From 275002d88a758d47e15b2f6d97873c243a500451 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 14 May 2010 16:41:29 -0400 Subject: allow hyphens in subdomains for webfinger addresses --- plugins/OStatus/OStatusPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index f183bc7ae..5167842ca 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -257,7 +257,7 @@ class OStatusPlugin extends Plugin $matches = array(); // Webfinger matches: @user@example.com - if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', + if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', $text, $wmatches, PREG_OFFSET_CAPTURE)) { -- cgit v1.2.3 From 1999b836c0681c44171d849028fb2d5d0c3d01b8 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 14 May 2010 16:43:21 -0400 Subject: accept either salmon endpoint (until they're unified in the spec) --- plugins/OStatus/lib/discoveryhints.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 80cfbbf15..ca54a0f5f 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -30,6 +30,7 @@ class DiscoveryHints { case Discovery::PROFILEPAGE: $hints['profileurl'] = $link['href']; break; + case Salmon::NS_MENTIONS: case Salmon::NS_REPLIES: $hints['salmon'] = $link['href']; break; -- cgit v1.2.3 From 599942f58a839a7d6d7ff92e31873f3d61faf326 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 14:56:40 +1200 Subject: sorted enums and auto_increments on postgres. Still needs inline indexes on table creation --- lib/pgsqlschema.php | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 715065d77..7594edc8e 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -41,6 +41,7 @@ if (!defined('STATUSNET')) { * @category Database * @package StatusNet * @author Evan Prodromou + * @author Brenda Wallace * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -79,7 +80,6 @@ class PgsqlSchema extends Schema $row = array(); while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) { -// var_dump($row); $cd = new ColumnDef(); $cd->name = $row['field']; @@ -155,7 +155,6 @@ class PgsqlSchema extends Schema } $sql .= $this->_columnSql($cd); - switch ($cd->key) { case 'UNI': $uniques[] = $cd->name; @@ -188,7 +187,7 @@ class PgsqlSchema extends Schema $res = $this->conn->query($sql); if (PEAR::isError($res)) { - throw new Exception($res->getMessage()); + throw new Exception($res->getMessage(). ' SQL was '. $sql); } return true; @@ -223,7 +222,7 @@ class PgsqlSchema extends Schema */ private function _columnTypeTranslation($type) { $map = array( - 'datetime' => 'timestamp' + 'datetime' => 'timestamp', ); if(!empty($map[$type])) { return $map[$type]; @@ -397,16 +396,17 @@ class PgsqlSchema extends Schema $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; + // BIG GIANT TODO! + // stop it detecting different types and trying to modify on every page request +// $tomod[] = $newCol->name; } } - if (count($toadd) + count($todrop) + count($tomod) == 0) { // nothing to do return true; @@ -434,7 +434,7 @@ class PgsqlSchema extends Schema } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); - + echo "

$sql

"; $res = $this->conn->query($sql); if (PEAR::isError($res)) { @@ -496,12 +496,21 @@ class PgsqlSchema extends Schema * * @return string correct SQL for that column */ - private function _columnSql($cd) { $sql = "{$cd->name} "; $type = $this->_columnTypeTranslation($cd->type); + //handle those mysql enum fields that postgres doesn't support + if (preg_match('!^enum!', $type)) { + $allowed_values = preg_replace('!^enum!', '', $type); + $sql .= " text check ({$cd->name} in $allowed_values)"; + return $sql; + } + if (!empty($cd->auto_increment)) { + $type = 'serial'; + } + if (!empty($cd->size)) { $sql .= "{$type}({$cd->size}) "; } else { @@ -513,10 +522,6 @@ class PgsqlSchema extends Schema } else { $sql .= ($cd->nullable) ? "null " : "not null "; } - - if (!empty($cd->auto_increment)) { - $sql .= " auto_increment "; - } if (!empty($cd->extra)) { $sql .= "{$cd->extra} "; -- cgit v1.2.3 From 7cf250ff188bac16400b688dd309d189ef99fde8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:08:22 +1200 Subject: removed sneaky debug echo that shouldn't be there --- lib/pgsqlschema.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 7594edc8e..12f24cfbe 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -434,7 +434,6 @@ class PgsqlSchema extends Schema } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); - echo "

$sql

