rfrisar at svn
Oct 9, 2007, 4:11 AM
Post #1 of 1
(338 views)
Permalink
|
|
SVN: [26539] branches/ApiEdit_Vodafone
|
|
Revision: 26539
Author: rfrisar
Date: 2007-10-09 11:11:15 +0000 (Tue, 09 Oct 2007)
Log Message:
-----------
Merged from trunk via svnmerge: 26293-26387
Modified Paths:
--------------
branches/ApiEdit_Vodafone/RELEASE-NOTES
branches/ApiEdit_Vodafone/includes/AuthPlugin.php
branches/ApiEdit_Vodafone/includes/AutoLoader.php
branches/ApiEdit_Vodafone/includes/JobQueue.php
branches/ApiEdit_Vodafone/includes/RecentChange.php
branches/ApiEdit_Vodafone/includes/User.php
branches/ApiEdit_Vodafone/includes/UserMailer.php
branches/ApiEdit_Vodafone/includes/api/ApiQueryRevisions.php
branches/ApiEdit_Vodafone/languages/messages/MessagesBcl.php
branches/ApiEdit_Vodafone/languages/messages/MessagesCy.php
branches/ApiEdit_Vodafone/languages/messages/MessagesExt.php
branches/ApiEdit_Vodafone/languages/messages/MessagesFiu_vro.php
branches/ApiEdit_Vodafone/languages/messages/MessagesGan.php
branches/ApiEdit_Vodafone/languages/messages/MessagesHe.php
branches/ApiEdit_Vodafone/languages/messages/MessagesHr.php
branches/ApiEdit_Vodafone/languages/messages/MessagesHsb.php
branches/ApiEdit_Vodafone/languages/messages/MessagesIs.php
branches/ApiEdit_Vodafone/languages/messages/MessagesNah.php
branches/ApiEdit_Vodafone/languages/messages/MessagesNl.php
branches/ApiEdit_Vodafone/languages/messages/MessagesPt_br.php
branches/ApiEdit_Vodafone/maintenance/parserTests.inc
Property Changed:
----------------
branches/ApiEdit_Vodafone/
Property changes on: branches/ApiEdit_Vodafone
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/phase3:1-26236,26238-26245,26264-26291
+ /trunk/phase3:1-26236,26238-26245,26264-26291,26293-26387
Modified: branches/ApiEdit_Vodafone/RELEASE-NOTES
===================================================================
--- branches/ApiEdit_Vodafone/RELEASE-NOTES 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/RELEASE-NOTES 2007-10-09 11:11:15 UTC (rev 26539)
@@ -29,7 +29,10 @@
* (bug 11151) Add descriptive <title> to revision history page
* (bug 5412) Add feed links for the site to all pages
* (bug 11353) Add ability to retrieve raw section content via action=raw
+* AuthPlugin added strictUserAuth() method to allow per-user override
+ of the strict() authentication behavior.
+
=== Bug fixes in 1.12 ===
* Subpages are now indexed for searching properly when using PostgreSQL
@@ -88,6 +91,7 @@
* (bug 11218) Add option to feedwatchlist to display multiple revisions for each page.
* (bug 11404) Provide name of exception caught in error code field of internal api
error messages.
+* (bug 11534) rvendid doesn't work
=== Languages updated in 1.12 ===
Modified: branches/ApiEdit_Vodafone/includes/AuthPlugin.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/AuthPlugin.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/AuthPlugin.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -211,6 +211,18 @@
}
/**
+ * Check if a user should authenticate locally if the global authentication fails.
+ * If either this or strict() returns true, local authentication is not used.
+ *
+ * @param $username String: username.
+ * @return bool
+ * @public
+ */
+ function strictUserAuth( $username ) {
+ return false;
+ }
+
+ /**
* When creating a user account, optionally fill in preferences and such.
* For instance, you might pull the email address or real name from the
* external user database.
Modified: branches/ApiEdit_Vodafone/includes/AutoLoader.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/AutoLoader.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/AutoLoader.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -241,6 +241,7 @@
'User' => 'includes/User.php',
'MailAddress' => 'includes/UserMailer.php',
'EmailNotification' => 'includes/UserMailer.php',
+ 'UserMailer' => 'includes/UserMailer.php',
'WatchedItem' => 'includes/WatchedItem.php',
'WebRequest' => 'includes/WebRequest.php',
'WebResponse' => 'includes/WebResponse.php',
@@ -388,4 +389,4 @@
require( $file );
}
}
-}
\ No newline at end of file
+}
Modified: branches/ApiEdit_Vodafone/includes/JobQueue.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/JobQueue.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/JobQueue.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -4,8 +4,6 @@
die( "This file is part of MediaWiki, it is not a valid entry point\n" );
}
-require_once('UserMailer.php');
-
/**
* Class to both describe a background job and handle jobs.
*/
@@ -290,3 +288,4 @@
}
}
+
Modified: branches/ApiEdit_Vodafone/includes/RecentChange.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/RecentChange.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/RecentChange.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -221,8 +221,7 @@
if( $wgUseEnotif ) {
# this would be better as an extension hook
global $wgUser;
- include_once( "UserMailer.php" );
- $enotif = new EmailNotification();
+ $enotif = new EmailNotification;
$title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
$enotif->notifyOnPageChange( $wgUser, $title,
$this->mAttribs['rc_timestamp'],
@@ -626,3 +625,4 @@
}
}
+
Modified: branches/ApiEdit_Vodafone/includes/User.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/User.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/User.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -206,13 +206,7 @@
return false;
}
- # Save to cache
- $data = array();
- foreach ( self::$mCacheVars as $name ) {
- $data[$name] = $this->$name;
- }
- $data['mVersion'] = MW_USER_VERSION;
- $wgMemc->set( $key, $data );
+ $this->saveToCache();
} else {
wfDebug( "Got user {$this->mId} from cache\n" );
# Restore from cache
@@ -224,6 +218,25 @@
}
/**
+ * Save user data to the shared cache
+ */
+ function saveToCache() {
+ $this->load();
+ if ( $this->isAnon() ) {
+ // Anonymous users are uncached
+ return;
+ }
+ $data = array();
+ foreach ( self::$mCacheVars as $name ) {
+ $data[$name] = $this->$name;
+ }
+ $data['mVersion'] = MW_USER_VERSION;
+ $key = wfMemcKey( 'user', 'id', $this->mId );
+ global $wgMemc;
+ $wgMemc->set( $key, $data );
+ }
+
+ /**
* Static factory method for creation from username.
*
* This is slightly less efficient than newFromId(), so use newFromId() if
@@ -1196,11 +1209,13 @@
global $wgMemc;
$key = wfMemcKey( 'newtalk', 'ip', $this->getName() );
$newtalk = $wgMemc->get( $key );
- if( $newtalk != "" ) {
+ if( strval( $newtalk ) !== '' ) {
$this->mNewtalk = (bool)$newtalk;
} else {
- $this->mNewtalk = $this->checkNewtalk( 'user_ip', $this->getName() );
- $wgMemc->set( $key, (int)$this->mNewtalk, time() + 1800 );
+ // Since we are caching this, make sure it is up to date by getting it
+ // from the master
+ $this->mNewtalk = $this->checkNewtalk( 'user_ip', $this->getName(), true );
+ $wgMemc->set( $key, (int)$this->mNewtalk, 1800 );
}
} else {
$this->mNewtalk = $this->checkNewtalk( 'user_id', $this->mId );
@@ -1227,18 +1242,22 @@
/**
- * Perform a user_newtalk check on current slaves; if the memcached data
- * is funky we don't want newtalk state to get stuck on save, as that's
- * damn annoying.
- *
+ * Perform a user_newtalk check, uncached.
+ * Use getNewtalk for a cached check.
+ *
* @param string $field
* @param mixed $id
+ * @param bool $fromMaster True to fetch from the master, false for a slave
* @return bool
* @private
*/
- function checkNewtalk( $field, $id ) {
- $dbr = wfGetDB( DB_SLAVE );
- $ok = $dbr->selectField( 'user_newtalk', $field,
+ function checkNewtalk( $field, $id, $fromMaster = false ) {
+ if ( $fromMaster ) {
+ $db = wfGetDB( DB_MASTER );
+ } else {
+ $db = wfGetDB( DB_SLAVE );
+ }
+ $ok = $db->selectField( 'user_newtalk', $field,
array( $field => $id ), __METHOD__ );
return $ok !== false;
}
@@ -1250,17 +1269,18 @@
* @private
*/
function updateNewtalk( $field, $id ) {
- if( $this->checkNewtalk( $field, $id ) ) {
- wfDebug( __METHOD__." already set ($field, $id), ignoring\n" );
- return false;
- }
$dbw = wfGetDB( DB_MASTER );
$dbw->insert( 'user_newtalk',
array( $field => $id ),
__METHOD__,
'IGNORE' );
- wfDebug( __METHOD__.": set on ($field, $id)\n" );
- return true;
+ if ( $dbw->affectedRows() ) {
+ wfDebug( __METHOD__.": set on ($field, $id)\n" );
+ return true;
+ } else {
+ wfDebug( __METHOD__." already set ($field, $id)\n" );
+ return false;
+ }
}
/**
@@ -1270,16 +1290,17 @@
* @private
*/
function deleteNewtalk( $field, $id ) {
- if( !$this->checkNewtalk( $field, $id ) ) {
- wfDebug( __METHOD__.": already gone ($field, $id), ignoring\n" );
- return false;
- }
$dbw = wfGetDB( DB_MASTER );
$dbw->delete( 'user_newtalk',
array( $field => $id ),
__METHOD__ );
- wfDebug( __METHOD__.": killed on ($field, $id)\n" );
- return true;
+ if ( $dbw->affectedRows() ) {
+ wfDebug( __METHOD__.": killed on ($field, $id)\n" );
+ return true;
+ } else {
+ wfDebug( __METHOD__.": already gone ($field, $id)\n" );
+ return false;
+ }
}
/**
@@ -1301,6 +1322,7 @@
$field = 'user_id';
$id = $this->getId();
}
+ global $wgMemc;
if( $val ) {
$changed = $this->updateNewtalk( $field, $id );
@@ -1308,20 +1330,13 @@
$changed = $this->deleteNewtalk( $field, $id );
}
- if( $changed ) {
- if( $this->isAnon() ) {
- // Anons have a separate memcached space, since
- // user records aren't kept for them.
- global $wgMemc;
- $key = wfMemcKey( 'newtalk', 'ip', $val );
- $wgMemc->set( $key, $val ? 1 : 0 );
- } else {
- if( $val ) {
- // Make sure the user page is watched, so a notification
- // will be sent out if enabled.
- $this->addWatch( $this->getTalkPage() );
- }
- }
+ if( $this->isAnon() ) {
+ // Anons have a separate memcached space, since
+ // user records aren't kept for them.
+ $key = wfMemcKey( 'newtalk', 'ip', $id );
+ $wgMemc->set( $key, $val ? 1 : 0, 1800 );
+ }
+ if ( $changed ) {
$this->invalidateCache();
}
}
@@ -1893,7 +1908,7 @@
'wl_notificationtimestamp' => NULL
), array( /* WHERE */
'wl_user' => $currentUser
- ), 'UserMailer::clearAll'
+ ), __METHOD__
);
# we also need to clear here the "you have new message" notification for the own user_talk page
@@ -2252,6 +2267,9 @@
} elseif( $wgAuth->strict() ) {
/* Auth plugin doesn't allow local authentication */
return false;
+ } elseif( $wgAuth->strictUserAuth( $this->getName() ) ) {
+ /* Auth plugin doesn't allow local authentication for this user name */
+ return false;
}
$ep = $this->encryptPassword( $password );
if ( 0 == strcmp( $ep, $this->mPassword ) ) {
@@ -2375,10 +2393,9 @@
$from = $wgPasswordSender;
}
- require_once( 'UserMailer.php' );
$to = new MailAddress( $this );
$sender = new MailAddress( $from );
- $error = userMailer( $to, $sender, $subject, $body );
+ $error = UserMailer::send( $to, $sender, $subject, $body );
if( $error == '' ) {
return true;
@@ -2686,3 +2703,4 @@
}
+
Modified: branches/ApiEdit_Vodafone/includes/UserMailer.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/UserMailer.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/UserMailer.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -1,9 +1,5 @@
<?php
/**
- * UserMailer.php
- * Copyright (C) 2004 Thomas Gries <mail[at]tgries.de>
- * http://www.mediawiki.org/
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -21,16 +17,10 @@
*
* @author <brion[at]pobox.com>
* @author <mail[at]tgries.de>
+ * @author Tim Starling
*
*/
-/**
- * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
- */
-function wfRFC822Phrase( $phrase ) {
- $phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
- return '"' . $phrase . '"';
-}
/**
* Stores a single person's name and email address.
@@ -70,155 +60,184 @@
return $this->address;
}
}
-}
-function send_mail($mailer, $dest, $headers, $body)
-{
- $mailResult =& $mailer->send($dest, $headers, $body);
-
- # Based on the result return an error string,
- if ($mailResult === true) {
- return '';
- } elseif (is_object($mailResult)) {
- wfDebug( "PEAR::Mail failed: " . $mailResult->getMessage() . "\n" );
- return $mailResult->getMessage();
- } else {
- wfDebug( "PEAR::Mail failed, unknown error result\n" );
- return 'Mail object return unknown error.';
+ function __toString() {
+ return $this->toString();
}
}
+
/**
- * This function will perform a direct (authenticated) login to
- * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
- * array of parameters. It requires PEAR:Mail to do that.
- * Otherwise it just uses the standard PHP 'mail' function.
- *
- * @param $to MailAddress: recipient's email
- * @param $from MailAddress: sender's email
- * @param $subject String: email's subject.
- * @param $body String: email's text.
- * @param $replyto String: optional reply-to email (default: null).
+ * Collection of static functions for sending mail
*/
-function userMailer( $to, $from, $subject, $body, $replyto=null ) {
- global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
- global $wgEnotifMaxRecips;
+class UserMailer {
+ /**
+ * Send mail using a PEAR mailer
+ */
+ protected static function sendWithPear($mailer, $dest, $headers, $body)
+ {
+ $mailResult =& $mailer->send($dest, $headers, $body);
- if (is_array( $wgSMTP )) {
- require_once( 'Mail.php' );
+ # Based on the result return an error string,
+ if ($mailResult === true) {
+ return '';
+ } elseif (is_object($mailResult)) {
+ wfDebug( "PEAR::Mail failed: " . $mailResult->getMessage() . "\n" );
+ return $mailResult->getMessage();
+ } else {
+ wfDebug( "PEAR::Mail failed, unknown error result\n" );
+ return 'Mail object return unknown error.';
+ }
+ }
- $msgid = str_replace(" ", "_", microtime());
- if (function_exists('posix_getpid'))
- $msgid .= '.' . posix_getpid();
+ /**
+ * This function will perform a direct (authenticated) login to
+ * a SMTP Server to use for mail relaying if 'wgSMTP' specifies an
+ * array of parameters. It requires PEAR:Mail to do that.
+ * Otherwise it just uses the standard PHP 'mail' function.
+ *
+ * @param $to MailAddress: recipient's email
+ * @param $from MailAddress: sender's email
+ * @param $subject String: email's subject.
+ * @param $body String: email's text.
+ * @param $replyto String: optional reply-to email (default: null).
+ */
+ static function send( $to, $from, $subject, $body, $replyto=null ) {
+ global $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEnotifImpersonal;
+ global $wgEnotifMaxRecips;
- if (is_array($to)) {
- $dest = array();
- foreach ($to as $u)
- $dest[] = $u->address;
- } else
- $dest = $to->address;
+ if ( is_array( $to ) ) {
+ wfDebug( __METHOD__.': sending mail to ' . implode( ',', $to ) . "\n" );
+ } else {
+ wfDebug( __METHOD__.': sending mail to ' . implode( ',', array( $to ) ) . "\n" );
+ }
- $headers['From'] = $from->toString();
+ if (is_array( $wgSMTP )) {
+ require_once( 'Mail.php' );
- if ($wgEnotifImpersonal)
- $headers['To'] = 'undisclosed-recipients:;';
- else
- $headers['To'] = $to->toString();
+ $msgid = str_replace(" ", "_", microtime());
+ if (function_exists('posix_getpid'))
+ $msgid .= '.' . posix_getpid();
- if ( $replyto ) {
- $headers['Reply-To'] = $replyto->toString();
- }
- $headers['Subject'] = wfQuotedPrintable( $subject );
- $headers['Date'] = date( 'r' );
- $headers['MIME-Version'] = '1.0';
- $headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
- $headers['Content-transfer-encoding'] = '8bit';
- $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
- $headers['X-Mailer'] = 'MediaWiki mailer';
+ if (is_array($to)) {
+ $dest = array();
+ foreach ($to as $u)
+ $dest[] = $u->address;
+ } else
+ $dest = $to->address;
- // Create the mail object using the Mail::factory method
- $mail_object =& Mail::factory('smtp', $wgSMTP);
- if( PEAR::isError( $mail_object ) ) {
- wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" );
- return $mail_object->getMessage();
- }
+ $headers['From'] = $from->toString();
- wfDebug( "Sending mail via PEAR::Mail to $dest\n" );
- if (is_array($dest)) {
- $chunks = array_chunk($dest, $wgEnotifMaxRecips);
- foreach ($chunks as $chunk) {
- $e = send_mail($mail_object, $chunk, $headers, $body);
- if ($e != '')
- return $e;
+ if ($wgEnotifImpersonal)
+ $headers['To'] = 'undisclosed-recipients:;';
+ else
+ $headers['To'] = $to->toString();
+
+ if ( $replyto ) {
+ $headers['Reply-To'] = $replyto->toString();
}
- } else
- return $mail_object->send($dest, $headers, $body);
+ $headers['Subject'] = wfQuotedPrintable( $subject );
+ $headers['Date'] = date( 'r' );
+ $headers['MIME-Version'] = '1.0';
+ $headers['Content-type'] = 'text/plain; charset='.$wgOutputEncoding;
+ $headers['Content-transfer-encoding'] = '8bit';
+ $headers['Message-ID'] = "<$msgid@" . $wgSMTP['IDHost'] . '>'; // FIXME
+ $headers['X-Mailer'] = 'MediaWiki mailer';
- } else {
- # In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
- # (fifth parameter of the PHP mail function, see some lines below)
+ // Create the mail object using the Mail::factory method
+ $mail_object =& Mail::factory('smtp', $wgSMTP);
+ if( PEAR::isError( $mail_object ) ) {
+ wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" );
+ return $mail_object->getMessage();
+ }
- # Line endings need to be different on Unix and Windows due to
- # the bug described at http://trac.wordpress.org/ticket/2603
- if ( wfIsWindows() ) {
- $body = str_replace( "\n", "\r\n", $body );
- $endl = "\r\n";
- } else {
- $endl = "\n";
- }
- $headers =
- "MIME-Version: 1.0$endl" .
- "Content-type: text/plain; charset={$wgOutputEncoding}$endl" .
- "Content-Transfer-Encoding: 8bit$endl" .
- "X-Mailer: MediaWiki mailer$endl".
- 'From: ' . $from->toString();
- if ($replyto) {
- $headers .= "{$endl}Reply-To: " . $replyto->toString();
- }
+ wfDebug( "Sending mail via PEAR::Mail to $dest\n" );
+ if (is_array($dest)) {
+ $chunks = array_chunk($dest, $wgEnotifMaxRecips);
+ foreach ($chunks as $chunk) {
+ $e = self::sendWithPear($mail_object, $chunk, $headers, $body);
+ if ($e != '')
+ return $e;
+ }
+ } else
+ return $mail_object->send($dest, $headers, $body);
- $wgErrorString = '';
- set_error_handler( 'mailErrorHandler' );
- wfDebug( "Sending mail via internal mail() function\n" );
+ } else {
+ # In the following $headers = expression we removed "Reply-To: {$from}\r\n" , because it is treated differently
+ # (fifth parameter of the PHP mail function, see some lines below)
- if (function_exists('mail'))
- if (is_array($to))
- foreach ($to as $recip)
- $sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers );
- else
- $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
- else
- $wgErrorString = 'PHP is not configured to send mail';
+ # Line endings need to be different on Unix and Windows due to
+ # the bug described at http://trac.wordpress.org/ticket/2603
+ if ( wfIsWindows() ) {
+ $body = str_replace( "\n", "\r\n", $body );
+ $endl = "\r\n";
+ } else {
+ $endl = "\n";
+ }
+ $headers =
+ "MIME-Version: 1.0$endl" .
+ "Content-type: text/plain; charset={$wgOutputEncoding}$endl" .
+ "Content-Transfer-Encoding: 8bit$endl" .
+ "X-Mailer: MediaWiki mailer$endl".
+ 'From: ' . $from->toString();
+ if ($replyto) {
+ $headers .= "{$endl}Reply-To: " . $replyto->toString();
+ }
+ $wgErrorString = '';
+ $html_errors = ini_get( 'html_errors' );
+ ini_set( 'html_errors', '0' );
+ set_error_handler( array( 'UserMailer', 'errorHandler' ) );
+ wfDebug( "Sending mail via internal mail() function\n" );
- restore_error_handler();
+ if (function_exists('mail')) {
+ if (is_array($to)) {
+ foreach ($to as $recip) {
+ $sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+ }
+ } else {
+ $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
+ }
+ } else {
+ $wgErrorString = 'PHP is not configured to send mail';
+ }
- if ( $wgErrorString ) {
- wfDebug( "Error sending mail: $wgErrorString\n" );
- return $wgErrorString;
- } elseif (! $sent) {
- //mail function only tells if there's an error
- wfDebug( "Error sending mail\n" );
- return 'mailer error';
- } else {
- return '';
+ restore_error_handler();
+ ini_set( 'html_errors', $html_errors );
+
+ if ( $wgErrorString ) {
+ wfDebug( "Error sending mail: $wgErrorString\n" );
+ return $wgErrorString;
+ } elseif (! $sent) {
+ //mail function only tells if there's an error
+ wfDebug( "Error sending mail\n" );
+ return 'mailer error';
+ } else {
+ return '';
+ }
}
}
-}
+ /**
+ * Get the mail error message in global $wgErrorString
+ *
+ * @param $code Integer: error number
+ * @param $string String: error message
+ */
+ static function errorHandler( $code, $string ) {
+ global $wgErrorString;
+ $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
+ }
-
-/**
- * Get the mail error message in global $wgErrorString
- *
- * @param $code Integer: error number
- * @param $string String: error message
- */
-function mailErrorHandler( $code, $string ) {
- global $wgErrorString;
- $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
+ /**
+ * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
+ */
+ static function rfc822Phrase( $phrase ) {
+ $phrase = strtr( $phrase, array( "\r" => '', "\n" => '', '"' => '' ) );
+ return '"' . $phrase . '"';
+ }
}
-
/**
* This module processes the email notifications when the current page is
* changed. It looks up the table watchlist to find out which users are watching
@@ -245,10 +264,24 @@
*/
var $to, $subject, $body, $replyto, $from;
var $user, $title, $timestamp, $summary, $minorEdit, $oldid;
+ var $mailTargets = array();
/**@}}*/
- function notifyOnPageChange($editor, &$title, $timestamp, $summary, $minorEdit, $oldid = false) {
+ /**
+ * Send emails corresponding to the user $editor editing the page $title.
+ * Also updates wl_notificationtimestamp.
+ *
+ * May be deferred via the job queue.
+ *
+ * @param $editor User object
+ * @param $title Title object
+ * @param $timestamp
+ * @param $summary
+ * @param $minorEdit
+ * @param $oldid (default: false)
+ */
+ function notifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid = false) {
global $wgEnotifUseJobQ;
if( $title->getNamespace() < 0 )
@@ -269,23 +302,27 @@
}
- /**
- * @todo document
+ /*
+ * Immediate version of notifyOnPageChange().
+ *
+ * Send emails corresponding to the user $editor editing the page $title.
+ * Also updates wl_notificationtimestamp.
+ *
+ * @param $editor User object
* @param $title Title object
* @param $timestamp
* @param $summary
* @param $minorEdit
* @param $oldid (default: false)
*/
- function actuallyNotifyOnPageChange($editor, &$title, $timestamp, $summary, $minorEdit, $oldid=false) {
+ function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid=false) {
# we use $wgEmergencyContact as sender's address
global $wgEnotifWatchlist;
global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
global $wgEnotifImpersonal;
- $fname = 'UserMailer::notifyOnPageChange';
- wfProfileIn( $fname );
+ wfProfileIn( __METHOD__ );
# The following code is only run, if several conditions are met:
# 1. EmailNotification for pages (other than user_talk pages) must be enabled
@@ -295,108 +332,85 @@
$enotifusertalkpage = ($isUserTalkPage && $wgEnotifUserTalk);
$enotifwatchlistpage = $wgEnotifWatchlist;
- $this->title =& $title;
+ $this->title = $title;
$this->timestamp = $timestamp;
$this->summary = $summary;
$this->minorEdit = $minorEdit;
$this->oldid = $oldid;
$this->composeCommonMailtext($editor);
- $impersonals = array();
+ $userTalkId = false;
if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
- if( $wgEnotifWatchlist ) {
- // Send updates to watchers other than the current editor
- $userCondition = 'wl_user <> ' . intval( $editor->getId() );
- } elseif( $wgEnotifUserTalk && $title->getNamespace() == NS_USER_TALK ) {
+ if ( $wgEnotifUserTalk && $isUserTalkPage ) {
$targetUser = User::newFromName( $title->getText() );
- if( is_null( $targetUser ) ) {
- wfDebug( "$fname: user-talk-only mode; no such user\n" );
- $userCondition = false;
- } elseif( $targetUser->getId() == $editor->getId() ) {
- wfDebug( "$fname: user-talk-only mode; editor is target user\n" );
- $userCondition = false;
+ if ( !$targetUser || $targetUser->isAnon() ) {
+ wfDebug( __METHOD__.": user talk page edited, but user does not exist\n" );
+ } elseif ( $targetUser->getId() == $editor->getId() ) {
+ wfDebug( __METHOD__.": user edited their own talk page, no notification sent\n" );
+ } elseif( $targetUser->getOption( 'enotifusertalkpages' ) ) {
+ wfDebug( __METHOD__.": sending talk page update notification\n" );
+ $this->compose( $targetUser );
+ $userTalkId = $targetUser->getId();
} else {
- // Don't notify anyone other than the owner of the talk page
- $userCondition = 'wl_user = ' . intval( $targetUser->getId() );
+ wfDebug( __METHOD__.": talk page owner doesn't want notifications\n" );
}
- } else {
- // Notifications disabled
- $userCondition = false;
}
- if( $userCondition ) {
- $dbr = wfGetDB( DB_MASTER );
+
+ if ( $wgEnotifWatchlist ) {
+ // Send updates to watchers other than the current editor
+ $userCondition = 'wl_user <> ' . intval( $editor->getId() );
+ if ( $userTalkId !== false ) {
+ // Already sent an email to this person
+ $userCondition .= ' AND wl_user <> ' . intval( $userTalkId );
+ }
+ $dbr = wfGetDB( DB_SLAVE );
+
$res = $dbr->select( 'watchlist', array( 'wl_user' ),
array(
'wl_title' => $title->getDBkey(),
'wl_namespace' => $title->getNamespace(),
$userCondition,
'wl_notificationtimestamp IS NULL',
- ), $fname );
+ ), __METHOD__ );
- # if anyone is watching ... set up the email message text which is
- # common for all receipients ...
- if ( $dbr->numRows( $res ) > 0 ) {
-
- $watchingUser = new User();
-
- # ... now do for all watching users ... if the options fit
- for ($i = 1; $i <= $dbr->numRows( $res ); $i++) {
-
- $wuser = $dbr->fetchObject( $res );
- $watchingUser->setID($wuser->wl_user);
-
- if ( ( ( $enotifwatchlistpage
- && $watchingUser->getOption('enotifwatchlistpages') )
- || ( $enotifusertalkpage
- && $watchingUser->getOption('enotifusertalkpages')
- && $title->equals( $watchingUser->getTalkPage() ) ) )
- && ( !$minorEdit
- || ( $wgEnotifMinorEdits
- && $watchingUser->getOption('enotifminoredits') ) )
- && ( $watchingUser->isEmailConfirmed() ) ) {
- # ... adjust remaining text and page edit time placeholders
- # which needs to be personalized for each user
- if ($wgEnotifImpersonal)
- $impersonals[] = $watchingUser;
- else
- $this->composeAndSendPersonalisedMail( $watchingUser );
-
- } # if the watching user has an email address in the preferences
+ foreach ( $res as $row ) {
+ $watchingUser = User::newFromId( $row->wl_user );
+ if ( $watchingUser->getOption( 'enotifwatchlistpages' ) &&
+ ( !$minorEdit || $watchingUser->getOption('enotifminoredits') ) &&
+ $watchingUser->isEmailConfirmed() )
+ {
+ $this->compose( $watchingUser );
}
}
- } # if anyone is watching
- } # if $wgEnotifWatchlist = true
+ }
+ }
global $wgUsersNotifedOnAllChanges;
foreach ( $wgUsersNotifedOnAllChanges as $name ) {
$user = User::newFromName( $name );
- if ($wgEnotifImpersonal)
- $impersonals[] = $user;
- else
- $this->composeAndSendPersonalisedMail( $user );
+ $this->compose( $user );
}
- $this->composeAndSendImpersonalMail($impersonals);
+ $this->sendMails();
if ( $wgShowUpdatedMarker || $wgEnotifWatchlist ) {
# mark the changed watch-listed page with a timestamp, so that the page is
# listed with an "updated since your last visit" icon in the watch list, ...
$dbw = wfGetDB( DB_MASTER );
- $success = $dbw->update( 'watchlist',
+ $dbw->update( 'watchlist',
array( /* SET */
'wl_notificationtimestamp' => $dbw->timestamp($timestamp)
), array( /* WHERE */
'wl_title' => $title->getDBkey(),
'wl_namespace' => $title->getNamespace(),
'wl_notificationtimestamp IS NULL'
- ), 'UserMailer::NotifyOnChange'
+ ), __METHOD__
);
- # FIXME what do we do on failure ?
}
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
} # function NotifyOnChange
/**
@@ -498,6 +512,31 @@
}
/**
+ * Compose a mail to a given user and either queue it for sending, or send it now,
+ * depending on settings.
+ *
+ * Call sendMails() to send any mails that were queued.
+ */
+ function compose( $user ) {
+ global $wgEnotifImpersonal;
+ if ( $wgEnotifImpersonal ) {
+ $this->mailTargets[] = new MailAddress( $user );
+ } else {
+ $this->sendPersonalised( $user );
+ }
+ }
+
+ /**
+ * Send any queued mails
+ */
+ function sendMails() {
+ global $wgEnotifImpersonal;
+ if ( $wgEnotifImpersonal ) {
+ $this->sendImpersonal( $this->mailTargets );
+ }
+ }
+
+ /**
* Does the per-user customizations to a notification e-mail (name,
* timestamp in proper timezone, etc) and sends it out.
* Returns true if the mail was sent successfully.
@@ -507,7 +546,7 @@
* @return bool
* @private
*/
- function composeAndSendPersonalisedMail( $watchingUser ) {
+ function sendPersonalised( $watchingUser ) {
global $wgLang;
// From the PHP manual:
// Note: The to parameter cannot be an address in the form of "Something <someone[at]example.com>".
@@ -524,23 +563,19 @@
$wgLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
$body);
- return userMailer($to, $this->from, $this->subject, $body, $this->replyto);
+ return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto);
}
/**
- * Same as composeAndSendPersonalisedMail but does impersonal mail
- * suitable for bulk mailing. Takes an array of users.
+ * Same as sendPersonalised but does impersonal mail suitable for bulk
+ * mailing. Takes an array of MailAddress objects.
*/
- function composeAndSendImpersonalMail($users) {
+ function sendImpersonal( $addresses ) {
global $wgLang;
- if (empty($users))
+ if (empty($addresses))
return;
- $to = array();
- foreach ($users as $user)
- $to[] = new MailAddress($user);
-
$body = str_replace(
array( '$WATCHINGUSERNAME',
'$PAGEEDITDATE'),
@@ -548,8 +583,20 @@
$wgLang->timeanddate($this->timestamp, true, false, false)),
$this->body);
- return userMailer($to, $this->from, $this->subject, $body, $this->replyto);
+ return UserMailer::send($addresses, $this->from, $this->subject, $body, $this->replyto);
}
} # end of class EmailNotification
+/**
+ * Backwards compatibility functions
+ */
+function wfRFC822Phrase( $s ) {
+ return UserMailer::rfc822Phrase( $s );
+}
+function userMailer( $to, $from, $subject, $body, $replyto=null ) {
+ return UserMailer::send( $to, $from, $subject, $body, $replyto );
+}
+
+
+
Modified: branches/ApiEdit_Vodafone/includes/api/ApiQueryRevisions.php
===================================================================
--- branches/ApiEdit_Vodafone/includes/api/ApiQueryRevisions.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/includes/api/ApiQueryRevisions.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -53,6 +53,7 @@
// Enumerating revisions on multiple pages make it extremelly
// difficult to manage continuations and require additional sql indexes
$enumRevMode = (!is_null($user) || !is_null($excludeuser) || !is_null($limit) || !is_null($startid) || !is_null($endid) || $dir === 'newer' || !is_null($start) || !is_null($end));
+
$pageSet = $this->getPageSet();
$pageCount = $pageSet->getGoodTitleCount();
@@ -133,7 +134,7 @@
// one row with the same timestamp for the same page.
// The order needs to be the same as start parameter to avoid SQL filesort.
- if (is_null($startid))
+ if (is_null($startid) && is_null($endid))
$this->addWhereRange('rev_timestamp', $dir, $start, $end);
else
$this->addWhereRange('rev_id', $dir, $startid, $endid);
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesBcl.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesBcl.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesBcl.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -1061,6 +1061,7 @@
'all-logs-page' => 'Gabos na historial',
'log-search-legend' => 'Hanapon an mga historial',
'log-search-submit' => 'Dumanán',
+'alllogstext' => 'Rinamas na hihilongon kan gabos na historial na igwa sa {{SITENAME}}. Kon buot mong ipasadit an seleccion magpili tabi nin klase kan historial, ngaran nin paragamit, o pahinang naapektahan.',
'logempty' => 'Mayong angay na bagay sa historial.',
'log-title-wildcard' => 'Hanapon an mga títulong napopoon sa textong ini',
@@ -1075,6 +1076,7 @@
'allpagesnext' => 'Sunod',
'allpagessubmit' => 'Dumanán',
'allpagesprefix' => 'Ipahiling an mga páhinang may prepiho:',
+'allpagesbadtitle' => 'An tinaong titulo kan pahina dai puede o may prefihong para sa ibang tataramon o ibang wiki. Puede ser na igwa ining saro o iba pang mga caracter na dai puedeng gamiton sa mga titulo.',
'allpages-bad-ns' => 'An {{SITENAME}} mayo man na ngaran-espacio na "$1".',
# Special:Listusers
@@ -1084,8 +1086,14 @@
# E-mail user
'mailnologin' => 'Mayong dirección nin destino',
+'mailnologintext' => 'Kaipuhan ika si [[Special:Userlogin|nakalaog]]
+asin may tama na direccion nin e-surat saimong [[Special:Preferences|mga kursonada]]
+para makapadara nin e-surat sa ibang paragamit.',
'emailuser' => 'e-suratan ining tagagamit',
'emailpage' => 'E-suratan an parágamit',
+'emailpagetext' => 'Kon ining paragamit nagkaag nin tama na direccion nin e-surat sa saiyang mga kursonada, an pormulario sa baba mapadara nin sarong mensahe.
+An kinaag mong direccion nin e-surat sa saimong mga kursonada nin paragamit mahihiling bilang na "hali ki" kan direccion nin e-surat, para an destinatario puedeng makasimbag.',
+'usermailererror' => 'Error manonongod sa korreong binalik:',
'defemailsubject' => '{{SITENAME}} e-surat',
'noemailtitle' => 'Mayong direksón nin e-surat',
'noemailtext' => 'Dai nagpili nin tama na direccion nin e-surat an paragamit,
@@ -1108,6 +1116,11 @@
'watchnologin' => 'Mayô sa laog',
'watchnologintext' => 'Dapat ika si [[Special:Userlogin|nakalaog]] para puede kang magribay kan saimong lista nin mga pigbabantayán.',
'addedwatch' => 'Idinugang sa pigbabantayan',
+'addedwatchtext' => "Ining pahina \"[[:\$1]]\" dinugang sa saimong mga [[Special:Watchlist|lista nin mga pigbabantayan]].
+An mga pagbabago sa pahinang ini asin sa mga pahinang olay na kapadis kaini ililista digdi,
+buda an pahina isusurat na '''maitom''' sa [[Special:Recentchanges|lista nin mga kaaaging pagbabago]] para madali ining mahiling.
+
+Kon atyan moot mong halion an pahina sa listang ini, pindoton an \"Unwatch\" sa barra sa gilid.",
'removedwatch' => 'Pigtanggal sa pigbabantayan',
'removedwatchtext' => 'An pahinang "[[:$1]]" pigtanggal sa saimong pigbabantayan.',
'watch' => 'Bantayan',
@@ -1115,6 +1128,10 @@
'unwatch' => 'Dai bantayan',
'unwatchthispage' => 'Pondohon an pagbantay',
'notanarticle' => 'Bako ini páhina nin mga kontenido',
+'watchnochange' => 'Mayo sa saimong mga pigbabantayan an nahira sa laog nin pinahiling na pagkalawig.',
+'watchlist-details' => '{{PLURAL:$1|$1 page|$1 mga pahina}} na pigbabantayan kundi an mga pahinang orolayan.',
+'wlheader-enotif' => '* Nakaandar an paising e-surat.',
+'wlheader-showupdated' => "* An mga pahing binago despues kan huring bisita mo nakasurat na '''maitom'''",
'watchmethod-recent' => 'Sinususog an mga kaaaging hira sa mga pigbabantayan na pahina',
'watchmethod-list' => 'Pigsususog an mga pigbabantayan na páhina para mahiling an mga kaaaging paghihirâ',
'watchlistcontains' => 'An saimong lista nin pigbabantayán igwang $1 na {{KADKLAN:$1|páhina|mga páhina}}.',
@@ -1138,19 +1155,48 @@
'enotif_impersonal_salutation' => '{{SITENAME}} parágamit',
'changed' => 'pigbâgo',
'created' => 'piggibo',
+'enotif_subject' => 'An pahinang {{SITENAME}} na $PAGETITLE binago $CHANGEDORCREATED ni $PAGEEDITOR',
'enotif_lastvisited' => 'Hilingón an $1 para sa gabos na mga pagbâgo poon kan huring bisita.',
'enotif_lastdiff' => 'Hilingón an $1 tangarig mahiling an pagbâgong ini.',
'enotif_anon_editor' => 'dai bistong parágamit $1',
+'enotif_body' => 'Mahal na $WATCHINGUSERNAME,
+
+An pahinang {{SITENAME}} na $PAGETITLE binago $CHANGEDORCREATED sa $PAGEEDITDATE ni $PAGEEDITOR, hilingon an $PAGETITLE_URL para sa presenteng bersion.
+
+$NEWPAGE
+
+Epitome kan parahira: $PAGESUMMARY $PAGEMINOREDIT
+
+Apodon an parahira:
+e-surat: $PAGEEDITOR_EMAIL
+wiki: $PAGEEDITOR_WIKI
+
+Mayo nang iba pang paisi na ipapadara ngapit sa iba pang mga pagbabago kon dai mo bibisitahon giraray ining pahina. Puede mo man na ipuesto giraray an mga patanid para sa saimong mga pahinang pigbabantayan duman sa saimong lista nin pigbabantayan.
+
+ An makiamigong sistema nin paisi kan {{SITENAME}}
+
+--
+Para bagohon an pagpuesto kan saimong mga pigbabantayan, bisitahon an
+{{fullurl:{{ns:special}}:Lista nin pigbabantayan/hira}}
+
+Comentario asin iba pang tabang:
+{{fullurl:{{MediaWiki:helppage}}}}',
+
# Delete/protect/revert
'deletepage' => 'Parâon an pahina',
'confirm' => 'Kompermaron',
'excontent' => "Ini an dating laog: '$1'",
+'excontentauthor' => "ini an dating laog: '$1' (asin an unikong kontribuidor si '[[Special:Contributions/$2|$2]]')",
'exbeforeblank' => "Ini an dating laog bagô blinankohán: '$1'",
'exblank' => 'Warang laog an páhina',
'confirmdelete' => 'Ikonpirma an pagborra',
'deletesub' => '(Pigboborra an "$1")',
'historywarning' => 'Patanid: An pahinang paparâon mo igwa nin historya.',
+'confirmdeletetext' => 'Boborrahon mo na sa base nin datos ining pahina
+o ladawan sabay sa gabos na mga historial kaini.
+Ikonpirma tabi na ini an talagang buot mong gibohon, asin nasasabotan mo an mga resulta, buda an paggibo mo kaini konporme sa
+[[{{MediaWiki:policy-url}}]].',
'actioncomplete' => 'Nagibo na',
'deletedtext' => 'Binorra na an"$1" .
Hilingón tabi an $2 para mahiling an lista nin mga kaaaging binorra.',
@@ -1165,6 +1211,10 @@
'rollbacklink' => 'pabalík',
'rollbackfailed' => 'Prakaso an pagbalík',
'cantrollback' => 'Dai puedeng bawion an hira; an huring kontribuidor iyo an unikong parasurat kan páhina.',
+'alreadyrolled' => 'Dai puedeng ibalik an huring hira kan [[:$1]]
+ni [[User:$2|$2]] ([[User talk:$2|Olay]]); may ibang paragamit na naghira na o nagbalik na kaini.
+
+Huring hira ni [[User:$3|$3]] ([[User talk:$3|Olay]]).',
'editcomment' => 'Ini an nakakaag na komentario sa paghihira: "<i>$1</i>".', # only shown if there is an edit comment
'revertpage' => 'Binawi an mga hira ni [[Especial:mga kontribusión/$2|$2]] ([[olay ko:$2|olay]]); ibinalik sa dating bersión ni [[Paragamit:$1|$1]]',
'rollback-success' => 'Binawi an mga hira ni $1; binalik sa dating bersion ni $2.',
@@ -1184,8 +1234,12 @@
'protect_expiry_old' => 'Pasado na an panahón nin pagpasó.',
'unprotectsub' => '(Binabawi an proteksión kan "$1")',
'protect-unchain' => 'Bawion an kandado sa mga permiso sa pagbalyó',
+'protect-locked-blocked' => 'Dai mo puedeng bagohon an mga nibel kan proteksion mientras ika pigbabagat. Ini an mga presenteng puesto kan pahina <strong>$1</strong>:',
'protect-locked-dblock' => 'Dai puedeng ibalyo an mga nibel kan proteksión ta may actibong kandado sa base nin datos.
Ini an mga puesta sa ngunyan kaining páhina <strong>$1</strong>:',
+'protect-locked-access' => 'An kuenta mo warang permiso na magbago kan nibel nin proteksion.
+Ini an mga presenteng puesto kan pahina <strong>$1</strong>:',
+'protect-cascadeon' => 'Ining pahina pigproprotektaran sa ngunyan ta sabay ini sa mga nasunod na {{PLURAL:$1|pahina, na may|mga pahina, na may}} proteksiong katarata na nakaandar. Puede mong bagohon an nibel nin proteksion kaining pahina, pero wara ning epekto sa proteksiong katarata.',
'protect-default' => '(normal)',
'protect-fallback' => 'Mangipo kan "$1" na permiso',
'protect-level-autoconfirmed' => 'Bagatón an mga paragamit na dae nakarehistro',
@@ -1208,23 +1262,46 @@
'restriction-level-all' => 'maski anong nibel',
# Undelete
-'undelete' => 'Hilingón ang mga pinarang pahina',
-'undeletepage' => 'Hilingón asin ibalik an mga pinarang pahina',
-'viewdeletedpage' => 'Hilingón an mga pinarang pahina',
-'undeleterevisions' => '$1 {{PLURAL:$1|na pagriribay|na mga pagriribay}} na nakaarchibo',
-'undelete-revision' => 'Binorra ni $3 an pagriribay ni $1(sa $2):',
-'undeletebtn' => 'Ibalik',
-'undeletereset' => 'Ipuesto giraray',
-'undeletecomment' => 'Komento:',
-'undeletedarticle' => 'Ibinalik "[[$1]]"',
-'undeletedrevisions' => '$1 na (mga) pagriribay an binalík',
-'undeletedfiles' => '$1 (mga) picherong binalik',
-'undelete-search-box' => 'Hanapón an mga pinarang pahina',
-'undelete-search-prefix' => 'Hilingón an mga pahinang nagpopoon sa:',
-'undelete-search-submit' => 'Hanápon',
-'undelete-no-results' => 'Warang nahanap na páhinang angay sa archibo kan mga binorra.',
-'undelete-cleanup-error' => 'May error sa pagborra kan picherong archibong "$1".',
+'undelete' => 'Hilingón ang mga pinarang pahina',
+'undeletepage' => 'Hilingón asin ibalik an mga pinarang pahina',
+'viewdeletedpage' => 'Hilingón an mga pinarang pahina',
+'undeletepagetext' => 'An mga nasunod na pahina binorra na pero yaon pa sa archibo asin puede pa ibalik. Dapat nugad limpiahan an archibo.',
+'undeleteextrahelp' => "Kon muya mong ibalik an enterong pahina, dai markahan an gabos na mga kahon asin pindoton an '''''Restore'''''. Para magpili nin ibabalik, markahan an mga kahon na nakaturo sa mga pagriribay na buot mong ibalik, buda pindoton an '''''Restore'''''. An pagpindot kan '''''Reset''''' makalimpia nin campo kan mga commento
+asin an gabos na mga kahon-marka.",
+'undeleterevisions' => '$1 {{PLURAL:$1|na pagriribay|na mga pagriribay}} na nakaarchibo',
+'undeletehistory' => 'Kon ibabalik mo an pahinang ini, an gabos na mga pagribay mabalik sa historial.
+Kon despues kan pagborra igwang bagong pahina na may parehong ngaran, an mga binalik na pagribay mahihiling sa historial, asin an presenteng pagribay kan pahinang pigigibo dai isasalidang enseguida. Giromdomon man tabi na an mga restriccion sa mga pagriribay nin pichero mawawara sa pagbalik.',
+'undeleterevdel' => 'Dai madagos an pagbawi kan pagborra kon an resulta kaini maboborra an parte kan pagribay na nasa pahinang pinakaitaas.
+Sa mga kasong ini, dapat halion an mga marka o dai itago an mga pinaka bagong binorra na mga pagriribay. Dai ibabalik an mga pagribay kan mga picherong mayo kan permisong hilingon.',
+'undeletehistorynoadmin' => 'Binorra na ining pahina. Mahihiling an rason sa epitome sa baba, kasabay sa mga detalye kan mga paragamit na naghira kaining pahina bago binorra. An mismong texto kaining mga binorrang pagribay an mga administrador sana an makakahiling kaini.',
+'undelete-revision' => 'Binorra ni $3 an pagriribay ni $1(sa $2):',
+'undeleterevision-missing' => 'Dai puede o ini sarong nawawarang pagribay. Puede ser na sala an takod, o
+binalik an na an pagribay o hinali sa archibo.',
+'undeletebtn' => 'Ibalik',
+'undeletereset' => 'Ipuesto giraray',
+'undeletecomment' => 'Komento:',
+'undeletedarticle' => 'Ibinalik "[[$1]]"',
+'undeletedrevisions' => '$1 na (mga) pagriribay an binalík',
+'undeletedrevisions-files' => '$1 na (mga) pagribay buda $2 na (mga) picherong binalik',
+'undeletedfiles' => '$1 (mga) picherong binalik',
+'cannotundelete' => 'Naprakaso an pagbawi kan pagborra; puede ser an binawi an pagborra kan pahina kan ibang paragamit.',
+'undeletedpage' => "<big>'''binalik na an $1 '''</big>
+Ikonsultar an [[Special:Log/delete|historial nin pagborra]] para mahiling an lista nin mga kaaaging pagborra asin pagbalik.",
+'undelete-header' => 'Hilingon an [[Special:Log/delete|historial kan pagborra]] kan mga kaaaging pahinang binorra.',
+'undelete-search-box' => 'Hanapón an mga pinarang pahina',
+'undelete-search-prefix' => 'Hilingón an mga pahinang nagpopoon sa:',
+'undelete-search-submit' => 'Hanápon',
+'undelete-no-results' => 'Warang nahanap na páhinang angay sa archibo kan mga binorra.',
+'undelete-filename-mismatch' => 'Dai puedeng bawion an pagborra nin pagribay na may tatak nin oras na $1: dai kapadis an ngaran nin pichero',
+'undelete-bad-store-key' => 'Dai puedeng bawion an pagborra nin pagribay na may tatak nin oras na $1: nawara an pichero bago sa pagborra.',
+'undelete-cleanup-error' => 'May error sa pagborra kan picherong archibong "$1".',
+'undelete-missing-filearchive' => 'Dai maibalik an archibo kan picherong may na ID $1 ta wara ini sa base nin datos. Puede ser na dati nang binawi an pagborra kaini.',
+'undelete-error-short' => 'May error sa pagbawi kan pagborra nin pichero: $1',
+'undelete-error-long' => 'May mga error na nakaagi mientras sa pagborra kan picherong:
+
+$1',
+
# Namespace form on various pages
'namespace' => 'ngaran-espacio:',
'invert' => 'Ibaliktad an pinili',
@@ -1233,6 +1310,7 @@
'contributions' => 'Mga kontribusyon kan parágamit',
'mycontris' => 'Mga kontribusyon ko',
'contribsub2' => 'Para sa $1 ($2)',
+'ucnote' => 'Mahihiling sa baba an mga huring <b>$1</b> binagao kaining paragamit sa <b>$2</b> na aldaw.',
'uclinks' => 'Hilingon an mga huring $1 na pagbabago; hilingon an mga huring $2 na aldaw.',
'month' => 'Poon bulan (asin mas amay):',
'year' => 'Poon taon (asin mas amay):',
@@ -1254,16 +1332,22 @@
'whatlinkshere' => 'Ano an nakatakod digdi',
'whatlinkshere-title' => 'Mga pahinang nakatakod sa $1',
'notargettitle' => 'Mayong target',
+'notargettext' => 'Dai ka pa nagpili nin pahina o paragamit na muya mong gibohon an accion na ini.',
'linklistsub' => '(Lista kan mga takod)',
'linkshere' => "An mga minasunod na pahina nakatakod sa '''[[:$1]]''':",
'nolinkshere' => "Mayong pahinang nakatakod sa '''[[:$1]]'''.",
+'nolinkshere-ns' => "Mayong pahina na nakatakod sa '''[[:$1]]''' sa piniling ngaran-espacio.",
'isredirect' => 'iredirekta an pahina',
+'istemplate' => 'inklusion',
'whatlinkshere-prev' => '{{PLURAL:$1|nakaagi|nakaaging $1}}',
'whatlinkshere-next' => '{{PLURAL:$1|sunod|sunod na $1}}',
'whatlinkshere-links' => '← Mga takod',
# Block/unblock
'blockip' => 'Bagáton an tagagamit',
+'blockiptext' => 'Gamiton an pormulario sa baba para bagaton an pagsurat kan sarong espesipikong direccion nin IP o ngaran nin paragamit.
+Dapat gibohon sana ini para maebitar an vandalismo, asin konpirme sa [[{{MediaWiki:policy-url}}|na politika]].
+Magkaag ni rason na espesipiko (halimbawa, magtao nin ehemplo na mga pahinang rinaot).',
'ipaddress' => 'Direksyón nin IP:',
'ipadressorusername' => 'dirección nin IP o gaha:',
'ipbexpiry' => 'Pasó:',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesCy.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesCy.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesCy.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -1,6 +1,8 @@
<?php
/**
* @addtogroup Language
+ *
+ * @author Lloffiwr
*/
/* Cymraeg - Welsh */
@@ -798,7 +800,13 @@
'imagelist_search_for' => "Chwilio am enw'r ddelwedd:",
# File reversion
-'filerevert' => 'Gwrthdroi $1',
+'filerevert' => 'Gwrthdroi $1',
+'filerevert-legend' => "Gwrthdroi'r ffeil",
+'filerevert-intro' => '<span class="plainlinks">Rydych yn gwrthdroi \'\'\'[[Media:$1|$1]]\'\'\' i\'r [fersiwn $4 fel ag yr oedd ar $3, $2].</span>',
+'filerevert-comment' => 'Sylw:',
+'filerevert-defaultcomment' => 'Wedi adfer fersiwn $2, $1',
+'filerevert-submit' => 'Gwrthdroi',
+'filerevert-badversion' => "Nid oes fersiwn lleol cynt o'r ffeil hwn gyda'r amsernod a nodwyd.",
# File deletion
'filedelete' => 'Dileu $1',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesExt.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesExt.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesExt.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -23,7 +23,7 @@
'tog-editwidth' => 'La caha d´eición tiini el anchón máisimu',
'tog-watchcreations' => 'Vehilal las páhinas que yo crei',
'tog-watchdefault' => 'Vehilal las páhinas qu´eiti',
-'tog-watchmoves' => 'Vehilal las páhinas que rehuchei',
+'tog-watchmoves' => 'Vehilal las páhinas que rellami',
'tog-watchdeletion' => 'Vehilal las páhinas qu´esborri',
'tog-minordefault' => 'Aseñalal tolas eicionis cumu chiqueninas pol defeutu',
'tog-previewontop' => 'Previsoreal enantis de la caha d´eición, i nu aluspués',
@@ -291,8 +291,8 @@
'noname' => 'Nu as escrebiu un nombri d´usuáriu corretu.',
'loginsuccesstitle' => 'Güenas, lo cúmu va esu?',
'loginsuccess' => "'''Acabihas d´entral en {{SITENAME}} con el nombri e \"\$1\".'''",
-'nosuchuser' => 'Nu ai dengún usuáriu hucheau "$1". Compreba qu´esté bien escrebiu, u crea una cuenta nueva.',
-'nosuchusershort' => 'Nu ai dengún usuáriu hucheau "$1". Compreba qu´esté bien escrebiu.',
+'nosuchuser' => 'Nu ai dengún usuáriu llamau "$1". Compreba qu´esté bien escrebiu, u crea una cuenta nueva.',
+'nosuchusershort' => 'Nu ai dengún usuáriu llamau "$1". Compreba qu´esté bien escrebiu.',
'nouserspecified' => 'Ebis escrebil un nombri d´usuáriu.',
'mailmypassword' => 'Envialmi pol correu la consínia',
'noemail' => 'Nu ai emburacau dengún e-mail el usuáriu "$1".',
@@ -441,7 +441,7 @@
'searchresults' => 'Landeal resurtaus',
'searchsubtitle' => "Landeasti '''[[:$1]]'''",
'searchsubtitleinvalid' => "Landeasti '''$1'''",
-'noexactmatch' => "'''Nu desisti denguna páhina hucheá \"\$1\".''' Pueis [[:\$1|creala tú]].",
+'noexactmatch' => "'''Nu desisti denguna páhina e nombri \"\$1\".''' Pueis [[:\$1|creala tú]].",
'prevn' => '$1 anterioris',
'nextn' => '$1 siguientis',
'viewprevnext' => 'Vel ($1) ($2) ($3).',
@@ -601,7 +601,7 @@
'linkstoimage' => 'Las siguientis páhinas atihan a esti archivu:',
'nolinkstoimage' => 'Nu ai denguna páhina qu´atihi a esti archivu.',
'shareduploadwiki-linktext' => 'páhina e descrición el archivu',
-'noimage' => 'Nu desisti dengún archivu hucheau asina, pueis $1.',
+'noimage' => 'Nu desisti dengún archivu llamau asina, pueis $1.',
'noimage-linktext' => 'empuntalu',
'uploadnewversion-linktext' => 'Empuntal una nueva velsión d´esti archivu',
'imagelist_date' => 'Fecha',
@@ -1042,7 +1042,7 @@
'confirm_purge_button' => 'Dalcuerdu',
# AJAX search
-'searchnamed' => "Landeal artículus hucheaus ''$1''.",
+'searchnamed' => "Landeal artículus llamaus ''$1''.",
'articletitles' => "Artículus qu´esmiencin pol ''$1''",
'hideresults' => 'Açonchal resurtaus',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesFiu_vro.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesFiu_vro.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesFiu_vro.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -358,6 +358,8 @@
'editinginterface' => "'''Hoiatus:''' Sa toimõndat tarkvara pruukjapalgõ tekstiga lehte. Ku siin midä muudat, mõotas tuu pruukjapalõt.",
'sqlhidden' => '(SQL-perräküsümine käkit)',
'cascadeprotected' => 'Taa leht om kirotuskaidsõt, selle et taa kuulus alanolõvidõ kaidsõtuidõ lehti hulka:',
+'namespaceprotected' => "Sul olõ-i lubat toimõndaq nimeruumi '''$1''' lehti.",
+'customcssjsprotected' => 'Sul olõ-i lubat toimõndaq taad lehte, selle et tan om seen tõõsõ pruukja säädmiisi.',
# Login and logout pages
'logouttitle' => 'Nime alt välläminek',
@@ -448,6 +450,7 @@
'italic_sample' => 'Liuhkakiri',
'italic_tip' => 'Liuhkakiri',
'link_sample' => 'Lingitäv päälkiri',
+'link_tip' => 'Siselink',
'extlink_sample' => "http://www.välislink'.com Lingi nimi",
'extlink_tip' => 'Välislink (unõhtagu-i ette pandaq http://)',
'headline_sample' => 'Päälkiri',
@@ -567,7 +570,12 @@
'template-semiprotected' => '(ärqkaidsõduq nimeldä ja vahtsõq pruukjaq)',
'nocreatetitle' => 'Lehekülgi luuminõ piiret',
'nocreatetext' => 'Sa ei saaq luvvaq vahtsit lehti. Võit toimõndaq olõmanolõvit lehti vai minnäq nimega sisse. Ku sul olõ-i pruukjanimme, sis võit tuu hindäle [[Special:Userlogin|tetäq]].',
+'nocreate-loggedin' => 'Sul olõ-i lupa seon vikin vahtsit lehti luvvaq.',
+'permissionserrorstext' => 'Sul olõ-i lubat taad tetäq, {{PLURAL:$1|tuuperäst, et|tuuperäst, et}}:',
+'recreate-deleted-warn' => "'''Hoiatus: Sa proovit vahtsõst luvvaq lehte, miä om ärq kistutõt.'''
+Kas tahat taad lehte tõtõstõ toimõndaq? Kaeq ka sissekirotust seo lehe ärqkistutamisõ kotsilõ:",
+
# "Undo" feature
'undo-success' => "Tagasivõtminõ läts' kõrda. Kaeq üle, kas taa om tuu, midä sa tetäq tahtsõt ja pästäq muutusõq.",
'undo-failure' => 'Tagasivõtminõ lää-s kõrda samal aol tettüide muutmiisi vastaolo peräst. Võit muutusõq käsilde tagasi võttaq.',
@@ -575,8 +583,10 @@
# Account creation failure
'cantcreateaccounttitle' => 'Pruukjanime luuminõ lää-s kõrda',
-'cantcreateaccounttext' => "Pruukjanime luuminõ taa puutri võrgoaadrõsi ($1) alt om keelet. Taa põhjusõs või ollaq perräjätmäldä kur'ategemine, miä om toimõ pant taa puutri võrgoaadrõsi päält.",
+'cantcreateaccount-text' => "Pruukjanime luuminõ taa puutri võrgoaadrõsi päält (<b>$1</b>) om ärq keelet. Kiildjä: [[User:$3|$3]].
+$3 kirjäpant põhjus: ''$2''",
+
# History pages
'revhistory' => 'Toimõndamislugu',
'viewpagelogs' => 'Kaeq seo lehe muutmisnimekirjä.',
@@ -652,6 +662,7 @@
# Diffs
'difference' => '(Kujjõ lahkominegiq)',
'loadingrev' => 'Kujo laatminõ lahkominekide näütämise lehe jaos',
+'lineno' => 'Rida $1:',
'editcurrent' => 'Toimõndaq taa leheküle viimäst kujjo',
'selectnewerversionfordiff' => 'Valiq võrdõlõmisõs vahtsõmb kujo',
'selectolderversionfordiff' => 'Valiq võrdõlõmisõs vanõmb kujo',
@@ -683,6 +694,7 @@
# Preferences page
'preferences' => 'Säädmine',
'mypreferences' => 'Mu säädmiseq',
+'prefs-edits' => 'Tõimõndamiisi arv:',
'prefsnologin' => 'Sa olõ-i nimega sisse lännüq',
'prefsnologintext' => 'Et säädmiisi tetäq, tulõ sul [[Special:Userlogin|nimega sisse minnäq]].',
'prefsreset' => 'Su säädmiseq ommaq puutrimälo perrä tagasi tettüq.',
@@ -702,6 +714,7 @@
'math_unknown_error' => 'Tundmalda viga',
'math_unknown_function' => 'Tundmalda tallitus',
'math_lexing_error' => 'Vällälugõmisviga',
+'math_syntax_error' => 'Süntaksiviga',
'math_image_error' => 'PNG-muutus lää-s kõrda; kaeq üle, et latex, dvips, gs ja convert ommaq õigõhe paika säedüq',
'math_bad_tmpdir' => 'Matõmaatigateksti kirotaminõ aotlistõ kausta vai taa kausta luuminõ ei lääq kõrdaq',
'math_bad_output' => 'Matõmaatigateksti kirotaminõ välläandmiskausta vai sääntse kausta luuminõ ei lääq kõrda',
@@ -830,6 +843,7 @@
'uploadedfiles' => 'Üleslaadiduq teedüstüq',
'ignorewarning' => 'Pangu-i hoiatust tähele ja pästäq tuugiperäst.',
'ignorewarnings' => 'Pangu-i üttegi hoiatust tähele',
+'minlength1' => 'Teedüstünimen piät olõma vähämbält üts täht.',
'illegalfilename' => 'Teedüstü nimen "$1" om lehenime jaos lubamaldaq märke. Vaihtaq teedüstü nimme ja prooviq taa vahtsõst üles laatiq.',
'badfilename' => 'Teedüstü nimi om ärq muudõt. Vahtsõnõ nimi om "$1".',
'filetype-badmime' => 'Teedüstüid, mink MIME-tüüp om "$1" tohe-i üles laatiq.',
@@ -854,6 +868,7 @@
'uploadwarning' => 'Üleslaatmishoiatus',
'savefile' => 'Pästäq teedüstü ärq',
'uploadedimage' => 'laadõ üles "$1"',
+'overwroteimage' => 'üles laadit "[[$1]]" vahtsõnõ kujo',
'uploaddisabled' => 'Üleslaatminõ lää-s kõrda',
'uploaddisabledtext' => 'Teedüstüide üleslaatminõ om seon vikin kinniq pant.',
'uploadscripted' => 'Seol teedüstül om HTML-kuud vai skripte, minkast võrgokaeja või võlssi arvo saiaq.',
@@ -863,7 +878,10 @@
'destfilename' => 'Teedüstü nimi vikin',
'watchthisupload' => 'Kaeq taa lehe perrä',
'filewasdeleted' => 'Sääntse nimega teedüstü om jo üles laadit ja sis ärq kistutõt. Kaeq üle $1 inne ku nakkat jälq üles laatma.',
+'upload-wasdeleted' => "'''Hoiatus: Sa proovit üles laatiq teedüstüt, miä om innemb ärq kistutõt.'''
+Kas olõt kimmäs, et tahat taad üles laatiq? Kaeq ka sissekirotust taa teedüstü ärqkistutamisõ kotsilõ:",
+
'upload-proto-error' => 'Viganõ protokoll',
'upload-proto-error-text' => 'Üles saa laatiq õnnõ aadrõssidõ päält, mink alostusõn om <code>http://</code> vai <code>ftp://</code>.',
'upload-file-error' => 'Sisemäne viga',
@@ -879,6 +897,7 @@
'license' => 'Litsents',
'nolicense' => 'Olõ-i litsentsi valit',
+'license-nopreview' => '(Saa-i kaiaq)',
'upload_source_url' => ' (avalik tüütäv võrgoaadrõs)',
'upload_source_file' => ' (teedüstü su puutrin)',
@@ -894,6 +913,16 @@
'imgdelete' => 'kistudaq',
'imgdesc' => 'seletüs',
'imgfile' => 'teedüstü',
+'filehist' => 'Teedüstü aolugu',
+'filehist-help' => "Klõpsaq kuupäävä/kelläao pääl, et nätäq määne taa teedüstü sis oll'.",
+'filehist-deleteall' => 'kistudaq kõik ärq',
+'filehist-deleteone' => 'kistudaq taa ärq',
+'filehist-revert' => 'võtaq tagasi',
+'filehist-current' => 'parhillanõ',
+'filehist-datetime' => 'Kuupäiv/Kelläaig',
+'filehist-user' => 'Pruukja',
+'filehist-filesize' => 'Teedüstü suurus',
+'filehist-comment' => 'Seletüs:',
'imagelinks' => 'Pildilingiq',
'linkstoimage' => 'Taa pildi pääle näütäseq leheküleq:',
'nolinkstoimage' => 'Taa pildi pääle näütä-i ütski lehekülg.',
@@ -910,6 +939,20 @@
'imagelist_description' => 'Seletüs',
'imagelist_search_for' => 'Pildi nime otsminõ:',
+# File reversion
+'filerevert' => 'Võtaq tagasi $1',
+'filerevert-legend' => 'Võtaq tagasi teedüstü',
+'filerevert-submit' => 'Võtaq tagasi',
+
+# File deletion
+'filedelete' => 'Kistudaq ärq $1',
+'filedelete-legend' => 'Kistudaq teedüstü ärq',
+'filedelete-intro' => "Sa kistutat ärq '''[[Media:$1|$1]]'''.",
+'filedelete-comment' => 'Seletüs:',
+'filedelete-submit' => 'Kistudaq',
+'filedelete-success' => "'''$1''' om ärq kistutõt.",
+'filedelete-nofile' => "'''$1''' olõ-i seo lehe pääl.",
+
# MIME search
'mimesearch' => 'MIME-otsminõ',
'mimesearch-summary' => 'Taa lehe pääl saat otsiq teedüstüid näide MIME-tüübi perrä. Kirodaq: sisutüüp/alltüüp, nt <tt>image/jpeg</tt>.',
@@ -971,6 +1014,7 @@
'uncategorizedpages' => 'Katõgoorijilda leheq',
'uncategorizedcategories' => 'Katõgoorijilda katõgooriaq',
'uncategorizedimages' => 'Katõgoorijilda pildiq',
+'uncategorizedtemplates' => 'Katõgoorialdaq näüdüseq',
'unusedcategories' => 'Pruukmalda katõgooriaq',
'unusedimages' => 'Pruukmaldaq pildiq',
'popularpages' => "Pall'okäütüq leheküleq",
@@ -978,6 +1022,7 @@
'wantedpages' => 'Kõgõ tahetumbaq artikliq',
'mostlinked' => 'Leheq, kohe om kõgõ rohkõmb linke',
'mostlinkedcategories' => 'Katõgooriaq, kohe om kõgõ rohkõmb linke',
+'mostlinkedtemplates' => 'Näüdüseq, kohe näütäs kõgõ rohkõmb linke',
'mostcategories' => 'Artikliq, mil om kõgõ rohkõmb katõgoorijit',
'mostimages' => 'Pildiq, mil om kõgõ rohkõmb katõgoorijit',
'mostrevisions' => 'Artikliq, mil om kõgõ rohkõmb toimõnduisi',
@@ -1041,6 +1086,7 @@
'allpagessubmit' => 'Näütäq',
'allpagesprefix' => 'Näütäq lehti, mink alostusõn om:',
'allpagesbadtitle' => "Taa päälkiri oll' viganõ vai vikidevaihõlidsõ edejakuga. Tan või ollaq märke, midä tohe-i päälkir'on pruukiq.",
+'allpages-bad-ns' => '{{SITENAME}}n olõ-i nimeruumi "$1".',
# Special:Listusers
'listusersfrom' => 'Näütäq pruukjit alostõn:',
@@ -1236,6 +1282,7 @@
'undelete-no-results' => 'Kistutamiisi nimekiräst lövvetä-s säänest lehte.',
# Namespace form on various pages
+'namespace' => 'Nimeruum:',
'invert' => 'Näütäq kõiki päält validu nimeruumi',
'blanknamespace' => '(Artikliq)',
@@ -1247,6 +1294,8 @@
'ucnote' => 'Näüdätäseq taa pruukja tettüid <b>$1</b> viimäst muutmist viimädse <b>$2</b> päävä seen.',
'uclinks' => 'Näütäq viimäst $1 muutmist; viimädse $2 päävä seen.',
'uctop' => ' (kõgõ vahtsõmb)',
+'month' => 'Alostõn kuust (ja varrampa):',
+'year' => 'Alostõn aastagast (ja varrampa):',
'sp-contributions-newest' => 'Kõgõ vahtsõmbaq',
'sp-contributions-oldest' => 'Kõgõ vanõmbaq',
@@ -1262,17 +1311,19 @@
'sp-newimages-showfrom' => 'Näütäq vahtsit pilte kuupääväst $1 pääle',
# What links here
-'whatlinkshere' => 'Siiäq näütäjäq lingiq',
-'notargettitle' => 'Otsitut lehte olõ-i',
-'notargettext' => 'Sa olõ-i andnuq lehte ega pruukjat, minka taad tallitust tetäq.',
-'linklistsub' => '(Linke nimekiri)',
-'linkshere' => 'Lehe <b>[[:$1]]</b> pääle näütäseq lingiq lehti päält:',
-'nolinkshere' => 'Lehe <b>[[:$1]]</b> pääle näütä-i linke ütegi lehe päält.',
-'nolinkshere-ns' => "Valitun nimeruumin näütä-i ütegi lehe päält linke lehe '''[[:$1]]''' pääle.",
-'isredirect' => 'ümbresaatmislehekülg',
-'istemplate' => 'pruugit näüdüssen',
-'whatlinkshere-prev' => '← {{PLURAL:$1|mineväne leht|$1 mineväst lehte}}',
-'whatlinkshere-next' => '{{PLURAL:$1|mineväne leht|$1 mineväst lehte}} →',
+'whatlinkshere' => 'Siiäq näütäjäq lingiq',
+'whatlinkshere-title' => 'Leheq, miä näütäseq lehe $1 pääle',
+'notargettitle' => 'Otsitut lehte olõ-i',
+'notargettext' => 'Sa olõ-i andnuq lehte ega pruukjat, minka taad tallitust tetäq.',
+'linklistsub' => '(Linke nimekiri)',
+'linkshere' => 'Lehe <b>[[:$1]]</b> pääle näütäseq lingiq lehti päält:',
+'nolinkshere' => 'Lehe <b>[[:$1]]</b> pääle näütä-i linke ütegi lehe päält.',
+'nolinkshere-ns' => "Valitun nimeruumin näütä-i ütegi lehe päält linke lehe '''[[:$1]]''' pääle.",
+'isredirect' => 'ümbresaatmislehekülg',
+'istemplate' => 'pruugit näüdüssen',
+'whatlinkshere-prev' => '← {{PLURAL:$1|mineväne leht|$1 mineväst lehte}}',
+'whatlinkshere-next' => '{{PLURAL:$1|mineväne leht|$1 mineväst lehte}} →',
+'whatlinkshere-links' => '← lingiq',
# Block/unblock
'blockip' => 'Piäq puutri võrgoaadrõs kinniq',
@@ -1280,6 +1331,7 @@
'ipaddress' => 'Puutri võrgoaadrõs (IP)',
'ipadressorusername' => 'Puutri võrgoaadrõs vai pruukjanimi',
'ipbexpiry' => 'Tähtaig',
+'ipbreason' => 'Põhjus',
'ipbreasonotherlist' => 'Muu põhjus',
'ipbreason-dropdown' => "*Hariliguq kinniqpidämise põhjusõq
** Võlss teedüse kirotaminõ
@@ -1291,6 +1343,7 @@
** Sündümäldäq pruukjanimi",
'ipbanononly' => 'Piäq kinniq õnnõ ilma nimeldä pruukjaq',
'ipbcreateaccount' => 'Lasku-i pruukjanimme luvvaq',
+'ipbemailban' => 'Lubagu-i pruukjal e-posti saataq',
'ipbenableautoblock' => 'Piäq kinniq viimäne puutri võrgoaadrõs, kost pruukja om toimõnduisi tennüq, ja edespiten aadrõsiq, kost tä viil pruuv toimõnduisi tetäq.',
'ipbsubmit' => 'Piäq taa aadrõs kinniq',
'ipbother' => 'Muu tähtaig',
@@ -1313,6 +1366,8 @@
'unblocked' => 'Pruukja [[User:$1|$1]] kinniqpidämine om ärq lõpõtõt',
'unblocked-id' => '$1 kinniqpidämine võeti maaha',
'ipblocklist' => 'Kinniqpeetüisi IP-aadrõssidõ nimekiri',
+'ipblocklist-legend' => 'Otsiq kinniqpeetüt pruukjat',
+'ipblocklist-username' => 'Pruukjanimi vai puutri võrgoaadrõs:',
'ipblocklist-submit' => 'Otsiq',
'blocklistline' => '$1 — $2 om kinniq pidänüq pruukja $3 ($4)',
'infiniteblock' => 'igäveste',
@@ -1320,6 +1375,7 @@
'anononlyblock' => 'õnnõ nimeldä pruukjaq',
'noautoblockblock' => 'automaatsõ kinniqpidämiseldä',
'createaccountblock' => 'pruukjanime luuminõ kinniq pant',
+'emailblock' => 'e-post kinniq peet',
'ipblocklist-empty' => 'Kinniqpidämiisi nimekiri om tühi.',
'ipblocklist-no-results' => 'Taa puutri võrgoaadrõss vai pruukjanimi olõ-i kinniq peet.',
'blocklink' => 'piäq kinniq',
@@ -1333,6 +1389,7 @@
'block-log-flags-anononly' => 'õnnõ nimeldä pruukjaq',
'block-log-flags-nocreate' => 'pruukjanime luuminõ kinniq peet',
'block-log-flags-noautoblock' => 'automaatnõ kinniqpidämine maaha võet',
+'block-log-flags-noemail' => 'e-post kinniq peet',
'range_block_disabled' => 'Kõrraldaja kinniqpidämisõigusõq olõ-i masma pantuq',
'ipb_expiry_invalid' => 'Viganõ tähtaig.',
'ipb_already_blocked' => '"$1" om jo kinniq peet',
@@ -1375,10 +1432,12 @@
'movearticle' => 'Panõq artiklilehekülg tõistõ paika',
'movenologin' => 'Sa olõ-i nimega sisse lännüq',
'movenologintext' => 'Et lehekülge tõistõ paika pandaq, piät hindä pruukjas kirjä pandma ja [[Special:Userlogin|nimega sisse minemä]]',
+'movenotallowed' => 'Sul olõ-i lupa seon vikin lehti tõistõ paika nõstaq.',
'newtitle' => 'Vahtsõ päälkirä ala',
'move-watch' => 'Kaeq taa lehe perrä',
'movepagebtn' => 'Panõq artikli tõistõ paika',
'pagemovedsub' => 'Artikli om tõistõ paika pant',
+'movepage-moved' => '<big>\'\'\'"$1" om pant nime ala "$2"\'\'\'</big>', # The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.
'articleexists' => 'Sääntse nimega artikli om jo olõman vai olõ-i lubat säänest nimme valliq. Valiq vahtsõnõ nimi.',
'talkexists' => 'Artikli om tõistõ paika pant, a arotuslehekülge saa-s pandaq, selle et vahtsõ nime all om jo arotuskülg. Panõq arotusküleq esiq kokko.',
'movedto' => 'Pant päälkirä ala:',
@@ -1588,7 +1647,6 @@
'patrol-log-page' => 'Muutmiisi ülekaemiisi nimekiri',
'patrol-log-line' => 'märke lehe $2 muutmisõ $1 ülekaetus $3',
'patrol-log-auto' => '(automaatnõ)',
-'patrol-log-diff' => 'r$1',
# Image deletion
'deletedrevision' => 'Kistutõdi ärq vana kujo $1.',
@@ -1953,12 +2011,6 @@
'autoredircomment' => 'Ümbresaatminõ lehele [[$1]]',
'autosumm-new' => 'Vahtsõnõ leht: $1',
-# Size units
-'size-bytes' => '$1 B',
-'size-kilobytes' => '$1 KB',
-'size-megabytes' => '$1 MB',
-'size-gigabytes' => '$1 GB',
-
# Live preview
'livepreview-loading' => 'Laat…',
'livepreview-ready' => 'Laat… Valmis!',
@@ -1972,16 +2024,21 @@
'lag-warn-high' => 'Teedüskogoserveri aiglusõ peräst pruugi-i $1 sekundist värskimbit muutmiisi nimekirän nätäq ollaq.',
# Watchlist editor
-'watchlistedit-noitems' => 'Perräkaemisnimekirän olõ-i üttegi päälkirjä.',
-'watchlistedit-clear-title' => 'Tiiq perräkaemisnimekiri tühäs',
-'watchlistedit-clear-legend' => 'Tiiq perräkaemisnimekiri tühäs',
-'watchlistedit-clear-submit' => 'Kistudaq',
-'watchlistedit-normal-title' => 'Toimõndaq perräkaemisnimekirjä',
-'watchlistedit-raw-titles' => 'Päälkiräq:',
-'watchlistedit-raw-submit' => 'Vahtsõndaq perräkaemisnimekirjä',
-'watchlistedit-raw-done' => 'Perräkaemisniekiri om ärq vahtsõndõt.',
-'watchlistedit-raw-added' => 'Mano pant {{PLURAL:$1|1 päälkiri|$1 päälkirjä}}:',
-'watchlistedit-raw-removed' => 'Ärq kistutõt {{PLURAL:$1|1 päälkiri|$1 päälkirjä}}:',
+'watchlistedit-numitems' => 'Su perräkaemisnimekirän om {{PLURAL:$1|1 päälkiri|$1 päälkirjä}}, arotusleheq vällä arvaduq.',
+'watchlistedit-noitems' => 'Perräkaemisnimekirän olõ-i üttegi päälkirjä.',
+'watchlistedit-clear-title' => 'Tiiq perräkaemisnimekiri tühäs',
+'watchlistedit-clear-legend' => 'Tiiq perräkaemisnimekiri tühäs',
+'watchlistedit-clear-confirm' => 'Kas olõt kimmäs, et tahat umast perräkaemisnimekiräst kõiki päälkirjo ärq kistutaq? Sa võit päälkirjo ärq kistutaq ka [[Special:Watchlist/edit|üteviisi]].',
+'watchlistedit-clear-submit' => 'Kistudaq',
+'watchlistedit-clear-done' => 'Su perräkaemisnimekiri om tühi. Kõik päälkiräq ommaq ärq kistutõduq.',
+'watchlistedit-normal-title' => 'Toimõndaq perräkaemisnimekirjä',
+'watchlistedit-normal-legend' => 'Kistudaq päälkiräq perräkaemisnimekiräst ärq',
+'watchlistedit-normal-submit' => 'Kistudaq päälkiräq ärq',
+'watchlistedit-raw-titles' => 'Päälkiräq:',
+'watchlistedit-raw-submit' => 'Vahtsõndaq perräkaemisnimekirjä',
+'watchlistedit-raw-done' => 'Perräkaemisniekiri om ärq vahtsõndõt.',
+'watchlistedit-raw-added' => 'Mano pant {{PLURAL:$1|1 päälkiri|$1 päälkirjä}}:',
+'watchlistedit-raw-removed' => 'Ärq kistutõt {{PLURAL:$1|1 päälkiri|$1 päälkirjä}}:',
# Watchlist editing tools
'watchlisttools-edit' => 'Kaeq ja toimõndaq perräkaemisnimekirjä',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesGan.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesGan.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesGan.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -12,7 +12,7 @@
'tog-underline' => '下劃連結',
'tog-highlightbroken' => '非法連結格式<a href="" class="new">像咁樣</a> (或者像咁樣<a href="" class="internal">?</a>).',
'tog-justify' => '對到段落',
-'tog-hideminor' => '最近嗰更改中隱藏小修改',
+'tog-hideminor' => '最近嗰更改中弆到細修改',
'tog-extendwatchlist' => '增加監視清單來顯示所有可採用嗰更改',
'tog-usenewrc' => '加強最近嗰更改(JavaScript)',
'tog-numberheadings' => '標題自動編號',
@@ -27,7 +27,7 @@
'tog-watchdefault' => '拿偶改咭嗰頁面加到偶嗰監視列表',
'tog-watchmoves' => '拿偶動咭嗰頁面加到偶嗰監視列表',
'tog-watchdeletion' => '拿偶刪撇嗰頁面加到偶嗰監視列表',
-'tog-minordefault' => '全部嗰編輯設成小修改',
+'tog-minordefault' => '全部嗰編輯設成細修改',
'tog-previewontop' => '在編輯框嗰上頭顯示預覽',
'tog-previewonfirst' => '頭道修改時顯示預覽',
'tog-nocache' => '停用頁面嗰緩存',
@@ -44,13 +44,13 @@
'tog-forceeditsummary' => '冇有修改注解時要跟偶話',
'tog-watchlisthideown' => '監視列表弆到偶嗰編輯',
'tog-watchlisthidebots' => '監視列表弆到機器人嗰編輯',
-'tog-watchlisthideminor' => '監視列表弆到小修改',
+'tog-watchlisthideminor' => '監視列表弆到細修改',
'tog-nolangconversion' => '嫑字轉換',
'tog-ccmeonemails' => '偶發email到人家時也發封副本到偶',
-'tog-diffonly' => '比較兩隻版本差異時不顯示文章內容',
+'tog-diffonly' => '比較兩隻版本差異時伓顯示文章內容',
'underline-always' => '總歸要用',
-'underline-never' => '絕不使用',
+'underline-never' => '絕伓使用',
'underline-default' => '瀏覽器預設',
'skinpreview' => '（預覽）',
@@ -144,8 +144,421 @@
# Metadata in edit box
'metadata_help' => '元數據:',
-'errorpagetitle' => '錯誤',
-'returnto' => '回到$1。',
-'tagline' => '出自{{SITENAME}}',
+'errorpagetitle' => '錯誤',
+'returnto' => '回到$1。',
+'tagline' => '出自{{SITENAME}}',
+'help' => '幫助',
+'search' => '撏',
+'searchbutton' => '撏',
+'go' => '去',
+'searcharticle' => '去',
+'history' => '文章歷史',
+'history_short' => '歷史',
+'updatedmarker' => '最晏次瀏覽後嗰改動',
+'info_short' => '消息',
+'printableversion' => '可打印版本',
+'permalink' => '永久連結',
+'print' => '打印',
+'edit' => '編寫',
+'editthispage' => '編寫箇頁',
+'delete' => '刪吥去',
+'deletethispage' => '刪吥箇頁',
+'undelete_short' => '反刪吥$1嗰修改',
+'protect' => '保護',
+'protect_change' => '更改保護',
+'protectthispage' => '保護箇頁',
+'unprotect' => '解除保護',
+'unprotectthispage' => '解除保護箇頁',
+'newpage' => '新文章',
+'talkpage' => '談吖箇頁',
+'talkpagelinktext' => '談坨',
+'specialpage' => '特殊頁',
+'personaltools' => '個人工具',
+'postcomment' => '話嚸意見',
+'articlepage' => '看吖文章',
+'talk' => '談坨',
+'views' => '眵',
+'toolbox' => '工具盒',
+'userpage' => '眵吖用戶頁',
+'projectpage' => '眵吖計畫頁',
+'imagepage' => '眵吖圖像頁',
+'mediawikipage' => '眵吖消息頁',
+'templatepage' => '眵吖模板頁',
+'viewhelppage' => '眵吖幫助頁',
+'categorypage' => '眵吖分類頁',
+'viewtalkpage' => '眵吖討論頁',
+'otherlanguages' => '別嗰話',
+'redirectedfrom' => '(從$1跳過來)',
+'redirectpagesub' => '跳轉頁',
+'lastmodifiedat' => '箇頁最晏嗰修改係 $1 $2。', # $1 date, $2 time
+'viewcount' => '箇頁拕人眵咭$1次。',
+'protectedpage' => '拕保護頁',
+'jumpto' => '跳到:',
+'jumptonavigation' => '導航',
+'jumptosearch' => '撏',
+# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
+'aboutsite' => '關於 {{SITENAME}}',
+'aboutpage' => '{{ns:project}}:關於',
+'bugreports' => '報告錯誤',
+'bugreportspage' => '{{ns:project}}:錯報報告',
+'copyright' => '箇版嗰內容係根據$1嗰條款發佈。',
+'copyrightpagename' => '{{SITENAME}} 版權',
+'copyrightpage' => '{{ns:project}}:版權資訊',
+'currentevents' => '新出嗰事',
+'currentevents-url' => '{{ns:project}}:新出嗰事',
+'disclaimers' => '免責聲明',
+'disclaimerpage' => '{{ns:project}}:免責聲明',
+'edithelp' => '編寫幫助',
+'edithelppage' => '{{ns:help}}:啷編寫文章',
+'faq' => 'FAQ',
+'helppage' => '{{ns:help}}:説明',
+'mainpage' => '封面',
+'policy-url' => '{{ns:project}}:政策',
+'portal' => '社區',
+'portal-url' => '{{ns:project}}:社區',
+'privacy' => '隱私政策',
+'privacypage' => '{{ns:project}}:隱私政策',
+'sitesupport' => '贊助',
+'sitesupport-url' => '{{ns:project}}:贊助',
+
+'badaccess' => '許可權錯誤',
+'badaccess-group0' => '倷嗰要求冇拕批准。',
+'badaccess-group1' => '倷嗰要求只有$1嗰用戶才執行得正。',
+'badaccess-group2' => '倷嗰要求只有$1嗰用戶才執行得正。',
+'badaccess-groups' => '倷嗰要求只有$1嗰用戶才執行得正。',
+
+'versionrequired' => '需要$1版嗰mediawiki',
+'versionrequiredtext' => '$1版嗰mediawiki才能用箇頁。參看[[Special:Version|版本頁]]。',
+
+'retrievedfrom' => '版本頁 "$1"',
+'youhavenewmessages' => '倷有 $1 ($2).',
+'newmessageslink' => '新消息',
+'newmessagesdifflink' => '最晏嗰改動',
+'youhavenewmessagesmulti' => '$1 上有倷嗰新消息',
+'editsection' => '編寫',
+'editold' => '編寫',
+'editsectionhint' => '編寫段落: $1',
+'toc' => '目錄',
+'showtoc' => '展開',
+'hidetoc' => '收到',
+'thisisdeleted' => '眵吖或還原$1？',
+'viewdeleted' => '眵吖$1?',
+'restorelink' => '$1隻拕刪吥嗰版本',
+'feedlinks' => '鎖定:',
+'feed-invalid' => '冇用嗰鎖定類型。',
+
+# Short words for each namespace, by default used in the 'article' tab in monobook
+'nstab-main' => '文章',
+'nstab-user' => '用戶頁',
+'nstab-media' => '媒體頁',
+'nstab-special' => '特殊頁',
+'nstab-project' => '計畫頁',
+'nstab-image' => '檔案',
+'nstab-mediawiki' => '消息',
+'nstab-template' => '模版',
+'nstab-help' => '説明頁',
+'nstab-category' => '分類',
+
+# Main script and global functions
+'nosuchaction' => '冇有箇隻命令',
+'nosuchactiontext' => 'Wiki識別伓到箇隻URL命令',
+'nosuchspecialpage' => '冇有箇隻特殊頁',
+'nospecialpagetext' => "'''<big>倷要求嗰特殊頁冇有用。</big>'''
+
+[[Special:Specialpages]]上可以撏到用得上嗰特殊頁。",
+
+# General errors
+'error' => '錯誤',
+'databaseerror' => '資料庫錯誤',
+'dberrortext' => '資料庫查詢語法有錯。
+可能係軟件有錯。
+最晏嗰資料庫指令係:
+<blockquote><tt>$1</tt></blockquote>
+來自函數 "<tt>$2</tt>"。
+MySQL回到錯誤 "<tt>$3: $4</tt>"。',
+'dberrortextcl' => '資料庫查詢語法有錯。
+最晏嗰資料庫指令係:
+“$1”
+來自函數“$2”。
+MySQL回到錯誤“$3: $4”。',
+'noconnect' => '對伓住！wiki碰到咭技術問題，連伓到資料庫服務器。<br />
+$1',
+'nodb' => '選伓正服務器 $1',
+'cachederror' => '底下係請求頁嗰緩存副本，可能伓係最新嗰。',
+'laggedslavemode' => '警告：頁面可能冇有新近內容。',
+'readonly' => '資料庫上咭鎖',
+'enterlockreason' => '請輸入鎖到資料庫嗰理由，包括預計幾時間解鎖',
+'readonlytext' => '資料庫上咭鎖改伓正，可能佢正在維修，搞正咭仰上會還原。管理員嗰解釋： $1',
+'missingarticle' => '資料庫撏伓到倷要嗰文章。"$1"通常係因為修訂頁上過時嗰連結連到刪撇咭嗰文章搞得。如果伓係倷碰到軟件嗰一隻錯誤，恁就請到URL位置，再報告話到管理員聽。',
+'readonly_lag' => '附屬資料庫服務器在拿緩存更新到主服務器，資料庫自動鎖到咭',
+'internalerror' => '內部錯誤',
+'internalerror_info' => '內部錯誤: $1',
+'filecopyerror' => '複製伓正檔案 "$1" 到 "$2"。',
+'filerenameerror' => '重命名伓正檔案 "$1" 到 "$2"。',
+'filedeleteerror' => '刪伓正檔案 "$1"。',
+'directorycreateerror' => '創建伓正目錄 "$1"。',
+'filenotfound' => '撏伓正到檔案 "$1"。',
+'fileexistserror' => '文件 "$1" 寫伓正進去：佢已存在',
+'unexpected' => '伓正常值： "$1"="$2"。',
+'formerror' => '錯誤：交伓正表格',
+'badarticleerror' => '箇隻操作在箇頁上用伓正。',
+'cannotdelete' => '選正嗰頁面或圖像刪伓正。（佢可能拕人家刪吥咭。）',
+'badtitle' => '錯誤嗰標題',
+'badtitletext' => '所要求嗰頁面標題伓正確，伓存在，跨語言或跨wiki連結。標題錯誤，佢可能有隻或好幾隻伓合嗰標題字符。',
+'perfdisabled' => '對伓住！箇隻操作可能會癱瘓資料庫，所以要暫停使用。',
+'perfcached' => '底下係緩存資料，可能伓係最新嗰。',
+'perfcachedts' => '底下係緩存資料，佢最晏更新嗰時間係 $1。',
+'querypage-no-updates' => '箇頁目前改伓正，佢嗰資料伓能仰上更新。',
+'wrong_wfQuery_params' => '參數錯誤斢到咭 wfQuery()<br />
+函數： $1<br />
+查詢： $2',
+'viewsource' => '原始碼',
+'viewsourcefor' => '$1 嗰原始碼',
+'protectedpagetext' => '箇頁鎖到咭，改伓正。',
+'viewsourcetext' => '倷可以眵吖或複製箇頁嗰原始碼：',
+'protectedinterface' => '箇頁給出咭軟件嗰界面文本，佢拕鎖到怕人亂動。',
+'editinginterface' => "'''警告'''：倷在編寫嗰頁面係用來提供軟件嗰界面文本，改動箇頁會礙到別嗰用戶嗰界面外觀。",
+'sqlhidden' => '(SQL 弆到嗰查詢)',
+'cascadeprotected' => '箇頁已拕保護，因為佢拕「聯鎖保護」嗰{{PLURAL:$1|一隻|幾隻}}拕保護頁包到：
+$2',
+'namespaceprotected' => "倷冇權編寫'''$1'''空間裡面嗰頁面。",
+'customcssjsprotected' => '倷冇權編寫箇頁，佢含到別嗰用戶嗰個人設定。',
+'ns-specialprotected' => '編寫伓正{{ns:special}}空間嗰頁面。',
+
+# Login and logout pages
+'logouttitle' => '用戶退出',
+'logouttext' => '<strong>倷退出咭。</strong><br />
+倷可以接到匿名使用{{SITENAME}}，或重登入過，隻把子頁面可能會接到話倷係登入狀態，除非係倷刪吥瀏覽器緩存。',
+'welcomecreation' => '== 歡迎, $1! ==
+
+建正咭倷嗰帳戶，嫑忘吥設置{{SITENAME}}嗰個人參數。',
+'loginpagetitle' => '用戶登入',
+'yourname' => '用戶名：',
+'yourpassword' => '密碼：',
+'yourpasswordagain' => '輸過道密碼：',
+'remembermypassword' => '讓電腦記到密碼',
+'yourdomainname' => '倷嗰域名：',
+'externaldberror' => '外部驗證資料庫出錯，或倷更新伓正倷嗰外部帳戶。',
+'loginproblem' => '<b>登入出錯。</b><br />重試吖看！',
+'login' => '登入',
+'loginprompt' => '要開到cookies才能登入 {{SITENAME}}。',
+'userlogin' => '登入/新開隻帳戶',
+'logout' => '退出',
+'userlogout' => '退出',
+'notloggedin' => '冇登入',
+'nologin' => '倷冇有帳戶？ $1.',
+'nologinlink' => '開隻新帳戶',
+'createaccount' => '開隻新帳戶',
+'gotaccount' => '有咭帳戶？ $1.',
+'gotaccountlink' => '登入',
+'createaccountmail' => '通過email',
+'badretype' => '倷輸嗰密碼伓合。',
+'userexists' => '倷輸嗰用戶名係人家嗰，選過隻嘍！',
+'username' => '用戶名：',
+'uid' => '用戶ID：',
+'yourrealname' => '真名：',
+'yourlanguage' => '語言：',
+'yourvariant' => '轉換字體',
+'yournick' => '花名：',
+'badsig' => '原始簽名錯誤，請檢查HTML。',
+'badsiglength' => '花名咁長？佢嗰長度要在$1隻字符以內。',
+'prefs-help-realname' => '真名係選填嗰，要係倷填咭，倷嗰作品就會標到倷嗰名字。',
+'loginerror' => '登入錯誤',
+'prefs-help-email' => 'email係選填嗰，佢可以讓伓認得倷嗰人通過email聯繫正倷。',
+'nocookiesnew' => '帳戶扤正咭！測到倷關吥咭Cookies，麻煩倷開到佢再登入。',
+'nocookieslogin' => '箇裡要用 Cookies 登入，測到倷關吥咭Cookies，麻煩倷開到佢再登入。',
+'noname' => '倷冇輸正有效嗰用戶名。',
+'loginsuccesstitle' => '登入正咭',
+'loginsuccess' => '倷在用"$1"嗰身份登到{{SITENAME}}。',
+'nosuchuser' => '箇裡冇有叫"$1"嗰用戶。眵吖倷嗰拼寫，要伓建過隻新帳戶。',
+'nosuchusershort' => '箇裡冇有叫"$1"嗰用戶。請眵吖倷嗰拼寫。',
+'nouserspecified' => '倷要指正一隻用戶名。',
+'wrongpassword' => '倷輸嗰密碼錯誤伓對，請試過吖囉。',
+'wrongpasswordempty' => '倷冇輸入密碼，請試過吖囉。',
+'passwordtooshort' => '倷嗰密碼伓對或太短嘞，佢最少要有$1隻字元，接到還要同用戶名伓同。',
+'mailmypassword' => '拿新密碼寄到偶',
+'passwordremindertitle' => '{{SITENAME}}嗰密碼提醒',
+'passwordremindertext' => '有人(可能係倷，IP位址$1)要偶人拿新嗰{{SITENAME}} ($4) 嗰登入密碼寄到倷。眼下用戶"$2"嗰密碼係"$3"。請仰上就登錄同到換吥密碼。如果係別嗰人發嗰請求，或者倷撏回咭倷嗰密碼，伓想改佢，倷可以嫑搭箇隻消息，繼續用舊密碼。',
+'noemail' => '冇有用戶"$1"嗰email地址。',
+'passwordsent' => '新嗰密碼已經寄到用戶"$1"嗰email去嘍。收到後請再登入過。',
+'blocked-mailpassword' => '倷嗰IP地址拕封到咭。伓可以用密碼復原功能以防止濫用。',
+'eauthentsent' => '確認email寄到話正嗰地址去嘍。在別嗰email發到箇隻帳戶之前，起先倷要按箇封email話嗰佢係否倷嗰。',
+'throttled-mailpassword' => '密碼提醒在$1鐘頭之前發出咭。怕別嗰亂用，$1隻鐘頭之內只會發送一隻密碼提醒。',
+'mailerror' => '發送email錯誤: $1',
+'acct_creation_throttle_hit' => '對伓住，倷建咭$1隻帳號。倷再建伓正囉。',
+'emailauthenticated' => '倷嗰email已經拕$1確認有效嘍。',
+'emailnotauthenticated' => '倷嗰email<strong>還冇拕認證</strong>。底下嗰功能都伓會發任何郵件。',
+'noemailprefs' => '<strong>話正隻email來用箇隻功能</strong>',
+'emailconfirmlink' => '確認倷嗰email',
+'invalidemailaddress' => 'email嗰格式伓合，請輸隻正確嗰email位址或清吥箇隻空格。',
+'accountcreated' => '帳戶扤正嘍',
+'accountcreatedtext' => '扤正嘍$1嗰帳戶。',
+'loginlanguagelabel' => '語言: $1',
+
+# Password reset dialog
+'resetpass' => '重設帳戶密碼',
+'resetpass_announce' => '倷係用到臨時email嗰代碼登入嗰。要登正入，倷要在箇裡設定隻新密碼:',
+'resetpass_header' => '設過密碼',
+'resetpass_submit' => '設定密碼同到登入',
+'resetpass_success' => '倷嗰密碼改正嘍！正幫倷登入...',
+'resetpass_bad_temporary' => '冇用嗰臨時密碼。可能倷改正咭倷嗰密碼，或者重新要過隻新嗰臨時密碼。',
+'resetpass_forbidden' => 'wiki 上改伓正密碼',
+'resetpass_missing' => '撏伓到資料。',
+
+# Edit page toolbar
+'bold_sample' => '粗體字',
+'bold_tip' => '粗體字',
+'italic_sample' => '斜體字',
+'italic_tip' => '斜體字',
+'link_sample' => '連結標題',
+'link_tip' => '內部連結',
+'extlink_sample' => 'http://www.example.com 連結標題',
+'extlink_tip' => '外部連結(頭上加 http://)',
+'headline_sample' => '標題文字',
+'headline_tip' => '二級標題',
+'math_sample' => '在箇裡扻入數學公式',
+'math_tip' => '數學公式 (LaTeX)',
+'nowiki_sample' => '在箇裡扻入非格式文本',
+'nowiki_tip' => '扻入非格式文本',
+'image_tip' => '扻入圖像',
+'media_tip' => '媒體檔案連結',
+'sig_tip' => '倷帶時間嗰簽名',
+'hr_tip' => '橫線 (小聲使用)',
+
+# Edit pages
+'summary' => '摘要',
+'subject' => '主題/頭條',
+'minoredit' => '箇係隻細修改',
+'watchthis' => '眏到箇頁',
+'savearticle' => '存到箇頁',
+'preview' => '預覽',
+'showpreview' => '顯示預覽',
+'showlivepreview' => '即時預覽',
+'showdiff' => '顯示差異',
+'anoneditwarning' => "'''警告:'''倷還冇登入，箇頁嗰編寫歷史會記到倷嗰IP。",
+'missingsummary' => "'''提示:''' 倷冇提供編寫摘要。要係倷再按係保存嗰話，倷保存嗰編輯就會冇編輯摘要。",
+'missingcommenttext' => '請到底下評論。',
+'missingcommentheader' => "'''提示:''' 倷嗰評論冇提供標題。要係倷再按係保存嗰話，倷保存嗰編輯就會冇標題。",
+'summary-preview' => '摘要預覽',
+'subject-preview' => '主題/頭條預覽',
+'blockedtitle' => '用戶封到咭',
+'blockedtext' => "<big>倷嗰用戶名或IP地址已經拕$1封到咭。</big>
+
+箇次封鎖係由$1所封嗰。個中原因係''$2''。
+
+* 箇次封鎖嗰開始時間係：$8
+* 箇次封鎖嗰到期時間係：$6
+* 對於拕查封嗰人：$7
+
+倷可以聯繫$1或別嗰[[{{MediaWiki:grouppage-sysop}}|管理員]]，討論箇次封鎖。除非倷已經在倷嗰[[Special:Preferences|帳號參數設置]] 裡設咭有效嗰email，伓然嗰話倷係用伓正「email到箇隻用戶」嗰功能。當設正咭有效嗰email後，箇隻功能係伓會拕封到嗰。 倷嗰IP地址係$3，許拕封到嗰ID係 #$5。 請倷在全部嗰查詢裡注明箇隻地址同／或查封ID。",
+'blockedoriginalsource' => "底下係'''$1'''嗰原始碼:",
+'blockededitsource' => "底下係倷對'''$1'''嗰'''編輯'''內容:",
+'whitelistedittitle' => '登入後才編得正',
+'whitelistedittext' => '起先倷要$1才編得正箇頁。',
+'whitelistreadtitle' => '登入後才眵得正',
+'whitelistreadtext' => '起先倷要[[Special:Userlogin|登入]] 才眵得正箇頁。',
+'whitelistacctitle' => '倷伓可以開帳戶',
+'whitelistacctext' => '在箇隻Wiki開帳戶起首倷要[[Special:Userlogin|登入]]同到提供有關許可。',
+'confirmedittitle' => 'email確認後才編得正',
+'confirmedittext' => '確認咭email才能編寫箇頁。麻煩用[[Special:Preferences|參數設置]]設置同確認倷嗰email。',
+'nosuchsectiontitle' => '冇箇隻段落',
+'nosuchsectiontext' => '倷嘗試編寫嗰段落伓存在。在箇裡係冇第$1隻段落，所以係冇地方去存到倷嗰編輯。',
+'loginreqtitle' => '需要登入',
+'loginreqlink' => '登入',
+'loginreqpagetext' => '倷要$1才能眵別嗰頁面。',
+'accmailtitle' => '密碼寄出咭',
+'accmailtext' => "'$1'嗰密碼已經發到$2咭。",
+'newarticle' => '(新)',
+'newarticletext' => '倷連到嗰頁面唔存在。要新開箇隻頁面，倷可以到底下嗰方框編寫內容(細節請參看[[Help:説明|説明]])。要係倷伓係特試來到箇裡，按吖瀏覽器嗰"返回"即可。',
+'anontalkpagetext' => "---- ''箇係匿名用戶嗰討論頁，可能佢還冇開帳戶。別人只能用IP地址同佢聯繫。箇隻IP位址可能有好幾隻用戶共用。如果倷係匿名用戶，覺得箇頁嗰內容同倷冇關，歡迎去[[Special:Userlogin|開隻新帳戶或登入]]，避免同別嗰匿名用戶混淆。''",
+'noarticletext' => '眼下箇頁還冇內容，倷可以在別嗰頁面[[Special:Search/{{PAGENAME}}|撏吖箇頁嗰標題]]或[{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} 編寫箇頁]。',
+'clearyourcache' => "'''注意:''' 在保存之後, 倷要清吥瀏覽器嗰緩存才眵得正改嗰內容。 '''Mozilla / Firefox / Safari:''' 按到 ''Shift'' 接到按''刷新''(或按吖''Ctrl-Shift-R''，在蘋果Mac上按''Cmd-Shift-R'')；'''IE:''' 按到 ''Ctrl''接到按''刷新''，或按吖''Ctrl-F5''；'''Konqueror:''' 單只要按 ''刷新''；'''Opera:''' 用戶要在 ''工具-設置'' 完全嗰清除緩存。",
+'usercssjsyoucanpreview' => "<strong>提示:</strong> 保存前請用'顯示預覽 '來測試倷嗰新CSS/JS 。",
+'usercsspreview' => "'''注意倷只係在預覽倷個人嗰 CSS, 內容還冇保存！'''",
+'userjspreview' => "'''注意倷只係在測試／預覽倷個人嗰 JavaScript，內容還冇保存！'''",
+'userinvalidcssjstitle' => "'''警告:''' 冇\"\$1\"嗰皮膚。請記到自定義嗰 .css 同 .js 頁要用小寫。就話，{{ns:user}}:Foo/monobook.css 伓等同 {{ns:user}}:Foo/Monobook.css。",
+'updated' => '(已更新)',
+'note' => '<strong>注意:</strong>',
+'previewnote' => '請記到箇單只係預覽，內容還冇保存！',
+'previewconflict' => '箇隻預覽係上首文字編輯區嗰內容。倷選擇保存嗰話佢才會保存到。',
+'editing' => '眼下在編輯$1',
+'editinguser' => '眼下在編輯用戶<b>$1</b>',
+'editingsection' => '眼下在編輯$1 (段落)',
+'editingcomment' => '眼下在編輯$1 (評論)',
+'editconflict' => '編輯仗: $1',
+'explainconflict' => '有人在倷開始編輯之後改動咭箇頁。上首嗰方框顯示嗰係眼下本頁嗰內容。倷嗰修改在底下嗰方框顯示。倷需要拿倷嗰修改並到眼下嗰內容。
+<b>只有</b>上首方框嗰內容會在倷按"存到箇頁"之後拕保存。<br />',
+'yourtext' => '倷編嗰內容',
+'storedversion' => '存到嗰版本',
+'yourdiff' => '差異',
+'readonlywarning' => '<strong>警告: 資料庫鎖到咭進行定期修護，眼下倷伓能存到倷嗰修改。倷可以拿佢存到文檔再著。</strong>',
+'protectedpagewarning' => '<strong>警告: 箇頁已經受保護，單只管理員許可權嗰用戶才改得正。</strong>',
+'semiprotectedpagewarning' => "'''注意：'''箇頁拕鎖到咭，單只註冊用戶編得正。",
+'cascadeprotectedwarning' => '警告: 箇頁已經受保護，單只管理員許可權嗰用戶才改得正，因為箇頁同底下嗰連鎖保護嗰{{PLURAL:$1|一隻|多隻}}頁面包到咭:',
+'templatesused' => '箇隻頁面使用嗰模板有:',
+'templatesusedpreview' => '箇隻預覽使用嗰模板有:',
+'templatesusedsection' => '箇隻段落使用嗰模板有:',
+'template-protected' => '(保護)',
+'template-semiprotected' => '(半保護)',
+'edittools' => '<!--箇裡嗰文本會在底下嗰編輯同上傳列表裡顯示。 -->',
+'nocreatetitle' => '新建頁面拕限制',
+'nocreatetext' => '箇隻網站限制新建頁面嗰功能。倷可以回頭去編輯有咭嗰頁面，或者[[Special:Userlogin|登入或新開帳戶]]。',
+'nocreate-loggedin' => '倷在箇隻wiki冇許可權去新開頁面。',
+'permissionserrors' => '許可權錯誤',
+'permissionserrorstext' => '根據底下嗰{{PLURAL:$1|原因|原因}}，倷冇許可權去扤:',
+'recreate-deleted-warn' => "'''警告: 倷正在重建一隻之前拕刪吥嗰頁面。'''
+
+倷應該要考慮吖繼續編輯箇頁面係否有必要。
+為到方便，箇頁嗰刪除記錄已經在底下提供:",
+
+# "Undo" feature
+'undo-success' => '箇隻編輯可以拕取銷。請檢查吖以確定箇係倷想扤嗰，接到保存修改去完成撤銷編輯。',
+'undo-failure' => '半中嗰編輯有人挭仗，箇隻編輯伓可以拕取銷。',
+'undo-summary' => '取消由[[Special:Contributions/$2|$2]] ([[User talk:$2|對話]])所修訂嗰 $1',
+
+# Account creation failure
+'cantcreateaccounttitle' => '伓能新開帳戶',
+'cantcreateaccount-text' => 'IP 位址伓能 (<b>$1</b>) 新開帳戶。箇可能係因為經常有來自倷嗰學堂或網絡供應商 (ISP)故意嗰破壞扤得。',
+
+# History pages
+'revhistory' => '修訂歷史',
+'viewpagelogs' => '眵吖箇頁嗰日誌',
+'nohistory' => '箇頁冇修改歷史。',
+'revnotfound' => '冇撏到修改歷史',
+'revnotfoundtext' => '倷請求嗰更早版本嗰修改歷史冇撏到。請檢查倷嗰 URL 係否正確。',
+'loadhist' => '搦到頁面修改歷史',
+'currentrev' => '眼前嗰修改版本',
+'revisionasof' => '$1嗰修改版本',
+'revision-info' => '$2在$1扤嗰修訂版本',
+'previousrevision' => '←之前嗰修改',
+'nextrevision' => '接到嗰修改→',
+'currentrevisionlink' => '眼前嗰修改',
+'cur' => '眼前',
+'next' => '之後',
+'last' => '之前',
+'orig' => '起先',
+'page_first' => '最早',
+'page_last' => '最晏',
+'histlegend' => '差異選擇: 標到伓同版本嗰單選鍵，接到按𢽴上嗰按鈕做比較。<br />
+說明: (眼下) 指同目前版本嗰比較，(之前) 指同之前修改版本嗰比較，細 = 細修改。',
+'deletedrev' => '[拕刪除]',
+'histfirst' => '最早版本',
+'histlast' => '最晏版本',
+'historysize' => '($1 字節)',
+'historyempty' => '(空)',
+
+# Revision feed
+'history-feed-title' => '修改歷史',
+'history-feed-description' => '本站箇頁嗰修改歷史',
+'history-feed-item-nocomment' => '$1在$2', # user at time
+'history-feed-empty' => '要求嗰頁面伓存在。佢可能拕刪吥咭或改咭名。試吖[[Special:Search|在本站撏]]有關嗰新頁面內容。',
+
+# Revision deletion
+'rev-deleted-comment' => '(注釋挪走咭)',
+'rev-deleted-user' => '(用戶名挪走咭)',
+'rev-deleted-event' => '(項目挪走咭)',
+'rev-deleted-text-permission' => '<div class="mw-warning plainlinks">箇頁嗰修改已經從共用文檔挪走咭。在[{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} 刪除日誌] 裡倷可能有詳細嗰資料。</div>',
+'rev-deleted-text-view' => "<div class='mw-warning plainlinks'>箇頁嗰修改已經從共用文檔挪走咭。作為本站嗰管理員，倷可以查看；在[{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} 刪除日誌] 裡有詳細嗰資料。 </div>",
+
);
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesHe.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesHe.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesHe.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -347,18 +347,18 @@
'specialpage' => 'דף מיוחד',
'personaltools' => 'כלים אישיים',
'postcomment' => 'הוסף הערה לדף השיחה',
-'articlepage' => 'צפיה בדף התוכן',
+'articlepage' => 'צפייה בדף התוכן',
'talk' => 'שיחה',
'views' => 'צפיות',
'toolbox' => 'תיבת כלים',
-'userpage' => 'צפיה בדף המשתמש',
-'projectpage' => 'צפיה בדף המיזם',
-'imagepage' => 'צפיה בדף התמונה',
-'mediawikipage' => 'צפיה בדף ההודעה',
-'templatepage' => 'צפיה בדף התבנית',
-'viewhelppage' => 'צפיה בדף העזרה',
-'categorypage' => 'צפיה בדף הקטגוריה',
-'viewtalkpage' => 'צפיה בדף השיחה',
+'userpage' => 'צפייה בדף המשתמש',
+'projectpage' => 'צפייה בדף המיזם',
+'imagepage' => 'צפייה בדף התמונה',
+'mediawikipage' => 'צפייה בדף ההודעה',
+'templatepage' => 'צפייה בדף התבנית',
+'viewhelppage' => 'צפייה בדף העזרה',
+'categorypage' => 'צפייה בדף הקטגוריה',
+'viewtalkpage' => 'צפייה בדף השיחה',
'otherlanguages' => 'שפות אחרות',
'redirectedfrom' => '(הופנה מהדף $1)',
'redirectpagesub' => 'דף הפניה',
@@ -407,9 +407,9 @@
'ok' => 'אישור',
'pagetitle' => '$1 – {{SITENAME}}',
'retrievedfrom' => '<br /><span style="font-size: smaller;">מקור: $1</span>',
-'youhavenewmessages' => 'יש לכם $1 ($2).',
+'youhavenewmessages' => 'יש לך $1 ($2).',
'newmessageslink' => 'הודעות חדשות',
-'newmessagesdifflink' => 'שינוי אחרון',
+'newmessagesdifflink' => 'השוואה לגרסה הקודמת',
'youhavenewmessagesmulti' => 'יש לך הודעות חדשות ב־$1',
'editsection' => 'עריכה',
'editold' => 'עריכה',
@@ -457,11 +457,11 @@
<th colspan="2" style="background-color: #F8F8F8; text-align: center;">מידע על השגיאה</th>
</tr>
<tr>
-<td>השאילתה האחרונה שבוצעה לבסיס הנתונים היתה:</td>
+<td>השאילתה האחרונה שבוצעה לבסיס הנתונים הייתה:</td>
<td style="direction: ltr;">$1</td>
</tr>
<tr>
-<td>הפונקציה הקוראת היתה:</td>
+<td>הפונקציה הקוראת הייתה:</td>
<td style="direction: ltr;">$2</td>
</tr>
<tr>
@@ -475,11 +475,11 @@
<th colspan="2" style="background-color: #F8F8F8; text-align: center;">מידע על השגיאה</th>
</tr>
<tr>
-<td>השאילתה האחרונה שבוצעה לבסיס הנתונים היתה:</td>
+<td>השאילתה האחרונה שבוצעה לבסיס הנתונים הייתה:</td>
<td style="direction: ltr;">$1</td>
</tr>
<tr>
-<td>הפונקציה הקוראת היתה:</td>
+<td>הפונקציה הקוראת הייתה:</td>
<td style="direction: ltr;">$2</td>
</tr>
<tr>
@@ -776,7 +776,7 @@
# History pages
'revhistory' => 'היסטוריית שינויים',
-'viewpagelogs' => 'הצג יומנים עבור דף זה',
+'viewpagelogs' => 'הצגת יומנים עבור דף זה',
'nohistory' => 'אין היסטוריית שינויים עבור דף זה.',
'revnotfound' => 'גרסה זו לא נמצאה',
'revnotfoundtext' => 'הגרסה הישנה של דף זה לא נמצאה. אנא בדקו את כתובת הקישור שהוביל אתכם הנה.',
@@ -858,7 +858,7 @@
'editcurrent' => 'ערוך גרסה נוכחית של הדף',
'selectnewerversionfordiff' => 'בחר גרסה חדשה יותר להשוואה',
'selectolderversionfordiff' => 'בחר גרסה ישנה יותר להשוואה',
-'compareselectedversions' => 'השווה את הגרסאות שנבחרו',
+'compareselectedversions' => 'השוואת הגרסאות שנבחרו',
'editundo' => 'ביטול',
'diff-multi' => '({{plural:$1|גרסת ביניים אחת אינה מוצגת|$1 גרסאות ביניים אינן מוצגות}}.)',
@@ -918,7 +918,7 @@
'prefs-watchlist-days' => 'מספר הימים המירבי שיוצגו ברשימת המעקב:',
'prefs-watchlist-edits' => 'מספר העריכות המירבי שיוצגו ברשימת המעקב המורחבת:',
'prefs-misc' => 'שונות',
-'saveprefs' => 'שמור העדפות',
+'saveprefs' => 'שמירת העדפות',
'resetprefs' => 'שחזור ברירת מחדל',
'oldpassword' => 'סיסמה ישנה',
'newpassword' => 'סיסמה חדשה',
@@ -1040,9 +1040,9 @@
'filesource' => 'מקור',
'uploadedfiles' => 'קבצים שהועלו',
'ignorewarning' => 'התעלם מהאזהרה ושמור את הקובץ בכל זאת.',
-'ignorewarnings' => 'התעלם מכל האזהרות',
+'ignorewarnings' => 'התעלמות מכל האזהרות',
'minlength1' => 'שמות של קבצי תמונה צריכים להיות בני תו אחד לפחות.',
-'illegalfilename' => 'הקובץ "$1" מכיל תוים בלתי חוקיים. אנא שנו את שמו ונסו להעלותו שנית.',
+'illegalfilename' => 'הקובץ "$1" מכיל תווים בלתי חוקיים. אנא שנו את שמו ונסו להעלותו שנית.',
'badfilename' => 'שם התמונה שונה ל־"$1".',
'filetype-badmime' => 'לא ניתן להעלות קבצים עם סוג ה־MIME "$1".',
'filetype-badtype' => "'''\".\$1\"''' הוא סוג קובץ אסור להעלאה
@@ -1067,7 +1067,7 @@
[[{{ns:image}}:$1|thumb|center|$1]]',
'successfulupload' => 'העלאת הקובץ הושלמה בהצלחה',
'uploadwarning' => 'אזהרת העלאת קבצים',
-'savefile' => 'שמור קובץ',
+'savefile' => 'שמירת קובץ',
'uploadedimage' => 'העלה את הקובץ [[$1]]',
'overwroteimage' => 'העלה גרסה חדשה של הקובץ [[$1]]',
'uploaddisabled' => 'העלאת קבצים מבוטלת',
@@ -1195,9 +1195,9 @@
'userstats' => 'סטטיסטיקות משתמשים',
'sitestatstext' => "בבסיס הנתונים יש בסך הכול {{plural:$1|דף '''אחד'''|'''$1''' דפים}}. מספר זה כולל דפים שאינם דפי תוכן, כגון דפי שיחה, דפים אודות {{SITENAME}}, קצרמרים, דפי תוכן ללא קישורים פנימיים, הפניות, וכיוצא בזה. אם לא סופרים את הדפים שאינם דפי תוכן, {{plural:$2|נשאר דף '''אחד''' שהוא ככל הנראה דף תוכן לכל דבר|נשארים '''$2''' דפים שהם ככל הנראה דפי תוכן לכל דבר}}.
-מאז תחילת פעולתו של האתר, {{plural:$3|הייתה באתר צפיה '''אחת''' בדפים|היו באתר '''$3''' צפיות בדפים}}, {{plural:$4|ובוצעה פעולת עריכה '''אחת'''|ובוצעו '''$4''' פעולות עריכה}}.
+מאז תחילת פעולתו של האתר, {{plural:$3|הייתה באתר צפייה '''אחת''' בדפים|היו באתר '''$3''' צפיות בדפים}}, {{plural:$4|ובוצעה פעולת עריכה '''אחת'''|ובוצעו '''$4''' פעולות עריכה}}.
-בסך הכול {{plural:$5|בוצעה בממוצע עריכה '''אחת''' לדף|בוצעו בממוצע '''$5''' עריכות לדף}}, ו{{plural:$6|הייתה צפיה '''אחת''' לכל עריכה|היו '''$6''' צפיות לכל עריכה}}.
+בסך הכול {{plural:$5|בוצעה בממוצע עריכה '''אחת''' לדף|בוצעו בממוצע '''$5''' עריכות לדף}}, ו{{plural:$6|הייתה צפייה '''אחת''' לכל עריכה|היו '''$6''' צפיות לכל עריכה}}.
אורך [http://meta.wikimedia.org/wiki/Help:Job_queue תור המשימות] הוא '''$7'''.
@@ -1228,7 +1228,7 @@
'nlinks' => '{{plural:$1|קישור אחד|$1 קישורים}}',
'nmembers' => '{{plural:$1|דף אחד|$1 דפים}}',
'nrevisions' => '{{plural:$1|גרסה אחת|$1 גרסאות}}',
-'nviews' => '{{plural:$1|צפיה אחת|$1 צפיות}}',
+'nviews' => '{{plural:$1|צפייה אחת|$1 צפיות}}',
'specialpage-empty' => 'אין תוצאות.',
'lonelypages' => 'דפים יתומים',
'lonelypagestext' => 'לדפים הבאים אין קישורים מדפים אחרים באתר זה.',
@@ -1419,7 +1419,7 @@
'exbeforeblank' => 'תוכן לפני שרוקן היה: "$1"',
'exblank' => 'הדף היה ריק',
'confirmdelete' => 'אישור מחיקת הדף',
-'deletesub' => '(מוחק את "$1")',
+'deletesub' => '(מחיקה של "$1")',
'historywarning' => 'אזהרה – לדף שאתם עומדים למחוק יש היסטוריית שינויים:',
'confirmdeletetext' => 'אתם עומדים למחוק דף או תמונה, יחד עם כל ההיסטוריה שלהם, מבסיס הנתונים.
@@ -1439,7 +1439,7 @@
'cantrollback' => 'לא ניתן לשחזר את העריכה – התורם האחרון הוא היחיד שכתב דף זה; עם זאת, ניתן למחוק את הדף.',
'alreadyrolled' => 'לא ניתן לשחזר את עריכת הדף [[:$1]] על־ידי [[{{ns:user}}:$2|$2]] ([[{{ns:user_talk}}:$2|שיחה]]); מישהו אחר כבר ערך או שחזר דף זה.
-העריכה האחרונה היתה של [[{{ns:user}}:$3|$3]] ([[{{ns:user_talk}}:$3|שיחה]]).',
+העריכה האחרונה הייתה של [[{{ns:user}}:$3|$3]] ([[{{ns:user_talk}}:$3|שיחה]]).',
'editcomment' => "תקציר העריכה היה: \"'''\$1'''\".", # only shown if there is an edit comment
'revertpage' => 'שוחזר מעריכה של [[{{ns:special}}:Contributions/$2|$2]] ([[{{ns:user_talk}}:$2|שיחה]]) לעריכה האחרונה של [[{{ns:user}}:$1|$1]]',
'rollback-success' => 'שוחזר מעריכה של $1 לעריכה האחרונה של $2',
@@ -1449,7 +1449,7 @@
'protectedarticle' => 'הגן על [[$1]]',
'modifiedarticleprotection' => 'שינה את רמת ההגנה של [[$1]]',
'unprotectedarticle' => 'ביטל את ההגנה על [[$1]]',
-'protectsub' => '(משנה את רמת ההגנה של "$1")',
+'protectsub' => '(שינוי רמת ההגנה של "$1")',
'confirmprotect' => 'מאשר את ההגנה',
'protectcomment' => 'הערה:',
'protectexpiry' => 'פקיעת ההגנה:',
@@ -1471,7 +1471,7 @@
'protect-level-sysop' => 'מפעילי מערכת בלבד',
'protect-summary-cascade' => 'מדורג',
'protect-expiring' => 'פוקעת $1 (UTC)',
-'protect-cascade' => 'הגן על כל הדפים המוכללים בדף זה (הגנה מדורגת)',
+'protect-cascade' => 'הגנה על כל הדפים המוכללים בדף זה (הגנה מדורגת)',
'restriction-type' => 'הרשאה:',
'restriction-level' => 'רמת ההגבלה:',
'minimum-size' => 'גודל מינימלי',
@@ -1488,9 +1488,9 @@
'restriction-level-all' => 'כל רמה',
# Undelete
-'undelete' => 'צפיה בדפים מחוקים',
-'undeletepage' => 'צפיה ושחזור דפים מחוקים',
-'viewdeletedpage' => 'צפיה בדפים מחוקים',
+'undelete' => 'צפייה בדפים מחוקים',
+'undeletepage' => 'צפייה ושחזור דפים מחוקים',
+'viewdeletedpage' => 'צפייה בדפים מחוקים',
'undeletepagetext' => 'הדפים שלהלן נמחקו, אך הם עדיין בארכיון וניתן לשחזר אותם. הארכיון מנוקה מעת לעת.',
'undeleteextrahelp' => 'לשחזור הדף כולו, אל תסמנו אף תיבת סימון ולחצו על "שחזור". לשחזור של גרסאות מסוימות בלבד, סמנו את תיבות הסימון של הגרסאות הללו, ולחצו על "שחזור". לחיצה על "איפוס" תנקה את התקציר, ואת כל תיבות הסימון.',
'undeleterevisions' => '{{plural:$1|גרסה אחת נשמרה|$1 גרסאות נשמרו}} בארכיון',
@@ -1629,7 +1629,7 @@
'ipblocklist-empty' => 'רשימת המשתמשים החסומים ריקה.',
'ipblocklist-no-results' => 'שם המשתמש או כתובת ה־IP המבוקשים אינם חסומים.',
'blocklink' => 'חסום',
-'unblocklink' => 'שחרר חסימה',
+'unblocklink' => 'שחרור חסימה',
'contribslink' => 'תרומות',
'autoblocker' => 'נחסמת באופן אוטומטי משום שאתה חולק את כתובת ה־IP שלך עם [[{{ns:user}}:$1|$1]]. הנימוק שניתן לחסימת [[{{ns:user}}:$1|$1]] הוא: "$2".',
'blocklogpage' => 'יומן חסימות',
@@ -1736,7 +1736,7 @@
'export-submit' => 'ייצוא',
'export-addcattext' => 'הוספת דפים מהקטגוריה:',
'export-addcat' => 'הוספה',
-'export-download' => 'שמור כקובץ',
+'export-download' => 'שמירה כקובץ',
# Namespace 8 related
'allmessages' => 'הודעות המערכת',
@@ -1768,7 +1768,7 @@
'import-interwiki-text' => 'אנא בחרו אתר ויקי ואת כותרת הדף לייבוא.
תאריכי ועורכי הגרסאות יישמרו בעת הייבוא.
כל פעולות הייבוא הבין־אתרי נשמרות ביומן הייבוא.',
-'import-interwiki-history' => 'העתק את כל היסטוריית העריכות של דף זה',
+'import-interwiki-history' => 'העתקת כל היסטוריית העריכות של דף זה',
'import-interwiki-submit' => 'ייבוא',
'import-interwiki-namespace' => 'העבר את הדפים לתוך מרחב השם:',
'importtext' => 'אנא ייצאו את הקובץ מאתר המקור תוך שימוש בעזר הייצוא, שמרו אותו לדיסק הקשיח שלכם והעלו אותו לכאן.',
@@ -1848,8 +1848,8 @@
'tooltip-minoredit' => 'סימון עריכה זו כמשנית',
'tooltip-save' => 'שמירת השינויים שביצעתם',
'tooltip-preview' => 'תצוגה מקדימה, אנא השתמשו באפשרות זו לפני השמירה!',
-'tooltip-diff' => 'צפיה בשינויים שערכתם בטקסט',
-'tooltip-compareselectedversions' => 'צפיה בהשוואת שתי גרסאות של דף זה',
+'tooltip-diff' => 'צפייה בשינויים שערכתם בטקסט',
+'tooltip-compareselectedversions' => 'צפייה בהשוואת שתי גרסאות של דף זה',
'tooltip-watch' => 'הוספת דף זה לרשימת המעקב',
'tooltip-recreate' => 'יצירת הדף מחדש למרות שהוא נמחק',
'tooltip-upload' => 'תחילת ההעלאה',
@@ -1907,10 +1907,10 @@
'mw_math_mathml' => 'MathML אם אפשר (ניסיוני)',
# Patrolling
-'markaspatrolleddiff' => 'סמן שינוי כבדוק',
-'markaspatrolledtext' => 'סמן דף זה כבדוק',
+'markaspatrolleddiff' => 'סימון השינוי כבדוק',
+'markaspatrolledtext' => 'סימון דף זה כבדוק',
'markedaspatrolled' => 'השינוי נבדק',
-'markedaspatrolledtext' => 'השינוי שנבחר נבדק.',
+'markedaspatrolledtext' => 'השינוי שבחרתם נבדק.',
'rcpatroldisabled' => 'בדיקת השינויים האחרונים מבוטלת',
'rcpatroldisabledtext' => 'התכונה של סימון שינוי כבדוק בשינויים האחרונים מבוטלת.',
'markedaspatrollederror' => 'לא ניתן לסמן כבדוק',
@@ -1936,8 +1936,8 @@
'filedelete-archive-read-only' => 'השרת אינו יכול לכתוב לתיקיית הארכיון "$1".',
# Browsing diffs
-'previousdiff' => '→ עבור להשוואת הגרסאות הקודמת',
-'nextdiff' => 'עבור להשוואת הגרסאות הבאה ←',
+'previousdiff' => '→ מעבר להשוואת הגרסאות הקודמת',
+'nextdiff' => 'מעבר להשוואת הגרסאות הבאה ←',
# Media information
'mediawarning' => "'''אזהרה:''' קובץ זה עלול להכיל קוד זדוני, שהרצתו עלולה לסכן את המערכת שלכם.<hr />",
@@ -1965,8 +1965,8 @@
# Metadata
'metadata' => 'מידע נוסף על התמונה',
'metadata-help' => 'קובץ זה מכיל מידע נוסף, שיש להניח שהגיע ממצלמה דיגיטלית או מסורק בו התמונה נוצרה או עברה דיגיטציה. אם הקובץ שונה ממצבו הראשוני, כמה מהנתונים להלן עלולים שלא לשקף באופן מלא את מצב התמונה החדש.',
-'metadata-expand' => 'הצג פרטים מורחבים',
-'metadata-collapse' => 'הסתר פרטים מורחבים',
+'metadata-expand' => 'הצגת פרטים מורחבים',
+'metadata-collapse' => 'הסתרת פרטים מורחבים',
'metadata-fields' => 'שדות המידע הנוסף של EXIF האלה אינם פרטים מורחבים ויוצגו תמיד, לעומת השאר:
* make
* model
@@ -2279,7 +2279,7 @@
# Delete conflict
'deletedwhileediting' => 'אזהרה: דף זה נמחק לאחר שהתחלתם לערוך!',
-'confirmrecreate' => "המשתמש [[{{ns:user}}:$1|$1]] ([[{{ns:user_talk}}:$1|שיחה]]) מחק את הדף לאחר שהתחלת לערוך אותו, מסיבה זו:
+'confirmrecreate' => "הדף נמחק על־ידי המשתמש [[{{ns:user}}:$1|$1]] ([[{{ns:user_talk}}:$1|שיחה]]) לאחר שהתחלתם לערוך אותו, מסיבה זו:
:'''$2'''
אנא אשרו שאתם אכן רוצים ליצור מחדש את הדף.",
'recreate' => 'צור מחדש',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesHr.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesHr.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesHr.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -489,6 +489,10 @@
'editingold' => '<strong>UPOZORENJE: Uređujete stariju inačicu
ove stranice. Ako je sačuvate, sve će promjene učinjene nakon ove inačice biti izgubljene.</strong>',
'yourdiff' => 'Razlike',
+'copyrightwarning' => '<div style="display:block;vertical-align: top;width:100%; background:#FFFFFF; color:#000000; text-align:center; font-weight:bold; font-size:100%;margin-bottom:5px;margin-top:0;margin-left:-5px;margin-right:-4px;">NE POSTAVLJAJTE RADOVE ZAŠTIĆENE AUTORSKIM PRAVIMA BEZ DOZVOLE!</div>
+*<strong>Nemojte</strong> izravno kopirati sadržaje s drugih internetskih stranica ako nemate izričitu dozvolu. Ako imate dozvolu, napišite to na pripadnoj stranici za razgovor članka. Molimo uočite da se svi doprinosi {{SITENAME}} smatraju objavljenima pod uvjetima [http://en.wikisource.org/wiki/GNU_Free_Documentation_License GNU licence za slobodnu dokumentaciju].
+*Ako ne želite da se vaše pisanje nemilosrdno uređuje i slobodno raspačava, nemojte ga ovamo slati. Također nam obećavate da ste ovo sami napisali, ili da ste to prepisali iz nečeg što je u javnom vlasništvu ili pod sličnom slobodnom licencom.',
+'copyrightwarning2' => 'Ako ne želite da se vaše pisanje nemilosrdno uređuje, nemojte ga slati ovdje.<br> Također nam obećavate da ste ovo sami napisali, ili da ste to prepisali iz nečeg što je u javnom vlasništvu ili pod sličnom slobodnom licencom. <strong>NE STAVLJAJTE ZAŠTIĆENE RADOVE BEZ DOZVOLE!</strong>',
'longpagewarning' => 'PAŽNJA: Ova stranica je dugačka $1 kilobajta; neki preglednici bi mogli imati problema pri uređivanju stranica koje se približavaju ili su duže od 32 kb.
Molimo razmislite o rastavljanju stranice na manje odjeljke.',
'longpageerror' => '<strong>POGRJEŠKA: Tekst koji ste unijeli dug je $1 kilobajta, što je više od maksimalnih $2 kilobajta. Nije ga moguće snimiti.</strong>',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesHsb.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesHsb.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesHsb.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -982,6 +982,10 @@
'destfilename' => 'Mjeno ciloweje dataje',
'watchthisupload' => 'Stronu wobkedźbować',
'filewasdeleted' => 'Dataja z tutym mjenom bu prjedy nahrata a pozdźišo wušmórnjena. Prošu přepruwuj $1 prjedy hač ju znowa składuješ.',
+'upload-wasdeleted' => "'''Kedźbu: Nahrawaš dataju, kotraž bu prjedy wušmórnjena.'''
+
+Prošu přepruwuj dokładnje, hač wospjetowane nahraće směrnicam wotpowěduje.
+Za twoju informaciju slěduje protokol wušmórnjenjow z wopodstatnjenjom za předchadne wušmórnjenje:",
'filename-bad-prefix' => 'Datajowe mjeno započina so z <strong>„$1“</strong>. To je powšitkownje datajowe mjeno, kotrež digitalna kamera zwjetša dawa a kotrež tohodla jara wuprajiwe njeje. Prošu wubjer bóle wuprajiwe mjeno za twoju dataju.',
'filename-prefix-blacklist' => ' #<!-- Njezměń tutu linku! --> <pre>
# Syntaksa:
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesIs.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesIs.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesIs.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -8,6 +8,7 @@
* @author Friðrik Bragi Dýrfjörð
* @author Cessator
* @author S.Örvarr.S
+ * @author Spacebirdy
*/
$skinNames = array(
@@ -414,7 +415,7 @@
'nocookieslogin' => "{{SITENAME}} notar kökur (enska: ''cookies'') til innskráningar. Vafrinn þinn er ekki að taka á móti þeim sem gerir það ókleyft að innskrá þig. Vinsamlegast kveiktu móttöku kakna í vafranum þínum til að geta skráð þig inn.",
'noname' => 'Ógilt notandanafn.',
'loginsuccesstitle' => 'Innskráning tókst',
-'loginsuccess' => 'Þú ert nú innskráð(ur) á {{SITENAME}} sem „$1“.',
+'loginsuccess' => 'Þú ert nú innskráð(ur) á {{SITENAME}} sem „[[Notandi:$1|$1]]“.',
'nosuchuser' => 'Enginn notandi er til undir nafninu „$1“.',
'nosuchusershort' => 'Það er enginn notandi með nafnið „$1“. Athugaðu hvort nafnið er ritað rétt.',
'nouserspecified' => 'Þú verður að taka fram notandanafn.',
@@ -1136,6 +1137,7 @@
'contributions' => 'Framlög notanda',
'mycontris' => 'Framlög',
'contribsub2' => 'Eftir $1 ($2)',
+'nocontribs' => 'Engar breytingar fundnar sem passa við þessa viðmiðun.',
'uctop' => '(nýjast)',
'month' => 'Frá mánuðinum (og fyrr):',
'year' => 'Frá árinu (og fyrr):',
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesNah.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesNah.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesNah.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -4,8 +4,9 @@
* @addtogroup Language
*
* @author Rob Church <robchur[at]gmail.com>
+ * @author Fluence
*
- * @copyright Copyright © 2006, Rob Church
+ * @copyright Copyright © 2006-2007, Rob Church, Fluence
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
*/
@@ -37,12 +38,28 @@
'december' => 'Tlamahtlācōnti',
'may' => 'Tlamacuilti',
+'article' => 'tlahcuilōlli',
+'navigation' => 'ācalpapanōliztli',
+
+'history' => 'tlahcuilōlloh',
+'edit' => 'ticpatlaz',
+'delete' => 'tlapoloaz',
+'talk' => 'tēixnāmiquiliztli',
+
# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations).
'mainpage' => 'Calīxatl',
+# Short words for each namespace, by default used in the 'article' tab in monobook
+'nstab-main' => 'tlahcuilōlli',
+
# Login and logout pages
'yourpassword' => 'Tlahtolichtacayo',
'yourpasswordagain' => 'Tlahtolichtacayo zapa',
'userlogin' => 'Calaqui / Registrarse',
'yourlanguage' => 'Tlahtolli:',
+
+# Edit pages
+'summary' => 'Mopatlaliz',
+'copyrightwarning' => '<small>Timitztlātlauhtiah xiquitta mochi mopatlaliz cana {{SITENAME}} tlatzayāna īpan [[GNU]]. Āqueh tlācah quipatlazqueh in motlahcuilōl auh tlatzayāna occeppa, intlā ahmō ticnequi īn, zātēpan ahmō titlahcuilōz nicān. Nō mitzihtoah in ōtitlahcuiloh ahmō quipiya in copyright nozo in yōllōxoxouhqui tlahcuilōlli. <strong>¡AHMŌ XITĒQUITILTILIA AHYŌLLŌXOXOUHQUI TLAHCUILŌLLI!</strong></small>',
+
);
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesNl.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesNl.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesNl.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -628,7 +628,7 @@
# Login and logout pages
'logouttitle' => 'Gebruiker afmelden',
'logouttext' => "<strong>U bent nu afgemeld.</strong><br />
-U kunt {{SITENAME}} nu anoniem gebruiken of weer aanmelden als dezelfde of een andere gebruiker. Mogelijk blijven een aantal pagina's getoond worden alsof u nog bent aangemeld totdat u de cache van uw browser leegt.",
+U kunt {{SITENAME}} nu anoniem gebruiken of weer aanmelden als dezelfde of een andere gebruiker. Mogelijk blijven een aantal pagina's getoond worden alsof u bent aangemeld totdat u de cache van uw browser leegt.",
'welcomecreation' => '== Welkom, $1! ==
Uw gebruiker is aangemaakt. Vergeet niet uw voorkeuren voor {{SITENAME}} aan te passen.',
@@ -667,7 +667,7 @@
'prefs-help-realname' => '* Echte naam (optioneel): als u deze opgeeft kan deze naam gebruikt worden om u erkenning te geven voor uw werk.',
'loginerror' => 'Aanmeldfout',
'prefs-help-email' => '* E-mail (optioneel): Stelt anderen in staat contact met u op te nemen via uw gebruikers- of overlegpagina zonder dat u uw identiteit prijsgeeft.',
-'nocookiesnew' => 'De gebruiker is aangemaakt maar nog niet aangemeld. {{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers. Schakel die a.u.b. in en meld daarna aan met uw nieuwe gebruikersnaam en wachtwoord.',
+'nocookiesnew' => 'De gebruiker is aangemaakt maar niet aangemeld. {{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers. Schakel die a.u.b. in en meld daarna aan met uw nieuwe gebruikersnaam en wachtwoord.',
'nocookieslogin' => '{{SITENAME}} gebruikt cookies voor het aanmelden van gebruikers. U accepteert geen cookies. Schakel deze optie a.u.b. aan en probeer het opnieuw.',
'noname' => 'U heeft geen geldige gebruikersnaam opgegeven.',
'loginsuccesstitle' => 'Aanmelden geslaagd',
@@ -695,7 +695,7 @@
'mailerror' => 'Fout bij het verzenden van e-mail: $1',
'acct_creation_throttle_hit' => 'Sorry, er zijn al $1 gebruikers aangemaakt vanaf dit IP-adres. U kunt geen nieuwe gebruikers meer aanmaken.',
'emailauthenticated' => 'Uw e-mailadres is bevestigd op $1.',
-'emailnotauthenticated' => 'Uw e-mailadres is <strong>nog niet bevestigd</strong>. U ontvangt geen e-mail voor de onderstaande functies.',
+'emailnotauthenticated' => 'Uw e-mailadres is <strong>niet bevestigd</strong>. U ontvangt geen e-mail voor de onderstaande functies.',
'noemailprefs' => 'Geef een e-mailadres op om deze functies te gebruiken.',
'emailconfirmlink' => 'Bevestig uw e-mailadres',
'invalidemailaddress' => 'Het e-mailadres is niet geaccepteerd omdat het een ongeldige opmaak heeft. Geef a.u.b. een geldig e-mailadres op of laat het veld leeg.',
@@ -792,7 +792,7 @@
'accmailtitle' => 'Wachtwoord verzonden.',
'accmailtext' => 'Het wachtwoord voor "$1" is verzonden naar $2.',
'newarticle' => '(Nieuw)',
-'newarticletext' => "Deze pagina bestaat nog niet. Typ in het onderstaande veld om de pagina aan te maken (meer informatie staat op de [[Help:Inhoud|hulppagina]]).
+'newarticletext' => "Deze pagina bestaat niet. Typ in het onderstaande veld om de pagina aan te maken (meer informatie staat op de [[Help:Inhoud|hulppagina]]).
Gebruik te knop '''vorige''' in uw browser als u hier per ongeluk terecht bent gekomen.",
'anontalkpagetext' => "----''Deze overlegpagina hoort bij een anonieme gebruiker die hetzij geen loginnaam heeft, hetzij deze niet gebruikt. We gebruiken daarom het IP-adres ter identificatie. Het is mogelijk dat meerdere personen hetzelfde IP-adres gebruiken. Mogelijk ontvangt u hier berichten die niet voor u bedoeld zijn. Als u dat wilt voorkomen, [[{{ns:special}}:Userlogin|maak dan een gebruikersnaam aan of meld u aan]].''",
'noarticletext' => 'Deze pagina bevat geen tekst. U kunt [[{{ns:special}}:Search/{{FULLPAGENAME}}|naar deze term zoeken]] in andere pagina\'s of <span class="plainlinks">[{{fullurl:{{FULLPAGENAME}}|action=edit}} deze pagina bewerken]</span>.',
@@ -810,12 +810,12 @@
| Konqueror || F5
|}',
'usercssjsyoucanpreview' => "<strong>Tip:</strong> Gebruik de knop 'Toon bewerking ter controle' om uw nieuwe css/js te testen alvorens op te slaan.",
-'usercsspreview' => "'''Dit is alleen een voorvertoning van uw persoonlijke css, deze is nog niet opgeslagen!'''",
-'userjspreview' => "'''Let op: u test nu uw persoonlijke JavaScript. Het is nog niet opgeslagen!'''",
+'usercsspreview' => "'''Dit is alleen een voorvertoning van uw persoonlijke css, deze is niet opgeslagen!'''",
+'userjspreview' => "'''Let op: u test nu uw persoonlijke JavaScript. De pagina is niet opgeslagen!'''",
'userinvalidcssjstitle' => "'''Waarschuwing:''' er is geen skin \"\$1\". Let op: uw eigen .css- en .js-pagina's beginnen met een kleine letter, bijvoorbeeld User:Naam/monobook.css in plaats van User:Naam/Monobook.css.",
'updated' => '(Bijgewerkt)',
'note' => '<strong>Opmerking:</strong>',
-'previewnote' => '<strong>Let op: dit is een controlepagina; uw tekst is nog niet opgeslagen!</strong>',
+'previewnote' => '<strong>Let op: dit is een controlepagina; uw tekst is niet opgeslagen!</strong>',
'previewconflict' => 'Deze voorvertoning geeft aan hoe de tekst in het bovenste veld eruit ziet als u deze opslaat.',
'session_fail_preview' => '<strong>Sorry! Uw bewerking is niet verwerkt omdat sessiegegevens verloren zijn gegaan.
Probeer het opnieuw. Als het dan nog niet lukt, meldt u dan af en weer aan.</strong>',
@@ -832,7 +832,7 @@
'editconflict' => 'Bewerkingsconflict: $1',
'explainconflict' => 'Een andere gebruiker heeft deze pagina bewerkt sinds u met uw bewerking bent begonnen.
In het bovenste deel van het venster staat de tekst van de huidige pagina.
-Uw bewerking staat nog in het onderste gedeelte.
+Uw bewerking staat in het onderste gedeelte.
U dient uw bewerkingen in te voegen in de bestaande tekst.
<b>Alleen</b> de tekst in het bovenste gedeelte wordt opgeslagen als u op "Pagina opslaan" klikt.<br />',
'yourtext' => 'Uw tekst',
@@ -883,7 +883,7 @@
# History pages
'revhistory' => 'Bewerkingsgeschiedenis',
'viewpagelogs' => 'Logboek voor deze pagina tonen',
-'nohistory' => 'Deze pagina is nog niet bewerkt.',
+'nohistory' => 'Deze pagina is niet bewerkt.',
'revnotfound' => 'Bewerking niet gevonden',
'revnotfoundtext' => 'De opgevraagde oude versie van deze pagina is onvindbaar. Controleer a.u.b. de URL die u gebruikte om naar deze pagina te gaan.',
'loadhist' => 'Bezig met het laden van de paginageschiedenis',
@@ -934,9 +934,9 @@
'revdelete-nooldid-text' => 'U heeft geen doelversie(s) voor deze handeling opgegeven.',
'revdelete-selected' => "Geselecteerde {{PLURAL:$2|bewerking|bewerkingen}} van '''[[:$1]]''':",
'logdelete-selected' => "{{PLURAL:$2|Geselecteerde log event|Geselecteerde log events}} voor '''$1:'''",
-'revdelete-text' => 'Verwijderde bewerkingen zijn nog steeds zichtbaar in de geschiedenis, maar de inhoud is niet langer publiek toegankelijk.
+'revdelete-text' => 'Verwijderde bewerkingen zijn zichtbaar in de geschiedenis, maar de inhoud is niet langer publiek toegankelijk.
-Andere beheerders van deze wiki kunnen nog steeds de verborgen inhoud benaderen en de verwijdering ongedaan maken met behulp van dit scherm, tenzij er additionele restricties gelden die zijn ingesteld door de systeembeheerder.',
+Andere beheerders van deze wiki kunnen de verborgen inhoud benaderen en de verwijdering ongedaan maken met behulp van dit scherm, tenzij er additionele restricties gelden die zijn ingesteld door de systeembeheerder.',
'revdelete-legend' => 'Stel versiebeperkingen in:',
'revdelete-hide-text' => 'Verberg de bewerkte tekst',
'revdelete-hide-name' => 'Verberg actie en doel.',
@@ -1258,7 +1258,7 @@
'sharedupload' => 'Dit bestand is een gedeelde upload en kan ook door andere projecten gebruikt worden.',
'shareduploadwiki' => 'Zie $1 voor verdere informatie.',
'shareduploadwiki-linktext' => 'bestandsbeschrijving',
-'noimage' => 'Er bestaat nog geen bestand met deze naam. U kunt het $1.',
+'noimage' => 'Er bestaat geen bestand met deze naam. U kunt het $1.',
'noimage-linktext' => 'uploaden',
'uploadnewversion-linktext' => 'Upload een nieuwe versie van dit bestand',
'imagelist_date' => 'Datum',
@@ -1792,8 +1792,8 @@
'movepagetext' => "Door middel van het onderstaande formulier kunt u een pagina hernoemen. De geschiedenis gaat mee naar de nieuwe pagina. De oude naam wordt automatisch een doorverwijzing naar de nieuwe pagina. Verwijzingen naar de oude pagina worden niet aangepast. Controleer na het hernoemen of er geen dubbele of onjuiste doorverwijzingen zijn onstaan. U bent verantwoordelijk voor de continuiteït van de verwijzingen.
Een wijziging van de paginanaam kan '''alleen''' worden uitgevoerd als de nieuwe paginanaam:
-*nog niet bestaat, of
-*slechts een doorverwijspagina zonder verdere geschiedenis is.
+*niet bestaat, of
+*een doorverwijspagina zonder verdere geschiedenis is.
<b>WAARSCHUWING!</b>
Voor populaire pagina's kan het hernoemen drastische en onvoorziene gevolgen hebben. Zorg ervoor dat u de consequenties overziet voordat u deze handeling uitvoert.",
Modified: branches/ApiEdit_Vodafone/languages/messages/MessagesPt_br.php
===================================================================
--- branches/ApiEdit_Vodafone/languages/messages/MessagesPt_br.php 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/languages/messages/MessagesPt_br.php 2007-10-09 11:11:15 UTC (rev 26539)
@@ -1,4 +1,4 @@
-<?php
+<?php
/** Brazilian Portugese (Portuguêsi do Brasil)
* @addtogroup Language
*/
Modified: branches/ApiEdit_Vodafone/maintenance/parserTests.inc
===================================================================
--- branches/ApiEdit_Vodafone/maintenance/parserTests.inc 2007-10-09 11:07:52 UTC (rev 26538)
+++ branches/ApiEdit_Vodafone/maintenance/parserTests.inc 2007-10-09 11:11:15 UTC (rev 26539)
@@ -946,7 +946,7 @@
if( ! $this->db->tableExists( 'testrun' ) or ! $this->db->tableExists( 'testitem') ) {
print "WARNING> `testrun` table not found in database. Trying to create table.\n";
- dbsource( 'testRunner.sql', $this->db );
+ dbsource( dirname(__FILE__) . '/testRunner.sql', $this->db );
echo "OK, resuming.\n";
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
http://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
