From cae2429d12321319d4a9ef1a22d73aaf76449a36 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 19:44:37 +0000 Subject: [PATCH 001/169] 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 88016bd6d0..ef28f31e82 100644 --- a/js/util.js +++ b/js/util.js @@ -525,13 +525,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)); }); @@ -566,9 +566,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 f9cc3e6d942f4a1e3b9e000daa5ecca4df5e4ce5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 20:10:46 +0000 Subject: [PATCH 002/169] 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 ef28f31e82..373a4f3b01 100644 --- a/js/util.js +++ b/js/util.js @@ -494,7 +494,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; @@ -571,7 +571,7 @@ var SN = { // StatusNet token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); }, function(error) { @@ -598,7 +598,7 @@ var SN = { // StatusNet 'token': $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); } else { removeNoticeDataGeo(); From 2e643071ff3d03bd05f453b8e144aee4695e952e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 22:31:47 +0000 Subject: [PATCH 003/169] 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 373a4f3b01..a10e9d15ae 100644 --- a/js/util.js +++ b/js/util.js @@ -624,8 +624,6 @@ var SN = { // StatusNet else { removeNoticeDataGeo(); } - - $('#'+SN.C.S.NoticeDataText).focus(); }).change(); } }, From a35c52b6bef775a47785922a25fad3d9199fce1c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 12:55:14 +0000 Subject: [PATCH 004/169] 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 a10e9d15ae..aeec8d89d7 100644 --- a/js/util.js +++ b/js/util.js @@ -494,7 +494,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; @@ -509,7 +509,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; @@ -571,7 +571,7 @@ var SN = { // StatusNet token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data, position); + getJSONgeocodeURL(geocodeURL, data); }, function(error) { @@ -593,12 +593,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 a7a0041a1157ad3ceec2ebd6af722a2529ad422f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 22 Jan 2010 00:27:08 +0000 Subject: [PATCH 005/169] Quick hack to avoid breaking with geonames off when there's some old cookie state. This code's a little rough and tumble; any breakage halts JS execution and leaves the spinner going and no message submitted. --- js/util.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/util.js b/js/util.js index aeec8d89d7..a7339010a7 100644 --- a/js/util.js +++ b/js/util.js @@ -205,8 +205,10 @@ var SN = { // StatusNet cookieValue = JSON.parse(cookieValue); NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) { + NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); + NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + } } if (cookieValue == 'disabled') { NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); @@ -301,8 +303,10 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); - $('#'+SN.C.S.NoticeLocationNs).val(NLNS); - $('#'+SN.C.S.NoticeLocationId).val(NLID); + if ($('#'+SN.C.S.NoticeLocationNs)) { + $('#'+SN.C.S.NoticeLocationNs).val(NLNS); + $('#'+SN.C.S.NoticeLocationId).val(NLID); + } $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); } }); From 591c5037a745f1b620b213ddaa84c82c64201b71 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 25 Jan 2010 14:55:04 +0000 Subject: [PATCH 006/169] 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 e9a155db733f5266816ae5904db1eace4af1e2df Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 16 Jan 2010 20:57:18 +0000 Subject: [PATCH 007/169] 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 2e4c88dfa3..893cc60b51 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 83eef607f1f01256e7342b421bddbed1fc32d6a6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 14:04:47 +0000 Subject: [PATCH 008/169] 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 14c3ec73b93ad59d5eb3947ac5a4b7ed6c26daad Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 17 Jan 2010 19:45:35 +0000 Subject: [PATCH 009/169] 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 a93a3cc2701a0a948fe06b1d2a156c5d6b28c006 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 11:12:05 +0000 Subject: [PATCH 010/169] 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 b1a4ccb4dfb0e815f4955ef0c5cde27d85437eb7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 11:29:05 +0000 Subject: [PATCH 011/169] 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 dbb44ca39a84181fa8ccfb66657075250507945c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 18 Jan 2010 17:17:02 +0000 Subject: [PATCH 012/169] 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 1406cc452f212f629bdba8ac3e4422e907fbfb7f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 20 Jan 2010 18:32:24 +0100 Subject: [PATCH 013/169] 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 893cc60b51..7eff4709c7 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -957,6 +957,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; } @@ -965,13 +975,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; } @@ -1001,7 +1017,6 @@ max-width:70%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { -margin-left:0; max-width:79%; } @@ -1065,6 +1080,7 @@ position:relative; font-size:0.95em; width:113px; float:right; +margin-top:3px; margin-right:4px; } From 2f74a9bf148a22bb19524da290783cc0c10d38ba Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 20 Jan 2010 18:50:48 +0100 Subject: [PATCH 014/169] 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 72ae0ecc1c5e021b0f562fe5aa7ad0140d9c9ecf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 21 Jan 2010 13:23:04 +0100 Subject: [PATCH 015/169] 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 171bea17c7..e9207a66a6 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 6ae453bb7d7db232bead11c833d9447ee4e4ec0b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 22 Jan 2010 19:18:14 +0100 Subject: [PATCH 016/169] Fixed innerHTML problem in IE7 and 8 for badge script --- js/identica-badge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/identica-badge.js b/js/identica-badge.js index 8276f22a1d..e43d1c43c7 100644 --- a/js/identica-badge.js +++ b/js/identica-badge.js @@ -223,7 +223,7 @@ function markupPost(raw, server) { }, changeUserTo : function(el) { $.a.user = el.rel; - $.s.h.a.innerHTML = el.rev + $.a.headerText; + $.s.h.a.appendChild(document.createTextNode(el.rev + $.a.headerText)); $.s.h.a.href = 'http://' + $.a.server + '/' + el.id; $.f.runSearch(); }, From 23e96dd4d1f2378a62dc24f2f11b3e8b645bac1c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 24 Jan 2010 15:34:40 +0100 Subject: [PATCH 017/169] 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 9bacdb9134b39f97fd244bdc28d9e467ac05b61d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 25 Jan 2010 22:44:05 +0100 Subject: [PATCH 018/169] Updated howto create a theme --- theme/README | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/theme/README b/theme/README index 266a89fdf9..e154a723c4 100644 --- a/theme/README +++ b/theme/README @@ -2,37 +2,46 @@ * * @package StatusNet * @author Sarven Capadisli - * @copyright 2009 StatusNet, Inc. + * @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/ */ -Location of key paths and files under theme/: +== Location of key paths and files == +

+base/css/
+base/css/display.css                #layout, typography rules
+base/images/                        #common icons, illustrations
+base/images/icons/icons-01.png      #main icons file (combined into a single file)
 
-./base/css/
-./base/css/display.css
-./base/images/
+default/css/
+default/css/display.css             #imports the base stylesheet for layout and adds background images and colour rules
+default/logo.png                    #default site logo for this theme
+default/mobilelogo.png              #default logo for the mobile output
+default/default-avatar-mini.png     #24x24 default avatar for minilists
+default/default-avatar-stream.png   #48x48 default avatar for notice timelines
+default/default-avatar-profile.png  #96x96 default avatar for the profile page
+
-./default/css/ -./default/css/display.css -./default/images/ -./base/display.css contains layout, typography rules: -Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future statusnet releases may not be compatible with your version. +== How to create your own theme == -./default/css/display.css contains only the background images and colour rules: -This file is a good basis for creating your own theme. -Let's create a theme: +You probably want to do one of the following: -1. To start off, copy over the default theme: -cp -r default mytheme -2. Edit your mytheme stylesheet: -nano mytheme/css/display.css +* If you just want to change the text, link, background, content, sidebar colours, background image: +** Do this from the Admin->Design settings (recommended!). You could also create a directory and a file structure like the default theme, search and replace with your own values. This is more work, but, you can do this if you plan to make additional *minimal* changes. -a) Search and replace your colours and background images, or -b) Create your own layout either importing a separate stylesheet (e.g., change to @import url(base.css);) or simply place it before the rest of the rules. -4. Set /config.php to load 'mytheme': -$config['site']['theme'] = 'mytheme'; +* If you want to change the background images and colours: +# Create a directory and a file structure like the default theme. +# Have your stylesheet import base/css/display.css and add your own styles below. It is okay to add *minimal* changes here. + + +* If you want to create a different layout, typography, background images and colours: +** Create your own theme directory (base or default) with stylesheets and images like. + + +Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well. + From 817f01c3b18ec626701de2a1402562eeb87eee6d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 26 Jan 2010 01:58:10 +0100 Subject: [PATCH 019/169] 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 cebab436a16b392d3854d6abe652a063e055b8c7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 26 Jan 2010 19:13:05 +0100 Subject: [PATCH 020/169] 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 2e0297bb6ff0fd2d3a37d811bd3305ce5d6a77ee Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 27 Jan 2010 15:08:33 +0000 Subject: [PATCH 021/169] 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 7eff4709c7..d4c4716742 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -984,12 +984,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 b1402896e7dac59ab1eecae4babf83a06d2f256d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 09:13:21 -0800 Subject: [PATCH 022/169] Set default 24-hour expiry on Memcached objects where not specified. --- plugins/MemcachePlugin.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php index 8c8b8da6dc..2bc4b892bd 100644 --- a/plugins/MemcachePlugin.php +++ b/plugins/MemcachePlugin.php @@ -59,6 +59,8 @@ class MemcachePlugin extends Plugin public $persistent = null; + public $defaultExpiry = 86400; // 24h + /** * Initialize the plugin * @@ -110,6 +112,9 @@ class MemcachePlugin extends Plugin function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) { $this->_ensureConn(); + if ($expiry === null) { + $expiry = $this->defaultExpiry; + } $success = $this->_conn->set($key, $value, $flag, $expiry); Event::handle('EndCacheSet', array($key, $value, $flag, $expiry)); From 00d9b215f4de97f94035880041179879fcf0d201 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 17:29:36 -0500 Subject: [PATCH 023/169] Plugin to support Google Adsense A plugin to easily add Google Adsense blocks to a StatusNet site. --- plugins/Adsense/AdsensePlugin.php | 160 ++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 plugins/Adsense/AdsensePlugin.php diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php new file mode 100644 index 0000000000..dc2b32bc8f --- /dev/null +++ b/plugins/Adsense/AdsensePlugin.php @@ -0,0 +1,160 @@ +. + * + * @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 to add Google Adsense to StatusNet sites + * + * This plugin lets you add Adsense ad units to your StatusNet site. + * + * We support the 4 ad sizes for the Universal Ad Platform (UAP): + * + * Medium Rectangle + * (Small) Rectangle + * Leaderboard + * Wide Skyscraper + * + * They fit in different places on the default theme. Some themes + * might interact quite poorly with this plugin. + * + * To enable advertising, you must sign up with Google Adsense and + * get a client ID. + * + * https://www.google.com/adsense/ + * + * You'll also need to create an Adsense for Content unit in one + * of the four sizes described above. At the end of the process, + * note the "google_ad_client" and "google_ad_slot" values in the + * resultant Javascript. + * + * Add the plugin to config.php like so: + * + * addPlugin('Adsense', array('client' => 'Your client ID', + * 'rectangle' => 'slot')); + * + * Here, your client ID is the value of google_ad_client and the + * slot is the value of google_ad_slot. Note that if you create + * a different size, you'll need to provide different arguments: + * 'mediumRectangle', 'leaderboard', or 'wideSkyscraper'. + * + * If for some reason your ad server is different from the default, + * use the 'adScript' parameter to set the full path to the ad script. + * + * @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 UAPPlugin + */ + +class AdsensePlugin extends UAPPlugin +{ + public $adScript = 'http://pagead2.googlesyndication.com/pagead/show_ads.js'; + public $client = null; + + /** + * Show a medium rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showMediumRectangle($action) + { + $this->showAdsenseCode($action, 300, 250, $this->mediumRectangle); + } + + /** + * Show a rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showRectangle($action) + { + $this->showAdsenseCode($action, 180, 150, $this->rectangle); + } + + /** + * Show a wide skyscraper ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showWideSkyscraper($action) + { + $this->showAdsenseCode($action, 160, 600, $this->wideSkyscraper); + } + + /** + * Show a leaderboard ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showLeaderboard($action) + { + $this->showAdsenseCode($action, 728, 90, $this->leaderboard); + } + + /** + * Output the bits of JavaScript code to show Adsense + * + * @param Action $action Action being shown + * @param integer $width Width of the block + * @param integer $height Height of the block + * @param string $slot Slot identifier + * + * @return void + */ + + protected function showAdsenseCode($action, $width, $height, $slot) + { + $code = 'google_ad_client = "'.$this->client.'"; '; + $code .= 'google_ad_slot = "'.$slot.'"; '; + $code .= 'google_ad_width = "'.$width.'"; '; + $code .= 'google_ad_height = "'.$height.'"; '; + + $action->inlineScript($code); + + $action->script($this->adScript); + } +} \ No newline at end of file From 2aba2eeeaf78f4e407abe23643ff6027b0ea53dd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 17:55:33 -0500 Subject: [PATCH 024/169] width and height should be integers in AdsensePlugin --- plugins/Adsense/AdsensePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index dc2b32bc8f..ab2b9a6fb3 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -150,8 +150,8 @@ class AdsensePlugin extends UAPPlugin { $code = 'google_ad_client = "'.$this->client.'"; '; $code .= 'google_ad_slot = "'.$slot.'"; '; - $code .= 'google_ad_width = "'.$width.'"; '; - $code .= 'google_ad_height = "'.$height.'"; '; + $code .= 'google_ad_width = '.$width.'; '; + $code .= 'google_ad_height = '.$height.'; '; $action->inlineScript($code); From 06cd3358970bfc27ff027cd1d8dc6974950c3793 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 10:08:24 -0800 Subject: [PATCH 025/169] Add scripts/sendemail.php to send email to a user's address. Updated setup_status_network.sh to create a user with the site's nick, accept site tags, and send a mail to the user (if a template is set) Email and tag params added to the end: setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user' (If multiple tags are needed, separate them with a pipe "|". Be sure to quote properly!) New parameters for setup.cfg need to be set: export PHPBASE=/var/www/statusnet export WILDCARD=example.net export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt export MAILSUBJECT="Your new StatusNet site" $PHPBASE is the base dir for a callable StatusNet install, used to run command-line scripts for user setup. $WILDCARD is the wildcard domain, needed to build a full server name to pass into command-line scripts. $MAILTEMPLATE points to a file containing an e-mail message template. '$nickname', '$sitename', and '$userpass' can be used in the template for substitution. $MAILSUBJECT is the subject line for said email. To skip sending an email on creation, leave $MAILTEMPLATE blank or point to a non-existing file. --- scripts/sendemail.php | 82 +++++++++++++++++++++++++++++++++ scripts/setup.cfg.sample | 5 +- scripts/setup_status_network.sh | 50 ++++++++++++++++++-- 3 files changed, 132 insertions(+), 5 deletions(-) create mode 100755 scripts/sendemail.php diff --git a/scripts/sendemail.php b/scripts/sendemail.php new file mode 100755 index 0000000000..436e085bed --- /dev/null +++ b/scripts/sendemail.php @@ -0,0 +1,82 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:'; +$longoptions = array('id=', 'nickname=', 'subject='); + +$helptext = << +Sends given email text to user. + + -i --id id of the user to query + -n --nickname nickname of the user to query + --subject mail subject line (required) + +END_OF_USEREMAIL_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + +if (have_option('i', 'id')) { + $id = get_option_value('i', 'id'); + $user = User::staticGet('id', $id); + if (empty($user)) { + print "Can't find user with ID $id\n"; + exit(1); + } +} else if (have_option('n', 'nickname')) { + $nickname = get_option_value('n', 'nickname'); + $user = User::staticGet('nickname', $nickname); + if (empty($user)) { + print "Can't find user with nickname '$nickname'\n"; + exit(1); + } +} else { + print "You must provide a user by --id or --nickname\n"; + exit(1); +} + +if (empty($user->email)) { + // @fixme unconfirmed address? + print "No email registered for user '$user->nickname'\n"; + exit(1); +} + +if (!have_option('subject')) { + echo "You must provide a subject line for the mail in --subject='...' param.\n"; + exit(1); +} +$subject = get_option_value('subject'); + +if (posix_isatty(STDIN)) { + print "You must provide message input on stdin!\n"; + exit(1); +} +$body = file_get_contents('php://stdin'); + +print "Sending to $user->email..."; +if (mail_to_user($user, $subject, $body)) { + print " done\n"; +} else { + print " failed.\n"; + exit(1); +} + diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample index 8d03b06f5e..a0f10b3528 100644 --- a/scripts/setup.cfg.sample +++ b/scripts/setup.cfg.sample @@ -11,4 +11,7 @@ export AVATARBASE=/var/www/avatar.example.net export BACKGROUNDBASE=/var/www/background.example.net export FILEBASE=/var/www/file.example.net export PWDGEN="pwgen 20" - +export PHPBASE=/var/www/statusnet +export WILDCARD=example.net +export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt +export MAILSUBJECT="Your new StatusNet site" diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index 777711fb55..d468df3aeb 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -2,9 +2,22 @@ source /etc/statusnet/setup.cfg -export nickname=$1 -export sitename=$2 +# setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user' +export nickname="$1" +export sitename="$2" +export email="$3" +export tags="$4" + +# Fixme: if this is changed later we need to update profile URLs +# for the created user. +export server="$nickname.$WILDCARD" + +# End-user info +export userpass=`$PWDGEN` +export roles="administrator moderator owner" + +# DB info export password=`$PWDGEN` export database=$nickname$DBBASE export username=$nickname$USERBASE @@ -21,8 +34,8 @@ mysql -h $DBHOST -u $ADMIN --password=$ADMINPASS $SITEDB << ENDOFCOMMANDS GRANT ALL ON $database.* TO '$username'@'localhost' IDENTIFIED BY '$password'; GRANT ALL ON $database.* TO '$username'@'%' IDENTIFIED BY '$password'; -INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created) -VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now()); +INSERT INTO status_network (nickname, dbhost, dbuser, dbpass, dbname, sitename, created, tags) +VALUES ('$nickname', '$DBHOSTNAME', '$username', '$password', '$database', '$sitename', now(), '$tags'); ENDOFCOMMANDS @@ -30,3 +43,32 @@ for top in $AVATARBASE $FILEBASE $BACKGROUNDBASE; do mkdir $top/$nickname chmod a+w $top/$nickname done + +php $PHPBASE/scripts/registeruser.php \ + -s"$server" \ + -n"$nickname" \ + -w"$userpass" \ + -e"$email" + +for role in $roles +do + php $PHPBASE/scripts/userrole.php \ + -s"$server" \ + -n"$nickname" \ + -r"$role" +done + +if [ -f "$MAILTEMPLATE" ] +then + # fixme how safe is this? are sitenames sanitized? + cat $MAILTEMPLATE | \ + sed "s/\$nickname/$nickname/" | \ + sed "s/\$sitename/$sitename/" | \ + sed "s/\$userpass/$userpass/" | \ + php $PHPBASE/scripts/sendemail.php \ + -s"$server" \ + -n"$nickname" \ + --subject="$MAILSUBJECT" +else + echo "No mail template, not sending email." +fi From 0373ab6fa437309ab790d5de4d43e241ba510c93 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 18:35:02 -0500 Subject: [PATCH 026/169] Plugin to enable OpenX ads --- plugins/OpenX/OpenXPlugin.php | 166 ++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 plugins/OpenX/OpenXPlugin.php diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php new file mode 100644 index 0000000000..a0d02ec117 --- /dev/null +++ b/plugins/OpenX/OpenXPlugin.php @@ -0,0 +1,166 @@ +. + * + * @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); +} + +$_OpenXPlugin_Script = <<<\/scr"+"ipt>"); +ENDOFSCRIPT; + +/** + * Plugin for OpenX Ad Server + * + * This plugin supports the OpenX ad server, http://www.openx.org/ + * + * We support the 4 ad sizes for the Universal Ad Platform (UAP): + * + * Medium Rectangle + * (Small) Rectangle + * Leaderboard + * Wide Skyscraper + * + * They fit in different places on the default theme. Some themes + * might interact quite poorly with this plugin. + * + * To enable advertising, you will need an OpenX server. You'll need + * to set up a "zone" for your StatusNet site that identifies a + * kind of ad you want to place (of the above 4 sizes). + * + * Add the plugin to config.php like so: + * + * addPlugin('OpenX', array('adScript' => 'full path to script', + * 'rectangle' => 1)); + * + * Here, the 'adScript' parameter is the full path to the OpenX + * ad script, like 'http://example.com/www/delivery/ajs.php'. Note + * that we don't do any magic to swap between HTTP and HTTPS, so + * if you want HTTPS, say so. + * + * The 'rectangle' parameter is the zone ID for that ad space on + * your site. If you've configured another size, try 'mediumRectangle', + * 'leaderboard', or 'wideSkyscraper'. + * + * If for some reason your ad server is different from the default, + * use the 'adScript' parameter to set the full path to the ad script. + * + * @category Ads + * @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 UAPPlugin + */ + +class OpenXPlugin extends UAPPlugin +{ + public $adScript = null; + + /** + * Show a medium rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showMediumRectangle($action) + { + $this->showAd($action, $this->mediumRectangle); + } + + /** + * Show a rectangle 'ad' + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showRectangle($action) + { + $this->showAd($action, $this->rectangle); + } + + /** + * Show a wide skyscraper ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showWideSkyscraper($action) + { + $this->showAd($action, $this->wideSkyscraper); + } + + /** + * Show a leaderboard ad + * + * @param Action $action Action being shown + * + * @return void + */ + + protected function showLeaderboard($action) + { + $this->showAd($action, $this->leaderboard); + } + + /** + * Show an ad using OpenX + * + * @param integer $zone Zone to show + * + * @return void + */ + + protected function showAd($zone) + { + global $_OpenXPlugin_Script; + + $this->inlineScript(sprintf($_OpenXPlugin_Script, $this->adScript, $zone)); + return true; + } +} \ No newline at end of file From e7a5471287598902d4fefbb93f1247d8c025e66b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 15:37:18 -0800 Subject: [PATCH 027/169] add additional post-install shell script option for setup_status_network.sh to do any other site-specific setup --- scripts/setup.cfg.sample | 1 + scripts/setup_status_network.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample index a0f10b3528..f247a3bcae 100644 --- a/scripts/setup.cfg.sample +++ b/scripts/setup.cfg.sample @@ -15,3 +15,4 @@ export PHPBASE=/var/www/statusnet export WILDCARD=example.net export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt export MAILSUBJECT="Your new StatusNet site" +export POSTINSTALL=/etc/statusnet/morestuff.sh diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index d468df3aeb..ae392191f1 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -72,3 +72,9 @@ then else echo "No mail template, not sending email." fi + +if [ -f "$POSTINSTALL" ] +then + echo "Running $POSTINSTALL ..." + source "$POSTINSTALL" +fi From 97a1ef14d2bfd32ec14db57b56d861e9cad7d02d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 18:39:55 -0500 Subject: [PATCH 028/169] using an action for output in OpenX plugin --- plugins/OpenX/OpenXPlugin.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index a0d02ec117..96ed82b447 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -151,16 +151,17 @@ class OpenXPlugin extends UAPPlugin /** * Show an ad using OpenX * - * @param integer $zone Zone to show + * @param Action $action Action being shown + * @param integer $zone Zone to show * * @return void */ - protected function showAd($zone) + protected function showAd($action, $zone) { global $_OpenXPlugin_Script; - $this->inlineScript(sprintf($_OpenXPlugin_Script, $this->adScript, $zone)); + $action->inlineScript(sprintf($_OpenXPlugin_Script, $this->adScript, $zone)); return true; } } \ No newline at end of file From dd413ff4faeada13571711a0e4cc51e5ab25f7cc Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 18:44:46 -0500 Subject: [PATCH 029/169] move script into OpenXPlugin::showAd() so it works --- plugins/OpenX/OpenXPlugin.php | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index 96ed82b447..59485f25d8 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -31,22 +31,6 @@ if (!defined('STATUSNET')) { exit(1); } -$_OpenXPlugin_Script = <<<\/scr"+"ipt>"); -ENDOFSCRIPT; - /** * Plugin for OpenX Ad Server * @@ -159,9 +143,23 @@ class OpenXPlugin extends UAPPlugin protected function showAd($action, $zone) { - global $_OpenXPlugin_Script; +$scr = <<<\/scr"+"ipt>"); +ENDOFSCRIPT; - $action->inlineScript(sprintf($_OpenXPlugin_Script, $this->adScript, $zone)); + $action->inlineScript(sprintf($scr, $this->adScript, $zone)); return true; } } \ No newline at end of file From fe531dfc6c9c700b5566db634a9078d4b4b87d87 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 16:03:01 -0800 Subject: [PATCH 030/169] Shuffle params on setup_status_network; adding fullname and pushing tags up --- scripts/setup_status_network.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index ae392191f1..f502a169a2 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -2,12 +2,13 @@ source /etc/statusnet/setup.cfg -# setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user' +# setup_status_net.sh mysite 'My Site' '1user' 'owner@example.com' 'Firsty McLastname' export nickname="$1" export sitename="$2" -export email="$3" -export tags="$4" +export tags="$3" +export email="$4" +export fullname="$5" # Fixme: if this is changed later we need to update profile URLs # for the created user. @@ -47,6 +48,7 @@ done php $PHPBASE/scripts/registeruser.php \ -s"$server" \ -n"$nickname" \ + -f"$fullname" \ -w"$userpass" \ -e"$email" From 420ae06faf033b799c677845045b50b259801dbd Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 00:39:40 +0000 Subject: [PATCH 031/169] 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 7aa49b1bf3..95d6f95afa 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -149,4 +149,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 324590c46eba2900164d0487a2d525ea4e9f93b8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 00:41:44 +0000 Subject: [PATCH 032/169] 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; } From f296f04abdc545f03daf55676282a2ae7108f79e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 01:24:40 +0000 Subject: [PATCH 033/169] Remove debugging statement --- lib/apiauth.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index d441014add..c684a6caee 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -96,9 +96,6 @@ class ApiAuthAction extends ApiAction // 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.'); From 07d50a012af70d9bd35a26f645d791ae7ba29986 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 17:34:13 -0800 Subject: [PATCH 034/169] fix update script -- read the diff wrong and put a couple fields on wrong table (whoops) --- db/rc3torc4.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/rc3torc4.sql b/db/rc3torc4.sql index 8342c4bc6f..917c1f1c41 100644 --- a/db/rc3torc4.sql +++ b/db/rc3torc4.sql @@ -15,7 +15,9 @@ 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 consumer_secret varchar(255) not null comment 'secret value'; + +alter table token add verifier varchar(255) comment 'verifier string for OAuth 1.0a', add verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a'; From 5182cc686dacfcf64130b591a3b7ded8d4a0c9dc Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 01:39:18 +0000 Subject: [PATCH 035/169] Numbered format specifiers --- actions/apioauthauthorize.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index fa074c4e76..15c3a9dad5 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -303,8 +303,9 @@ 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 3abfb454a381806a0f237e1463d2ba9a8612c22a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 18:39:17 -0800 Subject: [PATCH 036/169] Adds an emergency switch so we can run inbox distribution at save time (bypassing 'distrib' queue) Set $config['queue']['inboxes'] = false to do so --- classes/Notice.php | 10 +++++++--- lib/default.php | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 0966697e21..6b364fb5ce 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -326,9 +326,13 @@ class Notice extends Memcached_DataObject # XXX: someone clever could prepend instead of clearing the cache $notice->blowOnInsert(); - $qm = QueueManager::get(); - - $qm->enqueue($notice, 'distrib'); + if (common_config('queue', 'inboxes')) { + $qm = QueueManager::get(); + $qm->enqueue($notice, 'distrib'); + } else { + $handler = new DistribQueueHandler(); + $handler->handle($notice); + } return $notice; } diff --git a/lib/default.php b/lib/default.php index 10ea348640..c729193b52 100644 --- a/lib/default.php +++ b/lib/default.php @@ -87,6 +87,7 @@ $default = 'monitor' => null, // URL to monitor ping endpoint (work in progress) 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully 'debug_memory' => false, // true to spit memory usage to log + 'inboxes' => true, // true to do inbox distribution & output queueing from in background via 'distrib' queue ), 'license' => array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private' From c805a5e51874aa231c728c14402542648edb24bf Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 18:55:22 -0800 Subject: [PATCH 037/169] Update queue, translation notes in readme --- README | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/README b/README index f83873ca84..da278f7412 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ README ------ -StatusNet 0.9.0 ("Stand") Beta 3 -20 Jan 2010 +StatusNet 0.9.0 ("Stand") Beta 4 +27 Jan 2010 This is the README file for StatusNet (formerly Laconica), the Open Source microblogging platform. It includes installation instructions, @@ -597,26 +597,19 @@ server is probably a good idea for high-volume sites. needs as a parameter the install path; if you run it from the StatusNet dir, "." should suffice. -This will run eight (for now) queue handlers: +This will run the queue handlers: +* queuedaemon.php - polls for queued items for inbox processing and + pushing out to OMB, SMS, XMPP, etc. * xmppdaemon.php - listens for new XMPP messages from users and stores - them as notices in the database. -* jabberqueuehandler.php - sends queued notices in the database to - registered users who should receive them. -* publicqueuehandler.php - sends queued notices in the database to - public feed listeners. -* ombqueuehandler.php - sends queued notices to OpenMicroBlogging - recipients on foreign servers. -* smsqueuehandler.php - sends queued notices to SMS-over-email addresses - of registered users. -* xmppconfirmhandler.php - sends confirmation messages to registered - users. + them as notices in the database; also pulls queued XMPP output from + queuedaemon.php to push out to clients. -Note that these queue daemons are pretty raw, and need your care. In -particular, they leak memory, and you may want to restart them on a -regular (daily or so) basis with a cron job. Also, if they lose -the connection to the XMPP server for too long, they'll simply die. It -may be a good idea to use a daemon-monitoring service, like 'monit', +These two daemons will automatically restart in most cases of failure +including memory leaks (if a memory_limit is set), but may still die +or behave oddly if they lose connections to the XMPP or queue servers. + +It may be a good idea to use a daemon-monitoring service, like 'monit', to check their status and keep them running. All the daemons write their process IDs (pids) to /var/run/ by @@ -626,7 +619,7 @@ daemons. Since version 0.8.0, it's now possible to use a STOMP server instead of our kind of hacky home-grown DB-based queue solution. See the "queues" config section below for how to configure to use STOMP. As of this -writing, the software has been tested with ActiveMQ ( +writing, the software has been tested with ActiveMQ. Sitemaps -------- @@ -712,10 +705,12 @@ subdirectory to add a new language to your system. You'll need to compile the ".po" files into ".mo" files, however. Contributions of translation information to StatusNet are very easy: -you can use the Web interface at http://status.net/pootle/ to add one +you can use the Web interface at TranslateWiki.net to add one or a few or lots of new translations -- or even new languages. You can also download more up-to-date .po files there, if you so desire. +For info on helping with translations, see http://status.net/wiki/Translations + Backups ------- From ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 27 Jan 2010 21:59:38 -0500 Subject: [PATCH 038/169] increment software beta version --- lib/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.php b/lib/common.php index ada48b339d..b4e4a653c8 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0beta3'); +define('STATUSNET_VERSION', '0.9.0beta4'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); From 5c0560a7fc7d5e7bb9c91da7cc273d2dc89e32b2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 19:50:08 -0800 Subject: [PATCH 039/169] fix for fix for bad realtime JS load --- plugins/Realtime/RealtimePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 16e28e94d3..6c212453e4 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(common_path($script)); + $action->script($script); } $user = common_current_user(); @@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin function _getScripts() { - return array('plugins/Realtime/realtimeupdate.js'); + return array(common_path('plugins/Realtime/realtimeupdate.js')); } function _updateInitialize($timeline, $user_id) From f026ecec322e59899b5ce87abaa6d93738f67b9e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 19:50:08 -0800 Subject: [PATCH 040/169] fix for fix for bad realtime JS load --- plugins/Realtime/RealtimePlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 16e28e94d3..6c212453e4 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(common_path($script)); + $action->script($script); } $user = common_current_user(); @@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin function _getScripts() { - return array('plugins/Realtime/realtimeupdate.js'); + return array(common_path('plugins/Realtime/realtimeupdate.js')); } function _updateInitialize($timeline, $user_id) From fbd52111e1cc68a1a2710701ae0a146bcce5580e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 19:58:33 -0800 Subject: [PATCH 041/169] fix notice -- drop unused return value of variable that isn't initialized :) thx @ g0 for the catch --- classes/Notice.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 6b364fb5ce..90e3e76ef3 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1378,8 +1378,6 @@ class Notice extends Memcached_DataObject } $reply->free(); - - return $ids; } function clearRepeats() From 644c319f5ad78dbedb686cdfef38152cadf615b2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 19:58:33 -0800 Subject: [PATCH 042/169] fix notice -- drop unused return value of variable that isn't initialized :) thx @ g0 for the catch --- classes/Notice.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 6b364fb5ce..90e3e76ef3 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1378,8 +1378,6 @@ class Notice extends Memcached_DataObject } $reply->free(); - - return $ids; } function clearRepeats() From c2c262e4b47f5a4965317148b66ff390f4fc85fd Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 04:46:10 +0000 Subject: [PATCH 043/169] Move faceboookapp.js to the Facebook plugin --- plugins/Facebook/facebookaction.php | 4 +--- {js => plugins/Facebook}/facebookapp.js | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename {js => plugins/Facebook}/facebookapp.js (100%) diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 389e1ea81f..8437a705a7 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -89,7 +89,7 @@ class FacebookAction extends Action function showScripts() { - $this->script('facebookapp.js'); + $this->script(common_path('plugins/Facebook/facebookapp.js')); } /** @@ -397,8 +397,6 @@ class FacebookAction extends Action return; } - - } } diff --git a/js/facebookapp.js b/plugins/Facebook/facebookapp.js similarity index 100% rename from js/facebookapp.js rename to plugins/Facebook/facebookapp.js From 427ac3a3a6eafa9a82006e9f0a9c2ab19a09fb4b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 20:51:04 -0800 Subject: [PATCH 044/169] debug log line for control channel sub --- lib/stompqueuemanager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 19e8c49b5c..da70d9ae31 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -242,6 +242,7 @@ class StompQueueManager extends QueueManager parent::start($master); $this->_connect(); + common_log(LOG_INFO, "Subscribing to $this->control"); $this->con->subscribe($this->control); if ($this->sites) { foreach ($this->sites as $server) { From 7347381183bfee96db8b2f89a4ba0ce5d04f76e2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 21:42:13 -0800 Subject: [PATCH 045/169] Fix for Mapstraction plugin's zoomed map links Move definition of NICKNAME_FMT above plugin initialization but below loading of Validate package. A merge error when refactoring setup lead to this not being defined yet when plugins were initialized, causing the router setup in MapstractionPlugin which tried to use this constant to fail. Result was bogus links and if you hit the URL directly the action would be "unrecognized". --- lib/common.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/common.php b/lib/common.php index b4e4a653c8..b482464aac 100644 --- a/lib/common.php +++ b/lib/common.php @@ -115,6 +115,10 @@ function __autoload($cls) require_once 'Validate.php'; require_once 'markdown.php'; +// XXX: other formats here + +define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); + require_once INSTALLDIR.'/lib/util.php'; require_once INSTALLDIR.'/lib/action.php'; require_once INSTALLDIR.'/lib/mail.php'; @@ -136,6 +140,3 @@ try { exit; } -// XXX: other formats here - -define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); From 1ba8045a9b318fd19fb55d2c469bd23a3976c2e8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 01:24:00 -0500 Subject: [PATCH 046/169] set session cookie correctly --- lib/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 4312f9876b..c6dc4b43aa 100644 --- a/lib/util.php +++ b/lib/util.php @@ -178,7 +178,7 @@ function common_ensure_session() } if (isset($id)) { session_id($id); - setcookie(session_name(), $id); + setcookie(session_name(), $id, 0, common_config('site', 'path')); } @session_start(); if (!isset($_SESSION['started'])) { From 65c4cff01c42a5c432db968cf6731104b8040134 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 23:14:49 -0800 Subject: [PATCH 047/169] append '/' on cookie path for now (may still need some refactoring) --- lib/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index c6dc4b43aa..26a12871b9 100644 --- a/lib/util.php +++ b/lib/util.php @@ -178,7 +178,7 @@ function common_ensure_session() } if (isset($id)) { session_id($id); - setcookie(session_name(), $id, 0, common_config('site', 'path')); + setcookie(session_name(), $id, 0, common_config('site', 'path') . '/'); } @session_start(); if (!isset($_SESSION['started'])) { From 78fe76b058157670bf6c0ab5f3454733d465684e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 23:16:06 -0800 Subject: [PATCH 048/169] dropping the setcookie() call from common_ensure_session() since we're pretty sure it's unnecessary --- lib/util.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 26a12871b9..dd8189a582 100644 --- a/lib/util.php +++ b/lib/util.php @@ -178,7 +178,6 @@ function common_ensure_session() } if (isset($id)) { session_id($id); - setcookie(session_name(), $id, 0, common_config('site', 'path') . '/'); } @session_start(); if (!isset($_SESSION['started'])) { From ffaaf9de4a1da25f6168c53a33b25683ae134c61 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 27 Jan 2010 23:51:22 -0800 Subject: [PATCH 049/169] Don't preemptively close existing DB connections for web views (needed to keep # of conns from going insane on multi-site queue daemons, so just doing for CLI) May, or may not, help with mystery session problems --- classes/Memcached_DataObject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 2cc6377f83..b60aa7911d 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -428,7 +428,7 @@ class Memcached_DataObject extends DB_DataObject // // WARNING WARNING if we end up actually using multiple DBs at a time // we'll need some fancier logic here. - if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS'])) { + if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS']) && php_sapi_name() == 'cli') { foreach ($_DB_DATAOBJECT['CONNECTIONS'] as $index => $conn) { if (!empty($conn)) { $conn->disconnect(); From dcce323d18d4b779d2456f32aa99dfac5e2b7520 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 15:05:23 +0100 Subject: [PATCH 050/169] Removed unused variable assignment for avatar URL and added missing fn --- lib/noticelist.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 78abf34a76..85c169716a 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -555,11 +555,8 @@ class NoticeListItem extends Widget $this->out->raw(_('Repeated by')); - $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); - $this->out->elementStart('a', $attrs); - - $this->out->element('span', 'nickname', $repeater->nickname); + $this->out->element('span', 'fn nickname', $repeater->nickname); $this->out->elementEnd('a'); $this->out->elementEnd('span'); From 5b1245a32a04de602196d2216b9d25ac32e0fd3b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 15:06:03 +0100 Subject: [PATCH 051/169] Removed avatar from repeat of username (matches noticelist) --- actions/showstream.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/actions/showstream.php b/actions/showstream.php index 90ff67073a..c529193860 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -291,23 +291,6 @@ class ProfileNoticeListItem extends NoticeListItem $this->out->elementStart('span', 'repeat'); - $this->out->elementStart('a', $attrs); - - $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE); - - $this->out->element('img', array('src' => ($avatar) ? - $avatar->displayUrl() : - Avatar::defaultImage(AVATAR_MINI_SIZE), - 'class' => 'avatar photo', - 'width' => AVATAR_MINI_SIZE, - 'height' => AVATAR_MINI_SIZE, - 'alt' => - ($this->profile->fullname) ? - $this->profile->fullname : - $this->profile->nickname)); - - $this->out->elementEnd('a'); - $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname); $this->out->raw(sprintf(_('Repeat of %s'), $text_link)); From c6f8b94fa91e3e5559a9b79766e7320b096b839e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:02:39 +0100 Subject: [PATCH 052/169] Showing processing indicator for form_repeat on submit instead of form --- theme/base/css/display.css | 11 ++++++++++- theme/default/css/display.css | 9 +++++---- theme/identica/css/display.css | 9 +++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 65dd159900..3c51deb312 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1127,8 +1127,17 @@ top:3px; } .dialogbox .submit_dialogbox { -text-indent:0; font-weight:bold; +text-indent:0; +min-width:46px; +} + +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +cursor:wait; +outline:none; +text-indent:-9999px; } .notice-options { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 3aebb239d3..06711850fc 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -196,11 +196,12 @@ background-color:transparent; } #wrap form.processing input.submit, -.entity_actions a.processing { +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -outline:none; +} +.notice-options .form_repeat.processing { +background-image:none; } #content { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2818196c20..1ac96ab5be 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -196,11 +196,12 @@ background-color:transparent; } #wrap form.processing input.submit, -.entity_actions a.processing { +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -outline:none; +} +.notice-options .form_repeat.processing { +background-image:none; } #content { From 61114ceff7c4124519cb5aa59b4d06ec73127e9d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:39:20 +0100 Subject: [PATCH 053/169] Fixed layout for powered by statusnet in biz --- theme/biz/css/base.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 6357e55b4e..471ac580d9 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -224,6 +224,15 @@ font-weight:bold; address img + .fn { display:none; } +address .poweredby { +float:left; +clear:left; +display:block; +position:relative; +top:7px; +margin-right:-47px; +} + #header { width:100%; From d4289cb34e9aefe7ffea3ca506ea0223f7858cb6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:41:28 +0100 Subject: [PATCH 054/169] Fixed layout when ad plugin is on for biz --- theme/biz/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 471ac580d9..2d4ac85ba6 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -396,7 +396,7 @@ margin-bottom:1em; } #content { -width:51.009%; +width:50%; min-height:259px; padding:1.795%; float:left; From b969fba2f5de4edf43e514e23565e1a90f916d04 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:49:33 +0100 Subject: [PATCH 055/169] Updated geo sharing styles for biz --- theme/biz/css/base.css | 21 +++++++++++++++++++++ theme/biz/css/display.css | 15 ++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 2d4ac85ba6..47845421a3 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -518,6 +518,27 @@ margin-bottom:0; line-height:1.618; } +.form_notice #notice_data-geo_wrap label, +.form_notice #notice_data-geo_wrap input { +position:absolute; +top:25px; +right:4px; +left:auto; +cursor:pointer; +width:16px; +height:16px; +display:block; +} +.form_notice #notice_data-geo_wrap input { +visibility:hidden; +} +.form_notice #notice_data-geo_wrap label { +font-weight:normal; +font-size:1em; +margin-bottom:0; +text-indent:-9999px; +} + /* entity_profile */ .entity_profile { position:relative; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7ea4515769..7a53b02bfc 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -60,6 +60,13 @@ input.submit, color:#FFFFFF; } +.form_notice label[for=notice_data-geo] { +background-position:0 -1780px; +} +.form_notice label[for=notice_data-geo].checked { +background-position:0 -1846px; +} + a, #site_nav_local_views .current a, div.notice-options input, @@ -115,6 +122,12 @@ text-indent:-9999px; outline:none; } +.form_notice label[for=notice_data-geo] { +background-image:url(../../base/images/icons/icons-01.gif); +background-repeat:no-repeat; +background-color:transparent; +} + #content { box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); @@ -130,7 +143,7 @@ border-color:#FFFFFF; background-color:#FFFFFF; } -#site_nav_local_views li { +#site_nav_local_views li.current { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); From e881888789be64576cb299611c80a0d191fa5682 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:08:24 +0100 Subject: [PATCH 056/169] Updated biz theme to use the single icons file --- theme/biz/css/base.css | 20 +++--- theme/biz/css/display.css | 132 +++++++++++++++++++++++++++++--------- 2 files changed, 110 insertions(+), 42 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 47845421a3..4ce7b49caa 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -911,25 +911,21 @@ margin-right:11px; .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -top:0; +.notice-options .form_disfavor, +.notice-options .repeated { +float:left; +margin-left:14.2%; } .notice-options .form_favor, .notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; +margin-left:0; } .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7a53b02bfc..4dfd25a996 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -108,26 +108,63 @@ color:#333333; #form_notice.warning #notice_text-count { color:#000000; } -#form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +.form_notice label[for=notice_data-attach] { +background-position:0 -328px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { opacity:0; } -#wrap form.processing input.submit { -background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -outline:none; -} - -.form_notice label[for=notice_data-geo] { +.form_notice label[for=notice_data-attach], +#export_data li a.rss, +#export_data li a.atom, +#export_data li a.foaf, +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit, +.form_make_admin input.submit, +.notice .attachment, +.notice-options .notice_reply, +.notice-options form.form_favor input.submit, +.notice-options form.form_disfavor input.submit, +.notice-options .notice_delete, +.notice-options form.form_repeat input.submit, +#new_group a, +.pagination .nav_prev a, +.pagination .nav_next a, +button.close, +.form_group_leave input.submit, +.form_user_unsubscribe input.submit, +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a, +.entity_moderation p, +.entity_sandbox input.submit, +.entity_silence input.submit, +.entity_delete input.submit, +.notice-options .repeated, +.form_notice label[for=notice_data-geo], +button.minimize, +.form_reset_key input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; } +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +} +.notice-options .form_repeat.processing { +background-image:none; +} + #content { box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); @@ -175,13 +212,13 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.png); +background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.png); +background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icon_foaf.gif); +background-position:0 1px; } .entity_edit a, @@ -211,43 +248,65 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/twotone/green/edit.gif); +background-position: 5px -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/twotone/green/quote.gif); +background-position: 5px -852px; } + .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/twotone/green/mail.gif); +background-position: 5px -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/twotone/green/shield.gif); +background-position: 5px -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/twotone/green/admin.gif); +background-position: 5px -983px; +} +.entity_moderation p { +background-position: 5px -1313px; +} +.entity_sandbox input.submit { +background-position: 5px -1380px; +} +.entity_silence input.submit { +background-position: 5px -1445px; +} +.entity_delete input.submit { +background-position: 5px -1511px; +} +.form_reset_key input.submit { +background-position: 5px -1973px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; +background-position:0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +background-position:0 -592px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +background-position:0 -460px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +background-position:0 -526px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +background-position:0 -658px; +} +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} +.notice-options .repeated { +background-position:0 -1648px; } .notices div.entry-content, @@ -284,19 +343,32 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +background-position:0 -1054px; } .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#CEE1E9; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } .pagination .nav_prev a { -background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; +background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; +background-position:105% -252px; +} +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; } From 6e556e502a13a1cfef51492707932635322f4bc4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:09:35 +0100 Subject: [PATCH 057/169] Updated biz theme to hide form_repeat legend --- theme/biz/css/base.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 4ce7b49caa..ec8ca22f5f 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -942,17 +942,18 @@ padding-left:16px; width:16px; padding:2px 0; } +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; padding:0; } - #usergroups #new_group { float: left; margin-right: 2em; From 83087e9d9b14b4425368dbd2f95ff6fcc909e7f6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:12:48 +0100 Subject: [PATCH 058/169] Updated biz theme notice options --- theme/biz/css/base.css | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index ec8ca22f5f..d5873b0b07 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -903,9 +903,10 @@ text-transform:lowercase; .notice-options { position:relative; font-size:0.95em; -width:90px; +width:113px; float:right; -margin-right:11px; +margin-top:3px; +margin-right:4px; } .notice-options a { @@ -936,11 +937,17 @@ border:0; .notice-options .notice_reply, .notice-options .notice_delete { text-decoration:none; -padding-left:16px; +} +.notice .notice-options .notice_delete { +float:right; } .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } .notice-options .form_repeat legend, .notice-options .form_favor legend, @@ -953,6 +960,11 @@ display:none; border:0; padding:0; } +.notice-options a, +.notice-options .repeated { +width:16px; +height:16px; +} #usergroups #new_group { float: left; From 156efda37a2a6d2e16b061180fea828581691560 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:16:11 +0100 Subject: [PATCH 059/169] Updated biz theme to use dialogbox styles --- theme/biz/css/base.css | 43 ++++++++++++++++++++++++++++++++++++++ theme/biz/css/display.css | 44 ++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index d5873b0b07..a8834ca570 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -900,6 +900,49 @@ display:inline-block; text-transform:lowercase; } +.dialogbox { +position:absolute; +top:-4px; +right:29px; +z-index:9; +min-width:199px; +float:none; +background-color:#FFF; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-style:solid; +border-width:1px; +border-color:#DDDDDD; +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + +.dialogbox legend { +display:block !important; +margin-right:18px; +} + +.dialogbox button.close { +position:absolute; +right:3px; +top:3px; +} + +.dialogbox .submit_dialogbox { +font-weight:bold; +text-indent:0; +min-width:46px; +} + +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +cursor:wait; +outline:none; +text-indent:-9999px; +} + .notice-options { position:relative; font-size:0.95em; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 4dfd25a996..52f36ab54a 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -40,25 +40,35 @@ border-color:#DDDDDD; background:none; } -input.submit, -#form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { -background-color:#9BB43E; -} - -input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { -border-color:#9BB43E; -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -} -input.submit, -.entity_remote_subscribe, -#site_nav_local_views a { +input.submit { color:#FFFFFF; } +.entity_actions input.submit { +border-color:transparent; +text-shadow:none; +} +.dialogbox .submit_dialogbox, +input.submit, +.form_notice input.submit { +background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; +text-shadow:0 1px 0 #FFFFFF; +color:#000000; +border-color:#AAAAAA; +border-top-color:#CCCCCC; +border-left-color:#CCCCCC; +} +.dialogbox .submit_dialogbox:hover, +input.submit:hover { +background-position:0 -5px; +} +.dialogbox .submit_dialogbox:focus, +input.submit:focus { +background-position:0 -15px; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +text-shadow:none; +} .form_notice label[for=notice_data-geo] { background-position:0 -1780px; From d955fb5e374d94526f9af928d28514e7b9a27a8f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:22:01 +0100 Subject: [PATCH 060/169] Updated biz theme entity_actions styles --- theme/biz/css/base.css | 110 ++++++++++++++++++++++++++++---------- theme/biz/css/display.css | 41 +++++++------- 2 files changed, 104 insertions(+), 47 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index a8834ca570..bd70c083e2 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -605,8 +605,9 @@ display:none; /*entity_actions*/ .entity_actions { float:right; -margin-left:4.35%; -max-width:25%; +margin-left:2%; +margin-bottom:18px; +min-width:21%; } .entity_actions h2 { display:none; @@ -615,7 +616,7 @@ display:none; list-style-type:none; } .entity_actions li { -margin-bottom:4px; +margin-bottom:7px; } .entity_actions li:first-child { border-top:0; @@ -633,42 +634,97 @@ display:block; text-align:left; width:100%; } -.entity_actions a, -.entity_nudge p, -.entity_remote_subscribe { +.entity_actions a { text-decoration:none; font-weight:bold; display:block; } - -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p { -border:0; -padding-left:20px; -} - -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { -padding:4px 4px 4px 23px; -} - -.entity_remote_subscribe { -padding:4px; -border-width:2px; -border-style:solid; +.entity_actions a, +.entity_actions input { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; } + +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-width:2px; +border-style:solid; +padding-left:23px; +} + +.entity_actions a, +.entity_actions p { +padding:2px 4px 1px 26px; +} + .entity_actions .accept { margin-bottom:18px; } +.entity_send-a-message button { +position:absolute; +top:3px; +right:3px; +} + +.entity_send-a-message .form_notice { +position:absolute; +top:34px; +right:-1px; +padding:1.795%; +width:65%; +z-index:2; + border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:1px; +border-style:solid; +} +.entity_send-a-message .form_notice legend { +display:block; +margin-bottom:11px; +} + +.entity_send-a-message .form_notice label, +.entity_send-a-message .form_notice select { +display:none; +} +.entity_send-a-message .form_notice input.submit { +text-align:center; +} + +.entity_moderation { +position:relative; +} +.entity_moderation p { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +font-weight:bold; +padding-bottom:2px; +margin-bottom:7px; +} +.entity_moderation ul { +display:none; +} +.entity_moderation:hover ul { +display:block; +min-width:21%; +width:100%; +padding:11px; +position:absolute; +top:-1px; +right:-1px; +z-index:1; +border-width:1px; +border-style:solid; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} + .entity_tags ul { list-style-type:none; display:inline; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 52f36ab54a..7fd78470f5 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -186,7 +186,9 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); border-color:#FFFFFF; } #content, -#site_nav_local_views .current a { +#site_nav_local_views .current a, +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { background-color:#FFFFFF; } @@ -231,30 +233,22 @@ background-position:0 -64px; background-position:0 1px; } -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_nudge p, -.form_make_admin input.submit { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} .form_group_join input.submit, -.form_group_leave input.submit +.form_group_leave input.submit, .form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { -background-color:#9BB43E; +.form_user_unsubscribe input.submit, +.entity_subscribe a { +background-color:#AAAAAA; color:#FFFFFF; } -.form_user_unsubscribe input.submit, .form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#87B4C8; +.form_user_unsubscribe input.submit { +background-position:5px -1246px; +} +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a { +background-position:5px -1181px; } .entity_edit a { @@ -263,6 +257,12 @@ background-position: 5px -718px; .entity_send-a-message a { background-position: 5px -852px; } +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { +box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} .entity_nudge p, .form_user_nudge input.submit { @@ -293,6 +293,7 @@ background-position: 5px -1511px; background-position: 5px -1973px; } + /* NOTICES */ .notice .attachment { background-position:0 -394px; From d29af38a0be2f0944297898b166e86d0cebd9bd2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:28:11 +0100 Subject: [PATCH 061/169] Update to biz theme's input styles --- theme/biz/css/display.css | 69 +++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7fd78470f5..0b7c17de76 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -25,14 +25,33 @@ address { margin-right:7.18%; } +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select, -.entity_remote_subscribe { +input, textarea, select { border-color:#AAAAAA; } -#filter_tags ul li { + +.form_settings fieldset fieldset { +background:rgba(240, 240, 240, 0.2); +box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +} + +#filter_tags ul li, +.entity_send-a-message .form_notice, +.pagination .nav_prev a, +.pagination .nav_next a, +.form_settings fieldset fieldset, +.entity_moderation:hover ul { border-color:#DDDDDD; } @@ -40,6 +59,34 @@ border-color:#DDDDDD; background:none; } +.form_notice.warning #notice_text-count, +.form_settings .form_note { +background-color:#9BB43E; +} +input.submit, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_actions a, +.entity_actions input, +.entity_moderation p, +button { +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +} +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; +} +input:focus, textarea:focus, select:focus, +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note { +border-color:#9BB43E; +} + input.submit { color:#FFFFFF; } @@ -78,18 +125,12 @@ background-position:0 -1846px; } a, -#site_nav_local_views .current a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit { -color:#002E6E; +.notice-options input, +.entity_actions a, +.entity_actions input, +.entity_moderation p { +color:#002FA7; } #header a, From 1662aa11139517cccc600d65b9e8eba07c541ea7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:32:24 +0100 Subject: [PATCH 062/169] Update to biz theme button close and minimize styles --- theme/biz/css/base.css | 17 +++++++++++++++++ theme/biz/css/display.css | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index bd70c083e2..8a34425be2 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -518,6 +518,11 @@ margin-bottom:0; line-height:1.618; } +.form_notice #notice_data-attach_selected button.close { +float:right; +font-size:0.8em; +} + .form_notice #notice_data-geo_wrap label, .form_notice #notice_data-geo_wrap input { position:absolute; @@ -539,6 +544,18 @@ margin-bottom:0; text-indent:-9999px; } +button.close, +button.minimize { +width:16px; +height:16px; +text-indent:-9999px; +padding:0; +border:0; +text-align:center; +font-weight:bold; +cursor:pointer; +} + /* entity_profile */ .entity_profile { position:relative; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 0b7c17de76..7768d5146a 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -256,6 +256,13 @@ background-color:#F7E8E8; background-color:#EFF3DC; } +button.close { +background-position:0 -1120px; +} +button.minimize { +background-position:0 -1912px; +} + #anon_notice { color:#FFFFFF; } From b4babedd29661a15a8dd135a20ffaf7059b7fa50 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:36:33 +0100 Subject: [PATCH 063/169] Update to notice item in biz theme --- theme/biz/css/base.css | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 8a34425be2..366339db28 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -903,6 +903,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; } @@ -911,12 +921,22 @@ 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 { +margin-left:110px; font-size:2.2em; +min-height:123px; +} +#shownotice .notice div.entry-content { +margin-left:0; } .notice p.entry-content { @@ -939,7 +959,7 @@ clear:left; float:left; font-size:0.95em; margin-left:59px; -width:65%; +width:64%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { From 22d9c32e7e755c36817912cb9e20554b23d211d4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 18:39:30 +0100 Subject: [PATCH 064/169] Update to aside styles in biz theme --- theme/biz/css/base.css | 2 +- theme/biz/css/display.css | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 366339db28..2c2ab33a01 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -422,7 +422,7 @@ float:left; width:29.917%; min-height:259px; float:left; -margin-left:0.385%; +margin-left:1%; } #form_notice { diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7768d5146a..f133ac30b9 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -138,10 +138,22 @@ color:#002FA7; color:#87B4C8; } + + .notice, -.profile { -border-top-color:#CEE1E9; +.profile, +.application, +#content tbody tr { +border-top-color:#C8D1D5; } +.mark-top { +border-color:#AAAAAA; +} + +#aside_primary { +background-color:#144A6E; +} + .section .profile { border-top-color:#87B4C8; } From a868a523a5ab042e75d333298a75aaa369d445cc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 09:52:35 -0800 Subject: [PATCH 065/169] Can now set $config['queue']['stomp_persistent'] = false; to explicitly disable persistence when we queue items --- lib/default.php | 1 + lib/stompqueuemanager.php | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/default.php b/lib/default.php index c729193b52..8de8b10977 100644 --- a/lib/default.php +++ b/lib/default.php @@ -84,6 +84,7 @@ $default = 'control_channel' => '/topic/statusnet-control', // broadcasts to all queue daemons 'stomp_username' => null, 'stomp_password' => null, + 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled 'monitor' => null, // URL to monitor ping endpoint (work in progress) 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully 'debug_memory' => false, // true to spit memory usage to log diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index da70d9ae31..4e2b586025 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -174,12 +174,13 @@ class StompQueueManager extends QueueManager $this->_connect(); - // XXX: serialize and send entire notice - + $props = array('created' => common_sql_now()); + if (common_config('queue', 'stomp_persistent')) { + $props['persistent'] = 'true'; + } $result = $this->con->send($this->queueName($queue), $msg, // BODY of the message - array ('created' => common_sql_now(), - 'persistent' => 'true')); + $props); if (!$result) { common_log(LOG_ERR, "Error sending $rep to $queue queue"); From 558bf0f48907ad463872075c778c12bc5821f510 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 18:11:44 +0000 Subject: [PATCH 066/169] 'Sign in with Twitter' button img --- .../Sign-in-with-Twitter-lighter.png | Bin 0 -> 2490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png diff --git a/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png b/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png new file mode 100644 index 0000000000000000000000000000000000000000..297bb03404f2d7462ee9355aae38f5f5f3e47fbd GIT binary patch literal 2490 zcmV;r2}SmaP)dbVG7wVRUJ4ZXi@?ZDjy8FEKeU zFgbGL({lg-0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#1y$)1UwV2@^>~ zK~!jg?VEdWl+_u=f8X9WA)72QVM!vF1VSK4AZQ?nK}o}NseS3JN$f zgRQMIo!W~OJ6`ZouvAJ_K&eH%O=zU35Dd9+OGJ}EvYTu++57IdU;kJVc9XpY6B?a; zX3k{ZIp=-eC+|7m`<-)kR{+>vQ7sWi9D|5ebEgWz_KIq$s4!>9f*d_|j-lj_V|e1| zv2!Q@e7>PCTvsDT9K#C=07>!<2 zJRT3v{^4m(e0B`AMuXes=AQD^+;C$tPj22q>4H*zdfz>`#KAid3>9xAeo+*W%jE#P zv+pgwyLbU*^X6iX@D|vxdJPV{BV^y=rMIzo>FtA}CzL%H7|@3PC-uR0k{o`MEpT&+ zmiCUwd$DjaD&G5mR^R=5Ugy>A zFL6`pd;osE=`rd~)-ZEc5shchvh}x5aZ~9nJpS;;UjCggyhMFX4IM@k^;K2OnpeX9 zJ+G59W-M>Ndx+<@J`*QB2?^MN1N-(fead7?=HEi6T!B@Box5IR=L;`>Ej{PX zHuTf??pp_V_K#2V&%f=WuDXUP)2>6K(eP;bS}ruV@b7*5sr;ydIrB8I2tIsDgsYdEB~aA*X6k7? zxX|2;qp^|Gwe@`Y#d&IupCC)EqUw`l7)GU&uTKu*U$o?QG#U*z%qZYj8`hDRoCLu8 zhbzgOI5DbLyT^;&?d{E@=<{Loc(HlBWQ@7?YwIarxgyB6oH@guS9eiXI-mWozJlq( z1uEY@fC2%N(MZ*iqs%Lw&3$(-XHs%f#Ci8GF3A_N^~J`q@N(Yec4#`>p8;Rm>`^(w z^()mX);zY6A1}KTOQ(hBpZ+tI2M_vvC6EgOasg^TuSW9u`2L~=xMTvlF=IdirA&q( z01}jz+(`M#6-+Id=Jypvl2wZSngV!x>{xvBuA7QRt)c4kYU--0D3~!Fhr>aA^+`_G z)iHDWG@POs#IMsQgCL+*sYp&si#>KieJ zAZPaXZl!3>9M-SjNX7dfvh?=bdf)$&1YWO*1jqy#ZFVPakM~lt{ns24pi(Mnce*e+ zoV|U5)IWA0uWtapa=C)>xf3{EU4zZ(WX19y(%RC@hySVMd_x1@*}REPr@KGD1PCBr zszd|P3jULJU(P|*6JUEpf1ZUYMN@b5y{gO~R0`R^ zzo2^1b1iYS>vBugsL9qPM&yVTyCwWp(Uo=ev@y*W7rS{ZmOePbh#j}_&X%YtxeZa(=9L5<&(e8Bi z<5wsYm^&^0MKr*8(egMLdIIf9`S}2Jn9Y=xl~T570XoAdF4!DlHH6a}anEJ-cv*VQ z<;7KRgYq-}Q)5qi@;qcECS38JtLDV#Y+3g(n;(3LUp}&dB%O}ct5)I-xFV2%>k11g zTUf@C&yKTa*KVdw^(R50loR*{_b2SKCHeZt4jkLpj^;ZlKOe6sQZ!>aT9uM(b0*;N zdYL_=0IS=B(gj7|CTgIo3w=s5DLNgUE;lDl z=6*ck(9~r1FRqNt5);TzP2p%4ylH~wfExv!+`pk8s}?!j(i+mgrP)GJVGd2L zrifxR3OQ=I9MLCX4Ray;#3LJ#2{HtkfT^vG#S0hk#JUIhwAC2&WDQrS)2nfk*V=iQ!Y2K(sVlqHpM%x^1{ck;y4Kin5jc`W;@8<8AFx4+YWs z?QSo2A}4+Q<6F?#y0F{r Date: Thu, 28 Jan 2010 18:34:25 +0000 Subject: [PATCH 067/169] Remove redundant session token field from form (was already being added by base class). --- lib/applicationeditform.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php index 6f03a9beda..9b7d058614 100644 --- a/lib/applicationeditform.php +++ b/lib/applicationeditform.php @@ -168,8 +168,6 @@ class ApplicationEditForm extends Form $this->access_type = ''; } - $this->out->hidden('token', common_session_token()); - $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li', array('id' => 'application_icon')); From 612dce4fe12e20643c2d33910c2fdf361a4845a5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:39:20 +0100 Subject: [PATCH 068/169] Fixed layout for powered by statusnet in biz --- theme/biz/css/base.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 6357e55b4e..471ac580d9 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -224,6 +224,15 @@ font-weight:bold; address img + .fn { display:none; } +address .poweredby { +float:left; +clear:left; +display:block; +position:relative; +top:7px; +margin-right:-47px; +} + #header { width:100%; From df2390a90f43e7493eef492960526df112efa9a4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:41:28 +0100 Subject: [PATCH 069/169] Fixed layout when ad plugin is on for biz --- theme/biz/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 471ac580d9..2d4ac85ba6 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -396,7 +396,7 @@ margin-bottom:1em; } #content { -width:51.009%; +width:50%; min-height:259px; padding:1.795%; float:left; From 108aa050af17639c319305338ea9de9e28847275 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 16:49:33 +0100 Subject: [PATCH 070/169] Updated geo sharing styles for biz --- theme/biz/css/base.css | 21 +++++++++++++++++++++ theme/biz/css/display.css | 15 ++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 2d4ac85ba6..47845421a3 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -518,6 +518,27 @@ margin-bottom:0; line-height:1.618; } +.form_notice #notice_data-geo_wrap label, +.form_notice #notice_data-geo_wrap input { +position:absolute; +top:25px; +right:4px; +left:auto; +cursor:pointer; +width:16px; +height:16px; +display:block; +} +.form_notice #notice_data-geo_wrap input { +visibility:hidden; +} +.form_notice #notice_data-geo_wrap label { +font-weight:normal; +font-size:1em; +margin-bottom:0; +text-indent:-9999px; +} + /* entity_profile */ .entity_profile { position:relative; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7ea4515769..7a53b02bfc 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -60,6 +60,13 @@ input.submit, color:#FFFFFF; } +.form_notice label[for=notice_data-geo] { +background-position:0 -1780px; +} +.form_notice label[for=notice_data-geo].checked { +background-position:0 -1846px; +} + a, #site_nav_local_views .current a, div.notice-options input, @@ -115,6 +122,12 @@ text-indent:-9999px; outline:none; } +.form_notice label[for=notice_data-geo] { +background-image:url(../../base/images/icons/icons-01.gif); +background-repeat:no-repeat; +background-color:transparent; +} + #content { box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); @@ -130,7 +143,7 @@ border-color:#FFFFFF; background-color:#FFFFFF; } -#site_nav_local_views li { +#site_nav_local_views li.current { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); From f4c037f956ac7ca638c3d800f2d9070aa31d45e0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:08:24 +0100 Subject: [PATCH 071/169] Updated biz theme to use the single icons file --- theme/biz/css/base.css | 20 +++--- theme/biz/css/display.css | 132 +++++++++++++++++++++++++++++--------- 2 files changed, 110 insertions(+), 42 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 47845421a3..4ce7b49caa 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -911,25 +911,21 @@ margin-right:11px; .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -top:0; +.notice-options .form_disfavor, +.notice-options .repeated { +float:left; +margin-left:14.2%; } .notice-options .form_favor, .notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; +margin-left:0; } .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7a53b02bfc..4dfd25a996 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -108,26 +108,63 @@ color:#333333; #form_notice.warning #notice_text-count { color:#000000; } -#form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +.form_notice label[for=notice_data-attach] { +background-position:0 -328px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { opacity:0; } -#wrap form.processing input.submit { -background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; -cursor:wait; -text-indent:-9999px; -outline:none; -} - -.form_notice label[for=notice_data-geo] { +.form_notice label[for=notice_data-attach], +#export_data li a.rss, +#export_data li a.atom, +#export_data li a.foaf, +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit, +.form_make_admin input.submit, +.notice .attachment, +.notice-options .notice_reply, +.notice-options form.form_favor input.submit, +.notice-options form.form_disfavor input.submit, +.notice-options .notice_delete, +.notice-options form.form_repeat input.submit, +#new_group a, +.pagination .nav_prev a, +.pagination .nav_next a, +button.close, +.form_group_leave input.submit, +.form_user_unsubscribe input.submit, +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a, +.entity_moderation p, +.entity_sandbox input.submit, +.entity_silence input.submit, +.entity_delete input.submit, +.notice-options .repeated, +.form_notice label[for=notice_data-geo], +button.minimize, +.form_reset_key input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; } +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +} +.notice-options .form_repeat.processing { +background-image:none; +} + #content { box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); -moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); @@ -175,13 +212,13 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.png); +background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.png); +background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icon_foaf.gif); +background-position:0 1px; } .entity_edit a, @@ -211,43 +248,65 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/twotone/green/edit.gif); +background-position: 5px -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/twotone/green/quote.gif); +background-position: 5px -852px; } + .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/twotone/green/mail.gif); +background-position: 5px -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/twotone/green/shield.gif); +background-position: 5px -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/twotone/green/admin.gif); +background-position: 5px -983px; +} +.entity_moderation p { +background-position: 5px -1313px; +} +.entity_sandbox input.submit { +background-position: 5px -1380px; +} +.entity_silence input.submit { +background-position: 5px -1445px; +} +.entity_delete input.submit { +background-position: 5px -1511px; +} +.form_reset_key input.submit { +background-position: 5px -1973px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; +background-position:0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +background-position:0 -592px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +background-position:0 -460px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +background-position:0 -526px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +background-position:0 -658px; +} +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} +.notice-options .repeated { +background-position:0 -1648px; } .notices div.entry-content, @@ -284,19 +343,32 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +background-position:0 -1054px; } .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#CEE1E9; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } .pagination .nav_prev a { -background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; +background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; +background-position:105% -252px; +} +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; } From 8a18fd9591cfc8772d58b14f8a532558e70911f6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:09:35 +0100 Subject: [PATCH 072/169] Updated biz theme to hide form_repeat legend --- theme/biz/css/base.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 4ce7b49caa..ec8ca22f5f 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -942,17 +942,18 @@ padding-left:16px; width:16px; padding:2px 0; } +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; padding:0; } - #usergroups #new_group { float: left; margin-right: 2em; From 852a8b8295066140d4745b8a92eb835e8be6c3b0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:12:48 +0100 Subject: [PATCH 073/169] Updated biz theme notice options --- theme/biz/css/base.css | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index ec8ca22f5f..d5873b0b07 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -903,9 +903,10 @@ text-transform:lowercase; .notice-options { position:relative; font-size:0.95em; -width:90px; +width:113px; float:right; -margin-right:11px; +margin-top:3px; +margin-right:4px; } .notice-options a { @@ -936,11 +937,17 @@ border:0; .notice-options .notice_reply, .notice-options .notice_delete { text-decoration:none; -padding-left:16px; +} +.notice .notice-options .notice_delete { +float:right; } .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } .notice-options .form_repeat legend, .notice-options .form_favor legend, @@ -953,6 +960,11 @@ display:none; border:0; padding:0; } +.notice-options a, +.notice-options .repeated { +width:16px; +height:16px; +} #usergroups #new_group { float: left; From 9af751c03a08445b7e1fb79af60a60c65a81f89f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:16:11 +0100 Subject: [PATCH 074/169] Updated biz theme to use dialogbox styles --- theme/biz/css/base.css | 43 ++++++++++++++++++++++++++++++++++++++ theme/biz/css/display.css | 44 ++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index d5873b0b07..a8834ca570 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -900,6 +900,49 @@ display:inline-block; text-transform:lowercase; } +.dialogbox { +position:absolute; +top:-4px; +right:29px; +z-index:9; +min-width:199px; +float:none; +background-color:#FFF; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-style:solid; +border-width:1px; +border-color:#DDDDDD; +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + +.dialogbox legend { +display:block !important; +margin-right:18px; +} + +.dialogbox button.close { +position:absolute; +right:3px; +top:3px; +} + +.dialogbox .submit_dialogbox { +font-weight:bold; +text-indent:0; +min-width:46px; +} + +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +cursor:wait; +outline:none; +text-indent:-9999px; +} + .notice-options { position:relative; font-size:0.95em; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 4dfd25a996..52f36ab54a 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -40,25 +40,35 @@ border-color:#DDDDDD; background:none; } -input.submit, -#form_notice.warning #notice_text-count, -.form_settings .form_note, -.entity_remote_subscribe { -background-color:#9BB43E; -} - -input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { -border-color:#9BB43E; -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -} -input.submit, -.entity_remote_subscribe, -#site_nav_local_views a { +input.submit { color:#FFFFFF; } +.entity_actions input.submit { +border-color:transparent; +text-shadow:none; +} +.dialogbox .submit_dialogbox, +input.submit, +.form_notice input.submit { +background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; +text-shadow:0 1px 0 #FFFFFF; +color:#000000; +border-color:#AAAAAA; +border-top-color:#CCCCCC; +border-left-color:#CCCCCC; +} +.dialogbox .submit_dialogbox:hover, +input.submit:hover { +background-position:0 -5px; +} +.dialogbox .submit_dialogbox:focus, +input.submit:focus { +background-position:0 -15px; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +text-shadow:none; +} .form_notice label[for=notice_data-geo] { background-position:0 -1780px; From f66e0ed1392a01e925e3d5dcc1772d32cad6c271 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:22:01 +0100 Subject: [PATCH 075/169] Updated biz theme entity_actions styles --- theme/biz/css/base.css | 110 ++++++++++++++++++++++++++++---------- theme/biz/css/display.css | 41 +++++++------- 2 files changed, 104 insertions(+), 47 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index a8834ca570..bd70c083e2 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -605,8 +605,9 @@ display:none; /*entity_actions*/ .entity_actions { float:right; -margin-left:4.35%; -max-width:25%; +margin-left:2%; +margin-bottom:18px; +min-width:21%; } .entity_actions h2 { display:none; @@ -615,7 +616,7 @@ display:none; list-style-type:none; } .entity_actions li { -margin-bottom:4px; +margin-bottom:7px; } .entity_actions li:first-child { border-top:0; @@ -633,42 +634,97 @@ display:block; text-align:left; width:100%; } -.entity_actions a, -.entity_nudge p, -.entity_remote_subscribe { +.entity_actions a { text-decoration:none; font-weight:bold; display:block; } - -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p { -border:0; -padding-left:20px; -} - -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { -padding:4px 4px 4px 23px; -} - -.entity_remote_subscribe { -padding:4px; -border-width:2px; -border-style:solid; +.entity_actions a, +.entity_actions input { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; } + +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-width:2px; +border-style:solid; +padding-left:23px; +} + +.entity_actions a, +.entity_actions p { +padding:2px 4px 1px 26px; +} + .entity_actions .accept { margin-bottom:18px; } +.entity_send-a-message button { +position:absolute; +top:3px; +right:3px; +} + +.entity_send-a-message .form_notice { +position:absolute; +top:34px; +right:-1px; +padding:1.795%; +width:65%; +z-index:2; + border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:1px; +border-style:solid; +} +.entity_send-a-message .form_notice legend { +display:block; +margin-bottom:11px; +} + +.entity_send-a-message .form_notice label, +.entity_send-a-message .form_notice select { +display:none; +} +.entity_send-a-message .form_notice input.submit { +text-align:center; +} + +.entity_moderation { +position:relative; +} +.entity_moderation p { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +font-weight:bold; +padding-bottom:2px; +margin-bottom:7px; +} +.entity_moderation ul { +display:none; +} +.entity_moderation:hover ul { +display:block; +min-width:21%; +width:100%; +padding:11px; +position:absolute; +top:-1px; +right:-1px; +z-index:1; +border-width:1px; +border-style:solid; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} + .entity_tags ul { list-style-type:none; display:inline; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 52f36ab54a..7fd78470f5 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -186,7 +186,9 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); border-color:#FFFFFF; } #content, -#site_nav_local_views .current a { +#site_nav_local_views .current a, +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { background-color:#FFFFFF; } @@ -231,30 +233,22 @@ background-position:0 -64px; background-position:0 1px; } -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_nudge p, -.form_make_admin input.submit { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} .form_group_join input.submit, -.form_group_leave input.submit +.form_group_leave input.submit, .form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { -background-color:#9BB43E; +.form_user_unsubscribe input.submit, +.entity_subscribe a { +background-color:#AAAAAA; color:#FFFFFF; } -.form_user_unsubscribe input.submit, .form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#87B4C8; +.form_user_unsubscribe input.submit { +background-position:5px -1246px; +} +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a { +background-position:5px -1181px; } .entity_edit a { @@ -263,6 +257,12 @@ background-position: 5px -718px; .entity_send-a-message a { background-position: 5px -852px; } +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { +box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} .entity_nudge p, .form_user_nudge input.submit { @@ -293,6 +293,7 @@ background-position: 5px -1511px; background-position: 5px -1973px; } + /* NOTICES */ .notice .attachment { background-position:0 -394px; From 72fc0f6b8a4ad392142c64f075dd161a50e72c7c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:28:11 +0100 Subject: [PATCH 076/169] Update to biz theme's input styles --- theme/biz/css/display.css | 69 +++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7fd78470f5..0b7c17de76 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -25,14 +25,33 @@ address { margin-right:7.18%; } +input, textarea, select { +border-width:2px; +border-style: solid; +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} input, textarea, select, option { font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; } -input, textarea, select, -.entity_remote_subscribe { +input, textarea, select { border-color:#AAAAAA; } -#filter_tags ul li { + +.form_settings fieldset fieldset { +background:rgba(240, 240, 240, 0.2); +box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +} + +#filter_tags ul li, +.entity_send-a-message .form_notice, +.pagination .nav_prev a, +.pagination .nav_next a, +.form_settings fieldset fieldset, +.entity_moderation:hover ul { border-color:#DDDDDD; } @@ -40,6 +59,34 @@ border-color:#DDDDDD; background:none; } +.form_notice.warning #notice_text-count, +.form_settings .form_note { +background-color:#9BB43E; +} +input.submit, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_actions a, +.entity_actions input, +.entity_moderation p, +button { +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +} +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; +} +input:focus, textarea:focus, select:focus, +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note { +border-color:#9BB43E; +} + input.submit { color:#FFFFFF; } @@ -78,18 +125,12 @@ background-position:0 -1846px; } a, -#site_nav_local_views .current a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit { -color:#002E6E; +.notice-options input, +.entity_actions a, +.entity_actions input, +.entity_moderation p { +color:#002FA7; } #header a, From 8eec008b0ce96408d295745fe1c0ea66f876de34 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:32:24 +0100 Subject: [PATCH 077/169] Update to biz theme button close and minimize styles --- theme/biz/css/base.css | 17 +++++++++++++++++ theme/biz/css/display.css | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index bd70c083e2..8a34425be2 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -518,6 +518,11 @@ margin-bottom:0; line-height:1.618; } +.form_notice #notice_data-attach_selected button.close { +float:right; +font-size:0.8em; +} + .form_notice #notice_data-geo_wrap label, .form_notice #notice_data-geo_wrap input { position:absolute; @@ -539,6 +544,18 @@ margin-bottom:0; text-indent:-9999px; } +button.close, +button.minimize { +width:16px; +height:16px; +text-indent:-9999px; +padding:0; +border:0; +text-align:center; +font-weight:bold; +cursor:pointer; +} + /* entity_profile */ .entity_profile { position:relative; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 0b7c17de76..7768d5146a 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -256,6 +256,13 @@ background-color:#F7E8E8; background-color:#EFF3DC; } +button.close { +background-position:0 -1120px; +} +button.minimize { +background-position:0 -1912px; +} + #anon_notice { color:#FFFFFF; } From 1e8b14d24b8ef748b4451322b7ff68aaa1f00eae Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 17:36:33 +0100 Subject: [PATCH 078/169] Update to notice item in biz theme --- theme/biz/css/base.css | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 8a34425be2..366339db28 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -903,6 +903,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; } @@ -911,12 +921,22 @@ 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 { +margin-left:110px; font-size:2.2em; +min-height:123px; +} +#shownotice .notice div.entry-content { +margin-left:0; } .notice p.entry-content { @@ -939,7 +959,7 @@ clear:left; float:left; font-size:0.95em; margin-left:59px; -width:65%; +width:64%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { From 171c97f17eecb3165d6ac088fece15a56f7c9914 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 28 Jan 2010 18:39:30 +0100 Subject: [PATCH 079/169] Update to aside styles in biz theme --- theme/biz/css/base.css | 2 +- theme/biz/css/display.css | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 366339db28..2c2ab33a01 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -422,7 +422,7 @@ float:left; width:29.917%; min-height:259px; float:left; -margin-left:0.385%; +margin-left:1%; } #form_notice { diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 7768d5146a..f133ac30b9 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -138,10 +138,22 @@ color:#002FA7; color:#87B4C8; } + + .notice, -.profile { -border-top-color:#CEE1E9; +.profile, +.application, +#content tbody tr { +border-top-color:#C8D1D5; } +.mark-top { +border-color:#AAAAAA; +} + +#aside_primary { +background-color:#144A6E; +} + .section .profile { border-top-color:#87B4C8; } From e5ff610e755e205f06dbe5ada20fcfac2f2bb669 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 18:11:44 +0000 Subject: [PATCH 080/169] 'Sign in with Twitter' button img --- .../Sign-in-with-Twitter-lighter.png | Bin 0 -> 2490 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png diff --git a/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png b/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png new file mode 100644 index 0000000000000000000000000000000000000000..297bb03404f2d7462ee9355aae38f5f5f3e47fbd GIT binary patch literal 2490 zcmV;r2}SmaP)dbVG7wVRUJ4ZXi@?ZDjy8FEKeU zFgbGL({lg-0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#1y$)1UwV2@^>~ zK~!jg?VEdWl+_u=f8X9WA)72QVM!vF1VSK4AZQ?nK}o}NseS3JN$f zgRQMIo!W~OJ6`ZouvAJ_K&eH%O=zU35Dd9+OGJ}EvYTu++57IdU;kJVc9XpY6B?a; zX3k{ZIp=-eC+|7m`<-)kR{+>vQ7sWi9D|5ebEgWz_KIq$s4!>9f*d_|j-lj_V|e1| zv2!Q@e7>PCTvsDT9K#C=07>!<2 zJRT3v{^4m(e0B`AMuXes=AQD^+;C$tPj22q>4H*zdfz>`#KAid3>9xAeo+*W%jE#P zv+pgwyLbU*^X6iX@D|vxdJPV{BV^y=rMIzo>FtA}CzL%H7|@3PC-uR0k{o`MEpT&+ zmiCUwd$DjaD&G5mR^R=5Ugy>A zFL6`pd;osE=`rd~)-ZEc5shchvh}x5aZ~9nJpS;;UjCggyhMFX4IM@k^;K2OnpeX9 zJ+G59W-M>Ndx+<@J`*QB2?^MN1N-(fead7?=HEi6T!B@Box5IR=L;`>Ej{PX zHuTf??pp_V_K#2V&%f=WuDXUP)2>6K(eP;bS}ruV@b7*5sr;ydIrB8I2tIsDgsYdEB~aA*X6k7? zxX|2;qp^|Gwe@`Y#d&IupCC)EqUw`l7)GU&uTKu*U$o?QG#U*z%qZYj8`hDRoCLu8 zhbzgOI5DbLyT^;&?d{E@=<{Loc(HlBWQ@7?YwIarxgyB6oH@guS9eiXI-mWozJlq( z1uEY@fC2%N(MZ*iqs%Lw&3$(-XHs%f#Ci8GF3A_N^~J`q@N(Yec4#`>p8;Rm>`^(w z^()mX);zY6A1}KTOQ(hBpZ+tI2M_vvC6EgOasg^TuSW9u`2L~=xMTvlF=IdirA&q( z01}jz+(`M#6-+Id=Jypvl2wZSngV!x>{xvBuA7QRt)c4kYU--0D3~!Fhr>aA^+`_G z)iHDWG@POs#IMsQgCL+*sYp&si#>KieJ zAZPaXZl!3>9M-SjNX7dfvh?=bdf)$&1YWO*1jqy#ZFVPakM~lt{ns24pi(Mnce*e+ zoV|U5)IWA0uWtapa=C)>xf3{EU4zZ(WX19y(%RC@hySVMd_x1@*}REPr@KGD1PCBr zszd|P3jULJU(P|*6JUEpf1ZUYMN@b5y{gO~R0`R^ zzo2^1b1iYS>vBugsL9qPM&yVTyCwWp(Uo=ev@y*W7rS{ZmOePbh#j}_&X%YtxeZa(=9L5<&(e8Bi z<5wsYm^&^0MKr*8(egMLdIIf9`S}2Jn9Y=xl~T570XoAdF4!DlHH6a}anEJ-cv*VQ z<;7KRgYq-}Q)5qi@;qcECS38JtLDV#Y+3g(n;(3LUp}&dB%O}ct5)I-xFV2%>k11g zTUf@C&yKTa*KVdw^(R50loR*{_b2SKCHeZt4jkLpj^;ZlKOe6sQZ!>aT9uM(b0*;N zdYL_=0IS=B(gj7|CTgIo3w=s5DLNgUE;lDl z=6*ck(9~r1FRqNt5);TzP2p%4ylH~wfExv!+`pk8s}?!j(i+mgrP)GJVGd2L zrifxR3OQ=I9MLCX4Ray;#3LJ#2{HtkfT^vG#S0hk#JUIhwAC2&WDQrS)2nfk*V=iQ!Y2K(sVlqHpM%x^1{ck;y4Kin5jc`W;@8<8AFx4+YWs z?QSo2A}4+Q<6F?#y0F{r Date: Thu, 28 Jan 2010 13:53:28 -0500 Subject: [PATCH 081/169] additional debugging data for Sessions --- classes/Session.php | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/classes/Session.php b/classes/Session.php index 79a69a96ea..2422f8b68e 100644 --- a/classes/Session.php +++ b/classes/Session.php @@ -64,8 +64,12 @@ class Session extends Memcached_DataObject $session = Session::staticGet('id', $id); if (empty($session)) { + self::logdeb("Couldn't find '$id'"); return ''; } else { + self::logdeb("Found '$id', returning " . + strlen($session->session_data) . + " chars of data"); return (string)$session->session_data; } } @@ -77,14 +81,24 @@ class Session extends Memcached_DataObject $session = Session::staticGet('id', $id); if (empty($session)) { + self::logdeb("'$id' doesn't yet exist; inserting."); $session = new Session(); $session->id = $id; $session->session_data = $session_data; $session->created = common_sql_now(); - return $session->insert(); + $result = $session->insert(); + + if (!$result) { + common_log_db_error($session, 'INSERT', __FILE__); + self::logdeb("Failed to insert '$id'."); + } else { + self::logdeb("Successfully inserted '$id' (result = $result)."); + } + return $result; } else { + self::logdeb("'$id' already exists; updating."); if (strcmp($session->session_data, $session_data) == 0) { self::logdeb("Not writing session '$id'; unchanged"); return true; @@ -95,7 +109,16 @@ class Session extends Memcached_DataObject $session->session_data = $session_data; - return $session->update($orig); + $result = $session->update($orig); + + if (!$result) { + common_log_db_error($session, 'UPDATE', __FILE__); + self::logdeb("Failed to update '$id'."); + } else { + self::logdeb("Successfully updated '$id' (result = $result)."); + } + + return $result; } } } @@ -106,8 +129,17 @@ class Session extends Memcached_DataObject $session = Session::staticGet('id', $id); - if (!empty($session)) { - return $session->delete(); + if (empty($session)) { + self::logdeb("Can't find '$id' to delete."); + } else { + $result = $session->delete(); + if (!$result) { + common_log_db_error($session, 'DELETE', __FILE__); + self::logdeb("Failed to delete '$id'."); + } else { + self::logdeb("Successfully deleted '$id' (result = $result)."); + } + return $result; } } @@ -132,7 +164,10 @@ class Session extends Memcached_DataObject $session->free(); + self::logdeb("Found " . count($ids) . " ids to delete."); + foreach ($ids as $id) { + self::logdeb("Destroying session '$id'."); self::destroy($id); } } From 84b5480007d30280cc9c829fe1316db0f853f64c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 12:57:52 -0500 Subject: [PATCH 082/169] update mysqltimestamps on insert and update --- classes/Memcached_DataObject.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 2cc6377f83..bc9aaf81fe 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -147,6 +147,7 @@ class Memcached_DataObject extends DB_DataObject { $result = parent::insert(); if ($result) { + $this->fixupTimestamps(); $this->encache(); // in case of cached negative lookups } return $result; @@ -159,6 +160,7 @@ class Memcached_DataObject extends DB_DataObject } $result = parent::update($orig); if ($result) { + $this->fixupTimestamps(); $this->encache(); } return $result; @@ -366,7 +368,7 @@ class Memcached_DataObject extends DB_DataObject } /** - * sends query to database - this is the private one that must work + * sends query to database - this is the private one that must work * - internal functions use this rather than $this->query() * * Overridden to do logging. @@ -529,4 +531,20 @@ class Memcached_DataObject extends DB_DataObject return $c->delete($cacheKey); } + + function fixupTimestamps() + { + // Fake up timestamp columns + $columns = $this->table(); + foreach ($columns as $name => $type) { + if ($type & DB_DATAOBJECT_MYSQLTIMESTAMP) { + $this->$name = common_sql_now(); + } + } + } + + function debugDump() + { + common_debug("debugDump: " . common_log_objstring($this)); + } } From 74a03cbe1fecda9764f826c088331cc4ffbb9433 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 14:27:35 -0500 Subject: [PATCH 083/169] always set up database_rw, regardless, so cached sessions work --- index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/index.php b/index.php index b5edc0f947..5520d690b5 100644 --- a/index.php +++ b/index.php @@ -152,6 +152,16 @@ function checkMirror($action_obj, $args) static $alwaysRW = array('session', 'remember_me'); + // We ensure that these tables always are used + // on the master DB + + $config['db']['database_rw'] = $config['db']['database']; + $config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini'; + + foreach ($alwaysRW as $table) { + $config['db']['table_'.$table] = 'rw'; + } + if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha @@ -162,16 +172,6 @@ function checkMirror($action_obj, $args) $mirror = common_config('db', 'mirror'); } - // We ensure that these tables always are used - // on the master DB - - $config['db']['database_rw'] = $config['db']['database']; - $config['db']['ini_rw'] = INSTALLDIR.'/classes/statusnet.ini'; - - foreach ($alwaysRW as $table) { - $config['db']['table_'.$table] = 'rw'; - } - // everyone else uses the mirror $config['db']['database'] = $mirror; From 513f8be07a22d722b86509e570bee46d028066f2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:26:55 -0500 Subject: [PATCH 084/169] hide most DB_DataObject errors --- classes/Memcached_DataObject.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index e615f23539..f4dfe63141 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -547,4 +547,9 @@ class Memcached_DataObject extends DB_DataObject { common_debug("debugDump: " . common_log_objstring($this)); } + + function raiseError($message, $type = null, $behaviour = null) + { + throw new ServerException("DB_DataObject error [$type]: $message"); + } } From fa7895333724e314e2b32cb89f19a41069c554be Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:35:38 -0500 Subject: [PATCH 085/169] move RW setup above user get in index.php so remember_me works --- index.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 5520d690b5..5aa40440aa 100644 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ function formatBacktraceLine($n, $line) return $out; } -function checkMirror($action_obj, $args) +function setupRW() { global $config; @@ -161,7 +161,10 @@ function checkMirror($action_obj, $args) foreach ($alwaysRW as $table) { $config['db']['table_'.$table] = 'rw'; } +} +function checkMirror($action_obj, $args) +{ if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha @@ -237,9 +240,13 @@ function main() PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); + // Make sure RW database is setup + + setupRW(); + // XXX: we need a little more structure in this script - // get and cache current user + // get and cache current user (may hit RW!) $user = common_current_user(); From be7bca2303cc9900f2c1a746a10a785d9d95783c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:50:28 -0500 Subject: [PATCH 086/169] Revert "move RW setup above user get in index.php so remember_me works" This reverts commit fa7895333724e314e2b32cb89f19a41069c554be. --- index.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 5aa40440aa..5520d690b5 100644 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ function formatBacktraceLine($n, $line) return $out; } -function setupRW() +function checkMirror($action_obj, $args) { global $config; @@ -161,10 +161,7 @@ function setupRW() foreach ($alwaysRW as $table) { $config['db']['table_'.$table] = 'rw'; } -} -function checkMirror($action_obj, $args) -{ if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha @@ -240,13 +237,9 @@ function main() PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); - // Make sure RW database is setup - - setupRW(); - // XXX: we need a little more structure in this script - // get and cache current user (may hit RW!) + // get and cache current user $user = common_current_user(); From a33194effb350a03dcdf1c0683fb15d575d245e5 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:52:05 -0500 Subject: [PATCH 087/169] Revert "Revert "move RW setup above user get in index.php so remember_me works"" This reverts commit be7bca2303cc9900f2c1a746a10a785d9d95783c. --- index.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 5520d690b5..5aa40440aa 100644 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ function formatBacktraceLine($n, $line) return $out; } -function checkMirror($action_obj, $args) +function setupRW() { global $config; @@ -161,7 +161,10 @@ function checkMirror($action_obj, $args) foreach ($alwaysRW as $table) { $config['db']['table_'.$table] = 'rw'; } +} +function checkMirror($action_obj, $args) +{ if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha @@ -237,9 +240,13 @@ function main() PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); + // Make sure RW database is setup + + setupRW(); + // XXX: we need a little more structure in this script - // get and cache current user + // get and cache current user (may hit RW!) $user = common_current_user(); From 63a0e84a8b94d84b106431b648ec76e2537ab9c6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:52:42 -0500 Subject: [PATCH 088/169] lost config in index.php made all traffic go to master --- index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.php b/index.php index 5aa40440aa..605b380bf8 100644 --- a/index.php +++ b/index.php @@ -165,6 +165,8 @@ function setupRW() function checkMirror($action_obj, $args) { + global $config; + if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha From 1001c8ffd7bc7c60bb0dd6caeef0b3dc72a74ed3 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 29 Jan 2010 00:07:54 +0100 Subject: [PATCH 089/169] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 92 ++++++++------- locale/arz/LC_MESSAGES/statusnet.po | 92 ++++++++------- locale/bg/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/ca/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/cs/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/de/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/el/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/en_GB/LC_MESSAGES/statusnet.po | 92 ++++++++------- locale/es/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/fa/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/fi/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/fr/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/ga/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/he/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/hsb/LC_MESSAGES/statusnet.po | 94 ++++++++------- locale/ia/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/is/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/it/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/ja/LC_MESSAGES/statusnet.po | 163 +++++++++++++------------- locale/ko/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/mk/LC_MESSAGES/statusnet.po | 154 ++++++++++++------------ locale/nb/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/nl/LC_MESSAGES/statusnet.po | 150 ++++++++++++------------ locale/nn/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/pl/LC_MESSAGES/statusnet.po | 148 ++++++++++++----------- locale/pt/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/pt_BR/LC_MESSAGES/statusnet.po | 92 ++++++++------- locale/ru/LC_MESSAGES/statusnet.po | 146 +++++++++++------------ locale/statusnet.po | 86 +++++++------- locale/sv/LC_MESSAGES/statusnet.po | 92 ++++++++------- locale/te/LC_MESSAGES/statusnet.po | 93 ++++++++------- locale/tr/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/uk/LC_MESSAGES/statusnet.po | 146 +++++++++++------------ locale/vi/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/zh_CN/LC_MESSAGES/statusnet.po | 90 +++++++------- locale/zh_TW/LC_MESSAGES/statusnet.po | 90 +++++++------- 36 files changed, 1837 insertions(+), 1783 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index f6aa348cc7..51e378faca 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:20+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:06+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "عطّل التسجيل الجديد." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -177,7 +177,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -349,11 +349,11 @@ msgstr "لا يمكنك عدم متابعة نفسك." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "تعذّر إيجاد المستخدم الهدف." @@ -493,11 +493,13 @@ msgid "Invalid nickname / password!" msgstr "اسم/كلمة سر غير صحيحة!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "خطأ قاعدة البيانات أثناء حذف المستخدم OAuth app" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app" #: actions/apioauthauthorize.php:231 @@ -529,13 +531,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "الحساب" @@ -730,7 +725,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "احذف" @@ -924,7 +919,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1206,8 +1201,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "ألغِ" @@ -2511,7 +2506,7 @@ msgid "Full name" msgstr "الاسم الكامل" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحة الرئيسية" @@ -3008,7 +3003,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظة بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "مكرر" @@ -3084,21 +3079,21 @@ msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق." msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "أيقونة" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "الاسم" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "المنظمة" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" @@ -3388,7 +3383,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "تكرار ل%s" @@ -4460,64 +4455,73 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "عدّل التطبيق" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "صف تطبيقك" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "مسار المصدر" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5407,15 +5411,15 @@ msgstr "في السياق" msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "الإشعار مكرر" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 9ac285b14c..1d17767a3f 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:23+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:09+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "عطّل التسجيل الجديد." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -177,7 +177,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -349,11 +349,11 @@ msgstr "لا يمكنك عدم متابعه نفسك." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "تعذّر إيجاد المستخدم الهدف." @@ -493,11 +493,13 @@ msgid "Invalid nickname / password!" msgstr "اسم/كلمه سر غير صحيحة!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "خطأ قاعده البيانات أثناء حذف المستخدم OAuth app" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app" #: actions/apioauthauthorize.php:231 @@ -529,13 +531,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "الحساب" @@ -730,7 +725,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "احذف" @@ -924,7 +919,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1206,8 +1201,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "ألغِ" @@ -2509,7 +2504,7 @@ msgid "Full name" msgstr "الاسم الكامل" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحه الرئيسية" @@ -3006,7 +3001,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصيه." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظه بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "مكرر" @@ -3082,21 +3077,21 @@ msgstr "يجب أن تكون مسجل الدخول لرؤيه تطبيق." msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "الاسم" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "المنظمة" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "الوصف" @@ -3386,7 +3381,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "تكرارات %s" @@ -4458,64 +4453,73 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "اوصف تطبيقك" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "مسار المصدر" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5395,15 +5399,15 @@ msgstr "فى السياق" msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "الإشعار مكرر" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index f7d2c9b345..339b60ee2b 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:26+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:12+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -64,7 +64,7 @@ msgstr "Изключване на новите регистрации." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Запазване" @@ -176,7 +176,7 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -355,12 +355,12 @@ msgstr "Не можете да спрете да следите себе си!" msgid "Two user ids or screen_names must be supplied." msgstr "Трябва да се дадат два идентификатора или имена на потребители." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Грешка при изтегляне на общия поток" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Целевият потребител не беше открит." @@ -504,12 +504,12 @@ msgstr "Неправилно име или парола." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Грешка в настройките на потребителя." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Грешка в базата от данни — отговор при вмъкването: %s" #: actions/apioauthauthorize.php:231 @@ -541,13 +541,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "Сметка" @@ -745,7 +738,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Изтриване" @@ -942,7 +935,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1244,8 +1237,8 @@ msgstr "" "спам) за съобщение с указания." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Отказ" @@ -2638,7 +2631,7 @@ msgid "Full name" msgstr "Пълно име" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Лична страница" @@ -3161,7 +3154,7 @@ msgstr "Не можете да повтаряте собствена бележ msgid "You already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Повторено" @@ -3241,23 +3234,23 @@ msgstr "За напуснете група, трябва да сте влезл msgid "Application profile" msgstr "Бележката няма профил" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Псевдоним" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Страниране" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" @@ -3544,7 +3537,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Отговори на %s" @@ -4675,68 +4668,77 @@ msgstr "Настройка на оформлението" msgid "Paths configuration" msgstr "Настройка на пътищата" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Опишете групата или темата в до %d букви" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Опишете групата или темата" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Изходен код" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "Адрес на страница, блог или профил в друг сайт на групата" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Адрес на страница, блог или профил в друг сайт на групата" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5632,15 +5634,15 @@ msgstr "в контекст" msgid "Repeated by" msgstr "Повторено от" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Отговор" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Бележката е повторена." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 2ae0c33117..64ec6a9a13 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:29+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:15+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -66,7 +66,7 @@ msgstr "Inhabilita els nous registres." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -180,7 +180,7 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -365,11 +365,11 @@ msgstr "No podeu suprimir els usuaris." msgid "Two user ids or screen_names must be supplied." msgstr "Dos ids d'usuari o screen_names has de ser substituïts." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "No s'ha pogut determinar l'usuari d'origen." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "No es pot trobar cap estatus." @@ -516,12 +516,12 @@ msgstr "Nom d'usuari o contrasenya invàlids." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Error en configurar l'usuari." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Hashtag de l'error de la base de dades:%s" #: actions/apioauthauthorize.php:231 @@ -553,13 +553,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -759,7 +752,7 @@ msgid "Preview" msgstr "Vista prèvia" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Suprimeix" @@ -961,7 +954,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?" msgid "Do not delete this notice" msgstr "No es pot esborrar la notificació." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1258,8 +1251,8 @@ msgstr "" "carpeta de spam!) per al missatge amb les instruccions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancel·la" @@ -2663,7 +2656,7 @@ msgid "Full name" msgstr "Nom complet" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pàgina personal" @@ -3203,7 +3196,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència." msgid "You already repeated that notice." msgstr "Ja heu blocat l'usuari." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Repetit" @@ -3285,22 +3278,22 @@ msgstr "Has d'haver entrat per a poder marxar d'un grup." msgid "Application profile" msgstr "Avís sense perfil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nom" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Paginació" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Descripció" @@ -3594,7 +3587,7 @@ msgstr "" "**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://" "ca.wikipedia.org/wiki/Microblogging) " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Repetició de %s" @@ -4723,68 +4716,77 @@ msgstr "Configuració del disseny" msgid "Paths configuration" msgstr "Configuració dels camins" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Descriu el grup amb 140 caràcters" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Descriu el grup amb 140 caràcters" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Font" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL del teu web, blog del grup u tema" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL del teu web, blog del grup u tema" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5680,15 +5682,15 @@ msgstr "en context" msgid "Repeated by" msgstr "Repetit per" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Respon" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Notificació publicada" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 9059001d72..b1113fc304 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:33+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:18+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -67,7 +67,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Uložit" @@ -181,7 +181,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -361,12 +361,12 @@ msgstr "Nelze aktualizovat uživatele" msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Nelze aktualizovat uživatele" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Nelze aktualizovat uživatele" @@ -512,12 +512,12 @@ msgstr "Neplatné jméno nebo heslo" #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Chyba nastavení uživatele" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Chyba v DB při vkládání odpovědi: %s" #: actions/apioauthauthorize.php:231 @@ -549,13 +549,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -759,7 +752,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Odstranit" @@ -962,7 +955,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1262,8 +1255,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Zrušit" @@ -2641,7 +2634,7 @@ msgid "Full name" msgstr "Celé jméno" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Moje stránky" @@ -3153,7 +3146,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." msgid "You already repeated that notice." msgstr "Již jste přihlášen" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -3234,23 +3227,23 @@ msgstr "" msgid "Application profile" msgstr "Sdělení nemá profil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Přezdívka" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Umístění" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Odběry" @@ -3541,7 +3534,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Odpovědi na %s" @@ -4677,68 +4670,77 @@ msgstr "Potvrzení emailové adresy" msgid "Paths configuration" msgstr "Potvrzení emailové adresy" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Zdroj" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5646,16 +5648,16 @@ msgstr "Žádný obsah!" msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "odpověď" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Sdělení" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index e000f3406f..0b8e9d2cce 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:36+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:21+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -71,7 +71,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Speichern" @@ -193,7 +193,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -368,11 +368,11 @@ msgstr "Du kannst dich nicht selbst entfolgen!" msgid "Two user ids or screen_names must be supplied." msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Konnte öffentlichen Stream nicht abrufen." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Konnte keine Statusmeldungen finden." @@ -517,12 +517,12 @@ msgstr "Benutzername oder Passwort falsch." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Fehler bei den Nutzereinstellungen." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" #: actions/apioauthauthorize.php:231 @@ -554,13 +554,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -760,7 +753,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Löschen" @@ -958,7 +951,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" msgid "Do not delete this notice" msgstr "Diese Nachricht nicht löschen" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1257,8 +1250,8 @@ msgstr "" "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Abbrechen" @@ -2663,7 +2656,7 @@ msgid "Full name" msgstr "Vollständiger Name" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" @@ -3199,7 +3192,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du hast diesen Benutzer bereits blockiert." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Erstellt" @@ -3286,23 +3279,23 @@ msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." msgid "Application profile" msgstr "Nachricht hat kein Profil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Nutzername" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Seitenerstellung" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Beschreibung" @@ -3601,7 +3594,7 @@ msgstr "" "(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der Freien " "Software [StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Antworten an %s" @@ -4747,68 +4740,77 @@ msgstr "SMS-Konfiguration" msgid "Paths configuration" msgstr "SMS-Konfiguration" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Quellcode" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5762,15 +5764,15 @@ msgstr "im Zusammenhang" msgid "Repeated by" msgstr "Erstellt" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Antworten" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Nachricht gelöscht." diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 23034c0a8c..7f8f709502 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:39+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:24+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -64,7 +64,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -176,7 +176,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -355,12 +355,12 @@ msgstr "Δεν μπορείτε να εμποδίσετε τον εαυτό σα msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Απέτυχε η ενημέρωση του χρήστη." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασης." @@ -502,12 +502,12 @@ msgstr "" #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" #: actions/apioauthauthorize.php:231 @@ -539,13 +539,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "Λογαριασμός" @@ -742,7 +735,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Διαγραφή" @@ -943,7 +936,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1242,8 +1235,8 @@ msgstr "" "φάκελο spam!) για μήνυμα με περαιτέρω οδηγίες. " #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Ακύρωση" @@ -2589,7 +2582,7 @@ msgid "Full name" msgstr "Ονοματεπώνυμο" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Αρχική σελίδα" @@ -3113,7 +3106,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -3191,23 +3184,23 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Ψευδώνυμο" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Προσκλήσεις" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Περιγραφή" @@ -3495,7 +3488,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "" @@ -4591,65 +4584,74 @@ msgstr "Επιβεβαίωση διεύθυνσης email" msgid "Paths configuration" msgstr "Επιβεβαίωση διεύθυνσης email" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Περιγράψτε την ομάδα ή το θέμα μέχρι %d χαρακτήρες" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Περιγράψτε την ομάδα ή το θέμα" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5530,15 +5532,15 @@ msgstr "" msgid "Repeated by" msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Ρυθμίσεις OpenID" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 4c5e4efdf8..82d23affb8 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:42+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:26+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Save" @@ -184,7 +184,7 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,11 +362,11 @@ msgstr "You cannot unfollow yourself." msgid "Two user ids or screen_names must be supplied." msgstr "Two user ids or screen_names must be supplied." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Could not determine source user." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Could not find target user." @@ -506,11 +506,13 @@ msgid "Invalid nickname / password!" msgstr "Invalid nickname / password!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "DB error deleting OAuth app user." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "DB error inserting OAuth app user." #: actions/apioauthauthorize.php:231 @@ -544,13 +546,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -745,7 +740,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Delete" @@ -944,7 +939,7 @@ msgstr "Are you sure you want to delete this notice?" msgid "Do not delete this notice" msgstr "Do not delete this notice" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Delete this notice" @@ -1245,8 +1240,8 @@ msgstr "" "a message with further instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancel" @@ -2659,7 +2654,7 @@ msgid "Full name" msgstr "Full name" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" @@ -3195,7 +3190,7 @@ msgstr "You can't repeat your own notice." msgid "You already repeated that notice." msgstr "You have already blocked this user." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Created" @@ -3278,23 +3273,23 @@ msgstr "You must be logged in to leave a group." msgid "Application profile" msgstr "Notice has no profile" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Nickname" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Pagination" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Description" @@ -3589,7 +3584,7 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Replies to %s" @@ -4724,68 +4719,77 @@ msgstr "Design configuration" msgid "Paths configuration" msgstr "SMS confirmation" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Describe the group or topic in %d characters" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Describe the group or topic" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Source" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL of the homepage or blog of the group or topic" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL of the homepage or blog of the group or topic" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5689,15 +5693,15 @@ msgstr "in context" msgid "Repeated by" msgstr "Created" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Reply" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Notice deleted." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 22d6ccf9d7..1120aae41c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:44+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:29+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -71,7 +71,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -183,7 +183,7 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,11 +362,11 @@ msgstr "No puedes dejar de seguirte a ti mismo." msgid "Two user ids or screen_names must be supplied." msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "No se pudo determinar el usuario fuente." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "No se pudo encontrar ningún usuario de destino." @@ -512,12 +512,12 @@ msgstr "Usuario o contraseña inválidos." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Error al configurar el usuario." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Error de la BD al insertar la etiqueta clave: %s" #: actions/apioauthauthorize.php:231 @@ -549,13 +549,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -755,7 +748,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Borrar" @@ -958,7 +951,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?" msgid "Do not delete this notice" msgstr "No se puede eliminar este aviso." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1262,8 +1255,8 @@ msgstr "" "la de spam!) por un mensaje con las instrucciones." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancelar" @@ -2691,7 +2684,7 @@ msgid "Full name" msgstr "Nombre completo" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página de inicio" @@ -3234,7 +3227,7 @@ msgstr "No puedes registrarte si no estás de acuerdo con la licencia." msgid "You already repeated that notice." msgstr "Ya has bloqueado este usuario." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3316,23 +3309,23 @@ msgstr "Debes estar conectado para dejar un grupo." msgid "Application profile" msgstr "Aviso sin perfil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Apodo" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Paginación" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Descripción" @@ -3627,7 +3620,7 @@ msgstr "" "**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging) " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Respuestas a %s" @@ -4777,68 +4770,77 @@ msgstr "SMS confirmación" msgid "Paths configuration" msgstr "SMS confirmación" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Describir al grupo o tema en %d caracteres" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Describir al grupo o tema" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Fuente" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "El URL de página de inicio o blog del grupo or tema" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "El URL de página de inicio o blog del grupo or tema" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5741,15 +5743,15 @@ msgstr "en contexto" msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Aviso borrado" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 9526d702f7..8a87af1ada 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-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:50+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:35+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 @@ -67,7 +67,7 @@ msgstr "غیر فعال کردن نام نوبسی جدید" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "ذخیره‌کردن" @@ -185,7 +185,7 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -361,11 +361,11 @@ msgstr "نمی‌توانید خودتان را دنبال نکنید!" msgid "Two user ids or screen_names must be supplied." msgstr "باید ۲ شناسه‌ی کاربر یا نام ظاهری وارد کنید." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "نمی‌توان کاربر منبع را تعیین کرد." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "نمی‌توان کاربر هدف را پیدا کرد." @@ -506,11 +506,11 @@ msgid "Invalid nickname / password!" msgstr "نام کاربری یا کلمه ی عبور نا معتبر." #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:231 @@ -542,13 +542,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "حساب کاربری" @@ -746,7 +739,7 @@ msgid "Preview" msgstr "پیش‌نمایش" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "حذف" @@ -947,7 +940,7 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا msgid "Do not delete this notice" msgstr "این پیام را پاک نکن" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "این پیام را پاک کن" @@ -1243,8 +1236,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "انصراف" @@ -2608,7 +2601,7 @@ msgid "Full name" msgstr "نام‌کامل" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "صفحهٔ خانگی" @@ -3107,7 +3100,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی msgid "You already repeated that notice." msgstr "شما قبلا آن آگهی را تکرار کردید." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "" @@ -3187,23 +3180,23 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی msgid "Application profile" msgstr "ابن خبر ذخیره ای ندارد ." -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "نام کاربری" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "صفحه بندى" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "" @@ -3494,7 +3487,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "" @@ -4577,65 +4570,74 @@ msgstr "پیکره بندی اصلی سایت" msgid "Paths configuration" msgstr "" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "منبع" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5519,15 +5521,15 @@ msgstr "در زمینه" msgid "Repeated by" msgstr "تکرار از" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "به این آگهی جواب دهید" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "جواب دادن" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "آگهی تکرار شد" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 750e41b08c..585165a013 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:47+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:32+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -69,7 +69,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Tallenna" @@ -187,7 +187,7 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -369,12 +369,12 @@ msgstr "Et voi lopettaa itsesi tilausta!" msgid "Two user ids or screen_names must be supplied." msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Julkista päivitysvirtaa ei saatu." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Ei löytynyt yhtään päivitystä." @@ -521,12 +521,12 @@ msgstr "Käyttäjätunnus tai salasana ei kelpaa." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Virhe tapahtui käyttäjän asettamisessa." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" #: actions/apioauthauthorize.php:231 @@ -558,13 +558,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -764,7 +757,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Poista" @@ -963,7 +956,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?" msgid "Do not delete this notice" msgstr "Älä poista tätä päivitystä" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1270,8 +1263,8 @@ msgstr "" "lisäohjeita. " #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Peruuta" @@ -2689,7 +2682,7 @@ msgid "Full name" msgstr "Koko nimi" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Kotisivu" @@ -3229,7 +3222,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." msgid "You already repeated that notice." msgstr "Sinä olet jo estänyt tämän käyttäjän." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -3315,23 +3308,23 @@ msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." msgid "Application profile" msgstr "Päivitykselle ei ole profiilia" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Tunnus" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Sivutus" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Kuvaus" @@ -3625,7 +3618,7 @@ msgstr "" "Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on " "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Vastaukset käyttäjälle %s" @@ -4769,68 +4762,77 @@ msgstr "SMS vahvistus" msgid "Paths configuration" msgstr "SMS vahvistus" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Lähdekoodi" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5744,15 +5746,15 @@ msgstr "Ei sisältöä!" msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Vastaus" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Päivitys on poistettu." diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 06580cd654..299ff63c1b 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:53+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:38+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -69,7 +69,7 @@ msgstr "Désactiver les nouvelles inscriptions." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Enregistrer" @@ -190,7 +190,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -368,11 +368,11 @@ msgstr "Vous ne pouvez pas ne plus vous suivre vous-même." msgid "Two user ids or screen_names must be supplied." msgstr "Vous devez fournir 2 identifiants ou pseudos." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Impossible de déterminer l’utilisateur source." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Impossible de trouver l’utilisateur cible." @@ -518,12 +518,12 @@ msgstr "Identifiant ou mot de passe incorrect." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Erreur lors de la configuration de l’utilisateur." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" #: actions/apioauthauthorize.php:231 @@ -558,13 +558,6 @@ msgstr "" 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:441 msgid "Account" msgstr "Compte" @@ -763,7 +756,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Supprimer" @@ -963,7 +956,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet avis ?" msgid "Do not delete this notice" msgstr "Ne pas supprimer cet avis" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1261,8 +1254,8 @@ msgstr "" "réception (et celle de spam !) pour recevoir de nouvelles instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Annuler" @@ -2682,7 +2675,7 @@ msgid "Full name" msgstr "Nom complet" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site personnel" @@ -3228,7 +3221,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis." msgid "You already repeated that notice." msgstr "Vous avez déjà repris cet avis." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Repris" @@ -3315,22 +3308,22 @@ msgstr "Vous devez ouvrir une session pour quitter un groupe." msgid "Application profile" msgstr "L’avis n’a pas de profil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nom" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Pagination" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Description" @@ -3650,7 +3643,7 @@ msgstr "" "wikipedia.org/wiki/Microblog) basé sur le logiciel libre [StatusNet](http://" "status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Reprises de %s" @@ -4786,68 +4779,77 @@ msgstr "Configuration de la conception" msgid "Paths configuration" msgstr "Configuration des chemins" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Modifier votre application" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Description du groupe ou du sujet en %d caractères" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Description du groupe ou du sujet" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Source" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL du site Web ou blogue du groupe ou sujet " -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL du site Web ou blogue du groupe ou sujet " -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL vers laquelle rediriger après l'authentification" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Lecture seule" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Accès par défaut pour cette application : en lecture seule ou en lecture-" @@ -5863,15 +5865,15 @@ msgstr "dans le contexte" msgid "Repeated by" msgstr "Repris par" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Répondre" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Avis repris" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 611c3f3790..0d9aa81f5c 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:56+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:41+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -68,7 +68,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Gardar" @@ -182,7 +182,7 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -368,12 +368,12 @@ msgstr "" "Dous identificadores de usuario ou nomes_en_pantalla deben ser " "proporcionados." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Non se pudo recuperar a liña de tempo publica." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Non se puido atopar ningún estado" @@ -517,12 +517,12 @@ msgstr "Usuario ou contrasinal inválidos." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Acounteceu un erro configurando o usuario." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Erro ó inserir o hashtag na BD: %s" #: actions/apioauthauthorize.php:231 @@ -554,13 +554,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -764,7 +757,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -976,7 +969,7 @@ msgstr "Estas seguro que queres eliminar este chío?" msgid "Do not delete this notice" msgstr "Non se pode eliminar este chíos." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -1294,8 +1287,8 @@ msgstr "" "a %s á túa lista de contactos?)" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancelar" @@ -2721,7 +2714,7 @@ msgid "Full name" msgstr "Nome completo" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Páxina persoal" @@ -3270,7 +3263,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza." msgid "You already repeated that notice." msgstr "Xa bloqueaches a este usuario." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3352,23 +3345,23 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" msgid "Application profile" msgstr "O chío non ten perfil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Alcume" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Invitación(s) enviada(s)." #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Subscricións" @@ -3678,7 +3671,7 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Replies to %s" @@ -4841,68 +4834,77 @@ msgstr "Confirmación de SMS" msgid "Paths configuration" msgstr "Confirmación de SMS" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Fonte" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5909,17 +5911,17 @@ msgstr "Sen contido!" msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "contestar" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Chío publicado" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index ef9db6e297..300d382c6c 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:58:59+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:43+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "שמור" @@ -179,7 +179,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -359,12 +359,12 @@ msgstr "עידכון המשתמש נכשל." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "עידכון המשתמש נכשל." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "עידכון המשתמש נכשל." @@ -510,12 +510,12 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים" #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "שגיאה ביצירת שם המשתמש." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" #: actions/apioauthauthorize.php:231 @@ -547,13 +547,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -756,7 +749,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 #, fuzzy msgid "Delete" msgstr "מחק" @@ -962,7 +955,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1269,8 +1262,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "בטל" @@ -2648,7 +2641,7 @@ msgid "Full name" msgstr "שם מלא" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "אתר בית" @@ -3156,7 +3149,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "צור" @@ -3237,23 +3230,23 @@ msgstr "" msgid "Application profile" msgstr "להודעה אין פרופיל" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "כינוי" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "מיקום" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "הרשמות" @@ -3545,7 +3538,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "תגובת עבור %s" @@ -4677,68 +4670,77 @@ msgstr "הרשמות" msgid "Paths configuration" msgstr "הרשמות" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "מקור" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5645,16 +5647,16 @@ msgstr "אין תוכן!" msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "הגב" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "הודעות" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index f942d8b639..91763d5e1e 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:02+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "Nowe registrowanja znjemóžnić." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Składować" @@ -177,7 +177,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -349,11 +349,11 @@ msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "" @@ -493,11 +493,13 @@ msgid "Invalid nickname / password!" msgstr "Njepłaćiwe přimjeno abo hesło!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." -msgstr "" +#, fuzzy +msgid "Database error deleting OAuth application user." +msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." #: actions/apioauthauthorize.php:231 @@ -529,13 +531,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -731,7 +726,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Zničić" @@ -925,7 +920,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" msgid "Do not delete this notice" msgstr "Tutu zdźělenku njewušmórnyć" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1208,8 +1203,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Přetorhnyć" @@ -2515,7 +2510,7 @@ msgid "Full name" msgstr "Dospołne mjeno" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Startowa strona" @@ -3007,7 +3002,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować." msgid "You already repeated that notice." msgstr "Sy tutu zdźělenku hižo wospjetował." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Wospjetowany" @@ -3083,21 +3078,21 @@ msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał." msgid "Application profile" msgstr "Aplikaciski profil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Mjeno" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Organizacija" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Wopisanje" @@ -3383,7 +3378,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "" @@ -4449,64 +4444,73 @@ msgstr "SMS-wobkrućenje" msgid "Paths configuration" msgstr "" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Wopisaj swoju aplikaciju z %d znamješkami" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Wopisaj swoju aplikaciju" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "URL žórła" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5377,15 +5381,15 @@ msgstr "" msgid "Repeated by" msgstr "Wospjetowany wot" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Wotmołwić" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Zdźělenka wospjetowana" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 9dee941474..9e3e0f7dbb 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:06+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:49+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -63,7 +63,7 @@ msgstr "Disactivar le creation de nove contos." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salveguardar" @@ -183,7 +183,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,11 +362,11 @@ msgstr "Tu non pote cessar de sequer te mesme!" msgid "Two user ids or screen_names must be supplied." msgstr "Duo IDs de usator o pseudonymos debe esser fornite." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Non poteva determinar le usator de origine." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Non poteva trovar le usator de destination." @@ -508,12 +508,12 @@ msgstr "Nomine de usator o contrasigno invalide." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Error durante le configuration del usator." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Error durante le configuration del usator." #: actions/apioauthauthorize.php:231 @@ -545,13 +545,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "" @@ -751,7 +744,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Deler" @@ -951,7 +944,7 @@ msgstr "Es tu secur de voler deler iste nota?" msgid "Do not delete this notice" msgstr "Non deler iste nota" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Deler iste nota" @@ -1250,8 +1243,8 @@ msgstr "" "spam!) pro un message con ulterior instructiones." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancellar" @@ -2663,7 +2656,7 @@ msgid "Full name" msgstr "Nomine complete" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina personal" @@ -3202,7 +3195,7 @@ msgstr "Tu non pote repeter tu proprie nota." msgid "You already repeated that notice." msgstr "Tu ha ja repetite iste nota." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Repetite" @@ -3286,22 +3279,22 @@ msgstr "Tu debe aperir un session pro quitar un gruppo." msgid "Application profile" msgstr "Le nota ha nulle profilo" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Pseudonymo" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "" @@ -3616,7 +3609,7 @@ msgstr "" "(http://en.wikipedia.org/wiki/Microblog) a base del software libere " "[StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Repetition de %s" @@ -4702,65 +4695,74 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Describe te e tu interesses in %d characteres" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "URL pro reporto" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5634,15 +5636,15 @@ msgstr "" msgid "Repeated by" msgstr "Repetite per" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Nota delite." diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 3db7dbdf07..959d4ed1de 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-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:09+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:52+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -68,7 +68,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Vista" @@ -181,7 +181,7 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -363,11 +363,11 @@ msgstr "Gat ekki uppfært notanda." msgid "Two user ids or screen_names must be supplied." msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "" @@ -512,12 +512,12 @@ msgstr "Ótækt notendanafn eða lykilorð." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Villa kom upp í stillingu notanda." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" #: actions/apioauthauthorize.php:231 @@ -549,13 +549,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -754,7 +747,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Eyða" @@ -954,7 +947,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1260,8 +1253,8 @@ msgstr "" "ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Hætta við" @@ -2668,7 +2661,7 @@ msgid "Full name" msgstr "Fullt nafn" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimasíða" @@ -3202,7 +3195,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." msgid "You already repeated that notice." msgstr "Þú hefur nú þegar lokað á þennan notanda." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -3282,23 +3275,23 @@ msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." msgid "Application profile" msgstr "Babl hefur enga persónulega síðu" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Stuttnefni" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Uppröðun" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Lýsing" @@ -3585,7 +3578,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Svör við %s" @@ -4720,68 +4713,77 @@ msgstr "SMS staðfesting" msgid "Paths configuration" msgstr "SMS staðfesting" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Frumþula" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5680,15 +5682,15 @@ msgstr "" msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Babl sent inn" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index d43f708140..fa3e40cb27 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:12+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:54+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -66,7 +66,7 @@ msgstr "Disabilita la creazione di nuovi account" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salva" @@ -187,7 +187,7 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -363,11 +363,11 @@ msgstr "Non puoi non seguirti." msgid "Two user ids or screen_names must be supplied." msgstr "Devono essere forniti due ID utente o nominativi." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Impossibile determinare l'utente sorgente." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Impossibile trovare l'utente destinazione." @@ -512,12 +512,12 @@ msgstr "Nome utente o password non valido." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Errore nell'impostare l'utente." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Errore del DB nell'inserire un hashtag: %s" #: actions/apioauthauthorize.php:231 @@ -549,13 +549,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -754,7 +747,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Elimina" @@ -954,7 +947,7 @@ msgstr "Vuoi eliminare questo messaggio?" msgid "Do not delete this notice" msgstr "Non eliminare il messaggio" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -1254,8 +1247,8 @@ msgstr "" "istruzioni." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Annulla" @@ -2664,7 +2657,7 @@ msgid "Full name" msgstr "Nome" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina web" @@ -3202,7 +3195,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi." msgid "You already repeated that notice." msgstr "Hai già ripetuto quel messaggio." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Ripetuti" @@ -3286,22 +3279,22 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo." msgid "Application profile" msgstr "Il messaggio non ha un profilo" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Paginazione" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Descrizione" @@ -3616,7 +3609,7 @@ msgstr "" "it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]" "(http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Ripetizione di %s" @@ -4748,68 +4741,77 @@ msgstr "Configurazione aspetto" msgid "Paths configuration" msgstr "Configurazione percorsi" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Descrivi il gruppo o l'argomento in %d caratteri" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Descrivi il gruppo o l'argomento" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Sorgenti" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL della pagina web, blog del gruppo o l'argomento" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL della pagina web, blog del gruppo o l'argomento" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5816,15 +5818,15 @@ msgstr "nel contesto" msgid "Repeated by" msgstr "Ripetuto da" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Rispondi" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Messaggio ripetuto" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index ba3d7ecaea..4ccde02a10 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:15+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:04:57+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -27,12 +27,10 @@ msgid "Access" msgstr "アクセス" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "サイト設定の保存" +msgstr "サイトアクセス設定" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" msgstr "登録" @@ -66,15 +64,14 @@ msgstr "新規登録を無効。" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "保存" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "サイト設定の保存" +msgstr "アクセス設定の保存" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -184,7 +181,7 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -361,11 +358,11 @@ msgstr "自分自身をフォロー停止することはできません。" msgid "Two user ids or screen_names must be supplied." msgstr "ふたつのＩＤかスクリーンネームが必要です。" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "ソースユーザーを決定できません。" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "ターゲットユーザーを見つけられません。" @@ -507,11 +504,13 @@ msgid "Invalid nickname / password!" msgstr "不正なユーザ名またはパスワード。" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "OAuth アプリユーザの削除時ＤＢエラー。" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "OAuth アプリユーザの追加時ＤＢエラー。" #: actions/apioauthauthorize.php:231 @@ -545,13 +544,6 @@ msgstr "アプリケーションはあなたのアカウントに接続したい msgid "Allow or deny access" msgstr "アクセスを許可または拒絶" -#: 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 "アカウント" @@ -746,7 +738,7 @@ msgid "Preview" msgstr "プレビュー" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "削除" @@ -946,7 +938,7 @@ msgstr "本当にこのつぶやきを削除しますか？" msgid "Do not delete this notice" msgstr "このつぶやきを削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "このつぶやきを削除" @@ -1091,12 +1083,11 @@ msgid "Add to favorites" msgstr "お気に入りに加える" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "そのようなドキュメントはありません。" +msgstr "そのようなドキュメントはありません。\"%s\"" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "アプリケーション編集" @@ -1234,8 +1225,8 @@ msgstr "" "かれたメッセージが届いていないか確認してください。" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "中止" @@ -1835,9 +1826,9 @@ msgid "That is not your Jabber ID." msgstr "その Jabber ID はあなたのものではありません。" #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "%s の受信箱" +msgstr "%1$s の受信箱 - ページ %2$d" #: actions/inbox.php:62 #, php-format @@ -2083,7 +2074,6 @@ msgid "No current status" msgstr "現在のステータスはありません" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "新しいアプリケーション" @@ -2342,9 +2332,9 @@ msgid "Login token expired." msgstr "ログイントークンが期限切れです・" #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "%s の送信箱" +msgstr "%1$s の送信箱 - ページ %2$d" #: actions/outbox.php:61 #, php-format @@ -2630,7 +2620,7 @@ msgid "Full name" msgstr "フルネーム" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "ホームページ" @@ -3166,7 +3156,7 @@ msgstr "自分のつぶやきは繰り返せません。" msgid "You already repeated that notice." msgstr "すでにそのつぶやきを繰り返しています。" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "繰り返された" @@ -3181,9 +3171,9 @@ msgid "Replies to %s" msgstr "%s への返信" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "%2$s 上の %1$s への返信!" +msgstr "%1$s への返信、ページ %2$s" #: actions/replies.php:144 #, php-format @@ -3248,21 +3238,21 @@ msgstr "!!アプリケーションを見るためにはログインしていな msgid "Application profile" msgstr "アプリケーションプロファイル" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "アイコン" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "名前" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "組織" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "概要" @@ -3317,9 +3307,9 @@ msgstr "" "ポートしません。" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%s のお気に入りのつぶやき" +msgstr "%1$s のお気に入りのつぶやき、ページ %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3379,9 +3369,9 @@ msgid "%s group" msgstr "%s グループ" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s グループメンバー、ページ %2$d" +msgstr "%1$s グループ、ページ %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3503,9 +3493,9 @@ msgid " tagged %s" msgstr "タグ付けされた %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s と友人、ページ %2$d" +msgstr "%1$s、ページ %2$d" #: actions/showstream.php:122 #, php-format @@ -3579,7 +3569,7 @@ msgstr "" "[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http://en." "wikipedia.org/wiki/Micro-blogging) サービス。" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "%s の繰り返し" @@ -3948,9 +3938,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "ユーザ自身がつけたタグ %1$s - ページ %2$d" +msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d" #: actions/tag.php:86 #, php-format @@ -4252,9 +4242,9 @@ msgid "Enjoy your hotdog!" msgstr "あなたのhotdogを楽しんでください!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s グループメンバー、ページ %2$d" +msgstr "%1$s グループ、ページ %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4414,9 +4404,8 @@ msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "つぶやきを保存する際に問題が発生しました。" +msgstr "グループ受信箱を保存する際に問題が発生しました。" #: classes/Notice.php:850 #, php-format @@ -4687,80 +4676,84 @@ msgid "Design configuration" msgstr "デザイン設定" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "パス設定" +msgstr "利用者設定" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "デザイン設定" +msgstr "アクセス設定" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "パス設定" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "アプリケーション編集" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "このアプリケーションのアイコン" -#: lib/applicationeditform.php:206 -#, fuzzy, php-format +#: lib/applicationeditform.php:204 +#, php-format msgid "Describe your application in %d characters" -msgstr "グループやトピックを %d 字以内記述" +msgstr "あなたのアプリケーションを %d 字以内記述" -#: lib/applicationeditform.php:209 -#, fuzzy +#: lib/applicationeditform.php:207 msgid "Describe your application" -msgstr "グループやトピックを記述" +msgstr "あなたのアプリケーションを記述" + +#: lib/applicationeditform.php:216 +msgid "Source URL" +msgstr "ソース URL" #: lib/applicationeditform.php:218 -#, fuzzy -msgid "Source URL" -msgstr "ソース" - -#: lib/applicationeditform.php:220 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "グループやトピックのホームページやブログの URL" +msgstr "このアプリケーションのホームページの URL" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "このアプリケーションに責任がある組織" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "組織のホームページのURL" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "認証の後にリダイレクトするURL" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "ブラウザ" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "デスクトップ" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "リードオンリー" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "リードライト" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード" @@ -5688,6 +5681,8 @@ msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一" +"度試みてください" #: lib/noticelist.php:428 #, php-format @@ -5726,15 +5721,15 @@ msgstr "" msgid "Repeated by" msgstr "" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "このつぶやきへ返信" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "返信" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "つぶやきを繰り返しました" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index bd2600be2c..10febefa16 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:18+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:00+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -66,7 +66,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "저장" @@ -180,7 +180,7 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,12 +362,12 @@ msgstr "사용자를 업데이트 할 수 없습니다." msgid "Two user ids or screen_names must be supplied." msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "공개 stream을 불러올 수 없습니다." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "어떠한 상태도 찾을 수 없습니다." @@ -515,12 +515,12 @@ msgstr "사용자 이름이나 비밀 번호가 틀렸습니다." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "사용자 세팅 오류" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" #: actions/apioauthauthorize.php:231 @@ -552,13 +552,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "계정" @@ -759,7 +752,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "삭제" @@ -964,7 +957,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1275,8 +1268,8 @@ msgstr "" "주시기 바랍니다." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "취소" @@ -2686,7 +2679,7 @@ msgid "Full name" msgstr "실명" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "홈페이지" @@ -3216,7 +3209,7 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "생성" @@ -3298,23 +3291,23 @@ msgstr "그룹을 떠나기 위해서는 로그인해야 합니다." msgid "Application profile" msgstr "통지에 프로필이 없습니다." -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "별명" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "페이지수" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "설명" @@ -3607,7 +3600,7 @@ msgstr "" "**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/" "Micro-blogging) 서비스에 계정을 갖고 있습니다." -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "%s에 답신" @@ -4746,68 +4739,77 @@ msgstr "SMS 인증" msgid "Paths configuration" msgstr "SMS 인증" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "140글자로 그룹이나 토픽 설명하기" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "140글자로 그룹이나 토픽 설명하기" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "소스 코드" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5704,15 +5706,15 @@ msgstr "내용이 없습니다!" msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "답장하기" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "게시글이 등록되었습니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 441ccdb8bc..e0b3f2b2be 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:21+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:04+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -25,14 +25,12 @@ msgid "Access" msgstr "Пристап" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Зачувај нагодувања на веб-страницата" +msgstr "Нагодувања за пристап на веб-страницата" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Регистрирај се" +msgstr "Регистрација" #: actions/accessadminpanel.php:161 msgid "Private" @@ -66,15 +64,14 @@ msgstr "Оневозможи нови регистрации." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Зачувај" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "Зачувај нагодувања на веб-страницата" +msgstr "Зачувај нагодувања на пристап" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -187,7 +184,7 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -366,11 +363,11 @@ msgid "Two user ids or screen_names must be supplied." msgstr "" "Мора да бидат наведени два кориснички идентификатора (ID) или две имиња." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Не можев да го утврдам целниот корисник." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Не можев да го пронајдам целниот корисник." @@ -510,11 +507,13 @@ msgid "Invalid nickname / password!" msgstr "Погрешен прекар / лозинка!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "Грешка при бришењето на корисникот на OAuth-програмот." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "" "Грешка во базата на податоци при вметнувањето на корисникот на OAuth-" "програмот." @@ -548,13 +547,6 @@ msgstr "Има програм кој сака да се поврзе со Ваш msgid "Allow or deny access" msgstr "Дозволи или одбиј пристап" -#: 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 "Сметка" @@ -753,7 +745,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Бриши" @@ -953,7 +945,7 @@ msgstr "Дали сте сигурни дека сакате да ја избр msgid "Do not delete this notice" msgstr "Не ја бриши оваа забелешка" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" @@ -1098,12 +1090,11 @@ msgid "Add to favorites" msgstr "Додај во омилени" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Нема таков документ." +msgstr "Нема документ со наслов „%s“" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Уреди програм" @@ -1241,8 +1232,8 @@ msgstr "" "сандачето за спам!). Во писмото ќе следат понатамошни напатствија." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Откажи" @@ -1845,9 +1836,9 @@ msgid "That is not your Jabber ID." msgstr "Ова не е Вашиот Jabber ID." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Приемно сандаче за %s" +msgstr "Приемно сандаче за %1$s - стр. %2$d" #: actions/inbox.php:62 #, php-format @@ -2096,7 +2087,6 @@ msgid "No current status" msgstr "Нема тековен статус" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Нов програм" @@ -2357,9 +2347,9 @@ msgid "Login token expired." msgstr "Најавниот жетон е истечен." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Излезно сандаче за %s" +msgstr "Излезно сандаче за %1$s - стр. %2$d" #: actions/outbox.php:61 #, php-format @@ -2647,7 +2637,7 @@ msgid "Full name" msgstr "Цело име" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Домашна страница" @@ -3190,7 +3180,7 @@ msgstr "Не можете да повторувате сопствена заб msgid "You already repeated that notice." msgstr "Веќе ја имате повторено таа забелешка." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Повторено" @@ -3205,9 +3195,9 @@ msgid "Replies to %s" msgstr "Одговори испратени до %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Одговори на %1$s на %2$s!" +msgstr "Одговори на %1$s, стр. %2$d" #: actions/replies.php:144 #, php-format @@ -3272,21 +3262,21 @@ msgstr "Мора да сте најавени за да можете да го msgid "Application profile" msgstr "Профил на програмот" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Икона" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Име" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Организација" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" @@ -3341,9 +3331,9 @@ msgstr "" "текст." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Омилени забелешки на %s" +msgstr "Омилени забелешки на %1$s, стр. %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3403,9 +3393,9 @@ msgid "%s group" msgstr "Група %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Членови на групата %1$s, стр. %2$d" +msgstr "Група %1$s, стр. %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3528,9 +3518,9 @@ msgid " tagged %s" msgstr " означено со %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s и пријателите, стр. %2$d" +msgstr "%1$s, стр. %2$d" #: actions/showstream.php:122 #, php-format @@ -3604,7 +3594,7 @@ msgstr "" "(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на слободната " "програмска алатка [StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Повторувања на %s" @@ -3972,9 +3962,9 @@ msgid "SMS" msgstr "СМС" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Користници самоозначени со %1$s - стр. %2$d" +msgstr "Забелешки означени со %1$s, стр. %2$d" #: actions/tag.php:86 #, php-format @@ -4277,9 +4267,9 @@ msgid "Enjoy your hotdog!" msgstr "Добар апетит!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Членови на групата %1$s, стр. %2$d" +msgstr "Групи %1$s, стр. %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4450,9 +4440,8 @@ msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Проблем во зачувувањето на белешката." +msgstr "Проблем при зачувувањето на групното приемно сандаче." #: classes/Notice.php:850 #, php-format @@ -4663,16 +4652,20 @@ msgstr "Лиценца на содржините на веб-страницат #: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Содржината и податоците на %1$s се лични и доверливи." #: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Авторските права на содржината и податоците се во сопственост на %1$s. Сите " +"права задржани." #: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Авторските права на содржината и податоците им припаѓаат на учесниците. Сите " +"права задржани." #: lib/action.php:826 msgid "All " @@ -4723,77 +4716,84 @@ msgid "Design configuration" msgstr "Конфигурација на изгледот" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Конфигурација на патеки" +msgstr "Конфигурација на корисник" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Конфигурација на изгледот" +msgstr "Конфигурација на пристапот" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфигурација на патеки" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Уреди програм" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Икона за овој програм" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Опишете го програмот со %d знаци" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Опишете го Вашиот програм" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "Изворна URL-адреса" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "URL на страницата на програмот" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Организацијата одговорна за овој програм" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "URL на страницата на организацијата" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL за пренасочување по заверката" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Прелистувач" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Работна површина" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Тип на програм, прелистувач или работна површина" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Само читање" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Читање-пишување" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Основно-зададен пристап за овој програм: само читање, или читање-пишување" @@ -5802,15 +5802,15 @@ msgstr "во контекст" msgid "Repeated by" msgstr "Повторено од" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Одговори на забелешкава" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Одговор" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Забелешката е повторена" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index e6d3295066..c0be6a5cd3 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/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-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:24+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:07+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -64,7 +64,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lagre" @@ -183,7 +183,7 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -364,12 +364,12 @@ msgstr "Du kan ikke slutte å følge deg selv!" msgid "Two user ids or screen_names must be supplied." msgstr "To bruker ID-er eller kallenavn må oppgis." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Klarte ikke å oppdatere bruker." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Klarte ikke å oppdatere bruker." @@ -513,11 +513,11 @@ msgid "Invalid nickname / password!" msgstr "Ugyldig brukernavn eller passord" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:231 @@ -549,13 +549,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -755,7 +748,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 #, fuzzy msgid "Delete" msgstr "slett" @@ -957,7 +950,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?" msgid "Do not delete this notice" msgstr "Kan ikke slette notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1263,8 +1256,8 @@ msgstr "" "melding med videre veiledning." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Avbryt" @@ -2626,7 +2619,7 @@ msgid "Full name" msgstr "Fullt navn" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hjemmesiden" @@ -3146,7 +3139,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du er allerede logget inn!" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Opprett" @@ -3229,23 +3222,23 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Nick" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Bekreftelseskode" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Alle abonnementer" @@ -3538,7 +3531,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Svar til %s" @@ -4637,68 +4630,77 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Beskriv degselv og dine interesser med 140 tegn" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Beskriv degselv og dine interesser med 140 tegn" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Kilde" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5598,16 +5600,16 @@ msgstr "" msgid "Repeated by" msgstr "Opprett" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "svar" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Nytt nick" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 8e5fc1ea9f..9594c08b54 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:30+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:12+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -26,14 +26,12 @@ msgid "Access" msgstr "Toegang" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Websiteinstellingen opslaan" +msgstr "Instellingen voor sitetoegang" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Registreren" +msgstr "Registratie" #: actions/accessadminpanel.php:161 msgid "Private" @@ -65,15 +63,14 @@ msgstr "Nieuwe registraties uitschakelen." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Opslaan" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "Websiteinstellingen opslaan" +msgstr "Toegangsinstellingen opslaan" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -186,7 +183,7 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -367,11 +364,11 @@ msgstr "U kunt het abonnement op uzelf niet opzeggen." msgid "Two user ids or screen_names must be supplied." msgstr "Er moeten twee gebruikersnamen of ID's opgegeven worden." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Het was niet mogelijk de brongebruiker te bepalen." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Het was niet mogelijk de doelgebruiker te vinden." @@ -516,13 +513,15 @@ msgid "Invalid nickname / password!" msgstr "Ongeldige gebruikersnaam of wachtwoord." #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "" "Er is een databasefout opgetreden tijdens het verwijderen van de OAuth " "applicatiegebruiker." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "" "Er is een databasefout opgetreden tijdens het toevoegen van de OAuth " "applicatiegebruiker." @@ -558,13 +557,6 @@ msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens" msgid "Allow or deny access" msgstr "Toegang toestaan of ontzeggen" -#: 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" @@ -762,7 +754,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Verwijderen" @@ -962,7 +954,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?" msgid "Do not delete this notice" msgstr "Deze mededeling niet verwijderen" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1108,12 +1100,11 @@ msgid "Add to favorites" msgstr "Aan favorieten toevoegen" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Onbekend document." +msgstr "Onbekend document \"%s\"" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Applicatie bewerken" @@ -1251,8 +1242,8 @@ msgstr "" "ongewenste berichten/spam) voor een bericht met nadere instructies." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Annuleren" @@ -1861,9 +1852,9 @@ msgid "That is not your Jabber ID." msgstr "Dit is niet uw Jabber-ID." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Postvak IN van %s" +msgstr "Postvak IN van %s - pagina %2$d" #: actions/inbox.php:62 #, php-format @@ -2113,7 +2104,6 @@ msgid "No current status" msgstr "Geen huidige status" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Nieuwe applicatie" @@ -2377,9 +2367,9 @@ msgid "Login token expired." msgstr "Het aanmeldtoken is verlopen." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Postvak UIT voor %s" +msgstr "Postvak UIT voor %1$s - pagina %2$d" #: actions/outbox.php:61 #, php-format @@ -2665,7 +2655,7 @@ msgid "Full name" msgstr "Volledige naam" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Thuispagina" @@ -3212,7 +3202,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen." msgid "You already repeated that notice." msgstr "U hent die mededeling al herhaald." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Herhaald" @@ -3227,9 +3217,9 @@ msgid "Replies to %s" msgstr "Antwoorden aan %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Antwoorden aan %1$s op %2$s." +msgstr "Antwoorden aan %1$s, pagina %2$d" #: actions/replies.php:144 #, php-format @@ -3294,21 +3284,21 @@ msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken." msgid "Application profile" msgstr "Applicatieprofiel" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Icoon" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Naam" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Organisatie" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Beschrijving" @@ -3363,9 +3353,9 @@ msgstr "" "platte tekst is niet mogelijk." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Favoriete mededelingen van %s" +msgstr "Favoriete mededelingen van %1$s, pagina %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3426,9 +3416,9 @@ msgid "%s group" msgstr "%s groep" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s groeps leden, pagina %2$d" +msgstr "Groep %1$s, pagina %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3551,9 +3541,9 @@ msgid " tagged %s" msgstr " met het label %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s en vrienden, pagina %2$d" +msgstr "%1$s, pagina %2$d" #: actions/showstream.php:122 #, php-format @@ -3628,7 +3618,7 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " "[StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Herhaald van %s" @@ -3999,9 +3989,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d" +msgstr "Mededelingen met het label %1$s, pagina %2$d" #: actions/tag.php:86 #, php-format @@ -4307,9 +4297,9 @@ msgid "Enjoy your hotdog!" msgstr "Geniet van uw hotdog!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s groeps leden, pagina %2$d" +msgstr "Groepen voor %1$s, pagina %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4485,9 +4475,10 @@ msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." +msgstr "" +"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de " +"groep." #: classes/Notice.php:850 #, php-format @@ -4763,77 +4754,84 @@ msgid "Design configuration" msgstr "Instellingen vormgeving" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Padinstellingen" +msgstr "Gebruikersinstellingen" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Instellingen vormgeving" +msgstr "Toegangsinstellingen" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Padinstellingen" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Applicatie bewerken" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Icoon voor deze applicatie" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Beschrijf uw applicatie in %d tekens" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Beschrijf uw applicatie" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "Bron-URL" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "De URL van de homepage van deze applicatie" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Organisatie verantwoordelijk voor deze applicatie" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "De URL van de homepage van de organisatie" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL om naar door te verwijzen na authenticatie" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Browser" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Desktop" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Type applicatie; browser of desktop" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Alleen-lezen" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Lezen en schrijven" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven" @@ -5848,15 +5846,15 @@ msgstr "in context" msgid "Repeated by" msgstr "Herhaald door" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Antwoorden" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Mededeling herhaald" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 44c9c6cd55..c2959eb32b 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:27+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:09+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -66,7 +66,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lagra" @@ -180,7 +180,7 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,12 +362,12 @@ msgstr "Kan ikkje oppdatera brukar." msgid "Two user ids or screen_names must be supplied." msgstr "To brukar IDer eller kallenamn er naudsynte." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Kan ikkje hente offentleg straum." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Kan ikkje finna einkvan status." @@ -513,12 +513,12 @@ msgstr "Ugyldig brukarnamn eller passord." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Feil ved å setja brukar." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" #: actions/apioauthauthorize.php:231 @@ -550,13 +550,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -757,7 +750,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Slett" @@ -963,7 +956,7 @@ msgstr "Sikker på at du vil sletta notisen?" msgid "Do not delete this notice" msgstr "Kan ikkje sletta notisen." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1274,8 +1267,8 @@ msgstr "" "med instruksjonar." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Avbryt" @@ -2692,7 +2685,7 @@ msgid "Full name" msgstr "Fullt namn" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimeside" @@ -3229,7 +3222,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen." msgid "You already repeated that notice." msgstr "Du har allereie blokkert denne brukaren." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -3311,23 +3304,23 @@ msgstr "Du må være innlogga for å melde deg ut av ei gruppe." msgid "Application profile" msgstr "Notisen har ingen profil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Kallenamn" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Paginering" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Beskriving" @@ -3620,7 +3613,7 @@ msgstr "" "**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en." "wikipedia.org/wiki/Micro-blogging)-teneste" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Svar til %s" @@ -4763,68 +4756,77 @@ msgstr "SMS bekreftelse" msgid "Paths configuration" msgstr "SMS bekreftelse" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Beskriv gruppa eller emnet med 140 teikn" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Beskriv gruppa eller emnet med 140 teikn" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Kjeldekode" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL til heimesida eller bloggen for gruppa eller emnet" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL til heimesida eller bloggen for gruppa eller emnet" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5731,15 +5733,15 @@ msgstr "Ingen innhald." msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Melding lagra" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 292affef5e..a50e63f492 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-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:33+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:15+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -29,14 +29,12 @@ msgid "Access" msgstr "Dostęp" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Zapisz ustawienia strony" +msgstr "Ustawienia dostępu strony" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Zarejestruj się" +msgstr "Rejestracja" #: actions/accessadminpanel.php:161 msgid "Private" @@ -68,15 +66,14 @@ msgstr "Wyłączenie nowych rejestracji." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: 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" +msgstr "Zapisz ustawienia dostępu" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -189,7 +186,7 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -367,11 +364,11 @@ msgstr "Nie można zrezygnować z obserwacji samego siebie." msgid "Two user ids or screen_names must be supplied." msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Nie można określić użytkownika źródłowego." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Nie można odnaleźć użytkownika docelowego." @@ -511,11 +508,13 @@ msgid "Invalid nickname / password!" msgstr "Nieprawidłowy pseudonim/hasło." #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "Błąd bazy danych podczas usuwania użytkownika aplikacji OAuth." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth." #: actions/apioauthauthorize.php:231 @@ -548,13 +547,6 @@ 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: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" @@ -749,7 +741,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Usuń" @@ -948,7 +940,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?" msgid "Do not delete this notice" msgstr "Nie usuwaj tego wpisu" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1091,12 +1083,11 @@ msgid "Add to favorites" msgstr "Dodaj do ulubionych" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Nie ma takiego dokumentu." +msgstr "Nie ma takiego dokumentu \\\"%s\\\"" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Zmodyfikuj aplikację" @@ -1235,8 +1226,8 @@ msgstr "" "instrukcjami." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Anuluj" @@ -1829,9 +1820,9 @@ msgid "That is not your Jabber ID." msgstr "To nie jest twój identyfikator Jabbera." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Odebrane wiadomości użytkownika %s" +msgstr "Odebrane wiadomości użytkownika %1$s - strona %2$d" #: actions/inbox.php:62 #, php-format @@ -2080,7 +2071,6 @@ msgid "No current status" msgstr "Brak obecnego stanu" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Nowa aplikacja" @@ -2338,9 +2328,9 @@ msgid "Login token expired." msgstr "Token logowania wygasł." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Wysłane wiadomości użytkownika %s" +msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d" #: actions/outbox.php:61 #, php-format @@ -2626,7 +2616,7 @@ msgid "Full name" msgstr "Imię i nazwisko" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Strona domowa" @@ -3165,7 +3155,7 @@ msgstr "Nie można powtórzyć własnego wpisu." msgid "You already repeated that notice." msgstr "Już powtórzono ten wpis." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Powtórzono" @@ -3180,9 +3170,9 @@ msgid "Replies to %s" msgstr "Odpowiedzi na %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "odpowiedzi dla użytkownika %1$s na %2$s." +msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s" #: actions/replies.php:144 #, php-format @@ -3247,21 +3237,21 @@ msgstr "Musisz być zalogowany, aby wyświetlić aplikację." msgid "Application profile" msgstr "Profil aplikacji" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Ikona" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nazwa" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Organizacja" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Opis" @@ -3316,9 +3306,9 @@ msgstr "" "nie jest obsługiwana." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Ulubione wpisy użytkownika %s" +msgstr "Ulubione wpisy użytkownika %1$s, strona %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3378,9 +3368,9 @@ msgid "%s group" msgstr "Grupa %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Członkowie grupy %1$s, strona %2$d" +msgstr "Grupa %1$s, strona %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3503,9 +3493,9 @@ msgid " tagged %s" msgstr " ze znacznikiem %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s i przyjaciele, strona %2$d" +msgstr "%1$s, strona %2$d" #: actions/showstream.php:122 #, php-format @@ -3580,7 +3570,7 @@ msgstr "" "pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]" "(http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Powtórzenia %s" @@ -3945,9 +3935,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Użytkownicy używający znacznika %1$s - strona %2$d" +msgstr "Wpisy ze znacznikiem %1$s, strona %2$d" #: actions/tag.php:86 #, php-format @@ -4248,9 +4238,9 @@ msgid "Enjoy your hotdog!" msgstr "Smacznego hot-doga." #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Członkowie grupy %1$s, strona %2$d" +msgstr "Grupy użytkownika %1$s, strona %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4423,9 +4413,8 @@ msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Problem podczas zapisywania wpisu." +msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." #: classes/Notice.php:850 #, php-format @@ -4700,77 +4689,84 @@ msgid "Design configuration" msgstr "Konfiguracja wyglądu" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Konfiguracja ścieżek" +msgstr "Konfiguracja użytkownika" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Konfiguracja wyglądu" +msgstr "Konfiguracja dostępu" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Konfiguracja ścieżek" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Zmodyfikuj aplikację" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Ikona tej aplikacji" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Opisz aplikację w %d znakach" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Opisz aplikację" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "Źródłowy adres URL" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "Adres URL strony domowej tej aplikacji" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Organizacja odpowiedzialna za tę aplikację" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "Adres URL strony domowej organizacji" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "Adres URL do przekierowania po uwierzytelnieniu" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Przeglądarka" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Pulpit" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Typ aplikacji, przeglądarka lub pulpit" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Tylko do odczytu" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Odczyt i zapis" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu" @@ -5777,15 +5773,15 @@ msgstr "w rozmowie" msgid "Repeated by" msgstr "Powtórzone przez" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Odpowiedz" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Powtórzono wpis" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 86e7899ee2..2a804d1e42 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:37+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:18+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -64,7 +64,7 @@ msgstr "Impossibilitar registos novos." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Gravar" @@ -183,7 +183,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -360,11 +360,11 @@ msgstr "Não pode deixar de seguir-se a si próprio." msgid "Two user ids or screen_names must be supplied." msgstr "Devem ser fornecidos dois nomes de utilizador ou utilizadors." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Não foi possível determinar o utilizador de origem." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Não foi possível encontrar o utilizador de destino." @@ -506,12 +506,12 @@ msgstr "Nome de utilizador ou senha inválidos." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Erro ao configurar utilizador." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Erro na base de dados ao inserir a marca: %s" #: actions/apioauthauthorize.php:231 @@ -543,13 +543,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -746,7 +739,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Apagar" @@ -946,7 +939,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?" msgid "Do not delete this notice" msgstr "Não apagar esta nota" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1245,8 +1238,8 @@ msgstr "" "na caixa de spam!) uma mensagem com mais instruções." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancelar" @@ -2655,7 +2648,7 @@ msgid "Full name" msgstr "Nome completo" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Página pessoal" @@ -3196,7 +3189,7 @@ msgstr "Não pode repetir a sua própria nota." msgid "You already repeated that notice." msgstr "Já repetiu essa nota." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Repetida" @@ -3280,22 +3273,22 @@ msgstr "Precisa de iniciar uma sessão para deixar um grupo." msgid "Application profile" msgstr "Nota não tem perfil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Paginação" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" @@ -3612,7 +3605,7 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de " "Software Livre [StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Repetência de %s" @@ -4742,68 +4735,77 @@ msgstr "Configuração do estilo" msgid "Paths configuration" msgstr "Configuração das localizações" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Descreva o grupo ou o assunto em %d caracteres" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Descreva o grupo ou assunto" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Código" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL da página ou do blogue, deste grupo ou assunto" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL da página ou do blogue, deste grupo ou assunto" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5806,15 +5808,15 @@ msgstr "no contexto" msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Nota repetida" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index c3502658af..bc6bb997fc 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:40+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:21+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "Desabilita novos registros." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Salvar" @@ -186,7 +186,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -364,11 +364,11 @@ msgstr "Você não pode deixar de seguir você mesmo!" msgid "Two user ids or screen_names must be supplied." msgstr "Duas IDs de usuário ou screen_names devem ser informados." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Não foi possível determinar o usuário de origem." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Não foi possível encontrar usuário de destino." @@ -511,12 +511,14 @@ msgid "Invalid nickname / password!" msgstr "Nome de usuário e/ou senha inválido(s)!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "" "Erro no banco de dados durante a exclusão do aplicativo OAuth do usuário." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "" "Erro no banco de dados durante a inserção do aplicativo OAuth do usuário." @@ -551,13 +553,6 @@ msgstr "Uma aplicação gostaria de se conectar à sua conta" msgid "Allow or deny access" msgstr "Permitir ou negar o acesso" -#: 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" @@ -753,7 +748,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Excluir" @@ -953,7 +948,7 @@ msgstr "Tem certeza que deseja excluir esta mensagem?" msgid "Do not delete this notice" msgstr "Não excluir esta mensagem." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1241,8 +1236,8 @@ msgstr "" "de spam!) por uma mensagem com mais instruções." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Cancelar" @@ -2652,7 +2647,7 @@ msgid "Full name" msgstr "Nome completo" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Site" @@ -3194,7 +3189,7 @@ msgstr "Você não pode repetir sua própria mensagem." msgid "You already repeated that notice." msgstr "Você já repetiu essa mensagem." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Repetida" @@ -3277,21 +3272,21 @@ msgstr "Você deve estar autenticado para visualizar uma aplicação." msgid "Application profile" msgstr "Perfil da aplicação" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Ícone" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Nome" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Organização" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Descrição" @@ -3611,7 +3606,7 @@ msgstr "" "pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]" "(http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Repetição de %s" @@ -4741,64 +4736,73 @@ msgstr "Configuração da aparência" msgid "Paths configuration" msgstr "Configuração dos caminhos" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Editar a aplicação" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Ícone para esta aplicação" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Descreva a sua aplicação em %d caracteres" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Descreva sua aplicação" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "URL da fonte" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "URL do site desta aplicação" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Organização responsável por esta aplicação" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "URL para o site da organização" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL para o redirecionamento após a autenticação" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Navegador" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Desktop" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Tipo de aplicação: navegador ou desktop" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Somente leitura" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Leitura e escrita" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Acesso padrão para esta aplicação: somente leitura ou leitura e escrita" @@ -5806,15 +5810,15 @@ msgstr "no contexto" msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Mensagem repetida" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index cd58abacb5..4d84af8fd2 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:43+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:24+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -28,12 +28,10 @@ msgid "Access" msgstr "Принять" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Сохранить настройки сайта" +msgstr "Настройки доступа к сайту" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" msgstr "Регистрация" @@ -68,15 +66,14 @@ msgstr "Отключить новые регистрации." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Сохранить" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "Сохранить настройки сайта" +msgstr "Сохранить настройки доступа" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -187,7 +184,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -367,11 +364,11 @@ msgstr "Вы не можете перестать следовать за соб msgid "Two user ids or screen_names must be supplied." msgstr "Надо представить два имени пользователя или кода." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Не удаётся определить исходного пользователя." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Не удаётся найти целевого пользователя." @@ -512,11 +509,13 @@ msgid "Invalid nickname / password!" msgstr "Неверное имя или пароль." #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "Ошибка базы данных при удалении пользователя приложения OAuth." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth." #: actions/apioauthauthorize.php:231 @@ -549,13 +548,6 @@ msgstr "Приложение хочет соединиться с вашей у msgid "Allow or deny access" msgstr "Разрешить или запретить доступ" -#: 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 "Настройки" @@ -751,7 +743,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Удалить" @@ -950,7 +942,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1095,12 +1087,11 @@ msgid "Add to favorites" msgstr "Добавить в любимые" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Нет такого документа." +msgstr "Нет такого документа «%s»" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Изменить приложение" @@ -1238,8 +1229,8 @@ msgstr "" "для спама!), там будут дальнейшие инструкции." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Отменить" @@ -1847,9 +1838,9 @@ msgid "That is not your Jabber ID." msgstr "Это не Ваш Jabber ID." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Входящие для %s" +msgstr "Входящие для %1$s — страница %2$d" #: actions/inbox.php:62 #, php-format @@ -2098,7 +2089,6 @@ msgid "No current status" msgstr "Нет текущего статуса" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Новое приложение" @@ -2355,9 +2345,9 @@ msgid "Login token expired." msgstr "Срок действия ключа для входа истёк." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Исходящие для %s" +msgstr "Исходящие для %s — страница %2$d" #: actions/outbox.php:61 #, php-format @@ -2642,7 +2632,7 @@ msgid "Full name" msgstr "Полное имя" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Главная" @@ -3179,7 +3169,7 @@ msgstr "Вы не можете повторить собственную зап msgid "You already repeated that notice." msgstr "Вы уже повторили эту запись." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Повторено" @@ -3194,9 +3184,9 @@ msgid "Replies to %s" msgstr "Ответы для %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Ответы на записи %1$s на %2$s!" +msgstr "Ответы для %1$s, страница %2$d" #: actions/replies.php:144 #, php-format @@ -3262,21 +3252,21 @@ msgstr "Вы должны авторизоваться, чтобы просма msgid "Application profile" msgstr "Профиль приложения" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Иконка" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Имя" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Организация" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Описание" @@ -3331,9 +3321,9 @@ msgstr "" "подписи открытым текстом." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Любимые записи %s" +msgstr "Любимые записи %1$s, страница %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3392,9 +3382,9 @@ msgid "%s group" msgstr "Группа %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Участники группы %1$s, страница %2$d" +msgstr "Группа %1$s, страница %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3517,9 +3507,9 @@ msgid " tagged %s" msgstr " с тегом %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s и друзья, страница %2$d" +msgstr "%1$s, страница %2$d" #: actions/showstream.php:122 #, php-format @@ -3596,7 +3586,7 @@ msgstr "" "использованием свободного программного обеспечения [StatusNet](http://status." "net/)." -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Повтор за %s" @@ -3964,9 +3954,9 @@ msgid "SMS" msgstr "СМС" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Пользователи, установившие себе тег %1$s — страница %2$d" +msgstr "Записи с тегом %1$s, страница %2$d" #: actions/tag.php:86 #, php-format @@ -4268,9 +4258,9 @@ msgid "Enjoy your hotdog!" msgstr "Приятного аппетита!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Участники группы %1$s, страница %2$d" +msgstr "Группы %1$s, страница %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4439,9 +4429,8 @@ msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Проблемы с сохранением записи." +msgstr "Проблемы с сохранением входящих сообщений группы." #: classes/Notice.php:850 #, php-format @@ -4716,77 +4705,84 @@ msgid "Design configuration" msgstr "Конфигурация оформления" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Конфигурация путей" +msgstr "Конфигурация пользователя" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Конфигурация оформления" +msgstr "Конфигурация доступа" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфигурация путей" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Изменить приложение" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Иконка для этого приложения" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Опишите ваше приложение при помощи %d символов" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Опишите ваше приложение" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "URL источника" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "URL-адрес домашней страницы этого приложения" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Организация, ответственная за это приложение" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "URL-адрес домашней страницы организации" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL для перенаправления после проверки подлинности" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Браузер" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Операционная система" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Среда выполнения приложения: браузер или операционная система" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Только чтение" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Чтение и запись" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Доступ по умолчанию для этого приложения: только чтение или чтение и запись" @@ -5790,15 +5786,15 @@ msgstr "в контексте" msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Ответить" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Запись повторена" diff --git a/locale/statusnet.po b/locale/statusnet.po index 7995115348..0d7fd84252 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-27 23:58+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,7 +59,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -170,7 +170,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -342,11 +342,11 @@ msgstr "" msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "" @@ -486,11 +486,11 @@ msgid "Invalid nickname / password!" msgstr "" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "" #: actions/apioauthauthorize.php:231 @@ -522,13 +522,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "" @@ -723,7 +716,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "" @@ -917,7 +910,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1198,8 +1191,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "" @@ -2500,7 +2493,7 @@ msgid "Full name" msgstr "" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "" @@ -2991,7 +2984,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "" @@ -3067,21 +3060,21 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "" @@ -3367,7 +3360,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "" @@ -4431,64 +4424,73 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5353,15 +5355,15 @@ msgstr "" msgid "Repeated by" msgstr "" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 6731f7dfc9..21beffe86e 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:47+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:27+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "Inaktivera nya registreringar." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Spara" @@ -184,7 +184,7 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -358,11 +358,11 @@ msgstr "Du kan inte sluta följa dig själv." msgid "Two user ids or screen_names must be supplied." msgstr "Två användar-ID:n eller screen_names måste tillhandahållas." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Kunde inte fastställa användare hos källan." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Kunde inte hitta målanvändare." @@ -503,11 +503,13 @@ msgid "Invalid nickname / password!" msgstr "Ogiltigt smeknamn / lösenord!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "Databasfel vid borttagning av OAuth-applikationsanvändare." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "Databasfel vid infogning av OAuth-applikationsanvändare." #: actions/apioauthauthorize.php:231 @@ -539,13 +541,6 @@ msgstr "En applikation skulle vilja ansluta till ditt konto" msgid "Allow or deny access" msgstr "Tillåt eller neka åtkomst" -#: 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" @@ -741,7 +736,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Ta bort" @@ -941,7 +936,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?" msgid "Do not delete this notice" msgstr "Ta inte bort denna notis" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1229,8 +1224,8 @@ msgstr "" "skräppostkorg!) efter ett meddelande med vidare instruktioner." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Avbryt" @@ -2597,7 +2592,7 @@ msgid "Full name" msgstr "Fullständigt namn" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Hemsida" @@ -3126,7 +3121,7 @@ msgstr "Du kan inte upprepa din egna notis." msgid "You already repeated that notice." msgstr "Du har redan upprepat denna notis." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Upprepad" @@ -3208,21 +3203,21 @@ msgstr "Du måste vara inloggad för att se en applikation." msgid "Application profile" msgstr "Applikationsprofil" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Ikon" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Namn" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Organisation" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Beskrivning" @@ -3538,7 +3533,7 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging)tjänst baserad på den fria programvaran " "[StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Upprepning av %s" @@ -4666,64 +4661,73 @@ msgstr "Konfiguration av utseende" msgid "Paths configuration" msgstr "Konfiguration av sökvägar" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Redigera applikation" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Ikon för denna applikation" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Beskriv din applikation med högst %d tecken" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Beskriv din applikation" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "URL för källa" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "URL till hemsidan för denna applikation" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Organisation som ansvarar för denna applikation" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "URL till organisationens hemsidan" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL att omdirigera till efter autentisering" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Webbläsare" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Skrivbord" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Typ av applikation, webbläsare eller skrivbord" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Skrivskyddad" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Läs och skriv" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv" @@ -5612,15 +5616,15 @@ msgstr "i sammanhang" msgid "Repeated by" msgstr "Upprepad av" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Svara på denna notis" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Notis upprepad" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 54579428cb..229a5c0c27 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:50+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:30+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -65,7 +65,7 @@ msgstr "కొత్త నమోదులను అచేతనంచేయి. #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "భద్రపరచు" @@ -177,7 +177,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -355,12 +355,12 @@ msgstr "మిమ్మల్ని మీరే నిరోధించుక msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం." @@ -500,12 +500,13 @@ msgid "Invalid nickname / password!" msgstr "తప్పుడు పేరు / సంకేతపదం!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." -msgstr "" +#, fuzzy +msgid "Database error deleting OAuth application user." +msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు" #: actions/apioauthauthorize.php:231 @@ -537,13 +538,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "ఖాతా" @@ -741,7 +735,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "తొలగించు" @@ -937,7 +931,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -1223,8 +1217,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "రద్దుచేయి" @@ -2558,7 +2552,7 @@ msgid "Full name" msgstr "పూర్తి పేరు" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "హోమ్ పేజీ" @@ -3073,7 +3067,7 @@ msgstr "ఈ లైసెన్సుకి అంగీకరించకపో msgid "You already repeated that notice." msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3154,21 +3148,21 @@ msgstr "గుంపుని వదిలివెళ్ళడానికి msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "ప్రతీకం" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "పేరు" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "సంస్ధ" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "వివరణ" @@ -3455,7 +3449,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "%s యొక్క పునరావృతం" @@ -4547,66 +4541,75 @@ msgstr "SMS నిర్ధారణ" msgid "Paths configuration" msgstr "SMS నిర్ధారణ" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "ఉపకరణాన్ని మార్చు" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "ఈ ఉపకరణానికి ప్రతీకం" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "మీ ఉపకరణం గురించి %d అక్షరాల్లో వివరించండి" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "మీ ఉపకరణాన్ని వివరించండి" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "మూలము" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "ఈ ఉపకరణం యొక్క హోమ్‌పేజీ చిరునామా" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "ఈ ఉపకరణానికి బాధ్యతాయుతమైన సంస్థ" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "విహారిణి" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5504,15 +5507,15 @@ msgstr "సందర్భంలో" msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "స్పందించండి" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "నోటీసుని తొలగించాం." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 5b620f24de..77371e6345 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:53+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:32+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -67,7 +67,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Kaydet" @@ -181,7 +181,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,12 +362,12 @@ msgstr "Kullanıcı güncellenemedi." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Kullanıcı güncellenemedi." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Kullanıcı güncellenemedi." @@ -515,12 +515,12 @@ msgstr "Geçersiz kullanıcı adı veya parola." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Kullanıcı ayarlamada hata oluştu." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Cevap eklenirken veritabanı hatası: %s" #: actions/apioauthauthorize.php:231 @@ -552,13 +552,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -762,7 +755,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "" @@ -967,7 +960,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1273,8 +1266,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "İptal et" @@ -2657,7 +2650,7 @@ msgid "Full name" msgstr "Tam İsim" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Başlangıç Sayfası" @@ -3168,7 +3161,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." msgid "You already repeated that notice." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -3249,23 +3242,23 @@ msgstr "" msgid "Application profile" msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Takma ad" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Yer" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "Abonelikler" @@ -3557,7 +3550,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "%s için cevaplar" @@ -4686,70 +4679,79 @@ msgstr "Eposta adresi onayı" msgid "Paths configuration" msgstr "Eposta adresi onayı" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Kaynak" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5655,16 +5657,16 @@ msgstr "İçerik yok!" msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "cevapla" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Durum mesajları" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index c5ea85a8a3..21aa77c470 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:56+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:35+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -27,12 +27,10 @@ msgid "Access" msgstr "Погодитись" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Зберегти налаштування сайту" +msgstr "Параметри доступу на сайт" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" msgstr "Реєстрація" @@ -68,15 +66,14 @@ msgstr "Скасувати подальшу регістрацію." #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Зберегти" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "Зберегти налаштування сайту" +msgstr "Зберегти параметри доступу" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -186,7 +183,7 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -362,11 +359,11 @@ msgstr "Ви не можете відписатись від самого себ msgid "Two user ids or screen_names must be supplied." msgstr "Два ID або імені_у_мережі повинні підтримуватись." -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 msgid "Could not determine source user." msgstr "Не вдалось встановити джерело користувача." -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 msgid "Could not find target user." msgstr "Не вдалося знайти цільового користувача." @@ -509,11 +506,13 @@ msgid "Invalid nickname / password!" msgstr "Недійсне ім’я / пароль!" #: actions/apioauthauthorize.php:170 -msgid "DB error deleting OAuth app user." +#, fuzzy +msgid "Database error deleting OAuth application user." msgstr "Помилка бази даних при видаленні OAuth користувача." #: actions/apioauthauthorize.php:196 -msgid "DB error inserting OAuth app user." +#, fuzzy +msgid "Database error inserting OAuth application user." msgstr "Помилка бази даних при додаванні OAuth користувача." #: actions/apioauthauthorize.php:231 @@ -547,13 +546,6 @@ msgstr "Запит на дозвіл під’єднатися до Вашого msgid "Allow or deny access" msgstr "Дозволити або заборонити доступ" -#: 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 "Акаунт" @@ -750,7 +742,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "Видалити" @@ -947,7 +939,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "Видалити допис" @@ -1092,12 +1084,11 @@ msgid "Add to favorites" msgstr "Додати до обраних" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Такого документа немає." +msgstr "Немає такого документа «%s»" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Керувати додатками" @@ -1235,8 +1226,8 @@ msgstr "" "спамом також!), там має бути повідомлення з подальшими інструкціями." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Скасувати" @@ -1834,9 +1825,9 @@ msgid "That is not your Jabber ID." msgstr "Це не Ваш Jabber ID." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Вхідні для %s" +msgstr "Вхідні для %1$s — сторінка %2$d" #: actions/inbox.php:62 #, php-format @@ -2086,7 +2077,6 @@ msgid "No current status" msgstr "Ніякого поточного статусу" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Новий додаток" @@ -2345,9 +2335,9 @@ msgid "Login token expired." msgstr "Токен для входу втратив чинність." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Вихідні для %s" +msgstr "Вихідні для %1$s — сторінка %2$d" #: actions/outbox.php:61 #, php-format @@ -2633,7 +2623,7 @@ msgid "Full name" msgstr "Повне ім’я" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Веб-сторінка" @@ -3172,7 +3162,7 @@ msgstr "Ви не можете вторувати своїм власним до msgid "You already repeated that notice." msgstr "Ви вже вторували цьому допису." -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 msgid "Repeated" msgstr "Вторування" @@ -3187,9 +3177,9 @@ msgid "Replies to %s" msgstr "Відповіді до %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Відповіді до %1$s на %2$s!" +msgstr "Відповіді до %1$s, сторінка %2$d" #: actions/replies.php:144 #, php-format @@ -3254,21 +3244,21 @@ msgstr "Ви повинні спочатку увійти, аби перегля msgid "Application profile" msgstr "Профіль додатку" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "Іконка" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 msgid "Name" msgstr "Ім’я" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 msgid "Organization" msgstr "Організація" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Опис" @@ -3323,9 +3313,9 @@ msgstr "" "шифрування підписів відкритим текстом." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "Обрані дописи %s" +msgstr "Обрані дописи %1$s, сторінка %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3385,9 +3375,9 @@ msgid "%s group" msgstr "Група %s" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Учасники групи %1$s, сторінка %2$d" +msgstr "Група %1$s, сторінка %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3509,9 +3499,9 @@ msgid " tagged %s" msgstr " позначено з %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s та друзі, сторінка %2$d" +msgstr "%1$s, сторінка %2$d" #: actions/showstream.php:122 #, php-format @@ -3585,7 +3575,7 @@ msgstr "" "(http://uk.wikipedia.org/wiki/Мікроблоґ), який працює на вільному " "програмному забезпеченні [StatusNet](http://status.net/). " -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "Вторування %s" @@ -3952,9 +3942,9 @@ msgid "SMS" msgstr "СМС" #: actions/tag.php:68 -#, fuzzy, php-format +#, php-format msgid "Notices tagged with %1$s, page %2$d" -msgstr "Користувачі з особистим теґом %1$s — сторінка %2$d" +msgstr "Дописи з теґом %1$s, сторінка %2$d" #: actions/tag.php:86 #, php-format @@ -4256,9 +4246,9 @@ msgid "Enjoy your hotdog!" msgstr "Поласуйте бутербродом!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "Учасники групи %1$s, сторінка %2$d" +msgstr "Групи %1$s, сторінка %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4427,9 +4417,8 @@ msgid "Problem saving notice." msgstr "Проблема при збереженні допису." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Проблема при збереженні допису." +msgstr "Проблема при збереженні вхідних дописів для групи." #: classes/Notice.php:850 #, php-format @@ -4701,77 +4690,84 @@ msgid "Design configuration" msgstr "Конфігурація дизайну" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Конфігурація шляху" +msgstr "Конфігурація користувача" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Конфігурація дизайну" +msgstr "Прийняти конфігурацію" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Конфігурація шляху" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "Керувати додатками" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "Іконка для цього додатку" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, php-format msgid "Describe your application in %d characters" msgstr "Опишіть додаток, вкладаючись у %d знаків" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 msgid "Describe your application" msgstr "Опишіть Ваш додаток" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "URL-адреса" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "URL-адреса веб-сторінки цього додатку" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "Організація, відповідальна за цей додаток" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "URL-адреса веб-сторінки організації" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "URL-адреса, на яку перенаправляти після автентифікації" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "Браузер" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "Десктоп" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "Тип додатку, браузер або десктоп" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "Лише читання" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "Читати-писати" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" "Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати" @@ -5773,15 +5769,15 @@ msgstr "в контексті" msgid "Repeated by" msgstr "Вторуванні" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Відповісти" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 msgid "Notice repeated" msgstr "Допис вторували" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 741589cffa..a58bc70935 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-27 23:59:59+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:38+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -66,7 +66,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "Lưu" @@ -180,7 +180,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -366,12 +366,12 @@ msgstr "Không thể cập nhật thành viên." msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "Không thể lấy lại các tin nhắn ưa thích" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "Không tìm thấy bất kỳ trạng thái nào." @@ -517,12 +517,12 @@ msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "Lỗi xảy ra khi tạo thành viên." #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" #: actions/apioauthauthorize.php:231 @@ -554,13 +554,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -765,7 +758,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -972,7 +965,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?" msgid "Do not delete this notice" msgstr "Không thể xóa tin nhắn này." -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -1294,8 +1287,8 @@ msgstr "" "để nhận tin nhắn và lời hướng dẫn." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "Hủy" @@ -2754,7 +2747,7 @@ msgid "Full name" msgstr "Tên đầy đủ" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "Trang chủ hoặc Blog" @@ -3287,7 +3280,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho msgid "You already repeated that notice." msgstr "Bạn đã theo những người này:" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -3369,23 +3362,23 @@ msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những msgid "Application profile" msgstr "Tin nhắn không có hồ sơ cá nhân" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "Biệt danh" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "Thư mời đã gửi" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 msgid "Description" msgstr "Mô tả" @@ -3678,7 +3671,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "Trả lời cho %s" @@ -4845,68 +4838,77 @@ msgstr "Xác nhận SMS" msgid "Paths configuration" msgstr "Xác nhận SMS" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "Nguồn" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5880,16 +5882,16 @@ msgstr "Không có nội dung!" msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "Trả lời" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "Tin đã gửi" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 1cd332a8b8..3a785ae3e8 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-28 00:00:04+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:43+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -69,7 +69,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "保存" @@ -182,7 +182,7 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -364,12 +364,12 @@ msgstr "无法更新用户。" msgid "Two user ids or screen_names must be supplied." msgstr "必须提供两个用户帐号或昵称。" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "无法获取收藏的通告。" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "找不到任何信息。" @@ -515,12 +515,12 @@ msgstr "用户名或密码不正确。" #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "保存用户设置时出错。" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "添加标签时数据库出错：%s" #: actions/apioauthauthorize.php:231 @@ -552,13 +552,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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 "帐号" @@ -760,7 +753,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 #, fuzzy msgid "Delete" msgstr "删除" @@ -968,7 +961,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1281,8 +1274,8 @@ msgstr "" "指示。" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "取消" @@ -2695,7 +2688,7 @@ msgid "Full name" msgstr "全名" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "主页" @@ -3221,7 +3214,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "创建" @@ -3303,23 +3296,23 @@ msgstr "您必须登录才能邀请其他人使用 %s" msgid "Application profile" msgstr "通告没有关联个人信息" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "昵称" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "分页" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "描述" @@ -3616,7 +3609,7 @@ msgstr "" "**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, fuzzy, php-format msgid "Repeat of %s" msgstr "%s 的回复" @@ -4768,68 +4761,77 @@ msgstr "SMS短信确认" msgid "Paths configuration" msgstr "SMS短信确认" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "用不超过140个字符描述您自己和您的爱好" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "用不超过140个字符描述您自己和您的爱好" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 #, fuzzy msgid "Source URL" msgstr "来源" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 #, fuzzy msgid "URL of the homepage of this application" msgstr "您的主页、博客或在其他站点的URL" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 #, fuzzy msgid "URL for the homepage of the organization" msgstr "您的主页、博客或在其他站点的URL" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5747,17 +5749,17 @@ msgstr "没有内容！" msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index e01caa3c36..827bc07ff7 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 23:58+0000\n" -"PO-Revision-Date: 2010-01-28 00:00:08+0000\n" +"POT-Creation-Date: 2010-01-28 23:04+0000\n" +"PO-Revision-Date: 2010-01-28 23:05:46+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 (r61595); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61646); 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" @@ -64,7 +64,7 @@ msgstr "" #: 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/applicationeditform.php:333 lib/applicationeditform.php:334 #: lib/designsettings.php:256 lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -178,7 +178,7 @@ msgstr "" #: actions/apiaccountupdateprofilecolors.php:118 #: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 #: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 #: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 @@ -357,12 +357,12 @@ msgstr "無法更新使用者" msgid "Two user ids or screen_names must be supplied." msgstr "" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "無法更新使用者" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy msgid "Could not find target user." msgstr "無法更新使用者" @@ -507,12 +507,12 @@ msgstr "使用者名稱或密碼無效" #: actions/apioauthauthorize.php:170 #, fuzzy -msgid "DB error deleting OAuth app user." +msgid "Database error deleting OAuth application user." msgstr "使用者設定發生錯誤" #: actions/apioauthauthorize.php:196 #, fuzzy -msgid "DB error inserting OAuth app user." +msgid "Database error inserting OAuth application user." msgstr "增加回覆時,資料庫發生錯誤: %s" #: actions/apioauthauthorize.php:231 @@ -544,13 +544,6 @@ msgstr "" msgid "Allow or deny access" msgstr "" -#: 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" @@ -752,7 +745,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 lib/deleteuserform.php:66 -#: lib/noticelist.php:611 +#: lib/noticelist.php:608 msgid "Delete" msgstr "" @@ -957,7 +950,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:608 msgid "Delete this notice" msgstr "" @@ -1260,8 +1253,8 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 lib/applicationeditform.php:333 -#: lib/applicationeditform.php:334 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "取消" @@ -2604,7 +2597,7 @@ msgid "Full name" msgstr "全名" #: actions/profilesettings.php:115 actions/register.php:453 -#: lib/applicationeditform.php:230 lib/groupeditform.php:161 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "個人首頁" @@ -3104,7 +3097,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:626 #, fuzzy msgid "Repeated" msgstr "新增" @@ -3183,23 +3176,23 @@ msgstr "" msgid "Application profile" msgstr "" -#: actions/showapplication.php:160 lib/applicationeditform.php:182 +#: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" msgstr "" #: actions/showapplication.php:170 actions/version.php:195 -#: lib/applicationeditform.php:197 +#: lib/applicationeditform.php:195 #, fuzzy msgid "Name" msgstr "暱稱" -#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#: actions/showapplication.php:179 lib/applicationeditform.php:222 #, fuzzy msgid "Organization" msgstr "地點" #: actions/showapplication.php:188 actions/version.php:198 -#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 #, fuzzy msgid "Description" msgstr "所有訂閱" @@ -3490,7 +3483,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" -#: actions/showstream.php:313 +#: actions/showstream.php:296 #, php-format msgid "Repeat of %s" msgstr "" @@ -4602,65 +4595,74 @@ msgstr "確認信箱" msgid "Paths configuration" msgstr "確認信箱" +#: lib/apiauth.php:103 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:257 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + #: lib/applicationeditform.php:136 msgid "Edit application" msgstr "" -#: lib/applicationeditform.php:186 +#: lib/applicationeditform.php:184 msgid "Icon for this application" msgstr "" -#: lib/applicationeditform.php:206 +#: lib/applicationeditform.php:204 #, fuzzy, php-format msgid "Describe your application in %d characters" msgstr "請在140個字以內描述你自己與你的興趣" -#: lib/applicationeditform.php:209 +#: lib/applicationeditform.php:207 #, fuzzy msgid "Describe your application" msgstr "請在140個字以內描述你自己與你的興趣" -#: lib/applicationeditform.php:218 +#: lib/applicationeditform.php:216 msgid "Source URL" msgstr "" -#: lib/applicationeditform.php:220 +#: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" msgstr "" -#: lib/applicationeditform.php:226 +#: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" -#: lib/applicationeditform.php:232 +#: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" msgstr "" -#: lib/applicationeditform.php:238 +#: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" msgstr "" -#: lib/applicationeditform.php:260 +#: lib/applicationeditform.php:258 msgid "Browser" msgstr "" -#: lib/applicationeditform.php:276 +#: lib/applicationeditform.php:274 msgid "Desktop" msgstr "" -#: lib/applicationeditform.php:277 +#: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" msgstr "" -#: lib/applicationeditform.php:299 +#: lib/applicationeditform.php:297 msgid "Read-only" msgstr "" -#: lib/applicationeditform.php:317 +#: lib/applicationeditform.php:315 msgid "Read-write" msgstr "" -#: lib/applicationeditform.php:318 +#: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" @@ -5555,15 +5557,15 @@ msgstr "無內容" msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:585 +#: lib/noticelist.php:582 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:586 +#: lib/noticelist.php:583 msgid "Reply" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:625 #, fuzzy msgid "Notice repeated" msgstr "更新個人圖像" From 155a5d446f96651abf3eb62f9b5748e4bdfa0a76 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 16:49:32 -0800 Subject: [PATCH 090/169] Manual failover for stomp queues. If an array of multiple servers is put in $config['queue']['stomp_server'], enqueues will pick a random server to send to (failing over automatically if any are down). Queue handling daemons connect all servers so they get events no matter where they were delivered. In case of disconnection, daemons should now handle it gracefully and attempt to reconnect every 60 seconds or so, automatically resubscribing to all queues once it's back up. Can put to 'native' failover for reads as well by disabling $config['stomp']['manual_failover'] = false; but this is untested and may explode in addition to requiring that your ActiveMQ cluster actually be set up to handle its own data distribution. Additionally, can choose which queues to mark as persistent by setting $config['stomp']['persistent'] to an array of queue names. --- lib/default.php | 1 + lib/liberalstomp.php | 24 ++- lib/stompqueuemanager.php | 354 +++++++++++++++++++++++++++++--------- 3 files changed, 299 insertions(+), 80 deletions(-) diff --git a/lib/default.php b/lib/default.php index 8de8b10977..c01508695b 100644 --- a/lib/default.php +++ b/lib/default.php @@ -85,6 +85,7 @@ $default = 'stomp_username' => null, 'stomp_password' => null, 'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled + 'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all) 'monitor' => null, // URL to monitor ping endpoint (work in progress) 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully 'debug_memory' => false, // true to spit memory usage to log diff --git a/lib/liberalstomp.php b/lib/liberalstomp.php index c9233843a4..3d38953fd2 100644 --- a/lib/liberalstomp.php +++ b/lib/liberalstomp.php @@ -33,6 +33,22 @@ class LiberalStomp extends Stomp return $this->_socket; } + /** + * Return the host we're currently connected to. + * + * @return string + */ + function getServer() + { + $idx = $this->_currentHost; + if ($idx >= 0) { + $host = $this->_hosts[$idx]; + return "$host[0]:$host[1]"; + } else { + return '[unconnected]'; + } + } + /** * Make socket connection to the server * We also set the stream to non-blocking mode, since we'll be @@ -71,10 +87,12 @@ class LiberalStomp extends Stomp // @fixme this sometimes hangs in blocking mode... // shouldn't we have been idle until we found there's more data? $read = fread($this->_socket, $rb); - if ($read === false) { - $this->_reconnect(); + if ($read === false || ($read === '' && feof($this->_socket))) { + // @fixme possibly attempt an auto reconnect as old code? + throw new StompException("Error reading"); + //$this->_reconnect(); // @fixme this will lose prior items - return $this->readFrames(); + //return $this->readFrames(); } $data .= $read; if (strpos($data, "\x00") !== false) { diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index 4e2b586025..ec150bbb6e 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -29,28 +29,37 @@ */ require_once 'Stomp.php'; +require_once 'Stomp/Exception.php'; class StompQueueManager extends QueueManager { - var $server = null; - var $username = null; - var $password = null; - var $base = null; - var $con = null; + protected $servers; + protected $username; + protected $password; + protected $base; protected $control; + + protected $useTransactions = true; protected $sites = array(); protected $subscriptions = array(); - protected $useTransactions = true; - protected $transaction = null; - protected $transactionCount = 0; + protected $cons = array(); // all open connections + protected $disconnect = array(); + protected $transaction = array(); + protected $transactionCount = array(); + protected $defaultIdx = 0; function __construct() { parent::__construct(); - $this->server = common_config('queue', 'stomp_server'); + $server = common_config('queue', 'stomp_server'); + if (is_array($server)) { + $this->servers = $server; + } else { + $this->servers = array($server); + } $this->username = common_config('queue', 'stomp_username'); $this->password = common_config('queue', 'stomp_password'); $this->base = common_config('queue', 'queue_basename'); @@ -99,9 +108,9 @@ class StompQueueManager extends QueueManager $message .= ':' . $param; } $this->_connect(); - $result = $this->con->send($this->control, - $message, - array ('created' => common_sql_now())); + $result = $this->_send($this->control, + $message, + array ('created' => common_sql_now())); if ($result) { $this->_log(LOG_INFO, "Sent control ping to queue daemons: $message"); return true; @@ -166,29 +175,59 @@ class StompQueueManager extends QueueManager /** * Saves a notice object reference into the queue item table. * @return boolean true on success + * @throws StompException on connection or send error */ public function enqueue($object, $queue) + { + $this->_connect(); + return $this->_doEnqueue($object, $queue, $this->defaultIdx); + } + + /** + * Saves a notice object reference into the queue item table + * on the given connection. + * + * @return boolean true on success + * @throws StompException on connection or send error + */ + protected function _doEnqueue($object, $queue, $idx) { $msg = $this->encode($object); $rep = $this->logrep($object); - $this->_connect(); - $props = array('created' => common_sql_now()); - if (common_config('queue', 'stomp_persistent')) { + if ($this->isPersistent($queue)) { $props['persistent'] = 'true'; } - $result = $this->con->send($this->queueName($queue), - $msg, // BODY of the message - $props); + + $con = $this->cons[$idx]; + $host = $con->getServer(); + $result = $con->send($this->queueName($queue), $msg, $props); if (!$result) { - common_log(LOG_ERR, "Error sending $rep to $queue queue"); + common_log(LOG_ERR, "Error sending $rep to $queue queue on $host"); return false; } - common_log(LOG_DEBUG, "complete remote queueing $rep for $queue"); + common_log(LOG_DEBUG, "complete remote queueing $rep for $queue on $host"); $this->stats('enqueued', $queue); + return true; + } + + /** + * Determine whether messages to this queue should be marked as persistent. + * Actual persistent storage depends on the queue server's configuration. + * @param string $queue + * @return bool + */ + protected function isPersistent($queue) + { + $mode = common_config('queue', 'stomp_persistent'); + if (is_array($mode)) { + return in_array($queue, $mode); + } else { + return (bool)$mode; + } } /** @@ -199,7 +238,29 @@ class StompQueueManager extends QueueManager */ public function getSockets() { - return array($this->con->getSocket()); + $sockets = array(); + foreach ($this->cons as $con) { + if ($con) { + $sockets[] = $con->getSocket(); + } + } + return $sockets; + } + + /** + * Get the Stomp connection object associated with the given socket. + * @param resource $socket + * @return int index into connections list + * @throws Exception + */ + protected function connectionFromSocket($socket) + { + foreach ($this->cons as $i => $con) { + if ($con && $con->getSocket() === $socket) { + return $i; + } + } + throw new Exception(__CLASS__ . " asked to read from unrecognized socket"); } /** @@ -211,27 +272,56 @@ class StompQueueManager extends QueueManager */ public function handleInput($socket) { - assert($socket === $this->con->getSocket()); + $idx = $this->connectionFromSocket($socket); + $con = $this->cons[$idx]; + $host = $con->getServer(); + $ok = true; - $frames = $this->con->readFrames(); + try { + $frames = $con->readFrames(); + } catch (StompException $e) { + common_log(LOG_ERR, "Lost connection to $host: " . $e->getMessage()); + $this->cons[$idx] = null; + $this->transaction[$idx] = null; + $this->disconnect[$idx] = time(); + return false; + } foreach ($frames as $frame) { $dest = $frame->headers['destination']; if ($dest == $this->control) { - if (!$this->handleControlSignal($frame)) { + if (!$this->handleControlSignal($idx, $frame)) { // We got a control event that requests a shutdown; // close out and stop handling anything else! break; } } else { - $ok = $ok && $this->handleItem($frame); + $ok = $ok && $this->handleItem($idx, $frame); } } return $ok; } + /** + * Attempt to reconnect in background if we lost a connection. + */ + function idle() + { + $now = time(); + foreach ($this->cons as $idx => $con) { + if (empty($con)) { + $age = $now - $this->disconnect[$idx]; + if ($age >= 60) { + $this->_reconnect($idx); + } + } + } + return true; + } + /** * Initialize our connection and subscribe to all the queues - * we're going to need to handle... + * we're going to need to handle... If multiple queue servers + * are configured for failover, we'll listen to all of them. * * Side effects: in multi-site mode, may reset site configuration. * @@ -241,10 +331,14 @@ class StompQueueManager extends QueueManager public function start($master) { parent::start($master); - $this->_connect(); + $this->_connectAll(); common_log(LOG_INFO, "Subscribing to $this->control"); - $this->con->subscribe($this->control); + foreach ($this->cons as $con) { + if ($con) { + $con->subscribe($this->control); + } + } if ($this->sites) { foreach ($this->sites as $server) { StatusNet::init($server); @@ -253,7 +347,11 @@ class StompQueueManager extends QueueManager } else { $this->doSubscribe(); } - $this->begin(); + foreach ($this->cons as $i => $con) { + if ($con) { + $this->begin($i); + } + } return true; } @@ -268,8 +366,12 @@ 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); + foreach ($this->cons as $i => $con) { + if ($con) { + $this->rollback($i); + $con->unsubscribe($this->control); + } + } if ($this->sites) { foreach ($this->sites as $server) { StatusNet::init($server); @@ -291,23 +393,106 @@ class StompQueueManager extends QueueManager } /** - * Lazy open connection to Stomp queue server. + * Lazy open a single connection to Stomp queue server. + * If multiple servers are configured, we let the Stomp client library + * worry about finding a working connection among them. */ protected function _connect() { - if (empty($this->con)) { - $this->_log(LOG_INFO, "Connecting to '$this->server' as '$this->username'..."); - $this->con = new LiberalStomp($this->server); - - if ($this->con->connect($this->username, $this->password)) { - $this->_log(LOG_INFO, "Connected."); + if (empty($this->cons)) { + $list = $this->servers; + if (count($list) > 1) { + shuffle($list); // Randomize to spread load + $url = 'failover://(' . implode(',', $list) . ')'; } else { - $this->_log(LOG_ERR, 'Failed to connect to queue server'); - throw new ServerException('Failed to connect to queue server'); + $url = $list[0]; + } + $con = $this->_doConnect($url); + $this->cons = array($con); + $this->transactionCount = array(0); + $this->transaction = array(null); + $this->disconnect = array(null); + } + } + + /** + * Lazy open connections to all Stomp servers, if in manual failover + * mode. This means the queue servers don't speak to each other, so + * we have to listen to all of them to make sure we get all events. + */ + protected function _connectAll() + { + if (!common_config('queue', 'stomp_manual_failover')) { + return $this->_connect(); + } + if (empty($this->cons)) { + $this->cons = array(); + $this->transactionCount = array(); + $this->transaction = array(); + foreach ($this->servers as $idx => $server) { + try { + $this->cons[] = $this->_doConnect($server); + $this->disconnect[] = null; + } catch (Exception $e) { + // s'okay, we'll live + $this->cons[] = null; + $this->disconnect[] = time(); + } + $this->transactionCount[] = 0; + $this->transaction[] = null; + } + if (empty($this->cons)) { + throw new ServerException("No queue servers reachable..."); + return false; } } } + protected function _reconnect($idx) + { + try { + $con = $this->_doConnect($this->servers[$idx]); + } catch (Exception $e) { + $this->_log(LOG_ERR, $e->getMessage()); + $con = null; + } + if ($con) { + $this->cons[$idx] = $con; + $this->disconnect[$idx] = null; + + // now we have to listen to everything... + // @fixme refactor this nicer. :P + $host = $con->getServer(); + $this->_log(LOG_INFO, "Resubscribing to $this->control on $host"); + $con->subscribe($this->control); + foreach ($this->subscriptions as $site => $queues) { + foreach ($queues as $queue) { + $this->_log(LOG_INFO, "Resubscribing to $queue on $host"); + $con->subscribe($queue); + } + } + $this->begin($idx); + } else { + // Try again later... + $this->disconnect[$idx] = time(); + } + } + + protected function _doConnect($server) + { + $this->_log(LOG_INFO, "Connecting to '$server' as '$this->username'..."); + $con = new LiberalStomp($server); + + if ($con->connect($this->username, $this->password)) { + $this->_log(LOG_INFO, "Connected."); + } else { + $this->_log(LOG_ERR, 'Failed to connect to queue server'); + throw new ServerException('Failed to connect to queue server'); + } + + return $con; + } + /** * Subscribe to all enabled notice queues for the current site. */ @@ -319,7 +504,11 @@ class StompQueueManager extends QueueManager $rawqueue = $this->queueName($queue); $this->subscriptions[$site][$queue] = $rawqueue; $this->_log(LOG_INFO, "Subscribing to $rawqueue"); - $this->con->subscribe($rawqueue); + foreach ($this->cons as $con) { + if ($con) { + $con->subscribe($rawqueue); + } + } } } @@ -333,7 +522,11 @@ class StompQueueManager extends QueueManager if (!empty($this->subscriptions[$site])) { foreach ($this->subscriptions[$site] as $queue => $rawqueue) { $this->_log(LOG_INFO, "Unsubscribing from $rawqueue"); - $this->con->unsubscribe($rawqueue); + foreach ($this->cons as $con) { + if ($con) { + $con->unsubscribe($rawqueue); + } + } unset($this->subscriptions[$site][$queue]); } } @@ -348,27 +541,31 @@ class StompQueueManager extends QueueManager * Side effects: in multi-site mode, may reset site configuration to * match the site that queued the event. * + * @param int $idx connection index * @param StompFrame $frame * @return bool */ - protected function handleItem($frame) + protected function handleItem($idx, $frame) { + $this->defaultIdx = $idx; + list($site, $queue) = $this->parseDestination($frame->headers['destination']); if ($site != $this->currentSite()) { $this->stats('switch'); StatusNet::init($site); } + $host = $this->cons[$idx]->getServer(); if (is_numeric($frame->body)) { $id = intval($frame->body); - $info = "notice $id posted at {$frame->headers['created']} in queue $queue"; + $info = "notice $id posted at {$frame->headers['created']} in queue $queue from $host"; $notice = Notice::staticGet('id', $id); if (empty($notice)) { $this->_log(LOG_WARNING, "Skipping missing $info"); - $this->ack($frame); - $this->commit(); - $this->begin(); + $this->ack($idx, $frame); + $this->commit($idx); + $this->begin($idx); $this->stats('badnotice', $queue); return false; } @@ -376,16 +573,16 @@ class StompQueueManager extends QueueManager $item = $notice; } else { // @fixme should we serialize, or json, or what here? - $info = "string posted at {$frame->headers['created']} in queue $queue"; + $info = "string posted at {$frame->headers['created']} in queue $queue from $host"; $item = $frame->body; } $handler = $this->getHandler($queue); if (!$handler) { $this->_log(LOG_ERR, "Missing handler class; skipping $info"); - $this->ack($frame); - $this->commit(); - $this->begin(); + $this->ack($idx, $frame); + $this->commit($idx); + $this->begin($idx); $this->stats('badhandler', $queue); return false; } @@ -397,18 +594,18 @@ class StompQueueManager extends QueueManager // FIXME we probably shouldn't have to do // this kind of queue management ourselves; // if we don't ack, it should resend... - $this->ack($frame); + $this->ack($idx, $frame); $this->enqueue($item, $queue); - $this->commit(); - $this->begin(); + $this->commit($idx); + $this->begin($idx); $this->stats('requeued', $queue); return false; } $this->_log(LOG_INFO, "Successfully handled $info"); - $this->ack($frame); - $this->commit(); - $this->begin(); + $this->ack($idx, $frame); + $this->commit($idx); + $this->begin($idx); $this->stats('handled', $queue); return true; } @@ -416,10 +613,11 @@ class StompQueueManager extends QueueManager /** * Process a control signal broadcast. * + * @param int $idx connection index * @param array $frame Stomp frame * @return bool true to continue; false to stop further processing. */ - protected function handleControlSignal($frame) + protected function handleControlSignal($idx, $frame) { $message = trim($frame->body); if (strpos($message, ':') !== false) { @@ -443,9 +641,9 @@ class StompQueueManager extends QueueManager $this->_log(LOG_ERR, "Ignoring unrecognized control message: $message"); } - $this->ack($frame); - $this->commit(); - $this->begin(); + $this->ack($idx, $frame); + $this->commit($idx); + $this->begin($idx); return $shutdown; } @@ -522,47 +720,49 @@ class StompQueueManager extends QueueManager common_log($level, 'StompQueueManager: '.$msg); } - protected function begin() + protected function begin($idx) { if ($this->useTransactions) { - if ($this->transaction) { + if (!empty($this->transaction[$idx])) { throw new Exception("Tried to start transaction in the middle of a transaction"); } - $this->transactionCount++; - $this->transaction = $this->master->id . '-' . $this->transactionCount . '-' . time(); - $this->con->begin($this->transaction); + $this->transactionCount[$idx]++; + $this->transaction[$idx] = $this->master->id . '-' . $this->transactionCount[$idx] . '-' . time(); + $this->cons[$idx]->begin($this->transaction[$idx]); } } - protected function ack($frame) + protected function ack($idx, $frame) { if ($this->useTransactions) { - if (!$this->transaction) { + if (empty($this->transaction[$idx])) { throw new Exception("Tried to ack but not in a transaction"); } + $this->cons[$idx]->ack($frame, $this->transaction[$idx]); + } else { + $this->cons[$idx]->ack($frame); } - $this->con->ack($frame, $this->transaction); } - protected function commit() + protected function commit($idx) { if ($this->useTransactions) { - if (!$this->transaction) { + if (empty($this->transaction[$idx])) { throw new Exception("Tried to commit but not in a transaction"); } - $this->con->commit($this->transaction); - $this->transaction = null; + $this->cons[$idx]->commit($this->transaction[$idx]); + $this->transaction[$idx] = null; } } - protected function rollback() + protected function rollback($idx) { if ($this->useTransactions) { - if (!$this->transaction) { + if (empty($this->transaction[$idx])) { throw new Exception("Tried to rollback but not in a transaction"); } - $this->con->commit($this->transaction); - $this->transaction = null; + $this->cons[$idx]->commit($this->transaction[$idx]); + $this->transaction[$idx] = null; } } } From d13d73c5630244963f0c3bd9db68dd6c6451821a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 18:40:38 -0500 Subject: [PATCH 091/169] Last-chance distribution if enqueueing fails --- classes/Notice.php | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 90e3e76ef3..a60dd5bcd7 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -326,13 +326,7 @@ class Notice extends Memcached_DataObject # XXX: someone clever could prepend instead of clearing the cache $notice->blowOnInsert(); - if (common_config('queue', 'inboxes')) { - $qm = QueueManager::get(); - $qm->enqueue($notice, 'distrib'); - } else { - $handler = new DistribQueueHandler(); - $handler->handle($notice); - } + $notice->distribute(); return $notice; } @@ -1447,4 +1441,31 @@ class Notice extends Memcached_DataObject $gi->free(); } + + function distribute() + { + if (common_config('queue', 'inboxes')) { + // If there's a failure, we want to _force_ + // distribution at this point. + try { + $qm = QueueManager::get(); + $qm->enqueue($this, 'distrib'); + } catch (Exception $e) { + // If the exception isn't transient, this + // may throw more exceptions as DQH does + // its own enqueueing. So, we ignore them! + try { + $handler = new DistribQueueHandler(); + $handler->handle($this); + } catch (Exception $e) { + common_log(LOG_ERR, "emergency redistribution resulted in " . $e->getMessage()); + } + // Re-throw so somebody smarter can handle it. + throw $e; + } + } else { + $handler = new DistribQueueHandler(); + $handler->handle($this); + } + } } From 48a1a5a2dcaf026d92caf0656d44f324cd1bbf0c Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 29 Jan 2010 01:49:38 +0000 Subject: [PATCH 092/169] Adjust API authentication to also check for OAuth protocol params in the HTTP Authorization header, as defined in OAuth HTTP Authorization Scheme. --- lib/apiauth.php | 84 +++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index c684a6caee..99500404f9 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -55,11 +55,10 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $access_token = null; - var $oauth_source = null; /** - * Take arguments for running, and output basic auth header if needed + * Take arguments for running, looks for an OAuth request, + * and outputs basic auth header if needed * * @param array $args $_REQUEST args * @@ -71,26 +70,23 @@ 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()) { - if (!empty($this->access_token)) { - $this->checkOAuthRequest(); - } else { + + $oauthReq = $this->getOAuthRequest(); + + if (!$oauthReq) { $this->checkBasicAuthUser(true); + } else { + $this->checkOAuthRequest($oauthReq); } } else { // Check to see if a basic auth user is there even // if one's not required - - if (empty($this->access_token)) { - $this->checkBasicAuthUser(false); - } + $this->checkBasicAuthUser(false); } // Reject API calls with the wrong access level @@ -107,12 +103,44 @@ class ApiAuthAction extends ApiAction return true; } - function handle($args) + /** + * Determine whether the request is an OAuth request. + * This is to avoid doign any unnecessary DB lookups. + * + * @return mixed the OAuthRequest or false + * + */ + + function getOAuthRequest() { - parent::handle($args); + ApiOauthAction::cleanRequest(); + + $req = OAuthRequest::from_request(); + + $consumer = $req->get_parameter('oauth_consumer_key'); + $accessToken = $req->get_parameter('oauth_token'); + + // XXX: Is it good enough to assume it's not meant to be an + // OAuth request if there is no consumer or token? --Z + + if (empty($consumer) || empty($accessToken)) { + return false; + } + + return $req; } - function checkOAuthRequest() + /** + * Verifies the OAuth request signature, sets the auth user + * and access type (read-only or read-write) + * + * @param OAuthRequest $request the OAuth Request + * + * @return nothing + * + */ + + function checkOAuthRequest($request) { $datastore = new ApiStatusNetOAuthDataStore(); $server = new OAuthServer($datastore); @@ -120,22 +148,19 @@ class ApiAuthAction extends ApiAction $server->add_signature_method($hmac_method); - ApiOauthAction::cleanRequest(); - try { - $req = OAuthRequest::from_request(); - $server->verify_request($req); + $server->verify_request($request); - $app = Oauth_application::getByConsumerKey($this->consumer_key); + $consumer = $request->get_parameter('oauth_consumer_key'); + $access_token = $request->get_parameter('oauth_token'); + + $app = Oauth_application::getByConsumerKey($consumer); if (empty($app)) { - - // this should probably not happen common_log(LOG_WARNING, 'Couldn\'t find the OAuth app for consumer key: ' . - $this->consumer_key); - + $consumer); throw new OAuthException('No application for that consumer key.'); } @@ -143,11 +168,7 @@ class ApiAuthAction extends ApiAction $this->oauth_source = $app->name; - $appUser = Oauth_application_user::staticGet('token', - $this->access_token); - - // XXX: Check that app->id and appUser->application_id and consumer all - // match? + $appUser = Oauth_application_user::staticGet('token', $access_token); if (!empty($appUser)) { @@ -161,6 +182,8 @@ class ApiAuthAction extends ApiAction $this->access = ($appUser->access_type & Oauth_application::$writeAccess) ? self::READ_WRITE : self::READ_ONLY; + // Set the auth user + if (Event::handle('StartSetApiUser', array(&$user))) { $this->auth_user = User::staticGet('id', $appUser->profile_id); Event::handle('EndSetApiUser', array($user)); @@ -177,7 +200,6 @@ class ApiAuthAction extends ApiAction ($this->access = self::READ_WRITE) ? 'read-write' : 'read-only' )); - return; } else { throw new OAuthException('Bad access token.'); } From d70be6d2ad5a3a9e49a5cc7fa73b01311732e9b5 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 29 Jan 2010 01:49:38 +0000 Subject: [PATCH 093/169] Adjust API authentication to also check for OAuth protocol params in the HTTP Authorization header, as defined in OAuth HTTP Authorization Scheme. --- lib/apiauth.php | 84 +++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/lib/apiauth.php b/lib/apiauth.php index d441014add..262f4b966c 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -55,11 +55,10 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $access_token = null; - var $oauth_source = null; /** - * Take arguments for running, and output basic auth header if needed + * Take arguments for running, looks for an OAuth request, + * and outputs basic auth header if needed * * @param array $args $_REQUEST args * @@ -71,26 +70,23 @@ 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()) { - if (!empty($this->access_token)) { - $this->checkOAuthRequest(); - } else { + + $oauthReq = $this->getOAuthRequest(); + + if (!$oauthReq) { $this->checkBasicAuthUser(true); + } else { + $this->checkOAuthRequest($oauthReq); } } else { // Check to see if a basic auth user is there even // if one's not required - - if (empty($this->access_token)) { - $this->checkBasicAuthUser(false); - } + $this->checkBasicAuthUser(false); } // Reject API calls with the wrong access level @@ -110,12 +106,44 @@ class ApiAuthAction extends ApiAction return true; } - function handle($args) + /** + * Determine whether the request is an OAuth request. + * This is to avoid doign any unnecessary DB lookups. + * + * @return mixed the OAuthRequest or false + * + */ + + function getOAuthRequest() { - parent::handle($args); + ApiOauthAction::cleanRequest(); + + $req = OAuthRequest::from_request(); + + $consumer = $req->get_parameter('oauth_consumer_key'); + $accessToken = $req->get_parameter('oauth_token'); + + // XXX: Is it good enough to assume it's not meant to be an + // OAuth request if there is no consumer or token? --Z + + if (empty($consumer) || empty($accessToken)) { + return false; + } + + return $req; } - function checkOAuthRequest() + /** + * Verifies the OAuth request signature, sets the auth user + * and access type (read-only or read-write) + * + * @param OAuthRequest $request the OAuth Request + * + * @return nothing + * + */ + + function checkOAuthRequest($request) { $datastore = new ApiStatusNetOAuthDataStore(); $server = new OAuthServer($datastore); @@ -123,22 +151,19 @@ class ApiAuthAction extends ApiAction $server->add_signature_method($hmac_method); - ApiOauthAction::cleanRequest(); - try { - $req = OAuthRequest::from_request(); - $server->verify_request($req); + $server->verify_request($request); - $app = Oauth_application::getByConsumerKey($this->consumer_key); + $consumer = $request->get_parameter('oauth_consumer_key'); + $access_token = $request->get_parameter('oauth_token'); + + $app = Oauth_application::getByConsumerKey($consumer); if (empty($app)) { - - // this should probably not happen common_log(LOG_WARNING, 'Couldn\'t find the OAuth app for consumer key: ' . - $this->consumer_key); - + $consumer); throw new OAuthException('No application for that consumer key.'); } @@ -146,11 +171,7 @@ class ApiAuthAction extends ApiAction $this->oauth_source = $app->name; - $appUser = Oauth_application_user::staticGet('token', - $this->access_token); - - // XXX: Check that app->id and appUser->application_id and consumer all - // match? + $appUser = Oauth_application_user::staticGet('token', $access_token); if (!empty($appUser)) { @@ -164,6 +185,8 @@ class ApiAuthAction extends ApiAction $this->access = ($appUser->access_type & Oauth_application::$writeAccess) ? self::READ_WRITE : self::READ_ONLY; + // Set the auth user + if (Event::handle('StartSetApiUser', array(&$user))) { $this->auth_user = User::staticGet('id', $appUser->profile_id); Event::handle('EndSetApiUser', array($user)); @@ -180,7 +203,6 @@ class ApiAuthAction extends ApiAction ($this->access = self::READ_WRITE) ? 'read-write' : 'read-only' )); - return; } else { throw new OAuthException('Bad access token.'); } From 4a0413c0270bcac456c20972342c2c29182bec4e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 01:42:52 -0500 Subject: [PATCH 094/169] Add a script to set tags for sites --- scripts/settag.php | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 scripts/settag.php diff --git a/scripts/settag.php b/scripts/settag.php new file mode 100644 index 0000000000..1d7b60b902 --- /dev/null +++ b/scripts/settag.php @@ -0,0 +1,84 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'd'; +$longoptions = array('delete'); + +$helptext = << +Set the tag for site . + +With -d, delete the tag. + +END_OF_SETTAG_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + +if (count($args) != 2) { + show_help(); + exit(1); +} + +$nickname = $args[0]; +$tag = strtolower($args[1]); + +$sn = Status_network::memGet('nickname', $nickname); + +if (empty($sn)) { + print "No such site.\n"; + exit(-1); +} + +$tags = $sn->getTags(); + +$i = array_search($tags, $tag); + +if ($i !== false) { + if (have_option('d', 'delete')) { // Delete + unset($tags[$i]); + + $orig = clone($sn); + $sn->tags = implode('|', $tags); + $result = $sn->update($orig); + if (!$result) { + print "Couldn't update.\n"; + exit(-1); + } + } else { + print "Already set.\n"; + exit(-1); + } +} else { + if (have_option('d', 'delete')) { // Delete + print "No such tag.\n"; + exit(-1); + } else { + $tags[] = $tag; + $orig = clone($sn); + $sn->tags = implode('|', $tags); + $result = $sn->update($orig); + if (!$result) { + print "Couldn't update.\n"; + exit(-1); + } + } +} From 864ce8e276220262ef8a26a9138c929145ccf57e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 20:09:17 -0800 Subject: [PATCH 095/169] Fixes for status_network db object .ini and tag setter script --- classes/status_network.ini | 1 + scripts/settag.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/status_network.ini b/classes/status_network.ini index 8123265e46..adb71cba77 100644 --- a/classes/status_network.ini +++ b/classes/status_network.ini @@ -11,6 +11,7 @@ theme = 2 logo = 2 created = 142 modified = 384 +tags = 34 [status_network__keys] nickname = K diff --git a/scripts/settag.php b/scripts/settag.php index 1d7b60b902..e91d5eb505 100644 --- a/scripts/settag.php +++ b/scripts/settag.php @@ -50,7 +50,7 @@ if (empty($sn)) { $tags = $sn->getTags(); -$i = array_search($tags, $tag); +$i = array_search($tag, $tags); if ($i !== false) { if (have_option('d', 'delete')) { // Delete From 440ee00b1ed9c1b0b552c14b72c962a79e1a402e Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 22:04:14 -0800 Subject: [PATCH 096/169] Move sessions settings to its own panel --- actions/sessionsadminpanel.php | 201 +++++++++++++++++++++++++++++++++ actions/useradminpanel.php | 20 ---- lib/adminpanelaction.php | 11 +- lib/default.php | 2 +- lib/router.php | 3 +- 5 files changed, 212 insertions(+), 25 deletions(-) create mode 100644 actions/sessionsadminpanel.php diff --git a/actions/sessionsadminpanel.php b/actions/sessionsadminpanel.php new file mode 100644 index 0000000000..4386ef844b --- /dev/null +++ b/actions/sessionsadminpanel.php @@ -0,0 +1,201 @@ +. + * + * @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); +} + +/** + * Admin site sessions + * + * @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 SessionsadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _('Sessions'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _('Session settings for this StatusNet site.'); + } + + /** + * Show the site admin panel form + * + * @return void + */ + + function showForm() + { + $form = new SessionsAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $booleans = array('sessions' => array('handle', 'debug')); + + $values = array(); + + 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); + + // assert(all values are valid); + + $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; + } + + function validate(&$values) + { + // stub + } +} + +class SessionsAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'sessionsadminpanel'; + } + + /** + * 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('sessionsadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions')); + $this->out->element('legend', null, _('Sessions')); + + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->out->checkbox('handle', _('Handle sessions'), + (bool) $this->value('handle', 'sessions'), + _('Whether to handle sessions ourselves.')); + $this->unli(); + + $this->li(); + $this->out->checkbox('debug', _('Session debugging'), + (bool) $this->value('debug', 'sessions'), + _('Turn on debugging output for sessions.')); + $this->unli(); + + $this->out->elementEnd('ul'); + + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings')); + } +} diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php index 5de2db5fff..6813222f5f 100644 --- a/actions/useradminpanel.php +++ b/actions/useradminpanel.php @@ -96,7 +96,6 @@ class UseradminpanelAction extends AdminPanelAction ); static $booleans = array( - 'sessions' => array('handle', 'debug'), 'invite' => array('enabled') ); @@ -261,26 +260,7 @@ class UserAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions')); - $this->out->element('legend', null, _('Sessions')); - $this->out->elementStart('ul', 'form_data'); - - $this->li(); - $this->out->checkbox('sessions-handle', _('Handle sessions'), - (bool) $this->value('handle', 'sessions'), - _('Whether to handle sessions ourselves.')); - $this->unli(); - - $this->li(); - $this->out->checkbox('sessions-debug', _('Session debugging'), - (bool) $this->value('debug', 'sessions'), - _('Turn on debugging output for sessions.')); - $this->unli(); - - $this->out->elementEnd('ul'); - - $this->out->elementEnd('fieldset'); } diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index f62bfa458a..f05627b317 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -327,9 +327,14 @@ class AdminPanelNav extends Widget _('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'); + if ($this->canAdmin('paths')) { + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), + _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + } + + if ($this->canAdmin('sessions')) { + $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'), + _('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel'); } Event::handle('EndAdminPanelNav', array($this)); diff --git a/lib/default.php b/lib/default.php index c01508695b..1337a96336 100644 --- a/lib/default.php +++ b/lib/default.php @@ -266,7 +266,7 @@ $default = 'OpenID' => null), ), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')), 'singleuser' => array('enabled' => false, 'nickname' => null), diff --git a/lib/router.php b/lib/router.php index 03765b39dd..be9cfac0c2 100644 --- a/lib/router.php +++ b/lib/router.php @@ -637,8 +637,9 @@ 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/access', array('action' => 'accessadminpanel')); $m->connect('admin/paths', array('action' => 'pathsadminpanel')); + $m->connect('admin/sessions', array('action' => 'sessionsadminpanel')); $m->connect('getfile/:filename', array('action' => 'getfile'), From 288dc3452f3c274d2165d8e7d502631a6eacc97c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 22:05:14 -0800 Subject: [PATCH 097/169] Log exceptions from queuedaemon.php if they're not already caught --- scripts/queuedaemon.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index c2e2351c39..30a8a96026 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -109,7 +109,13 @@ class QueueDaemon extends SpawningDaemon $master = new QueueMaster($this->get_id()); $master->init($this->all); - $master->service(); + try { + $master->service(); + } catch (Exception $e) { + common_log(LOG_ERR, "Unhandled exception: " . $e->getMessage() . ' ' . + str_replace("\n", " ", $e->getTraceAsString())); + return self::EXIT_ERR; + } $this->log(LOG_INFO, 'finished servicing the queue'); From 58685117169ba81fcd62474d21b0387635873136 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 28 Jan 2010 22:04:14 -0800 Subject: [PATCH 098/169] Move sessions settings to its own panel --- actions/sessionsadminpanel.php | 201 +++++++++++++++++++++++++++++++++ actions/useradminpanel.php | 20 ---- lib/adminpanelaction.php | 11 +- lib/default.php | 2 +- lib/router.php | 3 +- 5 files changed, 212 insertions(+), 25 deletions(-) create mode 100644 actions/sessionsadminpanel.php diff --git a/actions/sessionsadminpanel.php b/actions/sessionsadminpanel.php new file mode 100644 index 0000000000..4386ef844b --- /dev/null +++ b/actions/sessionsadminpanel.php @@ -0,0 +1,201 @@ +. + * + * @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); +} + +/** + * Admin site sessions + * + * @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 SessionsadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _('Sessions'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _('Session settings for this StatusNet site.'); + } + + /** + * Show the site admin panel form + * + * @return void + */ + + function showForm() + { + $form = new SessionsAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $booleans = array('sessions' => array('handle', 'debug')); + + $values = array(); + + 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); + + // assert(all values are valid); + + $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; + } + + function validate(&$values) + { + // stub + } +} + +class SessionsAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'sessionsadminpanel'; + } + + /** + * 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('sessionsadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions')); + $this->out->element('legend', null, _('Sessions')); + + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->out->checkbox('handle', _('Handle sessions'), + (bool) $this->value('handle', 'sessions'), + _('Whether to handle sessions ourselves.')); + $this->unli(); + + $this->li(); + $this->out->checkbox('debug', _('Session debugging'), + (bool) $this->value('debug', 'sessions'), + _('Turn on debugging output for sessions.')); + $this->unli(); + + $this->out->elementEnd('ul'); + + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _('Save site settings')); + } +} diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php index 5de2db5fff..6813222f5f 100644 --- a/actions/useradminpanel.php +++ b/actions/useradminpanel.php @@ -96,7 +96,6 @@ class UseradminpanelAction extends AdminPanelAction ); static $booleans = array( - 'sessions' => array('handle', 'debug'), 'invite' => array('enabled') ); @@ -261,26 +260,7 @@ class UserAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_user_sessions')); - $this->out->element('legend', null, _('Sessions')); - $this->out->elementStart('ul', 'form_data'); - - $this->li(); - $this->out->checkbox('sessions-handle', _('Handle sessions'), - (bool) $this->value('handle', 'sessions'), - _('Whether to handle sessions ourselves.')); - $this->unli(); - - $this->li(); - $this->out->checkbox('sessions-debug', _('Session debugging'), - (bool) $this->value('debug', 'sessions'), - _('Turn on debugging output for sessions.')); - $this->unli(); - - $this->out->elementEnd('ul'); - - $this->out->elementEnd('fieldset'); } diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index f62bfa458a..f05627b317 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -327,9 +327,14 @@ class AdminPanelNav extends Widget _('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'); + if ($this->canAdmin('paths')) { + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), + _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + } + + if ($this->canAdmin('sessions')) { + $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'), + _('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_design_admin_panel'); } Event::handle('EndAdminPanelNav', array($this)); diff --git a/lib/default.php b/lib/default.php index a6b9919b21..64fb7a786f 100644 --- a/lib/default.php +++ b/lib/default.php @@ -265,7 +265,7 @@ $default = 'OpenID' => null), ), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions')), 'singleuser' => array('enabled' => false, 'nickname' => null), diff --git a/lib/router.php b/lib/router.php index 03765b39dd..be9cfac0c2 100644 --- a/lib/router.php +++ b/lib/router.php @@ -637,8 +637,9 @@ 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/access', array('action' => 'accessadminpanel')); $m->connect('admin/paths', array('action' => 'pathsadminpanel')); + $m->connect('admin/sessions', array('action' => 'sessionsadminpanel')); $m->connect('getfile/:filename', array('action' => 'getfile'), From ccb678ad15ee57302c751ea995264415c64ad298 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 22:26:58 -0800 Subject: [PATCH 099/169] Wrap each bit of distrib queue handler's saving operation in a try/catch; log exceptions but let everything else continue. --- lib/distribqueuehandler.php | 55 +++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php index f458d238da..4477468d0a 100644 --- a/lib/distribqueuehandler.php +++ b/lib/distribqueuehandler.php @@ -62,23 +62,60 @@ class DistribQueueHandler { // XXX: do we need to change this for remote users? - $notice->saveTags(); + try { + $notice->saveTags(); + } catch (Exception $e) { + $this->logit($notice, $e); + } - $groups = $notice->saveGroups(); + try { + $groups = $notice->saveGroups(); + } catch (Exception $e) { + $this->logit($notice, $e); + } - $recipients = $notice->saveReplies(); + try { + $recipients = $notice->saveReplies(); + } catch (Exception $e) { + $this->logit($notice, $e); + } - $notice->addToInboxes($groups, $recipients); + try { + $notice->addToInboxes($groups, $recipients); + } catch (Exception $e) { + $this->logit($notice, $e); + } - $notice->saveUrls(); + try { + $notice->saveUrls(); + } catch (Exception $e) { + $this->logit($notice, $e); + } - Event::handle('EndNoticeSave', array($notice)); + try { + Event::handle('EndNoticeSave', array($notice)); + // Enqueue for other handlers + } catch (Exception $e) { + $this->logit($notice, $e); + } - // Enqueue for other handlers - - common_enqueue_notice($notice); + try { + common_enqueue_notice($notice); + } catch (Exception $e) { + $this->logit($notice, $e); + } return true; } + + protected function logit($notice, $e) + { + common_log(LOG_ERR, "Distrib queue exception saving notice $notice->id: " . + $e->getMessage() . ' ' . + str_replace("\n", " ", $e->getTraceAsString())); + + // We'll still return true so we don't get stuck in a loop + // trying to run a bad insert over and over... + } } From e5eca9bd2ce11633e14a840cb93adc6fd3ec8fc0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 22:51:07 -0800 Subject: [PATCH 100/169] Don't attempt to resend XMPP messages that can't be broadcast due to the profile being deleted. --- lib/jabber.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jabber.php b/lib/jabber.php index b6b23521bd..e1bf06ba66 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -358,7 +358,7 @@ function jabber_broadcast_notice($notice) common_log(LOG_WARNING, 'Refusing to broadcast notice with ' . 'unknown profile ' . common_log_objstring($notice), __FILE__); - return false; + return true; // not recoverable; discard. } $msg = jabber_format_notice($profile, $notice); @@ -437,7 +437,7 @@ function jabber_public_notice($notice) common_log(LOG_WARNING, 'Refusing to broadcast notice with ' . 'unknown profile ' . common_log_objstring($notice), __FILE__); - return false; + return true; // not recoverable; discard. } $msg = jabber_format_notice($profile, $notice); From 4d3808a815dd8a020cf17151e4c04a821790169d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Jan 2010 23:08:36 -0800 Subject: [PATCH 101/169] Fix more fatal errors in queue edge cases --- lib/api.php | 2 +- lib/jabberqueuehandler.php | 2 +- lib/ombqueuehandler.php | 2 +- lib/publicqueuehandler.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/api.php b/lib/api.php index 794b140507..10a2fae28c 100644 --- a/lib/api.php +++ b/lib/api.php @@ -298,7 +298,7 @@ class ApiAction extends Action } } - if ($include_user) { + if ($include_user && $profile) { # Don't get notice (recursive!) $twitter_user = $this->twitterUserArray($profile, false); $twitter_status['user'] = $twitter_user; diff --git a/lib/jabberqueuehandler.php b/lib/jabberqueuehandler.php index 83471f2df7..d6b4b7416a 100644 --- a/lib/jabberqueuehandler.php +++ b/lib/jabberqueuehandler.php @@ -40,7 +40,7 @@ class JabberQueueHandler extends QueueHandler try { return jabber_broadcast_notice($notice); } catch (XMPPHP_Exception $e) { - $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); + common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); return false; } } diff --git a/lib/ombqueuehandler.php b/lib/ombqueuehandler.php index 24896c784c..1921c2bacd 100644 --- a/lib/ombqueuehandler.php +++ b/lib/ombqueuehandler.php @@ -39,7 +39,7 @@ class OmbQueueHandler extends QueueHandler function handle($notice) { if ($this->is_remote($notice)) { - $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id); + common_log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id); return true; } else { require_once(INSTALLDIR.'/lib/omb.php'); diff --git a/lib/publicqueuehandler.php b/lib/publicqueuehandler.php index c9edb8d5d7..a497d13850 100644 --- a/lib/publicqueuehandler.php +++ b/lib/publicqueuehandler.php @@ -38,7 +38,7 @@ class PublicQueueHandler extends QueueHandler try { return jabber_public_notice($notice); } catch (XMPPHP_Exception $e) { - $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); + common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); return false; } } From efb39347b28e2c16fd297c61fae0606a28398dd7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 29 Jan 2010 15:20:14 +0000 Subject: [PATCH 102/169] Hides .author from XHR response in showstream --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c51deb312..0d6395d057 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -995,6 +995,9 @@ padding-left:28px; .notice .author { margin-right:11px; } +#showstream #content .notice .author { +display:none; +} .fn { overflow:hidden; From acd0c0732a0f328548e744bdb05bf11acf9d87e0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 29 Jan 2010 15:20:14 +0000 Subject: [PATCH 103/169] Hides .author from XHR response in showstream --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 65dd159900..b109706a13 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -995,6 +995,9 @@ padding-left:28px; .notice .author { margin-right:11px; } +#showstream #content .notice .author { +display:none; +} .fn { overflow:hidden; From f6c8b8a8680d99afe37accf8eda29e6660bf69ff Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 29 Jan 2010 15:20:14 +0000 Subject: [PATCH 104/169] Hides .author from XHR response in showstream --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3c51deb312..0d6395d057 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -995,6 +995,9 @@ padding-left:28px; .notice .author { margin-right:11px; } +#showstream #content .notice .author { +display:none; +} .fn { overflow:hidden; From b68a21d4f77f7d05f12bf85068c2d0d1a0ba3a36 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 29 Jan 2010 15:43:37 +0000 Subject: [PATCH 105/169] Adds notice author's name to @title in Realtime response --- plugins/Realtime/realtimeupdate.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 52151f9de8..fb9dcdbfb7 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -132,11 +132,11 @@ RealtimeUpdate = { user = data['user']; html = data['html'].replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"').replace(/&/g,'&'); source = data['source'].replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"').replace(/&/g,'&'); - +console.log(data); ni = "
  • "+ "
    "+ ""+ - ""+ + ""+ "\""+user['screen_name']+"\"/"+ ""+user['screen_name']+""+ ""+ From f6eecf02fc9eca0d3947a8cacf374909003dc8d4 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 15:01:21 -0500 Subject: [PATCH 106/169] add simple cache getter/setter static functions to Memcached_DataObject --- classes/Memcached_DataObject.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index f4dfe63141..ab65c30ce2 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -552,4 +552,30 @@ class Memcached_DataObject extends DB_DataObject { throw new ServerException("DB_DataObject error [$type]: $message"); } + + static function cacheGet($keyPart) + { + $c = self::memcache(); + + if (empty($c)) { + return false; + } + + $cacheKey = common_cache_key($keyPart); + + return $c->get($cacheKey); + } + + static function cacheSet($keyPart, $value) + { + $c = self::memcache(); + + if (empty($c)) { + return false; + } + + $cacheKey = common_cache_key($keyPart); + + return $c->set($cacheKey, $value); + } } From d437b76ed1a7ba3c39f0d3cb8bef15e19c1c184f Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 15:15:04 -0500 Subject: [PATCH 107/169] define a constant for the 'owner' role of a site --- classes/Profile_role.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Profile_role.php b/classes/Profile_role.php index 74aca37305..bf2c453ed0 100644 --- a/classes/Profile_role.php +++ b/classes/Profile_role.php @@ -48,6 +48,7 @@ class Profile_role extends Memcached_DataObject return Memcached_DataObject::pkeyGet('Profile_role', $kv); } + const OWNER = 'owner'; const MODERATOR = 'moderator'; const ADMINISTRATOR = 'administrator'; const SANDBOXED = 'sandboxed'; From 70a4f8c0e26bfdb76f595ce501c6e84a8011fea8 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 15:15:23 -0500 Subject: [PATCH 108/169] method to get the site owner --- classes/User.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/classes/User.php b/classes/User.php index 6ea975202d..b700496178 100644 --- a/classes/User.php +++ b/classes/User.php @@ -925,4 +925,30 @@ class User extends Memcached_DataObject return $share; } } + + static function siteOwner() + { + $owner = self::cacheGet('user:site_owner'); + + if ($owner === false) { // cache miss + + $pr = new Profile_role(); + + $pr->role = Profile_role::OWNER; + + $pr->orderBy('created'); + + $pr->limit(0, 1); + + if ($pr->fetch($true)) { + $owner = User::staticGet('id', $pr->profile_id); + } else { + $owner = null; + } + + self::cacheSet('user:site_owner', $owner); + } + + return $owner; + } } From a7b2a08c42347d7beac43980a673b434a9c0331a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 15:15:52 -0500 Subject: [PATCH 109/169] for single-user mode, retrieve either site owner or defined nickname --- lib/router.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/router.php b/lib/router.php index be9cfac0c2..ca9f328126 100644 --- a/lib/router.php +++ b/lib/router.php @@ -649,7 +649,16 @@ class Router if (common_config('singleuser', 'enabled')) { - $nickname = common_config('singleuser', 'nickname'); + $user = User::siteOwner(); + + if (!empty($user)) { + $nickname = $user->nickname; + } else { + $nickname = common_config('singleuser', 'nickname'); + if (empty($nickname)) { + throw new ServerException(_("No single user defined for single-user mode.")); + } + } foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'xrds', From 2a054a50fb404b01512a00872ab0f68481b0f470 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 15:33:35 -0500 Subject: [PATCH 110/169] live fast, die young in bash scripts --- scripts/delete_status_network.sh | 4 ++++ scripts/setup_status_network.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/delete_status_network.sh b/scripts/delete_status_network.sh index f55f1486bb..3a8ebdcfd4 100755 --- a/scripts/delete_status_network.sh +++ b/scripts/delete_status_network.sh @@ -1,5 +1,9 @@ #!/bin/bash +# live fast! die young! + +set -e + source /etc/statusnet/setup.cfg export nickname=$1 diff --git a/scripts/setup_status_network.sh b/scripts/setup_status_network.sh index f502a169a2..4ad808011c 100755 --- a/scripts/setup_status_network.sh +++ b/scripts/setup_status_network.sh @@ -1,5 +1,9 @@ #!/bin/bash +# live fast! die young! + +set -e + source /etc/statusnet/setup.cfg # setup_status_net.sh mysite 'My Site' '1user' 'owner@example.com' 'Firsty McLastname' From 8cb8b357a4383f7afb1e09fcd264aa41ac1502a6 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 17:54:54 -0500 Subject: [PATCH 111/169] add hooks for user registration --- EVENTS.txt | 9 +++ classes/User.php | 199 ++++++++++++++++++++++++----------------------- 2 files changed, 112 insertions(+), 96 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 1ed670697b..3317c80dec 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -699,3 +699,12 @@ StartShowContentLicense: Showing the default license for content EndShowContentLicense: Showing the default license for content - $action: the current action + +StartUserRegister: When a new user is being registered +- &$profile: new profile data (no ID) +- &$user: new user account (no ID or URI) + +EndUserRegister: When a new user has been registered +- &$profile: new profile data +- &$user: new user account + diff --git a/classes/User.php b/classes/User.php index b700496178..022044aac1 100644 --- a/classes/User.php +++ b/classes/User.php @@ -209,8 +209,6 @@ class User extends Memcached_DataObject $profile = new Profile(); - $profile->query('BEGIN'); - if(!empty($email)) { $email = common_canonical_email($email); @@ -220,7 +218,7 @@ class User extends Memcached_DataObject $profile->nickname = $nickname; if(! User::allowed_nickname($nickname)){ common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname), - __FILE__); + __FILE__); } $profile->profileurl = common_profile_url($nickname); @@ -248,16 +246,8 @@ class User extends Memcached_DataObject $profile->created = common_sql_now(); - $id = $profile->insert(); - - if (empty($id)) { - common_log_db_error($profile, 'INSERT', __FILE__); - return false; - } - $user = new User(); - $user->id = $id; $user->nickname = $nickname; if (!empty($password)) { // may not have a password for OpenID users @@ -282,109 +272,126 @@ class User extends Memcached_DataObject $user->inboxed = 1; $user->created = common_sql_now(); - $user->uri = common_user_uri($user); - $result = $user->insert(); + if (Event::handle('StartUserRegister', array(&$user, &$profile))) { - if (!$result) { - common_log_db_error($user, 'INSERT', __FILE__); - return false; - } + $profile->query('BEGIN'); - // Everyone gets an inbox + $id = $profile->insert(); - $inbox = new Inbox(); - - $inbox->user_id = $user->id; - $inbox->notice_ids = ''; - - $result = $inbox->insert(); - - if (!$result) { - common_log_db_error($inbox, 'INSERT', __FILE__); - return false; - } - - // Everyone is subscribed to themself - - $subscription = new Subscription(); - $subscription->subscriber = $user->id; - $subscription->subscribed = $user->id; - $subscription->created = $user->created; - - $result = $subscription->insert(); - - if (!$result) { - common_log_db_error($subscription, 'INSERT', __FILE__); - return false; - } - - if (!empty($email) && !$user->email) { - - $confirm = new Confirm_address(); - $confirm->code = common_confirmation_code(128); - $confirm->user_id = $user->id; - $confirm->address = $email; - $confirm->address_type = 'email'; - - $result = $confirm->insert(); - if (!$result) { - common_log_db_error($confirm, 'INSERT', __FILE__); + if (empty($id)) { + common_log_db_error($profile, 'INSERT', __FILE__); return false; } - } - if (!empty($code) && $user->email) { - $user->emailChanged(); - } + $user->id = $id; + $user->uri = common_user_uri($user); - // Default system subscription + $result = $user->insert(); - $defnick = common_config('newuser', 'default'); + if (!$result) { + common_log_db_error($user, 'INSERT', __FILE__); + return false; + } - if (!empty($defnick)) { - $defuser = User::staticGet('nickname', $defnick); - if (empty($defuser)) { - common_log(LOG_WARNING, sprintf("Default user %s does not exist.", $defnick), - __FILE__); - } else { - $defsub = new Subscription(); - $defsub->subscriber = $user->id; - $defsub->subscribed = $defuser->id; - $defsub->created = $user->created; + // Everyone gets an inbox - $result = $defsub->insert(); + $inbox = new Inbox(); + + $inbox->user_id = $user->id; + $inbox->notice_ids = ''; + + $result = $inbox->insert(); + + if (!$result) { + common_log_db_error($inbox, 'INSERT', __FILE__); + return false; + } + + // Everyone is subscribed to themself + + $subscription = new Subscription(); + $subscription->subscriber = $user->id; + $subscription->subscribed = $user->id; + $subscription->created = $user->created; + + $result = $subscription->insert(); + + if (!$result) { + common_log_db_error($subscription, 'INSERT', __FILE__); + return false; + } + + if (!empty($email) && !$user->email) { + + $confirm = new Confirm_address(); + $confirm->code = common_confirmation_code(128); + $confirm->user_id = $user->id; + $confirm->address = $email; + $confirm->address_type = 'email'; + + $result = $confirm->insert(); if (!$result) { - common_log_db_error($defsub, 'INSERT', __FILE__); + common_log_db_error($confirm, 'INSERT', __FILE__); return false; } } - } - - $profile->query('COMMIT'); - - if (!empty($email) && !$user->email) { - mail_confirm_address($user, $confirm->code, $profile->nickname, $email); - } - - // Welcome message - - $welcome = common_config('newuser', 'welcome'); - - if (!empty($welcome)) { - $welcomeuser = User::staticGet('nickname', $welcome); - if (empty($welcomeuser)) { - common_log(LOG_WARNING, sprintf("Welcome user %s does not exist.", $defnick), - __FILE__); - } else { - $notice = Notice::saveNew($welcomeuser->id, - sprintf(_('Welcome to %1$s, @%2$s!'), - common_config('site', 'name'), - $user->nickname), - 'system'); + if (!empty($code) && $user->email) { + $user->emailChanged(); } + + // Default system subscription + + $defnick = common_config('newuser', 'default'); + + if (!empty($defnick)) { + $defuser = User::staticGet('nickname', $defnick); + if (empty($defuser)) { + common_log(LOG_WARNING, sprintf("Default user %s does not exist.", $defnick), + __FILE__); + } else { + $defsub = new Subscription(); + $defsub->subscriber = $user->id; + $defsub->subscribed = $defuser->id; + $defsub->created = $user->created; + + $result = $defsub->insert(); + + if (!$result) { + common_log_db_error($defsub, 'INSERT', __FILE__); + return false; + } + } + } + + $profile->query('COMMIT'); + + if (!empty($email) && !$user->email) { + mail_confirm_address($user, $confirm->code, $profile->nickname, $email); + } + + // Welcome message + + $welcome = common_config('newuser', 'welcome'); + + if (!empty($welcome)) { + $welcomeuser = User::staticGet('nickname', $welcome); + if (empty($welcomeuser)) { + common_log(LOG_WARNING, sprintf("Welcome user %s does not exist.", $defnick), + __FILE__); + } else { + $notice = Notice::saveNew($welcomeuser->id, + sprintf(_('Welcome to %1$s, @%2$s!'), + common_config('site', 'name'), + $user->nickname), + 'system'); + + } + } + + Event::handle('EndUserRegister', array(&$profile, &$user)); } return $user; From 01eb4e8f003bf62575ec16dfb6127d7534be9c88 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Fri, 29 Jan 2010 17:58:15 -0500 Subject: [PATCH 112/169] autoRegister() expects a username existing in ldap, not the suggested_nickname --- lib/authenticationplugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/authenticationplugin.php b/lib/authenticationplugin.php index 17237086c4..f7f8f8655b 100644 --- a/lib/authenticationplugin.php +++ b/lib/authenticationplugin.php @@ -132,7 +132,7 @@ abstract class AuthenticationPlugin extends Plugin //someone already exists with the suggested nickname //not much else we can do }else{ - $user = $this->autoregister($suggested_nickname); + $user = $this->autoRegister($nickname); if($user){ User_username::register($user,$nickname,$this->provider_name); return false; From 8318f195a2997b4e3a4831d65685dca24a2b66aa Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 29 Jan 2010 18:29:51 -0500 Subject: [PATCH 113/169] plugin to limit number of registered users --- plugins/UserLimitPlugin.php | 92 +++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 plugins/UserLimitPlugin.php diff --git a/plugins/UserLimitPlugin.php b/plugins/UserLimitPlugin.php new file mode 100644 index 0000000000..ab3187299e --- /dev/null +++ b/plugins/UserLimitPlugin.php @@ -0,0 +1,92 @@ +. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @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')) { + exit(1); +} + +/** + * Plugin to limit number of users that can register (best for cloud providers) + * + * For cloud providers whose freemium model is based on how many + * users can register. We use it on the StatusNet Cloud. + * + * @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 UserLimitPlugin extends Plugin +{ + public $maxUsers = null; + + function onStartUserRegister(&$user, &$profile) + { + $this->_checkMaxUsers(); + return true; + } + + function onStartRegistrationTry($action) + { + $this->_checkMaxUsers(); + return true; + } + + function _checkMaxUsers() + { + if (!is_null($this->maxUsers)) { + + $cls = new User(); + + $cnt = $cls->count(); + + if ($cnt >= $this->maxUsers) { + $msg = sprintf(_('Cannot register; maximum number of users (%d) reached.'), + $this->maxUsers); + + throw new ClientException($msg); + } + } + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'UserLimit', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:UserLimit', + 'description' => + _m('Limit the number of users who can register.')); + return true; + } +} From 61d4709eb855827e8d15a3e873760e4ad797b45b Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Fri, 29 Jan 2010 20:43:16 -0500 Subject: [PATCH 114/169] Pass username and nickname to autoregister so auth plugins can set the nickname correct when creating a new user. Continues fixing what Eric Helgeson pointed out in 01eb4e8f003bf62575ec16dfb6127d7534be9c88 --- lib/authenticationplugin.php | 12 ++++++++---- .../LdapAuthentication/LdapAuthenticationPlugin.php | 6 +++++- .../ReverseUsernameAuthenticationPlugin.php | 7 +++++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/authenticationplugin.php b/lib/authenticationplugin.php index f7f8f8655b..5be3ea5b90 100644 --- a/lib/authenticationplugin.php +++ b/lib/authenticationplugin.php @@ -69,13 +69,17 @@ abstract class AuthenticationPlugin extends Plugin /** * Automatically register a user when they attempt to login with valid credentials. * User::register($data) is a very useful method for this implementation - * @param username + * @param username username (that is used to login and find the user in the authentication provider) of the user to be registered + * @param nickname nickname of the user in the SN system. If nickname is null, then set nickname = username * @return mixed instance of User, or false (if user couldn't be created) */ - function autoRegister($username) + function autoRegister($username, $nickname = null) { + if(is_null($nickname)){ + $nickname = $username; + } $registration_data = array(); - $registration_data['nickname'] = $username ; + $registration_data['nickname'] = $nickname ; return User::register($registration_data); } @@ -132,7 +136,7 @@ abstract class AuthenticationPlugin extends Plugin //someone already exists with the suggested nickname //not much else we can do }else{ - $user = $this->autoRegister($nickname); + $user = $this->autoRegister($nickname, $suggested_nickname); if($user){ User_username::register($user,$nickname,$this->provider_name); return false; diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 1755033f17..768f0fe7f6 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -96,8 +96,11 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin } } - function autoRegister($username) + function autoRegister($username, $nickname) { + if(is_null($nickname)){ + $nickname = $username; + } $entry = $this->ldap_get_user($username,$this->attributes); if($entry){ $registration_data = array(); @@ -107,6 +110,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin if(isset($registration_data['email']) && !empty($registration_data['email'])){ $registration_data['email_confirmed']=true; } + $registration_data['nickname'] = $nickname; //set the database saved password to a random string. $registration_data['password']=common_good_rand(16); return User::register($registration_data); diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index d9d2137f82..dac5a15884 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -47,10 +47,13 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin return $username == strrev($password); } - function autoRegister($username) + function autoRegister($username, $nickname) { + if(is_null($nickname)){ + $nickname = $username; + } $registration_data = array(); - $registration_data['nickname'] = $username ; + $registration_data['nickname'] = $nickname ; return User::register($registration_data); } From e765a9657b0491c6d4fd6436c9cd489342a465c9 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 30 Jan 2010 18:45:10 +1300 Subject: [PATCH 115/169] move the schema DDL sql off into seperate files for each db we support --- lib/schema.mysql.php | 537 +++++++++++++++++++++++++++++++++++++++++++ lib/schema.pgsql.php | 504 ++++++++++++++++++++++++++++++++++++++++ lib/schema.php | 5 +- 3 files changed, 1045 insertions(+), 1 deletion(-) create mode 100644 lib/schema.mysql.php create mode 100644 lib/schema.pgsql.php diff --git a/lib/schema.mysql.php b/lib/schema.mysql.php new file mode 100644 index 0000000000..1f7c3d0926 --- /dev/null +++ b/lib/schema.mysql.php @@ -0,0 +1,537 @@ +. + * + * @category Database + * @package StatusNet + * @author Evan Prodromou + * @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')) { + exit(1); +} + +/** + * Class representing the database schema + * + * A class representing the database schema. Can be used to + * manipulate the schema -- especially for plugins and upgrade + * utilities. + * + * @category Database + * @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/ + */ + +class MysqlSchema extends Schema +{ + static $_single = null; + protected $conn = null; + + /** + * Constructor. Only run once for singleton object. + */ + + protected function __construct() + { + // XXX: there should be an easier way to do this. + $user = new User(); + + $this->conn = $user->getDatabaseConnection(); + + $user->free(); + + unset($user); + } + + /** + * Main public entry point. Use this to get + * the singleton object. + * + * @return Schema the (single) Schema object + */ + + static function get() + { + if (empty(self::$_single)) { + self::$_single = new Schema(); + } + return self::$_single; + } + + /** + * Returns a TableDef object for the table + * in the schema with the given name. + * + * Throws an exception if the table is not found. + * + * @param string $name Name of the table to get + * + * @return TableDef tabledef for that table. + */ + + public function getTableDef($name) + { + $res = $this->conn->query('DESCRIBE ' . $name); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + $td = new TableDef(); + + $td->name = $name; + $td->columns = array(); + + $row = array(); + + while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { + + $cd = new ColumnDef(); + + $cd->name = $row['Field']; + + $packed = $row['Type']; + + if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) { + $cd->type = $match[1]; + $cd->size = $match[2]; + } else { + $cd->type = $packed; + } + + $cd->nullable = ($row['Null'] == 'YES') ? true : false; + $cd->key = $row['Key']; + $cd->default = $row['Default']; + $cd->extra = $row['Extra']; + + $td->columns[] = $cd; + } + + return $td; + } + + /** + * Gets a ColumnDef object for a single column. + * + * Throws an exception if the table is not found. + * + * @param string $table name of the table + * @param string $column name of the column + * + * @return ColumnDef definition of the column or null + * if not found. + */ + + public function getColumnDef($table, $column) + { + $td = $this->getTableDef($table); + + foreach ($td->columns as $cd) { + if ($cd->name == $column) { + return $cd; + } + } + + return null; + } + + /** + * Creates a table with the given names and columns. + * + * @param string $name Name of the table + * @param array $columns Array of ColumnDef objects + * for new table. + * + * @return boolean success flag + */ + + public function createTable($name, $columns) + { + $uniques = array(); + $primary = array(); + $indices = array(); + + $sql = "CREATE TABLE $name (\n"; + + for ($i = 0; $i < count($columns); $i++) { + + $cd =& $columns[$i]; + + if ($i > 0) { + $sql .= ",\n"; + } + + $sql .= $this->_columnSql($cd); + + switch ($cd->key) { + case 'UNI': + $uniques[] = $cd->name; + break; + case 'PRI': + $primary[] = $cd->name; + break; + case 'MUL': + $indices[] = $cd->name; + break; + } + } + + if (count($primary) > 0) { // it really should be... + $sql .= ",\nconstraint primary key (" . implode(',', $primary) . ")"; + } + + foreach ($uniques as $u) { + $sql .= ",\nunique index {$name}_{$u}_idx ($u)"; + } + + foreach ($indices as $i) { + $sql .= ",\nindex {$name}_{$i}_idx ($i)"; + } + + $sql .= "); "; + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a table from the schema + * + * Throws an exception if the table is not found. + * + * @param string $name Name of the table to drop + * + * @return boolean success flag + */ + + public function dropTable($name) + { + $res = $this->conn->query("DROP TABLE $name"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Adds an index to a table. + * + * If no name is provided, a name will be made up based + * on the table name and column names. + * + * Throws an exception on database error, esp. if the table + * does not exist. + * + * @param string $table Name of the table + * @param array $columnNames Name of columns to index + * @param string $name (Optional) name of the index + * + * @return boolean success flag + */ + + public function createIndex($table, $columnNames, $name=null) + { + if (!is_array($columnNames)) { + $columnNames = array($columnNames); + } + + if (empty($name)) { + $name = "$table_".implode("_", $columnNames)."_idx"; + } + + $res = $this->conn->query("ALTER TABLE $table ". + "ADD INDEX $name (". + implode(",", $columnNames).")"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a named index from a table. + * + * @param string $table name of the table the index is on. + * @param string $name name of the index + * + * @return boolean success flag + */ + + public function dropIndex($table, $name) + { + $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Adds a column to a table + * + * @param string $table name of the table + * @param ColumnDef $columndef Definition of the new + * column. + * + * @return boolean success flag + */ + + public function addColumn($table, $columndef) + { + $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Modifies a column in the schema. + * + * The name must match an existing column and table. + * + * @param string $table name of the table + * @param ColumnDef $columndef new definition of the column. + * + * @return boolean success flag + */ + + public function modifyColumn($table, $columndef) + { + $sql = "ALTER TABLE $table MODIFY COLUMN " . + $this->_columnSql($columndef); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a column from a table + * + * The name must match an existing column. + * + * @param string $table name of the table + * @param string $columnName name of the column to drop + * + * @return boolean success flag + */ + + public function dropColumn($table, $columnName) + { + $sql = "ALTER TABLE $table DROP COLUMN $columnName"; + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Ensures that a table exists with the given + * name and the given column definitions. + * + * If the table does not yet exist, it will + * create the table. If it does exist, it will + * alter the table to match the column definitions. + * + * @param string $tableName name of the table + * @param array $columns array of ColumnDef + * objects for the table + * + * @return boolean success flag + */ + + public function ensureTable($tableName, $columns) + { + // XXX: DB engine portability -> toilet + + try { + $td = $this->getTableDef($tableName); + } catch (Exception $e) { + if (preg_match('/no such table/', $e->getMessage())) { + return $this->createTable($tableName, $columns); + } else { + throw $e; + } + } + + $cur = $this->_names($td->columns); + $new = $this->_names($columns); + + $toadd = array_diff($new, $cur); + $todrop = array_diff($cur, $new); + $same = array_intersect($new, $cur); + $tomod = array(); + + foreach ($same as $m) { + $curCol = $this->_byName($td->columns, $m); + $newCol = $this->_byName($columns, $m); + + if (!$newCol->equals($curCol)) { + $tomod[] = $newCol->name; + } + } + + if (count($toadd) + count($todrop) + count($tomod) == 0) { + // nothing to do + return true; + } + + // For efficiency, we want this all in one + // query, instead of using our methods. + + $phrase = array(); + + foreach ($toadd as $columnName) { + $cd = $this->_byName($columns, $columnName); + + $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd); + } + + foreach ($todrop as $columnName) { + $phrase[] = 'DROP COLUMN ' . $columnName; + } + + foreach ($tomod as $columnName) { + $cd = $this->_byName($columns, $columnName); + + $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd); + } + + $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Returns the array of names from an array of + * ColumnDef objects. + * + * @param array $cds array of ColumnDef objects + * + * @return array strings for name values + */ + + private function _names($cds) + { + $names = array(); + + foreach ($cds as $cd) { + $names[] = $cd->name; + } + + return $names; + } + + /** + * Get a ColumnDef from an array matching + * name. + * + * @param array $cds Array of ColumnDef objects + * @param string $name Name of the column + * + * @return ColumnDef matching item or null if no match. + */ + + private function _byName($cds, $name) + { + foreach ($cds as $cd) { + if ($cd->name == $name) { + return $cd; + } + } + + return null; + } + + /** + * Return the proper SQL for creating or + * altering a column. + * + * Appropriate for use in CREATE TABLE or + * ALTER TABLE statements. + * + * @param ColumnDef $cd column to create + * + * @return string correct SQL for that column + */ + + private function _columnSql($cd) + { + $sql = "{$cd->name} "; + + if (!empty($cd->size)) { + $sql .= "{$cd->type}({$cd->size}) "; + } else { + $sql .= "{$cd->type} "; + } + + if (!empty($cd->default)) { + $sql .= "default {$cd->default} "; + } else { + $sql .= ($cd->nullable) ? "null " : "not null "; + } + + if (!empty($cd->auto_increment)) { + $sql .= " auto_increment "; + } + + if (!empty($cd->extra)) { + $sql .= "{$cd->extra} "; + } + + return $sql; + } +} diff --git a/lib/schema.pgsql.php b/lib/schema.pgsql.php new file mode 100644 index 0000000000..7291106dc2 --- /dev/null +++ b/lib/schema.pgsql.php @@ -0,0 +1,504 @@ +. + * + * @category Database + * @package StatusNet + * @author Evan Prodromou + * @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')) { + exit(1); +} + +/** + * Class representing the database schema + * + * A class representing the database schema. Can be used to + * manipulate the schema -- especially for plugins and upgrade + * utilities. + * + * @category Database + * @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/ + */ + +class PgsqlSchema extends Schema +{ + + /** + * Returns a TableDef object for the table + * in the schema with the given name. + * + * Throws an exception if the table is not found. + * + * @param string $name Name of the table to get + * + * @return TableDef tabledef for that table. + */ + + public function getTableDef($name) + { + $res = $this->conn->query('DESCRIBE ' . $name); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + $td = new TableDef(); + + $td->name = $name; + $td->columns = array(); + + $row = array(); + + while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { + + $cd = new ColumnDef(); + + $cd->name = $row['Field']; + + $packed = $row['Type']; + + if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) { + $cd->type = $match[1]; + $cd->size = $match[2]; + } else { + $cd->type = $packed; + } + + $cd->nullable = ($row['Null'] == 'YES') ? true : false; + $cd->key = $row['Key']; + $cd->default = $row['Default']; + $cd->extra = $row['Extra']; + + $td->columns[] = $cd; + } + + return $td; + } + + /** + * Gets a ColumnDef object for a single column. + * + * Throws an exception if the table is not found. + * + * @param string $table name of the table + * @param string $column name of the column + * + * @return ColumnDef definition of the column or null + * if not found. + */ + + public function getColumnDef($table, $column) + { + $td = $this->getTableDef($table); + + foreach ($td->columns as $cd) { + if ($cd->name == $column) { + return $cd; + } + } + + return null; + } + + /** + * Creates a table with the given names and columns. + * + * @param string $name Name of the table + * @param array $columns Array of ColumnDef objects + * for new table. + * + * @return boolean success flag + */ + + public function createTable($name, $columns) + { + $uniques = array(); + $primary = array(); + $indices = array(); + + $sql = "CREATE TABLE $name (\n"; + + for ($i = 0; $i < count($columns); $i++) { + + $cd =& $columns[$i]; + + if ($i > 0) { + $sql .= ",\n"; + } + + $sql .= $this->_columnSql($cd); + + switch ($cd->key) { + case 'UNI': + $uniques[] = $cd->name; + break; + case 'PRI': + $primary[] = $cd->name; + break; + case 'MUL': + $indices[] = $cd->name; + break; + } + } + + if (count($primary) > 0) { // it really should be... + $sql .= ",\nconstraint primary key (" . implode(',', $primary) . ")"; + } + + foreach ($uniques as $u) { + $sql .= ",\nunique index {$name}_{$u}_idx ($u)"; + } + + foreach ($indices as $i) { + $sql .= ",\nindex {$name}_{$i}_idx ($i)"; + } + + $sql .= "); "; + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a table from the schema + * + * Throws an exception if the table is not found. + * + * @param string $name Name of the table to drop + * + * @return boolean success flag + */ + + public function dropTable($name) + { + $res = $this->conn->query("DROP TABLE $name"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Adds an index to a table. + * + * If no name is provided, a name will be made up based + * on the table name and column names. + * + * Throws an exception on database error, esp. if the table + * does not exist. + * + * @param string $table Name of the table + * @param array $columnNames Name of columns to index + * @param string $name (Optional) name of the index + * + * @return boolean success flag + */ + + public function createIndex($table, $columnNames, $name=null) + { + if (!is_array($columnNames)) { + $columnNames = array($columnNames); + } + + if (empty($name)) { + $name = "$table_".implode("_", $columnNames)."_idx"; + } + + $res = $this->conn->query("ALTER TABLE $table ". + "ADD INDEX $name (". + implode(",", $columnNames).")"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a named index from a table. + * + * @param string $table name of the table the index is on. + * @param string $name name of the index + * + * @return boolean success flag + */ + + public function dropIndex($table, $name) + { + $res = $this->conn->query("ALTER TABLE $table DROP INDEX $name"); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Adds a column to a table + * + * @param string $table name of the table + * @param ColumnDef $columndef Definition of the new + * column. + * + * @return boolean success flag + */ + + public function addColumn($table, $columndef) + { + $sql = "ALTER TABLE $table ADD COLUMN " . $this->_columnSql($columndef); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Modifies a column in the schema. + * + * The name must match an existing column and table. + * + * @param string $table name of the table + * @param ColumnDef $columndef new definition of the column. + * + * @return boolean success flag + */ + + public function modifyColumn($table, $columndef) + { + $sql = "ALTER TABLE $table MODIFY COLUMN " . + $this->_columnSql($columndef); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Drops a column from a table + * + * The name must match an existing column. + * + * @param string $table name of the table + * @param string $columnName name of the column to drop + * + * @return boolean success flag + */ + + public function dropColumn($table, $columnName) + { + $sql = "ALTER TABLE $table DROP COLUMN $columnName"; + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Ensures that a table exists with the given + * name and the given column definitions. + * + * If the table does not yet exist, it will + * create the table. If it does exist, it will + * alter the table to match the column definitions. + * + * @param string $tableName name of the table + * @param array $columns array of ColumnDef + * objects for the table + * + * @return boolean success flag + */ + + public function ensureTable($tableName, $columns) + { + // XXX: DB engine portability -> toilet + + try { + $td = $this->getTableDef($tableName); + } catch (Exception $e) { + if (preg_match('/no such table/', $e->getMessage())) { + return $this->createTable($tableName, $columns); + } else { + throw $e; + } + } + + $cur = $this->_names($td->columns); + $new = $this->_names($columns); + + $toadd = array_diff($new, $cur); + $todrop = array_diff($cur, $new); + $same = array_intersect($new, $cur); + $tomod = array(); + + foreach ($same as $m) { + $curCol = $this->_byName($td->columns, $m); + $newCol = $this->_byName($columns, $m); + + if (!$newCol->equals($curCol)) { + $tomod[] = $newCol->name; + } + } + + if (count($toadd) + count($todrop) + count($tomod) == 0) { + // nothing to do + return true; + } + + // For efficiency, we want this all in one + // query, instead of using our methods. + + $phrase = array(); + + foreach ($toadd as $columnName) { + $cd = $this->_byName($columns, $columnName); + + $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd); + } + + foreach ($todrop as $columnName) { + $phrase[] = 'DROP COLUMN ' . $columnName; + } + + foreach ($tomod as $columnName) { + $cd = $this->_byName($columns, $columnName); + + $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd); + } + + $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); + + $res = $this->conn->query($sql); + + if (PEAR::isError($res)) { + throw new Exception($res->getMessage()); + } + + return true; + } + + /** + * Returns the array of names from an array of + * ColumnDef objects. + * + * @param array $cds array of ColumnDef objects + * + * @return array strings for name values + */ + + private function _names($cds) + { + $names = array(); + + foreach ($cds as $cd) { + $names[] = $cd->name; + } + + return $names; + } + + /** + * Get a ColumnDef from an array matching + * name. + * + * @param array $cds Array of ColumnDef objects + * @param string $name Name of the column + * + * @return ColumnDef matching item or null if no match. + */ + + private function _byName($cds, $name) + { + foreach ($cds as $cd) { + if ($cd->name == $name) { + return $cd; + } + } + + return null; + } + + /** + * Return the proper SQL for creating or + * altering a column. + * + * Appropriate for use in CREATE TABLE or + * ALTER TABLE statements. + * + * @param ColumnDef $cd column to create + * + * @return string correct SQL for that column + */ + + private function _columnSql($cd) + { + $sql = "{$cd->name} "; + + if (!empty($cd->size)) { + $sql .= "{$cd->type}({$cd->size}) "; + } else { + $sql .= "{$cd->type} "; + } + + if (!empty($cd->default)) { + $sql .= "default {$cd->default} "; + } else { + $sql .= ($cd->nullable) ? "null " : "not null "; + } + + if (!empty($cd->auto_increment)) { + $sql .= " auto_increment "; + } + + if (!empty($cd->extra)) { + $sql .= "{$cd->extra} "; + } + + return $sql; + } +} diff --git a/lib/schema.php b/lib/schema.php index a7f64ebed1..164387ff3d 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -75,8 +75,11 @@ class Schema static function get() { + $type = common_config('db', 'type'); if (empty(self::$_single)) { - self::$_single = new Schema(); + include "lib/schema.{$type}.php"; + $class = $type.='Schema'; + self::$_single = new $class(); } return self::$_single; } From 870c83c17de9710800163570cdc5321591e73c34 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 10 Jan 2010 05:21:23 +0000 Subject: [PATCH 116/169] getTableDef() mostly working in postgres --- lib/schema.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/schema.php b/lib/schema.php index 164387ff3d..c1636c21d8 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -97,7 +97,12 @@ class Schema public function getTableDef($name) { - $res = $this->conn->query('DESCRIBE ' . $name); + if(common_config('db','type') == 'pgsql') { + $res = $this->conn->query("select column_default as default, is_nullable as Null, udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'"); + } + else { + $res = $this->conn->query('DESCRIBE ' . $name); + } if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -111,12 +116,16 @@ class Schema $row = array(); while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { + //lower case the keys, because the php postgres driver is case insentive for column names + foreach($row as $k=>$v) { + $row[strtolower($k)] = $row[$k]; + } $cd = new ColumnDef(); - $cd->name = $row['Field']; + $cd->name = $row['field']; - $packed = $row['Type']; + $packed = $row['type']; if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) { $cd->type = $match[1]; @@ -125,9 +134,9 @@ class Schema $cd->type = $packed; } - $cd->nullable = ($row['Null'] == 'YES') ? true : false; + $cd->nullable = ($row['null'] == 'YES') ? true : false; $cd->key = $row['Key']; - $cd->default = $row['Default']; + $cd->default = $row['default']; $cd->extra = $row['Extra']; $td->columns[] = $cd; From 22a6e46b45226647b6e7b9bfdc013e59c4a52428 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 30 Jan 2010 21:22:30 +1300 Subject: [PATCH 117/169] removed describeTable from base class, and fixed it up in pgsql --- lib/schema.pgsql.php | 13 +++++----- lib/schema.php | 60 -------------------------------------------- 2 files changed, 6 insertions(+), 67 deletions(-) diff --git a/lib/schema.pgsql.php b/lib/schema.pgsql.php index 7291106dc2..91bc09667c 100644 --- a/lib/schema.pgsql.php +++ b/lib/schema.pgsql.php @@ -61,7 +61,7 @@ class PgsqlSchema extends Schema public function getTableDef($name) { - $res = $this->conn->query('DESCRIBE ' . $name); + $res = $this->conn->query("select *, column_default as default, is_nullable as Null, udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'"); if (PEAR::isError($res)) { throw new Exception($res->getMessage()); @@ -75,12 +75,12 @@ class PgsqlSchema extends Schema $row = array(); while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { - +// var_dump($row); $cd = new ColumnDef(); - $cd->name = $row['Field']; + $cd->name = $row['field']; - $packed = $row['Type']; + $packed = $row['type']; if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) { $cd->type = $match[1]; @@ -89,14 +89,13 @@ class PgsqlSchema extends Schema $cd->type = $packed; } - $cd->nullable = ($row['Null'] == 'YES') ? true : false; + $cd->nullable = ($row['null'] == 'YES') ? true : false; $cd->key = $row['Key']; - $cd->default = $row['Default']; + $cd->default = $row['default']; $cd->extra = $row['Extra']; $td->columns[] = $cd; } - return $td; } diff --git a/lib/schema.php b/lib/schema.php index c1636c21d8..27a4deda11 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -84,66 +84,6 @@ class Schema return self::$_single; } - /** - * Returns a TableDef object for the table - * in the schema with the given name. - * - * Throws an exception if the table is not found. - * - * @param string $name Name of the table to get - * - * @return TableDef tabledef for that table. - */ - - public function getTableDef($name) - { - if(common_config('db','type') == 'pgsql') { - $res = $this->conn->query("select column_default as default, is_nullable as Null, udt_name as Type, column_name AS Field from INFORMATION_SCHEMA.COLUMNS where table_name = '$name'"); - } - else { - $res = $this->conn->query('DESCRIBE ' . $name); - } - - if (PEAR::isError($res)) { - throw new Exception($res->getMessage()); - } - - $td = new TableDef(); - - $td->name = $name; - $td->columns = array(); - - $row = array(); - - while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { - //lower case the keys, because the php postgres driver is case insentive for column names - foreach($row as $k=>$v) { - $row[strtolower($k)] = $row[$k]; - } - - $cd = new ColumnDef(); - - $cd->name = $row['field']; - - $packed = $row['type']; - - if (preg_match('/^(\w+)\((\d+)\)$/', $packed, $match)) { - $cd->type = $match[1]; - $cd->size = $match[2]; - } else { - $cd->type = $packed; - } - - $cd->nullable = ($row['null'] == 'YES') ? true : false; - $cd->key = $row['Key']; - $cd->default = $row['default']; - $cd->extra = $row['Extra']; - - $td->columns[] = $cd; - } - - return $td; - } /** * Gets a ColumnDef object for a single column. From bb0bf635d881e4238cfce3cbb269b3f70b45b8e3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:03:01 +0100 Subject: [PATCH 118/169] Using form object instead of form_id and find(). Slightly faster and easier to read. --- js/util.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/js/util.js b/js/util.js index b864867fd1..6bc174049a 100644 --- a/js/util.js +++ b/js/util.js @@ -185,13 +185,13 @@ var SN = { // StatusNet dataType: 'xml', timeout: '60000', beforeSend: function(formData) { - if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) { + if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) { form.addClass(SN.C.S.Warning); return false; } form.addClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); NLat = $('#'+SN.C.S.NoticeLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(); @@ -221,9 +221,9 @@ var SN = { // StatusNet }, error: function (xhr, textStatus, errorThrown) { form.removeClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); - $('#'+form_id+' .form_response').remove(); + form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); + form.find('.form_response').remove(); if (textStatus == 'timeout') { form.append('

    Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

    '); } @@ -233,9 +233,9 @@ var SN = { // StatusNet } else { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { - $('#'+form_id).resetForm(); - $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); - SN.U.FormNoticeEnhancements($('#'+form_id)); + form.resetForm(); + form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + SN.U.FormNoticeEnhancements(form); } else { form.append('

    (Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.

    '); @@ -244,7 +244,7 @@ var SN = { // StatusNet } }, success: function(data, textStatus) { - $('#'+form_id+' .form_response').remove(); + form.find('.form_response').remove(); var result; if ($('#'+SN.C.S.Error, data).length > 0) { result = document._importNode($('p', data)[0], true); @@ -290,16 +290,16 @@ var SN = { // StatusNet form.append('

    '+result_title+'

    '); } } - $('#'+form_id).resetForm(); - $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val(''); - $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); - SN.U.FormNoticeEnhancements($('#'+form_id)); + form.resetForm(); + form.find('#'+SN.C.S.NoticeInReplyTo).val(''); + form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + SN.U.FormNoticeEnhancements(form); } }, complete: function(xhr, textStatus) { form.removeClass(SN.C.S.Processing); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); - $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); + form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); From aa3170cf34e2b2120547691e204d5ac3bdfd07aa Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:19:13 +0100 Subject: [PATCH 119/169] Using jQuery chaining in FormNoticeXHR --- js/util.js | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/js/util.js b/js/util.js index 6bc174049a..4818be47e0 100644 --- a/js/util.js +++ b/js/util.js @@ -189,9 +189,11 @@ var SN = { // StatusNet form.addClass(SN.C.S.Warning); return false; } - form.addClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); + form + .addClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .addClass(SN.C.S.Disabled) + .attr(SN.C.S.Disabled, SN.C.S.Disabled); NLat = $('#'+SN.C.S.NoticeLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(); @@ -220,9 +222,11 @@ var SN = { // StatusNet return true; }, error: function (xhr, textStatus, errorThrown) { - form.removeClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); + form + .removeClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .removeClass(SN.C.S.Disabled) + .removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); form.find('.form_response').remove(); if (textStatus == 'timeout') { form.append('

    Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.

    '); @@ -233,8 +237,9 @@ var SN = { // StatusNet } else { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { - form.resetForm(); - form.find('#'+SN.C.S.NoticeDataAttachSelected).remove(); + form + .resetForm() + .find('#'+SN.C.S.NoticeDataAttachSelected).remove(); SN.U.FormNoticeEnhancements(form); } else { @@ -277,8 +282,9 @@ var SN = { // StatusNet else { notices.prepend(notice); } - $('#'+notice.id).css({display:'none'}); - $('#'+notice.id).fadeIn(2500); + $('#'+notice.id) + .css({display:'none'}) + .fadeIn(2500); SN.U.NoticeWithAttachment($('#'+notice.id)); SN.U.NoticeReplyTo($('#'+notice.id)); SN.U.FormXHR($('#'+notice.id+' .form_favor')); @@ -297,9 +303,11 @@ var SN = { // StatusNet } }, complete: function(xhr, textStatus) { - form.removeClass(SN.C.S.Processing); - form.find('#'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); - form.find('#'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + form + .removeClass(SN.C.S.Processing) + .find('#'+SN.C.S.NoticeActionSubmit) + .removeAttr(SN.C.S.Disabled) + .removeClass(SN.C.S.Disabled); $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); From 4d0ee6a41f3cfb2e99dcb92e7b14f3183393f1a5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 30 Jan 2010 15:28:31 +0100 Subject: [PATCH 120/169] Globalized form notice data geo values --- js/util.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/js/util.js b/js/util.js index 4818be47e0..bbc6fdb288 100644 --- a/js/util.js +++ b/js/util.js @@ -178,7 +178,7 @@ var SN = { // StatusNet }, FormNoticeXHR: function(form) { - var NDG, NLat, NLon, NLNS, NLID; + SN.C.I.NoticeDataGeo = {}; form_id = form.attr('id'); form.append(''); form.ajaxForm({ @@ -195,28 +195,28 @@ var SN = { // StatusNet .addClass(SN.C.S.Disabled) .attr(SN.C.S.Disabled, SN.C.S.Disabled); - NLat = $('#'+SN.C.S.NoticeLat).val(); - NLon = $('#'+SN.C.S.NoticeLon).val(); - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(); - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); + SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(); + SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(); + SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); + SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie); if (cookieValue !== null && cookieValue != 'disabled') { cookieValue = JSON.parse(cookieValue); - NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); - NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); + SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); + SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) { - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); + SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); } } if (cookieValue == 'disabled') { - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); } else { - NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); + SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); } return true; @@ -309,13 +309,13 @@ var SN = { // StatusNet .removeAttr(SN.C.S.Disabled) .removeClass(SN.C.S.Disabled); - $('#'+SN.C.S.NoticeLat).val(NLat); - $('#'+SN.C.S.NoticeLon).val(NLon); + $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat); + $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon); if ($('#'+SN.C.S.NoticeLocationNs)) { - $('#'+SN.C.S.NoticeLocationNs).val(NLNS); - $('#'+SN.C.S.NoticeLocationId).val(NLID); + $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS); + $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID); } - $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG); } }); }, From a1c9874a6119774a16917a631a7bb63f73a16ba1 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 30 Jan 2010 12:40:11 -0500 Subject: [PATCH 121/169] better handling of null responses from geonames.org --- plugins/GeonamesPlugin.php | 78 ++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index 52cc9c97f9..589462ed99 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -71,7 +71,7 @@ class GeonamesPlugin extends Plugin $loc = $this->getCache(array('name' => $name, 'language' => $language)); - if (!empty($loc)) { + if ($loc !== false) { $location = $loc; return false; } @@ -87,12 +87,20 @@ class GeonamesPlugin extends Plugin return true; } + if (count($geonames) == 0) { + // no results + $this->setCache(array('name' => $name, + 'language' => $language), + null); + return true; + } + $n = $geonames[0]; $location = new Location(); - $location->lat = (string)$n->lat; - $location->lon = (string)$n->lng; + $location->lat = $this->canonical($n->lat); + $location->lon = $this->canonical($n->lng); $location->names[$language] = (string)$n->name; $location->location_id = (string)$n->geonameId; $location->location_ns = self::LOCATION_NS; @@ -125,7 +133,7 @@ class GeonamesPlugin extends Plugin $loc = $this->getCache(array('id' => $id)); - if (!empty($loc)) { + if ($loc !== false) { $location = $loc; return false; } @@ -157,8 +165,9 @@ class GeonamesPlugin extends Plugin $location->location_id = (string)$last->geonameId; $location->location_ns = self::LOCATION_NS; - $location->lat = (string)$last->lat; - $location->lon = (string)$last->lng; + $location->lat = $this->canonical($last->lat); + $location->lon = $this->canonical($last->lng); + $location->names[$language] = implode(', ', array_reverse($parts)); $this->setCache(array('id' => (string)$last->geonameId), @@ -186,13 +195,15 @@ class GeonamesPlugin extends Plugin function onLocationFromLatLon($lat, $lon, $language, &$location) { - $lat = rtrim($lat, "0"); - $lon = rtrim($lon, "0"); + // Make sure they're canonical + + $lat = $this->canonical($lat); + $lon = $this->canonical($lon); $loc = $this->getCache(array('lat' => $lat, 'lon' => $lon)); - if (!empty($loc)) { + if ($loc !== false) { $location = $loc; return false; } @@ -207,6 +218,14 @@ class GeonamesPlugin extends Plugin return true; } + if (count($geonames) == 0) { + // no results + $this->setCache(array('lat' => $lat, + 'lon' => $lon), + null); + return true; + } + $n = $geonames[0]; $parts = array(); @@ -225,8 +244,8 @@ class GeonamesPlugin extends Plugin $location->location_id = (string)$n->geonameId; $location->location_ns = self::LOCATION_NS; - $location->lat = (string)$lat; - $location->lon = (string)$lon; + $location->lat = $this->canonical($n->lat); + $location->lon = $this->canonical($n->lng); $location->names[$language] = implode(', ', $parts); @@ -264,7 +283,7 @@ class GeonamesPlugin extends Plugin $n = $this->getCache(array('id' => $id, 'language' => $language)); - if (!empty($n)) { + if ($n !== false) { $name = $n; return false; } @@ -278,6 +297,13 @@ class GeonamesPlugin extends Plugin return false; } + if (count($geonames) == 0) { + $this->setCache(array('id' => $id, + 'language' => $language), + null); + return false; + } + $parts = array(); foreach ($geonames as $level) { @@ -412,17 +438,29 @@ class GeonamesPlugin extends Plugin throw new Exception("HTTP error code " . $result->code); } - $document = new SimpleXMLElement($result->getBody()); + $body = $result->getBody(); - if (empty($document)) { - throw new Exception("No results in response"); + if (empty($body)) { + throw new Exception("Empty HTTP body in response"); + } + + // This will throw an exception if the XML is mal-formed + + $document = new SimpleXMLElement($body); + + // No children, usually no results + + $children = $document->children(); + + if (count($children) == 0) { + return array(); } if (isset($document->status)) { throw new Exception("Error #".$document->status['value']." ('".$document->status['message']."')"); } - // Array of elements + // Array of elements, >0 elements return $document->geoname; } @@ -438,4 +476,12 @@ class GeonamesPlugin extends Plugin 'names for locations based on user-provided lat/long pairs.')); return true; } + + function canonical($coord) + { + $coord = rtrim($coord, "0"); + $coord = rtrim($coord, "."); + + return $coord; + } } From 1b7cc3393a6a039d4adcf955b3a79fe3c5cc6f47 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 30 Jan 2010 12:43:00 -0500 Subject: [PATCH 122/169] Use passed-in lat long in geocode.php Don't rewrite the lat-long for a location in geocode.php. --- actions/geocode.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/actions/geocode.php b/actions/geocode.php index 9671d2c276..7fd696baf9 100644 --- a/actions/geocode.php +++ b/actions/geocode.php @@ -52,12 +52,7 @@ class GeocodeAction extends Action } $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('lon'); - $location = Location::fromLatLon($this->lat, $this->lon); - if ($location) { - $this->location = Location::fromId($location->location_id, $location->location_ns); - $this->lat = $this->location->lat; - $this->lon = $this->location->lon; - } + $this->location = Location::fromLatLon($this->lat, $this->lon); return true; } From def5d56ce1582c785cbff7d49103493b293838bb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 30 Jan 2010 12:47:21 -0500 Subject: [PATCH 123/169] add lat, lon, location and remove closing tag from geocode.php --- actions/geocode.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/actions/geocode.php b/actions/geocode.php index 7fd696baf9..e883c6ce41 100644 --- a/actions/geocode.php +++ b/actions/geocode.php @@ -42,6 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ class GeocodeAction extends Action { + var $lat = null; + var $lon = null; + var $location = null; + function prepare($args) { parent::prepare($args); @@ -90,4 +94,3 @@ class GeocodeAction extends Action return true; } } -?> From 4ae31f3476f30cf397c0d768119be3638be6fbf0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 30 Jan 2010 13:15:17 -0500 Subject: [PATCH 124/169] on exceptions, stomp logs the error and reenqueues --- lib/stompqueuemanager.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index ec150bbb6e..6730cd213d 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -31,7 +31,6 @@ require_once 'Stomp.php'; require_once 'Stomp/Exception.php'; - class StompQueueManager extends QueueManager { protected $servers; @@ -41,7 +40,7 @@ class StompQueueManager extends QueueManager protected $control; protected $useTransactions = true; - + protected $sites = array(); protected $subscriptions = array(); @@ -182,7 +181,7 @@ class StompQueueManager extends QueueManager $this->_connect(); return $this->_doEnqueue($object, $queue, $this->defaultIdx); } - + /** * Saves a notice object reference into the queue item table * on the given connection. @@ -354,7 +353,7 @@ class StompQueueManager extends QueueManager } return true; } - + /** * Subscribe to all the queues we're going to need to handle... * @@ -459,7 +458,7 @@ class StompQueueManager extends QueueManager if ($con) { $this->cons[$idx] = $con; $this->disconnect[$idx] = null; - + // now we have to listen to everything... // @fixme refactor this nicer. :P $host = $con->getServer(); @@ -587,7 +586,15 @@ class StompQueueManager extends QueueManager return false; } - $ok = $handler->handle($item); + // If there's an exception when handling, + // log the error and let it get requeued. + + try { + $ok = $handler->handle($item); + } catch (Exception $e) { + $this->_log(LOG_ERR, "Exception on queue $queue: " . $e->getMessage()); + $ok = false; + } if (!$ok) { $this->_log(LOG_WARNING, "Failed handling $info"); @@ -646,7 +653,7 @@ class StompQueueManager extends QueueManager $this->begin($idx); return $shutdown; } - + /** * Set us up with queue subscriptions for a new site added at runtime, * triggered by a broadcast to the 'statusnet-control' topic. From fec8066bf76948142828b689708386861d089fb3 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 30 Jan 2010 14:37:39 -0500 Subject: [PATCH 125/169] error clearing tags for profiles from memcached --- classes/Notice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Notice.php b/classes/Notice.php index a60dd5bcd7..42878d94f1 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -140,7 +140,7 @@ class Notice extends Memcached_DataObject foreach(array_unique($hashtags) as $hashtag) { /* elide characters we don't want in the tag */ $this->saveTag($hashtag); - self::blow('profile:notice_ids_tagged:%d:%s', $this->profile_id, $tag->tag); + self::blow('profile:notice_ids_tagged:%d:%s', $this->profile_id, $hashtag); } return true; } From bd5278302574ae3af87f09e0d8191c95ab93582a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 31 Jan 2010 01:11:16 +0100 Subject: [PATCH 126/169] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 113 +++++---- locale/arz/LC_MESSAGES/statusnet.po | 113 +++++---- locale/bg/LC_MESSAGES/statusnet.po | 113 +++++---- locale/ca/LC_MESSAGES/statusnet.po | 113 +++++---- locale/cs/LC_MESSAGES/statusnet.po | 114 +++++---- locale/de/LC_MESSAGES/statusnet.po | 113 +++++---- locale/el/LC_MESSAGES/statusnet.po | 114 +++++---- locale/en_GB/LC_MESSAGES/statusnet.po | 113 +++++---- locale/es/LC_MESSAGES/statusnet.po | 114 +++++---- locale/fa/LC_MESSAGES/statusnet.po | 113 +++++---- locale/fi/LC_MESSAGES/statusnet.po | 115 +++++---- locale/fr/LC_MESSAGES/statusnet.po | 272 ++++++++++----------- locale/ga/LC_MESSAGES/statusnet.po | 114 +++++---- locale/he/LC_MESSAGES/statusnet.po | 114 +++++---- locale/hsb/LC_MESSAGES/statusnet.po | 113 +++++---- locale/ia/LC_MESSAGES/statusnet.po | 113 +++++---- locale/is/LC_MESSAGES/statusnet.po | 114 +++++---- locale/it/LC_MESSAGES/statusnet.po | 149 ++++++------ locale/ja/LC_MESSAGES/statusnet.po | 127 +++++----- locale/ko/LC_MESSAGES/statusnet.po | 114 +++++---- locale/mk/LC_MESSAGES/statusnet.po | 119 +++++---- locale/nb/LC_MESSAGES/statusnet.po | 113 +++++---- locale/nl/LC_MESSAGES/statusnet.po | 118 +++++---- locale/nn/LC_MESSAGES/statusnet.po | 114 +++++---- locale/pl/LC_MESSAGES/statusnet.po | 119 +++++---- locale/pt/LC_MESSAGES/statusnet.po | 113 +++++---- locale/pt_BR/LC_MESSAGES/statusnet.po | 113 +++++---- locale/ru/LC_MESSAGES/statusnet.po | 119 +++++---- locale/statusnet.po | 107 +++++---- locale/sv/LC_MESSAGES/statusnet.po | 334 +++++++++++++++++++------- locale/te/LC_MESSAGES/statusnet.po | 171 +++++++------ locale/tr/LC_MESSAGES/statusnet.po | 114 +++++---- locale/uk/LC_MESSAGES/statusnet.po | 122 +++++----- locale/vi/LC_MESSAGES/statusnet.po | 114 +++++---- locale/zh_CN/LC_MESSAGES/statusnet.po | 114 +++++---- locale/zh_TW/LC_MESSAGES/statusnet.po | 114 +++++---- 36 files changed, 2586 insertions(+), 2010 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 51e378faca..a816dcef95 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:06+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:16+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -3071,6 +3072,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "الجلسات" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "الإعدادات الأساسية لموقع StatusNet هذا." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "تنقيح الجلسة" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "مكّن تنقيح مُخرجات الجلسة." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "اذف إعدادت الموقع" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق." @@ -3537,10 +3569,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "اذف إعدادت الموقع" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" @@ -3831,84 +3859,64 @@ msgstr "المستخدم" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "الملف الشخصي" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "حد السيرة" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "مستخدمون جدد" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "ترحيب المستخدمين الجدد" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "الاشتراك المبدئي" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "الدعوات" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "الدعوات مُفعلة" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "الجلسات" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "تنقيح الجلسة" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "مكّن تنقيح مُخرجات الجلسة." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4455,11 +4463,16 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "ضبط التصميم" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4549,11 +4562,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرفق" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "تغيير كلمة السر فشل" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "تغيير كلمة السر غير مسموح به" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 1d17767a3f..75b04d3c35 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:09+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:19+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -3069,6 +3070,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "الجلسات" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "الإعدادات الأساسيه لموقع StatusNet هذا." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "تنقيح الجلسة" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "مكّن تنقيح مُخرجات الجلسه." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "اذف إعدادت الموقع" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "يجب أن تكون مسجل الدخول لرؤيه تطبيق." @@ -3535,10 +3567,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "اذف إعدادت الموقع" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" @@ -3829,84 +3857,64 @@ msgstr "المستخدم" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "الملف الشخصي" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "حد السيرة" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "مستخدمون جدد" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "ترحيب المستخدمين الجدد" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "الاشتراك المبدئي" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "الدعوات" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "الدعوات مُفعلة" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "الجلسات" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "تنقيح الجلسة" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "مكّن تنقيح مُخرجات الجلسه." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4453,11 +4461,16 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "ضبط التصميم" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4547,11 +4560,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرفق" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "تغيير كلمه السر فشل" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "تغيير كلمه السر غير مسموح به" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 339b60ee2b..513055266f 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:12+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:22+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Запазване" @@ -3224,6 +3225,37 @@ msgstr "Не може да изпращате съобщения до този msgid "User is already sandboxed." msgstr "Потребителят ви е блокирал." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Сесии" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Основни настройки на тази инсталация на StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Управление на сесии" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Запазване настройките на сайта" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3693,10 +3725,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Запазване настройките на сайта" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4005,88 +4033,68 @@ msgstr "Потребител" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Нови потребители" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Всички абонаменти" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Автоматично абониране за всеки, който се абонира за мен (подходящо за " "ботове)." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Покани" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Поканите са включени" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Сесии" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Управление на сесии" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Одобряване на абонамента" @@ -4668,11 +4676,16 @@ msgstr "Настройка на оформлението" msgid "Paths configuration" msgstr "Настройка на пътищата" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Настройка на оформлението" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4767,12 +4780,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Паролата е записана." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Паролата е записана." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 64ec6a9a13..2152e54c23 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:15+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:24+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -3268,6 +3269,37 @@ msgstr "No pots enviar un missatge a aquest usuari." msgid "User is already sandboxed." msgstr "Un usuari t'ha bloquejat." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessions" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Paràmetres de disseny d'aquest lloc StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Gestiona les sessions" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Depuració de la sessió" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Activa la sortida de depuració per a les sessions." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Desa els paràmetres del lloc" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3744,10 +3776,6 @@ msgstr "" "Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix " "de nou." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Desa els paràmetres del lloc" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Paràmetres de l'SMS" @@ -4061,84 +4089,64 @@ msgstr "Usuari" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Límit de la biografia" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Límit màxim de la biografia d'un perfil (en caràcters)." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Usuaris nous" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Benvinguda als usuaris nous" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Subscripció per defecte" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Subscriviu automàticament els usuaris nous a aquest usuari." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Invitacions" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "S'han habilitat les invitacions" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessions" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Gestiona les sessions" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Depuració de la sessió" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Activa la sortida de depuració per a les sessions." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autoritzar subscripció" @@ -4716,11 +4724,16 @@ msgstr "Configuració del disseny" msgid "Paths configuration" msgstr "Configuració dels camins" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Configuració del disseny" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4815,11 +4828,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "Etiquetes de l'adjunció" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "El canvi de contrasenya ha fallat" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Contrasenya canviada." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index b1113fc304..83985a640d 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:18+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:27+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -64,11 +64,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Uložit" @@ -3218,6 +3219,37 @@ msgstr "Neodeslal jste nám profil" msgid "User is already sandboxed." msgstr "Uživatel nemá profil." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Nastavení" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3693,11 +3725,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Nastavení" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4006,87 +4033,67 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Všechny odběry" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "Odběr autorizován" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Umístění" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizovaný odběr" @@ -4670,11 +4677,16 @@ msgstr "Potvrzení emailové adresy" msgid "Paths configuration" msgstr "Potvrzení emailové adresy" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Potvrzení emailové adresy" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4769,12 +4781,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Heslo uloženo" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Heslo uloženo" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 0b8e9d2cce..d925f47e67 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:21+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:30+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -68,11 +68,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Speichern" @@ -3269,6 +3270,37 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken." msgid "User is already sandboxed." msgstr "Dieser Benutzer hat dich blockiert." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Design-Einstellungen für diese StatusNet-Website." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Site-Einstellungen speichern" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3754,10 +3786,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Site-Einstellungen speichern" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4074,90 +4102,70 @@ msgstr "Benutzer" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Neue Nutzer" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Alle Abonnements" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-" "Menschen)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Einladung(en) verschickt" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Einladung(en) verschickt" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Abonnement bestätigen" @@ -4740,11 +4748,16 @@ msgstr "SMS-Konfiguration" msgid "Paths configuration" msgstr "SMS-Konfiguration" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS-Konfiguration" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4839,12 +4852,12 @@ msgstr "Nachrichten in denen dieser Anhang erscheint" msgid "Tags for this attachment" msgstr "Tags für diesen Anhang" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Passwort geändert" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Passwort geändert" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 7f8f709502..29420e44e6 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:24+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:33+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -3176,6 +3177,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Ρυθμίσεις OpenID" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3644,11 +3676,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Ρυθμίσεις OpenID" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -3948,88 +3975,68 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Νέοι χρήστες" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Όλες οι συνδρομές" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα (χρήση " "κυρίως από λογισμικό και όχι ανθρώπους)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Προσκλήσεις" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Εξουσιοδοτημένη συνδρομή" @@ -4584,11 +4591,16 @@ msgstr "Επιβεβαίωση διεύθυνσης email" msgid "Paths configuration" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Επιβεβαίωση διεύθυνσης email" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4679,12 +4691,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Ο κωδικός αποθηκεύτηκε." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Ο κωδικός αποθηκεύτηκε." diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 82d23affb8..c3d5b7b7bc 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:26+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:36+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Save" @@ -3263,6 +3264,37 @@ msgstr "You cannot sandbox users on this site." msgid "User is already sandboxed." msgstr "User is already sandboxed." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Design settings for this StausNet site." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Save site settings" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3743,10 +3775,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Save site settings" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4058,88 +4086,68 @@ msgstr "User" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "New users" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Default subscription" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Invitation(s) sent" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Invitation(s) sent" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Authorise subscription" @@ -4719,11 +4727,16 @@ msgstr "Design configuration" msgid "Paths configuration" msgstr "SMS confirmation" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Design configuration" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4819,12 +4832,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Password change" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Password change" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 1120aae41c..387c0868ca 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:29+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:39+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -68,11 +68,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -3299,6 +3300,37 @@ msgstr "No puedes enviar mensaje a este usuario." msgid "User is already sandboxed." msgstr "El usuario te ha bloqueado." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sesiones" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Configuración de Avatar" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3781,11 +3813,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Configuración de Avatar" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4104,89 +4131,69 @@ msgstr "Usuario" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nuevos usuarios" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Todas las suscripciones" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor " "para no-humanos)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Invitaciones" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Invitacion(es) enviada(s)" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sesiones" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizar la suscripción" @@ -4770,11 +4777,16 @@ msgstr "SMS confirmación" msgid "Paths configuration" msgstr "SMS confirmación" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS confirmación" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4869,12 +4881,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Cambio de contraseña " -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Cambio de contraseña " diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 8a87af1ada..a6810ee5ba 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-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:35+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:45+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 @@ -64,11 +64,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "ذخیره‌کردن" @@ -3170,6 +3171,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "تنظیمات ظاهری برای این سایت." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3644,10 +3676,6 @@ msgstr "" "چه مدت کاربران باید منتظر بمانند ( به ثانیه ) تا همان چیز را مجددا ارسال " "کنند." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -3942,84 +3970,64 @@ msgstr "کاربر" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "حداکثر طول یک زندگی نامه(در پروفایل) بر حسب کاراکتر." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "خوشامدگویی کاربر جدید" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "پیام خوشامدگویی برای کاربران جدید( حداکثر 255 کاراکتر)" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "دعوت نامه ها" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "دعوت نامه ها فعال شدند" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "خواه به کاربران اجازه ی دعوت کردن کاربران جدید داده شود." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4570,11 +4578,16 @@ msgstr "پیکره بندی اصلی سایت" msgid "Paths configuration" msgstr "" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "پیکره بندی اصلی سایت" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4666,12 +4679,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "تغییر گذرواژه" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "تغییر گذرواژه" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 585165a013..57cd6956eb 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:32+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:42+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -66,11 +66,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Tallenna" @@ -3298,6 +3299,38 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle." msgid "User is already sandboxed." msgstr "Käyttäjä on asettanut eston sinulle." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Ulkoasuasetukset tälle StatusNet palvelulle." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Profiilikuva-asetukset" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3779,11 +3812,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Profiilikuva-asetukset" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4094,91 +4122,71 @@ msgstr "Käyttäjä" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "Kutsu uusia käyttäjiä" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Kaikki tilaukset" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin " "ihmiskäyttäjille)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Kutsu(t) lähetettiin" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Kutsu(t) lähetettiin" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Valtuuta tilaus" @@ -4762,11 +4770,16 @@ msgstr "SMS vahvistus" msgid "Paths configuration" msgstr "SMS vahvistus" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS vahvistus" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4862,12 +4875,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Salasanan vaihto" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Salasanan vaihto" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 299ff63c1b..95aea43dbb 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:38+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:48+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -30,14 +30,12 @@ msgid "Access" msgstr "Accès" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Sauvegarder les paramètres du site" +msgstr "Paramètres d'accès au site" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Créer un compte" +msgstr "Inscription" #: actions/accessadminpanel.php:161 msgid "Private" @@ -66,18 +64,18 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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" +msgstr "Sauvegarder les paramètres d'accès" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -111,9 +109,9 @@ msgid "No such user." msgstr "Utilisateur non trouvé." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%1$s profils bloqués, page %2$d" +msgstr "!%1$s et amis, page %2$d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 @@ -512,19 +510,19 @@ msgstr "" "nouveau." #: actions/apioauthauthorize.php:146 -#, fuzzy msgid "Invalid nickname / password!" -msgstr "Identifiant ou mot de passe incorrect." +msgstr "Identifiant ou mot de passe incorrect !" #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Erreur lors de la configuration de l’utilisateur." +msgstr "" +"Erreur de la base de données lors de la suppression de l'utilisateur de " +"l'application OAuth." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" +msgstr "" +"Erreur de base de donnée en insérant l'utilisateur de l'application OAuth" #: actions/apioauthauthorize.php:231 #, php-format @@ -904,7 +902,6 @@ msgid "Couldn't delete email confirmation." msgstr "Impossible de supprimer le courriel de confirmation." #: actions/confirmaddress.php:144 -#, fuzzy msgid "Confirm address" msgstr "Confirmer l’adresse" @@ -1101,24 +1098,21 @@ msgid "Add to favorites" msgstr "Ajouter aux favoris" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Document non trouvé." +msgstr "Document « %s » non trouvé." #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Modifier votre application" +msgstr "Modifier l'application" #: actions/editapplication.php:66 -#, fuzzy msgid "You must be logged in to edit an application." -msgstr "Vous devez ouvrir une session pour modifier un groupe." +msgstr "Vous devez être connecté pour modifier une application." #: actions/editapplication.php:77 actions/showapplication.php:94 -#, fuzzy msgid "You are not the owner of this application." -msgstr "Vous n'êtes pas membre de ce groupe." +msgstr "Vous n'êtes pas le propriétaire de cette application." #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 #: actions/showapplication.php:87 @@ -1131,60 +1125,52 @@ msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." #: actions/editapplication.php:161 -#, fuzzy msgid "Use this form to edit your application." -msgstr "Remplissez ce formulaire pour modifier les options du groupe." +msgstr "Utilisez ce formulaire pour modifier votre application." #: actions/editapplication.php:177 actions/newapplication.php:159 -#, fuzzy msgid "Name is required." -msgstr "Identique au mot de passe ci-dessus. Requis." +msgstr "Le nom est requis." #: actions/editapplication.php:180 actions/newapplication.php:162 -#, fuzzy msgid "Name is too long (max 255 chars)." -msgstr "Nom complet trop long (maximum de 255 caractères)." +msgstr "Le nom est trop long (maximum de 255 caractères)." #: actions/editapplication.php:183 actions/newapplication.php:165 -#, fuzzy msgid "Description is required." -msgstr "Description" +msgstr "Description requise." #: actions/editapplication.php:191 msgid "Source URL is too long." msgstr "L'URL source est trop longue." #: actions/editapplication.php:197 actions/newapplication.php:182 -#, fuzzy msgid "Source URL is not valid." -msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." +msgstr "URL source invalide." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Organization is required." -msgstr "" +msgstr "Organisation requise." #: actions/editapplication.php:203 actions/newapplication.php:188 -#, fuzzy msgid "Organization is too long (max 255 chars)." -msgstr "Emplacement trop long (maximum de 255 caractères)." +msgstr "Organisation trop longue (maximum de 255 caractères)." #: actions/editapplication.php:206 actions/newapplication.php:191 msgid "Organization homepage is required." -msgstr "" +msgstr "La page d'accueil de l'organisation est requise." #: actions/editapplication.php:215 actions/newapplication.php:203 msgid "Callback is too long." msgstr "Le Callback est trop long." #: actions/editapplication.php:222 actions/newapplication.php:212 -#, fuzzy msgid "Callback URL is not valid." -msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." +msgstr "URL de rappel invalide." #: actions/editapplication.php:255 -#, fuzzy msgid "Could not update application." -msgstr "Impossible de mettre à jour le groupe." +msgstr "Impossible de mettre à jour l'application." #: actions/editgroup.php:56 #, php-format @@ -1860,9 +1846,9 @@ msgid "That is not your Jabber ID." msgstr "Ceci n’est pas votre identifiant Jabber." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Boîte de réception de %s" +msgstr "Boîte de réception de %1$s - page %2$d" #: actions/inbox.php:62 #, php-format @@ -2120,28 +2106,24 @@ msgid "No current status" msgstr "Aucun statut actuel" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Nouvelle application" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Vous devez ouvrir une session pour créer un groupe." +msgstr "Vous devez être connecté pour enregistrer une application." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :" +msgstr "Utilisez ce formulaire pour inscrire une nouvelle application." #: actions/newapplication.php:173 msgid "Source URL is required." -msgstr "" +msgstr "URL source requise." #: actions/newapplication.php:255 actions/newapplication.php:264 -#, fuzzy msgid "Could not create application." -msgstr "Impossible de créer les alias." +msgstr "Impossible de créer l'application." #: actions/newgroup.php:53 msgid "New group" @@ -2258,18 +2240,16 @@ msgid "Nudge sent!" msgstr "Clin d’œil envoyé !" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Vous devez ouvrir une session pour modifier un groupe." +msgstr "Vous devez être connecté pour lister vos applications." #: actions/oauthappssettings.php:74 -#, fuzzy msgid "OAuth applications" -msgstr "Autres options " +msgstr "Applications OAuth" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" -msgstr "" +msgstr "Applications que vous avez enregistré" #: actions/oauthappssettings.php:135 #, php-format @@ -2285,9 +2265,8 @@ 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 "Vous n'êtes pas membre de ce groupe." +msgstr "Vous n'êtes pas un utilisateur de cette application." #: actions/oauthconnectionssettings.php:180 msgid "Unable to revoke access for app: " @@ -2296,7 +2275,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:192 #, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Vous n'avez autorisé aucune application à utiliser votre compte." #: actions/oauthconnectionssettings.php:205 msgid "Developers can edit the registration settings for their applications " @@ -2333,7 +2312,6 @@ msgid "Notice Search" msgstr "Recherche d’avis" #: actions/othersettings.php:60 -#, fuzzy msgid "Other settings" msgstr "Autres paramètres" @@ -3298,19 +3276,48 @@ msgstr "" msgid "User is already sandboxed." msgstr "L’utilisateur est déjà dans le bac à sable." -#: actions/showapplication.php:82 +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessions" + +#: actions/sessionsadminpanel.php:65 #, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Paramètres de conception pour ce site StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Gérer les sessions" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "S’il faut gérer les sessions nous-même." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Déboguage de session" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Activer la sortie de déboguage pour les sessions." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Sauvegarder les paramètres du site" + +#: actions/showapplication.php:82 msgid "You must be logged in to view an application." -msgstr "Vous devez ouvrir une session pour quitter un groupe." +msgstr "Vous devez être connecté pour voir une application." #: actions/showapplication.php:158 -#, fuzzy msgid "Application profile" -msgstr "L’avis n’a pas de profil" +msgstr "Profil de l'application" #: actions/showapplication.php:160 lib/applicationeditform.php:180 msgid "Icon" -msgstr "" +msgstr "Icône" #: actions/showapplication.php:170 actions/version.php:195 #: lib/applicationeditform.php:195 @@ -3318,9 +3325,8 @@ msgid "Name" msgstr "Nom" #: actions/showapplication.php:179 lib/applicationeditform.php:222 -#, fuzzy msgid "Organization" -msgstr "Pagination" +msgstr "Organisation" #: actions/showapplication.php:188 actions/version.php:198 #: lib/applicationeditform.php:209 lib/groupeditform.php:172 @@ -3347,7 +3353,7 @@ msgstr "" #: actions/showapplication.php:241 msgid "Application info" -msgstr "" +msgstr "Informations sur l'application" #: actions/showapplication.php:243 msgid "Consumer key" @@ -3359,16 +3365,15 @@ msgstr "" #: actions/showapplication.php:253 msgid "Request token URL" -msgstr "" +msgstr "URL du jeton de requête" #: actions/showapplication.php:258 msgid "Access token URL" -msgstr "" +msgstr "URL du jeton d'accès" #: actions/showapplication.php:263 -#, fuzzy msgid "Authorize URL" -msgstr "Auteur" +msgstr "Autoriser l'URL" #: actions/showapplication.php:268 msgid "" @@ -3799,10 +3804,6 @@ msgstr "" "Combien de temps (en secondes) les utilisateurs doivent attendre pour poster " "la même chose de nouveau." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Sauvegarder les paramètres du site" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Paramètres SMS" @@ -4121,86 +4122,66 @@ msgstr "Utilisateur" msgid "User settings for this StatusNet site." msgstr "Paramètres des utilisateurs pour ce site StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Limite de bio invalide : doit être numérique." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Limite de bio" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Longueur maximale de la bio d’un profil en caractères." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nouveaux utilisateurs" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Accueil des nouveaux utilisateurs" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" "Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Abonnements par défaut" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Invitations" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Invitations activées" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" "S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessions" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Gérer les sessions" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "S’il faut gérer les sessions nous-même." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Déboguage de session" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Activer la sortie de déboguage pour les sessions." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autoriser l’abonnement" @@ -4766,24 +4747,27 @@ msgid "Design configuration" msgstr "Configuration de la conception" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Configuration des chemins" +msgstr "Configuration utilisateur" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Configuration de la conception" +msgstr "Configuration d'accès" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Configuration des chemins" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Configuration de la conception" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4794,36 +4778,32 @@ msgstr "Modifier votre application" #: lib/applicationeditform.php:184 msgid "Icon for this application" -msgstr "" +msgstr "Icône pour cette application" #: lib/applicationeditform.php:204 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Description du groupe ou du sujet en %d caractères" +msgstr "Décrivez votre application en %d caractères" #: lib/applicationeditform.php:207 -#, fuzzy msgid "Describe your application" -msgstr "Description du groupe ou du sujet" +msgstr "Décrivez votre applications" #: lib/applicationeditform.php:216 -#, fuzzy msgid "Source URL" -msgstr "Source" +msgstr "URL source" #: lib/applicationeditform.php:218 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL du site Web ou blogue du groupe ou sujet " +msgstr "URL de la page d'accueil de cette application" #: lib/applicationeditform.php:224 msgid "Organization responsible for this application" -msgstr "" +msgstr "Organisation responsable de cette application" #: lib/applicationeditform.php:230 -#, fuzzy msgid "URL for the homepage of the organization" -msgstr "URL du site Web ou blogue du groupe ou sujet " +msgstr "URL de la page d'accueil de l'organisation" #: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" @@ -4831,15 +4811,15 @@ msgstr "URL vers laquelle rediriger après l'authentification" #: lib/applicationeditform.php:258 msgid "Browser" -msgstr "" +msgstr "Navigateur" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "Bureau" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Type d'application, navigateur ou bureau" #: lib/applicationeditform.php:297 msgid "Read-only" @@ -4847,7 +4827,7 @@ msgstr "Lecture seule" #: lib/applicationeditform.php:315 msgid "Read-write" -msgstr "" +msgstr "Lecture-écriture" #: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" @@ -4856,9 +4836,8 @@ msgstr "" "écriture" #: lib/applicationlist.php:154 -#, fuzzy msgid "Revoke" -msgstr "Retirer" +msgstr "Révoquer" #: lib/attachmentlist.php:87 msgid "Attachments" @@ -4880,11 +4859,11 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît." msgid "Tags for this attachment" msgstr "Marques de cette pièce jointe" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "La modification du mot de passe a échoué" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "La modification du mot de passe n’est pas autorisée" @@ -5223,13 +5202,12 @@ msgid "Updates by SMS" msgstr "Suivi des avis par SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Connecter" +msgstr "Connexions" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Applications autorisées connectées" #: lib/dberroraction.php:60 msgid "Database error" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 0d9aa81f5c..adcf8316b3 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:41+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:51+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -65,11 +65,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Gardar" @@ -3335,6 +3336,37 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "User is already sandboxed." msgstr "O usuario bloqueoute." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Configuracións de Twitter" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3832,11 +3864,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Configuracións de Twitter" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4150,91 +4177,71 @@ msgstr "Usuario" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "Invitar a novos usuarios" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Tódalas subscricións" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para " "non humáns)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Invitación(s) enviada(s)." -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Invitación(s) enviada(s)." -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Subscrición de autorización." @@ -4834,11 +4841,16 @@ msgstr "Confirmación de SMS" msgid "Paths configuration" msgstr "Confirmación de SMS" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Confirmación de SMS" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4934,12 +4946,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Contrasinal gardada." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Contrasinal gardada." diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 300d382c6c..3cfed46c56 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:43+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:54+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "שמור" @@ -3221,6 +3222,37 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "User is already sandboxed." msgstr "למשתמש אין פרופיל." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "הגדרות" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3695,11 +3727,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "הגדרות" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4007,88 +4034,68 @@ msgstr "מתשמש" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "מחק" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "כל המנויים" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "ההרשמה אושרה" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "מיקום" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "אשר מנוי" @@ -4670,11 +4677,16 @@ msgstr "הרשמות" msgid "Paths configuration" msgstr "הרשמות" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "הרשמות" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4770,12 +4782,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "הסיסמה נשמרה." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "הסיסמה נשמרה." diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 91763d5e1e..d0c81c5bc3 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:46+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:41:57+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Składować" @@ -3070,6 +3071,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Posedźenja" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Designowe nastajenja za tute sydło StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Z posedźenjemi wobchadźeć" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Sydłowe nastajenja składować" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Dyrbiš přizjewjeny być, zo by sej aplikaciju wobhladał." @@ -3532,10 +3564,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Sydłowe nastajenja składować" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "SMS-nastajenja" @@ -3826,84 +3854,64 @@ msgstr "Wužiwar" msgid "User settings for this StatusNet site." msgstr "Wužiwarske nastajenja za sydło StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nowi wužiwarjo" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Powitanje noweho wužiwarja" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Standardny abonement" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Přeprošenja" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Přeprošenja zmóžnjene" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Posedźenja" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Z posedźenjemi wobchadźeć" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4444,11 +4452,16 @@ msgstr "SMS-wobkrućenje" msgid "Paths configuration" msgstr "" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS-wobkrućenje" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4538,11 +4551,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Změnjenje hesła je so njeporadźiło" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Změnjenje hesła njeje dowolene" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 9e3e0f7dbb..de42418c30 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:49+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:01+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -60,11 +60,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Salveguardar" @@ -3269,6 +3270,37 @@ msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito." msgid "User is already sandboxed." msgstr "Usator es ja in cassa de sablo." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Configuration del apparentia de iste sito StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Salveguardar configurationes del sito" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3766,10 +3798,6 @@ msgstr "" "Quante tempore (in secundas) le usatores debe attender ante de poter " "publicar le mesme cosa de novo." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Salveguardar configurationes del sito" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4072,84 +4100,64 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4695,11 +4703,16 @@ msgstr "" msgid "Paths configuration" msgstr "" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Nulle codice de confirmation." + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4791,12 +4804,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Cambio del contrasigno" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Cambio del contrasigno" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 959d4ed1de..67d7825d92 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-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:52+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:04+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -65,11 +65,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Vista" @@ -3265,6 +3266,37 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð." msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Stillingar fyrir mynd" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3738,11 +3770,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Stillingar fyrir mynd" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4051,91 +4078,71 @@ msgstr "Notandi" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg síða" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "Bjóða nýjum notendum að vera með" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Allar áskriftir" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér " "(best fyrir ómannlega notendur)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Boðskort hefur verið sent út" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Boðskort hefur verið sent út" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Heimila áskriftir" @@ -4713,11 +4720,16 @@ msgstr "SMS staðfesting" msgid "Paths configuration" msgstr "SMS staðfesting" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS staðfesting" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4812,12 +4824,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Lykilorðabreyting" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Lykilorðabreyting" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index fa3e40cb27..4a002d1155 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:54+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:07+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -25,14 +25,12 @@ msgid "Access" msgstr "Accesso" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Salva impostazioni" +msgstr "Impostazioni di accesso al sito" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Registra" +msgstr "Registrazione" #: actions/accessadminpanel.php:161 msgid "Private" @@ -63,18 +61,18 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Salva" #: actions/accessadminpanel.php:189 -#, fuzzy msgid "Save access settings" -msgstr "Salva impostazioni" +msgstr "Salva impostazioni di accesso" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -108,9 +106,9 @@ msgid "No such user." msgstr "Utente inesistente." #: actions/all.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "Profili bloccati di %1$s, pagina %2$d" +msgstr "%1$s e amici, pagina %2$d" #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 @@ -484,7 +482,7 @@ msgstr "Gruppi su %s" #: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 msgid "Bad request." -msgstr "" +msgstr "Richiesta non corretta." #: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -506,19 +504,16 @@ msgstr "" "Si è verificato un problema con il tuo token di sessione. Prova di nuovo." #: actions/apioauthauthorize.php:146 -#, fuzzy msgid "Invalid nickname / password!" msgstr "Nome utente o password non valido." #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Errore nell'impostare l'utente." +msgstr "Errore nel database nell'eliminare l'applicazione utente OAuth." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Errore del DB nell'inserire un hashtag: %s" +msgstr "Errore nel database nell'inserire l'applicazione utente OAuth." #: actions/apioauthauthorize.php:231 #, php-format @@ -526,11 +521,13 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"Il token di richiesta %s è stato autorizzato. Scambiarlo con un token di " +"accesso." #: actions/apioauthauthorize.php:241 #, php-format msgid "The request token %s has been denied." -msgstr "" +msgstr "Il token di richiesta %s è stato rifiutato." #: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 @@ -543,11 +540,11 @@ msgstr "Invio del modulo inaspettato." #: actions/apioauthauthorize.php:273 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Un'applicazione vorrebbe collegarsi al tuo account" #: actions/apioauthauthorize.php:290 msgid "Allow or deny access" -msgstr "" +msgstr "Consenti o nega l'accesso" #: actions/apioauthauthorize.php:320 lib/action.php:441 msgid "Account" @@ -568,16 +565,16 @@ msgstr "Password" #: actions/apioauthauthorize.php:338 #, fuzzy msgid "Deny" -msgstr "Aspetto" +msgstr "Nega" #: actions/apioauthauthorize.php:344 #, fuzzy msgid "Allow" -msgstr "Tutto" +msgstr "Consenti" #: actions/apioauthauthorize.php:361 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "Consenti o nega l'accesso alle informazioni del tuo account." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -3269,6 +3266,37 @@ msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito." msgid "User is already sandboxed." msgstr "L'utente è già nella \"sandbox\"." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessioni" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Impostazioni dell'aspetto per questo sito di StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Gestione sessioni" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Indica se gestire autonomamente le sessioni" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Debug delle sessioni" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Abilita il debug per le sessioni" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Salva impostazioni" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3765,10 +3793,6 @@ msgstr "" "Quanto tempo gli utenti devono attendere (in secondi) prima di inviare " "nuovamente lo stesso messaggio" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Salva impostazioni" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Impostazioni SMS" @@ -4083,85 +4107,65 @@ msgstr "Utente" msgid "User settings for this StatusNet site." msgstr "Impostazioni utente per questo sito StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Limite per la biografia non valido. Deve essere numerico." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" "Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Limite biografia" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Lunghezza massima in caratteri della biografia" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nuovi utenti" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Messaggio per nuovi utenti" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Abbonamento predefinito" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Abbonare automaticamente i nuovi utenti a questo utente" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Inviti" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Inviti abilitati" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Indica se consentire agli utenti di invitarne di nuovi" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessioni" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Gestione sessioni" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Indica se gestire autonomamente le sessioni" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Debug delle sessioni" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Abilita il debug per le sessioni" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizza abbonamento" @@ -4741,11 +4745,16 @@ msgstr "Configurazione aspetto" msgid "Paths configuration" msgstr "Configurazione percorsi" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Configurazione aspetto" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4840,11 +4849,11 @@ msgstr "Messaggi in cui appare questo allegato" msgid "Tags for this attachment" msgstr "Etichette per questo allegato" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Modifica della password non riuscita" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "La modifica della password non è permessa" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 4ccde02a10..dc5ae1c665 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:04:57+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:10+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "保存" @@ -3230,6 +3231,37 @@ msgstr "あなたはこのサイトのサンドボックスユーザができま msgid "User is already sandboxed." msgstr "利用者はすでにサンドボックスです。" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "セッション" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "この StatusNet サイトのデザイン設定。" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "セッションの扱い" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "自分達でセッションを扱うのであるかどうか。" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "セッションデバッグ" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "セッションのためのデバッグ出力をオン。" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "サイト設定の保存" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "!!アプリケーションを見るためにはログインしていなければなりません。" @@ -3431,7 +3463,7 @@ msgstr "全てのメンバー" #: actions/showgroup.php:432 msgid "Created" -msgstr "作成されました" +msgstr "作成日" #: actions/showgroup.php:448 #, php-format @@ -3443,7 +3475,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** は %%site.name%% 上のユーザグループです。フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http://en." +"[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en." "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関" "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ" "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))" @@ -3553,7 +3585,7 @@ msgid "" "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** は %%site.name%% 上のアカウントです。フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http://en." +"[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en." "wikipedia.org/wiki/Micro-blogging) サービス。[今すぐ参加](%%%%action.register" "%%%%)して、**%s** のつぶやきなどをフォローしましょう! ([もっと読む](%%%%doc." "help%%%%))" @@ -3566,7 +3598,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" "**%s** は %%site.name%% 上のアカウントです。フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基にした[マイクロブロギング] (http://en." +"[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en." "wikipedia.org/wiki/Micro-blogging) サービス。" #: actions/showstream.php:296 @@ -3728,10 +3760,6 @@ msgstr "" "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな" "いか。" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "サイト設定の保存" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "SMS 設定" @@ -4045,84 +4073,64 @@ msgstr "利用者" msgid "User settings for this StatusNet site." msgstr "この StatusNet サイトの利用者設定。" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "不正な自己紹介制限。数字である必要があります。" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "不正なウェルカムテキスト。最大長は255字です。" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "不正なデフォルトフォローです: '%1$s' は利用者ではありません。" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "プロファイル" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "自己紹介制限" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "プロファイル自己紹介の最大文字長。" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "新しい利用者" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "新しい利用者を歓迎" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "新しい利用者へのウェルカムテキスト (最大255字)。" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "デフォルトフォロー" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "自動的にこの利用者に新しい利用者をフォローしてください。" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "招待" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "招待が可能" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "利用者が新しい利用者を招待するのを許容するかどうか。" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "セッション" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "セッションの扱い" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "自分達でセッションを扱うのであるかどうか。" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "セッションデバッグ" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "セッションのためのデバッグ出力をオン。" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "フォローを承認" @@ -4687,11 +4695,16 @@ msgstr "アクセス設定" msgid "Paths configuration" msgstr "パス設定" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "デザイン設定" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4783,11 +4796,11 @@ msgstr "この添付が現れるつぶやき" msgid "Tags for this attachment" msgstr "この添付のタグ" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "パスワード変更に失敗しました" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "パスワード変更は許可されていません" @@ -5228,7 +5241,7 @@ msgstr "投稿が多いグループ" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "%s グループの通知にあるタグ" +msgstr "%s グループのつぶやきにあるタグ" #: lib/htmloutputter.php:103 msgid "This page is not available in a media type you accept" @@ -5828,7 +5841,7 @@ msgstr "利用者ＩＤ" #: lib/profileaction.php:183 msgid "Member since" -msgstr "からのメンバー" +msgstr "利用開始日" #: lib/profileaction.php:245 msgid "All groups" @@ -6001,7 +6014,7 @@ msgstr "この利用者をアンサイレンス" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "このユーザからのフォローを解除する" +msgstr "この利用者からのフォローを解除する" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 10febefa16..9b939636ad 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:00+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:13+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "저장" @@ -3281,6 +3282,37 @@ msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." msgid "User is already sandboxed." msgstr "회원이 당신을 차단해왔습니다." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "아바타 설정" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3761,11 +3793,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "아바타 설정" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4072,89 +4099,69 @@ msgstr "이용자" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "새 사용자를 초대" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "모든 예약 구독" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "나에게 구독하는 사람에게 자동 구독 신청" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "초대권을 보냈습니다" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "초대권을 보냈습니다" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "구독을 허가" @@ -4739,11 +4746,16 @@ msgstr "SMS 인증" msgid "Paths configuration" msgstr "SMS 인증" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS 인증" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4839,12 +4851,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "비밀번호 변경" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "비밀번호 변경" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index e0b3f2b2be..acd8005c50 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:04+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:17+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Зачувај" @@ -507,12 +508,10 @@ msgid "Invalid nickname / password!" msgstr "Погрешен прекар / лозинка!" #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." msgstr "Грешка при бришењето на корисникот на OAuth-програмот." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "" "Грешка во базата на податоци при вметнувањето на корисникот на OAuth-" @@ -3254,6 +3253,37 @@ msgstr "Не можете да ставате корисници во песоч msgid "User is already sandboxed." msgstr "Корисникот е веќе во песочен режим." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Сесии" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Нагодувања на изгледот на оваа StatusNet веб-страница." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Раководење со сесии" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Дали самите да си раководиме со сесиите." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Поправка на грешки во сесија" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Вклучи извод од поправка на грешки за сесии." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Зачувај нагодувања на веб-страницата" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Мора да сте најавени за да можете да го видите програмот." @@ -3754,10 +3784,6 @@ msgstr "" "Колку долго треба да почекаат корисниците (во секунди) за да можат повторно " "да го објават истото." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Зачувај нагодувања на веб-страницата" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Нагодувања за СМС" @@ -4070,84 +4096,64 @@ msgstr "Корисник" msgid "User settings for this StatusNet site." msgstr "Кориснички нагодувања за оваа StatusNet веб-страница." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Неважечко ограничување за биографијата. Мора да е бројчено." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "НЕважечки текст за добредојде. Дозволени се највеќе 255 знаци." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Неважечки опис по основно: „%1$s“ не е корисник." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Ограничување за биографијата" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Максимална големина на профилната биографија во знаци." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Нови корисници" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Добредојде за нов корисник" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Текст за добредојде на нови корисници (највеќе до 255 знаци)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Основно-зададена претплата" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Автоматски претплатувај нови корисници на овој корисник." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Покани" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Поканите се овозможени" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Дали да им е дозволено на корисниците да канат други корисници." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Сесии" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Раководење со сесии" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Дали самите да си раководиме со сесиите." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Поправка на грешки во сесија" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Вклучи извод од поправка на грешки за сесии." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Одобрете ја претплатата" @@ -4727,14 +4733,21 @@ msgstr "Конфигурација на пристапот" msgid "Paths configuration" msgstr "Конфигурација на патеки" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Конфигурација на изгледот" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"API-ресурсот бара да може и да чита и да запишува, а вие можете само да " +"читате." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" -msgstr "" +msgstr "Неуспешен обид за API-заверка, прекар = %1$s, прокси = %2$s, IP = %3$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4822,11 +4835,11 @@ msgstr "Забелешки кадешто се јавува овој прило msgid "Tags for this attachment" msgstr "Ознаки за овој прилог" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Менувањето на лозинката не успеа" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Менувањето на лозинка не е дозволено" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index c0be6a5cd3..ef35a39b16 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/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-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:07+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:20+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Lagre" @@ -3214,6 +3215,37 @@ msgstr "Du er allerede logget inn!" msgid "User is already sandboxed." msgstr "Du er allerede logget inn!" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Innstillinger for IM" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3687,11 +3719,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Innstillinger for IM" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -3994,89 +4021,69 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "slett" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Alle abonnementer" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Bekreftelseskode" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autoriser abonnementet" @@ -4630,11 +4637,15 @@ msgstr "" msgid "Paths configuration" msgstr "" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +msgid "Sessions configuration" +msgstr "" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4730,12 +4741,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Passordet ble lagret" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Passordet ble lagret" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 9594c08b54..9de175f9ae 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:12+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:26+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -60,11 +60,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Opslaan" @@ -513,14 +514,12 @@ msgid "Invalid nickname / password!" msgstr "Ongeldige gebruikersnaam of wachtwoord." #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." msgstr "" "Er is een databasefout opgetreden tijdens het verwijderen van de OAuth " "applicatiegebruiker." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "" "Er is een databasefout opgetreden tijdens het toevoegen van de OAuth " @@ -3276,6 +3275,37 @@ msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen." msgid "User is already sandboxed." msgstr "Deze gebruiker is al in de zandbak geplaatst." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessies" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Instellingen voor de vormgeving van deze StatusNet-website." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Sessieafhandeling" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Of sessies door de software zelf afgehandeld moeten worden." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Sessies debuggen" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Debuguitvoer voor sessies inschakelen." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Websiteinstellingen opslaan" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken." @@ -3780,10 +3810,6 @@ msgstr "" "Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen " "zenden." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Websiteinstellingen opslaan" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "SMS-instellingen" @@ -4099,84 +4125,64 @@ msgstr "Gebruiker" msgid "User settings for this StatusNet site." msgstr "Gebruikersinstellingen voor deze StatusNet-website." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Profiellimiet" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "De maximale lengte van de profieltekst in tekens." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nieuwe gebruikers" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Welkom voor nieuwe gebruikers" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Standaardabonnement" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Uitnodigingen" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Uitnodigingen ingeschakeld" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessies" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Sessieafhandeling" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Of sessies door de software zelf afgehandeld moeten worden." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Sessies debuggen" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Debuguitvoer voor sessies inschakelen." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Abonneren" @@ -4765,14 +4771,22 @@ msgstr "Toegangsinstellingen" msgid "Paths configuration" msgstr "Padinstellingen" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Instellingen vormgeving" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " +"maar leestoegang." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" +"De API-authenticatie is mislukt. nickname = %1$s, proxy - %2$s, ip = %3$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4860,11 +4874,11 @@ msgstr "Mededelingen die deze bijlage bevatten" msgid "Tags for this attachment" msgstr "Labels voor deze bijlage" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Wachtwoord wijzigen is mislukt" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Wachtwoord wijzigen is niet toegestaan" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index c2959eb32b..934c0e32df 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:09+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:23+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Lagra" @@ -3294,6 +3295,37 @@ msgstr "Du kan ikkje sende melding til denne brukaren." msgid "User is already sandboxed." msgstr "Brukar har blokkert deg." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Avatar-innstillingar" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3774,11 +3806,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Avatar-innstillingar" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4089,90 +4116,70 @@ msgstr "Brukar" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "Invitér nye brukarar" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Alle tingingar" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "" "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Invitasjon(er) sendt" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Invitasjon(er) sendt" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autoriser tinging" @@ -4756,11 +4763,16 @@ msgstr "SMS bekreftelse" msgid "Paths configuration" msgstr "SMS bekreftelse" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS bekreftelse" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4856,12 +4868,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Endra passord" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Endra passord" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index a50e63f492..02a3face1a 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-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:15+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:30+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Zapisz" @@ -508,12 +509,10 @@ msgid "Invalid nickname / password!" msgstr "Nieprawidłowy pseudonim/hasło." #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." msgstr "Błąd bazy danych podczas usuwania użytkownika aplikacji OAuth." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth." @@ -3229,6 +3228,37 @@ msgstr "Nie można ograniczać użytkowników na tej stronie." msgid "User is already sandboxed." msgstr "Użytkownik jest już ograniczony." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sesje" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Ustawienia wyglądu tej strony StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Obsługa sesji" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Czy samodzielnie obsługiwać sesje." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Debugowanie sesji" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Włącza wyjście debugowania dla sesji." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Zapisz ustawienia strony" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Musisz być zalogowany, aby wyświetlić aplikację." @@ -3726,10 +3756,6 @@ msgstr "" "Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to " "samo." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Zapisz ustawienia strony" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Ustawienia SMS" @@ -4044,84 +4070,64 @@ msgstr "Użytkownik" msgid "User settings for this StatusNet site." msgstr "Ustawienia użytkownika dla tej strony StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Ograniczenie informacji o sobie" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Maksymalna długość informacji o sobie jako liczba znaków." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nowi użytkownicy" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Powitanie nowego użytkownika" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Domyślna subskrypcja" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Zaproszenia" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Zaproszenia są włączone" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sesje" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Obsługa sesji" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Czy samodzielnie obsługiwać sesje." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Debugowanie sesji" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Włącza wyjście debugowania dla sesji." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Upoważnij subskrypcję" @@ -4700,14 +4706,23 @@ msgstr "Konfiguracja dostępu" msgid "Paths configuration" msgstr "Konfiguracja ścieżek" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Konfiguracja wyglądu" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " +"do odczytu." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" +"Próba uwierzytelnienia API nie powiodła się, pseudonim = %1$s, pośrednik = %2" +"$s, IP = %3$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4795,11 +4810,11 @@ msgstr "Powiadamia, kiedy pojawia się ten załącznik" msgid "Tags for this attachment" msgstr "Znaczniki dla tego załącznika" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Zmiana hasła nie powiodła się" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Zmiana hasła nie jest dozwolona" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 2a804d1e42..178f0c5814 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:18+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:34+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Gravar" @@ -3263,6 +3264,37 @@ msgstr "Não pode impedir notas públicas neste site." msgid "User is already sandboxed." msgstr "Utilizador já está impedido de criar notas públicas." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessões" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Configurações do estilo deste site StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Gerir sessões" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Se devemos gerir sessões nós próprios." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Depuração de sessões" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Ligar a impressão de dados de depuração, para sessões." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Gravar configurações do site" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3761,10 +3793,6 @@ msgstr "" "Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a " "mesma coisa outra vez." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Gravar configurações do site" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Configurações de SMS" @@ -4079,84 +4107,64 @@ msgstr "Utilizador" msgid "User settings for this StatusNet site." msgstr "Configurações do utilizador para este site StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Limite da biografia inválido. Tem de ser numérico." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Limite da Biografia" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Tamanho máximo de uma biografia em caracteres." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Utilizadores novos" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Boas-vindas a utilizadores novos" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Subscrição predefinida" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Novos utilizadores subscrevem automaticamente este utilizador." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Convites" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Convites habilitados" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessões" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Gerir sessões" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Se devemos gerir sessões nós próprios." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Depuração de sessões" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Ligar a impressão de dados de depuração, para sessões." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizar subscrição" @@ -4735,11 +4743,16 @@ msgstr "Configuração do estilo" msgid "Paths configuration" msgstr "Configuração das localizações" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Configuração do estilo" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4834,11 +4847,11 @@ msgstr "Notas em que este anexo aparece" msgid "Tags for this attachment" msgstr "Categorias para este anexo" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Não foi possível mudar a palavra-chave" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Não é permitido mudar a palavra-chave" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index bc6bb997fc..6d8a577e78 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:21+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:37+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -62,11 +62,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Salvar" @@ -3264,6 +3265,37 @@ msgstr "Você não pode colocar usuários deste site em isolamento." msgid "User is already sandboxed." msgstr "O usuário já está em isolamento." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessões" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Configurações da aparência deste site StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Gerenciar sessões" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Define se nós cuidamos do gerenciamento das sessões." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Depuração da sessão" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Ativa a saída de depuração para as sessões." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Salvar as configurações do site" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Você deve estar autenticado para visualizar uma aplicação." @@ -3762,10 +3794,6 @@ msgstr "" "Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma " "coisa novamente." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Salvar as configurações do site" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Configuração do SMS" @@ -4078,85 +4106,65 @@ msgstr "Usuário" msgid "User settings for this StatusNet site." msgstr "Configurações de usuário para este site StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Limite da descrição inválido. Seu valor deve ser numérico." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" "Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Assinatura padrão inválida: '%1$s' não é um usuário." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Limite da descrição" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Comprimento máximo da descrição do perfil, em caracteres." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Novos usuários" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Boas vindas aos novos usuários" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Assinatura padrão" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Os novos usuários assinam esse usuário automaticamente." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Convites" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Convites habilitados" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Define se os usuários podem ou não convidar novos usuários." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessões" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Gerenciar sessões" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Define se nós cuidamos do gerenciamento das sessões." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Depuração da sessão" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Ativa a saída de depuração para as sessões." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Autorizar a assinatura" @@ -4736,11 +4744,16 @@ msgstr "Configuração da aparência" msgid "Paths configuration" msgstr "Configuração dos caminhos" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Configuração da aparência" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4831,11 +4844,11 @@ msgstr "Mensagens onde este anexo aparece" msgid "Tags for this attachment" msgstr "Etiquetas para este anexo" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Não foi possível alterar a senha" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Não é permitido alterar a senha" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 4d84af8fd2..8e501c51ca 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:24+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:40+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Сохранить" @@ -509,12 +510,10 @@ msgid "Invalid nickname / password!" msgstr "Неверное имя или пароль." #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." msgstr "Ошибка базы данных при удалении пользователя приложения OAuth." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth." @@ -3244,6 +3243,37 @@ msgstr "" msgid "User is already sandboxed." msgstr "Пользователь уже в режиме песочницы." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Сессии" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Настройки оформления для этого сайта StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Управление сессиями" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Управлять ли сессиями самостоятельно." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Отладка сессий" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Включить отладочный вывод для сессий." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Сохранить настройки сайта" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Вы должны авторизоваться, чтобы просматривать приложения." @@ -3743,10 +3773,6 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" "Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Сохранить настройки сайта" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Установки СМС" @@ -4062,85 +4088,65 @@ msgstr "Пользователь" msgid "User settings for this StatusNet site." msgstr "Пользовательские настройки для этого сайта StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Неверное ограничение биографии. Должно быть числом." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" "Неверный текст приветствия. Максимальная длина составляет 255 символов." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Ограничение биографии" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Максимальная длина биографии профиля в символах." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Новые пользователи" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Приветствие новым пользователям" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Текст приветствия для новых пользователей (максимум 255 символов)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Подписка по умолчанию" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Автоматически подписывать новых пользователей на этого пользователя." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Приглашения" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Приглашения включены" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Разрешать ли пользователям приглашать новых пользователей." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Сессии" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Управление сессиями" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Управлять ли сессиями самостоятельно." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Отладка сессий" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Включить отладочный вывод для сессий." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Авторизовать подписку" @@ -4716,14 +4722,23 @@ msgstr "Конфигурация доступа" msgid "Paths configuration" msgstr "Конфигурация путей" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Конфигурация оформления" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"API ресурса требует доступ для чтения и записи, но у вас есть только доступ " +"для чтения." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" +"Неудачная попытка авторизации через API, nickname = %1$s, proxy = %2$s, ip = " +"%3$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4811,11 +4826,11 @@ msgstr "Сообщает, где появляется это вложение" msgid "Tags for this attachment" msgstr "Теги для этого вложения" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Изменение пароля не удалось" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Смена пароля не разрешена" diff --git a/locale/statusnet.po b/locale/statusnet.po index 0d7fd84252..6f6f1e58ba 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-28 23:04+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,11 +56,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -3052,6 +3053,36 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3514,10 +3545,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "" @@ -3808,84 +3835,64 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4424,11 +4431,15 @@ msgstr "" msgid "Paths configuration" msgstr "" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +msgid "Sessions configuration" +msgstr "" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4518,11 +4529,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 21beffe86e..de78d46d82 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:27+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:45+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -25,14 +25,12 @@ msgid "Access" msgstr "Åtkomst" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "Spara webbplatsinställningar" +msgstr "Inställningar för webbplatsåtkomst" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" -msgstr "Registrera" +msgstr "Registrering" #: actions/accessadminpanel.php:161 msgid "Private" @@ -62,18 +60,18 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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" +msgstr "Spara inställningar för åtkomst" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 @@ -503,12 +501,10 @@ msgid "Invalid nickname / password!" msgstr "Ogiltigt smeknamn / lösenord!" #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." msgstr "Databasfel vid borttagning av OAuth-applikationsanvändare." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "Databasfel vid infogning av OAuth-applikationsanvändare." @@ -1081,12 +1077,11 @@ msgid "Add to favorites" msgstr "Lägg till i favoriter" #: actions/doc.php:155 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Inget sådant dokument." +msgstr "Inget sådant dokument \"%s\"" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "Redigera applikation" @@ -1823,9 +1818,9 @@ msgid "That is not your Jabber ID." msgstr "Detta är inte ditt Jabber-ID." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Inkorg för %s" +msgstr "Inkorg för %1$s - sida %2$d" #: actions/inbox.php:62 #, php-format @@ -1949,6 +1944,32 @@ msgid "" "\n" "Sincerely, %2$s\n" msgstr "" +"%1$s har bjudit in dig till dem på %2$s (%3$s).\n" +"\n" +"%2$s är en mikrobloggtjänst som låter dig hålla dig uppdaterad med folk du " +"känner och folk som intresserar dig . \n" +"\n" +"Du kan också dela nyheter om dig själv, dina tankar, eller ditt liv online " +"med folk som känner till dig. Det är också bra för att träffa nya människor " +"som delar dina intressen.\n" +"\n" +"%1$s sa:\n" +"\n" +"%4$s\n" +"\n" +"Du kan se %1$ss profilsida på %2$s här: \n" +"\n" +"%5$s\n" +"\n" +"Om du vill prova tjänsten, klicka på länken nedan för att acceptera " +"inbjudan. \n" +"\n" +"%6$s\n" +"\n" +"Om inte, kan du bortse från detta meddelande. Tack för ditt tålamod och din " +"tid\n" +"\n" +"Vänliga hälsningar, %2$s\n" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." @@ -2046,7 +2067,6 @@ msgid "No current status" msgstr "Ingen aktuell status" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "Ny applikation" @@ -2306,9 +2326,9 @@ msgid "Login token expired." msgstr "Inloggnings-token förfallen." #: actions/outbox.php:58 -#, fuzzy, php-format +#, php-format msgid "Outbox for %1$s - page %2$d" -msgstr "Utkorg för %s" +msgstr "Utkorg för %1$s - sida %2$d" #: actions/outbox.php:61 #, php-format @@ -3037,6 +3057,20 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" +"Grattis, %1$s! Och välkommen till %%%%site.name%%%%. Härifrån kan du...\n" +"\n" +"* Gå till [din profil](%2$s) och skicka ditt första meddelande.\n" +"* Lägg till en [Jabber/GTalk-adress](%%%%action.imsettings%%%%) så att du " +"kan skicka notiser via snabbmeddelanden.\n" +"* [Söka efter personer](%%%%action.peoplesearch%%%%) som du kanske känner " +"eller som delar dina intressen. \n" +"* Uppdatera dina [profilinställningar](%%%%action.profilesettings%%%%) för " +"att berätta mer om dig. \n" +"* Läs igenom [online-dokumentationen](%%%%doc.help%%%%) för funktioner du " +"kan ha missat. \n" +"\n" +"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda " +"denna tjänst." #: actions/register.php:562 msgid "" @@ -3136,9 +3170,9 @@ msgid "Replies to %s" msgstr "Svarat till %s" #: actions/replies.php:127 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "Svar till %1$s på %2$s" +msgstr "Svar till %1$s, sida %2$s" #: actions/replies.php:144 #, php-format @@ -3195,6 +3229,37 @@ msgstr "Du kan inte flytta användare till sandlådan på denna webbplats." msgid "User is already sandboxed." msgstr "Användare är redan flyttad till sandlådan." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Sessioner" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Utseendeinställningar för denna StatusNet-webbplats." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Hantera sessioner" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Hurvida sessioner skall hanteras av oss själva." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Sessionsfelsökning" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Sätt på felsökningsutdata för sessioner." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Spara webbplatsinställningar" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Du måste vara inloggad för att se en applikation." @@ -3272,9 +3337,9 @@ msgstr "" "klartextsignatur." #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%ss favoritnotiser" +msgstr "%1$ss favoritnotiser, sida %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3334,9 +3399,9 @@ msgid "%s group" msgstr "%s grupp" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s gruppmedlemmar, sida %2$d" +msgstr "%1$s grupp, sida %2$d" #: actions/showgroup.php:218 msgid "Group profile" @@ -3458,9 +3523,9 @@ msgid " tagged %s" msgstr "taggade %s" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s blockerade profiler, sida %2$d" +msgstr "%1$s, sida %2$d" #: actions/showstream.php:122 #, php-format @@ -3688,10 +3753,6 @@ 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:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Spara webbplatsinställningar" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Inställningar för SMS" @@ -3897,9 +3958,9 @@ msgid "SMS" msgstr "SMS" #: actions/tag.php:68 -#, fuzzy, php-format +#, 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" +msgstr "Notiser taggade med %1$s, sida %2$d" #: actions/tag.php:86 #, php-format @@ -4006,86 +4067,66 @@ msgstr "Användare" msgid "User settings for this StatusNet site." msgstr "Användarinställningar för denna StatusNet-webbplats" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Ogiltig begränsning av biografi. Måste vara numerisk." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Begränsning av biografi" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Maximal teckenlängd av profilbiografi." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Nya användare" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Välkomnande av ny användare" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Välkomsttext för nya användare (max 255 tecken)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Standardprenumerationer" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" "Lägg automatiskt till en prenumeration på denna användare för alla nya " "användare." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Inbjudningar" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Inbjudningar aktiverade" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "Hurvida användare skall tillåtas bjuda in nya användare." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Sessioner" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Hantera sessioner" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Hurvida sessioner skall hanteras av oss själva." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Sessionsfelsökning" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Sätt på felsökningsutdata för sessioner." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Godkänn prenumeration" @@ -4204,9 +4245,9 @@ msgid "Enjoy your hotdog!" msgstr "Smaklig måltid!" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s gruppmedlemmar, sida %2$d" +msgstr "%1$s grupper, sida %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4375,9 +4416,8 @@ msgid "Problem saving notice." msgstr "Problem med att spara notis." #: classes/Notice.php:790 -#, fuzzy msgid "Problem saving group inbox." -msgstr "Problem med att spara notis." +msgstr "Problem med att spara gruppinkorg." #: classes/Notice.php:850 #, php-format @@ -4568,7 +4608,7 @@ msgstr "" #: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " -msgstr "**%%site.name%%** är en mikrobloggtjänst." +msgstr "**%%site.name%%** är en mikrobloggtjänst. " #: lib/action.php:786 #, php-format @@ -4588,16 +4628,17 @@ msgstr "Licens för webbplatsinnehåll" #: lib/action.php:806 #, php-format msgid "Content and data of %1$s are private and confidential." -msgstr "" +msgstr "Innehåll och data av %1$s är privat och konfidensiell." #: lib/action.php:811 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." -msgstr "" +msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade." #: lib/action.php:814 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade." #: lib/action.php:826 msgid "All " @@ -4648,27 +4689,33 @@ msgid "Design configuration" msgstr "Konfiguration av utseende" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "Konfiguration av sökvägar" +msgstr "Konfiguration av användare" #: lib/adminpanelaction.php:327 -#, fuzzy msgid "Access configuration" -msgstr "Konfiguration av utseende" +msgstr "Konfiguration av åtkomst" #: lib/adminpanelaction.php:332 msgid "Paths configuration" msgstr "Konfiguration av sökvägar" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Konfiguration av utseende" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" +"Misslyckat försök till API-autentisering, smeknamn =%1$s, proxy =%2$s, ip =%3" +"$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4756,11 +4803,11 @@ msgstr "Notiser där denna bilaga förekommer" msgid "Tags for this attachment" msgstr "Taggar för denna billaga" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Byte av lösenord misslyckades" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Byte av lösenord är inte tillåtet" @@ -5025,6 +5072,43 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Kommandon:\n" +"on - sätt på notifikationer\n" +"off - stäng av notifikationer\n" +"help - visa denna hjälp\n" +"follow - prenumerera på användare\n" +"groups - lista grupperna du tillhör\n" +"subscriptions - lista personerna du följer\n" +"subscribers - lista personerna som följer dig\n" +"leave - avsluta prenumeration på användare\n" +"d - direktmeddelande till användare\n" +"get - hämta senaste notis från användare\n" +"whois - hämta profilinformation om användare\n" +"fav - lägg till användarens senaste notis som favorit\n" +"fav # - lägg till notis med given id som favorit\n" +"repeat # - upprepa en notis med en given id\n" +"repeat - upprepa den senaste notisen från användare\n" +"reply # - svara på notis med en given id\n" +"reply - svara på den senaste notisen från användare\n" +"join - gå med i grupp\n" +"login - hämta en länk till webbgränssnittets inloggningssida\n" +"drop - lämna grupp\n" +"stats - hämta din statistik\n" +"stop - samma som 'off'\n" +"quit - samma som 'off'\n" +"sub - samma som 'follow'\n" +"unsub - samma som 'leave'\n" +"last - samma som 'get'\n" +"on - inte implementerat än.\n" +"off - inte implementerat än.\n" +"nudge - påminn en användare om att uppdatera\n" +"invite - inte implementerat än.\n" +"track - inte implementerat än.\n" +"untrack - inte implementerat än.\n" +"track off - inte implementerat än.\n" +"untrack all - inte implementerat än.\n" +"tracks - inte implementerat än.\n" +"tracking - inte implementerat än.\n" #: lib/common.php:131 msgid "No configuration file found. " @@ -5044,7 +5128,7 @@ msgstr "Gå till installeraren." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "IM" +msgstr "Snabbmeddelande" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" @@ -5292,6 +5376,18 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Hej %s!\n" +"\n" +"Någon la precis till den här e-postadressen på %s.\n" +"\n" +"Om det var du och du vill bekräfta det, använd webbadressen nedan:\n" +"\n" +"%s\n" +"\n" +"Om inte, ignorera bara det här meddelandet.\n" +"\n" +"Tack för din tid, \n" +"%s\n" #: lib/mail.php:236 #, php-format @@ -5312,6 +5408,16 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" +"%1$s lyssnar nu på dina notiser på %2$s.\n" +"\n" +"%3$s\n" +"\n" +"%4$s%5$s%6$s\n" +"Med vänliga hälsningar,\n" +"%7$s.\n" +"\n" +"----\n" +"Ändra din e-postadress eller notiferingsinställningar på %8$s\n" #: lib/mail.php:258 #, php-format @@ -5373,6 +5479,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) undrar vad du håller på med nuförtiden och inbjuder dig att " +"lägga upp några nyheter.\n" +"\n" +"Så låt oss höra av dig :)\n" +"\n" +"%3$s\n" +"\n" +"Svara inte på det här e-postmeddelandet; det kommer inte komma fram.\n" +"\n" +"Med vänliga hälsningar,\n" +"%4$s\n" #: lib/mail.php:510 #, php-format @@ -5397,6 +5514,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) skickade ett privat meddelande till dig:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Du kan svara på meddelandet här:\n" +"\n" +"%4$s\n" +"\n" +"Svara inte på detta e-postmeddelande; det kommer inte komma fram.\n" +"\n" +"Med vänliga hälsningar,\n" +"%5$s\n" #: lib/mail.php:559 #, php-format @@ -5423,6 +5554,22 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) la precis till din notis från %2$s som en av sina favoriter.\n" +"\n" +"Webbadressen för din notis är:\n" +"\n" +"%3$s\n" +"\n" +"Texten i din notis är:\n" +"\n" +"%4$s\n" +"\n" +"Du kan se listan med %1$ss favoriter här:\n" +"\n" +"%5$s\n" +"\n" +"Med vänliga hälsningar,\n" +"%6$s\n" #: lib/mail.php:624 #, php-format @@ -5443,6 +5590,17 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) skickade precis en notis för din uppmärksamhet (ett '@-svar') " +"på %2$s.\n" +"\n" +"Notisen är här:\n" +"\n" +"%3$s\n" +"\n" +"Den lyder:\n" +"\n" +"%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 229a5c0c27..59757cc823 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:30+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:48+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -25,12 +25,10 @@ msgid "Access" msgstr "అంగీకరించు" #: actions/accessadminpanel.php:65 -#, fuzzy msgid "Site access settings" -msgstr "సైటు అమరికలను భద్రపరచు" +msgstr "సైటు అందుబాటు అమరికలు" #: actions/accessadminpanel.php:158 -#, fuzzy msgid "Registration" msgstr "నమోదు" @@ -62,11 +60,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "భద్రపరచు" @@ -305,7 +304,7 @@ msgstr "చాలా పొడవుంది. గరిష్ఠ సందే #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." -msgstr "" +msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." @@ -334,12 +333,12 @@ msgstr "ఇష్టాంశాన్ని తొలగించలేకప #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "" +msgstr "వాడుకరిని అనుసరించలేకపోయాం: వాడుకరి కనబడలేదు." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "" +msgstr "వాడుకరిని అనుసరించలేకపోయాం: %s ఇప్పటికే మీ జాబితాలో ఉన్నారు." #: actions/apifriendshipsdestroy.php:109 #, fuzzy @@ -656,7 +655,7 @@ msgstr "%s బహిరంగ కాలరేఖ" #: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "" +msgstr "అందరి నుండి %s తాజాకరణలు!" #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format @@ -1424,7 +1423,7 @@ msgstr "విశేష వాడుకరులు, పేజీ %d" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "" +msgstr "%sలో కొందరు గొప్ప వాడుకరుల యొక్క ఎంపిక" #: actions/file.php:34 #, fuzzy @@ -1461,7 +1460,7 @@ msgstr "ఆ వాడుకరి మిమ్మల్ని చందాచే #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." -msgstr "" +msgstr "మీకు అధీకరణ లేదు." #: actions/finishremotesubscribe.php:113 msgid "Could not convert request token to access token." @@ -1523,6 +1522,8 @@ msgid "" "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" +"నిజంగానే వాడుకరి \"%1$s\"ని \"%2$s\" గుంపు నుండి నిరోధించాలనుకుంటున్నారా? వారిని గుంపు నుండి " +"తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1687,6 +1688,8 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే ఎందుకు [ఆ గుంపుని సృష్టించ](%%" +"action.newgroup%%)కూడదు!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." @@ -1847,7 +1850,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" @@ -2000,7 +2003,6 @@ msgid "No current status" msgstr "ప్రస్తుత స్థితి ఏమీ లేదు" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" msgstr "కొత్త ఉపకరణం" @@ -2752,7 +2754,7 @@ msgstr "" msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" -msgstr "" +msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే మొదట వ్రాసేవారు ఎందుకు కాకూడదు!" #: actions/publictagcloud.php:131 msgid "Tag cloud" @@ -3116,6 +3118,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"మీరు ఇతర వాడుకరులతో సంభాషించవచ్చు, మరింత మంది వ్యక్తులకు చందాచేరవచ్చు లేదా [గుంపులలో చేరవచ్చు]" +"(%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -3139,6 +3143,37 @@ msgstr "మీరు ఇప్పటికే లోనికి ప్రవే msgid "User is already sandboxed." msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "ఈ స్టేటస్‌నెట్ సైటుకి రూపురేఖల అమరికలు." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "సైటు అమరికలను భద్రపరచు" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3216,9 +3251,9 @@ msgid "" msgstr "" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%sకి ఇష్టమైన నోటీసులు" +msgstr "%1$sకి ఇష్టమైన నోటీసులు, పేజీ %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3424,6 +3459,7 @@ msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"ఈమధ్యే ఏదైనా ఆసక్తికరమైనది చూసారా? మీరు ఇంకా నోటీసులేమీ వ్రాయలేదు, మొదలుపెట్టడానికి ఇదే మంచి సమయం :)" #: actions/showstream.php:198 #, php-format @@ -3465,7 +3501,7 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site." -msgstr "" +msgstr "ఈ స్టేటస్‌నెట్ సైటుకి ప్రాధమిక అమరికలు." #: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." @@ -3605,10 +3641,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "సైటు అమరికలను భద్రపరచు" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "SMS అమరికలు" @@ -3667,7 +3699,7 @@ msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబర #: actions/smssettings.php:321 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "ఆ ఫోను నంబరు ఇప్పటికే వేరే వాడుకరికి చెందినది." #: actions/smssettings.php:347 #, fuzzy @@ -3745,6 +3777,7 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"మీకు చందాదార్లు ఎవరూ లేరు. మీకు తెలిసినవారికి చందాచేర ప్రయత్నించండి వాళ్ళు ప్రత్యుపకారం చేయవచ్చు." #: actions/subscribers.php:110 #, php-format @@ -3907,85 +3940,65 @@ msgstr "వాడుకరి" msgid "User settings for this StatusNet site." msgstr "ఈ స్టేటస్‌నెట్ సైటుకి వాడుకరి అమరికలు." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "ప్రొఫైలు" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "స్వపరిచయ పరిమితి" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "స్వపరిచయం యొక్క గరిష్ఠ పొడవు, అక్షరాలలో." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "కొత్త వాడుకరులు" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "కొత్త వాడుకరి స్వాగతం" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "అప్రమేయ చందా" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "ఆహ్వానాలు" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "ఆహ్వానాలని చేతనంచేసాం" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "" @@ -4189,9 +4202,8 @@ msgid "Group join failed." msgstr "గుంపులో చేరడం విఫలమైంది." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "గుంపుని తాజాకరించలేకున్నాం." +msgstr "గుంపులో భాగం కాదు." #: classes/Group_member.php:60 msgid "Group leave failed." @@ -4522,14 +4534,12 @@ msgid "Basic site configuration" msgstr "ప్రాథమిక సైటు స్వరూపణం" #: lib/adminpanelaction.php:317 -#, fuzzy msgid "Design configuration" -msgstr "SMS నిర్ధారణ" +msgstr "రూపకల్పన స్వరూపణం" #: lib/adminpanelaction.php:322 -#, fuzzy msgid "User configuration" -msgstr "SMS నిర్ధారణ" +msgstr "వాడుకరి స్వరూపణం" #: lib/adminpanelaction.php:327 #, fuzzy @@ -4541,11 +4551,16 @@ msgstr "SMS నిర్ధారణ" msgid "Paths configuration" msgstr "SMS నిర్ధారణ" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "రూపకల్పన స్వరూపణం" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4639,12 +4654,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "సంకేతపదం మార్పు" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "సంకేతపదం మార్పు" @@ -5322,7 +5337,7 @@ msgstr "" #: lib/mail.php:624 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) మీకు ఒక నోటీసుని పంపించారు" #: lib/mail.php:626 #, php-format @@ -5338,6 +5353,16 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) %2$sలో మీకు ('@-స్పందన') ఒక నోటీసుని పంపించారు .\n" +"\n" +"ఆ నోటీసు ఇక్కడ:\n" +"\n" +"%3$s\n" +"\n" +"ఇదీ పాఠ్యం:\n" +"\n" +"%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 77371e6345..57d10e80ff 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:32+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:51+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -64,11 +64,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Kaydet" @@ -3233,6 +3234,37 @@ msgstr "Bize o profili yollamadınız" msgid "User is already sandboxed." msgstr "Kullanıcının profili yok." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Ayarlar" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3709,11 +3741,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Ayarlar" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4021,87 +4048,67 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Bütün abonelikler" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "Takip talebine izin verildi" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Yer" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Takip isteğini onayla" @@ -4679,11 +4686,16 @@ msgstr "Eposta adresi onayı" msgid "Paths configuration" msgstr "Eposta adresi onayı" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Eposta adresi onayı" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4781,12 +4793,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Parola kaydedildi." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Parola kaydedildi." diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 21aa77c470..de786c8291 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:35+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:53+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Зберегти" @@ -506,14 +507,12 @@ msgid "Invalid nickname / password!" msgstr "Недійсне ім’я / пароль!" #: actions/apioauthauthorize.php:170 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Помилка бази даних при видаленні OAuth користувача." +msgstr "Помилка бази даних при видаленні користувача OAuth-додатку." #: actions/apioauthauthorize.php:196 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Помилка бази даних при додаванні OAuth користувача." +msgstr "Помилка бази даних при додаванні користувача OAuth-додатку." #: actions/apioauthauthorize.php:231 #, php-format @@ -3236,6 +3235,37 @@ msgstr "Ви не можете нікого ізолювати на цьому msgid "User is already sandboxed." msgstr "Користувача ізольовано доки набереться уму-розуму." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "Сесії" + +#: actions/sessionsadminpanel.php:65 +#, fuzzy +msgid "Session settings for this StatusNet site." +msgstr "Налаштування дизайну для цього сайту StatusNet." + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "Сесії обробки даних" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "Обробка даних сесій самостійно." + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "Сесія наладки" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "Виводити дані сесії наладки." + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +msgid "Save site settings" +msgstr "Зберегти налаштування сайту" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "Ви повинні спочатку увійти, аби переглянути додаток." @@ -3733,10 +3763,6 @@ msgstr "" "Як довго користувачі мають зачекати (в секундах) аби надіслати той самий " "допис ще раз." -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -msgid "Save site settings" -msgstr "Зберегти налаштування сайту" - #: actions/smssettings.php:58 msgid "SMS settings" msgstr "Налаштування СМС" @@ -4048,85 +4074,65 @@ msgstr "Користувач" msgid "User settings for this StatusNet site." msgstr "Власні налаштування користувача для цього сайту StatusNet." -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "Помилкове обмеження біо. Це мають бути цифри." -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "Помилковий текст привітання. Максимальна довжина 255 знаків." -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "Помилкова підписка за замовчуванням: '%1$s' не є користувачем." -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "Обмеження біо" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "Максимальна довжина біо користувача в знаках." -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "Нові користувачі" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "Привітання нового користувача" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "Текст привітання нових користувачів (255 знаків)." -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 msgid "Default subscription" msgstr "Підписка за замовчуванням" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "Автоматично підписувати нових користувачів до цього користувача." -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 msgid "Invitations" msgstr "Запрошення" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "Запрошення скасовано" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" "В той чи інший спосіб дозволити користувачам вітати нових користувачів." -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "Сесії" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "Сесії обробки даних" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "Обробка даних сесій самостійно." - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "Сесія наладки" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "Виводити дані сесії наладки." - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Авторизувати підписку" @@ -4701,14 +4707,22 @@ msgstr "Прийняти конфігурацію" msgid "Paths configuration" msgstr "Конфігурація шляху" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Конфігурація дизайну" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" +"API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " +"читання." -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" +"Невдала спроба авторизації API, nickname = %1$s, proxy = %2$s, ip = %3$s" #: lib/applicationeditform.php:136 msgid "Edit application" @@ -4796,11 +4810,11 @@ msgstr "Дописи, до яких прикріплено це вкладенн msgid "Tags for this attachment" msgstr "Теґи для цього вкладення" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "Не вдалося змінити пароль" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "Змінювати пароль не дозволено" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index a58bc70935..81461c3a01 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:38+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:56+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -63,11 +63,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "Lưu" @@ -3352,6 +3353,37 @@ msgstr "Bạn đã theo những người này:" msgid "User is already sandboxed." msgstr "Người dùng không có thông tin." +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "Thay đổi hình đại diện" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3832,11 +3864,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "Thay đổi hình đại diện" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4160,89 +4187,69 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sơ " -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "Gửi thư mời đến những người chưa có tài khoản" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "Tất cả đăng nhận" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "Tự động theo những người nào đăng ký theo tôi" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "Thư mời đã gửi" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "Thư mời đã gửi" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Đăng nhận cho phép" @@ -4838,11 +4845,16 @@ msgstr "Xác nhận SMS" msgid "Paths configuration" msgstr "Xác nhận SMS" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "Xác nhận SMS" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4938,12 +4950,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "Đã lưu mật khẩu." -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "Đã lưu mật khẩu." diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 3a785ae3e8..7023936339 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:43+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:42:59+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -66,11 +66,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "保存" @@ -3286,6 +3287,37 @@ msgstr "无法向此用户发送消息。" msgid "User is already sandboxed." msgstr "用户没有个人信息。" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "头像设置" + #: actions/showapplication.php:82 #, fuzzy msgid "You must be logged in to view an application." @@ -3770,11 +3802,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "头像设置" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -4090,89 +4117,69 @@ msgstr "用户" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "邀请新用户" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "所有订阅" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "已发送邀请" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "已发送邀请" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "确认订阅" @@ -4761,11 +4768,16 @@ msgstr "SMS短信确认" msgid "Paths configuration" msgstr "SMS短信确认" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS短信确认" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4861,12 +4873,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "密码已保存。" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "密码已保存。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 827bc07ff7..ac78960c6c 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 23:04+0000\n" -"PO-Revision-Date: 2010-01-28 23:05:46+0000\n" +"POT-Creation-Date: 2010-01-30 23:41+0000\n" +"PO-Revision-Date: 2010-01-30 23:43:02+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 (r61646); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.16alpha (r61734); 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" @@ -61,11 +61,12 @@ 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:333 lib/applicationeditform.php:334 -#: lib/designsettings.php:256 lib/groupeditform.php:202 +#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199 +#: actions/siteadminpanel.php:336 actions/smssettings.php:181 +#: actions/subscriptions.php:203 actions/tagother.php:154 +#: actions/useradminpanel.php:293 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 lib/designsettings.php:256 +#: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -3168,6 +3169,37 @@ msgstr "無法連結到伺服器:%s" msgid "User is already sandboxed." msgstr "" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:336 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "線上即時通設定" + #: actions/showapplication.php:82 msgid "You must be logged in to view an application." msgstr "" @@ -3641,11 +3673,6 @@ msgstr "" msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:336 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "線上即時通設定" - #: actions/smssettings.php:58 #, fuzzy msgid "SMS settings" @@ -3950,86 +3977,66 @@ msgstr "" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 msgid "New users" msgstr "" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "所有訂閱" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 msgid "Automatically subscribe new users to this user." msgstr "" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "地點" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 msgid "Invitations enabled" msgstr "" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "註冊確認" @@ -4595,11 +4602,16 @@ msgstr "確認信箱" msgid "Paths configuration" msgstr "確認信箱" -#: lib/apiauth.php:103 +#: lib/adminpanelaction.php:337 +#, fuzzy +msgid "Sessions configuration" +msgstr "確認信箱" + +#: lib/apiauth.php:99 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:257 +#: lib/apiauth.php:279 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4690,11 +4702,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:229 +#: lib/authenticationplugin.php:233 msgid "Password changing is not allowed" msgstr "" From dc62246443e3584ef5267505275f618f6fa86bf7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 31 Jan 2010 10:12:26 -0500 Subject: [PATCH 127/169] Add a robots.txt URL to the site root Adds a robots.txt file to the site root. Defaults defined by 'robotstxt' section of config. New events StartRobotsTxt and EndRobotsTxt to let plugins add information. Probably not useful if path is not /, but won't hurt anything, either. --- EVENTS.txt | 6 +++ README | 14 ++++++ actions/robotstxt.php | 100 ++++++++++++++++++++++++++++++++++++++++++ index.php | 5 ++- lib/default.php | 4 ++ lib/router.php | 2 + 6 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 actions/robotstxt.php diff --git a/EVENTS.txt b/EVENTS.txt index 3317c80dec..6bf12bf13f 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -708,3 +708,9 @@ EndUserRegister: When a new user has been registered - &$profile: new profile data - &$user: new user account +StartRobotsTxt: Before outputting the robots.txt page +- &$action: RobotstxtAction being shown + +EndRobotsTxt: After the default robots.txt page (good place for customization) +- &$action: RobotstxtAction being shown + diff --git a/README b/README index da278f7412..4e576dcdd3 100644 --- a/README +++ b/README @@ -1496,6 +1496,20 @@ 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. +robotstxt +--------- + +We put out a default robots.txt file to guide the processing of +Web crawlers. See http://www.robotstxt.org/ for more information +on the format of this file. + +crawldelay: if non-empty, this value is provided as the Crawl-Delay: + for the robots.txt file. see http://ur1.ca/l5a0 + for more information. Default is zero, no explicit delay. +disallow: Array of (virtual) directories to disallow. Default is 'main', + 'search', 'message', 'settings', 'admin'. Ignored when site + is private, in which case the entire site ('/') is disallowed. + Plugins ======= diff --git a/actions/robotstxt.php b/actions/robotstxt.php new file mode 100644 index 0000000000..5131097c8c --- /dev/null +++ b/actions/robotstxt.php @@ -0,0 +1,100 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Prints out a static robots.txt + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class RobotstxtAction extends Action +{ + /** + * Handles requests + * + * Since this is a relatively static document, we + * don't do a prepare() + * + * @param array $args GET, POST, and URL params; unused. + * + * @return void + */ + + function handle($args) + { + if (Event::handle('StartRobotsTxt', array($this))) { + + header('Content-Type: text/plain'); + + print "User-Agent: *\n"; + + if (common_config('site', 'private')) { + + print "Disallow: /\n"; + + } else { + + $disallow = common_config('robotstxt', 'disallow'); + + foreach ($disallow as $dir) { + print "Disallow: /$dir/\n"; + } + + $crawldelay = common_config('robotstxt', 'crawldelay'); + + if (!empty($crawldelay)) { + print "Crawl-delay: " . $crawldelay . "\n"; + } + } + + Event::handle('EndRobotsTxt', array($this)); + } + } + + /** + * Return true; this page doesn't touch the DB. + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } +} diff --git a/index.php b/index.php index 605b380bf8..06ff9900fd 100644 --- a/index.php +++ b/index.php @@ -285,8 +285,9 @@ function main() if (!$user && common_config('site', 'private') && !isLoginAction($action) && !preg_match('/rss$/', $action) - && !preg_match('/^Api/', $action) - ) { + && $action != 'robotstxt' + && !preg_match('/^Api/', $action)) { + // set returnto $rargs =& common_copy_args($args); unset($rargs['action']); diff --git a/lib/default.php b/lib/default.php index 1337a96336..2bedc4bf08 100644 --- a/lib/default.php +++ b/lib/default.php @@ -270,4 +270,8 @@ $default = 'singleuser' => array('enabled' => false, 'nickname' => null), + 'robotstxt' => + array('crawldelay' => 0, + 'disallow' => array('main', 'settings', 'admin', 'search', 'message') + ), ); diff --git a/lib/router.php b/lib/router.php index ca9f328126..4b5b8d0bb8 100644 --- a/lib/router.php +++ b/lib/router.php @@ -73,6 +73,8 @@ class Router if (Event::handle('StartInitializeRouter', array(&$m))) { + $m->connect('robots.txt', array('action' => 'robotstxt')); + $m->connect('opensearch/people', array('action' => 'opensearch', 'type' => 'people')); $m->connect('opensearch/notice', array('action' => 'opensearch', From 30268cff7899519f249861e067e3af680ee1c570 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 31 Jan 2010 15:16:59 -0500 Subject: [PATCH 128/169] Add Really Simple Discovery (RSD) support Anil Dash suggested that all implementers of the Twitter API include support for the remedial RSD format. This commit adds an RSD action that returns the API root and additional API data to help client developers discover and use our Twitter-compatible API. http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html http://tales.phrasewise.com/rfc/rsd --- actions/public.php | 10 +- actions/rsd.php | 226 +++++++++++++++++++++++++++++++++++++++++ actions/showstream.php | 9 ++ lib/router.php | 9 ++ 4 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 actions/rsd.php diff --git a/actions/public.php b/actions/public.php index 982dfde157..50278bfced 100644 --- a/actions/public.php +++ b/actions/public.php @@ -131,12 +131,20 @@ class PublicAction extends Action return _('Public timeline'); } } - + function extraHead() { parent::extraHead(); $this->element('meta', array('http-equiv' => 'X-XRDS-Location', 'content' => common_local_url('publicxrds'))); + + $rsd = common_local_url('rsd'); + + // RSD, http://tales.phrasewise.com/rfc/rsd + + $this->element('link', array('rel' => 'EditURI', + 'type' => 'application/rsd+xml', + 'href' => $rsd)); } /** diff --git a/actions/rsd.php b/actions/rsd.php new file mode 100644 index 0000000000..f88bf2e9a8 --- /dev/null +++ b/actions/rsd.php @@ -0,0 +1,226 @@ +. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * RSD action class + * + * Really Simple Discovery (RSD) is a simple (to a fault, maybe) + * discovery tool for blog APIs. + * + * http://tales.phrasewise.com/rfc/rsd + * + * Anil Dash suggested that RSD be used for services that implement + * the Twitter API: + * + * http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html + * + * It's in use now for WordPress.com blogs: + * + * http://matt.wordpress.com/xmlrpc.php?rsd + * + * I (evan@status.net) have tried to stay faithful to the premise of + * RSD, while adding information useful to StatusNet client developers. + * In particular: + * + * - There is a link from each user's profile page to their personal + * RSD feed. A personal rsd.xml includes a 'blogID' element that is + * their username. + * - There is a link from the public root to '/rsd.xml', a public RSD + * feed. It's identical to the personal rsd except it doesn't include + * a blogId. + * - I've added a setting to the API to indicate that OAuth support is + * available. + * + * @category API + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class RsdAction extends Action +{ + /** + * Optional attribute for the personal rsd.xml file. + */ + + var $user = null; + + /** + * Prepare the action for use. + * + * Check for a nickname; redirect if non-canonical; if + * not provided, assume public rsd.xml. + * + * @param array $args GET, POST, and URI arguments. + * + * @return boolean success flag + */ + + function prepare($args) + { + parent::prepare($args); + + // optional argument + + $nickname_arg = $this->arg('nickname'); + + if (empty($nickname_arg)) { + $this->user = null; + } else { + $nickname = common_canonical_nickname($nickname_arg); + + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + common_redirect(common_local_url('rsd', + array('nickname' => $nickname)), + 301); + return false; + } + + $this->user = User::staticGet('nickname', $nickname); + + if (empty($this->user)) { + $this->clientError(_('No such user.'), 404); + return false; + } + } + + return true; + } + + /** + * Action handler. + * + * Outputs the XML format for an RSD file. May include + * personal information if this is a personal file + * (based on whether $user attribute is set). + * + * @param array $args array of arguments + * + * @return nothing + */ + + function handle($args) + { + header('Content-Type: application/rsd+xml'); + + $this->startXML(); + + $rsdNS = 'http://archipelago.phrasewise.com/rsd'; + $this->elementStart('rsd', array('version' => '1.0', + 'xmlns' => $rsdNS)); + $this->elementStart('service'); + $this->element('engineName', null, _('StatusNet')); + $this->element('engineLink', null, 'http://status.net/'); + $this->elementStart('apis'); + if (Event::handle('StartRsdListApis', array($this, $this->user))) { + + $blogID = (empty($this->user)) ? '' : $this->user->nickname; + $apiAttrs = array('name' => 'Twitter', + 'preferred' => 'true', + 'apiLink' => $this->_apiRoot(), + 'blogID' => $blogID); + + $this->elementStart('api', $apiAttrs); + $this->elementStart('settings'); + $this->element('docs', null, + 'http://status.net/wiki/TwitterCompatibleAPI'); + $this->element('setting', array('name' => 'OAuth'), + 'true'); + $this->elementEnd('settings'); + $this->elementEnd('api'); + Event::handle('EndRsdListApis', array($this, $this->user)); + } + $this->elementEnd('apis'); + $this->elementEnd('service'); + $this->elementEnd('rsd'); + + $this->endXML(); + + return true; + } + + /** + * Returns last-modified date for use in caching + * + * Per-user rsd.xml is dated to last change of user + * (in case of nickname change); public has no date. + * + * @return string date of last change of this page + */ + + function lastModified() + { + if (!empty($this->user)) { + return $this->user->modified; + } else { + return null; + } + } + + /** + * Flag to indicate if this action is read-only + * + * It is; it doesn't change the DB. + * + * @param array $args ignored + * + * @return boolean true + */ + + function isReadOnly($args) + { + return true; + } + + /** + * Return current site's API root + * + * Varies based on URL parameters, like if fancy URLs are + * turned on. + * + * @return string API root URI for this site + */ + + private function _apiRoot() + { + if (common_config('site', 'fancy')) { + return common_path('api/', true); + } else { + return common_path('index.php/api/', true); + } + } +} diff --git a/actions/showstream.php b/actions/showstream.php index c529193860..07cc68b765 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -178,6 +178,15 @@ class ShowstreamAction extends ProfileAction $this->element('link', array('rel' => 'microsummary', 'href' => common_local_url('microsummary', array('nickname' => $this->profile->nickname)))); + + $rsd = common_local_url('rsd', + array('nickname' => $this->profile->nickname)); + + // RSD, http://tales.phrasewise.com/rfc/rsd + $this->element('link', array('rel' => 'EditURI', + 'type' => 'application/rsd+xml', + 'href' => $rsd)); + } function showProfile() diff --git a/lib/router.php b/lib/router.php index 4b5b8d0bb8..b046b240c9 100644 --- a/lib/router.php +++ b/lib/router.php @@ -708,6 +708,10 @@ class Router 'nickname' => $nickname), array('tag' => '[a-zA-Z0-9]+')); + $m->connect('rsd.xml', + array('action' => 'rsd', + 'nickname' => $nickname)); + $m->connect('', array('action' => 'showstream', 'nickname' => $nickname)); @@ -722,6 +726,7 @@ class Router $m->connect('featured', array('action' => 'featured')); $m->connect('favorited/', array('action' => 'favorited')); $m->connect('favorited', array('action' => 'favorited')); + $m->connect('rsd.xml', array('action' => 'rsd')); foreach (array('subscriptions', 'subscribers', 'nudge', 'all', 'foaf', 'xrds', @@ -769,6 +774,10 @@ class Router array('nickname' => '[a-zA-Z0-9]{1,64}'), array('tag' => '[a-zA-Z0-9]+')); + $m->connect(':nickname/rsd.xml', + array('action' => 'rsd'), + array('nickname' => '[a-zA-Z0-9]{1,64}')); + $m->connect(':nickname', array('action' => 'showstream'), array('nickname' => '[a-zA-Z0-9]{1,64}')); From 81087e45c5b797028e90181459e4c673cd7be278 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 31 Jan 2010 15:25:59 -0500 Subject: [PATCH 129/169] move schema.type.php to typeschema.php like other files --- lib/{schema.mysql.php => mysqlschema.php} | 0 lib/{schema.pgsql.php => pgsqlschema.php} | 0 lib/schema.php | 8 +++----- 3 files changed, 3 insertions(+), 5 deletions(-) rename lib/{schema.mysql.php => mysqlschema.php} (100%) rename lib/{schema.pgsql.php => pgsqlschema.php} (100%) diff --git a/lib/schema.mysql.php b/lib/mysqlschema.php similarity index 100% rename from lib/schema.mysql.php rename to lib/mysqlschema.php diff --git a/lib/schema.pgsql.php b/lib/pgsqlschema.php similarity index 100% rename from lib/schema.pgsql.php rename to lib/pgsqlschema.php diff --git a/lib/schema.php b/lib/schema.php index 27a4deda11..137b814e02 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -77,14 +77,12 @@ class Schema { $type = common_config('db', 'type'); if (empty(self::$_single)) { - include "lib/schema.{$type}.php"; - $class = $type.='Schema'; - self::$_single = new $class(); + $schemaClass = ucfirst($type).'Schema'; + self::$_single = new $schemaClass(); } return self::$_single; } - /** * Gets a ColumnDef object for a single column. * @@ -475,7 +473,7 @@ class Schema } else { $sql .= ($cd->nullable) ? "null " : "not null "; } - + if (!empty($cd->auto_increment)) { $sql .= " auto_increment "; } From 99a7dd64f65c0fbe9e1e18e1706527aa0521387c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 31 Jan 2010 22:33:11 +0000 Subject: [PATCH 130/169] Updated jQuery JavaScript Library from v1.3.2 to v1.4.1 --- js/jquery.js | 6711 +++++++++++++++++++++++++++++----------------- js/jquery.min.js | 164 +- 2 files changed, 4356 insertions(+), 2519 deletions(-) diff --git a/js/jquery.js b/js/jquery.js index 926357433e..237e1b9081 100644 --- a/js/jquery.js +++ b/js/jquery.js @@ -1,136 +1,221 @@ /*! - * jQuery JavaScript Library v1.3.2 + * jQuery JavaScript Library v1.4.1 * http://jquery.com/ * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license * - * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) - * Revision: 6246 + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Mon Jan 25 19:43:33 2010 -0500 */ -(function(){ +(function( window, undefined ) { -var - // Will speed up references to window, and allows munging its name. - window = this, - // Will speed up references to undefined, and allows munging its name. - undefined, - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - // Map over the $ in case of overwrite - _$ = window.$, - - jQuery = window.jQuery = window.$ = function( selector, context ) { +// Define a local copy of jQuery +var jQuery = function( selector, context ) { // The jQuery object is actually just the init constructor 'enhanced' return new jQuery.fn.init( selector, context ); }, + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + // A central reference to the root jQuery(document) + rootjQuery, + // A simple way to check for HTML strings or ID strings // (both of which we optimize for) - quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/, + quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, + // Is it a simple selector - isSimple = /^.[^:#\[\.,]*$/; + isSimple = /^.[^:#\[\.,]*$/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // Has the ready events already been bound? + readyBound = false, + + // The functions to execute on DOM ready + readyList = [], + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwnProperty = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + indexOf = Array.prototype.indexOf; jQuery.fn = jQuery.prototype = { init: function( selector, context ) { - // Make sure that a selection was provided - selector = selector || document; + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } // Handle $(DOMElement) if ( selector.nodeType ) { - this[0] = selector; + this.context = this[0] = selector; this.length = 1; - this.context = selector; return this; } + // Handle HTML strings if ( typeof selector === "string" ) { // Are we dealing with HTML string or an ID? - var match = quickExpr.exec( selector ); + match = quickExpr.exec( selector ); // Verify a match, and that no context was specified for #id if ( match && (match[1] || !context) ) { // HANDLE: $(html) -> $(array) - if ( match[1] ) - selector = jQuery.clean( [ match[1] ], context ); + if ( match[1] ) { + doc = (context ? context.ownerDocument || context : document); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } + + } else { + ret = buildFragment( [ match[1] ], [ doc ] ); + selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; + } // HANDLE: $("#id") - else { - var elem = document.getElementById( match[3] ); + } else { + elem = document.getElementById( match[2] ); - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem && elem.id != match[3] ) - return jQuery().find( selector ); + if ( elem ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } - // Otherwise, we inject the element directly into the jQuery object - var ret = jQuery( elem || [] ); - ret.context = document; - ret.selector = selector; - return ret; + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; } - // HANDLE: $(expr, [context]) - // (which is just equivalent to: $(content).find(expr) - } else + // HANDLE: $("TAG") + } else if ( !context && /^\w+$/.test( selector ) ) { + this.selector = selector; + this.context = document; + selector = document.getElementsByTagName( selector ); + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return (context || rootjQuery).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { return jQuery( context ).find( selector ); + } // HANDLE: $(function) // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) - return jQuery( document ).ready( selector ); + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } - // Make sure that old selector state is passed along - if ( selector.selector && selector.context ) { + if (selector.selector !== undefined) { this.selector = selector.selector; this.context = selector.context; } - return this.setArray(jQuery.isArray( selector ) ? - selector : - jQuery.makeArray(selector)); + return jQuery.isArray( selector ) ? + this.setArray( selector ) : + jQuery.makeArray( selector, this ); }, // Start with an empty selector selector: "", // The current version of jQuery being used - jquery: "1.3.2", + jquery: "1.4.1", + + // The default length of a jQuery object is 0 + length: 0, // The number of elements contained in the matched element set size: function() { return this.length; }, + toArray: function() { + return slice.call( this, 0 ); + }, + // Get the Nth element in the matched element set OR // Get the whole matched element set as a clean array get: function( num ) { - return num === undefined ? + return num == null ? // Return a 'clean' array - Array.prototype.slice.call( this ) : + this.toArray() : // Return just the object - this[ num ]; + ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] ); }, // Take an array of elements and push it onto the stack // (returning the new matched element set) pushStack: function( elems, name, selector ) { // Build a new jQuery matched element set - var ret = jQuery( elems ); + var ret = jQuery( elems || null ); // Add the old object onto the stack (as a reference) ret.prevObject = this; ret.context = this.context; - if ( name === "find" ) + if ( name === "find" ) { ret.selector = this.selector + (this.selector ? " " : "") + selector; - else if ( name ) + } else if ( name ) { ret.selector = this.selector + "." + name + "(" + selector + ")"; + } // Return the newly-formed element set return ret; @@ -143,7 +228,7 @@ jQuery.fn = jQuery.prototype = { // Resetting the length to 0, then using the native Array push // is a super-fast way to populate an object with array-like properties this.length = 0; - Array.prototype.push.apply( this, elems ); + push.apply( this, elems ); return this; }, @@ -154,414 +239,67 @@ jQuery.fn = jQuery.prototype = { each: function( callback, args ) { return jQuery.each( this, callback, args ); }, + + ready: function( fn ) { + // Attach the listeners + jQuery.bindReady(); - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem && elem.jquery ? elem[0] : elem - , this ); - }, + // If the DOM is already ready + if ( jQuery.isReady ) { + // Execute the function immediately + fn.call( document, jQuery ); - attr: function( name, value, type ) { - var options = name; - - // Look for the case where we're accessing a style value - if ( typeof name === "string" ) - if ( value === undefined ) - return this[0] && jQuery[ type || "attr" ]( this[0], name ); - - else { - options = {}; - options[ name ] = value; - } - - // Check to see if we're setting style values - return this.each(function(i){ - // Set all the styles - for ( name in options ) - jQuery.attr( - type ? - this.style : - this, - name, jQuery.prop( this, options[ name ], type, i, name ) - ); - }); - }, - - css: function( key, value ) { - // ignore negative width and height values - if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) - value = undefined; - return this.attr( key, value, "curCSS" ); - }, - - text: function( text ) { - if ( typeof text !== "object" && text != null ) - return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); - - var ret = ""; - - jQuery.each( text || this, function(){ - jQuery.each( this.childNodes, function(){ - if ( this.nodeType != 8 ) - ret += this.nodeType != 1 ? - this.nodeValue : - jQuery.fn.text( [ this ] ); - }); - }); - - return ret; - }, - - wrapAll: function( html ) { - if ( this[0] ) { - // The elements to wrap the target around - var wrap = jQuery( html, this[0].ownerDocument ).clone(); - - if ( this[0].parentNode ) - wrap.insertBefore( this[0] ); - - wrap.map(function(){ - var elem = this; - - while ( elem.firstChild ) - elem = elem.firstChild; - - return elem; - }).append(this); + // Otherwise, remember the function for later + } else if ( readyList ) { + // Add the function to the wait list + readyList.push( fn ); } return this; }, - - wrapInner: function( html ) { - return this.each(function(){ - jQuery( this ).contents().wrapAll( html ); - }); + + eq: function( i ) { + return i === -1 ? + this.slice( i ) : + this.slice( i, +i + 1 ); }, - wrap: function( html ) { - return this.each(function(){ - jQuery( this ).wrapAll( html ); - }); + first: function() { + return this.eq( 0 ); }, - append: function() { - return this.domManip(arguments, true, function(elem){ - if (this.nodeType == 1) - this.appendChild( elem ); - }); + last: function() { + return this.eq( -1 ); }, - prepend: function() { - return this.domManip(arguments, true, function(elem){ - if (this.nodeType == 1) - this.insertBefore( elem, this.firstChild ); - }); + slice: function() { + return this.pushStack( slice.apply( this, arguments ), + "slice", slice.call(arguments).join(",") ); }, - before: function() { - return this.domManip(arguments, false, function(elem){ - this.parentNode.insertBefore( elem, this ); - }); + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); }, - - after: function() { - return this.domManip(arguments, false, function(elem){ - this.parentNode.insertBefore( elem, this.nextSibling ); - }); - }, - + end: function() { - return this.prevObject || jQuery( [] ); + return this.prevObject || jQuery(null); }, // For internal use only. // Behaves like an Array's method, not like a jQuery method. - push: [].push, + push: push, sort: [].sort, - splice: [].splice, - - find: function( selector ) { - if ( this.length === 1 ) { - var ret = this.pushStack( [], "find", selector ); - ret.length = 0; - jQuery.find( selector, this[0], ret ); - return ret; - } else { - return this.pushStack( jQuery.unique(jQuery.map(this, function(elem){ - return jQuery.find( selector, elem ); - })), "find", selector ); - } - }, - - clone: function( events ) { - // Do the clone - var ret = this.map(function(){ - if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) { - // IE copies events bound via attachEvent when - // using cloneNode. Calling detachEvent on the - // clone will also remove the events from the orignal - // In order to get around this, we use innerHTML. - // Unfortunately, this means some modifications to - // attributes in IE that are actually only stored - // as properties will not be copied (such as the - // the name attribute on an input). - var html = this.outerHTML; - if ( !html ) { - var div = this.ownerDocument.createElement("div"); - div.appendChild( this.cloneNode(true) ); - html = div.innerHTML; - } - - return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")])[0]; - } else - return this.cloneNode(true); - }); - - // Copy the events from the original to the clone - if ( events === true ) { - var orig = this.find("*").andSelf(), i = 0; - - ret.find("*").andSelf().each(function(){ - if ( this.nodeName !== orig[i].nodeName ) - return; - - var events = jQuery.data( orig[i], "events" ); - - for ( var type in events ) { - for ( var handler in events[ type ] ) { - jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data ); - } - } - - i++; - }); - } - - // Return the cloned set - return ret; - }, - - filter: function( selector ) { - return this.pushStack( - jQuery.isFunction( selector ) && - jQuery.grep(this, function(elem, i){ - return selector.call( elem, i ); - }) || - - jQuery.multiFilter( selector, jQuery.grep(this, function(elem){ - return elem.nodeType === 1; - }) ), "filter", selector ); - }, - - closest: function( selector ) { - var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null, - closer = 0; - - return this.map(function(){ - var cur = this; - while ( cur && cur.ownerDocument ) { - if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) { - jQuery.data(cur, "closest", closer); - return cur; - } - cur = cur.parentNode; - closer++; - } - }); - }, - - not: function( selector ) { - if ( typeof selector === "string" ) - // test special case where just one selector is passed in - if ( isSimple.test( selector ) ) - return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector ); - else - selector = jQuery.multiFilter( selector, this ); - - var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; - return this.filter(function() { - return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; - }); - }, - - add: function( selector ) { - return this.pushStack( jQuery.unique( jQuery.merge( - this.get(), - typeof selector === "string" ? - jQuery( selector ) : - jQuery.makeArray( selector ) - ))); - }, - - is: function( selector ) { - return !!selector && jQuery.multiFilter( selector, this ).length > 0; - }, - - hasClass: function( selector ) { - return !!selector && this.is( "." + selector ); - }, - - val: function( value ) { - if ( value === undefined ) { - var elem = this[0]; - - if ( elem ) { - if( jQuery.nodeName( elem, 'option' ) ) - return (elem.attributes.value || {}).specified ? elem.value : elem.text; - - // We need to handle select boxes special - if ( jQuery.nodeName( elem, "select" ) ) { - var index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type == "select-one"; - - // Nothing was selected - if ( index < 0 ) - return null; - - // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; - - if ( option.selected ) { - // Get the specifc value for the option - value = jQuery(option).val(); - - // We don't need an array for one selects - if ( one ) - return value; - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - } - - // Everything else, we just grab the value - return (elem.value || "").replace(/\r/g, ""); - - } - - return undefined; - } - - if ( typeof value === "number" ) - value += ''; - - return this.each(function(){ - if ( this.nodeType != 1 ) - return; - - if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) ) - this.checked = (jQuery.inArray(this.value, value) >= 0 || - jQuery.inArray(this.name, value) >= 0); - - else if ( jQuery.nodeName( this, "select" ) ) { - var values = jQuery.makeArray(value); - - jQuery( "option", this ).each(function(){ - this.selected = (jQuery.inArray( this.value, values ) >= 0 || - jQuery.inArray( this.text, values ) >= 0); - }); - - if ( !values.length ) - this.selectedIndex = -1; - - } else - this.value = value; - }); - }, - - html: function( value ) { - return value === undefined ? - (this[0] ? - this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") : - null) : - this.empty().append( value ); - }, - - replaceWith: function( value ) { - return this.after( value ).remove(); - }, - - eq: function( i ) { - return this.slice( i, +i + 1 ); - }, - - slice: function() { - return this.pushStack( Array.prototype.slice.apply( this, arguments ), - "slice", Array.prototype.slice.call(arguments).join(",") ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function(elem, i){ - return callback.call( elem, i, elem ); - })); - }, - - andSelf: function() { - return this.add( this.prevObject ); - }, - - domManip: function( args, table, callback ) { - if ( this[0] ) { - var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(), - scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ), - first = fragment.firstChild; - - if ( first ) - for ( var i = 0, l = this.length; i < l; i++ ) - callback.call( root(this[i], first), this.length > 1 || i > 0 ? - fragment.cloneNode(true) : fragment ); - - if ( scripts ) - jQuery.each( scripts, evalScript ); - } - - return this; - - function root( elem, cur ) { - return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ? - (elem.getElementsByTagName("tbody")[0] || - elem.appendChild(elem.ownerDocument.createElement("tbody"))) : - elem; - } - } + splice: [].splice }; // Give the init function the jQuery prototype for later instantiation jQuery.fn.init.prototype = jQuery.fn; -function evalScript( i, elem ) { - if ( elem.src ) - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - - else - jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); - - if ( elem.parentNode ) - elem.parentNode.removeChild( elem ); -} - -function now(){ - return +new Date; -} - jQuery.extend = jQuery.fn.extend = function() { // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; + var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy; // Handle a deep copy situation if ( typeof target === "boolean" ) { @@ -572,58 +310,137 @@ jQuery.extend = jQuery.fn.extend = function() { } // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { target = {}; + } // extend jQuery itself if only one argument is passed - if ( length == i ) { + if ( length === i ) { target = this; --i; } - for ( ; i < length; i++ ) + for ( ; i < length; i++ ) { // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) + if ( (options = arguments[ i ]) != null ) { // Extend the base object - for ( var name in options ) { - var src = target[ name ], copy = options[ name ]; + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; // Prevent never-ending loop - if ( target === copy ) + if ( target === copy ) { continue; + } - // Recurse if we're merging object values - if ( deep && copy && typeof copy === "object" && !copy.nodeType ) - target[ name ] = jQuery.extend( deep, - // Never move original objects, clone them - src || ( copy.length != null ? [ ] : { } ) - , copy ); + // Recurse if we're merging object literal values or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) { + var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src + : jQuery.isArray(copy) ? [] : {}; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); // Don't bring in undefined values - else if ( copy !== undefined ) + } else if ( copy !== undefined ) { target[ name ] = copy; - + } } + } + } // Return the modified object return target; }; -// exclude the following css properties to add px -var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, - // cache defaultView - defaultView = document.defaultView || {}, - toString = Object.prototype.toString; - jQuery.extend({ noConflict: function( deep ) { window.$ = _$; - if ( deep ) + if ( deep ) { window.jQuery = _jQuery; + } return jQuery; }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // Handle when the DOM is ready + ready: function() { + // Make sure that the DOM is not already loaded + if ( !jQuery.isReady ) { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready, 13 ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If there are functions bound, to execute + if ( readyList ) { + // Execute all of them + var fn, i = 0; + while ( (fn = readyList[ i++ ]) ) { + fn.call( document, jQuery ); + } + + // Reset the list of functions + readyList = null; + } + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + } + } + }, + + bindReady: function() { + if ( readyBound ) { + return; + } + + readyBound = true; + + // Catch cases where $(document).ready() is called after the + // browser event has already occurred. + if ( document.readyState === "complete" ) { + return jQuery.ready(); + } + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", jQuery.ready, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent("onreadystatechange", DOMContentLoaded); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", jQuery.ready ); + + // If IE and not a frame + // continually check to see if the document is ready + var toplevel = false; + + try { + toplevel = window.frameElement == null; + } catch(e) {} + + if ( document.documentElement.doScroll && toplevel ) { + doScrollCheck(); + } + } + }, // See test/unit/core.js for details concerning isFunction. // Since version 1.3, DOM methods and functions like alert @@ -636,27 +453,81 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, - // check if an element is in a (or is an) XML document - isXMLDoc: function( elem ) { - return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || - !!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument ); + isPlainObject: function( obj ) { + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) { + return false; + } + + // Not own constructor property must be Object + if ( obj.constructor + && !hasOwnProperty.call(obj, "constructor") + && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + + var key; + for ( key in obj ) {} + + return key === undefined || hasOwnProperty.call( obj, key ); }, + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw msg; + }, + + parseJSON: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; + } + + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@") + .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]") + .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) { + + // Try to use the native JSON parser first + return window.JSON && window.JSON.parse ? + window.JSON.parse( data ) : + (new Function("return " + data))(); + + } else { + jQuery.error( "Invalid JSON: " + data ); + } + }, + + noop: function() {}, + // Evalulates a script in a global context globalEval: function( data ) { - if ( data && /\S/.test(data) ) { + if ( data && rnotwhite.test(data) ) { // Inspired by code by Andrea Giammarchi // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html var head = document.getElementsByTagName("head")[0] || document.documentElement, script = document.createElement("script"); script.type = "text/javascript"; - if ( jQuery.support.scriptEval ) - script.appendChild( document.createTextNode( data ) ); - else - script.text = data; - // Use insertBefore instead of appendChild to circumvent an IE6 bug. + if ( jQuery.support.scriptEval ) { + script.appendChild( document.createTextNode( data ) ); + } else { + script.text = data; + } + + // Use insertBefore instead of appendChild to circumvent an IE6 bug. // This arises when a base node is used (#2709). head.insertBefore( script, head.firstChild ); head.removeChild( script ); @@ -664,471 +535,99 @@ jQuery.extend({ }, nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); + return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); }, // args is for internal usage only each: function( object, callback, args ) { - var name, i = 0, length = object.length; + var name, i = 0, + length = object.length, + isObj = length === undefined || jQuery.isFunction(object); if ( args ) { - if ( length === undefined ) { - for ( name in object ) - if ( callback.apply( object[ name ], args ) === false ) + if ( isObj ) { + for ( name in object ) { + if ( callback.apply( object[ name ], args ) === false ) { break; - } else - for ( ; i < length; ) - if ( callback.apply( object[ i++ ], args ) === false ) + } + } + } else { + for ( ; i < length; ) { + if ( callback.apply( object[ i++ ], args ) === false ) { break; + } + } + } // A special, fast, case for the most common use of each } else { - if ( length === undefined ) { - for ( name in object ) - if ( callback.call( object[ name ], name, object[ name ] ) === false ) + if ( isObj ) { + for ( name in object ) { + if ( callback.call( object[ name ], name, object[ name ] ) === false ) { break; - } else + } + } + } else { for ( var value = object[0]; - i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} + i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {} + } } return object; }, - prop: function( elem, value, type, i, name ) { - // Handle executable functions - if ( jQuery.isFunction( value ) ) - value = value.call( elem, i ); - - // Handle passing in a number to a CSS property - return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ? - value + "px" : - value; - }, - - className: { - // internal only, use addClass("class") - add: function( elem, classNames ) { - jQuery.each((classNames || "").split(/\s+/), function(i, className){ - if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) - elem.className += (elem.className ? " " : "") + className; - }); - }, - - // internal only, use removeClass("class") - remove: function( elem, classNames ) { - if (elem.nodeType == 1) - elem.className = classNames !== undefined ? - jQuery.grep(elem.className.split(/\s+/), function(className){ - return !jQuery.className.has( classNames, className ); - }).join(" ") : - ""; - }, - - // internal only, use hasClass("class") - has: function( elem, className ) { - return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; - } - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - callback.call( elem ); - - // Revert the old values - for ( var name in options ) - elem.style[ name ] = old[ name ]; - }, - - css: function( elem, name, force, extra ) { - if ( name == "width" || name == "height" ) { - var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; - - function getWH() { - val = name == "width" ? elem.offsetWidth : elem.offsetHeight; - - if ( extra === "border" ) - return; - - jQuery.each( which, function() { - if ( !extra ) - val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; - if ( extra === "margin" ) - val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0; - else - val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; - }); - } - - if ( elem.offsetWidth !== 0 ) - getWH(); - else - jQuery.swap( elem, props, getWH ); - - return Math.max(0, Math.round(val)); - } - - return jQuery.curCSS( elem, name, force ); - }, - - curCSS: function( elem, name, force ) { - var ret, style = elem.style; - - // We need to handle opacity special in IE - if ( name == "opacity" && !jQuery.support.opacity ) { - ret = jQuery.attr( style, "opacity" ); - - return ret == "" ? - "1" : - ret; - } - - // Make sure we're using the right name for getting the float value - if ( name.match( /float/i ) ) - name = styleFloat; - - if ( !force && style && style[ name ] ) - ret = style[ name ]; - - else if ( defaultView.getComputedStyle ) { - - // Only "float" is needed here - if ( name.match( /float/i ) ) - name = "float"; - - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); - - var computedStyle = defaultView.getComputedStyle( elem, null ); - - if ( computedStyle ) - ret = computedStyle.getPropertyValue( name ); - - // We should always get a number back from opacity - if ( name == "opacity" && ret == "" ) - ret = "1"; - - } else if ( elem.currentStyle ) { - var camelCase = name.replace(/\-(\w)/g, function(all, letter){ - return letter.toUpperCase(); - }); - - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; - - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - - // If we're not dealing with a regular pixel number - // but a number that has a weird ending, we need to convert it to pixels - if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { - // Remember the original values - var left = style.left, rsLeft = elem.runtimeStyle.left; - - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - style.left = ret || 0; - ret = style.pixelLeft + "px"; - - // Revert the changed values - style.left = left; - elem.runtimeStyle.left = rsLeft; - } - } - - return ret; - }, - - clean: function( elems, context, fragment ) { - context = context || document; - - // !context.createElement fails in IE with an error but returns typeof 'object' - if ( typeof context.createElement === "undefined" ) - context = context.ownerDocument || context[0] && context[0].ownerDocument || document; - - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) { - var match = /^<(\w+)\s*\/?>$/.exec(elems[0]); - if ( match ) - return [ context.createElement( match[1] ) ]; - } - - var ret = [], scripts = [], div = context.createElement("div"); - - jQuery.each(elems, function(i, elem){ - if ( typeof elem === "number" ) - elem += ''; - - if ( !elem ) - return; - - // Convert html string into DOM nodes - if ( typeof elem === "string" ) { - // Fix "XHTML"-style tags in all browsers - elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ - return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? - all : - front + ">"; - }); - - // Trim whitespace, otherwise indexOf won't work as expected - var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase(); - - var wrap = - // option or optgroup - !tags.indexOf("", "" ] || - - !tags.indexOf("", "" ] || - - tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && - [ 1, "", "
    " ] || - - !tags.indexOf("", "" ] || - - // matched above - (!tags.indexOf("", "" ] || - - !tags.indexOf("", "" ] || - - // IE can't serialize and