Commit cd8717ca authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into limitdist2

parents d69f912b 841a9130
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,7 @@
* @author Alan Knowles <alan@akbkhome.com>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @version CVS: $Id: Generator.php 289384 2009-10-09 00:17:26Z alan_k $
* @version CVS: $Id: Generator.php 298560 2010-04-25 23:01:51Z alan_k $
* @link http://pear.php.net/package/DB_DataObject
*/
......@@ -383,8 +383,8 @@ class DB_DataObject_Generator extends DB_DataObject
return false;
}
$__DB = &$GLOBALS['_DB_DATAOBJECT']['CONNECTIONS'][$this->_database_dsn_md5];
if (!in_array($__DB->phptype, array('mysql','mysqli'))) {
echo "WARNING: cant handle non-mysql introspection for defaults.";
if (!in_array($__DB->phptype, array('mysql', 'mysqli', 'pgsql'))) {
echo "WARNING: cant handle non-mysql and pgsql introspection for defaults.";
return; // cant handle non-mysql introspection for defaults.
}
......@@ -392,33 +392,72 @@ class DB_DataObject_Generator extends DB_DataObject
$fk = array();
foreach($this->tables as $this->table) {
$quotedTable = !empty($options['quote_identifiers_tableinfo']) ? $DB->quoteIdentifier($table) : $this->table;
$res =& $DB->query('SHOW CREATE TABLE ' . $quotedTable );
if (PEAR::isError($res)) {
die($res->getMessage());
}
switch ($DB->phptype) {
$text = $res->fetchRow(DB_FETCHMODE_DEFAULT, 0);
$treffer = array();
// Extract FOREIGN KEYS
preg_match_all(
"/FOREIGN KEY \(`(\w*)`\) REFERENCES `(\w*)` \(`(\w*)`\)/i",
$text[1],
$treffer,
PREG_SET_ORDER);
if (count($treffer) < 1) {
continue;
}
for ($i = 0; $i < count($treffer); $i++) {
$fk[$this->table][$treffer[$i][1]] = $treffer[$i][2] . ":" . $treffer[$i][3];
}
}
case 'pgsql':
foreach($this->tables as $this->table) {
$quotedTable = !empty($options['quote_identifiers_tableinfo']) ? $DB->quoteIdentifier($table) : $this->table;
$res =& $DB->query("SELECT
pg_catalog.pg_get_constraintdef(r.oid, true) AS condef
FROM pg_catalog.pg_constraint r,
pg_catalog.pg_class c
WHERE c.oid=r.conrelid
AND r.contype = 'f'
AND c.relname = '" . $quotedTable . "'");
if (PEAR::isError($res)) {
die($res->getMessage());
}
while ($row = $res->fetchRow(DB_FETCHMODE_ASSOC)) {
$treffer = array();
// this only picks up one of these.. see this for why: http://pear.php.net/bugs/bug.php?id=17049
preg_match(
"/FOREIGN KEY \((\w*)\) REFERENCES (\w*)\((\w*)\)/i",
$row['condef'],
$treffer);
if (!count($treffer)) {
continue;
}
$fk[$this->table][$treffer[1]] = $treffer[2] . ":" . $treffer[3];
}
}
break;
case 'mysql':
case 'mysqli':
default:
foreach($this->tables as $this->table) {
$quotedTable = !empty($options['quote_identifiers_tableinfo']) ? $DB->quoteIdentifier($table) : $this->table;
$res =& $DB->query('SHOW CREATE TABLE ' . $quotedTable );
if (PEAR::isError($res)) {
die($res->getMessage());
}
$text = $res->fetchRow(DB_FETCHMODE_DEFAULT, 0);
$treffer = array();
// Extract FOREIGN KEYS
preg_match_all(
"/FOREIGN KEY \(`(\w*)`\) REFERENCES `(\w*)` \(`(\w*)`\)/i",
$text[1],
$treffer,
PREG_SET_ORDER);
if (!count($treffer)) {
continue;
}
foreach($treffer as $i=> $tref) {
$fk[$this->table][$tref[1]] = $tref[2] . ":" . $tref[3];
}
}
}
$links_ini = "";
foreach($fk as $table => $details) {
......@@ -861,10 +900,8 @@ class DB_DataObject_Generator extends DB_DataObject
$body = "\n ###START_AUTOCODE\n";
$body .= " /* the code below is auto generated do not remove the above tag */\n\n";
// table
$padding = (30 - strlen($this->table));
$padding = ($padding < 2) ? 2 : $padding;
$p = str_repeat(' ',$padding) ;
$p = str_repeat(' ',max(2, (18 - strlen($this->table)))) ;
$options = &PEAR::getStaticProperty('DB_DataObject','options');
......@@ -887,6 +924,7 @@ class DB_DataObject_Generator extends DB_DataObject
// Only include the $_database property if the omit_database_var is unset or false
if (isset($options["database_{$this->_database}"]) && empty($GLOBALS['_DB_DATAOBJECT']['CONFIG']['generator_omit_database_var'])) {
$p = str_repeat(' ', max(2, (16 - strlen($this->table))));
$body .= " {$var} \$_database = '{$this->_database}'; {$p}// database name (used with database_{*} config)\n";
}
......@@ -900,6 +938,7 @@ class DB_DataObject_Generator extends DB_DataObject
// show nice information!
$connections = array();
$sets = array();
foreach($defs as $t) {
if (!strlen(trim($t->name))) {
continue;
......@@ -915,19 +954,18 @@ class DB_DataObject_Generator extends DB_DataObject
continue;
}
$padding = (30 - strlen($t->name));
if ($padding < 2) $padding =2;
$p = str_repeat(' ',$padding) ;
$p = str_repeat(' ',max(2, (30 - strlen($t->name))));
$length = empty($t->len) ? '' : '('.$t->len.')';
$body .=" {$var} \${$t->name}; {$p}// {$t->type}$length {$t->flags}\n";
// can not do set as PEAR::DB table info doesnt support it.
//if (substr($t->Type,0,3) == "set")
// $sets[$t->Field] = "array".substr($t->Type,3);
$body .= $this->derivedHookVar($t,$padding);
$body .= $this->derivedHookVar($t,strlen($p));
}
$body .= $this->derivedHookPostVar($defs);
// THIS IS TOTALLY BORKED old FC creation
// IT WILL BE REMOVED!!!!! in DataObjects 1.6
......@@ -1078,7 +1116,21 @@ class DB_DataObject_Generator extends DB_DataObject
// It MUST NOT be changed here!!!
return "";
}
/**
* hook for after var lines (
* called at the end of the output of var line have generated, override to add extra var
* lines
*
* @param array cols containing array of objects with type,len,flags etc. from tableInfo call
* @access public
* @return string added to class eg. functions.
*/
function derivedHookPostVar($t)
{
// This is so derived generator classes can generate variabels
// It MUST NOT be changed here!!!
return "";
}
/**
* hook to add extra page-level (in terms of phpDocumentor) DocBlock
*
......
This diff is collapsed.
This diff is collapsed.
......@@ -5,21 +5,15 @@
*
* PHP versions 4 and 5
*
* LICENSE: This source file is subject to version 3.0 of the PHP license
* that is available through the world-wide-web at the following URI:
* http://www.php.net/license/3_0.txt. If you did not receive a copy of
* the PHP License and are unable to obtain it through the web, please
* send a note to license@php.net so we can mail you a copy immediately.
*
* @category pear
* @package PEAR
* @author Tomas V. V. Cox <cox@idecnet.com>
* @author Hans Lellelid <hans@velum.net>
* @author Bertrand Mansion <bmansion@mamasam.com>
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2008 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version CVS: $Id: Exception.php,v 1.29 2008/01/03 20:26:35 cellog Exp $
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version CVS: $Id: Exception.php 307683 2011-01-23 21:56:12Z dufuz $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.3
*/
......@@ -93,9 +87,9 @@
* @author Hans Lellelid <hans@velum.net>
* @author Bertrand Mansion <bmansion@mamasam.com>
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2008 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version Release: 1.7.2
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version Release: 1.9.2
* @link http://pear.php.net/package/PEAR
* @since Class available since Release 1.3.3
*
......@@ -295,7 +289,7 @@ class PEAR_Exception extends Exception
}
public function getTraceSafe()
{
{
if (!isset($this->_trace)) {
$this->_trace = $this->getTrace();
if (empty($this->_trace)) {
......@@ -331,21 +325,21 @@ class PEAR_Exception extends Exception
$trace = $this->getTraceSafe();
$causes = array();
$this->getCauseMessage($causes);
$html = '<table border="1" cellspacing="0">' . "\n";
$html = '<table style="border: 1px" cellspacing="0">' . "\n";
foreach ($causes as $i => $cause) {
$html .= '<tr><td colspan="3" bgcolor="#ff9999">'
$html .= '<tr><td colspan="3" style="background: #ff9999">'
. str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
. htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
. 'on line <b>' . $cause['line'] . '</b>'
. "</td></tr>\n";
}
$html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
. '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
. '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
. '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
$html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
. '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
. '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
. '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
foreach ($trace as $k => $v) {
$html .= '<tr><td align="center">' . $k . '</td>'
$html .= '<tr><td style="text-align: center;">' . $k . '</td>'
. '<td>';
if (!empty($v['class'])) {
$html .= $v['class'] . $v['type'];
......@@ -373,7 +367,7 @@ class PEAR_Exception extends Exception
. ':' . (isset($v['line']) ? $v['line'] : 'unknown')
. '</td></tr>' . "\n";
}
$html .= '<tr><td align="center">' . ($k+1) . '</td>'
$html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
. '<td>{main}</td>'
. '<td>&nbsp;</td></tr>' . "\n"
. '</table>';
......@@ -392,6 +386,4 @@ class PEAR_Exception extends Exception
}
return $causeMsg . $this->getTraceAsString();
}
}
?>
\ No newline at end of file
}
\ No newline at end of file
<?php
/**
* This is only meant for PHP 5 to get rid of certain strict warning
* that doesn't get hidden since it's in the shutdown function
*/
class PEAR5
{
/**
* If you have a class that's mostly/entirely static, and you need static
* properties, you can use this method to simulate them. Eg. in your method(s)
* do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
* You MUST use a reference, or they will not persist!
*
* @access public
* @param string $class The calling classname, to prevent clashes
* @param string $var The variable to retrieve.
* @return mixed A reference to the variable. If not set it will be
* auto initialised to NULL.
*/
static function &getStaticProperty($class, $var)
{
static $properties;
if (!isset($properties[$class])) {
$properties[$class] = array();
}
if (!array_key_exists($var, $properties[$class])) {
$properties[$class][$var] = null;
}
return $properties[$class][$var];
}
}
\ No newline at end of file
This diff is collapsed.
......@@ -12,19 +12,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-24 11:10+0000\n"
"PO-Revision-Date: 2011-03-24 11:12:09+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:04:35+0000\n"
"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.18alpha (r84667); Translate extension (2011-03-11)\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
"X-POT-Import-Date: 2011-03-18 20:10:59+0000\n"
"X-POT-Import-Date: 2011-03-24 15:23:28+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
......@@ -1143,14 +1143,17 @@ msgid "Could not cancel request for user %1$s to join group %2$s."
msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
#. TRANS: Title for leave group page after group join request is approved/disapproved.
#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
#, fuzzy, php-format
msgctxt "TITLE"
msgid "%1$s's request for %2$s"
msgstr "حالة %1$s في يوم %2$s"
#. TRANS: Message on page for group admin after approving a join request.
msgid "Join request approved."
msgstr ""
#. TRANS: Message on page for group admin after rejecting a join request.
msgid "Join request canceled."
msgstr ""
......@@ -2959,15 +2962,15 @@ msgstr "لست عضوا في تلك المجموعة."
#. TRANS: User admin panel title
msgctxt "TITLE"
msgid "License"
msgstr ""
msgstr "الرخصة"
#. TRANS: Form instructions for the site license admin panel.
msgid "License for this StatusNet site"
msgstr ""
msgstr "رخصة موقع ستاتس نت هذا"
#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
msgid "Invalid license selection."
msgstr ""
msgstr "اختيار غير صالح للرخصة."
#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
msgid ""
......@@ -6757,7 +6760,8 @@ msgid "Block this user"
msgstr "امنع هذا المستخدم"
#. TRANS: Submit button text on form to cancel group join request.
msgid "BUTTON"
msgctxt "BUTTON"
msgid "Cancel join request"
msgstr ""
#. TRANS: Title for command results.
......@@ -7643,10 +7647,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "مصدر صندوق وارد غير معروف %d."
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
msgid "Leave"
msgstr "غادر"
......@@ -7918,7 +7918,7 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
#. TRANS: Main body of pending group join request notification e-mail.
#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to the moderation queue page.
#. TRANS: %4$s is the URL to the moderation queue page.
#, php-format
msgid ""
"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
......@@ -8291,7 +8291,7 @@ msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
msgid "Repeat this notice?"
msgstr "أأكرّر هذا الإشعار؟ّ"
msgstr "أأكرّر هذا الإشعار؟"
msgid "Yes"
msgstr "نعم"
......@@ -8326,7 +8326,7 @@ msgstr "الكلمات المفتاحية"
#. TRANS: Button text for searching site.
msgctxt "BUTTON"
msgid "Search"
msgstr ""
msgstr "ابحث"
msgid "People"
msgstr "أشخاص"
......@@ -8699,8 +8699,6 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
#~ msgid "Notice"
#~ msgstr "إشعارات"
#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
#, fuzzy
#~ msgid "Message too long - maximum is %1$d characters, you sent %2$d."
#~ msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
......@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-24 11:10+0000\n"
"PO-Revision-Date: 2011-03-24 11:12:10+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:04:36+0000\n"
"Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
"arz>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.18alpha (r84667); Translate extension (2011-03-11)\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-POT-Import-Date: 2011-03-18 20:10:59+0000\n"
"X-POT-Import-Date: 2011-03-24 15:23:28+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
......@@ -1163,14 +1163,17 @@ msgid "Could not cancel request for user %1$s to join group %2$s."
msgstr "ما نفعش يضم %1$s للجروپ %2$s."
#. TRANS: Title for leave group page after group join request is approved/disapproved.
#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
#, fuzzy, php-format
msgctxt "TITLE"
msgid "%1$s's request for %2$s"
msgstr "%1$s ساب جروپ %2$s"
#. TRANS: Message on page for group admin after approving a join request.
msgid "Join request approved."
msgstr ""
#. TRANS: Message on page for group admin after rejecting a join request.
msgid "Join request canceled."
msgstr ""
......@@ -6885,7 +6888,8 @@ msgid "Block this user"
msgstr "امنع هذا المستخدم"
#. TRANS: Submit button text on form to cancel group join request.
msgid "BUTTON"
msgctxt "BUTTON"
msgid "Cancel join request"
msgstr ""
#. TRANS: Title for command results.
......@@ -7779,10 +7783,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "مصدر الـinbox مش معروف %d."
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
msgid "Leave"
msgstr "غادر"
......@@ -8036,7 +8036,7 @@ msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
#. TRANS: Main body of pending group join request notification e-mail.
#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to the moderation queue page.
#. TRANS: %4$s is the URL to the moderation queue page.
#, php-format
msgid ""
"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
......@@ -8831,5 +8831,5 @@ msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
#~ msgid "Notice"
#~ msgstr "الإشعارات"
#~ msgid "Message too long - maximum is %1$d characters, you sent %2$d."
#~ msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
......@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-24 11:10+0000\n"
"PO-Revision-Date: 2011-03-24 11:12:12+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:04:37+0000\n"
"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.18alpha (r84667); Translate extension (2011-03-11)\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-POT-Import-Date: 2011-03-18 20:10:59+0000\n"
"X-POT-Import-Date: 2011-03-24 15:23:28+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
......@@ -1128,14 +1128,17 @@ msgid "Could not cancel request for user %1$s to join group %2$s."
msgstr "Грешка при обновяване на групата."
#. TRANS: Title for leave group page after group join request is approved/disapproved.
#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
#, fuzzy, php-format
msgctxt "TITLE"
msgid "%1$s's request for %2$s"
msgstr "Бележка на %1$s от %2$s"
#. TRANS: Message on page for group admin after approving a join request.
msgid "Join request approved."
msgstr ""
#. TRANS: Message on page for group admin after rejecting a join request.
msgid "Join request canceled."
msgstr ""
......@@ -6878,7 +6881,8 @@ msgid "Block this user"
msgstr "Блокиране на потребителя"
#. TRANS: Submit button text on form to cancel group join request.
msgid "BUTTON"
msgctxt "BUTTON"
msgid "Cancel join request"
msgstr ""
#. TRANS: Title for command results.
......@@ -7735,12 +7739,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "Непознат език \"%s\"."
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
"$d."
msgid "Leave"
msgstr "Напускане"
......@@ -8000,7 +7998,7 @@ msgstr "%1$s реплики на съобщения от %2$s / %3$s."
#. TRANS: Main body of pending group join request notification e-mail.
#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to the moderation queue page.
#. TRANS: %4$s is the URL to the moderation queue page.
#, php-format
msgid ""
"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
......@@ -8760,8 +8758,7 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
#~ msgid "Notice"
#~ msgstr "Бележки"
#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
#~ msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
#~ msgid "Message too long - maximum is %1$d characters, you sent %2$d."
#~ msgstr ""
#~ "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %"
#~ "2$d."
......@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-24 11:10+0000\n"
"PO-Revision-Date: 2011-03-24 11:12:14+0000\n"
"POT-Creation-Date: 2011-03-26 11:02+0000\n"
"PO-Revision-Date: 2011-03-26 11:04:38+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.18alpha (r84667); Translate extension (2011-03-11)\n"
"X-Generator: MediaWiki 1.18alpha (r84791); Translate extension (2011-03-11)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-POT-Import-Date: 2011-03-18 20:10:59+0000\n"
"X-POT-Import-Date: 2011-03-24 15:23:28+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
......@@ -1124,14 +1124,17 @@ msgid "Could not cancel request for user %1$s to join group %2$s."
msgstr "Dibosupl eo stagañ an implijer %1$s d'ar strollad %2$s."
#. TRANS: Title for leave group page after group join request is approved/disapproved.
#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
#, fuzzy, php-format
msgctxt "TITLE"
msgid "%1$s's request for %2$s"
msgstr "Statud %1$s war %2$s"
#. TRANS: Message on page for group admin after approving a join request.
msgid "Join request approved."
msgstr ""
#. TRANS: Message on page for group admin after rejecting a join request.
msgid "Join request canceled."
msgstr ""
......@@ -6778,7 +6781,8 @@ msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
#. TRANS: Submit button text on form to cancel group join request.
msgid "BUTTON"
msgctxt "BUTTON"
msgid "Cancel join request"
msgstr ""
#. TRANS: Title for command results.
......@@ -7634,12 +7638,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "Yezh \"%s\" dizanv."
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
"arouezenn ho peus lakaet."
msgid "Leave"
msgstr "Kuitaat"
......@@ -7893,7 +7891,7 @@ msgstr "%1$s a zo bet er strollad %2$s."
#. TRANS: Main body of pending group join request notification e-mail.
#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to the moderation queue page.
#. TRANS: %4$s is the URL to the moderation queue page.
#, php-format
msgid ""
"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
......@@ -8651,9 +8649,7 @@ msgstr ""
msgid "Getting backup from file '%s'."
msgstr ""
#, fuzzy
#~ msgid "Notice"