\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-04 23:10:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:46+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -184,7 +184,7 @@ msgstr "Допис %s не має змісту."
#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
#: classes/Ostatus_profile.php:592
msgid "Show more"
-msgstr "Дивитись далі"
+msgstr "Розгорнути"
#. TRANS: Exception. %s is a profile URL.
#: classes/Ostatus_profile.php:785
@@ -213,55 +213,55 @@ msgstr "Невірна URL-адреса аватари %s."
msgid "Tried to update avatar for unsaved remote profile %s."
msgstr "Намагаюся оновити аватару для не збереженого віддаленого профілю %s."
-#: classes/Ostatus_profile.php:1057
+#: classes/Ostatus_profile.php:1058
#, php-format
msgid "Unable to fetch avatar from %s."
msgstr "Неможливо завантажити аватару з %s."
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1279
+#: classes/Ostatus_profile.php:1284
msgid "Local user can't be referenced as remote."
msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1289
msgid "Local group can't be referenced as remote."
msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1336 classes/Ostatus_profile.php:1347
+#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
msgid "Can't save local profile."
msgstr "Не вдається зберегти місцевий профіль."
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1355
+#: classes/Ostatus_profile.php:1360
msgid "Can't save OStatus profile."
msgstr "Не вдається зберегти профіль OStatus."
#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1614 classes/Ostatus_profile.php:1642
+#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
msgid "Not a valid webfinger address."
msgstr "Це недійсна адреса для протоколу WebFinger."
#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1724
+#: classes/Ostatus_profile.php:1729
#, php-format
msgid "Couldn't save profile for \"%s\"."
msgstr "Не можу зберегти профіль для «%s»."
#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1743
+#: classes/Ostatus_profile.php:1748
#, php-format
msgid "Couldn't save ostatus_profile for \"%s\"."
msgstr "Не можу зберегти профіль OStatus для «%s»."
#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1751
+#: classes/Ostatus_profile.php:1756
#, php-format
msgid "Couldn't find a valid profile for \"%s\"."
msgstr "не можу знайти відповідний й профіль для «%s»."
-#: classes/Ostatus_profile.php:1793
+#: classes/Ostatus_profile.php:1798
msgid "Could not store HTML content of long post as file."
msgstr "Не можу зберегти HTML місткого допису у якості файлу."
@@ -437,7 +437,7 @@ msgstr "hub.topic «%s» невірний. Спільноти не існує."
msgid "Invalid URL passed for %1$s: \"%2$s\""
msgstr "Для %1$s передано невірний URL: «%2$s»"
-#: actions/userxrd.php:51 actions/ownerxrd.php:39 actions/usersalmon.php:43
+#: actions/userxrd.php:59 actions/ownerxrd.php:39 actions/usersalmon.php:43
msgid "No such user."
msgstr "Такого користувача немає."
diff --git a/plugins/OStatus/tests/FeedDiscoveryTest.php b/plugins/OStatus/tests/FeedDiscoveryTest.php
index 3be4bf736c..ef17efe7cf 100644
--- a/plugins/OStatus/tests/FeedDiscoveryTest.php
+++ b/plugins/OStatus/tests/FeedDiscoveryTest.php
@@ -75,9 +75,10 @@ END;
' ',
'http://example.com/feed/rss'),
+ // This one can't resolve correctly; relative link is bogus.
array('http://example.com/relative/link3',
' ',
- 'http://example.com/feed/rss'),
+ 'http:/feed/rss'),
array('http://example.com/base/link1',
' ',
'http://target.example.com/feed/rss'),
array('http://example.com/base/link2',
' ',
'http://target.example.com/feed/rss'),
+ // This one can't resolve; relative link is bogus.
array('http://example.com/base/link3',
' ',
- 'http://target.example.com/feed/rss'),
+ 'http:/feed/rss'),
// Trick question! There's a but no href on it
array('http://example.com/relative/fauxbase',
' ',
diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php
index 64c60a8a4c..7888ec7c5d 100644
--- a/plugins/OStatus/tests/remote-tests.php
+++ b/plugins/OStatus/tests/remote-tests.php
@@ -4,7 +4,7 @@ if (php_sapi_name() != 'cli') {
die('not for web');
}
-define('TIMEOUT', 60); // ssslllloowwwww salmon if queues are off
+define('HTTP_TIMEOUT', 60); // ssslllloowwwww salmon if queues are off
define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__)))));
set_include_path(INSTALLDIR . '/extlib' . PATH_SEPARATOR . get_include_path());
@@ -63,14 +63,15 @@ class OStatusTester extends TestBase
/**
* @param string $a base URL of test site A (eg http://localhost/mublog)
* @param string $b base URL of test site B (eg http://localhost/mublog2)
+ * @param int $timeout HTTP timeout value (needs to be long if Salmon is slow)
*/
- function __construct($a, $b) {
+ function __construct($a, $b, $timeout=60) {
$this->a = $a;
$this->b = $b;
$base = 'test' . mt_rand(1, 1000000);
- $this->pub = new SNTestClient($this->a, 'pub' . $base, 'pw-' . mt_rand(1, 1000000));
- $this->sub = new SNTestClient($this->b, 'sub' . $base, 'pw-' . mt_rand(1, 1000000));
+ $this->pub = new SNTestClient($this->a, 'pub' . $base, 'pw-' . mt_rand(1, 1000000), $timeout);
+ $this->sub = new SNTestClient($this->b, 'sub' . $base, 'pw-' . mt_rand(1, 1000000), $timeout);
}
function run()
@@ -166,11 +167,12 @@ class OStatusTester extends TestBase
class SNTestClient extends TestBase
{
- function __construct($base, $username, $password)
+ function __construct($base, $username, $password, $timeout=60)
{
$this->basepath = $base;
$this->username = $username;
$this->password = $password;
+ $this->timeout = $timeout;
$this->fullname = ucfirst($username) . ' Smith';
$this->homepage = 'http://example.org/' . $username;
@@ -190,7 +192,7 @@ class SNTestClient extends TestBase
{
$url = $this->basepath . '/' . $path;
- $http = new HTTP_Request2($url, 'POST', array('timeout' => TIMEOUT));
+ $http = new HTTP_Request2($url, 'POST', array('timeout' => $this->timeout));
if ($auth) {
$http->setAuth($this->username, $this->password, HTTP_Request2::AUTH_BASIC);
}
@@ -217,7 +219,7 @@ class SNTestClient extends TestBase
protected function web($path, $form, $params=array())
{
$url = $this->basepath . '/' . $path;
- $http = new HTTP_Request2($url, 'GET', array('timeout' => TIMEOUT));
+ $http = new HTTP_Request2($url, 'GET', array('timeout' => $this->timeout));
$response = $http->send();
$dom = $this->checkWeb($url, 'GET', $response);
@@ -534,10 +536,29 @@ class SNTestClient extends TestBase
}
-$args = array_slice($_SERVER['argv'], 1);
+// @fixme switch to commandline.inc?
+$timeout = HTTP_TIMEOUT;
+
+$args = array();
+$options = array();
+foreach (array_slice($_SERVER['argv'], 1) as $arg) {
+ if (substr($arg, 0, 2) == '--') {
+ $bits = explode('=', substr($arg, 2), 2);
+ if (count($bits == 2)) {
+ list($key, $val) = $bits;
+ $options[$key] = $val;
+ } else {
+ list($key) = $bits;
+ $options[$key] = true;
+ }
+ } else {
+ $args[] = $arg;
+ }
+}
if (count($args) < 2) {
print <<
+remote-tests.php [options]
+ --timeout=## change HTTP timeout from default {$timeout}s
url1: base URL of a StatusNet instance
url2: base URL of another StatusNet instance
@@ -551,6 +572,9 @@ exit(1);
$a = $args[0];
$b = $args[1];
+if (isset($options['timeout'])) {
+ $timeout = intval($options['timeout']);
+}
-$tester = new OStatusTester($a, $b);
+$tester = new OStatusTester($a, $b, $timeout);
$tester->run();
diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
index 611f5e5c7b..f0f6144e01 100644
--- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
+++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class OpenExternalLinkTargetPlugin extends Plugin
{
function onEndShowScripts($action)
@@ -57,7 +56,7 @@ class OpenExternalLinkTargetPlugin extends Plugin
'author' => 'Sarven Capadisli',
'homepage' => 'http://status.net/wiki/Plugin:OpenExternalLinkTarget',
'rawdescription' =>
- _m('Opens external links (e.g., with rel=external) on a new window or tab.'));
+ _m('Opens external links (i.e. with rel=external) on a new window or tab.'));
return true;
}
}
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index 62487428a5..a8c74b6588 100644
--- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
+++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,6 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
diff --git a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..49e10b0242
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - OpenExternalLinkTarget to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:21:19+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-19 23:49:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"Öffnet externe Links (mit rel=external) in einem neuen Fenster oder Tab."
diff --git a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
index 82b8be953e..256a7ebc11 100644
--- a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Spanish \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Abre vínculos externos (por ejemplo, con rel=external) en una nueva ventana "
"o pestaña."
diff --git a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
index 91f9f5faf5..596593888e 100644
--- a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,6 +1,7 @@
# Translation of StatusNet - OpenExternalLinkTarget to French (Français)
# Expored from translatewiki.net
#
+# Author: Peter17
# Author: Verdy p
# --
# This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-20 17:39+0000\n"
+"PO-Revision-Date: 2010-10-20 17:42:16+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 01:18:29+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75070); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Ouvre les liens externes (p. ex., avec rel=external) dans une nouvelle "
"fenêtre ou un nouvel onglet."
diff --git a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
index 12a071148c..65aa5dc313 100644
--- a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
-"Aperi ligamines externe (p.ex. con rel=external) in un nove fenestra o "
-"scheda."
+"Aperi ligamines externe (i.e. con rel=external) in un nove fenestra o scheda."
diff --git a/plugins/OpenExternalLinkTarget/locale/id/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/id/LC_MESSAGES/OpenExternalLinkTarget.po
index 19d9f4c8b7..380daec18b 100644
--- a/plugins/OpenExternalLinkTarget/locale/id/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/id/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:52+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Indonesian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: id\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Membuka pranala luar (misal dengan rel=external) di jendela atau tab baru."
diff --git a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
index b5e4d1386c..9dcc804c6e 100644
--- a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
-"Отвора надворешни врски (на пр. со rel=external) во нов прозорец или јазиче."
+"Отвора надворешни врски (т.е. со rel=external) во нов прозорец или јазиче."
diff --git a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
index 8d9045dc66..d7535ebcee 100644
--- a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Norwegian (bokmål) \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Åpner eksterne lenker (f.eks. med rel=external) i ett nytt vindu eller en ny "
"fane."
diff --git a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
index f1a4e4c72c..3a3d82cca1 100644
--- a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
-"Opent externe verwijzingen in een nieuw venster of tabblad (bv. met "
-"\"rel=external\")."
+"Opent externe verwijzingen (met \"rel=external\") in een nieuw venster of "
+"tabblad."
diff --git a/plugins/OpenExternalLinkTarget/locale/pt_BR/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/pt_BR/LC_MESSAGES/OpenExternalLinkTarget.po
index 285207074a..ad5dd3f5a6 100644
--- a/plugins/OpenExternalLinkTarget/locale/pt_BR/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/pt_BR/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,21 +9,22 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:52+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Brazilian Portuguese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Abre links externos (por exemplo, com rel=external) em uma nova janela ou "
"aba."
diff --git a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
index 5da6bee90c..8a43460f42 100644
--- a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,21 +9,22 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Russian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Возможность открыть внешние ссылки (например, rel=внешние) в новом окне или "
"вкладке."
diff --git a/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
index d3d8816b06..9d8546f250 100644
--- a/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr ""
"Nagbubukas ng panlabasa na mga kawing (iyon ay may rel=external) sa isang "
"bagong bintana o panglaylay."
diff --git a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
index 773a641515..f6a3280952 100644
--- a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,21 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:56:59+0000\n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:21:19+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:19:58+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-19 23:49:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
-msgstr "Відкривати зовнішні посилання у новому вікні або вкладці."
+#: OpenExternalLinkTargetPlugin.php:59
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"Відкривати зовнішні посилання (тобто з rel=external) у новому вікні або "
+"вкладці."
diff --git a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
index 0e32025171..70074ee5db 100644
--- a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,19 +9,20 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:52+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:22+0000\n"
"Language-Team: Simplified Chinese \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:34+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: OpenExternalLinkTargetPlugin.php:60
-msgid "Opens external links (e.g., with rel=external) on a new window or tab."
+#: OpenExternalLinkTargetPlugin.php:59
+#, fuzzy
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
msgstr "在新窗口或标签打开外部链接(如使用 rel=external)。"
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index a033a50109..cdaabbbf7f 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
* @link http://status.net/
* @link http://openid.net/
*/
-
class OpenIDPlugin extends Plugin
{
// Plugin parameter: set true to disallow non-OpenID logins
@@ -60,7 +59,6 @@ class OpenIDPlugin extends Plugin
global $config;
$config['site']['openidonly'] = (bool)$this->openidOnly;
}
-
}
/**
@@ -72,7 +70,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onStartInitializeRouter($m)
{
$m->connect('main/openid', array('action' => 'openidlogin'));
@@ -98,7 +95,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onStartConnectPath(&$path, &$defaults, &$rules, &$result)
{
if (common_config('site', 'openidonly')) {
@@ -127,7 +123,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onArgsInitialize($args)
{
if (common_config('site', 'openidonly')) {
@@ -158,7 +153,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onEndPublicXRDS($action, &$xrdsOutputter)
{
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
@@ -189,7 +183,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onEndUserXRDS($action, &$xrdsOutputter)
{
$xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
@@ -218,7 +211,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onStartPrimaryNav($action)
{
if (common_config('site', 'openidonly') && !common_logged_in()) {
@@ -260,7 +252,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onStartLoginGroupNav(&$action)
{
if (common_config('site', 'openidonly')) {
@@ -281,7 +272,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onEndLoginGroupNav(&$action)
{
$this->showOpenIDLoginTab($action);
@@ -296,7 +286,6 @@ class OpenIDPlugin extends Plugin
*
* @return void
*/
-
function showOpenIDLoginTab($action)
{
$action_name = $action->trimmed('action');
@@ -319,7 +308,6 @@ class OpenIDPlugin extends Plugin
*
* @return void
*/
-
function onStartAccountSettingsPasswordMenuItem($menu, &$unused) {
if (common_config('site', 'openidonly')) {
return false;
@@ -334,7 +322,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onEndAccountSettingsNav(&$action)
{
$action_name = $action->trimmed('action');
@@ -358,7 +345,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onAutoload($cls)
{
switch ($cls)
@@ -400,7 +386,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onSensitiveAction($action, &$ssl)
{
switch ($action)
@@ -424,7 +409,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook return
*/
-
function onLoginAction($action, &$login)
{
switch ($action)
@@ -447,7 +431,6 @@ class OpenIDPlugin extends Plugin
*
* @return void
*/
-
function onEndShowHeadElements($action)
{
if ($action instanceof ShowstreamAction) {
@@ -471,7 +454,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean whether to continue
*/
-
function onRedirectToLogin($action, $user)
{
if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) {
@@ -488,7 +470,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onEndShowPageNotice($action)
{
$name = $action->trimmed('action');
@@ -527,7 +508,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onStartLoadDoc(&$title, &$output)
{
if ($title == 'openid') {
@@ -549,7 +529,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onEndLoadDoc($title, &$output)
{
if ($title == 'help') {
@@ -568,7 +547,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onCheckSchema()
{
$schema = Schema::get();
@@ -601,7 +579,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onUserDeleteRelated($user, &$tables)
{
$tables[] = 'User_openid';
@@ -616,7 +593,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onEndAdminPanelNav($nav)
{
if (AdminPanelAction::canAdmin('openid')) {
@@ -625,7 +601,9 @@ class OpenIDPlugin extends Plugin
$nav->out->menuItem(
common_local_url('openidadminpanel'),
- _m('OpenID'),
+ // TRANS: OpenID configuration menu item.
+ _m('MENU','OpenID'),
+ // TRANS: Tooltip for OpenID configuration menu item.
_m('OpenID configuration'),
$action_name == 'openidadminpanel',
'nav_openid_admin_panel'
@@ -642,7 +620,6 @@ class OpenIDPlugin extends Plugin
*
* @return boolean hook value
*/
-
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'OpenID',
@@ -654,4 +631,108 @@ class OpenIDPlugin extends Plugin
_m('Use OpenID to login to the site.'));
return true;
}
+
+ function onStartOAuthLoginForm($action, &$button)
+ {
+ if (common_config('site', 'openidonly')) {
+ // Cancel the regular password login form, we won't need it.
+ $this->showOAuthLoginForm($action);
+ // TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+ $button = _m('BUTTON', 'Continue');
+ return false;
+ } else {
+ // Leave the regular password login form in place.
+ // We'll add an OpenID link at bottom...?
+ return true;
+ }
+ }
+
+ /**
+ * @fixme merge with common code for main OpenID login form
+ * @param HTMLOutputter $action
+ */
+ protected function showOAuthLoginForm($action)
+ {
+ $action->elementStart('fieldset');
+ // TRANS: OpenID plugin logon form legend.
+ $action->element('legend', null, _m('OpenID login'));
+
+ $action->elementStart('ul', 'form_data');
+ $action->elementStart('li');
+ $provider = common_config('openid', 'trusted_provider');
+ $appendUsername = common_config('openid', 'append_username');
+ if ($provider) {
+ // TRANS: Field label.
+ $action->element('label', array(), _m('OpenID provider'));
+ $action->element('span', array(), $provider);
+ if ($appendUsername) {
+ $action->element('input', array('id' => 'openid_username',
+ 'name' => 'openid_username',
+ 'style' => 'float: none'));
+ }
+ $action->element('p', 'form_guide',
+ // TRANS: Form guide.
+ ($appendUsername ? _m('Enter your username.') . ' ' : '') .
+ // TRANS: Form guide.
+ _m('You will be sent to the provider\'s site for authentication.'));
+ $action->hidden('openid_url', $provider);
+ } else {
+ // TRANS: OpenID plugin logon form field label.
+ $action->input('openid_url', _m('OpenID URL'),
+ '',
+ // TRANS: OpenID plugin logon form field instructions.
+ _m('Your OpenID URL'));
+ }
+ $action->elementEnd('li');
+ $action->elementEnd('ul');
+
+ $action->elementEnd('fieldset');
+ }
+
+ /**
+ * Handle a POST user credential check in apioauthauthorization.
+ * If given an OpenID URL, we'll pass us over to the regular things
+ * and then redirect back here on completion.
+ *
+ * @fixme merge with common code for main OpenID login form
+ * @param HTMLOutputter $action
+ */
+ function onStartOAuthLoginCheck($action, &$user)
+ {
+ $provider = common_config('openid', 'trusted_provider');
+ if ($provider) {
+ $openid_url = $provider;
+ if (common_config('openid', 'append_username')) {
+ $openid_url .= $action->trimmed('openid_username');
+ }
+ } else {
+ $openid_url = $action->trimmed('openid_url');
+ }
+
+ if ($openid_url) {
+ require_once dirname(__FILE__) . '/openid.php';
+ oid_assert_allowed($openid_url);
+
+ $returnto = common_local_url(
+ 'ApiOauthAuthorize',
+ array(),
+ array(
+ 'oauth_token' => $action->arg('oauth_token'),
+ 'mode' => $action->arg('mode')
+ )
+ );
+ common_set_returnto($returnto);
+
+ // This will redirect if functional...
+ $result = oid_authenticate($openid_url,
+ 'finishopenidlogin');
+ if (is_string($result)) { # error message
+ throw new ServerException($result);
+ } else {
+ exit(0);
+ }
+ }
+
+ return true;
+ }
}
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 8ef57965f1..2d8efbf5ce 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
msgid "OpenID removed."
msgstr ""
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
@@ -242,67 +242,100 @@ msgid ""
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr ""
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr ""
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr ""
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr ""
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -481,28 +514,6 @@ msgstr ""
msgid "OpenID Login"
msgstr ""
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr ""
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr ""
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr ""
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr ""
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr ""
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
new file mode 100644
index 0000000000..efea4febe9
--- /dev/null
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -0,0 +1,606 @@
+# Translation of StatusNet - OpenID to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
+"Language-Team: Catalan \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr "Paràmetres de l'OpenID"
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"[OpenID](%%doc.openid%%) us permet iniciar una sessió a molts llocs amb un "
+"mateix compte d'usuari. Gestioneu les vostres connexions OpenID associades "
+"des d'aquí."
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr "Afegeix una connexió OpenID"
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Si voleu afegir una connexió OpenID al vostre compte, introduïu-la en la "
+"caixa a continuació i feu clic a «Afegeix»."
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr "URL de la connexió OpenID"
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "Afegeix"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr "Suprimeix la connexió OpenID"
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Si suprimiu la vostra única connexió OpenID, serà impossible que hi inicieu "
+"cap sessió. Si cal que la suprimiu, primer afegiu-ne una altra."
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Podeu suprimir una connexió OpenID del vostre compte si feu clic al botó "
+"marcat amb «Suprimeix»."
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "Suprimeix"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr "Llocs de confiança de l'OpenID"
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr ""
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"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."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr "Opcions"
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Ajuda'm!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr "Cerca"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr "Inici de sessió o registre amb OpenID"
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr "Afegeix o suprimeix connexions OpenID"
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr "Configuració de l'OpenID"
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use OpenID to login to the site."
+msgstr ""
+"Fa servir OpenID per connectar-se al lloc."
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continua"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Inici de sessió amb OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "Proveïdor d'OpenID"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Introduïu el vostre nom d'usuari."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Se us portarà al lloc del proveïdor perquè us hi autentiqueu."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "L'URL del vostre OpenID"
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "No esteu autoritzar a utilitzar la identitat %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr "Només un proveïdor OpenID. Res per veure aquí, movem-nos-en…"
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr "Ja heu iniciat una sessió."
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr "S'ha produït un error desconegut."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr "Configuració del compte OpenID"
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr ""
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr ""
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Contrasenya"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Connecta-hi"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr "No es permet el registre."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr "No és un codi d'invitació vàlid."
+
+#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
+#: finishopenidlogin.php:281
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El sobrenom ha de contenir només lletres minúscules i nombres, i cap espai."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:287
+msgid "Nickname not allowed."
+msgstr "No es permet el sobrenom."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:293
+msgid "Nickname already in use. Try another one."
+msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:301 finishopenidlogin.php:388
+msgid "Stored OpenID not found."
+msgstr "No s'ha trobat la connexió OpenID emmagatzemada."
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:311
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+"S'està creant un compte nou per a una connexió OpenID que ja té un usuari."
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:376
+msgid "Invalid username or password."
+msgstr "El nom d'usuari o la contrasenya no són vàlids."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:396
+msgid "Error connecting user to OpenID."
+msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Per motius de seguretat, torneu a iniciar una sessió amb [OpenID](%%doc."
+"openid%%) abans de canviar els paràmetres."
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Inicia una sessió amb un compte [OpenID](%%doc.openid%%)."
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr "Inici de sessió amb OpenID"
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Recorda'm"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Inicia una sessió automàticament en el futur; no recomanable en ordinadors "
+"compartits!"
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Inicia una sessió"
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr "Verificació de la identitat d'OpenID"
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Hauria d'arribar-se a aquesta pàgina només durant el processament de "
+"l'OpenID, no directament."
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+"%s us ha demanat verificar la identitat. Feu clic a Continuar per verificar "
+"la vostra identitat i iniciar una sessió sense crear cap contrasenya nova."
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Continua"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr "No s'ha iniciat una sessió."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr "Ja teniu aquest OpenID!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr "Algú altre ja té aquest OpenID."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr "S'ha produït un error en connectar l'usuari"
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr "S'ha produït un error en actualitzar el perfil"
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index a5fad3a9d9..3c88ec4db9 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:02+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
"Language-Team: German \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -32,10 +32,12 @@ msgid ""
"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
"account. Manage your associated OpenIDs from here."
msgstr ""
+"[OpenID](%%doc.openid%%) erlaubt die, dich auf vielen Seiten mit dem selben "
+"Benutzerkonto anzumelden. Verwalte deine verknüpften OpenIDs von hier aus."
#: openidsettings.php:100
msgid "Add OpenID"
-msgstr "Füge OpenID hinzu"
+msgstr "OpenID hinzufügen"
#: openidsettings.php:103
msgid ""
@@ -46,9 +48,9 @@ msgstr ""
"nachfolgenden Feld ein und klicke auf „Hinzufügen“."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
-msgstr "OpenID URL"
+msgstr "OpenID-URL"
#: openidsettings.php:118
msgid "Add"
@@ -80,7 +82,7 @@ msgstr "Entfernen"
#: openidsettings.php:187
msgid "OpenID Trusted Sites"
-msgstr ""
+msgstr "Vertrauenswürdige OpenID-Seiten"
#: openidsettings.php:190
msgid ""
@@ -124,7 +126,7 @@ msgstr "Diese OpenID gehört dir nicht."
msgid "OpenID removed."
msgstr "OpenID entfernt."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -146,19 +148,24 @@ msgid ""
"you are using your own OpenID service for shared sign-in, you can restrict "
"access to only your own users here."
msgstr ""
+"Standardmäßig dürfen sich Benutzer mit jedem OpenID-Provider "
+"authentifizieren. Wenn du deinen eigenen OpenID-Servide benutzt, kannst du "
+"hier den Zugang auf deine eigenen Benutzer beschränken."
#: openidadminpanel.php:220
msgid "Provider URL"
-msgstr ""
+msgstr "Provider-URL"
#: openidadminpanel.php:221
msgid ""
"All OpenID logins will be sent to this URL; other providers may not be used."
msgstr ""
+"Alle OpenID-Anmeldungen werden an diese URL gesendet; andere Provider können "
+"nicht verwendet werden."
#: openidadminpanel.php:228
msgid "Append a username to base URL"
-msgstr ""
+msgstr "Einen Benutzernamen an die Basis-URL anfügen"
#: openidadminpanel.php:230
msgid ""
@@ -166,32 +173,39 @@ msgid ""
"end. Use when OpenID provider URL should be the profile page for individual "
"users."
msgstr ""
+"Die Anmelde-Form wird eine Basis-URL anzeigen und um einen Benutzernamen am "
+"Ende bitten. Benutzer dass, wenn die OpenID-Provider-URL die Profilseite "
+"individueller Benutzer sein sollte."
#: openidadminpanel.php:238
msgid "Required team"
-msgstr ""
+msgstr "Erforderliche Mannschaft"
#: openidadminpanel.php:239
msgid "Only allow logins from users in the given team (Launchpad extension)."
msgstr ""
+"Nur Anmeldungen von Benutzern aus der gegebenen Mannschaft erlauben "
+"(Launchpad-Erweiterung)."
#: openidadminpanel.php:251
msgid "Options"
-msgstr ""
+msgstr "Optionen"
#: openidadminpanel.php:258
msgid "Enable OpenID-only mode"
-msgstr ""
+msgstr "Nur-OpenID-Modus aktivieren"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
+"Von allen Benutzern OpenID-Anmeldung verlangen. Warnung: deaktiviert "
+"Passwort-Authentifizierung aller Benutzer!"
#: openidadminpanel.php:278
msgid "Save OpenID settings"
-msgstr ""
+msgstr "OpenId-Einstellungen speichern"
#. TRANS: OpenID plugin server error.
#: openid.php:138
@@ -208,14 +222,14 @@ msgstr "Keine gültige OpenID."
#: openid.php:155
#, php-format
msgid "OpenID failure: %s"
-msgstr ""
+msgstr "OpenId-Fehler: %s"
#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
#. TRANS: %s is the failure message.
#: openid.php:205
#, php-format
msgid "Could not redirect to server: %s"
-msgstr ""
+msgstr "Konnte keine Verbindung zum Server erstellen: %s"
#. TRANS: OpenID plugin user instructions.
#: openid.php:244
@@ -227,17 +241,17 @@ msgstr ""
#. TRANS: OpenID plugin server error.
#: openid.php:280
msgid "Error saving the profile."
-msgstr ""
+msgstr "Fehler beim Speichern des Profils."
#. TRANS: OpenID plugin server error.
#: openid.php:292
msgid "Error saving the user."
-msgstr ""
+msgstr "Fehler beim Speichern des Benutzers."
#. TRANS: OpenID plugin client exception (403).
#: openid.php:322
msgid "Unauthorized URL used for OpenID login."
-msgstr ""
+msgstr "Unauthorisierte URL für OpenID-Anmeldung benutzt."
#. TRANS: Title
#: openid.php:370
@@ -247,7 +261,7 @@ msgstr ""
#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
#: openid.php:381
msgid "Requesting authorization from your login provider..."
-msgstr ""
+msgstr "Authorisierung von deinem Login-Provider wird angefragt …"
#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
#: openid.php:385
@@ -255,81 +269,117 @@ msgid ""
"If you are not redirected to your login provider in a few seconds, try "
"pushing the button below."
msgstr ""
+"Wenn du nicht in wenigen Sekunden zu deinem Login-Provider weitergeleitet "
+"wirst, versuche den Button unten zu klicken."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr ""
+msgstr "Auf der Seite anmelden"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Anmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hilf mir!"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Hilfe"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr ""
+msgstr "Suche nach Leuten oder Text"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Suche"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Anmelden oder Registrieren per OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Hinzufügen oder Entfernen von OpenIDs"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
-msgstr ""
+msgstr "OpenId-Konfiguration"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Benutzung der OpenID zur Anmeldung auf "
"der Seite"
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Weiter"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Gib deinen Benutzernamen ein."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "Ihre OpenID URL"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
msgid "You are not authorized to use the identity %s."
-msgstr ""
+msgstr "Du bist nicht berechtigt, die Identität %s zu benutzen."
#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
#: openidserver.php:137
msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
+msgstr "Nur ein OpenID-Provider. Hier gibt es nichts zu sehen …"
#. TRANS: Client error message trying to log on with OpenID while already logged on.
#: finishopenidlogin.php:37 openidlogin.php:33
@@ -340,11 +390,12 @@ msgstr "Bereits angemeldet."
#: finishopenidlogin.php:48
msgid "You can't register if you don't agree to the license."
msgstr ""
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
#. TRANS: Messag given on an unknown error.
#: finishopenidlogin.php:57
msgid "An unknown error has occured."
-msgstr ""
+msgstr "Ein unbekannter Fehler ist aufgetreten."
#. TRANS: Instructions given after a first successful logon using OpenID.
#. TRANS: %s is the site name.
@@ -355,6 +406,10 @@ msgid ""
"to a local account. You can either create a new account, or connect with "
"your existing account, if you have one."
msgstr ""
+"Dies ist das erste Mal, dass du dich auf %s anmeldest, sodass wir deine "
+"OpenID mit einem lokalen Benutzerkonto verbinden müssen. Du kannst entweder "
+"ein neues Benutzerkonto erstellen oder dich mit deinem existierendem "
+"Benutzerkonto verbinden."
#. TRANS: Title
#: finishopenidlogin.php:80
@@ -367,15 +422,15 @@ msgstr "Neues Benutzerkonto erstellen"
#: finishopenidlogin.php:112
msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "Neues Benutzerkonto mit diesem Benutzernamen erstellen."
#: finishopenidlogin.php:115
msgid "New nickname"
-msgstr ""
+msgstr "Neuer Benutzername"
#: finishopenidlogin.php:117
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
#: finishopenidlogin.php:142
@@ -386,7 +441,7 @@ msgstr "Erstellen"
#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
#: finishopenidlogin.php:148
msgid "Connect existing account"
-msgstr ""
+msgstr "Bestehendes Benutzerkonto verbinden"
#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
#: finishopenidlogin.php:151
@@ -394,11 +449,13 @@ msgid ""
"If you already have an account, login with your username and password to "
"connect it to your OpenID."
msgstr ""
+"Wenn du bereits ein Benutzerkonto hast, melde dich mit deinem Benutzernamen "
+"und Passwort an, um ihn mit deiner OpenID zu verbinden."
#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
#: finishopenidlogin.php:155
msgid "Existing nickname"
-msgstr ""
+msgstr "Bestehender Benutzername"
#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
#: finishopenidlogin.php:159
@@ -409,12 +466,12 @@ msgstr "Passwort"
#: finishopenidlogin.php:163
msgctxt "BUTTON"
msgid "Connect"
-msgstr ""
+msgstr "Verbinden"
#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
#: finishopenidlogin.php:176 finishaddopenid.php:90
msgid "OpenID authentication cancelled."
-msgstr ""
+msgstr "OpenID-Authentifizierung abgebrochen."
#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
#. TRANS: OpenID authentication failed; display the error message.
@@ -422,38 +479,42 @@ msgstr ""
#: finishopenidlogin.php:180 finishaddopenid.php:95
#, php-format
msgid "OpenID authentication failed: %s"
-msgstr ""
+msgstr "OpenID-Authentifizierung gescheitert: %s"
#: finishopenidlogin.php:200 finishaddopenid.php:111
msgid ""
"OpenID authentication aborted: you are not allowed to login to this site."
msgstr ""
+"OpenID-Authentifizierung abgebrochen: du darfst dich nicht auf dieser Seite "
+"anmelden."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
#: finishopenidlogin.php:252 finishopenidlogin.php:262
msgid "Registration not allowed."
-msgstr ""
+msgstr "Registrierung nicht erlaubt."
#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
#: finishopenidlogin.php:270
msgid "Not a valid invitation code."
-msgstr ""
+msgstr "Kein gültiger Einladungscode."
#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
#: finishopenidlogin.php:281
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
+"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+"Leerzeichen sind nicht erlaubt."
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
#: finishopenidlogin.php:287
msgid "Nickname not allowed."
-msgstr ""
+msgstr "Benutzername nicht erlaubt."
#. TRANS: OpenID plugin message. The entered new user name is already used.
#: finishopenidlogin.php:293
msgid "Nickname already in use. Try another one."
-msgstr ""
+msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
@@ -469,7 +530,7 @@ msgstr ""
#. TRANS: OpenID plugin message.
#: finishopenidlogin.php:376
msgid "Invalid username or password."
-msgstr ""
+msgstr "Benutzername oder Passwort falsch."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
#: finishopenidlogin.php:396
@@ -484,13 +545,15 @@ msgid ""
"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
"before changing your settings."
msgstr ""
+"Bitte melde dich aus Sicherheitsgründen noch einmal mit deiner [OpenID](%%"
+"doc.openid%%), bevor du deine Einstellungen änderst."
#. TRANS: OpenID plugin message.
#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
#: openidlogin.php:88
#, php-format
msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
+msgstr "Mit einem [OpenID](%%doc.openid%%)-Benutzerkonto anmelden."
#. TRANS: OpenID plugin message. Title.
#. TRANS: Title after getting the status of the OpenID authorisation request.
@@ -498,28 +561,6 @@ msgstr ""
msgid "OpenID Login"
msgstr ""
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr ""
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr ""
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Gib deinen Benutzernamen ein."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr ""
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "Ihre OpenID URL"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
@@ -528,7 +569,7 @@ msgstr "Anmeldedaten merken"
#. TRANS: OpenID plugin logon form field instructions.
#: openidlogin.php:171
msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
+msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
#: openidlogin.php:176
@@ -551,6 +592,9 @@ msgid ""
"%s has asked to verify your identity. Click Continue to verify your "
"identity and login without creating a new password."
msgstr ""
+"%s hat dich gebeten, deine Identität zu bestätigen. Klicke auf „Weiter“, um "
+"deine Identität zu bestätigen und dich anzumelden ohne ein neues Passwort zu "
+"erstellen."
#: openidtrust.php:136
msgid "Continue"
@@ -563,7 +607,7 @@ msgstr "Abbrechen"
#. TRANS: Client error message
#: finishaddopenid.php:68
msgid "Not logged in."
-msgstr ""
+msgstr "Nicht angemeldet."
#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
#: finishaddopenid.php:122
@@ -573,7 +617,7 @@ msgstr "Du hast bereits diese OpenID!"
#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
#: finishaddopenid.php:125
msgid "Someone else already has this OpenID."
-msgstr ""
+msgstr "Jemand anders hat bereits diese Open-ID."
#. TRANS: message in case the OpenID object cannot be connected to the user.
#: finishaddopenid.php:138
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index 1785ecb4a0..d25c86fc9e 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -1,6 +1,7 @@
# Translation of StatusNet - OpenID to French (Français)
# Expored from translatewiki.net
#
+# Author: Peter17
# Author: Verdy p
# --
# This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:02+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +49,7 @@ msgstr ""
"case ci-dessous et cliquez sur « Ajouter »."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "Adresse URL OpenID"
@@ -79,7 +80,7 @@ msgstr ""
#: openidsettings.php:173 openidsettings.php:214
msgid "Remove"
-msgstr "Retirer"
+msgstr "Enlever"
#: openidsettings.php:187
msgid "OpenID Trusted Sites"
@@ -129,7 +130,7 @@ msgstr "Ce compte OpenID ne vous appartient pas."
msgid "OpenID removed."
msgstr "Compte OpenID retiré."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -204,10 +205,10 @@ msgstr "Activer le mode OpenID seul"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
-"Exiger que tous les utilisateurs se connectent via OpenID. AVERTISSEMENT : "
+"Exiger que tous les utilisateurs se connectent via OpenID. Avertissement : "
"cela désactive l’authentification par mot de passe pour tous les "
"utilisateurs !"
@@ -284,68 +285,102 @@ msgstr ""
"quelques secondes, essayez en cliquant le bouton ci-dessous."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Connexion au site"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Connexion"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Aidez-moi !"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Aide"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Rechercher"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Se connecter ou s’inscrire avec OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Ajouter ou retirer des identifiants OpenID"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "Configuration d’OpenID"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Utiliser OpenID pour se connecter au site."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuer"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Connexion OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "Fournisseur OpenID"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Entrez votre nom d’utilisateur."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Vous serez envoyé sur le site du fournisseur pour l’authentification."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "Votre URL OpenID"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -536,28 +571,6 @@ msgstr "Connexion avec un compte [OpenID](%%doc.openid%%)."
msgid "OpenID Login"
msgstr "Connexion OpenID"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Connexion OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "Fournisseur OpenID"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Entrez votre nom d’utilisateur."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "Vous serez envoyé sur le site du fournisseur pour l’authentification."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "Votre URL OpenID"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 01d28a70e6..9a416ec881 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:03+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:35+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -47,7 +47,7 @@ msgstr ""
"clicca \"Adder\"."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "URL OpenID"
@@ -124,7 +124,7 @@ msgstr "Iste OpenID non appertine a te."
msgid "OpenID removed."
msgstr "OpenID removite."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -196,11 +196,11 @@ msgstr "Activar modo OpenID sol"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
-"Requirer que tote le usatores aperi session via OpenID. ATTENTION: isto "
-"disactiva le authentication per contrasigno pro tote le usatores!"
+"Requirer que tote le usatores aperi session via OpenID. Aviso: disactiva le "
+"authentication per contrasigno pro tote le usatores!"
#: openidadminpanel.php:278
msgid "Save OpenID settings"
@@ -275,68 +275,102 @@ msgstr ""
"tenta pulsar le button hic infra."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Authenticar te a iste sito"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Aperir session"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Adjuta me!"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Adjuta"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cercar personas o texto"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Cercar"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Aperir session o crear conto via OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Adder o remover OpenIDs"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "Configuration de OpenID"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Usar OpenID pro aperir session al sito."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Apertura de session via OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "Fornitor de OpenID"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Entra tu nomine de usator."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Tu essera inviate al sito del fornitor pro authentication."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "Tu URL de OpenID"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -525,28 +559,6 @@ msgstr "Aperir session con un conto [OpenID](%%doc.openid%%)."
msgid "OpenID Login"
msgstr "Apertura de session via OpenID"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Apertura de session via OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "Fornitor de OpenID"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Entra tu nomine de usator."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "Tu essera inviate al sito del fornitor pro authentication."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "Tu URL de OpenID"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index dc68a58211..a28736e4e6 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:03+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +48,7 @@ msgstr ""
"полето подолу и кликнете на „Додај“."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "URL на OpenID"
@@ -124,7 +124,7 @@ msgstr "Тој OpenID не Ви припаѓа Вам."
msgid "OpenID removed."
msgstr "OpenID е отстранет."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -194,11 +194,11 @@ msgstr "Вклучи режим „само OpenID“"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
-"Барај од сите корисници да се најават преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова ја "
-"оневозможува потврдата на лозинка за сите корисници!"
+"Барај од сите корисници да се најавуваат преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова "
+"ја оневозможува потврдата на лозинка за сите корисници!"
#: openidadminpanel.php:278
msgid "Save OpenID settings"
@@ -272,67 +272,101 @@ msgstr ""
"тогаш пристиснете го копчето подолу."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Најава на мреж. место"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Најава"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Напомош!"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Помош"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пребарување на луѓе или текст"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Пребарај"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Најава или регистрација со OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Додај или отстрани OpenID-ја"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "Поставки за OpenID"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr "Користете OpenID за најава."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продолжи"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Најава со OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "Услужител за OpenID"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Внесете го Вашето корисничко име."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Ќе бидете префрлени на мреж. место на услужникот за потврда."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "URL-адреса на Вашиот OpenID"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -521,28 +555,6 @@ msgstr "Најава со сметка на [OpenID](%%doc.openid%%)."
msgid "OpenID Login"
msgstr "OpenID-Најава"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Најава со OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "Услужител за OpenID"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Внесете го Вашето корисничко име."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "Ќе бидете префрлени на мреж. место на услужникот за потврда."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "URL-адреса на Вашиот OpenID"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index 6286a98fc1..b641290471 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:03+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
"Last-Translator: Siebrand Mazeland \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -50,7 +50,7 @@ msgstr ""
"en klik op \"Toevoegen\"."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "OpenID-URL"
@@ -128,7 +128,7 @@ msgstr "Die OpenID is niet van u."
msgid "OpenID removed."
msgstr "OpenID verwijderd."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -199,12 +199,12 @@ msgstr "Alleen OpenID inschakelen"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
"Alle gebruikers verplichten aan te melden via OpenID. Waarschuwing: als deze "
"instelling wordt gebruikt, kan geen enkele gebruiker met een wachtwoord "
-"aanmelden."
+"aanmelden!"
#: openidadminpanel.php:278
msgid "Save OpenID settings"
@@ -278,69 +278,103 @@ msgstr ""
"aanmeldprovider, klik dan op de onderstaande knop."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Aanmelden bij de site"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Aanmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Hulp"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Zoeken naar mensen of tekst"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Zoeken"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Aanmelden of registreren met OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "OpenID's toevoegen of verwijderen"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "OpenID-instellingen"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Gebruik OpenID om aan te melden bij de "
"site."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Doorgaan"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Aanmelden via OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "OpenID-provider"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Voer uw gebruikersnaam in"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "U wordt naar de site van de provider omgeleid om aan te melden."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "Uw OpenID-URL"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -529,28 +563,6 @@ msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker."
msgid "OpenID Login"
msgstr "Aanmelden via OpenID"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Aanmelden via OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "OpenID-provider"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Voer uw gebruikersnaam in"
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "U wordt naar de site van de provider omgeleid om aan te melden."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "Uw OpenID-URL"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index e7fdc2fc9b..5f41aff843 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:03+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -48,7 +48,7 @@ msgstr ""
"nasa ibaba at pindutin ang \"Idagdag\"."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "URL ng OpenID"
@@ -126,7 +126,7 @@ msgstr "Hindi mo pag-aari ang OpenID na iyan."
msgid "OpenID removed."
msgstr "Tinanggal ang OpenID."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -202,8 +202,9 @@ msgid "Enable OpenID-only mode"
msgstr "Paganahin ang gawi na OpenID lamang"
#: openidadminpanel.php:260
+#, fuzzy
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
"Igiit sa lahat ng mga tagagamit na lumagda sa pamamagitan ng OpenID. "
@@ -284,68 +285,102 @@ msgstr ""
"ng ilang mga segundo, subukang pindutin ang pindutang nasa ibaba."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Lumagda sa sityo"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Lumagda"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Saklolohan ako!"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Saklolo"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Maghanap ng mga tao o teksto"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Maghanap"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Lumagda o magpatala na may OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Idagdag o alisin ang mga OpenID"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "Pagkakaayos ng OpenID"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Gamitin ang OpenID upang lumagda sa sityo."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Magpatuloy"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Panglagdang OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "Tagapagbigay ng OpenID"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Ipasok ang iyong pangalan ng tagagamit."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Ipapadala ka sa sityo ng tagapagbigay para sa pagpapatunay."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "Ang iyong URL ng OpenID"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -539,28 +574,6 @@ msgstr "Lumagda sa pamamagitan ng isang akawnt ng [OpenID](%%doc.openid%%)."
msgid "OpenID Login"
msgstr "Panglagdang OpenID"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Panglagdang OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "Tagapagbigay ng OpenID"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Ipasok ang iyong pangalan ng tagagamit."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "Ipapadala ka sa sityo ng tagapagbigay para sa pagpapatunay."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "Ang iyong URL ng OpenID"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 63f2c13041..bd381baf37 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:08:03+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:38+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:57:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -49,7 +49,7 @@ msgstr ""
"натисніть «Додати»."
#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 openidlogin.php:161
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
msgid "OpenID URL"
msgstr "URL-адреса OpenID"
@@ -127,7 +127,7 @@ msgstr "Даний OpenID належить не вам."
msgid "OpenID removed."
msgstr "OpenID видалено."
-#: openidadminpanel.php:54 OpenIDPlugin.php:628
+#: openidadminpanel.php:54
msgid "OpenID"
msgstr "OpenID"
@@ -199,11 +199,11 @@ msgstr "Увімкнути режим входу лише за OpenID"
#: openidadminpanel.php:260
msgid ""
-"Require all users to login via OpenID. WARNING: disables password "
+"Require all users to login via OpenID. Warning: disables password "
"authentication for all users!"
msgstr ""
-"Вимагає, щоб всі користувачі входили лише за наявності OpenID. УВАГА: ця "
-"опція вимикає автентифікацію за паролем для всіх користувачів."
+"Вимагає, щоб всі користувачі входили лише за допомогою OpenID. Увага: ця "
+"опція вимикає автентифікацію за паролем для всіх користувачів!"
#: openidadminpanel.php:278
msgid "Save OpenID settings"
@@ -277,68 +277,102 @@ msgstr ""
"OpenID-провайдера, просто натисніть кнопку внизу."
#. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:218
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Вхід на сайт"
#. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:221
msgctxt "MENU"
msgid "Login"
msgstr "Увійти"
#. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:234
+#: OpenIDPlugin.php:226
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Допоможіть!"
#. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:237
+#: OpenIDPlugin.php:229
msgctxt "MENU"
msgid "Help"
msgstr "Довідка"
#. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:243
+#: OpenIDPlugin.php:235
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:246
+#: OpenIDPlugin.php:238
msgctxt "MENU"
msgid "Search"
msgstr "Пошук"
#. TRANS: OpenID plugin menu item on site logon page.
#. TRANS: OpenID plugin menu item on user settings page.
-#: OpenIDPlugin.php:306 OpenIDPlugin.php:344
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
msgctxt "MENU"
msgid "OpenID"
msgstr "OpenID"
#. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:308
+#: OpenIDPlugin.php:297
msgid "Login or register with OpenID"
msgstr "Увійти або зареєструватися за допомогою OpenID"
#. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:346
+#: OpenIDPlugin.php:333
msgid "Add or remove OpenIDs"
msgstr "Додати або видалити OpenID"
-#: OpenIDPlugin.php:629
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
msgid "OpenID configuration"
msgstr "Конфігурація OpenID"
#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:631
msgid "Use OpenID to login to the site."
msgstr ""
"Використання OpenID для входу на сайт."
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продовжити"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr "Вхід з OpenID"
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr "OpenID-провайдер"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Введіть ім’я користувача."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Вас буде перенаправлено на веб-сторінку провайдера для автентифікації."
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr "URL вашого OpenID"
+
#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
#: openidserver.php:116
#, php-format
@@ -529,28 +563,6 @@ msgstr "Увійти з [OpenID](%%doc.openid%%)."
msgid "OpenID Login"
msgstr "Вхід з OpenID"
-#. TRANS: OpenID plugin logon form legend.
-#: openidlogin.php:140
-msgid "OpenID login"
-msgstr "Вхід з OpenID"
-
-#: openidlogin.php:148
-msgid "OpenID provider"
-msgstr "OpenID-провайдер"
-
-#: openidlogin.php:156
-msgid "Enter your username."
-msgstr "Введіть ім’я користувача."
-
-#: openidlogin.php:157
-msgid "You will be sent to the provider's site for authentication."
-msgstr "Вас буде перенаправлено на веб-сторінку провайдера для автентифікації."
-
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr "URL вашого OpenID"
-
#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
#: openidlogin.php:169
msgid "Remember me"
diff --git a/plugins/OpenID/openidadminpanel.php b/plugins/OpenID/openidadminpanel.php
index ce4806cc89..38df183fef 100644
--- a/plugins/OpenID/openidadminpanel.php
+++ b/plugins/OpenID/openidadminpanel.php
@@ -257,7 +257,7 @@ class OpenIDAdminPanelForm extends AdminForm
$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!'),
+ _m('Require all users to login via OpenID. Warning: disables password authentication for all users!'),
'true'
);
$this->unli();
diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 59485f25d8..5d3bb2306c 100644
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -75,11 +75,26 @@ if (!defined('STATUSNET')) {
*
* @seeAlso UAPPlugin
*/
-
class OpenXPlugin extends UAPPlugin
{
public $adScript = null;
+ function initialize()
+ {
+ parent::initialize();
+
+ // A little bit of chicanery so we avoid overwriting values that
+ // are passed in with the constructor
+ foreach (array('mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper', 'adScript') as $setting) {
+ $value = common_config('openx', $setting);
+ if (!empty($value)) { // not found
+ $this->$setting = $value;
+ }
+ }
+
+ return true;
+ }
+
/**
* Show a medium rectangle 'ad'
*
@@ -87,7 +102,6 @@ class OpenXPlugin extends UAPPlugin
*
* @return void
*/
-
protected function showMediumRectangle($action)
{
$this->showAd($action, $this->mediumRectangle);
@@ -100,7 +114,6 @@ class OpenXPlugin extends UAPPlugin
*
* @return void
*/
-
protected function showRectangle($action)
{
$this->showAd($action, $this->rectangle);
@@ -113,7 +126,6 @@ class OpenXPlugin extends UAPPlugin
*
* @return void
*/
-
protected function showWideSkyscraper($action)
{
$this->showAd($action, $this->wideSkyscraper);
@@ -126,7 +138,6 @@ class OpenXPlugin extends UAPPlugin
*
* @return void
*/
-
protected function showLeaderboard($action)
{
$this->showAd($action, $this->leaderboard);
@@ -140,7 +151,6 @@ class OpenXPlugin extends UAPPlugin
*
* @return void
*/
-
protected function showAd($action, $zone)
{
$scr = <<inlineScript(sprintf($scr, $this->adScript, $zone));
return true;
}
-}
\ No newline at end of file
+
+ function onRouterInitialized($m)
+ {
+ $m->connect('admin/openx',
+ array('action' => 'openxadminpanel'));
+
+ return true;
+ }
+
+ function onAutoload($cls)
+ {
+ $dir = dirname(__FILE__);
+
+ switch ($cls)
+ {
+ case 'OpenxadminpanelAction':
+ require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ function onEndAdminPanelNav($menu) {
+ if (AdminPanelAction::canAdmin('openx')) {
+ // TRANS: Menu item title/tooltip
+ $menu_title = _m('OpenX configuration');
+ // TRANS: Menu item for site administration
+ $menu->out->menuItem(common_local_url('openxadminpanel'), _m('OpenX'),
+ $menu_title, $action_name == 'openxadminpanel', 'nav_openx_admin_panel');
+ }
+ return true;
+ }
+
+ /**
+ * Add our version information to output
+ *
+ * @param array &$versions Array of version-data arrays
+ *
+ * @return boolean hook value
+ */
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'OpenX',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Evan Prodromou',
+ 'homepage' => 'http://status.net/wiki/Plugin:OpenX',
+ 'rawdescription' =>
+ // TRANS: Plugin description.
+ _m('Plugin for OpenX Ad Server .'));
+ return true;
+ }
+}
diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot
new file mode 100644
index 0000000000..c8651de3df
--- /dev/null
+++ b/plugins/OpenX/locale/OpenX.pot
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Menu item title/tooltip
+#: OpenXPlugin.php:201
+msgid "OpenX configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: OpenXPlugin.php:203
+msgid "OpenX"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OpenXPlugin.php:224
+msgid "Plugin for OpenX Ad Server ."
+msgstr ""
+
+#. TRANS: Page title for OpenX admin panel.
+#: openxadminpanel.php:53
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr ""
+
+#. TRANS: Instructions for OpenX admin panel.
+#: openxadminpanel.php:64
+msgid "OpenX settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel.
+#: openxadminpanel.php:167
+msgid "Ad script URL"
+msgstr ""
+
+#. TRANS: Tooltip for form label in OpenX admin panel.
+#: openxadminpanel.php:169
+msgid "Script URL"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:175
+msgid "Medium rectangle"
+msgstr ""
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:177
+msgid "Medium rectangle zone"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:183
+msgid "Rectangle"
+msgstr ""
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:185
+msgid "Rectangle zone"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:191
+msgid "Leaderboard"
+msgstr ""
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:193
+msgid "Leaderboard zone"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:199
+msgid "Skyscraper"
+msgstr ""
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+#: openxadminpanel.php:201
+msgid "Wide skyscraper zone"
+msgstr ""
+
+#. TRANS: Submit button text in OpenX admin panel.
+#: openxadminpanel.php:216
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: Submit button title in OpenX admin panel.
+#: openxadminpanel.php:220
+msgid "Save OpenX settings"
+msgstr ""
diff --git a/plugins/OpenX/openxadminpanel.php b/plugins/OpenX/openxadminpanel.php
new file mode 100644
index 0000000000..0bd09c70a4
--- /dev/null
+++ b/plugins/OpenX/openxadminpanel.php
@@ -0,0 +1,222 @@
+.
+ *
+ * @category OpenX
+ * @package StatusNet
+ * @author Evan Prodromou
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Administer openx settings
+ *
+ * @category OpenX
+ * @package StatusNet
+ * @author Evan Prodromou
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+class OpenXadminpanelAction extends AdminPanelAction
+{
+ /**
+ * Returns the page title
+ *
+ * @return string page title
+ */
+ function title()
+ {
+ // TRANS: Page title for OpenX admin panel.
+ return _m('TITLE', 'OpenX');
+ }
+
+ /**
+ * Instructions for using this form.
+ *
+ * @return string instructions
+ */
+ function getInstructions()
+ {
+ // TRANS: Instructions for OpenX admin panel.
+ return _m('OpenX settings for this StatusNet site');
+ }
+
+ /**
+ * Show the site admin panel form
+ *
+ * @return void
+ */
+ function showForm()
+ {
+ $form = new OpenXAdminPanelForm($this);
+ $form->show();
+ return;
+ }
+
+ /**
+ * Save settings from the form
+ *
+ * @return void
+ */
+ function saveSettings()
+ {
+ static $settings = array('openx' => array('adScript', 'mediumRectangle', 'rectangle', 'leaderboard', 'wideSkyscraper'));
+
+ $values = array();
+
+ foreach ($settings as $section => $parts) {
+ foreach ($parts as $setting) {
+ $values[$section][$setting] = $this->trimmed($setting);
+ }
+ }
+
+ // 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]);
+ }
+ }
+
+ $config->query('COMMIT');
+
+ return;
+ }
+
+ function validate(&$values)
+ {
+ }
+}
+
+/**
+ * Form for the openx admin panel
+ */
+class OpenXAdminPanelForm extends AdminForm
+{
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+ function id()
+ {
+ return 'form_openx_admin_panel';
+ }
+
+ /**
+ * class of the form
+ *
+ * @return string class of the form
+ */
+ function formClass()
+ {
+ return 'form_openx';
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+ function action()
+ {
+ return common_local_url('openxadminpanel');
+ }
+
+ /**
+ * Data elements of the form
+ *
+ * @return void
+ */
+ function formData()
+ {
+ $this->out->elementStart('fieldset', array('id' => 'openx_admin'));
+ $this->out->elementStart('ul', 'form_data');
+ $this->li();
+ $this->input('adScript',
+ // TRANS: Form label in OpenX admin panel.
+ _m('Ad script URL'),
+ // TRANS: Tooltip for form label in OpenX admin panel.
+ _m('Script URL'),
+ 'openx');
+ $this->unli();
+ $this->li();
+ $this->input('mediumRectangle',
+ // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+ _m('Medium rectangle'),
+ // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+ _m('Medium rectangle zone'),
+ 'openx');
+ $this->unli();
+ $this->li();
+ $this->input('rectangle',
+ // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+ _m('Rectangle'),
+ // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+ _m('Rectangle zone'),
+ 'openx');
+ $this->unli();
+ $this->li();
+ $this->input('leaderboard',
+ // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+ _m('Leaderboard'),
+ // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+ _m('Leaderboard zone'),
+ 'openx');
+ $this->unli();
+ $this->li();
+ $this->input('wideSkyscraper',
+ // TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+ _m('Skyscraper'),
+ // TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+ _m('Wide skyscraper zone'),
+ 'openx');
+ $this->unli();
+ $this->out->elementEnd('ul');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+ function formActions()
+ {
+ $this->out->submit('submit',
+ // TRANS: Submit button text in OpenX admin panel.
+ _m('BUTTON','Save'),
+ 'submit',
+ null,
+ // TRANS: Submit button title in OpenX admin panel.
+ _m('Save OpenX settings'));
+ }
+}
diff --git a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
new file mode 100644
index 0000000000..a9c906fe29
--- /dev/null
+++ b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - PiwikAnalytics to Norwegian (bokmål) (Norsk (bokmål))
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PiwikAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:42+0000\n"
+"Language-Team: Norwegian (bokmål) \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:37+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PiwikAnalyticsPlugin.php:105
+msgid ""
+"Use Piwik Open Source web analytics "
+"software."
+msgstr ""
+"Bruk Piwik , en nettanalyseprogramvare med "
+"åpen kildekode."
diff --git a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
new file mode 100644
index 0000000000..608b871ef4
--- /dev/null
+++ b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - PostDebug to Norwegian (bokmål) (Norsk (bokmål))
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PostDebug\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:42+0000\n"
+"Language-Team: Norwegian (bokmål) \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:38+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: #out-statusnet-plugin-postdebug\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PostDebugPlugin.php:58
+msgid "Debugging tool to record request details on POST."
+msgstr "Feilsøkingsverktøy for å registrere forspørselsdetaljer om POST."
diff --git a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
index 7d6bdd6ad1..54573ebc90 100644
--- a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:17+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:43+0000\n"
"Language-Team: Breton \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-09 14:36:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
@@ -25,7 +25,7 @@ msgstr ""
#: PoweredByStatusNetPlugin.php:51
#, php-format
msgid "powered by %s"
-msgstr "savet gant %s"
+msgstr "enlusket gant %s"
#: PoweredByStatusNetPlugin.php:53
msgid "StatusNet"
@@ -36,3 +36,5 @@ msgid ""
"Outputs \"powered by StatusNet \" after "
"site name."
msgstr ""
+"Diskwel \"enlusket gant StatusNet \" goude "
+"anv al lec'hienn."
diff --git a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 0000000000..a1816fd70a
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - PoweredByStatusNet to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:43+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:48+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
+#: PoweredByStatusNetPlugin.php:51
+#, php-format
+msgid "powered by %s"
+msgstr "bereitgestellt von %s"
+
+#: PoweredByStatusNetPlugin.php:53
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: PoweredByStatusNetPlugin.php:66
+msgid ""
+"Outputs \"powered by StatusNet \" after "
+"site name."
+msgstr ""
+"Fügt „bereitgestellt von StatusNet “ "
+"hinter dem Seitennamen ein."
diff --git a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..87632e46f2
--- /dev/null
+++ b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - PtitUrl to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Fulup
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:44+0000\n"
+"Language-Team: Breton \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:49+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-ptiturl\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: PtitUrlPlugin.php:67
+#, php-format
+msgid "Uses %1$s URL-shortener service."
+msgstr ""
+"Ober a ra gant ar servij krennañ URL %1$s ."
diff --git a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..8698b2062c
--- /dev/null
+++ b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - PtitUrl to Portuguese (Português)
+# Expored from translatewiki.net
+#
+# Author: GTNS
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:50+0000\n"
+"Language-Team: Portuguese \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-18 20:30:53+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-ptiturl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PtitUrlPlugin.php:67
+#, php-format
+msgid "Uses %1$s URL-shortener service."
+msgstr "Usa o serviço de abreviação de URLs %1$s ."
diff --git a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..014c42ffcb
--- /dev/null
+++ b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - PtitUrl to Brazilian Portuguese (Português do Brasil)
+# Expored from translatewiki.net
+#
+# Author: Giro720
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:44+0000\n"
+"Language-Team: Brazilian Portuguese \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:49+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt-br\n"
+"X-Message-Group: #out-statusnet-plugin-ptiturl\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: PtitUrlPlugin.php:67
+#, php-format
+msgid "Uses %1$s URL-shortener service."
+msgstr ""
+"Utiliza o serviço de encurtamento de URL %1$s "
diff --git a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..8023b66026
--- /dev/null
+++ b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Recaptcha to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: Apmon
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:45+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:50+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr "Captcha"
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr "Captcha stimmt nicht mit Text überein!"
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses Recaptcha service to add a "
+"captcha to the registration page."
+msgstr ""
+"Verwendet Recaptcha um ein CAPTCHA zur "
+"Registrierung hinzuzufügen."
diff --git a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..068fa48556
--- /dev/null
+++ b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Recaptcha to Portuguese (Português)
+# Expored from translatewiki.net
+#
+# Author: GTNS
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:51+0000\n"
+"Language-Team: Portuguese \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-18 20:30:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr "Imagem de verificação"
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr "A imagem de verificação não corresponde!"
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses Recaptcha service to add a "
+"captcha to the registration page."
+msgstr ""
+"Usa o serviço Recaptcha para adicionar "
+"uma imagem de verificação à página de registo."
diff --git a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..62ad486e59
--- /dev/null
+++ b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - Recaptcha to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Eleferen
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:45+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:50+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr "Капча"
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr "Код проверки не совпадает!"
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses Recaptcha service to add a "
+"captcha to the registration page."
+msgstr ""
+"Добавляет на страницу регистрации каптчу с использованием Recaptcha ."
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index b6e9a90265..0078d3c600 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -57,6 +57,19 @@ class RegisterThrottlePlugin extends Plugin
86400 => 5, // per day
3600 => 3); // per hour
+ /**
+ * Disallow registration if a silenced user has registered from
+ * this IP address.
+ */
+
+ public $silenced = true;
+
+ /**
+ * Whether we're enabled; prevents recursion.
+ */
+
+ static private $enabled = true;
+
/**
* Database schema setup
*
@@ -138,6 +151,18 @@ class RegisterThrottlePlugin extends Plugin
}
}
+ // Check for silenced users
+
+ if ($this->silenced) {
+ $ids = Registration_ip::usersByIP($ipaddress);
+ foreach ($ids as $id) {
+ $profile = Profile::staticGet('id', $id);
+ if ($profile && $profile->isSilenced()) {
+ throw new Exception(_m("A banned user has registered from this address."));
+ }
+ }
+ }
+
return true;
}
@@ -245,4 +270,59 @@ class RegisterThrottlePlugin extends Plugin
return null;
}
}
+
+ /**
+ * When silencing a user, silence all other users registered from that IP
+ * address.
+ *
+ * @param Profile $profile Person getting a new role
+ * @param string $role Role being assigned like 'moderator' or 'silenced'
+ *
+ * @return boolean hook value
+ */
+
+ function onEndGrantRole($profile, $role)
+ {
+ if (!self::$enabled) {
+ return true;
+ }
+
+ if ($role != Profile_role::SILENCED) {
+ return true;
+ }
+
+ if (!$this->silenced) {
+ return true;
+ }
+
+ $ri = Registration_ip::staticGet('user_id', $profile->id);
+
+ if (empty($ri)) {
+ return true;
+ }
+
+ $ids = Registration_ip::usersByIP($ri->ipaddress);
+
+ foreach ($ids as $id) {
+
+ if ($id == $profile->id) {
+ continue;
+ }
+
+ $other = Profile::staticGet('id', $id);
+
+ if (empty($other)) {
+ continue;
+ }
+
+ if ($other->isSilenced()) {
+ continue;
+ }
+
+ $old = self::$enabled;
+ self::$enabled = false;
+ $other->silence();
+ self::$enabled = $old;
+ }
+ }
}
diff --git a/plugins/RegisterThrottle/Registration_ip.php b/plugins/RegisterThrottle/Registration_ip.php
index 5c7396b9b0..2486e36b46 100644
--- a/plugins/RegisterThrottle/Registration_ip.php
+++ b/plugins/RegisterThrottle/Registration_ip.php
@@ -111,8 +111,33 @@ class Registration_ip extends Memcached_DataObject
*
* @return array magic three-false array that stops auto-incrementing.
*/
+
function sequenceKey()
{
return array(false, false, false);
}
+
+ /**
+ * Get the users who've registered with this ip address.
+ *
+ * @param Array $ipaddress IP address to check for
+ *
+ * @return Array IDs of users who registered with this address.
+ */
+
+ static function usersByIP($ipaddress)
+ {
+ $ids = array();
+
+ $ri = new Registration_ip();
+ $ri->ipaddress = $ipaddress;
+
+ if ($ri->find()) {
+ while ($ri->fetch()) {
+ $ids[] = $ri->user_id;
+ }
+ }
+
+ return $ids;
+ }
}
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index 6c66ccfca1..0e38e92903 100644
--- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,18 +16,22 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr ""
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr ""
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr ""
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr ""
diff --git a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
new file mode 100644
index 0000000000..04666cd3bd
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - RegisterThrottle to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RegisterThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+msgid "Cannot find IP address."
+msgstr "Kann IP-Addresse nicht finden."
+
+#: RegisterThrottlePlugin.php:149
+msgid "Too many registrations. Take a break and try again later."
+msgstr ""
+"Zu viele Registrierungen. Mach eine Pause and versuche es später noch einmal."
+
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
+msgid "Cannot find user after successful registration."
+msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
+
+#: RegisterThrottlePlugin.php:224
+msgid "Throttles excessive registration from a single IP address."
+msgstr "Drosselt exzessive Registrierungen einer einzelnen IP-Adresse."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index 16b8e1e5a6..ac8949dfd6 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -10,32 +10,36 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Impossible de trouver l’adresse IP."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr ""
"Inscriptions trop nombreuses. Faites une pause et essayez à nouveau plus "
"tard."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr "Évite les inscriptions excessives depuis une même adresse IP."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index 14053a82d2..42fdac46a5 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -9,30 +9,34 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Non pote trovar adresse IP."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr "Troppo de registrationes. Face un pausa e reproba plus tarde."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Non pote trovar usator post registration succedite."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr "Inhibi le creation de contos excessive ab un sol adresse IP."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index de54757dc1..eda82abc51 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -9,30 +9,34 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Не можам да ја пронајдам IP-адресата."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr "Премногу регистрации. Направете пауза и обидете се подоцна."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr "Истиснува прекумерни регистрации од една IP-адреса."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index 7d1a7c593a..59f2f8c496 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -10,30 +10,34 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Het IP-adres kon niet gevonden worden."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr "Te veel registraties. Wacht even en probeer het later opnieuw."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr "Beperkt excessieve aantallen registraties vanaf één IP-adres."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index 8826451a8e..2cca3ee827 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -9,31 +9,35 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Hindi matagpuan ang tirahan ng IP."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr "Napakaraming mga pagpapatala. Magpahinga muna at subukan uli mamaya."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr ""
"Naglilipat-lipat ng labis na pagpapatala mula sa isang nag-iisang tirahan ng "
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 03ddc80e14..83d0b3c44a 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -9,31 +9,35 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RegisterThrottle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:05:52+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-01 20:39:03+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:30:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-#: RegisterThrottlePlugin.php:121 RegisterThrottlePlugin.php:160
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
msgid "Cannot find IP address."
msgstr "Не вдається знайти IP-адресу."
-#: RegisterThrottlePlugin.php:136
+#: RegisterThrottlePlugin.php:149
msgid "Too many registrations. Take a break and try again later."
msgstr "Забагато реєстрацій. Випийте поки що кави і повертайтесь пізніше."
-#: RegisterThrottlePlugin.php:166
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
msgid "Cannot find user after successful registration."
msgstr "Не вдається знайти користувача після успішної реєстрації."
-#: RegisterThrottlePlugin.php:199
+#: RegisterThrottlePlugin.php:224
msgid "Throttles excessive registration from a single IP address."
msgstr "Цей додаток обмежує кількість реєстрацій з певної IP-адреси."
diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 719dba89cd..6c0ef37d51 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -2,7 +2,8 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Plugin that requires the user to have a validated email address before they can post notices
+ * Plugin that requires the user to have a validated email address before they
+ * can post notices
*
* PHP version 5
*
@@ -32,44 +33,64 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
+/**
+ * Plugin for requiring a validated email before posting.
+ *
+ * Enable this plugin using addPlugin('RequireValidatedEmail');
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews
+ * @author Brion Vibber
+ * @author Evan Prodromou
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @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/
+ */
+
class RequireValidatedEmailPlugin extends Plugin
{
- // Users created before this time will be grandfathered in
- // without the validation requirement.
- public $grandfatherCutoff=null;
+ /**
+ * Users created before this time will be grandfathered in
+ * without the validation requirement.
+ */
- // If OpenID plugin is installed, users with a verified OpenID
- // association whose provider URL matches one of these regexes
- // will be considered to be sufficiently valid for our needs.
- //
- // For example, to trust WikiHow and Wikipedia OpenID users:
- //
- // addPlugin('RequireValidatedEmailPlugin', array(
- // 'trustedOpenIDs' => array(
- // '!^http://\w+\.wikihow\.com/!',
- // '!^http://\w+\.wikipedia\.org/!',
- // ),
- // ));
- public $trustedOpenIDs=array();
+ public $grandfatherCutoff = null;
- function __construct()
- {
- parent::__construct();
- }
+ /**
+ * If OpenID plugin is installed, users with a verified OpenID
+ * association whose provider URL matches one of these regexes
+ * will be considered to be sufficiently valid for our needs.
+ *
+ * For example, to trust WikiHow and Wikipedia OpenID users:
+ *
+ * addPlugin('RequireValidatedEmailPlugin', array(
+ * 'trustedOpenIDs' => array(
+ * '!^http://\w+\.wikihow\.com/!',
+ * '!^http://\w+\.wikipedia\.org/!',
+ * ),
+ * ));
+ */
+
+ public $trustedOpenIDs = array();
/**
* Event handler for notice saves; rejects the notice
* if user's address isn't validated.
*
- * @param Notice $notice
+ * @param Notice $notice The notice being saved
+ *
* @return bool hook result code
*/
+
function onStartNoticeSave($notice)
{
$user = User::staticGet('id', $notice->profile_id);
if (!empty($user)) { // it's a remote notice
if (!$this->validated($user)) {
- throw new ClientException(_m("You must validate your email address before posting."));
+ $msg = _m("You must validate your email address before posting.");
+ throw new ClientException($msg);
}
}
return true;
@@ -79,7 +100,8 @@ class RequireValidatedEmailPlugin extends Plugin
* Event handler for registration attempts; rejects the registration
* if email field is missing.
*
- * @param RegisterAction $action
+ * @param Action $action Action being executed
+ *
* @return bool hook result code
*/
function onStartRegistrationTry($action)
@@ -100,7 +122,8 @@ class RequireValidatedEmailPlugin extends Plugin
* Check if a user has a validated email address or has been
* otherwise grandfathered in.
*
- * @param User $user
+ * @param User $user User to valide
+ *
* @return bool
*/
protected function validated($user)
@@ -108,12 +131,16 @@ class RequireValidatedEmailPlugin extends Plugin
// The email field is only stored after validation...
// Until then you'll find them in confirm_address.
$knownGood = !empty($user->email) ||
- $this->grandfathered($user) ||
- $this->hasTrustedOpenID($user);
+ $this->grandfathered($user) ||
+ $this->hasTrustedOpenID($user);
// Give other plugins a chance to override, if they can validate
// that somebody's ok despite a non-validated email.
- Event::handle('RequireValidatedEmailPlugin_Override', array($user, &$knownGood));
+
+ // FIXME: This isn't how to do it! Use Start*/End* instead
+
+ Event::handle('RequireValidatedEmailPlugin_Override',
+ array($user, &$knownGood));
return $knownGood;
}
@@ -122,14 +149,15 @@ class RequireValidatedEmailPlugin extends Plugin
* Check if a user was created before the grandfathering cutoff.
* If so, we won't need to check for validation.
*
- * @param User $user
- * @return bool
+ * @param User $user User to check
+ *
+ * @return bool true if user is grandfathered
*/
protected function grandfathered($user)
{
if ($this->grandfatherCutoff) {
$created = strtotime($user->created . " GMT");
- $cutoff = strtotime($this->grandfatherCutoff);
+ $cutoff = strtotime($this->grandfatherCutoff);
if ($created < $cutoff) {
return true;
}
@@ -141,13 +169,20 @@ class RequireValidatedEmailPlugin extends Plugin
* Override for RequireValidatedEmail plugin. If we have a user who's
* not validated an e-mail, but did come from a trusted provider,
* we'll consider them ok.
+ *
+ * @param User $user User to check
+ *
+ * @return bool true if user has a trusted OpenID.
*/
+
function hasTrustedOpenID($user)
{
if ($this->trustedOpenIDs && class_exists('User_openid')) {
foreach ($this->trustedOpenIDs as $regex) {
$oid = new User_openid();
+
$oid->user_id = $user->id;
+
$oid->find();
while ($oid->fetch()) {
if (preg_match($regex, $oid->canonical)) {
@@ -159,14 +194,45 @@ class RequireValidatedEmailPlugin extends Plugin
return false;
}
+ /**
+ * Add version information for this plugin.
+ *
+ * @param array &$versions Array of associative arrays of version data
+ *
+ * @return boolean hook value
+ */
+
function onPluginVersion(&$versions)
{
- $versions[] = array('name' => 'Require Validated Email',
- 'version' => STATUSNET_VERSION,
- 'author' => 'Craig Andrews, Evan Prodromou, Brion Vibber',
- 'homepage' => 'http://status.net/wiki/Plugin:RequireValidatedEmail',
- 'rawdescription' =>
- _m('The Require Validated Email plugin disables posting for accounts that do not have a validated email address.'));
+ $versions[] =
+ array('name' => 'Require Validated Email',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Craig Andrews, '.
+ 'Evan Prodromou, '.
+ 'Brion Vibber',
+ 'homepage' =>
+ 'http://status.net/wiki/Plugin:RequireValidatedEmail',
+ 'rawdescription' =>
+ _m('Disables posting without a validated email address.'));
+ return true;
+ }
+
+ /**
+ * Hide the notice form if the user isn't able to post.
+ *
+ * @param Action $action action being shown
+ *
+ * @return boolean hook value
+ */
+
+ function onStartShowNoticeForm($action)
+ {
+ $user = common_current_user();
+ if (!empty($user)) { // it's a remote notice
+ if (!$this->validated($user)) {
+ return false;
+ }
+ }
return true;
}
}
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index dde5480bdb..8594cc6eb6 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,16 +16,14 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr ""
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr ""
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..f23aa3100c
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - RequireValidatedEmail to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:04:15+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-18 20:33:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RequireValidatedEmailPlugin.php:92
+msgid "You must validate your email address before posting."
+msgstr "Du musst deine E-Mail-Adresse validieren, bevor du beitragen kannst."
+
+#: RequireValidatedEmailPlugin.php:112
+msgid "You must provide an email address to register."
+msgstr "Du musst eine E-Mail-Adresse angeben, um dich zu registrieren."
+
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
+msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index 3925c5d4ad..1c66594be3 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,30 +9,27 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-20 17:39+0000\n"
+"PO-Revision-Date: 2010-10-20 17:42:37+0000\n"
"Language-Team: French \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 01:18:32+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75070); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr "Vous devez valider votre adresse électronique avant de poster."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "Vous devez fournir une adresse électronique avant de vous enregistrer."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
msgstr ""
-"L’extension Require Validated Email désactive le postage pour les comptes "
-"qui n’ont pas d’adresse électronique valide."
+"Désactive le postage pour ceux qui n’ont pas d’adresse électronique valide."
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index f208b8c777..e44edbbc2b 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,30 +9,26 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:19+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:04:15+0000\n"
"Language-Team: Interlingua \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr "Tu debe validar tu adresse de e-mail ante de publicar."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "Tu debe fornir un adresse de e-mail pro poter crear un conto."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
-msgstr ""
-"Le plug-in \"Require Validated Email\" disactiva le publication pro contos "
-"que non ha un adresse de e-mail validate."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
+msgstr "Disactiva le publication de messages sin adresse de e-mail validate."
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index 9347f8d447..02dcce4b20 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,32 +9,28 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:20+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:04:15+0000\n"
"Language-Team: Macedonian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr ""
"Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштенска "
"адреса."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "За да се регистрирате, ќе мора да наведете е-поштенска адреса."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
-msgstr ""
-"Приклучокот Require Validated Email оневозможува објави од сметки што немаат "
-"потврдено е-поштенска адреса."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
+msgstr "Оневозможува објавување без потврдена е-пошта."
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index 64790f3365..be2c8c352e 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,30 +9,26 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:20+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:04:15+0000\n"
"Language-Team: Dutch \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr "U moet uw e-mailadres bevestigen voordat u berichten kunt plaatsen."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "U moet een e-mailadres opgeven om te kunnen registreren."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
-msgstr ""
-"De plug-in Require Validated Email staat het plaatsen van berichten alleen "
-"toe voor gebruikers met een bevestigd e-mailadres."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
+msgstr "Schakelt berichten plaatsen zonder gevalideerd e-mailadres uit."
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index da63cc8b46..dda7e4080c 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,31 +9,26 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:20+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:04:15+0000\n"
"Language-Team: Tagalog \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr "Kailangan patunayan mo ang iyong tirahan ng e-liham bago magpaskil."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "Dapat kang magbigay ng isang tirahan ng e-liham upang makapagpatala."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
msgstr ""
-"Ang pamasak na Kailanganin ang Pagpapatunay ng E-liham ay hindi nagpapagana "
-"ng pagpapaskil para sa mga akawnt na walang isang napatunayan tirahan ng e-"
-"liham."
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index d1f2b85a41..3a6f66b9cb 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,33 +9,31 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 19:53+0000\n"
-"PO-Revision-Date: 2010-10-03 19:57:20+0000\n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:21:44+0000\n"
"Language-Team: Ukrainian \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-09-27 23:21:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-19 23:49:58+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-#: RequireValidatedEmailPlugin.php:72
+#: RequireValidatedEmailPlugin.php:92
msgid "You must validate your email address before posting."
msgstr ""
"Ви повинні підтвердити свою адресу електронної пошти до того, як почнете "
"надсилати дописи поштою."
-#: RequireValidatedEmailPlugin.php:90
+#: RequireValidatedEmailPlugin.php:112
msgid "You must provide an email address to register."
msgstr "Ви повинні зазначити свою адресу електронної пошти для реєстрації."
-#: RequireValidatedEmailPlugin.php:169
-msgid ""
-"The Require Validated Email plugin disables posting for accounts that do not "
-"have a validated email address."
+#: RequireValidatedEmailPlugin.php:216
+msgid "Disables posting without a validated email address."
msgstr ""
-"Додаток Require Validated Email унеможливлює надсилання дописів поштою для "
-"тих акаунтів, що не мають підтверджених електронних адрес."
+"Забороняє надсилання дописів, якщо користувач не має підтвердженої "
+"електронної адреси."
diff --git a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
new file mode 100644
index 0000000000..442157fa27
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - ReverseUsernameAuthentication to Norwegian (bokmål) (Norsk (bokmål))
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:47+0000\n"
+"Language-Team: Norwegian (bokmål) \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:15+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ReverseUsernameAuthenticationPlugin.php:67
+msgid ""
+"The Reverse Username Authentication plugin allows for StatusNet to handle "
+"authentication by checking if the provided password is the same as the "
+"reverse of the username."
+msgstr ""
+"Utvidelsen Reverse Username Authentication gjør det mulig for StatusNet å "
+"håndtere autentisering ved å sjekke om det oppgitte passordet er det samme "
+"som brukernavnet baklengs."
diff --git a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
new file mode 100644
index 0000000000..c95c54853d
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - ReverseUsernameAuthentication to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Александр Сигачёв
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:48+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:15+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: ReverseUsernameAuthenticationPlugin.php:67
+msgid ""
+"The Reverse Username Authentication plugin allows for StatusNet to handle "
+"authentication by checking if the provided password is the same as the "
+"reverse of the username."
+msgstr ""
+"Плагин аутентификации по обратному имени пользователя позволяет StatusNet "
+"проводить проверку указанного пароля на соответствие обратному написанию "
+"имени пользователя."
diff --git a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..879c547d0a
--- /dev/null
+++ b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
@@ -0,0 +1,69 @@
+# Translation of StatusNet - Sample to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:50+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:36:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-sample\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:164
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Konnte neuen Grüßungszähler von %d nicht speichern."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:177
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr "Konnte Grüßungszähler von %d nicht erhöhen."
+
+#: SamplePlugin.php:259 hello.php:111
+msgid "Hello"
+msgstr "Hallo"
+
+#: SamplePlugin.php:259
+msgid "A warm greeting"
+msgstr "Ein herzlicher Gruß"
+
+#: SamplePlugin.php:270
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Ein Beispiel-Plugin, um die Entwicklungsbasis neuen Hackern zu zeigen."
+
+#: hello.php:113
+#, php-format
+msgid "Hello, %s!"
+msgstr "Hallo %s!"
+
+#: hello.php:133
+msgid "Hello, stranger!"
+msgstr "Hallo Fremder!"
+
+#: hello.php:136
+#, php-format
+msgid "Hello, %s"
+msgstr "Hallo %s"
+
+#: hello.php:138
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Ich habe dich einmal begrüßt. "
+msgstr[1] "Ich habe dich %d-mal begrüßt. "
diff --git a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..703f8b3175
--- /dev/null
+++ b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
@@ -0,0 +1,72 @@
+# Translation of StatusNet - Sample to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Eleferen
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-20 17:39+0000\n"
+"PO-Revision-Date: 2010-10-20 17:42:40+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-18 20:34:09+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75070); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-sample\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:164
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Не удалось сохранить новое приветствие для %d."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:177
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
+
+#: SamplePlugin.php:259 hello.php:111
+msgid "Hello"
+msgstr "Привет"
+
+#: SamplePlugin.php:259
+msgid "A warm greeting"
+msgstr ""
+
+#: SamplePlugin.php:270
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#: hello.php:113
+#, php-format
+msgid "Hello, %s!"
+msgstr "Здравствуйте, %s!"
+
+#: hello.php:133
+msgid "Hello, stranger!"
+msgstr "Привет, незнакомец!"
+
+#: hello.php:136
+#, php-format
+msgid "Hello, %s"
+msgstr "Здравствуйте,%s"
+
+#: hello.php:138
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Я вас попривестствовал %d раз."
+msgstr[1] "Я вас поприветствовал %d раза."
+msgstr[2] "Я вас попривестствовал %d раз."
diff --git a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..c759e8068a
--- /dev/null
+++ b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - ShareNotice to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:51+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:17+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Leave this message unchanged.
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
+#, php-format
+msgid "\"%s\""
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+#: ShareNoticePlugin.php:130
+msgid "Share on Twitter"
+msgstr "Auf Twitter teilen"
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#: ShareNoticePlugin.php:163
+#, php-format
+msgid "Share on %s"
+msgstr "Auf %s teilen"
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+#: ShareNoticePlugin.php:186
+msgid "Share on Facebook"
+msgstr "Auf Facebook teilen"
+
+#. TRANS: Plugin description.
+#: ShareNoticePlugin.php:219
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
+"Dieses Plugin erlaubt das Teilen von Nachrichten auf Twitter, Facebook und "
+"anderen Plattformen."
diff --git a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
new file mode 100644
index 0000000000..673a353409
--- /dev/null
+++ b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SimpleUrl to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Fulup
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SimpleUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:52+0000\n"
+"Language-Team: Breton \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:19+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-simpleurl\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: SimpleUrlPlugin.php:58
+#, php-format
+msgid "Uses %1$s URL-shortener service."
+msgstr ""
+"Ober a ra gant ar servij krennañ URL %1$s ."
diff --git a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
new file mode 100644
index 0000000000..07eb5a18b7
--- /dev/null
+++ b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - SimpleUrl to Portuguese (Português)
+# Expored from translatewiki.net
+#
+# Author: Hamilton Abreu
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SimpleUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:53+0000\n"
+"Language-Team: Portuguese \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:19+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-simpleurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SimpleUrlPlugin.php:58
+#, php-format
+msgid "Uses %1$s URL-shortener service."
+msgstr "Usa o serviço de abreviação de URLs %1$s ."
diff --git a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..787f831bb8
--- /dev/null
+++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - Sitemap to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Fulup
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:54+0000\n"
+"Language-Team: Breton \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:20+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-sitemap\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Title for sitemap.
+#: sitemapadminpanel.php:53
+msgid "Sitemap"
+msgstr ""
+
+#. TRANS: Instructions for sitemap.
+#: sitemapadminpanel.php:64
+msgid "Sitemap settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:167
+msgid "Google key"
+msgstr "Alc'hwez Google"
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:169
+msgid "Google Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:175
+msgid "Yahoo key"
+msgstr "Alc'hwez Yahoo"
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:177
+msgid "Yahoo! Site Explorer verification key."
+msgstr ""
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:183
+msgid "Bing key"
+msgstr ""
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:185
+msgid "Bing Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Submit button text to save sitemap settings.
+#: sitemapadminpanel.php:200
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
+
+#. TRANS: Submit button title to save sitemap settings.
+#: sitemapadminpanel.php:204
+msgid "Save sitemap settings."
+msgstr "Enrollañ arventennoù tres al lec'hienn"
+
+#. TRANS: Menu item title/tooltip
+#: SitemapPlugin.php:211
+msgid "Sitemap configuration"
+msgstr "Kefluniadur tres al lec'hienn"
+
+#. TRANS: Menu item for site administration
+#: SitemapPlugin.php:213
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Tres al lec'hienn"
+
+#. TRANS: Plugin description.
+#: SitemapPlugin.php:238
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
+"Gant an astenn-mañ e c'haller sevel tresoù lec'hiennoù evit Bing, Yahoo! ha "
+"Google."
diff --git a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..300222087c
--- /dev/null
+++ b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,90 @@
+# Translation of StatusNet - Sitemap to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:55+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:20+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-sitemap\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Title for sitemap.
+#: sitemapadminpanel.php:53
+msgid "Sitemap"
+msgstr "Карта сайта"
+
+#. TRANS: Instructions for sitemap.
+#: sitemapadminpanel.php:64
+msgid "Sitemap settings for this StatusNet site"
+msgstr "Настройки карты этого сайта на движке StatusNet"
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:167
+msgid "Google key"
+msgstr "Ключ Google"
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:169
+msgid "Google Webmaster Tools verification key."
+msgstr "Ключ для подтверждения в инструментах вебмастера Google."
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:175
+msgid "Yahoo key"
+msgstr "Ключ Yahoo"
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:177
+msgid "Yahoo! Site Explorer verification key."
+msgstr "Ключ для подтверждения в Yahoo! Site Explorer."
+
+#. TRANS: Field label.
+#: sitemapadminpanel.php:183
+msgid "Bing key"
+msgstr "Ключ Bing"
+
+#. TRANS: Title for field label.
+#: sitemapadminpanel.php:185
+msgid "Bing Webmaster Tools verification key."
+msgstr "Ключ для подтверждения в инструментах вебмастера Bing."
+
+#. TRANS: Submit button text to save sitemap settings.
+#: sitemapadminpanel.php:200
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Сохранить"
+
+#. TRANS: Submit button title to save sitemap settings.
+#: sitemapadminpanel.php:204
+msgid "Save sitemap settings."
+msgstr "Сохранить настройки карты сайта."
+
+#. TRANS: Menu item title/tooltip
+#: SitemapPlugin.php:211
+msgid "Sitemap configuration"
+msgstr "Настройки карты сайта"
+
+#. TRANS: Menu item for site administration
+#: SitemapPlugin.php:213
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Карта сайта"
+
+#. TRANS: Plugin description.
+#: SitemapPlugin.php:238
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr "Этот плагин позволяет создавать карты сайта для Bing, Yahoo! и Google."
diff --git a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
new file mode 100644
index 0000000000..6541ab1691
--- /dev/null
+++ b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - SphinxSearch to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SphinxSearch\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:56+0000\n"
+"Language-Team: Russian \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:22+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Server exception.
+#: SphinxSearchPlugin.php:87
+msgid "Sphinx PHP extension must be installed."
+msgstr "Необходимо установить расширение Sphinx для PHP."
+
+#. TRANS: Plugin description.
+#: SphinxSearchPlugin.php:118
+msgid "Plugin for Sphinx search backend."
+msgstr "Плагин для поискового движка Sphinx."
+
+#. TRANS: Server exception thrown when a database name cannot be identified.
+#: sphinxsearch.php:96
+msgid "Sphinx search could not identify database name."
+msgstr "Поиск Sphinx не смог определить название базы данных."
diff --git a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
new file mode 100644
index 0000000000..809dd6ae6c
--- /dev/null
+++ b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SubscriptionThrottle to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: The Evil IP address
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubscriptionThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:43:58+0000\n"
+"Language-Team: German \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:25+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SubscriptionThrottlePlugin.php:171
+msgid "Configurable limits for subscriptions and group memberships."
+msgstr "Konfigurierbare Limits für Abonnements und Gruppenmitgliedschaften."
diff --git a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
new file mode 100644
index 0000000000..abda0307b0
--- /dev/null
+++ b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - TabFocus to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TabFocus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:06:02+0000\n"
+"Language-Team: Galician \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-09 14:37:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-tabfocus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: TabFocusPlugin.php:54
+msgid ""
+"TabFocus changes the notice form behavior so that, while in the text area, "
+"pressing the tab key focuses the \"Send\" button, matching the behavior of "
+"Twitter."
+msgstr ""
+"TabFocus cambia o comportamento do formulario de notas de modo que, estando "
+"na zona de texto, ao premer a tecla de tabulación se enfoca o botón \"Enviar"
+"\", do mesmo xeito que o Twitter."
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
new file mode 100644
index 0000000000..b0a47ed161
--- /dev/null
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - TinyMCE to Esperanto (Esperanto)
+# Expored from translatewiki.net
+#
+# Author: Eliovir
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TinyMCE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:44:00+0000\n"
+"Language-Team: Esperanto