"; $res = $this->conn->query($sql); if (PEAR::isError($res)) { -- cgit v1.2.3 From 191752138a26087648dc665595fb9ca566306637 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:14:11 +1200 Subject: indexes now working in postgres schemas --- lib/pgsqlschema.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 12f24cfbe..24b847a98 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -172,18 +172,16 @@ class PgsqlSchema extends Schema $sql .= ",\n primary key (" . implode(',', $primary) . ")"; } - - - foreach ($indices as $i) { - $sql .= ",\nindex {$name}_{$i}_idx ($i)"; - } - $sql .= "); "; foreach ($uniques as $u) { $sql .= "\n CREATE index {$name}_{$u}_idx ON {$name} ($u); "; } + + foreach ($indices as $i) { + $sql .= "CREATE index {$name}_{$i}_idx on {$name} ($i)"; + } $res = $this->conn->query($sql); if (PEAR::isError($res)) { -- cgit v1.2.3 From a467c0ebbab22a220972e458de0652e523bc12d7 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:31:54 +1200 Subject: caitalise the sql keywords --- lib/pgsqlschema.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 24b847a98..16639ff1b 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -169,7 +169,7 @@ class PgsqlSchema extends Schema } if (count($primary) > 0) { // it really should be... - $sql .= ",\n primary key (" . implode(',', $primary) . ")"; + $sql .= ",\n PRIMARY KEY (" . implode(',', $primary) . ")"; } $sql .= "); "; @@ -180,7 +180,7 @@ class PgsqlSchema extends Schema } foreach ($indices as $i) { - $sql .= "CREATE index {$name}_{$i}_idx on {$name} ($i)"; + $sql .= "CREATE index {$name}_{$i}_idx ON {$name} ($i)"; } $res = $this->conn->query($sql); -- cgit v1.2.3 From 7bd6b62461551f26fa5571b72b260d4e92c9bfd5 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:32:22 +1200 Subject: comment out the extra bit, cos there's always mysql-only stuff in therre. this isn't a very good idea --- lib/pgsqlschema.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 16639ff1b..583d01e0a 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -520,9 +520,9 @@ class PgsqlSchema extends Schema $sql .= ($cd->nullable) ? "null " : "not null "; } - if (!empty($cd->extra)) { - $sql .= "{$cd->extra} "; - } +// if (!empty($cd->extra)) { +// $sql .= "{$cd->extra} "; +// } return $sql; } -- cgit v1.2.3 From 9bb18541df68b5a921d366c8cfb578887178b694 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:33:55 +1200 Subject: added missing field to the group by. this makes postgres happy --- lib/popularnoticesection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 296ddbbb5..f70a972ef 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . - 'notice.lat,notice.lon,location_id,location_ns' . + 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' . ' ORDER BY weight DESC'; $offset = 0; -- cgit v1.2.3 From 57f570c8e73bc03f6b6cf5d3d00f27321c0dc7de Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 16 May 2010 17:45:48 +0200 Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/af/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ar/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/arz/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/bg/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/br/LC_MESSAGES/statusnet.po | 51 ++++++++--- locale/ca/LC_MESSAGES/statusnet.po | 155 +++++++++++++++++++--------------- locale/cs/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/de/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/el/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/en_GB/LC_MESSAGES/statusnet.po | 90 +++++++++++++++++--- locale/es/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/fa/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/fi/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/fr/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ga/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/gl/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/he/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/hsb/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ia/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/is/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/it/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ja/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ko/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/mk/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/nb/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/nl/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/nn/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/pl/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/pt/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/pt_BR/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/ru/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/statusnet.pot | 32 +++++-- locale/sv/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/te/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/tr/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/uk/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/vi/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/zh_CN/LC_MESSAGES/statusnet.po | 36 ++++++-- locale/zh_TW/LC_MESSAGES/statusnet.po | 36 ++++++-- 39 files changed, 1246 insertions(+), 342 deletions(-) diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index d6119b23f..b9f82c0f8 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:32+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:16+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -3140,7 +3140,7 @@ msgstr "" msgid "Registration successful" msgstr "Die registrasie is voltooi" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreer" @@ -3192,14 +3192,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3218,7 +3240,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 277190ef8..24253a970 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-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:36+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:19+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -3138,7 +3138,7 @@ msgstr "عذرا، رمز دعوة غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -3190,14 +3190,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3216,7 +3238,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 53ec108d6..12f575846 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:39+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:22+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.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -3160,7 +3160,7 @@ msgstr "عذرا، رمز دعوه غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -3212,14 +3212,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3238,7 +3260,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 43afebb72..10f4fc66e 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:25+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -3255,7 +3255,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "Записването е успешно." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" @@ -3309,14 +3309,36 @@ msgstr "Използва се само за промени, обяви или в msgid "Longer name, preferably your \"real\" name" msgstr "По-дълго име, за предпочитане \"истинското\" ви име." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3349,7 +3371,7 @@ msgstr "" "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи " "само приятни мигове!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index b207e4a5f..0c64a7aa0 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:28+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -3151,7 +3151,7 @@ msgstr "Digarezit, kod pedadenn direizh." msgid "Registration successful" msgstr "Krouet eo bet ar gont." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Krouiñ ur gont" @@ -3205,14 +3205,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3231,7 +3253,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -5951,11 +5973,14 @@ msgid "" "\n" "\t%s" msgstr "" +"Ar gaozeadenn klok a c'hell bezañ lennet amañ :\n" +"\n" +"%s" #: lib/mail.php:651 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn" #. TRANS: Body of @-reply notification e-mail. #: lib/mail.php:654 @@ -6065,7 +6090,7 @@ msgstr "" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Klaskit implijout ur furmad %s all." #: lib/mediafile.php:275 #, php-format @@ -6183,11 +6208,11 @@ msgstr "Kas ur blinkadenn d'an implijer-mañ" #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "" +msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "" +msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar" #: lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -6289,7 +6314,7 @@ msgstr "Strolladoù implijerien" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "Merkoù nevez" #: lib/publicgroupnav.php:88 msgid "Featured" @@ -6559,7 +6584,7 @@ msgstr "n'eo ket %s ul liv reizh !" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel." #: lib/xmppmanager.php:403 #, php-format diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index f41cef30c..d2bb7867a 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -1,7 +1,6 @@ # Translation of StatusNet to Catalan # # Author@translatewiki.net: Aleator -# Author@translatewiki.net: McDutchie # Author@translatewiki.net: Paucabot # Author@translatewiki.net: Toniher # -- @@ -11,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:50:56+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:32+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -451,7 +450,7 @@ msgstr "Hi ha massa àlies! Màxim %d." #: actions/apigroupcreate.php:266 #, php-format msgid "Invalid alias: \"%s\"." -msgstr "L'àlies no és vàlid: \"%s\"." +msgstr "L'àlies no és vàlid: «%s»." #: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 @@ -655,7 +654,7 @@ msgstr "Avís duplicat." #: actions/apistatusesshow.php:138 msgid "Status deleted." -msgstr "S'ha suprimit l'estat." +msgstr "S'ha eliminat l'estat." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." @@ -819,7 +818,7 @@ msgstr "Error en actualitzar avatar." #: actions/avatarsettings.php:397 msgid "Avatar deleted." -msgstr "S'ha suprimit l'avatar." +msgstr "S'ha eliminat l'avatar." #: actions/block.php:69 msgid "You already blocked that user." @@ -1228,7 +1227,7 @@ msgstr "Afegeix als preferits" #: actions/doc.php:158 #, php-format msgid "No such document \"%s\"" -msgstr "No existeix el document \"%s\"" +msgstr "No existeix el document «%s»" #: actions/editapplication.php:54 msgid "Edit Application" @@ -1544,7 +1543,7 @@ msgstr "Aquest no és el teu correu electrònic" #. TRANS: Message given after successfully removing a registered e-mail address. #: actions/emailsettings.php:479 msgid "The email address was removed." -msgstr "S'ha suprimit l'adreça de correu electrònic." +msgstr "S'ha eliminat l'adreça de correu electrònic." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1750,8 +1749,8 @@ msgid "" "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? Se suprimiran " -"del grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." +"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? S'eliminarà del " +"grup, i no podrà enviar-hi res ni subscriure-s'hi en el futur." #. TRANS: Submit button title for 'No' when blocking a user from a group. #: actions/groupblock.php:182 @@ -1998,9 +1997,9 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adreça Jabber o GTalk, per exemple \"NomUsuari@example.org\". Primer, " -"assegura't d'afegir a %s a la teva llista d'amics en el teu client de " -"missatgeria instantània o a GTalk." +"Adreça Jabber o GTalk, per exemple «NomUsuari@example.org». Primer, assegureu-" +"vos d'afegir %s a la vostra llista d'amics en el vostre client de " +"missatgeria instantània o al GTalk." #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 @@ -2953,7 +2952,7 @@ msgstr "Ubicació" #: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\"" +msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" @@ -3011,7 +3010,7 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Etiqueta no vàlida: \"%s\"" +msgstr "L'etiqueta no és vàlida: «%s»" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." @@ -3279,7 +3278,7 @@ msgstr "El codi d'invitació no és vàlid." msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -3333,9 +3332,31 @@ msgstr "" #: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" -msgstr "Nom llarg, preferiblement el teu nom \"real\"" +msgstr "Nom llarg, preferiblement el vostre nom «real»" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "El contingut i les dades de %1$s són privades i confidencials." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3345,7 +3366,7 @@ msgstr "" "les dades privades: contrasenya, adreça de correu electrònic, adreça de " "missatgeria instantània i número de telèfon." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3378,7 +3399,7 @@ msgstr "" "\n" "Gràcies per registrar-vos-hi i esperem que en gaudiu." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3842,7 +3863,7 @@ msgstr "Missatge de %1$s a %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "S'ha suprimit l'avís." +msgstr "S'ha eliminat l'avís." #: actions/showstream.php:73 #, php-format @@ -4198,7 +4219,7 @@ msgstr "Aquest no és el teu número de telèfon." #. TRANS: Message given after successfully removing a registered SMS phone number. #: actions/smssettings.php:470 msgid "The SMS phone number was removed." -msgstr "S'ha suprimit el número de telèfon de l'SMS." +msgstr "S'ha eliminat el número de telèfon de l'SMS." #. TRANS: Label for mobile carrier dropdown menu in SMS settings. #: actions/smssettings.php:511 @@ -4905,15 +4926,15 @@ msgstr "No hi esteu subscrit!" #: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." -msgstr "No s'ha pogut suprimir l'autosubscripció." +msgstr "No s'ha pogut eliminar l'autosubscripció." #: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "No s'ha pogut suprimir el testimoni OMB de la subscripció." +msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció." #: classes/Subscription.php:211 msgid "Couldn't delete subscription." -msgstr "No s'ha pogut suprimir la subscripció." +msgstr "No s'ha pogut eliminar la subscripció." #: classes/User.php:363 #, php-format @@ -5112,7 +5133,7 @@ msgstr "Vistes locals" #. TRANS: DT element for page notice. String is hidden in default CSS. #: lib/action.php:649 msgid "Page notice" -msgstr "Notificació pàgina" +msgstr "Avís de pàgina" #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS. #: lib/action.php:752 @@ -5286,7 +5307,7 @@ msgstr "El saveSettings() no està implementat." #. TRANS: the admin panel Design. #: lib/adminpanelaction.php:284 msgid "Unable to delete design setting." -msgstr "No s'ha pogut suprimir el paràmetre de disseny." +msgstr "No s'ha pogut eliminar el paràmetre de disseny." #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:349 @@ -5567,7 +5588,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s." #: lib/command.php:385 #, php-format msgid "Could not remove user %1$s from group %2$s" -msgstr "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." +msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s." #. TRANS: Whois output. %s is the full name of the queried user. #: lib/command.php:418 @@ -5671,12 +5692,12 @@ msgstr "Subscrit a %s" #: lib/command.php:655 lib/command.php:754 msgid "Specify the name of the user to unsubscribe from" -msgstr "Especifiqueu el nom de l'usuari de qui voleu deixar d'estar subscrit" +msgstr "Especifiqueu el nom de l'usuari de qui voleu cancel·lar la subscripció" #: lib/command.php:664 #, php-format msgid "Unsubscribed from %s" -msgstr "Has deixat d'estar subscrit a %s" +msgstr "Heu cancel·lat la subscripció a %s" #: lib/command.php:682 lib/command.php:705 msgid "Command not yet implemented." @@ -5684,19 +5705,19 @@ msgstr "Comanda encara no implementada." #: lib/command.php:685 msgid "Notification off." -msgstr "Notificacions off." +msgstr "Avisos desactivats." #: lib/command.php:687 msgid "Can't turn off notification." -msgstr "No es poden posar en off les notificacions." +msgstr "No es poden desactivar els avisos." #: lib/command.php:708 msgid "Notification on." -msgstr "Notificacions on." +msgstr "Avisos activitats." #: lib/command.php:710 msgid "Can't turn on notification." -msgstr "No es poden posar en on les notificacions." +msgstr "No es poden activar els avisos." #: lib/command.php:723 msgid "Login command is disabled" @@ -5712,7 +5733,7 @@ msgstr "" #: lib/command.php:761 #, php-format msgid "Unsubscribed %s" -msgstr "S'ha dessubscrit %s" +msgstr "S'ha cancel·lat la subscripció de %s" #: lib/command.php:778 msgid "You are not subscribed to anyone." @@ -5793,7 +5814,7 @@ msgstr "" "groups - llista els grups on us heu unit\n" "subscriptions - llista la gent que seguiu\n" "subscribers - llista la gent que us segueix\n" -"leave - dessubscriu de l'usuari\n" +"leave - cancel·la la subscripció de l'usuari\n" "d - missatge directe a l'usuari\n" "get - s'obté el darrer avís de l'usuari\n" "whois - s'obté la informació del perfil de l'usuari\n" @@ -5834,7 +5855,7 @@ msgstr "S'han cercat fitxers de configuracions en els llocs següents: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." -msgstr "Podeu voler executar l'instal·lador per a corregir-ho." +msgstr "Podeu voler executar l'instal·lador per corregir-ho." #: lib/common.php:139 msgid "Go to the installer." @@ -5842,11 +5863,11 @@ msgstr "Vés a l'instal·lador." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "Missatgeria Instantània" +msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Actualitzacions per Missatgeria Instantània" +msgstr "Actualitzacions per missatgeria instantània (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -5929,7 +5950,7 @@ msgstr "Etiqueta" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "Trieu una etiqueta per a escurçar la llista" +msgstr "Trieu una etiqueta per escurçar la llista" #: lib/galleryaction.php:143 msgid "Go" @@ -5942,16 +5963,16 @@ msgstr "Atorga a l'usuari el rol «%s»" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "URL del teu web, blog del grup u tema" +msgstr "URL del teu web, blog del grup o de la temàtica" #: lib/groupeditform.php:168 msgid "Describe the group or topic" -msgstr "Descriviu el grup o el tema" +msgstr "Descriviu el grup o la temàtica" #: lib/groupeditform.php:170 #, php-format msgid "Describe the group or topic in %d characters" -msgstr "Descriviu el grup o el tema en %d caràcters" +msgstr "Descriviu el grup o la temàtica en %d caràcters" #: lib/groupeditform.php:179 msgid "" @@ -5962,7 +5983,7 @@ msgstr "" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "Sobrenoms addicionals del grup, separats per coma o espai, màx. %d" +msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d" #: lib/groupnav.php:85 msgid "Group" @@ -5975,7 +5996,7 @@ msgstr "Blocat" #: lib/groupnav.php:102 #, php-format msgid "%s blocked users" -msgstr "%susuaris blocats" +msgstr "%s usuaris blocats" #: lib/groupnav.php:108 #, php-format @@ -5989,7 +6010,7 @@ msgstr "Logo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "Afegir o editar logo %s" +msgstr "Afegeix o edita el logo %s" #: lib/groupnav.php:120 #, php-format @@ -6007,7 +6028,7 @@ msgstr "Grups amb més entrades" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "Etiquetes en les notificacions del grup %s" +msgstr "Etiquetes en els avisos del grup %s" #. TRANS: Client exception 406 #: lib/htmloutputter.php:104 @@ -6037,7 +6058,7 @@ msgstr "No és una imatge o és un fitxer corrupte." #: lib/imagefile.php:122 msgid "Lost our file." -msgstr "Hem perdut el nostre arxiu." +msgstr "Hem perdut el nostre fitxer." #: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" @@ -6075,7 +6096,7 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" -msgstr "Registreu-vos-hi per a un compte nou" +msgstr "Registreu-vos-hi si voleu un compte nou" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 @@ -6143,7 +6164,7 @@ msgstr "" "%7$s.\n" "\n" "----\n" -"Canvieu la vostra adreça electrònica o les opcions de notificació a %8$s\n" +"Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 @@ -6170,13 +6191,13 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" -"Tens una nova direcció per publicar a %1$s.\n" +"Teniu una nova adreça per publicar a %1$s.\n" "\n" -"Envia un correu electrònic a %2$s per publicar un nou missatge.\n" +"Envieu un correu electrònic a %2$s per publicar un nou missatge.\n" "\n" "Més instruccions per al correu electrònic a %3$s.\n" "\n" -"Sincerament teus,\n" +"Atentament,\n" "%4$s" #. TRANS: Subject line for SMS-by-email notification messages @@ -6218,7 +6239,7 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" -"%1$s (%2$s) què tal us trobeu is us convida a enviar algunes notícies.\n" +"%1$s (%2$s) què tal us trobeu is us convida a publicar algunes notícies.\n" "\n" "Esperem sentir-vos aviat :)\n" "\n" @@ -6379,7 +6400,7 @@ msgstr "" "Atentament,\n" "%2$s\n" "\n" -"P.S. Podeu desactivar les notificacions per correu aquí: %8$s\n" +"P.S. Podeu desactivar els avisos per correu aquí: %8$s\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." @@ -6390,7 +6411,7 @@ msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" -"No teniu missatges privats. Podeu enviar un missatge per a animar altres " +"No teniu missatges privats. Podeu enviar un missatge per animar altres " "usuaris en la conversa. La gent pot enviar-vos missatges només per als " "vostres ulls." @@ -6643,7 +6664,7 @@ msgstr "Els teus missatges enviats" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "Etiquetes en les notificacions de %s's" +msgstr "Etiquetes en els avisos de %s" #: lib/plugin.php:115 msgid "Unknown" @@ -6761,15 +6782,15 @@ msgstr "Gent" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "Trobar gent en aquest lloc" +msgstr "Cerca gent en aquest lloc" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "Trobar contingut de les notes" +msgstr "Cerca el contingut dels avisos" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "Trobar un grup en aquest lloc" +msgstr "Cerca grups en aquest lloc" #: lib/section.php:89 msgid "Untitled section" @@ -6777,7 +6798,7 @@ msgstr "Secció sense títol" #: lib/section.php:106 msgid "More..." -msgstr "Més…" +msgstr "Més..." #: lib/silenceform.php:67 msgid "Silence" @@ -6795,7 +6816,7 @@ msgstr "Persones %s subscrites a" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "Persones subscrites a %s" +msgstr "Gent subscrita a %s" #: lib/subgroupnav.php:99 #, php-format @@ -6809,7 +6830,7 @@ msgstr "Convida" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Convidar amics i companys perquè participin a %s" +msgstr "Convida amics i companys perquè participin a %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -6827,7 +6848,7 @@ msgstr "Cap" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "Que més publiquen" +msgstr "Qui més publica" #: lib/unsandboxform.php:69 msgid "Unsandbox" @@ -6847,7 +6868,7 @@ msgstr "Dessilencia l'usuari" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "Deixar d'estar subscrit des d'aquest usuari" +msgstr "Cancel·la la subscripció d'aquest usuari" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" @@ -6868,7 +6889,7 @@ msgstr "Accions de l'usuari" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "S'està suprimint l'usuari..." +msgstr "S'està eliminant l'usuari..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index a6fbcfe7b..81489316b 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:00+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:35+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -3289,7 +3289,7 @@ msgstr "Chyba v ověřovacím kódu" msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -3341,7 +3341,29 @@ msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla." msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3350,7 +3372,7 @@ msgstr "" " až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní " "číslo." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3369,7 +3391,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 199f0d683..b221c99ba 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:03+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:38+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -3294,7 +3294,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -3353,7 +3353,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Inhalte und Daten von %1$s sind privat und vertraulich." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3362,7 +3384,7 @@ msgstr "" "Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3395,7 +3417,7 @@ msgstr "" "\n" "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index e7ba67b54..4e8f62afe 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:07+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:41+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -3235,7 +3235,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3287,7 +3287,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3296,7 +3318,7 @@ msgstr "" "εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, " "διεύθυνση IM, τηλεφωνικό νούμερο." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3330,7 +3352,7 @@ msgstr "" "Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία " "μας." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index e9fd5bdd3..03e7a669f 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-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:11+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:44+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -1908,6 +1908,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"If you can't find the group you're looking for, you can [create it](%%action." +"newgroup%%) yourself." #: actions/groupsearch.php:85 #, php-format @@ -1915,10 +1917,12 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Why not [register an account](%%action.register%%) and [create the group](%%" +"action.newgroup%%) yourself!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Only an admin can unblock group members." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -3228,7 +3232,7 @@ msgstr "Sorry, invalid invitation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -3280,7 +3284,29 @@ msgstr "Used only for updates, announcements, and password recovery" msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3289,7 +3315,7 @@ msgstr "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3322,7 +3348,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -4251,6 +4277,8 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"You have no subscribers. Try subscribing to people you know and they might " +"return the favour" #: actions/subscribers.php:110 #, php-format @@ -5115,7 +5143,7 @@ msgstr "" #: lib/action.php:871 #, php-format msgid "All %1$s content and data are available under the %2$s license." -msgstr "" +msgstr "All %1$s content and data are available under the %2$s licence." #. TRANS: DT element for pagination (previous/next, etc.). #: lib/action.php:1182 @@ -5663,6 +5691,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Commands:\n" +"on - turn on notifications\n" +"off - turn off notifications\n" +"help - show this help\n" +"follow - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" +"leave - unsubscribe from user\n" +"d - direct message to user\n" +"get - get last notice from user\n" +"whois - get profile info on user\n" +"lose - force user to stop following you\n" +"fav - add user's last notice as a 'fave'\n" +"fav # - add notice with the given id as a 'fave'\n" +"repeat # - repeat a notice with a given id\n" +"repeat - repeat the last notice from user\n" +"reply # - reply to notice with a given id\n" +"reply - reply to the last notice from user\n" +"join - join group\n" +"login - Get a link to login to the web interface\n" +"drop - leave group\n" +"stats - get your stats\n" +"stop - same as 'off'\n" +"quit - same as 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" #: lib/common.php:135 msgid "No configuration file found. " @@ -6625,7 +6691,7 @@ msgstr "Edit profile settings" #: lib/userprofile.php:264 msgid "Edit" -msgstr "" +msgstr "Edit" #: lib/userprofile.php:287 msgid "Send a direct message to this user" @@ -6637,7 +6703,7 @@ msgstr "Message" #: lib/userprofile.php:326 msgid "Moderate" -msgstr "" +msgstr "Moderate" #: lib/userprofile.php:364 msgid "User role" @@ -6651,7 +6717,7 @@ msgstr "Administrator" #: lib/userprofile.php:367 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Moderator" #. TRANS: Used in notices to indicate when the notice was made compared to now. #: lib/util.php:1083 diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 69d670e54..268cb5c5d 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:14+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:47+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -3284,7 +3284,7 @@ msgstr "El código de invitación no es válido." msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -3341,7 +3341,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nombre más largo, preferiblemente tu nombre \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "El contenido y datos de %1$s son privados y confidenciales." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3351,7 +3373,7 @@ msgstr "" "información privada: contraseña, dirección de correo electrónico, dirección " "de mensajería instantánea y número de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3406,7 @@ msgstr "" "\n" "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index e41e075ca..c4a039c31 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:21+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:56+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.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -3251,7 +3251,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موفقیت انجام شد." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -3303,7 +3303,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "نام بلند تر، به طور بهتر نام واقعیتان" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3312,7 +3334,7 @@ msgstr "" "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره " "تلفن." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3331,7 +3353,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 663e6ad34..48a25ce22 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:17+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:39:53+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -3343,7 +3343,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -3399,7 +3399,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Pitempi nimi, mieluiten oikea nimesi" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3408,7 +3430,7 @@ msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3441,7 +3463,7 @@ msgstr "" "\n" "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 639def20d..f5e2e9a91 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:27+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:00+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -3301,7 +3301,7 @@ msgstr "Désolé, code d’invitation invalide." msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -3358,7 +3358,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nom plus long, votre \"vrai\" nom de préférence" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Le contenu et les données de %1$s sont privés et confidentiels." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3368,7 +3390,7 @@ msgstr "" "données personnelles : mot de passe, adresse électronique, adresse de " "messagerie instantanée, numéro de téléphone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3402,7 +3424,7 @@ msgstr "" "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index bf1273bd7..64a4d3e3b 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:30+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:04+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -3380,7 +3380,7 @@ msgstr "Acounteceu un erro co código de confirmación." msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -3439,7 +3439,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nome máis longo, preferiblemente o teu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3448,7 +3470,7 @@ msgstr "" " agás esta informción privada: contrasinal, dirección de correo electrónico, " "dirección IM, número de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3480,7 +3502,7 @@ msgstr "" "\n" "Grazas por rexistrarte e esperamos que laretexes moito." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index b54d10ac9..6639ecf5a 100644 --- a/locale/gl/LC_MESSAGES/statusnet.po +++ b/locale/gl/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:34+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:10+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -3281,7 +3281,7 @@ msgstr "O código da invitación é incorrecto." msgid "Registration successful" msgstr "Rexistrouse correctamente" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrarse" @@ -3338,7 +3338,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nome longo, preferiblemente o seu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O contido e os datos de %1$s son privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3348,7 +3370,7 @@ msgstr "" "datos privados: contrasinais, enderezos de correo electrónico e mensaxería " "instantánea e números de teléfono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3380,7 +3402,7 @@ msgstr "" "\n" "Grazas por rexistrarse. Esperamos que goce deste servizo." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 29f21cbc0..486fc3285 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:37+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:14+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -3295,7 +3295,7 @@ msgstr "שגיאה באישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" @@ -3347,14 +3347,36 @@ msgstr "לשימוש רק במקרים של עידכונים, הודעות מע msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3373,7 +3395,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 22e57db04..8600eaf7d 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:17+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -3120,7 +3120,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod." msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -3172,14 +3172,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3198,7 +3220,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index c235d78c2..18617e5c5 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:20+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -3264,7 +3264,7 @@ msgstr "Pardono, le codice de invitation es invalide." msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Crear conto" @@ -3320,7 +3320,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Le contento e datos de %1$s es private e confidential." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3330,7 +3352,7 @@ msgstr "" "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de " "telephono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "\n" "Gratias pro inscriber te, e nos spera que iste servicio te place." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 35d508d9f..b3ced814d 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:50+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:24+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -3319,7 +3319,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -3373,14 +3373,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3413,7 +3435,7 @@ msgstr "" "\n" "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index d6b01201a..ed159ea92 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:54+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:28+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -3262,7 +3262,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrati" @@ -3318,7 +3318,29 @@ msgstr "Usata solo per aggiornamenti, annunci e recupero password" msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "I contenuti e i dati di %1$s sono privati e confidenziali." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3328,7 +3350,7 @@ msgstr "" "dati personali: password, indirizzo email, indirizzo messaggistica " "istantanea e numero di telefono." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 58e507dfd..36b810524 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:51:57+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:31+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -3283,7 +3283,7 @@ msgstr "すみません、不正な招待コード。" msgid "Registration successful" msgstr "登録成功" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -3339,14 +3339,36 @@ msgstr "更新、アナウンス、パスワードリカバリーでのみ使用 msgid "Longer name, preferably your \"real\" name" msgstr "長い名前" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3379,7 +3401,7 @@ msgstr "" "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん" "で使ってくれることを願っています。" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 8c20d9370..bd688f756 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:00+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:35+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -3286,7 +3286,7 @@ msgstr "확인 코드 오류" msgid "Registration successful" msgstr "회원 가입이 성공적입니다." -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" @@ -3340,14 +3340,36 @@ msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요." msgid "Longer name, preferably your \"real\" name" msgstr "더욱 긴 이름을 요구합니다." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3380,7 +3402,7 @@ msgstr "" "\n" "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 2647c9aac..2f4fca471 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:17+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -3277,7 +3277,7 @@ msgstr "Жалиме, неважечки код за поканата." msgid "Registration successful" msgstr "Регистрацијата е успешна" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрирај се" @@ -3333,7 +3333,29 @@ msgstr "Се користи само за подновувања, објави msgid "Longer name, preferably your \"real\" name" msgstr "Подолго име, по можност Вашето вистинско име и презиме" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Содржината и податоците на %1$s се лични и доверливи." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3342,7 +3364,7 @@ msgstr "" "Мојот текст и податотеки се достапни под %s, освен следниве приватни " "податоци: лозинка, е-пошта, IM-адреса и телефонски број." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3376,7 +3398,7 @@ msgstr "" "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа " "служба." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 8cfe078f7..5e5539e57 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:20+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:41+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.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -3237,7 +3237,7 @@ msgstr "Beklager, ugyldig invitasjonskode." msgid "Registration successful" msgstr "Registrering vellykket" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrer" @@ -3292,7 +3292,29 @@ msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting" msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3301,7 +3323,7 @@ msgstr "" "Mine tekster og filer er tilgjengelig under %s med unntak av disse private " "dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3334,7 +3356,7 @@ msgstr "" "\n" "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 26a2d0b31..2fb17c45f 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:27+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:48+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -3303,7 +3303,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig." msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -3357,7 +3357,29 @@ msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel" msgid "Longer name, preferably your \"real\" name" msgstr "Een langere naam, mogelijk uw echte naam" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3367,7 +3389,7 @@ msgstr "" "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3401,7 +3423,7 @@ msgstr "" "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u " "ervan verwacht." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index ffe8ad561..f1437b8aa 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:24+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:45+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -3342,7 +3342,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -3397,7 +3397,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3406,7 +3428,7 @@ msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3438,7 +3460,7 @@ msgstr "" "\n" "Takk for at du blei med, og vi håpar du vil lika tenesta!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 7288244c6..a6082d4f1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:30+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:51+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -20,7 +20,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.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -3253,7 +3253,7 @@ msgstr "Nieprawidłowy kod zaproszenia." msgid "Registration successful" msgstr "Rejestracja powiodła się" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" @@ -3309,7 +3309,29 @@ msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła" msgid "Longer name, preferably your \"real\" name" msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Treść i dane %1$s są prywatne i poufne." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3318,7 +3340,7 @@ msgstr "" "Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi " "danymi: hasło, adres e-mail, adres komunikatora i numer telefonu." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3351,7 +3373,7 @@ msgstr "" "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi " "sprawi ci przyjemność." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index f580b6107..f1368936a 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:36+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:55+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -3256,7 +3256,7 @@ msgstr "Desculpe, código de convite inválido." msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -3311,7 +3311,29 @@ msgstr "Usado apenas para actualizações, anúncios e recuperação da senha" msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O conteúdo e dados do site %1$s são privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3321,7 +3343,7 @@ msgstr "" "estes dados privados: senha, endereço de correio electrónico, endereço de " "mensageiro instantâneo, número de telefone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3354,7 +3376,7 @@ msgstr "" "\n" "Obrigado por se ter registado e esperamos que se divirta usando este serviço." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 5bfc411d1..a464b0cae 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-09 17:09+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:39+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:40:58+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -3286,7 +3286,7 @@ msgstr "Desculpe, mas o código do convite é inválido." msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -3341,7 +3341,29 @@ msgstr "Usado apenas para atualizações, anúncios e recuperações de senha" msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3351,7 +3373,7 @@ msgstr "" "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo " "e número de telefone." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3384,7 +3406,7 @@ msgstr "" "\n" "Obrigado por se registrar e esperamos que você aproveite o serviço." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 4fd2bbd22..249d59d65 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:43+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:01+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -3271,7 +3271,7 @@ msgstr "Извините, неверный пригласительный код msgid "Registration successful" msgstr "Регистрация успешна!" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" @@ -3329,7 +3329,29 @@ msgstr "Нужна только для обновлений, осведомле msgid "Longer name, preferably your \"real\" name" msgstr "Полное имя, предпочтительно Ваше настоящее имя" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Содержание и данные %1$s являются личными и конфиденциальными." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3338,7 +3360,7 @@ msgstr "" "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной " "информации: пароля, почтового адреса, номера мессенджера и номера телефона." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3372,7 +3394,7 @@ msgstr "" "Спасибо за то, что присоединились к нам, надеемся, что вы получите " "удовольствие от использования данного сервиса!" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 8ecee1b8e..da42f33dd 100644 --- a/locale/statusnet.pot +++ b/locale/statusnet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-13 20:50+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3106,7 +3106,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3158,14 +3158,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3184,7 +3206,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index cb75b3142..0cd352cbc 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:46+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:05+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -3252,7 +3252,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -3310,7 +3310,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Innehåll och data av %1$s är privat och konfidensiell." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3319,7 +3341,7 @@ msgstr "" "Mina texter och filer är tillgängliga under %s med undantag av den här " "privata datan: lösenord, e-postadress, IM-adress, telefonnummer." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3352,7 +3374,7 @@ msgstr "" "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:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index e93b96c26..c205085d3 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-29 23:21+0000\n" -"PO-Revision-Date: 2010-05-13 20:52:55+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:08+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -3203,7 +3203,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స msgid "Registration successful" msgstr "నమోదు విజయవంతం" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" @@ -3255,7 +3255,29 @@ msgstr "తాజా విశేషాలు, ప్రకటనలు, మర msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3264,7 +3286,7 @@ msgstr "" "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM " "చిరునామా, మరియు ఫోన్ నంబర్." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3295,7 +3317,7 @@ msgstr "" "\n" "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 568980585..54d1a00d7 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:01+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:12+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -3305,7 +3305,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -3358,7 +3358,29 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3367,7 +3389,7 @@ msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3386,7 +3408,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 0893e4b6d..ce85953d6 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:07+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:15+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -3264,7 +3264,7 @@ msgstr "Даруйте, помилка у коді запрошення." msgid "Registration successful" msgstr "Реєстрація успішна" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" @@ -3320,7 +3320,29 @@ msgstr "Використовується лише для оновлень, ог msgid "Longer name, preferably your \"real\" name" msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)" -#: actions/register.php:494 +#: actions/register.php:511 +#, fuzzy, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "Зміст і дані %1$s є приватними і конфіденційними." + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, php-format msgid "" "My text and files are available under %s except this private data: password, " @@ -3329,7 +3351,7 @@ msgstr "" "Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, " "електронна адреса, адреса IM, телефонний номер." -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3362,7 +3384,7 @@ msgstr "" "Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш " "сервіс." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 94d77bdb9..de5d64dc1 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:11+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:18+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -3406,7 +3406,7 @@ msgstr "Lỗi xảy ra với mã xác nhận." msgid "Registration successful" msgstr "Đăng ký thành công" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" @@ -3461,14 +3461,36 @@ msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật kh msgid "Longer name, preferably your \"real\" name" msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn." -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3499,7 +3521,7 @@ msgstr "" "\n" "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này." -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 2b204d031..771e303de 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:21+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:21+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -3346,7 +3346,7 @@ msgstr "验证码出错。" msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -3398,14 +3398,36 @@ msgstr "只用于更新、通告或密码恢复" msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:542 +#: actions/register.php:576 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3436,7 +3458,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 127220dbd..43e6effc8 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-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-05-13 20:53:34+0000\n" +"POT-Creation-Date: 2010-05-16 15:39+0000\n" +"PO-Revision-Date: 2010-05-16 15:41:24+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r66391); Translate extension (2010-05-01)\n" +"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -3237,7 +3237,7 @@ msgstr "確認碼發生錯誤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85 +#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -3289,14 +3289,36 @@ msgstr "" msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:494 +#: actions/register.php:511 +#, php-format +msgid "" +"I understand that content and data of %1$s are private and confidential." +msgstr "" + +#: actions/register.php:521 +#, php-format +msgid "My text and files are copyright by %1$s." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. +#: actions/register.php:525 +msgid "My text and files remain under my own copyright." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved. +#: actions/register.php:528 +msgid "All rights reserved." +msgstr "" + +#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. +#: actions/register.php:533 #, fuzzy, php-format msgid "" "My text and files are available under %s except this private data: password, " "email address, IM address, and phone number." msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼" -#: actions/register.php:542 +#: actions/register.php:576 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -3315,7 +3337,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:566 +#: actions/register.php:600 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" -- cgit v1.2.3 From a968cc69994588e475218975a6fcceb90b9826f8 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 17 May 2010 13:47:27 +1200 Subject: updated database for postgres --- db/statusnet_pg.sql | 71 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 998cc71e9..9f97566a9 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -8,6 +8,10 @@ create table profile ( homepage varchar(255) /* comment 'identifying URL' */, bio varchar(140) /* comment 'descriptive biography' */, location varchar(255) /* comment 'physical location' */, + lat decimal(10,7) /* comment 'latitude'*/ , + lon decimal(10,7) /* comment 'longitude'*/ , + location_id integer /* comment 'location id if possible'*/ , + location_ns integer /* comment 'namespace for location'*/ , created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */, @@ -132,6 +136,7 @@ create table notice ( is_local integer default 0 /* comment 'notice was generated by a user' */, source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */, conversation integer /*id of root notice in this conversation' */ references notice (id), + location varchar(255) /* comment 'physical location' */, lat decimal(10,7) /* comment 'latitude'*/ , lon decimal(10,7) /* comment 'longitude'*/ , location_id integer /* comment 'location id if possible'*/ , @@ -213,17 +218,33 @@ create table nonce ( primary key (consumer_key, ts, nonce) ); -/* One-to-many relationship of user to openid_url */ - -create table user_openid ( - canonical varchar(255) primary key /* comment 'Canonical true URL' */, - display varchar(255) not null unique /* comment 'URL for viewing, may be different from canonical' */, - user_id integer not null /* comment 'user owning this URL' */ references "user" (id) , +create sequence oauth_application_seq; +create table oauth_application ( + id bigint default nextval('oauth_application_seq') primary key /* comment 'unique identifier' */, + owner integer not null /* comment 'owner of the application' */ references profile (id), + consumer_key varchar(255) not null /* comment 'application consumer key' */ references consumer (consumer_key), + name varchar(255) unique not null /* comment 'name of the application' */, + description varchar(255) /* comment 'description of the application' */, + icon varchar(255) not null /* comment 'application icon' */, + source_url varchar(255) /* comment 'application homepage - used for source link' */, + organization varchar(255) /* comment 'name of the organization running the application' */, + homepage varchar(255) /* comment 'homepage for the organization' */, + callback_url varchar(255) /* comment 'url to redirect to after authentication' */, + "type" integer default 0 /* comment 'type of app, 1 = browser, 2 = desktop' */, + access_type integer default 0 /* comment 'default access type, bit 1 = read, bit 2 = write' */, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */ +); +create table oauth_application_user ( + profile_id integer not null /* 'user of the application' */ references profile (id), + application_id integer not null /* 'id of the application' */ references oauth_application (id), + access_type integer default 0 /* 'access type, bit 1 = read, bit 2 = write' */, + token varchar(255) /* 'request or access token' */, + created timestamp not null default CURRENT_TIMESTAMP /* 'date this record was created' */, + modified timestamp /* 'date this record was modified' */, + primary key (profile_id, application_id) ); -create index user_openid_user_id_idx on user_openid using btree(user_id); /* These are used by JanRain OpenID library */ @@ -589,3 +610,39 @@ create table login_token ( primary key (user_id) ); +create table user_location_prefs ( + user_id integer not null /* comment 'user who has the preference' */ references "user" (id), + share_location integer default 1 /* comment 'Whether to share location data' */, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */, + + primary key (user_id) +); + +create table inbox ( + + user_id integer not null /* comment 'user receiving the notice' */ references "user" (id), + notice_ids bytea /* comment 'packed list of notice ids' */, + + primary key (user_id) + +); + +create sequence conversation_seq; +create table conversation ( + id bigint default nextval('conversation_seq') primary key /* comment 'unique identifier' */, + uri varchar(225) unique /* comment 'URI of the conversation' */, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */ +); + +create table local_group ( + + group_id integer primary key /* comment 'group represented' */ references user_group (id), + nickname varchar(64) unique /* comment 'group represented' */, + + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */, + modified timestamp /* comment 'date this record was modified' */ + +); + -- cgit v1.2.3 From 6f19830c9a1f7f73e6a3b09e78f22f65eb1779c4 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 17 May 2010 13:50:37 +1200 Subject: fix the column modify on stuff for postgres. change serial to bigserial --- lib/pgsqlschema.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/pgsqlschema.php b/lib/pgsqlschema.php index 583d01e0a..272f7eff6 100644 --- a/lib/pgsqlschema.php +++ b/lib/pgsqlschema.php @@ -143,6 +143,7 @@ class PgsqlSchema extends Schema $uniques = array(); $primary = array(); $indices = array(); + $onupdate = array(); $sql = "CREATE TABLE $name (\n"; @@ -321,7 +322,7 @@ class PgsqlSchema extends Schema public function modifyColumn($table, $columndef) { - $sql = "ALTER TABLE $table MODIFY COLUMN " . + $sql = "ALTER TABLE $table ALTER COLUMN TYPE " . $this->_columnSql($columndef); $res = $this->conn->query($sql); @@ -428,7 +429,9 @@ class PgsqlSchema extends Schema foreach ($tomod as $columnName) { $cd = $this->_byName($columns, $columnName); - $phrase[] = 'MODIFY COLUMN ' . $this->_columnSql($cd); + /* brute force */ + $phrase[] = 'DROP COLUMN ' . $columnName; + $phrase[] = 'ADD COLUMN ' . $this->_columnSql($cd); } $sql = 'ALTER TABLE ' . $tableName . ' ' . implode(', ', $phrase); @@ -505,7 +508,7 @@ class PgsqlSchema extends Schema return $sql; } if (!empty($cd->auto_increment)) { - $type = 'serial'; + $type = "bigserial"; // FIXME: creates the wrong name for the sequence for some internal sequence-lookup function, so better fix this to do the real 'create sequence' dance. } if (!empty($cd->size)) { -- cgit v1.2.3 From 48dc899acb9a0ac87140353092dab1f5e67753d8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 15 May 2010 15:56:43 +1200 Subject: added notice.location to group by --- lib/popularnoticesection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index f70a972ef..3f0241790 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -72,7 +72,7 @@ class PopularNoticeSection extends NoticeSection $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . - 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of' . + 'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of,notice.location' . ' ORDER BY weight DESC'; $offset = 0; -- cgit v1.2.3 From e36df2921260a8970c81f2d729b121816be188e5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 17 May 2010 19:37:47 +0000 Subject: Patch from g0: fix for conversation links in Realtime updates Previously was using the reply-to URL, which didn't match with other displays. Now sends to the right conversation page. --- plugins/Realtime/README | 1 - plugins/Realtime/RealtimePlugin.php | 40 ++++++++++++++++++++++++++----------- plugins/Realtime/realtimeupdate.js | 4 ++-- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/plugins/Realtime/README b/plugins/Realtime/README index 524382696..99c79cfab 100644 --- a/plugins/Realtime/README +++ b/plugins/Realtime/README @@ -1,6 +1,5 @@ == TODO == * i18n -* Change in context URL to conversation (try not to construct the URL in JS) * Update mark behaviour (on notice send) * Pause, Send a notice ~ should not update counter * Pause ~ retain up to 50-100 most recent notices diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index b559d80c6..fa1b5e3e1 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -250,14 +250,7 @@ class RealtimePlugin extends Plugin $arr['url'] = $notice->bestUrl(); $arr['html'] = htmlspecialchars($notice->rendered); $arr['source'] = htmlspecialchars($arr['source']); - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } + $arr['conversation_url'] = $this->getConversationUrl($notice); $profile = $notice->getProfile(); $arr['user']['profile_url'] = $profile->profileurl; @@ -272,10 +265,7 @@ class RealtimePlugin extends Plugin $arr['retweeted_status']['source'] = htmlspecialchars($original->source); $originalProfile = $original->getProfile(); $arr['retweeted_status']['user']['profile_url'] = $originalProfile->profileurl; - if (!empty($original->reply_to)) { - $originalReply = Notice::staticGet('id', $original->reply_to); - $arr['retweeted_status']['in_reply_to_status_url'] = $originalReply->bestUrl(); - } + $arr['retweeted_status']['conversation_url'] = $this->getConversationUrl($original); } $original = null; } @@ -303,6 +293,32 @@ class RealtimePlugin extends Plugin return $tags; } + function getConversationUrl($notice) + { + $convurl = null; + + if ($notice->hasConversation()) { + $conv = Conversation::staticGet( + 'id', + $notice->conversation + ); + $convurl = $conv->uri; + + if(empty($convurl)) { + $msg = sprintf( + "Couldn't find Conversation ID %d to make 'in context'" + . "link for Notice ID %d", + $notice->conversation, + $notice->id + ); + + common_log(LOG_WARNING, $msg); + } + } + + return $convurl; + } + function _getScripts() { return array('plugins/Realtime/realtimeupdate.js'); diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 2e5851ae5..25dc12d58 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -149,8 +149,8 @@ RealtimeUpdate = { "from "+ ""+source+""+ // may have a link ""; - if (data['in_reply_to_status_id']) { - ni = ni+" in context"; + if (data['conversation_url']) { + ni = ni+" in context"; } if (repeat) { -- cgit v1.2.3 From b77878f46729d48588fb32b8a54ae13f3752c558 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 17 May 2010 19:47:44 +0000 Subject: Include notice fragment on 'in context' links in Realtime plugin family. --- plugins/Realtime/RealtimePlugin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index fa1b5e3e1..352afcf78 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -313,6 +313,8 @@ class RealtimePlugin extends Plugin ); common_log(LOG_WARNING, $msg); + } else { + $convurl .= '#notice-' . $notice->id; } } -- cgit v1.2.3 From 6da59fab58b3f517a9e48204faa4f29ceabc4ba9 Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 18 May 2010 10:09:16 -0400 Subject: invalid mbox_sha1sum in the case where users don't have an email address (reported by pedantic-web.org) --- actions/foaf.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/actions/foaf.php b/actions/foaf.php index 9cb65a885..2f054de0c 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -95,7 +95,9 @@ class FoafAction extends Action // Would be nice to tell if they were a Person or not (e.g. a #person usertag?) $this->elementStart('Agent', array('rdf:about' => $this->user->uri)); - $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); + if ($this->user->email) { + $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); + } if ($this->profile->fullname) { $this->element('name', null, $this->profile->fullname); } -- cgit v1.2.3 From 7c828ae5f8ab20f0daa8a1482fadce9b3e858975 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 10:39:56 -0700 Subject: OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default. To enable the admin panel: $config['admin']['panels'][] = 'openid'; Or to set them manually: $config['openid']['trusted_provider'] = 'https://login.ubuntu.net/'; $config['openid']['required_team'] = 'my-project-cabal'; $config['site']['openidonly'] = true; OpenID-only mode can still be set from addPlugin() parameters as well for backwards compatibility. Note: if it's set there, that value will override the setting from the database or config.php. Note that team restrictions are only really meaningful if a trusted provider is set; otherwise, any OpenID server could report back that users are members of the given team. Restrictions are checked only at OpenID authentication time and will not kick off people currently with a session open; existing remembered logins may also survive these changes. Using code for Launchpad team support provided by Canonical under AGPLv3, pulled from r27 of WordPress teams integration plugin: https://code.edge.launchpad.net/~canonical-isd-hackers/wordpress-teams-integration/trunk --- plugins/OpenID/OpenIDPlugin.php | 67 ++++++-- plugins/OpenID/extlib/README | 6 + plugins/OpenID/extlib/teams-extension.php | 175 +++++++++++++++++++ plugins/OpenID/finishaddopenid.php | 6 + plugins/OpenID/finishopenidlogin.php | 6 + plugins/OpenID/openid.php | 36 ++++ plugins/OpenID/openidadminpanel.php | 270 ++++++++++++++++++++++++++++++ plugins/OpenID/openidlogin.php | 22 ++- plugins/OpenID/openidsettings.php | 70 ++++---- 9 files changed, 611 insertions(+), 47 deletions(-) create mode 100644 plugins/OpenID/extlib/README create mode 100644 plugins/OpenID/extlib/teams-extension.php create mode 100644 plugins/OpenID/openidadminpanel.php diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 270e2c624..9eac9f6fc 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -20,7 +20,7 @@ * @category Plugin * @package StatusNet * @author Evan Prodromou - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ @@ -45,7 +45,19 @@ if (!defined('STATUSNET')) { class OpenIDPlugin extends Plugin { - public $openidOnly = false; + // Plugin parameter: set true to disallow non-OpenID logins + // If set, overrides the setting in database or $config['site']['openidonly'] + public $openidOnly = null; + + function initialize() + { + parent::initialize(); + if ($this->openidOnly !== null) { + global $config; + $config['site']['openidonly'] = (bool)$this->openidOnly; + } + + } /** * Add OpenID-related paths to the router table @@ -67,6 +79,7 @@ class OpenIDPlugin extends Plugin $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid')); $m->connect('main/openidserver', array('action' => 'openidserver')); + $m->connect('admin/openid', array('action' => 'openidadminpanel')); return true; } @@ -84,7 +97,7 @@ class OpenIDPlugin extends Plugin function onStartConnectPath(&$path, &$defaults, &$rules, &$result) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { static $block = array('main/login', 'main/register', 'main/recoverpassword', @@ -108,7 +121,7 @@ class OpenIDPlugin extends Plugin function onArgsInitialize($args) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { if (array_key_exists('action', $args)) { $action = trim($args['action']); if (in_array($action, array('login', 'register'))) { @@ -199,7 +212,7 @@ class OpenIDPlugin extends Plugin function onStartPrimaryNav($action) { - if ($this->openidOnly && !common_logged_in()) { + if (common_config('site', 'openidonly') && !common_logged_in()) { // TRANS: Tooltip for main menu option "Login" $tooltip = _m('TOOLTIP', 'Login to the site'); // TRANS: Main menu option when not logged in to log in @@ -241,7 +254,7 @@ class OpenIDPlugin extends Plugin function onStartLoginGroupNav(&$action) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { $this->showOpenIDLoginTab($action); // Even though we replace this code, we // DON'T run the End* hook, to keep others from @@ -297,7 +310,7 @@ class OpenIDPlugin extends Plugin */ function onStartAccountSettingsPasswordMenuItem($menu, &$unused) { - if ($this->openidOnly) { + if (common_config('site', 'openidonly')) { return false; } return true; @@ -345,13 +358,19 @@ class OpenIDPlugin extends Plugin case 'OpenidsettingsAction': case 'OpenidserverAction': case 'OpenidtrustAction': - require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; + case 'OpenidadminpanelAction': + require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; case 'User_openid': - require_once INSTALLDIR.'/plugins/OpenID/User_openid.php'; + require_once dirname(__FILE__) . '/User_openid.php'; return false; case 'User_openid_trustroot': - require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'; + require_once dirname(__FILE__) . '/User_openid_trustroot.php'; + return false; + case 'Auth_OpenID_TeamsExtension': + case 'Auth_OpenID_TeamsRequest': + case 'Auth_OpenID_TeamsResponse': + require_once dirname(__FILE__) . '/extlib/teams-extension.php'; return false; default: return true; @@ -442,7 +461,7 @@ class OpenIDPlugin extends Plugin function onRedirectToLogin($action, $user) { - if ($this->openidOnly || (!empty($user) && User_openid::hasOpenID($user->id))) { + if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); return false; } @@ -577,6 +596,32 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add an OpenID tab to the admin panel + * + * @param Widget $nav Admin panel nav + * + * @return boolean hook value + */ + + function onEndAdminPanelNav($nav) + { + if (AdminPanelAction::canAdmin('openid')) { + + $action_name = $nav->action->trimmed('action'); + + $nav->out->menuItem( + common_local_url('openidadminpanel'), + _m('OpenID'), + _m('OpenID configuration'), + $action_name == 'openidadminpanel', + 'nav_openid_admin_panel' + ); + } + + return true; + } + /** * Add our version information to output * diff --git a/plugins/OpenID/extlib/README b/plugins/OpenID/extlib/README new file mode 100644 index 000000000..1fe80d79b --- /dev/null +++ b/plugins/OpenID/extlib/README @@ -0,0 +1,6 @@ +team-extension.php + Support for Launchpad's OpenID Teams extension + Maintainer: Canonical + Source: https://code.edge.launchpad.net/wordpress-teams-integration + r27 2010-04-27 + License: AGPLv3 diff --git a/plugins/OpenID/extlib/teams-extension.php b/plugins/OpenID/extlib/teams-extension.php new file mode 100644 index 000000000..451f2fb19 --- /dev/null +++ b/plugins/OpenID/extlib/teams-extension.php @@ -0,0 +1,175 @@ +. + */ + +/** + * Provides an example OpenID extension to query user team/group membership + * + * This code is based on code supplied with the openid library for simple + * registration data. + */ + +/** + * Require the Message implementation. + */ +require_once 'Auth/OpenID/Message.php'; +require_once 'Auth/OpenID/Extension.php'; + +/** + * The team/group extension base class + */ +class Auth_OpenID_TeamsExtension extends Auth_OpenID_Extension { + var $ns_uri = 'http://ns.launchpad.net/2007/openid-teams'; + var $ns_alias = 'lp'; + var $request_field = 'query_membership'; + var $response_field = 'is_member'; + + /** + * Get the string arguments that should be added to an OpenID + * message for this extension. + */ + function getExtensionArgs() { + $args = array(); + + if ($this->_teams) { + $args[$this->request_field] = implode(',', $this->_teams); + } + + return $args; + } + + /** + * Add the arguments from this extension to the provided message. + * + * Returns the message with the extension arguments added. + */ + function toMessage(&$message) { + if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) { + if ($message->namespaces->getAlias($this->ns_uri) != $this->ns_alias) { + return null; + } + } + + $message->updateArgs($this->ns_uri, $this->getExtensionArgs()); + return $message; + } + + /** + * Extract the team/group namespace URI from the given OpenID message. + * Handles OpenID 1 and 2. + * + * $message: The OpenID message from which to parse team/group data. + * This may be a request or response message. + * + * Returns the sreg namespace URI for the supplied message. + * + * @access private + */ + function _getExtensionNS(&$message) { + $alias = null; + $found_ns_uri = null; + + // See if there exists an alias for the namespace + $alias = $message->namespaces->getAlias($this->ns_uri); + + if ($alias !== null) { + $found_ns_uri = $this->ns_uri; + } + + if ($alias === null) { + // There is no alias for this extension, so try to add one. + $found_ns_uri = Auth_OpenID_TYPE_1_0; + + if ($message->namespaces->addAlias($this->ns_uri, $this->ns_alias) === null) { + // An alias for the string 'lp' already exists, but + // it's defined for something other than team/group membership + return null; + } + } + + return $found_ns_uri; + } +} + +/** + * The team/group extension request class + */ +class Auth_OpenID_TeamsRequest extends Auth_OpenID_TeamsExtension { + function __init($teams) { + if (!is_array($teams)) { + if (!empty($teams)) { + $teams = explode(',', $teams); + } else { + $teams = Array(); + } + } + + $this->_teams = $teams; + } + + function Auth_OpenID_TeamsRequest($teams) { + $this->__init($teams); + } +} + +/** + * The team/group extension response class + */ +class Auth_OpenID_TeamsResponse extends Auth_OpenID_TeamsExtension { + var $_teams = array(); + + function __init(&$resp, $signed_only=true) { + $this->ns_uri = $this->_getExtensionNS($resp->message); + + if ($signed_only) { + $args = $resp->getSignedNS($this->ns_uri); + } else { + $args = $resp->message->getArgs($this->ns_uri); + } + + if ($args === null) { + return null; + } + + // An OpenID 2.0 response will handle the namespaces + if (in_array($this->response_field, array_keys($args)) && !empty($args[$this->response_field])) { + $this->_teams = explode(',', $args[$this->response_field]); + } + + // Piggybacking on a 1.x request, however, won't so the field name will + // be different + elseif (in_array($this->ns_alias.'.'.$this->response_field, array_keys($args)) && !empty($args[$this->ns_alias.'.'.$this->response_field])) { + $this->_teams = explode(',', $args[$this->ns_alias.'.'.$this->response_field]); + } + } + + function Auth_OpenID_TeamsResponse(&$resp, $signed_only=true) { + $this->__init($resp, $signed_only); + } + + /** + * Get the array of teams the user is a member of + * + * @return array + */ + function getTeams() { + return $this->_teams; + } +} + +?> diff --git a/plugins/OpenID/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php index 991e6584e..df1763a52 100644 --- a/plugins/OpenID/finishaddopenid.php +++ b/plugins/OpenID/finishaddopenid.php @@ -103,6 +103,12 @@ class FinishaddopenidAction extends Action $sreg = $sreg_resp->contents(); } + // Launchpad teams extension + if (!oid_check_teams($response)) { + $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.')); + return; + } + $cur = common_current_user(); $other = oid_get_user($canonical); diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 32b092a0b..57723ff97 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -177,6 +177,12 @@ class FinishopenidloginAction extends Action $sreg = $sreg_resp->contents(); } + // Launchpad teams extension + if (!oid_check_teams($response)) { + $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.')); + return; + } + $user = oid_get_user($canonical); if ($user) { diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 4ec336e1c..5ee9343d2 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -164,6 +164,15 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) $auth_request->addExtension($sreg_request); } + $requiredTeam = common_config('openid', 'required_team'); + if ($requiredTeam) { + // LaunchPad OpenID extension + $team_request = new Auth_OpenID_TeamsRequest(array($requiredTeam)); + if ($team_request) { + $auth_request->addExtension($team_request); + } + } + $trust_root = common_root_url(true); $process_url = common_local_url($returnto); @@ -286,6 +295,33 @@ function oid_assert_allowed($url) return; } +/** + * Check the teams available in the given OpenID response + * Using Launchpad's OpenID teams extension + * + * @return boolean whether this user is acceptable + */ +function oid_check_teams($response) +{ + $requiredTeam = common_config('openid', 'required_team'); + if ($requiredTeam) { + $team_resp = new Auth_OpenID_TeamsResponse($response); + if ($team_resp) { + $teams = $team_resp->getTeams(); + } else { + $teams = array(); + } + + $match = in_array($requiredTeam, $teams); + $is = $match ? 'is' : 'is not'; + common_log(LOG_DEBUG, "Remote user $is in required team $requiredTeam: [" . implode(', ', $teams) . "]"); + + return $match; + } + + return true; +} + class AutosubmitAction extends Action { var $form_html = null; diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php new file mode 100644 index 000000000..063306366 --- /dev/null +++ b/plugins/OpenID/openidadminpanel.php @@ -0,0 +1,270 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Administer global OpenID settings + * + * @category Admin + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class OpenidadminpanelAction extends AdminPanelAction +{ + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return _m('OpenID'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + return _m('OpenID settings'); + } + + /** + * Show the OpenID admin panel form + * + * @return void + */ + + function showForm() + { + $form = new OpenIDAdminPanelForm($this); + $form->show(); + return; + } + + /** + * Save settings from the form + * + * @return void + */ + + function saveSettings() + { + static $settings = array( + 'openid' => array('trusted_provider', 'required_team') + ); + + static $booleans = array( + 'site' => array('openidonly') + ); + + $values = array(); + + foreach ($settings as $section => $parts) { + foreach ($parts as $setting) { + $values[$section][$setting] + = $this->trimmed($setting); + } + } + + 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 ($settings as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + foreach ($booleans as $section => $parts) { + foreach ($parts as $setting) { + Config::save($section, $setting, $values[$section][$setting]); + } + } + + $config->query('COMMIT'); + + return; + } + + function validate(&$values) + { + // Validate consumer key and secret (can't be too long) + + if (mb_strlen($values['openid']['trusted_provider']) > 255) { + $this->clientError( + _m("Invalid provider URL. Max length is 255 characters.") + ); + } + + if (mb_strlen($values['openid']['required_team']) > 255) { + $this->clientError( + _m("Invalid team name. Max length is 255 characters.") + ); + } + } +} + +class OpenIDAdminPanelForm extends AdminForm +{ + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return 'openidadminpanel'; + } + + /** + * 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('openidadminpanel'); + } + + /** + * Data elements of the form + * + * @return void + * + * @todo Some of the options could prevent users from logging in again. + * Make sure that the acting administrator has a valid OpenID matching, + * or more carefully warn folks. + */ + + function formData() + { + $this->out->elementStart( + 'fieldset', + array('id' => 'settings_openid') + ); + $this->out->element('legend', null, _m('Trusted provider')); + $this->out->element('p', 'form_guide', + _m('By default, users are allowed to authenticate with any OpenID provider. ' . + 'If you are using your own OpenID service for shared sign-in, ' . + 'you can restrict access to only your own users here.')); + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->input( + 'trusted_provider', + _m('Provider URL'), + _m('All OpenID logins will be sent to this URL; other providers may not be used.'), + 'openid' + ); + $this->unli(); + + $this->li(); + $this->input( + 'required_team', + _m('Required team'), + _m('Only allow logins from users in the given team (Launchpad extension).'), + 'openid' + ); + $this->unli(); + + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + + $this->out->elementStart( + 'fieldset', + array('id' => 'settings_openid-options') + ); + $this->out->element('legend', null, _m('Options')); + + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + + $this->out->checkbox( + 'openidonly', _m('Enable OpenID-only mode'), + (bool) $this->value('openidonly', 'site'), + _m('Require all users to login via OpenID. WARNING: disables password authentication for all users!'), + 'true' + ); + $this->unli(); + + $this->out->elementEnd('ul'); + + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', _('Save'), 'submit', null, _m('Save OpenID settings')); + } +} diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 2a743672c..8c559c934 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -29,7 +29,12 @@ class OpenidloginAction extends Action if (common_is_real_login()) { $this->clientError(_m('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $openid_url = $this->trimmed('openid_url'); + $provider = common_config('openid', 'trusted_provider'); + if ($provider) { + $openid_url = $provider; + } else { + $openid_url = $this->trimmed('openid_url'); + } oid_assert_allowed($openid_url); @@ -116,9 +121,18 @@ class OpenidloginAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('openid_url', _m('OpenID URL'), - $this->openid_url, - _m('Your OpenID URL')); + $provider = common_config('openid', 'trusted_provider'); + if ($provider) { + $this->element('label', array(), _m('OpenID provider')); + $this->element('span', array(), $provider); + $this->element('p', 'form_guide', + _m('You will be sent to the provider\'s site for authentication.')); + $this->hidden('openid_url', $provider); + } else { + $this->input('openid_url', _m('OpenID URL'), + $this->openid_url, + _m('Your OpenID URL')); + } $this->elementEnd('li'); $this->elementStart('li', array('id' => 'settings_rememberme')); $this->checkbox('rememberme', _m('Remember me'), false, diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php index 16142cf48..505e7d0ee 100644 --- a/plugins/OpenID/openidsettings.php +++ b/plugins/OpenID/openidsettings.php @@ -90,34 +90,36 @@ class OpenidsettingsAction extends AccountSettingsAction { $user = common_current_user(); - $this->elementStart('form', array('method' => 'post', - 'id' => 'form_settings_openid_add', - 'class' => 'form_settings', - 'action' => - common_local_url('openidsettings'))); - $this->elementStart('fieldset', array('id' => 'settings_openid_add')); - $this->element('legend', null, _m('Add OpenID')); - $this->hidden('token', common_session_token()); - $this->element('p', 'form_guide', - _m('If you want to add an OpenID to your account, ' . - 'enter it in the box below and click "Add".')); - $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); - $this->element('label', array('for' => 'openid_url'), - _m('OpenID URL')); - $this->element('input', array('name' => 'openid_url', - 'type' => 'text', - 'id' => 'openid_url')); - $this->elementEnd('li'); - $this->elementEnd('ul'); - $this->element('input', array('type' => 'submit', - 'id' => 'settings_openid_add_action-submit', - 'name' => 'add', - 'class' => 'submit', - 'value' => _m('Add'))); - $this->elementEnd('fieldset'); - $this->elementEnd('form'); - + if (!common_config('openid', 'trusted_provider')) { + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_openid_add', + 'class' => 'form_settings', + 'action' => + common_local_url('openidsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_openid_add')); + + $this->element('legend', null, _m('Add OpenID')); + $this->hidden('token', common_session_token()); + $this->element('p', 'form_guide', + _m('If you want to add an OpenID to your account, ' . + 'enter it in the box below and click "Add".')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->element('label', array('for' => 'openid_url'), + _m('OpenID URL')); + $this->element('input', array('name' => 'openid_url', + 'type' => 'text', + 'id' => 'openid_url')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->element('input', array('type' => 'submit', + 'id' => 'settings_openid_add_action-submit', + 'name' => 'add', + 'class' => 'submit', + 'value' => _m('Add'))); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } $oid = new User_openid(); $oid->user_id = $user->id; @@ -234,10 +236,14 @@ class OpenidsettingsAction extends AccountSettingsAction } if ($this->arg('add')) { - $result = oid_authenticate($this->trimmed('openid_url'), - 'finishaddopenid'); - if (is_string($result)) { // error message - $this->showForm($result); + if (common_config('openid', 'trusted_provider')) { + $this->showForm(_m("Can't add new providers.")); + } else { + $result = oid_authenticate($this->trimmed('openid_url'), + 'finishaddopenid'); + if (is_string($result)) { // error message + $this->showForm($result); + } } } else if ($this->arg('remove')) { $this->removeOpenid(); -- cgit v1.2.3 From 813bbc912d73910943b966d1be80f27c3ff3584a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 13:44:23 -0700 Subject: typo fix in en_GB localization (also updated @ translatewiki) --- locale/en_GB/LC_MESSAGES/statusnet.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 38caf74c6..bb3c577b6 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -4889,7 +4889,7 @@ msgstr "Primary site navigation" #: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "ersonal profile and friends timeline" +msgstr "Personal profile and friends timeline" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 -- cgit v1.2.3 From 14a76926a225dec3d29aeffa13ab7ece74f708e5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 May 2010 21:52:17 +0000 Subject: Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in. The forms would already submit to SSL, but people are happier if they start on a secure page! Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo! --- actions/login.php | 22 ++++++++++++++++++++++ actions/register.php | 7 +++++++ 2 files changed, 29 insertions(+) diff --git a/actions/login.php b/actions/login.php index dc6352368..d3e4312f7 100644 --- a/actions/login.php +++ b/actions/login.php @@ -62,6 +62,28 @@ class LoginAction extends Action return false; } + /** + * Prepare page to run + * + * + * @param $args + * @return string title + */ + + function prepare($args) + { + parent::prepare($args); + + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('login')); + // exit + } + + return true; + } + /** * Handle input, produce output * diff --git a/actions/register.php b/actions/register.php index 7fdbb4ded..2fc7ef921 100644 --- a/actions/register.php +++ b/actions/register.php @@ -74,6 +74,13 @@ class RegisterAction extends Action parent::prepare($args); $this->code = $this->trimmed('code'); + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('register')); + // exit + } + if (empty($this->code)) { common_ensure_session(); if (array_key_exists('invitecode', $_SESSION)) { -- cgit v1.2.3 From d9fddff5395e77287c4de0796fd072b3073f1eb9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 5 May 2010 22:35:16 -0700 Subject: Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices --- classes/Notice.php | 17 +++++++++++++++-- lib/atomnoticefeed.php | 9 ++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 0b1b2e402..9a9172cba 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1171,7 +1171,7 @@ class Notice extends Memcached_DataObject return $groups; } - function asAtomEntry($namespace=false, $source=false, $author=true) + function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null) { $profile = $this->getProfile(); @@ -1184,7 +1184,8 @@ class Notice extends Memcached_DataObject 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', 'xmlns:media' => 'http://purl.org/syndication/atommedia', 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', - 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0'); + 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', + 'xmlns:statusnet' => 'http://status.net/ont/'); } else { $attrs = array(); } @@ -1210,6 +1211,18 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); + + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + // @todo source source_link + ); + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index e4df731fe..35a45118c 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -79,6 +79,11 @@ class AtomNoticeFeed extends Atom10Feed 'ostatus', 'http://ostatus.org/schema/1.0' ); + + $this->addNamespace( + 'statusnet', + 'http://status.net/ont/' + ); } /** @@ -110,7 +115,9 @@ class AtomNoticeFeed extends Atom10Feed $source = $this->showSource(); $author = $this->showAuthor(); - $this->addEntryRaw($notice->asAtomEntry(false, $source, $author)); + $cur = common_current_user(); + + $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); } function showSource() -- cgit v1.2.3 From c78f67aa7367acab5f9156ecf8963e2d5243e400 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:20:10 -0700 Subject: Refactor and centralize notice source link calculation --- actions/twitapisearchatom.php | 15 ++++++++++-- classes/Notice.php | 39 +++++++++++++++++++++++++++++- lib/apiaction.php | 51 ++++++++++----------------------------- lib/noticelist.php | 56 ++++++++++++++++++++----------------------- 4 files changed, 90 insertions(+), 71 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 24aa619bd..3eb54ccc3 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -342,10 +342,21 @@ class TwitapisearchatomAction extends ApiAction 'rel' => 'related', 'href' => $profile->avatarUrl())); - // TODO: Here is where we'd put in a link to an atom feed for threads + // @todo: Here is where we'd put in a link to an atom feed for threads + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } $this->element("twitter:source", null, - htmlentities($this->sourceLink($notice->source))); + htmlentities($source)); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index 9a9172cba..2c2c87d56 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -703,7 +703,7 @@ class Notice extends Memcached_DataObject /** * Is this notice part of an active conversation? - * + * * @return boolean true if other messages exist in the same * conversation, false if this is the only one */ @@ -1809,4 +1809,41 @@ class Notice extends Memcached_DataObject return $result; } + + /** + * Get the source of the notice + * + * @return Notice_source $ns A notice source object. 'code' is the only attribute + * guaranteed to be populated. + */ + function getSource() + { + $ns = new Notice_source(); + if (!empty($this->source)) { + switch ($this->source) { + case 'web': + case 'xmpp': + case 'mail': + case 'omb': + case 'system': + case 'api': + $ns->code = $this->source; + break; + default: + $ns = Notice_source::staticGet($this->source); + if (!$ns) { + $ns = new Notice_source(); + $ns->code = $this->source; + $app = Oauth_application::staticGet('name', $this->source); + if ($app) { + $ns->name = $app->name; + $ns->url = $app->source_url; + } + } + break; + } + } + return $ns; + } + } diff --git a/lib/apiaction.php b/lib/apiaction.php index f87b04611..7a6a5549b 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -260,7 +260,19 @@ class ApiAction extends Action $twitter_status['created_at'] = $this->dateTwitter($notice->created); $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null; - $twitter_status['source'] = $this->sourceLink($notice->source); + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '' . $ns->name . ''; + } else { + $source = $ns->code; + } + } + + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; @@ -1298,43 +1310,6 @@ class ApiAction extends Action } } - function sourceLink($source) - { - $source_name = _($source); - switch ($source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'api': - break; - default: - - $name = null; - $url = null; - - $ns = Notice_source::staticGet($source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } - - if (!empty($name) && !empty($url)) { - $source_name = '' . $name . ''; - } - - break; - } - return $source_name; - } - /** * Returns query argument or default value if not found. Certain * parameters used throughout the API are lightly scrubbed and diff --git a/lib/noticelist.php b/lib/noticelist.php index 4f997a328..e0d8bf560 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -480,48 +480,44 @@ class NoticeListItem extends Widget function showNoticeSource() { - if ($this->notice->source) { + $ns = $this->notice->getSource(); + + if ($ns) { + $source_name = _($ns->code); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); - $source_name = _($this->notice->source); $this->out->text(' '); - switch ($this->notice->source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'system': - case 'api': - $this->out->element('span', 'device', $source_name); - break; - default: - $name = $source_name; - $url = null; + // if $ns->name and $ns->url are populated we have + // configured a source attr somewhere + if (empty($ns->name) && empty($ns->url)) { + // otherwise it's from normal channel such as web or api + $this->out->element('span', 'device', $source_name); + } else { + $name = null; + $url = null; + $title = null; if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $ns = Notice_source::staticGet($this->notice->source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $this->notice->source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } + $name = $source_name; + $url = $ns->url; } Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); if (!empty($name) && !empty($url)) { $this->out->elementStart('span', 'device'); - $this->out->element('a', array('href' => $url, - 'rel' => 'external', - 'title' => $title), - $name); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (isset($title)) { + $attrs['title'] = $title; + } + + $this->out->element('a', $attrs, $name); $this->out->elementEnd('span'); } else { $this->out->element('span', 'device', $name); -- cgit v1.2.3 From 68634f04969d2d7bcbd1d657c466090990dea501 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:44:56 -0700 Subject: Add source link attr to statusnet:notice_info element in Atom output for notices --- classes/Notice.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 2c2c87d56..196501279 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1215,8 +1215,14 @@ class Notice extends Memcached_DataObject $noticeInfoAttr = array( 'local_id' => $this->id, // local notice ID (useful to clients for ordering) 'source' => $this->source // the client name (source attribution) - // @todo source source_link - ); + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = htmlentities($ns->url); + } + } if (!empty($cur)) { $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; -- cgit v1.2.3 From 0dfef88cacde19cf0afaefbd422a7f5230091064 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 00:55:17 -0700 Subject: HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them --- actions/twitapisearchatom.php | 2 +- lib/apiaction.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 3eb54ccc3..6c740c490 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } diff --git a/lib/apiaction.php b/lib/apiaction.php index 7a6a5549b..f3efff402 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -266,13 +266,13 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' . $ns->name . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = $source; + $twitter_status['source'] = htmlentities($source); $twitter_status['id'] = intval($notice->id); $replier_profile = null; -- cgit v1.2.3 From 6187266205a55db0298e02df7d6996a735d42eba Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 19:52:25 +0000 Subject: - OStatusPlugin should return true if it doesn't need to handle source attribution - Remove stray break statement from NoticeList --- lib/noticelist.php | 1 - plugins/OStatus/OStatusPlugin.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index e0d8bf560..d22010335 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -522,7 +522,6 @@ class NoticeListItem extends Widget } else { $this->out->element('span', 'device', $name); } - break; } $this->out->elementEnd('span'); } diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 5167842ca..5b153216e 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -452,6 +452,7 @@ class OStatusPlugin extends Plugin return false; } } + return true; } /** -- cgit v1.2.3 From 3708341857a8ae26c2936df53fede09aa17b09f8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 20:25:20 +0000 Subject: Allow OStatusPlugin to set the source attribution title --- lib/noticelist.php | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index d22010335..81da9edc0 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -489,40 +489,37 @@ class NoticeListItem extends Widget $this->out->text(_('from')); $this->out->text(' '); - // if $ns->name and $ns->url are populated we have - // configured a source attr somewhere - if (empty($ns->name) && empty($ns->url)) { - // otherwise it's from normal channel such as web or api - $this->out->element('span', 'device', $source_name); - } else { - $name = null; - $url = null; - $title = null; + $name = $source_name; + $url = $ns->url; + $title = null; - if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $name = $source_name; - $url = $ns->url; - } - Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); + if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { + $name = $source_name; + $url = $ns->url; + } + Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); - if (!empty($name) && !empty($url)) { - $this->out->elementStart('span', 'device'); + // if $ns->name and $ns->url are populated we have + // configured a source attr somewhere + if (!empty($name) && !empty($url)) { - $attrs = array( - 'href' => $url, - 'rel' => 'external' - ); + $this->out->elementStart('span', 'device'); - if (isset($title)) { - $attrs['title'] = $title; - } + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); - $this->out->element('a', $attrs, $name); - $this->out->elementEnd('span'); - } else { - $this->out->element('span', 'device', $name); + if (!empty($title)) { + $attrs['title'] = $title; } + + $this->out->element('a', $attrs, $name); + $this->out->elementEnd('span'); + } else { + $this->out->element('span', 'device', $name); } + $this->out->elementEnd('span'); } } -- cgit v1.2.3 From 5ea019c41ac4d6c161f3c8f287d405971d4aadea Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 6 May 2010 21:36:13 +0000 Subject: Remove errant double HTML entity encoding in API source attribution --- actions/twitapisearchatom.php | 9 ++++++--- classes/Notice.php | 2 +- lib/apiaction.php | 8 ++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 6c740c490..51e8a8881 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -349,14 +349,17 @@ class TwitapisearchatomAction extends ApiAction $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $this->element("twitter:source", null, - htmlentities($source)); + $this->element("twitter:source", null, $source); $this->elementStart('author'); diff --git a/classes/Notice.php b/classes/Notice.php index 196501279..0dc7e10e7 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1220,7 +1220,7 @@ class Notice extends Memcached_DataObject $ns = $this->getSource(); if ($ns) { if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = htmlentities($ns->url); + $noticeInfoAttr['source_link'] = $ns->url; } } diff --git a/lib/apiaction.php b/lib/apiaction.php index f3efff402..68198effc 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -266,13 +266,17 @@ class ApiAction extends Action $ns = $notice->getSource(); if ($ns) { if (!empty($ns->name) && !empty($ns->url)) { - $source = '' . $ns->name . ''; + $source = '' + . htmlspecialchars($ns->name) + . ''; } else { $source = $ns->code; } } - $twitter_status['source'] = htmlentities($source); + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; -- cgit v1.2.3 From 114df39822d7007f1b08b83b4e9a26202936e8c8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 12 May 2010 15:08:01 -0700 Subject: Need to always emit statusnet:notice_info so it's available in profile feeds --- classes/Notice.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index 0dc7e10e7..e173a2469 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1211,24 +1211,6 @@ class Notice extends Memcached_DataObject $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE)); $xs->element('updated', null, common_date_w3dtf($this->created)); - - $noticeInfoAttr = array( - 'local_id' => $this->id, // local notice ID (useful to clients for ordering) - 'source' => $this->source // the client name (source attribution) - ); - - $ns = $this->getSource(); - if ($ns) { - if (!empty($ns->url)) { - $noticeInfoAttr['source_link'] = $ns->url; - } - } - - if (!empty($cur)) { - $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; - } - - $xs->element('statusnet:notice_info', $noticeInfoAttr, null); } if ($source) { @@ -1251,6 +1233,24 @@ class Notice extends Memcached_DataObject $xs->element('published', null, common_date_w3dtf($this->created)); $xs->element('updated', null, common_date_w3dtf($this->created)); + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = $ns->url; + } + } + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); + if ($this->reply_to) { $reply_notice = Notice::staticGet('id', $this->reply_to); if (!empty($reply_notice)) { -- cgit v1.2.3 From 74a89b1fc37067d91d31bd66922053361eb4e616 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 19 May 2010 10:10:55 -0700 Subject: Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back. Should help with problems where xmppdaemon would get stuck in wrong locale. --- lib/mail.php | 20 ++++++++++---------- lib/util.php | 17 +++++++++++++++++ plugins/Facebook/facebookutil.php | 6 +++--- plugins/TwitterBridge/twitter.php | 6 +++--- 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/lib/mail.php b/lib/mail.php index 5fc584e28..a4065e8d5 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -224,9 +224,6 @@ function mail_subscribe_notify_profile($listenee, $other) if ($other->hasRight(Right::EMAILONSUBSCRIBE) && $listenee->email && $listenee->emailnotifysub) { - // use the recipient's localization - common_init_locale($listenee->language); - $profile = $listenee->getProfile(); $name = $profile->getBestName(); @@ -236,6 +233,9 @@ function mail_subscribe_notify_profile($listenee, $other) $recipients = $listenee->email; + // use the recipient's localization + common_switch_locale($listenee->language); + $headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname); $headers['From'] = mail_notify_from(); $headers['To'] = $name . ' <' . $listenee->email . '>'; @@ -271,7 +271,7 @@ function mail_subscribe_notify_profile($listenee, $other) common_local_url('emailsettings')); // reset localization - common_init_locale(); + common_switch_locale(); mail_send($recipients, $headers, $body); } } @@ -473,7 +473,7 @@ function mail_confirm_sms($code, $nickname, $address) function mail_notify_nudge($from, $to) { - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for 'nudge' notification email $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -491,7 +491,7 @@ function mail_notify_nudge($from, $to) $from->nickname, common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); $headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname); @@ -525,7 +525,7 @@ function mail_notify_message($message, $from=null, $to=null) return true; } - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for direct-message notification email $subject = sprintf(_('New private message from %s'), $from->nickname); @@ -549,7 +549,7 @@ function mail_notify_message($message, $from=null, $to=null) $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); - common_init_locale(); + common_switch_locale(); return mail_to_user($to, $subject, $body, $headers); } @@ -577,7 +577,7 @@ function mail_notify_fave($other, $user, $notice) $bestname = $profile->getBestName(); - common_init_locale($other->language); + common_switch_locale($other->language); // TRANS: Subject for favorite notification email $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname); @@ -605,7 +605,7 @@ function mail_notify_fave($other, $user, $notice) $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - common_init_locale(); + common_switch_locale(); mail_to_user($other, $subject, $body, $headers); } diff --git a/lib/util.php b/lib/util.php index efede1d4b..597da22c0 100644 --- a/lib/util.php +++ b/lib/util.php @@ -34,6 +34,14 @@ function common_user_error($msg, $code=400) $err->showPage(); } +/** + * This should only be used at setup; processes switching languages + * to send text to other users should use common_switch_locale(). + * + * @param string $language Locale language code (optional; empty uses + * current user's preference or site default) + * @return mixed success + */ function common_init_locale($language=null) { if(!$language) { @@ -50,6 +58,15 @@ function common_init_locale($language=null) return $ok; } +/** + * Initialize locale and charset settings and gettext with our message catalog, + * using the current user's language preference or the site default. + * + * This should generally only be run at framework initialization; code switching + * languages at runtime should call common_switch_language(). + * + * @access private + */ function common_init_language() { mb_internal_encoding('UTF-8'); diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index ac532e18b..83664995a 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -272,12 +272,12 @@ function remove_facebook_app($flink) function mail_facebook_app_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); $site_name = common_config('site', 'name'); + common_switch_locale($user->language); + $subject = sprintf( _m('Your %1$s Facebook application access has been disabled.', $site_name)); @@ -291,7 +291,7 @@ function mail_facebook_app_removed($user) "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"), $user->nickname, $site_name); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 21adc7a90..896eee2da 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -335,10 +335,10 @@ function remove_twitter_link($flink) function mail_twitter_bridge_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); + common_switch_locale($user->language); + $subject = sprintf(_m('Your Twitter bridge has been disabled.')); $site_name = common_config('site', 'name'); @@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user) common_local_url('twittersettings'), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } -- cgit v1.2.3