From: jenkins-bot Date: Tue, 16 Jan 2018 19:44:11 +0000 (+0000) Subject: Merge "Revert "Prevent new users from being sent emails"" X-Git-Tag: 1.31.0-rc.0~897 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=a79d012e1c40dbeeb55a90b8099fea4aa9b1270b;hp=4182a9001e32819d83e8cda4209d07cb6860267f;p=lhc%2Fweb%2Fwiklou.git Merge "Revert "Prevent new users from being sent emails"" --- diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index f8bca34e56..fca71a78e7 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -76,6 +76,7 @@ regularly. Below only new and removed languages are listed, as well as changes to languages because of Phabricator reports. * (T180052) Mirandese (mwl) now supports gendered NS_USER/NS_USER_TALK namespaces. +* (T182305) New language support: Nyungar (nys). === Other changes in 1.31 === * Introducing multi-content-revision capability into the storage layer. For details, diff --git a/includes/EditPage.php b/includes/EditPage.php index f9d112973e..a41e6d9177 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -780,7 +780,7 @@ class EditPage { /** * Display a read-only View Source page - * @param Content $content content object + * @param Content $content * @param string $errorMessage additional wikitext error message to display */ protected function displayViewSourcePage( Content $content, $errorMessage = '' ) { diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 6c343ab39f..6108ca1d46 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -97,7 +97,7 @@ class FeedUtils { /** * Really format a diff for the newsfeed * - * @param Title $title Title object + * @param Title $title * @param int $oldid Old revision's id * @param int $newid New revision's id * @param int $timestamp New revision's timestamp diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 621dd65adf..b0057ebf9a 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1010,7 +1010,7 @@ function wfMakeUrlIndexes( $url ) { /** * Check whether a given URL has a domain that occurs in a given set of domains - * @param string $url URL + * @param string $url * @param array $domains Array of domains (strings) * @return bool True if the host part of $url ends in one of the strings in $domains */ diff --git a/includes/Linker.php b/includes/Linker.php index 3b0e72d96b..9f6d34e21c 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1023,7 +1023,7 @@ class Linker { /** * @since 1.16.3 - * @param int $userId Userid + * @param int $userId * @param string $userText User name in database. * @return string HTML fragment with block link */ @@ -1037,7 +1037,7 @@ class Linker { } /** - * @param int $userId Userid + * @param int $userId * @param string $userText User name in database. * @return string HTML fragment with e-mail user link */ diff --git a/includes/MWGrants.php b/includes/MWGrants.php index c7c54fd503..ba22590c92 100644 --- a/includes/MWGrants.php +++ b/includes/MWGrants.php @@ -1,7 +1,5 @@ wasPosted() && - $output->getRedirect() && - $lbFactory->hasOrMadeRecentMasterChanges( INF ) - ) ? self::getUrlDomainDistance( $output->getRedirect() ) : false; + // Should the client return, their request should observe the new ChronologyProtector + // DB positions. This request might be on a foreign wiki domain, so synchronously update + // the DB positions in all datacenters to be safe. If this output is not a redirect, + // then OutputPage::output() will be relatively slow, meaning that running it in + // $postCommitWork should help mask the latency of those updates. + $flags = $lbFactory::SHUTDOWN_CHRONPROT_SYNC; + $strategy = 'cookie+sync'; $allowHeaders = !( $output->isDisabled() || headers_sent() ); - if ( $urlDomainDistance === 'local' || $urlDomainDistance === 'remote' ) { - // OutputPage::output() will be fast; $postCommitWork will not be useful for - // masking the latency of syncing DB positions accross all datacenters synchronously. - // Instead, make use of the RTT time of the client follow redirects. - $flags = $lbFactory::SHUTDOWN_CHRONPROT_ASYNC; - $cpPosTime = microtime( true ); - // Client's next request should see 1+ positions with this DBMasterPos::asOf() time - if ( $urlDomainDistance === 'local' && $allowHeaders ) { - // Client will stay on this domain, so set an unobtrusive cookie - $expires = time() + ChronologyProtector::POSITION_TTL; - $options = [ 'prefix' => '' ]; - $request->response()->setCookie( 'cpPosTime', $cpPosTime, $expires, $options ); - } else { - // Cookies may not work across wiki domains, so use a URL parameter - $safeUrl = $lbFactory->appendPreShutdownTimeAsQuery( - $output->getRedirect(), - $cpPosTime - ); - $output->redirect( $safeUrl ); + if ( $output->getRedirect() && $lbFactory->hasOrMadeRecentMasterChanges( INF ) ) { + // OutputPage::output() will be fast, so $postCommitWork is useless for masking + // the latency of synchronously updating the DB positions in all datacenters. + // Try to make use of the time the client spends following redirects instead. + $domainDistance = self::getUrlDomainDistance( $output->getRedirect() ); + if ( $domainDistance === 'local' && $allowHeaders ) { + $flags = $lbFactory::SHUTDOWN_CHRONPROT_ASYNC; + $strategy = 'cookie'; // use same-domain cookie and keep the URL uncluttered + } elseif ( $domainDistance === 'remote' ) { + $flags = $lbFactory::SHUTDOWN_CHRONPROT_ASYNC; + $strategy = 'cookie+url'; // cross-domain cookie might not work } - } else { - // OutputPage::output() is fairly slow; run it in $postCommitWork to mask - // the latency of syncing DB positions accross all datacenters synchronously - $flags = $lbFactory::SHUTDOWN_CHRONPROT_SYNC; - if ( $lbFactory->hasOrMadeRecentMasterChanges( INF ) && $allowHeaders ) { - $cpPosTime = microtime( true ); - // Set a cookie in case the DB position store cannot sync accross datacenters. - // This will at least cover the common case of the user staying on the domain. + } + + // Record ChronologyProtector positions for DBs affected in this request at this point + $cpIndex = null; + $lbFactory->shutdown( $flags, $postCommitWork, $cpIndex ); + wfDebug( __METHOD__ . ': LBFactory shutdown completed' ); + + if ( $cpIndex > 0 ) { + if ( $allowHeaders ) { $expires = time() + ChronologyProtector::POSITION_TTL; $options = [ 'prefix' => '' ]; - $request->response()->setCookie( 'cpPosTime', $cpPosTime, $expires, $options ); + $request->response()->setCookie( 'cpPosIndex', $cpIndex, $expires, $options ); + } + + if ( $strategy === 'cookie+url' ) { + if ( $output->getRedirect() ) { // sanity + $safeUrl = $lbFactory->appendShutdownCPIndexAsQuery( + $output->getRedirect(), + $cpIndex + ); + $output->redirect( $safeUrl ); + } else { + $e = new LogicException( "No redirect; cannot append cpPosIndex parameter." ); + MWExceptionHandler::logException( $e ); + } } } - // Record ChronologyProtector positions for DBs affected in this request at this point - $lbFactory->shutdown( $flags, $postCommitWork ); - wfDebug( __METHOD__ . ': LBFactory shutdown completed' ); // Set a cookie to tell all CDN edge nodes to "stick" the user to the DC that handles this // POST request (e.g. the "master" data center). Also have the user briefly bypass CDN so diff --git a/includes/OutputPage.php b/includes/OutputPage.php index a2d445fe75..e8b000e8fe 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -323,7 +323,7 @@ class OutputPage extends ContextSource { /** * Redirect to $url rather than displaying the normal page * - * @param string $url URL + * @param string $url * @param string $responsecode HTTP status code */ public function redirect( $url, $responsecode = '302' ) { diff --git a/includes/Preferences.php b/includes/Preferences.php index 37de2a55a9..f08b155058 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -204,7 +204,7 @@ class Preferences { } /** - * @param User $user The User object + * @param User $user * @param IContextSource $context * @return array Text/links to display as key; $skinkey as value */ diff --git a/includes/Revision.php b/includes/Revision.php index 0844e89286..510c1ee231 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -495,13 +495,13 @@ class Revision implements IDBAccessObject { $this->mRecord = self::getRevisionStore()->newMutableRevisionFromArray( $row, $queryFlags, - $title + $this->ensureTitle( $row, $queryFlags, $title ) ); } elseif ( is_object( $row ) ) { $this->mRecord = self::getRevisionStore()->newRevisionFromRow( $row, $queryFlags, - $title + $this->ensureTitle( $row, $queryFlags, $title ) ); } else { throw new InvalidArgumentException( @@ -510,6 +510,51 @@ class Revision implements IDBAccessObject { } } + /** + * Make sure we have *some* Title object for use by the constructor. + * For B/C, the constructor shouldn't fail even for a bad page ID or bad revision ID. + * + * @param array|object $row + * @param int $queryFlags + * @param Title|null $title + * + * @return Title $title if not null, or a Title constructed from information in $row. + */ + private function ensureTitle( $row, $queryFlags, $title = null ) { + if ( $title ) { + return $title; + } + + if ( is_array( $row ) ) { + if ( isset( $row['title'] ) ) { + if ( !( $row['title'] instanceof Title ) ) { + throw new MWException( 'title field must contain a Title object.' ); + } + + return $row['title']; + } + + $pageId = isset( $row['page'] ) ? $row['page'] : 0; + $revId = isset( $row['id'] ) ? $row['id'] : 0; + } else { + $pageId = isset( $row->rev_page ) ? $row->rev_page : 0; + $revId = isset( $row->rev_id ) ? $row->rev_id : 0; + } + + try { + $title = self::getRevisionStore()->getTitle( $pageId, $revId, $queryFlags ); + } catch ( RevisionAccessException $ex ) { + // construct a dummy title! + wfLogWarning( __METHOD__ . ': ' . $ex->getMessage() ); + + // NOTE: this Title will only be used inside RevisionRecord + $title = Title::makeTitleSafe( NS_SPECIAL, "Badtitle/ID=$pageId" ); + $title->resetArticleID( $pageId ); + } + + return $title; + } + /** * @return RevisionRecord */ @@ -608,20 +653,27 @@ class Revision implements IDBAccessObject { /** * Returns the length of the text in this revision, or null if unknown. * - * @return int + * @return int|null */ public function getSize() { - return $this->mRecord->getSize(); + try { + return $this->mRecord->getSize(); + } catch ( RevisionAccessException $ex ) { + return null; + } } /** * Returns the base36 sha1 of the content in this revision, or null if unknown. * - * @return string + * @return string|null */ public function getSha1() { - // XXX: we may want to drop all the hashing logic, it's not worth the overhead. - return $this->mRecord->getSha1(); + try { + return $this->mRecord->getSha1(); + } catch ( RevisionAccessException $ex ) { + return null; + } } /** @@ -1065,7 +1117,11 @@ class Revision implements IDBAccessObject { $comment = CommentStoreComment::newUnsavedComment( $summary, null ); - $title = Title::newFromID( $pageId ); + $title = Title::newFromID( $pageId, Title::GAID_FOR_UPDATE ); + if ( $title === null ) { + return null; + } + $rec = self::getRevisionStore()->newNullRevision( $dbw, $title, $comment, $minor, $user ); return new Revision( $rec ); diff --git a/includes/Setup.php b/includes/Setup.php index 4936b0b11a..d1f225b5fc 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -736,19 +736,19 @@ if ( !$wgDBerrorLogTZ ) { // Initialize the request object in $wgRequest $wgRequest = RequestContext::getMain()->getRequest(); // BackCompat // Set user IP/agent information for causal consistency purposes. -// The cpPosTime cookie has no prefix and is set by MediaWiki::preOutputCommit(). -$cpPosTime = $wgRequest->getFloat( 'cpPosTime', $wgRequest->getCookie( 'cpPosTime', '' ) ); +// The cpPosIndex cookie has no prefix and is set by MediaWiki::preOutputCommit(). +$cpPosIndex = $wgRequest->getInt( 'cpPosIndex', (int)$wgRequest->getCookie( 'cpPosIndex', '' ) ); MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [ 'IPAddress' => $wgRequest->getIP(), 'UserAgent' => $wgRequest->getHeader( 'User-Agent' ), 'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' ), - 'ChronologyPositionTime' => $cpPosTime + 'ChronologyPositionIndex' => $cpPosIndex ] ); // Make sure that caching does not compromise the consistency improvements -if ( $cpPosTime ) { +if ( $cpPosIndex ) { MediaWikiServices::getInstance()->getMainWANObjectCache()->useInterimHoldOffCaching( false ); } -unset( $cpPosTime ); +unset( $cpPosIndex ); // Useful debug output if ( $wgCommandLineMode ) { diff --git a/includes/Storage/RevisionArchiveRecord.php b/includes/Storage/RevisionArchiveRecord.php index 419cb95b0b..9999179074 100644 --- a/includes/Storage/RevisionArchiveRecord.php +++ b/includes/Storage/RevisionArchiveRecord.php @@ -107,6 +107,7 @@ class RevisionArchiveRecord extends RevisionRecord { } /** + * @throws RevisionAccessException if the size was unknown and could not be calculated. * @return int The nominal revision size, never null. May be computed on the fly. */ public function getSize() { @@ -120,6 +121,7 @@ class RevisionArchiveRecord extends RevisionRecord { } /** + * @throws RevisionAccessException if the hash was unknown and could not be calculated. * @return string The revision hash, never null. May be computed on the fly. */ public function getSha1() { diff --git a/includes/Storage/RevisionRecord.php b/includes/Storage/RevisionRecord.php index f490f9b40f..8734f48848 100644 --- a/includes/Storage/RevisionRecord.php +++ b/includes/Storage/RevisionRecord.php @@ -242,6 +242,7 @@ abstract class RevisionRecord { * * MCR migration note: this replaces Revision::getSize * + * @throws RevisionAccessException if the size was unknown and could not be calculated. * @return int */ abstract public function getSize(); @@ -254,6 +255,7 @@ abstract class RevisionRecord { * * MCR migration note: this replaces Revision::getSha1 * + * @throws RevisionAccessException if the hash was unknown and could not be calculated. * @return string */ abstract public function getSha1(); diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php index 78e789e5f4..f8481fed82 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -164,6 +164,8 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup * * MCR migration note: this corresponds to Revision::getTitle * + * @note this method should be private, external use should be avoided! + * * @param int|null $pageId * @param int|null $revId * @param int $queryFlags @@ -171,7 +173,7 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup * @return Title * @throws RevisionAccessException */ - private function getTitle( $pageId, $revId, $queryFlags = 0 ) { + public function getTitle( $pageId, $revId, $queryFlags = 0 ) { if ( !$pageId && !$revId ) { throw new InvalidArgumentException( '$pageId and $revId cannot both be 0 or null' ); } @@ -687,7 +689,7 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup $content = null; $blobData = null; - $blobFlags = ''; + $blobFlags = null; if ( is_object( $row ) ) { // archive row @@ -704,7 +706,11 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup if ( isset( $row->old_text ) ) { // this happens when the text-table gets joined directly, in the pre-1.30 schema $blobData = isset( $row->old_text ) ? strval( $row->old_text ) : null; - $blobFlags = isset( $row->old_flags ) ? strval( $row->old_flags ) : ''; + // Check against selects that might have not included old_flags + if ( !property_exists( $row, 'old_flags' ) ) { + throw new InvalidArgumentException( 'old_flags was not set in $row' ); + } + $blobFlags = ( $row->old_flags === null ) ? '' : $row->old_flags; } $mainSlotRow->slot_revision = intval( $row->rev_id ); @@ -733,7 +739,9 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup $mainSlotRow->format_name = isset( $row['content_format'] ) ? strval( $row['content_format'] ) : null; $blobData = isset( $row['text'] ) ? rtrim( strval( $row['text'] ) ) : null; - $blobFlags = isset( $row['flags'] ) ? trim( strval( $row['flags'] ) ) : ''; + // XXX: If the flags field is not set then $blobFlags should be null so that no + // decoding will happen. An empty string will result in default decodings. + $blobFlags = isset( $row['flags'] ) ? trim( strval( $row['flags'] ) ) : null; // if we have a Content object, override mText and mContentModel if ( !empty( $row['content'] ) ) { @@ -795,7 +803,9 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup * * @param SlotRecord $slot The SlotRecord to load content for * @param string|null $blobData The content blob, in the form indicated by $blobFlags - * @param string $blobFlags Flags indicating how $blobData needs to be processed + * @param string|null $blobFlags Flags indicating how $blobData needs to be processed. + * Use null if no processing should happen. That is in constrast to the empty string, + * which causes the blob to be decoded according to the configured legacy encoding. * @param string|null $blobFormat MIME type indicating how $dataBlob is encoded * @param int $queryFlags * @@ -805,23 +815,28 @@ class RevisionStore implements IDBAccessObject, RevisionFactory, RevisionLookup private function loadSlotContent( SlotRecord $slot, $blobData = null, - $blobFlags = '', + $blobFlags = null, $blobFormat = null, $queryFlags = 0 ) { if ( $blobData !== null ) { Assert::parameterType( 'string', $blobData, '$blobData' ); - Assert::parameterType( 'string', $blobFlags, '$blobFlags' ); + Assert::parameterType( 'string|null', $blobFlags, '$blobFlags' ); $cacheKey = $slot->hasAddress() ? $slot->getAddress() : null; - $data = $this->blobStore->expandBlob( $blobData, $blobFlags, $cacheKey ); - - if ( $data === false ) { - throw new RevisionAccessException( - "Failed to expand blob data using flags $blobFlags (key: $cacheKey)" - ); + if ( $blobFlags === null ) { + // No blob flags, so use the blob verbatim. + $data = $blobData; + } else { + $data = $this->blobStore->expandBlob( $blobData, $blobFlags, $cacheKey ); + if ( $data === false ) { + throw new RevisionAccessException( + "Failed to expand blob data using flags $blobFlags (key: $cacheKey)" + ); + } } + } else { $address = $slot->getAddress(); try { diff --git a/includes/Storage/RevisionStoreRecord.php b/includes/Storage/RevisionStoreRecord.php index 341855dbe3..e8efcfa1b0 100644 --- a/includes/Storage/RevisionStoreRecord.php +++ b/includes/Storage/RevisionStoreRecord.php @@ -150,6 +150,7 @@ class RevisionStoreRecord extends RevisionRecord { } /** + * @throws RevisionAccessException if the size was unknown and could not be calculated. * @return string The nominal revision size, never null. May be computed on the fly. */ public function getSize() { @@ -163,6 +164,7 @@ class RevisionStoreRecord extends RevisionRecord { } /** + * @throws RevisionAccessException if the hash was unknown and could not be calculated. * @return string The revision hash, never null. May be computed on the fly. */ public function getSha1() { diff --git a/includes/Storage/SqlBlobStore.php b/includes/Storage/SqlBlobStore.php index 5ddbd34ccb..031cb587ed 100644 --- a/includes/Storage/SqlBlobStore.php +++ b/includes/Storage/SqlBlobStore.php @@ -35,6 +35,7 @@ use Language; use MWException; use WANObjectCache; use Wikimedia\Assert\Assert; +use Wikimedia\Rdbms\Database; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\LoadBalancer; @@ -269,7 +270,10 @@ class SqlBlobStore implements IDBAccessObject, BlobStore { // TODO: change key, since this is not necessarily revision text! $this->cache->makeKey( 'revisiontext', 'textid', $blobAddress ), $this->getCacheTTL(), - function () use ( $blobAddress, $queryFlags ) { + function ( $unused, &$ttl, &$setOpts ) use ( $blobAddress, $queryFlags ) { + list( $index ) = DBAccessObjectUtils::getDBOptions( $queryFlags ); + $setOpts += Database::getCacheSetOptions( $this->getDBConnection( $index ) ); + return $this->fetchBlob( $blobAddress, $queryFlags ); }, [ 'pcGroup' => self::TEXT_CACHE_GROUP, 'pcTTL' => IExpiringStore::TTL_PROC_LONG ] @@ -365,6 +369,8 @@ class SqlBlobStore implements IDBAccessObject, BlobStore { * May be the blob itself, or the blob compressed, or just the address * of the actual blob, depending on $flags. * @param string|string[] $flags Blob flags, such as 'external' or 'gzip'. + * Note that not including 'utf-8' in $flags will cause the data to be decoded + * according to the legacy encoding specified via setLegacyEncoding. * @param string|null $cacheKey May be used for caching if given * * @return false|string The expanded blob or false on failure @@ -427,7 +433,8 @@ class SqlBlobStore implements IDBAccessObject, BlobStore { $blobFlags = []; // Revisions not marked as UTF-8 will have legacy decoding applied by decompressData(). - // XXX: if $this->legacyEncoding is not set, we could skip this. May be risky, though. + // XXX: if $this->legacyEncoding is not set, we could skip this. That would however be + // risky, since $this->legacyEncoding being set in the future would lead to data corruption. $blobFlags[] = 'utf-8'; if ( $this->compressBlobs ) { @@ -456,11 +463,13 @@ class SqlBlobStore implements IDBAccessObject, BlobStore { * @todo make this private, there should be no need to use this method outside this class. * * @param mixed $blob Reference to a text - * @param array $blobFlags Compression flags + * @param array $blobFlags Compression flags, such as 'gzip'. + * Note that not including 'utf-8' in $blobFlags will cause the data to be decoded + * according to the legacy encoding specified via setLegacyEncoding. * * @return string|bool Decompressed text, or false on failure */ - public function decompressData( $blob, $blobFlags ) { + public function decompressData( $blob, array $blobFlags ) { if ( $blob === false ) { // Text failed to be fetched; nothing to do return false; diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 3d5e372c5a..cd62737c56 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -407,7 +407,7 @@ class WebRequest { * * @since 1.28 * @param string $name - * @param string|null $default Optional default + * @param string|null $default * @return string|null */ public function getRawVal( $name, $default = null ) { diff --git a/includes/Xml.php b/includes/Xml.php index b20f66ef1c..7dcd4a4327 100644 --- a/includes/Xml.php +++ b/includes/Xml.php @@ -160,8 +160,9 @@ class Xml { } /** - * @param int $year - * @param int $month + * @param int|string $year Use '' or 0 to start with no year preselected. + * @param int|string $month A month in the 1..12 range. Use '', 0 or -1 to start with no month + * preselected. * @return string Formatted HTML */ public static function dateMenu( $year, $month ) { diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 85e8db63b0..f7ac21b76e 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -611,7 +611,7 @@ class HistoryPager extends ReverseChronologicalPager { * Creates a submit button * * @param string $message Text of the submit button, will be escaped - * @param array $attributes Attributes + * @param array $attributes * @return string HTML output for the submit button */ function submitButton( $message, $attributes = [] ) { diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index a8a8317fbc..3d3340600b 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -186,7 +186,7 @@ class InfoAction extends FormlessAction { * Adds a table to the content that will be added to the output. * * @param string $content The content that will be added to the output - * @param string $table The table + * @param string $table * @return string The content with the table added */ protected function addTable( $content, $table ) { diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 83d2ae9bea..1a126dba52 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -155,6 +155,7 @@ abstract class ApiBase extends ContextSource { * ((string|array|Message)[]) When PARAM_TYPE is an array, this is an array * mapping those values to $msg for ApiBase::makeMessage(). Any value not * having a mapping will use apihelp-{$path}-paramvalue-{$param}-{$value}. + * Specify an empty array to use the default message key for all values. * @since 1.25 */ const PARAM_HELP_MSG_PER_VALUE = 14; @@ -1029,7 +1030,7 @@ abstract class ApiBase extends ContextSource { * @param string $paramName Parameter name * @param array|mixed $paramSettings Default value or an array of settings * using PARAM_* constants. - * @param bool $parseLimit Parse limit? + * @param bool $parseLimit Whether to parse and validate 'limit' parameters * @return mixed Parameter value */ protected function getParameterFromSettings( $paramName, $paramSettings, $parseLimit ) { diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php index cfac761c91..774ea1ad5d 100644 --- a/includes/api/ApiPageSet.php +++ b/includes/api/ApiPageSet.php @@ -753,7 +753,7 @@ class ApiPageSet extends ApiBase { * $this->getPageTableFields(). * * @param IDatabase $db - * @param ResultWrapper $queryResult Query result object + * @param ResultWrapper $queryResult */ public function populateFromQueryResult( $db, $queryResult ) { $this->initFromQueryResult( $queryResult ); diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 1e3b2c7398..710550abec 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -53,7 +53,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { $fld_flags = false, $fld_timestamp = false, $fld_user = false, $fld_comment = false, $fld_parsedcomment = false, $fld_sizes = false, $fld_notificationtimestamp = false, $fld_userid = false, - $fld_loginfo = false; + $fld_loginfo = false, $fld_tags; /** * @param ApiPageSet $resultPageSet @@ -82,6 +82,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { $this->fld_patrol = isset( $prop['patrol'] ); $this->fld_notificationtimestamp = isset( $prop['notificationtimestamp'] ); $this->fld_loginfo = isset( $prop['loginfo'] ); + $this->fld_tags = isset( $prop['tags'] ); if ( $this->fld_patrol ) { if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) { @@ -243,6 +244,9 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { if ( $this->fld_loginfo ) { $includeFields[] = WatchedItemQueryService::INCLUDE_LOG_INFO; } + if ( $this->fld_tags ) { + $includeFields[] = WatchedItemQueryService::INCLUDE_TAGS; + } return $includeFields; } @@ -391,6 +395,16 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { } } + if ( $this->fld_tags ) { + if ( $recentChangeInfo['rc_tags'] ) { + $tags = explode( ',', $recentChangeInfo['rc_tags'] ); + ApiResult::setIndexedTagName( $tags, 'tag' ); + $vals['tags'] = $tags; + } else { + $vals['tags'] = []; + } + } + if ( $anyHidden && ( $recentChangeInfo['rc_deleted'] & Revision::DELETED_RESTRICTED ) ) { $vals['suppressed'] = true; } @@ -453,6 +467,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { 'sizes', 'notificationtimestamp', 'loginfo', + 'tags', ] ], 'show' => [ diff --git a/includes/api/i18n/de.json b/includes/api/i18n/de.json index 54dd8b2042..218454d5a1 100644 --- a/includes/api/i18n/de.json +++ b/includes/api/i18n/de.json @@ -907,6 +907,7 @@ "apihelp-query+watchlist-paramvalue-prop-timestamp": "Ergänzt den Zeitstempel der Bearbeitung.", "apihelp-query+watchlist-paramvalue-prop-patrol": "Markiert Bearbeitungen, die kontrolliert sind.", "apihelp-query+watchlist-paramvalue-prop-sizes": "Ergänzt die alten und neuen Längen der Seite.", + "apihelp-query+watchlist-paramvalue-prop-tags": "Listet Markierungen für den Eintrag auf.", "apihelp-query+watchlist-paramvalue-type-edit": "Normale Seitenbearbeitungen.", "apihelp-query+watchlist-paramvalue-type-external": "Externe Änderungen.", "apihelp-query+watchlist-paramvalue-type-new": "Seitenerstellungen.", diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index cceed01dcf..a897f06658 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -1331,6 +1331,7 @@ "apihelp-query+watchlist-paramvalue-prop-sizes": "Adds the old and new lengths of the page.", "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Adds timestamp of when the user was last notified about the edit.", "apihelp-query+watchlist-paramvalue-prop-loginfo": "Adds log information where appropriate.", + "apihelp-query+watchlist-paramvalue-prop-tags": "Lists tags for the entry.", "apihelp-query+watchlist-param-show": "Show only items that meet these criteria. For example, to see only minor edits done by logged-in users, set $1show=minor|!anon.", "apihelp-query+watchlist-param-type": "Which types of changes to show:", "apihelp-query+watchlist-paramvalue-type-edit": "Regular page edits.", diff --git a/includes/api/i18n/fa.json b/includes/api/i18n/fa.json index c137611905..5af3bda008 100644 --- a/includes/api/i18n/fa.json +++ b/includes/api/i18n/fa.json @@ -311,6 +311,7 @@ "apihelp-query+tags-param-prop": "خصوصیتی که باید گرفته شود:", "apihelp-query+tags-paramvalue-prop-name": "افزودن نام برچسب.", "apihelp-query+transcludedin-paramvalue-prop-title": "عنوان هر صفحه.", + "apihelp-query+watchlist-paramvalue-prop-tags": "برچسب‌‌های یک مدخل را لیست می‌کند", "apihelp-query+watchlist-paramvalue-type-log": "مدخل‌های سیاهه.", "apihelp-stashedit-param-text": "محتوای صفحه.", "apihelp-stashedit-param-contentmodel": "مدل محتوایی محتوای جدید", diff --git a/includes/api/i18n/fr.json b/includes/api/i18n/fr.json index 10d2b94274..2f27b58110 100644 --- a/includes/api/i18n/fr.json +++ b/includes/api/i18n/fr.json @@ -1261,6 +1261,7 @@ "apihelp-query+watchlist-paramvalue-prop-sizes": "Ajoute les tailles ancienne et nouvelle de la page.", "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Ajoute l’horodatage de la dernière notification de la modification à l’utilisateur.", "apihelp-query+watchlist-paramvalue-prop-loginfo": "Ajoute l’information de trace le cas échéant.", + "apihelp-query+watchlist-paramvalue-prop-tags": "Liste les balises associées à l'entrée.", "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 :", "apihelp-query+watchlist-paramvalue-type-edit": "Modifications normales de page.", diff --git a/includes/api/i18n/pt.json b/includes/api/i18n/pt.json index 20330c6139..f4a4662c63 100644 --- a/includes/api/i18n/pt.json +++ b/includes/api/i18n/pt.json @@ -7,7 +7,8 @@ "Jkb8", "Hamilton Abreu", "Mansil", - "Felipe L. Ewald" + "Felipe L. Ewald", + "Athena in Wonderland" ] }, "apihelp-main-extended-description": "
\n* [[mw:Special:MyLanguage/API:Main_page|Documentação]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Lista de discussão]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Anúncios da API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Erros e pedidos]\n
\nEstado: Todas as funcionalidades mostradas nesta página devem ter o comportamento documentado, mas a API ainda está em desenvolvimento ativo e pode ser alterada a qualquer momento. Inscreva-se na [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ lista de discussão mediawiki-api-announce] para ser informado acerca das atualizações.\n\nPedidos incorretos: Quando são enviados pedidos incorretos à API, será devolvido um cabeçalho HTTP com a chave \"MediaWiki-API-Error\" e depois tanto o valor desse cabeçalho como o código de erro devolvido serão definidos com o mesmo valor. Para mais informação, consulte [[mw:Special:MyLanguage/API:Errors_and_warnings|API:Erros e avisos]].\n\nTestes: Para testar facilmente pedidos à API, visite [[Special:ApiSandbox|Testes da API]].", @@ -1238,6 +1239,7 @@ "apihelp-query+watchlist-paramvalue-prop-sizes": "Adiciona os tamanhos novo e antigo da página.", "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Adiciona a data e hora da última vez em que o utilizador foi notificado da edição.", "apihelp-query+watchlist-paramvalue-prop-loginfo": "Adiciona informação do registo quando apropriado.", + "apihelp-query+watchlist-paramvalue-prop-tags": "Lista as etiquetas da entrada.", "apihelp-query+watchlist-param-show": "Mostrar só as entradas que correspondem a estes critérios. Por exemplo, para ver só as edições menores feitas por utilizadores autenticados, definir $1show=minor|!anon.", "apihelp-query+watchlist-param-type": "Os tipos de alterações a serem mostradas:", "apihelp-query+watchlist-paramvalue-type-edit": "Edições normais.", diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json index d21f29c7a9..1e4bfc8d29 100644 --- a/includes/api/i18n/qqq.json +++ b/includes/api/i18n/qqq.json @@ -1245,6 +1245,7 @@ "apihelp-query+watchlist-paramvalue-prop-sizes": "{{doc-apihelp-paramvalue|query+watchlist|prop|sizes}}", "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "{{doc-apihelp-paramvalue|query+watchlist|prop|notificationtimestamp}}", "apihelp-query+watchlist-paramvalue-prop-loginfo": "{{doc-apihelp-paramvalue|query+watchlist|prop|loginfo}}", + "apihelp-query+watchlist-paramvalue-prop-tags": "{{doc-apihelp-paramvalue|query+watchlist|prop|tags}}", "apihelp-query+watchlist-param-show": "{{doc-apihelp-param|query+watchlist|show}}", "apihelp-query+watchlist-param-type": "{{doc-apihelp-param|query+watchlist|type}}", "apihelp-query+watchlist-paramvalue-type-edit": "{{doc-apihelp-paramvalue|query+watchlist|type|edit}}", diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json index ed1d1c71f7..bb87dd1781 100644 --- a/includes/api/i18n/zh-hans.json +++ b/includes/api/i18n/zh-hans.json @@ -1254,6 +1254,7 @@ "apihelp-query+watchlist-paramvalue-prop-sizes": "添加页面的旧有长度和新长度。", "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "添加最近被通知有关编辑的用户的时间戳。", "apihelp-query+watchlist-paramvalue-prop-loginfo": "在适当位置添加日志信息。", + "apihelp-query+watchlist-paramvalue-prop-tags": "列举条目的标签。", "apihelp-query+watchlist-param-show": "只显示满足这些标准的项目。例如，要只查看由登录用户做出的小编辑，设置$1show=minor|!anon。", "apihelp-query+watchlist-param-type": "要显示的更改类型：", "apihelp-query+watchlist-paramvalue-type-edit": "普通页面编辑。", diff --git a/includes/auth/LegacyHookPreAuthenticationProvider.php b/includes/auth/LegacyHookPreAuthenticationProvider.php index cab6e32d5b..97bbde7532 100644 --- a/includes/auth/LegacyHookPreAuthenticationProvider.php +++ b/includes/auth/LegacyHookPreAuthenticationProvider.php @@ -115,9 +115,9 @@ class LegacyHookPreAuthenticationProvider extends AbstractPreAuthenticationProvi * Construct an appropriate failure response * @param User $user * @param User|null $creator - * @param int $constant LoginForm constant - * @param string|null $msg Message - * @param string $hook Hook + * @param int $constant One of the LoginForm::… constants + * @param string|null $msg Optional message key, will be derived from $constant otherwise + * @param string $hook Name of the hook for error logging and exception messages * @return StatusValue */ protected function makeFailResponse( $user, $creator, $constant, $msg, $hook ) { diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php index 4341daafe6..48809d07e0 100644 --- a/includes/cache/BacklinkCache.php +++ b/includes/cache/BacklinkCache.php @@ -28,6 +28,7 @@ use Wikimedia\Rdbms\ResultWrapper; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IDatabase; +use MediaWiki\MediaWikiServices; /** * Class for fetching backlink lists, approximate backlink counts and @@ -70,6 +71,11 @@ class BacklinkCache { */ protected $fullResultCache = []; + /** + * @var WANObjectCache + */ + protected $wanCache; + /** * Local copy of a database object. * @@ -93,6 +99,7 @@ class BacklinkCache { */ public function __construct( Title $title ) { $this->title = $title; + $this->wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache(); } /** @@ -122,11 +129,12 @@ class BacklinkCache { } /** - * Clear locally stored data and database object. + * Clear locally stored data and database object. Invalidate data in memcache. */ public function clear() { $this->partitionCache = []; $this->fullResultCache = []; + $this->wanCache->touchCheckKey( $this->makeCheckKey() ); unset( $this->db ); } @@ -324,7 +332,6 @@ class BacklinkCache { public function getNumLinks( $table, $max = INF ) { global $wgUpdateRowsPerJob; - $cache = ObjectCache::getMainWANInstance(); // 1) try partition cache ... if ( isset( $this->partitionCache[$table] ) ) { $entry = reset( $this->partitionCache[$table] ); @@ -337,15 +344,22 @@ class BacklinkCache { return min( $max, $this->fullResultCache[$table]->numRows() ); } - $memcKey = $cache->makeKey( + $memcKey = $this->wanCache->makeKey( 'numbacklinks', md5( $this->title->getPrefixedDBkey() ), $table ); // 3) ... fallback to memcached ... - $count = $cache->get( $memcKey ); - if ( $count ) { + $curTTL = INF; + $count = $this->wanCache->get( + $memcKey, + $curTTL, + [ + $this->makeCheckKey() + ] + ); + if ( $count && ( $curTTL > 0 ) ) { return min( $max, $count ); } @@ -359,7 +373,7 @@ class BacklinkCache { // Fetch the full title info, since the caller will likely need it next $count = $this->getLinks( $table, false, false, $max )->count(); if ( $count < $max ) { // full count - $cache->set( $memcKey, $count, self::CACHE_EXPIRY ); + $this->wanCache->set( $memcKey, $count, self::CACHE_EXPIRY ); } } @@ -383,7 +397,6 @@ class BacklinkCache { return $this->partitionCache[$table][$batchSize]['batches']; } - $cache = ObjectCache::getMainWANInstance(); $this->partitionCache[$table][$batchSize] = false; $cacheEntry =& $this->partitionCache[$table][$batchSize]; @@ -395,7 +408,7 @@ class BacklinkCache { return $cacheEntry['batches']; } - $memcKey = $cache->makeKey( + $memcKey = $this->wanCache->makeKey( 'backlinks', md5( $this->title->getPrefixedDBkey() ), $table, @@ -403,8 +416,15 @@ class BacklinkCache { ); // 3) ... fallback to memcached ... - $memcValue = $cache->get( $memcKey ); - if ( is_array( $memcValue ) ) { + $curTTL = 0; + $memcValue = $this->wanCache->get( + $memcKey, + $curTTL, + [ + $this->makeCheckKey() + ] + ); + if ( is_array( $memcValue ) && ( $curTTL > 0 ) ) { $cacheEntry = $memcValue; wfDebug( __METHOD__ . ": got from memcached $memcKey\n" ); @@ -435,15 +455,15 @@ class BacklinkCache { } // Save partitions to memcached - $cache->set( $memcKey, $cacheEntry, self::CACHE_EXPIRY ); + $this->wanCache->set( $memcKey, $cacheEntry, self::CACHE_EXPIRY ); // Save backlink count to memcached - $memcKey = $cache->makeKey( + $memcKey = $this->wanCache->makeKey( 'numbacklinks', md5( $this->title->getPrefixedDBkey() ), $table ); - $cache->set( $memcKey, $cacheEntry['numRows'], self::CACHE_EXPIRY ); + $this->wanCache->set( $memcKey, $cacheEntry['numRows'], self::CACHE_EXPIRY ); wfDebug( __METHOD__ . ": got from database\n" ); @@ -543,4 +563,16 @@ class BacklinkCache { return TitleArray::newFromResult( new FakeResultWrapper( array_values( $mergedRes ) ) ); } + + /** + * Returns check key for the backlinks cache for a particular title + * + * @return String + */ + private function makeCheckKey() { + return $this->wanCache->makeKey( + 'backlinks', + md5( $this->title->getPrefixedDBkey() ) + ); + } } diff --git a/includes/cache/CacheDependency.php b/includes/cache/CacheDependency.php index dd4c49e7b3..32dc8c0bea 100644 --- a/includes/cache/CacheDependency.php +++ b/includes/cache/CacheDependency.php @@ -98,7 +98,7 @@ class DependencyWrapper { * it will be generated with the callback function (if present), and the newly * calculated value will be stored to the cache in a wrapper. * - * @param BagOStuff $cache A cache object + * @param BagOStuff $cache * @param string $key The cache key * @param int $expiry The expiry timestamp or interval in seconds * @param bool|callable $callback The callback for generating the value, or false diff --git a/includes/cache/GenderCache.php b/includes/cache/GenderCache.php index a34d23586a..099a986f7b 100644 --- a/includes/cache/GenderCache.php +++ b/includes/cache/GenderCache.php @@ -56,7 +56,7 @@ class GenderCache { /** * Returns the gender for given username. - * @param string|User $username Username + * @param string|User $username * @param string $caller The calling method * @return string */ diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index d6e9b748ab..48721866aa 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -156,22 +156,22 @@ class MessageCache { } /** - * @param WANObjectCache $wanCache WAN cache instance - * @param BagOStuff $clusterCache Cluster cache instance - * @param BagOStuff $srvCache Server cache instance + * @param WANObjectCache $wanCache + * @param BagOStuff $clusterCache + * @param BagOStuff $serverCache * @param bool $useDB Whether to look for message overrides (e.g. MediaWiki: pages) * @param int $expiry Lifetime for cache. @see $mExpiry. */ public function __construct( WANObjectCache $wanCache, BagOStuff $clusterCache, - BagOStuff $srvCache, + BagOStuff $serverCache, $useDB, $expiry ) { $this->wanCache = $wanCache; $this->clusterCache = $clusterCache; - $this->srvCache = $srvCache; + $this->srvCache = $serverCache; $this->mDisable = !$useDB; $this->mExpiry = $expiry; diff --git a/includes/changes/ChangesListBooleanFilter.php b/includes/changes/ChangesListBooleanFilter.php index 2a7ba8849f..f37ed2dd6d 100644 --- a/includes/changes/ChangesListBooleanFilter.php +++ b/includes/changes/ChangesListBooleanFilter.php @@ -18,14 +18,13 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ use Wikimedia\Rdbms\IDatabase; /** - * An individual filter in a boolean group + * Represents a hide-based boolean filter (used on ChangesListSpecialPage and descendants) * * @since 1.29 */ diff --git a/includes/changes/ChangesListBooleanFilterGroup.php b/includes/changes/ChangesListBooleanFilterGroup.php index 7bab97bac2..4401378b28 100644 --- a/includes/changes/ChangesListBooleanFilterGroup.php +++ b/includes/changes/ChangesListBooleanFilterGroup.php @@ -54,7 +54,7 @@ class ChangesListBooleanFilterGroup extends ChangesListFilterGroup { /** * Registers a filter in this group * - * @param ChangesListBooleanFilter $filter ChangesListBooleanFilter + * @param ChangesListBooleanFilter $filter */ public function registerFilter( ChangesListBooleanFilter $filter ) { $this->filters[$filter->getName()] = $filter; diff --git a/includes/changes/ChangesListFilter.php b/includes/changes/ChangesListFilter.php index 1c86d44174..d191453624 100644 --- a/includes/changes/ChangesListFilter.php +++ b/includes/changes/ChangesListFilter.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ @@ -184,8 +183,7 @@ abstract class ChangesListFilter { * (not filtered out), even for the hide-based filters. So e.g. conflicting with * 'hideanons' means there is a conflict if only anonymous users are *shown*. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalKey i18n key for top-level conflict message * @param string $forwardKey i18n key for conflict message in this * direction (when in UI context of $this object) @@ -216,8 +214,7 @@ abstract class ChangesListFilter { * * Internal use ONLY. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalDescription i18n key for top-level conflict message * @param string $contextDescription i18n key for conflict message in this * direction (when in UI context of $this object) diff --git a/includes/changes/ChangesListFilterGroup.php b/includes/changes/ChangesListFilterGroup.php index 48c6e840a0..3e2c464aaf 100644 --- a/includes/changes/ChangesListFilterGroup.php +++ b/includes/changes/ChangesListFilterGroup.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ @@ -223,8 +222,7 @@ abstract class ChangesListFilterGroup { * (not filtered out), even for the hide-based filters. So e.g. conflicting with * 'hideanons' means there is a conflict if only anonymous users are *shown*. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalKey i18n key for top-level conflict message * @param string $forwardKey i18n key for conflict message in this * direction (when in UI context of $this object) @@ -255,8 +253,7 @@ abstract class ChangesListFilterGroup { * * Internal use ONLY. * - * @param ChangesListFilterGroup|ChangesListFilter $other Other - * ChangesListFilterGroup or ChangesListFilter + * @param ChangesListFilterGroup|ChangesListFilter $other * @param string $globalDescription i18n key for top-level conflict message * @param string $contextDescription i18n key for conflict message in this * direction (when in UI context of $this object) diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php index 775fd76d1e..8cd7ba8dea 100644 --- a/includes/changes/ChangesListStringOptionsFilterGroup.php +++ b/includes/changes/ChangesListStringOptionsFilterGroup.php @@ -18,7 +18,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Matthew Flaschen */ @@ -155,7 +154,7 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup { /** * Registers a filter in this group * - * @param ChangesListStringOptionsFilter $filter ChangesListStringOptionsFilter + * @param ChangesListStringOptionsFilter $filter */ public function registerFilter( ChangesListStringOptionsFilter $filter ) { $this->filters[$filter->getName()] = $filter; diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index db1f599087..95848ea085 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -135,7 +135,7 @@ class ChangeTags { * exists, provided it is not disabled. If the message is disabled, * we consider the tag hidden, and return false. * - * @param string $tag Tag + * @param string $tag * @param IContextSource $context * @return string|bool Tag description or false if tag is to be hidden. * @since 1.25 Returns false if tag is to be hidden. @@ -162,7 +162,7 @@ class ChangeTags { * or if message is disabled, returns false. Otherwise, returns the message object * for the long description. * - * @param string $tag Tag + * @param string $tag * @param IContextSource $context * @return Message|bool Message object of the tag long description or false if * there is no description. diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php index c12d28d9bc..65dc3bb19b 100644 --- a/includes/content/AbstractContent.php +++ b/includes/content/AbstractContent.php @@ -492,7 +492,7 @@ abstract class AbstractContent implements Content { * * @param Title $title Context title for parsing * @param int|null $revId Revision ID (for {{REVISIONID}}) - * @param ParserOptions|null $options Parser options + * @param ParserOptions|null $options * @param bool $generateHtml Whether or not to generate HTML * * @return ParserOutput Containing information derived from this content. @@ -536,7 +536,7 @@ abstract class AbstractContent implements Content { * * @param Title $title Context title for parsing * @param int|null $revId Revision ID (for {{REVISIONID}}) - * @param ParserOptions $options Parser options + * @param ParserOptions $options * @param bool $generateHtml Whether or not to generate HTML * @param ParserOutput &$output The output object to fill (reference). * diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php index 2b94f3f71e..7d8f67ce9d 100644 --- a/includes/content/JsonContent.php +++ b/includes/content/JsonContent.php @@ -75,8 +75,8 @@ class JsonContent extends TextContent { /** * Beautifies JSON prior to save. * - * @param Title $title Title - * @param User $user User + * @param Title $title + * @param User $user * @param ParserOptions $popts * @return JsonContent */ diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php index e5a9f90d16..71f65b37e1 100644 --- a/includes/content/TextContent.php +++ b/includes/content/TextContent.php @@ -236,7 +236,7 @@ class TextContent extends AbstractContent { * * @param Title $title Context title for parsing * @param int $revId Revision ID (for {{REVISIONID}}) - * @param ParserOptions $options Parser options + * @param ParserOptions $options * @param bool $generateHtml Whether or not to generate HTML * @param ParserOutput &$output The output object to fill (reference). */ diff --git a/includes/exception/LocalizedException.php b/includes/exception/LocalizedException.php index d2cb5d17ec..f5f8c84e86 100644 --- a/includes/exception/LocalizedException.php +++ b/includes/exception/LocalizedException.php @@ -45,7 +45,7 @@ class LocalizedException extends Exception implements ILocalizedException { /** * @param string|array|MessageSpecifier $messageSpec See Message::newFromSpecifier - * @param int $code Exception code + * @param int $code * @param Exception|Throwable $previous The previous exception used for the exception chaining. */ public function __construct( $messageSpec, $code = 0, $previous = null ) { diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php index eeb8a8ff84..80fd22ebaa 100644 --- a/includes/gallery/ImageGalleryBase.php +++ b/includes/gallery/ImageGalleryBase.php @@ -177,7 +177,7 @@ abstract class ImageGalleryBase extends ContextSource { /** * Set the caption (as plain text) * - * @param string $caption Caption + * @param string $caption */ function setCaption( $caption ) { $this->mCaption = htmlspecialchars( $caption ); @@ -186,7 +186,7 @@ abstract class ImageGalleryBase extends ContextSource { /** * Set the caption (as HTML) * - * @param string $caption Caption + * @param string $caption */ public function setCaptionHtml( $caption ) { $this->mCaption = $caption; diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index cb1b47e1e3..21d83d2397 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -152,7 +152,7 @@ class PostgresInstaller extends DatabaseInstaller { /** * Open a PG connection with given parameters * @param string $user User name - * @param string $password Password + * @param string $password * @param string $dbName Database name * @param string $schema Database schema * @return Status diff --git a/includes/installer/i18n/bg.json b/includes/installer/i18n/bg.json index 40e143b2f5..8668ed557a 100644 --- a/includes/installer/i18n/bg.json +++ b/includes/installer/i18n/bg.json @@ -5,7 +5,8 @@ "아라", "StanProg", "Vodnokon4e", - "Seb35" + "Seb35", + "ShockD" ] }, "config-desc": "Инсталатор на МедияУики", @@ -81,6 +82,7 @@ "config-no-cli-uploads-check": "Предупреждение: Директорията по подразбиране за качване на файлове ($1) не е проверена за уязвимости при изпълнение на произволен скрипт по време на инсталацията от командния ред.", "config-brokenlibxml": "Вашата система използва комбинация от версии на PHP и libxml2, които са с много грешки и могат да причинят скрити повреди на данните в МедияУики или други уеб приложения.\nНеобходимо е обновяване до libxml2 2.7.3 или по-нова версия ([https://bugs.php.net/bug.php?id=45996 докладвана грешка при PHP]).\nИнсталацията беше прекратена.", "config-suhosin-max-value-length": "Suhosin е инсталиран и ограничава дължината GET параметъра length на $1 байта. Компонентът на МедияУики ResourceLoader ще може да пренебрегне частично това ограничение, но това ще намали производителността. По възможност е препоръчително да се настрои suhosin.get.max_value_length на 1024 или по-голяма стойност в php.ini и в LocalSettings.php да се настрои $wgResourceLoaderMaxQueryLength със същата стойност.", + "config-using-32bit": "Внимание: изглежда, че системата Ви работи с 32-битови числа. Това [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:32-bit не се препоръчва].", "config-db-type": "Тип на базата от данни:", "config-db-host": "Хост на базата от данни:", "config-db-host-help": "Ако базата от данни е на друг сървър, в кутията се въвежда името на хоста или IP адреса.\n\nАко се използва споделен уеб хостинг, доставчикът на услугата би трябвало да е предоставил в документацията си коректния хост.\n\nАко инсталацията протича на Windows-сървър и се използва MySQL, използването на \"localhost\" може да е неприемливо. В такива случаи се използва \"127.0.0.1\" за локален IP адрес.\n\nПри използване на PostgreSQL, това поле се оставя празно, за свързване чрез Unix socket.", @@ -306,11 +308,14 @@ "config-install-mainpage-failed": "Вмъкването на Началната страница беше невъзможно: $1", "config-install-done": "Поздравления!\nИнсталирането на МедияУики приключи успешно.\n\nИнсталаторът създаде файл LocalSettings.php.\nТой съдържа всичката необходима основна конфигурация на уикито.\n\nНеобходимо е той да бъде изтеглен и поставен в основната директория на уикито (директорията, в която е и index.php). Изтеглянето би трябвало да започне автоматично.\n\nАко изтеглянето не започне автоматично или е било прекратено, файлът може да бъде изтеглен чрез щракване на препратката по-долу:\n\n$3\n\nЗабележка: Ако това не бъде извършено сега, генерираният конфигурационен файл няма да е достъпен на по-късен етап ако не бъде изтеглен сега или инсталацията приключи без изтеглянето му.\n\nКогато файлът вече е в основната директория, [$2 уикито ще е достъпно на този адрес].", "config-install-done-path": "Поздравления!\nИнсталирането на МедияУики приключи успешно.\n\nИнсталаторът създаде файл LocalSettings.php.\nТой съдържа всички ваши настройки.\n\nНеобходимо е той да бъде изтеглен и поставен в $4. Изтеглянето би трябвало да започне автоматично.\n\nАко изтеглянето не започне автоматично или е било прекратено, файлът може да бъде изтеглен чрез щракване на препратката по-долу:\n\n$3\n\nЗабележка: Ако това не бъде направено сега, генерираният конфигурационен файл няма да е достъпен на по-късен етап ако не бъде изтеглен сега или инсталацията приключи без изтеглянето му.\n\nКогато файлът вече е в основната директория, [$2 уикито ще е достъпно на този адрес].", + "config-install-success": "МедияУики беше успешно инсталиран. Можете да посетите <$1$2> за да видите Вашето уики.\nАко имате въпроси, вижте списъка с често задавани въпроси:\n или използвайте някой от форумите за поддръжка на тази страница.", "config-download-localsettings": "Изтегляне на LocalSettings.php", "config-help": "помощ", "config-help-tooltip": "щракнете за разгръщане", "config-nofile": "Файлът „$1“ не може да бъде открит. Да не е бил изтрит?", "config-extension-link": "Знаете ли, че това уики поддържа [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions разширения]?\n\nМожете да разгледате [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category разширенията по категория] или [https://www.mediawiki.org/wiki/Extension_Matrix Матрицата на разширенията] за пълен списък на разширенията.", + "config-skins-screenshots": "$1 (снимки на екрана: $2)", + "config-screenshot": "снимка на екран", "mainpagetext": "МедияУики беше успешно инсталирано.", "mainpagedocfooter": "Разгледайте [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents ръководството] за подробна информация относно използването на уики софтуера.\n\n== Първи стъпки ==\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Настройки за конфигуриране]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ ЧЗВ за МедияУики]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Пощенски списък относно нови версии на МедияУики]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Локализиране на МедияУики]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Научете как да се справяте със спама във вашето уики]" } diff --git a/includes/installer/i18n/fi.json b/includes/installer/i18n/fi.json index 6c99a4234e..6b204bc862 100644 --- a/includes/installer/i18n/fi.json +++ b/includes/installer/i18n/fi.json @@ -150,6 +150,7 @@ "config-postgres-old": "MediaWiki tarvitsee PostgreSQL:n version $1 tai uudemman. Nykyinen versio on $2.", "config-mssql-old": "Vaaditaan Microsoft SQL Server $1 tai uudempi. Sinulla on käytössä $2.", "config-sqlite-name-help": "Valitse nimi, joka yksilöi tämän wikin.\nÄlä käytä välilyöntejä tai viivoja.\nNimeä käytetään SQLite-tietokannan tiedostonimessä.", + "config-sqlite-mkdir-error": "Virhe luodessa datakansiota \"$1\".\nTarkista sijainti ja yritä uudelleen", "config-sqlite-dir-unwritable": "Hakemistoon ”$1” kirjoittaminen epäonnistui.\nMuuta hakemiston käyttöoikeuksia siten, että palvelinohjelmisto voi kirjoittaa siihen ja yritä uudelleen.", "config-sqlite-connection-error": "$1.\n\nTarkista tietohakemiston ja tietokannan nimi alla ja yritä uudelleen.", "config-sqlite-readonly": "Tiedostoon $1 ei voi kirjoittaa.", @@ -204,6 +205,7 @@ "config-subscribe": "Liity [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce päivityssähköpostilistalle].", "config-subscribe-help": "Tällä harvoin käytettävällä sähköpostilistalla julkaistaan päivitysilmoituksia ja turvallisuuspäivityksiä.\nLiittymistä listalle suositellaan samoin kuin päivittämään MediaWiki kun uusi versio julkaistaan.", "config-subscribe-noemail": "Yritit liittyä päivityssähköpostilistalle antamatta sähköpostiosoitetta.\nSyötä sähköpostiosoite jos haluat liittyä listalle.", + "config-pingback": "Jaa tietoja tästä asennuksesta MediaWiki-kehittäjien kanssa.", "config-almost-done": "Olet jo lähes valmis!\nVoit ohittaa jäljellä olevat määritykset ja asentaa wikin juuri nyt.", "config-optional-continue": "Säädä lisää asetuksia.", "config-optional-skip": "Nyt riittää, asenna wiki näillä tiedoilla.", @@ -213,6 +215,7 @@ "config-profile-fishbowl": "Vain hyväksytyt muokkaajat", "config-profile-private": "Yksityinen wiki", "config-license": "Tekijänoikeus ja lisenssi:", + "config-license-none": "Ei lisenssin alatunnistetta", "config-license-cc-by-sa": "Creative Commons Nimeä-Tarttuva", "config-license-cc-by": "Creative Commons Nimeä", "config-license-cc-by-nc-sa": "Creative Commons Nimeä-Epäkaupallinen-Tarttuva", @@ -296,7 +299,7 @@ "config-install-subscribe-notpossible": "cURL-ohjelmaa ei ole asennettu eikä allow_url_fopen ole saatavilla.", "config-install-mainpage": "Luodaan etusivu oletussisällöllä", "config-install-mainpage-exists": "Etusivu on jo olemassa, ohitetaan", - "config-install-extension-tables": "Luodaan tauluja käyttöönotetuille laajuennuksille", + "config-install-extension-tables": "Luodaan tauluja käyttöönotetuille laajennuksille", "config-install-mainpage-failed": "Etusivun lisääminen ei onnistunut: $1", "config-install-done": "Onnittelut!\nOlet asentanut MediaWikin.\n\nAsennusohjelma on luonut LocalSettings.php -tiedoston.\nSiinä on kaikki MediaWikin asetukset.\n\nLataa tiedosto ja laita se MediaWikin asennushakemistoon (sama kuin missä on index.php). Lataamisen olisi pitänyt alkaa automaattisesti.\n\nMikäli latausta ei tarjottu tai keskeytit latauksen, käynnistä se uudestaan tästä linkistä:\n\n$3\n\nHuom: Mikäli et nyt lataa tiedostoa, luotu tiedosto ei ole saatavissa myöhemmin, jos poistut asennuksesta lataamatta sitä.\n\nKun olet laittanut tiedoston oikeaan paikkaan, voit [$2 mennä wikiisi].", "config-install-done-path": "Onnittelut!\nOlet asentanut MediaWikin.\n\nAsennusohjelma on luonut LocalSettings.php -tiedoston.\nSiinä on kaikki MediaWikin asetukset.\n\nLataa tiedosto ja laita se sijaintiin $4. Lataamisen olisi pitänyt alkaa automaattisesti.\n\nMikäli latausta ei tarjottu tai keskeytit latauksen, käynnistä se uudestaan tästä linkistä:\n\n$3\n\nHuom: Mikäli et nyt lataa tiedostoa, luotu tiedosto ei ole saatavissa myöhemmin, jos poistut asennuksesta lataamatta sitä.\n\nKun olet laittanut tiedoston oikeaan paikkaan, voit [$2 mennä wikiisi].", @@ -305,6 +308,8 @@ "config-help-tooltip": "Klikkaa laajentaaksesi", "config-nofile": "Tiedostoa \"$1\" ei löytynyt. Onko se poistettu?", "config-extension-link": "Tiesitkö että wiki tukee [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions laajennuksia]?\n\nLaajennuksia voi hakea myös [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category luokittain].", + "config-skins-screenshots": "$1 (kuvakaappaukset: $2)", + "config-screenshot": "kuvakaappaus", "mainpagetext": "MediaWiki on onnistuneesti asennettu.", "mainpagedocfooter": "Lisätietoja wiki-ohjelmiston käytöstä on [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents käyttöoppaassa].\n\n=== Aloittaminen ===\n\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Asetusten teko-ohjeita]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWikin FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Sähköpostilista, jolla tiedotetaan MediaWikin uusista versioista]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Käännä MediaWikiä kielellesi]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Katso, kuinka torjua spämmiä wikissäsi]\n\n=== Asetukset ===\n\nTarkista, että alla olevat taivutusmuodot ovat oikein. Jos eivät, tee tarvittavat muutokset tiedostoon LocalSettings.php seuraavasti:\n $wgGrammarForms['fi']['genitive']['{{SITENAME}}'] = '...';\n $wgGrammarForms['fi']['partitive']['{{SITENAME}}'] = '...';\n $wgGrammarForms['fi']['elative']['{{SITENAME}}'] = '...';\n $wgGrammarForms['fi']['inessive']['{{SITENAME}}'] = '...';\n $wgGrammarForms['fi']['illative']['{{SITENAME}}'] = '...';\nTaivutusmuodot: {{GRAMMAR:genitive|{{SITENAME}}}} (yön) – {{GRAMMAR:partitive|{{SITENAME}}}} (yötä) – {{GRAMMAR:elative|{{SITENAME}}}} (yöstä) – {{GRAMMAR:inessive|{{SITENAME}}}} (yössä) – {{GRAMMAR:illative|{{SITENAME}}}} (yöhön)." } diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php index e85f02d6a3..f2c7ed29f0 100644 --- a/includes/libs/CSSMin.php +++ b/includes/libs/CSSMin.php @@ -132,6 +132,9 @@ class CSSMin { */ public static function encodeStringAsDataURI( $contents, $type, $ie8Compat = true ) { // Try #1: Non-encoded data URI + + // Remove XML declaration, it's not needed with data URI usage + $contents = preg_replace( "/<\\?xml.*?\\?>/", '', $contents ); // The regular expression matches ASCII whitespace and printable characters. if ( preg_match( '/^[\r\n\t\x20-\x7e]+$/', $contents ) ) { // Do not base64-encode non-binary files (sane SVGs). @@ -151,6 +154,7 @@ class CSSMin { $encoded = preg_replace( '/ {2,}/', ' ', $encoded ); // Remove leading and trailing spaces $encoded = preg_replace( '/^ | $/', '', $encoded ); + $uri = 'data:' . $type . ',' . $encoded; if ( !$ie8Compat || strlen( $uri ) < self::DATA_URI_SIZE_LIMIT ) { return $uri; diff --git a/includes/libs/IEUrlExtension.php b/includes/libs/IEUrlExtension.php index 2d1c58b66a..0d969fb270 100644 --- a/includes/libs/IEUrlExtension.php +++ b/includes/libs/IEUrlExtension.php @@ -186,7 +186,7 @@ class IEUrlExtension { * - if we find a possible extension followed by a dot or another illegal * character, we ignore it and continue searching * - * @param string $url URL + * @param string $url * @return mixed Detected extension (string), or false if none found */ public static function findIE6Extension( $url ) { diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php index f9dcc1b52e..6f348c2b96 100644 --- a/includes/libs/StatusValue.php +++ b/includes/libs/StatusValue.php @@ -214,7 +214,7 @@ class StatusValue { /** * Merge another status object into this one * - * @param StatusValue $other Other StatusValue object + * @param StatusValue $other * @param bool $overwriteValue Whether to override the "value" member */ public function merge( $other, $overwriteValue = false ) { diff --git a/includes/libs/mime/XmlTypeCheck.php b/includes/libs/mime/XmlTypeCheck.php index 97611086b0..648fb67f9f 100644 --- a/includes/libs/mime/XmlTypeCheck.php +++ b/includes/libs/mime/XmlTypeCheck.php @@ -294,7 +294,7 @@ class XmlTypeCheck { /** * @param string $name element or attribute name, maybe with a full or short prefix - * @param string $namespaceURI the namespaceURI + * @param string $namespaceURI * @return string the name prefixed with namespaceURI */ private function expandNS( $name, $namespaceURI ) { diff --git a/includes/libs/objectcache/MemcachedClient.php b/includes/libs/objectcache/MemcachedClient.php index 20e30c5551..b937736d4f 100644 --- a/includes/libs/objectcache/MemcachedClient.php +++ b/includes/libs/objectcache/MemcachedClient.php @@ -363,7 +363,7 @@ class MemcachedClient { /** * Changes the TTL on a key from the server to $time * - * @param string $key Key + * @param string $key * @param int $time TTL in seconds * * @return bool True on success, false on failure diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php index 8121654e33..4fcd88599c 100644 --- a/includes/libs/rdbms/ChronologyProtector.php +++ b/includes/libs/rdbms/ChronologyProtector.php @@ -43,10 +43,10 @@ class ChronologyProtector implements LoggerAwareInterface { protected $key; /** @var string Hash of client parameters */ protected $clientId; - /** @var float|null Minimum UNIX timestamp of 1+ expected startup positions */ - protected $waitForPosTime; + /** @var int|null Expected minimum index of the last write to the position store */ + protected $waitForPosIndex; /** @var int Max seconds to wait on positions to appear */ - protected $waitForPosTimeout = self::POS_WAIT_TIMEOUT; + protected $waitForPosStoreTimeout = self::POS_STORE_WAIT_TIMEOUT; /** @var bool Whether to no-op all method calls */ protected $enabled = true; /** @var bool Whether to check and wait on positions */ @@ -64,19 +64,19 @@ class ChronologyProtector implements LoggerAwareInterface { /** @var int Seconds to store positions */ const POSITION_TTL = 60; /** @var int Max time to wait for positions to appear */ - const POS_WAIT_TIMEOUT = 5; + const POS_STORE_WAIT_TIMEOUT = 5; /** * @param BagOStuff $store - * @param array $client Map of (ip: , agent: ) - * @param float $posTime UNIX timestamp + * @param array[] $client Map of (ip: , agent: ) + * @param int|null $posIndex Write counter index [optional] * @since 1.27 */ - public function __construct( BagOStuff $store, array $client, $posTime = null ) { + public function __construct( BagOStuff $store, array $client, $posIndex = null ) { $this->store = $store; $this->clientId = md5( $client['ip'] . "\n" . $client['agent'] ); $this->key = $store->makeGlobalKey( __CLASS__, $this->clientId, 'v1' ); - $this->waitForPosTime = $posTime; + $this->waitForPosIndex = $posIndex; $this->logger = new NullLogger(); } @@ -147,8 +147,10 @@ class ChronologyProtector implements LoggerAwareInterface { $masterName = $lb->getServerName( $lb->getWriterIndex() ); if ( $lb->getServerCount() > 1 ) { $pos = $lb->getMasterPos(); - $this->logger->info( __METHOD__ . ": LB for '$masterName' has pos $pos\n" ); - $this->shutdownPositions[$masterName] = $pos; + if ( $pos ) { + $this->logger->info( __METHOD__ . ": LB for '$masterName' has pos $pos\n" ); + $this->shutdownPositions[$masterName] = $pos; + } } else { $this->logger->info( __METHOD__ . ": DB '$masterName' touched\n" ); } @@ -161,9 +163,10 @@ class ChronologyProtector implements LoggerAwareInterface { * * @param callable|null $workCallback Work to do instead of waiting on syncing positions * @param string $mode One of (sync, async); whether to wait on remote datacenters + * @param int|null &$cpIndex DB position key write counter; incremented on update * @return DBMasterPos[] Empty on success; returns the (db name => position) map on failure */ - public function shutdown( callable $workCallback = null, $mode = 'sync' ) { + public function shutdown( callable $workCallback = null, $mode = 'sync', &$cpIndex = null ) { if ( !$this->enabled ) { return []; } @@ -198,13 +201,18 @@ class ChronologyProtector implements LoggerAwareInterface { } $ok = $store->set( $this->key, - self::mergePositions( $store->get( $this->key ), $this->shutdownPositions ), + $this->mergePositions( + $store->get( $this->key ), + $this->shutdownPositions, + $cpIndex + ), self::POSITION_TTL, ( $mode === 'sync' ) ? $store::WRITE_SYNC : 0 ); $store->unlock( $this->key ); } else { $ok = false; + $cpIndex = null; // nothing saved } if ( !$ok ) { @@ -254,28 +262,36 @@ class ChronologyProtector implements LoggerAwareInterface { $this->initialized = true; if ( $this->wait ) { - // If there is an expectation to see master positions with a certain min - // timestamp, then block until they appear, or until a timeout is reached. - if ( $this->waitForPosTime > 0.0 ) { + // If there is an expectation to see master positions from a certain write + // index or higher, then block until it appears, or until a timeout is reached. + // Since the write index restarts each time the key is created, it is possible that + // a lagged store has a matching key write index. However, in that case, it should + // already be expired and thus treated as non-existing, maintaining correctness. + if ( $this->waitForPosIndex > 0 ) { $data = null; $loop = new WaitConditionLoop( function () use ( &$data ) { $data = $this->store->get( $this->key ); + if ( !is_array( $data ) ) { + return WaitConditionLoop::CONDITION_CONTINUE; // not found yet + } elseif ( !isset( $data['writeIndex'] ) ) { + return WaitConditionLoop::CONDITION_REACHED; // b/c + } - return ( self::minPosTime( $data ) >= $this->waitForPosTime ) + return ( $data['writeIndex'] >= $this->waitForPosIndex ) ? WaitConditionLoop::CONDITION_REACHED : WaitConditionLoop::CONDITION_CONTINUE; }, - $this->waitForPosTimeout + $this->waitForPosStoreTimeout ); $result = $loop->invoke(); $waitedMs = $loop->getLastWaitTime() * 1e3; if ( $result == $loop::CONDITION_REACHED ) { - $msg = "expected and found pos time {$this->waitForPosTime} ({$waitedMs}ms)"; + $msg = "expected and found pos index {$this->waitForPosIndex} ({$waitedMs}ms)"; $this->logger->debug( $msg ); } else { - $msg = "expected but missed pos time {$this->waitForPosTime} ({$waitedMs}ms)"; + $msg = "expected but missed pos index {$this->waitForPosIndex} ({$waitedMs}ms)"; $this->logger->info( $msg ); } } else { @@ -290,48 +306,31 @@ class ChronologyProtector implements LoggerAwareInterface { } } - /** - * @param array|bool $data - * @return float|null - */ - private static function minPosTime( $data ) { - if ( !isset( $data['positions'] ) ) { - return null; - } - - $min = null; - foreach ( $data['positions'] as $pos ) { - if ( $pos instanceof DBMasterPos ) { - $min = $min ? min( $pos->asOfTime(), $min ) : $pos->asOfTime(); - } - } - - return $min; - } - /** * @param array|bool $curValue * @param DBMasterPos[] $shutdownPositions + * @param int|null &$cpIndex * @return array */ - private static function mergePositions( $curValue, array $shutdownPositions ) { + protected function mergePositions( $curValue, array $shutdownPositions, &$cpIndex = null ) { /** @var DBMasterPos[] $curPositions */ - if ( $curValue === false ) { - $curPositions = $shutdownPositions; - } else { - $curPositions = $curValue['positions']; - // Use the newest positions for each DB master - foreach ( $shutdownPositions as $db => $pos ) { - if ( - !isset( $curPositions[$db] ) || - !( $curPositions[$db] instanceof DBMasterPos ) || - $pos->asOfTime() > $curPositions[$db]->asOfTime() - ) { - $curPositions[$db] = $pos; - } + $curPositions = isset( $curValue['positions'] ) ? $curValue['positions'] : []; + // Use the newest positions for each DB master + foreach ( $shutdownPositions as $db => $pos ) { + if ( + !isset( $curPositions[$db] ) || + !( $curPositions[$db] instanceof DBMasterPos ) || + $pos->asOfTime() > $curPositions[$db]->asOfTime() + ) { + $curPositions[$db] = $pos; } } - return [ 'positions' => $curPositions ]; + $cpIndex = isset( $curValue['writeIndex'] ) ? $curValue['writeIndex'] : 0; + + return [ + 'positions' => $curPositions, + 'writeIndex' => ++$cpIndex + ]; } } diff --git a/includes/libs/rdbms/TransactionProfiler.php b/includes/libs/rdbms/TransactionProfiler.php index 57a12a4463..a828cd3f1c 100644 --- a/includes/libs/rdbms/TransactionProfiler.php +++ b/includes/libs/rdbms/TransactionProfiler.php @@ -82,7 +82,7 @@ class TransactionProfiler implements LoggerAwareInterface { } /** - * @param bool $value New value + * @param bool $value * @return bool Old value * @since 1.28 */ diff --git a/includes/libs/rdbms/connectionmanager/ConnectionManager.php b/includes/libs/rdbms/connectionmanager/ConnectionManager.php index 212ff315a8..4a497b088b 100644 --- a/includes/libs/rdbms/connectionmanager/ConnectionManager.php +++ b/includes/libs/rdbms/connectionmanager/ConnectionManager.php @@ -1,4 +1,23 @@ isset( $_SERVER[ 'REMOTE_ADDR' ] ) ? $_SERVER[ 'REMOTE_ADDR' ] : '', 'UserAgent' => isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '', 'ChronologyProtection' => 'true', - 'ChronologyPositionTime' => isset( $_GET['cpPosTime'] ) ? $_GET['cpPosTime'] : null + 'ChronologyPositionIndex' => isset( $_GET['cpPosIndex'] ) ? $_GET['cpPosIndex'] : null ]; $this->cliMode = isset( $conf['cliMode'] ) ? $conf['cliMode'] : PHP_SAPI === 'cli'; @@ -132,13 +132,13 @@ abstract class LBFactory implements ILBFactory { } public function shutdown( - $mode = self::SHUTDOWN_CHRONPROT_SYNC, callable $workCallback = null + $mode = self::SHUTDOWN_CHRONPROT_SYNC, callable $workCallback = null, &$cpIndex = null ) { $chronProt = $this->getChronologyProtector(); if ( $mode === self::SHUTDOWN_CHRONPROT_SYNC ) { - $this->shutdownChronologyProtector( $chronProt, $workCallback, 'sync' ); + $this->shutdownChronologyProtector( $chronProt, $workCallback, 'sync', $cpIndex ); } elseif ( $mode === self::SHUTDOWN_CHRONPROT_ASYNC ) { - $this->shutdownChronologyProtector( $chronProt, null, 'async' ); + $this->shutdownChronologyProtector( $chronProt, null, 'async', $cpIndex ); } $this->commitMasterChanges( __METHOD__ ); // sanity @@ -358,7 +358,7 @@ abstract class LBFactory implements ILBFactory { $failed = []; foreach ( $lbs as $i => $lb ) { if ( $masterPositions[$i] ) { - // The DBMS may not support getMasterPos() + // The RDBMS may not support getMasterPos() if ( !$lb->waitForAll( $masterPositions[$i], $opts['timeout'] ) ) { $failed[] = $lb->getServerName( $lb->getWriterIndex() ); } @@ -441,7 +441,7 @@ abstract class LBFactory implements ILBFactory { 'ip' => $this->requestInfo['IPAddress'], 'agent' => $this->requestInfo['UserAgent'], ], - $this->requestInfo['ChronologyPositionTime'] + $this->requestInfo['ChronologyPositionIndex'] ); $this->chronProt->setLogger( $this->replLogger ); @@ -465,9 +465,10 @@ abstract class LBFactory implements ILBFactory { * @param ChronologyProtector $cp * @param callable|null $workCallback Work to do instead of waiting on syncing positions * @param string $mode One of (sync, async); whether to wait on remote datacenters + * @param int|null &$cpIndex DB position key write counter; incremented on update */ protected function shutdownChronologyProtector( - ChronologyProtector $cp, $workCallback, $mode + ChronologyProtector $cp, $workCallback, $mode, &$cpIndex = null ) { // Record all the master positions needed $this->forEachLB( function ( ILoadBalancer $lb ) use ( $cp ) { @@ -475,7 +476,7 @@ abstract class LBFactory implements ILBFactory { } ); // Write them to the persistent stash. Try to do something useful by running $work // while ChronologyProtector waits for the stash write to replicate to all DCs. - $unsavedPositions = $cp->shutdown( $workCallback, $mode ); + $unsavedPositions = $cp->shutdown( $workCallback, $mode, $cpIndex ); if ( $unsavedPositions && $workCallback ) { // Invoke callback in case it did not cache the result yet $workCallback(); // work now to block for less time in waitForAll() @@ -544,7 +545,7 @@ abstract class LBFactory implements ILBFactory { $this->agent = $agent; } - public function appendPreShutdownTimeAsQuery( $url, $time ) { + public function appendShutdownCPIndexAsQuery( $url, $index ) { $usedCluster = 0; $this->forEachLB( function ( ILoadBalancer $lb ) use ( &$usedCluster ) { $usedCluster |= ( $lb->getServerCount() > 1 ); @@ -554,7 +555,7 @@ abstract class LBFactory implements ILBFactory { return $url; // no master/replica clusters touched } - return strpos( $url, '?' ) === false ? "$url?cpPosTime=$time" : "$url&cpPosTime=$time"; + return strpos( $url, '?' ) === false ? "$url?cpPosIndex=$index" : "$url&cpPosIndex=$index"; } public function setRequestInfo( array $info ) { diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index a75dc4db4e..e80b9520e5 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -242,6 +242,17 @@ class LoadBalancer implements ILoadBalancer { } } + /** + * Get the local (and default) database domain ID of connection handles + * + * @see DatabaseDomain + * @return string Database domain ID; this specifies DB name, schema, and table prefix + * @since 1.31 + */ + public function getLocalDomainID() { + return $this->localDomain->getId(); + } + /** * Get a LoadMonitor instance * diff --git a/includes/linkeddata/PageDataRequestHandler.php b/includes/linkeddata/PageDataRequestHandler.php index 43cb44c854..03ab8ea268 100644 --- a/includes/linkeddata/PageDataRequestHandler.php +++ b/includes/linkeddata/PageDataRequestHandler.php @@ -1,4 +1,22 @@ */ namespace MediaWiki\Linker; diff --git a/includes/linker/LinkRendererFactory.php b/includes/linker/LinkRendererFactory.php index b7c05c2fe8..240ea09be9 100644 --- a/includes/linker/LinkRendererFactory.php +++ b/includes/linker/LinkRendererFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL-2.0+ * @author Kunal Mehta */ namespace MediaWiki\Linker; diff --git a/includes/linker/LinkTarget.php b/includes/linker/LinkTarget.php index 980a8bfcb8..56407aec36 100644 --- a/includes/linker/LinkTarget.php +++ b/includes/linker/LinkTarget.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ * @author Addshore */ namespace MediaWiki\Linker; diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index 00d3bd3315..93a81cff8e 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -98,8 +98,9 @@ class LogEventsList extends ContextSource { * @param string $user * @param string $page * @param string $pattern - * @param int $year Year - * @param int $month Month + * @param int|string $year Use 0 to start with no year preselected. + * @param int|string $month A month in the 1..12 range. Use 0 to start with no month + * preselected. * @param array $filter * @param string $tagFilter Tag to select by default * @param string $action @@ -426,7 +427,7 @@ class LogEventsList extends ContextSource { } /** - * @param stdClass $row Row + * @param stdClass $row * @return string */ private function getShowHideLinks( $row ) { @@ -496,7 +497,7 @@ class LogEventsList extends ContextSource { } /** - * @param stdClass $row Row + * @param stdClass $row * @param string|array $type * @param string|array $action * @param string $right @@ -521,7 +522,7 @@ class LogEventsList extends ContextSource { * Determine if the current user is allowed to view a particular * field of this log row, if it's marked as deleted. * - * @param stdClass $row Row + * @param stdClass $row * @param int $field * @param User $user User to check, or null to use $wgUser * @return bool @@ -558,7 +559,7 @@ class LogEventsList extends ContextSource { } /** - * @param stdClass $row Row + * @param stdClass $row * @param int $field One of DELETED_* bitfield constants * @return bool */ diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php index e421209278..77d9aa21ba 100644 --- a/includes/logging/LogPage.php +++ b/includes/logging/LogPage.php @@ -319,7 +319,7 @@ class LogPage { * * @param string $action One of '', 'block', 'protect', 'rights', 'delete', * 'upload', 'move', 'move_redir' - * @param Title $target Title object + * @param Title $target * @param string $comment Description associated * @param array $params Parameters passed later to wfMessage function * @param null|int|User $doer The user doing the action. null for $wgUser diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index 2ed5db36f7..9e0fc3db36 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -292,7 +292,7 @@ class BitmapMetadataHandler { * Read the first 2 bytes of a tiff file to figure out * Little Endian or Big Endian. Needed for exif stuff. * - * @param string $filename The filename + * @param string $filename * @return string 'BE' or 'LE' or false */ static function getTiffByteOrder( $filename ) { diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php index 343adc2088..894043a4e5 100644 --- a/includes/media/IPTC.php +++ b/includes/media/IPTC.php @@ -353,20 +353,20 @@ class IPTC { * @todo Potentially this should also capture the timezone offset. * @param array $date The date tag * @param array $time The time tag - * @param string $c The charset + * @param string $charset * @return string Date in EXIF format. */ - private static function timeHelper( $date, $time, $c ) { + private static function timeHelper( $date, $time, $charset ) { if ( count( $date ) === 1 ) { // the standard says this should always be 1 // just double checking. - list( $date ) = self::convIPTC( $date, $c ); + list( $date ) = self::convIPTC( $date, $charset ); } else { return null; } if ( count( $time ) === 1 ) { - list( $time ) = self::convIPTC( $time, $c ); + list( $time ) = self::convIPTC( $time, $charset ); $dateOnly = false; } else { $time = '000000+0000'; // placeholder @@ -420,7 +420,7 @@ class IPTC { /** * Helper function to convert charset for iptc values. * @param string|array $data The iptc string - * @param string $charset The charset + * @param string $charset * * @return string|array */ @@ -439,7 +439,7 @@ class IPTC { /** * Helper function of a helper function to convert charset for iptc values. * @param string|array $data The IPTC string - * @param string $charset The charset + * @param string $charset * * @return string */ diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index 8551a120a5..5dca24bcba 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -255,7 +255,7 @@ abstract class MediaHandler { * Get a MediaTransformOutput object representing the transformed output. Does not * actually do the transform. * - * @param File $image The image object + * @param File $image * @param string $dstPath Filesystem destination path * @param string $dstUrl Destination URL to use in output HTML * @param array $params Arbitrary set of parameters validated by $this->validateParam() @@ -269,7 +269,7 @@ abstract class MediaHandler { * Get a MediaTransformOutput object representing the transformed output. Does the * transform unless $flags contains self::TRANSFORM_LATER. * - * @param File $image The image object + * @param File $image * @param string $dstPath Filesystem destination path * @param string $dstUrl Destination URL to use in output HTML * @param array $params Arbitrary set of parameters validated by $this->validateParam() @@ -497,7 +497,7 @@ abstract class MediaHandler { * * This is used by the media handlers that use the FormatMetadata class * - * @param array $metadataArray Metadata array + * @param array $metadataArray * @param bool|IContextSource $context Context to use (optional) * @return array Array for use displaying metadata. */ diff --git a/includes/media/WebP.php b/includes/media/WebP.php index e23989dfa8..e0af6def45 100644 --- a/includes/media/WebP.php +++ b/includes/media/WebP.php @@ -154,7 +154,7 @@ class WebPHandler extends BitmapHandler { /** * Decodes a lossy chunk header - * @param string $header Header string + * @param string $header First few bytes of the header, expected to be at least 18 bytes long * @return bool|array See WebPHandler::decodeHeader */ protected static function decodeLossyChunkHeader( $header ) { @@ -180,7 +180,7 @@ class WebPHandler extends BitmapHandler { /** * Decodes a lossless chunk header - * @param string $header Header string + * @param string $header First few bytes of the header, expected to be at least 13 bytes long * @return bool|array See WebPHandler::decodeHeader */ public static function decodeLosslessChunkHeader( $header ) { @@ -205,7 +205,7 @@ class WebPHandler extends BitmapHandler { /** * Decodes an extended chunk header - * @param string $header Header string + * @param string $header First few bytes of the header, expected to be at least 18 bytes long * @return bool|array See WebPHandler::decodeHeader */ public static function decodeExtendedChunkHeader( $header ) { diff --git a/includes/media/XCF.php b/includes/media/XCF.php index 3587eba656..1b6c4c87ed 100644 --- a/includes/media/XCF.php +++ b/includes/media/XCF.php @@ -151,7 +151,7 @@ class XCFHandler extends BitmapHandler { * * @param File|FSFile $file The image object, or false if there isn't one. * Warning, FSFile::getPropsFromPath might pass an (object)array() instead (!) - * @param string $filename The filename + * @param string $filename * @return string */ public function getMetadata( $file, $filename ) { diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php index c2860552c0..6691f73d2e 100644 --- a/includes/objectcache/SqlBagOStuff.php +++ b/includes/objectcache/SqlBagOStuff.php @@ -808,6 +808,9 @@ class SqlBagOStuff extends BagOStuff { // Main LB is used; wait for any replica DBs to catch up $masterPos = $lb->getMasterPos(); + if ( !$masterPos ) { + return true; // not applicable + } $loop = new WaitConditionLoop( function () use ( $lb, $masterPos ) { diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 5029d1d788..68476715f8 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -3353,6 +3353,8 @@ class WikiPage implements Page, IDBAccessObject { */ public static function onArticleDelete( Title $title ) { // Update existence markers on article/talk tabs... + // Clear Backlink cache first so that purge jobs use more up-to-date backlink information + BacklinkCache::get( $title )->clear(); $other = $title->getOtherPage(); $other->purgeSquid(); diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index f41ee01dce..dcd16eb4fa 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -4679,7 +4679,7 @@ class Parser { * Wrapper for preprocess() * * @param string $text The text to preprocess - * @param ParserOptions $options Options + * @param ParserOptions $options * @param Title|null $title Title object or null to use $wgTitle * @return string */ @@ -5972,7 +5972,7 @@ class Parser { /** * Remove any strip markers found in the given text. * - * @param string $text Input string + * @param string $text * @return string */ public function killMarkers( $text ) { diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 4ed176ce28..298aad3313 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -233,7 +233,7 @@ class StripState { /** * Remove any strip markers found in the given text. * - * @param string $text Input string + * @param string $text * @return string */ public function killMarkers( $text ) { diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index 0104ec33b9..4deb7fa988 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -106,7 +106,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { * Set this module's name. This is called by ResourceLoader::register() * when registering the module. Other code should not call this. * - * @param string $name Name + * @param string $name */ public function setName( $name ) { $this->name = $name; @@ -928,7 +928,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { * Get this module's last modification timestamp for a given context. * * @deprecated since 1.26 Use getDefinitionSummary() instead - * @param ResourceLoaderContext $context Context object + * @param ResourceLoaderContext $context * @return int|null UNIX timestamp */ public function getModifiedTime( ResourceLoaderContext $context ) { diff --git a/includes/revisiondelete/RevDelItem.php b/includes/revisiondelete/RevDelItem.php index bf97bd4100..4762085289 100644 --- a/includes/revisiondelete/RevDelItem.php +++ b/includes/revisiondelete/RevDelItem.php @@ -57,7 +57,7 @@ abstract class RevDelItem extends RevisionItemBase { /** * Get the return information about the revision for the API * @since 1.23 - * @param ApiResult $result API result object + * @param ApiResult $result * @return array Data for the API result */ abstract public function getApiData( ApiResult $result ); diff --git a/includes/search/SearchExactMatchRescorer.php b/includes/search/SearchExactMatchRescorer.php index 2687c8ec77..354b3909dc 100644 --- a/includes/search/SearchExactMatchRescorer.php +++ b/includes/search/SearchExactMatchRescorer.php @@ -34,7 +34,7 @@ class SearchExactMatchRescorer { * may sort based on other algorithms that may cause the exact title match * to not be in the results or be lower down the list. * @param string $search the query - * @param int[] $namespaces the namespaces + * @param int[] $namespaces * @param string[] $srchres results * @param int $limit the max number of results to return * @return string[] munged results @@ -96,7 +96,7 @@ class SearchExactMatchRescorer { } /** - * @param string[] $titles as strings + * @param string[] $titles * @return array redirect target prefixedText to index of title in titles * that is a redirect to it. */ diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php index d37b73b550..44806eddef 100644 --- a/includes/session/SessionBackend.php +++ b/includes/session/SessionBackend.php @@ -97,7 +97,7 @@ final class SessionBackend { private $shutdown = false; /** - * @param SessionId $id Session ID object + * @param SessionId $id * @param SessionInfo $info Session info to populate from * @param CachedBagOStuff $store Backend data store * @param LoggerInterface $logger diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 303184de17..282d764239 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -1812,7 +1812,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { * * @since 1.31 * @param Config $config - * @param User $user User object + * @param User $user * @return bool */ public static function checkStructuredFilterUiEnabled( Config $config, User $user ) { diff --git a/includes/specials/SpecialPageData.php b/includes/specials/SpecialPageData.php index c52c426e88..978efa7f12 100644 --- a/includes/specials/SpecialPageData.php +++ b/includes/specials/SpecialPageData.php @@ -1,11 +1,32 @@ . * - * @license GPL-2.0+ + * @class + * @ingroup SpecialPage */ class SpecialPageData extends SpecialPage { diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 2ef9eafffb..ac34996283 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -101,7 +101,6 @@ class SpecialProtectedpages extends SpecialPage { 'name' => 'namespace', 'id' => 'namespace', 'cssclass' => 'namespaceselector', - 'selected' => $namespace, 'all' => '', 'label' => $this->msg( 'namespace' )->text(), ], @@ -112,21 +111,18 @@ class SpecialProtectedpages extends SpecialPage { 'label' => $this->msg( 'protectedpages-indef' )->text(), 'name' => 'indefonly', 'id' => 'indefonly', - 'value' => $indefOnly ], 'cascadecheck' => [ 'type' => 'check', 'label' => $this->msg( 'protectedpages-cascade' )->text(), 'name' => 'cascadeonly', 'id' => 'cascadeonly', - 'value' => $cascadeOnly ], 'redirectcheck' => [ 'type' => 'check', 'label' => $this->msg( 'protectedpages-noredirect' )->text(), 'name' => 'noredirect', 'id' => 'noredirect', - 'value' => $noRedirect, ], 'sizelimit' => [ 'class' => 'HTMLSizeFilterField', @@ -166,7 +162,6 @@ class SpecialProtectedpages extends SpecialPage { return [ 'type' => 'select', 'options' => $options, - 'value' => $pr_type, 'label' => $this->msg( 'restriction-type' )->text(), 'name' => $this->IdType, 'id' => $this->IdType, @@ -200,7 +195,6 @@ class SpecialProtectedpages extends SpecialPage { return [ 'type' => 'select', 'options' => $options, - 'value' => $pr_level, 'label' => $this->msg( 'restriction-level' )->text(), 'name' => $this->IdLevel, 'id' => $this->IdLevel diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index fa9033cb31..af2b81f152 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -85,10 +85,8 @@ class SpecialProtectedtitles extends SpecialPage { } $link = $this->getLinkRenderer()->makeLink( $title ); - $description_items = []; // Messages: restriction-level-sysop, restriction-level-autoconfirmed - $protType = $this->msg( 'restriction-level-' . $row->pt_create_perm )->escaped(); - $description_items[] = $protType; + $description = $this->msg( 'restriction-level-' . $row->pt_create_perm )->escaped(); $lang = $this->getLanguage(); $expiry = strlen( $row->pt_expiry ) ? $lang->formatExpiry( $row->pt_expiry, TS_MW ) : @@ -96,7 +94,7 @@ class SpecialProtectedtitles extends SpecialPage { if ( $expiry !== 'infinity' ) { $user = $this->getUser(); - $description_items[] = $this->msg( + $description .= $this->msg( 'comma-separator' )->escaped() . $this->msg( 'protect-expiring-local', $lang->userTimeAndDate( $expiry, $user ), $lang->userDate( $expiry, $user ), @@ -104,8 +102,7 @@ class SpecialProtectedtitles extends SpecialPage { )->escaped(); } - // @todo i18n: This should use a comma separator instead of a hard coded comma, right? - return '
  • ' . $lang->specialList( $link, implode( $description_items, ', ' ) ) . "
    • \n"; + return '
  • ' . $lang->specialList( $link, $description ) . "
    • \n"; } /** diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 3559c9928b..7cc0dc6d10 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -823,7 +823,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { /** * Makes change an option link which carries all the other options * - * @param string $title Title + * @param string $title * @param array $override Options to override * @param array $options Current options * @param bool $active Whether to show the link in bold diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index b3a58cbd91..f8268445b1 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -394,7 +394,8 @@ class SpecialSearch extends SpecialPage { $linkRenderer = $this->getLinkRenderer(); $mainResultWidget = new FullSearchResultWidget( $this, $linkRenderer ); - if ( $search->getFeatureData( 'enable-new-crossproject-page' ) ) { + // Default (null) on. Can be explicitly disabled. + if ( $search->getFeatureData( 'enable-new-crossproject-page' ) !== false ) { $sidebarResultWidget = new InterwikiSearchResultWidget( $this, $linkRenderer ); $sidebarResultsWidget = new InterwikiSearchResultSetWidget( $this, diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php index 8cdfb87f53..c8b1578fe5 100644 --- a/includes/specials/SpecialUploadStash.php +++ b/includes/specials/SpecialUploadStash.php @@ -315,7 +315,7 @@ class SpecialUploadStash extends UnlistedSpecialPage { /** * Output HTTP response of raw content * Side effect: writes HTTP response to STDOUT. - * @param string $content Content + * @param string $content * @param string $contentType MIME type * @throws SpecialUploadStashTooLargeException * @return bool diff --git a/includes/specials/formfields/Licenses.php b/includes/specials/formfields/Licenses.php index f499cc161b..603c62f17b 100644 --- a/includes/specials/formfields/Licenses.php +++ b/includes/specials/formfields/Licenses.php @@ -21,7 +21,6 @@ * @ingroup SpecialPage * @author Ævar Arnfjörð Bjarmason * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ /** diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 45d9a7fc84..4efe92d743 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -407,7 +407,7 @@ class UsersPager extends AlphabeticPager { * Format a link to a group description page * * @param string|UserGroupMembership $group Group name or UserGroupMembership object - * @param string $username Username + * @param string $username * @return string */ protected function buildGroupLink( $group, $username ) { diff --git a/includes/title/ForeignTitleFactory.php b/includes/title/ForeignTitleFactory.php index 427afdf3eb..07dd346df9 100644 --- a/includes/title/ForeignTitleFactory.php +++ b/includes/title/ForeignTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/ImportTitleFactory.php b/includes/title/ImportTitleFactory.php index 629616d8c0..4baab22afa 100644 --- a/includes/title/ImportTitleFactory.php +++ b/includes/title/ImportTitleFactory.php @@ -16,7 +16,6 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL 2+ */ /** diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php index efc0fd4a71..890a870a2a 100644 --- a/includes/title/MediaWikiTitleCodec.php +++ b/includes/title/MediaWikiTitleCodec.php @@ -1,6 +1,6 @@ getCommentStore()->getJoin()['tables']; } + if ( in_array( self::INCLUDE_TAGS, $options['includeFields'] ) ) { + $tables[] = 'tag_summary'; + } return $tables; } @@ -384,6 +388,10 @@ class WatchedItemQueryService { if ( in_array( self::INCLUDE_LOG_INFO, $options['includeFields'] ) ) { $fields = array_merge( $fields, [ 'rc_logid', 'rc_log_type', 'rc_log_action', 'rc_params' ] ); } + if ( in_array( self::INCLUDE_TAGS, $options['includeFields'] ) ) { + // prefixed with rc_ to include the field in getRecentChangeFieldsFromRow + $fields['rc_tags'] = 'ts_tags'; + } return $fields; } @@ -678,6 +686,9 @@ class WatchedItemQueryService { if ( in_array( self::INCLUDE_COMMENT, $options['includeFields'] ) ) { $joinConds += $this->getCommentStore()->getJoin()['joins']; } + if ( in_array( self::INCLUDE_TAGS, $options['includeFields'] ) ) { + $joinConds['tag_summary'] = [ 'LEFT JOIN', [ 'rc_id=ts_rc_id' ] ]; + } return $joinConds; } diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php b/includes/widget/search/SimpleSearchResultSetWidget.php index d6583a3269..d0c259fea2 100644 --- a/includes/widget/search/SimpleSearchResultSetWidget.php +++ b/includes/widget/search/SimpleSearchResultSetWidget.php @@ -13,6 +13,8 @@ use Html; * Renders one or more SearchResultSets into a sidebar grouped by * interwiki prefix. Includes a per-wiki header indicating where * the results are from. + * + * @deprecated since 1.31. Use InterwikiSearchResultSetWidget */ class SimpleSearchResultSetWidget implements SearchResultSetWidget { /** @var SpecialSearch */ @@ -32,6 +34,7 @@ class SimpleSearchResultSetWidget implements SearchResultSetWidget { LinkRenderer $linkRenderer, InterwikiLookup $iwLookup ) { + wfDeprecated( __METHOD__, '1.31' ); $this->specialSearch = $specialSearch; $this->resultWidget = $resultWidget; $this->linkRenderer = $linkRenderer; diff --git a/includes/widget/search/SimpleSearchResultWidget.php b/includes/widget/search/SimpleSearchResultWidget.php index fa075637a1..552cbaf8ba 100644 --- a/includes/widget/search/SimpleSearchResultWidget.php +++ b/includes/widget/search/SimpleSearchResultWidget.php @@ -9,6 +9,8 @@ use SpecialSearch; /** * Renders a simple one-line result + * + * @deprecated since 1.31. Use other result widgets. */ class SimpleSearchResultWidget implements SearchResultWidget { /** @var SpecialSearch */ @@ -17,6 +19,7 @@ class SimpleSearchResultWidget implements SearchResultWidget { protected $linkRenderer; public function __construct( SpecialSearch $specialSearch, LinkRenderer $linkRenderer ) { + wfDeprecated( __METHOD__, '1.31' ); $this->specialSearch = $specialSearch; $this->linkRenderer = $linkRenderer; } diff --git a/languages/Language.php b/languages/Language.php index fdf2d05d9d..27c9faf307 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3489,15 +3489,16 @@ class Language { * @return string */ function truncate( $string, $length, $ellipsis = '...', $adjustLength = true ) { + # Check if there is no need to truncate + if ( strlen( $string ) <= abs( $length ) ) { + return $string; // no need to truncate + } # Use the localized ellipsis character if ( $ellipsis == '...' ) { $ellipsis = wfMessage( 'ellipsis' )->inLanguage( $this )->escaped(); } - # Check if there is no need to truncate if ( $length == 0 ) { return $ellipsis; // convention - } elseif ( strlen( $string ) <= abs( $length ) ) { - return $string; // no need to truncate } $stringOriginal = $string; # If ellipsis length is >= $length then we can't apply $adjustLength diff --git a/languages/data/Names.php b/languages/data/Names.php index 281be2b97b..d0a68247a4 100644 --- a/languages/data/Names.php +++ b/languages/data/Names.php @@ -320,6 +320,7 @@ class Names { 'nso' => 'Sesotho sa Leboa', # Northern Sotho 'nv' => 'Diné bizaad', # Navajo 'ny' => 'Chi-Chewa', # Chichewa + 'nys' => 'Nyunga', # Nyungar 'oc' => 'occitan', # Occitan 'olo' => 'Livvinkarjala', # Livvi-Karelian 'om' => 'Oromoo', # Oromo diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json index e380acca02..af6126b001 100644 --- a/languages/i18n/ar.json +++ b/languages/i18n/ar.json @@ -1359,7 +1359,7 @@ "rcfilters-activefilters": "المرشحات النشطة", "rcfilters-advancedfilters": "مرشحات متقدمة", "rcfilters-limit-title": "النتائج للعرض", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|تغيير|$1 تغييرات}}، $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|تغيير|$1 تغييرات}}، $2", "rcfilters-date-popup-title": "الفترة الزمنية للبحث", "rcfilters-days-title": "عدد الأيام الأخيرة", "rcfilters-hours-title": "عدد الساعات الأخيرة", @@ -1478,7 +1478,7 @@ "rcfilters-filter-showlinkedfrom-option-label": "الصفحات الموصولة من الصفحة المختارة", "rcfilters-filter-showlinkedto-label": "عرض التغييرات في الصفحات الموصولة بصفحة", "rcfilters-filter-showlinkedto-option-label": "الصفحات الموصولة إلى الصفحة المختارة", - "rcfilters-target-page-placeholder": "أدخل اسم صفحة", + "rcfilters-target-page-placeholder": "أدخل اسم صفحة (أو تصنيف)", "rcnotefrom": "بالأسفل {{PLURAL:$5|التغيير|التغييرات}} منذ $2 (إلى $1 معروضة).", "rclistfromreset": "إعادة ضبط خيار التاريخ", "rclistfrom": "أظهر التغييرات بدءًا من $3 $2", @@ -3556,7 +3556,7 @@ "version-poweredby-others": "آخرون", "version-poweredby-translators": "مترجمو ترانسليت ويكي دوت نت", "version-credits-summary": "نود أن نعرف بالأشخاص التالية أسماؤهم لمساهمتهم في [[Special:Version|ميدياويكي]].", - "version-license-info": "ميدياويكي برنامج حر، يحق لك توزيعه و/أو تعديله وفقاً لبنود رخصة غنو العمومية كما نشرتها مؤسسة البرمجيات الحرة، الإصدار الثاني أو (وفقا لاختيارك أنت) أي إصدار لاحق.\n\nهذا البرنامج يوزع على أمل أن يكون مفيداً، ولكن '''دون أية ضمانات'''، بما في ذلك ضمانات '''التسويق''' أو '''الملاءمة لغرض معين'''. انظر رخصة غنو العمومية لمزيد من التفاصيل.\n\nينبغي أن تكون قد تلقيت نسخة من رخصة غنو العمومية إذا لم يتم ذلك، اكتب إلى: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA أو [//www.gnu.org/licenses/old-licenses/gpl-2.0.html اقرأ على الإنترنت].", + "version-license-info": "ميدياويكي برنامج حر، يحق لك توزيعه و/أو تعديله وفقاً لبنود رخصة جنو العمومية كما نشرتها مؤسسة البرمجيات الحرة، الإصدار الثاني أو (وفقا لاختيارك أنت) أي إصدار لاحق.\n\nهذا البرنامج يوزع على أمل أن يكون مفيداً، ولكن دون أية ضمانات، بما في ذلك ضمانات التسويق أو الملاءمة لغرض معين. انظر رخصة غنو العمومية لمزيد من التفاصيل.\n\nينبغي أن تكون قد تلقيت نسخة من رخصة جنو العمومية إذا لم يتم ذلك، اكتب إلى: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA أو [//www.gnu.org/licenses/old-licenses/gpl-2.0.html اقرأ على الإنترنت].", "version-software": "البرنامج المثبت", "version-software-product": "المنتج", "version-software-version": "النسخة", diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json index 51d034fa0b..791d60f949 100644 --- a/languages/i18n/bg.json +++ b/languages/i18n/bg.json @@ -1277,7 +1277,7 @@ "rcfilters-activefilters": "Активни филтри", "rcfilters-advancedfilters": "Разширени филтри", "rcfilters-limit-title": "Резултати за показване", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|промяна|$1 промени}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|промяна|промени}}, $2", "rcfilters-date-popup-title": "Период за търсене", "rcfilters-days-title": "Последните дни", "rcfilters-hours-title": "Последните часове", diff --git a/languages/i18n/bho.json b/languages/i18n/bho.json index 9ce3d2ccec..7889f7467b 100644 --- a/languages/i18n/bho.json +++ b/languages/i18n/bho.json @@ -903,6 +903,7 @@ "search-redirect": "($1 से अनुप्रेषित)", "search-section": "(खंड $1)", "search-category": "(श्रेणी $1)", + "search-file-match": "(फाइल सामग्री से मैच करत बा)", "search-suggest": "का राउर मतलब बा: $1", "search-rewritten": "$1 खातिर रिजल्ट। एकरे जगह $2 खातिर खोज करीं।", "search-interwiki-caption": "साथी प्रोजेक्ट सभ से रिजल्ट", @@ -912,7 +913,8 @@ "search-relatedarticle": "संबंधित", "searchrelated": "संबंधित", "searchall": "सगरी", - "showingresults": "नीचे देखावल जा रहल बा {{PLURAL:$1|'''1''' परिणाम|'''$1''' परिणाम}} #'''$2''' से शुरु होवे वाला।", + "showingresults": "नीचे #'''$2''' से शुरु होखे वाला {{PLURAL:$1|'''1''' रिजल्ट देखावल जा रहल बा|'''$1''' रिजल्ट देखावल जा रहल बाड़ें}}।", + "showingresultsinrange": "नीचे #$2 से #$3 के रेंज में से {{PLURAL:$1|1 रिजल्ट देखावल जाता|$1 रिजल्ट देखावल जात बाड़ें}}।", "search-showingresults": "{{PLURAL:$4|$1 के रिजल्ट $3|$3 में से $1 - $2 के रिजल्ट}}", "search-nonefound": "राउर खोज से मेल खात कौनों परिणाम नइखे मिलत", "powersearch-legend": "उन्नत खोज", @@ -1288,6 +1290,7 @@ "filehist-help": "ओ समय ई फाइल कइसन लउके ई देखे खातिर कौनों तारीख/समय पर क्लिक करीं।", "filehist-deleteall": "सब मिटाईं", "filehist-deleteone": "मिटाईं", + "filehist-revert": "वापस लीं", "filehist-current": "वर्तमान", "filehist-datetime": "तारीख/समय", "filehist-thumb": "चिप्पी रूप", @@ -1349,6 +1352,7 @@ "pageswithprop-prop": "प्रापर्टी नाँव:", "pageswithprop-submit": "जाईं", "doubleredirects": "दोहरा पुननिर्देशित पन्ना", + "double-redirect-fixer": "अनुप्रेषण सुधारक", "brokenredirects": "टूटल पुनर्निर्देशन पन्ना", "brokenredirects-edit": "संपादन", "brokenredirects-delete": "मिटाईं", @@ -1426,6 +1430,8 @@ "booksources": "किताबी स्रोत", "booksources-search-legend": "किताबी स्रोत के खोज", "booksources-search": "खोज", + "specialloguserlabel": "जेकरे द्वारा कइल गइल:", + "speciallogtitlelabel": "टारगेट (टाइटिल या {{ns:user}}:प्रयोगकर्ता खाती प्रयोगकर्तानाँव):", "log": "सगरी लॉग", "all-logs-page": "सगरी पब्लिक लॉग", "allpages": "सगरी पन्ना", @@ -1466,6 +1472,7 @@ "protectlogpage": "सुरक्षा लॉग", "protectlogtext": "नीचे पन्ना सुरक्षा में भइल बदलावकुल के सूची बा।\nहाल में सुरक्षित पन्नन के सूची खातिर [[Special:ProtectedPages|सुरक्षित पन्नन के सूची]] देखीं।", "protectedarticle": "\"[[$1]]\" सुरक्षित कइल गइल", + "modifiedarticleprotection": "\"[[$1]]\" खातिर सुरक्षा स्तर बदलल गइल", "protect-default": "सगरी प्रयोगकर्ता लोग के एलाऊ करीं", "restriction-edit": "संपादन करीं", "restriction-move": "स्थानांतरण", @@ -1534,6 +1541,8 @@ "contribslink": "योगदान", "blocklogpage": "निष्क्रिय खाता", "blocklogentry": "[[$1]] के ब्लॉक कइल गइल, समाप्ती के अवधि $2 $3", + "block-log-flags-nocreate": "खाता निर्माण सक्षम नइखे", + "proxyblocker": "प्रॉक्सी ब्लॉककर्ता", "movepagebtn": "पन्ना स्थांतरण करीं", "movelogpage": "स्थानांतरण लॉग", "revertmove": "पिछलका स्थिति", @@ -1562,6 +1571,7 @@ "importcantopen": "आयात फाइल के खोले में असमर्थ", "importbadinterwiki": "खराब इंटरविकि कड़ी", "importsuccess": "आयात पूरा भइल!", + "importlogpage": "आयात के लॉग", "import-logentry-upload-detail": "$1 {{PLURAL:$1|संशोधन|संशोधनसभ}} लावल गइल", "tooltip-pt-userpage": "{{GENDER:|राउर सदस्य}} पन्ना", "tooltip-pt-mytalk": "{{GENDER:|राउर}} बातचीत पन्ना", @@ -1606,19 +1616,34 @@ "tooltip-ca-nstab-special": "ई एगो खास पन्ना ह, एकर संपादन ना हो सकेला", "tooltip-ca-nstab-project": "प्रोजेक्ट पन्ना देखीं", "tooltip-ca-nstab-image": "फाइल के पन्ना देखीं", + "tooltip-ca-nstab-mediawiki": "सिस्टम सनेसा देखीं", "tooltip-ca-nstab-template": "टेम्पलेट देखीं", "tooltip-ca-nstab-category": "श्रेणी के पन्ना देखीं", + "tooltip-minoredit": "एकरा के छोट संपादन चिन्हित करीं", "tooltip-save": "जवन बदलाव कइलीं ओकरा के सहेजीं", "tooltip-preview": "जवन बदलाव कइलीं ओकर झलक देखीं। सहेजे से पहिले एकर इस्तेमाल करे के आगरह बा।", "tooltip-diff": "देखीं कि पाठ में आप का बदलाव कइले बानी", "tooltip-compareselectedversions": "एह पन्ना के चुनल गइल दू गो रिवीजन सभ में अंतर देखीं", + "tooltip-watch": "ए पन्ना के अपनी धियानसूची में जोड़ीं", "tooltip-rollback": "\"रोलबैक\" एह पन्ना पर सभसे अंतिम संपादन करे वाला संपादक के कइल बदलाव(सभ) एकही क्लिक में वापस लवटा देला", "tooltip-undo": "\"वापस लीं\" ए संपादन के पलट देला आ संपादन फार्म के झलक देखावे वाला मोड में खोलेला। ई छोट सारांश में कारण जोड़े के मोका देला।", "tooltip-summary": "संछेप में एगो सारांश लिखीं", "simpleantispam-label": "स्पैम-बिरोधी रोक (Anti-spam check)\nएके मत भरीं!", + "pageinfo-title": "\"$1\" खातिर जानकारी", + "pageinfo-header-basic": "बेसिक जानकारी", "pageinfo-header-edits": "संपादन इतिहास", + "pageinfo-header-restrictions": "पन्ना सुरक्षा", + "pageinfo-display-title": "टाइटिल जवन देखाई पड़ी", + "pageinfo-default-sort": "डिफॉल्ट सॉर्ट कुंजी", "pageinfo-length": "पन्ना लंबाई (बाइट में)", "pageinfo-article-id": "पन्ना आइडी", + "pageinfo-language": "पन्ना के सामग्री के भाषा", + "pageinfo-content-model": "पन्ना सामग्री के मॉडल", + "pageinfo-robot-policy": "रोबोट द्वारा इंडेक्सिंग", + "pageinfo-robot-index": "एलाऊ बा", + "pageinfo-watchers": "पन्ना पर धियान रखे वाला लोग के संख्या", + "pageinfo-few-watchers": "$1 से कम धियान रखे {{PLURAL:$1|वाला|वाला लोग}}", + "pageinfo-redirects-name": "एह पन्ना पर आवे वाला अनुप्रेषणन के संख्या", "pageinfo-subpages-name": "एह पन्ना के उपपन्ना संख्या", "pageinfo-firstuser": "पन्ना बनावेवाला", "pageinfo-firsttime": "पन्ना बनावे के तारीख", @@ -1626,10 +1651,16 @@ "pageinfo-lasttime": "सभसे नया संपादन के तारीख", "pageinfo-edits": "कुल संपादन गिनती", "pageinfo-authors": "कुल अलग-अलग संपादकन के गिनती", + "pageinfo-recent-edits": "हाल के संपादन संख्या (पछिला $1 में)", + "pageinfo-recent-authors": "हाल के बिभिन्न संपादक लोग के संख्या", "pageinfo-magic-words": "जादुई शब्द {{{{PLURAL:$1||शब्द|शब्द}}}} ($1)", "pageinfo-toolboxlink": "पन्ना से जुड़ल जानकारी", + "pageinfo-contentpage": "सामग्री पन्ना के रूप में गिनती वाला", + "pageinfo-contentpage-yes": "हँऽ", + "patrol-log-page": "जाँच के लॉग", "previousdiff": "← पुरान संपादन", "nextdiff": "नया संपादन →", + "widthheightpage": "$1 × $2, $3 {{PLURAL:$3|पन्ना}}", "file-info-size": "$1 × $2 पिक्सेल, फाइल साइज: $3, MIME टाइप: $4", "file-nohires": "ए से उच्च गुणवत्ता उपलब्ध नइखे।", "svg-long-desc": "एसवीजी फाइल, नॉमिनली $1 x $2 पिक्सल, फाइल के आकार: $3", @@ -1678,6 +1709,7 @@ "autoredircomment": "पन्ना [[$1]] पर अनुप्रेषित कइल गइल", "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|बात करीं]])", "version-no-ext-name": "[अज्ञात नाम]", + "redirect-summary": "ई बिसेस पन्ना कौनों फाइल (जबकि फाइलनाँव दिहल होखे), पन्ना (रिवीजन आइडी या पन्ना आइडी दिहल होखे) या, प्रयोगकर्ता पन्ना (प्रयोगकर्ता आइडी दिहल होखे), या लॉग एंट्री (लॉग आइडी दिहल होखे) अनुप्रेषित करी। इस्तेमाल: [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]], या [[{{#Special:Redirect}}/logid/186]].", "fileduplicatesearch": "नकल प्रति फाइल खोजीं", "specialpages": "खास पन्ना", "specialpages-group-maintenance": "रखरखाव रिपोर्ट", @@ -1689,14 +1721,21 @@ "specialpages-group-wiki": "डेटा अउर औजार", "tag-filter": "[[Special:Tags|टैग]] छननी:", "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|टैग|टैग कुल}}]]: $2)", + "tags-active-yes": "हँऽ", + "tags-active-no": "ना", + "tags-hitcount": "$1 {{PLURAL:$1|बदलाव}}", "logentry-delete-delete": "$1 द्वारा पन्ना $3 {{GENDER:$2|हटा}} दिहल गइल", + "logentry-delete-revision": "$1 पन्ना $3 पर {{PLURAL:$5|रिवीजन|$5 रिवीजन सभ}} के विजिबिलिटी {{GENDER:$2|बदललें|बदलली}}: $4", "revdelete-restricted": "प्रबंधक पर प्रतिबंध लागू", "revdelete-unrestricted": "प्रबंधक पर से प्रतिबंध समाप्त", "logentry-move-move": "$1 पन्ना $3 के $4 पर {{GENDER:$2|स्थानांतरण कइलें}}", + "logentry-move-move-noredirect": "$1 {{GENDER:$2|द्वारा}} बिना अनुप्रेषण छोड़ले $3 पन्ना के $4 पर स्थानांतरण कइल गइल", + "logentry-move-move_redir": "$1 पन्ना $3 के $4 पर अनुप्रेषण के ऊपर स्थानांतरण {{GENDER:$2|कइलें|कइली}}", + "logentry-patrol-patrol-auto": "पन्ना $3 के रिवीजन $4 $1 द्वारा ऑटोमेटिक {{GENDER:$2|जाँचल चिन्हित कइल गइल}}", "logentry-newusers-create": "खाता $1 {{GENDER:$2|बनावल गइल}}", "logentry-upload-upload": "$1 {{GENDER:$2|अपलोड कइलें}} $3", "searchsuggest-search": "{{SITENAME}} में खोजीं", - "duration-days": "$1 दिन", + "duration-days": "$1 {{PLURAL:$1|दिन}}", "expandtemplates": "टेम्पलेट बिस्तार", "mediastatistics": "मीडिया सांख्यिकी" } diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json index 399f7fa11a..00ca8a77f4 100644 --- a/languages/i18n/bn.json +++ b/languages/i18n/bn.json @@ -1325,7 +1325,7 @@ "rcfilters-activefilters": "সক্রিয় ছাঁকনিসমূহ", "rcfilters-advancedfilters": "উন্নত ছাঁকনি", "rcfilters-limit-title": "যেসব ফলাফল দেখাবে", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|পরিবর্তন|$1টি পরিবর্তন}}, $2", + "rcfilters-limit-and-date-label": "$1টি {{PLURAL:$1|পরিবর্তন}}, $2", "rcfilters-date-popup-title": "অনুসন্ধানের সময়কাল", "rcfilters-days-title": "সাম্প্রতিক দিন", "rcfilters-hours-title": "সাম্প্রতিক ঘণ্টা", @@ -1438,7 +1438,7 @@ "rcfilters-watchlist-showupdated": "পরিবর্তন যখন ঘটেছে তখন থেকে যে পাতাগুলি আপনি এখনো দেখেননি তা মোটা চিহ্নসহ গাঢ় করে দেখানো হয়েছে।", "rcfilters-preference-label": "সাম্প্রতিক পরিবর্তনের উন্নত সংস্করণটি লুকান", "rcfilters-preference-help": "২০১৭-এর পুনঃনকশাকৃত ইন্টারফেস এবং তখন পর্যন্ত ও তখন থেকে যোগ করা সকল সরঞ্জামে ফেরত নিবে।", - "rcfilters-target-page-placeholder": "একটি পাতার নাম লিখুন", + "rcfilters-target-page-placeholder": "একটি পাতার নাম (বা বিষয়শ্রেণী) লিখুন", "rcnotefrom": "$2টা থেকে সংঘটিত পরিবর্তনগুলি (সর্বোচ্চ $1টি দেখানো হয়েছে)।", "rclistfromreset": "তারিখ নির্বাচন পুনঃস্থাপন করুন", "rclistfrom": "$2, $3 তারিখের পর সংঘটিত নতুন পরিবর্তনগুলো দেখাও", @@ -3476,7 +3476,7 @@ "version-poweredby-others": "অন্যান্য", "version-poweredby-translators": "translatewiki.net অনুবাদকগণ", "version-credits-summary": "[[Special:Version|মিডিয়াউইকি]] সফটওয়্যারে অবদানের জন্য আমরা এই ব্যক্তিকে স্বীকৃতি দিতে চাই।", - "version-license-info": "মিডিয়াউইকি একটি উন্মুক্ত সফটওয়্যার; আপনি এটি পুনঃবিতরণ করতে পারবেন এবং/অথবা সম্পাদনা করতে পারবেন, এক্ষেত্রে ফ্রি সফটওয়্যার ফাউন্ডেশনের প্রকাশিত গনু জেনারেল পাবলিক লাইসেন্সের ২য় অথবা সাম্প্রতিকতম কোনো সংস্করণ মেনে চলতে হবে। \n\nমিডিয়াউইকি এই আশায় বিতরণ করা হয়ে থাকে যে এটি সকলের উপকারে আসবে, কিন্তু এক্ষেত্রে কোনো লিখিত অঙ্গীকার দেয়া হয় না, এমনকি ব্যবসাযোগ্যতা বা বিশেষ কোনো কার্যক্ষেত্রে ব্যবহারের জন্য এটি উপযুক্ত কি না, এ নিয়ে পরোক্ষ অঙ্গীকারও দেয়া হয় না। বিস্তারিত জানতে গনু জেনারেল পাবলিক লাইসেন্স দেখুন। \n\nএই সফটওয়্যারের সাথে [{{SERVER}}{{SCRIPTPATH}}/COPYING গনু জেনারেল পাবলিক লাইসেন্সের একটি প্রতিলিপি] থাকার কথা; যদি আপনি না পেয়ে থাকেন তাহলে অনুগ্রহ করে ফ্রি সফটওয়্যার ফাউন্ডেশনকে জানান এই ঠিকানায়, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA অথবা [//www.gnu.org/licenses/old-licenses/gpl-2.0.html লাইসেন্সটি ইন্টারনেটে পড়ুন]।", + "version-license-info": "মিডিয়াউইকি একটি উন্মুক্ত সফটওয়্যার; আপনি এটি পুনঃবিতরণ করতে পারবেন এবং/অথবা সম্পাদনা করতে পারবেন, এক্ষেত্রে ফ্রি সফটওয়্যার ফাউন্ডেশনের প্রকাশিত গনু জেনারেল পাবলিক লাইসেন্সের ২য় অথবা সাম্প্রতিকতম কোনো সংস্করণ মেনে চলতে হবে। \n\nমিডিয়াউইকি এই আশায় বিতরণ করা হয়ে থাকে যে এটি সকলের উপকারে আসবে, কিন্তু এক্ষেত্রে কোনো লিখিত অঙ্গীকার দেয়া হয় না, এমনকি ব্যবসাযোগ্যতা বা বিশেষ কোনো কার্যক্ষেত্রে ব্যবহারের জন্য এটি উপযুক্ত কি না, এ নিয়ে পরোক্ষ অঙ্গীকারও দেয়া হয় না। বিস্তারিত জানতে গনু জেনারেল পাবলিক লাইসেন্স দেখুন। \n\nএই সফটওয়্যারের সাথে [{{SERVER}}{{SCRIPTPATH}}/COPYING গনু জেনারেল পাবলিক লাইসেন্সের একটি প্রতিলিপি] থাকার কথা; যদি আপনি না পেয়ে থাকেন তাহলে অনুগ্রহ করে ফ্রি সফটওয়্যার ফাউন্ডেশনকে জানান এই ঠিকানায়, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA অথবা [//www.gnu.org/licenses/old-licenses/gpl-2.0.html লাইসেন্সটি ইন্টারনেটে পড়ুন]।", "version-software": "ইনস্টলকৃত সফটওয়্যার", "version-software-product": "পণ্য", "version-software-version": "সংস্করণ", @@ -3817,7 +3817,7 @@ "limitreport-expansiondepth": "সর্বোচ্চ গভীরতা বিস্তার", "limitreport-expensivefunctioncount": "ব্যয়বহুল পার্সার ফাংশন গণনা", "expandtemplates": "টেমপ্লেট সম্প্রসারণ", - "expand_templates_intro": "এই বিশেষ পাতাটি কিছু টেক্সট গ্রহণ করে এবং এর ভেতরের সব টেম্পলেট বারংবার সম্প্রসারিত করে।\nএছাড়াও এটি\n{{#language:...}}-এর মত পার্সার ফাংশন,\n{{CURRENTDAY}}-এর মত ভ্যারিয়েবল\nমোটকথা দ্বিতীয় বন্ধনীর মধ্যে অবস্থিত সবকিছুকেই সম্প্রসারিত করতে পারে।", + "expand_templates_intro": "এই বিশেষ পাতাটি কিছু উইকিটেক্সট গ্রহণ করে এবং এর ভেতরের সব টেমপ্লেট বারংবার সম্প্রসারিত করে।\nএছাড়াও এটি\n{{#language:...}}-এর মত পার্সার ফাংশন,\n{{CURRENTDAY}}-এর মত ভ্যারিয়েবল\nমোটকথা দ্বিতীয় বন্ধনীর মধ্যে অবস্থিত সবকিছুকেই সম্প্রসারিত করতে পারে।", "expand_templates_title": "প্রাতিবেশিক শিরোনাম, {{FULLPAGENAME}}, ইত্যাদির জন্য:", "expand_templates_input": "ইনপুটের জন্য উইকিলেখা:", "expand_templates_output": "ফলাফল", diff --git a/languages/i18n/ca.json b/languages/i18n/ca.json index 3fcf23c83b..023e5f2e38 100644 --- a/languages/i18n/ca.json +++ b/languages/i18n/ca.json @@ -724,6 +724,7 @@ "yourtext": "El vostre text", "storedversion": "Versió emmagatzemada", "editingold": "'''AVÍS: Esteu editant una revisió desactualitzada de la pàgina.\nSi la deseu, es perdran els canvis que hàgiu fet des de llavors.'''", + "unicode-support-fail": "Sembla que el vostre navegador no és compatible amb Unicode. Com que n’és necessari per a modificar les pàgines, la vostra edició no s’ha desat.", "yourdiff": "Diferències", "copyrightwarning": "Si us plau, tingueu en compte que totes les contribucions per al projecte {{SITENAME}} es consideren com a publicades sota els termes de la llicència $2 (vegeu-ne més detalls a $1). Si no desitgeu la modificació i distribució lliure dels vostres escrits sense el vostre consentiment, no els poseu ací.
    \nA més a més, en enviar el vostre text, doneu fe que és vostra l'autoria, o bé de fonts en el domini públic o recursos lliures similars. Heu de saber que aquest '''no''' és el cas de la majoria de pàgines que hi ha a Internet.\n'''No feu servir textos amb drets d'autor sense permís!'''", "copyrightwarning2": "Si us plau, tingueu en compte que totes les contribucions al projecte {{SITENAME}} poden ser corregides, alterades o esborrades per altres usuaris. Si no desitgeu la modificació i distribució lliure dels vostres escrits sense el vostre consentiment, no els poseu ací.
    \nA més a més, en enviar el vostre text, doneu fe que és vostra l'autoria, o bé de fonts en el domini públic o altres recursos lliures similars (consulteu $1 per a més detalls).\n'''No feu servir textos amb drets d'autor sense permís!'''", @@ -1234,6 +1235,7 @@ "right-siteadmin": "Blocar i desblocar la base de dades", "right-override-export-depth": "Exportar pàgines incloent aquelles enllaçades fins a una fondària de 5", "right-sendemail": "Enviar missatges de correu electrònic a altres usuaris", + "right-sendemail-new-users": "Envia un correu electrònic als usuaris amb cap acció registrada", "right-managechangetags": "Crear, activar i desactivar [[Special:Tags|etiquetes]]", "right-applychangetags": "Aplica les [[Special:Tags|etiquetes]] juntament amb els canvis propis", "right-changetags": "Afegeix i suprimeix [[Special:Tags|etiquetes]] en revisions individuals i entrades de registre", @@ -1342,13 +1344,14 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (vegeu també la [[Special:NewPages|llista de pàgines noves]])", "recentchanges-legend-plusminus": "(''±123'')", "recentchanges-submit": "Mostra", + "rcfilters-tag-remove": "Suprimeix «$1»", "rcfilters-legend-heading": "Llista d'abreviatures:", "rcfilters-other-review-tools": "Altres eines de supervisió", "rcfilters-group-results-by-page": "Agrupa els resultats per pàgina", "rcfilters-activefilters": "Filtres actius", "rcfilters-advancedfilters": "Filtres avançats", "rcfilters-limit-title": "Resultats a mostrar", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|canvi|$1 canvis}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|canvi|canvis}}, $2", "rcfilters-date-popup-title": "Període de temps per cercar", "rcfilters-days-title": "Darrers dies", "rcfilters-hours-title": "Hores recents", @@ -1454,6 +1457,7 @@ "rcfilters-liveupdates-button-title-off": "Mostra els nous canvis al moment", "rcfilters-watchlist-markseen-button": "Marca tots els canvis com a vistos", "rcfilters-watchlist-edit-watchlist-button": "Editeu la vostra llista de pàgines seguides", + "rcfilters-watchlist-showupdated": "Els canvis fets en pàgines que no heu visitat des que s'efectuaren apareixen en negreta amb un punt sòlid al costat.", "rcfilters-preference-label": "Amaga la versió millorada de Canvis recents", "rcfilters-target-page-placeholder": "Escriviu el nom d’una pàgina (o d’una categoria)", "rcnotefrom": "A sota hi ha {{PLURAL:$5|el canvi|els canvis}} a partir de $3, $4 (fins a $1).", diff --git a/languages/i18n/ckb.json b/languages/i18n/ckb.json index 59e0b3749b..0c88b3f61e 100644 --- a/languages/i18n/ckb.json +++ b/languages/i18n/ckb.json @@ -706,7 +706,7 @@ "page_first": "یەکەمین", "page_last": "دوایین", "histlegend": "ھەڵبژاردنی جیاوازی: پیاچوونەوەکان بۆ ھەڵسەنگاندن دیاری بکە و ئینتەر یان دوگمەکەی خوارەوە لێبدە.
    \nڕێنوێنی: '''({{int:cur}})''' = جیاوازی لەگەڵ دوایین پیاچوونەوە، '''({{int:last}})''' = جیاوازی لەگەڵ پیاچوونەوەی پێشووی، '''{{int:minoreditletter}}''' = دەستکاریی بچووک.", - "history-fieldset-title": "گەشتی مێژوو", + "history-fieldset-title": "گەڕان بەدوای بەسەرداچوونەوەکان", "history-show-deleted": "تەنیا پێداچوونەوە سڕاوەکان", "histfirst": "کۆنترین", "histlast": "نوێترین", @@ -2651,6 +2651,7 @@ "autosumm-blank": "پەڕەکەی واڵا کردەوە", "autosumm-replace": "«$1»ی لە جێی ناوەرۆک دانا", "autoredircomment": "ڕەوانە کرا بۆ [[$1]]", + "autosumm-removed-redirect": "ڕەوانەکەرەکەی بۆ [[$1]] داندرا بوو لابرد", "autosumm-new": "پەڕەی دروست کرد بە «$1»ەوە", "autosumm-newblank": "پەڕەی واڵای دروست کرد", "size-bytes": "$1 بایت", diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json index 210122458d..08e9d1ed0a 100644 --- a/languages/i18n/cs.json +++ b/languages/i18n/cs.json @@ -1325,7 +1325,7 @@ "rcfilters-activefilters": "Aktivní filtry", "rcfilters-advancedfilters": "Pokročilé filtry", "rcfilters-limit-title": "Zobrazené výsledky", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|změna|$1 změny|$1 změn}}, $2", + "rcfilters-limit-and-date-label": "{{PLURAL:$1|Jedna změna|$1 změny|$1 změn}}, $2", "rcfilters-date-popup-title": "Hledané časové období", "rcfilters-days-title": "Poslední dny", "rcfilters-hours-title": "Poslední hodiny", diff --git a/languages/i18n/da.json b/languages/i18n/da.json index 94e447255c..1103592b87 100644 --- a/languages/i18n/da.json +++ b/languages/i18n/da.json @@ -65,7 +65,8 @@ "BoBrandt", "R12ntech", "Joedalton", - "EeveeSylveon" + "EeveeSylveon", + "Kenn.jensen" ] }, "tog-underline": "Understreg henvisninger:", @@ -79,7 +80,7 @@ "tog-showtoolbar": "Vis værktøjslinje til redigering", "tog-editondblclick": "Redigér sider med dobbeltklik", "tog-editsectiononrightclick": "Redigér afsnit ved at højreklikke på deres titler", - "tog-watchcreations": "Føj sider, jeg opretter, og filer, jeg lægger op, til min overvågningsliste", + "tog-watchcreations": "Føj sider jeg opretter og filer jeg lægger op, til min overvågningsliste", "tog-watchdefault": "Føj sider og filer, jeg redigerer, til min overvågningsliste", "tog-watchmoves": "Føj sider og filer, jeg flytter, til min overvågningsliste", "tog-watchdeletion": "Føj sider og filer, jeg sletter, til min overvågningsliste", diff --git a/languages/i18n/es-formal.json b/languages/i18n/es-formal.json index 71aff3700b..e62887fe6f 100644 --- a/languages/i18n/es-formal.json +++ b/languages/i18n/es-formal.json @@ -6,7 +6,8 @@ "Fitoschido", "Macofe", "MarcoAurelio", - "XanaG" + "XanaG", + "La Mantis" ] }, "tog-underline": "Subrayado de enlaces:", @@ -86,13 +87,13 @@ "newwindow": "(se abre en una ventana nueva)", "cancel": "Cancelar", "moredotdotdot": "Más…", - "morenotlisted": "Esta lista no está completa.", + "morenotlisted": "Esta lista puede estar incompleta.", "mypage": "Página", "mytalk": "Discusión", - "anontalk": "Discusión para esta IP", + "anontalk": "Discusión", "navigation": "Navegación", "and": " y", - "faq": "PP. FF.", + "faq": "Preguntas frecuentes", "actions": "Acciones", "namespaces": "Espacios de nombres", "variants": "Variantes", @@ -148,7 +149,7 @@ "versionrequired": "Se necesita por lo menos la versión $1 de MediaWiki", "ok": "Aceptar", "retrievedfrom": "Obtenido de «$1»", - "youhavenewmessages": "Tiene usted $1 ($2).", + "youhavenewmessages": "{{PLURAL:$3|Tiene}} $1 ($2).", "youhavenewmessagesmulti": "Tienes mensajes nuevos en $1", "editsection": "editar", "editold": "editar", @@ -247,7 +248,7 @@ "nbytes": "$1 {{PLURAL:$1|byte|bytes}}", "emailuser": "Enviar un correo electrónico a este usuario", "addedwatchtext": "La página «[[:$1]]» ha sido añadida a su [[Special:Watchlist|lista de seguimiento]]. Los cambios futuros en esta página y en su página de discusión asociada se indicarán ahí, y la página aparecerá '''en negritas''' en la [[Special:RecentChanges|lista de cambios recientes]] para hacerla más fácil de detectar.\n\nCuando quiera eliminar la página de su lista de seguimiento, presione «Dejar de vigilar» en el menú.", - "removedwatchtext": "La página «[[:$1]]» ha sido eliminada de su [[Special:Watchlist|lista de seguimiento]].", + "removedwatchtext": "Se han eliminado «[[:$1]]» y su página de discusión de tu [[Special:Watchlist|lista de seguimiento]].", "confirmdeletetext": "Está a punto de borrar una página junto con su historial.\nPor favor confirme que desea realizar esto, que entiende las consecuencias y que está realizando esta acción de acuerdo con las [[{{MediaWiki:Policy-url}}|políticas]]", "deletedtext": "\"$1\" ha sido borrado.\nVea $2 para un registro de los borrados recientes.", "rollbacklink": "revertir", @@ -261,15 +262,15 @@ "contribslink": "contribs", "articleexists": "Ya existe una página con ese nombre, o el nombre que ha escogido no es válido.\nPor favor, elija otro nombre.", "thumbnail-more": "Aumentar", - "tooltip-pt-userpage": "Su página de usuario", - "tooltip-pt-mytalk": "Su página de discusión", - "tooltip-pt-preferences": "Sus preferencias", + "tooltip-pt-userpage": "Su página de {{GENDER:|usuario|usuaria}}", + "tooltip-pt-mytalk": "{{GENDER:|Su}} página de discusión", + "tooltip-pt-preferences": "{{GENDER:|Sus}} preferencias", "tooltip-pt-watchlist": "La lista de páginas cuyos cambios usted vigila", - "tooltip-pt-mycontris": "Lista de sus contribuciones", + "tooltip-pt-mycontris": "Una lista de {{GENDER:|sus}} contribuciones", "tooltip-pt-login": "Le invitamos a que se registre, aunque no es obligatorio", "tooltip-pt-createaccount": "Le invitamos a que cree una cuenta de usuario e inicie sesión, aunque ello no es obligatorio.", "tooltip-ca-talk": "Discusión acerca del artículo", - "tooltip-ca-edit": "Usted puede editar esta página. Por favor, use el botón de previsualización antes de grabar.", + "tooltip-ca-edit": "Editar esta página", "tooltip-ca-history": "Versiones anteriores de esta página y sus autores", "tooltip-ca-watch": "Añadir esta página a tu lista de seguimiento", "tooltip-ca-unwatch": "Quitar esta página de su lista de seguimiento", @@ -290,7 +291,7 @@ "tooltip-t-print": "Versión imprimible de esta página", "tooltip-t-permalink": "Enlace permanente a esta versión de la página", "tooltip-ca-nstab-main": "Ver el artículo", - "tooltip-ca-nstab-special": "Esta es una página especial, usted no puede modificar la página en sí", + "tooltip-ca-nstab-special": "Esta es una página especial y no puede editarse", "tooltip-save": "Guarde sus cambios", "tooltip-preview": "Vista previa de sus cambios, por favor use esto antes de guardar", "tooltip-diff": "Mostrar los cambios que ha introducido en el texto.", diff --git a/languages/i18n/es.json b/languages/i18n/es.json index c8b4152ad5..7047aebbcf 100644 --- a/languages/i18n/es.json +++ b/languages/i18n/es.json @@ -524,7 +524,7 @@ "filereadonlyerror": "No se puede modificar el archivo \"$1\" porque el repositorio de archivos \"$2\" es de solo lectura.\n\nEl administrador del sistema que lo ha bloqueado ofrece esta explicación: \"$3\".", "invalidtitle-knownnamespace": "El título con el espacio de nombres «$2» y el texto «$3» no es válido", "invalidtitle-unknownnamespace": "El título con el espacio de nombres desconocido (n.º $1) y el texto «$2» no es válido", - "exception-nologin": "No has iniciado sesión", + "exception-nologin": "No has accedido", "exception-nologin-text": "Necesitas acceder para ver esta página o llevar a cabo esta acción.", "exception-nologin-text-manual": "Necesitas $1 para poder ver esta página o llevar a cabo esta acción.", "virus-badscanner": "Configuración incorrecta: antivirus desconocido: $1", @@ -562,7 +562,7 @@ "nav-login-createaccount": "Acceder/crear cuenta", "logout": "Salir", "userlogout": "Salir", - "notloggedin": "No has iniciado sesión", + "notloggedin": "No has accedido", "userlogin-noaccount": "¿No tienes una cuenta?", "userlogin-joinproject": "Únete a {{SITENAME}}", "createaccount": "Crear una cuenta", @@ -1633,7 +1633,7 @@ "reuploaddesc": "Cancelar subida y volver al formulario", "upload-tryagain": "Enviar la descripción modificada del archivo", "upload-tryagain-nostash": "Enviar el archivo cargado de nuevo y la descripción modificada", - "uploadnologin": "No has iniciado sesión", + "uploadnologin": "No has accedido", "uploadnologintext": "Tienes que $1 para subir archivos.", "upload_directory_missing": "El directorio de subida de archivos ($1) no existe, y el servidor no ha podido crearlo.", "upload_directory_read_only": "El servidor web no puede escribir en el directorio de subida de archivos ($1).", @@ -2265,7 +2265,7 @@ "watchlistfor2": "Para $1 $2", "nowatchlist": "No tienes ninguna página en tu lista de seguimiento.", "watchlistanontext": "Es necesario acceder para ver o editar los elementos de tu lista de seguimiento.", - "watchnologin": "No has iniciado sesión", + "watchnologin": "No has accedido", "addwatch": "Añadir a la lista de seguimiento", "addedwatchtext": "Se han añadido «[[:$1]]» y su página de discusión a tu [[Special:Watchlist|lista de seguimiento]].", "addedwatchtext-talk": "Se han añadido «[[:$1]]» y su página asociada a tu [[Special:Watchlist|lista de seguimiento]].", diff --git a/languages/i18n/et.json b/languages/i18n/et.json index 86a9236e3d..383848a216 100644 --- a/languages/i18n/et.json +++ b/languages/i18n/et.json @@ -256,7 +256,7 @@ "policy-url": "Project:Reeglid", "portal": "Kogukonnavärav", "portal-url": "Project:Kogukonnavärav", - "privacy": "Privaatsus", + "privacy": "Andmekaitse", "privacypage": "Project:Privaatsuseeskiri", "badaccess": "Õigus puudub", "badaccess-group0": "Sul pole õigust sooritada toimingut, mida üritasid.", @@ -663,7 +663,7 @@ "userpage-userdoesnotexist": "Kasutajakontot \"$1\" pole olemas.\nPalun mõtle järele, kas soovid seda lehte luua või muuta.", "userpage-userdoesnotexist-view": "Kasutajakonto \"$1\" pole registreeritud.", "blocked-notice-logextract": "See kasutaja on praegu blokeeritud.\nAllpool on toodud viimane blokeerimislogi sissekanne:", - "clearyourcache": "Märkus: Võimalik, et pärast salvestamist tuleb muudatuste nägemiseks brauseri puhver tühjendada.\n* Firefox / Safari: Hoia all Shift-klahvi ja klõpsa Laadi uuesti või vajuta kas Ctrl-F5 või Ctrl-R (Macis ⌘-R).\n* Google Chrome: Vajuta Ctrl-Shift-R (Macis ⌘-Shift-R).\n* Internet Explorer: Hoia all Ctrl-klahvi ja klõpsa Värskenda või vajuta Ctrl-F5.\n* Opera: Mine asukohta Menüü → Seaded (Macis Opera → Eelistused) ja seejärel Privaatsus ja turvalisus → Tühjenda sirvimisandmed → Puhverdatud pildid ja failid.", + "clearyourcache": "Märkus: Võimalik, et pärast salvestamist tuleb muudatuste nägemiseks brauseri puhver tühjendada.\n* Firefox / Safari: Hoia all Shift-klahvi ja klõpsa Laadi uuesti või vajuta kas Ctrl-F5 või Ctrl-R (Macis ⌘-R).\n* Google Chrome: Vajuta Ctrl-Shift-R (Macis ⌘-Shift-R).\n* Internet Explorer: Hoia all Ctrl-klahvi ja klõpsa Värskenda või vajuta Ctrl-F5.\n* Opera: Mine asukohta Menüü → Seaded (Macis Opera → Eelistused) ja seejärel Andmekaitse ja turvalisus → Tühjenda sirvimisandmed → Puhverdatud pildid ja failid.", "usercssyoucanpreview": "'''Vihje:''' Enne salvestamist kasuta oma uue CSSi proovimiseks nuppu \"{{int:showpreview}}\".", "userjsyoucanpreview": "'''Vihje:''' Enne salvestamist kasuta oma uue JavaScripti proovimiseks nuppu \"{{int:showpreview}}\".", "usercsspreview": "'''Ära unusta, et seda versiooni sinu isiklikust stiililehest pole veel salvestatud!'''", @@ -1435,7 +1435,7 @@ "rcfilters-filter-showlinkedfrom-option-label": "Leheküljed, millele viidatakse valitud leheküljel", "rcfilters-filter-showlinkedto-label": "Näita muudatusi lehekülgedel, millel viidatakse leheküljele", "rcfilters-filter-showlinkedto-option-label": "Leheküljed, mis viitavad valitud leheküljele", - "rcfilters-target-page-placeholder": "Sisesta lehekülje pealkiri", + "rcfilters-target-page-placeholder": "Sisesta lehekülje pealkiri (või kategooria)", "rcnotefrom": "Allpool on toodud {{PLURAL:$5|muudatus|muudatused}} alates: $3, kell $4 (näidatakse kuni $1 muudatust)", "rclistfromreset": "Lähtesta kuupäeva valik", "rclistfrom": "Näita muudatusi alates: $3, kell $2", @@ -3417,7 +3417,7 @@ "version-poweredby-others": "teised", "version-poweredby-translators": "translatewiki.net-i tõlkijad", "version-credits-summary": "Tahame tunnustada järgmisi inimesi [[Special:Version|MediaWikile]] tehtud kaastöö eest.", - "version-license-info": "MediaWiki on vaba tarkvara; tohid seda taaslevitada ja/või selle põhjal teisendeid luua vastavalt Vaba Tarkvara Fondi avaldatud GNU Üldise Avaliku Litsentsi versioonis 2 või hilisemas seatud tingimustele.\n\nMediaWiki tarkvara levitatakse lootuses, et see on kasulik, aga '''igasuguse tagatiseta''', ka kaudse tagatiseta teose '''turustatavuse''' või '''müügikõlblikkuse''' kohta. Üksikasjad leiad GNU Üldisest Avalikust Litsentsist.\n\nGNU Üldise Avaliku Litsentsi [{{SERVER}}{{SCRIPTPATH}}/COPYING eksemplar] peaks selle programmiga kaasas olema; kui pole, kirjuta aadressil Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA või [//www.gnu.org/licenses/old-licenses/gpl-2.0.html loe seda võrgust].", + "version-license-info": "MediaWiki on vaba tarkvara; tohid seda taaslevitada ja/või selle põhjal teisendeid luua vastavalt Vaba Tarkvara Fondi avaldatud GNU Üldise Avaliku Litsentsi versioonis 2 või hilisemas seatud tingimustele.\n\nMediaWiki tarkvara levitatakse lootuses, et see on kasulik, aga igasuguse tagatiseta, ka kaudse tagatiseta teose turustatavuse või müügikõlblikkuse kohta. Üksikasjad leiad GNU Üldisest Avalikust Litsentsist.\n\nGNU Üldise Avaliku Litsentsi [{{SERVER}}{{SCRIPTPATH}}/COPYING eksemplar] peaks selle programmiga kaasas olema; kui pole, kirjuta aadressil Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA või [//www.gnu.org/licenses/old-licenses/gpl-2.0.html loe seda võrgust].", "version-software": "Paigaldatud tarkvara", "version-software-product": "Toode", "version-software-version": "Versioon", @@ -3759,9 +3759,9 @@ "limitreport-expansiondepth": "Suurim hõrendussügavus", "limitreport-expensivefunctioncount": "Kulukate parserifunktsioonide arv", "expandtemplates": "Mallide hõrendamine", - "expand_templates_intro": "See erilehekülg hõrendab siia sisestatud tekstis kõik mallid rekursiivselt.\nSamuti hõrendab see parserifunktsioonid nagu\n{{#language:…}} ja muutujad nagu\n{{CURRENTDAY}}.\nÕigupoolest hõrendab see kahekordsete looksulgude vahel pea kõike.", + "expand_templates_intro": "See erilehekülg hõrendab siia sisestatud vikitekstis kõik mallid rekursiivselt.\nSamuti hõrendab see parserifunktsioonid nagu\n{{#language:…}} ja muutujad nagu\n{{CURRENTDAY}}.\nÕigupoolest hõrendab see kahekordsete looksulgude vahel pea kõike.", "expand_templates_title": "Sisu pealkiri, näiteks {{FULLPAGENAME}} jaoks:", - "expand_templates_input": "Sisendtekst:", + "expand_templates_input": "Sisend (vikitekst):", "expand_templates_output": "Tulemus", "expand_templates_xml_output": "XML-väljund", "expand_templates_html_output": "HTML-toorväljund", @@ -3773,7 +3773,7 @@ "expand_templates_preview": "Eelvaade", "expand_templates_preview_fail_html": "Kuna {{GRAMMAR:inessive|{{SITENAME}}}} on toor-HTML lubatud ja osa seansiandmeid läks kaotsi, siis on JavaScripti põhiste rünnakute vastase abinõuna eelvaade peidetud.\n\nKui see eelvaatekatse on õigustatud, proovi palun uuesti.\nKui see ikka ei tööta, proovi [[Special:UserLogout|logida välja]] ja tagasi sisse ning kontrolli, kas brauser lubab sellest võrgukohast küpsiseid.", "expand_templates_preview_fail_html_anon": "Kuna {{GRAMMAR:inessive|{{SITENAME}}}} on toor-HTML lubatud ja sa pole sisse logitud, siis on JavaScripti põhiste rünnakute vastase abinõuna eelvaade peidetud.\n\nKui see eelvaatekatse on õigustatud, [[Special:UserLogin|logi]] palun sisse ja proovi uuesti.", - "expand_templates_input_missing": "Sul tuleb tekst sisestada.", + "expand_templates_input_missing": "Sul tuleb sisestada vikitekst.", "pagelanguage": "Lehekülje keele valik", "pagelang-name": "Lehekülg", "pagelang-language": "Keel", diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json index 55bcbb08d3..7b57dba93b 100644 --- a/languages/i18n/eu.json +++ b/languages/i18n/eu.json @@ -1317,7 +1317,7 @@ "rcfilters-activefilters": "Iragazki aktiboak", "rcfilters-advancedfilters": "Iragazki aurreratuak", "rcfilters-limit-title": "Erakusteko emaitzak", - "rcfilters-limit-and-date-label": "{{PLURAL:aldaketa|$1|$1 aldaketa}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|aldaketa|aldaketak}}, $2", "rcfilters-date-popup-title": "Bilatzeko denbora tartea", "rcfilters-days-title": "Azken egunak", "rcfilters-hours-title": "Azken orduak", diff --git a/languages/i18n/fa.json b/languages/i18n/fa.json index 873c74f0a8..4288f6110d 100644 --- a/languages/i18n/fa.json +++ b/languages/i18n/fa.json @@ -503,7 +503,7 @@ "nosuchusershort": "هیچ کاربری با نام ''$1'' وجود ندارد.\nاملایتان را وارسی کنید.", "nouserspecified": "باید یک نام کاربری مشخص کنید.", "login-userblocked": "این کاربر بسته شده‌است. ورود به سامانه مجاز نیست.", - "wrongpassword": "گذرواژه‌ای که وارد کردید نادرست است.\nلطفاً دوباره امتحان کنید.", + "wrongpassword": "نام کاربری یا گذرواژه‌ای که وارد کردید نادرست است.\nلطفاً دوباره امتحان کنید.", "wrongpasswordempty": "گذرواژه‌ای که وارد کرده‌اید، خالی است.\nلطفاً دوباره تلاش کنید.", "passwordtooshort": "گذرواژه باید دست‌کم {{PLURAL:$1|۱ حرف|$1 حرف}} داشته باشد.", "passwordtoolong": "گذرواژه نمی تواند حروفش بیشتر از {{PLURAL:$1|۱ حرف|$1 حرف}} باشد.", @@ -1348,7 +1348,8 @@ "rcfilters-group-results-by-page": "گروه‌بندی نتایج بر اساس صفحه", "rcfilters-activefilters": "پالایه‌های فعال", "rcfilters-advancedfilters": "پالایه‌‌های پیشرفته", - "rcfilters-limit-title": "تغییرات برای نمایش دادن", + "rcfilters-limit-title": "تعداد تغییرات برای نمایش", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|تغییر|تغییر}}, $2", "rcfilters-days-title": "روزهای اخیر", "rcfilters-hours-title": "ساعت‌های اخیر", "rcfilters-days-show-days": "$1 {{PLURAL:$1|روز|روز}}", @@ -2665,6 +2666,7 @@ "import-mapping-namespace": "درون‌ریزی برای یک فضای نام:", "import-mapping-subpage": "درون‌ریزی به عنوان زیرصفحهٔ صفحهٔ:", "import-upload-filename": "نام پرونده:", + "import-upload-username-prefix": "پیشوند میان‌ویکی:", "import-comment": "توضیح:", "importtext": "لطفاً پرونده را از ویکی منبع با کمک [[Special:Export|ابزار برون‌بری]] دریافت کنید.\nسپس آن را روی دستگاه‌تان ذخیره کنید و اینجا بارگذاری نمایید.", "importstart": "در حال درون‌ریزی صفحات...", @@ -3534,7 +3536,12 @@ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|برچسب|برچسب‌ها}}]]: $2)", "tag-mw-contentmodelchange": "تغییر مدل محتوا", "tag-mw-contentmodelchange-description": "ویرایش‌هایی که [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel مدل محتوای صفحه را تغییر می‌دهند]", + "tag-mw-new-redirect": "تغییر مسیر جدید", "tag-mw-removed-redirect": "تغییرمسیر حذف شد", + "tag-mw-blank": "خالی‌کردن", + "tag-mw-blank-description": "ویرایش‌هایی که یک صفحه را خالی می‌کنند", + "tag-mw-replace": "جایگزین شد", + "tag-mw-replace-description": "ویرایش‌هایی که بیش از ۹۰ درصد صفحه را حذف می‌کنند", "tag-mw-rollback": "واگردانی", "tags-title": "برچسب‌ها", "tags-intro": "این صفحه فهرستی‌است از برچسب‌هایی که نرم‌افزار با آن‌ها ویرایش‌ها را علامت‌گذری می‌کند، به همراه معانی آن‌ها.", @@ -3807,7 +3814,7 @@ "expandtemplates": "بسط دادن الگوها", "expand_templates_intro": "این صفحهٔ ویژه متنی را دریافت کرده و تمام الگوهای به‌کاررفته در آن را به طور بازگشتی بسط می‌دهد. همچنین تابع‌های تجزیه چون {{#language:…}} و متغیرهایی چون {{CURRENTDAY}} را هم بسط می‌دهد — در واقع تقریباً هرچه را که داخل دوآکولاد باشد. این کار با صدازدن مرحلهٔ تجزیهٔ مربوط در خود مدیاویکی صورت می‌گیرد.", "expand_templates_title": "عنوان موضوع، برای {{FULLPAGENAME}} و غیره:", - "expand_templates_input": "متن ورودی:", + "expand_templates_input": "ویکی‌متن ورودی:", "expand_templates_output": "نتیجه", "expand_templates_xml_output": "خروجی XML", "expand_templates_html_output": "خروجی اچ‌تی‌ام‌ال خام", diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json index bf75153003..738d65f653 100644 --- a/languages/i18n/fi.json +++ b/languages/i18n/fi.json @@ -563,11 +563,11 @@ "botpasswords-insert-failed": "Botin nimen \"$1\" lisääminen epäonnsitui. Onko se jo lisätty?", "botpasswords-update-failed": "Botin nimen \"$1\" päivittäminen epäonnistui. Onko se poistettu?", "botpasswords-created-title": "Bottisalasana luotu", - "botpasswords-created-body": "Bottisalasana käyttäjän \"$2\" bottinimelle \"$1\" luotiin.", + "botpasswords-created-body": "Bottisalasana {{GENDER:$2|käyttäjän}} \"$2\" bottinimelle \"$1\" luotiin.", "botpasswords-updated-title": "Bottisalasana päivitetty", - "botpasswords-updated-body": "Bottisalasana käyttäjän \"$2\" bottinimelle \"$1\" päivitettiin.", + "botpasswords-updated-body": "Bottisalasana {{GENDER:$2|käyttäjän}} \"$2\" bottinimelle \"$1\" päivitettiin.", "botpasswords-deleted-title": "Bottisalasana poistettu", - "botpasswords-deleted-body": "Bottisalasana käyttäjän \"$2\" bottinimelle \"$1\" poistettiin.", + "botpasswords-deleted-body": "Bottisalasana {{GENDER:$2|käyttäjän}} \"$2\" bottinimelle \"$1\" poistettiin.", "botpasswords-newpassword": "Uusi salasana kirjautumiseen käyttäjällä $1 on $2. Säilytä tämä myöhempää käyttöä varten.
    (Vanhoilla boteilla, jotka vaativat kirjautumisnimen olevan sama kuin lopullinen käyttäjänimi, voit myös käyttää nimeä $3 ja salasanaa $4.)", "botpasswords-no-provider": "BotPasswordsSessionProvider ei ole saatavilla.", "botpasswords-restriction-failed": "Bottisalasanan rajoitukset estävät tämän sisäänkirjautumisen.", @@ -1328,7 +1328,7 @@ "rcfilters-activefilters": "Aktiiviset suodattimet", "rcfilters-advancedfilters": "Kehittyneet suodattimet", "rcfilters-limit-title": "Näytettävät tulokset", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|muutos|$1 muutosta}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|muutos|muutosta}}, $2", "rcfilters-date-popup-title": "Aikajakso hakua varten", "rcfilters-days-title": "Viimeisimmät päivät", "rcfilters-hours-title": "Viimeisimmät tunnit", @@ -1442,7 +1442,7 @@ "rcfilters-watchlist-showupdated": "Muutokset sivuihin, joilla et ole vieraillut sen jälkeen kun muutokset on tehty, on lihavoitu ja värimerkitty.", "rcfilters-preference-label": "Piilota tuoreiden muutosten parannettu versio", "rcfilters-preference-help": "Peruuttaa vuoden 2017 käyttöliittymän uudistuksen ja kaikki sen jälkeen lisätyt työkalut.", - "rcfilters-target-page-placeholder": "Anna sivun nimi", + "rcfilters-target-page-placeholder": "Anna sivun nimi (tai luokka)", "rcnotefrom": "Alla ovat muutokset $3, $4 lähtien. (Enintään $1 näytetään.)", "rclistfromreset": "Tyhjennä ajankohdan valinta", "rclistfrom": "Näytä uudet muutokset $3 kello $2 alkaen", @@ -1765,6 +1765,7 @@ "filerevert-submit": "Suorita palauttaminen", "filerevert-success": "'''[[Media:$1|$1]]''' on palautettu takaisin [$4 versioon, joka luotiin $2 kello $3].", "filerevert-badversion": "Tiedostosta ei ole luotu versiota kyseisellä ajan hetkellä.", + "filerevert-identical": "Tiedoston nykyinen versio on jo sama kuin valittu.", "filedelete": "Poistetaan tiedosto $1", "filedelete-legend": "Poista tiedosto", "filedelete-intro": "Olet poistamassa tiedoston '''[[Media:$1|$1]]''' ja lisäksi koko sen muokkaushistorian.", @@ -2608,6 +2609,7 @@ "import-mapping-namespace": "Tuonti nimiavaruuteen:", "import-mapping-subpage": "Tuonti seuraavan sivun alasivuiksi:", "import-upload-filename": "Tiedostonimi:", + "import-upload-username-prefix": "Interwiki-etuliite:", "import-comment": "Kommentti:", "importtext": "Vie sivuja lähdewikistä käyttäen [[Special:Export|vientityökalua]].\nTallenna tiedot koneellesi ja tuo ne tällä sivulla.", "importstart": "Tuodaan sivuja...", @@ -2616,6 +2618,7 @@ "imported-log-entries": "Tuotu $1 {{PLURAL:$1|lokitapahtuma|lokitapahtumaa}}.", "importfailed": "Tuonti epäonnistui: $1", "importunknownsource": "Tuntematon lähdetyyppi", + "importnoprefix": "Interwiki-etuliitettä ei syötetty", "importcantopen": "Tuontitiedoston avaus epäonnistui", "importbadinterwiki": "Kelpaamaton wikienvälinen linkki", "importsuccess": "Tuonti onnistui!", @@ -2859,6 +2862,7 @@ "newimages-legend": "Suodatin", "newimages-label": "Tiedostonimi (tai osa siitä)", "newimages-user": "IP-osoite tai käyttäjänimi:", + "newimages-newbies": "Näytä vain uusien käyttäjien muokkaukset", "newimages-showbots": "Näytä bottien tekemät tallennukset", "newimages-hidepatrolled": "Piilota tarkastetut tiedostotallennukset", "newimages-mediatype": "Median tyyppi:", @@ -3391,7 +3395,7 @@ "version-poweredby-others": "muut", "version-poweredby-translators": "translatewiki.net-kääntäjät", "version-credits-summary": "Haluamme kiittäen mainita seuraavat henkilöt, jotka ovat osallistuneet [[Special:Version|MediaWiki-ohjelmiston]] kehittämiseen.", - "version-license-info": "MediaWiki on vapaa ohjelmisto – voit levittää sitä ja/tai muokata sitä Free Software Foundationin GNU General Public Licensen ehdoilla, joko version 2 tai halutessasi minkä tahansa myöhemmän version mukaisesti.\n\nMediaWikiä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL-lisenssistä lisää yksityiskohtia.\n\nSinun olisi pitänyt saada [{{SERVER}}{{SCRIPTPATH}}/COPYING kopio GNU General Public Licensestä] tämän ohjelman mukana. Jos et saanut kopiota, kirjoita siitä osoitteeseen Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA tai [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lue se Internetissä].", + "version-license-info": "MediaWiki on vapaa ohjelmisto; voit levittää sitä ja/tai muokata sitä Free Software Foundationin GNU General Public Licensen ehdoilla, joko version 2 tai halutessasi minkä tahansa myöhemmän version mukaisesti.\n\nMediaWikiä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL-lisenssistä lisää yksityiskohtia.\n\nSinun olisi pitänyt saada [{{SERVER}}{{SCRIPTPATH}}/COPYING kopio GNU General Public Licensestä] tämän ohjelman mukana. Jos et saanut kopiota, kirjoita siitä osoitteeseen Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA tai [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lue se Internetissä].", "version-software": "Asennettu ohjelmisto", "version-software-product": "Tuote", "version-software-version": "Versio", @@ -3448,7 +3452,7 @@ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Merkkaus|Merkkaukset}}]]: $2)", "tag-mw-contentmodelchange": "sisältömallin muutos", "tag-mw-contentmodelchange-description": "Muokkaukset, jotka [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel muuttavat sivun sisältömallia]", - "tag-mw-new-redirect": "Uusi uudelleenohjaus", + "tag-mw-new-redirect": "Uusi ohjaus", "tag-mw-new-redirect-description": "Muokkaukset, jotka luovat uuden uudelleenohjauksen tai muuttavat sivun uudelleenohjaukseksi", "tag-mw-removed-redirect": "Ohjaus on poistettu", "tag-mw-removed-redirect-description": "Muokkaukset, jotka muuttavat olemassa olevan uudelleenohjauksen ei-uudelleenohjaukseksi", @@ -3456,10 +3460,10 @@ "tag-mw-changed-redirect-target-description": "Muokkaukset, jotka muuttavat uudelleenohjauksen kohdetta", "tag-mw-blank-description": "Muokkaukset, jotka tyhjentävät sivun", "tag-mw-replace": "Korvattu", - "tag-mw-replace-description": "Muokkaukset, jotka poistavat yli 90% sivun sisällöstä", - "tag-mw-rollback": "Palautus", + "tag-mw-replace-description": "Muokkaukset, joissa on poistettu yli 90 % sivun sisällöstä", + "tag-mw-rollback": "Palautettu takaisin", "tag-mw-rollback-description": "Muokkaukset, jotka palauttavat edelliset muokkaukset takaisinvetolinkillä", - "tag-mw-undo": "Kumoa", + "tag-mw-undo": "Kumoaminen", "tag-mw-undo-description": "Muokkaukset, jotka kumoavat edelliset muokkaukset kumoamislinkillä", "tags-title": "Merkkaukset", "tags-intro": "Tämä sivu luetteloi ne merkkaukset (''engl.'' tags), joilla ohjelmisto voi merkitä muokkauksia, ja mitä ne tarkoittavat.", @@ -3732,7 +3736,7 @@ "expandtemplates": "Laajenna mallineet", "expand_templates_intro": "Tämä toimintosivu ottaa syötteeksi tekstiä ja laajentaa kaikki siinä olevat mallineet rekursiivisesti.\nSe myös laajentaa tuetut parserifunktiot kuten\n{{#language:...}} ja -muuttujat kuten\n{{CURRENTDAY}}.\nKäytännössä se laajentaa melkein kaiken, joka on kaksoisaaltosulkeiden sisällä.", "expand_templates_title": "Otsikko (esimerkiksi muuttujaa {{FULLPAGENAME}} varten)", - "expand_templates_input": "Teksti", + "expand_templates_input": "Syötä wikiteksti:", "expand_templates_output": "Tulos", "expand_templates_xml_output": "XML-tuloste", "expand_templates_html_output": "Raaka HTML-koodi", @@ -3744,7 +3748,7 @@ "expand_templates_preview": "Esikatselu", "expand_templates_preview_fail_html": "Koska sivustolla {{SITENAME}} on käytössä suodattamaton HTML-koodi ja koska istunnon tiedot ovat kadonneet, esikatselu on piilotettu JavaScript-hyökkäyksien torjumiseksi.\n\nJos yritit esikatsella sivua, yritä uudestaan.\nJos esikatselu ei vieläkään toimi, yritä [[Special:UserLogout|kirjautua ulos]] ja sitten kirjautua uudestaan sisään. Tarkista myös, että selaimesi sallii evästeet tältä sivustolta.", "expand_templates_preview_fail_html_anon": "Koska sivustolla {{SITENAME}} on käytössä puhdas HTML-koodi ja koska et ole kirjautunut sisään, esikatselu on piilotettu JavaScript-hyökkäyksien torjumiseksi.\n\nJos olet oikealla asialla, [[Special:UserLogin|kirjaudu sisään]] ja yritä uudestaan.", - "expand_templates_input_missing": "Sinun on annettava edes jotakin tekstiä syötteeksi.", + "expand_templates_input_missing": "Sinun on annettava ainakin jotakin wikitekstiä syötteeksi.", "pagelanguage": "Sivun kielen vaihto", "pagelang-name": "Sivu", "pagelang-language": "Kieli", @@ -3964,11 +3968,13 @@ "restrictionsfield-label": "Sallitut IP-alueet:", "revid": "versio $1", "pageid": "sivun tunnistenumero $1", + "rawhtml-notallowed": "<html> komentoa ei voida käyttää normaalien sivujen ulkopuolella.", "gotointerwiki": "Lähdössä {{GRAMMAR:elative|{{SITENAME}}}}", "gotointerwiki-invalid": "Annettu otsikko on virheellinen.", "gotointerwiki-external": "Olet lähdössä {{GRAMMAR:elative|{{SITENAME}}}} toiselle sivustolle [[$2]].\n\n'''[$1 Jatka osoitteeseen $1]'''", "undelete-cantedit": "Et voi palauttaa tätä sivua, koska sinulla ei ole oikeutta muokata tätä sivua.", "undelete-cantcreate": "Et voi palauttaa tätä sivua, koska tällä nimellä ei ole olemassaolevaa sivua eikä sinulla ole oikeutta luoda tätä sivua.", "pagedata-title": "Sivudata", + "pagedata-not-acceptable": "Vastaavaa muotoa ei löytynyt. Tuetut MIME-tyypit: $1", "pagedata-bad-title": "Virheellinen otsikko: $1." } diff --git a/languages/i18n/frp.json b/languages/i18n/frp.json index 7c2811eb11..e3d0baec1e 100644 --- a/languages/i18n/frp.json +++ b/languages/i18n/frp.json @@ -141,7 +141,7 @@ "listingcontinuesabbrev": "(suita)", "index-category": "Pâges endèxâyes", "noindex-category": "Pâges pas endèxâyes", - "broken-file-category": "Pâges avouéc des lims de fichiérs câssos", + "broken-file-category": "Pâges avouéc de lims de fichiérs câssos", "about": "A propôs", "article": "Pâge de contegnu", "newwindow": "(ôvre na fenétra novèla)", @@ -156,7 +156,7 @@ "faq": "Quèstions sovent pôses", "actions": "Accions", "namespaces": "Èspâços de noms", - "variants": "Vèrsions", + "variants": "Variantes", "navigation-heading": "Menu de navegacion", "errorpagetitle": "Fôta", "returnto": "Tornar a la pâge $1.", @@ -201,7 +201,7 @@ "redirectedfrom": "(Redirigiê dês $1)", "redirectpagesub": "Pâge de redirèccion", "redirectto": "Redirigiér vers :", - "lastmodifiedat": "Dèrriér changement de cela pâge lo $1 a $2.", + "lastmodifiedat": "Lo dèrriér changement de cela pâge est étâ fêt lo $1 a $2.", "viewcount": "Cela pâge est étâye viua {{PLURAL:$1|un côp|$1 côps}}.", "protectedpage": "Pâge protègiêe", "jumpto": "Alar vers :", @@ -222,7 +222,7 @@ "currentevents-url": "Project:Novèles", "disclaimers": "Semonces", "disclaimerpage": "Project:Semonces g·ènèrâles", - "edithelp": "Éde", + "edithelp": "Éde por lo changement", "helppage-top-gethelp": "Éde", "mainpage": "Reçua", "mainpage-description": "Reçua", @@ -321,7 +321,7 @@ "delete-hook-aborted": "Suprèssion anulâye per un’èxtension.\nNion’èxplicacion est étâye balyêe.", "no-null-revision": "Y at pas moyen de fâre na novèla vèrsion voueda por la pâge « $1 »", "badtitle": "Crouyo titro", - "badtitletext": "Lo titro de la pâge demandâye est pas justo, vouedo ou ben o est un titro entèrlengoua entèrvouiqui mâl-liyê.\nContint de sûr yon ou ben un mouél de caractèros que pôvont pas étre empleyês dedens los titros.", + "badtitletext": "Lo titro de la pâge demandâye est pas justo, vouedo, ou ben o est un titro entèrlengoua entèrvouiqui mâl-liyê.\nContint de sûr yon ou ben un mouél de caractèros que pôvont pas étre empleyês dedens los titros.", "title-invalid-empty": "Lo titro de la pâge demandâye est vouedo ou ben contint mas que lo nom d’un èspâço de noms.", "title-invalid-utf8": "Lo titro de la pâge demandâye contint na cobla UTF-8 pas justa.", "title-invalid-interwiki": "Lo titro de la pâge demandâye contint un lim entèrvouiqui que pôt pas étre empleyê dedens los titros.", @@ -395,7 +395,7 @@ "userlogin-joinproject": "Rejuegnéd {{SITENAME}}", "createaccount": "Fâre un comptio", "userlogin-resetpassword-link": "Contresegno oubliâ ?", - "userlogin-helplink2": "Éde u branchement", + "userlogin-helplink2": "Éde por lo branchement", "userlogin-loggedin": "Vos éte ja branchiê{{GENDER:$1||e}} coment {{GENDER:$1|$1}}.\nEmpleyéd lo formulèro ce-desot por vos branchiér coment un ôtr’utilisator.", "userlogin-createanother": "Fâre un ôtro comptio", "createacct-emailrequired": "Adrèce èlèctronica", @@ -571,7 +571,7 @@ "image_tip": "Fichiér apondu", "media_sample": "Ègzemplo.ogg", "media_tip": "Lim de vers un fichiér", - "sig_tip": "Voutra signatura avouéc l’horodatâjo", + "sig_tip": "Voutra signatura avouéc la dâta et l’hora", "hr_tip": "Legne plana (pas nen abusar)", "summary": "Rèsumâ :", "subject": "Chousa :", @@ -606,10 +606,10 @@ "accmailtitle": "Contresegno mandâ", "accmailtext": "Un contresegno fêt a l’hasârd por [[User talk:$1|$1]] est étâ mandâ a $2. Pôt étre changiê dessus la pâge de [[Special:ChangePassword|changement de contresegno]] aprés branchement.", "newarticle": "(Novél)", - "newarticletext": "Vos éd siuvu un lim de vers na pâge qu’ègziste p’oncor.\nPor fâre cela pâge, buchiéd voutron tèxto dedens la bouèta ce-desot (vêde la [$1 pâge d’éde] por més d’enformacions).\nSe vos éte arrevâ{{GENDER:||ye}} ique per fôta, cllicâd dessus lo boton Devant de voutron navegator.", + "newarticletext": "Vos éd siuvu un lim de vers na pâge qu’ègziste p’oncor.\nPor fâre la pâge, buchiéd voutron tèxto dedens la bouèta ce-desot (vêde la [$1 pâge d’éde] por més d’enformacions).\nSe vos éte arrevâ{{GENDER:||ye}} ique per fôta, cllicâd dessus lo boton Devant de voutron navegator.", "anontalkpagetext": "----\nO est la pâge de discussion d’un utilisator anonimo qu’at p’oncor fêt un comptio ou ben que nen emplèye pas.\nPor cen, nos devens empleyér son adrèce IP numerica por o identifiar.\nUn’adrèce IP d’ense pôt étre partagiêe per un mouél d’utilisators.\nSe vos éte {{GENDER:|un utilisator|un’utilisatrice}} anonim{{GENDER:|o|a}} et pués se vos constatâd que de comentèros que vos regârdont pas vos sont étâs adrèciês, se vos plét [[Special:CreateAccount|féte un comptio]] ou ben [[Special:UserLogin|branchiéd-vos]] por èvitar tota confusion que vint avouéc d’ôtros utilisators anonimos.", - "noarticletext": "Ora y at gins de tèxto dedens cela pâge.\nVos pouede [[Special:Search/{{PAGENAME}}|fâre na rechèrche sur cél titro]] dedens les ôtres pâges,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechèrchiér dedens los jornâls liyês]\nou ben [{{fullurl:{{FULLPAGENAME}}|action=edit}} fâre cela pâge].", - "noarticletext-nopermission": "Ora y at gins de tèxto dedens cela pâge.\nVos pouede [[Special:Search/{{PAGENAME}}|fâre na rechèrche sur cél titro]] dedens les ôtres pâges ou ben [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechèrchiér dedens los jornâls liyês], mas vos éd pas la pèrmission de fâre cela pâge.", + "noarticletext": "Ora y at gins de tèxto dedens cela pâge.\nVos pouede [[Special:Search/{{PAGENAME}}|fâre na rechèrche sur cél titro]] dens les ôtres pâges,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechèrchiér dens los jornâls liyês]\nou ben [{{fullurl:{{FULLPAGENAME}}|action=edit}} fâre cela pâge].", + "noarticletext-nopermission": "Ora y at gins de tèxto dedens cela pâge.\nVos pouede [[Special:Search/{{PAGENAME}}|fâre na rechèrche sur cél titro]] dens les ôtres pâges ou ben [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} rechèrchiér dens los jornâls liyês], mas vos éd pas la pèrmission de fâre cela pâge.", "missing-revision": "La vèrsion n° $1 de la pâge apelâye « {{FULLPAGENAME}} » ègziste pas.\n\nEn g·ènèrâl cen arreve en siuvent un lim dèpassâ d’un historico de vers na pâge qu’est étâye suprimâye.\nVos pouede trovar més de dètalys dessus lo [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} jornâl de les suprèssions].", "userpage-userdoesnotexist": "Lo comptio utilisator « $1 » est pas encartâ.\nSe vos plét, controlâd se vos voléd fâre changiér cela pâge.", "userpage-userdoesnotexist-view": "Lo comptio utilisator « $1 » est pas encartâ.", @@ -666,7 +666,7 @@ "permissionserrorstext-withaction": "Vos éd pas la pèrmission de $2 por {{PLURAL:$1|ceta rêson|cetes rêsons}} :", "contentmodelediterror": "Vos pouede pas changiér cela vèrsion, son modèlo de contegnu est $1, cen que sè difèrence du modèlo de contegnu d’ora de la pâge $2.", "recreate-moveddeleted-warn": "Atencion : vos éte aprés refâre na pâge qu’est étâye suprimâye dês devant.\n\nDemandâd-vos se fôt franc continuar son changement.\nLo jornâl de les suprèssions et des dèplacements de cela pâge est balyê ce-desot por comoditât :", - "moveddeleted-notice": "Cela pâge est étâye suprimâye.\nLo jornâl de les suprèssions et des dèplacements de cela pâge est balyê ce-desot coment rèference.", + "moveddeleted-notice": "Cela pâge est étâye suprimâye.\nLo jornâl de les suprèssions, de les protèccions et des dèplacements de la pâge est balyê ce-desot coment rèference.", "moveddeleted-notice-recent": "Dèsolâ, dês pou cela pâge est étâye suprimâye (dens les 24 hores passâyes).\nLo jornâl de les suprèssions et des dèplacements de cela pâge est balyê ce-desot coment rèference.", "log-fulllog": "Vêre lo jornâl complèt", "edit-hook-aborted": "Changement anulâ per un’èxtension.\nNion’èxplicacion est étâye balyêe.", @@ -726,7 +726,7 @@ "revisionasof": "Vèrsion en dâta du $1", "revision-info": "Vèrsion en dâta du $1 per {{GENDER:$6|$2}}$7", "previousrevision": "← Vèrsion ples vielye", - "nextrevision": "Vèrsion ples novèla →", + "nextrevision": "Vèrsion més novèla →", "currentrevisionlink": "Vèrsion d’ora", "cur": "d’ora", "next": "aprés", @@ -734,10 +734,10 @@ "page_first": "premiére", "page_last": "dèrriére", "histlegend": "Chouèx de difs : pouentâd les câses de les vèrsions a comparar et pués apoyéd dessus « Entrâ » ou ben lo boton d’avâl.
    \nLègenda : ({{int:cur}}) = difèrence avouéc la vèrsion d’ora, ({{int:last}}) = difèrence avouéc la vèrsion devant, {{int:minoreditletter}} = petiôt changement.", - "history-fieldset-title": "Fâre dèfelar l’historico", + "history-fieldset-title": "Rechèrchiér de vèrsions", "history-show-deleted": "Mas que les suprimâyes", - "histfirst": "les ples vielyes", - "histlast": "Les ples novèles", + "histfirst": "les més vielyes", + "histlast": "Les més novèles", "historysize": "($1 octèt{{PLURAL:$1||s}})", "historyempty": "(voueda)", "history-feed-title": "Historico de les vèrsions", @@ -870,16 +870,16 @@ "nextn-title": "$1 rèsultat{{PLURAL:$1||s}} aprés", "shown-title": "Montrar $1 rèsultat{{PLURAL:$1||s}} per pâge", "viewprevnext": "Vêre ($1 {{int:pipe-separator}} $2) ($3)", - "searchmenu-exists": "Y at na pâge apelâye « [[:$1]] » sur cél vouiqui. {{PLURAL:$2|0=|Vêde avouéc los ôtros rèsultats de voutra rechèrche.}}", + "searchmenu-exists": "Y at na pâge apelâye « [[:$1]] » dessus cél vouiqui. {{PLURAL:$2|0=|Vêde avouéc los ôtros rèsultats de voutra rechèrche.}}", "searchmenu-new": "Fâre la pâge « [[:$1|$1]] » sur cél vouiqui ! {{PLURAL:$2|0=|Vêde asse-ben la pâge trovâye avouéc voutra rechèrche.|Vêde avouéc los rèsultats de voutra rechèrche.}}", "searchprofile-articles": "Pâges de contegnu", "searchprofile-images": "Multimèdiâ", "searchprofile-everything": "Tot", - "searchprofile-advanced": "Avanciê", + "searchprofile-advanced": "Avanciêe", "searchprofile-articles-tooltip": "Rechèrchiér dedens $1", "searchprofile-images-tooltip": "Rechèrchiér de fichiérs", "searchprofile-everything-tooltip": "Rechèrchiér dedens tot lo contegnu (les pâges de discussion avouéc)", - "searchprofile-advanced-tooltip": "Chouèsir los èspâços de noms por la rechèrche", + "searchprofile-advanced-tooltip": "Rechèrchiér dedens d’èspâços de noms pèrsonalisâs", "search-result-size": "$1 ($2 mot{{PLURAL:$2||s}})", "search-result-category-size": "$1 membro{{PLURAL:$1||s}} ($2 sot-catègori{{PLURAL:$2|a|es}}, $3 fichiér{{PLURAL:$3||s}})", "search-redirect": "(redirèccion dês $1)", @@ -896,7 +896,7 @@ "searchall": "tot", "showingresults": "Viua de $1 rèsultat{{PLURAL:$1||s}} dês lo n° $2.", "showingresultsinrange": "Viua de $1 rèsultat{{PLURAL:$1||s}} dedens la sèria n° $2 a n° $3.", - "search-showingresults": "{{PLURAL:$4|Rèsultat $1 entre-mié $3|Rèsultats $1 a $2entre-mié $3}}", + "search-showingresults": "{{PLURAL:$4|Rèsultat $1 entre-mié $3|Rèsultats $1 a $2 entre-mié $3}}", "search-nonefound": "Y at gins de rèsultat que corrèspond a la rechèrche.", "search-nonefound-thiswiki": "Y at gins de rèsultat que corrèspond a la rechèrche sur cél seto.", "powersearch-legend": "Rechèrche avanciêe", @@ -1264,7 +1264,7 @@ "recentchangeslinked-feed": "Changements rapondus", "recentchangeslinked-toolbox": "Changements rapondus", "recentchangeslinked-title": "Changements rapondus a « $1 »", - "recentchangeslinked-summary": "O est na lista des dèrriérs changements sur les pâges que sont liyêes a na pâge spècifiâye (ou ben sur los membros d’una catègoria spècifiâye).\nLes pâges de voutra [[Special:Watchlist|lista de gouârda]] sont en grôs.", + "recentchangeslinked-summary": "Buchiéd un nom de pâge por vêre los changements sur les pâges liyêes de vers ou ben dês cela pâge (por vêre los membros d’una catègoria, buchiéd Catègorie:Nom de catègoria). Los changements de les pâges de voutra [[Special:Watchlist|lista de gouârda]] sont en grôs.", "recentchangeslinked-page": "Nom de la pâge :", "recentchangeslinked-to": "Montrar per contre los changements de les pâges qu’ant un lim de vers la pâge balyêe", "recentchanges-page-added-to-category": "[[:$1]] apondua a la catègoria", @@ -1689,8 +1689,8 @@ "notargettext": "Vos éd pas spècifiâ na pâge un utilisator ciba que vos voléd fâre cel’accion.", "nopagetitle": "Niona pâge ciba d’ense", "nopagetext": "La pâge ciba que vos éd spècifiâye ègziste pas.", - "pager-newer-n": "{{PLURAL:$1|ples novèla|$1 ples novèles}}", - "pager-older-n": "{{PLURAL:$1|ples vielye|$1 ples vielyes}}", + "pager-newer-n": "{{PLURAL:$1|més novèla|$1 més novèles}}", + "pager-older-n": "{{PLURAL:$1|més vielye|$1 més vielyes}}", "suppress": "Rèprimar", "querypage-disabled": "Cela pâge spèciâla est dèsactivâye por de rêsons de capacitât.", "apihelp": "Éde de l’API", @@ -1872,7 +1872,7 @@ "unwatchthispage": "Pas més siuvre", "notanarticle": "O est pas na pâge de contegnu", "notvisiblerev": "La dèrriére vèrsion per un ôtr’utilisator est étâye suprimâye", - "watchlist-details": "Y at $1 pâge{{PLURAL:$1||s}} dedens voutra lista de gouârda, sen comptar a pârt les pâges de discussion.", + "watchlist-details": "Y at $1 pâge{{PLURAL:$1||s}} dedens voutra lista de gouârda (les pâges de discussion avouéc).", "wlheader-enotif": "La notificacion per mèssageria èlèctronica est activâye.", "wlheader-showupdated": "Les pâges que sont étâyes changiêes dês voutra dèrriére vesita sont montrâyes en grôs.", "wlnote": "Vê-que {{PLURAL:$1|lo dèrriér changement fêt|los $1 dèrriérs changements fêts}} pendent {{PLURAL:$2|l’hora passâye|les $2 hores passâyes}}, tant qu’u $3 a $4.", @@ -2057,7 +2057,7 @@ "undelete-show-file-submit": "Ouè", "namespace": "Èspâço de noms :", "invert": "Envèrsar lo chouèx", - "tooltip-invert": "Pouentâd cela câsa por cachiér los changements de les pâges dedens l’èspâço de noms chouèsi (et l’èspâço de noms associyê avouéc se pouentâ)", + "tooltip-invert": "Pouentâd cela câsa por cachiér los changements de les pâges dedens l’èspâço de noms chouèsi (et pués l’èspâço de noms associyê se pouentâ)", "tooltip-whatlinkshere-invert": "Pouentâd cela câsa por cachiér los lims de les pâges dedens l’èspâço de noms chouèsi.", "namespace_association": "Èspâço de noms associyê", "tooltip-namespace_association": "Pouentâd cela câsa por rapondre avouéc l’èspâço de noms de discussion de chousa associyê a l’èspâço de noms chouèsi", @@ -2398,7 +2398,7 @@ "tooltip-ca-edit": "Changiér cela pâge", "tooltip-ca-addsection": "Comenciér na novèla sèccion", "tooltip-ca-viewsource": "Cela pâge est protègiêe.\nPortant vos en pouede vêre son tèxto sôrsa", - "tooltip-ca-history": "Vèrsions passâyes de cela pâge", + "tooltip-ca-history": "Vielyes vèrsions de cela pâge", "tooltip-ca-protect": "Protègiér cela pâge", "tooltip-ca-unprotect": "Changiér la protèccion de cela pâge", "tooltip-ca-delete": "Suprimar cela pâge", @@ -2413,7 +2413,7 @@ "tooltip-n-mainpage": "Vesitar la pâge principâla", "tooltip-n-mainpage-description": "Vesitar la pâge principâla", "tooltip-n-portal": "Sur lo projèt, cen que vos pouede fâre, yô que trovar de chouses", - "tooltip-n-currentevents": "Trovar les enformacions de fond sur les novèles d’ora", + "tooltip-n-currentevents": "Trovar d’enformacions de fond sur les novèles d’ora", "tooltip-n-recentchanges": "Na lista des dèrriérs changements sur lo vouiqui", "tooltip-n-randompage": "Chargiér na pâge a l’hasârd", "tooltip-n-help": "L’endrêt por nen savêr més", @@ -2449,7 +2449,7 @@ "tooltip-watchlistedit-raw-submit": "Betar a jorn la lista de gouârda", "tooltip-recreate": "Refâre la pâge quand ben que ceta est étâye suprimâye", "tooltip-upload": "Emmodar lo tèlèchargement", - "tooltip-rollback": "« Rèvocar » anule tot d’un côp lo(s) changement(s) de cela pâge per lo dèrriér contributor", + "tooltip-rollback": "« Rèvocar » anule tot d’un côp lo(s) changement(s) de cela pâge fêt(s) per lo dèrriér contributor", "tooltip-undo": "« Dèfâre » anule cél changement et pués ôvre la fenétra de changement en fôrma d’apèrçu. Pèrmèt d’apondre na rêson dens lo rèsumâ.", "tooltip-preferences-save": "Encartar les prèferences", "tooltip-summary": "Buchiéd un côrt rèsumâ", @@ -2562,7 +2562,7 @@ "file-info": "Talye du fichiér : $1, tipo MIME : $2", "file-info-size": "$1 × $2 pixèls, talye du fichiér : $3, tipo MIME : $4", "file-info-size-pages": "$1 × $2 pixèls, talye du fichiér : $3, tipo MIME : $4, $5 pâge{{PLURAL:$5||s}}", - "file-nohires": "Niona rèsolucion ples hôta disponibla.", + "file-nohires": "Niona rèsolucion més hiôta disponibla.", "svg-long-desc": "Fichiér SVG, nominalament $1 × $2 pixèls, talye du fichiér : $3", "svg-long-desc-animated": "Fichiér SVG animâ, nominalament $1 × $2 pixèls, talye du fichiér : $3", "svg-long-error": "Fichiér SVG pas justo : $1", @@ -3157,7 +3157,7 @@ "version-libraries-description": "Dèscripcion", "version-libraries-authors": "Ôtors", "redirect": "Redirigiér per ID de fichiér, utilisator, pâge, vèrsion ou ben jornâl", - "redirect-summary": "Cela pâge spèciâla redirige vers un fichiér (lo nom de fichiér balyê), na pâge (l’ID de vèrsion de pâge balyê), na pâge d’utilisator (l’ID numerico a l’utilisator balyê) ou ben un’entrâ de jornâl (l’ID du jornâl balyê). Usâjo : [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]] ou ben [[{{#Special:Redirect}}/logid/186]].", + "redirect-summary": "Cela pâge spèciâla redirige vers un fichiér (lo nom de fichiér balyê), na pâge (l’ID de vèrsion de pâge balyê), na pâge utilisator (l’ID numerico de l’utilisator balyê) ou ben un’entrâ de jornâl (l’ID du jornâl balyê). Usâjo : [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]] ou ben [[{{#Special:Redirect}}/logid/186]].", "redirect-submit": "Emmodar", "redirect-lookup": "Rechèrche :", "redirect-value": "Valor :", @@ -3251,9 +3251,9 @@ "htmlform-reset": "Dèfâre los changements", "htmlform-selectorother-other": "Ôtro", "logentry-delete-delete": "$1 {{GENDER:$2|at suprimâ}} la pâge $3", - "logentry-delete-restore": "$1 at refêt la pâge $3", + "logentry-delete-restore": "$1 {{GENDER:$2|at refêt}} la pâge $3 ($4)", "logentry-delete-event": "$1 at changiê la visibilitât {{PLURAL:$5|d’un èvènement|de $5 èvènements}} du jornal dessus $3 : $4", - "logentry-delete-revision": "$1 at changiê la visibilitât {{PLURAL:$5|d’una vèrsion|de $5 vèrsions}} sur la pâge $3 : $4", + "logentry-delete-revision": "$1 {{GENDER:$2|at changiê}} la visibilitât {{PLURAL:$5|d’una vèrsion|de $5 vèrsions}} sur la pâge $3 : $4", "logentry-delete-event-legacy": "$1 at changiê la visibilitât des èvènements du jornal dessus $3", "logentry-delete-revision-legacy": "$1 at changiê la visibilitât de les vèrsions sur la pâge $3", "logentry-suppress-delete": "$1 at suprimâ la pâge $3", @@ -3270,19 +3270,20 @@ "revdelete-restricted": "at aplicâ les rèstriccions ux administrators", "revdelete-unrestricted": "rèstriccions enlevâs por los administrators", "logentry-move-move": "$1 {{GENDER:$2|at dèplaciê}} la pâge $3 vers $4", - "logentry-move-move-noredirect": "$1 at dèplaciê la pâge $3 vers $4 sen lèssiér una redirèccion", - "logentry-move-move_redir": "$1 at dèplaciê la pâge $3 vers $4 en ècrasent sa redirèccion", + "logentry-move-move-noredirect": "$1 {{GENDER:$2|at dèplaciê}} la pâge $3 vers $4 sen lèssiér gins de redirèccion", + "logentry-move-move_redir": "$1 {{GENDER:$2|at dèplaciê}} la pâge $3 vers $4 per-dessus na redirèccion", "logentry-move-move_redir-noredirect": "$1 at dèplaciê la pâge $3 vers $4 en ècrasent sa redirèccion sen lèssiér una redirèccion", "logentry-patrol-patrol": "$1 at marcâ la vèrsion $4 de la pâge $3 coment controlâye", - "logentry-patrol-patrol-auto": "$1 at marcâ ôtomaticament la vèrsion $4 de la pâge $3 coment controlâye", + "logentry-patrol-patrol-auto": "$1 {{GENDER:$2|at marcâ}} ôtomaticament la vèrsion $4 de la pâge $3 coment controlâye", "logentry-newusers-newusers": "Lo compto utilisator $1 est étâ fêt", "logentry-newusers-create": "Lo comptio utilisator $1 {{GENDER:$2|est étâ fêt}}", "logentry-newusers-create2": "Lo compto utilisator $3 est étâ fêt per $1", - "logentry-newusers-autocreate": "Lo compto $1 at étâ fêt ôtomaticament", + "logentry-newusers-autocreate": "Lo comptio $1 {{GENDER:$2|at étâ fêt}} ôtomaticament", "logentry-rights-rights": "$1 at changiê l’apartegnence a la tropa por « $3 » de $4 a $5", "logentry-rights-rights-legacy": "$1 at changiê l’apartegnence a la tropa por « $3 »", "logentry-rights-autopromote": "$1 est étâ nomâ ôtomaticament de $4 a $5", "logentry-upload-upload": "$1 {{GENDER:$2|at tèlèchargiê}} $3", + "logentry-upload-overwrite": "$1 {{GENDER:$2|at tèlèchargiê}} na novèla vèrsion de $3", "rightsnone": "(nion)", "feedback-adding": "Aponsa de voutros avis a la pâge...", "feedback-bugcheck": "Formidâblo ! Controlâd simplament qu’o est pas yona de les [$1 cofieries ja cognues].", @@ -3297,7 +3298,7 @@ "feedback-subject": "Sujèt :", "feedback-submit": "Sometre", "feedback-thanks": "Grant-marci ! Voutron avis at étâ postâ sur la pâge « [$2 $1] ».", - "searchsuggest-search": "Rechèrchiér dessus {{SITENAME}}", + "searchsuggest-search": "Rechèrchiér dedens {{SITENAME}}", "searchsuggest-containing": "que contint...", "api-error-badtoken": "Èrror de dedens : crouyo « jeton ».", "api-error-emptypage": "La crèacion de pâges novèles vouedes est pas ôtorisâ.", diff --git a/languages/i18n/he.json b/languages/i18n/he.json index 90197d504a..d23a0d7a10 100644 --- a/languages/i18n/he.json +++ b/languages/i18n/he.json @@ -1238,7 +1238,7 @@ "grant-protect": "הפעלת הגנה על דפים והסרתה", "grant-rollback": "שחזור שינויים בדפים", "grant-sendemail": "שליחת דואר אלקטרוני למשתמשים אחרים", - "grant-uploadeditmovefile": "העלאת קבצים, החלפתם והעברתם.", + "grant-uploadeditmovefile": "העלאת קבצים, החלפתם והעברתם", "grant-uploadfile": "העלאת קבצים חדשים", "grant-basic": "הרשאות בסיסיות", "grant-viewdeleted": "צפייה בקבצים ודפים שנמחקו", diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json index 63bba85825..50bf660e16 100644 --- a/languages/i18n/hu.json +++ b/languages/i18n/hu.json @@ -457,8 +457,8 @@ "createacct-emailrequired": "E-mail-cím", "createacct-emailoptional": "E-mail-cím (opcionális)", "createacct-email-ph": "Add meg e-mail címed", - "createacct-another-email-ph": "Add meg az emailcímet", - "createaccountmail": "Átmeneti, véletlenszerű jelszó beállítása és kiküldése a megadott e-mail címre", + "createacct-another-email-ph": "Add meg az e-mail-címet", + "createaccountmail": "Átmeneti, véletlenszerű jelszó beállítása és kiküldése a megadott e-mail-címre", "createaccountmail-help": "A jelszó megismerése nélkül készíthető valaki másnak fiók.", "createacct-realname": "Igazi neved (nem kötelező)", "createacct-reason": "Indoklás", diff --git a/languages/i18n/id.json b/languages/i18n/id.json index 9e83550b00..8c2f4aaee5 100644 --- a/languages/i18n/id.json +++ b/languages/i18n/id.json @@ -575,11 +575,11 @@ "botpasswords-insert-failed": "Gagal menambah nama bot \"$1\". Apakah sudah ditambahkan sebelum ini?", "botpasswords-update-failed": "Gagal memperbarui nama bot \"$1\". Apakah sebelumnya sudah pernah dihapus?", "botpasswords-created-title": "Kata sandi bot dibuat", - "botpasswords-created-body": "Kata sandi bot \"$1\" dari pengguna \"$2\" berhasil dibuat.", + "botpasswords-created-body": "Kata sandi bot \"$1\" dari {{GENDER:$2|user}} \"$2\" berhasil dibuat.", "botpasswords-updated-title": "Kata sandi bot diperbarui", - "botpasswords-updated-body": "Kata sandi bot \"$1\" dari pengguna \"$2\" berhasil diperbarui.", + "botpasswords-updated-body": "Kata sandi bot \"$1\" dari {{GENDER:$2|user}} \"$2\" berhasil diperbarui.", "botpasswords-deleted-title": "Kata sandi bot dihapus", - "botpasswords-deleted-body": "Kata sandi bot \"$1\" dari pengguna \"$2\" telah dihapus.", + "botpasswords-deleted-body": "Kata sandi bot \"$1\" dari {{GENDER:$2|user}} \"$2\" telah dihapus.", "botpasswords-newpassword": "Kata sandi baru untuk masuk log dengan $1 adalah $2. Catatlah kata sandi ini untuk referensi ke depan.
    (Untuk bot lama yang memerlukan nama masuk log yang sama dengan nama pengguna, dapat menggunakan $3 sebagai nama pengguna dan $4 sebagai kata sandi.)", "botpasswords-no-provider": "BotPasswordsSessionProvider tidak tersedia.", "botpasswords-restriction-failed": "Batasan kata sandi menghalangi masuk log ini.", @@ -3519,7 +3519,7 @@ "version-poweredby-others": "lainnya", "version-poweredby-translators": "penerjemah translatewiki.net", "version-credits-summary": "Kami ingin mengakui orang-orang berikut atas kontribusinya terhadap [[Special:Version|MediaWiki]].", - "version-license-info": "MediaWiki adalah perangkat lunak bebas; Anda diperbolehkan untuk mendistribusikan dan/atau memodfikasinya dengan persyaratan Lisensi Publik Umum GNU yang diterbitkan oleh Free Software Foundation; versi 2 atau terbaru.\n\nMediaWiki didistribusikan dengan harapan dapat digunakan, tetapi TANPA JAMINAN APA PUN; tanpa jaminan PERDAGANGAN atau KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik Umum GNU untuk informasi lebih lanjut.\n\nAnda seharusnya telah menerima [{{SERVER}}{{SCRIPTPATH}}/COPYING salinan Lisensi Publik Umum GNU] bersama dengan program ini; jika tidak, kirim surat ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA atau [//www.gnu.org/licenses/old-licenses/gpl-2.0.html baca daring].", + "version-license-info": "MediaWiki adalah perangkat lunak bebas; Anda diperbolehkan untuk mendistribusikan dan/atau memodfikasinya dengan persyaratan Lisensi Publik Umum GNU yang diterbitkan oleh Free Software Foundation; versi 2 atau terbaru.\n\nMediaWiki didistribusikan dengan harapan dapat digunakan, tetapi TANPA JAMINAN APA PUN; tanpa jaminan PERDAGANGAN atau KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik Umum GNU untuk informasi lebih lanjut.\n\nAnda seharusnya telah menerima [{{SERVER}}{{SCRIPTPATH}}/COPYING salinan Lisensi Publik Umum GNU] bersama dengan program ini; jika tidak, kirim surat ke Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA atau [//www.gnu.org/licenses/old-licenses/gpl-2.0.html baca daring].", "version-software": "Perangkat lunak terinstal", "version-software-product": "Produk", "version-software-version": "Versi", @@ -3578,6 +3578,14 @@ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag}}]]: $2)", "tag-mw-contentmodelchange": "Perubahan model konten", "tag-mw-contentmodelchange-description": "Perubahan yang [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel mengubah model konten] suatu halaman", + "tag-mw-new-redirect": "Pengalihan baru", + "tag-mw-removed-redirect": "Menghapus pengalihan", + "tag-mw-changed-redirect-target": "Target pengalihan diganti", + "tag-mw-blank": "Pengosongan", + "tag-mw-replace": "Penggantian", + "tag-mw-rollback": "Pengembalian", + "tag-mw-undo": "Pembatalan", + "tag-mw-undo-description": "Suntingan yang membatalkan suntingan sebelumnya dengan tombol kembalikan", "tags-title": "Tanda", "tags-intro": "Halaman ini berisi daftar tag yang dapat ditandai oleh perangkat lunak terhadap suatu suntingan berikut artinya.", "tags-tag": "Nama tag", @@ -3847,7 +3855,7 @@ "expandtemplates": "Pengembangan templat", "expand_templates_intro": "Halaman istimewa ini mengambil teks dan mengembangkan semua templat di dalamnya secara rekursif. Halaman ini juga menerjemahkan semua fungsi parser seperti {{#language:…}} dan variabel seperti {{CURRENTDAY}}. Bahkan bisa dibilang mengembangkan segala sesuatu yang berada di antara dua tanda kurung.", "expand_templates_title": "Judul konteks, untuk {{FULLPAGENAME}} dan lain-lain:", - "expand_templates_input": "Teks masukan:", + "expand_templates_input": "Masukan tekswiki:", "expand_templates_output": "Hasil", "expand_templates_xml_output": "Hasil XML", "expand_templates_html_output": "Keluaran HTML mentah", diff --git a/languages/i18n/is.json b/languages/i18n/is.json index f7ec58155d..543be60b94 100644 --- a/languages/i18n/is.json +++ b/languages/i18n/is.json @@ -1322,7 +1322,9 @@ "rcfilters-filter-previousrevision-label": "Ekki nýjasta útgáfa", "rcfilters-filter-previousrevision-description": "Allar breytingar nema sú nýjasta.", "rcfilters-filter-excluded": "Útilokað", + "rcfilters-tag-prefix-namespace-inverted": ":ekki $1", "rcfilters-exclude-button-off": "Útiloka val", + "rcfilters-exclude-button-on": "Útiloka valið", "rcfilters-view-tags": "Merktar breytingar", "rcfilters-view-namespaces-tooltip": "Sía niðurstöður eftir nafnrými", "rcfilters-view-tags-tooltip": "Sía niðurstöður með breytingarmerkjum", @@ -1333,6 +1335,7 @@ "rcfilters-liveupdates-button-title-off": "Sýna nýjar breytingar um leið og þær gerast", "rcfilters-watchlist-markseen-button": "Merkja allar breytingar sem skoðaðar", "rcfilters-watchlist-edit-watchlist-button": "Breyta þínum lista yfir vaktaðar síður", + "rcfilters-target-page-placeholder": "Settu inn síðuheiti (eða flokk)", "rcnotefrom": "Að neðan {{PLURAL:$5|er breyting síðan|eru breytingar síðan}} $3, $4 (allt að $1 sýndar).", "rclistfromreset": "Endurstilla dagsetningarval", "rclistfrom": "Sýna breytingar frá og með $3 $2", @@ -1550,6 +1553,7 @@ "uploadstash-thumbnail": "skoða smámynd", "uploadstash-bad-path": "Slóðin er ekki til.", "uploadstash-bad-path-invalid": "Slóðin er ógild.", + "uploadstash-bad-path-unknown-type": "Óþekkt gerð \"$1\".", "invalid-chunk-offset": "Ógild raðbreyting bunka", "img-auth-accessdenied": "Aðgangur óheimill", "img-auth-nopathinfo": "PATH_INFO vantar.\nBiðlarinn þínn er ekki stilltur til að gefa upp þessar upplýsingar.\nÞær mega vera CGI-byggðar og mega ekki styðja img_auth.\nhttps://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization", @@ -1819,6 +1823,8 @@ "apisandbox-alert-field": "Gildi þessa reits er ekki leyfilegt.", "apisandbox-continue": "Halda áfram", "apisandbox-continue-clear": "Hreinsa", + "apisandbox-multivalue-all-namespaces": "$1 (öll nafnarými)", + "apisandbox-multivalue-all-values": "$1 (öll gildi)", "booksources": "Bókaleit", "booksources-search-legend": "Leita að bókaheimildum", "booksources-isbn": "ISBN:", @@ -2610,6 +2616,7 @@ "pageinfo-category-subcats": "Fjöldi undirflokka", "pageinfo-category-files": "Fjöldi skráa", "pageinfo-user-id": "Notandanúmer", + "pageinfo-file-hash": "Tætigildi (hash)", "markaspatrolleddiff": "Merkja sem yfirfarið", "markaspatrolledtext": "Merkja þessa síðu sem yfirfarna", "markaspatrolledtext-file": "Merkja þessa útgáfu skrár sem yfirfarna", @@ -3342,6 +3349,8 @@ "tag-filter": "[[Special:Tags|Merkja]]sía:", "tag-filter-submit": "Sía", "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Merki}}]]: $2)", + "tag-mw-replace": "Skipt út", + "tag-mw-undo": "Afturkalla", "tags-title": "Merki", "tags-intro": "Þessi síða sýnir merkin sem hugbúnaðurinn gæti merkt breytingar með, og hvað þau þýða.", "tags-tag": "Heiti merkis", @@ -3447,6 +3456,7 @@ "logentry-delete-delete": "$1 {{GENDER:$2|eyddi}} síðunni $3", "logentry-delete-delete_redir": "$1 {{GENDER:$2|eyddi}} tilvísun $3 með því að yfirskrifa", "logentry-delete-restore": "$1 {{GENDER:$2|endurvakti}} síðu $3 ($4)", + "restore-count-files": "{{PLURAL:$1|1 skrá|$1 skrár}}", "logentry-delete-event": "$1 {{GENDER:$2|breytti}} sýnileika {{PLURAL:$5|færslu|$5 færslna}} á $3: $4", "logentry-delete-revision": "$1 {{GENDER:$2|breytti}} sýnileika {{PLURAL:$5|útgáfu|$5 útgáfna}} á $3: $4", "logentry-delete-event-legacy": "$1 {{GENDER:$2|breytti}} sýnileika færslna á $3", @@ -3644,5 +3654,6 @@ "sessionprovider-mediawiki-session-cookiesessionprovider": "setur með vefkökum", "sessionprovider-nocookies": "Vefkökur gætu verið óvirkar. Gakktu úr skugga um að smákökur séu virkar og byrjaðu svo aftur.", "randomrootpage": "Handahófsvalin rótarsíða", - "log-action-filter-all": "Allt" + "log-action-filter-all": "Allt", + "log-action-filter-delete-delete": "Eyðing síðu" } diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json index 397bce63ef..9fb8ee7fe6 100644 --- a/languages/i18n/ja.json +++ b/languages/i18n/ja.json @@ -1190,7 +1190,7 @@ "group-bot": "ボット", "group-sysop": "管理者", "group-bureaucrat": "ビューロクラット", - "group-suppress": "監督員", + "group-suppress": "秘匿者", "group-all": "(全員)", "group-user-member": "{{GENDER:$1|登録利用者}}", "group-autoconfirmed-member": "{{GENDER:$1|自動承認された利用者}}", @@ -1203,7 +1203,7 @@ "grouppage-bot": "{{ns:project}}:ボット", "grouppage-sysop": "{{ns:project}}:管理者", "grouppage-bureaucrat": "{{ns:project}}:ビューロクラット", - "grouppage-suppress": "{{ns:project}}:秘匿", + "grouppage-suppress": "{{ns:project}}:秘匿者", "right-read": "ページを閲覧", "right-edit": "ページを編集", "right-createpage": "ページ (議論ページ以外) を作成", @@ -1393,8 +1393,8 @@ "rcfilters-group-results-by-page": "ページごとにまとめて表示", "rcfilters-activefilters": "絞り込み", "rcfilters-advancedfilters": "詳細フィルター", - "rcfilters-limit-title": "表示件数の変更", - "rcfilters-limit-and-date-label": "$1件の変更、$2", + "rcfilters-limit-title": "表示する件数", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|件の変更}}、$2", "rcfilters-date-popup-title": "検索期間", "rcfilters-days-title": "日数", "rcfilters-hours-title": "時間", @@ -1470,9 +1470,9 @@ "rcfilters-filter-watchlist-watchednew-description": "ウォッチリストに登録されていて、前回訪れた後に更新があったページ。", "rcfilters-filter-watchlist-notwatched-label": "ウォッチリスト登録外", "rcfilters-filter-watchlist-notwatched-description": "ウォッチリストに登録されているページ以外の全ての変更。", - "rcfilters-filter-watchlistactivity-unseen-label": "保存していません!", + "rcfilters-filter-watchlistactivity-unseen-label": "未読の変更", "rcfilters-filter-watchlistactivity-unseen-description": "ウォッチリストに登録されていて、前回訪れた後に更新があったページ。", - "rcfilters-filter-watchlistactivity-seen-label": "最近の更新", + "rcfilters-filter-watchlistactivity-seen-label": "閲覧済みの変更", "rcfilters-filtergroup-changetype": "変更の種類", "rcfilters-filter-pageedits-label": "ページの編集", "rcfilters-filter-pageedits-description": "ウィキの本文、議論、カテゴリの説明などの編集", @@ -1508,7 +1508,7 @@ "rcfilters-preference-label": "最近の更新の改善版を隠す", "rcfilters-preference-help": "2017年のインターフェース更新、当時追加したや以来の新しいツールの使用を断る。", "rcfilters-filter-showlinkedfrom-label": "リンク先ページの変更を表示する", - "rcfilters-target-page-placeholder": "ページ名を入力", + "rcfilters-target-page-placeholder": "ページ名（またはカテゴリ名）を入力", "rcnotefrom": "以下は$3 $4以降の{{PLURAL:$5|更新です}} (最大 $1 件)。", "rclistfromreset": "日時指定をリセット", "rclistfrom": "$3の$2以降の更新を表示する", @@ -3527,7 +3527,7 @@ "watchlistedit-clear-titles": "ページ名:", "watchlistedit-clear-submit": "ウォッチリストの全消去 (この操作は取り消せません！)", "watchlistedit-clear-done": "ウォッチリストを全消去しました。", - "watchlistedit-clear-removed": "{{PLURAL:$1|$1 件のタイトル}}を除去しました:", + "watchlistedit-clear-removed": "{{PLURAL:$1|$1 件のページ}}を除去しました:", "watchlistedit-too-many": "ページ数が多すぎるため表示できません。", "watchlisttools-clear": "ウォッチリストの全消去", "watchlisttools-view": "関連する変更を表示", diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json index 10418b0f70..606c4755b2 100644 --- a/languages/i18n/ko.json +++ b/languages/i18n/ko.json @@ -997,7 +997,7 @@ "search-nonefound-thiswiki": "이 사이트에서 검색어와 일치하는 결과가 없습니다.", "powersearch-legend": "고급 검색", "powersearch-ns": "다음 이름공간에서 검색:", - "powersearch-togglelabel": "확인:", + "powersearch-togglelabel": "선택:", "powersearch-toggleall": "모두", "powersearch-togglenone": "모두 제외", "powersearch-remember": "향후 검색에 선택 기억하기", @@ -1234,6 +1234,7 @@ "right-siteadmin": "데이터베이스를 잠그거나 잠금 해제", "right-override-export-depth": "5단계로 링크된 문서를 포함하여 문서를 내보내기", "right-sendemail": "다른 사용자에게 이메일 보내기", + "right-sendemail-new-users": "기록된 동작이 없는 사용자에게 이메일 보내기", "right-managechangetags": "데이터베이스에서 [[Special:Tags|태그]]를 만들거나 지우기", "right-applychangetags": "자신이 편집할 때 [[Special:Tags|태그]]를 적용하기", "right-changetags": "문서의 특정 판과 특정 기록 항목에 임의의 [[Special:Tags|태그]]를 추가하거나 제거하기", @@ -1468,8 +1469,10 @@ "rcfilters-watchlist-showupdated": "변경이 발생한 이후로 방문한 적이 없는 문서의 변경사항은 굵게 표시됩니다.", "rcfilters-preference-label": "개선된 버전의 최근 바뀜 숨기기", "rcfilters-preference-help": "2017년 인터페이스 재설계 부분과 그 당시와 그 이후에 추가된 모든 도구를 되돌립니다.", - "rcfilters-filter-showlinkedfrom-label": "아래에서 링크한 문서의 변경사항 보기", - "rcfilters-filter-showlinkedto-label": "아래로 링크한 문서의 변경사항 보기", + "rcfilters-filter-showlinkedfrom-label": "다음 문서에서 링크한 문서의 변경사항 보기", + "rcfilters-filter-showlinkedfrom-option-label": "선택된 문서에서 링크하는 문서들", + "rcfilters-filter-showlinkedto-label": "다음 문서로 링크한 문서의 변경사항 보기", + "rcfilters-filter-showlinkedto-option-label": "선택된 문서로 링크하는 문서들", "rcfilters-target-page-placeholder": "문서 이름(또는 분류)을 입력하세요", "rcnotefrom": "아래는 $3, $4부터 시작하는 {{PLURAL:$5|바뀜이 있습니다}}. (최대 $1개가 표시됨)", "rclistfromreset": "날짜 선택 초기화", @@ -1711,6 +1714,7 @@ "uploadstash-bad-path": "경로가 존재하지 않습니다.", "uploadstash-bad-path-invalid": "경로가 유효하지 않습니다.", "uploadstash-bad-path-unknown-type": "알 수 없는 유형 \"$1\".", + "uploadstash-bad-path-unrecognized-thumb-name": "인식되지 않은 썸네일 이름", "uploadstash-bad-path-no-handler": "파일 $2의 mime $1에 대한 핸들러를 찾을 수 없습니다.", "uploadstash-bad-path-bad-format": "\"$1\" 키는 적절한 포맷이 아닙니다.", "uploadstash-file-not-found-no-thumb": "섬네일을 가져오지 못했습니다.", @@ -2175,7 +2179,7 @@ "unwatchthispage": "주시 해제하기", "notanarticle": "문서가 아님", "notvisiblerev": "이 판은 삭제되었습니다.", - "watchlist-details": "{{PLURAL:$1|문서 $1개}}가 주시문서 목록에 있습니다. (토론 문서 포함)", + "watchlist-details": "{{PLURAL:$1|문서 $1개}}가 주시문서 목록에 있습니다 (토론 문서 포함).", "wlheader-enotif": "이메일 알림 기능이 활성화되었습니다.", "wlheader-showupdated": "마지막으로 방문한 이후에 바뀐 문서는 '''굵은 글씨'''로 보입니다.", "wlnote": "$3 $4 기준으로, 아래에 최근 {{PLURAL:$2|한 시간|$2시간}} 동안 {{PLURAL:$1|마지막 바뀜이|마지막 바뀜 $1개가}} 있습니다.", @@ -3510,9 +3514,9 @@ "tag-mw-contentmodelchange-description": "페이지의 [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel 콘텐츠 모델을 변경하는] 편집", "tag-mw-new-redirect": "새 넘겨주기", "tag-mw-new-redirect-description": "새로운 넘겨주기를 만들거나 문서를 넘겨주기로 변경하는 편집", - "tag-mw-removed-redirect": "넘겨주기를 제거함", + "tag-mw-removed-redirect": "넘겨주기 제거", "tag-mw-removed-redirect-description": "기존의 넘겨주기를 넘겨주기가 아닌 문서로 변경하는 편집", - "tag-mw-changed-redirect-target": "넘겨주기 대상을 변경함", + "tag-mw-changed-redirect-target": "넘겨주기 대상 변경", "tag-mw-changed-redirect-target-description": "넘겨주기 대상을 변경하는 편집", "tag-mw-blank": "비우기", "tag-mw-blank-description": "문서를 비우는 편집", @@ -3703,7 +3707,7 @@ "logentry-move-move_redir": "$1님이 $3 문서를 $4 문서로 {{GENDER:$2|이동하면서}} 넘겨주기를 덮어썼습니다", "logentry-move-move_redir-noredirect": "$1님이 $3 문서를 $4 문서로 넘겨주기를 남기지 않고 {{GENDER:$2|이동하면서}} 이동할 대상에 있던 넘겨주기를 덮어썼습니다", "logentry-patrol-patrol": "$1님이 $3 문서의 $4판을 점검한 것으로 {{GENDER:$2|표시했습니다}}", - "logentry-patrol-patrol-auto": "$1님이 자동적으로 $3 문서의 $4판을 점검한 것으로 {{GENDER:$2|표시했습니다}}", + "logentry-patrol-patrol-auto": "$1님이 자동으로 $3 문서의 $4판을 점검한 것으로 {{GENDER:$2|표시했습니다}}", "logentry-newusers-newusers": "$1 사용자 계정을 {{GENDER:$2|만들었습니다}}", "logentry-newusers-create": "$1 사용자 계정을 {{GENDER:$2|만들었습니다}}", "logentry-newusers-create2": "$3 사용자 계정을 $1님이 {{GENDER:$2|만들었습니다}}", @@ -3717,7 +3721,7 @@ "logentry-protect-modify-cascade": "$1님이 $3 문서의 보호 수준을 {{GENDER:$2|바꾸었습니다}} $4 [연쇄적]", "logentry-rights-rights": "$1님이 {{GENDER:$6|$3}}님의 권한을 $4에서 $5(으)로 {{GENDER:$2|바꾸었습니다}}", "logentry-rights-rights-legacy": "$1님이 $3님의 권한을 {{GENDER:$2|바꾸었습니다}}", - "logentry-rights-autopromote": "$1님이 권한을 자동적으로 $4에서 $5(으)로 {{GENDER:$2|바꾸었습니다}}", + "logentry-rights-autopromote": "$1님이 권한을 자동으로 $4에서 $5(으)로 {{GENDER:$2|바꾸었습니다}}", "logentry-upload-upload": "$1님이 $3 파일을 {{GENDER:$2|올렸습니다}}", "logentry-upload-overwrite": "$1님이 $3의 새 판을 {{GENDER:$2|올렸습니다}}", "logentry-upload-revert": "$1님이 $3 파일을 {{GENDER:$2|올렸습니다}}", diff --git a/languages/i18n/lij.json b/languages/i18n/lij.json index 817bd1f90e..f2dc697b5d 100644 --- a/languages/i18n/lij.json +++ b/languages/i18n/lij.json @@ -25,7 +25,7 @@ "tog-usenewrc": "Amuggia pe paggina e modiffiche in urtime modifiche e sotta oservaçion", "tog-numberheadings": "Nùmeraçion aotomàtica di tìtoli de seçión", "tog-showtoolbar": "Fanni vedde a bara di strumenti de modìffica", - "tog-editondblclick": "Modiffica e paggine co-o doggio clic", + "tog-editondblclick": "Modìfica de pàgine tràmite dóggio clic", "tog-editsectiononrightclick": "Permetti de modificâ e seçioin co-o clic drito in sciô tìtolo", "tog-watchcreations": "Azonzi e paggine che creo e i file che carrego a-i oservæ speciâli", "tog-watchdefault": "Azonzi e paggine e i files che modiffico a-i mæ sotta oservaçion", @@ -70,17 +70,17 @@ "monday": "lunesdì", "tuesday": "mâtesdì", "wednesday": "mâcordì", - "thursday": "Zéuggia", + "thursday": "zéuggia", "friday": "venardì", "saturday": "sàbbo", - "sun": "Dom", - "mon": "Lun", - "tue": "Mar", + "sun": "dom", + "mon": "lun", + "tue": "mât", "wed": "mâc", "thu": "zéu", "fri": "ven", "sat": "sàb", - "january": "Zenâ", + "january": "zenâ", "february": "frevâ", "march": "màrso", "april": "arvî", @@ -100,12 +100,12 @@ "june-gen": "zùgno", "july-gen": "lùggio", "august-gen": "agósto", - "september-gen": "Seténbre", + "september-gen": "seténbre", "october-gen": "òtôbre", "november-gen": "novénbre", "december-gen": "dexénbre", "jan": "zen", - "feb": "Fre", + "feb": "fre", "mar": "màr", "apr": "arv", "may": "màz", @@ -118,16 +118,16 @@ "dec": "dex", "january-date": "$1 zenâ", "february-date": "$1 frevâ", - "march-date": "$1 março", + "march-date": "$1 màrso", "april-date": "$1 arvî", - "may-date": "$1 mazzo", - "june-date": "$1 zugno", - "july-date": "$1 luggio", - "august-date": "{{PLURAL:$1|1°|$1}} agosto", - "september-date": "$1 setenbre", - "october-date": "$1 otobre", - "november-date": "{{PLURAL:$1|1°|$1}} novembre", - "december-date": "$1 dexenbre", + "may-date": "$1 màzzo", + "june-date": "$1 zùgno", + "july-date": "$1 lùggio", + "august-date": "$1 agósto", + "september-date": "$1 seténbre", + "october-date": "$1 òtôbre", + "november-date": "$1 novénbre", + "december-date": "$1 dexénbre", "period-am": "AM", "period-pm": "PM", "pagecategories": "{{PLURAL:$1|Categorîa|Categorîe}}", @@ -151,11 +151,11 @@ "article": "Voxe", "newwindow": "(O s'arve inte 'n âtro barcon)", "cancel": "Scancella", - "moredotdotdot": "De ciû...", + "moredotdotdot": "Âtro...", "morenotlisted": "Questa lista a poriæ ese incompleta.", "mypage": "Paggina", - "mytalk": "Discuscioin", - "anontalk": "Discuscion pe questo addresso IP", + "mytalk": "discuscioìn", + "anontalk": "discuscioìn", "navigation": "Navegaçión", "and": " e", "faq": "Domande frequenti", @@ -180,7 +180,7 @@ "permalink": "Ingancio fisso", "print": "Stampa", "view": "Visualizza", - "view-foreign": "Amia insce $1", + "view-foreign": "Véddi in sce $1", "edit": "Modìfica", "edit-local": "Modifica descrission locale", "create": "Crea", @@ -189,15 +189,15 @@ "undelete_short": "Recuppera {{PLURAL:$1|una revixon|$1 revixoin}}", "viewdeleted_short": "{{PLURAL:$1|una modiffica cançelâ|$1 modiffiche cançelæ}}", "protect": "Protezi", - "protect_change": "cangia", - "unprotect": "Càngia proteçión", + "protect_change": "càngia", + "unprotect": "Càngia a proteçión", "newpage": "Nêuva pàgina", "talkpagelinktext": "discusción", "specialpage": "Pagina speçiâ", "personaltools": "Strumenti personâli", - "talk": "Discuscion", + "talk": "Discusción", "views": "Vìxite", - "toolbox": "Arneixi", + "toolbox": "Struménti", "tool-link-userrights": "Modiffica groppi {{GENDER:$1|utente}}", "tool-link-userrights-readonly": "Vixualizza groppi {{GENDER:$1|utente}}", "tool-link-emailuser": "Manda un'e-mail a questo {{GENDER:$1|utente}}", @@ -287,9 +287,9 @@ "nstab-special": "Pàgina speçiâ", "nstab-project": "Pàgina de servìçio", "nstab-image": "File", - "nstab-mediawiki": "Messaggio", + "nstab-mediawiki": "Mesàggio", "nstab-template": "Template", - "nstab-help": "Agiûtto", + "nstab-help": "Agiùtto", "nstab-category": "Categorîa", "mainpage-nstab": "Pàgina prinçipâ", "nosuchaction": "No se poeu", @@ -414,8 +414,8 @@ "userlogin-loggedin": "Ti t'ê zà connesso comme {{GENDER:$1|$1}}.\nUsa o formulaio sottostante pe accede comme 'n atro utente.", "userlogin-reauth": "Ti g'hæ da intrâ 'n'atra votta pe veificâ che ti t'ê {{GENDER:$1|$1}}.", "userlogin-createanother": "Crea 'n atra utensa", - "createacct-emailrequired": "Addresso e-mail:", - "createacct-emailoptional": "Adresso email (opsionale)", + "createacct-emailrequired": "Indirìsso emâi:", + "createacct-emailoptional": "Indirìsso de pòsta eletrònica (facoltatîvo)", "createacct-email-ph": "Scrivi o teu adresso email", "createacct-another-email-ph": "Scrivi o teu adresso email", "createaccountmail": "Doeuvia una password temporanea abrettio e mandila a l'adresso de posta elettronica speçificou", @@ -571,7 +571,7 @@ "changeemail-newemail-help": "Sto campo dev'ese lasciòu veuo se ti veu rimeuve o to addresso e-mail. No ti saiæ in graddo de reimpostâ 'na poula segretta desmentegâ e ti no riçeviæ e-mail da questo wiki, se l'adresso de posta elettronnica o ven rimosso.", "changeemail-none": "(nisciun)", "changeemail-password": "A to password pe {{SITENAME}}:", - "changeemail-submit": "Cangia e-mail", + "changeemail-submit": "Modìfica emâi", "changeemail-throttled": "T'hæ çercòu de intrâ troppe votte.\nPe piaxei aspeta $1 primma de provâ torna.", "changeemail-nochange": "Pe piaxei inseisci un neuvo addresso e-mail.", "resettokens": "Reimposta token", @@ -584,10 +584,10 @@ "resettokens-resetbutton": "Reimposta token selessionæ", "bold_sample": "Grascetto", "bold_tip": "Grascetto", - "italic_sample": "Testo in corscivo", - "italic_tip": "Corscivo", - "link_sample": "Tittolo de l'ingancio", - "link_tip": "Ingancio interno", + "italic_sample": "Corscîvo", + "italic_tip": "Corscîvo", + "link_sample": "Tìtolo do colegaménto", + "link_tip": "Colegaménto intèrno", "extlink_sample": "http://www.example.com tittolo de l'ingancio", "extlink_tip": "Colegaménto esterno (inclûdde o prefisso http:// )", "headline_sample": "Tìtolo", @@ -602,7 +602,7 @@ "hr_tip": "Linnia orizontâ", "summary": "Oggetto:", "subject": "Sogetto:", - "minoredit": "Quésta l'é 'na modìfica minô", + "minoredit": "Quésta a l'é 'na modìfica minô", "watchthis": "Metti sotta oservaçion", "savearticle": "Sarva a pàgina", "savechanges": "Sarva e modiffiche", @@ -683,7 +683,7 @@ "templatesused": "{{PLURAL:$1|Template dêuviòu|Template dêuviæ}} in sta pàgina:", "templatesusedpreview": "{{PLURAL:$1|Template deuviou|Template deuviæ}} in te st'anteprimma:", "templatesusedsection": "{{PLURAL:$1|Template deuviòu|Template deuviæ}} in questa seçion:", - "template-protected": "(protezûo)", + "template-protected": "(protètto)", "template-semiprotected": "(semiprotezûo)", "hiddencategories": "Sta pàgina a fa parte de {{PLURAL:$1|1 categoria ascoza|$1 categorie ascoze}}:", "nocreatetext": "A poscibilitæ de creâ nêuve paggine insce {{SITENAME}} a l'è stæta limitâ solo a-i ûtenti registræ.\nSe pêu tornâ inderê e modificâ 'na paggina existente, oppûre [[Special:UserLogin|intrâ ò creâ 'n accesso nêuvo]].", @@ -824,7 +824,7 @@ "revdelete-radio-unset": "Vixibbile", "revdelete-suppress": "Ascondi i dæti a-i amministratoî ascì", "revdelete-unsuppress": "Elimmina e limitaçioin in scê verscioin ripristinæ", - "revdelete-log": "Raxon:", + "revdelete-log": "Motîvo:", "revdelete-submit": "Applica {{PLURAL:$1|a-a verscion seleçionâ|a-e verscioin seleçionæ}}", "revdelete-success": "'''Vixibilitæ da verscion agiornâ.'''", "revdelete-failure": "'''A vixibilitæ da verscion a no peu ese agiornâ:'''\n$1", @@ -875,7 +875,7 @@ "mergehistory-comment": "Union de [[:$1]] in [[:$2]]: $3", "mergehistory-same-destination": "A paggina d'origgine e quella de destinaçion no peuan ese a mæxima", "mergehistory-reason": "Raxon:", - "mergelog": "Unioin", + "mergelog": "Unioìn", "revertmerge": "Anùlla union", "mergelogpagetext": "Chì de sotta 'na lista di urtime unioin de 'na stoia co-in atra", "history-title": "Stöia de revixoìn de \"$1\"", @@ -924,7 +924,7 @@ "search-rewritten": "Mostro i risultæ pe $1. Atrimenti, çerca $2.", "search-interwiki-caption": "Risultæ da-i progetti fræ", "search-interwiki-default": "Risultæ da $1:", - "search-interwiki-more": "(atro)", + "search-interwiki-more": "(âtro)", "search-interwiki-more-results": "atri risultæ", "search-relatedarticle": "corelæ", "searchrelated": "corelæ", @@ -992,16 +992,16 @@ "timezoneuseoffset": "Atro (speciffica a differensa)", "servertime": "Oa do server:", "guesstimezone": "Deuvia l'oa do navegatô", - "timezoneregion-africa": "Affrica", - "timezoneregion-america": "Amerrica", + "timezoneregion-africa": "Àfrica", + "timezoneregion-america": "América", "timezoneregion-antarctica": "Antartide", "timezoneregion-arctic": "Artide", - "timezoneregion-asia": "Axia", - "timezoneregion-atlantic": "Oçeano Atlantego", - "timezoneregion-australia": "Aostrallia", - "timezoneregion-europe": "Euiropa", - "timezoneregion-indian": "Oçeano Indian", - "timezoneregion-pacific": "Oçeano Paxiffego", + "timezoneregion-asia": "Àzia", + "timezoneregion-atlantic": "Òcéano Atlàntico", + "timezoneregion-australia": "Oustràlia", + "timezoneregion-europe": "Eoröpa", + "timezoneregion-indian": "Òcéano Indiàn", + "timezoneregion-pacific": "Òcéano Pacìfico", "allowemail": "Permetti a posta elettronega da di ätri utenti", "prefs-searchoptions": "Çerca", "prefs-namespaces": "Namespace:", @@ -1013,10 +1013,10 @@ "prefs-reset-intro": "L'è poscibile doeuviâ sta pagina pe rimpostâ e propie preferençe a quelle predefinie do scito.\nL'opiaçion a no poeu ese annullâ.", "prefs-emailconfirm-label": "Conferma de l'e-mail:", "youremail": "Indirìsso email:", - "username": "{{GENDER:$1|Nomme utente}}:", - "prefs-memberingroups": "{{GENDER:$2|Membro}} {{PLURAL:$1|do gruppo|di gruppi}}:", - "group-membership-link-with-expiry": "$1 (scin a $2)", - "prefs-registration": "Dæta de registraçion:", + "username": "{{GENDER:$1|Nómme uténte}}:", + "prefs-memberingroups": "{{GENDER:$2|Ménbro}} {{PLURAL:$1|do grùppo|di grùppi}}:", + "group-membership-link-with-expiry": "$1 (fìn a $2)", + "prefs-registration": "Dæta de registraçión:", "yourrealname": "Nomme vêo:", "yourlanguage": "Léngoa:", "yourvariant": "Variante da lengoa do contegnuo:", @@ -1050,7 +1050,7 @@ "prefs-displayrc": "Opçioin de visualizzaçion", "prefs-displaywatchlist": "Opçioin de visualizzaçion", "prefs-tokenwatchlist": "Token", - "prefs-diffs": "Differençe", + "prefs-diffs": "Diferénse", "prefs-help-prefershttps": "Questa preferença a l'aviâ effetto da-o proscimo accesso.", "prefswarning-warning": "T'hæ fæto de modiffiche a-e teu preferense che no son ancon stæte sarvæ.\nSe ti sciorti da sta paggina sensa sciaccâ \"$1\" e preferense no saian agiornæ.", "prefs-tabs-navigation-hint": "Suggeimento: ti peu deuviâ i pomelli co-a freccia scinistra e drita pe navegâ tra e schede inta lista de schede.", @@ -1066,7 +1066,7 @@ "userrights-groupsmember": "Membro de:", "userrights-groupsmember-auto": "Membro impliçito de:", "userrights-groups-help": "L'è poscibile modificâ i groppi de st'utente:\n* Una casella marcâ voeu dî che l'utente o l'è inte quello groppo.\n* Una casella smarcâ voeu dî che l'utente o no l'è inte quello groppo.\n* O scimbolo * o voeu dî che no ti poeu smarcâ o groppo una votta che ti l'hæ azonto (ò viçeversa).\n* O scimbolo # o l'indica che ti poeu solo portâ inderê a dæta da descheita de l'inscriçion a questo groppo; no l'è poscibbile portala avanti", - "userrights-reason": "Raxon:", + "userrights-reason": "Motîvo:", "userrights-no-interwiki": "No ti g'hæ i permissi pe modificâ i driti di utenti insce di atre wiki.", "userrights-nodatabase": "O database $1 o no l'esiste ò o no l'è un database locale.", "userrights-changeable-col": "Gruppi che ti peu modificâ", @@ -1082,8 +1082,8 @@ "userrights-cannot-shorten-expiry": "No ti poeu antiçipâ a descheita de l'inscriçion a-o groppo \"$1\". Soltanto i utenti co-o permisso de azonze e rimoeuve questo groppo poeuan antiçipâ e descheite.", "userrights-conflict": "Conflito de modiffica di driti utente! Pe piaxei controlla e conferma e teu modiffiche.", "group": "Gruppo:", - "group-user": "Ûtenti", - "group-autoconfirmed": "Utenti aotoconfermæ", + "group-user": "Uténti", + "group-autoconfirmed": "Uténti aotoconfermæ", "group-bot": "Bot", "group-sysop": "Aministratoî", "group-bureaucrat": "Buròcrati", @@ -1095,14 +1095,14 @@ "group-sysop-member": "{{GENDER:$1|amministratô|amministratrixe|amministratô/trixe}}", "group-bureaucrat-member": "{{GENDER:$1|buròcrate}}", "group-suppress-member": "{{GENDER:$1|soppressô|soppressôa}}", - "grouppage-user": "{{ns:project}}:Utenti", + "grouppage-user": "{{ns:project}}:Uténti", "grouppage-autoconfirmed": "{{ns:project}}:Utenti autoconfermæ", "grouppage-bot": "{{ns:project}}:Bot", "grouppage-sysop": "{{ns:project}}:Aministratoî", "grouppage-bureaucrat": "{{ns:project}}:Buròcrati", "grouppage-suppress": "{{ns:project}}:Soppressoî", "right-read": "Leze paggine", - "right-edit": "Modiffica paggine", + "right-edit": "Modìfica pàgine", "right-createpage": "Crea paggine (escluse e pagine de discuscion)", "right-createtalk": "Crea pagine de discuscion", "right-createaccount": "Crea noeuve utençe", @@ -1345,8 +1345,8 @@ "rcfilters-filter-watchlist-watchednew-description": "Cangi a-e paggine sotta oservaçion che non t'hæ vixitou doppo a modiffica.", "rcfilters-filter-watchlist-notwatched-label": "Non sotta oservaçion", "rcfilters-filter-watchlist-notwatched-description": "Tutto foeua che i cangi a-e to paggine sotta oservaçion.", - "rcfilters-filtergroup-changetype": "Tipo de modiffica", - "rcfilters-filter-pageedits-label": "Modiffiche a-e paggine", + "rcfilters-filtergroup-changetype": "Tîpo de modìfica", + "rcfilters-filter-pageedits-label": "Modìfiche a-e pàgine", "rcfilters-filter-pageedits-description": "Modiffiche a-o contegnto wiki, discuscioin, descriçioin categoria…", "rcfilters-filter-newpages-label": "Creaçioin de paggine", "rcfilters-filter-newpages-description": "Modiffiche che crean de noeuve paggine.", @@ -1621,8 +1621,8 @@ "upload-curl-error6-text": "Imposcibile razonze a URL specificâ. Verifica che a URL a sæ scrita correttamente e che o scito in question o sæ attivo.", "upload-curl-error28": "Tempo descheito pe l'upload", "upload-curl-error28-text": "O scito remoto o l'ha impiegou troppo tempo a risponde. Verifica che o sito o sæ attivo, attendi quarche menuto e proeuva torna, se mai inte 'n momento con meno traffego.", - "license": "Liçençia:", - "license-header": "Licensa", + "license": "Licénsa:", + "license-header": "Licénsa", "nolicense": "Nisciûnn-a liçensa indicâa", "licenses-edit": "Modiffica opçioin de liçença", "license-nopreview": "(Anteprimma non disponibbile)", @@ -1651,16 +1651,16 @@ "filehist-deleteall": "scassa tutto", "filehist-deleteone": "scassa", "filehist-revert": "Ripristina", - "filehist-current": "Corrente", + "filehist-current": "atoâle", "filehist-datetime": "Dæta/Ôa", "filehist-thumb": "Miniatua", "filehist-thumbtext": "Miniatua da versción de $1", "filehist-nothumb": "Nisciùnn-a miniatua", "filehist-user": "Uténte", - "filehist-dimensions": "Dimenscioin", + "filehist-dimensions": "Dimenscioìn", "filehist-filesize": "Dimenscion do file", "filehist-comment": "Coménti", - "imagelinks": "Ûzo do file", + "imagelinks": "Utilìzzo do file", "linkstoimage": "{{PLURAL:$1|A segoente pàgina a contegne|E segoenti $1 pàgine contegnan}} colegaménti a-o file:", "linkstoimage-more": "Ciù de $1 {{PLURAL:$1|pagina aponta|pagine apontan}} a questo file.\nA seguente lista a mostra {{PLURAL:$1|a primma paggina ch'a l'aponta|e primme $1 paggine ch'apontan}} a sto file.\nL'è disponibile un [[Special:WhatLinksHere/$2|elenco completo]].", "nolinkstoimage": "No gh'è nisciun-a paggina inganciâ a sto file.", @@ -1681,7 +1681,7 @@ "filerevert": "Ripristina $1", "filerevert-legend": "Ripristina file", "filerevert-intro": "Ti stæ pe ripristinâ o file '''[[Media:$1|$1]]''' a-a [$4 verscion do $2, $3].", - "filerevert-comment": "Raxon:", + "filerevert-comment": "Motîvo:", "filerevert-defaultcomment": "Ripristinou a verscion do $2, $1 ($3)", "filerevert-submit": "Ripristina", "filerevert-success": "'''O file [[Media:$1|$1]]''' o l'è stæto ripristinou a-a [$4 verscion do $2, $3].", @@ -1720,7 +1720,7 @@ "randomincategory": "Pagina a brettio inta categoria", "randomincategory-invalidcategory": "\"$1\" o no l'è un nomme de categoria vallido.", "randomincategory-nopages": "Paggine in [[:Category:$1]] no ghe n'è.", - "randomincategory-category": "Categoria:", + "randomincategory-category": "Categorîa:", "randomincategory-legend": "Pagina a brettio inta categoria", "randomincategory-submit": "Vanni", "randomredirect": "Ûn rindirissamento a brettio", @@ -1737,7 +1737,7 @@ "statistics-edits": "Modifiche a partî dal l'installaçion de {{SITENAME}}", "statistics-edits-average": "Meddia de modiffiche pe paggina", "statistics-users": "[[Special:ListUsers|Utenti]] registræ", - "statistics-users-active": "Utenti attivi", + "statistics-users-active": "Uténti atîvi", "statistics-users-active-desc": "Utenti che han effettuou un'açion {{PLURAL:$1|inte l'urtimo giorno|inti urtimi $1 giorni}}", "pageswithprop": "Paggine co-ina propietæ de paggina", "pageswithprop-legend": "Paggine co-ina propietæ de paggina", @@ -1753,7 +1753,7 @@ "double-redirect-fixer": "Correttô di redirect", "brokenredirects": "Rindirissamenti sballiæ", "brokenredirectstext": "I rendriççi chì de sotta apontan a de paggine inexistente:", - "brokenredirects-edit": "cangia", + "brokenredirects-edit": "modìfica", "brokenredirects-delete": "scassa", "withoutinterwiki": "Paggine sensa interwiki", "withoutinterwiki-summary": "E paggine chì de sotta no g'han nisciun ingancioo a-e verscioin in atre lengoe:", @@ -1828,10 +1828,10 @@ "listusers-desc": "Ordina in senso decrescente", "usereditcount": "$1 {{PLURAL:$1|contributo|contributi}}", "usercreated": "{{GENDER:$3|Creòu/â}} o $1 a-a $2", - "newpages": "Pagine ciù reçenti", + "newpages": "Nêuve pàgine", "newpages-submit": "Mostra", - "newpages-username": "Nomme utente", - "ancientpages": "Paggine ciû vëgie", + "newpages-username": "Nómme uté�nte:", + "ancientpages": "Pàgine mêno recénti", "move": "Mescia", "movethispage": "Mescia 'sta paggina", "unusedimagestext": "I seguenti file existan ma no son doeuviæ inte nisciun-a paggina.\nNotta che di atri sciti web porieivan ese conligæ a 'n file co-in URL diretto, e coscì o poriæ ese inte sta lista sciuben ch'o segge in doeuvia.", @@ -2005,7 +2005,7 @@ "nowikiemailtext": "Questo utente o l'ha scerto de no riçeive messaggi de posta elettronica da-i atri utenti.", "emailnotarget": "Nomme utente do destinataio inexistente o non vallido.", "emailtarget": "Inseisci o nomme utente do destinataio", - "emailusername": "Nomme utente", + "emailusername": "Nómme uténte:", "emailusernamesubmit": "Invia", "email-legend": "Invia un messaggio e-mail a un atro utente de {{SITENAME}}", "emailfrom": "Da:", @@ -2036,7 +2036,7 @@ "removedwatchtext-short": "A pagina \"$1\" a l'è stæata rimossa da-a proppia lista di öservæ.", "watch": "Metti sotta oservaçion", "watchthispage": "Vigilâ 'sta paggina", - "unwatch": "Leva da sott'oservaçion", + "unwatch": "No segoî", "unwatchthispage": "Smetti de öservâ", "notanarticle": "Questa paggina a no l'è una voxe", "notvisiblerev": "L'urtima revixon a l'è stæta scassâ", @@ -2048,8 +2048,8 @@ "watchlist-hide": "Ascondi", "watchlist-submit": "Mostra", "wlshowtime": "Periodo de tempo da vixualizzâ:", - "wlshowhideminor": "cangiamenti menoî", - "wlshowhidebots": "Bot", + "wlshowhideminor": "modìfiche minoî", + "wlshowhidebots": "bot", "wlshowhideliu": "utenti registræ", "wlshowhideanons": "utenti anonnimi", "wlshowhidepatr": "cangiaménti controllæ", @@ -2089,9 +2089,9 @@ "actioncomplete": "Açion completâ", "actionfailed": "Açión falîa", "deletedtext": "A paggina \"$1\" a l'è stæta scassâ. Consultâ o $2 pe 'na lista de paggine scassæ de reçente.", - "dellogpage": "Registro de cose scassæ", + "dellogpage": "Scancelaçioìn", "dellogpagetext": "De sotta gh'è 'na lista co-e paggine scassæ ciu de reçente.", - "deletionlog": "registro de scassatue", + "deletionlog": "scancelaçioìn", "reverted": "Ripristinou a verscion precedente", "deletecomment": "Raxon:", "deleteotherreason": "Ûn âtro motivo", @@ -2136,7 +2136,7 @@ "logentry-contentmodel-change": "$1 {{GENDER:$2|l'ha modificou}} o modello de contegnuo da paggina $3 da \"$4\" a \"$5\"", "logentry-contentmodel-change-revertlink": "ripristina", "logentry-contentmodel-change-revert": "ripristina", - "protectlogpage": "Protessioin", + "protectlogpage": "Proteçioìn", "protectlogtext": "De sotta gh'è 'na lista di cangi a-e proteçioin de paggine.\nAmia a [[Special:ProtectedPages|lista de pagine protette]] pe l'elenco de proteçioin de pagina attoalmente attive.", "protectedarticle": "o l'à protetto \"[[$1]]\"", "modifiedarticleprotection": "ha modificou o livello de proteçion de \"[[$1]]\"", @@ -2153,7 +2153,7 @@ "protect-norestrictiontypes-text": "Questa pagina a no poeu ese protetta perché non gh'è arcun tipo de restriçion disponibbile.", "protect-norestrictiontypes-title": "Paggina non protezibbile", "protect-legend": "Confermâ protession", - "protectcomment": "Raxon:", + "protectcomment": "Motîvo:", "protectexpiry": "Scadensa:", "protect_expiry_invalid": "Scadensa invalida.", "protect_expiry_old": "Dæta de scadensa into passòu.", @@ -2274,8 +2274,8 @@ "nolinkshere-ns": "Pagine ch'apontan a '''[[:$1]]''' into namespace seleçionou no ghe n'è.", "isredirect": "Paggina de rindirissamento", "istemplate": "Incluxon", - "isimage": "Ingancio a-o file", - "whatlinkshere-prev": "{{PLURAL:$1|precedente|precedenti $1}}", + "isimage": "Colegaménto a-o file", + "whatlinkshere-prev": "{{PLURAL:$1|precedénte|precedénti $1}}", "whatlinkshere-next": "{{PLURAL:$1|sûccescivo|sûccescivi $1}}", "whatlinkshere-links": "← colegaménti", "whatlinkshere-hideredirs": "$1 i rendirissamenti", @@ -2564,7 +2564,7 @@ "import-options-wrong": "{{PLURAL:$2|Opçion sbaliâ|Opçioin sbaliæ}}: $1", "import-rootpage-invalid": "A paggina prinçipâ fornia a no l'è un tittolo vallido.", "import-rootpage-nosubpage": "O namespace \"$1\" da paggina prinçipâ o no permette d'avei de sottopagine.", - "importlogpage": "Importassioîn", + "importlogpage": "Inportaçioìn", "importlogpagetext": "Importaçioin aministrative de paggine da di atre wiki complete de cronologia.", "import-logentry-upload-detail": "{{PLURAL:$1|una verscion importâ|$1 verscioin importæ}}", "import-logentry-interwiki-detail": "{{PLURAL:$1|una verscion importâ|$1 verscioin importæ}} da $2", @@ -2573,9 +2573,9 @@ "javascripttest-qunit-intro": "Amia insce mediawiki.org a [$1 documentaçion riguardante i test].", "tooltip-pt-userpage": "A {{GENDER:|to}} pagina utente", "tooltip-pt-anonuserpage": "A paggina utente de questo adreçço IP che t'ê aproeuvo a modificâ comme", - "tooltip-pt-mytalk": "A {{GENDER:|to}} paggina de discuscion", + "tooltip-pt-mytalk": "A {{GENDER:|teu}} pàgina de discusción", "tooltip-pt-anontalk": "Discuscioin insce e modiffiche fæte da questo adreçço IP", - "tooltip-pt-preferences": "E {{GENDER:|to}} preferençe", + "tooltip-pt-preferences": "E {{GENDER:|teu}} preferénse", "tooltip-pt-watchlist": "A lista de pagine che ti g'hæ sotta osservaçion", "tooltip-pt-mycontris": "A lista de {{GENDER:|to}} contribuçioin", "tooltip-pt-anoncontribs": "Un elenco de modiffiche fæte da questo adreçço IP", @@ -2621,7 +2621,7 @@ "tooltip-ca-nstab-user": "Amîa a paggina utente", "tooltip-ca-nstab-media": "Veddi a paggina do file murtimediâ", "tooltip-ca-nstab-special": "Sta chi l'è 'na pàgina speciâle e a no peu êse cangiâ", - "tooltip-ca-nstab-project": "Veddi a paggina de servissio", + "tooltip-ca-nstab-project": "Véddi a pàgina de servìçio", "tooltip-ca-nstab-image": "Veddi a paggina do file", "tooltip-ca-nstab-mediawiki": "Veddi o messaggio de scistema", "tooltip-ca-nstab-template": "Veddi o template", @@ -2666,7 +2666,7 @@ "pageinfo-header-basic": "Informaçion de base", "pageinfo-header-edits": "Cronologia de modiffiche", "pageinfo-header-restrictions": "Proteçion da paggina", - "pageinfo-header-properties": "Propietæ da paggina", + "pageinfo-header-properties": "Propiêtæ da pàgina", "pageinfo-display-title": "Tittolo vixualizzou", "pageinfo-default-sort": "Criteio d'ordenamento predefinio", "pageinfo-length": "Longheçça da paggina (in byte)", @@ -2680,12 +2680,12 @@ "pageinfo-robot-noindex": "Non consentio", "pageinfo-watchers": "Nummero di utenti che g'han a paggina in öservaçion", "pageinfo-visiting-watchers": "Nummero di öservatoî da paggina ch'han vixitou e modiffiche reçente", - "pageinfo-few-watchers": "Meno de $1 {{PLURAL:$1|öservatô|öservatoî}}", + "pageinfo-few-watchers": "Mêno de $1 {{PLURAL:$1|òservatô|òservatoî}}", "pageinfo-few-visiting-watchers": "Ghe poriæ ese ò meno di öservatoî ch'han vixitou e modiffiche reçente", "pageinfo-redirects-name": "Nummero de redirect a questa paggina", - "pageinfo-subpages-name": "Sottopaggine de questa paggina", + "pageinfo-subpages-name": "Sottopàgine de quésta pàgina", "pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|redirect}}; $3 {{PLURAL:$3|non redirect}})", - "pageinfo-firstuser": "Creatô da paggina", + "pageinfo-firstuser": "Creatô da pàgina", "pageinfo-firsttime": "Dæta de creaçion da paggina", "pageinfo-lastuser": "Urtimo contributô", "pageinfo-lasttime": "Dæta de l'urtima modiffica", @@ -2807,7 +2807,7 @@ "exif-bitspersample": "Bit pe campion", "exif-compression": "Meccanismo de comprescion", "exif-photometricinterpretation": "Struttua di pixel", - "exif-orientation": "Orientamento", + "exif-orientation": "Òrientaménto", "exif-samplesperpixel": "Nummero di componenti", "exif-planarconfiguration": "Dispoxiçion di dæti", "exif-ycbcrsubsampling": "Rapporto de campionamento Y / C", @@ -2823,7 +2823,7 @@ "exif-primarychromaticities": "Coordinæ cromattiche di coî primai", "exif-ycbcrcoefficients": "Coeffixenti de matrixe de transformaçion di spaççi de cô", "exif-referenceblackwhite": "Cobbia di valoî de rifeimento (neigro e gianco)", - "exif-datetime": "Dæta e öa da modiffica do file", + "exif-datetime": "Dæta e ôa de modìfica do file", "exif-imagedescription": "Tittolo de l'inmaggine", "exif-make": "Produttô fotocamera", "exif-model": "Modello fotocamera", @@ -2832,7 +2832,7 @@ "exif-copyright": "Diritti d'autô de", "exif-exifversion": "Verscion do formato Exif", "exif-flashpixversion": "Verscion Flashpix supportâ", - "exif-colorspace": "Spassio di coî", + "exif-colorspace": "Spàçio di coî", "exif-componentsconfiguration": "Scignificou de ogni componente", "exif-compressedbitsperpixel": "Modalitæ de comprescion immaggine", "exif-pixelxdimension": "Largheçça immaggine", diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json index 32788bedf8..9a7919e0df 100644 --- a/languages/i18n/mr.json +++ b/languages/i18n/mr.json @@ -236,7 +236,8 @@ "views": "दृष्ये", "toolbox": "साधने", "tool-link-userrights": "{{GENDER:$1|वापरकर्ता}} गट बदला", - "tool-link-emailuser": "{{GENDER:$1|सदस्याला}} विपत्र पाठवा", + "tool-link-userrights-readonly": "{{GENDER:$1|सदस्य}}गट बघा", + "tool-link-emailuser": "या {{GENDER:$1|सदस्याला}} विपत्र पाठवा", "imagepage": "संचिका पृष्ठ पहा", "mediawikipage": "संदेश पान पहा", "templatepage": "साच्याचे पृष्ठ पहा.", @@ -260,7 +261,7 @@ "pool-errorunknown": "अपरिचित त्रुटी", "pool-servererror": "पूल काउंटर सेवा उपलब्ध नाही($1).", "poolcounter-usage-error": "वापर त्रुटी:$1", - "aboutsite": "{{SITENAME}}बद्दल", + "aboutsite": "{{SITENAME}} बद्दल", "aboutpage": "Project:माहितीपृष्ठ", "copyright": "येथील मजकूर $1च्या अंतर्गत उपलब्ध आहे जोपर्यंत इतर नोंदी केलेल्या नाहीत.", "copyrightpage": "{{ns:project}}:प्रताधिकार", @@ -277,7 +278,7 @@ "portal-url": "Project:समाज मुखपृष्ठ", "privacy": "गुप्तता नीती", "privacypage": "Project:गुप्तता नीती", - "badaccess": "परवानगी नाकारण्यात आली आहे", + "badaccess": "परवानगी त्रुटी", "badaccess-group0": "आपण विनंती केलेल्या क्रियेच्या पूर्ततेचे तुम्हाला अधिकार नाहीत.", "badaccess-groups": "आपण विनीत केलेली कृती खालील {{PLURAL:$2|समूहासाठी|पैकी एका समूहासाठी}} मर्यादित आहे: $1.", "versionrequired": "मीडियाविकीची $1 आवृत्ती हवी", @@ -307,7 +308,7 @@ "thisisdeleted": "$1चे अवलोकन किंवा पुनर्स्थापन करायचे ?", "viewdeleted": " $1चे अवलोकन करायचे?", "restorelink": "{{PLURAL:$1|एक वगळलेले संपादन|$1 वगळलेली संपादने}}", - "feedlinks": "रसद (Feed) :", + "feedlinks": "रसद (फिड) :", "feed-invalid": "अयोग्य रसद नोंदणी (Invalid subscription feed type).", "feed-unavailable": "सिंडीकेशन रसद उपलब्ध नाहीत", "site-rss-feed": "$1 आरएसएस रसद", @@ -419,17 +420,20 @@ "userlogin-yourname-ph": "आपले सदस्यनाव टाका", "createacct-another-username-ph": "सदस्यनाव टाका", "yourpassword": "तुमचा परवलीचा शब्द:", - "userlogin-yourpassword": "परवलीचा शब्द(पासवर्ड)", + "userlogin-yourpassword": "परवलीचा शब्द (पासवर्ड)", "userlogin-yourpassword-ph": "आपला परवलीचा शब्द टाका", "createacct-yourpassword-ph": "परवलीचा शब्द टाका", "yourpasswordagain": "तुमचा परवलीचा शब्द पुन्हा टंका:", "createacct-yourpasswordagain": "परवलीच्या शब्दाची निश्चिती करा", "createacct-yourpasswordagain-ph": "पुन्हा परवलीचा शब्द टाका", - "userlogin-remembermypassword": "मला नोंदीकृतच(लॉग्ड-ईन) ठेवा", + "userlogin-remembermypassword": "मला नोंदीकृतच (लॉग्ड-ईन) ठेवा", "userlogin-signwithsecure": "सुरक्षित अनुबंध(सेक्युअर कनेक्शन) वापरा", "cannotlogin-title": "सनोंद प्रवेश करु शकत नाही", + "cannotlogin-text": "सनोंद-प्रवेश शक्य नाही.", "cannotloginnow-title": "आता सनोंद प्रवेश घेऊ शकत नाही", "cannotloginnow-text": "$1 वापरत असतांना सनोंद प्रवेश करणे शक्य नाही.", + "cannotcreateaccount-title": "खाते तयार करू शकत नाही", + "cannotcreateaccount-text": "या विकिवर थेट खाते तयार करण्याची सुविधा सक्षम नाही.", "yourdomainname": "तुमचे क्षेत्र (डोमेन) :", "password-change-forbidden": "तुम्ही या विकिवर तुमचा परवलीचा शब्द बदलू शकत नाही.", "externaldberror": "विदागार ’खातरजमा’ (प्रमाणितीकरण) त्रुटी होती अथवा तुम्हाला तुमचे बाह्य खाते अद्ययावत करण्याची परवानगी नाही.", @@ -445,17 +449,22 @@ "userlogin-resetpassword-link": "आपला परवलीचा शब्द विसरलात?", "userlogin-helplink2": "सनोंद प्रवेशासंबंधी साहाय्य", "userlogin-loggedin": "आपण पुर्वीच {{GENDER:$1|$1}} म्हणून सनोंद प्रवेशित आहात.वेगळ्या सदस्यनावाने सनोंद प्रवेशासाठी खालील आवेदन वापरा.", + "userlogin-reauth": "आपण {{GENDER:$1|$1}} आहात याची खात्री करण्यासाठी आपला पुनर्प्रवेश आवश्यक आहे.", "userlogin-createanother": "दुसरे नवीन खाते तयार करा", - "createacct-emailrequired": "विपत्र पत्ता(ई-मेल)", - "createacct-emailoptional": "विपत्र पत्ता(ई-मेल)(ऐच्छिक)", + "createacct-emailrequired": "विपत्र पत्ता (ई-मेल)", + "createacct-emailoptional": "विपत्र पत्ता (ई-मेल)(ऐच्छिक)", "createacct-email-ph": "आपला विपत्र पत्ता(ई-मेल) टाका", "createacct-another-email-ph": "आपला विपत्रपत्ता (ई-मेल) टाका", "createaccountmail": "तात्पुरता अनियत (रॅन्डम) परवलीचा शब्द तयार करून तो खाली नमूद विपत्रपत्त्यावर पाठवा", + "createaccountmail-help": "परवलीचा शब्द माहित केल्याशिवाय, अन्य व्यक्तीचे खाते तयार करण्यासाठी वापरण्यात येऊ शकते.", "createacct-realname": "खरे नाव (ऐच्छिक)", "createacct-reason": "कारण", "createacct-reason-ph": "आपण दुसरे खाते कां बनवीत आहात", + "createacct-reason-help": "खाते निर्माण नोंदीत दाखविण्यात येणारा संदेश", "createacct-submit": "आपले खाते निर्माण करा", "createacct-another-submit": "खाते तयार करा", + "createacct-continue-submit": "खाते निर्माण सुरू ठेवा", + "createacct-another-continue-submit": "खाते निर्माण सुरू ठेवा", "createacct-benefit-heading": "{{SITENAME}} हे आपल्यासारख्याच लोकांनी बनविलेले आहे.", "createacct-benefit-body1": "{{PLURAL:$1|edit|संपादने}}", "createacct-benefit-body2": "{{PLURAL:$1|लेख}}", @@ -469,6 +478,7 @@ "nocookiesnew": "सदस्य खाते तयार झाले ,पण तुम्ही सनोंद-प्रवेशित(लॉग्डईन) नाहीत.{{SITENAME}} सदस्यांना सनोंद-प्रवेश देतांना त्यांचे स्मृतिशेष (कुकिज) वापरते.तुम्ही स्मृतिशेष सुविधा अनुपलब्ध ठेवली आहे.ती कृपया उपलब्ध करा,आणि नंतर तुमच्या नवीन सदस्य नावाने आणि परवलीने दाखल व्हा.", "nocookieslogin": "{{SITENAME}} सदस्यांना सनोंद-प्रवेश देतांना, त्यांच्या स्मृतिशेष (cookies) वापरते.तुम्ही स्मृतिशेष सुविधा अनुपलब्ध ठेवली आहे.स्मृतीशेष सुविधा कृपया उपलब्ध करा आणि सनोंद-प्रवेशासाठी पुन्हा प्रयत्न करा.", "nocookiesfornew": "हे सदस्य खाते अस्तित्वात नाही, त्यामुळे आम्ही त्याच्या स्रोताची खात्री करू शकलो नाही.\nतुमचे स्मृतिशेष उपलब्ध असण्याची खात्री करा,या पानास पुनर्भारण(रिलोड) करा किंवा पुन्हा प्रयत्न करा.", + "createacct-loginerror": "खाते यशस्वीरित्या निर्माण केल्या गेले आहे पण आपला आपोआप प्रवेश करता आला नाही.कृपया हे [[Special:UserLogin|मानवी प्रवेशा]]साठी वापरा.", "noname": "आपण वैध सदस्यनाम नमूद केले नाही.", "loginsuccesstitle": "सनोंद-प्रवेशित", "loginsuccess": "'''तुम्ही {{SITENAME}} वर \"$1\" नावाने सनोंद प्रवेशित आहात.'''", @@ -549,21 +559,22 @@ "botpasswords-insert-failed": "\"$1\" हे सांगकाम्याचे नाव जोडण्यात अयशस्वी. ते पूर्वीच जोडले होते काय?", "botpasswords-update-failed": "\"$1\" हे सांगकाम्याचे नाव अद्यतन करण्यात अयशस्वी. ते वगळण्यात आले होते काय?", "botpasswords-created-title": "सांगकाम्याचा परवलीचा शब्द तयार केल्या गेला.", - "botpasswords-created-body": "\"$1\" हा सांगकाम्याचा परवलीचा शब्द यशस्वीरित्या तयार केल्या गेला.", + "botpasswords-created-body": "{{GENDER:$2|सदस्य}} \"$2\" साठी, \"$1\" हा सांगकाम्याचा परवलीचा शब्द तयार केल्या गेला.", "botpasswords-updated-title": "सांगकाम्याचा परवलीचा शब्द अद्यतन केला", - "botpasswords-updated-body": "\"$1\" हा सांगकाम्याचा परवलीचा शब्द यशस्वीरित्या अद्यतन केल्या गेला.", + "botpasswords-updated-body": "{{GENDER:$2|सदस्य}} \"$2\" साठी,\"$1\" हा सांगकाम्याचा परवलीचा शब्द अद्यतन केल्या गेला.", "botpasswords-deleted-title": "सांगकाम्याचा परवलीचा शब्द वगळला", - "botpasswords-deleted-body": "सांगकाम्याचा परवलीचा शब्द \"$1\" वगळला.", - "botpasswords-newpassword": "$1द्वारे सनोंद प्रवेशास नविन परवलीचा शब्द $2आहे. कृपया याचा भविष्यातील संदर्भासाठी वापर करा.", + "botpasswords-deleted-body": "{{GENDER:$2|सदस्य}} \"$2\" साठी,\"$1\" या सांगकाम्याच्या नावाचा परवलीचा शब्द वगळला.", + "botpasswords-newpassword": "$1द्वारे सनोंद प्रवेशास नविन परवलीचा शब्द $2आहे. कृपया याची भविष्यातील संदर्भासाठी नोंद ठेवा.(जून्या सांगकाम्यांसाठी, ज्यांचेसाठी सदस्यनाम हे मूळ सदस्यनावच असणे आवश्यक आहे, आपण $3 हे सदस्यनाम म्हणून व $4 हा परवलीचा शब्द म्हणून वापरू शकता.)", "botpasswords-no-provider": "सांगकाम्यापरवलीशब्दसत्रपुरवठादार उपलब्ध नाही.", "botpasswords-restriction-failed": "सांगकाम्या परवलीच्या शब्दावर असलेले प्रतिबंध या सनोंद प्रवेशास अटकाव करीत आहेत.", "botpasswords-invalid-name": "नमूद केलेल्या सदस्यनावात सांगकाम्याचा परवलीचा शब्द-विभाजक (\"$1\") नाही.", "botpasswords-not-exist": "सदस्य \"$1\" चा \"$2\" नावाचा सांगकाम्या परवलीचा शब्द नाही.", "resetpass_forbidden": "परवलीचे शब्द बदलता येत नाहीत.", + "resetpass_forbidden-reason": "परवलीचे शब्द बदलता येऊ शकत नाहीत:$1", "resetpass-no-info": "या पानामध्ये थेट जाण्यासाठी तुम्हास सनोंद-प्रवेशित असावयास हवे.", "resetpass-submit-loggedin": "परवलीचा शब्द बदला", "resetpass-submit-cancel": "रद्द करा", - "resetpass-wrong-oldpass": "अवैध किंवा अस्थायी परवलीचा शब्द.\nकदाचित तुम्ही आधीच तो यशस्वीरीत्या बदलला असेल किंवा नवीन तात्पुरता परवलीचा शब्द मागवला असेल.", + "resetpass-wrong-oldpass": "अवैध किंवा अस्थायी परवलीचा शब्द.\nकदाचित तुम्ही आधीच तो बदलला असेल किंवा नवीन तात्पुरता परवलीचा शब्द मागवला असेल.", "resetpass-recycled": "सध्याच्या परवलीच्या शब्दापेक्षा काहीतरी वेगळ्या परवलीच्या शब्दाची पुनर्स्थापना करा.", "resetpass-temp-emailed": "विप्त्राद्वारे पाठविलेल्या तात्पुरत्या संकेताने आपण प्रवेश घेतला.सनोंद प्रवेश पूर्ण करण्यास, आपण येथे नविन परवलीच्या शब्दाची स्थापना करावयास हवी:", "resetpass-temp-password": "तात्पुरता परवलीचा शब्द", @@ -585,6 +596,8 @@ "passwordreset-emailelement": "सदस्यनाव: \n$1\n\nअस्थायी परवलीचा शब्द: \n$2", "passwordreset-emailsentemail": "जर हा विपत्रपत्ता आपल्या खात्याशी संलग्न असेल तर, परवलीच्या शब्दाच्या पुनर्स्थापनेबाबत एक विपत्र पाठवण्यात येईल.", "passwordreset-emailsentusername": "जर या सदस्यनावाशी संलग्न विपत्रपत्ता असेल तर, परवलीचा शब्द पुनर्स्थापनाबाबत विपत्र पाठविल्या जाईल.", + "passwordreset-invalidemail": "अवैध विपत्रपत्ता", + "passwordreset-nodata": "सदस्यनाव अथवा विपत्रपता यापैकी काहीच पुरविल्या गेले नाही", "changeemail": "विपत्रपत्ता बदला किंवा हटवा", "changeemail-header": "आपला विपत्रपत्ता बदलण्यास हे आवेदन पूर्ण करा.जर आपणास आपल्या खात्याशी संलग्न कोणताही विपत्रपत्ता हटवायचा असेल तर,आवेदन सादर करण्यापूर्वी, नविन विपत्रपत्त्यासाठी असलेली जागा कोरी ठेवा.", "changeemail-no-info": "हे पान थेट बघण्यासठी तुम्हाला सनोंद-प्रवेशित असावे लागेल.", @@ -596,7 +609,7 @@ "changeemail-submit": "ईमेल बदला", "changeemail-throttled": "तुम्ही नुकतेच सनोंद- प्रवेशासाठी अनेक प्रयत्न केले आहेत.\nकृपया, पुन्हा प्रयत्न करण्याआधी $1 थोडी उसंत घ्या.", "changeemail-nochange": "कृपया वेगळा नविन विपत्रपत्ता टाका.", - "resettokens": "ओळखचिन्ह(टोकन) पुनर्स्थापित करा", + "resettokens": "ओळखचिन्ह (टोकन) पुनर्स्थापित करा", "resettokens-text": "येथे आपल्या खात्यात असलेला व्यक्तिगत मजकूरापर्यंत पोचण्यासाठी आपण ओळखचिन्ह(टोकन) पुनर्स्थापित करू शकता.\nआपण जर तो अपघाताने कोणासमवेत सहभागीला असेल किंवा आपले खात्याची आपण तडजोड केली असल्यास, हे करावयास हवे.", "resettokens-no-tokens": "पुनर्स्थापित करण्यासाठी कोणतीही ओळखचिन्हे नाहीत.", "resettokens-tokens": "ओळखचिन्हे:", @@ -709,7 +722,7 @@ "nocreate-loggedin": "येथे तुम्हाला नवीन पाने बनवण्याची परवानगी नाही.", "sectioneditnotsupported-title": "विभाग संपादन समर्थित नाही.", "sectioneditnotsupported-text": "या लेखामध्ये विभाग संपादन समर्थित नाही.", - "permissionserrors": "परवानगीस नकार", + "permissionserrors": "परवानगी त्रुटी", "permissionserrorstext": "खालील{{PLURAL:$1|कारणामुळे|कारणांमुळे}} तुम्हाला तसे करण्याची परवानगी नाही:", "permissionserrorstext-withaction": "तुम्हाला $2 क्रियेची परवानगी नाही, खालील {{PLURAL:$1|कारणासाठी|कारणांसाठी}}:", "contentmodelediterror": "ही आवृत्ती आपण संपादू शकत नाही कारण त्याचा आशय-आराखडा (कंटेन्ट मॉडेल)$1 आहे व सध्याच्या $2 पानाचा आशय आराखडा वेगळा आहे.", @@ -747,6 +760,7 @@ "post-expand-template-argument-warning": "ईशारा: या पानावर असा एकतरी साचा आहे जो वाढविल्यास खूप मोठा होईल.\nअसे साचे वगळण्यात आलेले आहेत.", "post-expand-template-argument-category": "अशी पाने ज्यांच्यामध्ये साचे वगळलेले आहेत", "parser-template-loop-warning": "साचा चक्र मिळाले: [[$1]]", + "template-loop-category": "साचा वलय असणारी पाने", "template-loop-category-desc": "या पानात एक साचा वलय आहे, म्हणजे, तो साचा जो स्वतःसच वारंवार हाक देतो.", "parser-template-recursion-depth-warning": "साचा पुनरावर्तन खोली मर्यादा ओलांडली ($1)", "language-converter-depth-warning": "भाषा रुपांतरण खोली मर्यादा ओलांडली ($1)", @@ -809,7 +823,7 @@ "rev-suppressed-unhide-diff": "या फरकाच्या आवृत्तींपैकी एक आवृत्ती '''दडपण्यात आली आहे'''. [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} दडपण्याच्या नोंदी] येथे अधिक तपशिल मिळू शकेल.जर आपणास काम पुढे चालू ठेवायचे असेल तर, आपण आत्ता सुद्धा [$1 हा फरक बघु शकता].", "rev-deleted-diff-view": "या फरकाच्या आवृत्तींपैकी एक आवृत्ती '''वगळण्यात आली आहे'''. आपण हा फरक बघु शकता; [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} वगळण्याच्या नोंदी] येथे अधिक तपशिल मिळू शकेल.", "rev-suppressed-diff-view": "या फरकाच्या आवृत्तींपैकी एक आवृत्ती '''दडपण्यात आली आहे'''. आपण हा फरक बघु शकता; [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} दडपण्याच्या नोंदी] येथे अधिक तपशिल मिळू शकेल.", - "rev-delundel": "दाखवा/लपवा", + "rev-delundel": "दृश्यता बदला", "rev-showdeleted": "दाखवा", "revisiondelete": "आवृत्त्या वगळा/पुनर्स्थापित करा", "revdelete-nooldid-title": "अवैध लक्ष्य आवृत्ती", @@ -876,6 +890,8 @@ "mergehistory-fail-bad-timestamp": "वेळठसा अवैध आहे.", "mergehistory-fail-invalid-source": "स्रोत पान अवैध आहे.", "mergehistory-fail-invalid-dest": "लक्ष्य पान अवैध आहे.", + "mergehistory-fail-permission": "इतिहास एकत्रिकरणास अपूऱ्या परवानग्या", + "mergehistory-fail-self-merge": "स्रोत व गंतव्य पाने सारखीच आहेत.", "mergehistory-fail-toobig": "इतिहास एकत्रिकरण करणे शक्य झाले नाही कारण $1 मर्यादेपेक्षा अधिक {{PLURAL:$1|आवृत्ती|आवृत्त्या}} स्थानांतरीत केल्या जातील.", "mergehistory-no-source": "स्रोत पान $1 अस्तित्वात नाही.", "mergehistory-no-destination": "लक्ष्य पान $1 अस्तित्वात नाही.", @@ -953,6 +969,7 @@ "search-external": "बाह्य शोध", "searchdisabled": "{{SITENAME}} शोध अनुपलब्ध केला आहे.तो पर्यंत गूगलवरून शोध घ्या.{{SITENAME}}च्या मजकुराची त्यांची सूचिबद्धता शिळी असण्याची शक्यता असू शकते हे लक्षात घ्या.", "search-error": "शोध घेतांना घडलेली त्रुटी:$1", + "search-warning": "शोधतांना इशारा देण्यात आलेला आहे:$1", "preferences": "पसंतीक्रम", "mypreferences": "पसंतीक्रम", "prefs-edits": "संपादनांची संख्या:", @@ -1012,6 +1029,8 @@ "timezoneregion-indian": "हिंदी महासागर", "timezoneregion-pacific": "प्रशांत महासागर", "allowemail": "इतर सदस्यांकडून माझ्या ई-मेल पत्त्यावर ई-मेल येण्यास मुभा द्या", + "email-allow-new-users-label": "एकदम नवीन सदस्यांच्या विपत्राला परवानगी द्या", + "email-blacklist-label": "मला विपत्र पाठविण्यास या सदस्यांना रोका:", "prefs-searchoptions": "शोधा", "prefs-namespaces": "नामविश्वे", "default": "अविचल", @@ -1024,6 +1043,7 @@ "youremail": "विपत्र:", "username": "{{GENDER:$1|सदस्यनाम}}:", "prefs-memberingroups": "{{PLURAL:$1|गटातील|गटांतील}}{{GENDER:$2|सदस्य}} :", + "group-membership-link-with-expiry": "$1 ($2 पर्यंत)", "prefs-registration": "नोंदणीची वेळ:", "yourrealname": "खरे नाव:", "yourlanguage": "भाषा:", @@ -1068,15 +1088,23 @@ "editusergroup": "सदस्य गटांचे भारण करा", "editinguser": "या {{GENDER:$1|सदस्या}}चे सदस्य-अधिकारात बदल केला जात आहे[[User:$1|$1]] $2", "userrights-editusergroup": "{{GENDER:$1|सदस्य}} गट संपादित करा", + "userrights-viewusergroup": "{{GENDER:$1|सदस्य}}गट बघा", "saveusergroups": "{{GENDER:$1|सदस्य}} गट जतन करा", "userrights-groupsmember": "याचा सभासद:", "userrights-groupsmember-auto": "याचा अव्यक्त सदस्य:", - "userrights-groups-help": "तुम्ही एखाद्या सदस्याचे गट सदस्यत्व बदलू शकता:\n* निवडलेला चौकोन म्हणजे सदस्य त्या गटात आहे.\n* न निवडलेला चौकोन म्हणजे सदस्य त्या गटात नाही.\n* एक * चा अर्थ तुम्ही एकदा समावेश केल्यानंतर तो गट बदलू शकत नाही, किंवा काढल्यानंतर समावेश करू शकत नाही.", + "userrights-groups-help": "तुम्ही एखाद्या सदस्याचे गट सदस्यत्व बदलू शकता:\n* निवडलेला चौकोन म्हणजे सदस्य त्या गटात आहे.\n* न निवडलेला चौकोन म्हणजे सदस्य त्या गटात नाही.\n* एक * चा अर्थ तुम्ही एकदा समावेश केल्यानंतर तो गट बदलू शकत नाही, किंवा काढल्यानंतर समावेश करू शकत नाही.\n* एक # हे दर्शविते कि या सदस्यगटाच्या अधिकाराच्या कालावधीची निवृत्ती आपण मागे आणू शकता; ती पुढे नेऊ शकत नाही.", "userrights-reason": "कारण:", "userrights-no-interwiki": "इतर विकींवरचे सदस्य अधिकार बदलण्याची परवानगी तुम्हाला नाही.", "userrights-nodatabase": "विदा $1 अस्तित्वात नाही अथवा स्थानिक नाही.", "userrights-changeable-col": "गट जे तुम्ही बदलू शकता", "userrights-unchangeable-col": "गट जे तुम्ही बदलू शकत नाही", + "userrights-expiry-current": "$1 ला संपते", + "userrights-expiry-none": "समाप्त होत नाही", + "userrights-expiry": "समाप्त होते:", + "userrights-expiry-existing": "सध्याचा समाप्ती वेळ:$3, $2", + "userrights-expiry-othertime": "इतर वेळ:", + "userrights-invalid-expiry": "गट \"$1\"साठी समाप्ती वेळ अवैध आहे.", + "userrights-expiry-in-past": "गट \"$1\"साठी असलेली समाप्ती वेळ निघून गेली.", "userrights-conflict": "बदलाबाबत सदस्य-हक्क विसंवाद !कृपया आपले बदल पुन्हा पुनरावलोकित व नक्की करा.", "group": "गट:", "group-user": "सदस्य", @@ -1097,7 +1125,7 @@ "grouppage-bot": "{{ns:project}}:सांगकाम्या", "grouppage-sysop": "{{ns:project}}:प्रचालक", "grouppage-bureaucrat": "{{ns:project}}:स्विकृती अधिकारी", - "grouppage-suppress": "{{ns:project}}:झापडबंद", + "grouppage-suppress": "{{ns:project}}:दडपा", "right-read": "पृष्ठे वाचा", "right-edit": "पाने संपादा", "right-createpage": "पृष्ठे तयार करा (जी चर्चापानांव्यतिरिक्त आहेत)", @@ -1167,11 +1195,16 @@ "right-siteadmin": "माहितीसाठ्याला कुलूप लावा अथवा काढा", "right-override-export-depth": "जोडलेल्या पानांचा पाचव्या पातळीपर्यंत अंतर्भाव करुन पाने निर्यात करा", "right-sendemail": "इतर सदस्यांना विपत्रे पाठवा", - "right-managechangetags": "डाटाबेस मधून [[Special:Tags|खूणपताका]] तयार करा किंवा वगळा", + "right-managechangetags": "[[Special:Tags|खूणपताका]] तयार करा किंवा वगळा", "right-applychangetags": "कोणाच्याही बदलास [[Special:Tags|खूणपताका]] जोडा", "right-changetags": "वैयक्तिक आवृत्त्यांना व नोंद प्रवेष्ट्यांना, आहेतुक(arbitrary) [[Special:Tags|खूणपताका]] जोडा अथवा हटवा", + "right-deletechangetags": "विदागारातून [[Special:Tags|खूणपताका]] वगळा", "grant-generic": "\"$1\" अधिकार गठ्ठा", "grant-group-email": "विपत्र पाठवा", + "grant-group-customization": "अनुकूलन व पसंतीक्रम", + "grant-group-administration": "प्रशासकीय क्रिया करा", + "grant-group-private-information": "आपल्याबद्दलच्या खाजगी माहितीस पोहोचा", + "grant-group-other": "किरकोळ क्रिया", "grant-blockusers": "सदस्यांना प्रतिबंधित/अप्रतिबंधित करा", "grant-createaccount": "खाते तयार करा", "grant-createeditmovepage": "पाने बनवा,संपादा व स्थानांतरण करा", @@ -1257,6 +1290,9 @@ "recentchanges-legend": "अलीकडील बदलाऐवजी पर्याय", "recentchanges-summary": "या विकिवर झालेल्या सर्वात अलीकडील बदलांचा या पानावर मागोवा घ्या.", "recentchanges-noresult": "नमुद कालावधीतील कोणतेही बदला या निकषांशी जुळत नाहीत.", + "recentchanges-timeout": "हा शोध कालबाह्य झाला आहे. आपणास वेगळ्या शोधासाठी प्रयत्न करावयाची ईच्छा असेल.", + "recentchanges-network": "तांत्रिक कारणांमुळे, निकालांचे भारण होऊ शकले नाही. पानास तरोताजे (रिफ्रेश) करुन प्रयत्न करा.", + "recentchanges-notargetpage": "त्या पानाशी संबंधित बदल बघण्यास, वर पानाचे नाव टाका.", "recentchanges-feed-description": "या रसदीत,या विकिवर झालेल्या सर्वात अलीकडील बदलांचा मागोवा घ्या.", "recentchanges-label-newpage": "या संपादनाने नवीन पान तयार झाले", "recentchanges-label-minor": "हे एक किरकोळ संपादन आहे", @@ -1267,26 +1303,32 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|नविन पानांची यादी]] हेही पाहा)", "recentchanges-legend-plusminus": "(''±१२३'')", "recentchanges-submit": "दाखवा", + "rcfilters-tag-remove": "$1 हटवा", "rcfilters-legend-heading": "लघुरूपांची यादी:", "rcfilters-other-review-tools": "पुनरावलोकनाची इतर साधने", "rcfilters-group-results-by-page": "पानानुसार गट निकाल", "rcfilters-activefilters": "सक्रिय गाळण्या", "rcfilters-advancedfilters": "प्रगत गाळण्या", "rcfilters-limit-title": "दाखविण्यासाठीचे निकाल", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|बदल}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|बदल}},$2", "rcfilters-date-popup-title": "शोधावयाचा कालावधी", "rcfilters-days-title": "अलीकडील दिवस", "rcfilters-hours-title": "अलीकडील तास", "rcfilters-days-show-days": "$1 {{PLURAL:$1|दिवस}}", + "rcfilters-days-show-hours": "$1 {{PLURAL:$1|तास}}", "rcfilters-highlighted-filters-list": "झोतामधे:$1", "rcfilters-quickfilters": "जतन केलेल्या गाळण्या", - "rcfilters-quickfilters-placeholder-title": "अद्याप कोणतेही दुवे जतन केल्या गेले नाहीत", + "rcfilters-quickfilters-placeholder-title": "अद्याप कोणत्याही गाळण्या जतन केल्या गेल्या नाहीत", "rcfilters-quickfilters-placeholder-description": "आपल्या गाळणीच्या मांडण्या जतन करण्यासाठी व नंतर त्यांना वापरण्यास, खाली सक्रिय गाळण्यांच्या क्षेत्रात असलेला बुकमार्क आयकॉन टिचका.", "rcfilters-savedqueries-defaultlabel": "जतन केलेल्या गाळण्या", + "rcfilters-savedqueries-rename": "नाव बदला", "rcfilters-savedqueries-setdefault": "अविचल म्हणून स्थापा", + "rcfilters-savedqueries-unsetdefault": "अविचल म्हणून हटवा", + "rcfilters-savedqueries-remove": "पुन्हा स्थानांतरीत करा", "rcfilters-savedqueries-new-name-label": "नाव", "rcfilters-savedqueries-new-name-placeholder": "या गाळणीच्या उद्देशाचे वर्णन करा", "rcfilters-savedqueries-apply-label": "गाळणी तयार करा", + "rcfilters-savedqueries-apply-and-setdefault-label": "अविचल गाळणी तयार करा", "rcfilters-savedqueries-cancel-label": "रद्द करा", "rcfilters-savedqueries-add-new-title": "सध्या असलेल्या गाळण्यांच्या मांडण्या जतन करा", "rcfilters-savedqueries-already-saved": "या गाळण्या पूर्वीच जतन केल्या आहेत.नवीन जतन केलेली गाळणी तयार करण्यासाठी आपल्या मांडण्या बदलवा.", @@ -1300,14 +1342,16 @@ "rcfilters-filterlist-whatsthis": "हे कसे काम करते?", "rcfilters-filterlist-feedbacklink": "या (नवीन) गाळणी साधनांबद्दल आपले काय म्हणणे/विचार आहेत ते आम्हास सांगा", "rcfilters-highlightbutton-title": "निकालांवर झोत टाका", + "rcfilters-highlightmenu-title": "एक रंग निवडा", "rcfilters-highlightmenu-help": "या गुणधर्मासाठी झोताचा रंग निवडा", "rcfilters-filterlist-noresults": "कोणतीच गाळणी सापडली नाही", + "rcfilters-noresults-conflict": "निकाल सापडले नाहीत कारण शोध-निकष विवादास्पद आहेत", "rcfilters-filtergroup-authorship": "योगदानांचे लेखक", "rcfilters-filter-editsbyself-label": "आपले स्वतःचे बदल", - "rcfilters-filter-editsbyself-description": "आपली संपादने", + "rcfilters-filter-editsbyself-description": "आपली स्वतःची संपादने", "rcfilters-filter-editsbyother-label": "इतरांचे बदल", - "rcfilters-filter-editsbyother-description": "इतर सदस्यांनी तयार केलेली संपादने (आपण नाही).", - "rcfilters-filtergroup-userExpLevel": "अनुभवाचा स्तर (फक्त नोंदणीकृत सदस्यांसाठीच)", + "rcfilters-filter-editsbyother-description": "आपल्या स्वतःच्या संपादनांशिवायचे सर्व बदल.", + "rcfilters-filtergroup-userExpLevel": "सदस्य नोंदणी व अनुभवाचा स्तर", "rcfilters-filter-user-experience-level-registered-label": "नोंदणीकृत", "rcfilters-filter-user-experience-level-registered-description": "प्रवेशलेले संपादक.", "rcfilters-filter-user-experience-level-unregistered-label": "अ-नोंदणीकृत", @@ -1323,6 +1367,11 @@ "rcfilters-filter-bots-description": "स्वयंचलित साधनांनी केलेली संपादने.", "rcfilters-filter-humans-label": "मानव (सांगकाम्या नाही)", "rcfilters-filter-humans-description": "मानवी संपादकांनी केलेली संपादने.", + "rcfilters-filtergroup-reviewstatus": "पुनरावलोकन स्थिती", + "rcfilters-filter-patrolled-label": "पहारा दिला", + "rcfilters-filter-patrolled-description": "पहारा दिला म्हणून खूण केलेली संपादने,", + "rcfilters-filter-unpatrolled-label": "पहारा दिला नाही", + "rcfilters-filter-unpatrolled-description": "पहारा दिला म्हणून खूण न-केलेली संपादने", "rcfilters-filtergroup-significance": "लक्षणीयता", "rcfilters-filter-minor-label": "किरकोळ संपादने", "rcfilters-filter-minor-description": "लेखकाने 'किरकोळ' अशी खूण केलेली संपादने", @@ -1335,10 +1384,12 @@ "rcfilters-filter-watchlist-watchednew-description": "बदल झाल्यानंतर, आपण भेट न दिल्यापासून झालेले निरीक्षणसूचीच्या पानांतील बदल", "rcfilters-filter-watchlist-notwatched-label": "निरीक्षणसूचीत नसलेली", "rcfilters-filter-watchlist-notwatched-description": "आपल्या निरीक्षणसूचीतील बदलांशिवाय इतर सर्वकाही.", + "rcfilters-filtergroup-watchlistactivity": "निरीक्षणसूची क्रिया", "rcfilters-filter-watchlistactivity-unseen-label": "न-बघितलेले बदल", "rcfilters-filter-watchlistactivity-seen-label": "बघितलेले बदल", "rcfilters-filtergroup-changetype": "बदलाचा प्रकार", "rcfilters-filter-pageedits-label": "पृष्ठ संपादने", + "rcfilters-filter-pageedits-description": "विकिआशय,चर्चा,वर्गवर्णन... संपादने", "rcfilters-filter-newpages-label": "नवीन पान-निर्माण", "rcfilters-filter-newpages-description": "नविन पान निर्माण करणारी संपादने.", "rcfilters-filter-categorization-label": "वर्गात करण्यात येणारा बदल", @@ -1357,7 +1408,12 @@ "rcfilters-view-tags-help-icon-tooltip": "खूण केलेल्या संपादनांबाबत अधिक जाणून घ्या", "rcfilters-liveupdates-button": "सजीव अद्यतने", "rcfilters-liveupdates-button-title-on": "सजीव अद्यतने बंद करा", + "rcfilters-liveupdates-button-title-off": "घडल्याबरोबर, नवीन बदल दाखवा", + "rcfilters-watchlist-markseen-button": "सर्व बदल बघितले म्हणून खूण करा", + "rcfilters-watchlist-edit-watchlist-button": "आपल्या निरीक्षणसूचीमधील पानांची यादी संपादा", + "rcfilters-target-page-placeholder": "पानाचे नाव (अथवा वर्ग) टाका", "rcnotefrom": "खाली {{PLURAL:$5|हा बदल आहे|हे बदल आहेत}} $3, $4पासून ते($1पर्यंतचे बदल दाखविले आहेत).", + "rclistfromreset": "दिनांक निवडीची पुनर्स्थापना करा", "rclistfrom": "$2,$3 पासून सुरुवात करुन, नविन केल्या गेलेले बदल दाखवा.", "rcshowhideminor": "छोटे बदल $1", "rcshowhideminor-show": "दाखवा", @@ -1469,6 +1525,7 @@ "file-deleted-duplicate-notitle": "या संचिकेसम असलेली दुसरी संचिका मागे वगळण्यात आलेली आहे व त्या शीर्षकाचे दमन केले आहे.आपण,त्या संचिकेच्या पुनर्-अपभारणापूर्वी, ज्या कोणास दमन केलेली संचिका बघण्याचे अधिकार असतील त्यास, या स्थितीच्या पुनर्विलोकनाची विनंती करा.", "uploadwarning": "चढवताना सूचना", "uploadwarning-text": "कृपया खालील संचिका वर्णन संपादित करून पुनर्प्रयत्न करा.", + "uploadwarning-text-nostash": "कृपया संचिकेचे पुनर्भारण करा, खाली असलेले वर्णन बदला व पुन्हा प्रयत्न करा.", "savefile": "संचिका जतन करा", "uploaddisabled": "संचिका चढविण्यास बंदी घालण्यात आलेली आहे.", "copyuploaddisabled": "आंतरजालपत्त्याद्वारे चढवणे प्रतिबंधित आहे.", @@ -1606,7 +1663,7 @@ "listfiles_size": "आकार (बाईट्स)", "listfiles_description": "वर्णन", "listfiles_count": "आवृत्त्या", - "listfiles-show-all": "या चित्राच्या जून्या आवृत्त्या अंतर्भूत करा.", + "listfiles-show-all": "या संचिकेच्या जून्या आवृत्त्या अंतर्भूत करा.", "listfiles-latestversion": "सध्याची आवृत्ती", "listfiles-latestversion-yes": "हो", "listfiles-latestversion-no": "नाही", @@ -1706,6 +1763,8 @@ "pageswithprop-legend": "पृष्ठ गुणधर्म असणारी पाने", "pageswithprop-text": "या पानावर अश्या पानांची यादी आहे जे एक विशिष्ट 'पृष्ठ गुणधर्म' वापरतात.", "pageswithprop-prop": "गुणधर्माचे नाव:", + "pageswithprop-reverse": "उलट्या क्रमाने निवडा", + "pageswithprop-sortbyvalue": "गुणधर्माच्या मूल्यानुसार निवडा", "pageswithprop-submit": "चला", "pageswithprop-prophidden-long": "मोठ्या मजकूराच्या गुणधर्माची किंमत लपविलेली आहे ($1)", "pageswithprop-prophidden-binary": "बायनरी गुणधर्माची किंमत लपविलेली आहे ($1)", @@ -1808,8 +1867,10 @@ "apihelp": "एपीआय साहाय्य", "apihelp-no-such-module": "मॉड्यूल \"$1\" सापडत नाही.", "apisandbox": "एपीआय(API) धूळपाटी", - "apisandbox-api-disabled": "या संकेतस्थळावर एपीआय अक्षम केला आहे.", + "apisandbox-jsonly": "ही एपीआय धूळपाटी वापरण्यास जावास्क्रिप्ट आवश्यक आहे.", + "apisandbox-api-disabled": "या संकेतस्थळावर हा एपीआय अक्षम केला आहे.", "apisandbox-intro": "मिडियाविकि वेब सर्व्हीस एपीआय वर प्रयोग करण्यासाठी या पानाचा वापर करा. एपीआय वापरण्याच्या अधिक तपशिलासाठी [[mw:API:Main page| एपीआय दस्ताऐवजीकरण]] हे पान बघा. उदाहरणार्थ:[https://www.mediawiki.org/wiki/API#A_simple_example मुख्य पानाचा आशय मिळवा]. अधिक उदाहरणे बघण्यास एखादी क्रिया निवडा.\n\nयाची नोंद घ्या कि ही धूळपाटी असली तरी, या पानावर आपण केलेल्या क्रियांद्वारे विकिवर फेरफार होऊ शकतो.", + "apisandbox-unfullscreen": "पान दाखवा", "apisandbox-submit": "विनंती करा", "apisandbox-reset": "हटवा", "apisandbox-examples": "उदाहरणे", @@ -1817,6 +1878,7 @@ "apisandbox-request-url-label": "'यूआरएल'ची विनंती करा:", "apisandbox-request-time": "विनंती वेळ:{{PLURAL:$1|$1 मिलीसेकंद}}", "apisandbox-multivalue-all-namespaces": "$1 (सर्व नामविश्वे)", + "apisandbox-multivalue-all-values": "$1 (सर्व किंमती)", "booksources": "पुस्तक स्रोत", "booksources-search-legend": "पुस्तक स्रोत शोधा", "booksources-search": "शोधा", @@ -1831,6 +1893,11 @@ "logempty": "नोंदीत अशी बाब नाही.", "log-title-wildcard": "या मजकुरापासून सुरू होणारी शीर्षके शोधा.", "showhideselectedlogentries": "निवडलेले लॉग पहाणे /लपवणे", + "log-edit-tags": "निवडलेल्या नोंदींतील खूणपताकांचे संपादन करा", + "checkbox-select": "निवडा:$1", + "checkbox-all": "सर्व", + "checkbox-none": "काहीही नाही", + "checkbox-invert": "उलटवा", "allpages": "सर्व पृष्ठे", "nextpage": "पुढील पान ($1)", "prevpage": "मागील पान ($1)", @@ -1957,7 +2024,7 @@ "wlshowlast": "मागील $1 तास $2 दिवस दाखवा", "watchlist-hide": "लपवा", "watchlist-submit": "दर्शवा", - "wlshowtime": "शेवटचे दाखवा:", + "wlshowtime": "दर्शविण्याचा कालावधी:", "wlshowhideminor": "छोटी संपादने", "wlshowhidebots": "सांगकामे", "wlshowhideliu": "नोंदणीकृत सदस्य", @@ -1981,10 +2048,11 @@ "enotif_body_intro_moved": "{{SITENAME}} हे $1 या लेखनामाचे पान या $PAGEEDITDATE (या संपादनाच्या तारखेस)$2 ने {{GENDER:$2|हलविले.}} अद्यतन आवृत्तीसाठी कृपया $3 बघा.", "enotif_body_intro_restored": "{{SITENAME}} हे $1 या लेखनामाचे पान या $PAGEEDITDATE (या संपादनाच्या तारखेस)$2 ने {{GENDER:$2|पुनर्स्थापित केले.}}अद्यतन आवृत्तीसाठी कृपया $3 बघा.", "enotif_body_intro_changed": "{{SITENAME}} हे $1 या लेखनामाचे पान या $PAGEEDITDATE (या संपादनाच्या तारखेस)$2 ने {{GENDER:$2|बदलविले.}} अद्यतन आवृत्तीसाठी कृपया $3 बघा.", - "enotif_lastvisited": "तुमच्या शेवटच्या भेटीनंतरचे बदल बघण्यासाठी $1 पहा.", - "enotif_lastdiff": "हा बदल पहाण्याकरिता $1 पहा.", + "enotif_lastvisited": "तुमच्या शेवटच्या भेटीनंतरचे बदल बघण्यासाठी, $1 बघा", + "enotif_lastdiff": "हा बदल पहाण्याकरिता, $1 पहा", "enotif_anon_editor": "अनामिक सदस्य $1", "enotif_body": "प्रिय $WATCHINGUSERNAME,\n\n{{SITENAME}}या लेखनावाचे $PAGETITLE (या मथळ्याचे) पान $PAGEEDITOR ने $PAGEEDITDATE ( या तारखेस) $CHANGEDORCREATED तयार केले किंवा बदलले आहे. सध्याची आवृत्ती पाहण्यासाठी खालील दुव्यावर टिचकी मारा.\n$PAGETITLE_URL\n\n$NEWPAGE\n\nसंपादकाचा आढावा : $PAGESUMMARY $PAGEMINOREDIT\n\nया संपादकास संपर्क करा :\nविपत्र: $PAGEEDITOR_EMAIL\nविकि: $PAGEEDITOR_WIKI\n\nतुम्ही सनोंद प्रवेशुन या पानास भेट देत नाही तोपर्यंत,या पानावर पुढे होणाऱ्या कोणत्याही क्रियांची इतर कोणतीही वेगळी अधिसूचना तुम्हाला देण्यात येणार नाही. तुमच्या निरीक्षणसूचीमध्ये असलेल्या पानांच्या सूचना-पताकांचे तुम्ही पुर्नयोजन करु शकता.\n\nतुमची मैत्रीपूर्ण {{SITENAME}} सूचना प्रणाली\n\n--\n\nतुमच्या निरीक्षणसूचीमध्ये पानांची मांडणावळ (कोंदण)तुम्ही बदलू शकता, त्यासाठी {{canonicalurl:{{#special:EditWatchlist}}}} या पानावर जा.\n\nहे पान तुमच्या निरीक्षणसूचीमधून काढून टाकण्यासाठी खालील दुव्यावर टिचकी मारा.\n$UNWATCHURL\n\nपुढील साहाय्य आणि प्रतिक्रिया:\n$HELPPAGE", + "enotif_minoredit": "हा एक छोटा बदल आहे", "created": "तयार केले", "changed": "बदलले", "deletepage": "पान वगळा", @@ -2028,7 +2096,9 @@ "sessionfailure-title": "सत्र त्रुटी", "sessionfailure": "तुमच्या दाखल सत्रात काही समस्या दिसते;सत्र अपहारणापासून \nवाचविण्याचे दृष्टीने ही कृती रद्द केल्या गेली आहे.कृपया आपल्या विचरकाच्या \"back\" कळीवर टिचकी मारा आणि तुम्ही ज्या पानावरून आला ते पुन्हा चढवा,आणि परत प्रयत्न करा.", "changecontentmodel": "पानाचा आशय नमूना (कंटेंट मॉडेल) बदला", - "changecontentmodel-title-label": "लेखपान शीर्ष", + "changecontentmodel-legend": "आशय-नमूना बदला", + "changecontentmodel-title-label": "लेखपान शीर्षक", + "changecontentmodel-model-label": "नवीन आशय-नमूना", "changecontentmodel-reason-label": "कारण:", "changecontentmodel-submit": "बदला", "changecontentmodel-success-title": "आशय नमूना बदलल्या गेला", @@ -2118,6 +2188,7 @@ "undelete-search-title": "वगळलेली पाने शोधा", "undelete-search-box": "वगळलेली पाने शोधा", "undelete-search-prefix": "पासून सुरू होणारी पाने दाखवा:", + "undelete-search-full": "हे असणारी पान शीर्षके दाखवा:", "undelete-search-submit": "शोध", "undelete-no-results": "वगळलेल्यांच्या विदांमध्ये जुळणारी पाने सापडली नाहीत.", "undelete-filename-mismatch": "$1 वेळेचे, वगळलेल्या संचिकेचे आवर्तन उलटवता येत नाही: नजुळणारे संचिकानाव", @@ -2154,13 +2225,14 @@ "sp-contributions-uploads": "अपभारणे", "sp-contributions-logs": "नोंदी", "sp-contributions-talk": "चर्चा", - "sp-contributions-userrights": "सदस्य अधिकार व्यवस्थापन", + "sp-contributions-userrights": "{{GENDER:$1|सदस्य}}अधिकार व्यवस्थापन", "sp-contributions-blocked-notice": "हा सदस्य सध्या प्रतिबंधित आहे.\nसर्वांत नवीन प्रतिबंधन यादी खाली संदर्भासाठी दिली आहे:", "sp-contributions-blocked-notice-anon": "हा अंकपत्ता सध्या प्रतिबंधित आहे.\nखाली, सर्वांत नवीनतम प्रतिबंधन नोंदप्रविष्टी संदर्भासाठी दिली आहे:", "sp-contributions-search": "योगदान शोधयंत्र", "sp-contributions-username": "आंतरजाल अंकपत्ता किंवा सदस्यनाम:", "sp-contributions-toponly": "केवळ नवीनतम आवर्तने असलेलीच संपादने दाखवा", "sp-contributions-newonly": "ज्याने नविन पान तयार झाले, केवळ अशीच संपादने दाखवा", + "sp-contributions-hideminor": "छोटी संपादने लपवा", "sp-contributions-submit": "शोध", "whatlinkshere": "येथे काय जोडले आहे", "whatlinkshere-title": "\"$1\" ला जुळलेली पाने", @@ -2211,17 +2283,21 @@ "ipb-unblock": "सदस्यनाव आणि अंकपत्त्यावरचे प्रतिबंधन उठवा", "ipb-blocklist": "सध्याचे प्रतिबंध पहा", "ipb-blocklist-contribs": "{{GENDER:$1|$1}}साठीचे योगदान", - "unblockip": "अंकपत्ता सोडवा", + "ipb-blocklist-duration-left": "$1 सोडून गेला", + "unblockip": "सदस्यप्रतिबंध काढा", "unblockiptext": "खाली दिलेला फॉर्म वापरून पूर्वी अडवलेल्या अंकपत्त्याला लेखनासाठी आधिकार द्या.", "ipusubmit": "हा पत्ता सोडवा", "unblocked": "[[User:$1|$1]] वरचे प्रतिबंध उठवले आहेत", "unblocked-range": "$1 याच्यावरील प्रतिबंधन काढले आहे", "unblocked-id": "प्रतिबंध $1 काढले", + "unblocked-ip": "[[Special:Contributions/$1|$1]] वरील प्रतिबंध काढला आहे", "blocklist": "प्रतिबंधित केलेले सदस्य", "autoblocklist": "स्वयंचलितरोध", + "autoblocklist-submit": "शोधा", "autoblocklist-legend": "स्वयंचलितरोध यादी", "autoblocklist-localblocks": "स्थानिक {{PLURAL:$1|स्वयंचलितरोध}}", "autoblocklist-total-autoblocks": "स्वयंचलित रोधांची एकूण संख्या:$1", + "autoblocklist-empty": "स्वयंरोध यादी रिकामी आहे.", "autoblocklist-otherblocks": "इतर {{PLURAL:$1|स्वयंचलितरोध}}", "ipblocklist": "प्रतिबंधित केलेले सदस्य", "ipblocklist-legend": "प्रतिबंधीत सदस्य शोधा", @@ -2269,6 +2345,7 @@ "block-log-flags-hiddenname": "सदस्यनाम लपवलेले आहे", "range_block_disabled": "प्रचालकांची पल्ला बंधने घालण्याची क्षमता अनुपलब्ध केली आहे.", "ipb_expiry_invalid": "अयोग्य समाप्ती काळ.", + "ipb_expiry_old": "संपण्याचा कालावधी उलटून गेलेला आहे.", "ipb_expiry_temp": "लपविलेले सदस्यनाम प्रतिबंधन कायमस्वरूपी असले पाहिजे.", "ipb_hide_invalid": "हे खात दाबण्यासाठी असमर्थ; त्यात {{PLURAL:$1|एक संपादन आहे|$1 संपादने आहेत}}.", "ipb_already_blocked": "\"$1\" आधीच अवरूद्ध केलेले आहे.", @@ -2301,7 +2378,8 @@ "lockdbsuccesstext": "विदागारास ताळे ठोकण्यात आले आहे.
    \nतुमच्याकडून अनुरक्षण पूर्ण झाल्यानंतर [[Special:UnlockDB|ताळे उघडण्याचे]] लक्षात ठेवा.", "unlockdbsuccesstext": "विदागाराचे ताळे उघडण्यात आले आहे.", "lockfilenotwritable": "विदा ताळे संचिका लेखनीय नाही.विदेस ताळे लावण्याकरिता किंवा उघडण्याकरिता, ती आंतरजाल विदादात्याकडून लेखनीय असावयास हवी.", - "databasenotlocked": "विदागारास ताळे नही", + "databaselocked": "विदागार पूर्वीच ताळेबंद आहे.", + "databasenotlocked": "विदागारास ताळे नाही.", "lockedbyandtime": "({{GENDER:$1|$1}} द्वारे $2 ला $3 वाजता)", "move-page": "$1 हलवा", "move-page-legend": "पृष्ठ स्थानांतरण", @@ -2316,6 +2394,7 @@ "cant-move-to-user-page": "तुम्हाला एखाद्या पानास सदस्य पानांवर (सदस्य उप-पाने सोडून) घेऊन जाण्यास परवानगी नाही.", "cant-move-category-page": "आपणास वर्गपाने स्थानांतराची परवानगी नाही.", "cant-move-to-category-page": "आपणास एखादे पान वर्गपानात स्थानांतरणाची परवानगी नाही.", + "cant-move-subpages": "उपपाने स्थानांतरीत करण्याची आपल्यास परवानगी नाही.", "namespace-nosubpages": "नामविश्व \"$1\" हे उपपानांस परवानगी देत नाही.", "newtitle": "नवीन शीर्षक:", "move-watch": "स्रोत पान व लक्ष पानांवर निगराणी ठेवा", @@ -2375,6 +2454,7 @@ "export-download": "संचिका म्हणून जतन करा", "export-templates": "साचे आंतरभूत करा", "export-pagelinks": "पुढे उल्लेखित पातळी पर्यंत दुवे दिलेल्या पानांचा आंतर्भाव करा :", + "export-manual": "स्वतः पाने जोडा:", "allmessages": "सर्व प्रणाली-संदेश", "allmessagesname": "नाव", "allmessagesdefault": "अविचल संदेश मजकूर", @@ -2417,6 +2497,7 @@ "import-mapping-namespace": "नामविश्वाला आयात करा:", "import-mapping-subpage": "खालील पानाचे उपपान म्हणून आयात करा:", "import-upload-filename": "संचिकानाव:", + "import-upload-username-prefix": "आंतरविकि उपसर्ग:", "import-comment": "प्रतिक्रीया:", "importtext": "कृपया [[Special:Export|निर्यात सुविधा]] वापरून स्रोत विकिकडून संचिका निर्यात करा,ती तुमच्या तबकडीवर जतन करा आणि येथे चढवा.", "importstart": "पाने आयात करत आहे...", @@ -2425,6 +2506,7 @@ "imported-log-entries": "{{PLURAL:$1|आयात केलेली|आयात केलेल्या}} $1 {{PLURAL:$1|यादी प्रविष्टी|यादी प्रविष्ट्या}}.", "importfailed": "अयशस्वी आयात: $1", "importunknownsource": "आयात स्रोत प्रकार अज्ञात", + "importnoprefix": "आंतरविकि उपसर्ग दिला नाही", "importcantopen": "आयातीत संचिका उघडणे जमले नाही", "importbadinterwiki": "अयोग्य आंतरविकि दुवा", "importsuccess": "आयात पूर्ण झाली!", @@ -2449,7 +2531,7 @@ "import-options-wrong": "चुकिचे {{PLURAL:$2|विकल्प}}: $1", "import-rootpage-invalid": "दिलेले मूळ पान अवैध नाव आहे", "import-rootpage-nosubpage": "\"$1\" नामविश्वाची मुल पाने, उपपानास परवानगी देत नाही.", - "importlogpage": "ईम्पोर्ट सूची", + "importlogpage": "आयात नोंद", "importlogpagetext": "इतर विकिक्डून पानांची, संपादकीय इतिहासासहीत, प्रबंधकीय आयात.", "import-logentry-upload-detail": "$1 {{PLURAL:$1|आवर्तन|आवर्तने}}आयात केलीत", "import-logentry-interwiki-detail": "$2 पासून $1 {{PLURAL:$1|आवर्तन|आवर्तने}} आयात केलीत", @@ -2465,6 +2547,7 @@ "tooltip-pt-mycontris": "{{GENDER:|आपल्या}} योगदानांची यादी", "tooltip-pt-anoncontribs": "या अंकपत्त्यावरुन झालेले संपादन", "tooltip-pt-login": "आपणांस सनोंद प्रवेशासाठी प्रोत्साहीत करण्यात येत आहे;अर्थातच, ते अनिवार्य नाही.", + "tooltip-pt-login-private": "हा विकि वापरण्यास आपला सनोंद-प्रवेश आवश्यक आहे", "tooltip-pt-logout": "सनोंद निर्गम", "tooltip-pt-createaccount": "आम्ही आपणास खाते उघडून सनोंद-प्रवेशास प्रोत्साहीत करत आहे;अर्थातच, ते अनिवार्य नाही.", "tooltip-ca-talk": "आशय पानाबद्दलची चर्चा", @@ -2513,8 +2596,9 @@ "tooltip-ca-nstab-category": "वर्ग पान पहा", "tooltip-minoredit": "किरकोळ संपादन म्हणून खूण करा", "tooltip-save": "तुम्ही केलेले बदल जतन करा", - "tooltip-preview": "तुम्ही केलेल्या बदलांची झलक पहा, जतन करण्यापूर्वी कृपया हे वापरा!", - "tooltip-diff": "या पाठ्यातील तुम्ही केलेले बदल दाखवा.", + "tooltip-publish": "आपले बदल प्रकाशित करा", + "tooltip-preview": "तुम्ही केलेल्या बदलांची झलक पहा. जतन करण्यापूर्वी कृपया हे वापरा.", + "tooltip-diff": "या मजकूरातील तुम्ही केलेले बदल दाखवा", "tooltip-compareselectedversions": "या पानाच्या दोन निवडलेल्या आवृत्त्यांमधील फरक दाखवा.", "tooltip-watch": "हे पान तुमच्या पहाऱ्याच्या सूचित टाका.", "tooltip-watchlistedit-normal-submit": "शीर्षके काढवीत", @@ -2531,8 +2615,8 @@ "lastmodifiedatby": "या पानातील शेवटचा बदल $3ने $2, $1 यावेळी केला.", "othercontribs": "$1 ने केलेल्या कामानुसार.", "others": "इतर", - "siteusers": "{{SITENAME}} {{PLURAL:$2|सदस्य|सदस्य}} $1", - "anonusers": "{{SITENAME}} वरील अनामी {{PLURAL:$2|सदस्य|सदस्य}} $1", + "siteusers": "{{SITENAME}} {{PLURAL:$2|{{GENDER:$1|सदस्य}}}}$1", + "anonusers": "{{SITENAME}} वरील अनामीक {{PLURAL:$2|{{GENDER:$1|सदस्य}}}}$1", "creditspage": "पान श्रेय नामावली", "nocredits": "या पानाकरिता श्रेय नामावलीची माहिती नाही.", "spamprotectiontitle": "केर(स्पॅम) सुरक्षा चाचणी", @@ -2607,6 +2691,8 @@ "patrol-log-page": "टेहळणीतील नोंदी", "patrol-log-header": "ही पाहणीनंतरच्या निरीक्षणाची नोंद आहे.", "log-show-hide-patrol": "$1 गस्तीची नोंद", + "confirm-markpatrolled-button": "ठीक आहे", + "confirm-markpatrolled-top": "$2च्या $3 आवृत्तीवर पहारा दिला म्हणून खूण करायची?", "deletedrevision": "जुनी आवृत्ती ($1) वगळली.", "filedeleteerror-short": "संचिका वगळताना त्रुटी: $1", "filedeleteerror-long": "संचिका वगळताना त्रुटी आढळल्या:\n\n$1", @@ -2643,6 +2729,8 @@ "newimages-summary": "हे विशेष पान शेवटी चढविलेल्या संचिका दर्शविते.", "newimages-legend": "गाळक", "newimages-label": "संचिकानाम (किंवा त्याचा भाग):", + "newimages-user": "अंकपत्ता अथवा सदस्यनाम", + "newimages-newbies": "फक्त नवीन खात्यांचीच योगदाने दाखवा", "newimages-showbots": "सांगकाम्याद्वारे केलेली अपभारणे दाखवा", "newimages-hidepatrolled": "गस्त घातलेली अपभारणे लपवा", "noimages": "बघण्यासारखे येथे काही नाही.", @@ -2862,6 +2950,7 @@ "exif-compression-4": "CCITT Group 4 फॅक्स संकेतन", "exif-copyrighted-true": "प्रताधिकारीत", "exif-copyrighted-false": "प्रताधिकार स्थिती स्थापण्यात आलेली नाही", + "exif-photometricinterpretation-1": "काळे व पांढरे (काळे शून्य आहे)", "exif-unknowndate": "अज्ञात तारीख", "exif-orientation-1": "सामान्य", "exif-orientation-2": "समांतर पालटले", @@ -2947,7 +3036,7 @@ "exif-gaincontrol-3": "द्युति थोडी कमी करा", "exif-gaincontrol-4": "द्युति अधिक कमी करा", "exif-contrast-0": "सामान्य", - "exif-contrast-1": "नरम", + "exif-contrast-1": "मृदू", "exif-contrast-2": "कठीण", "exif-saturation-0": "सर्व साधारण", "exif-saturation-1": "निम्न संतृप्ति", @@ -3039,6 +3128,7 @@ "confirmemail_invalidated": "इ-मेल पत्ता तपासणी रद्द करण्यात आलेली आहे", "invalidateemail": "इ-मेल तपासणी रद्द करा", "notificationemail_subject_changed": "{{SITENAME}} वर नोंदविलेला विपत्रपत्ता बदलवल्या गेला", + "notificationemail_subject_removed": "{{SITENAME}} वर नोंदविलेला विपत्रपत्ता हटविल्या गेला आहे", "scarytranscludedisabled": "[आंतरविकि आंतरन्यास अनुपलब्ध केले आहे]", "scarytranscludefailed": "[क्षमस्व;$1करिताची साचा ओढी फसली]", "scarytranscludetoolong": "[आंतरजालपत्ता खूप लांब आहे]", @@ -3046,13 +3136,15 @@ "confirmrecreate": "तुम्ही संपादन सुरू केल्यानंतर सदस्य [[User:$1|$1]] ([[User talk:$1|चर्चा]])ने हे पान पुढील कारणाने वगळले:\n: $2\nकृपया हे पान खरेच पुन्हा निर्मित करून हवे आहे का हे निश्चित करा.", "confirmrecreate-noreason": "तुम्ही संपादन सुरू केल्यानंतर सदस्य [[User:$1|$1]] ([[User talk:$1|चर्चा]])ने हे पान वगळले. तुम्हाला हे पान खरेच पुन्हा निर्मित करून हवे आहे का हे निश्चित करा.", "recreate": "पुनर्निर्माण", - "confirm_purge_button": "ठीक", + "confirm-purge-title": "या पानास 'पर्ज' करा", + "confirm_purge_button": "ठीक आहे", "confirm-purge-top": "यापानाची सय रिकामी करावयाची आहे?", "confirm-purge-bottom": "पानाची अती अलीकडील आवृत्ती सादर करण्यासाठी त्या पानाचे क्षालन, पानाची सय ( पानाचे पर्जींग पानाची cache ) रिकामी करते .", "confirm-watch-button": "ठीक आहे", "confirm-watch-top": "हे पान तुमच्या पहारा सूचीमध्ये टाकायचे?", "confirm-unwatch-button": "ठिक आहे", "confirm-unwatch-top": "हे पान तुमच्या नित्य पहाण्याच्या सूचीतून काढायचे?", + "confirm-rollback-button": "ठीक आहे", "quotation-marks": "\"$1\"", "imgmultipageprev": "← मागील पान", "imgmultipagenext": "पुढील पान →", @@ -3073,6 +3165,8 @@ "autosumm-blank": "या पानावरील सगळा मजकूर काढला", "autosumm-replace": "पान '$1' वापरून बदलले.", "autoredircomment": "[[$1]] कडे पुनर्निर्देशित", + "autosumm-removed-redirect": "[[$1]] ला असणारे पुनर्निर्देशन हटविले", + "autosumm-changed-redirect-target": "पुनर्निर्देशन लक्ष्य [[$1]] पासून [[$2]]ला बदलविले", "autosumm-new": "नवीन पान \"$1\"", "autosumm-newblank": "रिकामे पान बनविले", "size-bytes": "$1 बा.", @@ -3158,8 +3252,8 @@ "redirect-summary": "हे विशेष पान एक संचिकेस पुनर्निर्देशित करते(दिलेले संचिकानाम),एक पान(दिलेली आवृत्ती किंवा पान ओळखण) किंवा एक सदस्यपान(दिलेला सदस्य अंक).\nवापर:[[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], किंवा [[{{#Special:Redirect}}/user/101]].", "redirect-submit": "जा", "redirect-lookup": "बघा:", - "redirect-value": "मुल्य:", - "redirect-user": "सदस्यनाम", + "redirect-value": "मूल्य:", + "redirect-user": "सदस्य ओळखण", "redirect-page": "पृष्ठ-परिचय", "redirect-revision": "पानाची आवृत्ती", "redirect-file": "संचिकानाम", @@ -3174,6 +3268,7 @@ "fileduplicatesearch-noresults": "\"$1\" या नावाची संचिका सापडली नाही.", "specialpages": "विशेष पृष्ठे", "specialpages-note-top": "विवरण", + "specialpages-note-restricted": "* सामान्य विशेष पाने.\n* प्रतिबंधित विशेष पाने.", "specialpages-group-maintenance": "व्यवस्थापन अहवाल", "specialpages-group-other": "इतर विशेष पृष्ठे", "specialpages-group-login": "प्रवेश / नवीन सदस्य नोंदणी", @@ -3195,6 +3290,19 @@ "tag-filter-submit": "गाळक", "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|खूणपताका}}]]: $2)", "tag-mw-contentmodelchange": "आशय नमून्यात बदल", + "tag-mw-new-redirect": "नवीन पुनर्निर्देशन", + "tag-mw-new-redirect-description": "नवीन पुनर्निर्देशन तयार करणारी अथवा पानास पुनर्निर्देशनात बदलविणारी संपादने", + "tag-mw-removed-redirect": "हटविलेले पुनर्निर्देशन", + "tag-mw-removed-redirect-description": "अस्तित्वात असणारे पुनर्निर्देशन हे अ-पुनर्निर्देशनास बदलविणारी संपादने", + "tag-mw-changed-redirect-target": "पुनर्निर्देशनाचे लक्ष्य बदलले", + "tag-mw-changed-redirect-target-description": "पुनर्निर्देशनाचे लक्ष्य बदलविणारी संपादने", + "tag-mw-blank": "पान कोरे केले", + "tag-mw-blank-description": "या पानावरील सगळा मजकूर काढून ते कोरे केले", + "tag-mw-replace": "पुनर्स्थापित केले", + "tag-mw-replace-description": "एखाद्या पानाचा ९०% पेक्षा जास्त आशय हटविणारी संपादने", + "tag-mw-rollback": "द्रुतमाघार", + "tag-mw-rollback-description": "द्रुतमाघार दुवा वापरुन मागील संपादने उलटविणारी संपादने", + "tag-mw-undo": "रद्द करा", "tags-title": "खुणपताका", "tags-intro": "प्रणालीतून, विशिष्ट संपादनांच्या अर्थासहित खुणपताकांची यादी नमूद करणारे पान", "tags-tag": "खूण नाव", @@ -3206,6 +3314,8 @@ "tags-actions-header": "क्रिया", "tags-active-yes": "होय", "tags-active-no": "नाही", + "tags-source-extension": "संचेतनाद्वारे व्याख्यिकृत", + "tags-source-manual": "सदस्य व सांगकाम्यांनी स्वतः लागू केलेली", "tags-source-none": "वापरात नाही", "tags-edit": "संपादन करा", "tags-delete": "वगळा", @@ -3236,6 +3346,16 @@ "tags-deactivate-submit": "निष्क्रिय करा", "tags-apply-blocked": "आपण प्रतिबंधित असतांना आपल्या बदलांसह, बदल खूणपताकांना लागू करु शकत नाही.", "tags-update-blocked": "आपण प्रतिबंधित असतांना बदल खूणपताकांना जोडू अथवा हटवू शकत नाही.", + "tags-edit-title": "खूणपताकांचे संपादन करा", + "tags-edit-manage-link": "खूणपताकांचे व्यवस्थापन करा", + "tags-edit-existing-tags": "अस्तित्वात असलेल्या खूणपताका:", + "tags-edit-existing-tags-none": "काहीच नाही", + "tags-edit-new-tags": "नवीन खूणपताका:", + "tags-edit-add": "या खूणपताका जोडा:", + "tags-edit-remove": "या खूणपताका हटवा:", + "tags-edit-remove-all-tags": "(सर्व खूणपताका हटवा)", + "tags-edit-chosen-placeholder": "काही खूणपताका निवडा", + "tags-edit-chosen-no-results": "यासम कोणत्याच खूणपताका सापडल्या नाहीत", "tags-edit-reason": "कारण:", "tags-edit-success": "बदल लागू केल्या गेलेत.", "tags-edit-none-selected": "जोडण्यास किंवा हटविण्यास किमान एक खूणपताका निवडा.", @@ -3348,6 +3468,7 @@ "logentry-managetags-deactivate": "$1 ने \"$4\" ही खूणपताका, सदस्यांसाठी व सांगकाम्यांसाठी {{GENDER:$2|अक्रिय केली}}", "log-name-tag": "खूणपताका नोंदी", "rightsnone": "(काहीही नाही)", + "rightslogentry-temporary-group": "$1 (तात्पुरते, $2 पर्यंत)", "feedback-adding": "आपला पश्चप्रदाय (फिडबॅक) जोडत आहोत या पानास.......", "feedback-back": "परत", "feedback-bugcheck": "उत्तम! फक्त एकदा खात्री करा की हा [$1 अगोदरच माहिती असलेला बग] तर नाहीये.", @@ -3393,7 +3514,7 @@ "expandtemplates": "साचे वाढवा", "expand_templates_intro": "हे पान काही मजकूर घेऊन आवर्ती पद्धतीने त्यातील सर्व साचे वाढविते. तसेच हे पान पार्सर फंक्शन्स जसे की\n{{#language:...}}, व बदलणार्‍या किमती (variables) जसे की\n{{CURRENTDAY}}—म्हणजेच दोन ब्रेसेसमधील बरेच काही वाढविते.", "expand_templates_title": "{{FULLPAGENAME}} वगैरे करीता, कन्टेक्स्ट शीर्षक:", - "expand_templates_input": "इनपुट मजकूर:", + "expand_templates_input": "अंतर्दाय विकीमजकूर:", "expand_templates_output": "निकाल", "expand_templates_xml_output": "XML चे आऊटपुट", "expand_templates_ok": "ठिक आहे", @@ -3406,6 +3527,7 @@ "pagelang-language": "भाषा", "pagelang-use-default": "अविचल भाषा वापरा", "pagelang-select-lang": "भाषा निवडा", + "pagelang-reason": "कारण", "pagelang-submit": "सादर करा", "right-pagelang": "पानाची भाषा बदला", "action-pagelang": "पानाची असलेली भाषा बदला", @@ -3428,6 +3550,7 @@ "special-characters-group-ipa": "आंतरराष्ट्रीय उच्चारानुरूप अक्षरपद्धती", "special-characters-group-symbols": "चिन्ह", "special-characters-group-greek": "ग्रीक भाषा", + "special-characters-group-greekextended": "ग्रीक विस्तारीत", "special-characters-group-cyrillic": "सिरिलीक", "special-characters-group-arabic": "अरेबिक भाषा", "special-characters-group-arabicextended": "अरबी विस्तारित", @@ -3444,8 +3567,11 @@ "special-characters-group-khmer": "ख्मेर", "special-characters-title-minus": "ॠण चिन्ह", "mw-widgets-dateinput-no-date": "कोणताही दिनांक निवडला नाही", + "mw-widgets-mediasearch-noresults": "शोधनिकाल सापडले नाहीत.", "mw-widgets-titleinput-description-new-page": "अद्याप पान अस्तित्वात नाही", "mw-widgets-titleinput-description-redirect": "$1ला पुनर्निर्देशित करा", + "mw-widgets-categoryselector-add-category-placeholder": "वर्ग जोडा...", + "mw-widgets-usersmultiselect-placeholder": "अधिक जोडा...", "date-range-from": "या दिनांकापासून:", "date-range-to": "या दिनांकापर्यंत:", "sessionmanager-tie": "हे एकत्रित करु शकत नाही,बहुविध विनंती अधिप्रमाणन प्रकार:$1", @@ -3456,6 +3582,6 @@ "log-action-filter-contentmodel": "आशय नमूना बदलाचा प्रकार", "log-action-filter-rights-rights": "मानवी बदल", "log-action-filter-suppress-block": "रोधामार्फत सदस्य दाबणे", - "changecredentials": "अधिकारपत्रे (क्रेडेंटियल्स)बदला", + "changecredentials": "अधिकारपत्रे (क्रेडेंटियल्स) बदला", "removecredentials": "अधिकारपत्रे (क्रेडेंटियल्स) हटवा" } diff --git a/languages/i18n/nds-nl.json b/languages/i18n/nds-nl.json index ea26186799..a3c2e33371 100644 --- a/languages/i18n/nds-nl.json +++ b/languages/i18n/nds-nl.json @@ -1545,6 +1545,7 @@ "booksources-search": "Zeuken", "booksources-text": "Hieronder steet n lieste mit verwiezingen naor aandere websteeën die nieje of wat ouwere boeken verkopen, en daor hebben ze warschienlik meer informasie over t boek da'j zeuken:", "booksources-invalid-isbn": "De op-egeven ISBN klop niet; kiek effen nao o'j gien fout emaakt hebben bie de invoer.", + "magiclink-tracking-isbn": "Ziejen die magiese ISBN-verwiezingen gebruken", "specialloguserlabel": "Uutvoerende gebruker:", "speciallogtitlelabel": "Doel (ziednaam of gebruker):", "log": "Logboeken", diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json index c6589d4995..bdfe6c657c 100644 --- a/languages/i18n/pl.json +++ b/languages/i18n/pl.json @@ -101,7 +101,7 @@ "tog-hidepatrolled": "Ukryj sprawdzone edycje w ostatnich zmianach", "tog-newpageshidepatrolled": "Ukryj sprawdzone strony na liście nowych stron", "tog-hidecategorization": "Ukryj kategoryzację stron", - "tog-extendwatchlist": "Pokaż na liście obserwowanych wszystkie zmiany, nie tylko ostatnie", + "tog-extendwatchlist": "Pokazuj na liście obserwowanych wszystkie zmiany, nie tylko ostatnie", "tog-usenewrc": "Grupuj zmiany według stron na liście ostatnich zmian i obserwowanych", "tog-numberheadings": "Automatyczna numeracja nagłówków", "tog-showtoolbar": "Pokaż pasek narzędzi", @@ -859,7 +859,7 @@ "history-fieldset-title": "Szukaj wersji", "history-show-deleted": "Tylko usunięte edycje", "histfirst": "od najstarszych", - "histlast": "od najświeższych", + "histlast": "od najnowszych", "historysize": "({{PLURAL:$1|1 bajt|$1 bajty|$1 bajtów}})", "historyempty": "(pusta)", "history-feed-title": "Historia wersji", @@ -2408,7 +2408,7 @@ "uctop": "(ostatnia)", "month": "Do miesiąca (włącznie):", "year": "Do roku (włącznie):", - "sp-contributions-newbies": "Pokaż wyłącznie wkład nowych użytkowników", + "sp-contributions-newbies": "Pokazuj wyłącznie wkład nowych użytkowników", "sp-contributions-newbies-sub": "Dla nowych użytkowników", "sp-contributions-newbies-title": "Wkład nowych użytkowników", "sp-contributions-blocklog": "blokady", @@ -2942,7 +2942,7 @@ "newimages-label": "Nazwa pliku (lub jej fragment):", "newimages-user": "Adres IP lub nazwa użytkownika", "newimages-newbies": "Pokaż wyłącznie wkład nowych użytkowników", - "newimages-showbots": "Pokaż pliki przesłane przez boty", + "newimages-showbots": "Pokazuj pliki przesłane przez boty", "newimages-hidepatrolled": "Ukryj sprawdzone pliki", "newimages-mediatype": "Rodzaj plików:", "noimages": "Brak plików do pokazania.", diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json index 577a9227ef..bb950d7a98 100644 --- a/languages/i18n/pt-br.json +++ b/languages/i18n/pt-br.json @@ -1405,7 +1405,7 @@ "rcfilters-activefilters": "Filtros ativos", "rcfilters-advancedfilters": "Filtros avançados", "rcfilters-limit-title": "Resultados para mostrar", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|mudança|$1 mudanças}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|mudança|mudanças}}, $2", "rcfilters-date-popup-title": "Período de tempo para pesquisar", "rcfilters-days-title": "Dias recentes", "rcfilters-hours-title": "Horas recentes", diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json index 2b9c349507..b7f719ae1f 100644 --- a/languages/i18n/pt.json +++ b/languages/i18n/pt.json @@ -1379,7 +1379,7 @@ "rcfilters-activefilters": "Filtros ativos", "rcfilters-advancedfilters": "Filtros avançados", "rcfilters-limit-title": "Resultados a mostrar", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|mudança|$1 mudanças}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|mudança|mudanças}}, $2", "rcfilters-date-popup-title": "Período a pesquisar", "rcfilters-days-title": "Dias recentes", "rcfilters-hours-title": "Horas recentes", @@ -3626,8 +3626,8 @@ "compare-title-not-exists": "O título que especificou não existe.", "compare-revision-not-exists": "A revisão que especificou não existe.", "diff-form": "Diferenças", - "diff-form-oldid": "Identificador de revisão antigo (opcional)", - "diff-form-revid": "Identificador de revisão da diferença", + "diff-form-oldid": "Identificador da revisão anterior (opcional)", + "diff-form-revid": "Identificador da revisão a comparar", "diff-form-submit": "Mostrar diferenças", "permanentlink": "Hiperligação permanente", "permanentlink-revid": "Identificador de revisão", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index e7e0f42d69..6621e72a4f 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1637,10 +1637,10 @@ "rcfilters-filter-watchlist-notwatched-label": "Label for the filter for showing changes to pages not on your watchlist.", "rcfilters-filter-watchlist-notwatched-description": "Description for the filter for showing changes to pages not on your watchlist.", "rcfilters-filtergroup-watchlistactivity": "Title for the watchlist activity filter group (only available on [[Special:Watchlist]])", - "rcfilters-filter-watchlistactivity-unseen-label": "Label for unseen changes in the watchlist activity filter group.", - "rcfilters-filter-watchlistactivity-unseen-description": "Description for unseen changes in the watchlist activity filter group.", - "rcfilters-filter-watchlistactivity-seen-label": "Label for seen changes in the watchlist activity filter group.", - "rcfilters-filter-watchlistactivity-seen-description": "Description for seen changes in the watchlist activity filter group.", + "rcfilters-filter-watchlistactivity-unseen-label": "Label for unseen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}", + "rcfilters-filter-watchlistactivity-unseen-description": "Description for unseen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}", + "rcfilters-filter-watchlistactivity-seen-label": "Label for seen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}", + "rcfilters-filter-watchlistactivity-seen-description": "Description for seen changes in the watchlist activity filter group.\n\n{{Related|Rcfilters-filter-watchlistactivity}}", "rcfilters-filtergroup-changetype": "Title for the filter group for edit type.", "rcfilters-filter-pageedits-label": "Label for the filter for showing the edits to existing pages.", "rcfilters-filter-pageedits-description": "Description for the filter for showing edits to existing pages.", @@ -4383,7 +4383,7 @@ "expandtemplates": "{{doc-special|ExpandTemplates}}\nThe name of the [[mw:Extension:ExpandTemplates|Expand Templates extension]].", "expand_templates_intro": "This is the explanation given in the heading of the [[Special:ExpandTemplates]] page; it describes its functionality to the users.\nFor more information, see [[mw:Extension:ExpandTemplates]]", "expand_templates_title": "The label of the input box for the context title on the form displayed at [[Special:ExpandTemplates]] page.", - "expand_templates_input": "{{Identical|Input text}}", + "expand_templates_input": "Used as an indicator.", "expand_templates_output": "{{Identical|Result}}", "expand_templates_xml_output": "Used as HTML

    heading.", "expand_templates_html_output": "Used as HTML

    heading.", diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json index b264263a59..45c205a5ab 100644 --- a/languages/i18n/ru.json +++ b/languages/i18n/ru.json @@ -3659,7 +3659,7 @@ "tag-mw-new-redirect-description": "Правки, которые создают новое перенаправление или изменяют страницу на перенаправление", "tag-mw-removed-redirect": "удалённое перенаправление", "tag-mw-removed-redirect-description": "Правки, которые изменяют существующее перенаправление на не-перенаправление", - "tag-mw-changed-redirect-target": "Изменение цели перенаправления", + "tag-mw-changed-redirect-target": "изменение цели перенаправления", "tag-mw-changed-redirect-target-description": "Правки, которые изменяют цель перенаправления", "tag-mw-blank": "очистка", "tag-mw-blank-description": "Правки, которые очищают страницу", diff --git a/languages/i18n/sd.json b/languages/i18n/sd.json index 22afadc8b3..9ae50ea8b3 100644 --- a/languages/i18n/sd.json +++ b/languages/i18n/sd.json @@ -232,7 +232,7 @@ "ok": "ٺيڪ", "retrievedfrom": "\"$1\" تان ورتل", "youhavenewmessages": "{{PLURAL:$3|توھان وٽ}} $1 ($2) آھن.", - "youhavenewmessagesmanyusers": "توهان لاءِ ڪيترن ئي يُوزرس ($2) طرفان $1 آيل آهن.", + "youhavenewmessagesmanyusers": "توهان لاءِ ڪيترن ئي واپرائيندڙن ($2) طرفان $1 آهن.", "newmessageslinkplural": "{{PLURAL:$1|ھڪ نئون پيغام|999=نوان پيغام}}", "newmessagesdifflinkplural": "آخري {{PLURAL:$1|تبديلي|999=تبديليون}}", "youhavenewmessagesmulti": "$1 تي توهان لاءِ نوان نياپا آهن", @@ -377,7 +377,7 @@ "createacct-error": "کاتو کولڻ ۾ چُڪَ", "createaccounterror": "کاتو کُلي نہ سگھيو: $1", "nocookiesnew": "واپرائيندڙ کاتو کلي چڪو، پر توهان داخل نہ ٿيا آهيو. واپرائيندڙ کي داخل ڪرڻ لاءِ {{SITENAME}} ڪوڪيز استعمال ڪندي آهي. توهان ڪوڪيز کي ناڪاره بڻائي رکيو آهي. داخل ٿيڻ لاءِ ڪوڪيز کي ڪارائتو بڻايو.", - "nocookieslogin": "يُوزرس کي داخل ڪرڻ لاءِ {{SITENAME}} ڪوڪيز استعمال ڪندي آهي.\nتوھان ڪوڪيز کي ناڪاره بڻائي رکيو آھي.\nداخل ٿيڻ لاءِ ڪوڪيز کي ڪارائتو بڻايو.", + "nocookieslogin": "واپرائيندڙ داخل ڪرڻ لاءِ {{SITENAME}} ڪوڪيز استعمال ڪندي آهي.\nتوھان ڪوڪيز کي ناڪاره بڻائي رکيو آھي.\nداخل ٿيڻ لاءِ ڪوڪيز کي ڪارائتو بڻايو.", "noname": "توهان جو ڄاڻايل واپرائيندڙ-نانءُ ناقابل ڪار آهي.", "loginsuccesstitle": "داخل ٿيل", "loginsuccess": "'''هاڻي توهان {{SITENAME}} تي بطور \"$1\" داخل ٿيل آهيو.'''", @@ -539,7 +539,7 @@ "copyrightwarning": "ياد رکندا ته {{SITENAME}} لاءِ سموريون ڀاڱيداريون $2 تحت پڌريون ڪجن ٿيون (تفصيلن لاءِ $1 ڏسندا). اوهان جي تحرير کي {{SITENAME}} جي قائدن تحت ترميمي سگهجي ٿو. جيڪڏهن اوهان نه ٿا چاهيو ته اوهان جي لکڻين کي بي رحميءَ سان ترميميو وڃي يا ورهائي عام ڪيو وڃي ته پوءِ پنهنجي لکڻي هتي جمع نه ڪرايو. پنهنجو مواد هتي جمع ڪرڻ جو مطلب هوندو ته توهان کي جمع ڪرايل مواد جي مفت فراهمي ۽ کُليل تبديليءَ تي ڪو به اعتراز ناهي.
    \nتوهان اهڙي پڪ ڏيڻ جا پابند پڻ آهيو ته توهان جو جمع ڪرايل مواد توهان جو پنهنجو لکيل آهي يا وري توهان ڪنهن مفت وسيلي تان ڪاپي ڪيو آهي.\n'''تحفظيل حق ۽ واسطا رکندڙ مواد واسطيدار مالڪ کان اڳواٽ اجازت وٺڻ کان سواءِ هتي جمع نه ڪريو.'''", "copyrightwarning2": "ياد رکندا تہ {{SITENAME}} لاءِ سموريون ڀاڱيدارين کي ٻيا ڀاڱيدار سنواري، بدلائي، يا ڊاهي سگھن ٿا. جيڪڏهن اوهان نہ ٿا چاهيو تہ اوهان جي لکڻين کي بي رحميءَ سان ترميميو وڃي يا ورهائي عام ڪيو وڃي تہ پوءِ پنهنجي لکڻي هتي جمع نہ ڪرايو.
    \nتوهان اهڙي پڪ ڏيڻ جا پابند پڻ آهيو تہ توهان جو جمع ڪرايل مواد توهان جو پنهنجو لکيل آهي يا وري توهان ڪنهن اهڙي ئي مفت عوامي وسيلي تان ڪاپي ڪيو آهي. (تفصيلن لاءِ $1 ڏسندا).\n\nتحفظيل حق ۽ واسطا رکندڙ مواد واسطيدار مالڪ کان اڳواٽ اجازت وٺڻ بنان هتي جمع نہ ڪريو.", "protectedpagewarning": "چتاءُ: هيءَ صفحو اهڙيءَ ريت تحفظيو ويو آهي جو فقط منتظمين ئي ان کي سنواري سگھن ٿا. \nتازه ترين لاگ حوالي طور پيش ڪجي ٿو:", - "semiprotectedpagewarning": "نوٽ: هيءَ صفحو اهڙيءَ ريت تحفظيو ويو آهي جو فقط کاتيدار يُوزرس ئي ان کي سنواري سگھن ٿا. \nتازه ترين لاگ حوالي طور پيش ڪجي ٿو:", + "semiprotectedpagewarning": "نوٽ: هيءَ صفحو اهڙيءَ ريت تحفظيو ويو آهي جو فقط کاتيدار واپرائيندڙ ئي ان کي سنواري سگھن ٿا.\nتازه ترين لاگ حوالي طور پيش ڪجي ٿو:", "templatesused": "هن صفحي تي استعمال ٿيندڙ {{PLURAL:$1|سانچو|سانچا}}:", "templatesusedpreview": "هن پيش نگاھ ۾ استعمال ٿيل {{PLURAL:$1|سانچو|سانچا}}:", "templatesusedsection": "هن سيڪشن ۾ استعمال ٿيل {{PLURAL:$1|سانچو|سانچا}}:", @@ -863,7 +863,7 @@ "right-sendemail": "ٻين واپرائيندڙن ڏانھن برقٽپال موڪليو", "right-managechangetags": "[[Special:Tags|ٽيگس]] سرجيو ۽ ڊاهيو.", "grant-group-email": "برقٽپال اماڻيو", - "grant-blockusers": "يُوزرس کي بندشيو ۽ اڻبندشيو", + "grant-blockusers": "واپرائيندڙن کي بندشيو ۽ اڻبندشيو", "grant-createaccount": "کاتا کوليو", "grant-createeditmovepage": "صفحا سرجيو، سنواريو، ۽ چوريو", "grant-editmywatchlist": "پنھنجي نظر ۾ فھرست سنواريو", @@ -929,10 +929,14 @@ "recentchanges-submit": "ڏيکاريو", "rcfilters-legend-heading": "مخففن جي فھرست:", "rcfilters-other-review-tools": "نظرثانيءَ جا ٻيا اوزار", + "rcfilters-group-results-by-page": "صفحي جي لحاظ سان گروھي نتيجا", "rcfilters-activefilters": "سرگرم ڇاڻيون", "rcfilters-advancedfilters": "متقدم ڇاڻيون", + "rcfilters-limit-title": "ڏيکارڻ لاءِ نتيجا", "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|تبديلي|$1 تبديليون}}، $2", + "rcfilters-date-popup-title": "ڳولڻ لاءِ وقت جو دورانيو", "rcfilters-days-title": "ھاڻوڪا ڏينھن", + "rcfilters-hours-title": "ھاڻوڪا ڪلاڪَ", "rcfilters-days-show-days": "$1 {{PLURAL:$1|ڏينھُن|ڏينھَن}}", "rcfilters-highlighted-filters-list": "نمايان-ٿيل:$1", "rcfilters-quickfilters": "سانڍيل ڇاڻيون", @@ -955,9 +959,11 @@ "rcfilters-filter-editsbyself-label": "مون پاران تبديليون", "rcfilters-filter-editsbyself-description": "توھان جون پنھنجون ڀاڱيداريون.", "rcfilters-filter-editsbyother-label": "ٻين پاران تبديليون", + "rcfilters-filtergroup-userExpLevel": "واپرائيندڙن جي داخلا ۽ تجربو", "rcfilters-filter-user-experience-level-registered-label": "رجسٽر ٿيل", "rcfilters-filter-user-experience-level-registered-description": "داخل ٿيل ايڊيٽر.", "rcfilters-filter-user-experience-level-unregistered-label": "اڻرجسٽر ٿيل", + "rcfilters-filter-user-experience-level-unregistered-description": "سنواريندڙ جيڪي داخل ٿيل ناھن.", "rcfilters-filter-user-experience-level-newcomer-label": "نوان ايندڙ", "rcfilters-filter-user-experience-level-learner-label": "سکندڙ", "rcfilters-filter-user-experience-level-experienced-label": "تجربيڪار واپرائيندڙ", @@ -971,8 +977,14 @@ "rcfilters-filter-minor-label": "معمولي ترميمون", "rcfilters-filter-major-label": "غير معمولي ترميمون", "rcfilters-filter-major-description": "معمولي طور نشان نہ لڳل ترميمون.", + "rcfilters-filter-watchlist-watched-label": "نظر ۾ فھڙست تي", + "rcfilters-filter-watchlist-watched-description": "توھان جي نظر ۾ فھرست ۾ صفحن ۾ تبديليون.", + "rcfilters-filter-watchlist-watchednew-label": "نيون نظر ۾ فھرست ۾ تبديليون", + "rcfilters-filter-watchlist-notwatched-label": "نظر ۾ فھرست ۾ ناھي", + "rcfilters-filtergroup-watchlistactivity": "نظر ۾ فھرست ۾ سرگرمي", "rcfilters-filter-watchlistactivity-unseen-label": "اڻڏٺل ترميمون", "rcfilters-filter-watchlistactivity-seen-label": "ڏٺل ترميمون", + "rcfilters-filtergroup-changetype": "تبديليءَ جو قِسم", "rcfilters-filter-pageedits-label": "صفحي ترميمون", "rcfilters-filter-newpages-label": "صفحي تخليقون", "rcfilters-filter-newpages-description": "نوان صفحا ٺاھيندڙ ترميمون.", @@ -991,7 +1003,7 @@ "rcshowhideliu": "$1 کاتيدار واپرائيندڙَ", "rcshowhideliu-show": "ڏيکاريو", "rcshowhideliu-hide": "لڪايو", - "rcshowhideanons": "$1 نامعلوم يُوزرس", + "rcshowhideanons": "$1 نامعلوم واپرائيندڙَ", "rcshowhideanons-show": "ڏيکاريو", "rcshowhideanons-hide": "لڪايو", "rcshowhidepatr": "$1 تاڻيل ترميمون", @@ -1164,7 +1176,7 @@ "statistics-files": "چاڙھيل فائيل", "statistics-edits": "{{SITENAME}} جي ٺھڻ کان صفحن ۾ ڪيل سموريون ترميمون", "statistics-edits-average": "سراسري ترميمون في صفحو", - "statistics-users": "کاتيدار [[Special:ListUsers|يُوزرس]]", + "statistics-users": "کاتيدار [[Special:ListUsers|واپرائيندڙَ]]", "statistics-users-active": "سرگرم واپرائيندڙ", "statistics-users-active-desc": "اھي واپرائيندڙ جن پوين {{PLURAL:$1|ڏينھن|$1 ڏينھن}} ۾ ڪو عمل سرانجام ڏنو آهي", "pageswithprop-prop": "خصوصيت نانءُ:", @@ -1331,7 +1343,7 @@ "wlshowhideminor": "معمولي ترميم", "wlshowhidebots": "بوٽس", "wlshowhideliu": "کاتيدار واپرائيندڙ", - "wlshowhideanons": "گمنام يُوزرس", + "wlshowhideanons": "گمنام واپررائيندڙ", "wlshowhidepatr": "گشت-ڪيل ترميمون", "wlshowhidemine": "منھنجون ترميمون", "watchlist-options": "نظر ۾ فھرست جا چارا", @@ -1470,7 +1482,7 @@ "ipusubmit": "اها بندش هٽايو", "unblocked-range": "$1 تان بندش هٽي چڪي آهي.", "unblocked-id": "بندش $1 هٽي چڪي آهي.", - "blocklist": "بندشيل يُوزرس", + "blocklist": "بندشيل واپرائيندڙ", "ipblocklist": "بندشيل واپرائيندڙ", "blocklist-timestamp": "اوقاتي مهر", "blocklist-target": "هدف", diff --git a/languages/i18n/sk.json b/languages/i18n/sk.json index 153d279c0e..ca22ea0724 100644 --- a/languages/i18n/sk.json +++ b/languages/i18n/sk.json @@ -3311,6 +3311,13 @@ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Značka|Značky}}]]: $2)", "tag-mw-contentmodelchange": "zmena modelu obsahu", "tag-mw-contentmodelchange-description": "Úpravy, ktoré [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel menia model obsahu] stránky", + "tag-mw-new-redirect": "Nové presmerovanie", + "tag-mw-removed-redirect": "Zrušené presmerovanie", + "tag-mw-changed-redirect-target": "Zmena presmerovania", + "tag-mw-blank": "Vyprázdnenie", + "tag-mw-replace": "Náhrada", + "tag-mw-rollback": "Rollback", + "tag-mw-undo": "Vrátenie", "tags-title": "Značky", "tags-intro": "Táto stránka obsahuje zoznam a význam značiek, ktorými môže softvér označovať jednotlivé úpravy.", "tags-tag": "Názov značky", diff --git a/languages/i18n/skr-arab.json b/languages/i18n/skr-arab.json index b734d046b4..ab05e18889 100644 --- a/languages/i18n/skr-arab.json +++ b/languages/i18n/skr-arab.json @@ -601,6 +601,7 @@ "recentchanges-legend-heading": "اختصارات:", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (ایہ وی ݙیکھو [[Special:NewPages|نویں ورقیاں دی لسٹ]])", "recentchanges-submit": "ݙیکھاؤ", + "rcfilters-limit-and-date-label": "$1{{PLURAL:$1|تبدیلی|تبدیلیاں}}، $2", "rcfilters-days-title": "موجودہ ݙینہ", "rcfilters-hours-title": "موجودہ گھنٹے", "rcfilters-savedqueries-rename": "نواں ناں لکھو", diff --git a/languages/i18n/sr-ec.json b/languages/i18n/sr-ec.json index bcb4e92ffa..adf340f0cb 100644 --- a/languages/i18n/sr-ec.json +++ b/languages/i18n/sr-ec.json @@ -34,7 +34,8 @@ "Matma Rex", "Zoranzoki21", "Obsuser", - "Prevodim" + "Prevodim", + "Acamicamacaraca" ] }, "tog-underline": "Подвлачење веза:", @@ -103,7 +104,7 @@ "fri": "пет", "sat": "суб", "january": "јануар", - "february": "фебруар", + "february": "Фебруар", "march": "март", "april": "април", "may_long": "мај", @@ -1288,7 +1289,7 @@ "rcfilters-activefilters": "Активни филтери", "rcfilters-advancedfilters": "Напредни филтери", "rcfilters-limit-title": "Приказати измена", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|измена|$1 измена}}, $2", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|измена|измена}}, $2", "rcfilters-date-popup-title": "Временски оквир", "rcfilters-days-title": "Претходних неколико дана", "rcfilters-hours-title": "Претходних неколико сати", @@ -1449,7 +1450,7 @@ "recentchangeslinked-feed": "Сродне измене", "recentchangeslinked-toolbox": "Сродне измене", "recentchangeslinked-title": "Сродне измене са „$1“", - "recentchangeslinked-summary": "Ова посебна страница приказује списак последњих измена на страницама које су повезане (или чланови одређене категорије).\nСтранице с [[Special:Watchlist|вашег списка надгледања]] су '''подебљане'''.", + "recentchangeslinked-summary": "Унесите име странице да бисте видели промене на страницама које су повезане са или са те странице. (Да бисте видели чланове неке категорије, унесите Категорија:Назив категорије). Промене на страницама које су на [[Special:Watchlist|вашем списку надгледања]] су '''подебљане'''.", "recentchangeslinked-page": "Назив странице:", "recentchangeslinked-to": "Прикажи измене страница које су повезане с датом страницом", "recentchanges-page-added-to-category": "[[:$1]] је додата у категорију", @@ -2070,6 +2071,7 @@ "enotif_lastdiff": "Да видите ову измену, погледајте $1.", "enotif_anon_editor": "анониман корисник $1", "enotif_body": "Поштовани $WATCHINGUSERNAME,\n \t\n$PAGEINTRO $NEWPAGE\n\nОпис: $PAGESUMMARY $PAGEMINOREDIT\n\nКонтакт:\nмејл: $PAGEEDITOR_EMAIL\nвики: $PAGEEDITOR_WIKI\n\nНеће бити других обавештења у случају даљих измена уколико не посетите ову страницу када сте пријављени.\nМожете и да поништите поставке обавештења за све странице у вашем списку надгледања.\n\nСрдачан поздрав, {{SITENAME}}\n\n--\nДа бисте променили поставке имејл обавештења, посетите\n{{canonicalurl:{{#special:Preferences}}}}\n\nДа бисте променили поставке списка надгледања, посетите\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\nДа бисте уклонили ову страницу са списка надгледања, посетите\n$UNWATCHURL\n\nПодршка и даља помоћ:\n$HELPPAGE", + "enotif_minoredit": "Ово је мања измена", "created": "направљена", "changed": "измењена", "deletepage": "Обриши страницу", @@ -3773,6 +3775,8 @@ "removecredentials": "Уклањање акредитива", "credentialsform-provider": "Врста акредитива:", "credentialsform-account": "Назив налога:", + "userjsispublic": "Напомена: JavaScript подстранице не би требале садржавати поверљиве информације будући да су видљиве другим корисницима.", + "usercssispublic": "Напомена: CSS подстранице не би требале садржавати поверљиве информације будући да су видљиве другим корисницима.", "rawhtml-notallowed": "<html> тагови не могу да се користе ван нормалних страница.", "gotointerwiki": "Напуштам пројекат {{SITENAME}}", "gotointerwiki-invalid": "Одабрани наслов је невалидан.", diff --git a/languages/i18n/sr-el.json b/languages/i18n/sr-el.json index 121d414e7c..a4baeb5a4e 100644 --- a/languages/i18n/sr-el.json +++ b/languages/i18n/sr-el.json @@ -3379,7 +3379,7 @@ "feedback-termsofuse": "Prihvatam da pošaljem povratne informacije u skladu sa uslovima korišćenja.", "feedback-thanks": "Hvala! Vaša povratna informacija je postavljena na stranicu „[$2 $1]“.", "feedback-thanks-title": "Hvala vam!", - "searchsuggest-search": "Pretraga projekta {{SITENAME}}", + "searchsuggest-search": "Pretraga", "searchsuggest-containing": "sadrži...", "api-error-badtoken": "Unutrašnja greška: neispravan žeton.", "api-error-emptypage": "Stvaranje novih praznih stranica nije dozvoljeno.", diff --git a/languages/i18n/sw.json b/languages/i18n/sw.json index da1da87da4..7a2bbbafd2 100644 --- a/languages/i18n/sw.json +++ b/languages/i18n/sw.json @@ -18,7 +18,8 @@ "Kipala", "Kwisha", "Macofe", - "Muddyb" + "Muddyb", + "Fitoschido" ] }, "tog-underline": "Wekea mstari viungo:", @@ -1480,7 +1481,7 @@ "pager-older-n": "{{PLURAL:$1|$1 ya zamani zaidi}}", "suppress": "Uangalizi", "apihelp": "Usaisiz wa API", - "apihelp-no-such-module": "Moduli \"$ 1\" haikupatikana.", + "apihelp-no-such-module": "Moduli \"$1\" haikupatikana.", "apisandbox-submit": "Weka ombi", "apisandbox-reset": "Tandua", "apisandbox-examples": "Mfano", diff --git a/languages/i18n/te.json b/languages/i18n/te.json index 5ef3bf3d34..372ae46d1d 100644 --- a/languages/i18n/te.json +++ b/languages/i18n/te.json @@ -223,7 +223,7 @@ "redirectedfrom": "($1 నుండి మళ్ళించబడింది)", "redirectpagesub": "దారిమార్పు పేజీ", "redirectto": "దారి మార్పు:", - "lastmodifiedat": "ఈ పేజీలో చివరి మార్పు $1 న $2 కు జరిగింది.", + "lastmodifiedat": "ఈ పేజీలో చివరి మార్పు $1న $2కు జరిగింది.", "viewcount": "ఈ పేజీ {{PLURAL:$1|ఒక్క సారి|$1 సార్లు}} దర్శించబడింది.", "protectedpage": "సంరక్షణలోని పేజీ", "jumpto": "ఇక్కడికి గెంతు:", diff --git a/languages/i18n/th.json b/languages/i18n/th.json index bfe9af0ecd..2b1d423b45 100644 --- a/languages/i18n/th.json +++ b/languages/i18n/th.json @@ -1412,7 +1412,7 @@ "rcfilters-filter-showlinkedfrom-option-label": "แสดงการเปลี่ยนแปลงในหน้าที่ลิงก์มาจากหน้าหนึ่ง", "rcfilters-filter-showlinkedto-label": "แสดงการเปลี่ยนแปลงในหน้าที่ลิงก์มา", "rcfilters-filter-showlinkedto-option-label": "แสดงการเปลี่ยนแปลงในหน้าที่ลิงก์มายังหน้าหนึ่ง", - "rcfilters-target-page-placeholder": "กรอกชื่อหน้า", + "rcfilters-target-page-placeholder": "กรอกชื่อหน้า (หรือหมวดหมู่)", "rcnotefrom": "ด้านล่างเป็นการเปลี่ยนแปลงตั้งแต่ $3, $4 (แสดงมากสุด $1)", "rclistfromreset": "กลับค่าเดิมของการเลือกวันที่", "rclistfrom": "แสดงการเปลี่ยนแปลงใหม่เริ่มตั้งแต่ $2, $3", @@ -3357,7 +3357,7 @@ "expand_templates_ok": "ตกลง", "expand_templates_remove_comments": "นำส่วนความเห็นออก", "expand_templates_preview": "ตัวอย่างผลแสดง", - "expand_templates_input_missing": "คุณต้องให้ข้อความป้อนเข้าบ้าง", + "expand_templates_input_missing": "คุณต้องให้ข้อความวิกิป้อนเข้าบ้าง", "pagelanguage": "เปลี่ยนภาษาของหน้า", "pagelang-name": "หน้า", "pagelang-language": "ภาษา", diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json index 8099af0e62..6c5f5bb27b 100644 --- a/languages/i18n/tr.json +++ b/languages/i18n/tr.json @@ -3166,6 +3166,7 @@ "autosumm-replace": "Sayfa içeriği '$1' ile değiştirildi", "autoredircomment": "[[$1]] sayfasına yönlendirildi", "autosumm-removed-redirect": "[[$1]] sayfasına yapılmış yönlendirme kaldırıldı", + "autosumm-changed-redirect-target": "Yönlendirme hedefi [[$1]] yerine [[$2]] olarak değiştirildi", "autosumm-new": "\"$1\" içeriğiyle yeni sayfa oluşturdu", "autosumm-newblank": "Boş bir sayfa oluşturdu", "lag-warn-normal": "$1 {{PLURAL:$1|saniyeden|saniyeden}} yeni değişiklikler bu listede görünmeyebilir.", diff --git a/languages/i18n/ur.json b/languages/i18n/ur.json index 0dbadae55a..9f3b3dd6c2 100644 --- a/languages/i18n/ur.json +++ b/languages/i18n/ur.json @@ -548,11 +548,11 @@ "botpasswords-insert-failed": "روبہ نام \"$1\" کو شامل کرنے میں ناکامی۔ کیا اسے پہلے شامل کیا جا چکا ہے؟", "botpasswords-update-failed": "روبہ نام \"$1\" کی تجدید میں ناکامی۔ کیا اسے حذف کر دیا گیا ہے؟", "botpasswords-created-title": "روبہ کا پاس ورڈ تخلیق ہو چکا ہے", - "botpasswords-created-body": "صارف \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ تخلیق ہو چکا ہے۔", + "botpasswords-created-body": "{{GENDER:$2|صارف}} \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ تخلیق ہو چکا ہے۔", "botpasswords-updated-title": "روبہ کا پاس ورڈ تازہ کر دیا گیا", - "botpasswords-updated-body": "صارف \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ تازہ کر دیا گیا۔", + "botpasswords-updated-body": "{{GENDER:$2|صارف}} \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ تازہ کر دیا گیا۔", "botpasswords-deleted-title": "روبہ کا پاس ورڈ حذف ہو چکا ہے", - "botpasswords-deleted-body": "صارف \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ حذف کیا جا چکا ہے۔", + "botpasswords-deleted-body": "{{GENDER:$2|صارف}} \"$2\" کے روبہ نام \"$1\" کا پاس ورڈ حذف کیا جا چکا ہے۔", "botpasswords-newpassword": "$1 کے کھاتے میں داخل ہونے کے لیے نیا پاس ورڈ $2 ہے۔ براہ کرم اسے آئندہ کے لیے محفوظ کر لیں۔
    (وہ قدیم روبہ جات جنہیں یکساں لاگ ان نام اور آخری نام درکار ہوتا ہے، ان کے لیے آپ $3 کو صارف نام اور $4 کو پاس ورڈ کے طور پر استعمال کر سکتے ہیں۔)", "botpasswords-no-provider": "BotPasswordsSessionProvider دستیاب نہیں۔", "botpasswords-restriction-failed": "روبہ کے پاس ورڈ کی پابندیاں اس لاگ ان سے مانع ہیں۔", @@ -934,7 +934,7 @@ "shown-title": "فی صفحہ $1 {{PLURAL:$1|نتیجہ|نتائج}} دکھائیں", "viewprevnext": "($1 {{int:pipe-separator}} $2) دیکھیں ($3)", "searchmenu-exists": "اِس ویکی پر «[[:$1]]» نامی ایک صفحہ موجود ہے۔ {{PLURAL:$2|0=|تلاش کے دیگر نتائج بھی ملاحظہ فرمائیں۔}}", - "searchmenu-new": "صفحہ \"[[:$1]]\" کو اس ویکی پر تخلیق کریں {{PLURAL:$2|0=|وہ صفحہ بھی دیکھے جو ٓپ کے تلاش میں پایا گیا|ان نتائج کو بھی دیکھے جو پائے گئے}}", + "searchmenu-new": "صفحہ \"[[:$1]]\" کو اس ویکی پر تخلیق کریں {{PLURAL:$2|0=|وہ صفحہ بھی دیکھیں جو تلاش میں پایا گیا|ان نتائج کو بھی دیکھیں جو پائے گئے۔}}", "searchprofile-articles": "مواد کے حامل صفحات", "searchprofile-images": "ملٹی میڈیا", "searchprofile-everything": "سب کچھ", @@ -1032,6 +1032,7 @@ "timezoneregion-indian": "بحر ہند", "timezoneregion-pacific": "بحر الکاہل", "allowemail": "دوسرے صارفین کو برقی خظ بھیجنے کا اختیار دیں", + "email-allow-new-users-label": "نئے ترین صارفین کو خود کو ای میل بھیجنے کی اجازت دیں", "email-blacklist-label": "ان صارفین کو برقی خط ارسال کرنے سے باز رکھیں:", "prefs-searchoptions": "تلاش", "prefs-namespaces": "جائے نام", @@ -1200,6 +1201,7 @@ "right-siteadmin": "ڈیٹابیس کو مقفل یا غیر مقفل کرنا", "right-override-export-depth": "پانچویں سطح کی گہرائی تک مربوط صفحات پر مشتمل صفحات کی برآمد", "right-sendemail": "دیگر صارفین کو برقی ڈاک بھیجیں", + "right-sendemail-new-users": "لاگ ان ہوئے بغیر صارفین کو ای میل بھیجیں", "right-managechangetags": "[[Special:Tags|ٹیگوں]] کی تخلیق اور (غیر)فعالی", "right-applychangetags": "کسی کی تبدیلیوں کے ساتھ [[Special:Tags|ٹیگوں]] کا اطلاق", "right-changetags": "انفرادی نسخوں اور نوشتہ کے اندراج پر [[Special:Tags|ٹیگوں]] کا حذف و اضافہ", @@ -1301,6 +1303,7 @@ "recentchanges-noresult": "مقررہ مدت کے دوران میں اس معیار سے مشابہت رکھنے والی کوئی تبدیلی نہیں ہوئی۔", "recentchanges-timeout": "اس تلاش کا وقت ختم ہوگیا ہے۔ آپ پیرامیٹروں کی مختلف تلاش کرسکتے ہیں۔", "recentchanges-network": "تکنیکی خطاؤں کی وجوہات کی بنا پر کسی قسم کے نتیجے لوڈ نہیں ہوئے۔ براہ مہربانی صفحہ کو تازہ کر کے کوشش کریں۔", + "recentchanges-notargetpage": "‫ایک صفحہ سے متعلق اوپر تبدیلی دیکھنے کے لیے اُس صفحہ کا نام درج کریں", "recentchanges-feed-description": "اس فیڈ میں ویکی پر ہونے والی تازہ تریں تبدیلیوں کا مشاہدہ کریں۔", "recentchanges-label-newpage": "یہ ترمیم ایک نئے صفحے کی تخلیق ہے", "recentchanges-label-minor": "یہ ایک معمولی ترمیم ہے", @@ -1316,7 +1319,9 @@ "rcfilters-group-results-by-page": "نتائج گروہ بندی بلحاظ صفحہ", "rcfilters-activefilters": "فعال فلٹر", "rcfilters-advancedfilters": "اضافی فلٹر", - "rcfilters-limit-title": "تبدیلیوں کی تعداد", + "rcfilters-limit-title": "نتائج کی تعداد", + "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|تبدیلی|تبدیلیاں}}، $2", + "rcfilters-date-popup-title": "تلاش کے لیے وقت مدت", "rcfilters-days-title": "حالیہ دنوں کی تعداد", "rcfilters-hours-title": "حالیہ گھنٹوں کی تعداد", "rcfilters-days-show-days": "$1 {{PLURAL:$1|دن}}", @@ -1430,6 +1435,9 @@ "rcfilters-watchlist-showupdated": "تبدیلیوں کے رونما ہونے کے بعد جن صفحات کو آپ نے نہیں دیکھا وہ جلی حرفوں میں ٹھوس علامتوں کے ساتھ نظر آئیں گے۔", "rcfilters-preference-label": "حالیہ تبدیلیوں کا اصلاح شدہ نسخہ چھپائیں", "rcfilters-preference-help": "سنہ 2017ء کے انٹرفیس کو واپس لایا گیا ہے اور تمام آلات کو شامل کیا گیا ہے۔", + "rcfilters-filter-showlinkedfrom-label": "سے منسلک صفحات پر تبدیلیاں دکھائیں", + "rcfilters-filter-showlinkedfrom-option-label": "صفحات سے منسلک چنندہ صفحہ", + "rcfilters-target-page-placeholder": "ایک صفحہ کا نام (یا زمرہ) درج کریں", "rcnotefrom": "ذیل میں $2 سے کی گئی {{PLURAL:$5|تبدیلی|تبدیلیاں}} $1 تک دکھائی جا رہی ہیں۔", "rclistfromreset": "انتخاب تاریخ کی ترتیب نو", "rclistfrom": "$2، $3ء سے ہونے والی نئی تبدیلیاں دکھائیں", @@ -2129,6 +2137,7 @@ "delete-warning-toobig": "$1 {{PLURAL:$1|نسخے|نسخوں}} پر مشتمل اس صفحہ کا تاریخچہ بہت طویل ہے۔\nعین ممکن ہے کہ اسے حذف کرنے سے {{SITENAME}} کے ڈیٹابیس کی کارروائیاں انتشار کا شکار ہو جائیں؛ لہذا احتیاط سے آگے بڑھیں۔", "deleteprotected": "آپ اس صفحہ کو حذف نہیں کر سکتے کیونکہ اسے محفوظ کر دیا گیا ہے۔", "deleting-backlinks-warning": "انتباہ: جس صفحہ کو آپ حذف کر رہے ہیں اس سے مربوط یا اس میں شامل [[Special:WhatLinksHere/{{FULLPAGENAME}}|دیگر صفحات]]۔", + "deleting-subpages-warning": "انتباہ: جو صفحہ آپ حذف کر رہے ہیں اس [[Special:PrefixIndex/{{FULLPAGENAME}}/|{{PLURAL:$1|کا ایک ذیلی صفحہ ہے|$1 subpages|51=کے 50 سے زائد ذیلی صفحات ہیں}}]]", "rollback": "ترمیمات سابقہ حالت پرواپس", "rollbacklink": "استرجع کریں", "rollbacklinkcount": "استرجع $1 {{PLURAL:$1|ترمیم|ترامیم}}", @@ -2137,6 +2146,7 @@ "rollback-missingparam": "درخواست میں ضروری پیرامیٹر موجود نہیں۔", "rollback-missingrevision": "نسخہ کی معلومات لوڈ نہیں ہو سکتی۔", "cantrollback": "تدوین ثانی کا اعادہ نہیں کیا جاسکتا؛ کیونکہ اس میں آخری بار حصہ لینے والا ہی اس صفحہ کا واحد کاتب ہے۔", + "alreadyrolled": " [[User:$2|$2]] ([[User talk:$2|تبادلہ خیال]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]) کی [[:$1]] پر آخری ترمیم استرجع نہیں کی جاسکتی کیونکہ کوئی صفحے میں پہلے ہی ترمیم یا استرجع کر چکا ہے۔\n\nصفحہ پر آخری ترمیم [[User:$3|$3]] ([[User talk:$3|تبادلہ خیال ]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]) کی تھی۔", "editcomment": "خلاصہ ترمیم یہ تھا: «$1».", "revertpage": "[[Special:Contributions/$2|$2]] ([[User talk:$2|تبادلۂ خیال]]) کی ترامیم [[User:$1|$1]] کی گذشتہ ترمیم کی جانب واپس پھیر دی گئیں۔", "revertpage-nouser": "(حذف شدہ صارف نام) کی ترامیم {{GENDER:$1|[[User:$1|$1]]}} کی گذشتہ ترمیم کی جانب واپس پھیر دی گئیں", @@ -2156,7 +2166,7 @@ "changecontentmodel-emptymodels-title": "مواد کا کوئی ماڈل دستیاب نہیں", "changecontentmodel-emptymodels-text": "[[:$1]] میں موجود مواد کی نوعیت کو تبدیل نہیں کیا جا سکتا۔", "log-name-contentmodel": "نوشتہ تبدیلی نمونہ مواد", - "log-description-contentmodel": "صفحہ کے مواد کے ماڈل سے متعلق واقعات", + "log-description-contentmodel": "صفحہ کے مواد کے ماڈل سے متعلق واقعات اور صفحات جو طے شدہ کے علاوہ ایک مواد کے ماڈل کے ساتھ بنائے گئے۔", "logentry-contentmodel-new": "$1 نے مواد کے غیر ڈیفالٹ ماڈل «$5» کے ذریعہ صفحہ $3 کو {{GENDER:$2|تخلیق کیا}}", "logentry-contentmodel-change": "$1 نے صفحہ $3 کے مواد کی ساخت کو \"$4\" سے \"$5\" میں {{GENDER:$2|تبدیل کیا}}", "logentry-contentmodel-change-revertlink": "استرجع", @@ -2321,6 +2331,7 @@ "ipb-hardblock": "اس آئی پی پتے سے داخل شدہ صارفین کو ترمیم کاری سے باز رکھیں", "ipbcreateaccount": "کھاتہ سازی سے باز رکھیں", "ipbemailban": "برقی خط بھیجنے سے باز رکھیں", + "ipbenableautoblock": "یہ آئی پی پتہ ممنوع صارف نے استعمال کیا ہے اور خود کار طریقے سے اس آئی پی پتے پر پابندی عائد کر دی گئی ہے اور بعد میں اگر وہ ممنوع صارف جتنے بھی آئی پی پتے استعمال کرے گا تو ان پر بھی پابندی لگ جائے گی", "ipbsubmit": "اس صارف کا داخلہ ممنوع کریں", "ipbother": "دیگر وقت:", "ipboptions": "2 گھنٹے:2 hours,1 یوم:1 day,3 ایام:3 days,1 ہفتہ:1 week,2 ہفتے:2 weeks,1 مہینہ:1 month,3 مہینے:3 months,6 مہینے:6 months,1 سال:1 year,لامحدود:infinite", @@ -3650,9 +3661,9 @@ "limitreport-expansiondepth": "توسیع کی بلند ترین گہرائی", "limitreport-expensivefunctioncount": "کثیر الاستعمال پارسر فنکشنوں کی تعداد", "expandtemplates": "سانچوں کی توسیع", - "expand_templates_intro": "اس خصوصی صفحہ میں ویکی کی عبارتوں کو اخذ کرکے ان میں موجود تمام مستعمل سانچوں کو کھولا جاتا ہے۔\nنیز اس صفحہ میں {{#language:…}} جیسے پارسر فنکشنوں اور {{CURRENTDAY}} جیسے متغیرات کی معاونت بھی رکھی گئی ہے۔\nدرحقیقت یہاں ہر چیز کو دوہرے محرابی قوسین میں کھول دیا جاتا ہے۔", + "expand_templates_intro": "اس خصوصی صفحہ میں ویکی کی عبارتوں کو اخذ کر کے ان میں موجود تمام مستعمل سانچوں کو کھولا جاتا ہے۔\nنیز اس صفحہ میں {{#language:…}} جیسے پارسر فنکشنوں اور {{CURRENTDAY}} جیسے متغیرات کی معاونت بھی رکھی گئی ہے۔\nدرحقیقت یہاں ہر چیز کو دوہرے محرابی قوسین میں کھول دیا جاتا ہے۔", "expand_templates_title": "اس عبارت کا عنوان، مثلاً {{FULLPAGENAME}} وغیرہ کے لیے:", - "expand_templates_input": "ان پٹ متن:", + "expand_templates_input": "ان پٹ ویکی متن:", "expand_templates_output": "نتیجہ", "expand_templates_xml_output": "XML آؤٹ پٹ", "expand_templates_html_output": "ایچ ٹی ایم ایل کا خام نتیجہ", @@ -3664,7 +3675,7 @@ "expand_templates_preview": "پیش نظارہ", "expand_templates_preview_fail_html": "چونکہ {{SITENAME}} نے خام ایچ ٹی ایم ایل فعال کر رکھا ہے اور نشست کا ڈیٹا گم ہو گیا ہے لہذا جاوا اسکرپٹ کے طوفان بدتمیزی سے تحفظ کے لیے نمائش کو پوشیدہ رکھا گیا ہے۔\n\nاگر نمائش کی یہ کوشش درست ہے تو براہ کرم دوبارہ کوشش کریں۔\nاگر اب بھی کامیابی نہ ملے تو [[Special:UserLogout|خارج ہو کر]] دوبارہ داخل ہوں، نیز اپنے براؤز کی ترتیبات کو بھی جانچ لیں کہ آیا اس میں کوکیز کو ذخیرہ کرنے کی اجازت ہے یا نہیں۔", "expand_templates_preview_fail_html_anon": "چونکہ {{SITENAME}} نے خام ایچ ٹی ایم ایل فعال کر رکھا ہے اور آپ داخل نہیں ہیں لہذا جاوا اسکرپٹ کے طوفان بدتمیزی سے تحفظ کے لیے نمائش کو پوشیدہ رکھا گیا ہے۔\n\nاگر نمائش کی یہ کوشش درست ہے تو براہ کرم [[Special:UserLogin|داخل ہوں]] اور دوبارہ کوشش کریں۔", - "expand_templates_input_missing": "آپ کو کم از کم کچھ متن درج کرنا ہوگا۔", + "expand_templates_input_missing": "آپ کو کم از کم کچھ ویکی متن درج کرنا ہوگا۔", "pagelanguage": "صفحے کی زبان تبدیل کریں", "pagelang-name": "صفحہ", "pagelang-language": "زبان", @@ -3673,6 +3684,7 @@ "pagelang-reason": "وجہ", "pagelang-submit": "ٹھیک ہے", "pagelang-nonexistent-page": "صفحہ $1 موجود نہیں ہے۔", + "pagelang-unchanged-language": "صفحہ $1 کی زبان پہلے ہی $2 طے کی گئی ہے۔", "pagelang-db-failed": "ڈیٹابیس زبان کو تبدیل کرنے میں ناکام رہا۔", "right-pagelang": "صفحے کی زبان تبدیل کریں", "action-pagelang": "صفحے کی زبان تبدیل کریں", diff --git a/languages/i18n/vec.json b/languages/i18n/vec.json index 33f56f0f02..4c45461074 100644 --- a/languages/i18n/vec.json +++ b/languages/i18n/vec.json @@ -206,7 +206,7 @@ "redirectedfrom": "(Rimando da $1)", "redirectpagesub": "Pagina de rimando", "redirectto": "Rimanda a:", - "lastmodifiedat": "Ultimo canbiamento de sta pagina: $2, $1.", + "lastmodifiedat": "Ultimo canbiamento de sta pagina el $1 a ƚe $2.", "viewcount": "Sta pagina la xe stà leta {{PLURAL:$1|na olta|$1 olte}}.", "protectedpage": "Pagina proteta", "jumpto": "Va a:", @@ -284,7 +284,7 @@ "nstab-template": "Modèl", "nstab-help": "Ajuto", "nstab-category": "Categoria", - "mainpage-nstab": "Pagina prinsipale", + "mainpage-nstab": "Pàgina prinsipale", "nosuchaction": "Operasion no riconossua", "nosuchactiontext": "L'asion spesifegà ne l'URL no a xè vałida.\nXè posibiłe che l'URL sia sta dizità en modo erato o che sia sta seguio on cołegamento no vałido.\nCiò podaria anca indicare on bug en {{SITENAME}}.", "nosuchspecialpage": "Pajina prinsipałe no disponibiłe", @@ -1442,6 +1442,7 @@ "booksources-search": "Serca", "booksources-text": "De seguito vien presentà un elenco de colegamenti verso siti foresti che vende libri novi e usài, atraverso i quali se pol otegner piassè informazioni sul testo sercà.", "booksources-invalid-isbn": "El nùmaro ISBN inserìo no'l xe mia valido: controla de novo se te lo ghè copià justo da la fonte originale.", + "magiclink-tracking-isbn": "Pàgine che dòpara coƚegamenti magisi ISBN", "specialloguserlabel": "Asion efetuà da:", "speciallogtitlelabel": "Asion efetuà so:", "log": "Registri", diff --git a/languages/i18n/war.json b/languages/i18n/war.json index 0b8175f11d..b82d91be0a 100644 --- a/languages/i18n/war.json +++ b/languages/i18n/war.json @@ -1278,7 +1278,7 @@ "statistics-header-hooks": "Lain nga mga estadistika", "statistics-articles": "Unod nga mga pakli", "statistics-pages": "Mga pakli", - "statistics-pages-desc": "Ngatanan nga mga pakli ha sulod hini nga wiki, lakip an hiruhimangraw nga mga pakli, mga redirect, ngan iba pa", + "statistics-pages-desc": "Tanan nga pakli hinin nga wiki, lakip an hiruhimangraw nga pakli, redirect, ngan iba pa.", "statistics-files": "Mga paypay nga iginkarga pasaka", "statistics-edits": "Mga pagliwat hit pakli tikang gintukod hini nga {{SITENAME}}", "statistics-edits-average": "Average nga mga pagliwat kada pakli", diff --git a/languages/i18n/wuu.json b/languages/i18n/wuu.json index 990b146c53..b1040c4e38 100644 --- a/languages/i18n/wuu.json +++ b/languages/i18n/wuu.json @@ -53,7 +53,7 @@ "tog-shownumberswatching": "顯示關注人數", "tog-oldsig": "侬原生个签名：", "tog-fancysig": "拿签名当成维基文本（弗自动链接）", - "tog-uselivepreview": "使用实时预览", + "tog-uselivepreview": "显示预览弗用重新加载页面", "tog-forceeditsummary": "朆写编辑摘要个辰光提醒我", "tog-watchlisthideown": "关注表里囥脱我个编辑", "tog-watchlisthidebots": "关注表里囥脱机器人个编辑", @@ -182,6 +182,7 @@ "searcharticle": "去", "history": "页面历史", "history_short": "历史", + "history_small": "历史", "updatedmarker": "從上趟訪問起個更新", "printableversion": "打印版", "permalink": "老世链接", @@ -215,7 +216,7 @@ "redirectedfrom": "（从$1转戳到箇里）", "redirectpagesub": "轉戳頁", "redirectto": "重定向到：", - "lastmodifiedat": "箇只页面阿末趟修订来拉$1 $2。", + "lastmodifiedat": "箇只页面阿末趟编辑来拉$1 $2。", "viewcount": "箇頁望過$1垡。", "protectedpage": "畀保护个页面", "jumpto": "蹦到：", @@ -436,7 +437,7 @@ "nosuchusershort": "无没叫“$1”个用户。请检查侬个输入。", "nouserspecified": "侬必须选个用户名。", "login-userblocked": "箇个用户拨封锁拉许。弗允许登录。", - "wrongpassword": "密码弗对。请侬再试试看。", + "wrongpassword": "用户名或者密码弗对。请侬再试试看。", "wrongpasswordempty": "密码为空，请重试。", "passwordtooshort": "密码起码要$1个字符。", "passwordtoolong": "密码弗能超过{{PLURAL:$1|$1个字符}}。", @@ -452,7 +453,7 @@ "eauthentsent": "一封确认信已经发送到指定个电子邮箱地址。垃拉其他邮件发送到本账号之前，侬必须首先按照箇封信里向个指示，确认箇只邮箱真实有效。", "throttled-mailpassword": "密码转设电子信徕最近$1个钟头里发畀你侬哉。保险点，密码转设电子信$1个钟头只一垡好发。", "mailerror": "发送邮件错误：$1", - "acct_creation_throttle_hit": "弗好意思，使用箇只IP个访客已经创建仔$1只账号，迭个是箇段辰光里向所允许个最大值。箇咾使用箇只IP个地址个访客暂时弗好再创建账户。", + "acct_creation_throttle_hit": "使用侬个IP地址个访客勒过去$2已经创建仔$1只账号，迭个是箇段辰光里向允许个最大值。箇咾使用箇只IP地址个访客暂时弗好再创建账号。", "emailauthenticated": "侬个电子邮箱地址已经垃拉$2 $3确认。", "emailnotauthenticated": "侬个电子邮箱地址还朆确认。下底个功能弗会发送任何邮件。", "noemailprefs": "指定一只电子邮箱地址以使用箇眼功能。", @@ -548,10 +549,10 @@ "anonpreviewwarning": "''侬弗曾登录。侬个IP位址会得记录拉此页个编辑历史里向。''", "missingsummary": "'''提示：''' 侬弗曾提供编辑摘要。假使侬再次单击保存，侬个编辑将弗带编辑摘要保存。", "selfredirect": "警告：侬来上拿本页面重定向到它自家。侬可能搞错著重定向个目标，或者侬来上编辑错个页面。如果侬再次点击“$1”，重定向弗管哪亨会畀创建。", - "missingcommenttext": "请垃下头输入备注。", + "missingcommenttext": "请输入备注。", "missingcommentheader": "提示：侬弗曾为此评论提供标题。如果侬再次单击“$1”，侬个编辑将弗带标题保存。", - "summary-preview": "摘要预览：", - "subject-preview": "主题预览：", + "summary-preview": "编辑摘要个预览：", + "subject-preview": "主题个预览：", "blockedtitle": "用户畀查封", "blockedtext": "侬个用户名或IP地址已经畀查封。\n\n由$1查封。畀出个原因是$2。\n\n* 查封开始辰光：$8\n* 查封到期辰光：$6\n* 目标查封对象：$7\n\n侬可以联络$1或者其他个[[{{MediaWiki:Grouppage-sysop}}|管理员]]，讨论箇趟查封。侬弗好使用“电邮联系箇位用户”功能，除非侬已经垃侬个[[Special:Preferences|账号设置]]里向指定仔一只有效个电邮地址并且朆畀禁止使用箇只功能。侬当前个IP地址是$3，而该查封ID是#$5。请垃拉侬个查询里向注明以上所有资料。", "autoblockedtext": "侬个IP地址已经畀自动查封，因为之前另一位畀$1查封个用户搭侬用一样个IP地址。查封个原因是：\n\n:$2\n\n* 查封开始辰光：$8\n* 查封到期辰光：$6\n* 目标查封对象：$7\n\n侬可以联络$1或者其他个[[{{MediaWiki:Grouppage-sysop}}|管理员]]，讨论箇趟查封。\n\n注意侬弗好使用“电邮联系箇位用户”功能，除非侬已经垃侬个[[Special:Preferences|账号设置]]里向指定仔一只有效个电邮地址并且朆畀禁止使用箇只功能。\n\n侬当前个IP地址是$3，而该查封ID是#$5。请垃拉侬个查询里向注明以上所有资料。", @@ -573,7 +574,7 @@ "userpage-userdoesnotexist": "用户账户“$1”弗曾创建。请垃拉创建／编辑迭个页面前头先检查一记。", "userpage-userdoesnotexist-view": "用户账户“$1”弗曾创建。", "blocked-notice-logextract": "箇位用户箇歇畀封锁垃许。下头有最近个封锁纪录以供参考：", - "clearyourcache": "注意：垃拉保存之后，侬作兴要清除浏览器个缓存才好看见改变。\n* Firefox或Safari：揿牢“Shift”个同时点击“刷新”，或揿“Ctrl-F5”或“Ctrl-R”（Mac上是“⌘-R”）\n* Google Chrome：揿“Ctrl-Shift-R”（Mac上是“⌘-Shift-R”）\n* Internet Explorer：揿牢“Ctrl”个同时点击“刷新”，或揿“Ctrl-F5”\n* Opera：垃拉“工具→首选项”里向清除缓存", + "clearyourcache": "注意：垃拉保存之后，侬作兴要清除浏览器个缓存才好看见改变。\n* Firefox或Safari：揿牢“Shift”个同时点击“刷新”，或揿“Ctrl-F5”或“Ctrl-R”（Mac上是“⌘-R”）\n* Google Chrome：揿“Ctrl-Shift-R”（Mac上是“⌘-Shift-R”）\n* Internet Explorer：揿牢“Ctrl”个同时点击“刷新”，或揿“Ctrl-F5”\n* Opera：去到菜单 → 设置（Mac上是Opera → 偏好设定），再转到隐私&安全 → 清除浏览数据 → 缓存个图片搭文件。", "usercssyoucanpreview": "'''提示：''' 垃拉保存之前请用“{{int:showpreview}}”揿钮来测试新 CSS 。", "userjsyoucanpreview": "'''提示：''' 垃拉保存之前请用“{{int:showpreview}}”揿钮来测试新 JavaScript 。", "usercsspreview": "'''注意侬只是垃许预览侬个 CSS。'''\n'''还弗曾保存！'''", @@ -605,7 +606,7 @@ "readonlywarning": "警告：数据库锁定垃许维护，侬箇歇弗好保存侬个修改。侬作兴希望先拿侬个文字复制并保存到文本文件，等歇再修改。\n\n锁牢数据库个系统管理员有如下解释：$1", "protectedpagewarning": "警告：此页已经畀保护，只有拥有管理员权限个用户才好修改。最近个日志垃拉下底提供以便参考：", "semiprotectedpagewarning": "'''注意：''' 本页面畀锁定，仅限注册用户编辑。\n最近个日志垃拉下底提供以便参考：", - "cascadeprotectedwarning": "警告：本页已经畀保护，只有拥有管理员权限个用户才好修改，因为本页已畀下底眼级联保护个{{PLURAL:$1|一只|多只}}页面所嵌入：", + "cascadeprotectedwarning": "警告：本页已经畀保护，只有拥有[[Special:ListGroupRights|特定权限]]个用户纔好修改，因为本页已畀下底眼级联保护个{{PLURAL:$1|一只|多只}}页面所嵌入：", "titleprotectedwarning": "'''警告：本页面已畀锁定，需要[[Special:ListGroupRights|指定权限]]方可创建。'''\n最近个日志垃拉下底提供以便参考：", "templatesused": "箇页用着个{{PLURAL:$1|模板}}：", "templatesusedpreview": "箇趟预览用着个{{PLURAL:$1|模板}}：", @@ -621,15 +622,15 @@ "permissionserrorstext": "为仔下头个{{PLURAL:$1|原因|原因}}咾侬无权进行箇只操作：", "permissionserrorstext-withaction": "为仔下头个{{PLURAL:$1|原因|原因}}咾侬无权进行$2操作：", "recreate-moveddeleted-warn": "警告：你来上重新创建一只老早删过个页面。\n\n你应该考虑继续编辑箇只页面啊合适。为方便起见，箇只页面个删除搭移动记录提供勒下底：", - "moveddeleted-notice": "箇页删脱哉。箇页个删除搭移动记录提供垃拉下头以便参考。", + "moveddeleted-notice": "箇页删脱哉。箇页个删除、保护搭移动记录提供垃拉下头以便参考。", "log-fulllog": "望完整日志", "edit-hook-aborted": "编辑畀钩子取消。\n渠弗曾畀出解释。", "edit-gone-missing": "弗好更新页面。\n渠作兴齐巧畀删除。", "edit-conflict": "编辑冲突", "edit-no-change": "侬个编辑畀忽略，因为文本弗曾有改动。", - "postedit-confirmation-created": "页面已创建。", + "postedit-confirmation-created": "页面建立哉。", "postedit-confirmation-restored": "页面已恢复。", - "postedit-confirmation-saved": "倷个编辑已保存。", + "postedit-confirmation-saved": "倷个编辑保存好哉。", "edit-already-exists": "弗好创建新页面。已经有垃许。", "defaultmessagetext": "默认消息文本", "invalid-content-data": "无效内容数据", @@ -656,7 +657,7 @@ "undo-success": "箇只编辑可以撤销。请检查下头个比较，确定侬确实想撤销，再保存下底个更改完成撤销编辑。", "undo-failure": "由于相互冲突个中途编辑，箇只编辑弗好撤销。", "undo-norev": "由于其版本弗存在或已删除，此编辑弗好撤销。", - "undo-nochange": "箇届编辑看出来已经畀撤销。", + "undo-nochange": "箇笔编辑看出来已经畀撤销过哉。", "undo-summary": "撤销由[[Special:Contributions/$2|$2]]（[[User talk:$2|讨论]]）作出个版本$1", "cantcreateaccount-text": "从箇只IP地址 （$1） 创建账户已经畀[[User:$3|$3]]禁止。\n\n$3封禁个原因是''$2''", "viewpagelogs": "望箇页日志", @@ -674,8 +675,8 @@ "page_first": "最前", "page_last": "阿末", "histlegend": "选择比较版本：标记要比较个两只版本，回车或者揿页面底里个揿钮。
    图例：（当前） = 搭当前版本有啥两样， （上个） = 搭上个版本有啥两样，小 = 小改动。", - "history-fieldset-title": "浏览历史", - "history-show-deleted": "只显示删脱个", + "history-fieldset-title": "搜寻修订版本", + "history-show-deleted": "只显示删脱个修订版本", "histfirst": "顶早", "histlast": "顶晏", "historysize": "（$1字节）", @@ -733,7 +734,7 @@ "logdelete-failure": "'''事件个可见性无法设置：'''\n$1", "revdel-restore": "改变可见性", "pagehist": "页面历史", - "deletedhist": "已删除之历史", + "deletedhist": "删脱个历史", "revdelete-hide-current": "隐藏于$1 $2之项目错误：箇个是当前个版本，弗可以隐藏。", "revdelete-show-no-access": "显示于$1 $2之项目错误：箇只项目已经标示为\"已限制\"，侬对渠并无通行权。", "revdelete-modify-no-access": "更改于$1 $2之项目错误：箇个项目已经标示为\"已限制\"，侬对渠并无通行权。", @@ -814,7 +815,7 @@ "search-file-match": "（匹配文件内容）", "search-suggest": "侬啊是要寻：$1", "search-rewritten": "显示$1个结果。另寻$2。", - "search-interwiki-caption": "姊妹项目", + "search-interwiki-caption": "来自姊妹项目个结果", "search-interwiki-default": "来自$1个结果：", "search-interwiki-more": "（更多）", "search-relatedarticle": "相关", @@ -851,7 +852,7 @@ "prefs-editwatchlist-clear": "清空侬个关注表", "prefs-watchlist-days": "勒拉监控列表里向显示个日数：", "prefs-watchlist-days-max": "最长$1日天", - "prefs-watchlist-edits": "勒拉扩展个监控列表里向显示个编辑趟数：", + "prefs-watchlist-edits": "勒拉关注表里向显示个最大改动趟数：", "prefs-watchlist-edits-max": "顶多：1000", "prefs-watchlist-token": "监控列表记认：", "prefs-misc": "杂项", @@ -888,7 +889,7 @@ "timezoneregion-europe": "欧洲", "timezoneregion-indian": "印度洋", "timezoneregion-pacific": "太平洋", - "allowemail": "接受别个用户个电子邮件", + "allowemail": "允许别个用户发畀我电子邮件", "prefs-searchoptions": "搜寻", "prefs-namespaces": "名字空间", "default": "默认", @@ -925,7 +926,7 @@ "editusergroup": "加载用户组", "editinguser": "改动{{GENDER:$1|用户}}[[User:$1|$1]]个用户权限$2", "userrights-editusergroup": "编辑用户组", - "userrights-viewusergroup": "望用户组", + "userrights-viewusergroup": "望{{GENDER:$1|用户}}组", "saveusergroups": "保存{{GENDER:$1|用户}}组", "userrights-reason": "理由：", "group-bot": "机器人", @@ -974,7 +975,7 @@ "grant-group-email": "发电子邮件", "grant-createaccount": "建立账号", "grant-createeditmovepage": "建立、编辑搭著捅荡页面", - "grant-rollback": "畀修改擂轉到頁面", + "grant-rollback": "回退对页面个改动", "grant-sendemail": "发电子邮件畀其他用户", "newuserlogpage": "用户创建日志", "newuserlogpagetext": "箇是用户创建个记录。", @@ -983,6 +984,7 @@ "action-edit": "编辑箇只页面", "action-createpage": "建立该只页面", "action-createtalk": "建立该只讨论页", + "action-createaccount": "建立该只用户账号", "action-minoredit": "標小編寫", "action-move": "移箇頁", "action-move-subpages": "移箇頁搭兒頁", @@ -993,7 +995,7 @@ "action-delete": "刪箇頁", "action-deleterevision": "删脱修订", "action-deletedhistory": "望页面删脱个历史", - "action-browsearchive": "尋已刪頁", + "action-browsearchive": "寻删脱个页面", "action-undelete": "还原页面", "action-patrol": "拿别人家个编辑标记成已巡查", "action-userrights": "編全部用戶權", @@ -1009,6 +1011,7 @@ "recentchanges": "近段辰光个改动", "recentchanges-legend": "近段辰光个改动选项", "recentchanges-summary": "登该个页面浪跟踪最近对本站个改动。", + "recentchanges-noresult": "勒畀定个辰光内呒不符合伊点条件个改动。", "recentchanges-feed-description": "跟踪此订阅垃拉 wiki 高头个最近更改。", "recentchanges-label-newpage": "箇编辑建立着新页", "recentchanges-label-minor": "箇是小编写", @@ -1017,6 +1020,9 @@ "recentchanges-label-plusminus": "箇页面字节数前后个变化", "recentchanges-legend-heading": "说明：", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}}（见[[Special:NewPages|新页列表]]）", + "rcfilters-tag-remove": "拿脱「$1」", + "rcfilters-activefilters": "激活个过滤器", + "rcnotefrom": "下底{{PLURAL:$5|是}}$3 $4之后个改动（顶多显示$1个）。", "rclistfrom": "显示 $3 $2 以来个新改动", "rcshowhideminor": "$1小编写", "rcshowhideminor-show": "显示", @@ -1025,10 +1031,12 @@ "rcshowhidebots-show": "显示", "rcshowhidebots-hide": "囥脱", "rcshowhideliu": "$1注册用户", + "rcshowhideliu-show": "显示", "rcshowhideliu-hide": "囥脱", "rcshowhideanons": "$1匿名用户", "rcshowhideanons-show": "显示", "rcshowhideanons-hide": "囥脱", + "rcshowhidepatr": "$1巡查过个编辑", "rcshowhidepatr-hide": "囥脱", "rcshowhidemine": "$1我个编辑", "rcshowhidemine-show": "显示", @@ -1046,11 +1054,12 @@ "newsectionsummary": "/* $1 */ 新段落", "rc-enhanced-expand": "显示细节", "rc-enhanced-hide": "拿细节囥脱", + "rc-old-title": "暴开始建立个名字是“$1”", "recentchangeslinked": "搭界个改动", "recentchangeslinked-feed": "搭界个改动", "recentchangeslinked-toolbox": "搭界个改动", "recentchangeslinked-title": "搭“$1”有关个改动", - "recentchangeslinked-summary": "箇页列出个是对链到某只指定页面个页面近段辰光个修订（或者是对指定分类个成员）。\n徕[[Special:Watchlist|你侬个关注表]]里个页用'''粗体'''显示。", + "recentchangeslinked-summary": "输入页面名字，来望该只页面所链进或链出页面个改动。（要望分类个成员，请输入Category:分类名字）。[[Special:Watchlist|你侬个关注表]]里向页面个改动用粗体显示。", "recentchangeslinked-page": "页面名称：", "recentchangeslinked-to": "显示链接到指定页面个页面个改动", "upload": "上传文件", @@ -1103,6 +1112,7 @@ "lockmanager-notlocked": "“$1”朆鎖牢，嘸處開鎖。", "img-auth-nofile": "“$1”文件嘸。", "upload-curl-error6": "URL走弗進。", + "license": "授权协议：", "license-header": "授权协议", "listfiles_search_for": "寻图片名字:", "imgfile": "源文件", @@ -1124,16 +1134,19 @@ "filehist-datetime": "日脚 / 辰光", "filehist-thumb": "微缩图", "filehist-thumbtext": "于$1个缩图版本", + "filehist-nothumb": "呒不缩图", "filehist-user": "用户", "filehist-dimensions": "维度", "filehist-filesize": "文件大細", "filehist-comment": "备注", "imagelinks": "文件用法", "linkstoimage": "下头$1个页面链到箇文件：", + "linkstoimage-more": "超过$1只{{PLURAL:$1|页面链接}}到该只文件。下底个单子只显示链接到该只文件个{{PLURAL:$1|头一只页面|头$1只页面}}。侬好望[[Special:WhatLinksHere/$2|完整个单子]]。", "nolinkstoimage": "呒不页面链接到该只文件。", "linkstoimage-redirect": "$1（文件轉戳到）$2", "sharedupload": "箇只文件来源于$1，渠作兴垃拉其他项目当中畀应用。", "sharedupload-desc-here": "箇文件$1里个，作兴会畀别个项目使用。渠个[$2 描述页]里个说明显示如下。", + "filepage-nofile": "弗存在介样名字个文件。", "uploadnewversion-linktext": "上载该文件个新版", "upload-disallowed-here": "你弗可以覆盖伊只文件。", "filerevert": "恢复$1", @@ -1156,6 +1169,7 @@ "statistics-header-users": "用户资料", "statistics-users-active": "活跃用户", "pageswithprop-submit": "去", + "double-redirect-fixer": "重定向修正者", "brokenredirects": "坏脱个重定向", "brokenredirectstext": "下底个重定向链到弗存在个页面：", "brokenredirects-edit": "编辑", @@ -1191,7 +1205,9 @@ "specialloguserlabel": "用戶：", "speciallogtitlelabel": "目标（标题，或针对用户使用{{ns:user}}:用户名）：", "log": "记录", + "all-logs-page": "所有公开记录", "alllogstext": "所有{{SITENAME}}公开日志个联合展示。侬可以选择日志类型、用户名（区分大小写）或者相关页面（区分大小写）来缩小搜寻范围。", + "logempty": "呒不符合条件个记录项。", "checkbox-all": "侪选", "checkbox-none": "侪弗选", "allpages": "全部页面", @@ -1205,6 +1221,7 @@ "allpagesprefix": "显示个页面有下底个前缀:", "allpagesbadtitle": "畀定个页面标题是非法个，或者具有一个内部语言或内部 wiki 个前缀。渠作兴包括一个或更多个弗好用于标题个字符。", "allpages-bad-ns": "{{SITENAME}}呒不叫\"$1\"个名字空间。", + "allpages-hide-redirects": "囥脱重定向", "categories": "页面分类", "categoriespagetext": "下底个{{PLURAL:$1|分类包括}}页面或者媒体文件。[[Special:UnusedCategories|未使用分类]]弗勒伊𡍲显示。另见[[Special:WantedCategories|需要个分类]]。", "deletedcontributions": "删脱个用户贡献", @@ -1227,6 +1244,7 @@ "emailccme": "我個信息發份畀我", "emailsent": "电子邮件发出去哉", "emailsenttext": "倷个电子邮件讯息已经拨发送哉。", + "usermessage-editor": "系统消息编辑器", "watchlist": "關注表", "mywatchlist": "我个关注表", "watchlistfor2": "$1个关注表$2", @@ -1241,15 +1259,16 @@ "unwatch": "弗关注", "unwatchthispage": "停止监控", "notanarticle": "弗是內容頁", - "watchlist-details": "有$1页垃拉侬关注表高头，弗包括讨论页。", + "watchlist-details": "有$1页垃拉侬关注表高头（包括讨论页）。", "wlheader-showupdated": "勒侬上趟查看之后修改过个页面加粗显示。", - "wlnote": "下底是{{PLURAL:$2|过去$2个钟头}}个{{PLURAL:$1|最后$1届更改}}，截至$3 $4。", + "wlnote": "下底是{{PLURAL:$2|过去$2个钟头}}个{{PLURAL:$1|阿末$1趟更改}}，截至$3 $4。", "wlshowlast": "显示上$1个钟头$2日天", "watchlist-hide": "囥脱", "wlshowhidemine": "我个编辑", "watchlist-options": "关注表选项", "watching": "监控……", "unwatching": "解除监控……", + "enotif_reset": "标记所有页面为访问过", "enotif_body_intro_deleted": "{{SITENAME}}页面$1已于$PAGEEDITDATE被$2{{GENDER:$2|删除}}，请见<$3>。", "created": "建立哉", "changed": "改变哉", @@ -1268,7 +1287,7 @@ "deletereasonotherlist": "别个理由", "rollback": "恢复编辑", "rollbacklink": "恢复", - "rollbacklinkcount": "回退$1届编辑", + "rollbacklinkcount": "回退$1笔编辑", "rollbackfailed": "恢复失败", "cantrollback": "弗好恢复编辑；阿末个贡献人是本页唯一个作者。", "alreadyrolled": "恢复弗落[[User:$2|$2]]（[[User talk:$2|讲张]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]）对[[:$1]]个编辑，其他人已经编辑歇或恢复过该个页面。\n\n最后编辑者是[[User:$3|$3]]（[[User talk:$3|讲张]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]）。", @@ -1319,16 +1338,20 @@ "mycontris": "我个贡献", "anoncontribs": "贡献", "contribsub2": "{{GENDER:$3|$1}}个贡献（$2）", + "nocontribs": "朆寻着符合伊点条件个改动。", "uctop": "（此垡）", "month": "从箇月往前：", "year": "从箇年往前：", "sp-contributions-newbies": "只显示新用户个贡献", "sp-contributions-blocklog": "查封记录", "sp-contributions-deleted": "删脱个{{GENDER:$1|用户}}贡献", + "sp-contributions-uploads": "上传", + "sp-contributions-logs": "记录", "sp-contributions-talk": "讲张", "sp-contributions-search": "寻贡献记录", "sp-contributions-username": "IP地址要勿用户名：", "sp-contributions-toponly": "只显示阿末只版本个编辑", + "sp-contributions-newonly": "只显示建立页面个编辑", "sp-contributions-submit": "搜寻", "whatlinkshere": "链进来点啥", "whatlinkshere-title": "链接到“$1”个页面", @@ -1344,6 +1367,7 @@ "whatlinkshere-hideredirs": "$1重定向", "whatlinkshere-hidetrans": "$1嵌入", "whatlinkshere-hidelinks": "$1链接", + "whatlinkshere-hideimages": "$1文件链接", "whatlinkshere-filters": "过滤器", "blockip": "查封{{GENDER:$1|用户}}", "blockiptext": "用下头个表单来禁止来自某一特定IP地址或用户名个修改权限。只有勒勒为仔防止破坏，及符合[[{{MediaWiki:Policy-url}}|政策]]个情况下底才好采取此行动。请勒勒下底输入一个具体个理由（譬如引述一只畀破坏个页面）。侬好用[https://zh.wikipedia.org/wiki/无类别域间路由 CIDR]语法查封IP地址段；允许个最大段是/$1（针对IPv4）搭/$2（针对IPv6）。", @@ -1365,10 +1389,12 @@ "autoblocker": "因为侬搭“[[User:$1|$1]]”共享一个IP地址了畀自动查封。$1畀查封个理由是“$2”", "blocklogpage": "封禁日志", "blocklogentry": "查封[[$1]]，终止辰光为$2$3", + "reblock-logentry": "改动[[$1]]个查封期为$2$3", "blocklogtext": "该个是用户查封搭著解封操作个记录。自动查封个IP地址弗会列勒该𡍲。到[[Special:BlockList|封禁列表]]去看当前生效个查封。", "unblocklogentry": "$1已经拨解封", "block-log-flags-nocreate": "建账号禁用哉", "block-log-flags-nousertalk": "弗准编辑自家个讨论页", + "proxyblocker": "代理查封者", "lockdb": "鎖數據庫", "unlockdb": "開鎖數據庫", "lockbtn": "鎖數據庫", @@ -1401,6 +1427,7 @@ "allmessagesnotsupportedDB": "'''{{ns:special}}:Allmessages''' 呒处显示，因为 '''$wgUseDatabaseMessages''' 关勒浪。", "thumbnail-more": "放大", "filemissing": "文件寻弗着哉", + "importlogpage": "导入记录", "tooltip-pt-userpage": "{{GENDER:|侬个用户}}页", "tooltip-pt-mytalk": "{{GENDER:|侬}}个讨论页", "tooltip-pt-anontalk": "有关箇只IP地址编辑个讨论", @@ -1466,20 +1493,45 @@ "anonymous": "{{SITENAME}}上个匿名{{PLURAL:$1|用户}}", "simpleantispam-label": "反垃圾检查。弗要填伊个！", "pageinfo-title": "“$1”个信息", + "pageinfo-header-basic": "基本信息", + "pageinfo-header-edits": "编辑历史", + "pageinfo-header-restrictions": "页面保护", + "pageinfo-header-properties": "页面属性", "pageinfo-display-title": "显示题目头", + "pageinfo-default-sort": "默认排序关键字", + "pageinfo-length": "页面长度（字节）", + "pageinfo-article-id": "页面ID", "pageinfo-language": "页面内容闲话", + "pageinfo-content-model": "页面内容模型", + "pageinfo-robot-policy": "爬虫索引", + "pageinfo-robot-index": "允许", + "pageinfo-robot-noindex": "弗许", + "pageinfo-watchers": "页面关注者数目", + "pageinfo-few-watchers": "少于$1位关注者", "pageinfo-redirects-name": "指向箇页个重定向数目", + "pageinfo-subpages-name": "该只页面个子页面数目", + "pageinfo-subpages-value": "$1（$2个{{PLURAL:$2|重定向}}；$3个{{PLURAL:$3|非重定向}}）", "pageinfo-firstuser": "页面建立者", "pageinfo-firsttime": "页面建立日脚", "pageinfo-lastuser": "阿末位编辑者", "pageinfo-lasttime": "阿末趟编辑日脚", + "pageinfo-edits": "编辑总次数", + "pageinfo-authors": "弗同作者总数", + "pageinfo-recent-edits": "近来编辑次数（过去$1内）", "pageinfo-recent-authors": "最近作者数", + "pageinfo-magic-words": "魔术字（$1）", + "pageinfo-hidden-categories": "囥脱个{{PLURAL:$1|分类}}（$1）", + "pageinfo-templates": "用着个模板（$1）", "pageinfo-toolboxlink": "页面信息", "pageinfo-contentpage": "算成内容页面", + "pageinfo-contentpage-yes": "是", + "patrol-log-page": "巡查记录", "deletedrevision": "拨删脱个旧修订 $1", "previousdiff": "←老版", "nextdiff": "新版→", + "widthheightpage": "$1×$2，$3页", "file-info-size": "$1×$2像素，文件大小：$3，MIME类型：$4", + "file-info-size-pages": "$1 × $2像素，文件大小：$3，MIME类型：$4，$5页", "file-nohires": "无更高分辨率可提供。", "svg-long-desc": "SVG文件，名义大小：$1×$2像素，文件大小：$3", "show-big-image": "原始文件", @@ -1535,6 +1587,8 @@ "parentheses": "（$1）", "imgmultipageprev": "← 上一页", "imgmultipagenext": "下一页 →", + "imgmultigo": "去！", + "imgmultigoto": "去到第$1页", "ascending_abbrev": "升序", "descending_abbrev": "降序", "table_pager_next": "下页", @@ -1561,25 +1615,44 @@ "watchlisttools-raw": "编写原始关注表", "signature": "[[{{ns:user}}:$1|$2]]（[[{{ns:user_talk}}:$1|讨论]]）", "version": "版本", + "redirect": "重定向（按文件、用户、页面、修订或记录ID）", + "redirect-summary": "该只特别页面好跳转到一只文件（指定文件名）、页面（指定修订版本ID或页面ID）、用户页（指定数字用户ID）或记录项（指定记录ID）。用法：[[{{#Special:Redirect}}/file/Example.jpg]]、[[{{#Special:Redirect}}/page/64308]]、[[{{#Special:Redirect}}/revision/328429]]、[[{{#Special:Redirect}}/user/101]]或[[{{#Special:Redirect}}/logid/186]]。", + "redirect-submit": "提交", + "redirect-lookup": "查询：", + "redirect-value": "值：", + "redirect-user": "用户ID", + "redirect-page": "页面ID", + "redirect-revision": "页面修订", + "redirect-file": "文件名", "specialpages": "特别页面", "tag-filter": "[[Special:Tags|标签]]过滤器：", "tag-list-wrapper": "（[[Special:Tags|$1个标签]]：$2）", "tags-active-yes": "好", "tags-active-no": "弗", + "tags-hitcount": "$1趟改动", "dberr-info-hidden": "（連弗上數據庫）", "logentry-delete-delete": "$1{{GENDER:$2|删除}}页面$3", + "logentry-delete-restore": "$1{{GENDER:$2|还原}}页面$3（$4）", + "logentry-delete-revision": "$1{{GENDER:$2|改动}}页面$3个{{PLURAL:$5|一笔修订|$5笔修订}}个可见性：$4", + "revdelete-content-hid": "内容囥脱", "revdelete-restricted": "已将限制应用到管理员", "revdelete-unrestricted": "已移除对管理员个限制", "logentry-block-block": "$1{{GENDER:$2|查封}}{{GENDER:$4|$3}}，终止辰光为$5$6", "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-patrol-patrol-auto": "$1自动{{GENDER:$2|标记}}页面$3个版本$4为巡查过", "logentry-newusers-create": "用户账号$1畀{{GENDER:$2|创建}}", "logentry-newusers-create2": "用户账号$3畀$1{{GENDER:$2|创建}}", "logentry-newusers-autocreate": "用户账号$1畀自动{{GENDER:$2|创建}}", "logentry-rights-rights": "$1{{GENDER:$2|更改}}{{GENDER:$6|$3}}个用户组从$4到$5", "logentry-upload-upload": "$1{{GENDER:$2|上传}}$3", + "logentry-upload-overwrite": "$1{{GENDER:$2|上传着}}新版本个$3", "rightsnone": "（呒）", "feedback-thanks-title": "谢谢侬！", "searchsuggest-search": "搜寻{{SITENAME}}", - "pagelang-language": "闲话" + "duration-days": "$1日天", + "pagelang-language": "闲话", + "mw-widgets-dateinput-no-date": "朆选择日脚", + "randomrootpage": "随机根页面" } diff --git a/languages/i18n/yo.json b/languages/i18n/yo.json index bf584ac7ee..6651194de6 100644 --- a/languages/i18n/yo.json +++ b/languages/i18n/yo.json @@ -1637,10 +1637,12 @@ "deletecomment": "Ìdíẹ̀:", "deleteotherreason": "Àwọn ìdí mìíràn:", "deletereasonotherlist": "Ìdí mìíràn", - "deletereason-dropdown": "*Àwọn ìdí tówọ́pọ̀ fún ìparẹ́\n**Olùkọ̀wé ló tọrọ\n**Àìtẹ̀lé ẹ́tọ́àwòkọ\n**Ìbàjẹ́", + "deletereason-dropdown": "*Àwọn ìdí tówọ́pọ̀ fún ìparẹ́\n**Olùkọ̀wé ló tọrọ\n**Ohun tí ó lòdì sí àṣẹ oníṣẹ́\n**Ìbàjẹ́\n**Ojú ewé tí kò nítumọ̀\n**Ìdojú ewé rú", "delete-edit-reasonlist": "Àwọn ìdí fún àtúnṣe ìparẹ́", "delete-toobig": "Ojúewé yìí ní ìtàn àtúnṣe tótóbi, ó pọ̀ ju {{PLURAL:$1|àtúnyẹ̀wò}} $1 lọ.\nÌparẹ́ irú àwọn ojúewé báyìí ti jẹ́ dídílọ́nà láti dènà àsìṣe ìdílọ́wọ́ sí {{SITENAME}}.", "delete-warning-toobig": "Ojúewé yìí ní ìtàn àtúnṣe tótóbi, ó pọ̀ ju {{PLURAL:$1|àtúnyẹ̀wò}} $1 lọ.\nÌparẹ́ rẹ̀ le dí ìsiṣẹ́ ibùdó dátà lọ́wọ́ lórí {{SITENAME}}; ẹ ṣè fura.", + "deleteprotected": "Ìwọ kò láàfàní àti pa ojú ewé yìí rẹ́ nítorí wípé a ti dáàbò bòó", + "deleting-backlinks-warning": "[[Special:WhatLinksHere/{{FULLPAGENAME}}|Àwọn ojú ewé míràn]] jásì ojú ewé tí o fẹ́ parẹ́ yìí", "rollback": "Yí àwọn àtúnṣe sẹ́yìn", "rollbacklink": "yísẹ́yìn", "rollbacklinkcount": "ìyíṣẹ́yìn {{PLURAL:$1|àtúnṣe|àtúnṣe}} $1", @@ -1656,12 +1658,16 @@ "sessionfailure": "Ó dà wípé ìsòro wà pẹ̀lú ìwọlé yín;\na ti fagilé gbogbo ohun tí ẹ ti ṣe nísìnsinyì kí ẹlòmíràn ó mọ́ baà ji mú.\nẸ padà sí ojúewé tó kọjá, ẹ tún ojúewé náà gbéjáde, kí ẹ tó tún tó dán wó.", "changecontentmodel-title-label": "Àkọlé ojúewé", "changecontentmodel-reason-label": "Ìdíẹ̀:", + "changecontentmodel-submit": "Àtúnṣe", + "logentry-contentmodel-change-revertlink": "Dapadà", + "logentry-contentmodel-change-revert": "Dapadà", "protectlogpage": "Àkọsílẹ̀ àbò", "protectlogtext": "Nísàlẹ̀ ni àtòjọ àwọn àtúnṣe sí àwọn àbò ojúewé.\nẸ wo [[Special:ProtectedPages|àtòjọ àwọn ojúewé aláàbò]] fún àtòjọ àwọn àbò ojúewé ìgbàyí.", "protectedarticle": "ti dá àbò bo \"[[$1]]\"", "modifiedarticleprotection": "yí ìpele àbò padà fún \"[[$1]]\"", "unprotectedarticle": "yọ àbò kúrò lórí \"[[$1]]\"", "movedarticleprotection": "ti yípò àwọn ìtòólẹ̀ àbò padà láti \"[[$2]]\" sí \"[[$1]]\"", + "protectedarticle-comment": "{{GENDER:$2|Dáàbò bòó}} \"[[$1]]\"", "protect-title": "Ìyípadà ìpele àbò fún \"$1\"", "protect-title-notallowed": "Ìwo ìpele àbò fún \"$1\"", "prot_1movedto2": "[[$1]] ti yípò sí [[$2]]", @@ -1693,6 +1699,7 @@ "protect-othertime": "Àkókò míràn:", "protect-othertime-op": "àkókò míràn", "protect-existing-expiry": "Àsìkò ìparí tó wà: $3, $2", + "protect-existing-expiry-infinity": "Àkókò iṣetá:Àìlópin", "protect-otherreason": "Ìdí míràn/àfikún:", "protect-otherreason-op": "Ìdí míràn", "protect-dropdown": "*Àwọn ìdí àbò awọ́pọ̀\n** Ìbàjẹ́ ti pọ̀ jù\n** Spam ti pọ̀ jù\n** Àtúnṣe alòdì sí ara wọn\n** Ojúewé oníbẹ̀wò púpọ̀", @@ -1735,6 +1742,7 @@ "undelete-search-title": "Wá àwọn ojúewé onípíparẹ́", "undelete-search-box": "Wá àwọn ojúewé onípíparẹ́", "undelete-search-prefix": "Ìfihàn ojúewé tó bẹ̀rẹ̀ pẹ̀lú:", + "undelete-search-full": "Ṣe àfihàn ojú ewé tí ó ní:", "undelete-search-submit": "Ṣàwárí", "undelete-no-results": "Kò sí ojúewé kankan tó jọọ́ nínú ìpamọ́ ìparẹ́.", "undelete-filename-mismatch": "Kò le ṣe àìjẹ́píparẹ́ àtúnyẹ̀wò fáìlì pẹ̀lú àmìàsìkò $1: Àìjọra orúkọ fáìlì.", @@ -1757,6 +1765,7 @@ "mycontris": "Àwọn àfikún", "anoncontribs": "Àwọn àfikún", "contribsub2": "Fún {{GENDER:$3|$1}} ($2)", + "contributions-userdoesnotexist": "Oníṣẹ́ yìí \"$1\" kò forúkọ sílẹ̀", "nocontribs": "Kò sí àtúnṣe tuntun tó bá àwárí mu.", "uctop": "(lówọ́)", "month": "Láti osù (àti sẹ́yìn):", @@ -1765,6 +1774,7 @@ "sp-contributions-newbies-sub": "Fún àwọn àpamọ́ tuntun", "sp-contributions-newbies-title": "Àwọn àfikún oníṣe fún àwọn àpamọ́ tuntun", "sp-contributions-blocklog": "Àkọsílẹ̀ ìdínà", + "sp-contributions-suppresslog": "ṣèmúkúrò {{GENDER:$1|àwọn àfikún}} oníṣẹ́ yìí", "sp-contributions-deleted": "àwọn àfikún píparẹ́ oníṣe", "sp-contributions-uploads": "àwọn ìrùsókè", "sp-contributions-logs": "àwọn àkọọ́lẹ̀", @@ -1776,6 +1786,7 @@ "sp-contributions-username": "Àdírẹ́ẹ̀sì IP tàbí orúkọ oníṣe:", "sp-contributions-toponly": "Ìfihàn àwọn àtúnṣe tí wọn jẹ́ àtúnyẹ̀wò àìpẹ́ nìkan", "sp-contributions-newonly": "Ìfihàn àwọn àtúnṣe tí wọn jẹ́ ìdá ojúewé nìkan", + "sp-contributions-hideminor": "Fi àwọn àtúṣe kékeré pamọ́", "sp-contributions-submit": "Ṣàwárí", "whatlinkshere": "Ìjápọ̀ mọ́ ojúewé yí", "whatlinkshere-title": "Àwọn ojúewé tó jápọ̀ mọ́ \"$1\"", @@ -1826,13 +1837,22 @@ "ipb-unblock": "Ìmúkúrò ìdínà orúkọ oníṣe kan tàbí àdírẹ́sì IP", "ipb-blocklist": "Ìwo àwọn ìdínà tó wà", "ipb-blocklist-contribs": "Àwọn àfikún fún $1", + "ipb-blocklist-duration-left": "$1 lókù", "unblockip": "Ìmúkúrò ìdínà oníṣe", "unblockiptext": "Lo fọ́ọ́mù ìsàlẹ̀ láti dá ẹ̀tọ́ ìkọ padà fún àdírẹ́ẹ̀sì IP tàbí orúkọ oníṣe dídílọ́nà tẹ́lẹ̀.", "ipusubmit": "Ìmúkúrò ìdínà yìí", "unblocked": "[[User:$1|$1]] ti jẹ́ mímú kúrò nínú ìdínà", "unblocked-range": "$1 ti jẹ́ aláìdílọ́nà", "unblocked-id": "Ìdínà $1 ti jẹ́ mímúkúrò", + "unblocked-ip": "[[Special:Contributions/$1|$1]] ti gba ìtúsílẹ̀.", "blocklist": "Àwọn oníṣe aládìílọ́nà", + "autoblocklist": "Ìdínà tí ó wáyé fúnrarẹ̀", + "autoblocklist-submit": "Ṣàwárí", + "autoblocklist-legend": "Ṣe àfihàn àwọn ìdínà tí ó wáyé fúnrarẹ̀", + "autoblocklist-localblocks": "{{PLURAL:$1|ìdínà tí ó wáyé fúnrarẹ̀|àwọn ìdínà tí ó wáyé fúnrarẹ̀}} láwùjọ wa níbí", + "autoblocklist-total-autoblocks": "gbogbo iye àwọn ìdínà tí ó wáyé fúnrarẹ̀", + "autoblocklist-empty": "kò sí ohunkóhun nínù àfihàn àwọn ìdínà tí ó wáyé fúnrarẹ̀ láwùjọ wa níbí", + "autoblocklist-otherblocks": "{{PLURAL:$1|ìdínà tí ó wáyé fúnrarẹ̀|àwọn ìdínà tí ó wáyé fúnrarẹ̀}} míràn", "ipblocklist": "Àwọn oníṣe adílọ́nà", "ipblocklist-legend": "Wá oníṣe adílọ́nà kan", "blocklist-userblocks": "Ìbòmọ́lẹ̀ àwọn ìdínà àpamọ́", @@ -1879,6 +1899,7 @@ "block-log-flags-hiddenname": "orúkọ oníṣe jẹ́ bíbòmọ́lẹ̀", "range_block_disabled": "Agbára olùmójútó láti dá ìdínà àdìmọ́ jẹ́ dídálẹ́kun.", "ipb_expiry_invalid": "Àkókò ìparí kò ní ìbámu.", + "ipb_expiry_old": "Ìgbà tó ti kọjá ni ìparí.", "ipb_expiry_temp": "Àwọn ìdínà orúkọ oníṣe bíbòmọ́lẹ̀ gbọ́dọ̀ jẹ́ aláìyẹ̀.", "ipb_hide_invalid": "Ìrẹ̀mọ́lẹ̀ àpamọ́ yìí kò ṣe é ṣe; ó le jẹ́ pé ó ní àtúnṣe púpọ̀.", "ipb_already_blocked": "\"$1\" jẹ́ dídèlọ́nà tẹ́lẹ̀", @@ -1923,6 +1944,8 @@ "movenotallowedfile": "Ẹ kò ní ìyọ̀nda láti yípò fáìlì.", "cant-move-user-page": "Ẹ kò ní ìyọ̀nda láti yípò àwọn ojúewé oníṣe (àyàfi láti ọ̀dọ̀ àwọn abẹ́ojúewé).", "cant-move-to-user-page": "Ẹ kò ní ìyọ̀nda láti yípò àwọn ojúewé sí ojúewé oníṣe (àyàfi sí abẹ́ojúewé oníṣe).", + "cant-move-category-page": "Ẹ kò ní ìyọ̀nda láti yípò ojúewé.", + "cant-move-subpages": "Ẹ kò ní ìyọ̀nda láti yípò ojúewé.", "newtitle": "Àkọlé tuntun:", "move-watch": "Mójútó ojúewé yìí", "movepagebtn": "Yípò ojúewé", diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json index e49d7dbcde..10f875e72a 100644 --- a/languages/i18n/zh-hans.json +++ b/languages/i18n/zh-hans.json @@ -1312,7 +1312,7 @@ "rightslogtext": "这是用户权限更改的日志。", "action-read": "阅读本页", "action-edit": "编辑本页", - "action-createpage": "创建此页面", + "action-createpage": "创建本页", "action-createtalk": "创建此讨论页面", "action-createaccount": "创建该用户账户", "action-autocreateaccount": "自动创建该外部用户账户", @@ -1388,7 +1388,7 @@ "rcfilters-activefilters": "激活的过滤器", "rcfilters-advancedfilters": "高级过滤器", "rcfilters-limit-title": "要显示的结果", - "rcfilters-limit-and-date-label": "{{PLURAL:$1|$1次更改}}，$2", + "rcfilters-limit-and-date-label": "$1次{{PLURAL:$1|更改}}，$2", "rcfilters-date-popup-title": "搜索的时间段", "rcfilters-days-title": "最近几天", "rcfilters-hours-title": "最近几个小时", @@ -3851,7 +3851,7 @@ "expandtemplates": "展开模板", "expand_templates_intro": "此特殊页面可以递归地展开所给wiki文本中的模板。它同时还可展开像{{#language:…}}这样的解析器函数和像{{CURRENTDAY}}这样的变量。实际上，几乎所有在双重花括号中的内容都会被展开。", "expand_templates_title": "上下文标题，用于{{FULLPAGENAME}}等：", - "expand_templates_input": "输入的wiki文本：", + "expand_templates_input": "输入wiki文本：", "expand_templates_output": "结果", "expand_templates_xml_output": "XML输出", "expand_templates_html_output": "原始HTML输出", @@ -3863,7 +3863,7 @@ "expand_templates_preview": "预览", "expand_templates_preview_fail_html": "因为{{SITENAME}}启用了Raw HTML并且丢失了会话数据，预览被隐藏以防止JavaScript攻击。\n\n如果这是合法的预览尝试，请再次重试。如果仍然不能工作，尝试[[Special:UserLogout|退出]]并重新登录，并检查您的浏览器是否允许来自该网站的cookie。", "expand_templates_preview_fail_html_anon": "因为{{SITENAME}}启用了Raw HTML并且丢失了会话数据，预览被隐藏以防止JavaScript攻击。\n\n如果这是合法的预览尝试，请尝试[[Special:UserLogin|登录]]并重试。", - "expand_templates_input_missing": "您需要提供至少一些输入的wiki文本。", + "expand_templates_input_missing": "您需要提供至少一些输入wiki文本。", "pagelanguage": "更改页面语言", "pagelang-name": "页面", "pagelang-language": "语言", diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json index c93c13dd1e..778e7e67fe 100644 --- a/languages/i18n/zh-hant.json +++ b/languages/i18n/zh-hant.json @@ -1379,7 +1379,7 @@ "rcfilters-activefilters": "使用中的過濾條件", "rcfilters-advancedfilters": "進階查詢條件", "rcfilters-limit-title": "要顯示的結果", - "rcfilters-limit-and-date-label": "$2{{PLURAL:$1| 個變更|$1 個變更}}", + "rcfilters-limit-and-date-label": "$1次{{PLURAL:$1|變更}}，$2", "rcfilters-date-popup-title": "搜尋的時間段", "rcfilters-days-title": "幾天內", "rcfilters-hours-title": "幾個小時內", @@ -1497,7 +1497,7 @@ "rcfilters-filter-showlinkedfrom-label": "顯示連結自該頁面的頁面上的更改", "rcfilters-filter-showlinkedfrom-option-label": "連結自指定頁面的頁面", "rcfilters-filter-showlinkedto-label": "顯示連結到該頁面的頁面上的更改", - "rcfilters-filter-showlinkedto-option-label": "連結到指定頁面的頁面上的更改", + "rcfilters-filter-showlinkedto-option-label": "連結到指定頁面的頁面", "rcfilters-target-page-placeholder": "輸入頁面名稱（或分類）", "rcnotefrom": "以下{{PLURAL:$5|為}}自 $3 $4 以來的變更 (最多顯示 $1 筆)。", "rclistfromreset": "重設日期選擇", @@ -1692,7 +1692,7 @@ "backend-fail-notsame": "於 \"$1\" 已存在另一個不相同的檔案。", "backend-fail-invalidpath": "\"$1\" 不是有效的儲存路徑。", "backend-fail-delete": "無法刪除檔案 \"$1\"。", - "backend-fail-describe": "無法修改檔案 \"$1\" 的資料定義。", + "backend-fail-describe": "無法修改檔案 \"$1\" 的詮釋資料。", "backend-fail-alreadyexists": "檔案 \"$1\" 已存在。", "backend-fail-store": "無法儲存檔案 \"$1\" 於 \"$2\"。", "backend-fail-copy": "無法複製檔案 \"$1\" 至 \"$2\"。", @@ -2807,7 +2807,7 @@ "tooltip-recreate": "無論是否被刪除，重新建立該頁面。", "tooltip-upload": "開始上傳", "tooltip-rollback": "點選「還原」連結便可還原至上一位貢獻者對此頁面的編輯", - "tooltip-undo": "\"還原\" 可還原此編輯並以預覽模式開啟編輯表單，讓您可在摘要中加入原因。", + "tooltip-undo": "「撤銷」可還原此編輯並以預覽模式開啟編輯表單，讓您可在摘要中加入原因。", "tooltip-preferences-save": "儲存偏好設定", "tooltip-summary": "請輸入簡短摘要", "interlanguage-link-title": "$1 – $2", @@ -3142,7 +3142,7 @@ "exif-serialnumber": "相機序號", "exif-cameraownername": "相機持有人", "exif-label": "標籤", - "exif-datetimemetadata": "資料定義最後修改日期", + "exif-datetimemetadata": "詮釋資料最後修改日期", "exif-nickname": "非正式的影像名稱", "exif-rating": "評分 (共 5 分)", "exif-rightscertificate": "版權管理憑證", diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a3173d4440..16a12de148 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -488,7 +488,7 @@ $specialPageAliases = [ 'Search' => [ 'Search' ], 'Shortpages' => [ 'ShortPages' ], 'Specialpages' => [ 'SpecialPages' ], - 'Statistics' => [ 'Statistics' ], + 'Statistics' => [ 'Statistics', 'Stats' ], 'Tags' => [ 'Tags' ], 'TrackingCategories' => [ 'TrackingCategories' ], 'Unblock' => [ 'Unblock' ], diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php index 1be2a27908..4a70aaaf15 100644 --- a/maintenance/generateSitemap.php +++ b/maintenance/generateSitemap.php @@ -440,8 +440,8 @@ class GenerateSitemap extends Maintenance { /** * Get a sitemap filename * - * @param int $namespace The namespace - * @param int $count The count + * @param int $namespace + * @param int $count * @return string */ function sitemapFilename( $namespace, $count ) { diff --git a/maintenance/importImages.php b/maintenance/importImages.php index d3aa280a34..a72ec67321 100644 --- a/maintenance/importImages.php +++ b/maintenance/importImages.php @@ -440,7 +440,7 @@ class ImportImages extends Maintenance { /** * Split a filename into filename and extension * - * @param string $filename Filename + * @param string $filename * @return array */ private function splitFilename( $filename ) { diff --git a/maintenance/sql.php b/maintenance/sql.php index 8e276e7750..a67b28e55d 100644 --- a/maintenance/sql.php +++ b/maintenance/sql.php @@ -167,7 +167,7 @@ class MwSql extends Maintenance { /** * Print the results, callback for $db->sourceStream() - * @param ResultWrapper|bool $res The results object + * @param ResultWrapper|bool $res * @param IDatabase $db */ public function sqlPrintResult( $res, $db ) { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index 59d647493b..1b57f09e0b 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars.js +++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js @@ -1978,7 +1978,7 @@ OO.ui.PopupToolGroup.prototype.setActive = function ( value ) { this.$element.addClass( 'oo-ui-popupToolGroup-active oo-ui-popupToolGroup-left' ); this.setFlags( { progressive: true } ); this.toggleClipping( true ); - if ( this.isClippedHorizontally() || this.isFloatableOutOfView() ) { + if ( this.isClippedHorizontally() ) { // Anchoring to the left caused the popup to clip, so anchor it to the right instead this.toggleClipping( false ); this.$element @@ -1986,7 +1986,7 @@ OO.ui.PopupToolGroup.prototype.setActive = function ( value ) { .addClass( 'oo-ui-popupToolGroup-right' ); this.toggleClipping( true ); } - if ( this.isClippedHorizontally() || this.isFloatableOutOfView() ) { + if ( this.isClippedHorizontally() ) { // Anchoring to the right also caused the popup to clip, so just make it fill the container containerWidth = this.$clippableScrollableContainer.width(); containerLeft = this.$clippableScrollableContainer[ 0 ] === document.documentElement ? diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js index 4f4edc96b5..39c601f3a3 100644 --- a/resources/src/jquery/jquery.suggestions.js +++ b/resources/src/jquery/jquery.suggestions.js @@ -293,7 +293,7 @@ expandFrom = 'left'; // Catch invalid values, default to 'auto' - } else if ( $.inArray( expandFrom, [ 'left', 'right', 'start', 'end', 'auto' ] ) === -1 ) { + } else if ( [ 'left', 'right', 'start', 'end', 'auto' ].indexOf( expandFrom ) === -1 ) { expandFrom = 'auto'; } @@ -757,7 +757,7 @@ ]; if ( context.data.keypressedCount === 0 && e.which === context.data.keypressed && - $.inArray( e.which, allowed ) !== -1 + allowed.indexOf( e.which ) !== -1 ) { $.suggestions.keypress( e, context, context.data.keypressed ); } diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index cac103ee66..6d67ade978 100644 --- a/resources/src/jquery/jquery.tablesorter.js +++ b/resources/src/jquery/jquery.tablesorter.js @@ -289,8 +289,8 @@ function uniqueElements( array ) { var uniques = []; - $.each( array, function ( i, elem ) { - if ( elem !== undefined && $.inArray( elem, uniques ) === -1 ) { + array.forEach( function ( elem ) { + if ( elem !== undefined && uniques.indexOf( elem ) === -1 ) { uniques.push( elem ); } } ); @@ -345,7 +345,7 @@ } ); } ); // We want to find the row that has the most columns (ignoring colspan) - $.each( exploded, function ( index, cellArray ) { + exploded.forEach( function ( cellArray, index ) { headerCount = $( uniqueElements( cellArray ) ).filter( 'th' ).length; if ( headerCount >= maxSeen ) { maxSeen = headerCount; @@ -423,9 +423,9 @@ */ function setHeadersOrder( $headers, sortList, headerToColumns ) { // Loop through all headers to retrieve the indices of the columns the header spans across: - $.each( headerToColumns, function ( headerIndex, columns ) { + headerToColumns.forEach( function ( columns, headerIndex ) { - $.each( columns, function ( i, columnIndex ) { + columns.forEach( function ( columnIndex, i ) { var header = $headers[ headerIndex ], $header = $( header ); @@ -437,7 +437,7 @@ } ); } else { // Column shall be sorted: Apply designated count and order. - $.each( sortList, function ( j, sortColumn ) { + sortList.forEach( function ( sortColumn ) { if ( sortColumn[ 0 ] === i ) { $header.data( { order: sortColumn[ 1 ], @@ -622,8 +622,8 @@ } return ret; } ); - $.each( rowspanCells, function () { - $.data( this, 'tablesorter' ).needResort = false; + rowspanCells.forEach( function ( cell ) { + $.data( cell, 'tablesorter' ).needResort = false; } ); } resortCells(); @@ -925,9 +925,8 @@ cell = this; // Get current column index columns = config.headerToColumns[ $cell.data( 'headerIndex' ) ]; - newSortList = $.map( columns, function ( c ) { - // jQuery "helpfully" flattens the arrays... - return [ [ c, $cell.data( 'order' ) ] ]; + newSortList = columns.map( function ( c ) { + return [ c, $cell.data( 'order' ) ]; } ); // Index of first column belonging to this header i = columns[ 0 ]; diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js index 31c22af244..5ae91e8564 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js +++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js @@ -156,7 +156,7 @@ mw.util.getParamValue( 'undo' ) !== null || // Pressing "show changes" and "preview" also signify that the user will // probably save the page soon - $.inArray( $form.find( '#mw-edit-mode' ).val(), [ 'preview', 'diff' ] ) > -1 + [ 'preview', 'diff' ].indexOf( $form.find( '#mw-edit-mode' ).val() ) > -1 ) { checkStash(); } diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js index c9f59248d4..5564d1ec46 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -185,7 +185,7 @@ mw.rcfilters.dm.FiltersViewModel.prototype.getFirstConflictedItem = function () { var conflictedItem; - $.each( this.getItems(), function ( index, filterItem ) { + this.getItems().forEach( function ( filterItem ) { if ( filterItem.isSelected() && filterItem.isConflicted() ) { conflictedItem = filterItem; return false; diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css b/resources/src/mediawiki.special/mediawiki.special.apisandbox.css index 928fa1720d..acb39989dd 100644 --- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css +++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.css @@ -24,7 +24,6 @@ bottom: 0; right: 0; background: #fff; - z-index: 100; } .mw-apisandbox-fullscreen .mw-apisandbox-container { @@ -52,10 +51,10 @@ .mw-apisandbox-optionalWidget.oo-ui-widget-disabled { position: relative; - z-index: 0; /* New stacking context to prevent the overlay from leaking out */ + z-index: 0; /* New stacking context to prevent the cover from leaking out */ } -.mw-apisandbox-optionalWidget-overlay { +.mw-apisandbox-optionalWidget-cover { position: absolute; left: 0; right: 0; diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js index ff4335ae52..435dec21ba 100644 --- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js +++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js @@ -339,7 +339,7 @@ widget = new OO.ui.CapsuleMultiselectWidget( { allowArbitrary: true, allowDuplicates: Util.apiBool( pi.allowsduplicates ), - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); widget.paramInfo = pi; $.extend( widget, WidgetMethods.capsuleWidget ); @@ -459,14 +459,14 @@ widget = new OO.ui.CapsuleMultiselectWidget( { menu: { items: items }, - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); widget.paramInfo = pi; $.extend( widget, WidgetMethods.capsuleWidget ); } else { widget = new OO.ui.DropdownWidget( { menu: { items: items }, - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); widget.paramInfo = pi; $.extend( widget, WidgetMethods.dropdownWidget ); @@ -499,7 +499,7 @@ widget = new OO.ui.CapsuleMultiselectWidget( { menu: { items: items }, - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); widget.paramInfo = pi; $.extend( widget, WidgetMethods.capsuleWidget ); @@ -510,7 +510,7 @@ } else { widget = new OO.ui.DropdownWidget( { menu: { items: items }, - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); widget.paramInfo = pi; $.extend( widget, WidgetMethods.dropdownWidget ); @@ -554,7 +554,7 @@ widget = new OO.ui.CapsuleMultiselectWidget( { allowArbitrary: true, allowDuplicates: Util.apiBool( pi.allowsduplicates ), - $overlay: $( '#mw-apisandbox-ui' ), + $overlay: true, popup: { classes: [ 'mw-apisandbox-popup' ], $content: $content @@ -817,7 +817,7 @@ if ( ApiSandbox.isFullscreen ) { fullscreenButton.setLabel( mw.message( 'apisandbox-unfullscreen' ).text() ); fullscreenButton.setTitle( mw.message( 'apisandbox-unfullscreen-tooltip' ).text() ); - $body.append( $ui ); + OO.ui.getDefaultOverlay().prepend( $ui ); } else { fullscreenButton.setLabel( mw.message( 'apisandbox-fullscreen' ).text() ); fullscreenButton.setTitle( mw.message( 'apisandbox-fullscreen-tooltip' ).text() ); @@ -1051,7 +1051,7 @@ if ( !formatDropdown ) { formatDropdown = new OO.ui.DropdownWidget( { menu: { items: [] }, - $overlay: $( '#mw-apisandbox-ui' ) + $overlay: true } ); formatDropdown.getMenu().on( 'select', Util.onFormatDropdownChange ); } @@ -1074,7 +1074,7 @@ label: Util.parseMsg( 'apisandbox-request-selectformat-label' ) } ).$element, - $.map( formatItems, function ( item ) { + formatItems.map( function ( item ) { return item.getData().$element; } ), $result @@ -1112,7 +1112,7 @@ return xhr; } } ) - .then( null, function ( code, data, result, jqXHR ) { + .catch( function ( code, data, result, jqXHR ) { var deferred = $.Deferred(); if ( code !== 'http' ) { @@ -1176,7 +1176,7 @@ booklet.setPage( '|results|' ); } ).setDisabled( !paramsAreForced ) ).$element, new OO.ui.PopupButtonWidget( { - $overlay: $( '#mw-apisandbox-ui' ), + $overlay: true, framed: false, icon: 'info', popup: { @@ -1420,7 +1420,7 @@ for ( j = 0; j < tmp.length; j++ ) { availableFormats[ tmp[ j ] ] = true; } - pi.parameters[ i ].type = $.grep( tmp, filterFmModules ); + pi.parameters[ i ].type = tmp.filter( filterFmModules ); pi.parameters[ i ][ 'default' ] = 'json'; pi.parameters[ i ].required = true; } @@ -1429,7 +1429,7 @@ // Hide the 'wrappedhtml' parameter on format modules if ( pi.group === 'format' ) { - pi.parameters = $.grep( pi.parameters, function ( p ) { + pi.parameters = pi.parameters.filter( function ( p ) { return p.name !== 'wrappedhtml'; } ); } @@ -1445,13 +1445,13 @@ if ( pi.helpurls.length ) { buttons.push( new OO.ui.PopupButtonWidget( { - $overlay: $( '#mw-apisandbox-ui' ), + $overlay: true, label: mw.message( 'apisandbox-helpurls' ).text(), icon: 'help', popup: { width: 'auto', padded: true, - $content: $( '