=== Other changes in 1.27 ===
* ProfilerOutputUdp was removed. Note that there is a ProfilerOutputStats class.
+* WikiPage::doDeleteArticleReal() and WikiPage::doDeleteArticle() now
+ ignore the 2nd and 3rd arguments (formerly $id and $commit).
== Compatibility ==
'CompareParserCache' => __DIR__ . '/maintenance/compareParserCache.php',
'CompareParsers' => __DIR__ . '/maintenance/compareParsers.php',
'ComposerHookHandler' => __DIR__ . '/includes/composer/ComposerHookHandler.php',
+ 'ComposerInstalled' => __DIR__ . '/includes/libs/composer/ComposerInstalled.php',
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'ComposerPackageModifier' => __DIR__ . '/includes/composer/ComposerPackageModifier.php',
'MWExceptionHandler' => __DIR__ . '/includes/exception/MWExceptionHandler.php',
'MWHookException' => __DIR__ . '/includes/Hooks.php',
'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
- 'MWMemcached' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
+ 'MWMemcached' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
'MWNamespace' => __DIR__ . '/includes/MWNamespace.php',
'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php',
'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
- 'MemCachedClientforWiki' => __DIR__ . '/includes/objectcache/MemcachedClient.php',
+ 'MemCachedClientforWiki' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
'MemcLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MemcLockManager.php',
- 'MemcachedBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedBagOStuff.php',
+ 'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php',
'MemcachedPeclBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPeclBagOStuff.php',
- 'MemcachedPhpBagOStuff' => __DIR__ . '/includes/objectcache/MemcachedPhpBagOStuff.php',
+ 'MemcachedPhpBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPhpBagOStuff.php',
'MemoizedCallable' => __DIR__ . '/includes/libs/MemoizedCallable.php',
'MemoryFileBackend' => __DIR__ . '/includes/filebackend/MemoryFileBackend.php',
'MergeHistoryPager' => __DIR__ . '/includes/specials/SpecialMergeHistory.php',
'MssqlUpdater' => __DIR__ . '/includes/installer/MssqlUpdater.php',
'MultiConfig' => __DIR__ . '/includes/config/MultiConfig.php',
'MultiHttpClient' => __DIR__ . '/includes/libs/MultiHttpClient.php',
- 'MultiWriteBagOStuff' => __DIR__ . '/includes/objectcache/MultiWriteBagOStuff.php',
+ 'MultiWriteBagOStuff' => __DIR__ . '/includes/libs/objectcache/MultiWriteBagOStuff.php',
'MutableConfig' => __DIR__ . '/includes/config/MutableConfig.php',
'MutableContext' => __DIR__ . '/includes/context/MutableContext.php',
'MwSql' => __DIR__ . '/maintenance/sql.php',
CACHE_ANYTHING => array( 'factory' => 'ObjectCache::newAnything' ),
CACHE_ACCEL => array( 'factory' => 'ObjectCache::newAccelerator' ),
- CACHE_MEMCACHED => array( 'factory' => 'ObjectCache::newMemcached', 'loggroup' => 'memcached' ),
+ CACHE_MEMCACHED => array( 'class' => 'MemcachedPhpBagOStuff', 'loggroup' => 'memcached' ),
'db-replicated' => array(
'class' => 'ReplicatedBagOStuff',
* @par Example:
* To set a generic maximum of 4 hits in 60 seconds:
* @code
- * $wgRateLimits = array( 4, 60 );
+ * $wgRateLimits = array( 4, 60 );
* @endcode
*
- * You could also limit per action and then type of users. See the inline
- * code for a template to use.
- *
- * This option set is experimental and likely to change.
+ * @par Example:
+ * You could also limit per action and then type of users.
+ * @code
+ * $wgRateLimits = array(
+ * 'edit' => array(
+ * 'anon' => array( x, y ), // any and all anonymous edits (aggregate)
+ * 'user' => array( x, y ), // each logged-in user
+ * 'newbie' => array( x, y ), // each new autoconfirmed accounts; overrides 'user'
+ * 'ip' => array( x, y ), // each anon and recent account
+ * 'subnet' => array( x, y ), // ... within a /24 subnet in IPv4 or /64 in IPv6
+ * )
+ * )
+ * @endcode
*
- * @warning Requires memcached.
+ * @warning Requires that $wgMainCacheType is set to something persistent
*/
$wgRateLimits = array(
+ // Page edits
'edit' => array(
- 'anon' => null, // for any and all anonymous edits (aggregate)
- 'user' => null, // for each logged-in user
- 'newbie' => null, // for each recent (autoconfirmed) account; overrides 'user'
- 'ip' => null, // for each anon and recent account
- 'subnet' => null, // ... within a /24 subnet in IPv4 or /64 in IPv6
+ 'ip' => array( 8, 60 ),
+ 'newbie' => array( 8, 60 ),
+ ),
+ // Page moves
+ 'move' => array(
+ 'newbie' => array( 2, 120 ),
+ 'user' => array( 8, 60 ),
),
+ // File uploads
'upload' => array(
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ 'ip' => array( 8, 60 ),
+ 'newbie' => array( 8, 60 ),
),
- 'move' => array(
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Page rollbacks
+ 'rollback' => array(
+ 'user' => array( 10, 60 ),
+ 'newbie' => array( 5, 120 )
),
- 'mailpassword' => array( // triggering password resets emails
- 'anon' => null,
+ // Triggering password resets emails
+ 'mailpassword' => array(
+ 'ip' => array( 5, 3600 ),
),
- 'emailuser' => array( // emailing other users using MediaWiki
- 'user' => null,
+ // Emailing other users using MediaWiki
+ 'emailuser' => array(
+ 'ip' => array( 5, 86400 ),
+ 'newbie' => array( 5, 86400 ),
+ 'user' => array( 20, 86400 ),
),
- 'linkpurge' => array( // purges of link tables
- 'anon' => null,
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Purging pages
+ 'purge' => array(
+ 'ip' => array( 30, 60 ),
+ 'user' => array( 30, 60 ),
),
- 'renderfile' => array( // files rendered via thumb.php or thumb_handler.php
- 'anon' => null,
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Purges of link tables
+ 'linkpurge' => array(
+ 'ip' => array( 30, 60 ),
+ 'user' => array( 30, 60 ),
),
- 'renderfile-nonstandard' => array( // same as above but for non-standard thumbnails
- 'anon' => null,
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Files rendered via thumb.php or thumb_handler.php
+ 'renderfile' => array(
+ 'ip' => array( 700, 30 ),
+ 'user' => array( 700, 30 ),
),
- 'stashedit' => array( // stashing edits into cache before save
- 'anon' => null,
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Same as above but for non-standard thumbnails
+ 'renderfile-nonstandard' => array(
+ 'ip' => array( 70, 30 ),
+ 'user' => array( 70, 30 ),
),
- 'changetag' => array( // adding or removing change tags
- 'user' => null,
- 'newbie' => null,
+ // Stashing edits into cache before save
+ 'stashedit' => array(
+ 'ip' => array( 30, 60 ),
+ 'newbie' => array( 30, 60 ),
),
- 'purge' => array( // purging pages
- 'anon' => null,
- 'user' => null,
- 'newbie' => null,
- 'ip' => null,
- 'subnet' => null,
+ // Adding or removing change tags
+ 'changetag' => array(
+ 'ip' => array( 8, 60 ),
+ 'newbie' => array( 8, 60 ),
),
);
$page = WikiPage::factory( $title );
$dbw = wfGetDB( DB_MASTER );
try {
+ $dbw->startAtomic( __METHOD__ );
// delete the associated article first
$error = '';
$deleteStatus = $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user );
if ( $deleteStatus->isOK() ) {
$status = $file->delete( $reason, $suppress, $user );
if ( $status->isOK() ) {
- $dbw->commit( __METHOD__ );
$status->value = $deleteStatus->value; // log id
+ $dbw->endAtomic( __METHOD__ );
} else {
+ // Page deleted but file still there? rollback page delete
$dbw->rollback( __METHOD__ );
}
+ } else {
+ // Done; nothing changed
+ $dbw->endAtomic( __METHOD__ );
}
} catch ( Exception $e ) {
// Rollback before returning to prevent UI from displaying
if ( $target->getText() == '' && !$target->isExternal()
&& !$local && $title
) {
- $newTarget = clone ( $title );
+ $newTarget = clone $title;
$newTarget->setFragment( '#' . $target->getFragment() );
$target = $newTarget;
}
RepoGroup::singleton()->clearCache( $this->newTitle ); # clear false negative cache
}
- $dbw->begin( __METHOD__ ); # If $file was a LocalFile, its transaction would have closed our own.
+ $dbw->startAtomic( __METHOD__ );
$pageid = $this->oldTitle->getArticleID( Title::GAID_FOR_UPDATE );
$protected = $this->oldTitle->isProtected();
WatchedItem::duplicateEntries( $this->oldTitle, $this->newTitle );
}
- $dbw->commit( __METHOD__ );
+ $dbw->endAtomic( __METHOD__ );
+
+ $params = array( $this->oldTitle, $this->newTitle, $user, $pageid, $redirid, $reason );
+ $dbw->onTransactionIdle( function () use ( $params ) {
+ Hooks::run( 'TitleMoveComplete', $params );
+ } );
- Hooks::run(
- 'TitleMoveComplete',
- array( &$this->oldTitle, &$this->newTitle, &$user, $pageid, $redirid, $reason )
- );
return Status::newGood();
}
return $array;
}
+ /**
+ * Get a redirect's destination from a title
+ * @param Title $title A title to redirect. It may not redirect or even exist
+ * @return null|string If title exists and redirects, get the destination's prefixed name
+ */
private function getRedirectTarget( $title ) {
$page = WikiPage::factory( $title );
if ( !$page->exists() ) {
return null;
}
- return $page->getRedirectTarget()->getPrefixedText();
+ $redir = $page->getRedirectTarget();
+ return $redir ? $redir->getPrefixedText() : null;
}
/**
public $mName;
/** @var string */
public $mRealName;
-
- /**
- * These fields were marked "@private", but were defined as public to
- * maintain compatibility with PHP4 code since PHP4 didn't support access
- * restrictions. AuthManager makes password handling pluggable, meaning
- * these fields don't make sense anymore. If this broke something, see
- * T89459 for the context of the change.
- * @deprecated These are mostly unused, but kept for now to raise errors on attempted access.
- */
- // @{
+ /** @var Password|null */
private $mPassword = null;
- private $mNewpassword;
- private $mNewpassTime;
- private $mPasswordExpires;
- // @}
/** @var string */
public $mEmail;
return false;
}
- global $wgMemc;
-
$limits = $wgRateLimits[$action];
$keys = array();
$id = $this->getId();
$keys[wfMemcKey( 'limiter', $action, 'user', $id )] = $userLimit;
}
+ $cache = ObjectCache::getLocalClusterInstance();
+
$triggered = false;
foreach ( $keys as $key => $limit ) {
list( $max, $period ) = $limit;
$summary = "(limit $max in {$period}s)";
- $count = $wgMemc->get( $key );
+ $count = $cache->get( $key );
// Already pinged?
if ( $count ) {
if ( $count >= $max ) {
} else {
wfDebug( __METHOD__ . ": adding record for $key $summary\n" );
if ( $incrBy > 0 ) {
- $wgMemc->add( $key, 0, intval( $period ) ); // first ping
+ $cache->add( $key, 0, intval( $period ) ); // first ping
}
}
if ( $incrBy > 0 ) {
- $wgMemc->incr( $key, $incrBy );
+ $cache->incr( $key, $incrBy );
}
}
__METHOD__
);
try {
- $mNewpassword = $passwordFactory->newFromCiphertext( $row->user_newpassword );
+ $newPassword = $passwordFactory->newFromCiphertext( $row->user_newpassword );
} catch ( PasswordError $e ) {
wfDebug( 'Invalid password hash found in database.' );
- $mNewpassword = PasswordFactory::newInvalidPassword();
+ $newPassword = PasswordFactory::newInvalidPassword();
}
- if ( $mNewpassword->equals( $plaintext ) ) {
+ if ( $newPassword->equals( $plaintext ) ) {
if ( is_null( $row->user_newpass_time ) ) {
return true;
}
),
),
'min' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_TYPE => 'integer'
),
'max' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_TYPE => 'integer'
),
'limit' => array(
'namespace' => array(
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => 'namespace',
- ApiBase::PARAM_DFLT => null,
),
'start' => array(
ApiBase::PARAM_TYPE => 'timestamp',
)
),
'mime' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_ISMULTI => true,
),
'limit' => array(
public function getAllowedParams() {
return array(
'prop' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => array(
'protection',
),
'token' => array(
ApiBase::PARAM_DEPRECATED => true,
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => array_keys( $this->getTokenFunctions() )
),
ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-parse',
),
'section' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-section',
),
'diffto' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-diffto',
),
'difftotext' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-difftotext',
),
'difftotextpst' => array(
),
'contentformat' => array(
ApiBase::PARAM_TYPE => ContentHandler::getAllContentFormats(),
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-contentformat',
),
);
ApiBase::PARAM_ISMULTI => true,
),
'what' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_TYPE => array(
'title',
'text',
protected function appendInstalledLibraries( $property ) {
global $IP;
- $path = "$IP/composer.lock";
+ $path = "$IP/vendor/composer/installed.json";
if ( !file_exists( $path ) ) {
- // Maybe they're using mediawiki/vendor?
- $path = "$IP/vendor/composer.lock";
- if ( !file_exists( $path ) ) {
- return true;
- }
+ return true;
}
$data = array();
- $lock = new ComposerLock( $path );
- foreach ( $lock->getInstalledDependencies() as $name => $info ) {
+ $installed = new ComposerInstalled( $path );
+ foreach ( $installed->getInstalledDependencies() as $name => $info ) {
if ( strpos( $info['type'], 'mediawiki-' ) === 0 ) {
// Skip any extensions or skins since they'll be listed
// in their proper section
return array(
'filekey' => array(
ApiBase::PARAM_ISMULTI => true,
- ApiBase::PARAM_DFLT => null
),
'sessionkey' => array(
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_DEPRECATED => true,
- ApiBase::PARAM_DFLT => null
),
'prop' => array(
ApiBase::PARAM_ISMULTI => true,
public function getAllowedParams() {
return array(
'prop' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => array(
'blockinfo',
public function getAllowedParams() {
return array(
'prop' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => array(
'blockinfo',
const ERROR_UNCACHEABLE = 'uncacheable';
public function execute() {
- global $wgMemc;
+ $cache = ObjectCache::getLocalClusterInstance();
$user = $this->getUser();
$params = $this->extractRequestParams();
// De-duplicate requests on the same key
if ( $user->pingLimiter( 'stashedit' ) ) {
$status = 'ratelimited';
- } elseif ( $wgMemc->lock( $key, 0, 30 ) ) {
+ } elseif ( $cache->lock( $key, 0, 30 ) ) {
/** @noinspection PhpUnusedLocalVariableInspection */
- $unlocker = new ScopedCallback( function() use ( $key ) {
- global $wgMemc;
- $wgMemc->unlock( $key );
+ $unlocker = new ScopedCallback( function() use ( $cache, $key ) {
+ $cache->unlock( $key );
} );
$status = self::parseAndStash( $page, $content, $user );
} else {
* @since 1.25
*/
public static function parseAndStash( WikiPage $page, Content $content, User $user ) {
- global $wgMemc;
+ $cache = ObjectCache::getLocalClusterInstance();
$format = $content->getDefaultFormat();
$editInfo = $page->prepareContentForEdit( $content, null, $user, $format, false );
);
if ( $stashInfo ) {
- $ok = $wgMemc->set( $key, $stashInfo, $ttl );
+ $ok = $cache->set( $key, $stashInfo, $ttl );
if ( $ok ) {
wfDebugLog( 'StashEdit', "Cached parser output for key '$key'." );
return self::ERROR_NONE;
* will do nothing. Provided the values are cacheable, they will be stored
* in memcached so that final edit submission might make use of them.
*
- * @param Article|WikiPage $page Page title
+ * @param Page|Article|WikiPage $page Page title
* @param Content $content Proposed page content
* @param Content $pstContent The result of preSaveTransform() on $content
* @param ParserOutput $pOut The result of getParserOutput() on $pstContent
Page $page, Content $content, Content $pstContent, ParserOutput $pOut,
ParserOptions $pstOpts, ParserOptions $pOpts, $timestamp
) {
- global $wgMemc;
+ $cache = ObjectCache::getLocalClusterInstance();
// getIsPreview() controls parser function behavior that references things
// like user/revision that don't exists yet. The user/text should already
return false;
}
- $ok = $wgMemc->set( $key, $stashInfo, $ttl );
+ $ok = $cache->set( $key, $stashInfo, $ttl );
if ( !$ok ) {
wfDebugLog( 'StashEdit', "Failed to cache preview parser output for key '$key'." );
} else {
* @return stdClass|bool Returns false on cache miss
*/
public static function checkCache( Title $title, Content $content, User $user ) {
- global $wgMemc;
+ $cache = ObjectCache::getLocalClusterInstance();
$key = self::getStashKey( $title, $content, $user );
- $editInfo = $wgMemc->get( $key );
+ $editInfo = $cache->get( $key );
if ( !is_object( $editInfo ) ) {
$start = microtime( true );
// We ignore user aborts and keep parsing. Block on any prior parsing
// so as to use it's results and make use of the time spent parsing.
- if ( $wgMemc->lock( $key, 30, 30 ) ) {
- $editInfo = $wgMemc->get( $key );
- $wgMemc->unlock( $key );
+ if ( $cache->lock( $key, 30, 30 ) ) {
+ $editInfo = $cache->get( $key );
+ $cache->unlock( $key );
}
$sec = microtime( true ) - $start;
if ( $sec > .01 ) {
'url' => null,
'filekey' => null,
'sessionkey' => array(
- ApiBase::PARAM_DFLT => null,
ApiBase::PARAM_DEPRECATED => true,
),
'stash' => false,
"Macofe",
"Xavier Dengra",
"F3RaN",
- "Eduardo Martinez"
+ "Eduardo Martinez",
+ "Fitoschido"
]
},
"apihelp-main-param-format": "El format de la sortida.",
"apihelp-feedrecentchanges-param-tagfilter": "Filtra segons etiqueta.",
"apihelp-feedrecentchanges-param-target": "Mostra només els canvis de les pàgines enllaçades a aquesta pàgina.",
"apihelp-feedrecentchanges-example-simple": "Mostra els canvis recents.",
+ "apihelp-help-description": "Mostra l’ajuda dels mòduls especificats.",
"apihelp-help-example-recursive": "Tota l'ajuda en una sola pàgina.",
"apihelp-import-param-rootpage": "Importa com a subpàgina d'aquesta pàgina.",
"apihelp-login-param-name": "Nom d'usuari.",
"apihelp-login-param-password": "Contrasenya.",
"apihelp-login-example-login": "Inicia sessió.",
+ "apihelp-options-example-reset": "Reinicialitza totes les preferències.",
"apihelp-protect-param-cascade": "Activa la protecció en cascada (és a dir, protegeix les plantilles i imatges utilitzades en aquesta pàgina). S'ignora si cap dels nivells de protecció suporta la protecció en cascada.",
"apihelp-query+pageswithprop-example-generator": "Obtenir informació addicional sobre les 10 primeres pàgines utilitzant <code>__NOTOC__</code>.",
"apihelp-query+watchlist-paramvalue-prop-title": "Afegeix el títol de la pàgina.",
"Andreasburmeister",
"Anomie",
"Duder",
- "Ljonka"
+ "Ljonka",
+ "FriedhelmW"
]
},
"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page/de|Dokumentation]]\n* [[mw:API:FAQ/de|Häufig gestellte Fragen]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailingliste]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API-Ankündigungen]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Fehlerberichte und Anfragen]\n</div>\n<strong>Status:</strong> Alle auf dieser Seite gezeigten Funktionen sollten funktionieren, allerdings ist die API in aktiver Entwicklung und kann sich zu jeder Zeit ändern. Abonniere die [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ MediaWiki-API-Ankündigungs-Mailingliste], um über Aktualisierungen informiert zu werden.\n\n<strong>Fehlerhafte Anfragen:</strong> Wenn fehlerhafte Anfragen an die API gesendet werden, wird ein HTTP-Header mit dem Schlüssel „MediaWiki-API-Error“ gesendet. Der Wert des Headers und der Fehlercode werden auf den gleichen Wert gesetzt. Für weitere Informationen siehe [[mw:API:Errors_and_warnings|API: Fehler und Warnungen]].",
"apihelp-expandtemplates-param-text": "Zu konvertierender Wikitext.",
"apihelp-expandtemplates-param-revid": "Versionsnummer, die für die Anzeige von <nowiki>{{REVISIONID}}</nowiki> und ähnlichen Variablen verwendet wird.",
"apihelp-expandtemplates-paramvalue-prop-wikitext": "Der expandierte Wikitext.",
+ "apihelp-expandtemplates-paramvalue-prop-ttl": "Die maximale Zeit, nach der der Ergebnis-Cache ungültig wird.",
"apihelp-expandtemplates-paramvalue-prop-parsetree": "Der XML-Parserbaum der Eingabe.",
"apihelp-expandtemplates-param-includecomments": "Ob HTML-Kommentare in der Ausgabe eingeschlossen werden sollen.",
"apihelp-expandtemplates-param-generatexml": "XML-Parserbaum erzeugen (ersetzt durch $1prop=parsetree).",
"apihelp-feedrecentchanges-param-hideliu": "Änderungen von registrierten Benutzern ausblenden.",
"apihelp-feedrecentchanges-param-hidepatrolled": "Kontrollierte Änderungen ausblenden.",
"apihelp-feedrecentchanges-param-hidemyself": "Änderungen des aktuellen Benutzers ausblenden.",
+ "apihelp-feedrecentchanges-param-hidecategorization": "Änderungen der Kategorie-Zugehörigkeit verstecken.",
"apihelp-feedrecentchanges-param-tagfilter": "Nach Markierung filtern.",
"apihelp-feedrecentchanges-param-target": "Nur Änderungen an Seiten anzeigen, die von dieser Seite verlinkt sind.",
"apihelp-feedrecentchanges-param-showlinkedto": "Zeige Änderungen an Seiten die von der ausgewählten Seite verlinkt sind.",
"apihelp-query+allimages-description": "Alle Bilder nacheinander auflisten.",
"apihelp-query+allimages-param-sort": "Eigenschaft, nach der sortiert werden soll.",
"apihelp-query+allimages-param-dir": "Aufzählungsrichtung.",
+ "apihelp-query+allimages-param-minsize": "Beschränkt auf Bilder mit mindestens dieser Anzahl an Bytes.",
+ "apihelp-query+allimages-param-maxsize": "Beschränkt auf Bilder mit höchstens dieser Anzahl an Bytes.",
"apihelp-query+allimages-param-sha1": "SHA1-Hash des Bildes. Überschreibt $1sha1base36.",
"apihelp-query+allimages-param-sha1base36": "SHA1-Hash des Bildes (Basis 36; verwendet in MediaWiki).",
"apihelp-query+allimages-param-limit": "Wie viele Gesamtbilder zurückgegeben werden sollen.",
"apihelp-userrights-param-user": "Benutzername.",
"apihelp-userrights-param-userid": "Benutzerkennung.",
"apihelp-watch-example-watch": "Die Seite <kbd>Main Page</kbd> beobachten.",
+ "apihelp-watch-example-unwatch": "Entbeobachtet die Seite <kbd>Main Page</kbd>.",
"apihelp-format-example-generic": "Das Abfrageergebnis im $1-Format ausgeben.",
"apihelp-dbg-description": "Daten im PHP-<code>var_export()</code>-Format ausgeben.",
"apihelp-dbgfm-description": "Daten im PHP-<code>var_export()</code>-Format ausgeben (schöngedruckt in HTML).",
"api-help-param-deprecated": "Veraltet.",
"api-help-param-required": "Dieser Parameter ist erforderlich.",
"api-help-datatypes-header": "Datentypen",
+ "api-help-param-type-limit": "Typ: Ganzzahl oder <kbd>max</kbd>",
+ "api-help-param-type-integer": "Typ: {{PLURAL:$1|1=Ganzzahl|2=Liste von Ganzzahlen}}",
"api-help-param-list": "{{PLURAL:$1|1=Einer der folgenden Werte|2=Werte (mit <kbd>{{!}}</kbd> trennen)}}: $2",
"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Muss leer sein|Kann leer sein oder $2}}",
"api-help-param-limit": "Nicht mehr als $1 erlaubt.",
"api-help-param-default": "Standard: $1",
"api-help-param-default-empty": "Standard: <span class=\"apihelp-empty\">(leer)</span>",
"api-help-param-token": "Ein „$1“-Token abgerufen von [[Special:ApiHelp/query+tokens|action=query&meta=tokens]]",
+ "api-help-param-token-webui": "Aus Kompatibilitätsgründen wird der in der Weboberfläche verwendete Token ebenfalls akzeptiert.",
+ "api-help-param-disabled-in-miser-mode": "Deaktiviert aufgrund des [[mw:Manual:$wgMiserMode|Miser-Modus]].",
+ "api-help-param-continue": "Falls weitere Ergebnisse verfügbar sind, dies zum Fortfahren verwenden.",
"api-help-param-no-description": "<span class=\"apihelp-empty\">(keine Beschreibung)</span>",
"api-help-examples": "{{PLURAL:$1|Beispiel|Beispiele}}:",
"api-help-permissions": "{{PLURAL:$1|Berechtigung|Berechtigungen}}:",
"apihelp-query+watchlist-paramvalue-prop-loginfo": "Ajoute l’information de trace le cas échéant.",
"apihelp-query+watchlist-param-show": "Afficher uniquement les éléments qui correspondent à ces critères. Par exemple, pour voir uniquement les modifications mineures faites par des utilisateurs connectés, mettre $1show=minor|!anon.",
"apihelp-query+watchlist-param-type": "Quels types de modification afficher :\n;edit:Modifications ordinaires de page.\n;external:Modifications externes.\n;new:Créations de page.\n;log:Entrées du journal.",
+ "apihelp-query+watchlist-paramvalue-type-new": "Créations de pages.",
+ "apihelp-query+watchlist-paramvalue-type-log": "Entrées du journal.",
"apihelp-query+watchlist-param-owner": "Utilisé avec $1token pour accéder à la liste de suivi d’un autre utilisateur.",
"apihelp-query+watchlist-param-token": "Un jeton de sécurité (disponible dans les [[Special:Preferences#mw-prefsection-watchlist|préférences]] de l’utilsiateur) pour autoriser l’accès à la liste de suivi d&un autre utilisateur.",
"apihelp-query+watchlist-example-simple": "Lister la révision de tête des pages récemment modifiées dans la liste de suivi de l’utilisateur actuel",
--- /dev/null
+{
+ "@metadata": {
+ "authors": [
+ "WongKentir"
+ ]
+ },
+ "apihelp-createaccount-param-name": "Nama pengguna"
+}
"apihelp-query+revisions+base-paramvalue-prop-tags": "Makkehronge vun dä Väsjohn.",
"apihelp-query+revisions+base-param-limit": "Wi vill Väsjohne sulle ußjejovve wähde?",
"apihelp-query+revisions+base-param-section": "Holl blohß der Ennhald vun däm Affschnett met heh dä Nommer.",
+ "apihelp-query+revisions+base-param-difftotextpst": "Donn dä Täx ömsäze wi vör em Affseschere, ih de Ongerscheijde erus jefonge wähde. Jeihd blohß mem Parramehter <var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1difftotext</var> zesamme.",
"apihelp-query+search-description": "Söhk em jannze Täx.",
"apihelp-query+search-param-search": "Söhk noh alle Övverschreffte vun Sigge udder Ennhallde, woh dä Wäät drop paß. Mer kann heh met besönder Aufjahbe beim Söhke schtälle, jeh nohdämm wadd_em Wikki sing Projramm för et Söhke esu alles kann.",
"apihelp-query+search-param-namespace": "Söhk blohß en heh dä Appachtemangs.",
"apihelp-feedrecentchanges-param-hideanons": "Ännerunge vun anonyme Benotzer verstoppen.",
"apihelp-feedrecentchanges-param-hideliu": "Ännerunge vu registréierte Benotzer verstoppen.",
"apihelp-feedrecentchanges-param-hidemyself": "Ännerunge vum aktuelle Benotzer verstoppen.",
+ "apihelp-feedrecentchanges-param-hidecategorization": "Ännerunge vun der Memberschaft a Kategorie verstoppen.",
"apihelp-feedrecentchanges-example-simple": "Rezent Ännerunge weisen",
"apihelp-help-example-main": "Hëllef fir den Haaptmodul.",
"apihelp-help-example-recursive": "All Hëllef op enger Säit",
"apihelp-query+watchlist-paramvalue-prop-user": "Setzt de Benotzer derbäi deen d'Ännerung gemaach huet.",
"apihelp-query+watchlist-paramvalue-prop-comment": "Setzt d'Bemierkung vun der Ännerung derbäi.",
"apihelp-query+watchlist-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun der Ännerung derbäi.",
+ "apihelp-query+watchlist-paramvalue-type-external": "Extern Ännerungen.",
+ "apihelp-query+watchlist-paramvalue-type-new": "Ugeluecht Säiten.",
"apihelp-query+watchlistraw-param-show": "Nëmmen Elementer opzielen déi dëse Critèren entspriechen.",
"apihelp-query+watchlistraw-example-simple": "Säite vum aktuelle Benotzer senger Iwwerwaachungslëscht opzielen",
"apihelp-revisiondelete-description": "Versioune läschen a restauréieren.",
]
},
"apihelp-query+alldeletedrevisions-example-user": "Sąrašas paskutinių 50 ištrintų indėlių pagal vartotoją\n<kbd>Pavyzdys</kbd>.",
+ "apihelp-query+allrevisions-param-namespace": "Rodyti puslapius tik šioje vardų srityje.",
"apihelp-query+backlinks-example-simple": "Rodyti nuorodas <kbd>Pagrindinis puslapis</kbd>.",
"apihelp-query+watchlist-paramvalue-type-external": "Išoriniai keitimai.",
"apihelp-query+watchlist-paramvalue-type-new": "Puslapio sukūrimai.",
"apihelp-main-param-curtimestamp": "निकालात सद्य वेळठश्याचा अंतर्भाव करा.",
"apihelp-block-description": "सदस्यास प्रतिबंधित करा.",
"apihelp-block-param-user": "सदस्याचे नाव, अंक-पत्त्ता, किंवा प्रतिबंध करण्यासाठीचा आयपीचा आवाका.",
+ "apihelp-delete-description": "पान वगळा",
+ "apihelp-edit-param-minor": "छोटे संपादन",
+ "apihelp-edit-param-notminor": "छोटे नसलेले संपादन",
+ "apihelp-edit-example-edit": "पान संपादा",
+ "apihelp-login-param-name": "सदस्य नाव.",
+ "apihelp-login-param-password": "परवलीचा शब्द.",
+ "apihelp-login-example-login": "सनोंद-प्रवेश करा.",
+ "apihelp-move-description": "पृष्ठाचे स्थानांतरण करा.",
+ "apihelp-move-param-ignorewarnings": "सर्व सूचनांकडे दुर्लक्ष करा.",
+ "apihelp-options-example-reset": "पसंतीक्रमाची पुनर्स्थापना",
+ "apihelp-patrol-description": "पानावर किंवा आवृत्तीवर पहारा द्या.",
+ "apihelp-patrol-example-rcid": "अलीकडील बदलावर पहारा द्या.",
+ "apihelp-patrol-example-revid": "आवृत्तीवर पहारा द्या.",
+ "apihelp-protect-description": "पानाची सुरक्षापातळी बदला.",
+ "apihelp-protect-example-protect": "पानास सुरक्षित करा.",
+ "apihelp-query-param-list": "कोणती यादी मागवायची.",
+ "apihelp-query-param-meta": "कोणता मेटाडाटा हवा.",
"apihelp-query+allrevisions-description": "सर्व आवृत्त्यांची यादी",
"apihelp-query+allrevisions-param-user": "फक्त या सदस्याच्याच आवृत्त्यांची यादी करा",
"apihelp-query+allrevisions-param-excludeuser": "या सदस्याच्या आवृत्त्यांची यादी करु नका.",
"apihelp-query+allredirects-example-unique-generator": "获取所有目标页面，标记丢失的。",
"apihelp-query+allredirects-example-generator": "获取包含重定向的页面。",
"apihelp-query+allrevisions-description": "列举所有修订。",
+ "apihelp-query+allrevisions-param-start": "枚举的起始时间戳。",
+ "apihelp-query+allrevisions-param-end": "枚举的结束时间戳。",
"apihelp-query+allrevisions-param-user": "只列出此用户做出的修订。",
"apihelp-query+allrevisions-param-excludeuser": "不要列出此用户做出的修订。",
"apihelp-query+allrevisions-param-namespace": "只列出此名字空间的页面。",
"apihelp-query+revisions+base-param-section": "只检索此段落数的内容。",
"apihelp-query+revisions+base-param-diffto": "要比较修订差异的修订ID。使用<kbd>prev</kbd>、<kbd>next</kbd>和<kbd>cur</kbd>分别用于上个、下个和当前修订。",
"apihelp-query+revisions+base-param-difftotext": "要比较修订差异的文本。只有修订的有限数字内的差异。覆盖<var>$1diffto</var>。如果<var>$1section</var>被设置，只有那个段落将与此文本之间比较差异",
+ "apihelp-query+revisions+base-param-difftotextpst": "在编辑文本前对其执行预保存转换。只当与<var>$1difftotext</var>一起使用时有效。",
"apihelp-query+revisions+base-param-contentformat": "序列化用于<var>$1difftotext</var>的格式并预估内容输出。",
"apihelp-query+search-description": "执行一次全文本搜索。",
"apihelp-query+search-param-search": "搜索所有匹配此值的页面标题或内容。根据wiki的搜索后端工具，您可以使用搜索字符串以调用特殊搜索功能。",
* @return void
*/
public function incrMissesRecent( WebRequest $request ) {
- global $wgMemc;
if ( mt_rand( 0, self::MISS_FACTOR - 1 ) == 0 ) {
+ $cache = ObjectCache::getLocalClusterInstance();
# Get a large IP range that should include the user even if that
# person's IP address changes
$ip = $request->getIP();
# Bail out if a request already came from this range...
$key = wfMemcKey( get_class( $this ), 'attempt', $this->mType, $this->mKey, $ip );
- if ( $wgMemc->get( $key ) ) {
+ if ( $cache->get( $key ) ) {
return; // possibly the same user
}
- $wgMemc->set( $key, 1, self::MISS_TTL_SEC );
+ $cache->set( $key, 1, self::MISS_TTL_SEC );
# Increment the number of cache misses...
$key = $this->cacheMissKey();
- if ( $wgMemc->get( $key ) === false ) {
- $wgMemc->set( $key, 1, self::MISS_TTL_SEC );
+ if ( $cache->get( $key ) === false ) {
+ $cache->set( $key, 1, self::MISS_TTL_SEC );
} else {
- $wgMemc->incr( $key );
+ $cache->incr( $key );
}
}
}
* @return int
*/
public function getMissesRecent() {
- global $wgMemc;
+ $cache = ObjectCache::getLocalClusterInstance();
- return self::MISS_FACTOR * $wgMemc->get( $this->cacheMissKey() );
+ return self::MISS_FACTOR * $cache->get( $this->cacheMissKey() );
}
/**
/**
* @param array $options
- * @throws MWException
+ * @throws Exception
*/
protected function __construct( array $options ) {
if ( !class_exists( 'Redis' ) ) {
- throw new MWException( __CLASS__ . ' requires a Redis client library. ' .
+ throw new Exception( __CLASS__ . ' requires a Redis client library. ' .
'See https://www.mediawiki.org/wiki/Redis#Setup' );
}
if ( isset( $options['logger'] ) ) {
} elseif ( $options['serializer'] === 'none' ) {
$this->serializer = Redis::SERIALIZER_NONE;
} else {
- throw new MWException( "Invalid serializer specified." );
+ throw new InvalidArgumentException( "Invalid serializer specified." );
}
}
// TCP connection
$hostPort = IP::splitHostAndPort( $server );
if ( !$server || !$hostPort ) {
- throw new MWException( __CLASS__ . ": invalid configured server \"$server\"" );
+ throw new InvalidArgumentException(
+ __CLASS__ . ": invalid configured server \"$server\""
+ );
}
list( $host, $port ) = $hostPort;
if ( $port === false ) {
function __construct( array $params ) {
global $wgDBprefix, $wgDBmwschema, $wgCommandLineMode;
- $this->mTrxAtomicLevels = new SplStack;
$this->srvCache = ObjectCache::newAccelerator( 'hash' );
$server = $params['host'];
/**
* @ingroup Database
*/
-class DBReadOnlyError extends DBError {
+class DBReadOnlyError extends DBExpectedError {
}
* @return \\Psr\\Log\\LoggerInterface
*/
public static function getInstance( $channel ) {
- if ( !interface_exists( '\Psr\Log\LoggerInterface' ) ) {
- $message = (
- 'MediaWiki requires the <a href="https://github.com/php-fig/log">PSR-3 logging ' .
- "library</a> to be present. This library is not embedded directly in MediaWiki's " .
- "git repository and must be installed separately by the end user.\n\n" .
- 'Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git' .
- '#Fetch_external_libraries">mediawiki.org</a> for help on installing ' .
- 'the required components.'
- );
- echo $message;
- trigger_error( $message, E_USER_ERROR );
- die( 1 );
+ static $hasPSR3Interface = null;
+ if ( $hasPSR3Interface === null ) {
+ $hasPSR3Interface = interface_exists( '\Psr\Log\LoggerInterface' );
+ if ( !$hasPSR3Interface ) {
+ $message = (
+ 'MediaWiki requires the <a href="https://github.com/php-fig/log">PSR-3 logging ' .
+ "library</a> to be present. This library is not embedded directly in MediaWiki's " .
+ "git repository and must be installed separately by the end user.\n\n" .
+ 'Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git' .
+ '#Fetch_external_libraries">mediawiki.org</a> for help on installing ' .
+ 'the required components.'
+ );
+ echo $message;
+ trigger_error( $message, E_USER_ERROR );
+ die( 1 );
+ }
}
return self::getProvider()->getLogger( $channel );
// passing to the parent constructor. Our overridden report() below
// makes sure that the page shown to the user is not forced to English.
if ( $msg instanceof Message ) {
- $enMsg = clone( $msg );
+ $enMsg = clone $msg;
} else {
$enMsg = wfMessage( $msg, $params );
}
$pathNames[$this->fileCacheKey( $path )] = $path;
}
}
- // Get all cache entries for these container cache keys...
+ // Get all cache entries for these file cache keys...
$values = $this->memCache->getMulti( array_keys( $pathNames ) );
foreach ( $values as $cacheKey => $val ) {
$path = $pathNames[$cacheKey];
* @return bool|string
*/
function getThumbUrlFromCache( $name, $width, $height, $params = "" ) {
- global $wgMemc;
+ $cache = ObjectCache::getMainWANInstance();
// We can't check the local cache using FileRepo functions because
// we override fileExistsBatch(). We have to use the FileBackend directly.
$backend = $this->getBackend(); // convenience
$sizekey = "$width:$height:$params";
/* Get the array of urls that we already know */
- $knownThumbUrls = $wgMemc->get( $key );
+ $knownThumbUrls = $cache->get( $key );
if ( !$knownThumbUrls ) {
/* No knownThumbUrls for this file */
$knownThumbUrls = array();
if ( $remoteModified < $modified && $diff < $this->fileCacheExpiry ) {
/* Use our current and already downloaded thumbnail */
$knownThumbUrls[$sizekey] = $localUrl;
- $wgMemc->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
+ $cache->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
return $localUrl;
}
return $foreignUrl;
}
$knownThumbUrls[$sizekey] = $localUrl;
- $wgMemc->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
+ $cache->set( $key, $knownThumbUrls, $this->apiThumbCacheExpiry );
wfDebug( __METHOD__ . " got local thumb $localUrl, saving to cache \n" );
return $localUrl;
if ( !$thumb ) { // bad params?
$thumb = false;
} elseif ( $thumb->isError() ) { // transform error
+ /** @var $thumb MediaTransformError */
$this->lastError = $thumb->toText();
// Ignore errors if requested
if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
* @param string $reason
* @param bool $suppress Hide content from sysops?
* @param User|null $user
- * @return bool Boolean on success, false on some kind of failure
+ * @return FileRepoStatus
* STUB
* Overridden by LocalFile
*/
* @return string
*/
function getDescriptionText( $lang = false ) {
- global $wgMemc, $wgLang;
+ global $wgLang;
+
if ( !$this->repo || !$this->repo->fetchDescription ) {
return false;
}
- if ( !$lang ) {
- $lang = $wgLang;
- }
+
+ $lang = $lang ?: $wgLang;
+
$renderUrl = $this->repo->getDescriptionRenderUrl( $this->getName(), $lang->getCode() );
if ( $renderUrl ) {
+ $cache = ObjectCache::getMainWANInstance();
+
+ $key = null;
if ( $this->repo->descriptionCacheExpiry > 0 ) {
wfDebug( "Attempting to get the description from cache..." );
$key = $this->repo->getLocalCacheKey(
$lang->getCode(),
$this->getName()
);
- $obj = $wgMemc->get( $key );
+ $obj = $cache->get( $key );
if ( $obj ) {
wfDebug( "success!\n" );
}
wfDebug( "Fetching shared description from $renderUrl\n" );
$res = Http::get( $renderUrl, array(), __METHOD__ );
- if ( $res && $this->repo->descriptionCacheExpiry > 0 ) {
- $wgMemc->set( $key, $res, $this->repo->descriptionCacheExpiry );
+ if ( $res && $key ) {
+ $cache->set( $key, $res, $this->repo->descriptionCacheExpiry );
}
return $res;
}
function purgeDescriptionPage() {
- global $wgMemc, $wgContLang;
+ global $wgContLang;
$url = $this->repo->getDescriptionRenderUrl( $this->getName(), $wgContLang->getCode() );
$key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', 'url', md5( $url ) );
- $wgMemc->delete( $key );
+ ObjectCache::getMainWANInstance()->delete( $key );
}
/**
* @param array $options
*/
function purgeThumbnails( $options = array() ) {
- global $wgMemc;
-
$key = $this->repo->getLocalCacheKey( 'ForeignAPIRepo', 'ThumbUrl', $this->getName() );
- $wgMemc->delete( $key );
+ ObjectCache::getMainWANInstance()->delete( $key );
$files = $this->getThumbnails();
// Give media handler a chance to filter the purge list
'wgRightsIcon',
'wgRightsText',
'wgRightsUrl',
- 'wgMainCacheType',
'wgEnableEmail',
'wgEnableUserEmail',
'wgEnotifUserTalk',
return Status::newGood();
}
- /**
- * Exports all wg* variables stored by the installer into global scope.
- */
- public function exportVars() {
- foreach ( $this->settings as $name => $value ) {
- if ( substr( $name, 0, 2 ) == 'wg' ) {
- $GLOBALS[$name] = $value;
- }
- }
- }
-
/**
* Environment check for DB types.
* @return bool
'wgLanguageCode', 'wgEnableEmail', 'wgEnableUserEmail', 'wgDiff3',
'wgEnotifUserTalk', 'wgEnotifWatchlist', 'wgEmailAuthentication',
'wgDBtype', 'wgSecretKey', 'wgRightsUrl', 'wgSitename', 'wgRightsIcon',
- 'wgRightsText', 'wgMainCacheType', 'wgEnableUploads',
- 'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser',
+ 'wgRightsText', '_MainCacheType', 'wgEnableUploads',
+ '_MemCachedServers', 'wgDBserver', 'wgDBuser',
'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin',
'wgMetaNamespace', 'wgLogo',
),
$serverSetting = "";
if ( array_key_exists( 'wgServer', $this->values ) && $this->values['wgServer'] !== null ) {
$serverSetting = "\n## The protocol and server name to use in fully-qualified URLs\n";
- $serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n";
+ $serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";";
}
- switch ( $this->values['wgMainCacheType'] ) {
+ switch ( $this->values['_MainCacheType'] ) {
case 'anything':
case 'db':
case 'memcached':
case 'accel':
- $cacheType = 'CACHE_' . strtoupper( $this->values['wgMainCacheType'] );
+ $cacheType = 'CACHE_' . strtoupper( $this->values['_MainCacheType'] );
break;
case 'none':
default:
$this->settings = $session['settings'] + $this->settings;
}
- $this->exportVars();
$this->setupLanguage();
if ( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) )
$caches[] = 'memcached';
// We'll hide/show this on demand when the value changes, see config.js.
- $cacheval = $this->getVar( 'wgMainCacheType' );
+ $cacheval = $this->getVar( '_MainCacheType' );
if ( !$cacheval ) {
// We need to set a default here; but don't hardcode it
// or we lose it every time we reload the page for validation
// For grep: The following messages are used as the item labels:
// config-cache-none, config-cache-accel, config-cache-memcached
$this->parent->getRadioSet( array(
- 'var' => 'wgMainCacheType',
+ 'var' => '_MainCacheType',
'label' => 'config-cache-options',
'itemLabelPrefix' => 'config-cache-',
'values' => $caches,
$this->parent->setVarsFromRequest( array( '_RightsProfile', '_LicenseCode',
'wgEnableEmail', 'wgPasswordSender', 'wgEnableUploads', 'wgLogo',
'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist',
- 'wgEmailAuthentication', 'wgMainCacheType', '_MemCachedServers',
+ 'wgEmailAuthentication', '_MainCacheType', '_MemCachedServers',
'wgUseInstantCommons', 'wgDefaultSkin' ) );
$retVal = true;
}
$this->parent->setVar( '_Extensions', $extsToInstall );
- if ( $this->getVar( 'wgMainCacheType' ) == 'memcached' ) {
+ if ( $this->getVar( '_MainCacheType' ) == 'memcached' ) {
$memcServers = explode( "\n", $this->getVar( '_MemCachedServers' ) );
if ( !$memcServers ) {
$this->parent->showError( 'config-memcache-needservers' );
"config-db-install-account": "Імя карыстальніка для ўсталяваньня",
"config-db-username": "Імя карыстальніка базы зьвестак:",
"config-db-password": "Пароль базы зьвестак:",
- "config-db-password-empty": "Калі ласка, увядзіце пароль для новага карыстальніка базы зьвестак: $1.\nМагчыма стварыць карыстальніка без паролю, але гэта небясьпечна.",
- "config-db-username-empty": "Вы мусіце ўвесьці значэньне парамэтру «{{int:config-db-username}}»",
"config-db-install-username": "Увядзіце імя карыстальніка, якое будзе выкарыстоўвацца для злучэньня з базай зьвестак падчас усталяваньня. Гэта не назва рахунку MediaWiki; гэта імя карыстальніка Вашай базы зьвестак.",
"config-db-install-password": "Увядзіце пароль, які будзе выкарыстоўвацца для злучэньня з базай зьвестак падчас усталяваньня. Гэта не пароль рахунку MediaWiki; гэта пароль Вашай базы зьвестак.",
"config-db-install-help": "Увядзіце імя карыстальніка і пароль, якія будуць выкарыстаныя для далучэньня да базы зьвестак падчас працэсу ўсталяваньня.",
"config-nofile": "Файл «$1» ня знойдзены. Ці быў ён выдалены?",
"config-extension-link": "Ці ведаеце вы, што вашая вікі падтрымлівае [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions пашырэньні]?\n\nВы можаце праглядзець [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category пашырэньні паводле катэгорыяў].",
"mainpagetext": "'''MediaWiki пасьпяхова ўсталяваная.'''",
- "mainpagedocfooter": "Глядзіце [//meta.wikimedia.org/wiki/Help:Contents дапаможнік карыстальніка] для атрыманьня інфармацыі па карыстаньні вікі-праграмамі.\n\n== З чаго пачаць ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Сьпіс парамэтраў канфігурацыі]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Частыя пытаньні MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Рассылка паведамленьняў пра зьяўленьне новых вэрсіяў MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Пераклад MediaWiki на вашую мову]"
+ "mainpagedocfooter": "Глядзіце [//meta.wikimedia.org/wiki/Help:Contents дапаможнік карыстальніка] для атрыманьня інфармацыі па карыстаньні вікі-праграмамі.\n\n== З чаго пачаць ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Сьпіс парамэтраў канфігурацыі]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Частыя пытаньні MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Рассылка паведамленьняў пра зьяўленьне новых вэрсіяў MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Пераклад MediaWiki на вашую мову]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Даведайцеся, як змагацца з спамам у вашай вікі]"
}
"config-missing-db-name": "Heu d'introduir un valor per a «{{int:config-db-name}}».",
"config-missing-db-host": "Heu d'introduir un valor per a «{{int:config-db-host}}».",
"config-missing-db-server-oracle": "Heu d’introduir un valor per a «{{int:config-db-host-oracle}}».",
+ "config-invalid-db-name": "El nom de la base de dades, «$1», no és vàlid.\nUtilitzeu només lletres de l’ASCII (a-z, A-Z), xifres (0-9), guions baixos (_) i guionets (-).",
+ "config-invalid-db-prefix": "El prefix de la base de dades, «$1», no és vàlid.\nUtilitzeu només lletres de l’ASCII (a-z, A-Z), xifres (0-9), guions baixos (_) i guionets (-).",
"config-connection-error": "$1.\n\nComproveu el servidor central, el nom d'usuari i la contrasenya i torneu-ho a provar.",
+ "config-invalid-schema": "L’esquema «$1» no és vàlid per al MediaWiki.\nUtilitzeu només lletres de l’ASCII (a-z, A-Z), xifres (0-9), guions baixos (_) i guionets (-).",
"config-db-sys-create-oracle": "L'instal·lador només accepta emprar un compte SYSDBA per a la creació d'un nou compte.",
"config-db-sys-user-exists-oracle": "El compte d’usuari «$1» ja existeix. SYSDBA només es pot fer servir per crear comptes nous.",
"config-postgres-old": "Cal el PostgreSQL $1 o posterior. Teniu el $2.",
"config-mssql-old": "Cal utilitzar el Microsoft SQL Server $1 o posterior. Teniu la versió $2.",
+ "config-sqlite-name-help": "Trieu un nom per identificar el wiki.\nNo feu servir espais ni guionets.\nAquest nom s’utilitzarà per a denominar el fitxer de les dades de l’SQLite.",
"config-sqlite-mkdir-error": "S'ha produït un error en crear el directori de dades «$1».\nComproveu la ubicació i torneu-ho a provar.",
"config-sqlite-dir-unwritable": "No s'ha pogut escriure al directori «$1».\nCanvieu els seus permisos per tal que el servidor web pugui escriure-hi i torneu-ho a provar.",
"config-sqlite-connection-error": "$1. \n\nComproveu el directori de dades i el nom de la base de dades a continuació i torneu-ho a provar.",
"config-sqlite-readonly": "El fitxer <code>$1</code> no es pot escriure.",
"config-sqlite-cant-create-db": "No s'ha pogut crear el fitxer de base de dades <code>$1</code>.",
+ "config-can-upgrade": "Hi ha taules del MediaWiki en aquesta base de dades.\nPer actualitzar-les al MediaWiki $1, feu clic a <strong>Continua</strong>.",
"config-upgrade-done-no-regenerate": "S'ha completat l'actualització.\n\nJa podeu [$1 començar a utilitzar el wiki].",
"config-regenerate": "Torna a generar el LocalSettings.php →",
"config-show-table-status": "La consulta <code>SHOW TABLE STATUS</code> ha fallat!",
"config-skins-missing": "No s'ha trobat cap tema; MediaWiki utilitzarà el tema per defecte fins que hi instal·leu alguns adequats.",
"config-skins-must-enable-some": "Heu de triar com a mínim un tema per habilitar.",
"config-skins-must-enable-default": "Cal habilitar el tema triat per defecte.",
+ "config-install-begin": "En fer clic a «{{int:config-continue}}» s’iniciarà la instal·lació del MediaWiki. Si encara voleu fer canvis, feu clic a «{{int:config-back}}».",
"config-install-step-done": "fet",
"config-install-step-failed": "ha fallat",
"config-install-extensions": "S'estan incloent les extensions",
"config-db-install-account": "Uživatelský účet pro instalaci",
"config-db-username": "Databázové uživatelské jméno:",
"config-db-password": "Databázové heslo:",
- "config-db-password-empty": "Zadejte heslo pro nového databázového uživatele: $1.\nPřestože může jít zakládat nové uživatele i bez hesel, není to bezpečné.",
- "config-db-username-empty": "Musíte zadat hodnotu pro „{{int:config-db-username}}“.",
"config-db-install-username": "Zadejte uživatelské jméno, které se použije pro připojení k databázi v průběhu instalace.\nToto není jméno uživatelského účtu MediaWiki; toto je uživatelské jméno k vaší databázi.",
"config-db-install-password": "Zadejte heslo, které se použije pro připojení k databázi v průběhu instalace.\nToto není heslo uživatelského účtu MediaWiki; toto je heslo k vaší databázi.",
"config-db-install-help": "Zadejte uživatelské jméno a heslo, které se použijí pro připojení k databázi v průběhu instalace.",
"config-nofile": "Soubor „$1“ nelze nalézt. Byl smazán?",
"config-extension-link": "Věděli jste, že vaše wiki podporuje [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions rozšíření]?\n\nMůžete si prohlédnout [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category seznam rozšíření po kategoriích].",
"mainpagetext": "'''MediaWiki byla úspěšně nainstalována.'''",
- "mainpagedocfooter": "[//meta.wikimedia.org/wiki/Help:Contents Uživatelská příručka] vám napoví, jak MediaWiki používat.\n\n== Začínáme ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Nastavení konfigurace]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Často kladené otázky o MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce E-mailová konference oznámení MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Překlad MediaWiki do vašeho jazyka]"
+ "mainpagedocfooter": "[//meta.wikimedia.org/wiki/Help:Contents Uživatelská příručka] vám napoví, jak používat MediaWiki.\n\n== Začínáme ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Nastavení konfigurace]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Často kladené otázky o MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce E-mailová konference oznámení MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Překlad MediaWiki do vašeho jazyka]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Naučte se bojovat se spamem na vaší wiki]"
}
"config-header-sqlite": "SQLite-indstillinger",
"config-header-oracle": "Oracle-indstillinger",
"config-invalid-db-type": "Ugyldig databasetype",
+ "config-email-usertalk": "Aktiver notifikationer for brugerdiskussionsside",
"mainpagetext": "'''MediaWiki er nu installeret.'''",
"mainpagedocfooter": "Se [//meta.wikimedia.org/wiki/Help:Contents brugervejledningen] for oplysninger om brugen af wikiprogrammellet.\n\n== At komme i gang ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Listen over opsætningsmuligheder]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki ofte stillede spørgsmål]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Postliste angående udgivelser af MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Oversæt MediaWiki til dit sprog]"
}
"config-db-install-account": "Benutzerkonto für die Installation",
"config-db-username": "Name des Datenbankbenutzers:",
"config-db-password": "Passwort des Datenbankbenutzers:",
- "config-db-password-empty": "Bitte ein Passwort für den neuen Datenbankbenutzer angeben: $1.\nObwohl es möglich ist, Datenbankbenutzer ohne Passwort anzulegen, so ist dies nicht sicher.",
- "config-db-username-empty": "Du musst einen Wert für „{{int:config-db-username}}“ eingeben",
"config-db-install-username": "Den Benutzernamen angeben, der für die Verbindung mit der Datenbank während des Installationsvorgangs genutzt werden soll. Es handelt sich dabei nicht um den Benutzernamen für das MediaWiki-Konto, sondern um den Benutzernamen der vorgesehenen Datenbank.",
"config-db-install-password": "Das Passwort angeben, das für die Verbindung mit der Datenbank während des Installationsvorgangs genutzt werden soll. Es handelt sich dabei nicht um das Passwort für das MediaWiki-Konto, sondern um das Passwort der vorgesehenen Datenbank.",
"config-db-install-help": "Benutzername und Passwort, die während des Installationsvorgangs, für die Verbindung mit der Datenbank, genutzt werden sollen, sind nun anzugeben.",
"config-nofile": "Die Datei „$1“ konnte nicht gefunden werden. Wurde sie gelöscht?",
"config-extension-link": "Wusstest du, dass dein Wiki die Nutzung von [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions Erweiterungen] unterstützt?\n\nDu kannst [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category Erweiterungen nach Kategorie] durchsuchen.",
"mainpagetext": "'''MediaWiki wurde erfolgreich installiert.'''",
- "mainpagedocfooter": "Hilfe zur Benutzung und Konfiguration der Wiki-Software findest du im [//meta.wikimedia.org/wiki/Help:Contents Benutzerhandbuch].\n\n== Starthilfen ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Liste der Konfigurationsvariablen]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki-FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailingliste neuer MediaWiki-Versionen]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Lokalisiere MediaWiki für deine Sprache]"
+ "mainpagedocfooter": "Hilfe zur Benutzung und Konfiguration der Wiki-Software findest du im [//meta.wikimedia.org/wiki/Help:Contents Benutzerhandbuch].\n\n== Starthilfen ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Liste der Konfigurationsvariablen]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki-FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailingliste neuer MediaWiki-Versionen]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Lokalisiere MediaWiki für deine Sprache]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Erfahre, wie du Spam auf deinem Wiki bekämpfen kannst]"
}
"config-nofile": "File \"$1\" could not be found. Has it been deleted?",
"config-extension-link": "Did you know that your wiki supports [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions extensions]?\n\nYou can browse [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category extensions by category] or the [//www.mediawiki.org/wiki/Extension_Matrix Extension Matrix] to see the full list of extensions.",
"mainpagetext": "<strong>MediaWiki has been successfully installed.</strong>",
- "mainpagedocfooter": "Consult the [//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.\n\n== Getting started ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Configuration settings list]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Localise MediaWiki for your language]"
+ "mainpagedocfooter": "Consult the [//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.\n\n== Getting started ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Configuration settings list]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Localise MediaWiki for your language]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Learn how to combat spam on your wiki]"
}
"config-nofile": "El archivo \"$1\" no se pudo encontrar. ¿Se ha eliminado?",
"config-extension-link": "¿Sabías que tu wiki admite [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions extensiones]?\n\nPuedes navegar por las [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category categorías] o visitar el [//www.mediawiki.org/wiki/Extension_Matrix centro de extensiones] para ver una lista completa.",
"mainpagetext": "<strong>MediaWiki se ha instalado con éxito.</strong>",
- "mainpagedocfooter": "Consulta la [//meta.wikimedia.org/wiki/Help:Contents/es guía del usuario] para obtener información sobre el uso del software wiki.\n\n== Primeros pasos ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Lista de ajustes de configuración]\n* [//www.mediawiki.org/wiki/Manual:FAQ/es Preguntas frecuentes sobre MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista de correo de anuncios de publicación de MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Traducir MediaWiki en tu idioma]"
+ "mainpagedocfooter": "Consulta la [//meta.wikimedia.org/wiki/Help:Contents/es guía del usuario] para obtener información sobre el uso del software wiki.\n\n== Primeros pasos ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Lista de ajustes de configuración]\n* [//www.mediawiki.org/wiki/Manual:FAQ/es Preguntas frecuentes sobre MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Lista de correo de anuncios de publicación de MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Traducir MediaWiki en tu idioma]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Aprende cómo combatir el spam en tu wiki]"
}
"Seb35",
"Arifin.wijaya",
"Ilham151096",
- "Bennylin"
+ "Bennylin",
+ "WongKentir"
]
},
"config-desc": "Penginstal untuk MediaWiki",
"config-memcache-badport": "Nomor porta Memcached harus antara $1 dan $2.",
"config-extensions": "Ekstensi",
"config-extensions-help": "Ekstensi yang tercantum di atas terdeteksi di direktori <code>./extensions</code>.\n\nEkstensi tersebut mungkin memerlukan konfigurasi tambahan, tetapi Anda dapat mengaktifkannya sekarang.",
- "config-skins": "Kulit",
- "config-skins-use-as-default": "Gunakan kulit ini secara baku",
+ "config-skins": "Tampilan",
+ "config-skins-use-as-default": "Gunakan tampilan ini secara baku",
"config-install-alreadydone": "'''Peringatan:''' Anda tampaknya telah menginstal MediaWiki dan mencoba untuk menginstalnya lagi.\nLanjutkan ke halaman berikutnya.",
"config-install-begin": "Dengan menekan \"{{int:config-continue}}\", Anda akan memulai instalasi MediaWiki.\nJika Anda masih ingin membuat perubahan, tekan \"{{int:config-back}}\".",
"config-install-step-done": "selesai",
"config-nofile": "Il file \"$1\" non può essere trovato. È stato eliminato?",
"config-extension-link": "Sapevi che il tuo wiki supporta le [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions estensioni]?\n\nPuoi navigare tra le [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category estensioni per categoria].",
"mainpagetext": "'''Installazione di MediaWiki completata correttamente.'''",
- "mainpagedocfooter": "Consulta la [//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Contents Guida utente] per maggiori informazioni sull'uso di questo software wiki.\n\n== Per iniziare ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Impostazioni di configurazione]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Domande frequenti su MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailing list annunci MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Localizza MediaWiki nella tua lingua]"
+ "mainpagedocfooter": "Consulta la [//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Contents Guida utente] per maggiori informazioni sull'uso di questo software wiki.\n\n== Per iniziare ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Impostazioni di configurazione]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Domande frequenti su MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Mailing list annunci MediaWiki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Localizza MediaWiki nella tua lingua]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Imparare a combattere lo spam sul tuo wiki]"
}
"config-nofile": "ファイル「$1」が見つかりませんでした。削除された可能性があります。",
"config-extension-link": "あなたのウィキは[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions 拡張機能]をサポートしていることをご存知ですか?\n\n[//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category カテゴリ別で拡張機能を見る]か[//www.mediawiki.org/wiki/Extension_Matrix 拡張機能のマトリックス]で拡張機能すべてのリストをご覧になれます。",
"mainpagetext": "<strong>MediaWiki のインストールに成功しました。</strong>",
- "mainpagedocfooter": "ウィキソフトウェアの使い方に関する情報は[//meta.wikimedia.org/wiki/Help:Contents 利用者案内]を参照してください。\n\n== はじめましょう ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings/ja 設定の一覧]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/ja MediaWiki よくある質問と回答]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki リリース情報メーリングリスト]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation/ja MediaWiki のあなたの言語へのローカライズ]"
+ "mainpagedocfooter": "ウィキソフトウェアの使い方に関する情報は[//meta.wikimedia.org/wiki/Help:Contents 利用者案内]を参照してください。\n\n== はじめましょう ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings/ja 設定の一覧]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/ja MediaWiki よくある質問と回答]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki リリース情報メーリングリスト]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation/ja MediaWiki のあなたの言語へのローカライズ]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Learn how to combat spam on your wiki]"
}
"config-nofile": "De Dattei „$1“ ham_mer nit jefonge. Es di fottjeschmeße?",
"config-extension-link": "Häs De jewoß, dat et Wiki [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions Zohsazprojramme] hann kann?\n\nDo kanns [//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category Zohsazprojramme noh Saachjroppe] söhke udder en de [//www.mediawiki.org/wiki/Extension_Matrix Tabäll met de Zohsazprojramme] kike, öm de kumplätte Leß met de Zohsazprojramme ze krijje.",
"mainpagetext": "'''MehdijaWikki es jäz enschtalleht.'''",
- "mainpagedocfooter": "Luur en et (änglesche) [//meta.wikimedia.org/wiki/Help:Contents Handbohch] wann De weße wells wi de Wikki-ẞoffwähr jebruch un bedehnt wähde moß.\n\n== För der Aanfang ==\nDat es och all op Änglesch:\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings En leß met müjjelesche Enschtällonge för et MehdijaWikki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Öff jefrooch övver et Mehdijawikki …]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce De Meilengleß met Annköndijonge övver neuje Ußjahbe vum MehdijaWikki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Donn MediaWiki op Ding Schprohch aanpaße]\n\n== Un dann ==\nDonn heh di Sigg ömbenänne un/udder jähje en ääschte Aanfangssigg för heh dat Wikki ußtuusche!\n\nAlles Johde!"
+ "mainpagedocfooter": "Luur en et (änglesche) [//meta.wikimedia.org/wiki/Help:Contents Handbohch] wann De weße wells wi de Wikki-ẞoffwähr jebruch un bedehnt wähde moß.\n\n== För der Aanfang ==\nDat es och all op Änglesch:\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings En leß met müjjelesche Enschtällonge för et MehdijaWikki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Öff jefrooch övver et Mehdijawikki …]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce De Meilengleß met Annköndijonge övver neuje Ußjahbe vum MehdijaWikki]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Donn MediaWiki op Ding Schprohch aanpaße]\n\n=== Jrammatek ===\nJeh nohdämm, ovv_et „di {{SITENAME}}“, „dä {{SITENAME}}“ udder „dat {{SITENAME}}“ heiß, moß mer velleijsch en Datteij änndere. Wann „{{SITENAME}}“ med „wikki“ ov „wiki“ ophürt, moß mer nix donn. Bei „dä {{SITENAME}}“ och nit. Söns kütt en di Datteij <code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">languages/classes/LanguageKsh.php</code> vör udder henger dä Reihj met „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">No need add neuter wikis having names ending in -wiki.</code>“ en neuje Reihj eren:\n* för „di {{SITENAME}}“ heijß di:\n*: <code>'{{SITENAME}}' => 'f',</code>\n* för „dat {{SITENAME}}“ heijs et:\n*: <code>'{{SITENAME}}' => 'n',</code>\n\n== Un dann ==\nDonn heh di Sigg ömbenänne un/udder jähje en ääschte Aanfangssigg för heh dat Wikki ußtuusche!\n\nAlles Johde!"
}
"config-db-schema": "MediaWiki schema:",
"config-pg-test-error": "Negalima prisijungti prie duomenų bazės <strong>$1</strong>: $2",
"config-sqlite-dir": "SQLite duomenų katalogas:",
+ "config-oracle-def-ts": "Numatytoji lentelių sritis:",
+ "config-oracle-temp-ts": "Laikina lentelių sritis:",
"config-type-mysql": "MySQL (arba suderinama)",
"config-type-mssql": "Microsoft SQL serveris",
"config-header-mysql": "MySQL nustatymai",
"config-header-oracle": "Oracle nustatymai",
"config-header-mssql": "„Microsoft“ SQL serverio nustatymai",
"config-invalid-db-type": "Neteisingas duomenų bazės tipas",
+ "config-missing-db-host": "Privalote įvesti „{{int:config-db-host}}“ reikšmę.",
+ "config-missing-db-server-oracle": "Privalote įvesti „{{int:config-db-host-oracle}}“ reikšmę.",
"config-postgres-old": "PostgreSQL $1 ar vėlesnė yra reikalinga. Jūs turite $2.",
+ "config-regenerate": "Pergeneruoti LocalSettings.php →",
+ "config-db-web-account-same": "Naudoti tą pačią paskyrą kaip ir įdiegimui",
+ "config-db-web-create": "Sukurti paskyrą, jeigu jos nėra",
+ "config-mysql-engine": "Saugojimo variklis:",
"config-mysql-innodb": "InnoDB",
"config-mysql-myisam": "MyISAM",
+ "config-mysql-charset": "Duomenų bazės simbolių rinkinys:",
"config-mysql-utf8": "UTF-8",
+ "config-mssql-auth": "Autentifikavimo tipas:",
+ "config-mssql-sqlauth": "SQL Serverio autentifikavimas",
"config-mssql-windowsauth": "Windows autentifikavimas",
"config-site-name": "Viki pavadinimas:",
"config-site-name-blank": "Įveskite svetainės pavadinimą.",
"config-license-pd": "Viešas domenas",
"config-email-settings": "El. pašto nustatymai",
"config-email-watchlist": "Įjungti stebimų pranešimą",
+ "config-email-auth": "Įjungti el. pašto autentifikavimą",
"config-upload-settings": "Vaizdų ir failų įkėlimai",
"config-upload-enable": "Įgalinti failų įkėlimus",
"config-upload-deleted": "Katalogas ištrintiems failams:",
"config-install-done": "'''Sveikiname!'''\nJūs sėkmingai įdiegėte MediaWiki.\n\nĮdiegimo programa sukūrė <code>LocalSettings.php</code> failą.\nJame yra visos jūsų konfigūracijos.\n\nJums reikės atsisiųsti ir įdėti jį į savo wiki įdiegimo bazę (pačiame kataloge, kaip index.php). Atsisiuntimas turėtų prasidėti automatiškai.\n\nJei atsisiuntimas nebuvo pasiūlytas, arba jį atšaukėte, galite iš naujo atsisiųsti paspaudę žemiau esančią nuorodą:\n\n$3\n\n'''Pastaba:''' Jei jūs to nepadarysite dabar, tada šis sukurtas konfigūracijos failas nebus galimas vėliau, jei išeisite iš įdiegimo be atsisiuntimo.\n\nKai baigsite, jūs galėsite '''[$2 įeiti į savo viki]'''.",
"config-download-localsettings": "Atsisiųsti <code>LocalSettings.php</code>",
"config-help": "pagalba",
+ "config-help-tooltip": "spustelėkite išplėtimui",
+ "config-nofile": "Failas \"$1\" nerastas. Ar jis buvo ištrintas?",
"mainpagetext": "'''MediaWiki sėkmingai įdiegta.'''",
"mainpagedocfooter": "Informacijos apie wiki programinės įrangos naudojimą, ieškokite [//meta.wikimedia.org/wiki/Help:Contents žinyne].\n\n== Pradžiai ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Konfigūracijos nustatymų sąrašas]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki DUK]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki pranešimai paštu apie naujas versijas]"
}
"config-nofile": "找不到文件“$1”。它是否已被删除？",
"config-extension-link": "您是否知道您的wiki支持[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions 拓展]？\n您可浏览[//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category 拓展分类]。",
"mainpagetext": "'''已成功安装MediaWiki。'''",
- "mainpagedocfooter": "请查阅[//meta.wikimedia.org/wiki/Help:Contents 用户指南]以获取使用本wiki软件的信息！\n\n== 入门 ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings MediaWiki配置设置列表]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/zh-hans MediaWiki常见问题]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki发布邮件列表]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources 本地化MediaWiki到您的语言]"
+ "mainpagedocfooter": "请查阅[//meta.wikimedia.org/wiki/Help:Contents 用户指南]以获取使用本wiki软件的信息！\n\n== 入门 ==\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings MediaWiki配置设置列表]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/zh-hans MediaWiki常见问题]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki发布邮件列表]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources 本地化MediaWiki到您的语言]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam 了解如何在您的wiki上打击破坏]"
}
* @throws MWException
*/
protected function doGetAbandonedCount() {
- global $wgMemc;
-
if ( $this->claimTTL <= 0 ) {
return 0; // no acknowledgements
}
$key = $this->getCacheKey( 'abandonedcount' );
- $count = $wgMemc->get( $key );
+ $count = $this->cache->get( $key );
if ( is_int( $count ) ) {
return $count;
}
} catch ( DBError $e ) {
$this->throwDBException( $e );
}
- $wgMemc->set( $key, $count, self::CACHE_TTL_SHORT );
+
+ $this->cache->set( $key, $count, self::CACHE_TTL_SHORT );
return $count;
}
* @since 1.23
*/
public function queuesHaveJobs( $type = self::TYPE_ANY ) {
- global $wgMemc;
-
$key = wfMemcKey( 'jobqueue', 'queueshavejobs', $type );
+ $cache = ObjectCache::getLocalClusterInstance();
- $value = $wgMemc->get( $key );
+ $value = $cache->get( $key );
if ( $value === false ) {
$queues = $this->getQueuesWithJobs();
if ( $type == self::TYPE_DEFAULT ) {
$queues = array_intersect( $queues, $this->getDefaultQueueTypes() );
}
$value = count( $queues ) ? 'true' : 'false';
- $wgMemc->add( $key, $value, 15 );
+ $cache->add( $key, $value, 15 );
}
return ( $value === 'true' );
* @return mixed
*/
private function getCachedConfigVar( $name ) {
- global $wgConf, $wgMemc;
+ global $wgConf;
if ( $this->wiki === wfWikiID() ) {
return $GLOBALS[$name]; // common case
} else {
+ $cache = ObjectCache::getLocalClusterInstance();
list( $db, $prefix ) = wfSplitWikiID( $this->wiki );
$key = wfForeignMemcKey( $db, $prefix, 'configvalue', $name );
- $value = $wgMemc->get( $key ); // ('v' => ...) or false
+ $value = $cache->get( $key ); // ('v' => ...) or false
if ( is_array( $value ) ) {
return $value['v'];
} else {
$value = $wgConf->getConfig( $this->wiki, $name );
- $wgMemc->set( $key, array( 'v' => $value ), 86400 + mt_rand( 0, 86400 ) );
+ $cache->set( $key, array( 'v' => $value ), 86400 + mt_rand( 0, 86400 ) );
return $value;
}
// Check $wgUpdateRowsPerQuery for sanity; batch jobs are sized by that already.
foreach ( array_chunk( $pageIds, $wgUpdateRowsPerQuery ) as $batch ) {
$dbw->commit( __METHOD__, 'flush' );
+ wfWaitForSlaves();
$dbw->update( 'page',
array( 'page_touched' => $dbw->timestamp( $touchTimestamp ) ),
* @param Title $title
* @return bool
*/
- protected function runForTitle( Title $title = null ) {
- if ( is_null( $title ) ) {
- $this->setLastError( "refreshLinks: Invalid title" );
- return false;
- }
-
+ protected function runForTitle( Title $title ) {
// Wait for the DB of the current/next slave DB handle to catch up to the master.
// This way, we get the correct page_latest for templates or files that just changed
// milliseconds ago, having triggered this job to begin with.
* an 'args' key that provides arguments to pass to the
* constructor/callable.
*
- * Object construction using a specification having both 'class' and
- * 'args' members will call the constructor of the class using
- * ReflectionClass::newInstanceArgs. The use of ReflectionClass carries
- * a performance penalty and should not be used to create large numbers of
- * objects. If this is needed, consider introducing a factory method that
- * can be called via call_user_func_array() instead.
- *
* Values in the arguments collection which are Closure instances will be
* expanded by invoking them with no arguments before passing the
* resulting value on to the constructor/callable. This can be used to
if ( !$args ) {
$obj = new $clazz();
} else {
- $ref = new ReflectionClass( $clazz );
- $obj = $ref->newInstanceArgs( $args );
+ $obj = static::constructClassInstance( $clazz, $args );
}
} elseif ( isset( $spec['factory'] ) ) {
$obj = call_user_func_array( $spec['factory'], $args );
}
}, $list );
}
+
+ /**
+ * Construct an instance of the given class using the given arguments.
+ *
+ * PHP's `call_user_func_array()` doesn't work with object construction so
+ * we have to use other measures. Starting with PHP 5.6.0 we could use the
+ * "splat" operator (`...`) to unpack the array into an argument list.
+ * Sadly there is no way to conditionally include a syntax construct like
+ * a new operator in a way that allows older versions of PHP to still
+ * parse the file. Instead, we will try a loop unrolling technique that
+ * works for 0-10 arguments. If we are passed 11 or more arguments we will
+ * take the performance penalty of using
+ * `ReflectionClass::newInstanceArgs()` to construct the desired object.
+ *
+ * @param string $clazz Class name
+ * @param array $args Constructor arguments
+ * @return mixed Constructed instance
+ */
+ public static function constructClassInstance( $clazz, $args ) {
+ // TODO: when PHP min version supported is >=5.6.0 replace this
+ // function body with `return new $clazz( ... $args );`.
+ $obj = null;
+ switch ( count( $args ) ) {
+ case 0:
+ $obj = new $clazz();
+ break;
+ case 1:
+ $obj = new $clazz( $args[0] );
+ break;
+ case 2:
+ $obj = new $clazz( $args[0], $args[1] );
+ break;
+ case 3:
+ $obj = new $clazz( $args[0], $args[1], $args[2] );
+ break;
+ case 4:
+ $obj = new $clazz( $args[0], $args[1], $args[2], $args[3] );
+ break;
+ case 5:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4]
+ );
+ break;
+ case 6:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4],
+ $args[5]
+ );
+ break;
+ case 7:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4],
+ $args[5], $args[6]
+ );
+ break;
+ case 8:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4],
+ $args[5], $args[6], $args[7]
+ );
+ break;
+ case 9:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4],
+ $args[5], $args[6], $args[7], $args[8]
+ );
+ break;
+ case 10:
+ $obj = new $clazz(
+ $args[0], $args[1], $args[2], $args[3], $args[4],
+ $args[5], $args[6], $args[7], $args[8], $args[9]
+ );
+ break;
+ default:
+ // Fall back to using ReflectionClass and curse the developer
+ // who decided that 11+ args was a reasonable method
+ // signature.
+ $ref = new ReflectionClass( $clazz );
+ $obj = $ref->newInstanceArgs( $args );
+ }
+ return $obj;
+ }
}
--- /dev/null
+<?php
+
+/**
+ * Reads an installed.json file and provides accessors to get what is
+ * installed
+ *
+ * @since 1.27
+ */
+class ComposerInstalled {
+
+ /**
+ * @param string $location
+ */
+ public function __construct( $location ) {
+ $this->contents = json_decode( file_get_contents( $location ), true );
+ }
+
+ /**
+ * Dependencies currently installed according to installed.json
+ *
+ * @return array
+ */
+ public function getInstalledDependencies() {
+ $deps = array();
+ foreach ( $this->contents as $installed ) {
+ $deps[$installed['name']] = array(
+ 'version' => ComposerJson::normalizeVersion( $installed['version'] ),
+ 'type' => $installed['type'],
+ 'licenses' => isset( $installed['license'] ) ? $installed['license'] : array(),
+ 'authors' => isset( $installed['authors'] ) ? $installed['authors'] : array(),
+ 'description' => isset( $installed['description'] ) ? $installed['description']: '',
+ );
+ }
+
+ ksort( $deps );
+ return $deps;
+ }
+}
* @return string
*/
public function makeKeyInternal( $keyspace, $args ) {
- $key = $keyspace . ':' . implode( ':', $args );
+ $key = $keyspace;
+ foreach ( $args as $arg ) {
+ $arg = str_replace( ':', '%3A', $arg );
+ $key = $key . ':' . $arg;
+ }
return strtr( $key, ' ', '_' );
}
--- /dev/null
+<?php
+/**
+ * Base class for memcached clients.
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * Base class for memcached clients.
+ *
+ * @ingroup Cache
+ */
+class MemcachedBagOStuff extends BagOStuff {
+ /** @var MWMemcached|Memcached */
+ protected $client;
+
+ /**
+ * Fill in some defaults for missing keys in $params.
+ *
+ * @param array $params
+ * @return array
+ */
+ protected function applyDefaultParams( $params ) {
+ if ( !isset( $params['compress_threshold'] ) ) {
+ $params['compress_threshold'] = 1500;
+ }
+ if ( !isset( $params['connect_timeout'] ) ) {
+ $params['connect_timeout'] = 0.5;
+ }
+ return $params;
+ }
+
+ protected function doGet( $key, $flags = 0 ) {
+ $casToken = null;
+
+ return $this->getWithToken( $key, $casToken, $flags );
+ }
+
+ protected function getWithToken( $key, &$casToken, $flags = 0 ) {
+ return $this->client->get( $this->validateKeyEncoding( $key ), $casToken );
+ }
+
+ public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+ return $this->client->set( $this->validateKeyEncoding( $key ), $value,
+ $this->fixExpiry( $exptime ) );
+ }
+
+ protected function cas( $casToken, $key, $value, $exptime = 0 ) {
+ return $this->client->cas( $casToken, $this->validateKeyEncoding( $key ),
+ $value, $this->fixExpiry( $exptime ) );
+ }
+
+ public function delete( $key ) {
+ return $this->client->delete( $this->validateKeyEncoding( $key ) );
+ }
+
+ public function add( $key, $value, $exptime = 0 ) {
+ return $this->client->add( $this->validateKeyEncoding( $key ), $value,
+ $this->fixExpiry( $exptime ) );
+ }
+
+ public function merge( $key, $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
+ if ( !is_callable( $callback ) ) {
+ throw new Exception( "Got invalid callback." );
+ }
+
+ return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
+ }
+
+ /**
+ * Get the underlying client object. This is provided for debugging
+ * purposes.
+ * @return BagOStuff
+ */
+ public function getClient() {
+ return $this->client;
+ }
+
+ /**
+ * Construct a cache key.
+ *
+ * @since 1.27
+ * @param string $keyspace
+ * @param array $args
+ * @return string
+ */
+ public function makeKeyInternal( $keyspace, $args ) {
+ // Memcached keys have a maximum length of 255 characters. From that,
+ // subtract the number of characters we need for the keyspace and for
+ // the separator character needed for each argument.
+ $charsLeft = 255 - strlen( $keyspace ) - count( $args );
+
+ $args = array_map(
+ function ( $arg ) use ( &$charsLeft ) {
+ $arg = strtr( $arg, ' ', '_' );
+
+ // Make sure %, #, and non-ASCII chars are escaped
+ $arg = preg_replace_callback(
+ '/[^\x21-\x22\x24\x26-\x39\x3b-\x7e]+/',
+ function ( $m ) {
+ return rawurlencode( $m[0] );
+ },
+ $arg
+ );
+
+ // 33 = 32 characters for the MD5 + 1 for the '#' prefix.
+ if ( $charsLeft > 33 && strlen( $arg ) > $charsLeft ) {
+ $arg = '#' . md5( $arg );
+ }
+
+ $charsLeft -= strlen( $arg );
+ return $arg;
+ },
+ $args
+ );
+
+ if ( $charsLeft < 0 ) {
+ return $keyspace . ':##' . md5( implode( ':', $args ) );
+ }
+
+ return $keyspace . ':' . implode( ':', $args );
+ }
+
+ /**
+ * Ensure that a key is safe to use (contains no control characters and no
+ * characters above the ASCII range.)
+ *
+ * @param string $key
+ * @return string
+ * @throws Exception
+ */
+ public function validateKeyEncoding( $key ) {
+ if ( preg_match( '/[^\x21-\x7e]+/', $key ) ) {
+ throw new Exception( "Key contains invalid characters: $key" );
+ }
+ return $key;
+ }
+
+ /**
+ * TTLs higher than 30 days will be detected as absolute TTLs
+ * (UNIX timestamps), and will result in the cache entry being
+ * discarded immediately because the expiry is in the past.
+ * Clamp expires >30d at 30d, unless they're >=1e9 in which
+ * case they are likely to really be absolute (1e9 = 2011-09-09)
+ * @param int $expiry
+ * @return int
+ */
+ function fixExpiry( $expiry ) {
+ if ( $expiry > 2592000 && $expiry < 1000000000 ) {
+ $expiry = 2592000;
+ }
+ return (int)$expiry;
+ }
+
+ /**
+ * Send a debug message to the log
+ * @param string $text
+ */
+ protected function debugLog( $text ) {
+ $this->logger->debug( $text );
+ }
+
+ public function modifySimpleRelayEvent( array $event ) {
+ if ( array_key_exists( 'val', $event ) ) {
+ $event['flg'] = 0; // data is not serialized nor gzipped (for memcached driver)
+ }
+
+ return $event;
+ }
+}
--- /dev/null
+<?php
+// @codingStandardsIgnoreFile It's an external lib and it isn't. Let's not bother.
+/**
+ * Memcached client for PHP.
+ *
+ * +---------------------------------------------------------------------------+
+ * | memcached client, PHP |
+ * +---------------------------------------------------------------------------+
+ * | Copyright (c) 2003 Ryan T. Dean <rtdean@cytherianage.net> |
+ * | All rights reserved. |
+ * | |
+ * | Redistribution and use in source and binary forms, with or without |
+ * | modification, are permitted provided that the following conditions |
+ * | are met: |
+ * | |
+ * | 1. Redistributions of source code must retain the above copyright |
+ * | notice, this list of conditions and the following disclaimer. |
+ * | 2. Redistributions in binary form must reproduce the above copyright |
+ * | notice, this list of conditions and the following disclaimer in the |
+ * | documentation and/or other materials provided with the distribution. |
+ * | |
+ * | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
+ * | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
+ * | OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
+ * | IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
+ * | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
+ * | NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+ * | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+ * | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
+ * | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
+ * | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+ * +---------------------------------------------------------------------------+
+ * | Author: Ryan T. Dean <rtdean@cytherianage.net> |
+ * | Heavily influenced by the Perl memcached client by Brad Fitzpatrick. |
+ * | Permission granted by Brad Fitzpatrick for relicense of ported Perl |
+ * | client logic under 2-clause BSD license. |
+ * +---------------------------------------------------------------------------+
+ *
+ * @file
+ * $TCAnet$
+ */
+
+/**
+ * This is the PHP client for memcached - a distributed memory cache daemon.
+ * More information is available at http://www.danga.com/memcached/
+ *
+ * Usage example:
+ *
+ * require_once 'memcached.php';
+ *
+ * $mc = new MWMemcached(array(
+ * 'servers' => array('127.0.0.1:10000',
+ * array('192.0.0.1:10010', 2),
+ * '127.0.0.1:10020'),
+ * 'debug' => false,
+ * 'compress_threshold' => 10240,
+ * 'persistent' => true));
+ *
+ * $mc->add( 'key', array( 'some', 'array' ) );
+ * $mc->replace( 'key', 'some random string' );
+ * $val = $mc->get( 'key' );
+ *
+ * @author Ryan T. Dean <rtdean@cytherianage.net>
+ * @version 0.1.2
+ */
+
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+// {{{ requirements
+// }}}
+
+// {{{ class MWMemcached
+/**
+ * memcached client class implemented using (p)fsockopen()
+ *
+ * @author Ryan T. Dean <rtdean@cytherianage.net>
+ * @ingroup Cache
+ */
+class MWMemcached {
+ // {{{ properties
+ // {{{ public
+
+ // {{{ constants
+ // {{{ flags
+
+ /**
+ * Flag: indicates data is serialized
+ */
+ const SERIALIZED = 1;
+
+ /**
+ * Flag: indicates data is compressed
+ */
+ const COMPRESSED = 2;
+
+ /**
+ * Flag: indicates data is an integer
+ */
+ const INTVAL = 4;
+
+ // }}}
+
+ /**
+ * Minimum savings to store data compressed
+ */
+ const COMPRESSION_SAVINGS = 0.20;
+
+ // }}}
+
+ /**
+ * Command statistics
+ *
+ * @var array
+ * @access public
+ */
+ public $stats;
+
+ // }}}
+ // {{{ private
+
+ /**
+ * Cached Sockets that are connected
+ *
+ * @var array
+ * @access private
+ */
+ public $_cache_sock;
+
+ /**
+ * Current debug status; 0 - none to 9 - profiling
+ *
+ * @var bool
+ * @access private
+ */
+ public $_debug;
+
+ /**
+ * Dead hosts, assoc array, 'host'=>'unixtime when ok to check again'
+ *
+ * @var array
+ * @access private
+ */
+ public $_host_dead;
+
+ /**
+ * Is compression available?
+ *
+ * @var bool
+ * @access private
+ */
+ public $_have_zlib;
+
+ /**
+ * Do we want to use compression?
+ *
+ * @var bool
+ * @access private
+ */
+ public $_compress_enable;
+
+ /**
+ * At how many bytes should we compress?
+ *
+ * @var int
+ * @access private
+ */
+ public $_compress_threshold;
+
+ /**
+ * Are we using persistent links?
+ *
+ * @var bool
+ * @access private
+ */
+ public $_persistent;
+
+ /**
+ * If only using one server; contains ip:port to connect to
+ *
+ * @var string
+ * @access private
+ */
+ public $_single_sock;
+
+ /**
+ * Array containing ip:port or array(ip:port, weight)
+ *
+ * @var array
+ * @access private
+ */
+ public $_servers;
+
+ /**
+ * Our bit buckets
+ *
+ * @var array
+ * @access private
+ */
+ public $_buckets;
+
+ /**
+ * Total # of bit buckets we have
+ *
+ * @var int
+ * @access private
+ */
+ public $_bucketcount;
+
+ /**
+ * # of total servers we have
+ *
+ * @var int
+ * @access private
+ */
+ public $_active;
+
+ /**
+ * Stream timeout in seconds. Applies for example to fread()
+ *
+ * @var int
+ * @access private
+ */
+ public $_timeout_seconds;
+
+ /**
+ * Stream timeout in microseconds
+ *
+ * @var int
+ * @access private
+ */
+ public $_timeout_microseconds;
+
+ /**
+ * Connect timeout in seconds
+ */
+ public $_connect_timeout;
+
+ /**
+ * Number of connection attempts for each server
+ */
+ public $_connect_attempts;
+
+ /**
+ * @var LoggerInterface
+ */
+ private $_logger;
+
+ // }}}
+ // }}}
+ // {{{ methods
+ // {{{ public functions
+ // {{{ memcached()
+
+ /**
+ * Memcache initializer
+ *
+ * @param array $args Associative array of settings
+ *
+ * @return mixed
+ */
+ public function __construct( $args ) {
+ $this->set_servers( isset( $args['servers'] ) ? $args['servers'] : array() );
+ $this->_debug = isset( $args['debug'] ) ? $args['debug'] : false;
+ $this->stats = array();
+ $this->_compress_threshold = isset( $args['compress_threshold'] ) ? $args['compress_threshold'] : 0;
+ $this->_persistent = isset( $args['persistent'] ) ? $args['persistent'] : false;
+ $this->_compress_enable = true;
+ $this->_have_zlib = function_exists( 'gzcompress' );
+
+ $this->_cache_sock = array();
+ $this->_host_dead = array();
+
+ $this->_timeout_seconds = 0;
+ $this->_timeout_microseconds = isset( $args['timeout'] ) ? $args['timeout'] : 500000;
+
+ $this->_connect_timeout = isset( $args['connect_timeout'] ) ? $args['connect_timeout'] : 0.1;
+ $this->_connect_attempts = 2;
+
+ $this->_logger = isset( $args['logger'] ) ? $args['logger'] : new NullLogger();
+ }
+
+ // }}}
+ // {{{ add()
+
+ /**
+ * Adds a key/value to the memcache server if one isn't already set with
+ * that key
+ *
+ * @param string $key Key to set with data
+ * @param mixed $val Value to store
+ * @param int $exp (optional) Expiration time. This can be a number of seconds
+ * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
+ * longer must be the timestamp of the time at which the mapping should expire. It
+ * is safe to use timestamps in all cases, regardless of expiration
+ * eg: strtotime("+3 hour")
+ *
+ * @return bool
+ */
+ public function add( $key, $val, $exp = 0 ) {
+ return $this->_set( 'add', $key, $val, $exp );
+ }
+
+ // }}}
+ // {{{ decr()
+
+ /**
+ * Decrease a value stored on the memcache server
+ *
+ * @param string $key Key to decrease
+ * @param int $amt (optional) amount to decrease
+ *
+ * @return mixed False on failure, value on success
+ */
+ public function decr( $key, $amt = 1 ) {
+ return $this->_incrdecr( 'decr', $key, $amt );
+ }
+
+ // }}}
+ // {{{ delete()
+
+ /**
+ * Deletes a key from the server, optionally after $time
+ *
+ * @param string $key Key to delete
+ * @param int $time (optional) how long to wait before deleting
+ *
+ * @return bool True on success, false on failure
+ */
+ public function delete( $key, $time = 0 ) {
+ if ( !$this->_active ) {
+ return false;
+ }
+
+ $sock = $this->get_sock( $key );
+ if ( !is_resource( $sock ) ) {
+ return false;
+ }
+
+ $key = is_array( $key ) ? $key[1] : $key;
+
+ if ( isset( $this->stats['delete'] ) ) {
+ $this->stats['delete']++;
+ } else {
+ $this->stats['delete'] = 1;
+ }
+ $cmd = "delete $key $time\r\n";
+ if ( !$this->_fwrite( $sock, $cmd ) ) {
+ return false;
+ }
+ $res = $this->_fgets( $sock );
+
+ if ( $this->_debug ) {
+ $this->_debugprint( sprintf( "MemCache: delete %s (%s)\n", $key, $res ) );
+ }
+
+ if ( $res == "DELETED" || $res == "NOT_FOUND" ) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @param string $key
+ * @param int $timeout
+ * @return bool
+ */
+ public function lock( $key, $timeout = 0 ) {
+ /* stub */
+ return true;
+ }
+
+ /**
+ * @param string $key
+ * @return bool
+ */
+ public function unlock( $key ) {
+ /* stub */
+ return true;
+ }
+
+ // }}}
+ // {{{ disconnect_all()
+
+ /**
+ * Disconnects all connected sockets
+ */
+ public function disconnect_all() {
+ foreach ( $this->_cache_sock as $sock ) {
+ fclose( $sock );
+ }
+
+ $this->_cache_sock = array();
+ }
+
+ // }}}
+ // {{{ enable_compress()
+
+ /**
+ * Enable / Disable compression
+ *
+ * @param bool $enable True to enable, false to disable
+ */
+ public function enable_compress( $enable ) {
+ $this->_compress_enable = $enable;
+ }
+
+ // }}}
+ // {{{ forget_dead_hosts()
+
+ /**
+ * Forget about all of the dead hosts
+ */
+ public function forget_dead_hosts() {
+ $this->_host_dead = array();
+ }
+
+ // }}}
+ // {{{ get()
+
+ /**
+ * Retrieves the value associated with the key from the memcache server
+ *
+ * @param array|string $key key to retrieve
+ * @param float $casToken [optional]
+ *
+ * @return mixed
+ */
+ public function get( $key, &$casToken = null ) {
+
+ if ( $this->_debug ) {
+ $this->_debugprint( "get($key)\n" );
+ }
+
+ if ( !is_array( $key ) && strval( $key ) === '' ) {
+ $this->_debugprint( "Skipping key which equals to an empty string" );
+ return false;
+ }
+
+ if ( !$this->_active ) {
+ return false;
+ }
+
+ $sock = $this->get_sock( $key );
+
+ if ( !is_resource( $sock ) ) {
+ return false;
+ }
+
+ $key = is_array( $key ) ? $key[1] : $key;
+ if ( isset( $this->stats['get'] ) ) {
+ $this->stats['get']++;
+ } else {
+ $this->stats['get'] = 1;
+ }
+
+ $cmd = "gets $key\r\n";
+ if ( !$this->_fwrite( $sock, $cmd ) ) {
+ return false;
+ }
+
+ $val = array();
+ $this->_load_items( $sock, $val, $casToken );
+
+ if ( $this->_debug ) {
+ foreach ( $val as $k => $v ) {
+ $this->_debugprint( sprintf( "MemCache: sock %s got %s\n", serialize( $sock ), $k ) );
+ }
+ }
+
+ $value = false;
+ if ( isset( $val[$key] ) ) {
+ $value = $val[$key];
+ }
+ return $value;
+ }
+
+ // }}}
+ // {{{ get_multi()
+
+ /**
+ * Get multiple keys from the server(s)
+ *
+ * @param array $keys Keys to retrieve
+ *
+ * @return array
+ */
+ public function get_multi( $keys ) {
+ if ( !$this->_active ) {
+ return false;
+ }
+
+ if ( isset( $this->stats['get_multi'] ) ) {
+ $this->stats['get_multi']++;
+ } else {
+ $this->stats['get_multi'] = 1;
+ }
+ $sock_keys = array();
+ $socks = array();
+ foreach ( $keys as $key ) {
+ $sock = $this->get_sock( $key );
+ if ( !is_resource( $sock ) ) {
+ continue;
+ }
+ $key = is_array( $key ) ? $key[1] : $key;
+ if ( !isset( $sock_keys[$sock] ) ) {
+ $sock_keys[intval( $sock )] = array();
+ $socks[] = $sock;
+ }
+ $sock_keys[intval( $sock )][] = $key;
+ }
+
+ $gather = array();
+ // Send out the requests
+ foreach ( $socks as $sock ) {
+ $cmd = 'gets';
+ foreach ( $sock_keys[intval( $sock )] as $key ) {
+ $cmd .= ' ' . $key;
+ }
+ $cmd .= "\r\n";
+
+ if ( $this->_fwrite( $sock, $cmd ) ) {
+ $gather[] = $sock;
+ }
+ }
+
+ // Parse responses
+ $val = array();
+ foreach ( $gather as $sock ) {
+ $this->_load_items( $sock, $val, $casToken );
+ }
+
+ if ( $this->_debug ) {
+ foreach ( $val as $k => $v ) {
+ $this->_debugprint( sprintf( "MemCache: got %s\n", $k ) );
+ }
+ }
+
+ return $val;
+ }
+
+ // }}}
+ // {{{ incr()
+
+ /**
+ * Increments $key (optionally) by $amt
+ *
+ * @param string $key Key to increment
+ * @param int $amt (optional) amount to increment
+ *
+ * @return int|null Null if the key does not exist yet (this does NOT
+ * create new mappings if the key does not exist). If the key does
+ * exist, this returns the new value for that key.
+ */
+ public function incr( $key, $amt = 1 ) {
+ return $this->_incrdecr( 'incr', $key, $amt );
+ }
+
+ // }}}
+ // {{{ replace()
+
+ /**
+ * Overwrites an existing value for key; only works if key is already set
+ *
+ * @param string $key Key to set value as
+ * @param mixed $value Value to store
+ * @param int $exp (optional) Expiration time. This can be a number of seconds
+ * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
+ * longer must be the timestamp of the time at which the mapping should expire. It
+ * is safe to use timestamps in all cases, regardless of exipration
+ * eg: strtotime("+3 hour")
+ *
+ * @return bool
+ */
+ public function replace( $key, $value, $exp = 0 ) {
+ return $this->_set( 'replace', $key, $value, $exp );
+ }
+
+ // }}}
+ // {{{ run_command()
+
+ /**
+ * Passes through $cmd to the memcache server connected by $sock; returns
+ * output as an array (null array if no output)
+ *
+ * @param Resource $sock Socket to send command on
+ * @param string $cmd Command to run
+ *
+ * @return array Output array
+ */
+ public function run_command( $sock, $cmd ) {
+ if ( !is_resource( $sock ) ) {
+ return array();
+ }
+
+ if ( !$this->_fwrite( $sock, $cmd ) ) {
+ return array();
+ }
+
+ $ret = array();
+ while ( true ) {
+ $res = $this->_fgets( $sock );
+ $ret[] = $res;
+ if ( preg_match( '/^END/', $res ) ) {
+ break;
+ }
+ if ( strlen( $res ) == 0 ) {
+ break;
+ }
+ }
+ return $ret;
+ }
+
+ // }}}
+ // {{{ set()
+
+ /**
+ * Unconditionally sets a key to a given value in the memcache. Returns true
+ * if set successfully.
+ *
+ * @param string $key Key to set value as
+ * @param mixed $value Value to set
+ * @param int $exp (optional) Expiration time. This can be a number of seconds
+ * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
+ * longer must be the timestamp of the time at which the mapping should expire. It
+ * is safe to use timestamps in all cases, regardless of exipration
+ * eg: strtotime("+3 hour")
+ *
+ * @return bool True on success
+ */
+ public function set( $key, $value, $exp = 0 ) {
+ return $this->_set( 'set', $key, $value, $exp );
+ }
+
+ // }}}
+ // {{{ cas()
+
+ /**
+ * Sets a key to a given value in the memcache if the current value still corresponds
+ * to a known, given value. Returns true if set successfully.
+ *
+ * @param float $casToken Current known value
+ * @param string $key Key to set value as
+ * @param mixed $value Value to set
+ * @param int $exp (optional) Expiration time. This can be a number of seconds
+ * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
+ * longer must be the timestamp of the time at which the mapping should expire. It
+ * is safe to use timestamps in all cases, regardless of exipration
+ * eg: strtotime("+3 hour")
+ *
+ * @return bool True on success
+ */
+ public function cas( $casToken, $key, $value, $exp = 0 ) {
+ return $this->_set( 'cas', $key, $value, $exp, $casToken );
+ }
+
+ // }}}
+ // {{{ set_compress_threshold()
+
+ /**
+ * Sets the compression threshold
+ *
+ * @param int $thresh Threshold to compress if larger than
+ */
+ public function set_compress_threshold( $thresh ) {
+ $this->_compress_threshold = $thresh;
+ }
+
+ // }}}
+ // {{{ set_debug()
+
+ /**
+ * Sets the debug flag
+ *
+ * @param bool $dbg True for debugging, false otherwise
+ *
+ * @see MWMemcached::__construct
+ */
+ public function set_debug( $dbg ) {
+ $this->_debug = $dbg;
+ }
+
+ // }}}
+ // {{{ set_servers()
+
+ /**
+ * Sets the server list to distribute key gets and puts between
+ *
+ * @param array $list Array of servers to connect to
+ *
+ * @see MWMemcached::__construct()
+ */
+ public function set_servers( $list ) {
+ $this->_servers = $list;
+ $this->_active = count( $list );
+ $this->_buckets = null;
+ $this->_bucketcount = 0;
+
+ $this->_single_sock = null;
+ if ( $this->_active == 1 ) {
+ $this->_single_sock = $this->_servers[0];
+ }
+ }
+
+ /**
+ * Sets the timeout for new connections
+ *
+ * @param int $seconds Number of seconds
+ * @param int $microseconds Number of microseconds
+ */
+ public function set_timeout( $seconds, $microseconds ) {
+ $this->_timeout_seconds = $seconds;
+ $this->_timeout_microseconds = $microseconds;
+ }
+
+ // }}}
+ // }}}
+ // {{{ private methods
+ // {{{ _close_sock()
+
+ /**
+ * Close the specified socket
+ *
+ * @param string $sock Socket to close
+ *
+ * @access private
+ */
+ function _close_sock( $sock ) {
+ $host = array_search( $sock, $this->_cache_sock );
+ fclose( $this->_cache_sock[$host] );
+ unset( $this->_cache_sock[$host] );
+ }
+
+ // }}}
+ // {{{ _connect_sock()
+
+ /**
+ * Connects $sock to $host, timing out after $timeout
+ *
+ * @param int $sock Socket to connect
+ * @param string $host Host:IP to connect to
+ *
+ * @return bool
+ * @access private
+ */
+ function _connect_sock( &$sock, $host ) {
+ list( $ip, $port ) = preg_split( '/:(?=\d)/', $host );
+ $sock = false;
+ $timeout = $this->_connect_timeout;
+ $errno = $errstr = null;
+ for ( $i = 0; !$sock && $i < $this->_connect_attempts; $i++ ) {
+ MediaWiki\suppressWarnings();
+ if ( $this->_persistent == 1 ) {
+ $sock = pfsockopen( $ip, $port, $errno, $errstr, $timeout );
+ } else {
+ $sock = fsockopen( $ip, $port, $errno, $errstr, $timeout );
+ }
+ MediaWiki\restoreWarnings();
+ }
+ if ( !$sock ) {
+ $this->_error_log( "Error connecting to $host: $errstr\n" );
+ $this->_dead_host( $host );
+ return false;
+ }
+
+ // Initialise timeout
+ stream_set_timeout( $sock, $this->_timeout_seconds, $this->_timeout_microseconds );
+
+ // If the connection was persistent, flush the read buffer in case there
+ // was a previous incomplete request on this connection
+ if ( $this->_persistent ) {
+ $this->_flush_read_buffer( $sock );
+ }
+ return true;
+ }
+
+ // }}}
+ // {{{ _dead_sock()
+
+ /**
+ * Marks a host as dead until 30-40 seconds in the future
+ *
+ * @param string $sock Socket to mark as dead
+ *
+ * @access private
+ */
+ function _dead_sock( $sock ) {
+ $host = array_search( $sock, $this->_cache_sock );
+ $this->_dead_host( $host );
+ }
+
+ /**
+ * @param string $host
+ */
+ function _dead_host( $host ) {
+ $parts = explode( ':', $host );
+ $ip = $parts[0];
+ $this->_host_dead[$ip] = time() + 30 + intval( rand( 0, 10 ) );
+ $this->_host_dead[$host] = $this->_host_dead[$ip];
+ unset( $this->_cache_sock[$host] );
+ }
+
+ // }}}
+ // {{{ get_sock()
+
+ /**
+ * get_sock
+ *
+ * @param string $key Key to retrieve value for;
+ *
+ * @return Resource|bool Resource on success, false on failure
+ * @access private
+ */
+ function get_sock( $key ) {
+ if ( !$this->_active ) {
+ return false;
+ }
+
+ if ( $this->_single_sock !== null ) {
+ return $this->sock_to_host( $this->_single_sock );
+ }
+
+ $hv = is_array( $key ) ? intval( $key[0] ) : $this->_hashfunc( $key );
+ if ( $this->_buckets === null ) {
+ $bu = array();
+ foreach ( $this->_servers as $v ) {
+ if ( is_array( $v ) ) {
+ for ( $i = 0; $i < $v[1]; $i++ ) {
+ $bu[] = $v[0];
+ }
+ } else {
+ $bu[] = $v;
+ }
+ }
+ $this->_buckets = $bu;
+ $this->_bucketcount = count( $bu );
+ }
+
+ $realkey = is_array( $key ) ? $key[1] : $key;
+ for ( $tries = 0; $tries < 20; $tries++ ) {
+ $host = $this->_buckets[$hv % $this->_bucketcount];
+ $sock = $this->sock_to_host( $host );
+ if ( is_resource( $sock ) ) {
+ return $sock;
+ }
+ $hv = $this->_hashfunc( $hv . $realkey );
+ }
+
+ return false;
+ }
+
+ // }}}
+ // {{{ _hashfunc()
+
+ /**
+ * Creates a hash integer based on the $key
+ *
+ * @param string $key Key to hash
+ *
+ * @return int Hash value
+ * @access private
+ */
+ function _hashfunc( $key ) {
+ # Hash function must be in [0,0x7ffffff]
+ # We take the first 31 bits of the MD5 hash, which unlike the hash
+ # function used in a previous version of this client, works
+ return hexdec( substr( md5( $key ), 0, 8 ) ) & 0x7fffffff;
+ }
+
+ // }}}
+ // {{{ _incrdecr()
+
+ /**
+ * Perform increment/decriment on $key
+ *
+ * @param string $cmd Command to perform
+ * @param string|array $key Key to perform it on
+ * @param int $amt Amount to adjust
+ *
+ * @return int New value of $key
+ * @access private
+ */
+ function _incrdecr( $cmd, $key, $amt = 1 ) {
+ if ( !$this->_active ) {
+ return null;
+ }
+
+ $sock = $this->get_sock( $key );
+ if ( !is_resource( $sock ) ) {
+ return null;
+ }
+
+ $key = is_array( $key ) ? $key[1] : $key;
+ if ( isset( $this->stats[$cmd] ) ) {
+ $this->stats[$cmd]++;
+ } else {
+ $this->stats[$cmd] = 1;
+ }
+ if ( !$this->_fwrite( $sock, "$cmd $key $amt\r\n" ) ) {
+ return null;
+ }
+
+ $line = $this->_fgets( $sock );
+ $match = array();
+ if ( !preg_match( '/^(\d+)/', $line, $match ) ) {
+ return null;
+ }
+ return $match[1];
+ }
+
+ // }}}
+ // {{{ _load_items()
+
+ /**
+ * Load items into $ret from $sock
+ *
+ * @param Resource $sock Socket to read from
+ * @param array $ret returned values
+ * @param float $casToken [optional]
+ * @return bool True for success, false for failure
+ *
+ * @access private
+ */
+ function _load_items( $sock, &$ret, &$casToken = null ) {
+ $results = array();
+
+ while ( 1 ) {
+ $decl = $this->_fgets( $sock );
+
+ if ( $decl === false ) {
+ /*
+ * If nothing can be read, something is wrong because we know exactly when
+ * to stop reading (right after "END") and we return right after that.
+ */
+ return false;
+ } elseif ( preg_match( '/^VALUE (\S+) (\d+) (\d+) (\d+)$/', $decl, $match ) ) {
+ /*
+ * Read all data returned. This can be either one or multiple values.
+ * Save all that data (in an array) to be processed later: we'll first
+ * want to continue reading until "END" before doing anything else,
+ * to make sure that we don't leave our client in a state where it's
+ * output is not yet fully read.
+ */
+ $results[] = array(
+ $match[1], // rkey
+ $match[2], // flags
+ $match[3], // len
+ $match[4], // casToken
+ $this->_fread( $sock, $match[3] + 2 ), // data
+ );
+ } elseif ( $decl == "END" ) {
+ if ( count( $results ) == 0 ) {
+ return false;
+ }
+
+ /**
+ * All data has been read, time to process the data and build
+ * meaningful return values.
+ */
+ foreach ( $results as $vars ) {
+ list( $rkey, $flags, $len, $casToken, $data ) = $vars;
+
+ if ( $data === false || substr( $data, -2 ) !== "\r\n" ) {
+ $this->_handle_error( $sock,
+ 'line ending missing from data block from $1' );
+ return false;
+ }
+ $data = substr( $data, 0, -2 );
+ $ret[$rkey] = $data;
+
+ if ( $this->_have_zlib && $flags & self::COMPRESSED ) {
+ $ret[$rkey] = gzuncompress( $ret[$rkey] );
+ }
+
+ /*
+ * This unserialize is the exact reason that we only want to
+ * process data after having read until "END" (instead of doing
+ * this right away): "unserialize" can trigger outside code:
+ * in the event that $ret[$rkey] is a serialized object,
+ * unserializing it will trigger __wakeup() if present. If that
+ * function attempted to read from memcached (while we did not
+ * yet read "END"), these 2 calls would collide.
+ */
+ if ( $flags & self::SERIALIZED ) {
+ $ret[$rkey] = unserialize( $ret[$rkey] );
+ } elseif ( $flags & self::INTVAL ) {
+ $ret[$rkey] = intval( $ret[$rkey] );
+ }
+ }
+
+ return true;
+ } else {
+ $this->_handle_error( $sock, 'Error parsing response from $1' );
+ return false;
+ }
+ }
+ }
+
+ // }}}
+ // {{{ _set()
+
+ /**
+ * Performs the requested storage operation to the memcache server
+ *
+ * @param string $cmd Command to perform
+ * @param string $key Key to act on
+ * @param mixed $val What we need to store
+ * @param int $exp (optional) Expiration time. This can be a number of seconds
+ * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
+ * longer must be the timestamp of the time at which the mapping should expire. It
+ * is safe to use timestamps in all cases, regardless of exipration
+ * eg: strtotime("+3 hour")
+ * @param float $casToken [optional]
+ *
+ * @return bool
+ * @access private
+ */
+ function _set( $cmd, $key, $val, $exp, $casToken = null ) {
+ if ( !$this->_active ) {
+ return false;
+ }
+
+ $sock = $this->get_sock( $key );
+ if ( !is_resource( $sock ) ) {
+ return false;
+ }
+
+ if ( isset( $this->stats[$cmd] ) ) {
+ $this->stats[$cmd]++;
+ } else {
+ $this->stats[$cmd] = 1;
+ }
+
+ $flags = 0;
+
+ if ( is_int( $val ) ) {
+ $flags |= self::INTVAL;
+ } elseif ( !is_scalar( $val ) ) {
+ $val = serialize( $val );
+ $flags |= self::SERIALIZED;
+ if ( $this->_debug ) {
+ $this->_debugprint( sprintf( "client: serializing data as it is not scalar\n" ) );
+ }
+ }
+
+ $len = strlen( $val );
+
+ if ( $this->_have_zlib && $this->_compress_enable
+ && $this->_compress_threshold && $len >= $this->_compress_threshold
+ ) {
+ $c_val = gzcompress( $val, 9 );
+ $c_len = strlen( $c_val );
+
+ if ( $c_len < $len * ( 1 - self::COMPRESSION_SAVINGS ) ) {
+ if ( $this->_debug ) {
+ $this->_debugprint( sprintf( "client: compressing data; was %d bytes is now %d bytes\n", $len, $c_len ) );
+ }
+ $val = $c_val;
+ $len = $c_len;
+ $flags |= self::COMPRESSED;
+ }
+ }
+
+ $command = "$cmd $key $flags $exp $len";
+ if ( $casToken ) {
+ $command .= " $casToken";
+ }
+
+ if ( !$this->_fwrite( $sock, "$command\r\n$val\r\n" ) ) {
+ return false;
+ }
+
+ $line = $this->_fgets( $sock );
+
+ if ( $this->_debug ) {
+ $this->_debugprint( sprintf( "%s %s (%s)\n", $cmd, $key, $line ) );
+ }
+ if ( $line == "STORED" ) {
+ return true;
+ }
+ return false;
+ }
+
+ // }}}
+ // {{{ sock_to_host()
+
+ /**
+ * Returns the socket for the host
+ *
+ * @param string $host Host:IP to get socket for
+ *
+ * @return Resource|bool IO Stream or false
+ * @access private
+ */
+ function sock_to_host( $host ) {
+ if ( isset( $this->_cache_sock[$host] ) ) {
+ return $this->_cache_sock[$host];
+ }
+
+ $sock = null;
+ $now = time();
+ list( $ip, /* $port */) = explode( ':', $host );
+ if ( isset( $this->_host_dead[$host] ) && $this->_host_dead[$host] > $now ||
+ isset( $this->_host_dead[$ip] ) && $this->_host_dead[$ip] > $now
+ ) {
+ return null;
+ }
+
+ if ( !$this->_connect_sock( $sock, $host ) ) {
+ return null;
+ }
+
+ // Do not buffer writes
+ stream_set_write_buffer( $sock, 0 );
+
+ $this->_cache_sock[$host] = $sock;
+
+ return $this->_cache_sock[$host];
+ }
+
+ /**
+ * @param string $text
+ */
+ function _debugprint( $text ) {
+ $this->_logger->debug( $text );
+ }
+
+ /**
+ * @param string $text
+ */
+ function _error_log( $text ) {
+ $this->_logger->error( "Memcached error: $text" );
+ }
+
+ /**
+ * Write to a stream. If there is an error, mark the socket dead.
+ *
+ * @param Resource $sock The socket
+ * @param string $buf The string to write
+ * @return bool True on success, false on failure
+ */
+ function _fwrite( $sock, $buf ) {
+ $bytesWritten = 0;
+ $bufSize = strlen( $buf );
+ while ( $bytesWritten < $bufSize ) {
+ $result = fwrite( $sock, $buf );
+ $data = stream_get_meta_data( $sock );
+ if ( $data['timed_out'] ) {
+ $this->_handle_error( $sock, 'timeout writing to $1' );
+ return false;
+ }
+ // Contrary to the documentation, fwrite() returns zero on error in PHP 5.3.
+ if ( $result === false || $result === 0 ) {
+ $this->_handle_error( $sock, 'error writing to $1' );
+ return false;
+ }
+ $bytesWritten += $result;
+ }
+
+ return true;
+ }
+
+ /**
+ * Handle an I/O error. Mark the socket dead and log an error.
+ *
+ * @param Resource $sock
+ * @param string $msg
+ */
+ function _handle_error( $sock, $msg ) {
+ $peer = stream_socket_get_name( $sock, true /** remote **/ );
+ if ( strval( $peer ) === '' ) {
+ $peer = array_search( $sock, $this->_cache_sock );
+ if ( $peer === false ) {
+ $peer = '[unknown host]';
+ }
+ }
+ $msg = str_replace( '$1', $peer, $msg );
+ $this->_error_log( "$msg\n" );
+ $this->_dead_sock( $sock );
+ }
+
+ /**
+ * Read the specified number of bytes from a stream. If there is an error,
+ * mark the socket dead.
+ *
+ * @param Resource $sock The socket
+ * @param int $len The number of bytes to read
+ * @return string|bool The string on success, false on failure.
+ */
+ function _fread( $sock, $len ) {
+ $buf = '';
+ while ( $len > 0 ) {
+ $result = fread( $sock, $len );
+ $data = stream_get_meta_data( $sock );
+ if ( $data['timed_out'] ) {
+ $this->_handle_error( $sock, 'timeout reading from $1' );
+ return false;
+ }
+ if ( $result === false ) {
+ $this->_handle_error( $sock, 'error reading buffer from $1' );
+ return false;
+ }
+ if ( $result === '' ) {
+ // This will happen if the remote end of the socket is shut down
+ $this->_handle_error( $sock, 'unexpected end of file reading from $1' );
+ return false;
+ }
+ $len -= strlen( $result );
+ $buf .= $result;
+ }
+ return $buf;
+ }
+
+ /**
+ * Read a line from a stream. If there is an error, mark the socket dead.
+ * The \r\n line ending is stripped from the response.
+ *
+ * @param Resource $sock The socket
+ * @return string|bool The string on success, false on failure
+ */
+ function _fgets( $sock ) {
+ $result = fgets( $sock );
+ // fgets() may return a partial line if there is a select timeout after
+ // a successful recv(), so we have to check for a timeout even if we
+ // got a string response.
+ $data = stream_get_meta_data( $sock );
+ if ( $data['timed_out'] ) {
+ $this->_handle_error( $sock, 'timeout reading line from $1' );
+ return false;
+ }
+ if ( $result === false ) {
+ $this->_handle_error( $sock, 'error reading line from $1' );
+ return false;
+ }
+ if ( substr( $result, -2 ) === "\r\n" ) {
+ $result = substr( $result, 0, -2 );
+ } elseif ( substr( $result, -1 ) === "\n" ) {
+ $result = substr( $result, 0, -1 );
+ } else {
+ $this->_handle_error( $sock, 'line ending missing in response from $1' );
+ return false;
+ }
+ return $result;
+ }
+
+ /**
+ * Flush the read buffer of a stream
+ * @param Resource $f
+ */
+ function _flush_read_buffer( $f ) {
+ if ( !is_resource( $f ) ) {
+ return;
+ }
+ $r = array( $f );
+ $w = null;
+ $e = null;
+ $n = stream_select( $r, $w, $e, 0, 0 );
+ while ( $n == 1 && !feof( $f ) ) {
+ fread( $f, 1024 );
+ $r = array( $f );
+ $w = null;
+ $e = null;
+ $n = stream_select( $r, $w, $e, 0, 0 );
+ }
+ }
+
+ // }}}
+ // }}}
+ // }}}
+}
+
+// }}}
+
+class MemCachedClientforWiki extends MWMemcached {
+}
--- /dev/null
+<?php
+/**
+ * Object caching using memcached.
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * A wrapper class for the pure-PHP memcached client, exposing a BagOStuff interface.
+ *
+ * @ingroup Cache
+ */
+class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
+ /**
+ * Available parameters are:
+ * - servers: The list of IP:port combinations holding the memcached servers.
+ * - debug: Whether to set the debug flag in the underlying client.
+ * - persistent: Whether to use a persistent connection
+ * - compress_threshold: The minimum size an object must be before it is compressed
+ * - timeout: The read timeout in microseconds
+ * - connect_timeout: The connect timeout in seconds
+ *
+ * @param array $params
+ */
+ function __construct( $params ) {
+ parent::__construct( $params );
+ $params = $this->applyDefaultParams( $params );
+
+ $this->client = new MWMemcached( $params );
+ $this->client->set_servers( $params['servers'] );
+ $this->client->set_debug( $params['debug'] );
+ }
+
+ public function setDebug( $debug ) {
+ $this->client->set_debug( $debug );
+ }
+
+ public function getMulti( array $keys, $flags = 0 ) {
+ foreach ( $keys as $key ) {
+ $this->validateKeyEncoding( $key );
+ }
+
+ return $this->client->get_multi( $keys );
+ }
+
+ public function incr( $key, $value = 1 ) {
+ $this->validateKeyEncoding( $key );
+
+ return $this->client->incr( $key, $value );
+ }
+
+ public function decr( $key, $value = 1 ) {
+ $this->validateKeyEncoding( $key );
+
+ return $this->client->decr( $key, $value );
+ }
+}
--- /dev/null
+<?php
+/**
+ * Wrapper for object caching in different caches.
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * A cache class that replicates all writes to multiple child caches. Reads
+ * are implemented by reading from the caches in the order they are given in
+ * the configuration until a cache gives a positive result.
+ *
+ * @ingroup Cache
+ */
+class MultiWriteBagOStuff extends BagOStuff {
+ /** @var BagOStuff[] */
+ protected $caches;
+ /** @var bool Use async secondary writes */
+ protected $asyncWrites = false;
+ /** @var callback|null */
+ protected $asyncHandler;
+
+ /** Idiom for "write to all backends" */
+ const ALL = INF;
+
+ const UPGRADE_TTL = 3600; // TTL when a key is copied to a higher cache tier
+
+ /**
+ * $params include:
+ * - caches: A numbered array of either ObjectFactory::getObjectFromSpec
+ * arrays yeilding BagOStuff objects or direct BagOStuff objects.
+ * If using the former, the 'args' field *must* be set.
+ * The first cache is the primary one, being the first to
+ * be read in the fallback chain. Writes happen to all stores
+ * in the order they are defined. However, lock()/unlock() calls
+ * only use the primary store.
+ * - replication: Either 'sync' or 'async'. This controls whether writes
+ * to secondary stores are deferred when possible. Async writes
+ * require setting 'asyncCallback'. HHVM register_postsend_function() function.
+ * Async writes can increase the chance of some race conditions
+ * or cause keys to expire seconds later than expected. It is
+ * safe to use for modules when cached values: are immutable,
+ * invalidation uses logical TTLs, invalidation uses etag/timestamp
+ * validation against the DB, or merge() is used to handle races.
+ * - asyncHandler: callable that takes a callback and runs it after the
+ * current web request ends. In CLI mode, it should run it immediately.
+ * @param array $params
+ * @throws InvalidArgumentException
+ */
+ public function __construct( $params ) {
+ parent::__construct( $params );
+
+ if ( empty( $params['caches'] ) || !is_array( $params['caches'] ) ) {
+ throw new InvalidArgumentException(
+ __METHOD__ . ': "caches" parameter must be an array of caches'
+ );
+ }
+
+ $this->caches = array();
+ foreach ( $params['caches'] as $cacheInfo ) {
+ if ( $cacheInfo instanceof BagOStuff ) {
+ $this->caches[] = $cacheInfo;
+ } else {
+ if ( !isset( $cacheInfo['args'] ) ) {
+ // B/C for when $cacheInfo was for ObjectCache::newFromParams().
+ // Callers intenting this to be for ObjectFactory::getObjectFromSpec
+ // should have set "args" per the docs above. Doings so avoids extra
+ // (likely harmless) params (factory/class/calls) ending up in "args".
+ $cacheInfo['args'] = array( $cacheInfo );
+ }
+ $this->caches[] = ObjectFactory::getObjectFromSpec( $cacheInfo );
+ }
+ }
+
+ $this->asyncHandler = isset( $params['asyncHandler'] )
+ ? $params['asyncHandler']
+ : null;
+ $this->asyncWrites = (
+ isset( $params['replication'] ) &&
+ $params['replication'] === 'async' &&
+ is_callable( $this->asyncHandler )
+ );
+ }
+
+ public function setDebug( $debug ) {
+ foreach ( $this->caches as $cache ) {
+ $cache->setDebug( $debug );
+ }
+ }
+
+ protected function doGet( $key, $flags = 0 ) {
+ if ( ( $flags & self::READ_LATEST ) == self::READ_LATEST ) {
+ // If the latest write was a delete(), we do NOT want to fallback
+ // to the other tiers and possibly see the old value. Also, this
+ // is used by mergeViaLock(), which only needs to hit the primary.
+ return $this->caches[0]->get( $key, $flags );
+ }
+
+ $misses = 0; // number backends checked
+ $value = false;
+ foreach ( $this->caches as $cache ) {
+ $value = $cache->get( $key, $flags );
+ if ( $value !== false ) {
+ break;
+ }
+ ++$misses;
+ }
+
+ if ( $value !== false
+ && $misses > 0
+ && ( $flags & self::READ_VERIFIED ) == self::READ_VERIFIED
+ ) {
+ $this->doWrite( $misses, $this->asyncWrites, 'set', $key, $value, self::UPGRADE_TTL );
+ }
+
+ return $value;
+ }
+
+ public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+ $asyncWrites = ( ( $flags & self::WRITE_SYNC ) == self::WRITE_SYNC )
+ ? false
+ : $this->asyncWrites;
+
+ return $this->doWrite( self::ALL, $asyncWrites, 'set', $key, $value, $exptime );
+ }
+
+ public function delete( $key ) {
+ return $this->doWrite( self::ALL, $this->asyncWrites, 'delete', $key );
+ }
+
+ public function add( $key, $value, $exptime = 0 ) {
+ return $this->doWrite( self::ALL, $this->asyncWrites, 'add', $key, $value, $exptime );
+ }
+
+ public function incr( $key, $value = 1 ) {
+ return $this->doWrite( self::ALL, $this->asyncWrites, 'incr', $key, $value );
+ }
+
+ public function decr( $key, $value = 1 ) {
+ return $this->doWrite( self::ALL, $this->asyncWrites, 'decr', $key, $value );
+ }
+
+ public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
+ // Only need to lock the first cache; also avoids deadlocks
+ return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
+ }
+
+ public function unlock( $key ) {
+ // Only the first cache is locked
+ return $this->caches[0]->unlock( $key );
+ }
+
+ public function getLastError() {
+ return $this->caches[0]->getLastError();
+ }
+
+ public function clearLastError() {
+ $this->caches[0]->clearLastError();
+ }
+
+ /**
+ * Apply a write method to the first $count backing caches
+ *
+ * @param integer $count
+ * @param bool $asyncWrites
+ * @param string $method
+ * @param mixed ...
+ * @return bool
+ */
+ protected function doWrite( $count, $asyncWrites, $method /*, ... */ ) {
+ $ret = true;
+ $args = array_slice( func_get_args(), 3 );
+
+ foreach ( $this->caches as $i => $cache ) {
+ if ( $i >= $count ) {
+ break; // ignore the lower tiers
+ }
+
+ if ( $i == 0 || !$asyncWrites ) {
+ // First store or in sync mode: write now and get result
+ if ( !call_user_func_array( array( $cache, $method ), $args ) ) {
+ $ret = false;
+ }
+ } else {
+ // Secondary write in async mode: do not block this HTTP request
+ $logger = $this->logger;
+ call_user_func(
+ $this->asyncHandler,
+ function () use ( $cache, $method, $args, $logger ) {
+ if ( !call_user_func_array( array( $cache, $method ), $args ) ) {
+ $logger->warning( "Async $method op failed" );
+ }
+ }
+ );
+ }
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Delete objects expiring before a certain date.
+ *
+ * Succeed if any of the child caches succeed.
+ * @param string $date
+ * @param bool|callable $progressCallback
+ * @return bool
+ */
+ public function deleteObjectsExpiringBefore( $date, $progressCallback = false ) {
+ $ret = false;
+ foreach ( $this->caches as $cache ) {
+ if ( $cache->deleteObjectsExpiringBefore( $date, $progressCallback ) ) {
+ $ret = true;
+ }
+ }
+
+ return $ret;
+ }
+}
* Retrieve the version of the installed ImageMagick
* You can use PHPs version_compare() to use this value
* Value is cached for one hour.
- * @return string Representing the IM version.
+ * @return string|bool Representing the IM version; false on error
*/
protected function getMagickVersion() {
- global $wgMemc;
-
- $cache = $wgMemc->get( "imagemagick-version" );
- if ( !$cache ) {
- global $wgImageMagickConvertCommand;
- $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
- wfDebug( __METHOD__ . ": Running convert -version\n" );
- $retval = '';
- $return = wfShellExec( $cmd, $retval );
- $x = preg_match( '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches );
- if ( $x != 1 ) {
- wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
-
- return null;
+ return ObjectCache::newAccelerator( CACHE_NONE )->getWithSetCallback(
+ "imagemagick-version",
+ 3600,
+ function () {
+ global $wgImageMagickConvertCommand;
+
+ $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
+ wfDebug( __METHOD__ . ": Running convert -version\n" );
+ $retval = '';
+ $return = wfShellExec( $cmd, $retval );
+ $x = preg_match(
+ '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
+ );
+ if ( $x != 1 ) {
+ wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
+
+ return false;
+ }
+
+ return $matches[1];
}
- $wgMemc->set( "imagemagick-version", $matches[1], 3600 );
-
- return $matches[1];
- }
-
- return $cache;
+ );
}
/**
+++ /dev/null
-<?php
-/**
- * Base class for memcached clients.
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Cache
- */
-
-/**
- * Base class for memcached clients.
- *
- * @ingroup Cache
- */
-class MemcachedBagOStuff extends BagOStuff {
- /** @var MWMemcached|Memcached */
- protected $client;
-
- /**
- * Fill in the defaults for any parameters missing from $params, using the
- * backwards-compatible global variables
- * @param array $params
- * @return array
- */
- protected function applyDefaultParams( $params ) {
- if ( !isset( $params['servers'] ) ) {
- $params['servers'] = $GLOBALS['wgMemCachedServers'];
- }
- if ( !isset( $params['debug'] ) ) {
- $params['debug'] = $GLOBALS['wgMemCachedDebug'];
- }
- if ( !isset( $params['persistent'] ) ) {
- $params['persistent'] = $GLOBALS['wgMemCachedPersistent'];
- }
- if ( !isset( $params['compress_threshold'] ) ) {
- $params['compress_threshold'] = 1500;
- }
- if ( !isset( $params['timeout'] ) ) {
- $params['timeout'] = $GLOBALS['wgMemCachedTimeout'];
- }
- if ( !isset( $params['connect_timeout'] ) ) {
- $params['connect_timeout'] = 0.5;
- }
- return $params;
- }
-
- protected function doGet( $key, $flags = 0 ) {
- $casToken = null;
-
- return $this->getWithToken( $key, $casToken, $flags );
- }
-
- protected function getWithToken( $key, &$casToken, $flags = 0 ) {
- return $this->client->get( $this->encodeKey( $key ), $casToken );
- }
-
- public function set( $key, $value, $exptime = 0, $flags = 0 ) {
- return $this->client->set( $this->encodeKey( $key ), $value,
- $this->fixExpiry( $exptime ) );
- }
-
- protected function cas( $casToken, $key, $value, $exptime = 0 ) {
- return $this->client->cas( $casToken, $this->encodeKey( $key ),
- $value, $this->fixExpiry( $exptime ) );
- }
-
- public function delete( $key ) {
- return $this->client->delete( $this->encodeKey( $key ) );
- }
-
- public function add( $key, $value, $exptime = 0 ) {
- return $this->client->add( $this->encodeKey( $key ), $value,
- $this->fixExpiry( $exptime ) );
- }
-
- public function merge( $key, $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
- if ( !is_callable( $callback ) ) {
- throw new Exception( "Got invalid callback." );
- }
-
- return $this->mergeViaCas( $key, $callback, $exptime, $attempts );
- }
-
- /**
- * Get the underlying client object. This is provided for debugging
- * purposes.
- * @return BagOStuff
- */
- public function getClient() {
- return $this->client;
- }
-
- /**
- * Encode a key for use on the wire inside the memcached protocol.
- *
- * We encode spaces and line breaks to avoid protocol errors. We encode
- * the other control characters for compatibility with libmemcached
- * verify_key. We leave other punctuation alone, to maximise backwards
- * compatibility.
- * @param string $key
- * @return string
- */
- public function encodeKey( $key ) {
- return preg_replace_callback( '/[\x00-\x20\x25\x7f]+/',
- array( $this, 'encodeKeyCallback' ), $key );
- }
-
- /**
- * @param array $m
- * @return string
- */
- protected function encodeKeyCallback( $m ) {
- return rawurlencode( $m[0] );
- }
-
- /**
- * TTLs higher than 30 days will be detected as absolute TTLs
- * (UNIX timestamps), and will result in the cache entry being
- * discarded immediately because the expiry is in the past.
- * Clamp expires >30d at 30d, unless they're >=1e9 in which
- * case they are likely to really be absolute (1e9 = 2011-09-09)
- * @param int $expiry
- * @return int
- */
- function fixExpiry( $expiry ) {
- if ( $expiry > 2592000 && $expiry < 1000000000 ) {
- $expiry = 2592000;
- }
- return (int)$expiry;
- }
-
- /**
- * Decode a key encoded with encodeKey(). This is provided as a convenience
- * function for debugging.
- *
- * @param string $key
- *
- * @return string
- */
- public function decodeKey( $key ) {
- // matches %00-%20, %25, %7F (=decoded alternatives for those encoded in encodeKey)
- return preg_replace_callback( '/%([0-1][0-9]|20|25|7F)/i', function ( $match ) {
- return urldecode( $match[0] );
- }, $key );
- }
-
- /**
- * Send a debug message to the log
- * @param string $text
- */
- protected function debugLog( $text ) {
- $this->logger->debug( $text );
- }
-
- public function modifySimpleRelayEvent( array $event ) {
- if ( array_key_exists( 'val', $event ) ) {
- $event['flg'] = 0; // data is not serialized nor gzipped (for memcached driver)
- }
-
- return $event;
- }
-}
+++ /dev/null
-<?php
-// @codingStandardsIgnoreFile It's an external lib and it isn't. Let's not bother.
-/**
- * Memcached client for PHP.
- *
- * +---------------------------------------------------------------------------+
- * | memcached client, PHP |
- * +---------------------------------------------------------------------------+
- * | Copyright (c) 2003 Ryan T. Dean <rtdean@cytherianage.net> |
- * | All rights reserved. |
- * | |
- * | Redistribution and use in source and binary forms, with or without |
- * | modification, are permitted provided that the following conditions |
- * | are met: |
- * | |
- * | 1. Redistributions of source code must retain the above copyright |
- * | notice, this list of conditions and the following disclaimer. |
- * | 2. Redistributions in binary form must reproduce the above copyright |
- * | notice, this list of conditions and the following disclaimer in the |
- * | documentation and/or other materials provided with the distribution. |
- * | |
- * | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
- * | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
- * | OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
- * | IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
- * | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
- * | NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- * | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- * | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
- * | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
- * | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- * +---------------------------------------------------------------------------+
- * | Author: Ryan T. Dean <rtdean@cytherianage.net> |
- * | Heavily influenced by the Perl memcached client by Brad Fitzpatrick. |
- * | Permission granted by Brad Fitzpatrick for relicense of ported Perl |
- * | client logic under 2-clause BSD license. |
- * +---------------------------------------------------------------------------+
- *
- * @file
- * $TCAnet$
- */
-
-/**
- * This is the PHP client for memcached - a distributed memory cache daemon.
- * More information is available at http://www.danga.com/memcached/
- *
- * Usage example:
- *
- * require_once 'memcached.php';
- *
- * $mc = new MWMemcached(array(
- * 'servers' => array('127.0.0.1:10000',
- * array('192.0.0.1:10010', 2),
- * '127.0.0.1:10020'),
- * 'debug' => false,
- * 'compress_threshold' => 10240,
- * 'persistent' => true));
- *
- * $mc->add( 'key', array( 'some', 'array' ) );
- * $mc->replace( 'key', 'some random string' );
- * $val = $mc->get( 'key' );
- *
- * @author Ryan T. Dean <rtdean@cytherianage.net>
- * @version 0.1.2
- */
-
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-
-// {{{ requirements
-// }}}
-
-// {{{ class MWMemcached
-/**
- * memcached client class implemented using (p)fsockopen()
- *
- * @author Ryan T. Dean <rtdean@cytherianage.net>
- * @ingroup Cache
- */
-class MWMemcached {
- // {{{ properties
- // {{{ public
-
- // {{{ constants
- // {{{ flags
-
- /**
- * Flag: indicates data is serialized
- */
- const SERIALIZED = 1;
-
- /**
- * Flag: indicates data is compressed
- */
- const COMPRESSED = 2;
-
- /**
- * Flag: indicates data is an integer
- */
- const INTVAL = 4;
-
- // }}}
-
- /**
- * Minimum savings to store data compressed
- */
- const COMPRESSION_SAVINGS = 0.20;
-
- // }}}
-
- /**
- * Command statistics
- *
- * @var array
- * @access public
- */
- public $stats;
-
- // }}}
- // {{{ private
-
- /**
- * Cached Sockets that are connected
- *
- * @var array
- * @access private
- */
- public $_cache_sock;
-
- /**
- * Current debug status; 0 - none to 9 - profiling
- *
- * @var bool
- * @access private
- */
- public $_debug;
-
- /**
- * Dead hosts, assoc array, 'host'=>'unixtime when ok to check again'
- *
- * @var array
- * @access private
- */
- public $_host_dead;
-
- /**
- * Is compression available?
- *
- * @var bool
- * @access private
- */
- public $_have_zlib;
-
- /**
- * Do we want to use compression?
- *
- * @var bool
- * @access private
- */
- public $_compress_enable;
-
- /**
- * At how many bytes should we compress?
- *
- * @var int
- * @access private
- */
- public $_compress_threshold;
-
- /**
- * Are we using persistent links?
- *
- * @var bool
- * @access private
- */
- public $_persistent;
-
- /**
- * If only using one server; contains ip:port to connect to
- *
- * @var string
- * @access private
- */
- public $_single_sock;
-
- /**
- * Array containing ip:port or array(ip:port, weight)
- *
- * @var array
- * @access private
- */
- public $_servers;
-
- /**
- * Our bit buckets
- *
- * @var array
- * @access private
- */
- public $_buckets;
-
- /**
- * Total # of bit buckets we have
- *
- * @var int
- * @access private
- */
- public $_bucketcount;
-
- /**
- * # of total servers we have
- *
- * @var int
- * @access private
- */
- public $_active;
-
- /**
- * Stream timeout in seconds. Applies for example to fread()
- *
- * @var int
- * @access private
- */
- public $_timeout_seconds;
-
- /**
- * Stream timeout in microseconds
- *
- * @var int
- * @access private
- */
- public $_timeout_microseconds;
-
- /**
- * Connect timeout in seconds
- */
- public $_connect_timeout;
-
- /**
- * Number of connection attempts for each server
- */
- public $_connect_attempts;
-
- /**
- * @var LoggerInterface
- */
- private $_logger;
-
- // }}}
- // }}}
- // {{{ methods
- // {{{ public functions
- // {{{ memcached()
-
- /**
- * Memcache initializer
- *
- * @param array $args Associative array of settings
- *
- * @return mixed
- */
- public function __construct( $args ) {
- $this->set_servers( isset( $args['servers'] ) ? $args['servers'] : array() );
- $this->_debug = isset( $args['debug'] ) ? $args['debug'] : false;
- $this->stats = array();
- $this->_compress_threshold = isset( $args['compress_threshold'] ) ? $args['compress_threshold'] : 0;
- $this->_persistent = isset( $args['persistent'] ) ? $args['persistent'] : false;
- $this->_compress_enable = true;
- $this->_have_zlib = function_exists( 'gzcompress' );
-
- $this->_cache_sock = array();
- $this->_host_dead = array();
-
- $this->_timeout_seconds = 0;
- $this->_timeout_microseconds = isset( $args['timeout'] ) ? $args['timeout'] : 500000;
-
- $this->_connect_timeout = isset( $args['connect_timeout'] ) ? $args['connect_timeout'] : 0.1;
- $this->_connect_attempts = 2;
-
- $this->_logger = isset( $args['logger'] ) ? $args['logger'] : new NullLogger();
- }
-
- // }}}
- // {{{ add()
-
- /**
- * Adds a key/value to the memcache server if one isn't already set with
- * that key
- *
- * @param string $key Key to set with data
- * @param mixed $val Value to store
- * @param int $exp (optional) Expiration time. This can be a number of seconds
- * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
- * longer must be the timestamp of the time at which the mapping should expire. It
- * is safe to use timestamps in all cases, regardless of expiration
- * eg: strtotime("+3 hour")
- *
- * @return bool
- */
- public function add( $key, $val, $exp = 0 ) {
- return $this->_set( 'add', $key, $val, $exp );
- }
-
- // }}}
- // {{{ decr()
-
- /**
- * Decrease a value stored on the memcache server
- *
- * @param string $key Key to decrease
- * @param int $amt (optional) amount to decrease
- *
- * @return mixed False on failure, value on success
- */
- public function decr( $key, $amt = 1 ) {
- return $this->_incrdecr( 'decr', $key, $amt );
- }
-
- // }}}
- // {{{ delete()
-
- /**
- * Deletes a key from the server, optionally after $time
- *
- * @param string $key Key to delete
- * @param int $time (optional) how long to wait before deleting
- *
- * @return bool True on success, false on failure
- */
- public function delete( $key, $time = 0 ) {
- if ( !$this->_active ) {
- return false;
- }
-
- $sock = $this->get_sock( $key );
- if ( !is_resource( $sock ) ) {
- return false;
- }
-
- $key = is_array( $key ) ? $key[1] : $key;
-
- if ( isset( $this->stats['delete'] ) ) {
- $this->stats['delete']++;
- } else {
- $this->stats['delete'] = 1;
- }
- $cmd = "delete $key $time\r\n";
- if ( !$this->_fwrite( $sock, $cmd ) ) {
- return false;
- }
- $res = $this->_fgets( $sock );
-
- if ( $this->_debug ) {
- $this->_debugprint( sprintf( "MemCache: delete %s (%s)\n", $key, $res ) );
- }
-
- if ( $res == "DELETED" || $res == "NOT_FOUND" ) {
- return true;
- }
-
- return false;
- }
-
- /**
- * @param string $key
- * @param int $timeout
- * @return bool
- */
- public function lock( $key, $timeout = 0 ) {
- /* stub */
- return true;
- }
-
- /**
- * @param string $key
- * @return bool
- */
- public function unlock( $key ) {
- /* stub */
- return true;
- }
-
- // }}}
- // {{{ disconnect_all()
-
- /**
- * Disconnects all connected sockets
- */
- public function disconnect_all() {
- foreach ( $this->_cache_sock as $sock ) {
- fclose( $sock );
- }
-
- $this->_cache_sock = array();
- }
-
- // }}}
- // {{{ enable_compress()
-
- /**
- * Enable / Disable compression
- *
- * @param bool $enable True to enable, false to disable
- */
- public function enable_compress( $enable ) {
- $this->_compress_enable = $enable;
- }
-
- // }}}
- // {{{ forget_dead_hosts()
-
- /**
- * Forget about all of the dead hosts
- */
- public function forget_dead_hosts() {
- $this->_host_dead = array();
- }
-
- // }}}
- // {{{ get()
-
- /**
- * Retrieves the value associated with the key from the memcache server
- *
- * @param array|string $key key to retrieve
- * @param float $casToken [optional]
- *
- * @return mixed
- */
- public function get( $key, &$casToken = null ) {
-
- if ( $this->_debug ) {
- $this->_debugprint( "get($key)\n" );
- }
-
- if ( !is_array( $key ) && strval( $key ) === '' ) {
- $this->_debugprint( "Skipping key which equals to an empty string" );
- return false;
- }
-
- if ( !$this->_active ) {
- return false;
- }
-
- $sock = $this->get_sock( $key );
-
- if ( !is_resource( $sock ) ) {
- return false;
- }
-
- $key = is_array( $key ) ? $key[1] : $key;
- if ( isset( $this->stats['get'] ) ) {
- $this->stats['get']++;
- } else {
- $this->stats['get'] = 1;
- }
-
- $cmd = "gets $key\r\n";
- if ( !$this->_fwrite( $sock, $cmd ) ) {
- return false;
- }
-
- $val = array();
- $this->_load_items( $sock, $val, $casToken );
-
- if ( $this->_debug ) {
- foreach ( $val as $k => $v ) {
- $this->_debugprint( sprintf( "MemCache: sock %s got %s\n", serialize( $sock ), $k ) );
- }
- }
-
- $value = false;
- if ( isset( $val[$key] ) ) {
- $value = $val[$key];
- }
- return $value;
- }
-
- // }}}
- // {{{ get_multi()
-
- /**
- * Get multiple keys from the server(s)
- *
- * @param array $keys Keys to retrieve
- *
- * @return array
- */
- public function get_multi( $keys ) {
- if ( !$this->_active ) {
- return false;
- }
-
- if ( isset( $this->stats['get_multi'] ) ) {
- $this->stats['get_multi']++;
- } else {
- $this->stats['get_multi'] = 1;
- }
- $sock_keys = array();
- $socks = array();
- foreach ( $keys as $key ) {
- $sock = $this->get_sock( $key );
- if ( !is_resource( $sock ) ) {
- continue;
- }
- $key = is_array( $key ) ? $key[1] : $key;
- if ( !isset( $sock_keys[$sock] ) ) {
- $sock_keys[intval( $sock )] = array();
- $socks[] = $sock;
- }
- $sock_keys[intval( $sock )][] = $key;
- }
-
- $gather = array();
- // Send out the requests
- foreach ( $socks as $sock ) {
- $cmd = 'gets';
- foreach ( $sock_keys[intval( $sock )] as $key ) {
- $cmd .= ' ' . $key;
- }
- $cmd .= "\r\n";
-
- if ( $this->_fwrite( $sock, $cmd ) ) {
- $gather[] = $sock;
- }
- }
-
- // Parse responses
- $val = array();
- foreach ( $gather as $sock ) {
- $this->_load_items( $sock, $val, $casToken );
- }
-
- if ( $this->_debug ) {
- foreach ( $val as $k => $v ) {
- $this->_debugprint( sprintf( "MemCache: got %s\n", $k ) );
- }
- }
-
- return $val;
- }
-
- // }}}
- // {{{ incr()
-
- /**
- * Increments $key (optionally) by $amt
- *
- * @param string $key Key to increment
- * @param int $amt (optional) amount to increment
- *
- * @return int|null Null if the key does not exist yet (this does NOT
- * create new mappings if the key does not exist). If the key does
- * exist, this returns the new value for that key.
- */
- public function incr( $key, $amt = 1 ) {
- return $this->_incrdecr( 'incr', $key, $amt );
- }
-
- // }}}
- // {{{ replace()
-
- /**
- * Overwrites an existing value for key; only works if key is already set
- *
- * @param string $key Key to set value as
- * @param mixed $value Value to store
- * @param int $exp (optional) Expiration time. This can be a number of seconds
- * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
- * longer must be the timestamp of the time at which the mapping should expire. It
- * is safe to use timestamps in all cases, regardless of exipration
- * eg: strtotime("+3 hour")
- *
- * @return bool
- */
- public function replace( $key, $value, $exp = 0 ) {
- return $this->_set( 'replace', $key, $value, $exp );
- }
-
- // }}}
- // {{{ run_command()
-
- /**
- * Passes through $cmd to the memcache server connected by $sock; returns
- * output as an array (null array if no output)
- *
- * @param Resource $sock Socket to send command on
- * @param string $cmd Command to run
- *
- * @return array Output array
- */
- public function run_command( $sock, $cmd ) {
- if ( !is_resource( $sock ) ) {
- return array();
- }
-
- if ( !$this->_fwrite( $sock, $cmd ) ) {
- return array();
- }
-
- $ret = array();
- while ( true ) {
- $res = $this->_fgets( $sock );
- $ret[] = $res;
- if ( preg_match( '/^END/', $res ) ) {
- break;
- }
- if ( strlen( $res ) == 0 ) {
- break;
- }
- }
- return $ret;
- }
-
- // }}}
- // {{{ set()
-
- /**
- * Unconditionally sets a key to a given value in the memcache. Returns true
- * if set successfully.
- *
- * @param string $key Key to set value as
- * @param mixed $value Value to set
- * @param int $exp (optional) Expiration time. This can be a number of seconds
- * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
- * longer must be the timestamp of the time at which the mapping should expire. It
- * is safe to use timestamps in all cases, regardless of exipration
- * eg: strtotime("+3 hour")
- *
- * @return bool True on success
- */
- public function set( $key, $value, $exp = 0 ) {
- return $this->_set( 'set', $key, $value, $exp );
- }
-
- // }}}
- // {{{ cas()
-
- /**
- * Sets a key to a given value in the memcache if the current value still corresponds
- * to a known, given value. Returns true if set successfully.
- *
- * @param float $casToken Current known value
- * @param string $key Key to set value as
- * @param mixed $value Value to set
- * @param int $exp (optional) Expiration time. This can be a number of seconds
- * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
- * longer must be the timestamp of the time at which the mapping should expire. It
- * is safe to use timestamps in all cases, regardless of exipration
- * eg: strtotime("+3 hour")
- *
- * @return bool True on success
- */
- public function cas( $casToken, $key, $value, $exp = 0 ) {
- return $this->_set( 'cas', $key, $value, $exp, $casToken );
- }
-
- // }}}
- // {{{ set_compress_threshold()
-
- /**
- * Sets the compression threshold
- *
- * @param int $thresh Threshold to compress if larger than
- */
- public function set_compress_threshold( $thresh ) {
- $this->_compress_threshold = $thresh;
- }
-
- // }}}
- // {{{ set_debug()
-
- /**
- * Sets the debug flag
- *
- * @param bool $dbg True for debugging, false otherwise
- *
- * @see MWMemcached::__construct
- */
- public function set_debug( $dbg ) {
- $this->_debug = $dbg;
- }
-
- // }}}
- // {{{ set_servers()
-
- /**
- * Sets the server list to distribute key gets and puts between
- *
- * @param array $list Array of servers to connect to
- *
- * @see MWMemcached::__construct()
- */
- public function set_servers( $list ) {
- $this->_servers = $list;
- $this->_active = count( $list );
- $this->_buckets = null;
- $this->_bucketcount = 0;
-
- $this->_single_sock = null;
- if ( $this->_active == 1 ) {
- $this->_single_sock = $this->_servers[0];
- }
- }
-
- /**
- * Sets the timeout for new connections
- *
- * @param int $seconds Number of seconds
- * @param int $microseconds Number of microseconds
- */
- public function set_timeout( $seconds, $microseconds ) {
- $this->_timeout_seconds = $seconds;
- $this->_timeout_microseconds = $microseconds;
- }
-
- // }}}
- // }}}
- // {{{ private methods
- // {{{ _close_sock()
-
- /**
- * Close the specified socket
- *
- * @param string $sock Socket to close
- *
- * @access private
- */
- function _close_sock( $sock ) {
- $host = array_search( $sock, $this->_cache_sock );
- fclose( $this->_cache_sock[$host] );
- unset( $this->_cache_sock[$host] );
- }
-
- // }}}
- // {{{ _connect_sock()
-
- /**
- * Connects $sock to $host, timing out after $timeout
- *
- * @param int $sock Socket to connect
- * @param string $host Host:IP to connect to
- *
- * @return bool
- * @access private
- */
- function _connect_sock( &$sock, $host ) {
- list( $ip, $port ) = preg_split( '/:(?=\d)/', $host );
- $sock = false;
- $timeout = $this->_connect_timeout;
- $errno = $errstr = null;
- for ( $i = 0; !$sock && $i < $this->_connect_attempts; $i++ ) {
- MediaWiki\suppressWarnings();
- if ( $this->_persistent == 1 ) {
- $sock = pfsockopen( $ip, $port, $errno, $errstr, $timeout );
- } else {
- $sock = fsockopen( $ip, $port, $errno, $errstr, $timeout );
- }
- MediaWiki\restoreWarnings();
- }
- if ( !$sock ) {
- $this->_error_log( "Error connecting to $host: $errstr\n" );
- $this->_dead_host( $host );
- return false;
- }
-
- // Initialise timeout
- stream_set_timeout( $sock, $this->_timeout_seconds, $this->_timeout_microseconds );
-
- // If the connection was persistent, flush the read buffer in case there
- // was a previous incomplete request on this connection
- if ( $this->_persistent ) {
- $this->_flush_read_buffer( $sock );
- }
- return true;
- }
-
- // }}}
- // {{{ _dead_sock()
-
- /**
- * Marks a host as dead until 30-40 seconds in the future
- *
- * @param string $sock Socket to mark as dead
- *
- * @access private
- */
- function _dead_sock( $sock ) {
- $host = array_search( $sock, $this->_cache_sock );
- $this->_dead_host( $host );
- }
-
- /**
- * @param string $host
- */
- function _dead_host( $host ) {
- $parts = explode( ':', $host );
- $ip = $parts[0];
- $this->_host_dead[$ip] = time() + 30 + intval( rand( 0, 10 ) );
- $this->_host_dead[$host] = $this->_host_dead[$ip];
- unset( $this->_cache_sock[$host] );
- }
-
- // }}}
- // {{{ get_sock()
-
- /**
- * get_sock
- *
- * @param string $key Key to retrieve value for;
- *
- * @return Resource|bool Resource on success, false on failure
- * @access private
- */
- function get_sock( $key ) {
- if ( !$this->_active ) {
- return false;
- }
-
- if ( $this->_single_sock !== null ) {
- return $this->sock_to_host( $this->_single_sock );
- }
-
- $hv = is_array( $key ) ? intval( $key[0] ) : $this->_hashfunc( $key );
- if ( $this->_buckets === null ) {
- $bu = array();
- foreach ( $this->_servers as $v ) {
- if ( is_array( $v ) ) {
- for ( $i = 0; $i < $v[1]; $i++ ) {
- $bu[] = $v[0];
- }
- } else {
- $bu[] = $v;
- }
- }
- $this->_buckets = $bu;
- $this->_bucketcount = count( $bu );
- }
-
- $realkey = is_array( $key ) ? $key[1] : $key;
- for ( $tries = 0; $tries < 20; $tries++ ) {
- $host = $this->_buckets[$hv % $this->_bucketcount];
- $sock = $this->sock_to_host( $host );
- if ( is_resource( $sock ) ) {
- return $sock;
- }
- $hv = $this->_hashfunc( $hv . $realkey );
- }
-
- return false;
- }
-
- // }}}
- // {{{ _hashfunc()
-
- /**
- * Creates a hash integer based on the $key
- *
- * @param string $key Key to hash
- *
- * @return int Hash value
- * @access private
- */
- function _hashfunc( $key ) {
- # Hash function must be in [0,0x7ffffff]
- # We take the first 31 bits of the MD5 hash, which unlike the hash
- # function used in a previous version of this client, works
- return hexdec( substr( md5( $key ), 0, 8 ) ) & 0x7fffffff;
- }
-
- // }}}
- // {{{ _incrdecr()
-
- /**
- * Perform increment/decriment on $key
- *
- * @param string $cmd Command to perform
- * @param string|array $key Key to perform it on
- * @param int $amt Amount to adjust
- *
- * @return int New value of $key
- * @access private
- */
- function _incrdecr( $cmd, $key, $amt = 1 ) {
- if ( !$this->_active ) {
- return null;
- }
-
- $sock = $this->get_sock( $key );
- if ( !is_resource( $sock ) ) {
- return null;
- }
-
- $key = is_array( $key ) ? $key[1] : $key;
- if ( isset( $this->stats[$cmd] ) ) {
- $this->stats[$cmd]++;
- } else {
- $this->stats[$cmd] = 1;
- }
- if ( !$this->_fwrite( $sock, "$cmd $key $amt\r\n" ) ) {
- return null;
- }
-
- $line = $this->_fgets( $sock );
- $match = array();
- if ( !preg_match( '/^(\d+)/', $line, $match ) ) {
- return null;
- }
- return $match[1];
- }
-
- // }}}
- // {{{ _load_items()
-
- /**
- * Load items into $ret from $sock
- *
- * @param Resource $sock Socket to read from
- * @param array $ret returned values
- * @param float $casToken [optional]
- * @return bool True for success, false for failure
- *
- * @access private
- */
- function _load_items( $sock, &$ret, &$casToken = null ) {
- $results = array();
-
- while ( 1 ) {
- $decl = $this->_fgets( $sock );
-
- if ( $decl === false ) {
- /*
- * If nothing can be read, something is wrong because we know exactly when
- * to stop reading (right after "END") and we return right after that.
- */
- return false;
- } elseif ( preg_match( '/^VALUE (\S+) (\d+) (\d+) (\d+)$/', $decl, $match ) ) {
- /*
- * Read all data returned. This can be either one or multiple values.
- * Save all that data (in an array) to be processed later: we'll first
- * want to continue reading until "END" before doing anything else,
- * to make sure that we don't leave our client in a state where it's
- * output is not yet fully read.
- */
- $results[] = array(
- $match[1], // rkey
- $match[2], // flags
- $match[3], // len
- $match[4], // casToken
- $this->_fread( $sock, $match[3] + 2 ), // data
- );
- } elseif ( $decl == "END" ) {
- if ( count( $results ) == 0 ) {
- return false;
- }
-
- /**
- * All data has been read, time to process the data and build
- * meaningful return values.
- */
- foreach ( $results as $vars ) {
- list( $rkey, $flags, $len, $casToken, $data ) = $vars;
-
- if ( $data === false || substr( $data, -2 ) !== "\r\n" ) {
- $this->_handle_error( $sock,
- 'line ending missing from data block from $1' );
- return false;
- }
- $data = substr( $data, 0, -2 );
- $ret[$rkey] = $data;
-
- if ( $this->_have_zlib && $flags & self::COMPRESSED ) {
- $ret[$rkey] = gzuncompress( $ret[$rkey] );
- }
-
- /*
- * This unserialize is the exact reason that we only want to
- * process data after having read until "END" (instead of doing
- * this right away): "unserialize" can trigger outside code:
- * in the event that $ret[$rkey] is a serialized object,
- * unserializing it will trigger __wakeup() if present. If that
- * function attempted to read from memcached (while we did not
- * yet read "END"), these 2 calls would collide.
- */
- if ( $flags & self::SERIALIZED ) {
- $ret[$rkey] = unserialize( $ret[$rkey] );
- } elseif ( $flags & self::INTVAL ) {
- $ret[$rkey] = intval( $ret[$rkey] );
- }
- }
-
- return true;
- } else {
- $this->_handle_error( $sock, 'Error parsing response from $1' );
- return false;
- }
- }
- }
-
- // }}}
- // {{{ _set()
-
- /**
- * Performs the requested storage operation to the memcache server
- *
- * @param string $cmd Command to perform
- * @param string $key Key to act on
- * @param mixed $val What we need to store
- * @param int $exp (optional) Expiration time. This can be a number of seconds
- * to cache for (up to 30 days inclusive). Any timespans of 30 days + 1 second or
- * longer must be the timestamp of the time at which the mapping should expire. It
- * is safe to use timestamps in all cases, regardless of exipration
- * eg: strtotime("+3 hour")
- * @param float $casToken [optional]
- *
- * @return bool
- * @access private
- */
- function _set( $cmd, $key, $val, $exp, $casToken = null ) {
- if ( !$this->_active ) {
- return false;
- }
-
- $sock = $this->get_sock( $key );
- if ( !is_resource( $sock ) ) {
- return false;
- }
-
- if ( isset( $this->stats[$cmd] ) ) {
- $this->stats[$cmd]++;
- } else {
- $this->stats[$cmd] = 1;
- }
-
- $flags = 0;
-
- if ( is_int( $val ) ) {
- $flags |= self::INTVAL;
- } elseif ( !is_scalar( $val ) ) {
- $val = serialize( $val );
- $flags |= self::SERIALIZED;
- if ( $this->_debug ) {
- $this->_debugprint( sprintf( "client: serializing data as it is not scalar\n" ) );
- }
- }
-
- $len = strlen( $val );
-
- if ( $this->_have_zlib && $this->_compress_enable
- && $this->_compress_threshold && $len >= $this->_compress_threshold
- ) {
- $c_val = gzcompress( $val, 9 );
- $c_len = strlen( $c_val );
-
- if ( $c_len < $len * ( 1 - self::COMPRESSION_SAVINGS ) ) {
- if ( $this->_debug ) {
- $this->_debugprint( sprintf( "client: compressing data; was %d bytes is now %d bytes\n", $len, $c_len ) );
- }
- $val = $c_val;
- $len = $c_len;
- $flags |= self::COMPRESSED;
- }
- }
-
- $command = "$cmd $key $flags $exp $len";
- if ( $casToken ) {
- $command .= " $casToken";
- }
-
- if ( !$this->_fwrite( $sock, "$command\r\n$val\r\n" ) ) {
- return false;
- }
-
- $line = $this->_fgets( $sock );
-
- if ( $this->_debug ) {
- $this->_debugprint( sprintf( "%s %s (%s)\n", $cmd, $key, $line ) );
- }
- if ( $line == "STORED" ) {
- return true;
- }
- return false;
- }
-
- // }}}
- // {{{ sock_to_host()
-
- /**
- * Returns the socket for the host
- *
- * @param string $host Host:IP to get socket for
- *
- * @return Resource|bool IO Stream or false
- * @access private
- */
- function sock_to_host( $host ) {
- if ( isset( $this->_cache_sock[$host] ) ) {
- return $this->_cache_sock[$host];
- }
-
- $sock = null;
- $now = time();
- list( $ip, /* $port */) = explode( ':', $host );
- if ( isset( $this->_host_dead[$host] ) && $this->_host_dead[$host] > $now ||
- isset( $this->_host_dead[$ip] ) && $this->_host_dead[$ip] > $now
- ) {
- return null;
- }
-
- if ( !$this->_connect_sock( $sock, $host ) ) {
- return null;
- }
-
- // Do not buffer writes
- stream_set_write_buffer( $sock, 0 );
-
- $this->_cache_sock[$host] = $sock;
-
- return $this->_cache_sock[$host];
- }
-
- /**
- * @param string $text
- */
- function _debugprint( $text ) {
- $this->_logger->debug( $text );
- }
-
- /**
- * @param string $text
- */
- function _error_log( $text ) {
- $this->_logger->error( "Memcached error: $text" );
- }
-
- /**
- * Write to a stream. If there is an error, mark the socket dead.
- *
- * @param Resource $sock The socket
- * @param string $buf The string to write
- * @return bool True on success, false on failure
- */
- function _fwrite( $sock, $buf ) {
- $bytesWritten = 0;
- $bufSize = strlen( $buf );
- while ( $bytesWritten < $bufSize ) {
- $result = fwrite( $sock, $buf );
- $data = stream_get_meta_data( $sock );
- if ( $data['timed_out'] ) {
- $this->_handle_error( $sock, 'timeout writing to $1' );
- return false;
- }
- // Contrary to the documentation, fwrite() returns zero on error in PHP 5.3.
- if ( $result === false || $result === 0 ) {
- $this->_handle_error( $sock, 'error writing to $1' );
- return false;
- }
- $bytesWritten += $result;
- }
-
- return true;
- }
-
- /**
- * Handle an I/O error. Mark the socket dead and log an error.
- *
- * @param Resource $sock
- * @param string $msg
- */
- function _handle_error( $sock, $msg ) {
- $peer = stream_socket_get_name( $sock, true /** remote **/ );
- if ( strval( $peer ) === '' ) {
- $peer = array_search( $sock, $this->_cache_sock );
- if ( $peer === false ) {
- $peer = '[unknown host]';
- }
- }
- $msg = str_replace( '$1', $peer, $msg );
- $this->_error_log( "$msg\n" );
- $this->_dead_sock( $sock );
- }
-
- /**
- * Read the specified number of bytes from a stream. If there is an error,
- * mark the socket dead.
- *
- * @param Resource $sock The socket
- * @param int $len The number of bytes to read
- * @return string|bool The string on success, false on failure.
- */
- function _fread( $sock, $len ) {
- $buf = '';
- while ( $len > 0 ) {
- $result = fread( $sock, $len );
- $data = stream_get_meta_data( $sock );
- if ( $data['timed_out'] ) {
- $this->_handle_error( $sock, 'timeout reading from $1' );
- return false;
- }
- if ( $result === false ) {
- $this->_handle_error( $sock, 'error reading buffer from $1' );
- return false;
- }
- if ( $result === '' ) {
- // This will happen if the remote end of the socket is shut down
- $this->_handle_error( $sock, 'unexpected end of file reading from $1' );
- return false;
- }
- $len -= strlen( $result );
- $buf .= $result;
- }
- return $buf;
- }
-
- /**
- * Read a line from a stream. If there is an error, mark the socket dead.
- * The \r\n line ending is stripped from the response.
- *
- * @param Resource $sock The socket
- * @return string|bool The string on success, false on failure
- */
- function _fgets( $sock ) {
- $result = fgets( $sock );
- // fgets() may return a partial line if there is a select timeout after
- // a successful recv(), so we have to check for a timeout even if we
- // got a string response.
- $data = stream_get_meta_data( $sock );
- if ( $data['timed_out'] ) {
- $this->_handle_error( $sock, 'timeout reading line from $1' );
- return false;
- }
- if ( $result === false ) {
- $this->_handle_error( $sock, 'error reading line from $1' );
- return false;
- }
- if ( substr( $result, -2 ) === "\r\n" ) {
- $result = substr( $result, 0, -2 );
- } elseif ( substr( $result, -1 ) === "\n" ) {
- $result = substr( $result, 0, -1 );
- } else {
- $this->_handle_error( $sock, 'line ending missing in response from $1' );
- return false;
- }
- return $result;
- }
-
- /**
- * Flush the read buffer of a stream
- * @param Resource $f
- */
- function _flush_read_buffer( $f ) {
- if ( !is_resource( $f ) ) {
- return;
- }
- $r = array( $f );
- $w = null;
- $e = null;
- $n = stream_select( $r, $w, $e, 0, 0 );
- while ( $n == 1 && !feof( $f ) ) {
- fread( $f, 1024 );
- $r = array( $f );
- $w = null;
- $e = null;
- $n = stream_select( $r, $w, $e, 0, 0 );
- }
- }
-
- // }}}
- // }}}
- // }}}
-}
-
-// }}}
-
-class MemCachedClientforWiki extends MWMemcached {
-}
break;
case 'igbinary':
if ( !Memcached::HAVE_IGBINARY ) {
- throw new MWException( __CLASS__ . ': the igbinary extension is not available ' .
- 'but igbinary serialization was requested.' );
+ throw new InvalidArgumentException(
+ __CLASS__ . ': the igbinary extension is not available ' .
+ 'but igbinary serialization was requested.'
+ );
}
$this->client->setOption( Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_IGBINARY );
break;
default:
- throw new MWException( __CLASS__ . ': invalid value for serializer parameter' );
+ throw new InvalidArgumentException(
+ __CLASS__ . ': invalid value for serializer parameter'
+ );
}
$servers = array();
foreach ( $params['servers'] as $host ) {
protected function getWithToken( $key, &$casToken, $flags = 0 ) {
$this->debugLog( "get($key)" );
- $result = $this->client->get( $this->encodeKey( $key ), null, $casToken );
+ $result = $this->client->get( $this->validateKeyEncoding( $key ), null, $casToken );
$result = $this->checkResult( $key, $result );
return $result;
}
public function getMulti( array $keys, $flags = 0 ) {
$this->debugLog( 'getMulti(' . implode( ', ', $keys ) . ')' );
- $callback = array( $this, 'encodeKey' );
- $encodedResult = $this->client->getMulti( array_map( $callback, $keys ) );
- $encodedResult = $encodedResult ?: array(); // must be an array
- $result = array();
- foreach ( $encodedResult as $key => $value ) {
- $key = $this->decodeKey( $key );
- $result[$key] = $value;
+ foreach ( $keys as $key ) {
+ $this->validateKeyEncoding( $key );
}
+ $result = $this->client->getMulti( $keys ) ?: array();
return $this->checkResult( false, $result );
}
* @return bool
*/
public function setMulti( array $data, $exptime = 0 ) {
- foreach ( $data as $key => $value ) {
- $encKey = $this->encodeKey( $key );
- if ( $encKey !== $key ) {
- $data[$encKey] = $value;
- unset( $data[$key] );
- }
- }
$this->debugLog( 'setMulti(' . implode( ', ', array_keys( $data ) ) . ')' );
+ foreach ( array_keys( $data ) as $key ) {
+ $this->validateKeyEncoding( $key );
+ }
$result = $this->client->setMulti( $data, $this->fixExpiry( $exptime ) );
return $this->checkResult( false, $result );
}
+++ /dev/null
-<?php
-/**
- * Object caching using memcached.
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Cache
- */
-
-/**
- * A wrapper class for the pure-PHP memcached client, exposing a BagOStuff interface.
- *
- * @ingroup Cache
- */
-class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
-
- /**
- * Constructor.
- *
- * Available parameters are:
- * - servers: The list of IP:port combinations holding the memcached servers.
- * - debug: Whether to set the debug flag in the underlying client.
- * - persistent: Whether to use a persistent connection
- * - compress_threshold: The minimum size an object must be before it is compressed
- * - timeout: The read timeout in microseconds
- * - connect_timeout: The connect timeout in seconds
- *
- * @param array $params
- */
- function __construct( $params ) {
- parent::__construct( $params );
- $params = $this->applyDefaultParams( $params );
-
- $this->client = new MemCachedClientforWiki( $params );
- $this->client->set_servers( $params['servers'] );
- $this->client->set_debug( $params['debug'] );
- }
-
- /**
- * @param bool $debug
- */
- public function setDebug( $debug ) {
- $this->client->set_debug( $debug );
- }
-
- public function getMulti( array $keys, $flags = 0 ) {
- $callback = array( $this, 'encodeKey' );
- $encodedResult = $this->client->get_multi( array_map( $callback, $keys ) );
- $result = array();
- foreach ( $encodedResult as $key => $value ) {
- $key = $this->decodeKey( $key );
- $result[$key] = $value;
- }
- return $result;
- }
-
- /**
- * @param string $key
- * @param int $value
- * @return mixed
- */
- public function incr( $key, $value = 1 ) {
- return $this->client->incr( $this->encodeKey( $key ), $value );
- }
-
- /**
- * @param string $key
- * @param int $value
- * @return mixed
- */
- public function decr( $key, $value = 1 ) {
- return $this->client->decr( $this->encodeKey( $key ), $value );
- }
-}
+++ /dev/null
-<?php
-/**
- * Wrapper for object caching in different caches.
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Cache
- */
-
-/**
- * A cache class that replicates all writes to multiple child caches. Reads
- * are implemented by reading from the caches in the order they are given in
- * the configuration until a cache gives a positive result.
- *
- * @ingroup Cache
- */
-class MultiWriteBagOStuff extends BagOStuff {
- /** @var BagOStuff[] */
- protected $caches;
- /** @var bool Use async secondary writes */
- protected $asyncWrites = false;
- /** @var callback|null */
- protected $asyncHandler;
-
- /** Idiom for "write to all backends" */
- const ALL = INF;
-
- const UPGRADE_TTL = 3600; // TTL when a key is copied to a higher cache tier
-
- /**
- * $params include:
- * - caches: A numbered array of either ObjectFactory::getObjectFromSpec
- * arrays yeilding BagOStuff objects or direct BagOStuff objects.
- * If using the former, the 'args' field *must* be set.
- * The first cache is the primary one, being the first to
- * be read in the fallback chain. Writes happen to all stores
- * in the order they are defined. However, lock()/unlock() calls
- * only use the primary store.
- * - replication: Either 'sync' or 'async'. This controls whether writes
- * to secondary stores are deferred when possible. Async writes
- * require setting 'asyncCallback'. HHVM register_postsend_function() function.
- * Async writes can increase the chance of some race conditions
- * or cause keys to expire seconds later than expected. It is
- * safe to use for modules when cached values: are immutable,
- * invalidation uses logical TTLs, invalidation uses etag/timestamp
- * validation against the DB, or merge() is used to handle races.
- * - asyncHandler: callable that takes a callback and runs it after the
- * current web request ends. In CLI mode, it should run it immediately.
- * @param array $params
- * @throws InvalidArgumentException
- */
- public function __construct( $params ) {
- parent::__construct( $params );
-
- if ( empty( $params['caches'] ) || !is_array( $params['caches'] ) ) {
- throw new InvalidArgumentException(
- __METHOD__ . ': "caches" parameter must be an array of caches'
- );
- }
-
- $this->caches = array();
- foreach ( $params['caches'] as $cacheInfo ) {
- if ( $cacheInfo instanceof BagOStuff ) {
- $this->caches[] = $cacheInfo;
- } else {
- if ( !isset( $cacheInfo['args'] ) ) {
- // B/C for when $cacheInfo was for ObjectCache::newFromParams().
- // Callers intenting this to be for ObjectFactory::getObjectFromSpec
- // should have set "args" per the docs above. Doings so avoids extra
- // (likely harmless) params (factory/class/calls) ending up in "args".
- $cacheInfo['args'] = array( $cacheInfo );
- }
- $this->caches[] = ObjectFactory::getObjectFromSpec( $cacheInfo );
- }
- }
-
- $this->asyncHandler = isset( $params['asyncHandler'] )
- ? $params['asyncHandler']
- : null;
- $this->asyncWrites = (
- isset( $params['replication'] ) &&
- $params['replication'] === 'async' &&
- is_callable( $this->asyncHandler )
- );
- }
-
- public function setDebug( $debug ) {
- foreach ( $this->caches as $cache ) {
- $cache->setDebug( $debug );
- }
- }
-
- protected function doGet( $key, $flags = 0 ) {
- if ( ( $flags & self::READ_LATEST ) == self::READ_LATEST ) {
- // If the latest write was a delete(), we do NOT want to fallback
- // to the other tiers and possibly see the old value. Also, this
- // is used by mergeViaLock(), which only needs to hit the primary.
- return $this->caches[0]->get( $key, $flags );
- }
-
- $misses = 0; // number backends checked
- $value = false;
- foreach ( $this->caches as $cache ) {
- $value = $cache->get( $key, $flags );
- if ( $value !== false ) {
- break;
- }
- ++$misses;
- }
-
- if ( $value !== false
- && $misses > 0
- && ( $flags & self::READ_VERIFIED ) == self::READ_VERIFIED
- ) {
- $this->doWrite( $misses, $this->asyncWrites, 'set', $key, $value, self::UPGRADE_TTL );
- }
-
- return $value;
- }
-
- public function set( $key, $value, $exptime = 0, $flags = 0 ) {
- $asyncWrites = ( ( $flags & self::WRITE_SYNC ) == self::WRITE_SYNC )
- ? false
- : $this->asyncWrites;
-
- return $this->doWrite( self::ALL, $asyncWrites, 'set', $key, $value, $exptime );
- }
-
- public function delete( $key ) {
- return $this->doWrite( self::ALL, $this->asyncWrites, 'delete', $key );
- }
-
- public function add( $key, $value, $exptime = 0 ) {
- return $this->doWrite( self::ALL, $this->asyncWrites, 'add', $key, $value, $exptime );
- }
-
- public function incr( $key, $value = 1 ) {
- return $this->doWrite( self::ALL, $this->asyncWrites, 'incr', $key, $value );
- }
-
- public function decr( $key, $value = 1 ) {
- return $this->doWrite( self::ALL, $this->asyncWrites, 'decr', $key, $value );
- }
-
- public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
- // Only need to lock the first cache; also avoids deadlocks
- return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
- }
-
- public function unlock( $key ) {
- // Only the first cache is locked
- return $this->caches[0]->unlock( $key );
- }
-
- public function getLastError() {
- return $this->caches[0]->getLastError();
- }
-
- public function clearLastError() {
- $this->caches[0]->clearLastError();
- }
-
- /**
- * Apply a write method to the first $count backing caches
- *
- * @param integer $count
- * @param bool $asyncWrites
- * @param string $method
- * @param mixed ...
- * @return bool
- */
- protected function doWrite( $count, $asyncWrites, $method /*, ... */ ) {
- $ret = true;
- $args = array_slice( func_get_args(), 3 );
-
- foreach ( $this->caches as $i => $cache ) {
- if ( $i >= $count ) {
- break; // ignore the lower tiers
- }
-
- if ( $i == 0 || !$asyncWrites ) {
- // First store or in sync mode: write now and get result
- if ( !call_user_func_array( array( $cache, $method ), $args ) ) {
- $ret = false;
- }
- } else {
- // Secondary write in async mode: do not block this HTTP request
- $logger = $this->logger;
- call_user_func(
- $this->asyncHandler,
- function () use ( $cache, $method, $args, $logger ) {
- if ( !call_user_func_array( array( $cache, $method ), $args ) ) {
- $logger->warning( "Async $method op failed" );
- }
- }
- );
- }
- }
-
- return $ret;
- }
-
- /**
- * Delete objects expiring before a certain date.
- *
- * Succeed if any of the child caches succeed.
- * @param string $date
- * @param bool|callable $progressCallback
- * @return bool
- */
- public function deleteObjectsExpiringBefore( $date, $progressCallback = false ) {
- $ret = false;
- foreach ( $this->caches as $cache ) {
- if ( $cache->deleteObjectsExpiringBefore( $date, $progressCallback ) ) {
- $ret = true;
- }
- }
-
- return $ret;
- }
-}
return call_user_func( $params['factory'], $params );
} elseif ( isset( $params['class'] ) ) {
$class = $params['class'];
- if ( $class === 'MultiWriteBagOStuff' && !isset( $params['asyncHandler'] ) ) {
- $params['asyncHandler'] = 'DeferredUpdates::addCallableUpdate';
+ // Automatically set the 'async' update handler
+ if ( $class === 'MultiWriteBagOStuff' ) {
+ $params['asyncHandler'] = isset( $params['asyncHandler'] )
+ ? $params['asyncHandler']
+ : 'DeferredUpdates::addCallableUpdate';
+ }
+ // Do b/c logic for MemcachedBagOStuff
+ if ( is_subclass_of( $class, 'MemcachedBagOStuff' ) ) {
+ if ( !isset( $params['servers'] ) ) {
+ $params['servers'] = $GLOBALS['wgMemCachedServers'];
+ }
+ if ( !isset( $params['debug'] ) ) {
+ $params['debug'] = $GLOBALS['wgMemCachedDebug'];
+ }
+ if ( !isset( $params['persistent'] ) ) {
+ $params['persistent'] = $GLOBALS['wgMemCachedPersistent'];
+ }
+ if ( !isset( $params['timeout'] ) ) {
+ $params['timeout'] = $GLOBALS['wgMemCachedTimeout'];
+ }
}
return new $class( $params );
} else {
return self::newFromId( $id );
}
- /**
- * Factory function that creates a memcached client object.
- *
- * This always uses the PHP client, since the PECL client has a different
- * hashing scheme and a different interpretation of the flags bitfield, so
- * switching between the two clients randomly would be disastrous.
- *
- * @param array $params
- * @return MemcachedPhpBagOStuff
- */
- public static function newMemcached( $params ) {
- return new MemcachedPhpBagOStuff( $params );
- }
-
/**
* Create a new cache object of the specified type.
*
/**
* @param string $reason
* @param bool $suppress
- * @param int $id
- * @param bool $commit
+ * @param int $u1 Unused
+ * @param bool $u2 Unused
* @param string $error
* @return bool
*/
- public function doDeleteArticle( $reason, $suppress = false, $id = 0,
- $commit = true, &$error = ''
+ public function doDeleteArticle(
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = ''
) {
- return $this->mPage->doDeleteArticle( $reason, $suppress, $id, $commit, $error );
+ return $this->mPage->doDeleteArticle( $reason, $suppress, $u1, $u2, $error );
}
/**
function __construct( $imagePage ) {
parent::__construct( $imagePage->getContext() );
$this->mImagePage = $imagePage;
- $this->mTitle = clone ( $imagePage->getTitle() );
+ $this->mTitle = clone $imagePage->getTitle();
$this->mTitle->setFragment( '#filehistory' );
$this->mImg = null;
$this->mHist = array();
* @param string $reason Delete reason for deletion log
* @param bool $suppress Suppress all revisions and log the deletion in
* the suppression log instead of the deletion log
- * @param int $id Article ID
- * @param bool $commit Defaults to true, triggers transaction end
- * @param array &$error Array of errors to append to
+ * @param int $u1 Unused
+ * @param bool $u2 Unused
+ * @param array|string &$error Array of errors to append to
* @param User $user The deleting user
* @return bool True if successful
*/
public function doDeleteArticle(
- $reason, $suppress = false, $id = 0, $commit = true, &$error = '', User $user = null
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null
) {
- $status = $this->doDeleteArticleReal( $reason, $suppress, $id, $commit, $error, $user );
+ $status = $this->doDeleteArticleReal( $reason, $suppress, $u1, $u2, $error, $user );
return $status->isGood();
}
* @param string $reason Delete reason for deletion log
* @param bool $suppress Suppress all revisions and log the deletion in
* the suppression log instead of the deletion log
- * @param int $id Article ID
- * @param bool $commit Defaults to true, triggers transaction end
- * @param array &$error Array of errors to append to
+ * @param int $u1 Unused
+ * @param bool $u2 Unused
+ * @param array|string &$error Array of errors to append to
* @param User $user The deleting user
* @return Status Status object; if successful, $status->value is the log_id of the
* deletion log entry. If the page couldn't be deleted because it wasn't
* found, $status is a non-fatal 'cannotdelete' error
*/
public function doDeleteArticleReal(
- $reason, $suppress = false, $id = 0, $commit = true, &$error = '', User $user = null
+ $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null
) {
global $wgUser, $wgContentHandlerUseDB;
}
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin( __METHOD__ );
-
- if ( $id == 0 ) {
- $this->loadPageData( self::READ_LATEST );
- $id = $this->getID();
- // T98706: lock the page from various other updates but avoid using
- // WikiPage::READ_LOCKING as that will carry over the FOR UPDATE to
- // the revisions queries (which also JOIN on user). Only lock the page
- // row and CAS check on page_latest to see if the trx snapshot matches.
- $lockedLatest = $this->lock();
- if ( $id == 0 || $this->getLatest() != $lockedLatest ) {
- // Page not there or trx snapshot is stale
- $dbw->rollback( __METHOD__ );
- $status->error( 'cannotdelete',
- wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) );
- return $status;
- }
+ $dbw->startAtomic( __METHOD__ );
+
+ $this->loadPageData( self::READ_LATEST );
+ $id = $this->getID();
+ // T98706: lock the page from various other updates but avoid using
+ // WikiPage::READ_LOCKING as that will carry over the FOR UPDATE to
+ // the revisions queries (which also JOIN on user). Only lock the page
+ // row and CAS check on page_latest to see if the trx snapshot matches.
+ $lockedLatest = $this->lock();
+ if ( $id == 0 || $this->getLatest() != $lockedLatest ) {
+ $dbw->endAtomic( __METHOD__ );
+ // Page not there or trx snapshot is stale
+ $status->error( 'cannotdelete',
+ wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) );
+ return $status;
}
+ // At this point we are now comitted to returning an OK
+ // status unless some DB query error or other exception comes up.
+ // This way callers don't have to call rollback() if $status is bad
+ // unless they actually try to catch exceptions (which is rare).
+
// we need to remember the old content so we can use it to generate all deletion updates.
$content = $this->getContent( Revision::RAW );
$row['ar_content_format'] = 'rev_content_format';
}
- $dbw->insertSelect( 'archive', array( 'page', 'revision' ),
+ // Copy all the page revisions into the archive table
+ $dbw->insertSelect(
+ 'archive',
+ array( 'page', 'revision' ),
$row,
array(
'page_id' => $id,
'page_id = rev_page'
- ), __METHOD__
+ ),
+ __METHOD__
);
// Now that it's safely backed up, delete it
$dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
- $ok = ( $dbw->affectedRows() > 0 ); // $id could be laggy
-
- if ( !$ok ) {
- $dbw->rollback( __METHOD__ );
- $status->error( 'cannotdelete',
- wfEscapeWikiText( $this->getTitle()->getPrefixedText() ) );
- return $status;
- }
if ( !$dbw->cascadingDeletes() ) {
$dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ );
$logEntry->publish( $logid );
} );
- if ( $commit ) {
- $dbw->commit( __METHOD__ );
- }
-
- // Show log excerpt on 404 pages rather than just a link
- $key = wfMemcKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
- ObjectCache::getMainStashInstance()->set( $key, 1, 86400 );
+ $dbw->endAtomic( __METHOD__ );
$this->doDeleteUpdates( $id, $content );
Hooks::run( 'ArticleDeleteComplete',
array( &$this, &$user, $reason, $id, $content, $logEntry ) );
$status->value = $logid;
+
+ // Show log excerpt on 404 pages rather than just a link
+ $key = wfMemcKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
+ ObjectCache::getMainStashInstance()->set( $key, 1, 86400 );
+
return $status;
}
* Defaults to the site content language
* @return DateFormatter
*/
- public static function &getInstance( $lang = null ) {
- global $wgMemc, $wgContLang;
- static $dateFormatter = false;
+ public static function getInstance( $lang = null ) {
+ global $wgContLang, $wgMainCacheType;
+
$lang = $lang ? wfGetLangObj( $lang ) : $wgContLang;
- $key = wfMemcKey( 'dateformatter', $lang->getCode() );
+ $cache = ObjectCache::newAccelerator( $wgMainCacheType );
+
+ static $dateFormatter = false;
if ( !$dateFormatter ) {
- $dateFormatter = $wgMemc->get( $key );
- if ( !$dateFormatter ) {
- $dateFormatter = new DateFormatter( $lang );
- $wgMemc->set( $key, $dateFormatter, 3600 );
- }
+ $dateFormatter = $cache->getWithSetCallback(
+ $cache->makeKey( 'dateformatter', $lang->getCode() ),
+ 3600,
+ function () use ( $lang ) {
+ return new DateFormatter( $lang );
+ }
+ );
}
+
return $dateFormatter;
}
* @ingroup Parser
*/
+use MediaWiki\Logger\LoggerFactory;
+
/**
* @ingroup Parser
*/
-interface Preprocessor {
+abstract class Preprocessor {
+
+ const CACHE_VERSION = 1;
+
+ /**
+ * Store a document tree in the cache.
+ *
+ * @param string $text
+ * @param int $flags
+ */
+ protected function cacheSetTree( $text, $flags, $tree ) {
+ $config = RequestContext::getMain()->getConfig();
+
+ $length = strlen( $text );
+ $threshold = $config->get( 'PreprocessorCacheThreshold' );
+ if ( $threshold === false || $length < $threshold || $length > 1e6 ) {
+ return false;
+ }
+
+ $key = wfMemcKey(
+ // TODO: Once we require PHP 5.5, use static::class instead of
+ // get_called_class() or get_class( $this ).
+ defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(),
+ md5( $text ), $flags );
+ $value = sprintf( "%08d", static::CACHE_VERSION ) . $tree;
+
+ $cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) );
+ $cache->set( $key, $value, 86400 );
+
+ LoggerFactory::getInstance( 'Preprocessor' )
+ ->info( "Cached preprocessor output (key: $key)" );
+ }
+
/**
- * Create a new preprocessor object based on an initialised Parser object
+ * Attempt to load a precomputed document tree for some given wikitext
+ * from the cache.
*
- * @param Parser $parser
+ * @param string $text
+ * @param int $flags
+ * @return PPNode_Hash_Tree|bool
*/
- public function __construct( $parser );
+ protected function cacheGetTree( $text, $flags ) {
+ $config = RequestContext::getMain()->getConfig();
+
+ $length = strlen( $text );
+ $threshold = $config->get( 'PreprocessorCacheThreshold' );
+ if ( $threshold === false || $length < $threshold || $length > 1e6 ) {
+ return false;
+ }
+
+ $cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) );
+
+ $key = wfMemcKey(
+ // TODO: Once we require PHP 5.5, use static::class instead of
+ // get_called_class() or get_class( $this ).
+ defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(),
+ md5( $text ), $flags );
+
+ $value = $cache->get( $key );
+ if ( !$value ) {
+ return false;
+ }
+
+ $version = intval( substr( $value, 0, 8 ) );
+ if ( $version !== static::CACHE_VERSION ) {
+ return false;
+ }
+
+ LoggerFactory::getInstance( 'Preprocessor' )
+ ->info( "Loaded preprocessor output from cache (key: $key)" );
+
+ return substr( $value, 8 );
+ }
/**
* Create a new top-level frame for expansion of a page
*
* @return PPFrame
*/
- public function newFrame();
+ abstract public function newFrame();
/**
* Create a new custom frame for programmatic use of parameter replacement
*
* @return PPFrame
*/
- public function newCustomFrame( $args );
+ abstract public function newCustomFrame( $args );
/**
* Create a new custom node for programmatic use of parameter replacement
*
* @param array $values
*/
- public function newPartNodeArray( $values );
+ abstract public function newPartNodeArray( $values );
/**
* Preprocess text to a PPNode
*
* @return PPNode
*/
- public function preprocessToObj( $text, $flags = 0 );
+ abstract public function preprocessToObj( $text, $flags = 0 );
}
/**
* @ingroup Parser
*/
// @codingStandardsIgnoreStart Squiz.Classes.ValidClassName.NotCamelCaps
-class Preprocessor_DOM implements Preprocessor {
+class Preprocessor_DOM extends Preprocessor {
// @codingStandardsIgnoreEnd
/**
public $memoryLimit;
- const CACHE_VERSION = 1;
+ const CACHE_PREFIX = 'preprocess-xml';
public function __construct( $parser ) {
$this->parser = $parser;
* @return PPNode_DOM
*/
public function preprocessToObj( $text, $flags = 0 ) {
- global $wgMemc, $wgPreprocessorCacheThreshold;
-
- $xml = false;
- $cacheable = ( $wgPreprocessorCacheThreshold !== false
- && strlen( $text ) > $wgPreprocessorCacheThreshold );
- if ( $cacheable ) {
- $cacheKey = wfMemcKey( 'preprocess-xml', md5( $text ), $flags );
- $cacheValue = $wgMemc->get( $cacheKey );
- if ( $cacheValue ) {
- $version = substr( $cacheValue, 0, 8 );
- if ( intval( $version ) == self::CACHE_VERSION ) {
- $xml = substr( $cacheValue, 8 );
- // From the cache
- wfDebugLog( "Preprocessor", "Loaded preprocessor XML from memcached (key $cacheKey)" );
- }
- }
- if ( $xml === false ) {
- $xml = $this->preprocessToXml( $text, $flags );
- $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . $xml;
- $wgMemc->set( $cacheKey, $cacheValue, 86400 );
- wfDebugLog( "Preprocessor", "Saved preprocessor XML to memcached (key $cacheKey)" );
- }
- } else {
+
+ $xml = $this->cacheGetTree( $text, $flags );
+ if ( $xml === false ) {
$xml = $this->preprocessToXml( $text, $flags );
+ $this->cacheSetTree( $text, $flags, $xml );
}
// Fail if the number of elements exceeds acceptable limits
$this->parser->mGeneratedPPNodeCount += substr_count( $xml, '<' );
$max = $this->parser->mOptions->getMaxGeneratedPPNodeCount();
if ( $this->parser->mGeneratedPPNodeCount > $max ) {
- if ( $cacheable ) {
- }
+ // if ( $cacheable ) { ... }
throw new MWException( __METHOD__ . ': generated node count limit exceeded' );
}
$obj = new PPNode_DOM( $dom->documentElement );
}
- if ( $cacheable ) {
- }
+ // if ( $cacheable ) { ... }
if ( !$result ) {
throw new MWException( __METHOD__ . ' generated invalid XML' );
* @ingroup Parser
*/
// @codingStandardsIgnoreStart Squiz.Classes.ValidClassName.NotCamelCaps
-class Preprocessor_Hash implements Preprocessor {
+class Preprocessor_Hash extends Preprocessor {
// @codingStandardsIgnoreEnd
/**
*/
public $parser;
- const CACHE_VERSION = 1;
+ const CACHE_PREFIX = 'preprocess-hash';
public function __construct( $parser ) {
$this->parser = $parser;
return $node;
}
+
/**
* Preprocess some wikitext and return the document tree.
* This is the ghost of Parser::replace_variables().
* @return PPNode_Hash_Tree
*/
public function preprocessToObj( $text, $flags = 0 ) {
- // Check cache.
- global $wgMemc, $wgPreprocessorCacheThreshold;
-
- $cacheable = $wgPreprocessorCacheThreshold !== false
- && strlen( $text ) > $wgPreprocessorCacheThreshold;
-
- if ( $cacheable ) {
- $cacheKey = wfMemcKey( 'preprocess-hash', md5( $text ), $flags );
- $cacheValue = $wgMemc->get( $cacheKey );
- if ( $cacheValue ) {
- $version = substr( $cacheValue, 0, 8 );
- if ( intval( $version ) == self::CACHE_VERSION ) {
- $hash = unserialize( substr( $cacheValue, 8 ) );
- // From the cache
- wfDebugLog( "Preprocessor",
- "Loaded preprocessor hash from memcached (key $cacheKey)" );
- return $hash;
- }
- }
+ $tree = $this->cacheGetTree( $text, $flags );
+ if ( $tree !== false ) {
+ return unserialize( $tree );
}
$rules = array(
$lastNode = $node;
}
if ( !$node ) {
- if ( $cacheable ) {
- }
+ // if ( $cacheable ) { ... }
throw new MWException( __METHOD__ . ': eqpos not found' );
}
if ( $node->name !== 'equals' ) {
- if ( $cacheable ) {
- }
+ // if ( $cacheable ) { ... }
throw new MWException( __METHOD__ . ': eqpos is not equals' );
}
$equalsNode = $node;
$rootNode->lastChild = $stack->rootAccum->lastNode;
// Cache
- if ( $cacheable ) {
- $cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode );
-
- // T111289: Cache values should not exceed 1 Mb, but they do.
- if ( strlen( $cacheValue ) <= 1e6 ) {
- $wgMemc->set( $cacheKey, $cacheValue, 86400 );
- wfDebugLog( "Preprocessor", "Saved preprocessor Hash to memcached (key $cacheKey)" );
- }
- }
+ $this->cacheSetTree( $text, $flags, serialize( $rootNode ) );
return $rootNode;
}
// Allow multiple modules to be registered in one call
$registrations = is_array( $name ) ? $name : array( $name => $info );
foreach ( $registrations as $name => $info ) {
- // Disallow duplicate registrations
+ // Warn on duplicate registrations
if ( isset( $this->moduleInfos[$name] ) ) {
// A module has already been registered by this name
- throw new MWException(
- 'ResourceLoader duplicate registration error. ' .
- 'Another module has already been registered as ' . $name
- );
+ if ( $this->moduleInfos[$name] === $info ) {
+ $this->logger->warning(
+ 'ResourceLoader duplicate registration warning. ' .
+ 'Another module has already been registered as ' . $name
+ );
+ }
}
// Check $name for validity
* @ingroup Search
*/
class SearchResultSet {
+
+ /**
+ * Types of interwiki results
+ */
+ /**
+ * Results that are displayed only together with existing main wiki results
+ * @var int
+ */
+ const SECONDARY_RESULTS = 0;
+ /**
+ * Results that can displayed even if no existing main wiki results exist
+ * @var int
+ */
+ const INLINE_RESULTS = 1;
+
protected $containedSyntax = false;
public function __construct( $containedSyntax = false ) {
*
* @return SearchResultSet
*/
- function getInterwikiResults() {
+ function getInterwikiResults( $type = self::SECONDARY_RESULTS ) {
return null;
}
*
* @return bool
*/
- function hasInterwikiResults() {
- return $this->getInterwikiResults() != null;
+ function hasInterwikiResults( $type = self::SECONDARY_RESULTS ) {
+ return false;
}
/**
*/
function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '', $hideredirects = false ) {
$t = $this->getPageTitle();
-
$out = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
$out .= Xml::openElement(
'form',
$out .= Xml::closeElement( 'fieldset' );
$out .= Xml::closeElement( 'form' );
$out .= Xml::closeElement( 'div' );
-
return $out;
}
return;
}
+ $navLinks = array();
$self = $this->getPageTitle();
- $topLinks = array(
- Linker::link( $self, $this->msg( 'allpages' )->escaped() )
- );
- $bottomLinks = array();
-
- # Do we put a previous link ?
+ // Generate a "previous page" link if needed
if ( $prevTitle ) {
$query = array( 'from' => $prevTitle->getText() );
$query['hideredirects'] = $hideredirects;
}
- $prevLink = Linker::linkKnown(
+ $navLinks[] = Linker::linkKnown(
$self,
$this->msg( 'prevpage', $prevTitle->getText() )->escaped(),
array(),
$query
);
- $topLinks[] = $prevLink;
- $bottomLinks[] = $prevLink;
+
}
+ // Generate a "next page" link if needed
if ( $n == $this->maxPerPage && $s = $res->fetchObject() ) {
# $s is the first link of the next chunk
$t = Title::makeTitle( $namespace, $s->page_title );
$query['hideredirects'] = $hideredirects;
}
- $nextLink = Linker::linkKnown(
+ $navLinks[] = Linker::linkKnown(
$self,
$this->msg( 'nextpage', $t->getText() )->escaped(),
array(),
$query
);
- $topLinks[] = $nextLink;
- $bottomLinks[] = $nextLink;
}
- $nsForm = $this->namespaceForm( $namespace, $from, $to, $hideredirects );
- $out2 = Xml::openElement( 'table', array( 'class' => 'mw-allpages-table-form' ) ) .
- '<tr>
- <td>' .
- $nsForm .
- '</td>
- <td class="mw-allpages-nav">' .
- $this->getLanguage()->pipeList( $topLinks ) .
- '</td></tr></table>';
-
- $output->addHTML( $out2 . $out );
-
- if ( count( $bottomLinks ) ) {
- $output->addHTML(
- Html::element( 'hr' ) .
- Html::rawElement( 'div', array( 'class' => 'mw-allpages-nav' ),
- $this->getLanguage()->pipeList( $bottomLinks )
- )
+ $topOut = $this->namespaceForm( $namespace, $from, $to, $hideredirects );
+
+ if ( count( $navLinks ) ) {
+ // Add pagination links
+ $pagination = Html::rawElement( 'div',
+ array( 'class' => 'mw-allpages-nav' ),
+ $this->getLanguage()->pipeList( $navLinks )
);
+
+ $topOut .= $pagination;
+ $out .= Html::element( 'hr' ) . $pagination; // Footer
}
+
+ $output->addHTML( $topOut . $out );
}
/**
)
);
- # ## @todo FIXME: Side link to previous
+ // @todo FIXME: Side link to previous
$n = 0;
if ( $res->numRows() > 0 ) {
}
}
- $footer = '';
- if ( $this->including() ) {
- $out2 = '';
- } else {
- $nsForm = $this->namespacePrefixForm( $namespace, $prefix );
- $self = $this->getPageTitle();
- $out2 = Xml::openElement( 'table', array( 'id' => 'mw-prefixindex-nav-table' ) ) .
- '<tr>
- <td>' .
- $nsForm .
- '</td>
- <td id="mw-prefixindex-nav-form" class="mw-prefixindex-nav">';
-
- if ( $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
- $query = array(
- 'from' => $s->page_title,
- 'prefix' => $prefix,
- 'hideredirects' => $this->hideRedirects,
- 'stripprefix' => $this->stripPrefix,
- );
+ $output = $this->getOutput();
- if ( $namespace || $prefix == '' ) {
- // Keep the namespace even if it's 0 for empty prefixes.
- // This tells us we're not just a holdover from old links.
- $query['namespace'] = $namespace;
- }
+ if ( $this->including() ) {
+ // We don't show the nav-links and the form when included into other
+ // pages so let's just finish here.
+ $output->addHTML( $out );
+ return;
+ }
- $nextLink = Linker::linkKnown(
- $self,
- $this->msg( 'nextpage', str_replace( '_', ' ', $s->page_title ) )->escaped(),
- array(),
- $query
- );
+ $topOut = $this->namespacePrefixForm( $namespace, $prefix );
- $out2 .= $nextLink;
+ if ( $res && ( $n == $this->maxPerPage ) && ( $s = $res->fetchObject() ) ) {
+ $query = array(
+ 'from' => $s->page_title,
+ 'prefix' => $prefix,
+ 'hideredirects' => $this->hideRedirects,
+ 'stripprefix' => $this->stripPrefix,
+ );
- $footer = "\n" . Html::element( 'hr' ) .
- Html::rawElement(
- 'div',
- array( 'class' => 'mw-prefixindex-nav' ),
- $nextLink
- );
+ if ( $namespace || $prefix == '' ) {
+ // Keep the namespace even if it's 0 for empty prefixes.
+ // This tells us we're not just a holdover from old links.
+ $query['namespace'] = $namespace;
}
- $out2 .= "</td></tr>" .
- Xml::closeElement( 'table' );
+
+ $nextLink = Linker::linkKnown(
+ $this->getPageTitle(),
+ $this->msg( 'nextpage', str_replace( '_', ' ', $s->page_title ) )->escaped(),
+ array(),
+ $query
+ );
+
+ // Link shown at the top of the page below the form
+ $topOut .= Html::rawElement( 'div',
+ array( 'class' => 'mw-prefixindex-nav' ),
+ $nextLink
+ );
+
+ // Link shown at the footer
+ $out .= "\n" . Html::element( 'hr' ) .
+ Html::rawElement(
+ 'div',
+ array( 'class' => 'mw-prefixindex-nav' ),
+ $nextLink
+ );
+
}
- $this->getOutput()->addHTML( $out2 . $out . $footer );
+ $output->addHTML( $topOut . $out );
}
protected function getGroupName() {
*/
protected $runSuggestion = true;
+ /**
+ * Names of the wikis, in format: Interwiki prefix -> caption
+ * @var array
+ */
+ protected $customCaptions;
+
const NAMESPACES_CURRENT = 'sense';
public function __construct() {
if ( $numTextMatches > 0 ) {
$out->addHTML( $this->showMatches( $textMatches ) );
}
- // show interwiki results if any
- if ( $textMatches->hasInterwikiResults() ) {
- $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ) );
+
+ // show secondary interwiki results if any
+ if ( $textMatches->hasInterwikiResults( SearchResultSet::SECONDARY_RESULTS ) ) {
+ $out->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(
+ SearchResultSet::SECONDARY_RESULTS ), $term ) );
}
$textMatches->free();
}
+
+ $hasOtherResults = $textMatches->hasInterwikiResults( SearchResultSet::INLINE_RESULTS );
+
if ( $num === 0 ) {
if ( $textStatus ) {
$out->addHTML( '<div class="error">' .
$textStatus->getMessage( 'search-error' ) . '</div>' );
} else {
- $out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>",
- array( 'search-nonefound', wfEscapeWikiText( $term ) ) );
$this->showCreateLink( $title, $num, $titleMatches, $textMatches );
+ $out->wrapWikiMsg( "<p class=\"mw-search-nonefound\">\n$1</p>",
+ array( $hasOtherResults ? 'search-nonefound-thiswiki' : 'search-nonefound',
+ wfEscapeWikiText( $term )
+ ) );
+ }
+ }
+
+ if ( $hasOtherResults ) {
+ foreach ( $textMatches->getInterwikiResults( SearchResultSet::INLINE_RESULTS )
+ as $interwiki => $interwikiResult ) {
+ if ( $interwikiResult instanceof Status || $interwikiResult->numRows() == 0 ) {
+ // ignore bad interwikis for now
+ continue;
+ }
+ // TODO: wiki header
+ $out->addHTML( $this->showMatches( $interwikiResult, $interwiki ) );
}
}
$out->addHTML( '<div class="visualClear"></div>' );
+
if ( $prevnext ) {
$out->addHTML( "<p class='mw-search-pager-bottom'>{$prevnext}</p>\n" );
}
}
+ /**
+ * Produce wiki header for interwiki results
+ * @param string $interwiki Interwiki name
+ * @param SearchResultSet $interwikiResult The result set
+ */
+ protected function interwikiHeader( $interwiki, $interwikiResult ) {
+ // TODO: we need to figure out how to name wikis correctly
+ $wikiMsg = $this->msg( 'search-interwiki-results-' . $interwiki )->parse();
+ return "<p class=\"mw-search-interwiki-header\">\n$wikiMsg</p>";
+ }
+
/**
* Decide if the suggested query should be run, and it's results returned
* instead of the provided $textMatches
* Show whole set of results
*
* @param SearchResultSet $matches
+ * @param string $interwiki Interwiki name
*
* @return string
*/
- protected function showMatches( &$matches ) {
+ protected function showMatches( &$matches, $interwiki = null ) {
global $wgContLang;
$terms = $wgContLang->convertForSearchResult( $matches->termMatches() );
-
- $out = "<ul class='mw-search-results'>\n";
+ $out = '';
$result = $matches->next();
$pos = $this->offset;
+
+ if ( $result && $interwiki ) {
+ $out .= $this->interwikiHeader( $interwiki, $result );
+ }
+
+ $out .= "<ul class='mw-search-results'>\n";
while ( $result ) {
$out .= $this->showHit( $result, $terms, ++$pos );
$result = $matches->next();
}
$link_t = clone $title;
+ $query = array();
Hooks::run( 'ShowSearchHitTitle',
- array( &$link_t, &$titleSnippet, $result, $terms, $this ) );
+ array( &$link_t, &$titleSnippet, $result, $terms, $this, &$query ) );
$link = Linker::linkKnown(
$link_t,
$titleSnippet,
- array( 'data-serp-pos' => $position ) // HTML attributes
+ array( 'data-serp-pos' => $position ), // HTML attributes
+ $query
);
// If page content is not readable, just return the title.
return $html;
}
+ /**
+ * Extract custom captions from search-interwiki-custom message
+ */
+ protected function getCustomCaptions() {
+ if ( is_null( $this->customCaptions ) ) {
+ $this->customCaptions = array();
+ // format per line <iwprefix>:<caption>
+ $customLines = explode( "\n", $this->msg( 'search-interwiki-custom' )->text() );
+ foreach ( $customLines as $line ) {
+ $parts = explode( ":", $line, 2 );
+ if ( count( $parts ) == 2 ) { // validate line
+ $this->customCaptions[$parts[0]] = $parts[1];
+ }
+ }
+ }
+ }
+
/**
* Show results from other wikis
*
$out .= "<ul class='mw-search-iwresults'>\n";
// work out custom project captions
- $customCaptions = array();
- // format per line <iwprefix>:<caption>
- $customLines = explode( "\n", $this->msg( 'search-interwiki-custom' )->text() );
- foreach ( $customLines as $line ) {
- $parts = explode( ":", $line, 2 );
- if ( count( $parts ) == 2 ) { // validate line
- $customCaptions[$parts[0]] = $parts[1];
- }
- }
+ $this->getCustomCaptions();
if ( !is_array( $matches ) ) {
$matches = array( $matches );
$prev = null;
$result = $set->next();
while ( $result ) {
- $out .= $this->showInterwikiHit( $result, $prev, $query, $customCaptions );
+ $out .= $this->showInterwikiHit( $result, $prev, $query );
$prev = $result->getInterwikiPrefix();
$result = $set->next();
}
* @param SearchResult $result
* @param string $lastInterwiki
* @param string $query
- * @param array $customCaptions Interwiki prefix -> caption
*
* @return string
*/
- protected function showInterwikiHit( $result, $lastInterwiki, $query, $customCaptions ) {
+ protected function showInterwikiHit( $result, $lastInterwiki, $query ) {
if ( $result->isBrokenTitle() ) {
return '';
$out = "";
// display project name
if ( is_null( $lastInterwiki ) || $lastInterwiki != $title->getInterwiki() ) {
- if ( array_key_exists( $title->getInterwiki(), $customCaptions ) ) {
+ if ( array_key_exists( $title->getInterwiki(), $this->customCaptions ) ) {
// captions from 'search-interwiki-custom'
- $caption = $customCaptions[$title->getInterwiki()];
+ $caption = $this->customCaptions[$title->getInterwiki()];
} else {
// default is to show the hostname of the other wiki which might suck
// if there are many wikis on one hostname
* @return Status
*/
public function addNewAccountInternal() {
- global $wgAuth, $wgMemc, $wgAccountCreationThrottle, $wgEmailConfirmToEdit;
+ global $wgAuth, $wgAccountCreationThrottle, $wgEmailConfirmToEdit;
// If the user passes an invalid domain, something is fishy
if ( !$wgAuth->validDomain( $this->mDomain ) ) {
return Status::newFatal( 'noname' );
}
+ $cache = ObjectCache::getLocalClusterInstance();
# Make sure the user does not exist already
- $lock = $wgMemc->getScopedLock( wfGlobalCacheKey( 'account', md5( $this->mUsername ) ) );
+ $lock = $cache->getScopedLock( wfGlobalCacheKey( 'account', md5( $this->mUsername ) ) );
if ( !$lock ) {
return Status::newFatal( 'usernameinprogress' );
} elseif ( $u->idForName( User::READ_LOCKING ) ) {
} else {
if ( ( $wgAccountCreationThrottle && $currentUser->isPingLimitable() ) ) {
$key = wfMemcKey( 'acctcreate', 'ip', $ip );
- $value = $wgMemc->get( $key );
+ $value = $cache->get( $key );
if ( !$value ) {
- $wgMemc->set( $key, 0, 86400 );
+ $cache->set( $key, 0, 86400 );
}
if ( $value >= $wgAccountCreationThrottle ) {
return Status::newFatal( 'acct_creation_throttle_hit', $wgAccountCreationThrottle );
}
- $wgMemc->incr( $key );
+ $cache->incr( $key );
}
}
// Give general extensions, such as a captcha, a chance to abort logins
$abort = self::ABORTED;
if ( !Hooks::run( 'AbortLogin', array( $u, $this->mPassword, &$abort, &$msg ) ) ) {
+ if ( !in_array( $abort, self::$statusCodes, true ) ) {
+ throw new Exception( 'Invalid status code returned from AbortLogin hook: ' . $abort );
+ }
$this->mAbortLoginErrorMsg = $msg;
-
return $abort;
}
* @return bool|int The integer hit count or True if it is already at the limit
*/
public static function incLoginThrottle( $username ) {
- global $wgPasswordAttemptThrottle, $wgMemc, $wgRequest;
+ global $wgPasswordAttemptThrottle, $wgRequest;
$username = trim( $username ); // sanity
$throttleCount = 0;
$count = $wgPasswordAttemptThrottle['count'];
$period = $wgPasswordAttemptThrottle['seconds'];
- $throttleCount = $wgMemc->get( $throttleKey );
+ $cache = ObjectCache::getLocalClusterInstance();
+ $throttleCount = $cache->get( $throttleKey );
if ( !$throttleCount ) {
- $wgMemc->add( $throttleKey, 1, $period ); // start counter
+ $cache->add( $throttleKey, 1, $period ); // start counter
} elseif ( $throttleCount < $count ) {
- $wgMemc->incr( $throttleKey );
+ $cache->incr( $throttleKey );
} elseif ( $throttleCount >= $count ) {
return true;
}
* @return void
*/
public static function clearLoginThrottle( $username ) {
- global $wgMemc, $wgRequest;
+ global $wgRequest;
$username = trim( $username ); // sanity
$throttleKey = wfMemcKey( 'password-throttle', $wgRequest->getIP(), md5( $username ) );
- $wgMemc->delete( $throttleKey );
+ ObjectCache::getLocalClusterInstance()->delete( $throttleKey );
}
/**
}
function processLogin() {
- global $wgMemc, $wgLang, $wgSecureLogin, $wgPasswordAttemptThrottle,
- $wgInvalidPasswordReset;
+ global $wgLang, $wgSecureLogin, $wgPasswordAttemptThrottle, $wgInvalidPasswordReset;
+ $cache = ObjectCache::getLocalClusterInstance();
$authRes = $this->authenticateUserData();
switch ( $authRes ) {
case self::SUCCESS:
// Reset the throttle
$request = $this->getRequest();
$key = wfMemcKey( 'password-throttle', $request->getIP(), md5( $this->mUsername ) );
- $wgMemc->delete( $key );
+ $cache->delete( $key );
if ( $this->hasSessionCookie() || $this->mSkipCookieCheck ) {
/* Replace the language object to provide user interface in
*/
protected function getExternalLibraries() {
global $IP;
- $path = "$IP/composer.lock";
+ $path = "$IP/vendor/composer/installed.json";
if ( !file_exists( $path ) ) {
- // Maybe they're using mediawiki/vendor?
- $path = "$IP/vendor/composer.lock";
- if ( !file_exists( $path ) ) {
- return '';
- }
+ return '';
}
- $lock = new ComposerLock( $path );
+ $installed = new ComposerInstalled( $path );
$out = Html::element(
'h2',
array( 'id' => 'mw-version-libraries' ),
. Html::element( 'th', array(), $this->msg( 'version-libraries-authors' )->text() )
. Html::closeElement( 'tr' );
- foreach ( $lock->getInstalledDependencies() as $name => $info ) {
+ foreach ( $installed->getInstalledDependencies() as $name => $info ) {
if ( strpos( $info['type'], 'mediawiki-' ) === 0 ) {
// Skip any extensions or skins since they'll be listed
// in their proper section
class UploadStash {
// Format of the key for files -- has to be suitable as a filename itself (e.g. ab12cd34ef.jpg)
const KEY_FORMAT_REGEX = '/^[\w-\.]+\.\w*$/';
+ const MAX_US_PROPS_SIZE = 65535;
/**
* repository that this uses to store temp files
wfDebug( __METHOD__ . " inserting $stashPath under $key\n" );
$dbw = $this->repo->getMasterDb();
+ $serializedFileProps = serialize( $fileProps );
+ if ( strlen( $serializedFileProps ) > self::MAX_US_PROPS_SIZE ) {
+ // Database is going to truncate this and make the field invalid.
+ // Prioritize important metadata over file handler metadata.
+ // File handler should be prepared to regenerate invalid metadata if needed.
+ $fileProps['metadata'] = false;
+ $serializedFileProps = serialize( $fileProps );
+ }
+
$this->fileMetadata[$key] = array(
'us_id' => $dbw->nextSequenceValue( 'uploadstash_us_id_seq' ),
'us_user' => $this->userId,
'us_key' => $key,
'us_orig_path' => $path,
'us_path' => $stashPath, // virtual URL
- 'us_props' => $dbw->encodeBlob( serialize( $fileProps ) ),
+ 'us_props' => $dbw->encodeBlob( $serializedFileProps ),
'us_size' => $fileProps['size'],
'us_sha1' => $fileProps['sha1'],
'us_mime' => $fileProps['mime'],
"createacct-reason-ph": "لماذا تقوم بإنشاء حساب آخر",
"createacct-submit": "افتح الحساب",
"createacct-another-submit": "أنشئ حسابا",
- "createacct-benefit-heading": "موقع {{SITENAME}} أنشأه أشخاص مثلك.",
+ "createacct-benefit-heading": "{{SITENAME}} موقع يساهم فيه أشخاص مثلك.",
"createacct-benefit-body1": "{{PLURAL:$1|تحريرا|تحريرات}}",
"createacct-benefit-body2": "{{PLURAL:$1|صفحة}}",
"createacct-benefit-body3": "آخر {{PLURAL:$1|مساهم|مساهمين}}",
"search-category": "(التصنيف $1)",
"search-file-match": "(يطابق محتوى الملف)",
"search-suggest": "أتقصد: $1",
- "search-rewritten": "عرض النتائج ل$1. ابحث بدلا من ذلك عن $2.",
+ "search-rewritten": "نتائج البحث المشابه $1 معروضة. يمكنك بدل ذلك البحث عن $2.",
"search-interwiki-caption": "المشاريع الشقيقة",
"search-interwiki-default": "نتائح من $1:",
"search-interwiki-more": "(المزيد)",
"foreign-structured-upload-form-label-not-own-work-message-local": "Калі вы ня можаце загрузіць файл у адпаведнасьці з правіламі {{GRAMMAR:родны|{{SITENAME}}}}, калі ласка, закрыйце гэтае акно і паспрабуйце іншы мэтад.",
"foreign-structured-upload-form-label-not-own-work-local-local": "Вы таксама можаце паспрабаваць [[Special:Upload|старонку загрузкі па змоўчаньні]].",
"foreign-structured-upload-form-label-own-work-message-default": "Я разумею, што загружаю гэты файл у агульнае сховішча. Я пацьвярджаю, што раблю гэта ў адпаведнасьці з умовамі выкарыстаньня і ліцэнзійнай палітыкай.",
+ "foreign-structured-upload-form-label-not-own-work-message-default": "Калі вы ня можаце загрузіць гэты файл паводле правілаў агульнага сховішча, калі ласка, закрыйце гэты дыялёг і паспрабуйце іншы мэтад.",
+ "foreign-structured-upload-form-label-not-own-work-local-default": "Вы можаце паспрабаваць скарыстацца [[Special:Upload|старонкай загрузкі {{GRAMMAR:родны|{{SITENAME}}}}]], калі гэты файл можна туды загрузіць згодна з правіламі.",
+ "foreign-structured-upload-form-label-own-work-message-shared": "Я пацьвярджаю, што зьяўляюся ўласьнікам аўтарскіх правоў на гэты файл, і згодны незваротна перадаць гэты файл ў Вікісховішча на ўмовах ліцэнзіі [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0], а таксама згодны з [https://wikimediafoundation.org/wiki/Terms_of_Use умовамі выкарыстаньня].",
"backend-fail-stream": "Немагчыма накіраваць файл $1.",
"backend-fail-backup": "Немагчыма зрабіць рэзэрвовую копію файла $1.",
"backend-fail-notexists": "Файл $1 не існуе.",
"passwordreset-emailerror-capture": "স্মরণ করিয়ে দেয়ার জন্য একটি ইমেইল তৈরী করা হয়েছিল, যা নিচে দেখানো হচ্ছে, তবে $1 {{GENDER:$2|ব্যবহারকারীকে}} এটি পাঠানো যায়নি!",
"changeemail": "ই-মেইল ঠিকানা পরিবর্তন বা বাতিল",
"changeemail-header": "অ্যাকাউন্ট ই-মেইল ঠিকানা পরিবর্তন",
+ "changeemail-passwordrequired": "এই পরিবর্তন নিশ্চিত করতে আপনাকে আপনার পাসওয়ার্ড লিখতে হবে।",
"changeemail-no-info": "এই পাতাটিতে সরাসরি প্রবেশাধিকার পেতে আপনাকে অবশ্যই লগইন করতে হবে।",
"changeemail-oldemail": "বর্তমান ই-মেইল ঠিকানা:",
"changeemail-newemail": "নতুন ই-মেইল ঠিকানা:",
"sig_tip": "সময় ও তারিখসহ আপনার স্বাক্ষর",
"hr_tip": "অনুভূমিক রেখা (সংযতভাবে ব্যবহার করুন)",
"summary": "সারাংশ:",
- "subject": "বিষয়/শিরোনাম:",
+ "subject": "বিষয়:",
"minoredit": "এটি একটি অনুল্লেখ্য সম্পাদনা",
"watchthis": "এই পাতাটি নজরে রাখুন",
"savearticle": "সংরক্ষণ",
"missingsummary": "'''খেয়াল করুন''': আপনি কিন্তু সম্পাদনার সারাংশ দেননি। আবার যদি \"সংরক্ষণ\" বোতামে ক্লিক করেন, তাহলে ঐ সারাংশ বাক্যটি ছাড়াই আপনার সম্পাদনা সংরক্ষিত হবে।",
"selfredirect": "<strong>সতর্কতা:</strong> আপনি এই পাতাকে এর নিজের দিকে পুনঃনির্দেশিত করছেন।\nআপনাকে পুনঃনির্দেশিত করার জন্য হয় ভুল লক্ষ্য নির্দিষ্ট করেছেন, অথবা আপনি ভুল পাতা সম্পাদনা করছেন।\nআপনি যদি আবার \"{{int:savearticle}}\" ক্লিক করেন, পুনর্নির্দেশ যেকোনোভাবেই হোক তৈরি করা হবে।",
"missingcommenttext": "দয়া করে নিচে মন্তব্য যোগ করুন।",
- "missingcommentheader": "'''খেয়াল করুন:''' আপনি এই মন্তব্যের জন্য কোন বিষয়/শিরোনাম দেননি। সংরক্ষণ বোতামে ক্লিক করলে, আপনার এই সম্পাদনা কোন বিষয়/শিরোনাম ছাড়াই সংরক্ষিত হবে।",
+ "missingcommentheader": "<strong>খেয়াল করুন:</strong> আপনি এই মন্তব্যের জন্য কোন বিষয় প্রদান করেননি।আপনি যদি আবার \"{{int:savearticle}}\" বোতামে ক্লিক করেন, আপনার এই সম্পাদনা কোন বিষয় ছাড়াই সংরক্ষিত হবে।",
"summary-preview": "সারাংশ প্রাকদর্শন:",
- "subject-preview": "বিষয়/শিরোনাম প্রাকদর্শন:",
+ "subject-preview": "বিষয় প্রাকদর্শন:",
"previewerrortext": "আপনার পরিবর্তনগুলি প্রাকদর্শন করার চেষ্টা করার সময় একটি ত্রুটি ঘটেছে।",
"blockedtitle": "ব্যবহারকারীকে বাধা দেয়া হয়েছে",
"blockedtext": "আপনার ব্যবহারকারী নাম বা আইপি ঠিকানার ঊপর নিষেধাজ্ঞা আরোপিত হয়েছে।\n\n$1 নিষেধাজ্ঞা আরোপ করেছেন। নিষেধের কারণ হিসেবে বলা হয়েছে:''$2''।\n\n* নিষেধাজ্ঞা শুরুর সময়:$8\n* নিষেধাজ্ঞা উঠিয়ে নেয়ার সময়: $6\n* যার উপর নিষেধাজ্ঞা আরোপ করা হয়েছে: $7\n\nআপনি $1 অথবা [[{{MediaWiki:Grouppage-sysop}}|প্রশাসকদের]] কারও সাথে এই নিষেধাজ্ঞা সংক্রান্ত বিষয়ে আলোচনা করতে পারেন।\n\nআপনি '(ব্যবহারকারীকে) ইমেইল করুন' ফিচারটি ব্যবহার করতে পারবেন না। তবে [[Special:Preferences|আপনার পছন্দ তালিকাতে]] যদি একটি বৈধ ই-মেইল ঠিকানা নির্দিষ্ট করা হয়ে থাকে এবং ফিচারটি ব্যবহারে যদি আপনাকে বাধা না দেওয়া হয়ে থাকে, তবে আপনি ফিচারটি ব্যবহার করতে পারবেন।\n\nআপনার বর্তমান আইপি ঠিকানা $3, এবং আপনার নিষেধাজ্ঞা নং হল #$5।\n\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
"mergehistory-go": "একত্রীকরণযোগ্য সম্পাদনাগুলি দেখানো হোক",
"mergehistory-submit": "সংশোধনগুলি একত্র করা হোক",
"mergehistory-empty": "কোন সংশোধন একত্র করা যাবে না.",
- "mergehistory-done": "$1 গুলোর মধ্যে $3 {{PLURAL:$3| টি সংশোধন |টি সংশোধনগুলো}} সফলভাবে [[:$2]]-এর সাথে একত্রিত করা হয়েছে।",
+ "mergehistory-done": "$1-এর $3{{PLURAL:$3|টি সংশোধন}} [[:$2]]-এর সাথে একত্রিত করা হয়েছে।",
"mergehistory-fail": "ইতিহাস একত্র করা গেল না। অনুগ্রহ করে পাতাটি ও সময়ের প্যারামিটারগুলি আবার পরীক্ষা করে দেখুন।",
"mergehistory-fail-toobig": "ইতিহাস থেকে আগের পাতাগুলো একীকরণ সম্ভব নয়, কারণ এর ফলে সর্বোচ্চ $1 টি {{PLURAL:$1|সংস্করণ}} স্থানান্তরের সীমানা অতিক্রম করবে।",
"mergehistory-no-source": "$1 বলে কোন উৎস পাতার অস্তিত্ব নেই।",
"prefs-help-recentchangescount": "এতে সাম্প্রতিক পরিবর্তনসমূহ, পাতার ইতিহাস এবং লগ অন্তর্ভুক্ত।",
"prefs-help-watchlist-token2": "এটি আপনার নজরতালিকার ওয়েব ফিডের গোপন চাবি। যে কেউ যিনি এটা জানেন তিনি আপনার নজরতালিকা পড়তে সক্ষম হবেন, তাই এটি প্রকাশ করবেন না। [[Special:ResetTokens|আপনার এটি পুনরায় সেট করার প্রয়োজন হলে এখানে ক্লিক করুন]]।",
"savedprefs": "আপনার পছন্দগুলো সংরক্ষণ করা হয়েছে।",
+ "savedrights": "{{GENDER:$1|$1}}-এর ব্যবহারকারী অধিকার সংরক্ষিত হয়েছে।",
"timezonelegend": "সময়স্থান:",
"localtime": "স্থানীয় সময়:",
"timezoneuseserverdefault": "উইকির পূর্বনির্ধারিত সময় ব্যবহার করো ($1)",
"recentchanges-page-added-to-category-bundled": "বিষয়শ্রেণীতে [[:$1]] এবং {{PLURAL:$2|একটি পাতা|$2টি পাতা}} যোগ করা হয়েছে",
"recentchanges-page-removed-from-category": "বিষয়শ্রেণী থেকে [[:$1]] সরানো হয়েছে",
"recentchanges-page-removed-from-category-bundled": "বিষয়শ্রেণী থেকে [[:$1]] এবং {{PLURAL:$2|একটি পাতা|$2টি পাতা}} সরানো হয়েছে",
+ "autochange-username": "মিডিয়াউইকি স্বয়ংক্রিয় পরিবর্তন",
"upload": "আপলোড",
"uploadbtn": "ফাইল আপলোড করুন",
"reuploaddesc": "আপলোড বাতিল করো এবং আপলোড ফর্মে ফেরত যাও।",
"uploadscripted": "এই ফাইলে এমন HTML বা স্ক্রিপ্ট কোড আছে যা একটি ওয়েব ব্রাউজার ভুল বুঝতে পারে।",
"uploaded-script-svg": "আপলোডকৃত SVG ফাইলে স্ক্রিপ্টযোগ্য উপাদান \"$1\" পাওয়া গেছে।",
"uploaded-hostile-svg": "আপলোড করা SVG ফাইলের শৈলী উপাদানে অনিরাপদ সিএসএস পাওয়া গেছে।",
+ "uploaded-image-filter-svg": "আপলোডকৃত SVG ফাইলে URL: <code><$1 $2=\"$3\"></code> সহ ছবি পরিশোধক পাওয়া গেছে।",
"uploadscriptednamespace": "এই SVG ফাইলে অবৈধ নামস্থান \"$1\" রয়েছে",
"uploadinvalidxml": "আপলোডকৃত ফাইলে XML পার্স করা যাবে না।",
"uploadvirus": "এই ফাইলটিতে ভাইরাস আছে! ব্যাখ্যা: $1",
"svg-long-error": "অবৈধ SVG ফাইল: $1",
"show-big-image": "মূল ফাইল",
"show-big-image-preview": "এই প্রাকদর্শনের আকার: $1।",
+ "show-big-image-preview-differ": "এই $2 ফাইলের জন্য এই $3 প্রাকদর্শনের আকার: $1।",
"show-big-image-other": "অন্যান্য {{PLURAL:$2|আকার|আকারসমূহ}}: $1।",
"show-big-image-size": "$1 × $2 পিক্সেল",
"file-info-gif-looped": "লুপকৃত",
"tags-create-reason": "কারণ:",
"tags-create-submit": "তৈরি করুন",
"tags-create-no-name": "আপনাকে একটি ট্যাগের নাম অবশ্যই উল্লেখ করতে হবে।",
+ "tags-create-already-exists": "\"$1\" ট্যাগ ইতিমধ্যেই বিদ্যমান।",
"tags-delete-title": "ট্যাগ অপসারণ",
"tags-delete-reason": "কারণ:",
"tags-delete-submit": "অপরিবর্তনীয় এই ট্যাগ অপসারন করো",
+ "tags-delete-not-found": "\"$1\" ট্যাগ বিদ্যমান নয়।",
"tags-activate-title": "সক্রিয় ট্যাগ",
"tags-activate-reason": "কারণ:",
"tags-activate-submit": "চালু",
"redirectedfrom": "(Preusmjereno sa $1)",
"redirectpagesub": "Preusmjerenje",
"redirectto": "Preusmjerenje na:",
- "lastmodifiedat": "Ova stranica je posljednji put izmijenjena $2, $1",
+ "lastmodifiedat": "Ova stranica je posljednji put izmijenjena u $2 na $1.",
"viewcount": "Ovoj stranici je pristupljeno {{PLURAL:$1|$1 put|$1 puta}}.",
"protectedpage": "Zaštićena stranica",
"jumpto": "Idi na:",
"viewsource": "Prikaži izvor",
"viewsource-title": "Prikaz izvora stranice $1",
"actionthrottled": "Akcija je usporena",
- "actionthrottledtext": "Kao anti-spam mjera, ograničene su vam izmjene u određenom vremenu, i trenutačno ste dostigli to ograničenje. Pokušajte ponovo poslije nekoliko minuta.",
+ "actionthrottledtext": "U cilju borbe protiv zloupotrebe, ograničeno vam je da u kratkom vremenskom periodu previše puta vršite ovu radnju, a upravo ste prešli to ograničenje.\nPokušajte ponovo za nekoliko minuta.",
"protectedpagetext": "Ova stranica je zaključana da bi se spriječile izmjene.",
"viewsourcetext": "Možete vidjeti i kopirati izvorni kôd ove stranice.",
- "viewyourtext": "Možete da pogledate i kopirate izvor '''vaših izmjena''' na ovoj stranici:",
+ "viewyourtext": "Možete vidjeti i kopirati izvor '''vaših izmjena''' na ovoj stranici.",
"protectedinterface": "Ova stranica sadrži tekst korisničkog okruženja za softver na ovom wikiju i zaštićena je radi sprečavanja zloupotrebe.\nDa biste dodali ili izmjenili prijevode svih wikija, posjetite [//translatewiki.net/ translatewiki.net], projekat za lokalizaciju Mediawikija.",
"editinginterface": "<strong>Upozorenje:</strong> Mijenjate stranicu koja sadrži aktivan tekst programa.\nPromjene na ovoj stranici dovode i do promjena za druge korisnike ovog wikija.\nZa dodavanje ili promjene prijevoda za sve wikije, molimo Vas koristite [//translatewiki.net/ translatewiki.net], projekt prijevoda za MediaWiki.",
"translateinterface": "Za dodavanje ili promjenu prijevoda za sve wikije koristite [//translatewiki.net/ translatewiki.net], projekt za lokalizaciju MediaWikija.",
"createacct-reason": "Razlog",
"createacct-reason-ph": "Zašto pravite još jedan korisnički račun?",
"createacct-submit": "Napravite svoj korisnički račun",
- "createacct-another-submit": "Napravi još jedan korisnički račun",
+ "createacct-another-submit": "Napravi korisnički račun",
"createacct-benefit-heading": "{{SITENAME}} je napravljena od strane ljudi kao što ste Vi.",
"createacct-benefit-body1": "{{PLURAL:$1|izmjena|izmjene}}",
"createacct-benefit-body2": "{{PLURAL:$1|stranica|stranice|stranica}}",
"passwordreset-emailtext-ip": "Neko (vjerovatno Vi, s IP adrese $1) je zatražio podsjetnik Vaših detalja računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|račun korisnika je|računi korisnika su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše početne šifre, a ne želite je promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
"passwordreset-emailtext-user": "Korisnik $1 na {{SITENAME}} je zatražio podsjetnik o detaljima Vašeg računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|korisnički račun je|korisnički računi su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše originalne šifre, a ne želite je više promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
"passwordreset-emailelement": "Korisničko ime: \n$1\n\nPrivremena šifra: \n$2",
- "passwordreset-emailsent": "Podsjetnik na lozinku poslan je na Vašu e-mail adresu.",
+ "passwordreset-emailsent": "Ako je ovo adresa e-pošte s kojom ste registrirali ovaj račun, podsjetnik šifre će vam biti poslan na vašu adresu e-pošte.",
"passwordreset-emailsent-capture": "Poslan je podsjetnik preko e-pošte (prikazano ispod).",
"passwordreset-emailerror-capture": "E-poruka za resetiranje lozinke, prikazano ispod, poslana je, ali slanje {{GENDER:$2|korisniku|korisnici}} nije uspjelo: $1",
- "changeemail": "Promjena e-adrese",
- "changeemail-header": "Promijeni e-mail adresu korisničkog računa",
+ "changeemail": "Promjena ili uklanjanje e-adrese",
+ "changeemail-header": "Ispunite sljedeći formular da biste promijenili adresu e-pošte. Ako želite ukloniti postojeću adresu e-pošte s vašeg korisničkog računa, pri ispunjavanju formulara, polje nove adrese e-pošte ostavite prazno.",
"changeemail-no-info": "Morate biti prijavljeni za direktan pristup ovoj stranici.",
"changeemail-oldemail": "Trenutna adresa e-pošte:",
"changeemail-newemail": "Nova adresa e-pošte:",
"sig_tip": "Vaš potpis sa trenutnim vremenom",
"hr_tip": "Horizontalna linija (koristite oskudno)",
"summary": "Sažetak:",
- "subject": "Tema/naslov:",
+ "subject": "Tema:",
"minoredit": "Ovo je manja izmjena",
"watchthis": "Prati ovu stranicu",
"savearticle": "Sačuvaj stranicu",
"missingsummary": "'''Napomena:''' Niste unijeli sažetak izmjene.\nAko kliknete na Sačuvaj, Vaša izmjena će biti sačuvana bez sažetka.",
"selfredirect": "<strong>Upozorenje:</strong> Preusmjerili ste stranicu na samu sebe.\nMožda ste naveli pogrešan cilj preusmjeravanja ili ste uređivali pogrešnu stranicu.\nAko ponovno kliknete \"{{int:savearticle}}\", ipak će nastati preusmjerenje.",
"missingcommenttext": "Molimo unesite komentar ispod.",
- "missingcommentheader": "<strong>Podsjetnik:</strong> Niste napisali temu/naslov za ovaj komentar.\nAko ponovo kliknete na \"{{int:savearticle}}\", vaša izmjena će biti sačuvana bez teme/naslova.",
+ "missingcommentheader": "<strong>Podsjetnik:</strong> Niste napisali temu za ovaj komentar.\nAko ponovo kliknete na \"{{int:savearticle}}\", vaša izmjena će biti sačuvana bez teme/naslova.",
"summary-preview": "Pregled sažetka:",
- "subject-preview": "Pregled tema/naslova:",
+ "subject-preview": "Pregled teme:",
"previewerrortext": "Dogodila se greška prilikom prikazivanja vaših izmjena.",
"blockedtitle": "Korisnik je blokiran",
"blockedtext": "'''Vaše korisničko ime ili IP-adresa je blokirana.'''\n\nBlokada izvršena od strane $1.\nDati razlog je sljedeći: ''$2''.\n\n*Početak blokade: $8\n*Kraj perioda blokade: $6\n*Ime blokiranog korisnika: $7\n\nMožete kontaktirati sa $1 ili nekim drugim [[{{MediaWiki:Grouppage-sysop}}|administratorom]] da biste razgovarali o blokadi.\n\nNe možete koristiti opciju ''Pošalji e-mail korisniku'' osim ako niste unijeli e-mail adresu u [[Special:Preferences|Vaše postavke]].\nVaša trenutna IP-adresa je $3, a oznaka blokade je #$5.\nMolimo Vas da navedete gornje podatke pri zahtjevu za deblokadu.",
"mergehistory-go": "Prikaži izmjene koje se mogu spojiti",
"mergehistory-submit": "Spoji revizije",
"mergehistory-empty": "Nema revizija za spajanje.",
- "mergehistory-done": "$3 {{PLURAL:$3|revizija|revizije|revizija}} stranice $1 uspješno spojeno u [[:$2]].",
+ "mergehistory-done": "$3 {{PLURAL:$3|izmjena|izmjene|izmjena}} stranice $1 uspješno je spojeno u [[:$2]].",
"mergehistory-fail": "Ne može se izvršiti spajanje historije, molimo provjerite opet stranicu i parametre vremena.",
"mergehistory-fail-toobig": "Ne može se izvršiti spajanje historije jer će se više premjestiti više od ograničenja od $1 {{PLURAL:$1|revizije|revizija}}.",
"mergehistory-no-source": "Izvorna stranica $1 ne postoji.",
"prefs-watchlist-token": "Žeton praćenih članaka:",
"prefs-misc": "Ostala podešavanja",
"prefs-resetpass": "Promijeni šifru",
- "prefs-changeemail": "Promijeni adresu e-pošte",
+ "prefs-changeemail": "Promijeni ili ukloni adresu e-pošte",
"prefs-setemail": "Postavite e-mail adresu",
"prefs-email": "Opcije e-pošte",
"prefs-rendering": "Izgled",
"group-bot": "Botovi",
"group-sysop": "Administratori",
"group-bureaucrat": "Birokrati",
- "group-suppress": "Nadzornici",
+ "group-suppress": "Skrivači",
"group-all": "(sve)",
"group-user-member": "{{GENDER:$1|korisnik|korisnica}}",
"group-autoconfirmed-member": "Potvrđeni korisnik",
"group-bot-member": "bot",
"group-sysop-member": "{{GENDER:$1|administrator|administratorica}}",
"group-bureaucrat-member": "{{GENDER:$1|birokrat|birokratica}}",
- "group-suppress-member": "Nadzornik",
+ "group-suppress-member": "{{GENDER:$1|skrivač|skrivačica}}",
"grouppage-user": "{{ns:project}}:Korisnici",
"grouppage-autoconfirmed": "{{ns:project}}:Potvrđeni korisnici",
"grouppage-bot": "{{ns:project}}:Botovi",
"grouppage-sysop": "{{ns:project}}:Administratori",
"grouppage-bureaucrat": "{{ns:project}}:Birokrati",
- "grouppage-suppress": "{{ns:project}}:Nadzornici",
+ "grouppage-suppress": "{{ns:project}}:Skrivač",
"right-read": "Čitanje stranica",
"right-edit": "Uređivanje stranica",
"right-createpage": "Pravljenje stranica (neuključujući stranice za razgovor)",
"rcshowhidemine": "$1 moje izmjene",
"rcshowhidemine-show": "Prikaži",
"rcshowhidemine-hide": "Sakrij",
+ "rcshowhidecategorization-show": "Prikaži",
+ "rcshowhidecategorization-hide": "Sakrij",
"rclinks": "Prikaži posljednjih $1 izmjena u posljednjih $2 dana<br />$3",
"diff": "razl",
"hist": "hist",
"newpageletter": "N",
"boteditletter": "b",
"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|korisnik|korisnika}} koji pregledaju]",
- "rc_categories": "Ograniči na kategorije (razdvojene sa \"|\")",
- "rc_categories_any": "Sve",
+ "rc_categories": "Ograniči na kategorije (razdvoji sa \"|\"):",
+ "rc_categories_any": "Bilo koju odabranu",
"rc-change-size-new": "$1 {{PLURAL:$1|bajt|bajta|bajtova}} poslije izmjene",
"newsectionsummary": "/* $1 */ novi odjeljak",
"rc-enhanced-expand": "Pokaži detalje",
"upload-too-many-redirects": "URL sadrži previše preusmjerenja",
"upload-http-error": "Desila se HTTP greška: $1",
"upload-copy-upload-invalid-domain": "Kopije postavljenih datoteka nisu dostupne sa ove domene.",
+ "upload-dialog-title": "Postavi datoteku",
+ "upload-dialog-button-cancel": "Odustani",
+ "upload-dialog-button-done": "Gotovo",
+ "upload-dialog-button-save": "Sačuvaj",
+ "upload-dialog-button-upload": "Postavi",
+ "upload-form-label-select-file": "Izaberi datoteku",
+ "upload-form-label-infoform-title": "Detalji",
+ "upload-form-label-infoform-name": "Ime",
+ "upload-form-label-infoform-description": "Opis",
+ "upload-form-label-usage-title": "Korištenje",
+ "upload-form-label-usage-filename": "Ime datoteke",
+ "foreign-structured-upload-form-label-own-work": "Ovo je moje djelo",
+ "foreign-structured-upload-form-label-infoform-categories": "Kategorije",
+ "foreign-structured-upload-form-label-infoform-date": "Datum",
+ "foreign-structured-upload-form-label-own-work-message-shared": "Potvrđujem da posjedujem autorska prava za ovu datoteku i slažem se da ću je neopozivo postaviti na Wikimedia Commons pod licencom [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0], te se slažem s [https://wikimediafoundation.org/wiki/Terms_of_Use Uvjetima korištenja].",
+ "foreign-structured-upload-form-label-not-own-work-message-shared": "Ako ne posjedujete autorska prava za ovu datoteku ili je želite postaviti pod drugom licencom, imajte na umu da možete koristiti [https://commons.wikimedia.org/wiki/Special:UploadWizard čarobnjak za postavljanje datoteka na Commonsu].",
+ "foreign-structured-upload-form-label-not-own-work-local-shared": "Također možete koristiti [[Special:Upload|stranicu za postavljanje datoteka na projektu {{SITENAME}}]] ako politika stranice dozvoljava postavljanje ove datoteke.",
"backend-fail-stream": "Ne mogu emitirati datoteku $1.",
"backend-fail-backup": "Ne može sigurnosno kopirati datoteku $1.",
"backend-fail-notexists": "Datoteka $1 ne postoji.",
"nopagetext": "Ciljna stranica koju ste naveli ne postoji.",
"pager-newer-n": "{{PLURAL:$1|novija 1|novije $1}}",
"pager-older-n": "{{PLURAL:$1|starija 1|starije $1}}",
- "suppress": "Nazdor",
+ "suppress": "Sakrij",
"querypage-disabled": "Ova posebna stranica je onemogućena jer smanjuje performanse.",
"apihelp": "API pomoć",
"apihelp-no-such-module": "Modul \"$1\" nije pronađen.",
"trackingcategories-disabled": "Kategorija je onemogućena",
"mailnologin": "Nema adrese za slanje",
"mailnologintext": "Morate biti [[Special:UserLogin|prijavljeni]]\ni imati ispravnu adresu e-pošte u vašim [[Special:Preferences|podešavanjima]]\nda biste slali e-poštu drugim korisnicima.",
- "emailuser": "Pošalji e-poštu",
+ "emailuser": "Pošalji e-poruku",
"emailuser-title-target": "Pošalji e-poruku {{GENDER:$1|korisniku|korisnici|korisniku}}",
"emailuser-title-notarget": "Pošalji e-mail korisniku",
"emailpagetext": "Možete korisiti obrazac ispod za slanje poruke e-poštom {{GENDER:$1|ovom korisniku|ovoj korisnici|ovom korisniku}}.\nAdresa e-pošte koju ste unijeli u [[Special:Preferences|svojim korisničkim postavkama]] će biti prikazana kao adresa pošiljaoca, tako da će primaoc poruke moći da Vam odgovori.",
"emailccsubject": "Kopiraj Vašu poruku za $1: $2",
"emailsent": "Poruka poslata",
"emailsenttext": "Vaša poruka je poslata e-poštom.",
- "emailuserfooter": "Ovaj e-mail je poslao $1 korisniku $2 putem funkcije \"{{int:emailuser}}\" sa {{SITENAME}}.",
+ "emailuserfooter": "Ovu e-poruku {{GENDER:$1|poslao|poslala}} je $1 {{GENDER:$2|korisniku|korisnici}} $2 pomoću funkcije \"{{int:emailuser}}\" s projekta {{SITENAME}}.",
"usermessage-summary": "Ostavljanje sistemske poruke.",
"usermessage-editor": "Sistem za poruke",
"watchlist": "Spisak praćenja",
"watchlistanontext": "Morate biti prijavljeni kako biste vidjeli ili uređivali svoj spisak praćenih članaka.",
"watchnologin": "Niste prijavljeni",
"addwatch": "Dodaj na spisak praćenja",
- "addedwatchtext": "Stranica \"[[:$1]]\" je dodata vašem [[Special:Watchlist|spisku praćenih članaka]]. \nBuduće promjene ove stranice i njoj pridružene stranice za razgovor će biti navedene ovdje.",
+ "addedwatchtext": "Stranica \"[[:$1]]\" i njena stranica za razgovor dodani su na vaš [[Special:Watchlist|spisak praćenja]].",
"addedwatchtext-short": "Stranica \"$1\" je dodana na vaš spisak praćenja.",
"removewatch": "Ukloni sa spiska praćenja",
"removedwatchtext": "Stranica \"[[:$1]]\" je uklonjena iz [[Special:Watchlist|vašeg spiska praćenih članaka]].",
"cant-move-to-user-page": "Nemate dopuštenje da premjestite stranicu na korisničku stranicu (osim na korisničku podstranicu).",
"cant-move-category-page": "Nemate dopuštene da premještate stranice kategorija.",
"cant-move-to-category-page": "Nemate dopuštenje da premjestite stranicu na stranicu kategorije.",
- "newtitle": "Novi naslov",
+ "newtitle": "Novi naslov:",
"move-watch": "Prati ovu stranicu",
"movepagebtn": "Premjesti stranicu",
"pagemovedsub": "Premještanje uspjelo",
"anonymous": "{{PLURAL:$1|Anonimni korisnik|$1 anonimna korisnika|$1 anonimnih korisnika}} projekta {{SITENAME}}",
"siteuser": "{{SITENAME}} korisnik $1",
"anonuser": "{{SITENAME}} anonimni korisnik $1",
- "lastmodifiedatby": "Ovu stranicu posljednji je put promijenio $3 u $2, $1",
+ "lastmodifiedatby": "Ovu stranicu posljednji je put {{GENDER:$4|izmijenio|izmijenila}} $3 dana $1 u $2.",
"othercontribs": "Bazirano na radu od strane korisnika $1.",
"others": "ostali",
"siteusers": "{{SITENAME}} {{PLURAL:$2|korisnik|korisnika}} $1",
"tog-hideminor": "Amaga les edicions menors en la pàgina de canvis recents",
"tog-hidepatrolled": "Amaga edicions patrullades als canvis recents",
"tog-newpageshidepatrolled": "Amaga pàgines patrullades de la llista de pàgines noves",
+ "tog-hidecategorization": "Amaga la categorització de les pàgines",
"tog-extendwatchlist": "Desplega la llista de seguiment per a mostrar tots els canvis afectats, no només els més recents",
"tog-usenewrc": "Agrupa els canvis per pàgina en canvis recents i llista de seguiment",
"tog-numberheadings": "Enumera automàticament els encapçalaments",
"tog-watchlisthideliu": "Amaga a la llista les edicions d'usuaris registrats",
"tog-watchlisthideanons": "Amaga a la llista les edicions d'usuaris anònims",
"tog-watchlisthidepatrolled": "Amaga edicions patrullades de la llista de seguiment",
+ "tog-watchlisthidecategorization": "Amaga la categorització de les pàgines",
"tog-ccmeonemails": "Envia’m còpies dels missatges que enviï als altres usuaris",
"tog-diffonly": "Amaga el contingut de la pàgina davall de la taula de diferències",
"tog-showhiddencats": "Mostra les categories ocultes",
"viewsource": "Mostra el codi",
"viewsource-title": "Mostra la font per a $1",
"actionthrottled": "Acció limitada",
- "actionthrottledtext": "Com a mesura per a prevenir la propaganda indiscriminada (spam), no podeu fer aquesta acció tantes vegades en un període de temps tan curt. Torneu-ho a intentar d'ací uns minuts.",
+ "actionthrottledtext": "Com a mesura per prevenir l’abús, no podeu fer aquesta acció tantes vegades en un període de temps tan curt. Torneu-ho a intentar d’ací a uns minuts.",
"protectedpagetext": "S'ha protegit la pàgina per evitar-hi modificacions.",
"viewsourcetext": "Podeu veure i copiar el codi font d’aquesta pàgina.",
"viewyourtext": "Vostè pot veure i copiar la font de <strong>les teves modificacions</strong> d'aquesta pàgina.",
"userlogin-helplink2": "Ajuda amb el registre",
"userlogin-loggedin": "Heu iniciat una sessió com {{GENDER:$1|$1}}.\nFeu servir el formulari de sota per iniciar la sessió com un altre usuari.",
"userlogin-createanother": "Crea un altre compte",
- "createacct-emailrequired": "Adreça de correu electrònic",
- "createacct-emailoptional": "Adreça de correu electrònic (opcional)",
+ "createacct-emailrequired": "Adreça electrònica",
+ "createacct-emailoptional": "Adreça electrònica (opcional)",
"createacct-email-ph": "Introduïu la vostra adreça de correu electrònic",
"createacct-another-email-ph": "Introduïu una adreça de correu electrònic",
"createaccountmail": "Utilitza una contrasenya aleatòria temporal i envia-la a l'adreça de correu indicada",
"passwordremindertitle": "Nova contrasenya temporal per al projecte {{SITENAME}}",
"passwordremindertext": "Algú (vós mateix segurament, des de l'adreça l'IP $1) ha soŀlicitat que us enviéssim una nova contrasenya per a iniciar la sessió al projecte {{SITENAME}} ($4).\nLa nova contrasenya temporal per a l'usuari «$2» és ara «$3». Si aquesta fou la vostra intenció, ara hauríeu d'iniciar la sessió i canviar-la. Tingueu present que és temporal i caducarà d'aquí {{PLURAL:$5|un dia|$5 dies}}.\n\nSi algú altre hagués fet aquesta soŀlicitud o si ja haguéssiu recordat la vostra contrasenya i\nno volguéssiu canviar-la, ignoreu aquest missatge i continueu utilitzant\nla vostra antiga contrasenya.",
"noemail": "No hi ha cap adreça electrònica registrada de l'usuari «$1».",
- "noemailcreate": "Has d'indicar una adreça de correu electrònic vàlida",
+ "noemailcreate": "Heu d’indicar una adreça electrònica vàlida.",
"passwordsent": "S'ha enviat una nova contrasenya a l'adreça electrònica registrada per «$1».\nInicieu una sessió després que la rebeu.",
"blocked-mailpassword": "S'ha blocat la vostra adreça IP. Se us ha desactivat la funció de recuperació de contrasenya per a prevenir abusos.",
"eauthentsent": "S'ha enviat un correu electrònic a la direcció especificada. Abans no s'enviï cap altre correu electrònic a aquesta adreça, cal verificar que és realment vostra. Per tant, cal que seguiu les instruccions presents en el correu electrònic que se us ha enviat.",
"passwordreset-domain": "Domini",
"passwordreset-capture": "Veure el missatge de correu electrònic?",
"passwordreset-capture-help": "Si marqueu aquesta casella, el missatge de correu electrònic (amb la contrasenya temporal) es mostrarà al mateix moment que sigui enviat a l'usuari.",
- "passwordreset-email": "Adreça de correu electrònic:",
+ "passwordreset-email": "Adreça electrònica:",
"passwordreset-emailtitle": "Detalls del compte a {{SITENAME}}",
"passwordreset-emailtext-ip": "Algú (vós mateix segurament, des de l'adreça IP $1) ha demanat una reinicialització de la vostra contrasenya al projecte {{SITENAME}} ($4). {{PLURAL:$3|El següent compte d'usuari està associat|Els següents comptes d'usuari estan associats}} amb aquesta adreça de correu electrònic:\n\n$2\n\n{{PLURAL:$3|Aquesta contrasenya temporal caducarà|Aquestes contrasenyes temporals caducaran}} en {{PLURAL:$5|un dia|$5 dies}}.\nHauríeu d'entrar al compte per a fixar-hi una nova contrasenya al més aviat possible. Si algú que no sou vós és qui ha fet aquesta petició o si heu recordat la contrasenya original i ja no la voleu canviar, podeu ignorar aquest missatge i seguir utilitzant la vostra antiga contrasenya.",
"passwordreset-emailtext-user": "L'usuari $1 de {{SITENAME}} ha demanat una reinicialització de la vostra contrasenya per al projecte {{SITENAME}} ($4). {{PLURAL:$3|El següent compte d'usuari està associat|Els següents comptes d'usuari estan associats}} amb aquesta adreça de correu electrònic:\n\n$2\n\n{{PLURAL:$3|Aquesta contrasenya temporal caducarà|Aquestes contrasenyes temporals caducaran}} en {{PLURAL:$5|un dia|$5 dies}}.\nHauríeu d'entrar ara per fixar una nova contrasenya. Si algú que no sou vós és qui ha fet aquesta petició o si heu recordat la contrasenya original i ja no la voleu canviar, podeu ignorar aquest missatge i seguir utilitzant la vostra antiga contrasenya.",
"passwordreset-emailelement": "Nom d'usuari: \n$1\n\nContrasenya temporal: \n$2",
- "passwordreset-emailsent": "S'ha enviat un correu de reinicialització de contrasenya.",
+ "passwordreset-emailsent": "Si aquesta és una adreça electrònica registrada amb el vostre compte, s’hi enviarà un missatge de restabliment de contrasenya.",
"passwordreset-emailsent-capture": "S'ha enviat un correu electrònic de reinicialització de contrasenya, tal com es mostra a continuació.",
"passwordreset-emailerror-capture": "S'ha generat un correu electrònic de renovació de contrasenya, que es mostra a continuació, però ha fallat l'enviament a {{GENDER:$2:l'usuari|la usuària}}: $1",
- "changeemail": "Canvi de correu electrònic",
- "changeemail-header": "Canvi de l'adreça de correu electrònic del compte",
+ "changeemail": "Canvia o elimina l’adreça electrònica",
+ "changeemail-header": "Empleneu aquest formulari per canviar la vostra adreça electrònica. Si voleu eliminar qualssevol associacions d’adreces electròniques del vostre compte, deixeu en blanc el camp i envieu el formulari.",
+ "changeemail-passwordrequired": "Cal que introduïu la vostra contrasenya per confirmar el canvi.",
"changeemail-no-info": "Heu d'entrar en un compte d'usuari per accedir directament a aquesta pàgina.",
- "changeemail-oldemail": "Adreça de correu electrònic actual:",
+ "changeemail-oldemail": "Adreça electrònica actual:",
"changeemail-newemail": "Adreça electrònica nova:",
"changeemail-none": "(cap)",
"changeemail-password": "La vostra contrasenya a {{SITENAME}}:",
"changeemail-submit": "Canvia de correu electrònic",
"changeemail-throttled": "Heu realitzat massa intents d'inici de sessió.\nEspereu $1 abans de tornar-ho a provar.",
+ "changeemail-nochange": "Introduïu una adreça electrònica distinta.",
"resettokens": "Reinicia els testimonis",
"resettokens-text": "Des d'aquí podeu reiniciar els testimonis que permeten l'accés a certes dades privades associades amb el vostre compte.\n\nHo hauríeu de fer si accidentalment els heu compartit amb algú o si el vostre compte ha estat compromès.",
"resettokens-no-tokens": "No hi ha testimonis per reiniciar.",
"sig_tip": "La vostra signatura amb marca horària",
"hr_tip": "Línia horitzontal (feu-la servir amb moderació)",
"summary": "Resum:",
- "subject": "Tema/capçalera:",
+ "subject": "Assumpte:",
"minoredit": "Aquesta és una modificació menor",
"watchthis": "Vigila aquesta pàgina",
"savearticle": "Desa la pàgina",
"missingsummary": "'''Recordatori''': Heu deixat en blanc el resum de l'edició. Si torneu a clicar al botó de desar, l'edició es guardarà sense resum.",
"selfredirect": "<strong>Avís:</strong> Esteu redirigint la pàgina a si mateixa.\nPodeu haver especificat un objectiu erroni per a la redirecció, o potser esteu modificant una pàgina incorrecta.\nSi feu clic a «{{int:savearticle}}» una vegada més, la redirecció es crearà de totes maneres.",
"missingcommenttext": "Introduïu un comentari a continuació.",
- "missingcommentheader": "'''Recordatori:''' No heu proporcionat un assumpte/encapçalament per al comentari. Si cliqueu de nou al botó \"{{int:savearticle}}\", la vostra contribució se desarà sense cap.",
+ "missingcommentheader": "<strong>Recordatori:</strong> no heu proporcionat un assumpte/encapçalament per al comentari.\nSi feu clic de nou al botó «{{int:savearticle}}», la vostra contribució es desarà sense cap.",
"summary-preview": "Previsualització del resum:",
- "subject-preview": "Previsualització de tema/capçalera:",
+ "subject-preview": "Previsualització de l’assumpte:",
"previewerrortext": "S'ha produït un error quan es provava de previsualitzar els canvis.",
"blockedtitle": "L'usuari està blocat",
"blockedtext": "'''S'ha procedit al blocatge del vostre compte d'usuari o la vostra adreça IP.'''\n\nEl blocatge l'ha dut a terme l'usuari $1.\nEl motiu donat és ''$2''.\n\n* Inici del blocatge: $8\n* Final del blocatge: $6\n* Compte blocat: $7\n\nPodeu contactar amb $1 o un dels [[{{MediaWiki:Grouppage-sysop}}|administradors]] per a discutir-ho.\n\nTingueu en compte que no podeu fer servir el formulari d'enviament de missatges de correu electrònic a cap usuari, a menys que tingueu una adreça de correu vàlida registrada a les vostres [[Special:Preferences|preferències d'usuari]] i no ho tingueu tampoc blocat.\n\nLa vostra adreça IP actual és $3, i el número d'identificació del blocatge és #$5.\nSi us plau, incloeu aquestes dades en totes les consultes que feu.",
"permissionserrorstext-withaction": "No teniu permís per a $2, {{PLURAL:$1|pel motiu següent|pels motius següents}}:",
"recreate-moveddeleted-warn": "'''Avís: esteu creant una pàgina que s'ha suprimit prèviament.'''\n\nHauríeu de considerar si és realment necessari continuar editant aquesta pàgina.\nA continuació s'ofereix el registre de supressions i de reanomenaments de la pàgina:",
"moveddeleted-notice": "S'ha suprimit aquesta pàgina.\nA continuació us mostrem com a referència el registre d'esborraments i reanomenaments de la pàgina.",
+ "moveddeleted-notice-recent": "S’ha suprimit aquesta pàgina recentment (en les últimes 24 hores).\nA continuació us mostrem com a referència el registre de supressions i reanomenaments de la pàgina.",
"log-fulllog": "Veure tot el registre",
"edit-hook-aborted": "Modificació avortada pel hook.\nNo s'ha donat cap explicació.",
"edit-gone-missing": "No s'ha pogut actualitzar la pàgina.\nSembla haver estat esborrada.",
"mergehistory-go": "Mostra les edicions que es poden fusionar",
"mergehistory-submit": "Fusiona les revisions",
"mergehistory-empty": "No pot fusionar-se cap revisió.",
- "mergehistory-done": "$3 {{PLURAL:$3|revisió|revisions}} de $1 s'han fusionat amb èxit a [[:$2]].",
+ "mergehistory-done": "{{PLURAL:$3|S’ha|S’han}} fusionat correctament $3 {{PLURAL:$3|revisió|revisions}} de $1 a [[:$2]].",
"mergehistory-fail": "No s'ha pogut realitzar la fusió de l'historial, comproveu la pàgina i els paràmetres horaris.",
"mergehistory-fail-toobig": "No s'ha pogut realitzar la fusió de l'historial perquè es mourien més del limit de $1 {{PLURAL:$1|revisió|revisions}}.",
"mergehistory-no-source": "La pàgina d'origen $1 no existeix.",
"search-category": "(categoria $1)",
"search-file-match": "(coincideix amb el contingut del fitxer)",
"search-suggest": "Volíeu dir: $1",
+ "search-rewritten": "S’hi mostren els resultats de $1. Cerqueu «$2» en comptes d’aquest.",
"search-interwiki-caption": "Projectes germans",
"search-interwiki-default": "Resultats de $1:",
"search-interwiki-more": "(més)",
"prefs-watchlist-token": "Testimoni de llista de seguiment:",
"prefs-misc": "Altres preferències",
"prefs-resetpass": "Canvia la contrasenya",
- "prefs-changeemail": "Canvia de correu electrònic",
+ "prefs-changeemail": "Canvia o elimina l’adreça electrònica",
"prefs-setemail": "Indiqueu una adreça de correu electrònic",
"prefs-email": "Opcions de correu electrònic",
"prefs-rendering": "Aparença",
"timezoneregion-europe": "Europa",
"timezoneregion-indian": "Oceà Índic",
"timezoneregion-pacific": "Oceà Pacífic",
- "allowemail": "Permet que altres usuaris puguin enviar-me correus electrònics",
+ "allowemail": "Permet que altres usuaris puguin enviar-me missatges per correu electrònic",
"prefs-searchoptions": "Cerca",
"prefs-namespaces": "Espais de noms",
"default": "per defecte",
"rcshowhidemine": "$1 edicions pròpies",
"rcshowhidemine-show": "Mostra",
"rcshowhidemine-hide": "Amaga",
+ "rcshowhidecategorization": "$1 la categorització de la pàgina",
+ "rcshowhidecategorization-show": "Mostra",
+ "rcshowhidecategorization-hide": "Amaga",
"rclinks": "Mostra els darrers $1 canvis en els darrers $2 dies<br />$3",
"diff": "dif",
"hist": "hist",
"recentchanges-page-added-to-category-bundled": "[[:$1]] i {{PLURAL:$2|una pàgina|$2 pàgines}} més afegides a la categoria",
"recentchanges-page-removed-from-category": "[[:$1]] treta de la categoria",
"recentchanges-page-removed-from-category-bundled": "[[:$1]] i {{PLURAL:$2|una pàgina|$2 pàgines}} més tretes de la categoria",
+ "autochange-username": "Canvi automàtic del MediaWiki",
"upload": "Carregueu un fitxer",
"uploadbtn": "Carrega un fitxer",
"reuploaddesc": "Torna al formulari per apujar.",
"php-uploaddisabledtext": "La càrrega de fitxer està desactivada al PHP. Comproveu les opcions del fitxer file_uploads.",
"uploadscripted": "Aquest fitxer conté codi HTML o de seqüències que pot ser interpretat equivocadament per un navegador.",
"upload-scripted-pi-callback": "No es poden carregar arxius que continguin instruccions de processament de pàgines d'estil XML",
+ "uploaded-script-svg": "S’ha trobat l’element programable «$1» al fitxer SVG carregat.",
+ "uploaded-hostile-svg": "S’ha trobat codi CSS no segur a l’element d’estil del fitxer SVG carregat.",
+ "uploaded-event-handler-on-svg": "No es permet establir els atributs de gestió d’events <code>$1=\"$2\"</code> als fitxers SVG.",
+ "uploaded-href-attribute-svg": "No es permeten els atributs d’«href» <code><$1 $2=\"$3\"></code> amb objectius no locals (p. ex., http:// i javascript:) als fitxers SVG.",
+ "uploaded-href-unsafe-target-svg": "S’ha trobat un element «href» amb un objectiu no segur <code><$1 $2=\"$3\"></code> al fitxer SVG carregat.",
"uploadscriptednamespace": "Aquest fitxer SVG conté un espai de noms \"$1\" no autoritzat",
"uploadinvalidxml": "No s'ha pogut analitzar l'XML del fitxer carregat.",
"uploadvirus": "El fitxer conté un virus! Detalls: $1",
"upload-form-label-infoform-description": "Descripció",
"upload-form-label-usage-title": "Ús",
"upload-form-label-usage-filename": "Nom del fitxer",
+ "foreign-structured-upload-form-label-own-work": "Això és el meu propi treball",
"foreign-structured-upload-form-label-infoform-categories": "Categories",
"foreign-structured-upload-form-label-infoform-date": "Data",
"backend-fail-stream": "No s'ha pogut transmetre el fitxer $1.",
"booksources-text": "A sota hi ha una llista d'enllaços d'altres llocs que venen llibres nous i de segona mà, i també podrien tenir més informació dels llibres que esteu cercant:",
"booksources-invalid-isbn": "El codi ISBN donat no és vàlid. Comproveu si l'heu copiat correctament.",
"specialloguserlabel": "Realitzador:",
- "speciallogtitlelabel": "L'objectiu (títol o usuari):",
+ "speciallogtitlelabel": "Objectiu (títol o «{{ns:user}}:nom d’usuari» per a un usuari):",
"log": "Registres",
"all-logs-page": "Tots els registres públics",
"alllogstext": "Presentació combinada de tots els registres disponibles de {{SITENAME}}.\nPodeu reduir l'extensió seleccionant el tipus de registre, el nom d'usuari realitzador (distingeix entre majúscules i minúscules), o la pàgina objectiu (també en distingeix).",
"category_header": "АгӀонаш категоречохь «$1»",
"subcategories": "Бухаркатегореш",
"category-media-header": "Файлаш оцу категори чохь «$1»",
- "category-empty": "''ХӀара категори хӀинца йаьсса ю.''",
+ "category-empty": "''ХӀара категори хӀинца яьсса ю.''",
"hidden-categories": "{{PLURAL:$1|1=Къайлаха категори|Къайлаха йолу категореш}}",
"hidden-category-category": "Къайлаха йолу категореш",
"category-subcat-count": "{{PLURAL:$2|ХӀокху категори чохь ю хӀокхуьнан бухара категори.|ХӀокху категори чохь ю $1 {{PLURAL:$1|бухара категори|бухара категореш}} $2 массо нах.}}",
"databaseerror-query": "Дехар: $1",
"databaseerror-function": "Функци: $1",
"databaseerror-error": "ГӀалат: $1",
- "laggedslavemode": "Тергам бе: агӀона чохь керла йаьхинарш ца хила мега.",
+ "laggedslavemode": "Тергам бе: агӀон чохь керла яьхнарш ца хила мега.",
"readonly": "Блоктоьхна дӀайаздар хаамийн бухе",
"enterlockreason": "Билгалде блоктохаран бахьана а, и чекх йолу хан а.",
"readonlytext": "АгӀонаш тӀетохар а, кхин хийцамаш барна а блоктоьхна:\nБлокоьхначо биттина хаам: $1.",
"translateinterface": "ХӀокху хааман гоч тӀетоха я хийца дехар до лелае локализацин сайт MediaWiki [//translatewiki.net/ translatewiki.net].",
"cascadeprotected": "АгӀо хийцам ца байта ларйина ю {{PLURAL:$1|хӀокху агӀона|хӀокху агӀонийн}} юкъа йогӀуш хилар бахьнехь:\n$2",
"namespaceprotected": "ХӀан бакъо яц анна цӀерш чохь тадарш да «$1».",
- "customcssprotected": "Хьан бакъо яц хӀара CSS-агӀо тая, иза кхечу декъашхочун гӀерс болу дера.",
- "customjsprotected": "Хьан бакъо яц хӀара JavaScript-агӀо тая, иза кхечу декъашхочун гӀерс болу дера.",
- "mycustomcssprotected": "Хьан бакъо яц хӀара CSS агӀо тая.",
+ "customcssprotected": "Хьан бакъо яц хӀара CSS-агӀо таян, иза кхечу декъашхочун гӀирс болу дера.",
+ "customjsprotected": "Хьан бакъо яц хӀара JavaScript-агӀо таян, иза кхечу декъашхочун гӀирс болу дера.",
+ "mycustomcssprotected": "Хьан бакъо яц хӀара CSS агӀо таян.",
"mycustomjsprotected": "Хьан бакъо яц JavaScript агӀо тая.",
"myprivateinfoprotected": "Хьайн долара хаамна хийцам ба хьа йиш яц",
"mypreferencesprotected": "Хьай гӀирс нисбан хьа бакъо яц.",
"createaccountreason": "Бахьана:",
"createacct-reason": "Бахьана",
"createacct-reason-ph": "Стен кхуллуш ду ахьа керла декъашхочун дӀаяздар",
- "createacct-captcha": "Кхерамзалла хьажар",
- "createacct-imgcaptcha-ph": "ДӀаязде хьайна лакхахь гуш долу йоза",
"createacct-submit": "Кхолла декъашхочун дӀаяздар",
"createacct-another-submit": "Кхолла декъашхочун кхин дӀаяздар",
"createacct-benefit-heading": "{{SITENAME}} кхолийна хьо санначу наха.",
"explainconflict": "Ахьа хӀара агӀо тоечу хенахь, цхьам хийцамаш бина.\nЛакхарчу таяран корехь хьона гуш ду хӏинца агӏона чохь долу йоза.\nЛахарчу корехь ахь бина хийцам бу.\nХьой бина хийцам лахарчу корера лакхарчу коре баккха.\nКнопкан «{{int:savearticle}}» тӏетаӏича лакхара корера йоза дӏаязлурду.",
"yourtext": "Хьан йоза",
"storedversion": "Ӏалашйина верси",
- "editingold": "'''ДӀахьедар. Ахьа таеш ю хӀокху агӀона шира елла верси.'''\nАгӀо Ӏалаш йинчул тӀехьа хьалхо бина хийцамаш дӀабяра бу.",
+ "editingold": "'''ДӀахьедар. Ахь таеш ю хӀокху агӀонан шира елла верси.'''\nАгӀо Ӏалаш йинчул тӀаьхьа, хьалхо бина хийцамаш дӀабевра бу.",
"yourdiff": "Башхаллаш",
"copyrightwarning": "Тергаме хьажа, массо яззаман чутухуш долу йозан хийцам хьажарехь бу, арахоьцуш санна оцу лицензи хьолехь.\nНагахь хьо лууш вацахь хьайн йозанаш маьрша даржа а кхечаьрга хийцам байта, мадаха уьш кху чу.<br />\nИштта чӀагӀо йой ахьа, айхьа далош долучуьнна хьо куьг да ву аьлла, я хьаэцна цхьан\nхьостера, хийцам ба а дӀаса даржада а чулацам болуш.<br />\n'''МА-КХИССА БАКЪО ЙОЦУ ГӀИРСАШ КХУ ЧУ, КУЬЙГАЛХОЧУЬННА БАКЪО ЛАРЪЕШ ЙОЛУ!'''",
"readonlywarning": "'''ДӀАХЬЕДО. ГӀирса бух блоктоьхна оьшуш долучу хьаштан, цундера хӀинц хьоьга дӀа ца йазло хийцам.\nХила мега, ахьа Ӏалаш дан дезаш хьайн йоза, юха тӀаьхьо леладан иза йоза.'''\n\nКуьйгалхочо блоктоьхна гӀирса бух, цо битина кхетош хӀара хаам: $1",
"protectedpagewarning": "'''ДӀахьедар. ХӀара агӀо ларйина ю хийцам цабайта, иза хийца я нисъян а бакъо йолуш куьйгалла лелош болу декъашхой бе бац.'''\nЛахахьа гойту хаамаш тӀаьххьара бина болу хийцамна тептар чура:",
"semiprotectedpagewarning": "'''ДӀахьедо.''' ХӀара агӀо ларйина ю; дӀабазбиначу декъашхошка бе цӀе хийцалуш яц.\nЛахахьа тептаро балийна тӀаьххьаралера дӀаязбина хаам:",
- "cascadeprotectedwarning": "<strong>ДӀахьедар:</strong> ХӀара агӀо таян бакъо йолуш [[Project:Куьйгалхой|куьйгалхой]] бу, хӀунда аьлча {{PLURAL:$1|1=и агӀо латийна кхечу агӀонашца|и агӀо латийна кхечу агӀонашца}} хӀоттделлачу ларйиначух:",
+ "cascadeprotectedwarning": "<strong>ДӀахьедар:</strong> ХӀара агӀо таян бакъо йолуш беккъа [[Project:Куьйгалхой|куьйгалхой]] бу, хӀунда аьлча {{PLURAL:$1|1=хӀара агӀо кхечу агӀонашца латийна ю|хӀара агӀо кхечу агӀонашца латийна ю}} ларъяш ю:",
"templatesused": "{{PLURAL:$1|1=Кеп, лелош ю|Кепаш, лелош ю}} хӀокху агӀон башхонца:",
"templatesusedpreview": "{{PLURAL:$1|1=Кеп, лелошдолу|Кепаш, лелойлу}} оцу хьалх хьожучу агӀонца:",
"templatesusedsection": "ХӀокху декъан чохь {{PLURAL:$1|1=лелош йолу кеп|лелош йолу кепаш}}:",
"permissionserrors": "ТӀекхачаре бакъона гӀалат",
"permissionserrorstext": "Хьан бакъо яц кхочуш хилийта хийцам оцу {{PLURAL:$1|1=шолгlа бахьанца|шолгlа бахьанашца}}:",
"permissionserrorstext-withaction": "Хьан бакъо яц хlумда «'''$2'''» оцу {{PLURAL:$1|1=шолгlа бахьанца|шолгlа бахьанашца}}:",
+ "contentmodelediterror": "Хьуна хӀара верси таян цало, цуна чохь <code>$1</code> модель хилар бахьнехь, ткъа агӀонан чура карара модель — <code>$2</code> ю.",
"recreate-moveddeleted-warn": "'''Тидам бе. Ахьа кхуллуш ю, хьалхо дӀаяьккхина йолу агӀо.'''\n\nХьажа, билгалла оьши хьуна хӀара агӀо юха кхолла.\nЛахахь далина ду дӀаяхарш тӀяхь долу тептарш а хӀокх агӀона цӀе хийцарш а.",
"moveddeleted-notice": "ХӀара агӀо дӀаяьккхина яра.\nЛахахьа гойту хӀара дӀаккхарш а, цӀе хийцарш а.",
"log-fulllog": "Хьажа деригге тептаре",
"prefs-help-recentchangescount": "Гойту керла нисдарш, агӀонийн истори, тептарш.",
"prefs-help-watchlist-token2": "Иза хьан тергаме могӀан къайла догӀа ду.\nМуьлха и хуучунна йиш ю хьан тергаме могӀам беша, цундела ма хаийта иза кхечаьрга. [[Special:ResetTokens|ТӀетаӀа йе кхуза и хьайга кхосса лууш делахь]].",
"savedprefs": "Хьан гӀирс Ӏалашбина.",
+ "savedrights": "{{GENDER:$1|$1}} декъашхочун бакъонаш Ӏалашйина.",
"timezonelegend": "Сахьтан аса:",
"localtime": "Меттигера хан:",
"timezoneuseserverdefault": "Серверан ($1) гӀирс лелабе",
"double-redirect-fixed-move": "[[$1]] агӀонан цӀе хийцина.\nХӀинца иза авто-карлаяьккхина а [[$2]] агӀона тӀехьажийна.",
"double-redirect-fixed-maintenance": "Шалха дӀасахьажинарг нисъяр [[$1]] → [[$2]].",
"double-redirect-fixer": "ДӀасахьажинарш нисерг",
- "brokenredirects": "ДIадаьхна долу дIасахьажораш",
+ "brokenredirects": "ДӀаяьхна йолу дIасахьажоргаш",
"brokenredirectstext": "Лахара дӀасахьажийнарш ю йоцучу агӀонийн тӀе хьажийна:",
"brokenredirects-edit": "нисъе",
"brokenredirects-delete": "дӀаяккха",
"wantedfiletext-nocat": "Лахара йоцу файлаш лело гӀерта. Оцу могӀам юкъа ца хууш файлаш кхета там бу, кхечу проекташ чохь йолу. Ишта ца хууш юкъа нийса елачарна тӀехула <del>сиз</del> хира ду.",
"wantedtemplates": "Оьшуш йолу кепаш",
"mostlinked": "Дуккха хьажоргаш тӀе тоьхна йолу агӀонаш",
- "mostlinkedcategories": "Дуккха тӀе хьажораш йолу категореш",
+ "mostlinkedcategories": "Ð\94Ñ\83ккÑ\85а Ñ\82Ó\80е Ñ\85Ñ\8cажоÑ\80гаÑ\88 йолÑ\83 каÑ\82егоÑ\80еÑ\88",
"mostlinkedtemplates": "Массарел дуккха а лелайо агӀонаш",
"mostcategories": "Дуккха категореш тӀе тоьхна йолу агӀонаш",
"mostimages": "Массарел дуккха лелайо файлаш",
"noautoblockblock": "ша блоктухарг дӏаяйина",
"createaccountblock": "цамагдо керла дӀаяздарш кхоллар",
"emailblock": "цамаго кехаташ кхехӀита",
- "blocklist-nousertalk": "Ñ\88ин дийÑ\86аÑ\80е агÓ\80о Ñ\82аÑ\8fн лÑ\83Ñ\88 дац",
+ "blocklist-nousertalk": "Ñ\88ен дийÑ\86аÑ\80е агÓ\80о Ñ\82аÑ\8fлÑ\83Ñ\88 Ñ\8fц",
"ipblocklist-empty": "Блоктохаран могӀам баьсса бу.",
"ipblocklist-no-results": "И адрес блоктоьхна дац.",
"blocklink": "блоктоха",
"block-log-flags-nocreate": "цамагдо керла дӏаяздарш кхоллар",
"block-log-flags-noautoblock": "ша блоктухарг дӏаяйина",
"block-log-flags-noemail": "цамаго кехаташ кхехӀита",
- "block-log-flags-nousertalk": "Ñ\88ин дийÑ\86аÑ\80е агÓ\80о Ñ\82аÑ\8fн лÑ\83Ñ\88 дац",
+ "block-log-flags-nousertalk": "Ñ\88ен дийÑ\86аÑ\80е агÓ\80о Ñ\82аÑ\8fлÑ\83Ñ\88 Ñ\8fц",
"block-log-flags-angry-autoblock": "латина шуьйра автоблоктохар",
"block-log-flags-hiddenname": "декъашхочун цӀе къайлаяьккхина",
"range_block_disabled": "Куьйгалхошна диапазонашна блоктоха цамага до.",
"imageinvalidfilename": "Файлан цӀе гӀалате ю",
"fix-double-redirects": "Хьалхара цӀе йолу дӀасахьажорг нисъян",
"move-leave-redirect": "Ӏадйита дӀасахьажораг",
- "protectedpagemovewarning": "'''ДӀахьедар.''' ХӀара агӀо ларйина ю; цӀе хийца я нисъян а бакъо йолуш куьйгалхой бе бац.\nЛахахьа тептаро балийна тӀаьхьаралера дӀаязбина хаам:",
+ "protectedpagemovewarning": "'''ДӀахьедар.''' ХӀара агӀо ларйина ю; цӀе хийца я нисъян а бакъо йолуш куьйгалхой бен бац.\nЛахахь тептаро балийна тӀаьхьаралера дӀаязбина хаам:",
"semiprotectedpagemovewarning": "'''ДӀахьедо.''' ХӀара агӀо ларйина ю; дӀабазбиначу декъашхошка бе цӀе хийцалуш яц.\nЛахахьа тептаро балийна тӀаьххьаралера дӀаязбина хаам:",
"move-over-sharedrepo": "== Файл йолуш ю ==\nВикигулам чохь йолуш ю [[:$1]]. ХӀокху файлан цӀе хийцича Викигулам чуьраниг дӀакъовлу.",
"export": "АгӀонаш араяхар",
"tooltip-ca-nstab-main": "Яззамна чулацам",
"tooltip-ca-nstab-user": "ХӀора декъашхочун долахь йолу агӀо ю",
"tooltip-ca-nstab-media": "Медиа-файл",
- "tooltip-ca-nstab-special": "ХӀара белхан агӀо ю, хӀара тая луш яц",
+ "tooltip-ca-nstab-special": "ХӀара белхан агӀо ю, хӀара таялуш яц",
"tooltip-ca-nstab-project": "Кхолламан дакъа",
"tooltip-ca-nstab-image": "Файлан агӀо",
"tooltip-ca-nstab-mediawiki": "Хааман агlо MediaWiki",
"specialpages": "Леррина агӀонаш",
"specialpages-note-top": "Легенда",
"specialpages-note": "* Гуттарлера белха агlонаш.\n* <strong class=\"mw-specialpagerestricted\">Кlеззиг таронаш йолу леррина агlонаш.</strong>",
- "specialpages-group-maintenance": "Ð\96амlаÑ\88 гlиÑ\80Ñ\81а Ñ\85Ñ\8cаÑ\88Ñ\82аÑ\88 кÑ\85оÑ\87Ñ\83Ñ\88даÑ\80",
+ "specialpages-group-maintenance": "ТеÑ\85никийн Ñ\85Ñ\8cаÑ\88Ñ\82аÑ\88 кÑ\85оÑ\87Ñ\83Ñ\88даÑ\80ан Ñ\85аамаÑ\88",
"specialpages-group-other": "Кхин белхан агӀонаш",
"specialpages-group-login": "Системин чугӀо / дӀаяздар кхолла",
- "specialpages-group-changes": "Керла нисдарш а тéптарш",
- "specialpages-group-media": "Ð\96амlаÑ\88 оÑ\86Ñ\83 медиа-гlиÑ\80Ñ\81аÑ\88ан а Ñ\87Ñ\83Ñ\8fÑ\85аÑ\80ш",
- "specialpages-group-users": "Декъашхой а бакъонаш",
+ "specialpages-group-changes": "Керла нисдарш а, тéптарш а",
+ "specialpages-group-media": "Ð\9cедиа-гÓ\80иÑ\80Ñ\81ийн а, Ñ\87Ñ\83Ñ\8fÑ\85аÑ\80ийн а Ñ\85аамаш",
+ "specialpages-group-users": "Декъашхой а, бакъонаш а",
"specialpages-group-highuse": "Уггаре дукха лелайо агӀонаш",
"specialpages-group-pages": "АгӀонийн могӀанаш",
"specialpages-group-pagetools": "ГӀирсаш агӀонашна",
"logentry-delete-delete": "$1 {{GENDER:$2|поничьжилъ|поничьжила}} страницѫ ⁖ $3 ⁖",
"logentry-move-move": "$1 {{GENDER:$2|нарєчє}} страницѫ ⁖ $3 ⁖ имєньмь ⁖ $4 ⁖",
"logentry-move-move-noredirect": "$1 {{GENDER:$2|нарєчє}} страницѫ ⁖ $3 ⁖ имєньмь ⁖ $4 ⁖ бєꙁ прѣнаправлєниꙗ сътворѥниꙗ",
+ "logentry-move-move_redir": "$1 {{GENDER:$2|нарєчє}} страницѧ ⁖ $3 ⁖ имєньмь ⁖ $4 ⁖ врьхоу прѣнаправлѥниꙗ",
"logentry-newusers-create": "польꙃєватєльско мѣсто ⁖ $1 ⁖ {{GENDER:$2|сътворѥно}} ѥстъ",
"logentry-upload-upload": "$1 {{GENDER:$2|положишє}} $3",
"revdelete-summary": "мѣнꙑ опьсаниѥ",
"Macofe",
"Jyllanj",
"Matma Rex",
- "Poullindholm"
+ "Poullindholm",
+ "Mads Haupt"
]
},
"tog-underline": "Understreg henvisninger:",
"tog-uselivepreview": "Benyt løbende forhåndsvisning",
"tog-forceeditsummary": "Advar mig hvis jeg ikke udfylder beskrivelsesfeltet",
"tog-watchlisthideown": "Skjul egne ændringer i overvågningslisten",
- "tog-watchlisthidebots": "Skjul ændringer fra bots i overvågningslisten",
+ "tog-watchlisthidebots": "Skjul ændringer fra botter i overvågningslisten",
"tog-watchlisthideminor": "Skjul mindre ændringer i overvågningslisten",
"tog-watchlisthideliu": "Skjul indloggede brugeres redigeringer i overvågningslisten",
"tog-watchlisthideanons": "Skjul anonyme brugeres redigeringer i overvågningslisten",
"prefs-watchlist-token": "Overvågningslistenøgle:",
"prefs-misc": "Forskelligt",
"prefs-resetpass": "Skift adgangskode",
- "prefs-changeemail": "Ændre e-mailadresse",
+ "prefs-changeemail": "Skift eller fjern e-mailadresse",
"prefs-setemail": "Angiv en e-mailadresse",
"prefs-email": "Indstillinger for e-mail",
"prefs-rendering": "Udseende",
"rcshowhidemine": "$1 egne bidrag",
"rcshowhidemine-show": "Vis",
"rcshowhidemine-hide": "Skjul",
+ "rcshowhidecategorization-show": "Vis",
+ "rcshowhidecategorization-hide": "Skjul",
"rclinks": "Vis seneste $1 ændringer i de sidste $2 dage<br />$3",
"diff": "forskel",
"hist": "historik",
"upload-too-many-redirects": "URL'en indeholdt for mange omdirigeringer",
"upload-http-error": "Der opstod en HTTP-fejl: $1",
"upload-copy-upload-invalid-domain": "Uploads af kopier er ikke tilgængelig fra dette domæne.",
+ "upload-dialog-title": "Læg en fil op",
+ "upload-dialog-button-cancel": "Annuller",
+ "upload-dialog-button-done": "Færdig",
+ "upload-dialog-button-save": "Gem",
+ "upload-dialog-button-upload": "Læg op",
+ "upload-form-label-select-file": "Vælg filer",
+ "upload-form-label-infoform-name": "Navn",
+ "upload-form-label-infoform-description": "Beskrivelse",
+ "upload-form-label-usage-filename": "Filnavn",
+ "foreign-structured-upload-form-label-infoform-categories": "Kategorier",
+ "foreign-structured-upload-form-label-infoform-date": "Dato",
+ "foreign-structured-upload-form-label-own-work-message-local": "Jeg bekræfter at jeg uploader filen i overenstemmelse med betingelser for brug og licenseringspoltikken på {{SITENAME}}.",
+ "foreign-structured-upload-form-label-not-own-work-message-local": "Hvis du ikke kan uploade filen under politikerne på {{SITENAME}}, skal du lukke dialogboksen og prøve en anden metode.",
+ "foreign-structured-upload-form-label-not-own-work-local-local": "Du kan også vælge at prøve [[Special:Upload|den almindelige uploadside]].",
"backend-fail-stream": "Kunne ikke streame filen $1.",
"backend-fail-backup": "Kunne ikke lave sikkerhedskopi af filen $1.",
"backend-fail-notexists": "Filen $1 findes ikke.",
"nstab-help": "Σελίδα βοήθειας",
"nstab-category": "Κατηγορία",
"mainpage-nstab": "Αρχική σελίδα",
- "nosuchaction": "Δεν υπάρχει τέτοια ενέργεια.",
+ "nosuchaction": "Δεν υπάρχει τέτοια ενέργεια",
"nosuchactiontext": "Η ενέργεια που καθορίστηκε από την διεύθυνση URL δεν είναι έγκυρη.\nΕνδέχεται να πληκτρολογήσατε λανθασμένα την διεύθυνση URL ή να ακολουθήσατε έναν μη έγκυρο σύνδεσμο.\nΜπορεί επίσης να είναι σημάδι κάποιου σφάλματος του λογισμικού που χρησιμοποιεί ο ιστότοπος {{SITENAME}}.",
"nosuchspecialpage": "Δεν υπάρχει τέτοια ειδική σελίδα",
"nospecialpagetext": "<strong>Ζητήσατε μια μη έγκυρη ειδική σελίδα.</strong>\n\nΈνας κατάλογος έγκυρων ειδικών σελίδων μπορεί να βρεθεί στη σελίδα [[Special:SpecialPages|{{int:specialpages}}]].",
"mycustomjsprotected": "Δεν έχετε άδεια για να επεξεργαστείτε αυτήν τη σελίδα JavaScript.",
"myprivateinfoprotected": "Δεν έχετε άδεια για να επεξεργαστείτε τα προσωπικά σας στοιχεία.",
"mypreferencesprotected": "Δεν έχετε άδεια για να επεξεργαστείτε τις προτιμήσεις σας.",
- "ns-specialprotected": "ΣελίδεÏ\82 Ï\83Ï\84ον Ï\84ομÎα {{ns:special}} δεν γίνεÏ\84αι να εÏ\80εξεÏ\81γαÏ\83Ï\84οÏ\8dν.",
+ "ns-specialprotected": "Î\97 εÏ\80εξεÏ\81γαÏ\83ία Ï\83ελίδÏ\89ν Ï\83Ï\84ον Ï\84ομÎα {{ns:special}} δεν είναι δÏ\85ναÏ\84ή.",
"titleprotected": "Αυτός ο τίτλος έχει προστατευθεί από την δημιουργία από τον [[User:$1|$1]].\nΟ λόγος που δίνεται είναι «$2».",
"filereadonlyerror": "Δεν είναι δυνατή η τροποποίηση του αρχείου «$1» επειδή το αποθετήριο αρχείων «$2» είναι σε κατάσταση λειτουργίας μόνο για ανάγνωση.\n\nΟ διαχειριστής που το κλείδωσε προσφέρει αυτή την αιτιολόγηση: «$3».",
"invalidtitle-knownnamespace": "Μη έγκυρος τίτλος με χώρο ονομάτων «$2» και κείμενο «$3»",
"invalidtitle-unknownnamespace": "Μη έγκυρος τίτλος με άγνωστο αριθμό χώρου ονομάτων $1 και κείμενο «$2»",
- "exception-nologin": "Δεν έχετε συνδεθεί.",
+ "exception-nologin": "Δεν έχετε συνδεθεί",
"exception-nologin-text": "Παρακαλούμε να συνδεθείτε για να μπορείτε να αποκτήσετε πρόσβαση σε αυτήν τη σελίδα ή την ενέργεια.",
"exception-nologin-text-manual": "Παρακαλούμε $1 για να μπορείτε να έχετε πρόσβαση σε αυτή τη σελίδα ή ενέργεια.",
"virus-badscanner": "Λάθος ρύθμιση: άγνωστος ανιχνευτής ιών: ''$1''",
"userloginnocreate": "Είσοδος",
"logout": "Έξοδος",
"userlogout": "Έξοδος",
- "notloggedin": "Δεν έχετε συνδεθεί.",
+ "notloggedin": "Δεν έχετε συνδεθεί",
"userlogin-noaccount": "Δεν έχετε λογαριασμό;",
"userlogin-joinproject": "Συνδεθείτε σε {{SITENAME}}",
"nologin": "Δεν έχετε λογαριασμό; $1.",
"userlogin-resetpassword-link": "Ξεχάσατε τον κωδικό πρόσβασης;",
"userlogin-helplink2": "Βοήθεια για τη σύνδεση",
"userlogin-loggedin": "Είστε ήδη {{GENDER:$1|συνδεδεμένος|συνδεδεμένη}} ως $1.\nΧρησιμοποιήστε την παρακάτω φόρμα για να συνδεθείτε ως άλλος χρήστης.",
- "userlogin-createanother": "Δημιουργήσετε έναν άλλο λογαριασμό",
+ "userlogin-createanother": "Δημιουργήστε άλλο λογαριασμό",
"createacct-emailrequired": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
"createacct-emailoptional": "Διεύθυνση ηλεκτρονικού ταχυδρομείου (προαιρετικό)",
"createacct-email-ph": "Εισάγετε το email σας",
"throttled-mailpassword": "Ένα email επαναφοράς κωδικού έχει ήδη αποσταλεί, μέσα {{PLURAL:$1|στην τελευταία ώρα|στις τελευταίες $1 ώρες}}.\nΓια την αποφυγή κατάχρησης, μόνο ένα email επαναφοράς κωδικού θα στέλνεται ανά {{PLURAL:$1|ώρα|$1 ώρες}}.",
"mailerror": "Σφάλμα στην αποστολή του μηνύματος: $1",
"acct_creation_throttle_hit": "Επισκέπτες αυτού του wiki με την διεύθυνση IP σας έχουν ήδη δημιουργήσει {{PLURAL:$1|ένα λογαριασμό|$1 λογαριασμούς}}, κατά την τελευταία μία ημέρα, που είναι και ο μέγιστος επιτρεπόμενος αριθμός.\nΩς αποτέλεσμα, επισκέπτες αυτού του wiki με αυτήν την διεύθυνση IP δεν μπορούν αυτή την στιγμή να δημιουργήσουν περισσότερους λογαριασμούς.",
- "emailauthenticated": "Î\97 ηλεκÏ\84Ï\81ονική Ï\83αÏ\82 διεÏ\8dθÏ\85νÏ\83η εÏ\80ιβεβαιÏ\8eθηκε Ï\83Ï\84ιÏ\82 $2, Ï\83Ï\84ιÏ\82 $3.",
+ "emailauthenticated": "Î\97 διεÏ\8dθÏ\85νÏ\83ή Ï\83αÏ\82 ηλεκÏ\84Ï\81ονικοÏ\8d Ï\84αÏ\87Ï\85δÏ\81ομείοÏ\85 εÏ\80ιβεβαιÏ\8eθηκε Ï\83Ï\84ιÏ\82 $2 και Ï\8eÏ\81α $3.",
"emailnotauthenticated": "Η ηλεκτρονική σας διεύθυνση δεν έχει επαληθευτεί ακόμα.\nΚανένα μήνυμα ηλεκτρονικού ταχυδρομείου δεν θα σταλεί για τις ακόλουθες λειτουργίες.",
"noemailprefs": "Δεν έχει ορισθεί ηλεκτρονική διεύθυνση, οι λειτουργίες που ακολουθούν δεν θα είναι δυνατόν να ολοκληρωθούν.",
"emailconfirmlink": "Επαληθεύστε την ηλεκτρονική σας διεύθυνση",
"pt-login": "Σύνδεση",
"pt-login-button": "Σύνδεση",
"pt-createaccount": "Δημιουργία λογαριασμού",
- "pt-userlogout": "Αποσύνδεση;",
+ "pt-userlogout": "Αποσύνδεση",
"php-mail-error-unknown": "Άγνωστο σφάλμα στη συνάρτηση mail() της PHP.",
"user-mail-no-addy": "Προσπαθήσατε να στείλετε e-mail χωρίς μια διεύθυνση e-mail.",
"user-mail-no-body": "Προσπάθησε να στείλει e-mail με ένα κενό ή αδικαιολόγητα σύντομο σώμα.",
"resetpass-submit-cancel": "Ακύρωση",
"resetpass-wrong-oldpass": "Λάθος προσωρινός ή κανονικός κωδικός.\nΜπορεί να έχετε ήδη αλλάξει επιτυχώς τον κωδικό σας ή να έχετε ζητήσει έναν νέο προσωρινό κωδικό.",
"resetpass-recycled": "Παρακαλούμε επαναφέρετε τον κωδικό πρόσβασής σας σε κάτι διαφορετικό από τον τρέχοντα κωδικό πρόσβασης.",
- "resetpass-temp-emailed": "Έχετε συνδεθεί με ένα προσωρινό κωδικό μέσω ηλεκτρονικού ταχυδρομείου.\nΓια να ολοκληρώσετε τη σύνδεση, πρέπει να ορίσετε ένα νέο κωδικό εδώ:",
+ "resetpass-temp-emailed": "Έχετε συνδεθεί με έναν προσωρινό κωδικό μέσω ηλεκτρονικού ταχυδρομείου.\nΓια να ολοκληρώσετε τη σύνδεση, πρέπει να ορίσετε έναν νέο κωδικό εδώ:",
"resetpass-temp-password": "Προσωρινός κωδικός:",
"resetpass-abort-generic": "Η αλλαγή του κωδικού έχει απορριφθεί από μια προέκταση.",
- "resetpass-expired": "Τον κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ήÏ\82 Ï\83αÏ\82 ÎÏ\87ει λήξει. Î\9fÏ\81ίÏ\83Ï\84ε Îνα νέο κωδικό πρόσβασης για να συνδεθείτε.",
- "resetpass-expired-soft": "Î\9f κÏ\89δικÏ\8cÏ\82 Ï\80Ï\81Ï\8cÏ\83βαÏ\83ήÏ\82 Ï\83αÏ\82 ÎÏ\87ει λήξει και Ï\80Ï\81ÎÏ\80ει να γίνει εÏ\80αναÏ\86οÏ\81ά Ï\84οÏ\85. ΠαÏ\81ακαλοÏ\8dμε γÏ\81άÏ\88Ï\84ε Îνα νÎο κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 ή κάνÏ\84ε κλικ Ï\83Ï\84ο \"{{int:resetpass-submit-cancel}}\" για τον επαναφέρετε αργότερα.",
- "resetpass-validity-soft": "Τον κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ήÏ\82 Ï\83αÏ\82 δεν είναι ÎγκÏ\85Ï\81οÏ\82: $1 \nΠαÏ\81ακαλÏ\8e εÏ\80ιλÎξÏ\84ε Îνα νÎο κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 Ï\84Ï\8eÏ\81α, ή κάνÏ\84ε κλικ Ï\83Ï\84ο κοÏ\85μÏ\80ί \"{{int:resetpass-submit-cancel}}\" για να Ï\84ο επαναφέρετε αργότερα.",
- "passwordreset": "Î\9aÏ\89δικÏ\8cÏ\82 εÏ\80αναÏ\86οÏ\81άÏ\82",
+ "resetpass-expired": "Î\9f κÏ\89δικÏ\8cÏ\82 Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 ÎÏ\87ει λήξει. Î\9fÏ\81ίÏ\83Ï\84ε Îναν νέο κωδικό πρόσβασης για να συνδεθείτε.",
+ "resetpass-expired-soft": "Î\9f κÏ\89δικÏ\8cÏ\82 Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 ÎÏ\87ει λήξει και Ï\80Ï\81ÎÏ\80ει να γίνει εÏ\80αναÏ\86οÏ\81ά Ï\84οÏ\85. Î\95Ï\80ιλÎξÏ\84ε Îναν νÎο κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 Ï\84Ï\8eÏ\81α ή Ï\80αÏ\84ήÏ\83Ï\84ε «{{int:resetpass-submit-cancel}}» για τον επαναφέρετε αργότερα.",
+ "resetpass-validity-soft": "Î\9f κÏ\89δικÏ\8cÏ\82 Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 δεν είναι ÎγκÏ\85Ï\81οÏ\82: $1\n\nÎ\95Ï\80ιλÎξÏ\84ε Îναν νÎο κÏ\89δικÏ\8c Ï\80Ï\81Ï\8cÏ\83βαÏ\83ηÏ\82 Ï\84Ï\8eÏ\81α ή Ï\80αÏ\84ήÏ\83Ï\84ε «{{int:resetpass-submit-cancel}}» για να Ï\84ον επαναφέρετε αργότερα.",
+ "passwordreset": "Î\95Ï\80αναÏ\86οÏ\81ά κÏ\89δικοÏ\8d",
"passwordreset-text-one": "Συμπληρώστε την παρακάτω φόρμα για να επαναφέρετε τον κωδικό πρόσβασής σας.",
"passwordreset-text-many": "{{PLURAL:$1|Συμπληρώστε ένα από τα πεδία για να λάβετε προσωρινό κωδικό πρόσβαση μέσω ηλεκτρονικού ταχυδρομείου.}}",
"passwordreset-disabled": "Η επαναφορά κωδικού πρόσβασης έχει απενεργοποιηθεί σε αυτό το wiki",
"passwordreset-emailsent-capture": "Έχει αποσταλεί email επαναφοράς κωδικού, το οποίο φαίνεται πιο κάτω.",
"passwordreset-emailerror-capture": "Ένα email επαναφοράς κωδικού έχει δημιουργηθεί, το οποίο φαίνεται πιο κάτω, αλλά απέτυχε η αποστολή του στο {{GENDER:$2|χρήστη}}: $1",
"changeemail": "Αλλαγή ή αφαίρεση της διεύθυνσης ηλεκτρονικού ταχυδρομείου",
- "changeemail-header": "Î\91λλαγή λογαÏ\81ιαÏ\83μοÏ\8d ηλεκÏ\84Ï\81ονικοÏ\8d Ï\84αÏ\87Ï\85δÏ\81ομείοÏ\85",
+ "changeemail-header": "ΣÏ\85μÏ\80ληÏ\81Ï\8eÏ\83Ï\84ε αÏ\85Ï\84ήν Ï\84η Ï\86Ï\8cÏ\81μα για να αλλάξεÏ\84ε Ï\84η διεÏ\8dθÏ\85νÏ\83ή Ï\83αÏ\82 ηλεκÏ\84Ï\81ονικοÏ\8d Ï\84αÏ\87Ï\85δÏ\81ομείοÏ\85. Î\91ν θÎλεÏ\84ε να καÏ\84αÏ\81γήÏ\83εÏ\84ε Ï\84η Ï\83Ï\8dνδεÏ\83η οÏ\80οιαÏ\83δήÏ\80οÏ\84ε διεÏ\8dθÏ\85νÏ\83ηÏ\82 ηλεκÏ\84Ï\81ονικοÏ\8d Ï\84αÏ\87Ï\85δÏ\81ομείοÏ\85 με Ï\84ο λογαÏ\81ιαÏ\83μÏ\8c Ï\83αÏ\82, αÏ\86ήÏ\83Ï\84ε Ï\84η νÎα διεÏ\8dθÏ\85νÏ\83η ηλεκÏ\84Ï\81ονικοÏ\8d Ï\84αÏ\87Ï\85δÏ\81ομείοÏ\85 κενή καÏ\84ά Ï\84ην Ï\85Ï\80οβολή Ï\84ηÏ\82 Ï\86Ï\8cÏ\81μαÏ\82.",
"changeemail-passwordrequired": "Θα χρειαστεί να εισάγετε τον κωδικό σας για να επιβεβαιώσετε την αλλαγή αυτή.",
"changeemail-no-info": "Πρέπει να έχετε συνδεθεί για άμεση πρόσβαση σε αυτήν τη σελίδα.",
"changeemail-oldemail": "Τρέχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου:",
"changeemail-newemail": "Νέα διεύθυνση ηλεκτρονικού ταχυδρομείου:",
+ "changeemail-newemail-help": "Αυτό το πεδίο θα πρέπει να μείνει κενό αν θέλετε να καταργήσετε τη διεύθυνσή σας ηλεκτρονικού ταχυδρομείου. Αν η διεύθυνση ηλεκτρονικού ταχυδρομείου καταργηθεί, δεν θα μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σε περίπτωση που τον ξεχάσετε και δεν θα λαμβάνετε μηνύματα ηλεκτρονικού ταχυδρομείου από αυτό το wiki.",
"changeemail-none": "(κανένα)",
"changeemail-password": "Ο κωδικός πρόσβασής σας στο εγχείρημα {{SITENAME}}:",
"changeemail-submit": "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου",
"changecontentmodel-model-label": "Νέο μοντέλο περιεχομένου",
"changecontentmodel-reason-label": "Αιτία:",
"changecontentmodel-success-title": "Το περιεχόμενο πρότυπο άλλαξε",
+ "changecontentmodel-success-text": "Ο τύπος περιεχομένου του [[:$1]] έχει αλλάξει.",
+ "changecontentmodel-nodirectediting": "Το μοντέλο περιεχομένου $1 δεν υποστηρίζει την άμεση επεξεργασία",
+ "log-name-contentmodel": "Αρχείο καταγραφής αλλαγών μοντέλου περιεχομένου",
+ "log-description-contentmodel": "Συμβάντα που σχετίζονται με τα μοντέλα περιεχομένου μιας σελίδας",
"logentry-contentmodel-change": "{{GENDER:$2|Ο|Η}} $1 άλλαξε το πρότυπο περιεχομένου της σελίδας $3 από «$4» σε «$5»",
"logentry-contentmodel-change-revertlink": "αναστροφή",
"logentry-contentmodel-change-revert": "αναστροφή",
"movepagetext-noredirectfixer": "Χρησιμοποιώντας τη φόρμα που ακολουθεί μπορείτε να μετονομάσετε σελίδες και να μεταφέρετε όλο το ιστορικό τους στο νέο όνομα.\nΟ παλιός τίτλος της σελίδας θα γίνει μια σελίδα ανακατεύθυνσης στο νέο τίτλο.\nΜπορείτε να ενημερώσετε τις ανακατευθύνσεις που οδηγούν στον αρχικό τίτλο αυτόματα.\nΑν επιλέξετε να μην γίνει, θα πρέπει να ελέγξετε τις [[Special:DoubleRedirects|διπλές]] και τις [[Special:BrokenRedirects|κατεστραμμένες ανακατευθύνσεις]].\nΕίστε υπεύθυνος να επιβεβαιώσετε ότι οι σύνδεσμοι εξακολουθούν να οδηγούν προς τις κατευθύνσεις που πρέπει.\n\nΛάβετε υπόψη σας ότι η σελίδα '''δεν''' θα μετακινηθεί αν υπάρχει ήδη μια άλλη σελίδα κάτω από το νέο τίτλο, εκτός αν η σελίδα αυτή είναι κενή ή είναι ανακατεύθυνση χωρίς ιστορικό επεξεργασίας.\nΑυτό σημαίνει ότι, στην περίπτωση που έχετε κάνει λάθος, μπορείτε να μετονομάσετε μια σελίδα ξαναδίνοντας της την αρχική της ονομασία αλλά δεν μπορείτε να αντικαταστήσετε μια υπάρχουσα σελίδα.\n\n'''ΠΡΟΣΟΧΗ!'''\nΗ μετονομασία σελίδας είναι μια αιφνίδια και δραστική αλλαγή όταν πρόκειται για δημοφιλείς σελίδες.\nΠαρακαλούμε, πριν το αποφασίσετε, να εξετάσετε προσεκτικά τις πιθανές επιπτώσεις αυτής της ενέργειας.",
"movepagetalktext": "Αν τσεκάρετε αυτό το κουτί, η σχετιζόμενη σελίδα συζήτησης θα μετακινηθεί αυτόματα στο νέο τίτλο, εκτός αν υπάρχει κάτω από το νέο όνομα μια σελίδα συζήτησης που δεν είναι κενή.\n\nΣε αυτή την περίπτωση, θα πρέπει να μετακινήσετε ή να συγχωνεύσετε τη σελίδα με το χέρι αν είναι επιθυμητό.",
"moveuserpage-warning": "'''Προσοχή:''' Ετοιμάζεστε να μετακινήσετε μια σελίδα χρήστη. Σημειώστε παρακαλώ ότι θα μετακινηθεί μόνο η σελίδα και ο χρήστης '''δεν''' θα μετονομαστεί.",
- "movecategorypage-warning": "<strong>Προειδοποίηση:</strong>Πάτε να μετακινήσετε μια σελίδα κατηγορίας. Παρακαλούμε να σημειωθεί ότι μόνο η σελίδα θα μετακινηθεί και τυχόν σελίδες στην παλιά κατηγορία <em>δεν</em> θα επανακατηγοριοποιηθούν στη νέα κατηγορία.",
+ "movecategorypage-warning": "<strong>Προειδοποίηση:</strong>Πρόκειται να μετακινήσετε μια σελίδα κατηγορίας. Έχετε υπόψη ότι θα μετακινηθεί μόνο η σελίδα και τυχόν σελίδες στην παλιά κατηγορία <em>δεν</em> θα μεταφερθούν στη νέα κατηγορία.",
"movenologintext": "Για να μετακινήσετε μια σελίδα πρέπει να είστε εγγεγραμένος χρήστης και [[Special:UserLogin|να έχετε συνδεθεί]] στο Wiκi.",
"movenotallowed": "Δεν έχετε άδεια να μετακινείτε σελίδες.",
"movenotallowedfile": "Δεν έχετε άδεια να μετακινείτε αρχεία.",
"showingresultsinrange": "Showing below up to {{PLURAL:$1|<strong>1</strong> result|<strong>$1</strong> results}} in range #<strong>$2</strong> to #<strong>$3</strong>.",
"search-showingresults": "{{PLURAL:$4|Result <strong>$1</strong> of <strong>$3</strong>|Results <strong>$1 - $2</strong> of <strong>$3</strong>}}",
"search-nonefound": "There were no results matching the query.",
+ "search-nonefound-thiswiki": "There were no results matching the query in this site.",
"powersearch-legend": "Advanced search",
"powersearch-ns": "Search in namespaces:",
"powersearch-togglelabel": "Check:",
"tog-hideminor": "Piilota pienet muutokset tuoreet muutokset -listasta",
"tog-hidepatrolled": "Piilota tarkastetut muutokset tuoreet muutokset -listasta",
"tog-newpageshidepatrolled": "Piilota tarkastetut sivut uusien sivujen listalta",
+ "tog-hidecategorization": "Piilota sivujen luokittelu",
"tog-extendwatchlist": "Laajenna tarkkailulista näyttämään kaikki tehdyt muutokset eikä vain viimeisimmät",
"tog-usenewrc": "Ryhmittele muutokset sivun mukaan tuoreiden muutosten listalla ja tarkkailulistalla",
"tog-numberheadings": "Numeroi otsikot automaattisesti",
"tog-watchlisthideliu": "Piilota kirjautuneiden käyttäjien muokkaukset tarkkailulistalta",
"tog-watchlisthideanons": "Piilota rekisteröitymättömien käyttäjien muokkaukset tarkkailulistalta",
"tog-watchlisthidepatrolled": "Piilota muutostentarkastajien hyväksymät muokkaukset tarkkailulistalta",
+ "tog-watchlisthidecategorization": "Piilota muutokset, jotka koskevat sivujeen lisäämistä tai poistamista luokkiin",
"tog-ccmeonemails": "Lähetä minulle kopio MediaWikin kautta lähetetyistä sähköposteista",
"tog-diffonly": "Älä näytä sivun sisältöä eroavaisuusvertailun alapuolella",
"tog-showhiddencats": "Näytä piilotetut luokat",
"listingcontinuesabbrev": "jatkuu",
"index-category": "Indeksoidut sivut",
"noindex-category": "Indeksointikiellolliset sivut",
- "broken-file-category": "Sivut, joilla toimimattomia tiedostolinkkejä",
+ "broken-file-category": "Sivut, joissa on toimimattomia tiedostolinkkejä",
"about": "Tietoja",
"article": "Sivu",
"newwindow": "(avautuu uuteen ikkunaan)",
"createaccountreason": "Syy:",
"createacct-reason": "Syy",
"createacct-reason-ph": "Miksi olet luomassa toista käyttäjätunnusta",
- "createacct-captcha": "Turvatarkastus",
- "createacct-imgcaptcha-ph": "Kirjoita teksti, jonka näet edellä",
"createacct-submit": "Luo tunnus",
"createacct-another-submit": "Luo käyttäjätunnus",
"createacct-benefit-heading": "{{SITENAME}} on sinun kaltaistesi ihmisten tekemä.",
"permissionserrors": "Puutteelliset oikeudet",
"permissionserrorstext": "Sinulla ei ole oikeutta suorittaa toimintoa {{PLURAL:$1|seuraavasta syystä|seuraavista syistä}}:",
"permissionserrorstext-withaction": "Sinulla ei ole oikeutta {{lcfirst:$2}} {{PLURAL:$1|seuraavasta syystä|seuraavista syistä}}:",
+ "contentmodelediterror": "Et voi muokata tätä versiota, koska sen sisältömalli on <code>$1</code>, ja sivun nykyinen sisältömalli on <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Varoitus: Olet luomassa sellaista sivua, joka on aikaisemmin poistettu.'''\n\nHarkitse, kannattaako tätä sivua luoda uudelleen. \nAlla on tämän sivun poisto- ja siirtohistoria:",
"moveddeleted-notice": "Tämä sivu on poistettu. Alla on tämän sivun poisto- ja siirtohistoria.",
"moveddeleted-notice-recent": "Valitettavasti tämä sivu on poistettu aivan äskettäin (viimeisen 24 tunnin aikana).\nAlla näkyy sivun poisto- ja siirtolokin tietoja.",
"prefs-help-recentchangescount": "Tämä sisältää tuoreet muutokset, muutoshistoriat ja lokit.",
"prefs-help-watchlist-token2": "Tämä on salainen avain tarkkailulistasi verkkosyötteeseen.\nKuka tahansa, joka tietää sen voi lukea tarkkailulistaasi, joten älä paljasta sitä.\n[[Special:ResetTokens|Napsauta tästä, jos sinun pitää uudistaa se]].",
"savedprefs": "Asetuksesi on tallennettu.",
+ "savedrights": "Käyttäjän {{GENDER:$1|$1}} käyttöoikeudet on tallennettu.",
"timezonelegend": "Aikavyöhyke",
"localtime": "Paikallinen aika",
"timezoneuseserverdefault": "Käytä oletusta ($1)",
"rcshowhidemine": "$1 omat muutokset",
"rcshowhidemine-show": "Näytä",
"rcshowhidemine-hide": "Piilota",
+ "rcshowhidecategorization": "$1 sivujen luokkien muutokset",
+ "rcshowhidecategorization-show": "Näytä",
+ "rcshowhidecategorization-hide": "Piilota",
"rclinks": "Näytä $1 tuoretta muutosta viimeisten $2 päivän ajalta.<br />$3",
"diff": "ero",
"hist": "historia",
"pager-newer-n": "← {{PLURAL:$1|1 uudempi|$1 uudempaa}}",
"pager-older-n": "{{PLURAL:$1|1 vanhempi|$1 vanhempaa}} →",
"suppress": "Häivytys",
- "querypage-disabled": "Tämä toimintosivu on poistettu käytöstä suorituskykysyistä.",
+ "querypage-disabled": "Tämä toimintosivu on poistettu käytöstä suorituskykyyn liittyvien syiden vuoksi.",
"apihelp": "API-apu",
"apihelp-no-such-module": "Moduulia ”$1” ei löydy.",
"booksources": "Kirjalähteet",
"post-expand-template-inclusion-category-desc": "Sivun koko on suurempi kuin <code>$wgMaxArticleSize</code>, kun kaikki mallineet on laajennettu. Tämän vuoksi joitakin mallineita ei laajennettu.",
"post-expand-template-argument-category-desc": "Sivu on suurempi kuin <code>$wgMaxArticleSize</code>, kun mallineen argumentti on laajennettu (argumentti on merkkijono kolmen aaltosulun sisällä kuten <code>{{{Foo}}}</code>).",
"expensive-parserfunction-category-desc": "Tämä sivu käyttää liian monta resursseja vaativaa jäsenninfunktiota (kuten <code>#ifexist</code>). Katso [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
- "broken-file-category-desc": "Tämä sivu sisältää rikkinäisen tiedostolinkin. Tällä tarkoitetaan linkkiä sellaiseen tiedostoon, jota ei olemassa.",
+ "broken-file-category-desc": "Tämä sivu sisältää toimimattoman tiedostolinkin (eli linkin sellaiseen tiedoston upottamiseksi, jota ei olemassa).",
"hidden-category-category-desc": "Tämä luokka sisältää koodin <code><nowiki>__HIDDENCAT__</nowiki></code> sen tekstisisällössä. Koodi estää luokan näkymisen sivujen alareunassa olevassa luokkien laatikossa kuten yleensä.",
"trackingcategories-nodesc": "Ei kuvausta olemassa.",
"trackingcategories-disabled": "Luokka on poistettu käytöstä",
"email-legend": "Sähköpostin lähetys {{GRAMMAR:genitive|{{SITENAME}}}} käyttäjälle",
"emailfrom": "Lähettäjä",
"emailto": "Vastaanottaja",
- "emailsubject": "Aihe",
+ "emailsubject": "Aihe:",
"emailmessage": "Viesti",
"emailsend": "Lähetä",
"emailccme": "Lähetä kopio viestistä minulle.",
"feedback-error3": "Virhe: Ohjelmointirajapinta ei vastaa",
"feedback-error4": "Virhe: Annetun palautteen otsikkoa ei voida lähettää",
"feedback-message": "Viesti",
- "feedback-subject": "Otsikko",
+ "feedback-subject": "Aihe:",
"feedback-submit": "Lähetä",
"feedback-terms": "Ymmärrän, että minua koskeva \"user agent\" -tieto sisältää tiedon siitä, mitä yksittäistä selainta ja käyttöjärjestelmää minä käytän ja että nämä tiedot tulevat näkymään julkisesti kaikille palautteeni yhteydessä.",
"feedback-termsofuse": "Sitoudun lähettämään palautteen käyttöehtojen määräysten mukaisesti.",
"hebrew-calendar-m2": "hechvan",
"hebrew-calendar-m3": "kislev",
"hebrew-calendar-m4": "tévet",
- "hebrew-calendar-m5": "Schébat",
- "hebrew-calendar-m6": "Adar",
+ "hebrew-calendar-m5": "chevat",
+ "hebrew-calendar-m6": "adar",
"hebrew-calendar-m7": "Nissane",
"hebrew-calendar-m8": "Iyar",
"hebrew-calendar-m9": "Sivane",
"hebrew-calendar-m2-gen": "hechvan",
"hebrew-calendar-m3-gen": "kislev",
"hebrew-calendar-m4-gen": "tévet",
- "hebrew-calendar-m5-gen": "Schébat",
- "hebrew-calendar-m6-gen": "Adar",
+ "hebrew-calendar-m5-gen": "chevat",
+ "hebrew-calendar-m6-gen": "adar",
"hebrew-calendar-m7-gen": "Nissane",
"hebrew-calendar-m8-gen": "Iyar",
"hebrew-calendar-m9-gen": "Sivane",
"nstab-template": "Předłoha",
"nstab-help": "Pomoc",
"nstab-category": "Kategorija",
+ "mainpage-nstab": "Hłowna strona",
"nosuchaction": "Žana tajka akcija",
"nosuchactiontext": "Akcija, kotruž URL podawa, je njepłaćiwa.\nSy so snano při zapodaću URL zapisał abo sy wopačnemu wotkazej slědował.\nTo móhło tež programowanski zmylk w {{GRAMMAR:lokatiw|{{SITENAME}}}} być.",
"nosuchspecialpage": "Tuta specialna strona njeeksistuje.",
"createaccountreason": "Přičina:",
"createacct-reason": "Přičina",
"createacct-reason-ph": "Čehodla załožuješ druhe konto?",
- "createacct-captcha": "Wěstotna kontrola",
- "createacct-imgcaptcha-ph": "Zapodaj tekst, kotryž deleka widźiš",
"createacct-submit": "Twoje konto załožić",
"createacct-another-submit": "Dalše konto załožić",
"createacct-benefit-heading": "{{SITENAME}} je so wot ludźi kaž ty wutworił.",
"protect-locked-dblock": "Datowa banka je zawrjena, tohodla njemóžeš škit strony změnić. Tu widźiš aktualne škitne nastajenja za stronu'''„$1“:'''",
"protect-locked-access": "Nimaš trěbne prawa, zo by škit strony změnił. Tu widźiš aktualne škitne nastajenja za stronu'''„$1“:'''",
"protect-cascadeon": "Tuta strona je tuchwilu škitana, dokelž je w {{PLURAL:$1|slědowacej stronje|slědowacych stronach}} zapřijata, {{PLURAL:$1|kotraž je|kotrež su}} přez kaskadowu opciju {{PLURAL:$1|škitana|škitane}}. Změny na škitnym schodźenku tuteje strony njebudu kaskadowy škit wobwliwować.",
- "protect-default": "Wšěch wužiwarjow dowolić",
+ "protect-default": "Wšěm wužiwarjam dowolić",
"protect-fallback": "Jenož wužiwarjow z prawom \"$1\" dowolić",
- "protect-level-autoconfirmed": "Jenož awtomatisce wobkrućenych wužiwarjow dowolić",
- "protect-level-sysop": "Jenož administratorow dowolić",
+ "protect-level-autoconfirmed": "Jenož awtomatisce wobkrućenym wužiwarjam dowolić",
+ "protect-level-sysop": "Jenož administratoram dowolić",
"protect-summary-cascade": "kaskadowacy",
"protect-expiring": "spadnje $1 (UTC)",
"protect-expiring-local": "płaćiwy hač do $1",
"tooltip-ca-nstab-main": "stronu wobhladać",
"tooltip-ca-nstab-user": "wužiwarsku stronu wobhladać",
"tooltip-ca-nstab-media": "datajowu stronu wobhladać",
- "tooltip-ca-nstab-special": "To je specialna strona. Njemóžeš ju wobdźěłać.",
+ "tooltip-ca-nstab-special": "To je specialna strona, kotruž wobdźěłać njemóžeš.",
"tooltip-ca-nstab-project": "projektowu stronu wobhladać",
"tooltip-ca-nstab-image": "Datajowu stronu pokazać",
"tooltip-ca-nstab-mediawiki": "systemowu zdźělenku wobhladać",
"Totosunarto",
"Mirws",
"Ilham",
- "Matma Rex"
+ "Matma Rex",
+ "WongKentir"
]
},
"tog-underline": "Garis bawahi pranala:",
"rcshowhidemine": "$1 suntingan saya",
"rcshowhidemine-show": "Tampilkan",
"rcshowhidemine-hide": "Sembunyikan",
+ "rcshowhidecategorization-show": "Tampilkan",
+ "rcshowhidecategorization-hide": "Sembunyikan",
"rclinks": "Perlihatkan $1 perubahan terbaru dalam $2 hari terakhir<br />$3",
"diff": "beda",
"hist": "versi",
"upload-form-label-infoform-description": "Deskripsi",
"upload-form-label-usage-title": "Penggunaan",
"upload-form-label-usage-filename": "Nama berkas",
- "foreign-structured-upload-form-label-own-work": "Ini karya saya sendiri",
+ "foreign-structured-upload-form-label-own-work": "Ini adalah karya saya sendiri",
"foreign-structured-upload-form-label-infoform-categories": "Kategori",
"foreign-structured-upload-form-label-infoform-date": "Tanggal",
"backend-fail-stream": "Tidak bisa mengalikan berkas $1.",
"changecontentmodel-reason-label": "Alasan:",
"changecontentmodel-success-title": "Model konten ini telah diubah",
"changecontentmodel-success-text": "Jenis konten [[:$1]] telah diubah",
+ "logentry-contentmodel-change-revertlink": "batalkan",
+ "logentry-contentmodel-change-revert": "batalkan",
"protectlogpage": "Log pelindungan",
"protectlogtext": "Di bawah ini adalah daftar perubahan terhadap perlindungan halaman.\nLihat [[Special:ProtectedPages|daftar halaman terlindungi]] untuk daftar perlindungan halaman terkini.",
"protectedarticle": "melindungi \"[[$1]]\"",
"cant-move-to-user-page": "Anda tidak memiliki hak akses untuk memindahkan halaman ke suatu halaman pengguna (kecuali ke subhalaman pengguna).",
"cant-move-category-page": "Anda tidak memiliki izin untuk memindahkan halaman kategori.",
"cant-move-to-category-page": "Anda tidak memiliki izin untuk memindahkan halaman ke halaman kategori.",
- "newtitle": "Ke judul baru:",
+ "newtitle": "Judul baru:",
"move-watch": "Pantau halaman ini",
"movepagebtn": "Pindahkan halaman",
"pagemovedsub": "Pemindahan berhasil",
"spam_reverting": "Membatalkan ke versi terakhir yang tak memiliki pranala ke $1",
"spam_blanking": "Semua revisi yang memiliki pranala ke $1, kosong",
"spam_deleting": "Semua revisi yang memiliki pranala ke $1, penghapusan",
- "simpleantispam-label": "Pemeriksaan anti-spam.\n'''Jangan''' mengisi ini!",
+ "simpleantispam-label": "Pemeriksaan anti-spam.\n<strong>Jangan</strong> diisi!",
"pageinfo-title": "Informasi untuk \"$1\"",
"pageinfo-not-current": "Maaf, tidak mungkin memberikan informasi ini ke revisi lama.",
"pageinfo-header-basic": "Informasi dasar",
"autosumm-replace": "←Mengganti halaman dengan '$1'",
"autoredircomment": "←Mengalihkan ke [[$1]]",
"autosumm-new": "←Membuat halaman berisi '$1'",
+ "autosumm-newblank": "Membuat halaman kosong",
"lag-warn-normal": "Perubahan yang lebih baru dari $1 {{PLURAL:$1|detik|detik}} mungkin tidak muncul di daftar ini.",
"lag-warn-high": "Karenanya besarnya keterlambatan basis data server, perubahan yang lebih baru dari $1 {{PLURAL:$1|detik|detik}} mungkin tidak muncul di daftar ini.",
"watchlistedit-normal-title": "Sunting daftar pantauan",
"version-entrypoints-header-url": "URL",
"version-entrypoints-articlepath": "[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgArticlePath Artikel path]",
"version-entrypoints-scriptpath": "[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgScriptPath Skrip path]",
+ "version-libraries-library": "Perpustakaan",
+ "version-libraries-version": "Versi",
+ "version-libraries-license": "Lisensi",
+ "version-libraries-description": "Deskripsi",
+ "version-libraries-authors": "Pembuat",
"redirect": "Pengalihan berdasarkan ID berkas, pengguna, halaman atau revisi",
"redirect-legend": "Pengalihan ke sebuah berkas atau halaman",
"redirect-summary": "Halaman istimewa ini beralih ke berkas (sesuai nama berkasnya), halaman (sesuai ID revisinya), atau halaman pengguna (sesuai ID numerik penggunanya). Penggunaan: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/revision/328429]], atau [[{{#Special:Redirect}}/user/101]].",
"tags-tag": "Nama tag",
"tags-display-header": "Tampilan di daftar perubahan",
"tags-description-header": "Deskripsi lengkap atau makna",
+ "tags-source-header": "Sumber",
"tags-active-header": "Aktif?",
"tags-hitcount-header": "Perubahan bertag",
+ "tags-actions-header": "Tindakan",
"tags-active-yes": "Ya",
"tags-active-no": "Tidak",
+ "tags-source-none": "Tidak digunakan lagi",
"tags-edit": "sunting",
"tags-delete": "hapus",
"tags-activate": "aktifkan",
"tags-deactivate": "nonaktifkan",
"tags-hitcount": "$1 {{PLURAL:$1|perubahan}}",
+ "tags-create-heading": "Buat sebuah tag baru",
+ "tags-create-reason": "Alasan:",
+ "tags-create-submit": "Buat",
+ "tags-delete-reason": "Alasan:",
+ "tags-activate-reason": "Alasan:",
+ "tags-activate-submit": "Aktifkan",
+ "tags-deactivate-reason": "Alasan:",
+ "tags-deactivate-submit": "Matikan",
+ "tags-edit-reason": "Alasan:",
"comparepages": "Bandingkan halaman",
"compare-page1": "Halaman 1",
"compare-page2": "Halaman 2",
"htmlform-cloner-create": "Tambahkan lebih banyak",
"htmlform-cloner-delete": "Hapus",
"htmlform-cloner-required": "Paling sedikit satu nilai diperlukan.",
+ "htmlform-title-not-exists": "[[:$1]] tidak ada.",
"sqlite-has-fts": "$1 dengan dukungan pencarian teks lengkap",
"sqlite-no-fts": "$1 tanpa dukungan pencarian teks lengkap",
"logentry-delete-delete": "$1 {{GENDER:$2|menghapus}} halaman $3",
"rightsnone": "(tidak ada)",
"revdelete-summary": "ringkasan",
"feedback-adding": "Menambahkan umpan balik ke halaman...",
+ "feedback-back": "Kembali",
"feedback-bugcheck": "Hebat! Hanya periksa bahwa itu bukan satu di antara [$1 bug yang telah dikenal].",
"feedback-bugnew": "Saya telah memeriksa. Laporkan bug baru",
"feedback-bugornote": "Jika Anda sudah siap untuk mendeskripsikan masalah teknis secara rinci silakan [$1 melaporkan bug].\nJika tidak, Anda dapat menggunakan formulir mudah di bawah ini. Komentar Anda akan ditambahkan ke halaman \"[$3 $2]\", bersama dengan nama pengguna Anda dan apa browser yang Anda gunakan.",
"feedback-cancel": "Batal",
"feedback-close": "Selesai",
+ "feedback-error-title": "Kesalahan",
"feedback-error1": "Galat: Hasil tidak dikenal dari API",
"feedback-error2": "Galat: Penyuntingan gagal",
"feedback-error3": "Error: API tidak merespons",
"feedback-subject": "Perihal:",
"feedback-submit": "Kirim",
"feedback-thanks": "Terima kasih! Umpan balik Anda telah dikirimkan ke halaman \"[$2 $1]\".",
+ "feedback-thanks-title": "Terima kasih!",
"searchsuggest-search": "Cari",
"searchsuggest-containing": "berisi...",
"api-error-badaccess-groups": "Anda tidak diizinkan mengunggah berkas ke wiki ini.",
"permissionserrors": "権限エラー",
"permissionserrorstext": "あなたにはこの操作を行う権限はありません。{{PLURAL:$1|理由}}は以下の通りです:",
"permissionserrorstext-withaction": "あなたには「$2」を行う権限はありません。{{PLURAL:$1|理由}}は以下の通りです:",
+ "contentmodelediterror": "コンテンツモデルが <code>$1</code> であるため、この版を編集することができません。ページの現在のコンテンツモデルは <code>$2</code> です。",
"recreate-moveddeleted-warn": "<strong>警告: 以前削除されたページを再作成しようとしています。</strong>\n\nこのページの編集を続行するのが適切かどうかご確認ください。\n参考までに、このページの削除と移動の記録を以下に示します:",
"moveddeleted-notice": "このページは削除されています。\n参考のため、このページの削除と移動の記録を以下に表示します。",
"moveddeleted-notice-recent": "ごめんなさい、このページは最近に削除されました (過去24時間以内)。このページについての削除と移動の記録が、参考のため、以下にて提供されています。",
"recentchangeslinked-page": "ページ名:",
"recentchangeslinked-to": "このページへのリンク元での変更の表示に切り替え",
"recentchanges-page-added-to-category": "[[:$1]] カテゴリに追加",
+ "recentchanges-page-added-to-category-bundled": "[[:$1]]と他{{PLURAL:$2|1ページ|$2ページ}}をカテゴリに追加しました",
"recentchanges-page-removed-from-category": "[[:$1]] カテゴリから削除",
+ "recentchanges-page-removed-from-category-bundled": "[[:$1]]と他{{PLURAL:$2|1ページ|$2ページ}}をカテゴリから削除しました",
"autochange-username": "メディアウィキ自動変更",
"upload": "ファイルをアップロード",
"uploadbtn": "ファイルをアップロード",
"nopagetext": "指定したページは存在しません。",
"pager-newer-n": "{{PLURAL:$1|以後の$1件}}",
"pager-older-n": "{{PLURAL:$1|以前の$1件}}",
- "suppress": "秘匿する",
+ "suppress": "秘匿",
"querypage-disabled": "パフォーマンスに悪影響を与えるおそれがあるため、この特別ページは無効になっています。",
"apihelp": "API のヘルプ",
"apihelp-no-such-module": "モジュール「$1」が見つかりません。",
"templatesused": "ამ გვერდზე გამოყენებული {{PLURAL:$1|თარგი|თარგები}}:",
"templatesusedpreview": "{{PLURAL:$1|თარგი, რომელიც|თარგები, რომლებიც}} წინასწარ გადახედვის გვერდზეა გამოყენებული:",
"templatesusedsection": "ამ სექციაში გამოყენებული {{PLURAL:$1|თარგი|თარგები}}:",
- "template-protected": "(დაცული)",
+ "template-protected": "(დაცულია)",
"template-semiprotected": "(ნახევრად დაცული)",
"hiddencategories": "ეს გვერდი გაერთიანებულია $1 დამალულ კატეგორიაში.",
"edittools": "<!-- აქ განთავსებული ტექსტი ნაჩვენები იქნება რედაქტირებისა და ატვირთვის ფორმების ქვეშ. -->",
"category-file-count-limited": "Ағымдағы санатта келесі $1 файл бар.",
"listingcontinuesabbrev": "(жалғ.)",
"index-category": "Индекстелген беттер",
- "noindex-category": "Ð\98ндекÑ\81Ñ\82елмеген беттер",
+ "noindex-category": "Ð\98ндекÑ\81Ñ\82елмейÑ\82Ñ\96н беттер",
"broken-file-category": "Ақаулы файлдық сілтемелері бар беттер",
"about": "Жоба туралы",
"article": "Мағлұмат беті",
"createaccountreason": "Себебі:",
"createacct-reason": "Себебі:",
"createacct-reason-ph": "Неге басқа тіркегі жасамақшысыз",
- "createacct-captcha": "Құпиялық тексеруі",
- "createacct-imgcaptcha-ph": "Жоғарыдағы мәтінді енгізіңіз",
"createacct-submit": "Тіркелгіңізді жасаңыз",
"createacct-another-submit": "Тіркелгі жасау",
"createacct-benefit-heading": "{{SITENAME}} сіздермен жасалады.",
"mimesearch-summary": "Бұл бетте файлдарды MIME түрімен сүзгілеуі қосылған.\nКірісі: мағлұмат_түрі/түр_тарауы не мағлұмат_түрі/*, мысалы <code>image/jpeg</code>.",
"mimetype": "MIME түрі:",
"download": "Түсіріп алу",
- "unwatchedpages": "Бақыланылмаған беттер",
+ "unwatchedpages": "Бақыланбаған беттер",
"listredirects": "Айдағыш бет тізімі",
"listduplicatedfiles": "Телнұсқалы файлдар тізімі",
"listduplicatedfiles-summary": "Бұл кейбір басқа файлдың ең соңғы нұсқалы файлдың ең соңғы телнұсқасы файлдардың тізімі. Тек жергілікті файлдар есептелінеді.",
"specialpage-empty": "Бұл сұраныс бойынша нәтиже жоқ.",
"lonelypages": "Еш беттен сілтелмеген беттер",
"lonelypagestext": "Келесі беттерге {{SITENAME}} жобасындағы басқа беттерінің ішіндегі кірікбеттер сілтемейді.",
- "uncategorizedpages": "СанаÑ\82Ñ\81Ñ\8bз беттер",
+ "uncategorizedpages": "СанаÑ\82Ñ\82алмаÒ\93ан беттер",
"uncategorizedcategories": "Санатсыз санаттар",
"uncategorizedimages": "Санатсыз файлдар",
"uncategorizedtemplates": "Санатсыз үлгілер",
"permissionserrors": "Dat jeit nit, dat darfs De nit.",
"permissionserrorstext": "Do häs nit dat Rääch, dat ze maache, {{PLURAL:$1|dä Jrund es:|de Jründe sin:|oohne Jrund.}}",
"permissionserrorstext-withaction": "Do häs nit dat Rääch $2, {{PLURAL:$1|dä Jrond es:|de Jrönde sin:|ävver ohne aanjävbahre Jrond.}}",
- "contentmodelediterror": "Di Väsjohn km_mer nit änndere, weil its content model is <code>$1</code>, but the current content model of the page is <code>$2</code>.",
+ "contentmodelediterror": "Di Väsjohn kam_mer nit änndere, weil its content model is <code>$1</code>, but the current content model of the page is <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Opjepaß:''' Do bes om bäste Wääsch, en Sigg neu aanzelähje, di doför ald ens fottjeschmeße woode wohr.\n\nBes förseschtesch un övverlääsch Der, of dat en johde Ideh es, di Sigg widder opzemaache. Domet De Bescheid weiß, heh de Endrääsh em Logbohch vum Sigge-Ömnänne, un em Logbohch vum Sigge-Fottschmihße mem Jrond, woröm di Sigg dohmohls fottjeschmeße woode es:",
"moveddeleted-notice": "Heh di Sigg es fottjeschmeße.\nE Schtök uß dä Logböhscher fum Sigge_Fottschmihße un fum Sigge-Ömnänne för di Sigg kütt jäz, en dä Hoffnung, dat dat hellef.",
"moveddeleted-notice-recent": "Schahd, di Sigg wohd en de läzde 24 Schtonde fottjeschmeße.\nDe Enndrähsch för heh di Sigg em Logbohch fum Sigge Fottschmiiße un Ömnänne küntt heh för zom Nohlohre.",
"createaccountreason": "Causa:",
"createacct-reason": "Causa",
"createacct-reason-ph": "Cur aliam rationem creas",
- "createacct-imgcaptcha-ph": "Textum quem supra vidis inscribe",
"createacct-submit": "Rationem tuam creare",
"createacct-another-submit": "Aliam rationem creare",
"createacct-benefit-body1": "{{PLURAL:$1|recensio|recensiones}}",
"enhancedrc-history": "Historia",
"recentchanges": "Nuper mutata",
"recentchanges-legend": "Indicis paginarum nuper mutatarum praeferentiae",
- "recentchanges-summary": "Inspice mutationes recentes huic vici in hac pagina.",
+ "recentchanges-summary": "Ecce mutationes recentes.",
"recentchanges-feed-description": "Nuper mutata Viciae hoc in fluxu observare.",
"recentchanges-label-newpage": "Haec recensio paginam novam creavit",
"recentchanges-label-minor": "Haec est recensio minor",
"july": "جوٙلای",
"august": "آگوست",
"september": "سئپتامر",
- "october": "ئوکتور",
+ "october": "ئÙ\88کتÙ\88بر",
"november": "نوڤامر",
"december": "دئسامر",
"january-gen": "جانڤیە",
"july-gen": "جوٙلای",
"august-gen": "آگوست",
"september-gen": "سئپتامر",
- "october-gen": "ئوکتوڤر",
+ "october-gen": "ئوکتوبر",
"november-gen": "نوڤامر",
"december-gen": "دئسامر",
"jan": "جانڤیە",
"july-date": "جوٙلای $1",
"august-date": "آگوست $1",
"september-date": "سئپتامر $1",
- "october-date": "ئوکتوڤر $1",
+ "october-date": "ئوکتوبر $1",
"november-date": "نوڤامر $1",
"december-date": "دئسامر $1",
"pagecategories": "{{PLURAL:$1|}}{{PLURAL:$1|دأسە|دأسە يا}}",
"permissionserrors": "Teisių klaida",
"permissionserrorstext": "Jūs neturite teisių tai daryti dėl {{PLURAL:$1|šios priežasties|šių priežasčių}}:",
"permissionserrorstext-withaction": "Jūs neturite leidimo $2 dėl {{PLURAL:$1|šios priežasties|šių priežasčių}}:",
+ "contentmodelediterror": "Jūs negalite redaguoti šios versijos, nes jos turinio modelis yra <code>$1</code> ir dabartinis puslapio turinio modelis yra <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Dėmesio: Jūs atkuriate puslapį, kuris anksčiau buvo ištrintas.'''\n\nTurėtumėte nuspręsti, ar reikėtų toliau redaguoti šį puslapį.\nJūsų patogumui čia pateikiamas šio puslapio šalinimų ir perkėlimų sąrašas:",
"moveddeleted-notice": "Šis puslapis buvo ištrintas.\nŽemiau pateikiamas puslapio šalinimų ir pervadinimų sąrašas.",
"moveddeleted-notice-recent": "Atsiprašome, šis puslapis nesenai buvo ištrintas (per pastarąsias 24 valandas). Puslapio ištrynimo ir perkėlimo istorija yra pateikiama žemiau kaip nuoroda.",
"upload-options": "Įkėlimo nustatymai",
"watchthisupload": "Stebėti šią rinkmeną",
"filewasdeleted": "Failas šiuo vardu anksčiau buvo įkeltas, o paskui ištrintas. Jums reikėtų patikrinti $1 prieš bandant įkelti jį vėl.",
+ "filename-thumb-name": "Tai panašu į miniatiūros pavadinimą. Prašome neįkėlinėti miniatiūrų atgal į tą patį vikį. Kitu atveju, prašome pataisyti failo pavadinimą taip, kad jis būtų prasmingesnis ir neturėtų miniatiūros prefikso.",
"filename-bad-prefix": "Jūsų įkeliamas failas prasideda su '''„$1“''', bet tai yra neapibūdinantis pavadinimas, dažniausiai priskirtas skaitmeninių kamerų. Prašome suteikti labiau apibūdinantį pavadinimą savo failui.",
"upload-success-subj": "Įkelta sėkmingai",
"upload-success-msg": "Jūsų įkėlimas iš [$2] buvo sėkmingas. Jį galima rasti čia: [[:{{ns:file}}:$1]]",
"foreign-structured-upload-form-label-infoform-categories": "Kategorijos",
"foreign-structured-upload-form-label-infoform-date": "Data",
"foreign-structured-upload-form-label-own-work-message-local": "Patvirtinu, kad įkeliu šį failą su šiomis naudojimosi sąlygomis ir licencijavimo politika į {{SITENAME}}.",
+ "foreign-structured-upload-form-label-not-own-work-message-local": "Jeigu Jūs negalite įkelti šio failo su {{SITENAME}} politika, prašome uždaryti dialogą ir pabandyti kitą metodą.",
+ "foreign-structured-upload-form-label-not-own-work-local-local": "Jūs taip pat galite norėti išbandyti [[Special:Upload|numatytąjį įkėlimo puslapį]].",
+ "foreign-structured-upload-form-label-own-work-message-default": "Aš suprantu, kad įkeliu šį failą į dalinimosi repozitoriją. Aš patvirtinu, kad tai darau laikydamasis jų paslaugų teikimo sąlygų ir licencijavimo politikos.",
+ "foreign-structured-upload-form-label-not-own-work-message-default": "Jeigu negalite įkelti šio failo su dalinimosi repozitorijos politika, prašome uždaryti šį dialogą ir bandyti kitą metodą.",
+ "foreign-structured-upload-form-label-not-own-work-local-default": "Jūs taip pat galite norėti išbandyti [[Special:Upload|{{SITENAME}} įkėlimo puslapį]], jeigu šis failas gali būti įkeltas su jų politika.",
+ "foreign-structured-upload-form-label-own-work-message-shared": "Aš patvirtinu, kad man priklauso šio failo autorinės teisės ir sutinku neatšaukiamai išleisti šį failą į Wikimedia Commons su [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0] licencija, ir aš sutinku su [https://wikimediafoundation.org/wiki/Terms_of_Use paslaugų teikimo sąlygomis].",
+ "foreign-structured-upload-form-label-not-own-work-message-shared": "Jeigu Jums nepriklauso šio failo autorinės teisės arba Jūs norite išleisti jį su kitokia licencija, apsvarstykite naudojimą [https://commons.wikimedia.org/wiki/Special:UploadWizard Commons įkėlimo vedlį].",
"backend-fail-stream": "Negali būti apdorotas failas $1.",
"backend-fail-backup": "Negali būti išsaugotas failas $1.",
"backend-fail-notexists": "Failas $1 neegzistuoja.",
"tog-hideminor": "अलीकडील बदलांत छोटी संपादने लपवा",
"tog-hidepatrolled": "पहारा दिलेली संपादने (नित्य पहाण्यात असलेली संपादने) अलीकडील बदलांमधून लपवा",
"tog-newpageshidepatrolled": "नवीन पृष्ठ यादीतून पहारा दिलेली पाने (नित्य पहाण्यात असलेली संपादने) लपवा",
+ "tog-hidecategorization": "पानांचे वर्गीकरण लपवा",
"tog-extendwatchlist": "निरीक्षणसूचीत सगळे बदल दाखवा. फक्त अलीकडील नाही.",
"tog-usenewrc": "अलीकडील बदल आणि पहाऱ्याची सूचीत मांडणी करा",
"tog-numberheadings": "शीर्षके स्वयंक्रमांकित करा",
"tog-watchdefault": "मी संपादित केलेली पाने आणि संचिका माझ्या निरीक्षणसूचीत टाका",
"tog-watchmoves": "मी स्थानांतर केलेली पाने आणि संचिका माझ्या निरीक्षणसूचीत टाका",
"tog-watchdeletion": "मी वगळलेली पाने आणि संचिका माझ्या निरीक्षणसूचीत टाका",
+ "tog-watchrollback": "यात ज्या पानात मी माझ्या निरीक्षणसूचीत पुनर्परतीची (रोलबॅक) क्रिया केलेली आहे.",
"tog-minordefault": "सर्व संपादने 'छोटा बदल' म्हणून आपोआप जतन करा.",
"tog-previewontop": "झलक संपादन खिडकीच्या आधी दाखवा",
"tog-previewonfirst": "पहिल्या संपादनानंतर झलक दाखवा",
"tog-watchlisthideliu": "पहाऱ्याच्या सूचीतून प्रवेश केलेल्या सदस्यांची संपादने लपवा",
"tog-watchlisthideanons": "निरीक्षणसूचीतून अनामिक सदस्यांची संपादने लपवा",
"tog-watchlisthidepatrolled": "निरीक्षणसूचीतून तपासलेली संपादने लपवा",
+ "tog-watchlisthidecategorization": "पानांचे वर्गीकरण लपवा",
"tog-ccmeonemails": "मी इतर सदस्यांना पाठविलेल्या ई-मेल च्या प्रती मलाही माझ्या ई-मेल पत्त्यावर पाठवा",
"tog-diffonly": "निवडलेल्या आवृत्त्यांमधील बदल दाखवताना जुनी आवृत्ती दाखवू नका.",
"tog-showhiddencats": "लपविलेले वर्ग दाखवा",
"pool-timeout": "ताळ्यासाठी वाट पाहण्याची वेळ संपली",
"pool-queuefull": "सर्व्हरवर ताण आहे.",
"pool-errorunknown": "अपरिचित त्रुटी",
+ "pool-servererror": "पूल काउंटर सेवा उपलब्ध नाही($1).",
"poolcounter-usage-error": "वापर त्रूटी:$1",
"aboutsite": "{{SITENAME}}बद्दल",
"aboutpage": "Project:माहितीपृष्ठ",
"disclaimers": "उत्तरदायित्वास नकार",
"disclaimerpage": "Project: सर्वसाधारण उत्तरदायकत्वास नकार",
"edithelp": "संपादन साहाय्य",
- "helppage-top-gethelp": "मदत",
+ "helppage-top-gethelp": "साहायà¥\8dय",
"mainpage": "मुखपृष्ठ",
"mainpage-description": "मुखपृष्ठ",
"policy-url": "Project:नीती",
"readonly_lag": "मुख्य विदागार दात्याच्या (मास्टर डाटाबेस सर्व्हर) बरोबरीने पोहचण्यास पराधीन-विदागारदात्यास (स्लेव्ह सर्व्हर) वेळ लागल्यामुळे, विदागार आपोआप बंद झाला आहे.",
"internalerror": "अंतर्गत त्रुटी",
"internalerror_info": "अंतर्गत त्रुटी: $1",
+ "internalerror-fatal-exception": "\"$1\"प्रकारचा घातक अपवाद",
"filecopyerror": "\"$1\" संचिकेची \"$2\" ही प्रत करता आली नाही.",
"filerenameerror": "\"$1\" संचिकेचे \"$2\" असे नामांतर करता आले नाही.",
"filedeleteerror": "\"$1\" संचिका वगळता आली नाही.",
"title-invalid-empty": "आपण विनंति केलेले पान-शिर्षक एकतर रिकामे आहे किंवा त्यात एखाद्या नामविश्वाचे नाव आहे.",
"title-invalid-utf8": "आपण विनंती केलेल्या पानाच्या शिर्षकात अवैध यूटिएफ-८ क्रमवारी आहेत.",
"title-invalid-interwiki": "आपण विनंती केलेल्या पानात आंतरविकि दुवे आहेत जे शिर्षकात वापरता येउ शकत नाहीत.",
- "title-invalid-talk-namespace": "आपण विनंति केलेले पान उपलब्ध नसलेल्या चर्च्या पानास संबोधित करते",
+ "title-invalid-talk-namespace": "आपण विनंति केलेले पान शिर्षक चर्चा पानास संदर्भांकित करते जे अस्तित्वात नाही.",
+ "title-invalid-characters": "विनंती केलेल्या पानात अवैध वर्ण आहेत:\"$1\".",
+ "title-invalid-relative": "शिर्षकास संलग्न मार्ग आहेत.संलग्न पान शिर्षके (./, ../)अवैध आहेत, कारण ते सदस्याच्या न्याहाळकाद्वारे हाताळल्यावर, अनेकदा, त्यावर पोचता येणार नाही.",
+ "title-invalid-magic-tilde": "विनंती केलेल्या पानाच्या शिर्षकात अवैध जादुई नासिक्यत्व-चिन्ह क्रमवारी(मॅजिक टिल्ड सिक्वेन्स) आहे(<nowiki>~~~</nowiki>).",
+ "title-invalid-too-long": "विनंती केलेल्या पानाचे शिर्षक फारच लांबीचे आहे.यूटीएफ-८ एनकोडिंगमध्ये ते $1{{PLURAL:$1|बाईट|बाईटस्}} पेक्षा लांब नको.",
+ "title-invalid-leading-colon": "विनंती केलेल्या पानाचे शिर्षकाचे सुरुवातीस अवैध द्विबिंदुचिन्ह(:) आहे.",
"perfcached": "खालील माहिती सयीमधील (कॅशे) असल्यामुळे ती अद्ययावत् नाही.जास्तीतजास्त {{PLURAL:$1|एक प्रतिफळ |$1 प्रतिफळे }} सयीमध्ये असतात.",
"perfcachedts": "खालील माहिती सयीमधील (कॅशे) आहे व ती $1 पर्यंत अद्ययावत् आहे. जास्तीतजास्त {{PLURAL:$4|एक प्रतिफळ |$4 प्रतिफळे}} सयीमध्ये असतात.",
"querypage-no-updates": "सध्या या पानाकरिता नवी अद्यतने अनुपलब्ध केली आहेत.आत्ताच येथील विदा तरोताजा होणार नाही.",
"viewyourtext": "तुम्ही या पानाची,<strong>तुमची संपादने</strong> पाहू शकता व त्याची प्रत करू शकता.",
"protectedinterface": "हे पान सॉफ्टवेअरला इंटरफेस लेखन पुरवते, म्हणून दुरूपयोग टाळण्यासाठी संरक्षित केलेले आहे.\n\nसर्व विकिंवर, अनुवाद जोडण्याकरता किंवा बदलण्याकरता अथवा शुद्धलेखन चिकित्सेकरीता , कृपया [//translatewiki.net/ translatewiki.net], या मिडियाविकि स्थानिकीकरण प्रकल्पावर जा.",
"editinginterface": "<strong>सावधान</strong>तुम्ही संचेतनाचे (सॉफ्टवेअर) संपर्क माध्यम मजकूर असलेले पान संपादित करित आहात. या पानावरील बदल या विकिवरील इतर सदस्यांच्या सदस्य संपर्क माध्यमाचे स्वरूप बदलू शकते.",
+ "translateinterface": "सर्व विकिंवर अनुवाद जोडण्याकरता किंवा बदलण्याकरता, कृपया [//translatewiki.net/ ट्रांसलेटविकि.नेट]चा वापर करा,जो मिडियाविकिचा स्थानिकीकरण प्रकल्प आहे.",
"cascadeprotected": "हे पान संपादनांपासून सुरक्षित केल्या गेले आहे, कारण ते खालील {{PLURAL:$1|पानात|पानांमध्ये}} अंतर्भूत केलेले आहे,{{PLURAL:$1|जे पान|जी पाने }} निपतन पर्याय सुरु केल्यामुळे सुरक्षित आहेत:\n$2",
"namespaceprotected": "'''$1''' नामविश्वातील पाने संपादण्याची आपणांस परवानगी नाही.",
"customcssprotected": "या पानावर इतर सदस्याची वैयक्तिक मांडणी असल्यामुळे, तुम्हाला हे सीएसएस पान संपादित करण्याची परवानगी नाही.",
"invalidtitle-knownnamespace": "\"$2\" नामविश्वात \"$3\" मजकूराचे अयोग्य शीर्षक",
"invalidtitle-unknownnamespace": "अनोळखी नामविश्वाच्या आकड्यासह अवैध मथळा $1 व मजकूर \"$2\"",
"exception-nologin": "सनोंद-प्रवेशित नाही",
- "exception-nologin-text": "हà¥\87 पान à¤\95िà¤\82वा à¤\95à¥\8dरिया à¤\95रणà¥\8dयासाठà¥\80 à¤\86पलà¥\8dयाला या विà¤\95िवर [[Special:Userlogin|सनà¥\8bà¤\82द- पà¥\8dरवà¥\87शित]] असावयास हवे.",
+ "exception-nologin-text": "हà¥\87 पान à¤\95िà¤\82वा à¤\95à¥\8dरिया à¤\95रणà¥\8dयासाठà¥\80 à¤\86पलà¥\8dयाला सनà¥\8bà¤\82द- पà¥\8dरवà¥\87शित असावयास हवे.",
"exception-nologin-text-manual": "हे पान किंवा क्रियेस पोचण्यास कृपया $1 करा.",
"virus-badscanner": "खराब विन्यास (कॉन्फिगरेशन): अनोळखी व्हायरस स्कॅनर: ''$1''",
"virus-scanfailed": "क्रमवीक्षण (स्कॅन) अयशस्वी (कोड $1)",
"gotaccountlink": "सनोंद-प्रवेश करा",
"userlogin-resetlink": "सनोंद-प्रवेश तपशील विसरला असाल तर येथे टिचकी मारा.",
"userlogin-resetpassword-link": "आपला परवलीचा शब्द विसरलात?",
- "userlogin-helplink2": "सनà¥\8bà¤\82द पà¥\8dरवà¥\87शासà¤\82बà¤\82धà¥\80 मदत",
+ "userlogin-helplink2": "सनà¥\8bà¤\82द पà¥\8dरवà¥\87शासà¤\82बà¤\82धà¥\80 साहायà¥\8dय",
"userlogin-loggedin": "आपण पुर्वीच {{GENDER:$1|$1}} म्हणून सनोंद प्रवेशित आहात.वेगळ्या सदस्यनावाने सनोंद प्रवेशासाठी खालील आवेदन वापरा.",
"userlogin-createanother": "दुसरे नवीन खाते तयार करा",
"createacct-emailrequired": "विपत्र पत्ता(ई-मेल)",
"createacct-benefit-body2": "{{PLURAL:$1|लेख}}",
"createacct-benefit-body3": "अलीकडील {{PLURAL:$1|योगदानकर्ता|योगदानकर्ते}}",
"badretype": "तुम्ही टाकलेले परवलीचे शब्द जुळत नाहीत.",
+ "usernameinprogress": "या सदस्यनावाचे खाते तयार करण्याचे काम प्रगतीपथावर आहे. कृपया थांबा.",
"userexists": "तुम्ही टाकलेले सदस्यनाम पूर्वीच वापरात आहे.\nकृपया वेगळे सदस्यनाम निवडा.",
"loginerror": "सनोंद-प्रवेशात चूक झाली आहे",
"createacct-error": "खाते तयार करण्यात चुकी",
"nosuchusershort": "\"$1\" या नावाचा सदस्य नाही. लिहीताना आपली चूक तर नाही ना झाली?",
"nouserspecified": "तुम्हाला सदस्यनाव नमूद करावे लागेल.",
"login-userblocked": "हा सदस्य ’प्रतिबंधित’ आहे. त्यास सनोंद-प्रवेशाची परवानगी नाही.",
- "wrongpassword": "à¤\86पला परवलà¥\80à¤\9aा शबà¥\8dद à¤\9aà¥\81à¤\95à¥\80à¤\9aा आहे, पुन्हा एकदा प्रयत्न करा.",
- "wrongpasswordempty": "परवलà¥\80à¤\9aा शबà¥\8dद रिà¤\95ामा à¤\86हà¥\87; परत प्रयत्न करा.",
+ "wrongpassword": "à¤\86पण परवलà¥\80à¤\9aा शबà¥\8dद à¤\9aà¥\81à¤\95à¥\80à¤\9aा à¤\9fाà¤\95ला आहे, पुन्हा एकदा प्रयत्न करा.",
+ "wrongpasswordempty": "परवलà¥\80à¤\9aा शबà¥\8dद à¤\95à¥\8bरा à¤\86हà¥\87; पà¥\81नà¥\8dहा प्रयत्न करा.",
"passwordtooshort": "तुमच्या परवलीच्या शब्दात किमान {{PLURAL:$1|१ अक्षर |$1 अक्षरे}} हवीत.",
+ "passwordtoolong": "परवलीचा शब्द हा {{PLURAL:$1|१ वर्ण पेक्षा|$1 वर्णांपेक्षा}} लांबीचा नको.",
"password-name-match": "आपला परवलीचा शब्द हा आपल्या सदस्यनावापेक्षा वेगळा हवा.",
"password-login-forbidden": "या सदस्यनामाचा व परवलीच्या शब्दाचा वापर निषिद्ध आहे.",
"mailmypassword": "नवीन परवलीचा शब्द पुनर्स्थापित(रिसेट) करा",
- "passwordremindertitle": "{{SITENAME}}करिता नवा तात्पुरता परवलीचा शब्दांक.",
+ "passwordremindertitle": "{{SITENAME}}करिता नवा तात्पुरता परवलीचा शब्द",
"passwordremindertext": "कुणीतरी (कदाचित तुम्ही, अंकपत्ता $1 कडून) {{SITENAME}} करिता ’नवा परवलीचा शब्दांक पाठवावा’ अशी विनंती केली आहे ($4).\n\"$2\" सदस्याकरिता तात्पुरता परवलीचा शब्दांक \"$3\" झाला आहे.\nतुम्ही आता प्रवेश करा व तुमचा परवलीचा शब्दांक बदला. तुमचा अस्थायी शब्दांक {{PLURAL:$5|एका दिवसात|$5 दिवसांत}} मृत होईल.\n\nजर ही विनंती इतर कुणी केली असेल किंवा तुम्हाला तुमचा परवलीचा शब्दांक आठवला असेल आणि तुम्ही तो आता बदलू इच्छित नसाल तर, तुम्ही हा संदेश दुर्लक्षित करून जुना परवलीचा शब्दांक वापरत राहू शकता.",
"noemail": "\"$1\" सदस्याच्या कोणत्याही विपत्रपत्त्याची(ई-मेल)नोंद नाही.",
"noemailcreate": "आपण वैध विरोप-पत्ता (ई-मेल ऍड्रेस) देणे आवश्यक आहे.",
"eauthentsent": "नमूद केलेल्या ई-मेल पत्त्यावर एक निश्चितता स्वीकारक ई-मेल पाठविला गेला आहे.\nखात्यावर कोणताही इतर ई-मेल पाठविण्यापूर्वी - तो ई-मेल पत्ता तुमचाच आहे, हे सुनिश्चित करण्यासाठी - तुम्हाला त्या ई-मेल मधील सूचनांचे पालन करावे लागेल.",
"throttled-mailpassword": "मागील {{PLURAL:$1|तासात|$1 तासांत}} परवलीचा शब्द बदलण्यासाठीची सूचना विपत्राद्वारे पाठविलेली आहे. दुरुपयोग टाळण्यासाठी, {{PLURAL:$1|एका तासामध्ये|$1 तासांमध्ये}} फक्त एकदाच सूचना दिली जाईल.",
"mailerror": "विपत्र पाठवण्यात त्रुटी: $1",
- "acct_creation_throttle_hit": "माफ à¤\95रा, तà¥\81मà¥\8dहà¥\80 à¤\86तà¥\8dतापरà¥\8dयà¤\82त {{PLURAL:$1|१ à¤\96ातà¥\87 à¤\89à¤\98डलà¥\87 à¤\86हà¥\87|$1 à¤\96ातà¥\80 à¤\89à¤\98डलà¥\80 à¤\86हà¥\87त}}. तà¥\81मà¥\8dहाला à¤\86णà¤\96à¥\80 à¤\96ातà¥\80 उघडता येणार नाहीत.",
+ "acct_creation_throttle_hit": "à¤\86पला à¤\85à¤\82à¤\95पतà¥\8dता वापरà¥\81न या विà¤\95िस à¤à¥\87à¤\9f दà¥\87णाऱà¥\8dयाà¤\82नà¥\80 à¤\95ाल {{PLURAL:$1|१ à¤\96ातà¥\87|$1 à¤\96ातà¥\80}} à¤\89à¤\98डलà¥\80 à¤\86हà¥\87त तà¥\80 या à¤\95ालावधà¥\80तà¥\80ल महतà¥\8dतम à¤\86हà¥\87त.\n\nतà¥\8dयाà¤\9aा परिपाà¤\95 मà¥\8dहणà¥\82न सधà¥\8dया हा à¤\85à¤\82à¤\95पतà¥\8dता वापरà¥\81न à¤à¥\87à¤\9f दà¥\87णाऱà¥\8dयास à¤\85धिà¤\95 à¤\96ातà¥\87 उघडता येणार नाहीत.",
"emailauthenticated": "तुमचा विपत्रपत्ता $2 ला $3 यावेळी तपासण्यात आला आहे.",
"emailnotauthenticated": "तुमच्या ई-मेल पत्त्याची अद्याप निश्चिती झालेली नाही. खालील कोणत्याही फिचर्ससाठी ई-मेल पाठविला जाणार नाही.",
"noemailprefs": "खालील सुविधा कार्यान्वित करण्यासाठी,पसंतीक्रमात ई-मेल पत्ता नमूद करा.",
"createaccount-text": "तुमचा विपत्र पत्ता घेउन {{SITENAME}} ($4)वर \"$2\" नावाच्या कोण्या एकाने \"$3\" परवलीने खाते उघडले आहे. कृपया आपण सनोंद-प्रवेश करून आपला परवलीचा शब्द बदलावा.\n\nजर ही खातेनोंदणी चुकिने झाली असेल तर, तुम्ही या संदेशाकडे दुर्लक्ष करू शकता.",
"login-throttled": "तुम्ही नुकतेच सनोंद- प्रवेशासाठी अनेकानेक प्रयत्न केले आहेत.\nकृपया, पुन्हा प्रयत्न करण्याआधी $1 थोडी उसंत घ्या.",
"login-abort-generic": "तुमचा प्रवेश अयशस्वी होऊन रद्द झाला.",
+ "login-migrated-generic": "आपल्या खात्याचे स्थलांतर झाले आहे,या विकिवर आपले सदस्यनाव आता यापुढे अस्तित्वात राहणार नाही.",
"loginlanguagelabel": "भाषा: $1",
"suspicious-userlogout": "तुमच्या सनोंद-निर्गमनास नकार दिल्या गेला कारण असे दिसते की ती विनंती अन-अनुबंधित(डिसकनेक्टेड) न्याहाळकाद्वारे पाठवल्या गेली.",
"createacct-another-realname-tip": "आपले खरे नाव टाकणे वैकल्पिक आहे.\nजर आपण ते द्यायचे ठरविले तर,ते आपल्या कामाचा मूळ स्रोत म्णून देण्यास वापरले जाईल.",
"pt-createaccount": "खाते बनवा",
"pt-userlogout": "सनोंद-निर्गम",
"php-mail-error-unknown": "पीएचपीच्या विपत्र() पर्यायात अज्ञात चूक",
- "user-mail-no-addy": "à¤\88मà¥\87ल पतà¥\8dतà¥\8dया विना à¤\88मà¥\87ल पाठवणà¥\8dयà¤\9aा पà¥\8dरयतà¥\8dन à¤\95à¥\87ला",
+ "user-mail-no-addy": "à¤\88मà¥\87ल पतà¥\8dतà¥\8dया विना à¤\88मà¥\87ल पाठविणà¥\8dयाà¤\9aा पà¥\8dरयतà¥\8dन à¤\95à¥\87ला.",
"user-mail-no-body": "रिकामे किंवा अत्यंत छोटा मजकूर असलेले विपत्र पाठविण्याचा प्रयत्न करण्यात आला",
"changepassword": "परवलीचा शब्द बदला",
- "resetpass_announce": "à¤\96ातà¥\8dयामधà¥\8dयà¥\87 पà¥\8dरविषà¥\8dà¤\9f हà¥\8bणà¥\87 थाà¤\82बविणà¥\8dयाà¤\95रिता à¤\95à¥\83पया à¤\86पलà¥\8dया à¤\96ातà¥\8dयाà¤\9aा à¤\95à¥\82à¤\9fशबà¥\8dद बदला.",
+ "resetpass_announce": "सनà¥\8bà¤\82द पà¥\8dरवà¥\87श पà¥\82रà¥\8dण à¤\95रणà¥\8dयाà¤\95रिता à¤\95à¥\83पया à¤\86पला परवलà¥\80à¤\9aा शबà¥\8dद पà¥\81नरà¥\8dसà¥\8dथापित à¤\95रा.",
"resetpass_text": "<!-- मजकूर इथे लिहा -->",
"resetpass_header": "खात्याचा परवलीचा शब्द बदला",
"oldpassword": "जुना परवलीचा शब्दः",
"resetpass-submit-loggedin": "परवलीचा शब्द बदला",
"resetpass-submit-cancel": "रद्द करा",
"resetpass-wrong-oldpass": "अवैध किंवा अस्थायी परवलीचा शब्द.\nकदाचित तुम्ही आधीच तो यशस्वीरीत्या बदलला असेल किंवा नवीन तात्पुरता परवलीचा शब्द मागवला असेल.",
+ "resetpass-recycled": "सध्याच्या परवलीच्या शब्दापेक्षा काहीतरी वेगळ्या परवलीच्या शब्दाची पुनर्स्थापना करा.",
+ "resetpass-temp-emailed": "विप्त्राद्वारे पाठविलेल्या तात्पुरत्या संकेताने आपण प्रवेश घेतला.सनोंद प्रवेश पूर्ण करण्यास, आपण येथे नविन परवलीच्या शब्दाची स्थापना करावयास हवी:",
"resetpass-temp-password": "तात्पुरता परवलीचा शब्द",
"resetpass-abort-generic": "परवलीचा शब्दबदल विस्तारकाद्वारे नाकारण्यात आला.",
+ "resetpass-expired": "आपला परवलीचा शब्द संपुष्टात आला.कृपया प्रवेशास नविन परवलीचा शब्द स्थापा.",
+ "resetpass-expired-soft": "आपला परवलीचा शब्द संपुष्टात आला असुन त्याची पुनर्स्थापना करणे आवश्यक आहे. कृपया आता नविन परवलीचा शब्द निवडा किंवा नंतर पुनर्स्थापना करण्यास \"{{int:resetpass-submit-cancel}}\" येथे टिचका.",
+ "resetpass-validity-soft": "आपला परवलीचा शब्द वैध नाही:$1\n\nकृपया नविन परवलीचा शब्द निवडा किंवा नंतर पुनर्स्थापना करण्यास \"{{int:resetpass-submit-cancel}}\" येथे टिचका.",
"passwordreset": "परवलीचा शब्द पूर्ववत करा",
"passwordreset-text-one": "आपला परवलीचा शब्द बदलण्यास हे आवेदन भरा.",
"passwordreset-text-many": "{{PLURAL:$1|आपला तात्पुरता परवलीचा शब्द विपत्रामार्फत प्राप्त करण्यास खालील क्षेत्रातील एखादे भरा.}}",
"changeemail-no-info": "हे पान थेट बघण्यासठी तुम्हाला सनोंद-प्रवेशित असावे लागेल.",
"changeemail-oldemail": "सध्याचा ईमेल पत्ता :",
"changeemail-newemail": "नवा ईमेल पत्ता:",
+ "changeemail-newemail-help": "जर आपणास आपला विपत्रपत्ता(ई-मेल एड्रेस) हटवायचा असेल तर हे क्षेत्र आपण कोरे ठेवावयास हवे. जर आपण आपला विपत्रपत्ता हटविला तर, आपण विसरलेला परवलीचा शब्द पुनर्स्थापित करु शकणार नाही व या विकिवरुन आपणास विपत्रे प्राप्त होणार नाहीत.",
"changeemail-none": "(काहीही नाही)",
"changeemail-password": "तुमचा {{SITENAME}} संकेतांक:",
"changeemail-submit": "ईमेल बदला",
"changeemail-throttled": "तुम्ही नुकतेच सनोंद- प्रवेशासाठी अनेक प्रयत्न केले आहेत.\nकृपया, पुन्हा प्रयत्न करण्याआधी $1 थोडी उसंत घ्या.",
+ "changeemail-nochange": "कृपया वेगळा नविन विपत्रपत्ता टाका.",
"resettokens": "ओळखचिन्ह(टोकन) पुनर्स्थापित करा",
"resettokens-text": "येथे आपल्या खात्यात असलेला व्यक्तिगत मजकूरापर्यंत पोचण्यासाठी आपण ओळखचिन्ह(टोकन) पुनर्स्थापित करू शकता.\nआपण जर तो अपघाताने कोणासमवेत सहभागीला असेल किंवा आपले खात्याची आपण तडजोड केली असल्यास, हे करावयास हवे.",
"resettokens-no-tokens": "पुनर्स्थापित करण्यासाठी कोणतीही ओळखचिन्हे नाहीत.",
"preview": "झलक",
"showpreview": "झलक दाखवा",
"showdiff": "बदल दाखवा",
+ "blankarticle": "<strong>ईशारा:</strong>आपण तयार करीत असलेले पान कोरे आहे.जर आपण पुन्हा \"{{int:savearticle}}\" टिचकले तर,कोणताही आशय/मजकूर नसलेले पान तयार होईल.",
"anoneditwarning": "<strong>इशारा:</strong> तुम्ही विकिपीडियाचे सदस्य म्हणून सनोंद-प्रवेश (लॉग-इन) केलेले नाही.आपण काही संपादन केले तर, तुमचा अंकपत्ता (आयपी) सार्वजनिक रित्या दृष्य होईल. जर आपण <strong>[$1 सनोंद प्रवेश केला]</strong> किंवा <strong>[$2 खाते उघडले]</strong>,तर आपण केलेली संपादने ही आपल्या नांवाशी संलग्न होतील, त्याशिवाय याचे इतरही फायदे आहेत.",
"anonpreviewwarning": "\"'''सावधान:''' तुम्ही विकिपीडियाचे सदस्य म्हणून सनोंद-प्रवेश (लॉग-इन) केलेला नाही. या पानाच्या संपादन इतिहासात तुमचा अंकपत्ता (आय.पी. ॲड्रेस) नोंदला जाईल.\"",
"missingsummary": "'''आठवण:''' आपण संपादन सारांश पुरवलेला नाही.आपण 'जतन करा' वर पुन्हा टिचकी मारली तर, ते त्याशिवायच जतन होईल.",
+ "selfredirect": "<strong>ईशारा:</strong>आपण या पानास, त्याच पानावर पुनर्निर्देशित करीता आहात.\nआपण पुनर्निर्देशनासाठी चूकिचे लक्ष्य नमूद केले आहे किंवा आपण चूकिच्या पानाचे संपादन करीत आहात.\nजर आपण पुन्हा \"{{int:savearticle}}\" टिचकले तर, कसेहीकरुन ते पुनर्निर्देशन तयार होईल.",
"missingcommenttext": "कृपया खाली प्रतिक्रिया भरा.",
"missingcommentheader": "<strong>आठवण:<strong> आपण या लेखनाकरिता विषय दिलेला नाही. आपण पुन्हा \"{{int:savearticle}}\" वर टिचकले तर, तुमचे संपादन त्याशिवायच जतन होईल.",
"summary-preview": "आढाव्याची झलक:",
"subject-preview": "विषय झलक:",
+ "previewerrortext": "आपल्या बदलांची झलक बघण्याचे प्रयत्नादरम्यान त्रूटी उद्भवली.",
"blockedtitle": "हा सदस्य प्रतिबंधित आहे",
"blockedtext": "'''तुमचे सदस्यनाव अथवा IP पत्ता ब्लॉक केलेला आहे.'''\n\nहा ब्लॉक $1 यांनी केलेला आहे.\nयासाठी ''$2'' हे कारण दिलेले आहे.\n\n* ब्लॉकची सुरूवात: $8\n* ब्लॉकचा शेवट: $6\n* कुणाला ब्लॉक करायचे आहे: $7\n\nतुम्ही ह्या ब्लॉक संदर्भातील चर्चेसाठी $1 अथवा [[{{MediaWiki:Grouppage-sysop}}|प्रबंधकांशी]] संपर्क करू शकता.\nतुम्ही जोवर वैध ई-मेल पत्ता आपल्या [[Special:Preferences|'माझ्या पसंती']] पानावर देत नाही तोवर तुम्ही ’सदस्याला ई-मेल पाठवा’ हा दुवा वापरू शकत नाही. तसेच असे करण्यापासून आपल्याला ब्लॉक केलेले नाही.\nतुमचा सध्याचा IP पत्ता $3 हा आहे, व तुमचा ब्लॉक क्रमांक #$5 हा आहे.\nकृपया या संदर्भातील चर्चेमध्ये वरील सर्व तपशिल उद्घृत करा.",
"autoblockedtext": "तुमचा आंतरजालीय अंकपत्ता आपोआप स्थगित केला आहे कारण तो इतर अशा सदस्याने वापरला, ज्याला $1ने प्रतिबंधित केले.\nआणि दिलेले कारण खालील प्रमाणे आहे\n:''$2''\nब्लॉकची सुरूवात: $8\nब्लॉकचा शेवट: $6\nकुणाला ब्लॉक करायचे आहे: $7\n\nतुम्ही $1शी संपर्क करू शकता किंवा इतर [[{{MediaWiki:Grouppage-sysop}}|प्रबंधकां पैकी]] एकाशी स्थगनाबद्दल चर्चा करू शकता.\n\n[[Special:Preferences|सदस्य पसंतीत]]त शाबीत विपत्र पत्ता नमूद असल्या शिवाय आणि तुम्हाला तो वापरण्या पासून प्रतिबंधित केले असल्यास तुम्ही \"या सदस्यास विपत्र पाठवा\" सुविधा वापरू शकणार नाही.\nतुमचा सध्याचा IP पत्ता $3 हा आहे, व तुमचा ब्लॉक क्रमांक #$5 हा आहे. \nतुमचा स्थगन क्र $5 आहे. कृपया या संदर्भातील चर्चेमध्ये वरील सर्व तपशिल उद्घृत करा.",
"accmailtitle": "परवलीचा शब्द पाठविण्यात आलेला आहे.",
"accmailtext": "[[User talk:$1|$1]] यांसाठी अनियतक्रमाने निर्मित केलेला परवलीचा शब्द $2 यांना पाठवण्यात आला आहे.\n\nया नवीन खात्यासाठीचा परवलीचा शब्द,सनोंद-प्रवेश घेतल्यावर [[Special:ChangePassword|परवलीचा शब्द बदला]] येथे बदलता येईल.",
"newarticle": "(नवीन लेख)",
- "newarticletext": "तà¥\81मà¥\8dहाला à¤\85पà¥\87à¤\95à¥\8dषित à¤\85सलà¥\87ला लà¥\87à¤\96 à¤\85à¤\9cà¥\82न लिहिला à¤\97à¥\87लà¥\87ला नाहà¥\80. हा लà¥\87à¤\96 लिहिणà¥\8dयासाठà¥\80 à¤\96ालà¥\80ल पà¥\87à¤\9fà¥\80त मà¤\9cà¤\95à¥\82र लिहा. मदतà¥\80साठà¥\80 [$1 यà¥\87थà¥\87] à¤\9fिà¤\9aà¤\95à¥\80 दà¥\8dया.\n\nà¤\9cर यà¥\87थà¥\87 à¤\9aà¥\81à¤\95à¥\82न à¤\86ला à¤\85साल तर बà¥\8dराà¤\89à¤\9dरà¤\9aà¥\8dया बà¥\85à¤\95 (back) कळीवर टिचकी द्या.",
+ "newarticletext": "à¤\86पण सधà¥\8dया à¤\85सà¥\8dतितà¥\8dवात नसलà¥\87लà¥\8dया पानाà¤\9aà¥\8dया दà¥\81वà¥\8dयाà¤\9aा माà¤\97à¥\8bवा à¤\98à¥\87त à¤\86ला à¤\86हात.\nहà¥\87 पान तयार à¤\95रणà¥\8dयासाठà¥\80,à¤\96ालà¥\80ल पà¥\87à¤\9fà¥\80त à¤\9fà¤\82à¤\95न à¤\95रणà¥\87 सà¥\81रà¥\81 à¤\95रा(à¤\85धिà¤\95 माहितà¥\80साठà¥\80 [$1 साहायà¥\8dय पान] बà¤\98ा).\n\nà¤\9cर à¤\86पण यà¥\87थà¥\87 à¤\9aà¥\81à¤\95à¥\82न à¤\86ला à¤\85साल तर बà¥\8dराà¤\89à¤\9dरà¤\9aà¥\8dया <strong>परत</strong>(बà¥\85à¤\95) कळीवर टिचकी द्या.",
"anontalkpagetext": "---- ''हे चर्चापान अशा अज्ञात सदस्यासाठी आहे, ज्यांनी खाते तयार केलेले नाही किंवा त्याचा वापर करत नाहीत. त्यांच्या ओळखीसाठी आम्ही आंतरजाल अंकपत्ता वापरतो आहोत. असा अंकपत्ता बऱ्याच लोकांचा एकच असू शकतो. जर आपण अज्ञात सदस्य असाल आणि आपल्याला काही अप्रासंगिक संदेश मिळाला असेल तर कृपया [[Special:UserLogin| खाते तयार करा]] किंवा [[Special:UserLogin/signup|सनोंद-प्रवेश करा]] ज्यामुळे, पुढे असे गैरसमज होणार नाहीत.''",
"noarticletext": "या लेखात सध्या काहीही मजकूर नाही.\nतुम्ही विकिपीडियावरील इतर लेखांमध्ये या [[Special:Search/{{PAGENAME}}| मथळ्याचा शोध घेऊ शकता]], <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} इतर नोंदी शोधा],\nकिंवा हा लेख [{{fullurl:{{FULLPAGENAME}}|action=edit}} लिहू शकता]</span>.",
"noarticletext-nopermission": "सध्या या लेखात काहीही मजकूर नाही.\nतुम्ही विकिपीडियावरील इतर लेखांमध्ये [[Special:Search/{{PAGENAME}}| या मथळ्याचा शोध घेऊ शकता]], <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAME}}}}आपण या लेखाच्या इतर नोंदी शोधा]</span>,परंतु, आपणास हा लेख लिहीण्याची परवानगी देण्यात येउ शकत नाही.",
"token_suffix_mismatch": "'''तुमचे संपादन रद्द करण्यात आलेले आहे कारण तुमच्या क्लायंटनी तुमच्या संपादनातील उद्गारवाचक चिन्हांमध्ये (punctuation) बदल केलेले आहेत.\nपानातील मजकूर खराब होऊ नये यासाठी संपादन रद्द करण्यात आलेले आहे.\nअसे कदाचित तुम्ही अनामिक proxy वापरत असल्याने होऊ शकते.'''",
"edit_form_incomplete": "'''तुमच्या संपादनाचा काही भाग सर्व्हरपर्यंत पोचला नाही; तुमचे संपादन पूर्ण आहे का याची पुन्हा खात्री करा व पुन्हा प्रयत्न करा.'''",
"editing": "$1 चे संपादन होत आहे.",
- "creating": "$1 या लà¥\87à¤\96ाà¤\9aà¥\80 निरà¥\8dमितà¥\80 सà¥\81रà¥\82 à¤\86हà¥\87",
+ "creating": "$1 ची निर्मिती सुरू आहे",
"editingsection": "$1 (विभाग) संपादन",
"editingcomment": "$1 चे संपादन (प्रतिक्रिया)",
"editconflict": "संपादन मतभेद: $1",
"yourdiff": "फरक",
"copyrightwarning": "{{SITENAME}} येथे केलेले कोणतेही लेखन $2 (अधिक माहितीसाठी $1 पहा) अंतर्गत मुक्त उद्घोषित केले आहे असे गृहीत धरले जाईल याची कृपया नोंद घ्यावी. आपणास आपल्या लेखनाचे मुक्त संपादन आणि मुक्त वितरण होणे पसंत नसेल तर येथे संपादन करू नये.<br />\nतुम्ही येथे लेखन करताना हे सुद्धा गृहीत धरलेले असते की येथे केलेले लेखन तुमचे स्वतःचे आणि केवळ स्वतःच्या प्रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प्रताधिकाराने गठित न होणाऱ्या सार्वजनिक ज्ञानक्षेत्रातून घेतले आहे किंवा तत्सम मुक्त स्रोतातून घेतले आहे. तुम्ही संपादन करताना तसे वचन देत आहात. '''प्रताधिकारयुक्त लेखन सुयोग्य परवानगीशिवाय मुळीच चढवू/भरू नये!'''",
"copyrightwarning2": "{{SITENAME}} येथे केलेले कोणतेही लेखन हे इतर संपादकांकरवी बदलले अथवा काढले जाऊ शकते. जर आपणास आपल्या लेखनाचे मुक्त संपादन होणे पसंत नसेल तर येथे संपादन करू नये.<br />\nतुम्ही येथे लेखन करताना हे सुद्धा गृहीत धरलेले असते की येथे केलेले लेखन तुमचे स्वतःचे आणि केवळ स्वतःच्या प्रताधिकार (कॉपीराईट) मालकीचे आहे किंवा प्रताधिकाराने गठित न होणाऱ्या सार्वजनिक ज्ञानक्षेत्रातून घेतले आहे किंवा तत्सम मुक्त स्रोतातून घेतले आहे. तुम्ही संपादन करताना तसे वचन देत आहात (अधिक माहितीसाठी $1 पहा). '''प्रताधिकारयुक्त लेखन सुयोग्य परवानगीशिवाय मुळीच चढवू/भरू नये!'''",
+ "editpage-cannot-use-custom-model": "या पानाचा आशय-आराखडा(कंटेन्ट मॉडेल) बदलता येणार नाही.",
"longpageerror": "त्रूटी:आपण दिलेला मजकूर जास्तीत जास्त शक्य {{PLURAL:$2|one किलोबाईट|$2 किलोबाईट}} पेक्षा अधिक लांबीचा {{PLURAL:$1|one किलोबाईट|$1 किलोबाईट}} आहे.तो जतन केला जाऊ शकत नाही",
"readonlywarning": "'''सावधान:विदागारास अनुरक्षणासाठी(मेंटेनन्स) ताळे ठोकले आहे,त्यामुळे सध्याच तुम्ही तुमचे संपादन जतन करू शकत नाही.'''\nजर तुम्हाला हवे असेल तर नंतर उपयोग करण्याच्या दृष्टीने, तुम्ही मजकूर नक्कल करुन, पुढील संपादनासाठी ’मजकुर संचिकेत’(टेक्स्ट फाईल)चिटकवू शकता.\nविदागारास ताळे ठोकलेल्या प्रचालकांनी खालील स्पष्टीकरण दिले आहे:$1",
"protectedpagewarning": "'''सूचना: हे सुरक्षित पान आहे. फक्त प्रचालक याच्यात बदल करू शकतात.'''",
"semiprotectedpagewarning": "'''सूचना:''' हे पान सुरक्षित आहे. फक्त नोंदणीकृत सदस्य याच्यात बदल करू शकतात.",
- "cascadeprotectedwarning": "'''ताकिद:''' हे पान निम्न-लिखीत निपतन-प्रतिबंधीत {{PLURAL:$1|पानात|पानांत}} आंतरभूत असल्यामुळे,केवळ प्रचालक सुविधाप्राप्त सदस्यांनाच संपादन करता यावे असे ताळे त्यास ठोकलेले आहे :",
+ "cascadeprotectedwarning": "<strong>ताकिद:</strong>हे पान निम्न-लिखीत निपतन-प्रतिबंधीत {{PLURAL:$1|पानात|पानांत}} आंतरभूत असल्यामुळे,केवळ प्रचालक-सुविधाप्राप्त सदस्यांनाच संपादन करता यावे असे ताळे त्यास ठोकलेले आहे :",
"titleprotectedwarning": "”’सावधान: फक्त काही सदस्यानांच [[Special:ListGroupRights|विशेष आधिकार]] तयार करता यावे म्हणून ह्या पानास ताळे आहे.'''",
"templatesused": "या पानामध्ये {{PLURAL:$1|वापरलेला साचा|वापरलेले साचे}}:",
"templatesusedpreview": "या झलकेमध्ये {{PLURAL:$1|वापरलेला साचा|वापरलेले साचे}}:",
"permissionserrors": "परवानगीस नकार",
"permissionserrorstext": "खालील{{PLURAL:$1|कारणामुळे|कारणांमुळे}} तुम्हाला तसे करण्याची परवानगी नाही:",
"permissionserrorstext-withaction": "तुम्हाला $2 क्रियेची परवानगी नाही, खालील {{PLURAL:$1|कारणासाठी|कारणांसाठी}}:",
+ "contentmodelediterror": "ही आवृत्ती आपण संपादू शकत नाही कारण त्याचा आशय-आराखडा (कंटेन्ट मॉडेल)<code>$1</code> आहे व सध्याच्या पानाचा आशय आराखडा <code>$2</code> आहे.",
"recreate-moveddeleted-warn": "'''सूचना: पूर्वी वगळलेला लेख तुम्ही पुन्हा बनवित आहात.'''\n\nआपण याचा विचार करा कि या पानाचे संपादन यापुढे करणे योग्य आहे काय.या पानाच्या वगळण्याच्या व स्थानांतराच्या नोंदी आपल्या (कामाच्या) सुलभतेसाठी दिलेल्या आहेत:",
"moveddeleted-notice": "हे पान वगळण्यात आलेले आहे.\nसंदर्भासाठी, वगळण्याची व स्थानांतराची नोंद खाली दिलेली आहे.",
+ "moveddeleted-notice-recent": "माफ करा,हे पान अलीकडेच (मागील २४ तासात) वगळल्या गेले आहे.हा पानाच्या वगळण्याचा व हलविण्याचा लॉग संदर्भासाठी खाली दिला आहे.",
"log-fulllog": "पूर्ण नोंदी पहा",
"edit-hook-aborted": "हूकद्वारे संपादन रद्द.\nकारण दिलेले नाही.",
"edit-gone-missing": "नविन पृष्ठ अद्यतन करता आले नाही. ते वगळले असण्याची शक्यता आहे.",
"edit-conflict": "वादग्रस्त संपादन",
"edit-no-change": "तुमचे संपादन दुर्लक्षित करण्यात आले आहे, कारण मजकूरात काहीही बदल झालेला नाही.",
- "postedit-confirmation-created": "पान निर्मित केले",
+ "postedit-confirmation-created": "पान निर्मित केल्या गेले आहे",
+ "postedit-confirmation-restored": "हे पान पुनर्स्थापित केल्या गेले.",
"postedit-confirmation-saved": "आपले संपादन जतन करण्यात आले आहे.",
"edit-already-exists": "नवीन पान तयार करता येऊ शकले नाही.\nया नावाचे पान पूर्वीच अस्तित्वात आहे.",
"defaultmessagetext": "अविचल संदेश मजकूर",
"expensive-parserfunction-warning": "”’इशारा:”’ या पानावर खूप सारे खर्चीक पार्सर क्रिया कॉल्स आहेत.\n\nते $2{{PLURAL:$2|कॉल|कॉल्स}} पेक्षा कमी असायला हवेत, सध्या $1{{PLURAL:$1| $1 कॉल| $1 कॉल्स}} एवढे आहेत.",
"expensive-parserfunction-category": "खूप सारे खर्चीक पार्सर क्रिया कॉल्स असणारी पाने",
"post-expand-template-inclusion-warning": "<strong>ईशारा:</strong> साचे वाढविण्याची मर्यादा संपलेली आहे.\nकाही साचे वगळले जातील.",
- "post-expand-template-inclusion-category": "अशी पाने ज्यांच्यावर साचे चढविण्याची मर्यादा संपलेली आहे",
+ "post-expand-template-inclusion-category": "à¤\85शà¥\80 पानà¥\87 à¤\9cà¥\8dयाà¤\82à¤\9aà¥\8dयावर साà¤\9aà¥\87 à¤\9aढविणà¥\8dयाà¤\9aà¥\80 à¤\86à¤\95ार मरà¥\8dयादा सà¤\82पलà¥\87लà¥\80 à¤\86हà¥\87",
"post-expand-template-argument-warning": "<strong>ईशारा:</strong> या पानावर असा एकतरी साचा आहे जो वाढविल्यास खूप मोठा होईल.\nअसे साचे वगळण्यात आलेले आहेत.",
"post-expand-template-argument-category": "अशी पाने ज्यांच्यामध्ये साचे वगळलेले आहेत",
"parser-template-loop-warning": "साचा चक्र मिळाले: [[$1]]",
"cantcreateaccounttitle": "खाते उघडू शकत नाही",
"cantcreateaccount-text": "('''$1''')या आंतरजाल अंकपत्त्याकडूनच्या खाते निर्मितीस [[User:$3|$3]]ने अटकाव केला आहे.\n\n$3ने ''$2'' कारण दिले आहे.",
"viewpagelogs": "या पानाच्या नोंदी पहा",
- "nohistory": "या पà¥\83षà¥\8dठासाठà¥\80 à¤\86वà¥\83तà¥\8dतà¥\80 इतिहास अस्तित्वात नाही.",
+ "nohistory": "या पà¥\83षà¥\8dठासाठà¥\80 सà¤\82पादन इतिहास अस्तित्वात नाही.",
"currentrev": "सध्याची आवृत्ती",
"currentrev-asof": "$1 ची नविनतम आवृत्ती",
"revisionasof": "$1 नुसारची आवृत्ती",
- "revision-info": "$2ने $1चे आवर्तन",
+ "revision-info": "{{GENDER:$6|$2}}द्वारा $1चे आवर्तन",
"previousrevision": "←मागील आवृत्ती",
"nextrevision": "नविनतम आवृत्ती→",
"currentrevisionlink": "सध्याची आवृत्ती",
"rev-deleted-event": "(क्रिया नोंद वगळली)",
"rev-deleted-user-contribs": "[सदस्यनाव / अंकपत्ता वगळला - योगदानातुन संपादन लपविले]",
"rev-deleted-text-permission": "या पानाची आवृत्ती सार्वजनिक विदागारातून '''वगळण्यात आली आहे'''.\n\n[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} वगळल्याच्या नोंदीत] अधिक तपशील असण्याची शक्यता आहे.",
- "rev-suppressed-text-permission": "या पानाची आवृत्ती '''दडपली'''.\nआपण ती बघू शकता; [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} दडपलेल्यांचा क्रमलेख] येथे त्याची विस्तृत माहिती सापडेल.",
+ "rev-suppressed-text-permission": "या पानाची आवृत्ती <strong>दडपली</strong> आहे.\nआपण ती बघू शकता; [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} दडपलेल्यांचा क्रमलेख] येथे त्याची विस्तृत माहिती सापडेल.",
"rev-deleted-text-unhide": "या पानाचे संस्करण '''वगळले'''.\n [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} वगळलेल्या नोंदी] येथे याची माहिती मिळेल.\nजर आपणास पुढे जावयाचे असल्यास, अजूनही [$1 हे संस्करण बघू शकता].",
"rev-suppressed-text-unhide": "या पानाचे संस्करण '''दडपले'''.\n [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} दडपलेले क्रमलेख] येथे याची माहिती मिळेल.\nजर आपणास पुढे जावयाचे असल्यास, अजूनही [$1 हे संस्करण बघू शकता].",
"rev-deleted-text-view": "या पानाची आवृत्ती '''वगळण्यात आली आहे'''.\nती तुम्ही बघू शकता; अधिक तपशील [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} वगळल्याच्या नोंदी] येथे मिळेल.",
"revdelete-legend": "दृश्य बंधने स्थापित करा",
"revdelete-hide-text": "आवर्तीत मजकूर",
"revdelete-hide-image": "संचिका आशय लपवा",
- "revdelete-hide-name": "à¤\95à¥\83तà¥\80 à¤\86णि लà¤\95à¥\8dषà¥\8dय लपवा",
+ "revdelete-hide-name": "लà¤\95à¥\8dषà¥\8dय व पà¥\8dराà¤\9aल लपवा",
"revdelete-hide-comment": "संपादन तपशील",
"revdelete-hide-user": "संपादकाचे सदस्यनाव/आयपी अंकपत्ता",
"revdelete-hide-restricted": "प्रशासकांद्वारेची माहिती दडपा तसेच ईतरांचीही",
"searchall": "सर्व",
"showingresults": "#'''$2'''पासून {{PLURAL:$1|'''1'''पर्यंतचा निकाल|'''$1'''पर्यंतचे निकाल}} खाली दाखवले आहे.",
"showingresultsinrange": "खाली #<strong>$2</strong> ते #<strong>$3</strong> पर्यंतच्या कक्षेतील {{PLURAL:$1|<strong>१</strong> निकाल दाखविला आहे|<strong>$1</strong> निकाल दाखविले आहेत}}.",
+ "search-showingresults": "{{PLURAL:$4|Result <strong>$1</strong> of <strong>$3</strong>|निकाल <strong>$3</strong> चे<strong>$1 - $2</strong>}}",
"search-nonefound": "दिलेल्या पृच्छेशी जुळणारे निकाल नाहीत.",
"powersearch-legend": "प्रगत शोध",
"powersearch-ns": "नामविश्वांमध्ये शोधा:",
"preferences": "पसंतीक्रम",
"mypreferences": "पसंतीक्रम",
"prefs-edits": "संपादनांची संख्या:",
- "prefsnologintext2": "आपला पसंतीक्रम बदलण्यास $1 करा",
+ "prefsnologintext2": "आपला पसंतीक्रम बदलण्यास सनोंद प्रवेश करा.",
"prefs-skin": "त्वचा",
"skin-preview": "झलक",
"datedefault": "प्राथमिकता नाही",
"prefs-personal": "सदस्य व्यक्तिरेखा",
"prefs-rc": "अलीकडील बदल",
"prefs-watchlist": "निरीक्षणसूची",
+ "prefs-editwatchlist": "पहाऱ्याच्या सूचीचे संपादन करा",
"prefs-watchlist-days": "निरीक्षणसूचीमध्ये दिसणाऱ्या दिवसांची संख्या:",
"prefs-watchlist-days-max": "जास्तीत जास्त $1 {{PLURAL:$1|दिवस|दिवस}}",
"prefs-watchlist-edits": "वाढीव निरीक्षणसूचीमध्ये दिसणाऱ्या संपादनांची संख्या:",
"columns": "स्तंभ:",
"searchresultshead": "शोध",
"stub-threshold": "<a href=\"#\" class=\"stub\">अंकुरीत दुव्यांच्या</a> रचनेची नांदी (बाईट्स):",
+ "stub-threshold-sample-link": "नमुना",
"stub-threshold-disabled": "अक्षम केले",
"recentchangesdays": "अलीकडील बदल मधील दाखवावयाचे दिवस:",
"recentchangesdays-max": "जास्तीतजास्त $1 {{PLURAL:$1|दिवस}}",
"prefs-help-recentchangescount": "यात नुकतेच झालेले बदल, पानांचे इतिहास व नोंदी या गोष्टी असतात.",
"prefs-help-watchlist-token2": "ही आपल्या निरिक्षणसूचीच्या 'वेब फिड'ची गुप्त चाबी आहे.ज्या कोणास त्याची माहिती होईल तो आपली निरिक्षणसूची बघू शकेल,म्हणुन कोणास यात सहभागी करून घेउ नका.[[Special:ResetTokens|पुनर्स्थापनाची आपणास गरज असल्यास येथे टिचकी द्या]].",
"savedprefs": "तुमच्या पसंती जतन केल्या आहेत.",
+ "savedrights": "{{GENDER:$1|$1}}चे सदस्याधिकार जतन केले आहेत.",
"timezonelegend": "वेळक्षेत्र",
"localtime": "स्थानिक वेळ:",
"timezoneuseserverdefault": "सर्व्हर मूलस्थिती वापरा ($1)",
"badsig": "अयोग्य कच्ची सही;HTML खुणपताका तपासा.",
"badsiglength": "तुमची स्वाक्षरी खूप लांब आहे.\nटोपणनाव $1 {{PLURAL:$1|अक्षरापेक्षा|अक्षरांपेक्षा}} कमी लांबीचे हवे.",
"yourgender": "आपणास कश्या प्रकारे वर्णन केल्या गेलेले आवडेल?",
- "gender-unknown": "मà¥\80 à¤\85धिà¤\95 दà¥\87à¤\89 à¤\87à¤\9aà¥\8dà¤\9bित नाहà¥\80",
+ "gender-unknown": "à¤\86पला à¤\89लà¥\8dलà¥\87à¤\96 à¤\95रताà¤\82ना, हà¥\87 सà¤\82à¤\9aà¥\87तन, à¤\9cà¥\87थà¥\87 शà¤\95à¥\8dय à¤\86हà¥\87 तà¥\87थà¥\87, लिà¤\82à¤\97ाबाबत à¤\85à¤\95à¥\8dरिय शबà¥\8dदाà¤\9aा वापर à¤\95रà¥\87ल.",
"gender-male": "तो विकिपाने संपादितो",
"gender-female": "ती विकिपाने संपादिते",
"prefs-help-gender": "या पसंतीक्रमास स्थापणे ऐच्छिक आहे:संचेतन याचा उपयोग आपल्यास लिंगानुसार संबोधित करण्यास करते व आपल्यास दुसऱ्यांना उल्लेखण्यास होतो. ही माहिती सार्वजनिक असेल.",
"email": "विपत्र",
- "prefs-help-realname": "तुमचे खरे नाव (वैकल्पिक): हे नाव दिल्यास आपले योगदान या नावाखाली नोंदले व दाखवले जाईल.",
+ "prefs-help-realname": "तुमचे खरे नाव वैकल्पिक आहे.\nते दिल्यास,त्याचा वापर आपणास आपल्या कामाचे श्रेय देण्यास होऊ शकतो.",
"prefs-help-email": "विपत्रपत्ता वैकल्पिक आहे,परंतु,परवलीचा शब्द आपण विसरल्यास, तो त्याच्या पुनर्स्थापनेसाठी आवश्यक आहे.",
"prefs-help-email-others": "आपण इतरांना आपल्याशी ईमेलद्वारे संपर्क साधण्यास,आपल्या सदस्य किंवा सदस्य चर्चा पानातून दुवा देण्याचे निवडू शकता.जेंव्हा इतर आपल्याशी संपर्क साधतात तेंव्हा, आपला विपत्रपत्ता त्यांना दाखविल्या जात नाही.",
"prefs-help-email-required": "विपत्र(ईमेल)पत्ता हवा.",
"prefs-tokenwatchlist": "ओळखचिन्ह",
"prefs-diffs": "फरक",
"prefs-help-prefershttps": "हा पसंतीक्रम आपल्या पुढील सनोंद प्रवेशानंतर कार्यान्वित होईल.",
+ "prefswarning-warning": "आपण आपल्या पसंतीक्रमात केलेला बदल अद्याप जतन झाला नाही.जर आपण \"$1\" न टिचकता, या पानावरुन दुसरीकडे गेलात तर आपला पसंतीक्रम अद्यतन होणार नाही.",
"email-address-validity-valid": "विपत्रपत्ता वैध दिसत आहे",
"email-address-validity-invalid": "वैध विपत्रपत्ता लिहा",
"userrights": "सदस्य अधिकार व्यवस्थापन",
"userrights-lookup-user": "सदस्य गटांचे(ग्रूप्स) व्यवस्थापन करा.",
"userrights-user-editname": "सदस्य नाव टाका:",
"editusergroup": "सदस्याचे गट संपादित करा",
- "editinguser": "सदस्य '''[[User:$1|$1]]''' $2 चे सदस्य अधिकारात बदल केला जात आहे.",
+ "editinguser": "{{GENDER:$1|सदस्य}}चे सदस्य अधिकारात बदल केला जात आहे <strong>[[User:$1|$1]]</strong> $2",
"userrights-editusergroup": "सदस्याचे गट संपादित करा",
"saveusergroups": "सदस्य गट जतन करा",
"userrights-groupsmember": "(चा) सभासद:",
"right-deletedtext": "वगळलेला मजकूर व वगळलेल्या आवृत्त्यांमधील बदल पहा",
"right-browsearchive": "वगळलेली पाने शोधा",
"right-undelete": "एखादे पान पुनर्स्थापित करा",
- "right-suppressrevision": "पà¥\8dरà¤\9aालà¤\95ाà¤\82पासà¥\82न लपविलà¥\87लà¥\8dया à¤\86वà¥\83तà¥\8dतà¥\8dया पà¥\81नरावलà¥\8bà¤\95ित व पà¥\81नरà¥\8dसà¥\8dथापित करा",
+ "right-suppressrevision": "à¤\95à¥\8bणतà¥\8dयाहà¥\80 सदसà¥\8dयास विशिषà¥\8dà¤\9f à¤\86वà¥\83तà¥\8dतà¥\8dया दरà¥\8dशवा,लपवा à¤\95िà¤\82वा पà¥\8dरà¤\97à¤\9f करा",
"right-suppressionlog": "खासगी नोंदी पहा",
"right-block": "इतर सदस्यांना संपादन करण्यापासून प्रतिबंधित करा",
"right-blockemail": "एखाद्या सदस्याला इ-मेल पाठविण्यास प्रतिबंधित करा",
"action-createpage": "लेख बनवा",
"action-createtalk": "चर्चा पृष्ठे तयार करा",
"action-createaccount": "हे सदस्यखाते तयार करा",
+ "action-history": "या पानाचा इतिहास बघा.",
"action-minoredit": "हे संपादन 'किरकोळ' म्हणून खूण करा",
"action-move": "हे पान स्थानांतरित करा",
"action-move-subpages": "हे पान व त्याची उपपाने हलवा",
"action-move-rootuserpages": "मूळ सदस्यपाने हलवा",
+ "action-move-categorypages": "वर्ग पाने स्थानांतरील करा",
"action-movefile": "ही संचिका हलवा",
"action-upload": "या संचिकेचे अपभारण करा",
"action-reupload": "अस्तित्वात असलेल्या संचिकेवर पुनर्लेखन करा",
"recentchanges-legend-heading": "'''विवरण:'''",
"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|नविन पानांची यादी]] हेही पाहा)",
"recentchanges-legend-plusminus": "(''±१२३'')",
- "rcnotefrom": "खाली <b>$2</b> पासूनचे ('''$1''' पर्यंत) बदल दाखविले आहेत.",
- "rclistfrom": "$3 $2 नंतर केले गेलेले बदल दाखवा.",
+ "rcnotefrom": "खाली {{PLURAL:$5|हा बदल आहे|हे बदल आहेत}} <strong>$3, $4</strong>पासून ते(<strong>$1</strong>पर्यंतचे बदल दाखविले आहेत).",
+ "rclistfrom": "$2,$3 नंतर केले गेलेले बदल दाखवा.",
"rcshowhideminor": "छोटे बदल $1",
"rcshowhideminor-show": "दाखवा",
"rcshowhideminor-hide": "लपवा",
"rcshowhidemine": "माझे बदल $1",
"rcshowhidemine-show": "दाखवा",
"rcshowhidemine-hide": "लपवा",
+ "rcshowhidecategorization-show": "दाखवा",
+ "rcshowhidecategorization-hide": "लपवा",
"rclinks": "मागील $2 दिवसांतील $1 बदल पहा.<br />$3",
"diff": "फरक",
"hist": "इति",
"newpageletter": "न",
"boteditletter": "सां",
"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|सदस्याने|सदस्यांनी}} पहारा दिलेला आहे]",
- "rc_categories": "वर्गांपुरते मर्यादित ठेवा (\"|\"ने वेगळे करा)",
- "rc_categories_any": "कोणतेही",
+ "rc_categories": "वर्गांपुरते मर्यादित ठेवा (\"|\"ने वेगळे करा):",
+ "rc_categories_any": "निवडलà¥\8dयापà¥\88à¤\95à¥\80 à¤\95à¥\8bणतà¥\87हà¥\80",
"rc-change-size-new": " बदलानंतर $1 {{PLURAL:$1|बाईट|बाईटस्}}",
"newsectionsummary": "/* $1 */ नवीन विभाग",
"rc-enhanced-expand": "तपशील दाखवा",
"uploaderror": "अपभारणात चूक",
"upload-recreate-warning": "'''सावधान: या नावाची संचीका वगळली अथवा स्थलांतरित करण्यात आली आहे.'''\nया पानाची वगळल्याची व स्थलांतरणाची नोंद तुमच्या सोयीसाठी येथे पुरवली आहे.:",
"uploadtext": "खालील अर्ज नवीन संचिका चढविण्यासाठी वापरा.\nपूर्वी चढविलेल्या संचिका पाहण्यासाठी अथवा शोधण्यासाठी [[Special:FileList|चढविलेल्या संचिकांची यादी]] पहा. चढविलेल्या तसेच वगळलेल्या संचिकांची यादी पहाण्यासाठी [[Special:Log/upload|चढवलेल्या संचिकांची सूची]] व [[Special:Log/delete|वगळलेल्या संचिकांची सूची]] पहा.\n\nएखाद्या लेखात ही संचिका वापरण्यासाठी खालीलप्रमाणे दुवा द्या\n'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki>''',\n'''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|alt text]]</nowiki>''' किंवा\n'''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' संचिकेला थेट दुवा देण्यासाठी वापरा.",
- "upload-permitted": "अनुमतीत संचिका वर्ग: $1.",
- "upload-preferred": "शà¥\8dरà¥\87यसà¥\8dà¤\95र सà¤\82à¤\9aिà¤\95ा पà¥\8dरà¤\95ार:$1.",
- "upload-prohibited": "प्रतिबंधीत संचिका प्रकार: $1.",
+ "upload-permitted": "अनुमतीत संचिका{{PLURAL:$2|प्रकार}}: $1.",
+ "upload-preferred": "पसà¤\82तà¥\80तला सà¤\82à¤\9aिà¤\95ा {{PLURAL:$2|पà¥\8dरà¤\95ार}}:$1.",
+ "upload-prohibited": "प्रतिबंधीत संचिका {{PLURAL:$2|प्रकार}}:$1.",
"uploadlogpage": "अपभारणाच्या नोंदी",
"uploadlogpagetext": "नवीनतम चढवलेल्या संचिकांची यादीखाली दिलेली आहे.जास्त बघण्यासाठी [[Special:NewFiles|नविन संचिकांची दिर्घिका]] बघा.",
"filename": "संचिकेचे नाव",
"largefileserver": "सेवा संगणकावर (सर्व्हर) निर्धारित केलेल्या आकारापेक्षा या संचिकेचा आकार मोठा आहे.",
"emptyfile": "चढवलेली संचिका रिकामी आहे.असे संचिकानाम चुकीचे लिहिल्याने होउ शकते. कृपया तुम्हाला हीच संचिका चढवायची आहे का ते तपासा.",
"windows-nonascii-filename": "या विकिवर विशेष वर्ण असलेल्या संचिकानामाचा आधार घेता येणार नाही.",
- "fileexists": "या नावाà¤\9aà¥\80 सà¤\82à¤\9aिà¤\95ा à¤\86धà¥\80à¤\9a à¤\85सà¥\8dतितà¥\8dवात à¤\86हà¥\87, à¤\95à¥\83पया हà¥\80 सà¤\82à¤\9aिà¤\95ा बदलणà¥\8dयाबदà¥\8dदल तà¥\81मà¥\8dहà¥\80 साशà¤\82à¤\95 à¤\85साल तर <strong>[[:$1]]</strong> तपासा.\n[[$1|thumb]]",
+ "fileexists": "या नावाà¤\9aà¥\80 सà¤\82à¤\9aिà¤\95ा à¤\86धà¥\80à¤\9a à¤\85सà¥\8dतितà¥\8dवात à¤\86हà¥\87, à¤\9cर हà¥\80 सà¤\82à¤\9aिà¤\95ा बदलणà¥\8dयाबदà¥\8dदल तà¥\81मà¥\8dहà¥\80 साशà¤\82à¤\95 à¤\85साल तर, à¤\95à¥\83पया <strong>[[:$1]]</strong>तपासा.\n[[$1|thumb]]",
"filepageexists": "या नावाचे एक माहितीपृष्ठ (संचिका नव्हे) अगोदरच अस्तित्त्वात आहे. कृपया जर आपणांस त्यात बदल करायचा नसेल तर <strong>[[:$1]]</strong> तपासा.\n[[$1|thumb]]",
- "fileexists-extension": "या नावाà¤\9aà¥\80 सà¤\82à¤\9aिà¤\95ा à¤\85सà¥\8dतितà¥\8dवात à¤\86हà¥\87: [[$2|thumb]]\n* à¤\9aढवà¥\80त à¤\85सलà¥\87लà¥\8dया सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\87 नाव: <strong>[[:$1]]</strong>\n* à¤\85सà¥\8dतितà¥\8dवात à¤\85सलà¥\87लà¥\8dया सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\87 नाव: <strong>[[:$2]]</strong>\nà¤\95à¥\83पया दà¥\81सरà¥\87 नाव निवडा.",
+ "fileexists-extension": "या सारà¤\96à¥\8dया नावाà¤\9aà¥\80 सà¤\82à¤\9aिà¤\95ा à¤\85सà¥\8dतितà¥\8dवात à¤\86हà¥\87: [[$2|thumb]]\n* à¤\9aढवà¥\80त à¤\85सलà¥\87लà¥\8dया सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\87 नाव: <strong>[[:$1]]</strong>\n* सधà¥\8dया à¤\85सà¥\8dतितà¥\8dवात à¤\85सलà¥\87लà¥\8dया सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\87 नाव: <strong>[[:$2]]</strong>\nà¤\86पणास à¤\85धिà¤\95 वà¥\88शिषà¥\8dà¤\9fà¥\8dयपà¥\82रà¥\8dण नाव निवडायà¤\9aà¥\87 à¤\86हà¥\87 à¤\95ाय?",
"fileexists-thumbnail-yes": "आपण चढवीत असलेली संचिका ही मोठ्या चित्राची इवलीशी प्रतिकृती ''(thumbnail)'' असण्याची शक्यता आहे. [[$1|इवलेसे]]\nकृपया <strong>[[:$1]]</strong> ही संचिका तपासा.\nजर तपासलेली संचिका ही याच आकाराची असेल तर नवीन प्रतिकृती चढविण्याची गरज नाही.",
"file-thumbnail-no": "या संचिकेचे नाव <strong>$1</strong> पासून सुरू होत आहे. ही कदाचित झलक असू शकते.\nजर तुमच्याकडे पूर्ण रिझोल्यूशनची संचिका असेल तर चढवा अथवा संचिकेचे नाव बदला.",
"fileexists-forbidden": "या नावाची संचिका अगोदरच अस्तित्त्वात आहे; कृपया पुन्हा परत जाऊन ही संचिका नवीन नावाने चढवा.\n[[File:$1|thumb|center|$1]]",
"filename-bad-prefix": "तुम्ही चढवत असलेल्या संचिकेचे नाव '''\"$1\"''' पासून सुरू होते, जे की अंकीय छाउ (कॅमेरा) ने दिलेले अवर्णनात्मक नाव आहे.कृपया तुमच्या संचिकेकरिता अधिक वर्णनात्मक नाव निवडा.",
"upload-success-subj": "यशस्वीरीत्या अपभारित केले",
"upload-success-msg": "तुमचे [$2] येथून अपभारण यशस्वी ठरले. ते येथे उपलब्ध आहे: [[:{{ns:file}}:$1]]",
- "upload-failure-subj": "à¤\9aढवणà¥\8dयातà¥\80ल तà¥\8dरà¥\82à¤\9fि:",
- "upload-failure-msg": "[$2] यà¥\87थà¥\82न तà¥\81मà¤\9aà¥\8dया à¤\9aढवणà¥\8dयात à¤\9aà¥\82à¤\95 झाली:\n\n$1",
- "upload-warning-subj": "à¤\9aढवताना सà¥\82à¤\9aना",
- "upload-warning-msg": "तà¥\81मà¤\9aà¥\8dया à¤\9aढवणà¥\8dयात [$2] यà¥\87थà¥\82न à¤\9aà¥\82à¤\95 झाली. तुम्ही [[Special:Upload/stash/$1|चढवण्याचा अर्ज]] पुन्हा भरून ही चूक दूर करू शकता.",
- "upload-proto-error": "à¤\9aà¥\82à¤\95à¥\80à¤\9aा सà¤\82à¤\95à¥\87त",
- "upload-proto-error-text": "दà¥\82रसà¥\8dथ à¤\9aढवणà¥\8dयाच्या क्रियेत <code>http://</code>पासून किंवा <code>ftp://</code>पासून सुरू होणारी URL लागतात.",
+ "upload-failure-subj": "à¤\85पà¤à¤¾à¤°à¤£à¤¾à¤¤à¥\80ल तà¥\8dरà¥\82à¤\9fि",
+ "upload-failure-msg": "[$2] यà¥\87थà¥\82न तà¥\81मà¤\9aà¥\8dया à¤\85पà¤à¤¾à¤°à¤£à¤¾à¤¤ à¤\85डà¤\9aण निरà¥\8dमाण झाली:\n\n$1",
+ "upload-warning-subj": "à¤\85पà¤à¤¾à¤°à¤£ ताà¤\95िद",
+ "upload-warning-msg": "तà¥\81मà¤\9aà¥\8dया à¤\85पà¤à¤¾à¤°à¤£à¤¾à¤¤ [$2] यà¥\87थà¥\82न à¤\85डà¤\9aण निरà¥\8dमाण झाली. तुम्ही [[Special:Upload/stash/$1|चढवण्याचा अर्ज]] पुन्हा भरून ही चूक दूर करू शकता.",
+ "upload-proto-error": "à¤\9aà¥\82à¤\95à¥\80à¤\9aा शिषà¥\8dà¤\9fाà¤\9aार",
+ "upload-proto-error-text": "दà¥\82रसà¥\8dथ à¤\85पà¤à¤¾à¤°à¤£ाच्या क्रियेत <code>http://</code>पासून किंवा <code>ftp://</code>पासून सुरू होणारी URL लागतात.",
"upload-file-error": "अंतर्गत त्रूटी",
- "upload-file-error-text": "विदादातà¥\8dयावर तातà¥\8dपà¥\81रतà¥\80 सà¤\82à¤\9aिà¤\95ा तयार à¤\95रणà¥\8dयाà¤\9aà¥\8dया पà¥\8dरयतà¥\8dन à¤\95रत à¤\85सताना à¤\85à¤\82तरà¥\8dà¤\97त ताà¤\82तà¥\8dरिà¤\95 à¤\85डà¤\9aण à¤\86ली.कृपया [[Special:ListUsers/sysop|प्रचालकांशी]] संपर्क करा.",
- "upload-misc-error": "सà¤\82à¤\9aिà¤\95ा à¤\9aढविताना माहà¥\80त नसलà¥\87लà¥\80 तà¥\8dरà¥\81à¤\9fà¥\80 à¤\86लà¥\87लà¥\80 à¤\86हà¥\87.",
- "upload-misc-error-text": "à¤\9aढवताना à¤\85à¤\9cà¥\8dà¤\9eात ताà¤\82तà¥\8dरिà¤\95 à¤\85डà¤\9aण à¤\86लà¥\80.à¤\95à¥\83पया à¤\86à¤\82तरà¤\9cालपतà¥\8dता सà¥\81यà¥\8bà¤\97à¥\8dय à¤\86णि à¤\89पलबà¥\8dध à¤\86हà¥\87 à¤\95ा तà¥\87 तपासा à¤\86णि पà¥\81नà¥\8dहा पà¥\8dरयतà¥\8dन à¤\95रा. à¤\85धिà¤\95 à¤\85डà¤\9aणà¥\80 à¤\86लà¥\8dयास तर [[Special:ListUsers/sysop|प्रचालकांशी]] संपर्क करा.",
+ "upload-file-error-text": "विदादातà¥\8dयावर तातà¥\8dपà¥\81रतà¥\80 सà¤\82à¤\9aिà¤\95ा तयार à¤\95रणà¥\8dयाà¤\9aà¥\8dया पà¥\8dरयतà¥\8dन à¤\95रत à¤\85सताना à¤\85à¤\82तरà¥\8dà¤\97त तà¥\8dरà¥\82à¤\9fà¥\80 à¤\98डली.कृपया [[Special:ListUsers/sysop|प्रचालकांशी]] संपर्क करा.",
+ "upload-misc-error": "à¤\85नà¥\8bळà¤\96à¥\80 à¤\85पà¤à¤¾à¤°à¤£ तà¥\8dरà¥\82à¤\9fà¥\80.",
+ "upload-misc-error-text": "à¤\85पà¤à¤¾à¤°à¤£à¤¾à¤¤ à¤\85नà¥\8bळà¤\96à¥\80 तà¥\8dरà¥\82à¤\9fà¥\80 à¤\98डलà¥\80.à¤\95à¥\83पया यà¥\82à¤\86रà¤\8fल वà¥\88ध à¤\86णि पà¥\8bहà¥\8bà¤\9aयà¥\8bà¤\97à¥\8dय à¤\86हà¥\87 à¤\95ा तà¥\87 तपासा à¤\86णि पà¥\81नà¥\8dहा पà¥\8dरयतà¥\8dन à¤\95रा. à¤\85डà¤\9aण तशà¥\80à¤\9a à¤\9fिà¤\95à¥\81न राहिलà¥\8dयास, [[Special:ListUsers/sysop|प्रचालकांशी]] संपर्क करा.",
"upload-too-many-redirects": "या आंतरजालपत्त्यात खूप पुनर्निर्देशने आहेत",
"upload-http-error": "एक एचटीटीपी चूक उद्भवली: $1",
- "upload-copy-upload-invalid-domain": "सà¤\82à¤\95à¥\8dरमित à¤\95à¥\87लà¥\87लà¥\80 महितà¥\80 à¤\85धिà¤\95à¥\8dषà¥\87तà¥\8dरात à¤\89पलबà¥\8dध नाहà¥\80.",
+ "upload-copy-upload-invalid-domain": "या डà¥\8bमà¥\87नमधà¥\8dयà¥\87 पà¥\8dरत-à¤\85पà¤à¤¾à¤°à¤£à¥\87 à¤\85नà¥\81पलबà¥\8dध à¤\86हà¥\87त.",
"upload-dialog-title": "संचिकेचे अपभारण करा",
"upload-dialog-button-cancel": "रद्द करा",
"upload-dialog-button-done": "झाले",
"backend-fail-hashes": "तुलना करण्यासाठी फाइल हॅशेस मिळाले नाही",
"backend-fail-notsame": " $1 येथे यापेक्षा विभिन्न असलेली संचिका पूर्वीच विद्यमान आहे",
"backend-fail-invalidpath": "$1 हा वैध संग्राहक-पथ नाही.",
- "backend-fail-delete": "$1 ही संचिका (फाईल) बनवता आली नाही.",
- "backend-fail-describe": "\"$1\" या सà¤\82à¤\9aिà¤\95à¥\87साठà¥\80 à¤\86पण मेटाडाटा बदलू शकत नाही.",
+ "backend-fail-delete": "\"$1\" ही संचिका (फाईल) वगळता आली नाही.",
+ "backend-fail-describe": "\"$1\" या सà¤\82à¤\9aिà¤\95à¥\87साठà¥\80 à¤\85सलà¥\87ला मेटाडाटा बदलू शकत नाही.",
"backend-fail-alreadyexists": "$1 ही संचिका अगोदरच अस्तित्वात आहे.",
- "backend-fail-store": "$1 ही संचिका $2मधे साठवू शकत नाही.",
- "backend-fail-copy": "\"$1\" सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\80 \"$2\" हà¥\80 पà¥\8dरत à¤\95रता à¤\86लà¥\80 नाही.",
- "backend-fail-move": "संचिका $1 पासून $2मधे हलवता आली नाही.",
+ "backend-fail-store": "\"$1\" ही संचिका \"$2\"मध्ये साठवू शकत नाही.",
+ "backend-fail-copy": "\"$1\" सà¤\82à¤\9aिà¤\95à¥\87स \"$2\" मधà¥\8dयà¥\87 नà¤\95लता à¤\86लà¥\87 नाही.",
+ "backend-fail-move": "संचिका \"$1\"ला \"$2\"मधे स्थानांतरीत करता आले नाही.",
"backend-fail-opentemp": "तात्पुरती संचिका उघडणे जमले नाही.",
"backend-fail-writetemp": "तात्पुरत्या संचिकेत लिहिणे जमले नाही.",
"backend-fail-closetemp": "तात्पुरती संचिका बंद करणे जमले नाही.",
- "backend-fail-read": "$1 ही संचिका वाचता आली नाही.",
- "backend-fail-create": "$1 ही संचिका लिहिता आली नाही.",
+ "backend-fail-read": "\"$1\"ही संचिका वाचता आली नाही.",
+ "backend-fail-create": "\"$1\"ही संचिका लिहिता आली नाही.",
"backend-fail-maxsize": "$1 ही संचिका लिहिता आली नाही कारण ती {{PLURAL:$2|एक बाइट|$2 बाइट्स}} पेक्षा मोठी आहे.",
"backend-fail-readonly": "पार्श्वभौमीक साठवण \"$1\" “फक्त वाचा” अशी आहे. दिलेले कारण आहे: \"<em>$2</em>\"",
"backend-fail-synced": "अंतर्गत पार्श्वभौमीक साठवणीतील फाईल \"$1\" विसंगत आहे.",
"backend-fail-connect": "पार्श्वभौमीक साठा \"$1\"शी संबंध जोडू शकत नाही.",
"backend-fail-internal": "पार्श्वभौमीक साठा \"$1\" यात अज्ञात चूक झाली आहे.",
- "backend-fail-contenttype": "\"$1\" मधà¥\8dयà¥\87 ठà¥\87वलà¥\87लà¥\8dया फाà¤\88लà¤\9aा महितà¥\80à¤\9aा पà¥\8dरà¤\95ार à¤\95ळत नाहà¥\80",
+ "backend-fail-contenttype": "\"$1\" मधà¥\8dयà¥\87 साठविणà¥\8dयात यà¥\87णाऱà¥\8dया सà¤\82à¤\9aिà¤\95à¥\87à¤\9aा à¤\86शय-पà¥\8dरà¤\95ार(à¤\95à¤\82à¤\9fà¥\87à¤\82à¤\9f à¤\9fाà¤\88प) नà¤\95à¥\8dà¤\95à¥\80 à¤\95रता à¤\86ला नाहà¥\80.",
"backend-fail-batchsize": "पार्श्वभौमीक साठयातील बॅच $1 फाईल{{PLURAL:$1|क्रियेत|क्रियांमध्ये}}; मर्यादित कस्त $२ {{PLURAL:$2|क्रिया}} असू शकते",
"backend-fail-usable": "अपुऱ्या परवानगीमुळे किंवा निर्देशिकेच्या/धारिकेच्या(डिरेक्टरीज/कंटेनर्स) अभावामुळे \"$1\" संचिका वाचु अथवा लिहू शकत नाही.",
"filejournal-fail-dbconnect": "\"$1\" स्टोरेज बॅकएंडकरिता, माहिती-भांडाराच्या ज्ञानपत्रिकेशी जुळता आले नाही.",
"lockmanager-fail-deletelock": "\"$1\" साठी लॉक फाइल वगळू शकत नाही",
"lockmanager-fail-acquirelock": "\"$1\" साठी लॉक फाइल मिळवू शकत नाही",
"lockmanager-fail-openlock": "\"$1\" साठी लॉक फाइल उघडू शकत नाही",
- "lockmanager-fail-releaselock": "\"$1\" साठà¥\80 लà¥\89à¤\95 à¤\89à¤\98डà¥\82 शà¤\95त नाहà¥\80",
+ "lockmanager-fail-releaselock": "\"$1\" साठà¥\80 ताळा à¤\89à¤\98डà¥\82 शà¤\95त नाहà¥\80.",
"lockmanager-fail-db-bucket": "$1 बकेट मधील कुलूप बंद डेटाबेसशी पुरेसा संपर्क होवू शकत नाही.",
- "lockmanager-fail-db-release": "\"$1\" डाà¤\9fाबà¥\87स वरà¥\80ल लà¥\89à¤\95 उघडू शकत नाही",
+ "lockmanager-fail-db-release": "\"$1\" डाà¤\9fाबà¥\87स वरà¥\80ल ताळा उघडू शकत नाही",
"lockmanager-fail-svr-acquire": "सर्व्हर \"$1\" वरील कुलूप उघडू शकत नाही",
"lockmanager-fail-svr-release": "सर्व्हर \"$1\" वरील् लॉक उघडू शकत नाही",
- "zip-file-open-error": "सà¤\82à¤\9aà¥\80à¤\95ा ZIP तपासणà¥\80साठà¥\80 à¤\89à¤\98डताना तà¥\8dरà¥\81à¤\9fà¥\80 à¤\86ली.",
- "zip-wrong-format": "हà¥\80 सà¤\82à¤\9aिà¤\95ा \"à¤\9dिप\" पà¥\8dरà¤\95ारà¤\9aà¥\80 नाही.",
+ "zip-file-open-error": "सà¤\82à¤\9aिà¤\95ा ZIP तपासणà¥\80साठà¥\80 à¤\89à¤\98डताना तà¥\8dरà¥\81à¤\9fà¥\80 à¤\89दà¥\8dà¤à¤µली.",
+ "zip-wrong-format": "नमà¥\82द à¤\95à¥\87लà¥\87लà¥\80 सà¤\82à¤\9aिà¤\95ा हà¥\80 à¤\9dिप(ZIP)सà¤\82à¤\9aिà¤\95ा नाही.",
"zip-bad": "ही संचिका दूषित किंवा न वाचता येणारी झिप संचिका आहे.\nती सुरक्षिततेसाठी नीट तपासता आली नाही.",
"zip-unsupported": "ही संचिका एक ZIP संचिका आहे जी मिडीयाविकी द्वारे (support) न केलेले ZIP वैशिष्ट्ये (features) वापरते.\nया संचिकेची सुरक्षा पडताळणी व्यवस्थितरीत्या होऊ शकत नाही.",
"uploadstash": "चढवणे लपवा",
"uploadstash-badtoken": "ही कृती अयशस्वी होती. कदाचित आपल्या संपादन अधिकारपत्राची (editing credentials) मुदत संपली.",
"uploadstash-errclear": "संचिका स्वच्छ करणे अयशस्वी.",
"uploadstash-refresh": "संचिकांची यादी ताजीतवानी करा",
- "invalid-chunk-offset": "à¤\85à¤\97à¥\8dराहà¥\8dय चंक ऑफसेट",
+ "invalid-chunk-offset": "à¤\85वà¥\88ध चंक ऑफसेट",
"img-auth-accessdenied": "पोहोच नाकारल्या गेली.",
- "img-auth-nopathinfo": "मारà¥\8dà¤\97 माहितà¥\80 à¤\86ढळलà¥\80 नाहà¥\80.\nà¤\86पला सरà¥\8dवà¥\8dहर हà¥\80 माहितà¥\80 पà¥\8bà¤\9aवà¥\82 शà¤\95त नाहà¥\80.\nतà¥\8b सà¥\80à¤\9cà¥\80à¤\86य-à¤\86धारित व à¤\87मà¥\87à¤\9c_à¤\91थला समरà¥\8dथन न दà¥\87à¤\8a शà¤\95णारा à¤\85सà¥\82 शà¤\95तà¥\8b.\nhttps://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization à¤\95à¥\83पया हे पहा.",
- "img-auth-notindir": "माà¤\97ितलà¥\87ला मारà¥\8dà¤\97 à¤\85पलà¥\8bड निरà¥\8dदà¥\87शिà¤\95à¥\87à¤\95रà¥\80ता à¤\9cà¥\8bडलà¥\87ला नाही.",
+ "img-auth-nopathinfo": "मारà¥\8dà¤\97 माहितà¥\80 à¤\86ढळलà¥\80 नाहà¥\80.\nà¤\86पला सरà¥\8dवà¥\8dहर हà¥\80 माहितà¥\80 दà¥\87णà¥\8dयास à¤\85नà¥\81नत नाहà¥\80.\nतà¥\8b सà¥\80à¤\9cà¥\80à¤\86य-à¤\86धारित व à¤\87मà¥\87à¤\9c_à¤\91थला समरà¥\8dथन न दà¥\87à¤\8a शà¤\95णारा à¤\85सà¥\82 शà¤\95तà¥\8b.\nà¤\95à¥\83पया https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization हे पहा.",
+ "img-auth-notindir": "विनà¤\82तà¥\80 à¤\95à¥\87लà¥\87ला मारà¥\8dà¤\97 à¤\85पà¤à¤¾à¤°à¤£ शबà¥\8dदà¤\95à¥\8bशाà¤\95रà¥\80ता रà¤\9aित नाही.",
"img-auth-badtitle": "\"$1\" पासून वैध शीर्षक बनवण्यात अयशस्वी.",
"img-auth-nologinnWL": "तुम्ही प्रवेश घेतलेला नाही व \"$1\" श्वेतयादीत नाही.",
"img-auth-nofile": "\"$1\" ही संचिका अस्तित्वात नाही.",
- "img-auth-isdir": "तुम्ही $1 निदेशक वापरण्याचा प्रयत्न करत आहात.\nफक्त संचिका वापरण्याची परवानगी आहे.",
+ "img-auth-isdir": "तुम्ही \"$1\" निदेशक वापरण्याचा प्रयत्न करत आहात.\nफक्त संचिका वापरण्याची परवानगी आहे.",
"img-auth-streaming": "स्ट्रीमिंग \"$1\".",
"img-auth-public": "img_auth.php हे वैयक्तिक विकीमधून माहिती प्रदान करण्याचे कार्य करते.\nहा विकि सार्वजनिक विकि म्हणून सब्चित करण्यात आला आहे.\nकिमान सुरक्षेसाठी img_auth.php ला अक्षम केले आहे.",
"img-auth-noread": "तुम्हाला \"$1\" वाचण्याची परवानगी नाही",
"http-bad-status": "एचटीटीपी मागणीदरम्यान एक चूक उद्भवली: $1 $2",
"upload-curl-error6": "आंतरजाल पत्त्यापाशी पोहोचले नाही",
"upload-curl-error6-text": "दिलेल्या URL ला पोहचू शकलो नाही.कृपया URL बरोबर असून संकेतस्थळ चालू असल्याची पुनश्च खात्री करा.",
- "upload-curl-error28": "à¤\9aढवणà¥\8dयात वà¥\87ळà¤\97à¥\87लà¥\80",
- "upload-curl-error28-text": "संकेतस्थळाने साद देण्यात खूप जास्त वेळ घेतला आहे,कृपया थोडा वेळ थांबा आणि पुन्हा प्रयत्न करा.कदाचित तुम्ही कमी गर्दीच्या वेळात प्रयत्न करू इच्छीताल.",
+ "upload-curl-error28": "à¤\85पà¤à¤¾à¤°à¤£ à¤\95ालबाहà¥\8dय à¤\9dालà¥\87",
+ "upload-curl-error28-text": "संकेतस्थळाने साद देण्यात खूप जास्त वेळ घेतला आहे.\nकृपया हे तपासा कि ते संकेतस्थळ सुरु आहे.थोडा वेळ थांबा आणि पुन्हा प्रयत्न करा.\nकदाचित तुम्ही कमी गर्दीच्या वेळात प्रयत्न करू इच्छीत असाल.",
"license": "परवाना:",
"license-header": "परवाना:",
"nolicense": "काही निवडलेले नाही",
"upload_source_file": "(तुमच्या संगणकावरील एक संचिका निवडली आहे)",
"listfiles-delete": "वगळा",
"listfiles-summary": "हे विशेष पान सर्व अपभारिलेल्या संचिका दर्शिविते.",
- "listfiles_search_for": "à¤\9aितà¥\8dर नावानà¥\87 शà¥\8bध:",
+ "listfiles_search_for": "माधà¥\8dयमाà¤\9aà¥\87 नाव शà¥\8bधा:",
"listfiles-userdoesnotexist": "सदस्यखाते \"$1\" हे नोंदलेले नाही.",
"imgfile": "संचिका",
- "listfiles": "à¤\9aितà¥\8dर यादी",
+ "listfiles": "सà¤\82à¤\9aिà¤\95ा यादी",
"listfiles_thumb": "नखुले",
"listfiles_date": "दिनांक",
"listfiles_name": "नाव",
"filehist-comment": "प्रतिक्रीया",
"imagelinks": "संचिका वापर",
"linkstoimage": "खालील {{PLURAL:$1|पान चित्राशी जोडले आहे|$1 पाने चित्राशी जोडली आहेत}}:",
- "linkstoimage-more": "या सà¤\82à¤\9aिà¤\95à¥\87 ला $1 {{PLURAL:$1|पान à¤\9cà¥\8bडलà¥\87|पानà¥\87 à¤\9cà¥\8bडलà¥\80}} à¤\86हà¥\87त.\nया सà¤\82à¤\9aिà¤\95à¥\87 ला à¤\9cà¥\8bडलà¥\87लà¥\8dया {{PLURAL:$1|पहिलà¥\8dया पानà¤\9aा दà¥\81वा à¤\96ालà¥\80 दिला à¤\86हà¥\87|पहिलà¥\8dया $1 पानाà¤\82à¤\9aà¥\87 दà¥\81वà¥\87 à¤\96ालà¥\80 दिलà¥\87 à¤\86हà¥\87त}}.\n[[Special:WhatLinksHere/$2|संपुर्ण यादी]] उपलब्ध आहे.",
+ "linkstoimage-more": "या सà¤\82à¤\9aिà¤\95à¥\87 ला $1 {{PLURAL:$1|पान à¤\9cà¥\8bडलà¥\87|पानà¥\87 à¤\9cà¥\8bडलà¥\80}} à¤\86हà¥\87त.\nà¤\96ालà¥\80ल यादà¥\80 या सà¤\82à¤\9aिà¤\95à¥\87 ला à¤\9cà¥\8bडलà¥\87लà¥\8dया {{PLURAL:$1|पहिलà¥\8dया पानाà¤\9aा दà¥\81वा |पहिलà¥\8dया $1 पानाà¤\82à¤\9aà¥\87 दà¥\81वà¥\87 }}दरà¥\8dशवितà¥\87.\n[[Special:WhatLinksHere/$2|संपुर्ण यादी]] उपलब्ध आहे.",
"nolinkstoimage": "या चित्राशी जोडलेली पृष्ठे नाही आहेत.",
"morelinkstoimage": "या संचिकेचे [[Special:WhatLinksHere/$1|अधिक दुवे]] पहा.",
"linkstoimage-redirect": "$1 (संचिका पुनर्निर्देशन) $2",
"duplicatesoffile": "खालील संचिका या दिलेल्या {{PLURAL:$1|संचिकेची प्रत आहे|$1 संचिकांच्या प्रती आहेत}}. [[Special:FileDuplicateSearch/$2|अधिक माहिती]]",
- "sharedupload": "हà¥\80 सà¤\82à¤\9aिà¤\95ा $1 मधà¥\80ल à¤\86हà¥\87 व तà¥\80 à¤\87तर पà¥\8dरà¤\95लà¥\8dपाà¤\82मधà¥\8dयà¥\87 वापरलà¥\80 à¤\97à¥\87लà¥\8dयाà¤\9aà¥\80 शà¤\95à¥\8dयता à¤\86हे.",
- "sharedupload-desc-there": "हà¥\80 सà¤\82à¤\9aिà¤\95ा $1 मधà¥\80ल à¤\86हà¥\87 व तà¥\80 à¤\87तर पà¥\8dरà¤\95लà¥\8dपाà¤\82मधà¥\8dयà¥\87 वापरलà¥\80 जाऊ शकते.\nअधिक माहिती साठी कृपया [$2 संचिका वर्णन पान] पहावे.",
+ "sharedupload": "हà¥\80 सà¤\82à¤\9aिà¤\95ा $1 मधà¥\80ल à¤\86हà¥\87 व तà¥\80 à¤\87तर पà¥\8dरà¤\95लà¥\8dपाà¤\82दà¥\8dवारà¥\87 वापरलà¥\8dया à¤\9cाà¤\8a शà¤\95ते.",
+ "sharedupload-desc-there": "हà¥\80 सà¤\82à¤\9aिà¤\95ा $1 मधà¥\80ल à¤\86हà¥\87 व तà¥\80 à¤\87तर पà¥\8dरà¤\95लà¥\8dपाà¤\82दà¥\8dवारà¥\87 वापरलà¥\8dया जाऊ शकते.\nअधिक माहिती साठी कृपया [$2 संचिका वर्णन पान] पहावे.",
"sharedupload-desc-here": "ही संचिका $1 येथील असून ती इतर प्रकल्पात वापरलेली असू शकते.\nतिचे तेथील [$2 संचिका वर्णन पान] खाली दाखवले आहे.",
"sharedupload-desc-edit": "संचिका $1 मधील आहे व ती इतर प्रकल्पांमध्ये वापरली जाऊ शकते.आपणास हवे असल्यास,या पानाच्या[$2 'संचिका वर्णन पान'] येथे,त्याची माहिती संपादु शकता.",
"sharedupload-desc-create": "संचिका $1 मधील आहे व ती इतर प्रकल्पांमध्ये वापरली जात असल्याची शक्यता आहे.आपणास हवे असल्यास,या पानाच्या[$2 'संचिका वर्णन पान'] येथे,त्याची माहिती संपादु शकता",
"filepage-nofile": "या नावाची संचिका अस्तित्वात नाही.",
"filepage-nofile-link": "या नावाची संचिका अस्तित्वात नाही, पण तुम्ही ती [$1 चढवू शकता].",
- "uploadnewversion-linktext": "या सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\80 नवà¥\80न à¤\86वà¥\83तà¥\8dतà¥\80 à¤\9aढवा",
+ "uploadnewversion-linktext": "या सà¤\82à¤\9aिà¤\95à¥\87à¤\9aà¥\8dया नवà¥\80न à¤\86वà¥\83तà¥\8dतà¥\80à¤\9aà¥\87 à¤\85पà¤à¤¾à¤°à¤£ à¤\95रा",
"shared-repo-from": "$1 पासून",
"shared-repo": "एक मुक्त कोश",
"upload-disallowed-here": "या संचिकेवर आपण पुनर्लिखाण करू शकत नाही.",
- "filerevert": "$1 पूर्वपद",
- "filerevert-legend": "संचिका पूर्वपदास",
+ "filerevert": "$1 पूर्वपदास न्या",
+ "filerevert-legend": "संचिका पूर्वपदास न्या",
"filerevert-intro": "तुम्ही [$3, $2 प्रमाणे आवर्तन$4 कडे]<strong>[[Media:$1|$1]]</strong> उलटवत आहात.",
"filerevert-comment": "कारण:",
"filerevert-defaultcomment": "$2, $1 च्या आवृत्तीस पूर्वपदावर ($3)",
- "filerevert-submit": "पूर्वपद",
+ "filerevert-submit": "पूर्वपदास न्या",
"filerevert-success": "[$3, $2 प्रमाणे आवर्तन $4]कडे<strong>[[Media:$1|$1]]</strong>उलटवण्यात आली.",
"filerevert-badversion": "दिलेलेल्या वेळ मापनानुसार,या संचिकेकरिता कोणतीही पूर्वीची स्थानिक आवृत्ती नाही.",
"filedelete": "$1 वगळा",
"statistics-edits": "{{SITENAME}} च्या सुरुवातीपासूनची पानांची संपादने",
"statistics-edits-average": "प्रतिपान सरासरी संपादने",
"statistics-users": "नोंदणीकृत [[Special:ListUsers|सदस्य]]",
- "statistics-users-active": "à¤\95ारà¥\8dयरत सदस्य",
- "statistics-users-active-desc": "{{PLURAL:$1|शेवटच्या दिवसात|शेवटच्या $1 दिवसांत}} एकतरी संपादन केलेले सदस्य",
+ "statistics-users-active": "à¤\95à¥\8dरियाशà¥\80ल सदस्य",
+ "statistics-users-active-desc": "शेवटच्या{{PLURAL:$1|दिवसात|$1 दिवसांत}} एकतरी संपादन केलेले सदस्य",
"pageswithprop": "'पृष्ठ गुणधर्म' असणारी पाने",
"pageswithprop-legend": "पृष्ठ गुणधर्म असणारी पाने",
"pageswithprop-text": "या पानावर अश्या पानांची यादी आहे जे एक विशिष्ट 'पृष्ठ गुणधर्म' वापरतात.",
"doubleredirects": "दुहेरी-पुनर्निर्देशने",
"doubleredirectstext": "हे पान, अशा पानांची यादी पुरवते की जी पाने, दुसऱ्या पुर्ननिर्देशीत पानाकडे पुर्ननिर्देशीत झाली आहेत.प्रत्येक ओळीत पहिल्या आणि दुसऱ्या पुर्ननिर्देशनाचा दुवा दिला आहे,तसेच, दुसऱ्या पुर्ननिर्देशनाचे लक्ष्य पान पण दिले आहे,जे मुळात ते \nलक्ष्यपान आहे ज्याकडे, पहिले पुनर्निर्देशन असावयास हवे.\n\n<del>खोडलेल्या प्रविष्टी</del>समायोजित करण्यात आलेल्या आहेत.",
"double-redirect-fixed-move": "[[$1]] हलवले गेले आहे.\nते आता स्वयंचलितरित्या अद्यतन केल्या गेले व [[$2]] येथे निर्देशित होते.",
- "double-redirect-fixed-maintenance": "[[$1]] ते [[$2]] हे चुकीचे पुनर्निर्देशन ठिकठाक केले.",
+ "double-redirect-fixed-maintenance": "देखभालीच्या कामादरम्यान,स्वयंचलितरित्या [[$1]]पासून ते [[$2]]ला, हे दुहेरी पुनर्निर्देशन ठिकठाक केले.",
"double-redirect-fixer": "पुनर्निर्देशन ठिकठाक करणारा",
"brokenredirects": "मोडकी पुनर्निर्देशने",
"brokenredirectstext": "खालील पुनर्निर्देशने अस्तित्वात नसलेली पाने जोडतात:",
"withoutinterwiki-submit": "दाखवा",
"fewestrevisions": "सगळ्यात कमी बदल असलेले लेख",
"nbytes": "$1 {{PLURAL:$1|बाइट}}",
- "ncategories": "$1 {{PLURAL:$1|वर्ग|वर्ग}}",
- "ninterwikis": "$1 {{PLURAL:$1|आंतरविकि|आंतरविकि दुवे}}",
+ "ncategories": "$1 {{PLURAL:$1|वर्ग}}",
+ "ninterwikis": "$1 {{PLURAL:$1|आंतरविकि}}",
"nlinks": "$1 {{PLURAL:$1|दुवा|दुवे}}",
"nmembers": "$1 {{PLURAL:$1|सदस्य}}",
"nmemberschanged": "$1 → $2 {{PLURAL:$2|सदस्य}}",
"lonelypagestext": "खालील पानांना {{SITENAME}}च्या इतर पानांकडून दुवा जोड झालेली नाही.",
"uncategorizedpages": "अवर्गीकृत पाने",
"uncategorizedcategories": "अवर्गीकृत वर्ग",
- "uncategorizedimages": "à¤\85वरà¥\8dà¤\97à¥\80à¤\95à¥\83त à¤\9aितà¥\8dरà¥\87",
+ "uncategorizedimages": "à¤\85वरà¥\8dà¤\97à¥\80à¤\95à¥\83त सà¤\82à¤\9aिà¤\95ा",
"uncategorizedtemplates": "अवर्गीकृत साचे",
"unusedcategories": "न वापरलेले वर्ग",
"unusedimages": "न वापरलेल्या संचिका",
"wantedpages": "पाहिजे असलेले लेख",
"wantedpages-badtitle": "परिणामाच्या यादीत अवैध शीर्षक: $1",
"wantedfiles": "पाहिजे असलेल्या संचिका",
- "wantedfiletext-cat": "पà¥\81ढà¥\80ल फाà¤\87लà¥\8dस वापरलà¥\8dया à¤\85सतà¥\80ल पण à¤\86ता à¤\85सà¥\8dतितà¥\8dवात नाहà¥\80त. बाहà¥\87रà¥\80ल ठिà¤\95ाणाà¤\82à¤\9aà¥\8dया फाà¤\87लà¥\8dस यà¥\87थà¥\87 दिसतात पण à¤\85सतà¥\80लà¤\9a à¤\85सà¥\87 नाहà¥\80. à¤\85शा फाà¤\87लà¥\8dस à¤\86ढळलà¥\8dयास वà¤\97ळलà¥\8dया à¤\9cातà¥\80ल. à¤\85शà¥\80 पानà¥\87 [[:$1]] यà¥\87थà¥\87 दिसतà¥\80ल.",
+ "wantedfiletext-cat": "पà¥\81ढà¥\80ल फाà¤\87लà¥\8dस वापरलà¥\8dया à¤\85सतà¥\80ल पण à¤\86ता à¤\85सà¥\8dतितà¥\8dवात नाहà¥\80त. बाहà¥\87रà¥\80ल ठिà¤\95ाणाà¤\82à¤\9aà¥\8dया फाà¤\87लà¥\8dस यà¥\87थà¥\87 दिसतात पण à¤\85सतà¥\80लà¤\9a à¤\85सà¥\87 नाहà¥\80. à¤\85शा फाà¤\87लà¥\8dस à¤\86ढळलà¥\8dयास वà¤\97ळलà¥\8dया à¤\9cातà¥\80ल. à¤\85तिरिà¤\95à¥\8dतपणà¥\87,à¤\85शà¥\80 पानà¥\87, à¤\9cà¥\8dयात à¤\9fाà¤\95लà¥\87लà¥\8dया सà¤\82à¤\9aिà¤\95ा à¤\85सà¥\8dतितà¥\8dवात नाहà¥\80त,तà¥\8dयाà¤\9aà¥\80 यादà¥\80 [[:$1]] यà¥\87थà¥\87 दिसà¥\87ल.",
"wantedfiletext-nocat": "पुढील फाइल्स वापरल्या असतील पण आता अस्तित्वात नाहीत. बाहेरील ठिकाणांच्या फाइल्स येथे दिसतात पण असतीलच असे नाही. अशा फाइल्स आढळल्यास वगळल्या जातील.",
"wantedtemplates": "पाहिजे असलेले साचे",
"mostlinked": "सर्वाधिक जोडलेली पाने",
"mostlinkedcategories": "सर्वाधिक जोडलेले वर्ग",
- "mostlinkedtemplates": "सरà¥\8dवाधिà¤\95 à¤\9cà¥\8bडलà¥\87लà¥\87 साà¤\9aे",
- "mostcategories": "सरà¥\8dवाधिà¤\95 वरà¥\8dà¤\97à¥\80à¤\95à¥\83त पाने",
+ "mostlinkedtemplates": "सरà¥\8dवाधिà¤\95 à¤\86à¤\82तरà¤à¥\82त पाने",
+ "mostcategories": "बहà¥\81तà¥\87à¤\95 सरà¥\8dव वरà¥\8dà¤\97 à¤\85सलà¥\87लà¥\80 पाने",
"mostimages": "सर्वाधिक जोडलेली चित्रे",
"mostinterwikis": "सर्वाधिक आंतरविकि दुवे असणारी पाने",
"mostrevisions": "सर्वाधिक बदललेले लेख",
"shortpages": "छोटी पाने",
"longpages": "मोठी पाने",
"deadendpages": "टोकाची पाने",
- "deadendpagestext": "या पानांवर या विकिवरील इतर कुठल्याही पानाला जोडणारा दुवा नाही.",
+ "deadendpagestext": "या पानांवर या {{SITENAME}}वरील इतर कुठल्याही पानाला जोडणारा दुवा नाही.",
"protectedpages": "सुरक्षित पाने",
"protectedpages-indef": "फक्त अनंत काळासाठी सुरक्षित केलेले",
- "protectedpages-summary": "या पानात,अस्तित्वात असणाऱ्या संरक्षित अशा पानाची यादी आहे.नवनिर्माणापासून संरक्षित शीर्षकांच्या यादीसाठी [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]] बघा.",
+ "protectedpages-summary": "या पानात,अस्तित्वात असणाऱ्या संरक्षित अशा पानाची यादी आहे.नवनिर्माणापासून संरक्षित शीर्षकांच्या यादीसाठी [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]] बघा.",
"protectedpages-cascade": "केवळ एकामेकांवर अवलंबून कास्केडींग सुरक्षा (सुरक्षा शिडी)",
"protectedpages-noredirect": "पुनर्निर्देशने लपवा",
"protectedpagesempty": "सध्या या नियमावलीने कोणतीही पाने सुरक्षित केलेली नाहीत.",
"movethispage": "हे पान स्थानांतरित करा",
"unusedimagestext": "कृपया लक्षात घ्या की इतर संकेतस्थळे संचिकेशी थेट दुव्याने जोडल्या असू शकतात, त्यामुळे सक्रिय उपयोगात असून सुद्धा यादीत असू शकतात.",
"unusedcategoriestext": "खालील वर्ग पाने अस्तित्वात आहेत पण कोणतेही लेख किंवा वर्ग त्यांचा वापर करत नाहीत.",
- "notargettitle": "à¤\95रà¥\8dम(target) नाही",
+ "notargettitle": "लà¤\95à¥\8dषà¥\8dय(à¤\9fारà¤\97à¥\87à¤\9f) नाही",
"notargettext": "ही क्रिया करण्यासाठी तुम्ही सदस्य किंवा पृष्ठ लिहिले नाही.",
"nopagetitle": "असे लक्ष्य पान नाही",
"nopagetext": "तुम्ही दिलेले लक्ष्य पान अस्तित्वात नाही.",
"pager-newer-n": "{{PLURAL:$1|नवे 1|नवे $1}}",
"pager-older-n": "{{PLURAL:$1|जुने 1|जुने $1}}",
- "suppress": "à¤\9dापडबà¤\82द",
+ "suppress": "दमन à¤\95रा(सपà¥\8dरà¥\87स)",
"querypage-disabled": "हे विषेश पान कार्यमापन (performance) करणांमुळे प्रतिबंधित करण्यात आले आहे.",
+ "apihelp": "एपीआय साहाय्य",
+ "apihelp-no-such-module": "मॉड्यूल \"$1\" सापडत नाही.",
"booksources": "पुस्तक स्रोत",
"booksources-search-legend": "पुस्तक स्रोत शोधा",
"booksources-search": "शोधा",
"booksources-text": "खालील यादीत नवी आणिजुनी पुस्तके विकणाऱ्या संकेतस्थळाचे दुवे आहेत,आणि त्यात कदाचित आपण शोधू पहात असलेल्या पुस्तकाची अधिक माहिती असेल:",
"booksources-invalid-isbn": "दिलेला आयएसबीएन वैध नाही; मूळ स्रोतातून उतरवताना झालेल्या चुकांचे निरसन करा.",
"specialloguserlabel": "कार्यकर्ता:",
- "speciallogtitlelabel": "à¤\89दà¥\8dदिषà¥\8dà¤\9f (लà¤\95à¥\8dष):",
+ "speciallogtitlelabel": "लà¤\95à¥\8dष (शिरà¥\8dषà¤\95 à¤\95िà¤\82वा {{ns:user}}:सदसà¥\8dयाà¤\9aà¥\87 सदसà¥\8dयनाव):",
"log": "नोंदी",
"all-logs-page": "सर्व नोंदी",
"alllogstext": "{{SITENAME}}च्या सर्व नोंदीचे एकत्र दर्शन.नोंद प्रकार, सदस्यनाव किंवा बाधित पान निवडून तुम्ही तुमचे दृश्यपान मर्यादित करू शकता.",
"allpages-hide-redirects": "पुनर्निर्देशने लपवा",
"cachedspecial-viewing-cached-ttl": "तुम्ही या पानाची कॅचड् आवृत्ती पहात आहात. पाहत आहात या पाठया ची छोटी आवृत्ती,जी $1 ईतकी जुनी असू शकते.",
"cachedspecial-viewing-cached-ts": "तुम्ही या पानाची कॅचड् आवृत्ती पहात आहात. पाहत आहात या पाठया ची छोटी आवृत्ती,जी पुर्णतः मुळ आवृत्ती नसू शकते.",
- "cachedspecial-refresh-now": "à¤\86à¤\96à¥\87रà¤\9aà¥\87 दà¥\83शà¥\8dय",
+ "cachedspecial-refresh-now": "नà¥\81à¤\95तà¥\87à¤\9a à¤\95à¥\87लà¥\87लà¥\87 दाà¤\96वा.",
"categories": "वर्ग",
"categoriespagetext": "विकिवर खालील वर्ग {{PLURAL:$1|आहे|आहेत}}.\n[[Special:UnusedCategories|न वापरलेले वर्ग]] येथे दाखवलेले नाहीत.\nहेही पहा: [[Special:WantedCategories|पाहिजे असलेले वर्ग]].",
"categoriesfrom": "या शब्दापासून सुरू होणारे वर्ग दाखवा:",
- "special-categories-sort-count": "à¤\95à¥\8dरमानà¥\81सार लावा",
- "special-categories-sort-abc": "à¤\85à¤\95à¥\8dषराà¤\82पà¥\8dरमाणà¥\87 लावा",
+ "special-categories-sort-count": "मà¥\8bà¤\9cणà¥\80नà¥\81सार निवडा",
+ "special-categories-sort-abc": "à¤\85à¤\95ारविलà¥\8dहà¥\87 निवडा",
"deletedcontributions": "वगळलेली सदस्य संपादने",
"deletedcontributions-title": "वगळलेली सदस्य संपादने",
"sp-deletedcontributions-contribs": "संपादने",
"linksearch": "बाह्य दुवे शोध",
- "linksearch-pat": "शोधण्याचा मजकूर:",
+ "linksearch-pat": "शोध पद्धत:",
"linksearch-ns": "नामविश्व:",
"linksearch-ok": "शोध",
"linksearch-text": "\"*.wikipedia.org\" सारखी वाईल्डकार्ड्स वापरायला परवानगी आहे.\nकिमान एक उच्च-स्तरिय डोमेन,उदा.- \"*.org\".<br />गरजेचे आहे.\nसहाय्याचे प्रोटोकॉल्स {{PLURAL:$2|protocol|protocols}}: \n $1(जर कोणतेही प्रोटोकॉल्स नमूद केल्या गेले नसतील तर http://)हा डिफॉल्ट आहे.",
"listusersfrom": "पुढील शब्दापासून सुरू होणारे सदस्य दाखवा:",
"listusers-submit": "दाखवा",
"listusers-noresult": "एकही सदस्य सापडला नाही.",
- "listusers-blocked": "(à¤\96à¤\82डित)",
- "activeusers": "à¤\95ारà¥\8dयरत सदस्यांची यादी",
- "activeusers-intro": "$1 {{PLURAL:$1|day|days}} मधे शेवटी काम केलेल्या सदस्यांची यादी येथे मिळेल",
+ "listusers-blocked": "(à¤\85वरà¥\8bधित)",
+ "activeusers": "à¤\95à¥\8dरियाशà¥\80ल सदस्यांची यादी",
+ "activeusers-intro": "शेवटच्या $1 {{PLURAL:$1|दिवसात}} काम केलेल्या सदस्यांची यादी येथे मिळेल",
"activeusers-count": "शेवटच्या {{PLURAL:$3|दिवसात|$3 दिवसांत}} $1 {{PLURAL:$1|क्रिया}}",
"activeusers-from": "पुढील शब्दापासून सुरू होणारे सदस्य दाखवा:",
"activeusers-hidebots": "सांगकामे लपवा",
"listgrouprights-namespaceprotection-namespace": "नामविश्व",
"trackingcategories": "वर्ग शोधत आहोत",
"trackingcategories-name": "संदेश नाम",
+ "trackingcategories-nodesc": "वर्णन उपलब्ध नाही.",
+ "trackingcategories-disabled": "वर्ग अक्षम केल्या गेला आहे",
"mailnologin": "पाठविण्याचा पत्ता नाही",
"mailnologintext": "इतर सदस्यांना विपत्र(ई-मेल) पाठवण्याकरिता तुम्ही [[Special:UserLogin|प्रवेश केलेला]] असणे आणि प्रमाणित (ई-मेल) पत्ता तुमच्या [[Special:Preferences|पसंतीत]] नमूद असणे आवश्यक आहे.",
"emailuser": "या सदस्याला ई-मेल पाठवा",
"watchnologin": "सनोंद-प्रवेशित नाही",
"addwatch": "पहाऱ्याच्या सूचीमध्ये टाका",
"addedwatchtext": "\"[[:$1]]\" हे पान तुमच्या [[Special:Watchlist|'माझी निरीक्षणसूची']]मध्ये टाकले आहे. या पानावरील तसेच त्याच्या चर्चा पानावरील भविष्यातील बदल तेथे दाखवले जातील",
+ "addedwatchtext-short": "\"$1\" हे पान आपल्या निरीक्षणसूचीत जोडण्यात आले आहे.",
"removewatch": "पहाऱ्याच्या सूचीतून वगळा",
- "removedwatchtext": "\"[[:$1]]\" पान तुमच्या [[Special:Watchlist|पहाऱ्याच्या सूची]]तून वगळण्यात आले आहे.",
+ "removedwatchtext": "\"[[:$1]]\" हे पान व त्याची चर्चापाने तुमच्या [[Special:Watchlist|निरीक्षण सूचीतून]] हटविण्यात आले आहे.",
+ "removedwatchtext-short": "\"$1\" हे पान आपल्या निरीक्षणसूचीतुन हटविण्यात आले आहे.",
"watch": "पहारा",
"watchthispage": "या पानावर बदलांसाठी लक्ष ठेवा.",
"unwatch": "पहारा काढा",
"unwatchthispage": "पहारा काढून टाका",
"notanarticle": "हे आशयपान नाही",
"notvisiblerev": "आवृत्ती वगळण्यात आलेली आहे",
- "watchlist-details": "पहाऱ्याच्या सूचीमधील {{PLURAL:$1|$1 पान|$1 पाने}}, यात चर्चा पाने मोजलेली नाहीत.",
+ "watchlist-details": "पहाऱ्याच्या सूचीमधील {{PLURAL:$1|$1 पान|$1 पाने}}, यात चर्चा पाने वेगळी मोजलेली नाहीत.",
"wlheader-enotif": "विपत्र अधिसूचना सुविधा शक्य केली.",
"wlheader-showupdated": "ती पाने, जी आपण दिलेल्या शेवटच्या भेटीनंतर बदललेली आहेत, '''ठळक''' दाखवली आहेत.",
"wlnote": "खाली $3, $4 पर्यंतचे गेल्या {{PLURAL:$2| '''१''' तासातील|'''$2''' तासातील}} {{PLURAL:$1|शेवटचा बदल दिला आहे|शेवटाचे '''$1'''बदल दिले आहेत}}.",
"sp-contributions-newbies-sub": "नवशिक्यांसाठी",
"sp-contributions-newbies-title": "नवीन खात्यांसाठी सदस्य योगदान",
"sp-contributions-blocklog": "रोध नोंदी",
+ "sp-contributions-suppresslog": "सदस्य योगदानाचे दमन केले",
"sp-contributions-deleted": "वगळलेली सदस्य संपादने",
"sp-contributions-uploads": "अपभारणे",
"sp-contributions-logs": "नोंदी",
"sp-contributions-search": "योगदान शोधयंत्र",
"sp-contributions-username": "आंतरजाल अंकपत्ता किंवा सदस्यनाम:",
"sp-contributions-toponly": "केवळ नवीनतम आवर्तने असलेलीच संपादने दाखवा",
+ "sp-contributions-newonly": "केवळ पान तयार केलेली संपादनेच दाखवा",
"sp-contributions-submit": "शोध",
"whatlinkshere": "येथे काय जोडले आहे",
"whatlinkshere-title": "\"$1\" ला जुळलेली पाने",
"autoblockid": "स्वयंचलितपणे #$1ला प्रतिबंधित करा",
"block": "सदस्यास प्रतिबंध करा",
"unblock": "सदस्यप्रतिबंध काढा",
- "blockip": "हा अंकपत्ता अडवा",
+ "blockip": "{{GENDER:$1|सदस्यास}} प्रतिबंधित करा",
"blockip-legend": "सदस्यास प्रतिबंध करा",
"blockiptext": "एखाद्या विशिष्ट अंकपत्त्याची किंवा सदस्याची लिहिण्याची क्षमता प्रतिबंधित करण्याकरिता खालील सारणी वापरा.\nहे केवळ उच्छेद टाळण्याच्याच दृष्टीने आणि [[{{MediaWiki:Policy-url}}|निती]]स अनुसरून केले पाहिजे.\nखाली विशिष्ट कारण भरा(उदाहरणार्थ,ज्या पानांवर उच्छेद माजवला गेला त्यांची उद्धरणे देऊन).",
"ipaddressorusername": "अंकपत्ता किंवा सदस्यनाम:",
"ipb-unblock-addr": "$1चा प्रतिबंध उठवा",
"ipb-unblock": "सदस्यनाव आणि अंकपत्त्यावरचे प्रतिबंधन उठवा",
"ipb-blocklist": "सध्याचे प्रतिबंध पहा",
- "ipb-blocklist-contribs": "$1 साठी सदस्याचे योगदान",
+ "ipb-blocklist-contribs": "{{GENDER:$1|$1}}साठीचे योगदान",
"unblockip": "अंकपत्ता सोडवा",
"unblockiptext": "खाली दिलेला फॉर्म वापरून पूर्वी अडवलेल्या अंकपत्त्याला लेखनासाठी आधिकार द्या.",
"ipusubmit": "हा पत्ता सोडवा",
"thumbnail_image-failure-limit": "हे नखुले देण्यासाठी नुकतेच अनेक अयशस्वी प्रयत्न($1 किंवा अधिक) केल्या गेले आहेत.कृपया नंतर पुन्हा प्रयत्न करा.",
"import": "पाने आयात करा",
"importinterwiki": "दुसऱ्या विकीवरुन आयात करा",
- "import-interwiki-text": "à¤\86यात à¤\95रणà¥\8dयाà¤\95रिता à¤\8fà¤\95 विà¤\95ि à¤\86णि पानाà¤\9aा मथळा निवडा.\nà¤\86वरà¥\8dतनाà¤\82à¤\9aà¥\8dया तारà¤\96ा à¤\86णि सà¤\82पादà¤\95ाà¤\82à¤\9aà¥\80 नावà¥\87 à¤\9cतन à¤\95à¥\87लà¥\80 à¤\9cातà¥\80ल.\nसरà¥\8dव à¤\86à¤\82तरविà¤\95ि à¤\86यात à¤\95à¥\8dरिया [[Special:Log/import|à¤\86यात नà¥\8bà¤\82दà¥\80त]] दाà¤\96ल à¤\95à¥\87लà¥\8dया à¤\86हà¥\87त.",
+ "import-interwiki-text": "à¤\86यात à¤\95रणà¥\8dयाà¤\95रिता à¤\8fà¤\95 विà¤\95ि à¤\86णि पानाà¤\9aा मथळा निवडा.\nà¤\86वरà¥\8dतनाà¤\82à¤\9aà¥\8dया तारà¤\96ा à¤\86णि सà¤\82पादà¤\95ाà¤\82à¤\9aà¥\80 नावà¥\87 à¤\9cतन à¤\95à¥\87लà¥\80 à¤\9cातà¥\80ल.\nसरà¥\8dव à¤\86à¤\82तरविà¤\95ि à¤\86यात à¤\95à¥\8dरिया [[Special:Log/import|à¤\86यात नà¥\8bà¤\82दà¥\80त]] दाà¤\96ल à¤\95रणà¥\8dयात यà¥\87तात.",
"import-interwiki-sourcewiki": "स्रोत विकि:",
"import-interwiki-sourcepage": "स्रोत पान:",
"import-interwiki-history": "या पानाकरिताची साऱ्या इतिहास आवर्तनांची नक्कल करा",
"import-upload": "XML डाटा चढवा",
"import-token-mismatch": "अधिवेशन माहितीची हानी.\nकृपया पुन्हा प्रयत्न करा.",
"import-invalid-interwiki": "नमूद केलेल्या विकिमधून आयात करू शकत नाही.",
- "import-error-edit": "तुम्हाला संपादनाची परवानगी नसल्याने $1 पान आयात केले गेले नाही.",
- "import-error-create": "तुम्हाला $1 तयार करण्याची परवानगी नसल्याने ते आयात केले गेले नाही.",
- "import-error-interwiki": "à¤\87à¤\82à¤\9fर विà¤\95à¥\80 लिà¤\82à¤\95 साठà¥\80 $1 पान à¤\86रà¤\95à¥\8dषित à¤\95à¥\87लà¥\8dयामà¥\81ळà¥\87 तà¥\87 à¤\87मà¥\8dपà¥\8bरà¥\8dà¤\9f à¤\95रà¥\82 शà¤\95त नाहà¥\80",
- "import-error-special": "विशà¥\87ष नामविशà¥\8dवासाठà¥\80 $1 पान à¤\86रà¤\95à¥\8dषित à¤\95à¥\87लà¥\8dयामà¥\81ळà¥\87 तà¥\87 à¤\87मà¥\8dपà¥\8bरà¥\8dà¤\9f à¤\95रà¥\82 शà¤\95त नाहà¥\80. या नामविशà¥\8dवात पानà¥\87 à¤\85सत नाहà¥\80त.",
- "import-error-invalid": "नाव à¤\85यà¥\8bà¤\97à¥\8dय à¤\85सलà¥\8dयानà¥\87 $1 पान à¤\87मà¥\8dपà¥\8bरà¥\8dà¤\9f à¤\95रà¥\82 शà¤\95त नाहà¥\80.",
+ "import-error-edit": "तुम्हाला संपादनाची परवानगी नसल्याने \"$1\" पान आयात केल्या गेले नाही.",
+ "import-error-create": "तुम्हाला पान \"$1\" तयार करण्याची परवानगी नसल्याने ते आयात केल्या गेले नाही.",
+ "import-error-interwiki": "पान \"$1\" à¤\86यात à¤\95à¥\87लà¥\8dया à¤\97à¥\87लà¥\87 नाहà¥\80 à¤\95ारण तà¥\8dयाà¤\9aà¥\87 नाव बाहà¥\8dय दà¥\81वà¥\8dयाà¤\82साठà¥\80 (à¤\86à¤\82तरविà¤\95ि) à¤\86रà¤\95à¥\8dषित à¤\86हà¥\87.",
+ "import-error-special": "पान \"$1\" à¤\86यात à¤\95à¥\87लà¥\8dया à¤\97à¥\87लà¥\87 नाहà¥\80 à¤\95ारण तà¥\87 विशà¥\87ष नामविशà¥\8dवात à¤\85सलà¥\8dयामà¥\81ळà¥\87 तà¥\87 पानाà¤\82ना (साठविणà¥\8dयाà¤\9aà¥\80)परवानà¤\97à¥\80 दà¥\87त नाहà¥\80.",
+ "import-error-invalid": "पान \"$1\" à¤\86यात à¤\95à¥\87लà¥\8dया à¤\97à¥\87लà¥\87 नाहà¥\80 à¤\95ारण तà¥\87 à¤\9cà¥\8dया नावात à¤\86यात à¤\95रणà¥\8dयात यà¥\87त à¤\86हà¥\87 तà¥\87 नाव या विà¤\95ित à¤\85वà¥\88ध à¤\86हà¥\87.",
"import-error-unserialize": " \"$1\" पानाची $2 आवृत्ती अनुक्रमांकातून काढता आली नाही.ही आवृत्ती कंटेंट मॉडेल $3 वापरत असल्याचा व $4 म्हणून अनुक्रमांकीत झाली असल्याचा अहवाल प्राप्त झाला आहे.",
"import-options-wrong": "चुकिचे {{PLURAL:$2|विकल्प}}: <nowiki>$1</nowiki>",
"import-rootpage-invalid": "दिलेले मूळ पान अवैध नाव आहे",
"import-rootpage-nosubpage": "\"$1\" नामविश्वाची मुल पाने, उपपानास परवानगी देत नाही.",
"importlogpage": "ईम्पोर्ट सूची",
"importlogpagetext": "इतर विकिक्डून पानांची, संपादकीय इतिहासासहीत, प्रबंधकीय आयात.",
- "import-logentry-upload-detail": "$1 {{PLURAL:$1|आवर्तन|आवर्तने}}",
- "import-logentry-interwiki-detail": "$2 पासून $1 {{PLURAL:$1|आवर्तन|आवर्तने}}",
+ "import-logentry-upload-detail": "$1 {{PLURAL:$1|आवर्तन|आवर्तने}}आयात केलीत",
+ "import-logentry-interwiki-detail": "$2 पासून $1 {{PLURAL:$1|आवर्तन|आवर्तने}} आयात केलीत",
"javascripttest": "जावा स्क्रिप्ट तपासणी",
"javascripttest-pagetext-noframework": "हे पान जावा स्क्रिप्ट तपासणी साठी सुरक्षित केले आहे",
"javascripttest-pagetext-unknownframework": "अज्ञात तपासणीचे ठिकाण $1",
+ "javascripttest-pagetext-unknownaction": "अनोळखी क्रिया \"$1\".",
"javascripttest-pagetext-frameworks": "कृपया टेस्टिंग साठी पुढील पैकी व्यवस्था / पद्धत निवडावी: $1",
"javascripttest-pagetext-skins": "टेस्ट करण्यासाठी योग्य ती स्कीन निवडावी",
"javascripttest-qunit-intro": "mediawiki.org वर [$1 testing documentation] पहा",
"tooltip-feed-atom": "या पानाकरिता ऍटम रसद",
"tooltip-t-contributions": "या सदस्याच्या योगदानांची यादी पहा",
"tooltip-t-emailuser": "या सदस्याला ई-मेल पाठवा",
+ "tooltip-t-info": "या पानाबाबत अधिक माहिती",
"tooltip-t-upload": "संचिकेचे अपभारण करा",
"tooltip-t-specialpages": "सर्व विशेष पृष्ठांची यादी",
"tooltip-t-print": "या पानाची छापण्यायोग्य आवृत्ती",
"pageinfo-length": "पानाचा आकार (बाइट्समध्ये)",
"pageinfo-article-id": "पृष्ठ-परिचय",
"pageinfo-language": "पानाच्या मजकूराची भाषा",
+ "pageinfo-content-model": "पान आशय नमूना",
"pageinfo-robot-policy": "यंत्रमानवाद्वारे अनुक्रमन",
"pageinfo-robot-index": "अनुमती दिली",
"pageinfo-robot-noindex": "अनुमती दिल्या जात नाही",
"pageinfo-protect-cascading-yes": "होय",
"pageinfo-protect-cascading-from": "रखणे(प्रोटक्शन्स) प्रपातीत होतात (कॅस्केडिंग) येथून",
"pageinfo-category-info": "वर्ग माहिती",
+ "pageinfo-category-total": "सदस्यांचा एकूण आकडा",
"pageinfo-category-pages": "पानांची संख्या",
"pageinfo-category-subcats": "उपवर्गांची संख्या",
"pageinfo-category-files": "संचिकांची संख्या",
"confirm-watch-top": "हे पान तुमच्या पहारा सूचीमध्ये टाकायचे?",
"confirm-unwatch-button": "ठिक आहे",
"confirm-unwatch-top": "हे पान तुमच्या नित्य पहाण्याच्या सूचीतून काढायचे?",
+ "quotation-marks": "\"$1\"",
"imgmultipageprev": "← मागील पान",
"imgmultipagenext": "पुढील पान →",
"imgmultigo": "चला!",
"duplicate-defaultsort": "'''ताकिद:''' डिफॉल्ट सॉर्ट की \"$2\" ओवर्राइड्स अर्लीयर डिफॉल्ट सॉर्ट की \"$1\".",
"version": "आवृत्ती",
"version-extensions": "स्थापित विस्तार",
- "version-skins": "त्वचा",
+ "version-skins": "à¤\87à¤\82सà¥\8dà¤\9fà¥\89ल à¤\95à¥\87लà¥\8dया à¤\97à¥\87लà¥\87लà¥\8dया तà¥\8dवà¤\9aा",
"version-specialpages": "विशेष पाने",
"version-parserhooks": "पृथकक अंकुश",
"version-variables": "चल",
"version-hook-name": "अंकुश नाव",
"version-hook-subscribedby": "वर्गणीदार",
"version-version": "($1)",
+ "version-no-ext-name": "[नाव नाही]",
"version-license": "मिडियाविकि परवाना",
"version-ext-license": "परवाना",
"version-ext-colheader-name": "विस्तारक",
+ "version-skin-colheader-name": "त्वचा",
"version-ext-colheader-version": "आवृत्ती",
"version-ext-colheader-license": "परवाना",
"version-ext-colheader-description": "वर्णन",
"version-ext-colheader-credits": "लेखक",
"version-license-title": "$1 साठी परवाना",
"version-license-not-found": "या विस्तारकासाठी विस्तृत परवाना माहिती सापडली नाही.",
+ "version-credits-title": "$1साठीचे श्रेय",
+ "version-credits-not-found": "या विस्तारकासाठी विस्तृत श्रेयनिर्देशन माहिती सापडली नाही.",
"version-poweredby-credits": "हा विकी '''[https://www.mediawiki.org/ मीडियाविकी]'''द्वारे संचालित आहे, प्रताधिकारित © २००१-$1 $2.",
"version-poweredby-others": "इतर",
"version-poweredby-translators": "ट्रांसलेटविकि.नेट वरील भाषांतरकार",
"specialpages-group-wiki": "डाटा व उपकरणे",
"specialpages-group-redirects": "पुनर्निर्देशन करणारी विशेष पृष्ठे",
"specialpages-group-spam": "उत्पात साधने",
+ "specialpages-group-developer": "विकसक उपकरण",
"blankpage": "रिकामे पान",
"intentionallyblankpage": "हे पान मुद्दाम कोरे सोडण्यात आले आहे.",
"external_image_whitelist": "#ही ओळ जशी आहे तशीच घ्या.\n#\n#.\n#\n#\n#हे केस सेन्सेटिव्ह आहे.",
"feedback-subject": "विषय:",
"feedback-submit": "सादर करा",
"feedback-thanks": " \"[$2 $1]\" या पानात आपला पश्चप्रदाय (फिडबॅक) टाकत आहोत.",
+ "feedback-thanks-title": "आपणास धन्यवाद!",
+ "feedback-useragent": "सदस्य प्रतिनीधी:",
"searchsuggest-search": "शोधा",
"searchsuggest-containing": ".......हे असलेले",
"api-error-badaccess-groups": "आपणास ह्या विकिवर संचिका चढवण्याची परवानगी नाही",
"expand_templates_generate_xml": "XML चा पार्स (parse) वृक्ष दाखवा",
"expand_templates_preview": "झलक",
"pagelang-name": "पान",
+ "pagelang-language": "भाषा",
+ "pagelang-use-default": "अविचल भाषा वापरा",
+ "pagelang-select-lang": "भाषा निवडा",
+ "right-pagelang": "पानाची भाषा बदला",
+ "action-pagelang": "पानाची असलेली भाषा बदला",
+ "log-name-pagelang": "भाषा बदल नोंदवही",
+ "mediastatistics-table-extensions": "शक्य विस्तारके",
+ "mediastatistics-table-count": "संचिकांची संख्या",
+ "mediastatistics-table-totalbytes": "एकत्रित आकार",
+ "mediastatistics-header-unknown": "अनोळखी",
"mediastatistics-header-office": "कार्यालय",
"special-characters-group-latin": "लॅटीन",
"special-characters-group-latinextended": "विस्तारीत लॅटीन भाषा",
"special-characters-title-minus": "ॠण चिन्ह",
"mw-widgets-dateinput-no-date": "कोणताही दिनांक निवडला नाही",
"mw-widgets-titleinput-description-new-page": "अद्याप पान अस्तित्वात नाही",
+ "mw-widgets-titleinput-description-redirect": "$1ला पुनर्निर्देशित करा",
"api-error-blacklisted": "कुपया वेगळे वर्णनात्मक शीर्षक निवडा"
}
"tog-enotifrevealaddr": "Näytä minun sähköpoštuadressii muile lähetettylöis ilmoituksis",
"tog-shownumberswatching": "Ozuta tädä sivuu tarkailevien käyttäjien miäriä",
"tog-oldsig": "Nygöine allekirjutus:",
- "tog-fancysig": "Allekirjutus wikitekstannu (automuattizettah linkittäh)",
+ "tog-fancysig": "Allekirjutus wikitekstannu (ilmai automuattistu linkii)",
"tog-uselivepreview": "Käytä välittömiä ezikaččeluu",
"tog-forceeditsummary": "Huomavuta minuu, gu en olle kirjutannuh yhtehveduo",
"tog-watchlisthideown": "Peitä minun korjavukset valvonduluvettelospäi",
"tog-prefershttps": "Käytä ainos suojattuu yhtevytty ku olet kirjutannuhes",
"underline-always": "Ainos",
"underline-never": "Nikonzu",
- "underline-default": "Ketun libo livaimen piäazetus",
+ "underline-default": "Käytä livaimen piäazetuksii",
"editfont-style": "Edituičendualovehen kirjainstiil'u:",
"editfont-default": "Livaimen piäazetus",
"editfont-monospace": "Tazalevyhine kirjain",
"pt-userlogout": "Kirjuttai ullos",
"php-mail-error-unknown": "Tundematoi haireh PHP:n mail()-funktsies",
"user-mail-no-addy": "Opit työndiä sähköpoštan sähköpoštuadressittah.",
- "user-mail-no-body": "Sähköpoštan syväindön pidäy olla pitkembi.",
+ "user-mail-no-body": "Sähköpoštan syväindö pidäy olla suurembi.",
"changepassword": "Vaihta peittosana",
"resetpass_announce": "Suaja sizähkirjuamine loppuh, sinul pidäy keksie uuzi peittosana.",
"resetpass_header": "Vaihta tilin peittosana",
"showdiff": "Luajitut korjavukset",
"anoneditwarning": "<strong>Varaitus:</strong> Et ole kirjutannuhes. Luadinet muutoksii syväindölöih, sinun Ip-adressu tulou nägövih kaikile. Ku <strong>[$1 kirjutannuttos]</strong> libo <strong>[$2 registriiruičettos]</strong>, sinun syväindömuutokset nävytäh sinun käyttäinimel, toizien eduloin ližäkse.",
"summary-preview": "Yhtehvevon ezikačondu:",
- "subject-preview": "Tiemam ezikačondu:",
+ "subject-preview": "Teeman ezikačondu:",
"previewerrortext": "Rodih haireh oppijes ezikaččuo muutoksii.",
"blockedtitle": "Käyttäi on estetty",
"blockednoreason": "ei viärysty annettu",
"whitelistedittext": "Sinun pidäy $1 ku edituija sivuloi.",
- "nosuchsectiontitle": "Nengostu sektua ei ole",
- "loginreqtitle": "Pidäy kirjautuakseh",
+ "nosuchsectiontitle": "Nengostu sektsiedu ei ole",
+ "loginreqtitle": "Pidäy kirjuttuakseh",
"loginreqlink": "kirjuttai",
"loginreqpagetext": "Toizien sivuloin kaččomizekse pidäy $1.",
"accmailtitle": "Peittosana työtty",
"editing": "Edituijah sivuu $1",
"creating": "Luajitah sivuu \"$1\"",
"editingsection": "Korjuandu $1 (alalugu)",
- "editingcomment": "Edituijah $1 (uuzi sektu)",
+ "editingcomment": "Edituijah $1 (uuzi sektsii)",
"yourtext": "Sinun tekstu",
"yourdiff": "Erot",
"templatesused": "{{PLURAL:$1|Šablon|Šablonat}} käytetty täl sivul:",
"template-protected": "(suojattu)",
"template-semiprotected": "(puolekse suojattu)",
"hiddencategories": "Tämä sivu kuuluu {{PLURAL:$1|1 peitettyh kategourieh|$1 peitettyh kategourieh}}:",
- "sectioneditnotsupported-title": "Sektan kohendustu ei tuveta.",
- "sectioneditnotsupported-text": "Sektan kohendustu ei tuveta täl sivul.",
+ "sectioneditnotsupported-title": "Sektsien kohendustu ei tuveta.",
+ "sectioneditnotsupported-text": "Sektsieb kohendustu ei tuveta täl sivul.",
"permissionserrors": "Ei oigevuksii",
"permissionserrorstext": "Sinul ei ole lubua toimindoh {{PLURAL:$1|tämän syyn periä|nämmien syylöin periä}}:",
"permissionserrorstext-withaction": "Sinul ei ole lubua toimindoh $2 niškoi, {{PLURAL:$1|tämän syyn periä|nämmien syylöin periä}}:",
"moveddeleted-notice": "Tämä sivu on otettu iäre. Sivun iäreotandu- da siirdohistourii ollah annettu al viittavuksennu.",
"postedit-confirmation-created": "Sivu on nygöi luajittu.",
- "postedit-confirmation-restored": "Sivus on otettu järilleh sen aijembi versii.",
+ "postedit-confirmation-restored": "Sivun aijembi versii on tuodu järilleh.",
"postedit-confirmation-saved": "Sinun kohendus tallendettih.",
"edit-already-exists": "Ei voi luadie uuttu sivuu. Se on jo olemas.",
"content-model-wikitext": "wikitekstu",
"content-json-empty-object": "Tyhjy objektu",
"cantcreateaccounttitle": "Ei voi luadie tunnustu",
"cantcreateaccount-text": "Tunnuksien luadimine täs IP-adressaspäi ('''$1''') on estetty. Estäjänny on [[User:$3|$3]].\n\nKäyttäjän $3 annettu syy on ''$2''",
- "cantcreateaccount-range-text": "Tunnuksien luadimine IP-adressilois adressualovehel '''$1''', kuduah kuuluu dai sinun käytetty IP-adressu('''$4'''), on estetty. Eston on azettanuh [[User:$3|$3]].\n\nKäyttäjän $3 annettu syy estole on \"$2\".",
+ "cantcreateaccount-range-text": "Tunnuksien luadimine IP-adressilois adressualovehel '''$1''', kuduah kuuluu sinungi käytetty IP-adressu('''$4'''), on estetty. Eston on azetannuh [[User:$3|$3]].\n\nKäyttäjän $3 annettu syy estole on \"$2\".",
"viewpagelogs": "Ozuta tämän sivun logat",
"nohistory": "Täl sivul ei ole kohendushistoriedu.",
"currentrev": "Jälgimäzin versii",
"history-feed-description": "Tämän sivun versiihistourii",
"history-feed-item-nocomment": "$1 ($2)",
"rev-deleted-user": "(käyttäinimi on otettu iäre)",
- "rev-deleted-event": "(logan tiijot on otettu iäre)",
+ "rev-deleted-event": "(login tiijot on otettu iäre)",
"rev-deleted-user-contribs": "[käyttäinimi libo IP-adressu on otettu iäre – edituičendu on peitetty edituičenduluvettelospäi]",
"rev-delundel": "vaihta nägyvys",
"rev-showdeleted": "ozuttua",
"pagehist": "Sivuhistourii",
"deletedhist": "Iäre otettuloin versielöin histourii",
"revdelete-offender": "Versien luadii:",
- "suppressionlog": "Peitändyloga",
+ "suppressionlog": "Peitändylog",
"mergehistory": "Yhtistä sivuloin edituičenduhistourii",
"mergehistory-header": "Täl sivul voit yhtistiä lähtehsivun sivuhistourien versielöi uvvemban sivun histourieh. Varmista, ku sivuloin yhtenäine edituičenduhistourii pyzyy eigo mene ristakkai immin-kummin!",
"mergehistory-box": "Yhtistä kahten sivun versielöi:",
"foreign-structured-upload-form-label-own-work-message-local": "Potwierdzam, że wysyłam ten plik zgodnie z warunkami i zasadami licencjowania obowiązującymi na {{SITENAME}}.",
"foreign-structured-upload-form-label-not-own-work-message-local": "Jeśli nie możesz wysłać tego pliku zgodnie z zasadami obowiązującymi na {{SITENAME}}, zamknij ten komunikat i spróbuj innej metody.",
"foreign-structured-upload-form-label-not-own-work-message-default": "Jeśli nie jesteś w stanie przesłać tego pliku zgodnie z zasadami współdzielonego repozytorium, zamknij to okno i spróbuj innej metody.",
+ "foreign-structured-upload-form-label-own-work-message-shared": "Oświadczam, że mam prawa autorskie do tego pliku, nieodwołalnie publikuję go na Wikimedia Commons na licencji [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons BY-SA 4.0] i zgadzam się na [https://wikimediafoundation.org/wiki/Terms_of_Use warunki użytkowania].",
+ "foreign-structured-upload-form-label-not-own-work-message-shared": "Jeżeli nie masz praw autorskich do tego pliku albo chcesz go opublikować na innej licencji, rozważ użycie [https://commons.wikimedia.org/wiki/Special:UploadWizard kreatora przesyłania plików].",
+ "foreign-structured-upload-form-label-not-own-work-local-shared": "Możesz spróbować użyć [[Special:Upload|kreatora przesyłania plików {{GRAMMAR:D.lp|{{SITENAME}}}}]], jeżeli wolontariusze {{GRAMMAR:D.lp|{{SITENAME}}}} dopuszczają publikację plików na własnych zasadach.",
"backend-fail-stream": "Nie można odczytać pliku $1.",
"backend-fail-backup": "Nie można utworzyć kopii zapasowej pliku $1 .",
"backend-fail-notexists": "Plik $1 nie istnieje.",
"passwordreset-emailsent-capture": "Foi enviado um correio eletrónico para recuperação da palavra-passe, que é mostrado abaixo.",
"passwordreset-emailerror-capture": "Foi gerado um correio eletrónico para redefinição da palavra-passe, mostrado abaixo, mas o seu envio para {{GENDER:$2|o utilizador|a utilizadora}} falhou: $1",
"changeemail": "Alterar ou remover o endereço de correio eletrónico",
- "changeemail-header": "Completa este formulário para alterar o seu endereço de correio electrónico. Se quer eliminar a associação de qualquer endereço de correio electrónico com a sua conta, deixa em branco o novo endereço de correio electrónico ao enviar o formulário.",
+ "changeemail-header": "Complete este formulário para alterar o seu endereço de correio eletrónico. Se quer eliminar a associação de qualquer endereço de correio eletrónico com a sua conta, deixe em branco o novo endereço de correio eletrónico ao submeter o formulário.",
"changeemail-passwordrequired": "Necessita de introduzir a sua palavra-passe para confirmar esta alteração.",
"changeemail-no-info": "Precisa de iniciar sessão para aceder diretamente a esta página.",
"changeemail-oldemail": "Correio eletrónico atual:",
"recentchangeslinked-page": "Nome da página:",
"recentchangeslinked-to": "Inversamente, mostrar mudanças às páginas que contêm ligações para esta",
"recentchanges-page-added-to-category": "[[:$1]] foi adicionada à categoria",
- "recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|uma página|$2 páginas}} foram adicionadas à categoria",
+ "recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|uma outra página|$2 outras páginas}} foram adicionadas à categoria",
"recentchanges-page-removed-from-category": "[[:$1]] foi removida da categoria",
- "recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|uma página|$2 páginas}} foram removidas da categoria",
+ "recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|uma outra página|$2 outras páginas}} foram removidas da categoria",
"upload": "Carregar ficheiro",
"uploadbtn": "Carregar ficheiro",
"reuploaddesc": "Cancelar o envio e voltar ao formulário de carregamento",
"showingresultsinrange": "Used in pagination of [[Special:MostLinkedCategories]]. Parameters:\n* $1 - the total number of results in the batch shown\n* $2 - the number of the first item listed\n* $3 - the number of last item in the batch shown\n\nSee also {{msg-mw|Showingresults}}",
"search-showingresults": "Used in search results of [[Special:Search]]. Parameters:\n* $1 - minimum offset\n* $2 - maximum offset\n* $3 - total number of results\n* $4 - number of results",
"search-nonefound": "Message shown when a search returned no results (when using the default MediaWiki search engine).",
+ "search-nonefound-thiswiki": "Message shown when a search in current wiki returned no results (when using the default MediaWiki search engine) but search in other wikis did return results.",
"powersearch-legend": "Advanced search\n\n{{Identical|Advanced search}}",
"powersearch-ns": "Used in the extended search form at [[Special:Search]]",
"powersearch-togglelabel": "Used in [{{canonicalurl:Special:Search|advanced=1}} Advanced search]. Synonym: \"Select\" as verb.\n{{Identical|Check}}",
"createaccountreason": "Motiv:",
"createacct-reason": "Motiv",
"createacct-reason-ph": "De ce creați un alt cont",
- "createacct-captcha": "Verificare de securitate",
- "createacct-imgcaptcha-ph": "Introduceți textul pe care îl vedeți deasupra",
"createacct-submit": "Creați-vă contul",
"createacct-another-submit": "Creează contul",
"createacct-benefit-heading": "{{SITENAME}} este un proiect clădit de oameni ca dumneavoastră.",
"permissionserrors": "Eroare de permisiune",
"permissionserrorstext": "Nu aveți permisiune pentru a face acest lucru, din următoarele {{PLURAL:$1|motiv|motive}}:",
"permissionserrorstext-withaction": "Nu aveți permisiunea să $2, din {{PLURAL:$1|următorul motiv|următoarele motive}}:",
+ "contentmodelediterror": "Nu puteți modifica această versiune, deoarece modelul de conținut al acesteia este <code>$1</code>, iar actualul model de conținut al paginii este <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Atenție: Recreați o pagină care a fost ștearsă anterior.'''\n\nAsigurați-vă că este oportună recrearea acestei pagini.\nJurnalul ștergerilor și al mutărilor pentru această pagină este disponibil:",
"moveddeleted-notice": "Această pagină a fost ștearsă.\nJurnalul ștergerilor și al redenumirilor este disponibil mai jos.",
"moveddeleted-notice-recent": "Ne cerem scuze, dar această pagină a fost ștearsă recent (în ultimele 24 de ore).\nJurnalele de ștergere și redenumire ale paginii sunt disponibile mai jos cu scop informativ.",
"permissionserrors": "Ошибка прав доступа",
"permissionserrorstext": "У вас нет прав на выполнение этой операции по {{PLURAL:$1|1=следующей причине|следующим причинам}}:",
"permissionserrorstext-withaction": "У вас нет прав на $2 по {{PLURAL:$1|1=следующей причине|следующим причинам}}:",
+ "contentmodelediterror": "Вы не можете редактировать эту версию, поскольку её моделью содержимого является <code>$1</code>, а текущая модель содержимого страницы — <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Внимание. Вы пытаетесь воссоздать страницу, которая ранее удалялась.'''\n\nПроверьте, действительно ли вам нужно воссоздавать эту страницу.\nНиже приведены журналы удалений и переименований этой страницы.",
"moveddeleted-notice": "Эта страница была удалена.\nДля справки ниже показаны соответствующие записи из журналов удалений и переименований.",
"moveddeleted-notice-recent": "К сожалению, эта страница была недавно удалена (в течение последних 24 часов).\nНиже для справки приведены журналы удаления и перемещения для этой страницы.",
"move-page-legend": "Переименование страницы",
"movepagetext": "Воспользовавшись нижеприведённой формой, вы переименуете страницу, одновременно переместив на новое место её журнал изменений.\nСтарое название станет перенаправлением на новое.\nВы можете автоматически обновить перенаправления, которые вели на старое название.\nЕсли вы этого не сделаете, пожалуйста, проверьте наличие [[Special:DoubleRedirects|двойных]] и [[Special:BrokenRedirects|разорванных перенаправлений]].\nВы отвечаете за то, чтобы ссылки продолжали и далее указывать туда, куда предполагалось.\n\nОбратите внимание, что страница <strong>не будет</strong> переименована, если уже существует страница с названием, идентичным выбранному, кроме случаев, когда такая страница пуста или представляет собой перенаправление, и при этом не имеет истории правок.\nЭто означает, что сделав ошибочное переименование, вы можете переименовать страницу обратно в то название, которое у неё только что было, но не можете случайно затереть существующую страницу.\n\n<strong>Предупреждение!</strong>\nПереименование популярных страниц может привести к масштабным и неожиданным изменениям.\nПожалуйста, прежде чем продолжать, убедитесь, что понимаете все возможные последствия.",
"movepagetext-noredirectfixer": "Воспользовавшись формой ниже, вы переименуете страницу, одновременно переместив на новое место её журнал изменений.\nСтарое название станет перенаправлением на новое название.\nПожалуйста, проверьте наличие [[Special:DoubleRedirects|двойных]] и [[Special:BrokenRedirects|разорванных перенаправлений]].\nВы отвечаете за то, чтобы ссылки продолжали и далее указывать туда, куда предполагалось.\n\nОбратите внимание, что страница <strong>не будет</strong> переименована, если страница с новым названием уже существует, кроме случаев, если она пуста или представляет собой перенаправление, и при этом не имеет истории правок.\nЭто означает, что сделав ошибочное переименование, вы сможете переименовать страницу обратно в то название, которое у неё только что было, но не сможете случайно затереть существующую страницу.\n\n<strong>Предупреждение!</strong>\nПереименование может привести к масштабным и неожиданным изменениям для популярных страниц.\nПожалуйста, прежде чем продолжить, убедитесь, что понимаете все возможные последствия.",
- "movepagetalktext": "Ð\9fÑ\80иÑ\81оединÑ\91ннаÑ\8f Ñ\81Ñ\82Ñ\80аниÑ\86а обÑ\81Ñ\83ждениÑ\8f бÑ\83деÑ\82 Ñ\82акже авÑ\82омаÑ\82иÑ\87еÑ\81ки пеÑ\80еименована, '''кÑ\80оме Ñ\81лÑ\83Ñ\87аев, когда:'''\n\n*Ð\9dе пÑ\83Ñ\81Ñ\82аÑ\8f Ñ\81Ñ\82Ñ\80аниÑ\86а обÑ\81Ñ\83ждениÑ\8f Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82 под Ñ\82аким же именем или\n*Ð\92Ñ\8b не поÑ\81Ñ\82авили галоÑ\87кÑ\83 в поле ниже.\n\nÐ\92 Ñ\8dÑ\82иÑ\85 Ñ\81лÑ\83Ñ\87аÑ\8fÑ\85, вÑ\8b бÑ\83деÑ\82е вÑ\8bнÑ\83жденÑ\8b пеÑ\80емеÑ\81Ñ\82иÑ\82Ñ\8c или обÑ\8aединиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e, еÑ\81ли Ñ\8dÑ\82о нÑ\83жно.",
+ "movepagetalktext": "Ð\95Ñ\81ли вÑ\8b оÑ\82меÑ\82иÑ\82е Ñ\8dÑ\82оÑ\82 пÑ\83нкÑ\82, Ñ\81вÑ\8fзаннаÑ\8f Ñ\81 ней Ñ\81Ñ\82Ñ\80аниÑ\86а обÑ\81Ñ\83ждениÑ\8f бÑ\83деÑ\82 Ñ\82акже авÑ\82омаÑ\82иÑ\87еÑ\81ки пеÑ\80еименована, еÑ\81ли Ñ\82олÑ\8cко Ñ\83же не Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82 непÑ\83Ñ\81Ñ\82аÑ\8f Ñ\81Ñ\82Ñ\80аниÑ\86а обÑ\81Ñ\83ждениÑ\8f Ñ\81 Ñ\82аким же названием.\n\nÐ\92 Ñ\8dÑ\82ом Ñ\81лÑ\83Ñ\87ае вам нÑ\83жно бÑ\83деÑ\82 пеÑ\80еименоваÑ\82Ñ\8c или обÑ\8aединиÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e, еÑ\81ли Ñ\8dÑ\82о необÑ\85одимо.",
"moveuserpage-warning": "'''Внимание.''' Вы собираетесь переименовать страницу участника. Пожалуйста, обратите внимание, что переименована будет только страница, участник '''не''' будет переименован.",
"movecategorypage-warning": "<strong>Предупреждение:</strong> Вы собираетесь переименовать страницу категории. Пожалуйста, обратите внимание, что будет переименована только эта страница, а все страницы старой категории <em>не</em> будут перекатегоризованы в новую.",
"movenologintext": "Вы должны [[Special:UserLogin|представиться системе]],\nчтобы иметь возможность переименовать страницы.",
"tags-edit-revision-submit": "Применить изменения к {{PLURAL:$1|этой версии|$1 версиям}}",
"tags-edit-logentry-submit": "Применить изменения к {{PLURAL:$1|этой записи журнала|$1 записям журнала}}",
"tags-edit-success": "Изменения были успешно применены.",
- "tags-edit-failure": "Ð\98зменениÑ\8f не Ñ\83далоÑ\81Ñ\8c пÑ\80именениÑ\82Ñ\8c.\n$1",
+ "tags-edit-failure": "Изменения не удалось применить.\n$1",
"tags-edit-nooldid-title": "Не задана целевая версия",
"tags-edit-nooldid-text": "Вы не задали целевую версию (версии) для выполнения этой функции, или указанная версия не существует.",
"tags-edit-none-selected": "Пожалуйста, выберите по крайней мере один тег, чтобы добавить или удалить.",
"tog-hideminor": "Кыра көннөрүүлэри көрдөрбөккө",
"tog-hidepatrolled": "Ботурууллааччы көрбүт көннөрүүтүн саҥа көннөрүүлэр тиһиктэригэр көрдөрүмэ",
"tog-newpageshidepatrolled": "Ботуруулламмыт сирэйдэри саҥа сирэйдэр тиһиктэригэр көрдөрүмэ",
+ "tog-hidecategorization": "Сирэй категорияларын көрдөрүмэ",
"tog-extendwatchlist": "Кэтээһин тупсарыллыбыт тиһигэ. Бары уларытыылар көстөллөр (бүтэһиктэр эрэ буолбатах)",
"tog-usenewrc": "Саҥа уларытыы уонна кэтэбил тиһиктэригэр уларыйыылары бөлөхтүүргэ",
"tog-numberheadings": "Түһүмэхтэр ааттарын нүөмэрдээ",
"tog-watchlisthideliu": "Бэлиэтэммит кыттааччылар уларытыыларын кэтиир тиһиккэ көрдөрүмэ",
"tog-watchlisthideanons": "Ааттарын эппэтэх кыттааччылар уларытыыларын кэтээһин тиһигэр көрдөрүмэ",
"tog-watchlisthidepatrolled": "Ботурууллааччы көрбүт көннөрүүтүн кэтээһин испииһэгэр көрдөрүмэ",
+ "tog-watchlisthidecategorization": "Сирэй категорияларын көрдөрүмэ",
"tog-ccmeonemails": "Атын кыттааччыларга суруйбут суруктарбын бэйэбэр эмиэ ыыт",
"tog-diffonly": "Икки барылы тэҥнииргэ сирэй иһин көрдөрүмэ",
"tog-showhiddencats": "Кистэммит категориялары көрдөр",
"permissionserrors": "Киирии алҕаһа",
"permissionserrorstext": "Маны оҥорор кыаҕыҥ суох, {{PLURAL:$1|төрүтэ|төрүттэрэ}}:",
"permissionserrorstext-withaction": "Бу дьайыыны ($2) оҥорор кыаҕыҥ суох. {{PLURAL:$1|Биричиинэтэ|Биричиинэлэрэ}}:",
+ "contentmodelediterror": "Бу торуму уларытар кыаҕыҥ суох эбит, тоҕо диэтэххэ иһинээҕитин мадьыала маннык <code>$1</code>, оттон сирэй иһинээҕитин билиҥҥитэ маннык — <code>$2</code>.",
"recreate-moveddeleted-warn": "'''Болҕой: сотулубут сирэйи төттөрү оҥорон эрэҕин.'''\n\nТолкуйдаан көр, кырдьык бу сирэйи оҥорор туһалаах дуо.\nАллара сотуулар уонна аат уларыйыытын сурунааллара көрдөрүлүннэ.",
"moveddeleted-notice": "Бу сирэй сотуллубут.\nАллара сотуу уонна аат уларытыытын сурунаалларыгар онно сыһыаннаах туох суруллубута көстөр.",
"moveddeleted-notice-recent": "Бу сирэй соторутааҕыта (тиһэх 24 чаас иһигэр) сотуллубут эбит.\nАллара сотуу уонна көһөрүү сурунаалларыгар сигэлэр көстөллөр.",
"foreign-structured-upload-form-label-own-work-message-default": "Уопсай репозиторийга угарбын өйдөөн туран угабын. Туһаныы сиэрин уонна лиссиэнсийэлиир бэлиитикэни кытта сөп түбэһэрин мэктиэлиибин.",
"foreign-structured-upload-form-label-not-own-work-message-default": "Бу билэҕин уопсай репозиторий быраабылатынан угар кыаҕыҥ суох буоллаҕына, маны сап уонна атын ньыманы туһанан көр.",
"foreign-structured-upload-form-label-not-own-work-local-default": "Өскө, {{SITENAME}} быраабылатынан угар сатанар буоллаҕына, кини [[Special:Upload|киллэрии тэрилин]] туһаныаххын сөп.",
+ "foreign-structured-upload-form-label-own-work-message-shared": "Бу билэни бас билэрбин уонна Биики Ыскылаакка төнүннэрбэттии [https://creativecommons.org/licenses/by-sa/4.0/deed.ru Creative Commons Attribution-ShareAlike 4.0] лиссиэнсийэннэн угары бигэргэтэбин. Ону тэҥэ [https://wikimediafoundation.org/wiki/Условия_использования Туһаныы усулуобуйатын кытта] сөбүлэһэбин.",
+ "foreign-structured-upload-form-label-not-own-work-message-shared": "Өскөтө билэни бас билбэт буоллаххына, биитэр атын лиссиэнсийэннэн угуоххун баҕарар буоллаххына, манна баар ньыманы туһаныаххын сөп: [https://commons.wikimedia.org/wiki/Special:UploadWizard Биики Ыскылаакка угуу маастара].",
"foreign-structured-upload-form-label-not-own-work-local-shared": "Өскө, {{SITENAME}} быраабылатынан угар сатанар буоллаҕына, кини [[Special:Upload|киллэрии тэрилин]] туһаныаххын эмиэ сөп.",
"backend-fail-stream": "$1 билэни ыытар табыллыбата.",
"backend-fail-backup": "Бу билэ $1 резервнэй куопуйатын оҥорор табыллыбата.",
"index-category-desc": "Сирэйгэ <nowiki>__INDEX__</nowiki> диэн «аптаах тыл» баар эбит (сирэй ону көҥүллүүр аат далыгар баар эбит), онон көрдүүр роботтар кинини болҕомтоҕо ылыа да суох түгэннэргэ көрөллөр эбит.",
"post-expand-template-inclusion-category-desc": "Халыыптары барытын көрдөрдөххө сирэй ыйааһына маны <code>$wgMaxArticleSize</code> куоһарыан сөп, онон сорҕото эрэ көрдөрүлүннэ.",
"post-expand-template-argument-category-desc": "Халыып аргуменын арыйдахха (фигурнай ускуопка иһигэр баары, холобур, <code>{{{Foo}}})</code>, сирэй маннааҕар улахан буолуо: <code>$wgMaxArticleSize</code>.",
- "expensive-parserfunction-category-desc": "СиÑ\80Ñ\8dйгÑ\8d наһаа Ñ\8dлбÑ\8dÑ\85 Ñ\80еÑ\81Ñ\83Ñ\80Ñ\81анÑ\8b Ñ\81ииÑ\80 Ñ\84Ñ\83нкÑ\86иÑ\8f Ñ\82Ñ\83Ñ\82Ñ\82Ñ\83ллÑ\83бÑ\83Ñ\82 (Ñ\85олобÑ\83Ñ\80, маннÑ\8bк <code>#ifexist</code>). Сиһилии — бу сирэйгэ: [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
- "broken-file-category-desc": "Ð\91Ñ\83 каÑ\82егоÑ\80иÑ\8f билÑ\8dÒ\95Ñ\8d алÒ\95аÑ\81Ñ\82ааÑ\85 Ñ\81игÑ\8d бааÑ\80 бÑ\83оллаÒ\95Ñ\8bна Ñ\8dбиллÑ\8dÑ\80 (Ñ\81Ñ\83оÑ\85 билÑ\8dÒ\95Ñ\8d Ñ\81игÑ\8dнии).",
- "hidden-category-category-desc": "Ð\9cаннÑ\8bк бÑ\8dлиÑ\8dлÑ\8dÑ\8dÑ\85 каÑ\82егоÑ\80иÑ\8f <code><nowiki>__HIDDENCAT__</nowiki></code> кинини каÑ\82егоÑ\80иÑ\8f Ñ\81алааÑ\82Ñ\8bгаÑ\80 көÑ\81Ñ\82Ó©Ñ\80үн бобор.",
+ "expensive-parserfunction-category-desc": "СиÑ\80Ñ\8dйгÑ\8d наһаа Ñ\8dлбÑ\8dÑ\85 Ñ\80еÑ\81Ñ\83Ñ\80Ñ\81анÑ\8b Ñ\81ииÑ\80 Ñ\84Ñ\83нкÑ\86иÑ\8f Ñ\82Ñ\83Ñ\82Ñ\82Ñ\83ллÑ\83бÑ\83Ñ\82 (Ñ\85олобÑ\83Ñ\80, маннÑ\8bгÑ\8b <code>#ifexist</code>). Сиһилии — бу сирэйгэ: [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
+ "broken-file-category-desc": "СиÑ\80Ñ\8dй билÑ\8dÒ\95Ñ\8d Ñ\81игÑ\8dÑ\82Ñ\8d алÒ\95аÑ\81Ñ\82ааÑ\85 (Ñ\81Ñ\83оÑ\85 билÑ\8dÒ\95Ñ\8d Ñ\81игÑ\8dнÑ\8dÑ\80).",
+ "hidden-category-category-desc": "Ð\9cаннÑ\8bк бÑ\8dлиÑ\8dлÑ\8dÑ\8dÑ\85 каÑ\82егоÑ\80иÑ\8f <code><nowiki>__HIDDENCAT__</nowiki></code> кинини каÑ\82егоÑ\80иÑ\8f Ñ\81алааÑ\82Ñ\8bн Ñ\81иÑ\80Ñ\8dйдÑ\8dÑ\80игÑ\8dÑ\80 көÑ\81Ñ\82үбÑ\8dÑ\82 оҥоÑ\80ор.",
"trackingcategories-nodesc": "Ойуулааһына суох.",
"trackingcategories-disabled": "Араарыллыбыт категория",
"mailnologin": "Аадырыһа суох",
"emailccsubject": "Эн суругуҥ куоппуйата $1: $2",
"emailsent": "Сурук барда",
"emailsenttext": "Эн суругуҥ ыытылынна.",
- "emailuserfooter": "Ð\91Ñ\83 Ñ\81Ñ\83Ñ\80Ñ\83к $2 кÑ\8bÑ\82Ñ\82ааÑ\87Ñ\87Ñ\8bга $1 кÑ\8bÑ\82Ñ\82ааÑ\87Ñ\87Ñ\8bÑ\82Ñ\82ан «СÑ\83Ñ\80Ñ\83кÑ\82а Ñ\8bÑ\8bÑ\82» диÑ\8dн Ñ\84Ñ\83нкÑ\86иÑ\8f көмөÑ\82үнÑ\8dн {{SITENAME}} Ñ\81аайÑ\82ан ыытыллыбыт.",
+ "emailuserfooter": "Ð\91Ñ\83 Ñ\81Ñ\83Ñ\80Ñ\83к $2 кÑ\8bÑ\82Ñ\82ааÑ\87Ñ\87Ñ\8bга $1 кÑ\8bÑ\82Ñ\82ааÑ\87Ñ\87Ñ\8bÑ\82Ñ\82ан «СÑ\83Ñ\80Ñ\83кÑ\82а Ñ\8bÑ\8bÑ\82» диÑ\8dн Ñ\82Ñ\8dÑ\80ил көмөÑ\82үнÑ\8dн {{SITENAME}} Ñ\81иÑ\82им-Ñ\81иÑ\80Ñ\82Ñ\8dн ыытыллыбыт.",
"usermessage-summary": "Тиһилик биллэриитин хааллар.",
"usermessage-editor": "Тиһилик биллэрээччитэ",
"watchlist": "Кэтэбилим тиһигэ",
"mywatchlist": "Кэтэбил тиһигэ",
"watchlistfor2": "$1 $2 аналлаах",
"nowatchlist": "Эн кэтиир сирэйдэриҥ суохтар.",
- "watchlistanontext": "Кэтэбилиҥ сирэйин көрөргөр эбэтэр уларытаргар маны оҥор: $1.",
+ "watchlistanontext": "Кэтэбилиҥ сирэйин көрөргө эбэтэр уларытарга бэлиэ-аатынан киириэхтээххин.",
"watchnologin": "Бэйэҕин билиһиннэр",
"addwatch": "Кэтэбил тиһигэр киллэр",
"addedwatchtext": "«[[:$1]]» сирэй [[Special:Watchlist|кэтэбил тиһигэр]] киирдэ.\nСирэй уларытыылара уонна кинини кытта ситимнээх ырытыы сирэйин уларытыылара бүгүҥҥүттэн онно көстөр буолуохтара.",
"javascripttest": "JavaScript тургутуу",
"javascripttest-pagetext-noframework": "Бу сирэй JavaScript тургутууларга анаммыт.",
"javascripttest-pagetext-unknownframework": "\"$1\" тургутуу биллибэт эйгэтэ.",
+ "javascripttest-pagetext-unknownaction": "Биллибэт дьайыы «$1».",
"javascripttest-pagetext-frameworks": "Бука диэн, бу тургуутуу эйгэлэриттэн биирин тал: $1",
"javascripttest-pagetext-skins": "Тургутууну ыытарга тас көрүҥүн бастаан тал:",
"javascripttest-qunit-intro": "[$1 тургутуу документациятын] манна mediawiki.org көр.",
"tooltip-feed-atom": "Atom бу сирэйгэ",
"tooltip-t-contributions": "Бу кыттааччы уларыппыт сирэйдэрин испииһэгэ",
"tooltip-t-emailuser": "Бу киһиэхэ сурук ыытарга",
+ "tooltip-t-info": "Бу сирэй туһунан сиһилии",
"tooltip-t-upload": "Билэлэри суруттарыы",
"tooltip-t-specialpages": "Анал сирэйдэр испииһэктэрэ",
"tooltip-t-print": "Сирэй бэчээккэ ыытыллар торума",
"pageinfo-robot-index": "Көҥүллэммит",
"pageinfo-robot-noindex": "Араарыллыбыт",
"pageinfo-watchers": "Кэтээнэр сирэйдэр ахсааннара",
+ "pageinfo-visiting-watchers": "Сирэйи кэтиир уонна тиһэх көннөрүүлэри көрбүт дьон ахсаана",
"pageinfo-few-watchers": "$1 кыттааччыттан аҕыйах кэтээччи",
"pageinfo-redirects-name": "Бу сирэйгэ утаарыы ахсаана",
"pageinfo-subpages-name": "Сирэй аннынааҕы сирэйдэр ахсааннара",
"pageinfo-protect-cascading-yes": "Сөп",
"pageinfo-protect-cascading-from": "Каскадынан көмүскэл мантан",
"pageinfo-category-info": "Категория туһунан",
+ "pageinfo-category-total": "Бары",
"pageinfo-category-pages": "Сирэй ахсаана",
"pageinfo-category-subcats": "Субкатегория ахсаана",
"pageinfo-category-files": "Билэ ахсаана",
"tags-create-invalid-chars": "Бэлиэ аатыгар сопутуой (<code>,</code>) эбэтэр слэш (<code>/</code>) буолуохтаах.",
"tags-create-invalid-title-chars": "Тиэк аатыгар сирэй баһыгар туттуллуо суохтаах бэлиэ киириэ суохтаах",
"tags-create-already-exists": "«$1» тиэк хайыы-үйэ баар эбит.",
+ "tags-delete-title": "Тиэги сот",
+ "tags-delete-explanation-initial": "«$1» тиэги билии олоҕуттан сотон эрэҕин.",
"tags-delete-reason": "Төрүөтэ:",
"tags-delete-submit": "Бу тиэги букатыннаахтык сот",
"tags-activate-title": "Тиэги холбоо",
+ "tags-activate-question": "\"$1\" тиэги холбоон эрэҕин.",
"tags-activate-reason": "Төрүөтэ:",
+ "tags-activate-not-allowed": "\"$1\" тиэги холбуур табыллыбат.",
+ "tags-activate-not-found": "Маннык $1 тиэк суох эбит.",
"tags-activate-submit": "Холбоо",
"tags-deactivate-title": "Тиэги араар",
"tags-deactivate-question": "\"$1\" тиэги арааран эрэҕин.",
"tags-deactivate-reason": "Төрүөтэ:",
"tags-deactivate-not-allowed": "\"$1\" тиэги араарар табыллыбат.",
"tags-deactivate-submit": "араар",
+ "tags-apply-no-permission": "Бэйэҥ уларытыыгар уларытыы тиэгин туруорар кыаҕыҥ суох эбит.",
+ "tags-apply-not-allowed-one": "«$1» тиэги илииннэн туруорар табыллыбат эбит.",
"tags-edit-title": "Тиэктэри уларытыы",
"tags-edit-manage-link": "Тиэктэри дьаһайыы",
"tags-edit-existing-tags": "Баар тиэктэр:",
"tags-edit-chosen-placeholder": "Биир эбэтэр хас да тиэги тал",
"tags-edit-chosen-no-results": "Сөп түбэһэр тиэк көстүбэтэ",
"tags-edit-reason": "Төрүөтэ:",
+ "tags-edit-success": "Уларытыы сөпкө бигэргэннэ.",
"comparepages": "Сирэйдэри тэҥнииргэ",
"compare-page1": "Бастакы сирэй",
"compare-page2": "Иккис сирэй",
"tog-hideminor": "تازيون معمولي تبديليون لڪايو",
"tog-hidepatrolled": "تازيون گھميل تبديليون لڪايو",
"tog-newpageshidepatrolled": "نَوَن صفحن واري فهرست مان تازو گھميل صفحا لڪايو",
+ "tog-hidecategorization": "صفحن جا ذمرا لڪايو",
+ "tog-extendwatchlist": "تازه ترين بدران سموريون تبديليون ڏيکارڻ لاءِ ٽيٽ لسٽ کي وسيع ڪريو.",
"tog-numberheadings": "سُرخين کي خودڪار طريقي سان نمبر ڏيو",
"tog-showtoolbar": "سنوار اوزار ڏيکاريو",
"tog-editondblclick": "ٻٽي ڪلڪ تي صفحا سنواريو",
"tog-watchcreations": "منهنجا سرجيل صفحا منهنجي ٽيٽ فهرست ۾ رکو",
"tog-watchdefault": "منهنجا ترميميل صفحا منهنجي ٽيٽ فهرست تي رکو",
+ "tog-watchmoves": "جيڪي صفحا ۽ فائيلس آئون چوريان، سي منهنجي ٽيٽ لسٽ ۾ شامل ڪريو.",
"tog-watchdeletion": "آئون جيڪي صفحا ڊاهيان، سي منهنجي ٽيٽ فهرست تي رکو",
"tog-watchrollback": "انهن صفحن کي منهنجي ٽيٽ فهرست تي رکو، جن ۾ تبديلين کي مون واپس ورايو آهي.",
"tog-minordefault": "سمورين تبديلين کي بنان چئي معمولي ترميم تصور ڪريو",
"listingcontinuesabbrev": "جاري..",
"index-category": "ڏسڻيل صفحا",
"noindex-category": "غيرڏسڻيل صفحا",
+ "broken-file-category": "فائيل جي ٽٽل ڳنڍڻن وارا صفحا",
"about": "بابت",
"article": "موادي صفحو",
"newwindow": "(نئين دريءَ ۾ کلندو)",
"protectedpagetext": "هيءُ صفحو ترميمن کان تحفظيل آهي.",
"viewsourcetext": "توهان هن صفحي جو ڪوڊ ڏسي ۽ نقل ڪري سگھو ٿا:",
"namespaceprotected": "توهان کي نانءُ پولار '''$1''' جا صفحا سنوارڻ جا اختيار ناهن.",
+ "mycustomjsprotected": "توهان کي هيءُ جاوا اسڪرپٽ صفحو سنوارڻ جي اجازت حاصل ڪانهي.",
+ "mypreferencesprotected": "توهان جي پنهنجون ترجيحات سنوارڻ جي اجات حاصل ڪانهي.",
"ns-specialprotected": "خاص صفحا سنواري نٿا سگھجن.",
"exception-nologin": "لا اِن ٿيل ناهيو",
"virus-unknownscanner": "اڻ ڄاتل نِس وائرس:",
"passwordremindertitle": "{{SITENAME}} لاءِ نئون عارضي ڳجھو لفظ",
"passwordremindertext": "ڪنهن (شايد توهان آءِ پي پتي $1 تان) اسان کي {{SITENAME}} ($4) لاءِ نئون ڳجھو لفظ اماڻڻ جي گھُرَ ڪئي.\n\nهاڻي يوزر \"$2\" لاءِ ڳجھو لفظ \"$3\" آهي. توهان کي هينئر ئي لاگ اِن ٿي پنهنجو ڳجھو لفظ تبديل ڪرڻ گھرجي.\n\nجيڪڏهن اها گھُرَ اوهان نه ڪئي هئي، يا هاڻي اوهان کي پنهنجو ڳجھو لفظ ياد اچي ويو آهي ۽ توهان ان کي تبديل ڪرڻ نه ٿا چاهيو، ته توهان هن نياپي کي نظر انداز ڪندي پنهنجو پراڻو ڳجھو لفظ ئي استعمال ڪري سگھو ٿا.",
"noemail": "يُوزر \"$1\" جي ڪو به برق ٽپال پتو درج ٿيل ناهي.",
+ "noemailcreate": "توهان کي قابل ڪار برق ٽپال پتو مهيا ڪرڻو پوندو.",
"passwordsent": "يوزر \"$1\" لاءِ هڪ نئون ڳجھو لفظ برق ٽپال ذريعي اماڻيو ويو آهي. مهرباني ڪري اهو حاصل ڪرڻ بعد لاگ اِن ٿيندا.",
"mailerror": "ٽپال اماڻڻ ۾ چُڪَ: $1",
"acct_creation_throttle_hit": "توهان جي آءِ پي پتي تان هن وڪيءَ تي پوئين ڏينهن $1 کاتا کلي چڪا آهن. ايتري عرصي ۾ ان کان وڌيڪ کاتا نہ ٿا کولي سگھجن. نتيجتاً ساڳي آءِ پي پتي تان فيالوقت وڌيڪ کاتا کولي نہ ٿا سگھجن.",
"emailauthenticated": "توهان جي برق ٽپال پتي جي تصديق $2 تي $3 بجي ڪئي وئي.",
"emailnotauthenticated": "توهان جو برق ٽپال پتي جي تصديق اڃا ٿي نہ سگھي آهي.",
+ "noemailprefs": "انهن فيچرس کي فعال بڻائڻ لاءِ پنهنجي ترجيحات ۾ برق ٽپال پتو ڄاڻايو.",
"emailconfirmlink": "پنهنجي برق ٽپال پتي جي پَڪَ ڪندا",
+ "cannotchangeemail": "هن وڪيءَ تي کاتيدار جو برق ٽپال پتو بدلائي نہ ٿو سگھجي.",
"emaildisabled": "هيءَ سرزمين برق ٽپال اماڻي نہ ٿي سگھي.",
"accountcreated": "کاتو کلي چڪو",
"accountcreatedtext": "$1 نالي يوزر کاتو کلي چڪو آھي.",
"pt-login-button": "لاگ اِن",
"pt-createaccount": "کاتو کوليو",
"pt-userlogout": "لاگ آئوٽ",
+ "php-mail-error-unknown": "پي ايڇ پي جي ڪاڄ اندر اڻڄاتل چُڪَ.",
"user-mail-no-addy": "برق ٽپال پتو ڄاڻائڻ کان سواءِ برق ٽپال اماڻڻ جي ڪوشش ڪئي وئي.",
"changepassword": "ڳجھو لفظ تبديل ڪريو",
"resetpass_header": "کاتي جو ڳجھو لفظ بدلايو",
"passwordreset-domain": "ميدان:",
"passwordreset-email": "برق ٽپال پتو:",
"passwordreset-emailtitle": "{{SITENAME}} واري کاتي جا تفصيل",
+ "changeemail": "برق ٽپال پتو مِٽايو يا بدلايو",
"changeemail-passwordrequired": "توهانکي هن تبديلي جي تصديق ڪرڻ جي لاءِ پنهنجو ڳجھو لفظ داخل ڪرڻ جي ضرورت پوندي.",
"changeemail-oldemail": "هاڻوڪو برق ٽپال پتو:",
"changeemail-newemail": "نئون برق ٽپال پتو:",
"blockedtitle": "يُوزر بندشيل آهي.",
"blockedtext": "'''توهان جي يوزرنانءُ يا آءِ پي کي بندشيو ويو آهي.'''\n\nبندش $1 هنئي. جڏهن تہ ڄاڻايل سبب ''$2'' آهي.\n\n\n* بندش جو آغاز: $8\n* بندش جو انجام: $6\n* بندش جو هدف: $7\n\nاهڙي روڪ تي بحث ڪرڻ لاءِ توهان $1 يا ڪنهن ٻي [[{{MediaWiki:Grouppage-sysop}}|منتظم]] سان رابطو ڪري سگھو ٿا. جيڪڏهن توهان جو درست [[Special:ترجيحات|کاتو ترجيحات]] ۾ درست برق ٽپال پتو درج ٿيل نہ آهي تہ توهان 'هن يوزر کي برق ٽپال ڪريو' وارو فيچر نہ ٿا \nYou cannot use the 'e-mail this user' feature unless a valid e-mail address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nاستعمال ڪري سگھو. توهان جو هاڻوڪو آءِ پي پتو $3 آهي، ۽ بندش سڃاڻپ $5 آهي. مهرباني ڪري ڪنهن بہ پڇا ڳاڇا يا لهوچڙ لاءِ انهن مان ڪنهن هڪ يا ٻنهي جو حوالو ڏيندا.",
"blockednoreason": "سبب اڻڄاڻايل",
+ "whitelistedittext": "صفحا سنوارڻ لاءِ مهرباني ڪري $1.",
+ "confirmedittext": "صفحا سنوارڻ کان اڳ توهان کي پنهنجو برق ٽپال پتي جي تصديق ڪرڻي پوندي. مهرباني ڪري [[Special:ترجيحات|يُوزر ترجيات]] ذريعي پنهنجو برق ٽپال پتو ڄاڻايو ۽ تصديقيو.",
+ "nosuchsectiontitle": "سيڪشن لڀجي نه سگھيو",
"loginreqtitle": "لاگ اِن گھربل آهي",
"loginreqlink": "لاگ اِن",
"loginreqpagetext": "ٻيا صفحا ڏسڻ لاءِ مهرباني ڪري $1",
"content-not-allowed-here": "\"$1\" مواد هن صفحي [[$2]] تي رکي نہ ٿو سگھجي.",
"content-model-wikitext": "وڪيٽيڪسٽ",
"content-model-text": "سادو ٽيڪسٽ",
+ "content-model-javascript": "جاوا اسڪرپٽ",
"content-json-empty-object": "خالي آبجيڪٽ",
"content-json-empty-array": "خالي اري",
"duplicate-args-warning": "وارننگ: [[:$2]]کي [[:$1]] ڪال ڪري رهيو آهي، ساڻ هڪ کان وڌيڪ قدرن لاءِ ’$3‘ پيراميٽرس لاءِ. فقط آخري قدر مهيا ڪيل استعمال ڪيو ويندو.",
"parser-template-loop-warning": "سانچو چڪر لڌو ويو: [[$1]]",
+ "cantcreateaccounttitle": "کاتو کولي نہ ٿو سگھجي",
+ "cantcreateaccount-text": "$3 جو ڄاڻايل سبب <em>$2</em> آهي.",
+ "cantcreateaccount-range-text": "$3 جو ڄاڻايل سبب \"$2\" آهي.",
"viewpagelogs": "هن صفحي جا لاگ ڏسو",
"currentrev": "هاڻوڪو مسودو",
"currentrev-asof": "$1 جو تازو ترين مسودو",
"nextrevision": "اڃا نئون پرت→",
"currentrevisionlink": "هاڻوڪو پرت",
"cur": "ھاڻوڪو",
+ "next": "اڳيون",
"last": "پويون",
"page_first": "پهريون",
"page_last": "آخري",
+ "history-fieldset-title": "جھانگ جي سوانح",
"history-show-deleted": "رڳو ڊاٺل",
"histfirst": "اوائلي ترين",
"histlast": "تازه ترين",
"historysize": "({{PLURAL:$1|1 ٻاٽڻ|$1 ٻاٽڻيون}})",
"historyempty": "(خالي)",
+ "history-feed-title": "ترميمي سوانح",
+ "history-feed-description": "وڪي جي هن صفحي جي ترميمي سوانح",
"history-feed-item-nocomment": "$2 تي $1",
"rev-deleted-user": "(يُوزرنانءُ ڊاٺو ويو)",
+ "rev-showdeleted": "نمايو",
+ "revisiondelete": "مسوادا ڊاهيو/اڻڊاهيو",
"revdelete-show-file-submit": "ها",
"revdelete-radio-set": "لڪل",
"revdelete-radio-unset": "ظاهر",
+ "revdelete-log": "سبب:",
"pagehist": "صفحي جي سوانح",
"deletedhist": "ڊاٺل سوانح",
"revdelete-otherreason": "ٻيا/اضافي ڪارڻ:",
"search-result-size": "$1 ({{PLURAL:$2|لفظُ|$2 لفظَ}})",
"search-redirect": "($1 کي چوريو)",
"search-section": "(سيڪشن $1)",
+ "search-category": "(ذمرو $1)",
"search-suggest": "ڇا توهان جو مطلب $1 آهي؟",
"search-interwiki-caption": "برادر رٿائون",
"search-interwiki-more": "(وڌيڪ)",
"searchrelated": "لاڳاپيل",
"searchall": "سڀ",
"search-nonefound": "توهان جي ڳولا جي نتيجي ۾ ڪجھہ بہ ڪو نہ لڌو.",
+ "powersearch-togglelabel": "چڪاسيو:",
"powersearch-toggleall": "سڀ",
"powersearch-togglenone": "ڪو بہ نہ",
"search-external": "خارجي ڳولا",
"prefs-editwatchlist-edit": "پنهنجي ٽيٽ فهرست ۾ موجود عنوان ڏسو ۽ مٽايو",
"prefs-editwatchlist-raw": "ڪچي ٽيٽ فهرست سنواريو",
"prefs-editwatchlist-clear": "پنهنجي ٽيٽ فهرست ڊاهيو",
+ "prefs-watchlist-days": "ٽيٽ فهرست هيترن ڏينهن تي ٻڌل هجي:",
"prefs-watchlist-days-max": "وڌ ۾ وڌ $1 {{PLURAL:$1|ڏينهن|ڏينهن}}",
"prefs-watchlist-edits-max": "وڌ ۾ وڌ تعداد: 1000",
+ "prefs-watchlist-token": "ٽيٽ لسٽ جو ٽوڪن:",
"prefs-resetpass": "ڳجھو لفظ بدلايو",
"prefs-changeemail": "برق ٽپال پتو مِٽايو يا بدلايو",
"prefs-setemail": "ڪو برق ٽپال پتو ڄاڻايو",
"prefs-email": "برق ٽپال چارا",
"prefs-rendering": "حليو",
"saveprefs": "سانڍيو",
+ "rows": "قطارون:",
+ "searchresultshead": "ڳولا",
"stub-threshold-sample-link": "نمونو",
"stub-threshold-disabled": "غيرفعال",
"recentchangesdays-max": "وڌ ۾ وڌ $1 {{PLURAL:$1|ڏينهن|ڏينهن}}",
"userrights-nodatabase": "اعداخانو $1 يا تہ وجود نہ ٿو رکي يا تہ اهو مقامي اعدادخانو نہ آهي.",
"group": "گروپ:",
"group-user": "يوزرس",
+ "group-all": "(سڀ)",
+ "group-user-member": "{{GENDER:$1|يُوزر}}",
+ "group-sysop-member": "{{GENDER:$1|منتظم}}",
+ "grouppage-user": "{{ns:project}}:يُوزرس",
"grouppage-sysop": "{{ns:project}}:منتظمين",
+ "grouppage-bureaucrat": "{{ns:project}}:ڪامورا",
+ "right-read": "صفحا پڙهو",
+ "right-edit": "صفحا سنواريو",
+ "right-createpage": "صفحا سنواريو (جيڪي مباحثي صفحا نہ آهن)",
+ "right-createtalk": "مباحثي صفحا سرجيو",
+ "right-createaccount": "نوان يُوزر کاتا کوليو",
+ "right-move": "صگحا چوريو",
+ "right-move-subpages": "ذيلي صفحن سميت صفحا چوريو",
+ "right-movefile": "فائيل چوريو",
+ "right-upload": "فائيل چاڙهيو",
+ "right-upload_by_url": "ڪنهن يُو آر ايل کان فائيل چاڙهيو",
+ "right-delete": "صفحا ڊاهيو",
+ "right-bigdelete": "ڊگھيون سوانح رکندڙ صفحا ڊاهيو",
+ "right-browsearchive": "ڊاٺل صفحن ۾ ڳوليو",
"right-undelete": "ڪو صفحو اڻڊاهيو",
+ "right-editinterface": "يُوزر باهمرُو کي سنواريو",
+ "right-viewmywatchlist": "پنهنجي ٽيٽ لسٽ ڏسو",
+ "right-editmyoptions": "پنهنجون ترجيحات سنواريو",
+ "right-import": "ٻين وڪيز کان صفحا درآمديو",
+ "right-mergehistory": "صفحن جي سوانح سنواريو",
"newuserlogpage": "يوزر کاتن جو لاگ",
"rightslog": "يُوزر حق لاگ",
+ "action-move": "هيءَُ صفحو چوريو",
+ "action-move-subpages": "هيءُ صفحو، ۽ ان جا ذيلي صفحا چوريو",
+ "action-move-categorypages": "زمرن جا صفحا چوريو",
"action-movefile": "هيءُ فائيل چوريو",
"action-upload": "هيءُ فائيل چاڙهيو",
+ "action-delete": "هيءُ صفحو ڊاهيو",
"action-browsearchive": "ڊاٺل صفحن ۾ ڳوليو",
"action-undelete": "هيءُ صفحو اڻڊاهيو",
+ "action-import": "ٻي ڪنهن وڪي کان صفحا درآمديو",
+ "action-importupload": "ڪو فائيل چاڙهي صفحا درآمديو",
+ "action-mergehistory": "هن صفحي جي سوانح ضم ڪريو",
+ "action-siteadmin": "اعدادخاني کي بنديو يا کوليو",
+ "action-sendemail": "برق ٽپال اماڻيو",
"action-editmywatchlist": "پنهنجي ٽيٽ فهرست سنواريو",
"action-viewmywatchlist": "پنهنجي ٽيٽ فهرست ڏسو",
"nchanges": "$1 {{PLURAL:$1|تبديلي|تبديليون}}",
"rcshowhideanons-show": "نمايو",
"rcshowhideanons-hide": "لڪايو",
"rcshowhidepatr": "$1 تاڻيل ترميمون",
+ "rcshowhidepatr-show": "نمايو",
"rcshowhidepatr-hide": "لڪايو",
"rcshowhidemine": "منهنجون ترميمون $1",
"rcshowhidemine-show": "نمايو",
"uploaded-remote-url-svg": "ايس وي جي جيڪا سيٽ ڪري ٿي ڪنهن اسٽائيل وصف رموٽ يو آر ايل سان بلاڪ ٿيل آهي.\n <code>$1=\"$2\"</code> اپلوڊ ٿيل ايس وي جي فائيل ۾ مليو",
"uploaded-image-filter-svg": "هن يو آر ايل سان <code><$1 $2=\"$3\"></code> اميج فلٽر مليو آهي، اپلوڊ ٿيل ايس وي جي فائيل ۾،",
"uploadvirus": "هن فائيل ۾ وائرس آهي! \nتفصيل: $1",
+ "upload-description": "فائيل جي تشريح",
"watchthisupload": "هيءُ فائيل ٽيٽيو",
"upload-success-subj": "چاڙهہ ڪامياب",
+ "upload-file-error": "اندروني چُڪَ",
"upload-dialog-title": "فائيل چاڙهيو",
"upload-dialog-button-cancel": "رد",
"upload-dialog-button-save": "سانڍيو",
"upload-dialog-button-upload": "چاڙهيو",
"upload-form-label-select-file": "فائيل چونڊيو",
+ "upload-form-label-infoform-title": "تفصيل",
"upload-form-label-infoform-name": "نالو",
"upload-form-label-infoform-description": "تشريح",
"upload-form-label-usage-title": "استعمال",
"creditspage": "Аутори странице",
"nocredits": "Не постоје подаци о аутору ове странице.",
"spamprotectiontitle": "Филтер за заштиту од непожељних порука",
- "spamprotectiontext": "Филтера против нежељених порука је блокирао чување ове странице.\nОво је вероватно изазвано везом до спољашњег сајта који се налази на црној листи.",
+ "spamprotectiontext": "Филтера против нежељених порука је блокирао чување ове странице.\nОво је вероватно изазвано везом до спољашњег сајта који се налази на црном списку.",
"spamprotectionmatch": "Следећи текст је активирао наш филтер за нежељене поруке: $1",
"spambot_username": "Чишћење непожељних порука у Медијавикији",
"spam_reverting": "Враћам на последњу измену која не садржи везе до $1",
"creditspage": "Autori stranice",
"nocredits": "Ne postoje podaci o autoru ove stranice.",
"spamprotectiontitle": "Filter za zaštitu od nepoželjnih poruka",
- "spamprotectiontext": "Filtera protiv neželjenih poruka je blokirao čuvanje ove stranice.\nOvo je verovatno izazvano vezom do spoljašnjeg sajta koji se nalazi na crnoj listi.",
+ "spamprotectiontext": "Filtera protiv neželjenih poruka je blokirao čuvanje ove stranice.\nOvo je verovatno izazvano vezom do spoljašnjeg sajta koji se nalazi na crnom spisku.",
"spamprotectionmatch": "Sledeći tekst je aktivirao naš filter za neželjene poruke: $1",
"spambot_username": "Čišćenje nepoželjnih poruka u Medijavikiji",
"spam_reverting": "Vraćam na poslednju izmenu koja ne sadrži veze do $1",
"createaccountreason": "Sabab:",
"createacct-reason": "Sabab",
"createacct-reason-ph": "Nimaga yana boshqa hisob yaratyapsiz",
- "createacct-captcha": "Xavfsizlik tekshiruvi",
- "createacct-imgcaptcha-ph": "Yuqoridagi yozuvni bu yerga kiriting",
"createacct-submit": "Hisob yaratish",
"createacct-another-submit": "Boshqa hisob yaratish",
"createacct-benefit-heading": "{{SITENAME}} Sizga oʻxshagan odamlar tomonidan yaratiladi",
"passwordreset-email": "Elektron pochta manzilingiz:",
"passwordreset-emailelement": "Foydalanuvchi ismi: \n$1\n\nVaqtinchalik maxfiy so'z: \n$2",
"changeemail": "Elektron pochta manzilini oʻzgartirish",
+ "changeemail-header": "Elektron pochta manzilini o'zgaritish",
"changeemail-oldemail": "Joriy elektron pochta manzili",
"changeemail-newemail": "Elektron pochtaning yangi manzili",
"changeemail-none": "(yoʻq)",
"prefs-displaywatchlist": "Tasvirlash moslamalari",
"prefs-diffs": "Versiyalar farqi",
"userrights": "Foydalanuvchi huquqlarini oʻzgartirish",
+ "userrights-lookup-user": "Foydalanuvchini tanlash",
"userrights-user-editname": "Foydalanuvchi nomi:",
- "editusergroup": "Guruhlardagi aʼzoligini oʻzgartirish",
- "userrights-groupsmember": "Aʼzolik:",
- "userrights-groupsmember-auto": "Quyidagi guruhlarga kiradi:",
+ "editusergroup": "Shu foydalanuvchi huquqlarini oʻzgartirish",
+ "editinguser": "{{GENDER:$1|Foydalanuvchi}} <strong>[[User:$1|$1]]</strong> $2 huquqlarini oʻzgartirish",
+ "userrights-editusergroup": "Guruhlardagi aʼzoligini oʻzgartirish",
+ "saveusergroups": "Oʻzgarishlarni saqlash",
+ "userrights-groupsmember": "Ushbu guruhlar aʼzosi:",
+ "userrights-groupsmember-auto": "Shuningdek, ushbu texnik guruhlar aʼzosi:",
+ "userrights-groups-help": "Ushbu foydalanuvchining guruhlardagi aʼzoligini oʻzgartirishingiz mumkin:\n* Guruh nomi yonida belgi turgan boʻlsa, demak foydalanuvchi ushbu guruh aʼzosidir\n* Guruh nomi yonida belgi yoʻq boʻlsa, demak foydalanuvchi ushbu guruh aʼzosi emas\n* * (yulduzcha) belgisi foydalanuvchini guruhga qoʻshsangiz, qaytarib chiqarib tashlay olmasligingizni (yoki chiqarib tashlasangiz, qaytarib qoʻsha olmasligingizni) anglatadi",
"userrights-reason": "Sabab:",
- "userrights-changeable-col": "Siz o'zgartirishingiz mumkin bo'lgan guruhlar",
- "userrights-unchangeable-col": "Siz o'zgartira olmaydigan guruhlar",
+ "userrights-changeable-col": "Quyidagi guruhlarga qoʻsha olasiz",
+ "userrights-unchangeable-col": "Quyidagi guruhlarga qoʻsha olmaysiz",
"group": "Guruh",
"group-user": "Foydalanuvchilar",
"group-autoconfirmed": "Tasdiqlangan foydalanuvchilar",
"undeleteviewlink": "koʻrib chiqish",
"undeleteinvert": "Tanlash tartibini almashtirish",
"undeletecomment": "Sababi:",
+ "undeletedrevisions": "{{PLURAL:$1|1 ta oʻzgarish|$1 ta tahrirlar}} tiklandi",
+ "undeletedfiles": "$1 ta fayl tiklandi",
"undelete-search-title": "O'chirilgan sahifalarni qidirish",
"undelete-search-box": "O'chirilgan sahifalarni qidirish",
"undelete-search-prefix": "Bundan boshlangan sahifalarni koʻrsatish:",
"block-log-flags-nousertalk": "o'zining munozara sahifasini tahrirlay olmaydi",
"move-page": "$1 — qayta nomlash",
"move-page-legend": "Sahifani qayta nomlash",
- "movearticle": "Hozirgi nomi:",
"newtitle": "Yangi nom:",
"move-watch": "Ushbu sahifani kuzatuv roʻyxatingizga qoʻshish",
"movepagebtn": "Sahifani koʻchirish",
"htmlform-reset": "Oʻzgarishlarni bekor qilish",
"htmlform-selectorother-other": "Boshqa",
"logentry-delete-delete": "$1 $3 sahifasini {{GENDER:$2|oʻchirdi}}",
+ "logentry-delete-restore": "$1 $3 sahifasini {{GENDER:$2|tikladi}}",
"logentry-move-move": "$1 $3 sahifasini $4ga koʻchirdi",
"logentry-move-move-noredirect": "$1 $3 sahifasini $4ga {{GENDER:$2|koʻchirdi}}",
"logentry-move-move_redir": "$1 sahifa nomini $3dan $4ga yoʻnaltirish ustidan {{GENDER:$2|koʻchirdi}}",
"tog-hideminor": "Tago-a an mga gagmay nga pagliwat ha mga bag-o pa la nga mga kabag-ohan",
"tog-hidepatrolled": "Tago-a in mga gin-patrol o binantayan nga mga pagliwat ha mga dipala naiha nga mga kabag-ohan",
"tog-newpageshidepatrolled": "Tago-a an mga gin-patrol o binantayan nga mga pakli tikang han talaan hin bag-o nga pakli",
+ "tog-hidecategorization": "Igtago an kategorisasyon han mga pakli",
"tog-extendwatchlist": "Padako-a an angay timan-an agod makita an tanan nga kabag-ohan, diri la an gibag-ohi",
"tog-usenewrc": "Grupo nga mga pagbag-o kada pakli ha kababag-o pala ngan mga barantayon nga talaan",
"tog-numberheadings": "Auto-nga-ihap nga mga pagngaran",
"tog-watchdefault": "Igdugang in mga pakli ngan mga paypay nga akon ginliwat ngadto han akon angay timan-an",
"tog-watchmoves": "Igdugang in mga pakli nga mga paypay nga akon ginpamalhin ngadto han akon angay timan-an",
"tog-watchdeletion": "Igdugang in mga pakli ngan mga paypay nga akon ginpamara ngadto han akon angay timan-an",
+ "tog-watchrollback": "Igdugang an mga pakli ha akon watchlist an ak mga gin-rollback",
"tog-minordefault": "Tigamni an ngatanan nga mga pagliwat nga gudti hin default",
"tog-previewontop": "Igpakita in prevista o pan-ugsa-nga-lantaw ugsa hiton pagliwat nga kahon",
"tog-previewonfirst": "Igpakita in prevista o pan-ugsa-nga-lantaw ha syahan nga pagliwat",
"tog-shownumberswatching": "Igpakita an ihap han mga nangingita nga mga nagamit",
"tog-oldsig": "Aada nga pirma:",
"tog-fancysig": "Tratuha it pirma komo uska wikitext (nga waray automatiko nga sumpay)",
- "tog-uselivepreview": "Gamita an buhi nga pahiuna nga pagawas (eksperimental)",
+ "tog-uselivepreview": "Gamita an buhi nga pahiuna nga pagawas",
"tog-forceeditsummary": "Pasabti ako kun waray ko ginsurat ha dalikyat-nga-tigaman han pagliwat (edit summary)",
"tog-watchlisthideown": "Tago-a an akon mga ginliwat tikang han angay timan-an",
"tog-watchlisthidebots": "Tago-a an ginliwat hin bot tikang han angay timan-an",
"tog-watchlisthideliu": "Igatag an mga ginliwat han naka log-in nga mga gumaramit tikang ha gintitiman-an",
"tog-watchlisthideanons": "Igtago an mga ginliwat han mga waray nagpakilala nga nagamit tikang ha gintitiman-an",
"tog-watchlisthidepatrolled": "Igatag an mga pinatrolya nga mga pagliwat tikang ha angay timan-an",
+ "tog-watchlisthidecategorization": "Igtago an kategorisasyon han mga pakli",
"tog-ccmeonemails": "Padad-i ak hin mga kopya hin mga email nga akon ginpapadara ha iba nga mga gumaramit",
"tog-diffonly": "Ayaw igpakita an sulod han pakli ha ilarom han pagkakaiba",
"tog-showhiddencats": "Igpakita an mga tinago nga mga kaarangay",
"pool-queuefull": "Puno an katitirok nga pila",
"pool-errorunknown": "Waray kasabti nga kasaypanan",
"pool-servererror": "An pool nga pag-ihap nga serbisyo diri yanâ magagamit ($)",
+ "poolcounter-usage-error": "Sayop ha paggamit: $1",
"aboutsite": "Mahitungod han {{SITENAME}}",
"aboutpage": "Project:Mahitungod han",
"copyright": "An sulod mabiblingan ha ilarom han $1 antes may-ada pasabot.",
"disclaimers": "Mga Disclaimer",
"disclaimerpage": "Project:Kasahiran nga disclaimer",
"edithelp": "Bulig hin pagliwat",
+ "helppage-top-gethelp": "Bulig",
"mainpage": "Syahan nga Pakli",
"mainpage-description": "Syahan nga Pakli",
"policy-url": "Project:Polisiya",
"hidetoc": "tago-a",
"collapsible-collapse": "Rumpag",
"collapsible-expand": "Latag",
+ "confirmable-confirm": "Sigurado {{GENDER:$1|ka}}?",
+ "confirmable-yes": "Oo",
+ "confirmable-no": "Diri",
"thisisdeleted": "¿Kitaa o balika in $1?",
"viewdeleted": "¿Kitaa in $1?",
"restorelink": "{{PLURAL:$1|usa nga ginpara nga pagliwat|$1 ka ginpara nga mga pagliwat}}",
"readonly_lag": "Ginlugaring pagtranka han database samtang an mga nasunod nga mga database nga server naglalanat pa han agaron",
"internalerror": "Sayop ha sulod",
"internalerror_info": "Sayop ha sulod: $1",
+ "internalerror-fatal-exception": "Fatal exception han klase \"$1\"",
"filecopyerror": "Diri nakokopya an paypay nga ''$1'' ha ''$2''.",
"filerenameerror": "Diri nababalyuan an ngaran han paypay nga ''$1'' ha ''$2''.",
"filedeleteerror": "Diri napapara an paypay nga ''$1''.",
"directorycreateerror": "Waray makahimo han direktoryo nga \"$1\".",
+ "directoryreadonlyerror": "Direktorya \"$1\" in pagbasa la.",
+ "directorynotreadableerror": "Direktorya \"$1\" in diri nababasahan.",
"filenotfound": "Diri nabibilngan an paypay nga \"$1\"",
"unexpected": "Diri ginlalauman nga balor: \"$1\"=\"$2\".",
"formerror": "Sayop: Diri nasusumite an porma.",
"no-null-revision": "Diri nakakahimo hin bag-o nga null rebisyon para han pakli \"$1\"",
"badtitle": "Maraot nga titulo",
"badtitletext": "An ginhangyo nga pakli diri puyde, waray sulod, o sayop nga nasumpay nga inter-pinunongan o inter-wiki nga titulo.\nBangin mayda usa o damo nga mga agi nga diri puyde magamit ha mga titulo.",
+ "title-invalid-empty": "An ginhangyo nga titulo han pakli in waray sulod o nagsusulod la han ngaran han uska ngaran-latáng.",
+ "title-invalid-utf8": "An ginhangyo nga titulo han pakli in nagsusulod hin invalid UTF-8 sequence.",
+ "title-invalid-interwiki": "An ginhangyo nga titulo han pakli in nagsusulod hin uska interwiki nga sumpay nga diri magagamitan ha mga titulo.",
+ "title-invalid-talk-namespace": "An ginhangyo nga titulo hin pakli in natudlok ha hiruhimangraw nga pakli nga waray pa.",
+ "title-invalid-characters": "An ginhangyo nga titulo han pakli in nagsusulod hin invalid characters: \"$1\".",
+ "title-invalid-relative": "An titulo in may-ada relative path. An mga relative page title (./, ../) in diri gintutugotan, tungod nga hira in agsob diri maaabtan kun gamiton han kanan gumaramit browser.",
+ "title-invalid-magic-tilde": "An ginhangyo nga titulo han pakli in nagsusulod hin invalid magic tilde sequence (<nowiki>~~~</nowiki>).",
+ "title-invalid-too-long": "An ginhangyo nga titulo han pakli in halaba hin duro. Diri dapat mas halaba kaysa $1 {{PLURAL:$1|ka byte|ka mga byte}} ha UTF-8 encoding.",
+ "title-invalid-leading-colon": "An ginhangyo nga titulo han pakli in nagsusulod hin invalid colon ha katikangan.",
"perfcached": "An nasunod nga data gin-cache ngan bangin diri amo an yana. In maximum hin {{PLURAL:$1|usa ka resulta|$1 ka mga resulta}} aada hit cache.",
"perfcachedts": "An nasunod nga data gin-cache, ngan kataposan ginbag-o dida han $1. In maximum hin {{PLURAL:$4|usa ka resulta|$4 ka resulta}} aada hit cache.",
"querypage-no-updates": "An mga kabag-ohan para hini nga pakli ha yana diri mahihimo.\nAn data dini diri mahihimo nga bag-o.",
"viewsource": "Kitaa an ginkuhaan",
"viewsource-title": "Kitaa an tinikangan para han $1",
"actionthrottled": "Ginpahinay an ginbuhat",
- "actionthrottledtext": "Komo uska pangontra ha spam, ikaw in ginlilimitaran paghimo hini nga pagbuhat hin sobra kadamo ha sulod hin gutiay nga oras, ngan ikaw in naglapos hini nga katubtuban.\nAlayon pagutro kahuman hin pipira ka mga minuto.",
+ "actionthrottledtext": "Komo uska pangontra han abuso, ikaw in ginlilimitahan paghimo hini nga pagbuhat hin sobra kadamo ha sulod hin gutiay nga panahon, ngan ikaw in naglapos hini nga katubtuban.\nAlayon pagutro kahuman hin pipira ka mga minuto.",
"protectedpagetext": "Ginpanalipdan ini nga pakli basi mapugngan an pagliwat o iba pa nga mga maburuhat.",
- "viewsourcetext": "Puydi ka kinmita ngan kinmopya han gintikangan han pakli:",
- "viewyourtext": "Puydi nim makit-an ngan makopya an tinikangan han '''imo mga pagliwat''' ha dinhi nga pakli:",
+ "viewsourcetext": "Puydi ka kumita ngan kumopya han gintikangan han pakli.",
+ "viewyourtext": "Puydi nim makit-an ngan makopya an tinikangan <strong>imo mga pagliwat</strong> dinhi nga pakli:",
"protectedinterface": "Ini nga pakli in nahatag hin teksto hit interface para han software han hin nga wiki, ngan in pinasasaliporan para makalikay hit pag-abuso.\nPara makadugang o makaliwat hin mga paghubad para han tanan nga mga wiki, alayon paggamit han [//translatewiki.net/ translatewiki.net], an kanan MediaWiki proyekto hin lokalisasyon.",
"editinginterface": "'''Pahimatngon:''' Imo ginliliwat an pakli nga gingagamit paghatag hin interface text para han software.\nAn mga pagbag-o hini nga pakli in makakaapekto han user interface han iba nga mga gumaramit hini nga wiki.\nPara makadugang o makabag-o han mga paghubad para han ngatanan nga mga wiki, alayon paggamit han [//translatewiki.net/ translatewiki.net], an lokalisasyon nga proyekto han MediaWiki.",
"cascadeprotected": "Ini nga pakli in pinapasaliporan hin pagliwat tungod ini in nalalakip ha masunod nga {{PLURAL:$1|pakli, kun diin |mga pakli, kun diin}} pinapasaliporan hit \"cascading\" nga pagpili nga pinaandar:\n$2",
"createacct-reason": "Rason",
"createacct-reason-ph": "Kay ano nahimo ka hin usa pa nga akawnt",
"createacct-submit": "Ighimo an im akawnt",
- "createacct-another-submit": "Paghimo hin lain nga akant",
+ "createacct-another-submit": "Paghimo hin account",
"createacct-benefit-heading": "{{SITENAME}} in ginhimo hin tawo nga sugad ha imo.",
"createacct-benefit-body1": "{{PLURAL:$1|pagliwat|mga pagliwat}}",
"createacct-benefit-body2": "{{PLURAL:$1|ka pakli|ka mga pakli}}",
"createacct-benefit-body3": "bag-o pala nga {{PLURAL:$1|mag-aramot|mga mag-aramot}}",
"badretype": "Diri naangay an mga tigaman-pagsulod nga im ginbutang",
+ "usernameinprogress": "An paghimo hin account para hinin nga ngaran hit gumaramit in ginpoproseso na. Alayon paghulat.",
"userexists": "An agnay hiton gumaramit nga im ginbutang in gingamit na.\nAlayon pagpili hin lain nga ngaran.",
"loginerror": "Sayop hin pagsakob",
"createacct-error": "Pakyas an paghimo han akawnt",
"wrongpassword": "Sayop nga tigaman-pagsulod an nahibutang.\nAlayon pagutro pagbutang.",
"wrongpasswordempty": "An tigaman-pagsulod nga ginbutang in waray sulod.\nAlayon pagutro pagbutang.",
"passwordtooshort": "An tigaman-pagsulod dapat diri maubos hit {{PLURAL:$1|1 nga agi|$1 nga agi}}.",
+ "passwordtoolong": "It mga password in diri puydi mas huruhilaba hin {{PLURAL:$1|1 ka karakter|$1 ka mga karakter}}.",
"password-name-match": "An imo tigaman-pagsulod in kinahanglan iba ha imo agnay-hiton-gumaramit.",
"password-login-forbidden": "An paggamit hini nga agnay-hit-gumaramit ngan tigaman-pagsulod in diri gintutugotan.",
"mailmypassword": "Ig-reset an tigaman-pagsulod",
"passwordreset-emailsent": "Ginpadangat an password reset email.",
"passwordreset-emailsent-capture": "Ginpadangat an password reset email, nga ginpakita ha ubos.",
"passwordreset-emailerror-capture": "Ginhimo an password reset email, kun diin nakikita ha ubos, pero pakyas an pagpadara ha {{GENDER:$2|gumaramit}}: $1",
- "changeemail": "Igliwan an e-mail address",
+ "changeemail": "Igliwat o igtanggal an e-mail address",
"changeemail-header": "Igliwan an e-mail address akawnt",
+ "changeemail-passwordrequired": "Kinahanglan nim igbutang an imo password para igkompirma inin nga pagbag-o.",
"changeemail-no-info": "Kinahanglanon mo mag-log-in para ka direkta makasakob hini nga pakli.",
"changeemail-oldemail": "Yana nga e-mail address:",
"changeemail-newemail": "Bag-o nga e-mail address:",
"compareselectedversions": "Igkumpara an mga pinili nga pagbabag-o",
"editundo": "Igpawara an ginbuhat",
"diff-empty": "(Waray pagkakaiba)",
+ "diff-multi-sameuser": "({{PLURAL:$1|Usa nga intermediate revision|$1 mga intermediate revision}} han pareho nga gumaramit nga waray ginpakita)",
"diff-multi-manyusers": "({{PLURAL:$1|Uska sapit-nahiuna nga rebisyon|$1 nga mga sapit-nanhiuna nga rebisyon}} nga may labaw nga $2 {{PLURAL:$2|gumaramit|mga gumaramit}} in diri ginpapakita)",
"searchresults": "Mga nabilingan han pagbiling",
"searchresults-title": "Mga nabilngan han pagbiling para han \"$1\"",
"search-relatedarticle": "kasumapy",
"searchrelated": "kadugtong",
"searchall": "ngatanan",
+ "search-showingresults": "{{PLURAL:$4|Resulta <strong>$1</strong> han <strong>$3</strong>|Mga resulta <strong>$1 - $2</strong> han <strong>$3</strong>}}",
"search-nonefound": "Waray resulta an nakakabaton han pakiana.",
"powersearch-legend": "Abansado nga pagbiling",
"powersearch-ns": "Pamiling ha mga ngaran-lat'ang:",
"recentchanges-label-unpatrolled": "Ini nga pagliwat in diri pa nakapatrol",
"recentchanges-label-plusminus": "An kadako han pakli in nabag-o hin ini nga numero nga mga byte",
"recentchanges-legend-heading": "'''Leyenda:'''",
+ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (kitaa gihapon [[Special:NewPages|talaan han mga bag-o nga pakli]])",
"rcnotefrom": "An ha ubos in mga pagbabag-o tikang han <strong>$2</strong> (kutob ngadto ha <strong>$1</strong> nga ginpakita).",
"rclistfrom": "Pakit-a an mga ginbag-ohan tikang han $3 $2",
"rcshowhideminor": "$1 gudti nga mga pagliwat",
"undelete-show-file-submit": "Oo",
"namespace": "Ngaran-lat'ang",
"invert": "Baliskara an pirilion",
+ "tooltip-invert": "Ig-check inin nga kahon para igtago an mga pagbag-o han mga pakli ha sulod han pipira nga ngaran-latáng (ngan an may pagkahisumpay nga ngaran-latáng kun gin-check)",
"namespace_association": "Kasumpay nga mga ngaran-lat'ang",
+ "tooltip-namespace_association": "Igcheck inin nga kahon para liwat iglakip an hiruhimangraw o himangrawon nga ngaran-latáng nga may pagkahisumpay ha pinili nga ngaran-lat'ang",
"blanknamespace": "(Panguna)",
"contributions": "Mga ámot ni {{GENDER:$1|User}}",
"contributions-title": "Mga amot han gumaramit para ha $1",
"tog-hideminor": "隱藏近期變更中的小修訂",
"tog-hidepatrolled": "隱藏近期變更中巡查過的編輯",
"tog-newpageshidepatrolled": "隱藏新頁面清單中巡查過的頁面",
+ "tog-hidecategorization": "隱藏頁面分類",
"tog-extendwatchlist": "展開監視清單顯示包含最近以外的所有變更",
"tog-usenewrc": "依近期變更與監視清單的頁面分類顯示變更",
"tog-numberheadings": "標題自動編號",
"tog-watchlisthideliu": "隱藏監視清單中已登入使用者的編輯",
"tog-watchlisthideanons": "隱藏監視清單中匿名使用者的編輯",
"tog-watchlisthidepatrolled": "隱藏監視清單中已巡查的編輯",
+ "tog-watchlisthidecategorization": "隱藏頁面分類",
"tog-ccmeonemails": "我給他人寄出郵件時，也寄出一份副本到我的電子郵件信箱",
"tog-diffonly": "比對差異時下方不顯示頁面內容",
"tog-showhiddencats": "顯示隱藏分類",
"createaccountreason": "原因：",
"createacct-reason": "原因",
"createacct-reason-ph": "您為什麼要建立另一個帳號",
- "createacct-captcha": "安全驗證",
- "createacct-imgcaptcha-ph": "輸入您在上方看到的文字",
"createacct-submit": "建立您的帳號",
"createacct-another-submit": "建立帳號",
"createacct-benefit-heading": "{{SITENAME}} 是由像您一樣貢獻的人所建立的。",
"passwordreset-emailsent-capture": "已寄出重設密碼的電子郵件，並於下方顯示。",
"passwordreset-emailerror-capture": "下列為重設密碼的電子郵件內容，傳送給{{GENDER:$2|使用者}}失敗：$1",
"changeemail": "變更或移除電子郵件地址",
- "changeemail-header": "變更帳號的電子郵箱地址",
+ "changeemail-header": "請填寫此表單來變更您的電子郵件地址，若您想要移除您帳號所連結的所有電子郵件地址，請於新電子郵件地址欄位留空。",
+ "changeemail-passwordrequired": "您須要輸入您的密碼來確認此次變更。",
"changeemail-no-info": "您必須登入方可直接存取此頁面。",
"changeemail-oldemail": "目前的電子郵件地址：",
"changeemail-newemail": "新的電子郵件地址：",
"missingsummary": "<strong>提醒：</strong>您未填寫編輯摘要。\n若您再點選 \"{{int:savearticle}}\" 一次，將略過摘要直接儲存您的編輯。",
"selfredirect": "<strong>警告：</strong> 您正建立連結至自己的重新導向。\n您可能指定錯要重新導向的目標頁面或者編輯錯頁面。\n若您再點選 \"{{int:savearticle}}\" 一次，將會繼續建立重新導向。",
"missingcommenttext": "請在下方輸入評論。",
- "missingcommentheader": "<strong>提醒：</strong>您未填寫此評論的主旨/標題。\n若您再點選 \"{{int:savearticle}}\" 一次，將略過主旨/標題直接儲存您的評論。",
+ "missingcommentheader": "<strong>提醒：</strong>您未填寫此評論的主旨。\n若您再點選 \"{{int:savearticle}}\" 一次，將略過主旨/標題直接儲存您的評論。",
"summary-preview": "摘要預覽：",
"subject-preview": "主旨預覽：",
"previewerrortext": "嘗試預覽您的變更時發生錯誤。",
"permissionserrors": "權限錯誤",
"permissionserrorstext": "由於下列{{PLURAL:$1|原因}}，您沒有權限進行目前的動作：",
"permissionserrorstext-withaction": "由於下列{{PLURAL:$1|原因}}，您沒有權限進行 $2 的動作：",
+ "contentmodelediterror": "您無法編輯此修訂，因此修訂使用的內容模型為 <code>$1</code> 而目前使用的頁面內容模型為 <code>$2</code>。",
"recreate-moveddeleted-warn": "<strong>警告：您正重新建立先前已刪除的頁面。</strong>\n\n您應考慮是否繼續編輯此頁。\n在此提供刪除與移動日誌方便作為參考：",
"moveddeleted-notice": "此頁面已刪除。\n下方提供此頁面的刪除和移動日誌以便參考。",
"moveddeleted-notice-recent": "抱歉，此頁面最近被刪除 (24 小時內)。\n以下提供此頁面的刪除與移動日誌做為參考。",
"prefs-help-recentchangescount": "這包含近期變更、頁面歷史以及日誌。",
"prefs-help-watchlist-token2": "訂閱您的監視清單所需的密鑰。\n任何人只要知道密鑰就能夠讀取您的監視清單，所以請勿任意與它人共享。\n若有需要 [[Special:ResetTokens|您可重設密鑰]]。",
"savedprefs": "已儲存您的偏好設定。",
+ "savedrights": "已儲存 {{GENDER:$1|$1}} 的使用者權限。",
"timezonelegend": "時區：",
"localtime": "當地時間：",
"timezoneuseserverdefault": "使用 Wiki 預設值 ($1)",
"rcshowhidemine": "$1 我的編輯",
"rcshowhidemine-show": "顯示",
"rcshowhidemine-hide": "隱藏",
+ "rcshowhidecategorization": "$1 頁面分類",
+ "rcshowhidecategorization-show": "顯示",
+ "rcshowhidecategorization-hide": "隱藏",
"rclinks": "顯示近期 $2 天內的 $1 次變更。<br />$3",
"diff": "差異",
"hist": "歷史",
"upload-options": "上傳選項",
"watchthisupload": "監視此檔案",
"filewasdeleted": "先前已有同樣名稱的檔案上傳，後來被刪除。\n您應在上傳此檔案前檢查 $1。",
+ "filename-thumb-name": "此檔名似乎為縮圖檔名，請不要重新上傳縮圖回相同 wiki。 否則請先修正為更具意義的檔案名稱並且去除縮圖的檔名字首。",
"filename-bad-prefix": "您上傳的檔案名稱以 <strong>\"$1\"</strong> 開頭，是不具任何描述意義的名稱，通常由數位相機自動產生。\n請替您的檔案使用一個更具描述意義的名稱。",
"upload-success-subj": "成功上傳",
"upload-success-msg": "您已成功使用 [$2] 上傳檔案，可於此處取得檔案：[[:{{ns:file}}:$1]]",
"upload-form-label-infoform-description": "描述",
"upload-form-label-usage-title": "用法",
"upload-form-label-usage-filename": "檔案名稱",
+ "foreign-structured-upload-form-label-own-work": "這是我的作品",
"foreign-structured-upload-form-label-infoform-categories": "分類",
"foreign-structured-upload-form-label-infoform-date": "日期",
+ "foreign-structured-upload-form-label-own-work-message-local": "我確定我上傳的檔案已遵守下列 {{SITENAME}} 的服務條款與授權條款。",
+ "foreign-structured-upload-form-label-not-own-work-message-local": "若您無法同意遵守 {{SITENAME}} 的政策上傳檔案，請關閉此對話框並嘗試其他方法。",
+ "foreign-structured-upload-form-label-not-own-work-local-local": "您也可嘗試[[Special:Upload|預設的上傳頁面]]。",
"backend-fail-stream": "無法傳輸檔案 \"$1\"。",
"backend-fail-backup": "無法備份檔案 \"$1\"。",
"backend-fail-notexists": "檔案 $1 不存在。",
return;
}
- $dbw = wfGetDB( DB_MASTER );
- $dbw->begin( __METHOD__ );
-
$updates = $content->getSecondaryDataUpdates( $page->getTitle() );
DataUpdate::runUpdates( $updates );
-
- $dbw->commit( __METHOD__ );
}
/**
$( '#config_wgSitename' ).on( 'keyup change', syncText ).each( syncText );
// Show/Hide memcached servers when needed
- $( 'input[name$="config_wgMainCacheType"]' ).change( function () {
+ $( 'input[name$="config__MainCacheType"]' ).change( function () {
var $memc = $( '#config-memcachewrapper' );
- if ( $( 'input[name$="config_wgMainCacheType"]:checked' ).val() === 'memcached' ) {
+ if ( $( 'input[name$="config__MainCacheType"]:checked' ).val() === 'memcached' ) {
$memc.show( 'slow' );
} else {
$memc.hide( 'slow' );
"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-watch": "0.6.1",
"grunt-jscs": "2.1.0",
- "grunt-jsonlint": "1.0.4",
+ "grunt-jsonlint": "1.0.5",
"grunt-karma": "0.12.1",
"karma": "0.13.10",
"karma-chrome-launcher": "0.2.0",
* @param {jQuery.Event} e
*/
function doLivePreview( e ) {
- var isDiff, api, request, postData, copySelectors, section,
+ var isDiff, api, parseRequest, diffRequest, postData, copySelectors, section,
$wikiPreview, $wikiDiff, $editform, $textbox, $summary, $copyElements, $spinner, $errorBox;
isDiff = ( e.target.name === 'wpDiff' );
api = new mw.Api();
postData = {
action: 'parse',
- uselang: mw.config.get( 'wgUserLanguage' ),
title: mw.config.get( 'wgPageName' ),
- text: $textbox.textSelection( 'getContents' ),
summary: $summary.textSelection( 'getContents' ),
- sectionpreview: section !== ''
+ prop: ''
};
- if ( section === 'new' ) {
- postData.section = 'new';
- postData.sectiontitle = postData.summary;
- }
-
if ( isDiff ) {
$wikiPreview.hide();
- // First PST the input, then diff it
- postData.onlypst = true;
- request = api.post( postData );
- request.done( function ( response ) {
- api.post( {
- action: 'query',
- indexpageids: true,
- prop: 'revisions',
- titles: mw.config.get( 'wgPageName' ),
- rvdifftotext: response.parse.text[ '*' ],
- rvprop: [],
- rvsection: section === '' ? undefined : section
- } ).done( function ( response ) {
- try {
- var diffHtml = response.query.pages[ response.query.pageids[ 0 ] ]
- .revisions[ 0 ].diff[ '*' ];
- $wikiDiff.find( 'table.diff tbody' ).html( diffHtml );
- } catch ( e ) {
- // "result.blah is undefined" error, ignore
- mw.log.warn( e );
- }
- $wikiDiff.show();
- } );
+ if ( postData.summary ) {
+ parseRequest = api.post( postData );
+ }
+
+ diffRequest = api.post( {
+ action: 'query',
+ indexpageids: true,
+ prop: 'revisions',
+ titles: mw.config.get( 'wgPageName' ),
+ rvdifftotext: $textbox.textSelection( 'getContents' ),
+ rvdifftotextpst: true,
+ rvprop: '',
+ rvsection: section === '' ? undefined : section
+ } );
+
+ // Wait for the summary before showing the diff so the page doesn't jump twice
+ $.when( diffRequest, parseRequest ).done( function ( response ) {
+ var diffHtml,
+ query = response[ 0 ].query;
+ try {
+ diffHtml = query.pages[ query.pageids[ 0 ] ]
+ .revisions[ 0 ].diff[ '*' ];
+ $wikiDiff.find( 'table.diff tbody' ).html( diffHtml );
+ } catch ( e ) {
+ // "result.blah is undefined" error, ignore
+ mw.log.warn( e );
+ }
+ $wikiDiff.show();
} );
} else {
$wikiDiff.hide();
+
$.extend( postData, {
+ prop: 'text|displaytitle|modules|jsconfigvars|categorieshtml|templates|langlinks|limitreporthtml',
+ text: $textbox.textSelection( 'getContents' ),
pst: true,
preview: true,
- prop: 'text|displaytitle|modules|jsconfigvars|categorieshtml|templates|langlinks|limitreporthtml',
- disableeditsection: true
+ sectionpreview: section !== '',
+ disableeditsection: true,
+ uselang: mw.config.get( 'wgUserLanguage' )
} );
- request = api.post( postData );
- request.done( function ( response ) {
+ if ( section === 'new' ) {
+ postData.section = 'new';
+ postData.sectiontitle = postData.summary;
+ }
+
+ parseRequest = api.post( postData );
+ parseRequest.done( function ( response ) {
var li, newList, $displaytitle, $content, $parent, $list;
if ( response.parse.jsconfigvars ) {
mw.config.set( response.parse.jsconfigvars );
$wikiPreview.append( $content );
$wikiPreview.show();
-
}
} );
}
- request.done( function ( response ) {
- var isSubject = ( section === 'new' ),
+ $.when( parseRequest, diffRequest ).done( function ( parseResp ) {
+ var parse = parseResp && parseResp[ 0 ].parse,
+ isSubject = ( section === 'new' ),
summaryMsg = isSubject ? 'subject-preview' : 'summary-preview',
$summaryPreview = $editform.find( '.mw-summary-preview' ).empty();
- if ( response.parse.parsedsummary && response.parse.parsedsummary[ '*' ] !== '' ) {
+ if ( parse && parse.parsedsummary && parse.parsedsummary[ '*' ] !== '' ) {
$summaryPreview.append(
mw.message( summaryMsg ).parse(),
' ',
$( '<span>' ).addClass( 'comment' ).html(
// There is no equivalent to rawParams
mw.message( 'parentheses' ).escaped()
- .replace( '$1', response.parse.parsedsummary[ '*' ] )
+ .replace( '$1', parse.parsedsummary[ '*' ] )
)
);
}
mw.hook( 'wikipage.editform' ).fire( $editform );
- } );
- request.always( function () {
+ } ).always( function () {
$spinner.hide();
$copyElements.animate( {
opacity: 1
}, 'fast' );
- } );
- request.fail( function ( code, result ) {
- var errorMsg = 'API error: ' + code;
+ } ).fail( function ( code, result ) {
+ // This just shows the error for whatever request failed first
+ var errorMsg = 'API error: ' + code;
if ( code === 'http' ) {
errorMsg = 'HTTP error: ';
if ( result.exception ) {
font-style: italic;
}
-/* Special:Allpages */
-.mw-allpages-nav {
- text-align: right;
- margin-bottom: 1em;
-}
-table.mw-allpages-table-form {
- width: 100%;
-}
-table.mw-allpages-table-form tr {
- vertical-align: top;
-}
-
-/* Special:Prefixindex */
-.mw-prefixindex-nav {
- text-align: right;
-}
-table#mw-prefixindex-nav-table {
- width: 100%;
-}
-td#mw-prefixindex-nav-form {
- margin-bottom: 1em;
- vertical-align: top;
-}
-
/* Special:Block */
p.mw-ipb-conveniencelinks {
font-size: 90%;
},
setWarning: function ( warning ) {
- $( '#wpDestFile-warning' ).html( warning );
+ var $warning = $( $.parseHTML( warning ) );
+ mw.hook( 'wikipage.content' ).fire( $warning );
+ $( '#wpDestFile-warning' ).empty().append( $warning );
// Set a value in the form indicating that the warning is acknowledged and
// doesn't need to be redisplayed post-upload
&:focus {
text-decoration: none;
}
+
+ // a-tags behave different to inputs if the line-height attribute is inherited
+ // from another element (e.g. mw-body-content). They appear bigger as input
+ // tags. See Bug T116427. To fix that, apply the correct line-height (used
+ // for inputs) to a-tags, too.
+ line-height: normal;
}
// Button groups
min-height: 3.75em;
padding-left: 4.75em;
- &:not(:last-child) {
+ &:not( :last-child ) {
margin-bottom: 2px;
}
}
&.oo-ui-iconElement {
- >.oo-ui-iconElement-icon {
+ > .oo-ui-iconElement-icon {
display: block;
width: 3.75em;
height: 3.75em;
left: 0;
- background-color: #ccc;
- opacity: 0.4;
- }
-
- > .mw-widget-titleOptionWidget-hasImage {
- border: 0;
- background-size: cover;
- opacity: 0.7;
+ &:not( .mw-widget-titleOptionWidget-hasImage ) {
+ background-color: #ccc;
+ opacity: 0.4;
+ }
+ &.mw-widget-titleOptionWidget-hasImage {
+ border: 0;
+ background-size: cover;
+ opacity: 0.7;
+ }
}
}
- }
- &.oo-ui-optionWidget-highlighted, &.oo-ui-optionWidget-selected {
- &.oo-ui-iconElement > .mw-widget-titleOptionWidget-hasImage {
- opacity: 1;
+ &.oo-ui-optionWidget-highlighted, &.oo-ui-optionWidget-selected {
+ &.oo-ui-iconElement > .mw-widget-titleOptionWidget-hasImage {
+ opacity: 1;
+ }
}
}
}
* @inheritdoc
*/
mw.ForeignStructuredUpload.BookletLayout.prototype.getText = function () {
- this.upload.addDescription( 'en', this.descriptionWidget.getValue() );
+ var language = mw.config.get( 'wgContentLanguage' );
+ this.upload.addDescription( language, this.descriptionWidget.getValue() );
this.upload.setDate( this.dateWidget.getValue() );
this.upload.addCategories( this.categoriesWidget.getItemsData() );
return this.upload.getText();
public function testUpdateRedirect( $oldText, $expectedText ) {
$this->setMwGlobals( array(
'wgServer' => '//example.org',
- 'wgScriptPath' => '/w/index.php',
+ 'wgScriptPath' => '/w',
+ 'wgScript' => '/w/index.php',
+ 'wgResourceBasePath' => '/w',
) );
$target = Title::newFromText( "testUpdateRedirect_target" );
public function testGetRedirectTarget( $title, $text ) {
$this->setMwGlobals( array(
'wgServer' => '//example.org',
- 'wgScriptPath' => '/w/index.php',
+ 'wgScriptPath' => '/w',
+ 'wgScript' => '/w/index.php',
+ 'wgResourceBasePath' => '/w',
) );
$content = new JavaScriptContent( $text );
$target = $content->getRedirectTarget();
$this->assertInternalType( 'string', $obj->setterArgs[0] );
$this->assertSame( 'unwrapped', $obj->setterArgs[0] );
}
+
+ /**
+ * @covers ObjectFactory::constructClassInstance
+ * @dataProvider provideConstructClassInstance
+ */
+ public function testConstructClassInstance( $args ) {
+ $obj = ObjectFactory::constructClassInstance(
+ 'ObjectFactoryTestFixture', $args
+ );
+ $this->assertSame( $args, $obj->args );
+ }
+
+ public function provideConstructClassInstance() {
+ // These args go to 11. I thought about making 10 one louder, but 11!
+ return array(
+ '0 args' => array( array() ),
+ '1 args' => array( array( 1, ) ),
+ '2 args' => array( array( 1, 2, ) ),
+ '3 args' => array( array( 1, 2, 3, ) ),
+ '4 args' => array( array( 1, 2, 3, 4, ) ),
+ '5 args' => array( array( 1, 2, 3, 4, 5, ) ),
+ '6 args' => array( array( 1, 2, 3, 4, 5, 6, ) ),
+ '7 args' => array( array( 1, 2, 3, 4, 5, 6, 7, ) ),
+ '8 args' => array( array( 1, 2, 3, 4, 5, 6, 7, 8, ) ),
+ '9 args' => array( array( 1, 2, 3, 4, 5, 6, 7, 8, 9, ) ),
+ '10 args' => array( array( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ) ),
+ '11 args' => array( array( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, ) ),
+ );
+ }
}
class ObjectFactoryTestFixture {
--- /dev/null
+<?php
+/**
+ * @author Matthias Mullie <mmullie@wikimedia.org>
+ * @group BagOStuff
+ */
+class BagOStuffTest extends MediaWikiTestCase {
+ /** @var BagOStuff */
+ private $cache;
+
+ protected function setUp() {
+ parent::setUp();
+
+ // type defined through parameter
+ if ( $this->getCliArg( 'use-bagostuff' ) ) {
+ $name = $this->getCliArg( 'use-bagostuff' );
+
+ $this->cache = ObjectCache::newFromId( $name );
+ } else {
+ // no type defined - use simple hash
+ $this->cache = new HashBagOStuff;
+ }
+
+ $this->cache->delete( wfMemcKey( 'test' ) );
+ }
+
+ /**
+ * @covers BagOStuff::makeGlobalKey
+ * @covers BagOStuff::makeKeyInternal
+ */
+ public function testMakeKey() {
+ $cache = ObjectCache::newFromId( 'hash' );
+
+ $localKey = $cache->makeKey( 'first', 'second', 'third' );
+ $globalKey = $cache->makeGlobalKey( 'first', 'second', 'third' );
+
+ $this->assertStringMatchesFormat(
+ '%Sfirst%Ssecond%Sthird%S',
+ $localKey,
+ 'Local key interpolates parameters'
+ );
+
+ $this->assertStringMatchesFormat(
+ 'global%Sfirst%Ssecond%Sthird%S',
+ $globalKey,
+ 'Global key interpolates parameters and contains global prefix'
+ );
+
+ $this->assertNotEquals(
+ $localKey,
+ $globalKey,
+ 'Local key and global key with same parameters should not be equal'
+ );
+
+ $this->assertNotEquals(
+ $cache->makeKeyInternal( 'prefix', array( 'a', 'bc:', 'de' ) ),
+ $cache->makeKeyInternal( 'prefix', array( 'a', 'bc', ':de' ) )
+ );
+ }
+
+ /**
+ * @covers BagOStuff::merge
+ * @covers BagOStuff::mergeViaLock
+ */
+ public function testMerge() {
+ $key = wfMemcKey( 'test' );
+
+ $usleep = 0;
+
+ /**
+ * Callback method: append "merged" to whatever is in cache.
+ *
+ * @param BagOStuff $cache
+ * @param string $key
+ * @param int $existingValue
+ * @use int $usleep
+ * @return int
+ */
+ $callback = function ( BagOStuff $cache, $key, $existingValue ) use ( &$usleep ) {
+ // let's pretend this is an expensive callback to test concurrent merge attempts
+ usleep( $usleep );
+
+ if ( $existingValue === false ) {
+ return 'merged';
+ }
+
+ return $existingValue . 'merged';
+ };
+
+ // merge on non-existing value
+ $merged = $this->cache->merge( $key, $callback, 0 );
+ $this->assertTrue( $merged );
+ $this->assertEquals( $this->cache->get( $key ), 'merged' );
+
+ // merge on existing value
+ $merged = $this->cache->merge( $key, $callback, 0 );
+ $this->assertTrue( $merged );
+ $this->assertEquals( $this->cache->get( $key ), 'mergedmerged' );
+
+ /*
+ * Test concurrent merges by forking this process, if:
+ * - not manually called with --use-bagostuff
+ * - pcntl_fork is supported by the system
+ * - cache type will correctly support calls over forks
+ */
+ $fork = (bool)$this->getCliArg( 'use-bagostuff' );
+ $fork &= function_exists( 'pcntl_fork' );
+ $fork &= !$this->cache instanceof HashBagOStuff;
+ $fork &= !$this->cache instanceof EmptyBagOStuff;
+ $fork &= !$this->cache instanceof MultiWriteBagOStuff;
+ if ( $fork ) {
+ // callback should take awhile now so that we can test concurrent merge attempts
+ $pid = pcntl_fork();
+ if ( $pid == -1 ) {
+ // can't fork, ignore this test...
+ } elseif ( $pid ) {
+ // wait a little, making sure that the child process is calling merge
+ usleep( 3000 );
+
+ // attempt a merge - this should fail
+ $merged = $this->cache->merge( $key, $callback, 0, 1 );
+
+ // merge has failed because child process was merging (and we only attempted once)
+ $this->assertFalse( $merged );
+
+ // make sure the child's merge is completed and verify
+ usleep( 3000 );
+ $this->assertEquals( $this->cache->get( $key ), 'mergedmergedmerged' );
+ } else {
+ $this->cache->merge( $key, $callback, 0, 1 );
+
+ // Note: I'm not even going to check if the merge worked, I'll
+ // compare values in the parent process to test if this merge worked.
+ // I'm just going to exit this child process, since I don't want the
+ // child to output any test results (would be rather confusing to
+ // have test output twice)
+ exit;
+ }
+ }
+ }
+
+ /**
+ * @covers BagOStuff::add
+ */
+ public function testAdd() {
+ $key = wfMemcKey( 'test' );
+ $this->assertTrue( $this->cache->add( $key, 'test' ) );
+ }
+
+ public function testGet() {
+ $value = array( 'this' => 'is', 'a' => 'test' );
+
+ $key = wfMemcKey( 'test' );
+ $this->cache->add( $key, $value );
+ $this->assertEquals( $this->cache->get( $key ), $value );
+ }
+
+ /**
+ * @covers BagOStuff::getWithSetCallback
+ */
+ public function testGetWithSetCallback() {
+ $key = wfMemcKey( 'test' );
+ $value = $this->cache->getWithSetCallback(
+ $key,
+ 30,
+ function () {
+ return 'hello kitty';
+ }
+ );
+
+ $this->assertEquals( 'hello kitty', $value );
+ $this->assertEquals( $value, $this->cache->get( $key ) );
+ }
+
+ /**
+ * @covers BagOStuff::incr
+ */
+ public function testIncr() {
+ $key = wfMemcKey( 'test' );
+ $this->cache->add( $key, 0 );
+ $this->cache->incr( $key );
+ $expectedValue = 1;
+ $actualValue = $this->cache->get( $key );
+ $this->assertEquals( $expectedValue, $actualValue, 'Value should be 1 after incrementing' );
+ }
+
+ /**
+ * @covers BagOStuff::getMulti
+ */
+ public function testGetMulti() {
+ $value1 = array( 'this' => 'is', 'a' => 'test' );
+ $value2 = array( 'this' => 'is', 'another' => 'test' );
+ $value3 = array( 'testing a key that may be encoded when sent to cache backend' );
+ $value4 = array( 'another test where chars in key will be encoded' );
+
+ $key1 = wfMemcKey( 'test1' );
+ $key2 = wfMemcKey( 'test2' );
+ // internally, MemcachedBagOStuffs will encode to will-%25-encode
+ $key3 = wfMemcKey( 'will-%-encode' );
+ $key4 = wfMemcKey(
+ 'flowdb:flow_ref:wiki:by-source:v3:Parser\'s_"broken"_+_(page)_&_grill:testwiki:1:4.7'
+ );
+
+ $this->cache->add( $key1, $value1 );
+ $this->cache->add( $key2, $value2 );
+ $this->cache->add( $key3, $value3 );
+ $this->cache->add( $key4, $value4 );
+
+ $this->assertEquals(
+ array( $key1 => $value1, $key2 => $value2, $key3 => $value3, $key4 => $value4 ),
+ $this->cache->getMulti( array( $key1, $key2, $key3, $key4 ) )
+ );
+
+ // cleanup
+ $this->cache->delete( $key1 );
+ $this->cache->delete( $key2 );
+ $this->cache->delete( $key3 );
+ $this->cache->delete( $key4 );
+ }
+
+ /**
+ * @covers BagOStuff::getScopedLock
+ */
+ public function testGetScopedLock() {
+ $key = wfMemcKey( 'test' );
+ $value1 = $this->cache->getScopedLock( $key, 0 );
+ $value2 = $this->cache->getScopedLock( $key, 0 );
+
+ $this->assertType( 'ScopedCallback', $value1, 'First call returned lock' );
+ $this->assertNull( $value2, 'Duplicate call returned no lock' );
+
+ unset( $value1 );
+
+ $value3 = $this->cache->getScopedLock( $key, 0 );
+ $this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' );
+ unset( $value3 );
+
+ $value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+ $value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+
+ $this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
+ $this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
+ }
+}
--- /dev/null
+<?php
+
+/**
+ * @group Database
+ */
+class MultiWriteBagOStuffTest extends MediaWikiTestCase {
+ /** @var HashBagOStuff */
+ private $cache1;
+ /** @var HashBagOStuff */
+ private $cache2;
+ /** @var MultiWriteBagOStuff */
+ private $cache;
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this->cache1 = new HashBagOStuff();
+ $this->cache2 = new HashBagOStuff();
+ $this->cache = new MultiWriteBagOStuff( array(
+ 'caches' => array( $this->cache1, $this->cache2 ),
+ 'replication' => 'async',
+ 'asyncHandler' => 'DeferredUpdates::addCallableUpdate'
+ ) );
+ }
+
+ public function testSetImmediate() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $this->cache->set( $key, $value );
+
+ // Set in tier 1
+ $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+ // Set in tier 2
+ $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+ }
+
+ public function testSyncMerge() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $func = function () use ( $value ) {
+ return $value;
+ };
+
+ // XXX: DeferredUpdates bound to transactions in CLI mode
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->begin();
+ $this->cache->merge( $key, $func );
+
+ // Set in tier 1
+ $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+ // Not yet set in tier 2
+ $this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
+
+ $dbw->commit();
+
+ // Set in tier 2
+ $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+
+ $key = wfRandomString();
+
+ $dbw->begin();
+ $this->cache->merge( $key, $func, 0, 1, BagOStuff::WRITE_SYNC );
+
+ // Set in tier 1
+ $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+ // Also set in tier 2
+ $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+
+ $dbw->commit();
+ }
+
+ public function testSetDelayed() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+
+ // XXX: DeferredUpdates bound to transactions in CLI mode
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->begin();
+ $this->cache->set( $key, $value );
+
+ // Set in tier 1
+ $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
+ // Not yet set in tier 2
+ $this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
+
+ $dbw->commit();
+
+ // Set in tier 2
+ $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
+ }
+}
--- /dev/null
+<?php
+
+class ReplicatedBagOStuffTest extends MediaWikiTestCase {
+ /** @var HashBagOStuff */
+ private $writeCache;
+ /** @var HashBagOStuff */
+ private $readCache;
+ /** @var ReplicatedBagOStuff */
+ private $cache;
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this->writeCache = new HashBagOStuff();
+ $this->readCache = new HashBagOStuff();
+ $this->cache = new ReplicatedBagOStuff( array(
+ 'writeFactory' => $this->writeCache,
+ 'readFactory' => $this->readCache,
+ ) );
+ }
+
+ /**
+ * @covers ReplicatedBagOStuff::set
+ */
+ public function testSet() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $this->cache->set( $key, $value );
+
+ // Write to master.
+ $this->assertEquals( $this->writeCache->get( $key ), $value );
+ // Don't write to slave. Replication is deferred to backend.
+ $this->assertEquals( $this->readCache->get( $key ), false );
+ }
+
+ /**
+ * @covers ReplicatedBagOStuff::get
+ */
+ public function testGet() {
+ $key = wfRandomString();
+
+ $write = wfRandomString();
+ $this->writeCache->set( $key, $write );
+ $read = wfRandomString();
+ $this->readCache->set( $key, $read );
+
+ // Read from slave.
+ $this->assertEquals( $this->cache->get( $key ), $read );
+ }
+
+ /**
+ * @covers ReplicatedBagOStuff::get
+ */
+ public function testGetAbsent() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $this->writeCache->set( $key, $value );
+
+ // Don't read from master. No failover if value is absent.
+ $this->assertEquals( $this->cache->get( $key ), false );
+ }
+}
--- /dev/null
+<?php
+
+class WANObjectCacheTest extends MediaWikiTestCase {
+ /** @var WANObjectCache */
+ private $cache;
+ /**@var BagOStuff */
+ private $internalCache;
+
+ protected function setUp() {
+ parent::setUp();
+
+ if ( $this->getCliArg( 'use-wanobjectcache' ) ) {
+ $name = $this->getCliArg( 'use-wanobjectcache' );
+
+ $this->cache = ObjectCache::getWANInstance( $name );
+ } else {
+ $this->cache = new WANObjectCache( array(
+ 'cache' => new HashBagOStuff(),
+ 'pool' => 'testcache-hash',
+ 'relayer' => new EventRelayerNull( array() )
+ ) );
+ }
+
+ $wanCache = TestingAccessWrapper::newFromObject( $this->cache );
+ $this->internalCache = $wanCache->cache;
+ }
+
+ /**
+ * @dataProvider provider_testSetAndGet
+ * @covers WANObjectCache::set()
+ * @covers WANObjectCache::get()
+ * @param mixed $value
+ * @param integer $ttl
+ */
+ public function testSetAndGet( $value, $ttl ) {
+ $key = wfRandomString();
+ $this->cache->set( $key, $value, $ttl );
+
+ $curTTL = null;
+ $this->assertEquals( $value, $this->cache->get( $key, $curTTL ) );
+ if ( is_infinite( $ttl ) || $ttl == 0 ) {
+ $this->assertTrue( is_infinite( $curTTL ), "Current TTL is infinite" );
+ } else {
+ $this->assertGreaterThan( 0, $curTTL, "Current TTL > 0" );
+ $this->assertLessThanOrEqual( $ttl, $curTTL, "Current TTL < nominal TTL" );
+ }
+ }
+
+ public static function provider_testSetAndGet() {
+ return array(
+ array( 14141, 3 ),
+ array( 3535.666, 3 ),
+ array( array(), 3 ),
+ array( null, 3 ),
+ array( '0', 3 ),
+ array( (object)array( 'meow' ), 3 ),
+ array( INF, 3 ),
+ array( '', 3 ),
+ array( 'pizzacat', INF ),
+ );
+ }
+
+ public function testGetNotExists() {
+ $key = wfRandomString();
+ $curTTL = null;
+ $value = $this->cache->get( $key, $curTTL );
+
+ $this->assertFalse( $value, "Non-existing key has false value" );
+ $this->assertNull( $curTTL, "Non-existing key has null current TTL" );
+ }
+
+ public function testSetOver() {
+ $key = wfRandomString();
+ for ( $i = 0; $i < 3; ++$i ) {
+ $value = wfRandomString();
+ $this->cache->set( $key, $value, 3 );
+
+ $this->assertEquals( $this->cache->get( $key ), $value );
+ }
+ }
+
+ public function testStaleSet() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $this->cache->set( $key, $value, 3, array( 'since' => microtime( true ) - 30 ) );
+
+ $this->assertFalse( $this->cache->get( $key ), "Stale set() value ignored" );
+ }
+
+ /**
+ * @covers WANObjectCache::getWithSetCallback()
+ */
+ public function testGetWithSetCallback() {
+ $cache = $this->cache;
+
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $cKey1 = wfRandomString();
+ $cKey2 = wfRandomString();
+
+ $wasSet = 0;
+ $func = function( $old, &$ttl ) use ( &$wasSet, $value ) {
+ ++$wasSet;
+ $ttl = 20; // override with another value
+ return $value;
+ };
+
+ $wasSet = 0;
+ $v = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $this->assertEquals( 1, $wasSet, "Value regenerated" );
+
+ $curTTL = null;
+ $cache->get( $key, $curTTL );
+ $this->assertLessThanOrEqual( 20, $curTTL, 'Current TTL between 19-20 (overriden)' );
+ $this->assertGreaterThanOrEqual( 19, $curTTL, 'Current TTL between 19-20 (overriden)' );
+
+ $wasSet = 0;
+ $v = $cache->getWithSetCallback( $key, 30, $func, array(
+ 'lowTTL' => 0,
+ 'lockTSE' => 5,
+ ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $this->assertEquals( 0, $wasSet, "Value not regenerated" );
+
+ $priorTime = microtime( true );
+ usleep( 1 );
+ $wasSet = 0;
+ $v = $cache->getWithSetCallback( $key, 30, $func,
+ array( 'checkKeys' => array( $cKey1, $cKey2 ) ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $this->assertEquals( 1, $wasSet, "Value regenerated due to check keys" );
+ $t1 = $cache->getCheckKeyTime( $cKey1 );
+ $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check keys generated on miss' );
+ $t2 = $cache->getCheckKeyTime( $cKey2 );
+ $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check keys generated on miss' );
+
+ $priorTime = microtime( true );
+ $wasSet = 0;
+ $v = $cache->getWithSetCallback( $key, 30, $func,
+ array( 'checkKeys' => array( $cKey1, $cKey2 ) ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $this->assertEquals( 1, $wasSet, "Value regenerated due to still-recent check keys" );
+ $t1 = $cache->getCheckKeyTime( $cKey1 );
+ $this->assertLessThanOrEqual( $priorTime, $t1, 'Check keys did not change again' );
+ $t2 = $cache->getCheckKeyTime( $cKey2 );
+ $this->assertLessThanOrEqual( $priorTime, $t2, 'Check keys did not change again' );
+
+ $curTTL = null;
+ $v = $cache->get( $key, $curTTL, array( $cKey1, $cKey2 ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
+
+ $wasSet = 0;
+ $key = wfRandomString();
+ $v = $cache->getWithSetCallback( $key, 30, $func, array( 'pcTTL' => 5 ) );
+ $this->assertEquals( $value, $v, "Value returned" );
+ $cache->delete( $key );
+ $v = $cache->getWithSetCallback( $key, 30, $func, array( 'pcTTL' => 5 ) );
+ $this->assertEquals( $value, $v, "Value still returned after deleted" );
+ $this->assertEquals( 1, $wasSet, "Value process cached while deleted" );
+ }
+
+ /**
+ * @covers WANObjectCache::getWithSetCallback()
+ */
+ public function testLockTSE() {
+ $cache = $this->cache;
+ $key = wfRandomString();
+ $value = wfRandomString();
+
+ $calls = 0;
+ $func = function() use ( &$calls, $value ) {
+ ++$calls;
+ return $value;
+ };
+
+ $cache->delete( $key );
+ $ret = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
+ $this->assertEquals( $value, $ret );
+ $this->assertEquals( 1, $calls, 'Value was populated' );
+
+ // Acquire a lock to verify that getWithSetCallback uses lockTSE properly
+ $this->internalCache->lock( $key, 0 );
+ $ret = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
+ $this->assertEquals( $value, $ret );
+ $this->assertEquals( 1, $calls, 'Callback was not used' );
+ }
+
+ /**
+ * @covers WANObjectCache::getMulti()
+ */
+ public function testGetMulti() {
+ $cache = $this->cache;
+
+ $value1 = array( 'this' => 'is', 'a' => 'test' );
+ $value2 = array( 'this' => 'is', 'another' => 'test' );
+
+ $key1 = wfRandomString();
+ $key2 = wfRandomString();
+ $key3 = wfRandomString();
+
+ $cache->set( $key1, $value1, 5 );
+ $cache->set( $key2, $value2, 10 );
+
+ $curTTLs = array();
+ $this->assertEquals(
+ array( $key1 => $value1, $key2 => $value2 ),
+ $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs )
+ );
+
+ $this->assertEquals( 2, count( $curTTLs ), "Two current TTLs in array" );
+ $this->assertGreaterThan( 0, $curTTLs[$key1], "Key 1 has current TTL > 0" );
+ $this->assertGreaterThan( 0, $curTTLs[$key2], "Key 2 has current TTL > 0" );
+
+ $cKey1 = wfRandomString();
+ $cKey2 = wfRandomString();
+ $curTTLs = array();
+ $this->assertEquals(
+ array( $key1 => $value1, $key2 => $value2 ),
+ $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs ),
+ 'Result array populated'
+ );
+
+ $priorTime = microtime( true );
+ usleep( 1 );
+ $curTTLs = array();
+ $this->assertEquals(
+ array( $key1 => $value1, $key2 => $value2 ),
+ $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs, array( $cKey1, $cKey2 ) ),
+ "Result array populated even with new check keys"
+ );
+ $t1 = $cache->getCheckKeyTime( $cKey1 );
+ $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check key 1 generated on miss' );
+ $t2 = $cache->getCheckKeyTime( $cKey2 );
+ $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check key 2 generated on miss' );
+ $this->assertEquals( 2, count( $curTTLs ), "Current TTLs array set" );
+ $this->assertLessThanOrEqual( 0, $curTTLs[$key1], 'Key 1 has current TTL <= 0' );
+ $this->assertLessThanOrEqual( 0, $curTTLs[$key2], 'Key 2 has current TTL <= 0' );
+
+ usleep( 1 );
+ $curTTLs = array();
+ $this->assertEquals(
+ array( $key1 => $value1, $key2 => $value2 ),
+ $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs, array( $cKey1, $cKey2 ) ),
+ "Result array still populated even with new check keys"
+ );
+ $this->assertEquals( 2, count( $curTTLs ), "Current TTLs still array set" );
+ $this->assertLessThan( 0, $curTTLs[$key1], 'Key 1 has negative current TTL' );
+ $this->assertLessThan( 0, $curTTLs[$key2], 'Key 2 has negative current TTL' );
+ }
+
+ /**
+ * @covers WANObjectCache::delete()
+ */
+ public function testDelete() {
+ $key = wfRandomString();
+ $value = wfRandomString();
+ $this->cache->set( $key, $value );
+
+ $curTTL = null;
+ $v = $this->cache->get( $key, $curTTL );
+ $this->assertEquals( $value, $v, "Key was created with value" );
+ $this->assertGreaterThan( 0, $curTTL, "Existing key has current TTL > 0" );
+
+ $this->cache->delete( $key );
+
+ $curTTL = null;
+ $v = $this->cache->get( $key, $curTTL );
+ $this->assertFalse( $v, "Deleted key has false value" );
+ $this->assertLessThan( 0, $curTTL, "Deleted key has current TTL < 0" );
+
+ $this->cache->set( $key, $value . 'more' );
+ $this->assertFalse( $v, "Deleted key is tombstoned and has false value" );
+ $this->assertLessThan( 0, $curTTL, "Deleted key is tombstoned and has current TTL < 0" );
+ }
+
+ /**
+ * @covers WANObjectCache::touchCheckKey()
+ * @covers WANObjectCache::resetCheckKey()
+ * @covers WANObjectCache::getCheckKeyTime()
+ */
+ public function testTouchKeys() {
+ $key = wfRandomString();
+
+ $priorTime = microtime( true );
+ usleep( 100 );
+ $t0 = $this->cache->getCheckKeyTime( $key );
+ $this->assertGreaterThanOrEqual( $priorTime, $t0, 'Check key auto-created' );
+
+ $priorTime = microtime( true );
+ usleep( 100 );
+ $this->cache->touchCheckKey( $key );
+ $t1 = $this->cache->getCheckKeyTime( $key );
+ $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check key created' );
+
+ $t2 = $this->cache->getCheckKeyTime( $key );
+ $this->assertEquals( $t1, $t2, 'Check key time did not change' );
+
+ usleep( 100 );
+ $this->cache->touchCheckKey( $key );
+ $t3 = $this->cache->getCheckKeyTime( $key );
+ $this->assertGreaterThan( $t2, $t3, 'Check key time increased' );
+
+ $t4 = $this->cache->getCheckKeyTime( $key );
+ $this->assertEquals( $t3, $t4, 'Check key time did not change' );
+
+ usleep( 100 );
+ $this->cache->resetCheckKey( $key );
+ $t5 = $this->cache->getCheckKeyTime( $key );
+ $this->assertGreaterThan( $t4, $t5, 'Check key time increased' );
+
+ $t6 = $this->cache->getCheckKeyTime( $key );
+ $this->assertEquals( $t5, $t6, 'Check key time did not change' );
+ }
+}
+++ /dev/null
-<?php
-/**
- * @author Matthias Mullie <mmullie@wikimedia.org>
- * @group BagOStuff
- */
-class BagOStuffTest extends MediaWikiTestCase {
- /** @var BagOStuff */
- private $cache;
-
- protected function setUp() {
- parent::setUp();
-
- // type defined through parameter
- if ( $this->getCliArg( 'use-bagostuff' ) ) {
- $name = $this->getCliArg( 'use-bagostuff' );
-
- $this->cache = ObjectCache::newFromId( $name );
- } else {
- // no type defined - use simple hash
- $this->cache = new HashBagOStuff;
- }
-
- $this->cache->delete( wfMemcKey( 'test' ) );
- }
-
- /**
- * @covers BagOStuff::makeGlobalKey
- * @covers BagOStuff::makeKeyInternal
- */
- public function testMakeKey() {
- $cache = ObjectCache::newFromId( 'hash' );
-
- $localKey = $cache->makeKey( 'first', 'second', 'third' );
- $globalKey = $cache->makeGlobalKey( 'first', 'second', 'third' );
-
- $this->assertStringMatchesFormat(
- '%Sfirst%Ssecond%Sthird%S',
- $localKey,
- 'Local key interpolates parameters'
- );
-
- $this->assertStringMatchesFormat(
- 'global%Sfirst%Ssecond%Sthird%S',
- $globalKey,
- 'Global key interpolates parameters and contains global prefix'
- );
-
- $this->assertNotEquals(
- $localKey,
- $globalKey,
- 'Local key and global key with same parameters should not be equal'
- );
- }
-
- /**
- * @covers BagOStuff::merge
- * @covers BagOStuff::mergeViaLock
- */
- public function testMerge() {
- $key = wfMemcKey( 'test' );
-
- $usleep = 0;
-
- /**
- * Callback method: append "merged" to whatever is in cache.
- *
- * @param BagOStuff $cache
- * @param string $key
- * @param int $existingValue
- * @use int $usleep
- * @return int
- */
- $callback = function ( BagOStuff $cache, $key, $existingValue ) use ( &$usleep ) {
- // let's pretend this is an expensive callback to test concurrent merge attempts
- usleep( $usleep );
-
- if ( $existingValue === false ) {
- return 'merged';
- }
-
- return $existingValue . 'merged';
- };
-
- // merge on non-existing value
- $merged = $this->cache->merge( $key, $callback, 0 );
- $this->assertTrue( $merged );
- $this->assertEquals( $this->cache->get( $key ), 'merged' );
-
- // merge on existing value
- $merged = $this->cache->merge( $key, $callback, 0 );
- $this->assertTrue( $merged );
- $this->assertEquals( $this->cache->get( $key ), 'mergedmerged' );
-
- /*
- * Test concurrent merges by forking this process, if:
- * - not manually called with --use-bagostuff
- * - pcntl_fork is supported by the system
- * - cache type will correctly support calls over forks
- */
- $fork = (bool)$this->getCliArg( 'use-bagostuff' );
- $fork &= function_exists( 'pcntl_fork' );
- $fork &= !$this->cache instanceof HashBagOStuff;
- $fork &= !$this->cache instanceof EmptyBagOStuff;
- $fork &= !$this->cache instanceof MultiWriteBagOStuff;
- if ( $fork ) {
- // callback should take awhile now so that we can test concurrent merge attempts
- $pid = pcntl_fork();
- if ( $pid == -1 ) {
- // can't fork, ignore this test...
- } elseif ( $pid ) {
- // wait a little, making sure that the child process is calling merge
- usleep( 3000 );
-
- // attempt a merge - this should fail
- $merged = $this->cache->merge( $key, $callback, 0, 1 );
-
- // merge has failed because child process was merging (and we only attempted once)
- $this->assertFalse( $merged );
-
- // make sure the child's merge is completed and verify
- usleep( 3000 );
- $this->assertEquals( $this->cache->get( $key ), 'mergedmergedmerged' );
- } else {
- $this->cache->merge( $key, $callback, 0, 1 );
-
- // Note: I'm not even going to check if the merge worked, I'll
- // compare values in the parent process to test if this merge worked.
- // I'm just going to exit this child process, since I don't want the
- // child to output any test results (would be rather confusing to
- // have test output twice)
- exit;
- }
- }
- }
-
- /**
- * @covers BagOStuff::add
- */
- public function testAdd() {
- $key = wfMemcKey( 'test' );
- $this->assertTrue( $this->cache->add( $key, 'test' ) );
- }
-
- public function testGet() {
- $value = array( 'this' => 'is', 'a' => 'test' );
-
- $key = wfMemcKey( 'test' );
- $this->cache->add( $key, $value );
- $this->assertEquals( $this->cache->get( $key ), $value );
- }
-
- /**
- * @covers BagOStuff::getWithSetCallback
- */
- public function testGetWithSetCallback() {
- $key = wfMemcKey( 'test' );
- $value = $this->cache->getWithSetCallback(
- $key,
- 30,
- function () {
- return 'hello kitty';
- }
- );
-
- $this->assertEquals( 'hello kitty', $value );
- $this->assertEquals( $value, $this->cache->get( $key ) );
- }
-
- /**
- * @covers BagOStuff::incr
- */
- public function testIncr() {
- $key = wfMemcKey( 'test' );
- $this->cache->add( $key, 0 );
- $this->cache->incr( $key );
- $expectedValue = 1;
- $actualValue = $this->cache->get( $key );
- $this->assertEquals( $expectedValue, $actualValue, 'Value should be 1 after incrementing' );
- }
-
- /**
- * @covers BagOStuff::getMulti
- */
- public function testGetMulti() {
- $value1 = array( 'this' => 'is', 'a' => 'test' );
- $value2 = array( 'this' => 'is', 'another' => 'test' );
- $value3 = array( 'testing a key that may be encoded when sent to cache backend' );
- $value4 = array( 'another test where chars in key will be encoded' );
-
- $key1 = wfMemcKey( 'test1' );
- $key2 = wfMemcKey( 'test2' );
- // internally, MemcachedBagOStuffs will encode to will-%25-encode
- $key3 = wfMemcKey( 'will-%-encode' );
- $key4 = wfMemcKey(
- 'flowdb:flow_ref:wiki:by-source:v3:Parser\'s_"broken"_+_(page)_&_grill:testwiki:1:4.7'
- );
-
- $this->cache->add( $key1, $value1 );
- $this->cache->add( $key2, $value2 );
- $this->cache->add( $key3, $value3 );
- $this->cache->add( $key4, $value4 );
-
- $this->assertEquals(
- array( $key1 => $value1, $key2 => $value2, $key3 => $value3, $key4 => $value4 ),
- $this->cache->getMulti( array( $key1, $key2, $key3, $key4 ) )
- );
-
- // cleanup
- $this->cache->delete( $key1 );
- $this->cache->delete( $key2 );
- $this->cache->delete( $key3 );
- $this->cache->delete( $key4 );
- }
-
- /**
- * @covers BagOStuff::getScopedLock
- */
- public function testGetScopedLock() {
- $key = wfMemcKey( 'test' );
- $value1 = $this->cache->getScopedLock( $key, 0 );
- $value2 = $this->cache->getScopedLock( $key, 0 );
-
- $this->assertType( 'ScopedCallback', $value1, 'First call returned lock' );
- $this->assertNull( $value2, 'Duplicate call returned no lock' );
-
- unset( $value1 );
-
- $value3 = $this->cache->getScopedLock( $key, 0 );
- $this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' );
- unset( $value3 );
-
- $value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
- $value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
-
- $this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
- $this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
- }
-}
--- /dev/null
+<?php
+/**
+ * @group BagOStuff
+ */
+class MemcachedBagOStuffTest extends MediaWikiTestCase {
+ /** @var MemcachedBagOStuff */
+ private $cache;
+
+ protected function setUp() {
+ parent::setUp();
+ $this->cache = new MemcachedBagOStuff( array( 'keyspace' => 'test' ) );
+ }
+
+ /**
+ * @covers MemcachedBagOStuff::makeKeyInternal
+ */
+ public function testKeyNormalization() {
+ $this->assertEquals(
+ 'test:vanilla',
+ $this->cache->makeKey( 'vanilla' )
+ );
+
+ $this->assertEquals(
+ 'test:punctuation_marks_are_ok:!@$^&*()',
+ $this->cache->makeKey( 'punctuation_marks_are_ok', '!@$^&*()' )
+ );
+
+ $this->assertEquals(
+ 'test:but_spaces:hashes%23:and%0Anewlines:are_not',
+ $this->cache->makeKey( 'but spaces', 'hashes#', "and\nnewlines", 'are_not' )
+ );
+
+ $this->assertEquals(
+ 'test:this:key:contains:%F0%9D%95%9E%F0%9D%95%A6%F0%9D%95%9D%F0%9D%95%A5%F0%9' .
+ 'D%95%9A%F0%9D%95%93%F0%9D%95%AA%F0%9D%95%A5%F0%9D%95%96:characters',
+ $this->cache->makeKey( 'this', 'key', 'contains', '𝕞𝕦𝕝𝕥𝕚𝕓𝕪𝕥𝕖', 'characters' )
+ );
+
+ $this->assertEquals(
+ 'test:this:key:contains:#c118f92685a635cb843039de50014c9c',
+ $this->cache->makeKey( 'this', 'key', 'contains', '𝕥𝕠𝕠 𝕞𝕒𝕟𝕪 𝕞𝕦𝕝𝕥𝕚𝕓𝕪𝕥𝕖 𝕔𝕙𝕒𝕣𝕒𝕔𝕥𝕖𝕣𝕤' )
+ );
+
+ $this->assertEquals(
+ 'test:##5820ad1d105aa4dc698585c39df73e19',
+ $this->cache->makeKey( '𝕖𝕧𝕖𝕟', '𝕚𝕗', '𝕨𝕖', '𝕄𝔻𝟝', '𝕖𝕒𝕔𝕙',
+ '𝕒𝕣𝕘𝕦𝕞𝕖𝕟𝕥', '𝕥𝕙𝕚𝕤', '𝕜𝕖𝕪', '𝕨𝕠𝕦𝕝𝕕', '𝕤𝕥𝕚𝕝𝕝', '𝕓𝕖', '𝕥𝕠𝕠', '𝕝𝕠𝕟𝕘' )
+ );
+
+ $this->assertEquals(
+ 'test:%23%235820ad1d105aa4dc698585c39df73e19',
+ $this->cache->makeKey( '##5820ad1d105aa4dc698585c39df73e19' )
+ );
+
+ $this->assertEquals(
+ 'test:percent_is_escaped:!@$%25^&*()',
+ $this->cache->makeKey( 'percent_is_escaped', '!@$%^&*()' )
+ );
+
+ $this->assertEquals(
+ 'test:colon_is_escaped:!@$%3A^&*()',
+ $this->cache->makeKey( 'colon_is_escaped', '!@$:^&*()' )
+ );
+
+ $this->assertEquals(
+ 'test:long_key_part_hashed:#0244f7b1811d982dd932dd7de01465ac',
+ $this->cache->makeKey( 'long_key_part_hashed', str_repeat( 'y', 500 ) )
+ );
+ }
+}
+++ /dev/null
-<?php
-
-/**
- * @group Database
- */
-class MultiWriteBagOStuffTest extends MediaWikiTestCase {
- /** @var HashBagOStuff */
- private $cache1;
- /** @var HashBagOStuff */
- private $cache2;
- /** @var MultiWriteBagOStuff */
- private $cache;
-
- protected function setUp() {
- parent::setUp();
-
- $this->cache1 = new HashBagOStuff();
- $this->cache2 = new HashBagOStuff();
- $this->cache = new MultiWriteBagOStuff( array(
- 'caches' => array( $this->cache1, $this->cache2 ),
- 'replication' => 'async',
- 'asyncHandler' => 'DeferredUpdates::addCallableUpdate'
- ) );
- }
-
- public function testSetImmediate() {
- $key = wfRandomString();
- $value = wfRandomString();
- $this->cache->set( $key, $value );
-
- // Set in tier 1
- $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
- // Set in tier 2
- $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
- }
-
- public function testSyncMerge() {
- $key = wfRandomString();
- $value = wfRandomString();
- $func = function () use ( $value ) {
- return $value;
- };
-
- // XXX: DeferredUpdates bound to transactions in CLI mode
- $dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
- $this->cache->merge( $key, $func );
-
- // Set in tier 1
- $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
- // Not yet set in tier 2
- $this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
-
- $dbw->commit();
-
- // Set in tier 2
- $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
-
- $key = wfRandomString();
-
- $dbw->begin();
- $this->cache->merge( $key, $func, 0, 1, BagOStuff::WRITE_SYNC );
-
- // Set in tier 1
- $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
- // Also set in tier 2
- $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
-
- $dbw->commit();
- }
-
- public function testSetDelayed() {
- $key = wfRandomString();
- $value = wfRandomString();
-
- // XXX: DeferredUpdates bound to transactions in CLI mode
- $dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
- $this->cache->set( $key, $value );
-
- // Set in tier 1
- $this->assertEquals( $value, $this->cache1->get( $key ), 'Written to tier 1' );
- // Not yet set in tier 2
- $this->assertEquals( false, $this->cache2->get( $key ), 'Not written to tier 2' );
-
- $dbw->commit();
-
- // Set in tier 2
- $this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
- }
-}
+++ /dev/null
-<?php
-
-class ReplicatedBagOStuffTest extends MediaWikiTestCase {
- /** @var HashBagOStuff */
- private $writeCache;
- /** @var HashBagOStuff */
- private $readCache;
- /** @var ReplicatedBagOStuff */
- private $cache;
-
- protected function setUp() {
- parent::setUp();
-
- $this->writeCache = new HashBagOStuff();
- $this->readCache = new HashBagOStuff();
- $this->cache = new ReplicatedBagOStuff( array(
- 'writeFactory' => $this->writeCache,
- 'readFactory' => $this->readCache,
- ) );
- }
-
- /**
- * @covers ReplicatedBagOStuff::set
- */
- public function testSet() {
- $key = wfRandomString();
- $value = wfRandomString();
- $this->cache->set( $key, $value );
-
- // Write to master.
- $this->assertEquals( $this->writeCache->get( $key ), $value );
- // Don't write to slave. Replication is deferred to backend.
- $this->assertEquals( $this->readCache->get( $key ), false );
- }
-
- /**
- * @covers ReplicatedBagOStuff::get
- */
- public function testGet() {
- $key = wfRandomString();
-
- $write = wfRandomString();
- $this->writeCache->set( $key, $write );
- $read = wfRandomString();
- $this->readCache->set( $key, $read );
-
- // Read from slave.
- $this->assertEquals( $this->cache->get( $key ), $read );
- }
-
- /**
- * @covers ReplicatedBagOStuff::get
- */
- public function testGetAbsent() {
- $key = wfRandomString();
- $value = wfRandomString();
- $this->writeCache->set( $key, $value );
-
- // Don't read from master. No failover if value is absent.
- $this->assertEquals( $this->cache->get( $key ), false );
- }
-}
+++ /dev/null
-<?php
-
-class WANObjectCacheTest extends MediaWikiTestCase {
- /** @var WANObjectCache */
- private $cache;
- /**@var BagOStuff */
- private $internalCache;
-
- protected function setUp() {
- parent::setUp();
-
- if ( $this->getCliArg( 'use-wanobjectcache' ) ) {
- $name = $this->getCliArg( 'use-wanobjectcache' );
-
- $this->cache = ObjectCache::getWANInstance( $name );
- } else {
- $this->cache = new WANObjectCache( array(
- 'cache' => new HashBagOStuff(),
- 'pool' => 'testcache-hash',
- 'relayer' => new EventRelayerNull( array() )
- ) );
- }
-
- $wanCache = TestingAccessWrapper::newFromObject( $this->cache );
- $this->internalCache = $wanCache->cache;
- }
-
- /**
- * @dataProvider provider_testSetAndGet
- * @covers WANObjectCache::set()
- * @covers WANObjectCache::get()
- * @param mixed $value
- * @param integer $ttl
- */
- public function testSetAndGet( $value, $ttl ) {
- $key = wfRandomString();
- $this->cache->set( $key, $value, $ttl );
-
- $curTTL = null;
- $this->assertEquals( $value, $this->cache->get( $key, $curTTL ) );
- if ( is_infinite( $ttl ) || $ttl == 0 ) {
- $this->assertTrue( is_infinite( $curTTL ), "Current TTL is infinite" );
- } else {
- $this->assertGreaterThan( 0, $curTTL, "Current TTL > 0" );
- $this->assertLessThanOrEqual( $ttl, $curTTL, "Current TTL < nominal TTL" );
- }
- }
-
- public static function provider_testSetAndGet() {
- return array(
- array( 14141, 3 ),
- array( 3535.666, 3 ),
- array( array(), 3 ),
- array( null, 3 ),
- array( '0', 3 ),
- array( (object)array( 'meow' ), 3 ),
- array( INF, 3 ),
- array( '', 3 ),
- array( 'pizzacat', INF ),
- );
- }
-
- public function testGetNotExists() {
- $key = wfRandomString();
- $curTTL = null;
- $value = $this->cache->get( $key, $curTTL );
-
- $this->assertFalse( $value, "Non-existing key has false value" );
- $this->assertNull( $curTTL, "Non-existing key has null current TTL" );
- }
-
- public function testSetOver() {
- $key = wfRandomString();
- for ( $i = 0; $i < 3; ++$i ) {
- $value = wfRandomString();
- $this->cache->set( $key, $value, 3 );
-
- $this->assertEquals( $this->cache->get( $key ), $value );
- }
- }
-
- public function testStaleSet() {
- $key = wfRandomString();
- $value = wfRandomString();
- $this->cache->set( $key, $value, 3, array( 'since' => microtime( true ) - 30 ) );
-
- $this->assertFalse( $this->cache->get( $key ), "Stale set() value ignored" );
- }
-
- /**
- * @covers WANObjectCache::getWithSetCallback()
- */
- public function testGetWithSetCallback() {
- $cache = $this->cache;
-
- $key = wfRandomString();
- $value = wfRandomString();
- $cKey1 = wfRandomString();
- $cKey2 = wfRandomString();
-
- $wasSet = 0;
- $func = function( $old, &$ttl ) use ( &$wasSet, $value ) {
- ++$wasSet;
- $ttl = 20; // override with another value
- return $value;
- };
-
- $wasSet = 0;
- $v = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $this->assertEquals( 1, $wasSet, "Value regenerated" );
-
- $curTTL = null;
- $cache->get( $key, $curTTL );
- $this->assertLessThanOrEqual( 20, $curTTL, 'Current TTL between 19-20 (overriden)' );
- $this->assertGreaterThanOrEqual( 19, $curTTL, 'Current TTL between 19-20 (overriden)' );
-
- $wasSet = 0;
- $v = $cache->getWithSetCallback( $key, 30, $func, array(
- 'lowTTL' => 0,
- 'lockTSE' => 5,
- ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $this->assertEquals( 0, $wasSet, "Value not regenerated" );
-
- $priorTime = microtime( true );
- usleep( 1 );
- $wasSet = 0;
- $v = $cache->getWithSetCallback( $key, 30, $func,
- array( 'checkKeys' => array( $cKey1, $cKey2 ) ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $this->assertEquals( 1, $wasSet, "Value regenerated due to check keys" );
- $t1 = $cache->getCheckKeyTime( $cKey1 );
- $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check keys generated on miss' );
- $t2 = $cache->getCheckKeyTime( $cKey2 );
- $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check keys generated on miss' );
-
- $priorTime = microtime( true );
- $wasSet = 0;
- $v = $cache->getWithSetCallback( $key, 30, $func,
- array( 'checkKeys' => array( $cKey1, $cKey2 ) ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $this->assertEquals( 1, $wasSet, "Value regenerated due to still-recent check keys" );
- $t1 = $cache->getCheckKeyTime( $cKey1 );
- $this->assertLessThanOrEqual( $priorTime, $t1, 'Check keys did not change again' );
- $t2 = $cache->getCheckKeyTime( $cKey2 );
- $this->assertLessThanOrEqual( $priorTime, $t2, 'Check keys did not change again' );
-
- $curTTL = null;
- $v = $cache->get( $key, $curTTL, array( $cKey1, $cKey2 ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
-
- $wasSet = 0;
- $key = wfRandomString();
- $v = $cache->getWithSetCallback( $key, 30, $func, array( 'pcTTL' => 5 ) );
- $this->assertEquals( $value, $v, "Value returned" );
- $cache->delete( $key );
- $v = $cache->getWithSetCallback( $key, 30, $func, array( 'pcTTL' => 5 ) );
- $this->assertEquals( $value, $v, "Value still returned after deleted" );
- $this->assertEquals( 1, $wasSet, "Value process cached while deleted" );
- }
-
- /**
- * @covers WANObjectCache::getWithSetCallback()
- */
- public function testLockTSE() {
- $cache = $this->cache;
- $key = wfRandomString();
- $value = wfRandomString();
-
- $calls = 0;
- $func = function() use ( &$calls, $value ) {
- ++$calls;
- return $value;
- };
-
- $cache->delete( $key );
- $ret = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
- $this->assertEquals( $value, $ret );
- $this->assertEquals( 1, $calls, 'Value was populated' );
-
- // Acquire a lock to verify that getWithSetCallback uses lockTSE properly
- $this->internalCache->lock( $key, 0 );
- $ret = $cache->getWithSetCallback( $key, 30, $func, array( 'lockTSE' => 5 ) );
- $this->assertEquals( $value, $ret );
- $this->assertEquals( 1, $calls, 'Callback was not used' );
- }
-
- /**
- * @covers WANObjectCache::getMulti()
- */
- public function testGetMulti() {
- $cache = $this->cache;
-
- $value1 = array( 'this' => 'is', 'a' => 'test' );
- $value2 = array( 'this' => 'is', 'another' => 'test' );
-
- $key1 = wfRandomString();
- $key2 = wfRandomString();
- $key3 = wfRandomString();
-
- $cache->set( $key1, $value1, 5 );
- $cache->set( $key2, $value2, 10 );
-
- $curTTLs = array();
- $this->assertEquals(
- array( $key1 => $value1, $key2 => $value2 ),
- $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs )
- );
-
- $this->assertEquals( 2, count( $curTTLs ), "Two current TTLs in array" );
- $this->assertGreaterThan( 0, $curTTLs[$key1], "Key 1 has current TTL > 0" );
- $this->assertGreaterThan( 0, $curTTLs[$key2], "Key 2 has current TTL > 0" );
-
- $cKey1 = wfRandomString();
- $cKey2 = wfRandomString();
- $curTTLs = array();
- $this->assertEquals(
- array( $key1 => $value1, $key2 => $value2 ),
- $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs ),
- 'Result array populated'
- );
-
- $priorTime = microtime( true );
- usleep( 1 );
- $curTTLs = array();
- $this->assertEquals(
- array( $key1 => $value1, $key2 => $value2 ),
- $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs, array( $cKey1, $cKey2 ) ),
- "Result array populated even with new check keys"
- );
- $t1 = $cache->getCheckKeyTime( $cKey1 );
- $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check key 1 generated on miss' );
- $t2 = $cache->getCheckKeyTime( $cKey2 );
- $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check key 2 generated on miss' );
- $this->assertEquals( 2, count( $curTTLs ), "Current TTLs array set" );
- $this->assertLessThanOrEqual( 0, $curTTLs[$key1], 'Key 1 has current TTL <= 0' );
- $this->assertLessThanOrEqual( 0, $curTTLs[$key2], 'Key 2 has current TTL <= 0' );
-
- usleep( 1 );
- $curTTLs = array();
- $this->assertEquals(
- array( $key1 => $value1, $key2 => $value2 ),
- $cache->getMulti( array( $key1, $key2, $key3 ), $curTTLs, array( $cKey1, $cKey2 ) ),
- "Result array still populated even with new check keys"
- );
- $this->assertEquals( 2, count( $curTTLs ), "Current TTLs still array set" );
- $this->assertLessThan( 0, $curTTLs[$key1], 'Key 1 has negative current TTL' );
- $this->assertLessThan( 0, $curTTLs[$key2], 'Key 2 has negative current TTL' );
- }
-
- /**
- * @covers WANObjectCache::delete()
- */
- public function testDelete() {
- $key = wfRandomString();
- $value = wfRandomString();
- $this->cache->set( $key, $value );
-
- $curTTL = null;
- $v = $this->cache->get( $key, $curTTL );
- $this->assertEquals( $value, $v, "Key was created with value" );
- $this->assertGreaterThan( 0, $curTTL, "Existing key has current TTL > 0" );
-
- $this->cache->delete( $key );
-
- $curTTL = null;
- $v = $this->cache->get( $key, $curTTL );
- $this->assertFalse( $v, "Deleted key has false value" );
- $this->assertLessThan( 0, $curTTL, "Deleted key has current TTL < 0" );
-
- $this->cache->set( $key, $value . 'more' );
- $this->assertFalse( $v, "Deleted key is tombstoned and has false value" );
- $this->assertLessThan( 0, $curTTL, "Deleted key is tombstoned and has current TTL < 0" );
- }
-
- /**
- * @covers WANObjectCache::touchCheckKey()
- * @covers WANObjectCache::resetCheckKey()
- * @covers WANObjectCache::getCheckKeyTime()
- */
- public function testTouchKeys() {
- $key = wfRandomString();
-
- $priorTime = microtime( true );
- usleep( 100 );
- $t0 = $this->cache->getCheckKeyTime( $key );
- $this->assertGreaterThanOrEqual( $priorTime, $t0, 'Check key auto-created' );
-
- $priorTime = microtime( true );
- usleep( 100 );
- $this->cache->touchCheckKey( $key );
- $t1 = $this->cache->getCheckKeyTime( $key );
- $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check key created' );
-
- $t2 = $this->cache->getCheckKeyTime( $key );
- $this->assertEquals( $t1, $t2, 'Check key time did not change' );
-
- usleep( 100 );
- $this->cache->touchCheckKey( $key );
- $t3 = $this->cache->getCheckKeyTime( $key );
- $this->assertGreaterThan( $t2, $t3, 'Check key time increased' );
-
- $t4 = $this->cache->getCheckKeyTime( $key );
- $this->assertEquals( $t3, $t4, 'Check key time did not change' );
-
- usleep( 100 );
- $this->cache->resetCheckKey( $key );
- $t5 = $this->cache->getCheckKeyTime( $key );
- $this->assertGreaterThan( $t4, $t5, 'Check key time increased' );
-
- $t6 = $this->cache->getCheckKeyTime( $key );
- $this->assertEquals( $t5, $t6, 'Check key time did not change' );
- }
-}
dépôts / lhc / web / wiklou.git / commitdiff