From: jenkins-bot Date: Fri, 26 Feb 2016 22:40:15 +0000 (+0000) Subject: Merge "Allow more fine-grained throttling of login attempts" X-Git-Tag: 1.31.0-rc.0~7815 X-Git-Url: https://git.heureux-cyclage.org/index.php?a=commitdiff_plain;h=4772f4452a79f1e79c1d5ab0850e60e8a5e79ec0;hp=6fcfa981544fca6a6e490334451a66046e0ab3ba;p=lhc%2Fweb%2Fwiklou.git Merge "Allow more fine-grained throttling of login attempts" --- diff --git a/.jscsrc b/.jscsrc index 3b94b90f07..116c5cfbc8 100644 --- a/.jscsrc +++ b/.jscsrc @@ -10,10 +10,9 @@ "checkAnnotations": { "preset": "jsduck5", "extra": { - "context": true, - "source": true, - "see": true, - "private": true + "context": "some", + "source": "some", + "see": "some" } }, "checkParamNames": true, diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index 3a83b36ca7..867abd7a12 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -317,6 +317,8 @@ changes to languages because of Phabricator reports. rather than consume everything until the end of the page. * New maintenance script resetUserEmail.php allows sysadmins to reset user emails in case a user forgot password/account was stolen. +* wfCheckEntropy() was removed (deprecated in 1.27). +* Browser support for Internet Explorer 8 lowered from Grade A to Grade C. == Compatibility == diff --git a/autoload.php b/autoload.php index 341cb90422..5ec6218f28 100644 --- a/autoload.php +++ b/autoload.php @@ -703,6 +703,7 @@ $wgAutoloadLocalClasses = [ 'LinksDeletionUpdate' => __DIR__ . '/includes/deferred/LinksDeletionUpdate.php', 'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php', 'ListDuplicatedFilesPage' => __DIR__ . '/includes/specials/SpecialListDuplicatedFiles.php', + 'ListToggle' => __DIR__ . '/includes/ListToggle.php', 'ListVariants' => __DIR__ . '/maintenance/language/listVariants.php', 'ListredirectsPage' => __DIR__ . '/includes/specials/SpecialListredirects.php', 'LoadBalancer' => __DIR__ . '/includes/db/loadbalancer/LoadBalancer.php', @@ -1401,6 +1402,7 @@ $wgAutoloadLocalClasses = [ 'WantedTemplatesPage' => __DIR__ . '/includes/specials/SpecialWantedtemplates.php', 'WatchAction' => __DIR__ . '/includes/actions/WatchAction.php', 'WatchedItem' => __DIR__ . '/includes/WatchedItem.php', + 'WatchedItemStore' => __DIR__ . '/includes/WatchedItemStore.php', 'WatchlistCleanup' => __DIR__ . '/maintenance/cleanupWatchlist.php', 'WebInstaller' => __DIR__ . '/includes/installer/WebInstaller.php', 'WebInstallerComplete' => __DIR__ . '/includes/installer/WebInstallerComplete.php', diff --git a/composer.json b/composer.json index f1149149b0..12703111f2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.15.4", + "oojs/oojs-ui": "0.16.0", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", @@ -45,7 +45,7 @@ "monolog/monolog": "~1.17.2", "nikic/php-parser": "1.4.1", "nmred/kafka-php": "0.1.5", - "phpunit/phpunit": "3.7.37", + "phpunit/phpunit": "4.8.23", "wikimedia/avro": "1.7.7" }, "suggest": { diff --git a/docs/hooks.txt b/docs/hooks.txt index 930aa0a84c..8955f54c1a 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -3066,6 +3066,11 @@ $old: old title $nt: new title $user: user who does the move +'TitleMoveStarting': Before moving an article (title), but just after the atomic DB section starts. +$old: old title +$nt: new title +$user: user who does the move + 'TitleMoveComplete': After moving an article (title), post-commit. &$old: old title &$nt: new title diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 1e713e508b..41bf42bb9d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2294,6 +2294,14 @@ $wgSessionHandler = null; /** * Whether to use PHP session handling ($_SESSION and session_*() functions) + * + * If the constant MW_NO_SESSION is defined, this is forced to 'disable'. + * + * If the constant MW_NO_SESSION_HANDLER is defined, this is ignored and PHP + * session handling will function independently of SessionHandler. + * SessionHandler and PHP's session handling may attempt to override each + * others' cookies. + * * @since 1.27 * @var string * - 'enable': Integrate with PHP's session handling as much as possible. @@ -2302,28 +2310,6 @@ $wgSessionHandler = null; */ $wgPHPSessionHandling = 'enable'; -/** - * The number of different IPs in the same session within a period of $wgSuspiciousIpExpiry - * that should cause warnings to be logged. This is meant more for debugging errors in the - * authentication system than for detecting abuse. - * @since 1.27 - */ -$wgSuspiciousIpPerSessionLimit = 2; - -/** - * Like $wgSuspiciousIpPerSessionLimit but over all requests from the same user within - * $wgSuspiciousIpExpiry, whether they are in the same session or not. - * @since 1.27 - */ -$wgSuspiciousIpPerUserLimit = 5; - -/** - * Time in seconds to remember IPs for, for the purposes of $wgSuspiciousIpPerSessionLimit and - * $wgSuspiciousIpPerUserLimit. - * @since 1.27 - */ -$wgSuspiciousIpExpiry = 600; - /** * If enabled, will send MemCached debugging information to $wgDebugLogFile */ diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index ac1dd6d049..eb174f2e3b 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2988,22 +2988,6 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, return Wikimedia\base_convert( $input, $sourceBase, $destBase, $pad, $lowercase, $engine ); } -/** - * Check if there is sufficient entropy in php's built-in session generation - * - * @deprecated since 1.27, PHP's session generation isn't used with - * MediaWiki\\Session\\SessionManager - * @return bool True = there is sufficient entropy - */ -function wfCheckEntropy() { - wfDeprecated( __FUNCTION__, '1.27' ); - return ( - ( wfIsWindows() && version_compare( PHP_VERSION, '5.3.3', '>=' ) ) - || ini_get( 'session.entropy_file' ) - ) - && intval( ini_get( 'session.entropy_length' ) ) >= 32; -} - /** * @deprecated since 1.27, PHP's session generation isn't used with * MediaWiki\\Session\\SessionManager @@ -3046,12 +3030,6 @@ function wfResetSessionID() { function wfSetupSession( $sessionId = false ) { wfDeprecated( __FUNCTION__, '1.27' ); - // If they're calling this, they probably want our session management even - // if NO_SESSION was set for Setup.php. - if ( !MediaWiki\Session\PHPSessionHandler::isInstalled() ) { - MediaWiki\Session\PHPSessionHandler::install( SessionManager::singleton() ); - } - if ( $sessionId ) { session_id( $sessionId ); } diff --git a/includes/LinkTarget.php b/includes/LinkTarget.php index 1ce5f32339..175a8392a8 100644 --- a/includes/LinkTarget.php +++ b/includes/LinkTarget.php @@ -8,29 +8,28 @@ interface LinkTarget { /** - * Get the namespace index + * Get the namespace index. * * @return int Namespace index */ public function getNamespace(); /** - * Get the link fragment (i.e.\ the bit after the #) in text form + * Get the link fragment (i.e. the bit after the #) in text form. * * @return string link fragment */ public function getFragment(); /** - * Get the main part with underscores + * Get the main part with underscores. * - * @return string Main part of the link, with underscores (for use in hrf attributes) + * @return string Main part of the link, with underscores (for use in href attributes) */ public function getDBkey(); /** - * Returns the link in text form, - * without namespace prefix or fragment. + * Returns the link in text form, without namespace prefix or fragment. * * This is computed from the DB key by replacing any underscores with spaces. * diff --git a/includes/ListToggle.php b/includes/ListToggle.php new file mode 100644 index 0000000000..4733dfb714 --- /dev/null +++ b/includes/ListToggle.php @@ -0,0 +1,68 @@ +output = $output; + + $output->addModules( 'mediawiki.checkboxtoggle' ); + $output->addModuleStyles( 'mediawiki.checkboxtoggle.styles' ); + } + + private function checkboxLink( $checkboxType ) { + return Html::element( + 'a', [ 'href' => '#', 'class' => 'mw-checkbox-' . $checkboxType ], + $this->output->msg( 'checkbox-' . $checkboxType )->text() + ); + } + + /** + * @return string + */ + public function getHTML() { + // Select: All, None, Invert + $links = [ + $this->checkboxLink( 'all' ), + $this->checkboxLink( 'none' ), + $this->checkboxLink( 'invert' ), + ]; + + return Html::rawElement( 'div', + [ + 'class' => 'mw-checkbox-toggle-controls' + ], + $this->output->msg( 'checkbox-select' ) + ->rawParams( $this->output->getLanguage()->commaList( $links ) )->escaped() + ); + } +} diff --git a/includes/Message.php b/includes/Message.php index 4056f38da9..9d5f5e642a 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -810,7 +810,7 @@ class Message implements MessageSpecifier, Serializable { /** * Magic method implementation of the above (for PHP >= 5.2.0), so we can do, eg: - * $foo = Message::get( $key ); + * $foo = new Message( $key ); * $string = "$foo"; * * @since 1.18 diff --git a/includes/MovePage.php b/includes/MovePage.php index 6d69eaa60b..afa4e1cdbb 100644 --- a/includes/MovePage.php +++ b/includes/MovePage.php @@ -248,6 +248,9 @@ class MovePage { } $dbw->startAtomic( __METHOD__ ); + + Hooks::run( 'TitleMoveStarting', [ $this->oldTitle, $this->newTitle, $user ] ); + $pageid = $this->oldTitle->getArticleID( Title::GAID_FOR_UPDATE ); $protected = $this->oldTitle->isProtected(); diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 2570cfbeaa..5d1d5d0cdf 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3870,13 +3870,20 @@ class OutputPage extends ContextSource { */ public static function transformResourcePath( Config $config, $path ) { global $IP; - $remotePath = $config->get( 'ResourceBasePath' ); + $remotePathPrefix = $config->get( 'ResourceBasePath' ); + if ( $remotePathPrefix === '' ) { + // The configured base path is required to be empty string for + // wikis in the domain root + $remotePath = '/'; + } else { + $remotePath = $remotePathPrefix; + } if ( strpos( $path, $remotePath ) !== 0 ) { // Path is outside wgResourceBasePath, ignore. return $path; } $path = RelPath\getRelativePath( $path, $remotePath ); - return self::transformFilePath( $remotePath, $IP, $path ); + return self::transformFilePath( $remotePathPrefix, $IP, $path ); } /** @@ -3885,18 +3892,18 @@ class OutputPage extends ContextSource { * Caller is responsible for ensuring the file exists. Emits a PHP warning otherwise. * * @since 1.27 - * @param string $remotePath URL path that points to $localPath + * @param string $remotePath URL path prefix that points to $localPath * @param string $localPath File directory exposed at $remotePath * @param string $file Path to target file relative to $localPath * @return string URL */ - public static function transformFilePath( $remotePath, $localPath, $file ) { + public static function transformFilePath( $remotePathPrefix, $localPath, $file ) { $hash = md5_file( "$localPath/$file" ); if ( $hash === false ) { wfLogWarning( __METHOD__ . ": Failed to hash $localPath/$file" ); $hash = ''; } - return "$remotePath/$file?" . substr( $hash, 0, 5 ); + return "$remotePathPrefix/$file?" . substr( $hash, 0, 5 ); } /** diff --git a/includes/Setup.php b/includes/Setup.php index 4854727d68..189855e82c 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -517,6 +517,11 @@ if ( $wgPHPSessionHandling !== 'enable' && ) { $wgPHPSessionHandling = 'warn'; } +if ( defined( 'MW_NO_SESSION' ) ) { + // If the entry point wants no session, force 'disable' here unless they + // specifically set it to the (undocumented) 'warn'. + $wgPHPSessionHandling = MW_NO_SESSION === 'warn' ? 'warn' : 'disable'; +} Profiler::instance()->scopedProfileOut( $ps_default ); @@ -702,10 +707,13 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' ); } - // Create the SessionManager singleton and set up our session handler - MediaWiki\Session\PHPSessionHandler::install( - MediaWiki\Session\SessionManager::singleton() - ); + // Create the SessionManager singleton and set up our session handler, + // unless we're specifically asked not to. + if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) { + MediaWiki\Session\PHPSessionHandler::install( + MediaWiki\Session\SessionManager::singleton() + ); + } // Initialize the session try { @@ -740,6 +748,16 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { session_id( $session->getId() ); MediaWiki\quietCall( 'session_start' ); } + + unset( $session ); +} else { + // Even if we didn't set up a global Session, still install our session + // handler unless specifically requested not to. + if ( !defined( 'MW_NO_SESSION_HANDLER' ) ) { + MediaWiki\Session\PHPSessionHandler::install( + MediaWiki\Session\SessionManager::singleton() + ); + } } Profiler::instance()->scopedProfileOut( $ps_session ); @@ -809,10 +827,5 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { wfDebug( "Fully initialised\n" ); $wgFullyInitialised = true; -// T125455 -if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { - MediaWiki\Session\SessionManager::singleton()->checkIpLimits(); -} - Profiler::instance()->scopedProfileOut( $ps_extensions ); Profiler::instance()->scopedProfileOut( $ps_setup ); diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php index 2c400d0707..b597f99d93 100644 --- a/includes/WatchedItem.php +++ b/includes/WatchedItem.php @@ -379,63 +379,15 @@ class WatchedItem { } /** - * Check if the given title already is watched by the user, and if so - * add watches on a new title. To be used for page renames and such. + * @deprecated since 1.27. See WatchedItemStore::duplicateEntry * - * @param Title $ot Page title to duplicate entries from, if present - * @param Title $nt Page title to add watches on + * @param Title $oldTitle + * @param Title $newTitle */ - public static function duplicateEntries( $ot, $nt ) { - WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() ); - WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() ); + public static function duplicateEntries( Title $oldTitle, Title $newTitle ) { + $store = WatchedItemStore::getDefaultInstance(); + $store->duplicateEntry( $oldTitle->getSubjectPage(), $newTitle->getSubjectPage() ); + $store->duplicateEntry( $oldTitle->getTalkPage(), $newTitle->getTalkPage() ); } - /** - * Handle duplicate entries. Backend for duplicateEntries(). - * - * @param Title $ot - * @param Title $nt - * - * @return bool - */ - private static function doDuplicateEntries( $ot, $nt ) { - $oldnamespace = $ot->getNamespace(); - $newnamespace = $nt->getNamespace(); - $oldtitle = $ot->getDBkey(); - $newtitle = $nt->getDBkey(); - - $dbw = wfGetDB( DB_MASTER ); - $res = $dbw->select( 'watchlist', - [ 'wl_user', 'wl_notificationtimestamp' ], - [ 'wl_namespace' => $oldnamespace, 'wl_title' => $oldtitle ], - __METHOD__, 'FOR UPDATE' - ); - # Construct array to replace into the watchlist - $values = []; - foreach ( $res as $s ) { - $values[] = [ - 'wl_user' => $s->wl_user, - 'wl_namespace' => $newnamespace, - 'wl_title' => $newtitle, - 'wl_notificationtimestamp' => $s->wl_notificationtimestamp, - ]; - } - - if ( empty( $values ) ) { - // Nothing to do - return true; - } - - # Perform replace - # Note that multi-row replace is very efficient for MySQL but may be inefficient for - # some other DBMSes, mostly due to poor simulation by us - $dbw->replace( - 'watchlist', - [ [ 'wl_user', 'wl_namespace', 'wl_title' ] ], - $values, - __METHOD__ - ); - - return true; - } } diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php new file mode 100644 index 0000000000..83a5856869 --- /dev/null +++ b/includes/WatchedItemStore.php @@ -0,0 +1,86 @@ +loadBalancer = $loadBalancer; + } + + /** + * @return self + */ + public static function getDefaultInstance() { + static $instance; + if ( !$instance ) { + $instance = new self( wfGetLB() ); + } + return $instance; + } + + /** + * Check if the given title already is watched by the user, and if so + * add a watch for the new title. + * + * To be used for page renames and such. + * This must be called separately for Subject and Talk pages + * + * @param LinkTarget $oldTarget + * @param LinkTarget $newTarget + */ + public function duplicateEntry( LinkTarget $oldTarget, LinkTarget $newTarget ) { + $dbw = $this->loadBalancer->getConnection( DB_MASTER, [ 'watchlist' ] ); + + $result = $dbw->select( + 'watchlist', + [ 'wl_user', 'wl_notificationtimestamp' ], + [ + 'wl_namespace' => $oldTarget->getNamespace(), + 'wl_title' => $oldTarget->getDBkey(), + ], + __METHOD__, + [ 'FOR UPDATE' ] + ); + + $newNamespace = $newTarget->getNamespace(); + $newDBkey = $newTarget->getDBkey(); + + # Construct array to replace into the watchlist + $values = []; + foreach ( $result as $row ) { + $values[] = [ + 'wl_user' => $row->wl_user, + 'wl_namespace' => $newNamespace, + 'wl_title' => $newDBkey, + 'wl_notificationtimestamp' => $row->wl_notificationtimestamp, + ]; + } + + if ( !empty( $values ) ) { + # Perform replace + # Note that multi-row replace is very efficient for MySQL but may be inefficient for + # some other DBMSes, mostly due to poor simulation by us + $dbw->replace( + 'watchlist', + [ [ 'wl_user', 'wl_namespace', 'wl_title' ] ], + $values, + __METHOD__ + ); + } + + $this->loadBalancer->reuseConnection( $dbw ); + } + +} diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 073b3caf54..6f1f3e81b4 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -517,6 +517,11 @@ class HistoryPager extends ReverseChronologicalPager { $this->buttons .= Xml::tags( 'div', [ 'class' => 'mw-history-revisionactions' ], $actionButtons ); } + + if ( $user->isAllowed( 'deleterevision' ) || $this->showTagEditUI ) { + $this->buttons .= ( new ListToggle( $this->getOutput() ) )->getHTML(); + } + $this->buttons .= ''; $s .= $this->buttons; diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php index 44b3d4c3ea..2eb5d14ea3 100644 --- a/includes/api/ApiQuerySearch.php +++ b/includes/api/ApiQuerySearch.php @@ -351,8 +351,8 @@ class ApiQuerySearch extends ApiQueryGeneratorBase { ApiBase::PARAM_DFLT => 10, ApiBase::PARAM_TYPE => 'limit', ApiBase::PARAM_MIN => 1, - ApiBase::PARAM_MAX => ApiBase::LIMIT_SML1, - ApiBase::PARAM_MAX2 => ApiBase::LIMIT_SML2 + ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1, + ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2 ], 'interwiki' => false, 'enablerewrites' => false, diff --git a/includes/api/i18n/fa.json b/includes/api/i18n/fa.json index a5af63aa3c..93016926f1 100644 --- a/includes/api/i18n/fa.json +++ b/includes/api/i18n/fa.json @@ -11,10 +11,11 @@ "Mjbmr", "Ebraminio", "Macofe", - "Huji" + "Huji", + "Ladsgroup" ] }, - "apihelp-main-description": "
\n* [[mw:API:Main_page|مستندات]]\n* [[mw:API:FAQ|پرسش‌های متداول]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api فهرست پست الکترونیکی]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce اعلانات رابط برنامه‌نویسی کاربردی]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R ایرادها و درخواست‌ها]\n
\n\nوضعیت: تمام ویژگی‌هایی که در این صفحه نمایش یافته‌اند باید کار بکنند، ولی رابط برنامه‌نویسی کاربردی کماکان در حال توسعه است، و ممکن است در هر زمان تغییر بکند. به عضویت [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ فهرست پست الکترونیکی mediawiki-api-announce] در بیایید تا از تغییرات باخبر شوید.\n\nدرخواست‌های معیوب: وقتی درخواست‌های معیوب به رابط برنامه‌نویسی کاربردی فرستاده شوند، یک سرایند اچ‌تی‌تی‌پی با کلید «MediaWiki-API-Erorr» فرستاده می‌شود و بعد هم مقدار سرایند و هم کد خطای بازگردانده شده هر دو به یک مقدار نسبت داده می‌شوند. برای اطلاعات بیشتر [[mw:API:Errors_and_warnings|API: Errors and warnings]] را ببینید.", + "apihelp-main-description": "
\n* [[mw:API:Main_page|مستندات]]\n* [[mw:API:FAQ|پرسش‌های متداول]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api فهرست پست الکترونیکی]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce اعلانات رابط برنامه‌نویسی کاربردی]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R ایرادها و درخواست‌ها]\n
\n\nوضعیت: تمام ویژگی‌هایی که در این صفحه نمایش یافته‌اند باید کار بکنند، ولی رابط برنامه‌نویسی کاربردی کماکان در حال توسعه است، و ممکن است در هر زمان تغییر بکند. به عضویت [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ فهرست پست الکترونیکی mediawiki-api-announce] در بیایید تا از تغییرات باخبر شوید.\n\nدرخواست‌های معیوب: وقتی درخواست‌های معیوب به رابط برنامه‌نویسی کاربردی فرستاده شوند، یک سرایند اچ‌تی‌تی‌پی با کلید «MediaWiki-API-Erorr» فرستاده می‌شود و بعد هم مقدار سرایند و هم کد خطای بازگردانده شده هر دو به یک مقدار نسبت داده می‌شوند. برای اطلاعات بیشتر [[mw:API:Errors_and_warnings|API: Errors and warnings]] را ببینید.\n\nآزمایش: برای انجام درخواست‌های API آزمایشی [[Special:ApiSandbox]] را ببینید.", "apihelp-main-param-action": "کدام عملیات را انجام دهد.", "apihelp-main-param-format": "فرمت خروجی.", "apihelp-main-param-curtimestamp": "برچسب زمان کنونی را در نتیجه قرار دهید.", diff --git a/includes/api/i18n/nap.json b/includes/api/i18n/nap.json index afd33d74c8..1991ea9542 100644 --- a/includes/api/i18n/nap.json +++ b/includes/api/i18n/nap.json @@ -48,6 +48,14 @@ "apihelp-createaccount-param-reason": "Raggiona, a facoltativa, d' 'a criaziona 'e nu cunto a mpizzà int' 'e reggistre.", "apihelp-createaccount-param-language": "Codece 'e llengua a mpustà comme predefinita pe' n'utente (opzionale, 'e default fosse 'a lengue d' 'e cuntenute).", "apihelp-delete-description": "Scancella 'na paggena.", + "apihelp-delete-param-watch": "Azzecc' 'a paggena â lista 'e paggene cuntrullate.", + "apihelp-delete-param-watchlist": "Senza condizione, azzeccà o luvà 'a paggena 'a l'elenco 'e paggene cuntrullate 'e ll'utente, ausà mpustaziune o nun 'o cagnà l'elenco.", + "apihelp-delete-param-unwatch": "Liev' 'a paggena â lista 'e paggene cuntrullate.", + "apihelp-delete-param-oldimage": "'O nomm' 'e ll'immaggene viecchia a se scancellà comme sta scritto ccà: [[Special:ApiHelp/query+imageinfo|action=query&prop=imageinfo&iiprop=archivename]].", + "apihelp-delete-example-simple": "Scancella Main Page.", + "apihelp-delete-example-reason": "Scancella 'a Main Page c' 'o mutivo Preparing for move.", + "apihelp-disabled-description": "Stu modulo è stato stutato.", + "apihelp-edit-description": "Crèa e cagna paggene.", "apihelp-edit-param-prependtext": "Azzecca stu testo addò 'o cap' 'e paggena. Se mettesse ncuoll'a $1text.", "apihelp-edit-param-appendtext": "Azzecca stu testo addò 'o cap' 'e paggena. Se mettesse ncuoll'a $1text.\n\nAusate $1section=new pe' ne puté appennere na seziona nova, ato che ausà stu parammetro.", "apihelp-edit-param-undo": "Torna arrèto sta verziona. Miette ncuollo 'o $1text, $1prependtext e $1appendtext.", diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php index 5dc81101b0..a60195891f 100644 --- a/includes/cache/LinkBatch.php +++ b/includes/cache/LinkBatch.php @@ -58,12 +58,8 @@ class LinkBatch { /** * @param LinkTarget $linkTarget */ - public function addObj( $linkTarget ) { - if ( is_object( $linkTarget ) ) { - $this->add( $linkTarget->getNamespace(), $linkTarget->getDBkey() ); - } else { - wfDebug( "Warning: LinkBatch::addObj got invalid LinkTarget object\n" ); - } + public function addObj( LinkTarget $linkTarget ) { + $this->add( $linkTarget->getNamespace(), $linkTarget->getDBkey() ); } /** diff --git a/includes/content/Content.php b/includes/content/Content.php index 76881bc55f..931128faed 100644 --- a/includes/content/Content.php +++ b/includes/content/Content.php @@ -243,7 +243,7 @@ interface Content { * * @since 1.21 * - * @param bool $hasLinks If it is known whether this content contains + * @param bool|null $hasLinks If it is known whether this content contains * links, provide this information here, to avoid redundant parsing to * find out. * diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php index 8fe88fec22..b9215fce85 100644 --- a/includes/content/JsonContent.php +++ b/includes/content/JsonContent.php @@ -121,19 +121,19 @@ class JsonContent extends TextContent { */ protected function rootValueTable( $val ) { if ( is_object( $val ) ) { - return self::objectTable( $val ); + return $this->objectTable( $val ); } if ( is_array( $val ) ) { // Wrap arrays in another array so that they're visually boxed in a container. // Otherwise they are visually indistinguishable from a single value. - return self::arrayTable( [ $val ] ); + return $this->arrayTable( [ $val ] ); } return Html::rawElement( 'table', [ 'class' => 'mw-json mw-json-single-value' ], Html::rawElement( 'tbody', [], Html::rawElement( 'tr', [], - Html::element( 'td', [], self::primitiveValue( $val ) ) + Html::element( 'td', [], $this->primitiveValue( $val ) ) ) ) ); @@ -174,7 +174,7 @@ class JsonContent extends TextContent { */ protected function objectRow( $key, $val ) { $th = Html::element( 'th', [], $key ); - $td = self::valueCell( $val ); + $td = $this->valueCell( $val ); return Html::rawElement( 'tr', [], $th . $td ); } @@ -211,7 +211,7 @@ class JsonContent extends TextContent { * @return string HTML. */ protected function arrayRow( $val ) { - $td = self::valueCell( $val ); + $td = $this->valueCell( $val ); return Html::rawElement( 'tr', [], $td ); } @@ -223,14 +223,14 @@ class JsonContent extends TextContent { */ protected function valueCell( $val ) { if ( is_object( $val ) ) { - return Html::rawElement( 'td', [], self::objectTable( $val ) ); + return Html::rawElement( 'td', [], $this->objectTable( $val ) ); } if ( is_array( $val ) ) { - return Html::rawElement( 'td', [], self::arrayTable( $val ) ); + return Html::rawElement( 'td', [], $this->arrayTable( $val ) ); } - return Html::element( 'td', [ 'class' => 'value' ], self::primitiveValue( $val ) ); + return Html::element( 'td', [ 'class' => 'value' ], $this->primitiveValue( $val ) ); } /** diff --git a/includes/content/MessageContent.php b/includes/content/MessageContent.php index e3f93759c3..4b58989371 100644 --- a/includes/content/MessageContent.php +++ b/includes/content/MessageContent.php @@ -136,7 +136,7 @@ class MessageContent extends AbstractContent { } /** - * @param bool $hasLinks + * @param bool|null $hasLinks * * @return bool Always false. * diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php index baea812576..225522e92d 100644 --- a/includes/content/TextContent.php +++ b/includes/content/TextContent.php @@ -92,7 +92,7 @@ class TextContent extends AbstractContent { * Returns true if this content is not a redirect, and $wgArticleCountMethod * is "any". * - * @param bool $hasLinks If it is known whether this content contains links, + * @param bool|null $hasLinks If it is known whether this content contains links, * provide this information here, to avoid redundant parsing to find out. * * @return bool diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index c1fef7cbb5..a63819dd42 100644 --- a/includes/content/WikitextContent.php +++ b/includes/content/WikitextContent.php @@ -258,10 +258,10 @@ class WikitextContent extends TextContent { * Returns true if this content is not a redirect, and this content's text * is countable according to the criteria defined by $wgArticleCountMethod. * - * @param bool $hasLinks If it is known whether this content contains + * @param bool|null $hasLinks If it is known whether this content contains * links, provide this information here, to avoid redundant parsing to * find out (default: null). - * @param Title $title Optional title, defaults to the title from the current main request. + * @param Title|null $title Optional title, defaults to the title from the current main request. * * @return bool */ diff --git a/includes/db/Database.php b/includes/db/Database.php index 351d43845a..02a6ec870b 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -859,8 +859,12 @@ abstract class DatabaseBase implements IDatabase { # Try reconnecting if the connection was lost if ( false === $ret && $this->wasErrorReissuable() ) { - # Transaction is gone, like it or not - $hadTrx = $this->mTrxLevel; // possible lost transaction + # Transaction is gone; this can mean lost writes or REPEATABLE-READ snapshots + $hadTrx = $this->mTrxLevel; + # T127428: for non-write transactions, a disconnect and a COMMIT are similar: + # neither changed data and in both cases any read snapshots are reset anyway. + $isNoopCommit = ( !$this->writesOrCallbacksPending() && $sql === 'COMMIT' ); + # Update state tracking to reflect transaction loss $this->mTrxLevel = 0; $this->mTrxIdleCallbacks = []; // bug 65263 $this->mTrxPreCommitCallbacks = []; // bug 65263 @@ -874,12 +878,12 @@ abstract class DatabaseBase implements IDatabase { $msg = __METHOD__ . ": lost connection to $server; reconnected"; wfDebugLog( 'DBPerformance', "$msg:\n" . wfBacktrace( true ) ); - if ( $hadTrx || $this->mNamedLocksHeld ) { + if ( ( $hadTrx && !$isNoopCommit ) || $this->mNamedLocksHeld ) { # Leave $ret as false and let an error be reported. # Callers may catch the exception and continue to use the DB. $this->reportQueryError( $lastError, $lastErrno, $sql, $fname, $tempIgnore ); } else { - # Should be safe to silently retry (no trx and thus no callbacks) + # Should be safe to silently retry (no trx/callbacks/locks) $startTime = microtime( true ); $ret = $this->doQuery( $commentedSql ); $queryRuntime = microtime( true ) - $startTime; diff --git a/includes/db/IDatabase.php b/includes/db/IDatabase.php index e1d1173b14..7855861281 100644 --- a/includes/db/IDatabase.php +++ b/includes/db/IDatabase.php @@ -1334,9 +1334,13 @@ interface IDatabase { * @param string $fname * @param string $flush Flush flag, set to 'flush' to disable warnings about * explicitly committing implicit transactions, or calling commit when no - * transaction is in progress. This will silently break any ongoing - * explicit transaction. Only set the flush flag if you are sure that it - * is safe to ignore these warnings in your context. + * transaction is in progress. + * + * This will trigger an exception if there is an ongoing explicit transaction. + * + * Only set the flush flag if you are sure that these warnings are not applicable, + * and no explicit transactions are open. + * * @throws DBUnexpectedError */ public function commit( $fname = __METHOD__, $flush = '' ); diff --git a/includes/htmlform/HTMLTextField.php b/includes/htmlform/HTMLTextField.php index c2606c2329..fb7584b7d1 100644 --- a/includes/htmlform/HTMLTextField.php +++ b/includes/htmlform/HTMLTextField.php @@ -22,7 +22,7 @@ class HTMLTextField extends HTMLFormField { 'value' => $value, 'dir' => $this->mDir, 'spellcheck' => $this->getSpellCheck(), - ] + $this->getTooltipAndAccessKey(); + ] + $this->getTooltipAndAccessKey() + $this->getDataAttribs(); if ( $this->mClass !== '' ) { $attribs['class'] = $this->mClass; @@ -126,4 +126,13 @@ class HTMLTextField extends HTMLFormField { protected function getInputWidget( $params ) { return new OOUI\TextInputWidget( $params ); } + + /** + * Returns an array of data-* attributes to add to the field. + * + * @return array + */ + protected function getDataAttribs() { + return []; + } } diff --git a/includes/htmlform/HTMLTitleTextField.php b/includes/htmlform/HTMLTitleTextField.php index 09fbaa74c8..410d15d080 100644 --- a/includes/htmlform/HTMLTitleTextField.php +++ b/includes/htmlform/HTMLTitleTextField.php @@ -80,4 +80,20 @@ class HTMLTitleTextField extends HTMLTextField { $params['relative'] = $this->mParams['relative']; return new TitleInputWidget( $params ); } + + public function getInputHtml( $value ) { + // add mw-searchInput class to enable search suggestions for non-OOUI, too + $this->mClass .= 'mw-searchInput'; + + // return the HTMLTextField html + return parent::getInputHtml( $value ); + } + + protected function getDataAttribs() { + return [ + 'data-mw-searchsuggest' => FormatJson::encode( [ + 'wrapAsLink' => false, + ] ), + ]; + } } diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 7ebab67eb9..70fa857691 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -1715,7 +1715,9 @@ abstract class Installer { * Override the necessary bits of the config to run an installation. */ public static function overrideConfig() { - define( 'MW_NO_SESSION', 1 ); + // Use PHP's built-in session handling, since MediaWiki's + // SessionHandler can't work before we have an object cache set up. + define( 'MW_NO_SESSION_HANDLER', 1 ); // Don't access the database $GLOBALS['wgUseDatabaseMessages'] = false; @@ -1739,6 +1741,8 @@ abstract class Installer { // Some of the environment checks make shell requests, remove limits $GLOBALS['wgMaxShellMemory'] = 0; + // Override the default CookieSessionProvider with a dummy + // implementation that won't stomp on PHP's cookies. $GLOBALS['wgSessionProviders'] = [ [ 'class' => 'InstallerSessionProvider', @@ -1747,6 +1751,9 @@ abstract class Installer { ] ] ] ]; + + // Don't try to use any object cache for SessionManager either. + $GLOBALS['wgSessionCacheType'] = CACHE_NONE; } /** diff --git a/includes/installer/i18n/ko.json b/includes/installer/i18n/ko.json index 90e6dc9ff7..3bdcbd76ed 100644 --- a/includes/installer/i18n/ko.json +++ b/includes/installer/i18n/ko.json @@ -9,7 +9,8 @@ "Revi", "Alex00728", "Hwangjy9", - "Macofe" + "Macofe", + "Mooozi" ] }, "config-desc": "미디어위키를 위한 설치 관리자", @@ -18,7 +19,7 @@ "config-localsettings-upgrade": "LocalSettings.php 파일을 감지했습니다.\n이 설치를 업그레이드하려면, 아래 상자에 $wgUpgradeKey의 값을 입력하세요.\nLocalSettings.php에서 찾을 수 있습니다.", "config-localsettings-cli-upgrade": "LocalSettings.php 파일을 감지했습니다.\n이 설치를 업그레이드하려면 update.php를 대신 실행하세요", "config-localsettings-key": "업그레이드 키:", - "config-localsettings-badkey": "제공한 키가 잘못되었습니다.", + "config-localsettings-badkey": "업그레이드 키가 잘못되었습니다.", "config-upgrade-key-missing": "미디어위키의 기존 설치를 감지했습니다.\n이 설치를 업그레이드하려면, LocalSettings.php의 아래에 다음 줄을 넣으세요:\n\n$1", "config-localsettings-incomplete": "기존 LocalSettings.php가 완전하지 않은 것 같습니다.\n$1 변수가 설정되어 있지 않습니다.\n이 변수가 설정되도록 LocalSettings.php를 바꾸고 \"{{int:Config-continue}}\"을 클릭하세요.", "config-localsettings-connection-error": "LocalSettings.php에 지정한 설정을 사용하여 데이터베이스에 연결할 때 오류가 발생했습니다. 이러한 설정을 고치고 다시 시도하세요.\n\n$1", @@ -61,12 +62,7 @@ "config-no-db": "적절한 데이터베이스 드라이버를 찾을 수 없습니다! PHP용 데이터베이스 드라이버를 설치해야 합니다.\n다음 데이터베이스 {{PLURAL:$2|유형을 지원합니다}}: $1.\n\nPHP를 직접 컴파일했다면, 예를 들어 ./configure --with-mysql을 사용하여, 데이터베이스 클라이언트를 활성화하도록 다시 설정하세요.\n데비안이나 우분투 패키지에서 PHP를 설치했다면 php5-mysql 모듈도 설치해야 합니다.", "config-outdated-sqlite": "경고: 최소인 $2 버전보다 낮은 SQLite $1(이)가 있습니다. SQLite를 사용할 수 없습니다.", "config-no-fts3": "경고: SQLite를 [//sqlite.org/fts3.html FTS3 모듈] 없이 컴파일하며, 검색 기능은 백엔드에 사용할 수 없습니다.", - "config-register-globals-error": "오류: PHP의 [http://php.net/register_globals register_globals] 옵션이 활성화되어 있습니다.\n설치를 계속하려면 비활성화해야 합니다.\n어떻게 하는지에 대한 도움말에 대해서는 [https://www.mediawiki.org/wiki/register_globals https://www.mediawiki.org/wiki/register_globals]를 보세요.", - "config-magic-quotes-gpc": "치명: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-gpc magic_quotes_gpc]이 활성화되어 있습니다!\n이 옵션은 데이터를 입력하는 데 예기치 않는 손상을 일으킵니다.\n이 옵션을 비활성화하지 않는 한 미디어위키를 설치하고 사용할 수 없습니다.", - "config-magic-quotes-runtime": "치명: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime]이 활성화되어 있습니다!\n이 옵션은 데이터를 입력하는 데 예기치 않는 손상이 일으킵니다.\n이 옵션을 비활성화하지 않는 한 미디어위키를 설치하고 사용할 수 없습니다.", - "config-magic-quotes-sybase": "치명: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase]이 활성화되어 있습니다!\n이 옵션은 데이터를 입력하는 데 예기치 않는 손상을 일으킵니다.\n이 옵션을 비활성화하지 않는 한 미디어위키를 설치하고 사용할 수 없습니다.", "config-mbstring": "치명: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload]이 활성화되어 있습니다!\n이 옵션은 오류가 발생하고 데이터를 입력하는 데 예기치 않는 손상을 일으킬 수 있습니다.\n이 옵션을 비활성화하지 않는 한 미디어위키를 설치하고 사용할 수 없습니다.", - "config-safe-mode": "경고: PHP의 [http://www.php.net/features.safe-mode 안전 모드]가 활성화되어 있습니다!\n특히 파일을 올리거나 math를 지원하는 데 문제가 발생할 수 있습니다.", "config-xml-bad": "PHP의 XML 모듈이 없습니다.\n미디어위키는 이 모듈의 기능이 필요하며 이 설정에서는 작동하지 않습니다.\nphp-xml 패키지를 설치해야할 수도 있습니다.", "config-pcre-old": "치명: PCRE $1 또는 그 이상이 필요합니다.\nPHP 바이너리는 PCRE $2에 연결되어 있습니다. [https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE 자세한 정보].", "config-pcre-no-utf8": "치명: PHP의 PCRE 모듈은 RCRE_UTF8 지원 없이 컴파일된 것 같습니다.\n미디어위키가 올바르게 작동하려면 UTF-8을 지원해야 합니다.", diff --git a/includes/installer/i18n/sah.json b/includes/installer/i18n/sah.json index ab257ddb31..caca27f56c 100644 --- a/includes/installer/i18n/sah.json +++ b/includes/installer/i18n/sah.json @@ -1,12 +1,39 @@ { "@metadata": { "authors": [ - "HalanTul" + "HalanTul", + "Мария Олесова" ] }, "config-desc": "MediaWiki инсталлятора", "config-title": "MediaWiki $1 туруоруу", "config-information": "Бу туһунан", + "config-localsettings-key": "Саҥатытыы күлүүһэ:", + "config-localsettings-badkey": "Саҥатытыыга сыыһа күлүүһү ыйдыҥ.", + "config-your-language-help": "Туруоруу кэмигэр туттуллар тылы тал.", + "config-wiki-language": "Биики туттуохтаах тыла:", + "config-back": "← Төттөрү", + "config-continue": "Салгыы →", + "config-page-language": "Тыла", + "config-page-dbconnect": "Билии олоҕор холбонуу", + "config-page-upgrade": "Баар туруорууну саҥатытыы", + "config-page-dbsettings": "Билии олоҕун бэлэмнээһин", + "config-page-name": "Аат", + "config-page-options": "Туруоруулар", + "config-page-install": "Туруоруу", + "config-page-complete": "Бэлэм!", + "config-page-restart": "Туруорууну саҥаттан саҕалыырга", + "config-page-upgradedoc": "Саҥатытыы", + "config-page-existingwiki": "Баар биики", + "config-help-restart": "Харайыллыбыт көрдөрүүлэри сотуоххун уонна туруоруу кэмин саҥаттан ыытыаххын баҕараҕын дуо?", + "config-restart": "Сөп, саҥаттан саҕалыырга", + "config-env-good": "Тас кэккэ бэрэбиэркэтэ ситиһиилээхтик ыытылынна. \nMediaWiki туруоруоххун сөп.", + "config-db-type": "Билии олоҕун көрүҥэ:", + "config-db-wiki-settings": "Бу биики тэҥнэбилэ", + "config-db-name": "Билии олоҕун аата:", + "config-db-name-oracle": "Билии олоҕун исхиэмэтэ:", + "config-db-install-account": "Туруорууга анаммыт бэлиэ-аат", + "config-db-username": "Билии олоҕун туһанааччы аата:", "mainpagetext": "'''«MediaWiki» сөпкө туруорулунна.'''", "mainpagedocfooter": "Биики программатын туһунан [//meta.wikimedia.org/wiki/Help:Contents справочникка] көрүөххүн сөп.\n\n== Саҕаланыыта ==\n\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Конфигурация уларытыытын параметрдара]\n* [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki релизтарын почтовай испииһэгэ]" } diff --git a/includes/libs/objectcache/CachedBagOStuff.php b/includes/libs/objectcache/CachedBagOStuff.php index 798357d596..3d5d383e42 100644 --- a/includes/libs/objectcache/CachedBagOStuff.php +++ b/includes/libs/objectcache/CachedBagOStuff.php @@ -50,11 +50,9 @@ class CachedBagOStuff extends HashBagOStuff { protected function doGet( $key, $flags = 0 ) { $ret = parent::doGet( $key, $flags ); - if ( $ret === false ) { + if ( $ret === false && !$this->hasKey( $key ) ) { $ret = $this->backend->doGet( $key, $flags ); - if ( $ret !== false ) { - $this->set( $key, $ret, 0, self::WRITE_CACHE_ONLY ); - } + $this->set( $key, $ret, 0, self::WRITE_CACHE_ONLY ); } return $ret; } diff --git a/includes/libs/objectcache/HashBagOStuff.php b/includes/libs/objectcache/HashBagOStuff.php index 6e7fb0cae0..e03cec6a2f 100644 --- a/includes/libs/objectcache/HashBagOStuff.php +++ b/includes/libs/objectcache/HashBagOStuff.php @@ -60,8 +60,19 @@ class HashBagOStuff extends BagOStuff { return true; } + /** + * Does this bag have a non-null value for the given key? + * + * @param string $key + * @return bool + * @since 1.27 + */ + protected function hasKey( $key ) { + return isset( $this->bag[$key] ); + } + protected function doGet( $key, $flags = 0 ) { - if ( !isset( $this->bag[$key] ) ) { + if ( !$this->hasKey( $key ) ) { return false; } diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php index 3b470ecd8f..012d53c9a2 100644 --- a/includes/logging/DeleteLogFormatter.php +++ b/includes/logging/DeleteLogFormatter.php @@ -33,6 +33,8 @@ class DeleteLogFormatter extends LogFormatter { $key = parent::getMessageKey(); if ( in_array( $this->entry->getSubtype(), [ 'event', 'revision' ] ) ) { if ( count( $this->getMessageParameters() ) < 5 ) { + // Messages: logentry-delete-event-legacy, logentry-delete-revision-legacy, + // logentry-suppress-event-legacy, logentry-suppress-revision-legacy return "$key-legacy"; } } diff --git a/includes/logging/PatrolLogFormatter.php b/includes/logging/PatrolLogFormatter.php index 0d007b3308..e6f9fb64cd 100644 --- a/includes/logging/PatrolLogFormatter.php +++ b/includes/logging/PatrolLogFormatter.php @@ -33,6 +33,7 @@ class PatrolLogFormatter extends LogFormatter { $key = parent::getMessageKey(); $params = $this->getMessageParameters(); if ( isset( $params[5] ) && $params[5] ) { + // Messages: logentry-patrol-patrol-auto $key .= '-auto'; } diff --git a/includes/logging/RightsLogFormatter.php b/includes/logging/RightsLogFormatter.php index eebccddbcd..b9dfb6c044 100644 --- a/includes/logging/RightsLogFormatter.php +++ b/includes/logging/RightsLogFormatter.php @@ -53,6 +53,7 @@ class RightsLogFormatter extends LogFormatter { $key = parent::getMessageKey(); $params = $this->getMessageParameters(); if ( !isset( $params[3] ) && !isset( $params[4] ) ) { + // Messages: logentry-rights-rights-legacy $key .= '-legacy'; } diff --git a/includes/logging/TagLogFormatter.php b/includes/logging/TagLogFormatter.php index b62bcb4db8..230d13b60b 100644 --- a/includes/logging/TagLogFormatter.php +++ b/includes/logging/TagLogFormatter.php @@ -39,8 +39,12 @@ class TagLogFormatter extends LogFormatter { $key .= ( $remove ? ( $add ? '' : '-remove' ) : '-add' ); if ( isset( $params[3] ) && $params[3] ) { + // Messages: logentry-tag-update-add-revision, logentry-tag-update-remove-revision, + // logentry-tag-update-revision $key .= '-revision'; } else { + // Messages: logentry-tag-update-add-logentry, logentry-tag-update-remove-logentry, + // logentry-tag-update-logentry $key .= '-logentry'; } diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index 983f42c636..464e7b8eee 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -33,7 +33,7 @@ class UserMailer { /** * Send mail using a PEAR mailer * - * @param UserMailer $mailer + * @param Mail_smtp $mailer * @param string $dest * @param string $headers * @param string $body @@ -116,7 +116,7 @@ class UserMailer { */ public static function send( $to, $from, $subject, $body, $options = [] ) { global $wgAllowHTMLEmail; - $contentType = 'text/plain; charset=UTF-8'; + if ( !is_array( $options ) ) { // Old calling style wfDeprecated( __METHOD__ . ' with $replyto as 5th parameter', '1.26' ); @@ -125,6 +125,9 @@ class UserMailer { $options['contentType'] = func_get_arg( 5 ); } } + if ( !isset( $options['contentType'] ) ) { + $options['contentType'] = 'text/plain; charset=UTF-8'; + } if ( !is_array( $to ) ) { $to = [ $to ]; @@ -327,8 +330,7 @@ class UserMailer { $body = str_replace( "\n", "\r\n", $body ); } $headers['MIME-Version'] = '1.0'; - $headers['Content-type'] = ( is_null( $contentType ) ? - 'text/plain; charset=UTF-8' : $contentType ); + $headers['Content-type'] = $contentType; $headers['Content-transfer-encoding'] = '8bit'; } diff --git a/includes/media/BMP.php b/includes/media/BMP.php index 64f12f71e4..4b9b268257 100644 --- a/includes/media/BMP.php +++ b/includes/media/BMP.php @@ -32,7 +32,7 @@ class BmpHandler extends BitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php index b470e064c8..b055d16fc0 100644 --- a/includes/media/Bitmap.php +++ b/includes/media/Bitmap.php @@ -59,7 +59,7 @@ class BitmapHandler extends TransformationalImageHandler { return $scaler; } - function makeParamString( $params ) { + public function makeParamString( $params ) { $res = parent::makeParamString( $params ); if ( isset( $params['interlace'] ) && $params['interlace'] ) { return "interlaced-{$res}"; @@ -68,7 +68,7 @@ class BitmapHandler extends TransformationalImageHandler { } } - function parseParamString( $str ) { + public function parseParamString( $str ) { $remainder = preg_replace( '/^interlaced-/', '', $str ); $params = parent::parseParamString( $remainder ); if ( $params === false ) { @@ -78,7 +78,7 @@ class BitmapHandler extends TransformationalImageHandler { return $params; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'interlace' ) { return $value === false || $value === true; } else { diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index 0d2ed29b00..d4ef8a875e 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -47,7 +47,7 @@ class DjVuHandler extends ImageHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } @@ -64,14 +64,14 @@ class DjVuHandler extends ImageHandler { * @param File $file * @return bool */ - function isMultiPage( $file ) { + public function isMultiPage( $file ) { return true; } /** * @return array */ - function getParamMap() { + public function getParamMap() { return [ 'img_width' => 'width', 'img_page' => 'page', @@ -83,7 +83,7 @@ class DjVuHandler extends ImageHandler { * @param mixed $value * @return bool */ - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'page' && trim( $value ) !== (string)intval( $value ) ) { // Extra junk on the end of page, probably actually a caption // e.g. [[File:Foo.djvu|thumb|Page 3 of the document shows foo]] @@ -104,7 +104,7 @@ class DjVuHandler extends ImageHandler { * @param array $params * @return bool|string */ - function makeParamString( $params ) { + public function makeParamString( $params ) { $page = isset( $params['page'] ) ? $params['page'] : 1; if ( !isset( $params['width'] ) ) { return false; @@ -117,7 +117,7 @@ class DjVuHandler extends ImageHandler { * @param string $str * @return array|bool */ - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^page(\d+)-(\d+)px$/', $str, $m ) ) { return [ 'width' => $m[2], 'page' => $m[1] ]; diff --git a/includes/media/ImageHandler.php b/includes/media/ImageHandler.php index a7847bbeec..158c0dc6ea 100644 --- a/includes/media/ImageHandler.php +++ b/includes/media/ImageHandler.php @@ -31,15 +31,15 @@ abstract class ImageHandler extends MediaHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { return ( $file->getWidth() && $file->getHeight() ); } - function getParamMap() { + public function getParamMap() { return [ 'img_width' => 'width' ]; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( in_array( $name, [ 'width', 'height' ] ) ) { if ( $value <= 0 ) { return false; @@ -51,7 +51,7 @@ abstract class ImageHandler extends MediaHandler { } } - function makeParamString( $params ) { + public function makeParamString( $params ) { if ( isset( $params['physicalWidth'] ) ) { $width = $params['physicalWidth']; } elseif ( isset( $params['width'] ) ) { @@ -65,7 +65,7 @@ abstract class ImageHandler extends MediaHandler { return "{$width}px"; } - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^(\d+)px$/', $str, $m ) ) { return [ 'width' => $m[1] ]; diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index 040ff96e1c..b8b6f6c987 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -42,7 +42,7 @@ class JpegHandler extends ExifBitmapHandler { return true; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'quality' ) { return self::validateQuality( $value ); } else { @@ -58,7 +58,7 @@ class JpegHandler extends ExifBitmapHandler { return $value === 'low'; } - function makeParamString( $params ) { + public function makeParamString( $params ) { // Prepend quality as "qValue-". This has to match parseParamString() below $res = parent::makeParamString( $params ); if ( $res && isset( $params['quality'] ) ) { @@ -67,7 +67,7 @@ class JpegHandler extends ExifBitmapHandler { return $res; } - function parseParamString( $str ) { + public function parseParamString( $str ) { // $str contains "qlow-200px" or "200px" strings because thumb.php would strip the filename // first - check if the string begins with "qlow-", and if so, treat it as quality. // Pass the first portion, or the whole string if "qlow-" not found, to the parent diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index 95498ba5bd..6b0f887460 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -75,7 +75,7 @@ abstract class MediaHandler { * Get an associative array mapping magic word IDs to parameter names. * Will be used by the parser to identify parameters. */ - abstract function getParamMap(); + abstract public function getParamMap(); /** * Validate a thumbnail parameter at parse time. @@ -85,7 +85,7 @@ abstract class MediaHandler { * @param string $name * @param mixed $value */ - abstract function validateParam( $name, $value ); + abstract public function validateParam( $name, $value ); /** * Merge a parameter array into a string appropriate for inclusion in filenames @@ -93,7 +93,7 @@ abstract class MediaHandler { * @param array $params Array of parameters that have been through normaliseParams. * @return string */ - abstract function makeParamString( $params ); + abstract public function makeParamString( $params ); /** * Parse a param string made with makeParamString back into an array @@ -101,7 +101,7 @@ abstract class MediaHandler { * @param string $str The parameter string without file name (e.g. 122px) * @return array|bool Array of parameters or false on failure. */ - abstract function parseParamString( $str ); + abstract public function parseParamString( $str ); /** * Changes the parameter array as necessary, ready for transformation. @@ -342,7 +342,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { return true; } @@ -353,7 +353,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return false; } @@ -363,7 +363,7 @@ abstract class MediaHandler { * @param File $file * @return bool */ - function isMultiPage( $file ) { + public function isMultiPage( $file ) { return false; } diff --git a/includes/media/SVG.php b/includes/media/SVG.php index d570f30ef2..7e77b25be3 100644 --- a/includes/media/SVG.php +++ b/includes/media/SVG.php @@ -51,7 +51,7 @@ class SvgHandler extends ImageHandler { } } - function mustRender( $file ) { + public function mustRender( $file ) { return true; } @@ -462,7 +462,7 @@ class SvgHandler extends ImageHandler { * @param mixed $value Parameter value * @return bool Validity */ - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( in_array( $name, [ 'width', 'height' ] ) ) { // Reject negative heights, widths return ( $value > 0 ); @@ -485,7 +485,7 @@ class SvgHandler extends ImageHandler { * @param array $params Name=>value pairs of parameters * @return string Filename to use */ - function makeParamString( $params ) { + public function makeParamString( $params ) { $lang = ''; if ( isset( $params['lang'] ) && $params['lang'] !== 'en' ) { $params['lang'] = strtolower( $params['lang'] ); @@ -498,7 +498,7 @@ class SvgHandler extends ImageHandler { return "$lang{$params['width']}px"; } - function parseParamString( $str ) { + public function parseParamString( $str ) { $m = false; if ( preg_match( '/^lang([a-z]+(?:-[a-z]+)*)-(\d+)px$/', $str, $m ) ) { return [ 'width' => array_pop( $m ), 'lang' => $m[1] ]; @@ -509,7 +509,7 @@ class SvgHandler extends ImageHandler { } } - function getParamMap() { + public function getParamMap() { return [ 'img_lang' => 'lang', 'img_width' => 'width' ]; } diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 750528f0f7..2e732493bf 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -40,7 +40,7 @@ class TiffHandler extends ExifBitmapHandler { * @param File $file * @return bool */ - function canRender( $file ) { + public function canRender( $file ) { global $wgTiffThumbnailType; return (bool)$wgTiffThumbnailType @@ -54,7 +54,7 @@ class TiffHandler extends ExifBitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } diff --git a/includes/media/XCF.php b/includes/media/XCF.php index 05c38472c6..f8fa2521d3 100644 --- a/includes/media/XCF.php +++ b/includes/media/XCF.php @@ -37,7 +37,7 @@ class XCFHandler extends BitmapHandler { * @param File $file * @return bool */ - function mustRender( $file ) { + public function mustRender( $file ) { return true; } diff --git a/includes/page/Article.php b/includes/page/Article.php index caff619997..4252f8578e 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -636,7 +636,7 @@ class Article implements Page { # the correct version information. $outputPage->setRevisionId( $this->getRevIdFetched() ); # Preload timestamp to avoid a DB hit - $outputPage->setRevisionTimestamp( $this->getTimestamp() ); + $outputPage->setRevisionTimestamp( $this->mPage->getTimestamp() ); # Pages containing custom CSS or JavaScript get special treatment if ( $this->getTitle()->isCssOrJsPage() || $this->getTitle()->isCssJsSubpage() ) { diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php index 255fef8adc..368d79ef49 100644 --- a/includes/parser/Preprocessor.php +++ b/includes/parser/Preprocessor.php @@ -67,9 +67,7 @@ abstract class Preprocessor { } $key = wfMemcKey( - // TODO: Once we require PHP 5.5, use static::class instead of - // get_called_class() or get_class( $this ). - defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(), + defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class, md5( $text ), $flags ); $value = sprintf( "%08d", static::CACHE_VERSION ) . $tree; @@ -100,9 +98,7 @@ abstract class Preprocessor { $cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) ); $key = wfMemcKey( - // TODO: Once we require PHP 5.5, use static::class instead of - // get_called_class() or get_class( $this ). - defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(), + defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class, md5( $text ), $flags ); $value = $cache->get( $key ); diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index bf5ae4b647..6458e71e7e 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -221,13 +221,7 @@ class ResourceLoaderContext { if ( $this->userObj === null ) { $username = $this->getUser(); if ( $username ) { - // Optimize: Avoid loading a new User object if possible - global $wgUser; - if ( is_object( $wgUser ) && $wgUser->getName() === $username ) { - $this->userObj = $wgUser; - } else { - $this->userObj = User::newFromName( $username ); - } + $this->userObj = User::newFromName( $username ); } else { $this->userObj = new User; // Anonymous user } diff --git a/includes/session/BotPasswordSessionProvider.php b/includes/session/BotPasswordSessionProvider.php index 44199bdec4..70c771dc31 100644 --- a/includes/session/BotPasswordSessionProvider.php +++ b/includes/session/BotPasswordSessionProvider.php @@ -165,16 +165,19 @@ class BotPasswordSessionProvider extends ImmutableSessionProviderWithCookie { return true; } + /** + * @codeCoverageIgnore + */ public function preventSessionsForUser( $username ) { BotPassword::removeAllPasswordsForUser( $username ); } public function getAllowedUserRights( SessionBackend $backend ) { if ( $backend->getProvider() !== $this ) { - throw new InvalidArgumentException( 'Backend\'s provider isn\'t $this' ); + throw new \InvalidArgumentException( 'Backend\'s provider isn\'t $this' ); } $data = $backend->getProviderMetadata(); - if ( $data ) { + if ( $data && isset( $data['rights'] ) && is_array( $data['rights'] ) ) { return $data['rights']; } diff --git a/includes/session/MetadataMergeException.php b/includes/session/MetadataMergeException.php index 9f42c278bc..882084d04e 100644 --- a/includes/session/MetadataMergeException.php +++ b/includes/session/MetadataMergeException.php @@ -22,6 +22,7 @@ namespace MediaWiki\Session; +use Exception; use UnexpectedValueException; /** diff --git a/includes/session/PHPSessionHandler.php b/includes/session/PHPSessionHandler.php index 93b0b36c07..695ce5a92a 100644 --- a/includes/session/PHPSessionHandler.php +++ b/includes/session/PHPSessionHandler.php @@ -111,6 +111,12 @@ class PHPSessionHandler implements \SessionHandlerInterface { return; } + // @codeCoverageIgnoreStart + if ( defined( 'MW_NO_SESSION_HANDLER' ) ) { + throw new \BadMethodCallException( 'MW_NO_SESSION_HANDLER is defined' ); + } + // @codeCoverageIgnoreEnd + self::$instance = new self( $manager ); // Close any auto-started session, before we replace it diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php index 0a9191b123..0424a2da07 100644 --- a/includes/session/SessionBackend.php +++ b/includes/session/SessionBackend.php @@ -572,7 +572,9 @@ final class SessionBackend { * @param bool $closing Whether the session is being closed */ public function save( $closing = false ) { - if ( $this->provider->getManager()->isUserSessionPrevented( $this->user->getName() ) ) { + $anon = $this->user->isAnon(); + + if ( !$anon && $this->provider->getManager()->isUserSessionPrevented( $this->user->getName() ) ) { $this->logger->debug( 'SessionBackend "{session}" not saving, user {user} was ' . 'passed to SessionManager::preventSessionsForUser', @@ -585,7 +587,6 @@ final class SessionBackend { // Ensure the user has a token // @codeCoverageIgnoreStart - $anon = $this->user->isAnon(); if ( !$anon && !$this->user->getToken( false ) ) { $this->logger->debug( 'SessionBackend "{session}" creating token for user {user} on save', diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index 8695b689b1..6a8b8a32ec 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -24,7 +24,6 @@ namespace MediaWiki\Session; use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; use BagOStuff; use CachedBagOStuff; use Config; @@ -297,6 +296,11 @@ final class SessionManager implements SessionManagerInterface { } public function getVaryHeaders() { + // @codeCoverageIgnoreStart + if ( defined( 'MW_NO_SESSION' ) && MW_NO_SESSION !== 'warn' ) { + return []; + } + // @codeCoverageIgnoreEnd if ( $this->varyHeaders === null ) { $headers = []; foreach ( $this->getProviders() as $provider ) { @@ -315,6 +319,11 @@ final class SessionManager implements SessionManagerInterface { } public function getVaryCookies() { + // @codeCoverageIgnoreStart + if ( defined( 'MW_NO_SESSION' ) && MW_NO_SESSION !== 'warn' ) { + return []; + } + // @codeCoverageIgnoreEnd if ( $this->varyCookies === null ) { $cookies = []; foreach ( $this->getProviders() as $provider ) { @@ -508,12 +517,14 @@ final class SessionManager implements SessionManagerInterface { } # Notify AuthPlugin + // @codeCoverageIgnoreStart $tmpUser = $user; $wgAuth->initUser( $tmpUser, true ); if ( $tmpUser !== $user ) { $logger->warning( __METHOD__ . ': ' . get_class( $wgAuth ) . '::initUser() replaced the user object' ); } + // @codeCoverageIgnoreEnd # Notify hooks (e.g. Newuserlog) \Hooks::run( 'AuthPluginAutoCreate', [ $user ] ); @@ -952,6 +963,17 @@ final class SessionManager implements SessionManagerInterface { * @return Session */ public function getSessionFromInfo( SessionInfo $info, WebRequest $request ) { + // @codeCoverageIgnoreStart + if ( defined( 'MW_NO_SESSION' ) ) { + if ( MW_NO_SESSION === 'warn' ) { + // Undocumented safety case for converting existing entry points + $this->logger->error( 'Sessions are supposed to be disabled for this entry point' ); + } else { + throw new \BadMethodCallException( 'Sessions are disabled for this entry point' ); + } + } + // @codeCoverageIgnoreEnd + $id = $info->getId(); if ( !isset( $this->allSessionBackends[$id] ) ) { @@ -1065,96 +1087,6 @@ final class SessionManager implements SessionManagerInterface { self::$globalSessionRequest = null; } - /** - * Do a sanity check to make sure the session is not used from many different IP addresses - * and store some data for later sanity checks. - * FIXME remove this once SessionManager is considered stable - * @private For use in Setup.php only - * @param Session $session Defaults to the global session. - */ - public function checkIpLimits( Session $session = null ) { - $session = $session ?: self::getGlobalSession(); - - try { - $ip = $session->getRequest()->getIP(); - } catch ( \MWException $e ) { - return; - } - if ( $ip === '127.0.0.1' || \IP::isConfiguredProxy( $ip ) ) { - return; - } - $now = time(); - - // Record (and possibly log) that the IP is using the current session. - // Don't touch the stored data unless we are adding a new IP or re-adding an expired one. - // This is slightly inaccurate (when an existing IP is seen again, the expiry is not - // extended) but that shouldn't make much difference and limits the session write frequency - // to # of IPs / $wgSuspiciousIpExpiry. - $data = $session->get( 'SessionManager-ip', [] ); - if ( - !isset( $data[$ip] ) - || $data[$ip] < $now - ) { - $data[$ip] = time() + $this->config->get( 'SuspiciousIpExpiry' ); - foreach ( $data as $key => $expires ) { - if ( $expires < $now ) { - unset( $data[$key] ); - } - } - $session->set( 'SessionManager-ip', $data ); - - $logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'session-ip' ); - $logLevel = count( $data ) >= $this->config->get( 'SuspiciousIpPerSessionLimit' ) - ? LogLevel::WARNING : ( count( $data ) === 1 ? LogLevel::DEBUG : LogLevel::INFO ); - $logger->log( - $logLevel, - 'Same session used from {count} IPs', - [ - 'count' => count( $data ), - 'ips' => $data, - 'session' => $session->getId(), - 'user' => $session->getUser()->getName(), - 'persistent' => $session->isPersistent(), - ] - ); - } - - // Now do the same thing globally for the current user. - // We are using the object cache and assume it is shared between all wikis of a farm, - // and further assume that the same name belongs to the same user on all wikis. (It's either - // that or a central ID lookup which would mean an extra SQL query on every request.) - if ( $session->getUser()->isLoggedIn() ) { - $userKey = 'SessionManager-ip:' . md5( $session->getUser()->getName() ); - $data = $this->store->get( $userKey ) ?: []; - if ( - !isset( $data[$ip] ) - || $data[$ip] < $now - ) { - $data[$ip] = time() + $this->config->get( 'SuspiciousIpExpiry' ); - foreach ( $data as $key => $expires ) { - if ( $expires < $now ) { - unset( $data[$key] ); - } - } - $this->store->set( $userKey, $data, $this->config->get( 'SuspiciousIpExpiry' ) ); - $logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'session-ip' ); - $logLevel = count( $data ) >= $this->config->get( 'SuspiciousIpPerUserLimit' ) - ? LogLevel::WARNING : ( count( $data ) === 1 ? LogLevel::DEBUG : LogLevel::INFO ); - $logger->log( - $logLevel, - 'Same user had sessions from {count} IPs', - [ - 'count' => count( $data ), - 'ips' => $data, - 'session' => $session->getId(), - 'user' => $session->getUser()->getName(), - 'persistent' => $session->isPersistent(), - ] - ); - } - } - } - /**@}*/ } diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php index c06db01cbe..9c5fc2f973 100644 --- a/includes/specials/SpecialActiveusers.php +++ b/includes/specials/SpecialActiveusers.php @@ -223,8 +223,10 @@ class ActiveUsersPager extends UsersPager { [ 'class' => 'mw-ui-input-inline mw-autocomplete-user', 'tabindex' => 1, - 'autofocus' => $this->requestedUser === '', - ] + ] + ( + // Set autofocus on blank input + $this->requestedUser === '' ? [ 'autofocus' => '' ] : [] + ) ) . '
'; $out .= Xml::checkLabel( $this->msg( 'activeusers-hidebots' )->text(), diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 254d9e2401..5a351a7967 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -934,14 +934,16 @@ class ContribsPager extends ReverseChronologicalPager { function doBatchLookups() { # Do a link batch query $this->mResult->seek( 0 ); - $revIds = []; + $parentRevIds = []; + $this->mParentLens = []; $batch = new LinkBatch(); # Give some pointers to make (last) links foreach ( $this->mResult as $row ) { if ( isset( $row->rev_parent_id ) && $row->rev_parent_id ) { - $revIds[] = $row->rev_parent_id; + $parentRevIds[] = $row->rev_parent_id; } if ( isset( $row->rev_id ) ) { + $this->mParentLens[$row->rev_id] = $row->rev_len; if ( $this->contribs === 'newbie' ) { // multiple users $batch->add( NS_USER, $row->user_name ); $batch->add( NS_USER_TALK, $row->user_name ); @@ -949,7 +951,11 @@ class ContribsPager extends ReverseChronologicalPager { $batch->add( $row->page_namespace, $row->page_title ); } } - $this->mParentLens = Revision::getParentLengths( $this->mDbSecondary, $revIds ); + # Fetch rev_len for revisions not already scanned above + $this->mParentLens += Revision::getParentLengths( + $this->mDbSecondary, + array_diff( $parentRevIds, array_keys( $this->mParentLens ) ) + ); $batch->execute(); $this->mResult->seek( 0 ); } diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index cdf350d5ca..3528be0dc0 100644 --- a/includes/specials/SpecialEmailuser.php +++ b/includes/specials/SpecialEmailuser.php @@ -265,28 +265,32 @@ class SpecialEmailUser extends UnlistedSpecialPage { */ protected function userForm( $name ) { $this->getOutput()->addModules( 'mediawiki.userSuggest' ); - $string = Xml::openElement( - 'form', - [ 'method' => 'get', 'action' => wfScript(), 'id' => 'askusername' ] - ) . + $string = Html::openElement( + 'form', + [ 'method' => 'get', 'action' => wfScript(), 'id' => 'askusername' ] + ) . Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() ) . - Xml::openElement( 'fieldset' ) . + Html::openElement( 'fieldset' ) . Html::rawElement( 'legend', null, $this->msg( 'emailtarget' )->parse() ) . - Xml::inputLabel( + Html::label( $this->msg( 'emailusername' )->text(), + 'emailusertarget' + ) . ' ' . + Html::input( 'target', - 'emailusertarget', - 30, $name, + 'text', [ + 'id' => 'emailusertarget', 'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest 'autofocus' => true, + 'size' => 30, ] ) . ' ' . - Xml::submitButton( $this->msg( 'emailusernamesubmit' )->text() ) . - Xml::closeElement( 'fieldset' ) . - Xml::closeElement( 'form' ) . "\n"; + Html::submitButton( $this->msg( 'emailusernamesubmit' )->text(), [] ) . + Html::closeElement( 'fieldset' ) . + Html::closeElement( 'form' ) . "\n"; return $string; } diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php index bec871b9e8..d4c7c6ad2b 100644 --- a/includes/specials/SpecialLog.php +++ b/includes/specials/SpecialLog.php @@ -259,31 +259,7 @@ class SpecialLog extends SpecialPage { ) . "\n"; } - // Select: All, None, Invert - $links = []; - $links[] = Html::element( - 'a', [ 'href' => '#', 'class' => 'mw-checkbox-all' ], - $this->msg( 'checkbox-all' )->text() - ); - $links[] = Html::element( - 'a', [ 'href' => '#', 'class' => 'mw-checkbox-none' ], - $this->msg( 'checkbox-none' )->text() - ); - $links[] = Html::element( - 'a', [ 'href' => '#', 'class' => 'mw-checkbox-invert' ], - $this->msg( 'checkbox-invert' )->text() - ); - - $buttons .= Html::rawElement( 'p', - [ - 'class' => "mw-checkbox-toggle-controls" - ], - $this->msg( 'checkbox-select' ) - ->rawParams( $this->getLanguage()->commaList( $links ) )->escaped() - ); - - $this->getOutput()->addModules( 'mediawiki.checkboxtoggle' ); - $this->getOutput()->addModuleStyles( 'mediawiki.checkboxtoggle.styles' ); + $buttons .= ( new ListToggle( $this->getOutput() ) )->getHTML(); $s .= $buttons . $formcontents . $buttons; $s .= Html::closeElement( 'form' ); diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index d706786a58..c0f959033d 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -255,9 +255,10 @@ class SpecialVersion extends SpecialPage { * Return a string of the MediaWiki version with Git revision if available. * * @param string $flags + * @param Language|string|null $lang * @return mixed */ - public static function getVersion( $flags = '' ) { + public static function getVersion( $flags = '', $lang = null ) { global $wgVersion, $IP; $gitInfo = self::getGitHeadSha1( $IP ); @@ -268,7 +269,11 @@ class SpecialVersion extends SpecialPage { $version = "$wgVersion ($shortSha1)"; } else { $shortSha1 = substr( $gitInfo, 0, 7 ); - $shortSha1 = wfMessage( 'parentheses' )->params( $shortSha1 )->escaped(); + $msg = wfMessage( 'parentheses' ); + if ( $lang !== null ) { + $msg->inLanguage( $lang ); + } + $shortSha1 = $msg->params( $shortSha1 )->escaped(); $version = "$wgVersion $shortSha1"; } diff --git a/includes/user/User.php b/includes/user/User.php index 31f68079d4..c92c06b0b1 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -315,9 +315,12 @@ class User implements IDBAccessObject { } /** - * Test if it's safe to load this User object. You should typically check this before using - * $wgUser or RequestContext::getUser in a method that might be called before the system has - * been fully initialized. If the object is unsafe, you should use an anonymous user: + * Test if it's safe to load this User object. + * + * You should typically check this before using $wgUser or + * RequestContext::getUser in a method that might be called before the + * system has been fully initialized. If the object is unsafe, you should + * use an anonymous user: * \code * $user = $wgUser->isSafeToLoad() ? $wgUser : new User; * \endcode @@ -327,7 +330,14 @@ class User implements IDBAccessObject { */ public function isSafeToLoad() { global $wgFullyInitialised; - return $wgFullyInitialised || $this->mLoadedItems === true || $this->mFrom !== 'session'; + + // The user is safe to load if: + // * MW_NO_SESSION is undefined AND $wgFullyInitialised is true (safe to use session data) + // * mLoadedItems === true (already loaded) + // * mFrom !== 'session' (sessions not involved at all) + + return ( !defined( 'MW_NO_SESSION' ) && $wgFullyInitialised ) || + $this->mLoadedItems === true || $this->mFrom !== 'session'; } /** @@ -458,12 +468,18 @@ class User implements IDBAccessObject { } $cache = ObjectCache::getMainWANInstance(); - $data = $cache->get( $this->getCacheKey( $cache ) ); - if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) { - // Object is expired - return false; - } + $key = $this->getCacheKey( $cache ); + $processCache = ObjectCache::getLocalServerInstance( 'hash' ); + $data = $processCache->get( $key ); + if ( !is_array( $data ) ) { + $data = $cache->get( $key ); + if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) { + // Object is expired + return false; + } + $processCache->set( $key, $data ); + } wfDebug( "User: got user {$this->mId} from cache\n" ); // Restore from cache @@ -1111,7 +1127,8 @@ class User implements IDBAccessObject { $this->mOptionOverrides = null; $this->mOptionsLoaded = false; - $loggedOut = $this->mRequest ? $this->mRequest->getSession()->getLoggedOutTimestamp() : 0; + $loggedOut = $this->mRequest && !defined( 'MW_NO_SESSION' ) + ? $this->mRequest->getSession()->getLoggedOutTimestamp() : 0; if ( $loggedOut !== 0 ) { $this->mTouched = wfTimestamp( TS_MW, $loggedOut ); } else { @@ -3080,9 +3097,13 @@ class User implements IDBAccessObject { if ( is_null( $this->mRights ) ) { $this->mRights = self::getGroupPermissions( $this->getEffectiveGroups() ); - $allowedRights = $this->getRequest()->getSession()->getAllowedUserRights(); - if ( $allowedRights !== null ) { - $this->mRights = array_intersect( $this->mRights, $allowedRights ); + // Deny any rights denied by the user's session, unless this + // endpoint has no sessions. + if ( !defined( 'MW_NO_SESSION' ) ) { + $allowedRights = $this->getRequest()->getSession()->getAllowedUserRights(); + if ( $allowedRights !== null ) { + $this->mRights = array_intersect( $this->mRights, $allowedRights ); + } } Hooks::run( 'UserGetRights', [ $this, &$this->mRights ] ); @@ -4605,11 +4626,14 @@ class User implements IDBAccessObject { } } - // Remove any rights that aren't allowed to the global-session user - $allowedRights = SessionManager::getGlobalSession()->getAllowedUserRights(); - if ( $allowedRights !== null && !in_array( $right, $allowedRights, true ) ) { - $cache[$right] = false; - return false; + // Remove any rights that aren't allowed to the global-session user, + // unless there are no sessions for this endpoint. + if ( !defined( 'MW_NO_SESSION' ) ) { + $allowedRights = SessionManager::getGlobalSession()->getAllowedUserRights(); + if ( $allowedRights !== null && !in_array( $right, $allowedRights, true ) ) { + $cache[$right] = false; + return false; + } } // Allow extensions to say false diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json index 5d7826ae5a..0ad1af0625 100644 --- a/languages/i18n/ar.json +++ b/languages/i18n/ar.json @@ -91,6 +91,7 @@ "tog-watchlisthidebots": "أخف تعديلات البوتات من قائمة المراقبة", "tog-watchlisthideminor": "أخف التعديلات الطفيفة في قائمة المراقبة", "tog-watchlisthideliu": "أخف تعديلات المستخدمين المسجلين في قائمة المراقبة", + "tog-watchlistreloadautomatically": "أعد تحميل قائمة المراقبة بصفة آلية حينما يتغير مرشح ما (يتطلب جافاسكربت)", "tog-watchlisthideanons": "أخف تعديلات المستخدمين المجهولين في قائمة المراقبة", "tog-watchlisthidepatrolled": " أخف التعديلات المراجعة في قائمة المراقبة", "tog-watchlisthidecategorization": "أخف تصنيف الصفحات", @@ -1197,6 +1198,8 @@ "grant-editpage": "تعديل صفحات موجودة", "grant-editprotected": "تعديل صفحات محمية", "grant-highvolume": "تعديل كبير الحجم", + "grant-protect": "حماية وإزالة حماية الصفحات", + "grant-rollback": "استرجاع التغييرات في الصفحات", "grant-sendemail": "إرسال بريد إلكتروني للمستخدمين الآخرين", "grant-uploadeditmovefile": "رفع وإزاحة ونقل الملفات", "grant-uploadfile": "ارفع ملفات جديدة", @@ -1315,6 +1318,7 @@ "recentchangeslinked-to": "أظهر التغييرات للصفحات الموصولة للصفحة المعطاة عوضا عن ذلك", "recentchanges-page-added-to-category": "[[:$1]] أضيفت إلى التصنيف", "recentchanges-page-added-to-category-bundled": "أضيفت [[:$1]] و{{PLURAL:$2|صفحة واحدة|صفحتان|$2 صفحات}} إلى التصنيف", + "recentchanges-page-removed-from-category": "أزيلت [[$1:]] من التصنيف", "recentchanges-page-removed-from-category-bundled": "أزيلت [[:$1]] و{{PLURAL:$2|صفحة واحدة|صفحتان|$2 صفحات}} من التصنيف", "autochange-username": "تغيير آلي لميدياويكي", "upload": "ارفع ملفا", @@ -1729,6 +1733,7 @@ "apisandbox-results": "النتائج", "apisandbox-request-url-label": "مسار الطلب:", "apisandbox-request-time": "وقت الطلب: $1", + "apisandbox-alert-page": "هناك حقول غير صالحة في هذه الصفحة.", "apisandbox-alert-field": "قيمة هذا الحقل غير صالحة.", "booksources": "مصادر كتاب", "booksources-search-legend": "البحث عن مصادر الكتب", @@ -1887,6 +1892,7 @@ "wlshowhidebots": "البوتات", "wlshowhideliu": "المسجلين", "wlshowhideanons": "المجهولين", + "wlshowhidepatr": "التعديلات المراجعة", "wlshowhidemine": "تعديلاتي", "wlshowhidecategorization": "تصنيف الصفحات", "watchlist-options": "خيارات قائمة المراقبة", @@ -2196,6 +2202,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\" ممنوع حالياً", @@ -2427,7 +2434,7 @@ "tooltip-feed-rss": "تلقيم أر إس إس لهذه الصفحة", "tooltip-feed-atom": "تلقيم أتوم لهذه الصفحة", "tooltip-t-contributions": "رؤية قائمة مساهمات هذا المستخدم", - "tooltip-t-emailuser": "أرسل رسالة لهذا المستخدم", + "tooltip-t-emailuser": "أرسل رسالة {{GENDER:$1|لهذا المستخدم|لهذه المستخدمة}}", "tooltip-t-info": "المزيد من المعلومات عن هذه الصفحة", "tooltip-t-upload": "ارفع ملفات", "tooltip-t-specialpages": "قائمة بكل الصفحات الخاصة", @@ -2570,6 +2577,7 @@ "svg-long-error": "ملف SVG غير صالح: $1", "show-big-image": "الملف الأصلي", "show-big-image-preview": "حجم هذه المعاينة: $1.", + "show-big-image-preview-differ": "حجم معاينة $3 لذلك الملف ذي الامتداد $2: $1.", "show-big-image-other": "{{PLURAL:$2||البعد الآخر|البعدان الآخران|الأبعاد الأخرى}}: $1.", "show-big-image-size": "$1 × $2 بكسل", "file-info-gif-looped": "ملفوف", @@ -3508,6 +3516,7 @@ "expand_templates_generate_xml": "اعرض شجرة XML parse", "expand_templates_generate_rawhtml": "أظهر خام HTML", "expand_templates_preview": "عرض مسبق", + "expand_templates_input_missing": "يجب تقديم بعض المدخلات النصية على الأقل.", "pagelanguage": "تغيير لغة الصفحة", "pagelang-name": "صفحة", "pagelang-language": "اللغة", diff --git a/languages/i18n/ba.json b/languages/i18n/ba.json index 637418ea5c..d54096a03e 100644 --- a/languages/i18n/ba.json +++ b/languages/i18n/ba.json @@ -264,7 +264,7 @@ "pagetitle": "{{SITENAME}} проектынан", "retrievedfrom": "Сығанағы — «$1»", "youhavenewmessages": "Яңы $1 бар ($2).", - "youhavenewmessagesfromusers": "{{PLURAL:$4|Һеҙгә}} {{PLURAL:$3|$3 ҡатнашыусыһана}} $1 килде ($2).", + "youhavenewmessagesfromusers": "{{PLURAL:$4|Һеҙгә}} {{PLURAL:$3|$3 ҡатнашыусыһынан}} $1 килде ($2).", "youhavenewmessagesmanyusers": "Һеҙгә күп ҡатнашыусынан $1 бар ($2).", "newmessageslinkplural": "{{PLURAL:$1|1=яңы хәбәр|яңы хәбәр}}", "newmessagesdifflinkplural": "һуңғы {{PLURAL:$1|үҙгәртеү|999=үҙгәртеүҙәр}}", @@ -346,7 +346,7 @@ "badtitle": "Ярамаған исем", "badtitletext": "Биттең һоратылған исеме дөрөҫ түгел, буш йәки телдәр араһы йәки интервики исеме яңылыш күрһәтелгән. Исемдә тыйылған символдар булыуы ла мөмкин.", "title-invalid-empty": "Һоратылған бит башлығы буш йәки исемдәр арауығы була.", - "title-invalid-utf8": "Һеҙ эҙләгән биттә UTF-8 дөрөҫ булмаған символдар теҙмәһе бар.", + "title-invalid-utf8": "Һеҙ эҙләгән биттә дөрөҫ булмаған UTF-8 символдар теҙмәһе бар.", "perfcached": "Был мәғлүмәттәр кэштан алынған, уларҙа һуңғы үҙгәртеүҙәр булмаҫҡа мөмкин. Кэшта иң күбе {{PLURAL:$1|язма}} һаҡлана.", "perfcachedts": "Был мәғлүмәттәр кэштан алынған, ул һуңғы тапҡыр $1 яңыртылды. Кэшта иң күбе {{PLURAL:$4|язма}} һаҡлана", "querypage-no-updates": "Был битте яңыртыу хәҙер тыйылған.\nБында күрһәтелгән мәғлүмәттәр яңыртылмаясаҡ.", @@ -1845,7 +1845,7 @@ "contributions": "{{GENDER:$1|Ҡатнашыусы}} башҡарған эш", "contributions-title": "$1 исемле ҡатнашыусы башҡарған эш", "mycontris": "Башҡарған эштәр", - "anoncontribs": "башҡарған эштәр", + "anoncontribs": "Иғәнәләр", "contribsub2": "{{GENDER:$3|$1}} башҡарған эше ($2)", "nocontribs": "Күрһәтелгән шарттарға яуап биргән үҙгәртеүҙәр табылманы.", "uctop": "(ағымдағы)", diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json index 5f975bf8d8..943a21ddbc 100644 --- a/languages/i18n/be-tarask.json +++ b/languages/i18n/be-tarask.json @@ -645,7 +645,7 @@ "newarticle": "(Новая)", "newarticletext": "Вы прыйшлі па спасылцы на старонку, якая яшчэ не існуе.\nКаб стварыць яе, напішыце тэкст у полі ніжэй (глядзіце [$1 старонку дапамогі] для дадатковай інфармацыі).\nКалі Вы трапілі сюды памылкова, націсьніце '''назад''' у вашым браўзэры.", "anontalkpagetext": "----''Гэта старонка гутарак ананімнага ўдзельніка, які яшчэ не стварыў сабе рахунак альбо не ўжывае яго. Таму мы вымушаныя ўжываць лічбавы IP-адрас дзеля ягонай ідэнтыфікацыі. Адзін IP-адрас можа выкарыстоўвацца некалькімі ўдзельнікамі. Калі Вы — ананімны ўдзельнік і лічыце, што атрымалі не прызначаныя Вам камэнтары, калі ласка, [[Special:UserLogin/signup|стварыце рахунак]] альбо [[Special:UserLogin|увайдзіце ў сыстэму]], каб у будучыні пазьбегнуць магчымай блытаніны зь іншымі ананімнымі ўдзельнікамі.''", - "noarticletext": "Цяпер тэкст на гэтай старонцы адсутнічае.\nВы можаце [[Special:Search/{{PAGENAME}}|пашукаць гэтую назву]] ў іншых старонках, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} пашукаць у адпаведных журналах падзеяў]\nальбо [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} рэдагаваць гэтую старонку].", + "noarticletext": "Цяпер тэкст на гэтай старонцы адсутнічае.\nВы можаце [[Special:Search/{{PAGENAME}}|пашукаць гэтую назву]] сярод іншых старонак, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} пашукаць у адпаведных журналах падзеяў]\nальбо [{{fullurl:{{FULLPAGENAME}}|action=edit}} стварыць гэтую старонку].", "noarticletext-nopermission": "Цяпер на гэтай старонцы тэкст адсутнічае.\nВы можаце [[Special:Search/{{PAGENAME}}|пашукаць назву гэтай старонкі]] на іншых старонках, альбо [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} пашукаць зьвязаныя запісы ў журналах], але ў вас няма дазволу ствараць гэтую старонку.", "missing-revision": "Вэрсія старонкі №$1 з назвай «{{FULLPAGENAME}}» не існуе.\n\nЗвычайна гэта здараецца з-за перахода па састарэлай спасылцы на старонку, якая была выдаленая.\nПадрабязнасьці можна знайсьці ў [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} журнале выдаленьняў].", "userpage-userdoesnotexist": "Рахунак удзельніка «$1» не зарэгістраваны. Калі ласка, удакладніце, ці жадаеце Вы стварыць/рэдагаваць гэтую старонку.", @@ -1173,6 +1173,9 @@ "grant-generic": "Набор правоў «$1»", "grant-group-page-interaction": "Узаемадзеньне з старонкамі", "grant-group-file-interaction": "Узаемадзеяньне з мэдыяфайламі", + "grant-group-watchlist-interaction": "Узаемадзеяньне з вашым сьпісам назіраньня", + "grant-group-email": "Адпраўка лістоў электроннай пошты", + "grant-group-customization": "Налады і перавагі", "grant-createaccount": "Стварыць рахункі", "grant-createeditmovepage": "Ствараць, рэдагаваць і пераносіць старонкі", "grant-delete": "Выдаляць старонкі, вэрсіі і запісы журналу", diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json index f123a25653..11164fba8d 100644 --- a/languages/i18n/bn.json +++ b/languages/i18n/bn.json @@ -523,6 +523,8 @@ "changepassword-success": "আপনার পাসওয়ার্ড সাফলভাবে পরিবর্তীত হয়েছে।", "changepassword-throttled": "আপনি সম্প্রতি পরপর বেশ কয়েকবার প্রবেশের চেষ্টা করেছেন। পুনরায় চেষ্টা করার পূর্বে অনুগ্রহ করে $1 অপেক্ষা করুন।", "botpasswords": "বট পাসওয়ার্ড", + "botpasswords-disabled": "বট পাসওয়ার্ড নিষ্ক্রিয় করা।", + "botpasswords-no-central-id": "বট পাসওয়ার্ড ব্যবহার করার জন্য, আপনাকে একটি কেন্দ্রীভূত অ্যাকাউন্টে প্রবেশ করতে হবে।", "botpasswords-label-appid": "বটের নাম:", "botpasswords-label-create": "তৈরি করো", "botpasswords-label-update": "হালনাগাদ", @@ -641,7 +643,7 @@ "newarticle": "(নতুন)", "newarticletext": "আপনি এমন একটি লিংক অনুসরণ করছেন, যা নেই।\nপাতাটি তৈরি করতে, নিচের বাক্সে তা টাইপ করা শুরু করুন (আরও তথ্য জানতে [$1 সহায়িকা পাতা] দেখুন)।\nআপনি যদি ভুল করে এখানে এসে থাকেন, তাহলে আপনার ব্রাউজারের '''back''' বোতাম ক্লিক করুন।", "anontalkpagetext": "----''এটি একটি বেনামী ব্যবহারকারীর আলাপের পাতা, যিনি এখনও কোন অ্যাকাউন্ট তৈরি করেননি, কিংবা তিনি অ্যাকাউন্টটি ব্যবহার করছেন না।\nআমরা তাই সাংখ্যিক আইপি ঠিকানা ব্যবহার করে তাঁকে শনাক্ত করছি।\nএকাধিক ব্যবহারকারী এরকম একটি আইপি ঠিকানা ব্যবহার করতে পারেন।\nআপনি যদি একজন বেনামী ব্যবহারকারী হয়ে থাকেন এবং যদি অনুভব করেন যে আপনার প্রতি অপ্রাসঙ্গিক মন্তব্য করা হয়েছে, তাহলে অন্যান্য বেনামী ব্যবহারকারীর সাথে ভবিষ্যতে বিভ্রান্তি এড়াতে অনুগ্রহ করে [[Special:UserLogin/signup|একটি অ্যাকাউন্ট তৈরি করুন]] অথবা [[Special:UserLogin|অ্যাকাউন্টে প্রবেশ করুন]]।''", - "noarticletext": "বর্তমানে এই পাতায় কোন লেখা নেই।\nআপনি চাইলে অন্যান্য পাতায় [[Special:Search/{{PAGENAME}}| এই শিরোনামটি অনুসন্ধান করতে পারেন]],\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} এ সম্পর্কিত লগ অনুসন্ধান করতে পারেন], \nকিংবা [{{fullurl:{{FULLPAGENAME}}|action=edit}} এই পাতাটি সম্পাদনা করতে পারেন]।", + "noarticletext": "বর্তমানে এই পাতায় কোন লেখা নেই।\nআপনি চাইলে অন্যান্য পাতায় [[Special:Search/{{PAGENAME}}| এই শিরোনামটি অনুসন্ধান করতে পারেন]],\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} এ সম্পর্কিত লগ অনুসন্ধান করতে পারেন], \nকিংবা [{{fullurl:{{FULLPAGENAME}}|action=edit}} এই পাতাটি তৈরি করতে পারেন]।", "noarticletext-nopermission": "বর্তমানে এই পাতায় কোন লেখা নেই।\nআপনি চাইলে অন্য পাতায় [[Special:Search/{{PAGENAME}}| শিরোনামটি অনুসন্ধান করতে পারেন]], অথবা [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} সম্পর্কিত লগ অনুসন্ধান করতে পারেন], কিন্তু আপনার এই পাতাটি তৈরী করার অনুমতি নেই।", "missing-revision": "\"{{FULLPAGENAME}}\" এর #$1তম সংস্করণটি প্রদর্শন সম্ভব নয়।\n\nসাধারণত মুছে ফেলা হয়েছে এমন পাতার মেয়াদ উত্তীর্ণ ইতিহাস পাতার লিংক ওপেন করার কারণে এটি হতে পারে। \n[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} অপসারণ লগে] বিস্তারিত তথ্য জানা যাবে।", "userpage-userdoesnotexist": "\"$1\" নামের কোন ব্যবহারকারী অ্যাকাউন্ট নিবন্ধিত হয়নি। অনুগ্রহ করে পরীক্ষা করে দেখুন আপনি এই পাতাটি সৃষ্টি/সম্পাদনা করতে চান কি না।", @@ -863,6 +865,7 @@ "mergehistory-fail-bad-timestamp": "সময়তারিখ অবৈধ।", "mergehistory-fail-invalid-source": "উত্স পাতা অবৈধ।", "mergehistory-fail-invalid-dest": "গন্তব্য পাতা অবৈধ।", + "mergehistory-fail-self-merge": "উৎস এবং গন্তব্য পাতা একই।", "mergehistory-fail-toobig": "ইতিহাস থেকে আগের পাতাগুলো একীকরণ সম্ভব নয়, কারণ এর ফলে সর্বোচ্চ $1 টি {{PLURAL:$1|সংস্করণ}} স্থানান্তরের সীমানা অতিক্রম করবে।", "mergehistory-no-source": "$1 বলে কোন উৎস পাতার অস্তিত্ব নেই।", "mergehistory-no-destination": "$1 বলে কোন গন্তব্য পাতার অস্তিত্ব নেই।", @@ -1913,6 +1916,7 @@ "rollback-success": "$1-এর সম্পাদনাগুলি পূর্বাবস্থায় ফিরিয়ে নেওয়া হয়েছে; $2-এর করা শেষ সংস্করণে পাতাটি ফেরত নেওয়া হয়েছে।", "sessionfailure-title": "সেশন পরিত্যক্ত", "sessionfailure": "আপনার প্রবেশ সেশনে একটি সমস্যা হয়েছে বলে মনে হচ্ছে;\nসেশন হাইজ্যাক প্রতিরোধের উপায় হিসেবে এই কাজটি বাতিল করা হয়েছে।\nঅনুগ্রহ ব্রাউজারের \"পিছনে\" বোতাম চাপুন এবং যে পাতা থেকে এসেছিলেন, তা পুনঃলোড করুন এবং আবার চেষ্টা করুন।", + "changecontentmodel-legend": "বিষয়বস্তুর মডেল পরিবর্তন করুন", "changecontentmodel-title-label": "পাতার শিরোনাম", "changecontentmodel-model-label": "পাতার বিষয়বস্তুর প্রতিরূপ", "changecontentmodel-reason-label": "কারণ:", @@ -3028,9 +3032,11 @@ "hijri-calendar-m10": "শাওয়াল", "hijri-calendar-m11": "জ্বিলকদ", "hijri-calendar-m12": "জ্বিলহজ্জ", + "hebrew-calendar-m1": "তিশরেই", "hebrew-calendar-m10": "তামুয", "hebrew-calendar-m11": "আভ", "hebrew-calendar-m12": "এলুল", + "hebrew-calendar-m7-gen": "নিসান", "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|আলাপ]])", "timezone-utc": "ইউটিসি", "timezone-local": "স্থানীয়", @@ -3154,6 +3160,7 @@ "tags-create-submit": "তৈরি করুন", "tags-create-no-name": "আপনাকে একটি ট্যাগের নাম অবশ্যই উল্লেখ করতে হবে।", "tags-create-already-exists": "\"$1\" ট্যাগ ইতিমধ্যেই বিদ্যমান।", + "tags-create-warnings-below": "আপনি কি ট্যাগটি তৈরি করা চালিয়ে যেতে চান?", "tags-delete-title": "ট্যাগ অপসারণ", "tags-delete-reason": "কারণ:", "tags-delete-submit": "অপরিবর্তনীয় এই ট্যাগ অপসারন করো", @@ -3171,6 +3178,9 @@ "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": "কারণ:", diff --git a/languages/i18n/br.json b/languages/i18n/br.json index b3dae32491..c60e2d80fa 100644 --- a/languages/i18n/br.json +++ b/languages/i18n/br.json @@ -231,6 +231,7 @@ "pool-timeout": "Aet eur dreist d'an termen gortoz evit ar stankadenn", "pool-queuefull": "Soulgarget eo ar servijerioù", "pool-errorunknown": "Fazi dianav", + "poolcounter-usage-error": "Fazi implij : $1", "aboutsite": "Diwar-benn {{SITENAME}}", "aboutpage": "Project:Diwar-benn", "copyright": "Danvez a c'haller implijout dindan $1 nemet ha notet e vefe ar c'hontrol.", @@ -324,6 +325,8 @@ "filerenameerror": "Dibosupl da adenvel « $1 » e « $2 ».", "filedeleteerror": "Dibosupl eo diverkañ « $1 ».", "directorycreateerror": "N'eus ket bet gallet krouiñ kavlec'h \"$1\".", + "directoryreadonlyerror": "Kavlec'h «$1» lenn hepken", + "directorynotreadableerror": "Ne c'haller ket lenn ar c'havlec'h « $1 ».", "filenotfound": "N'haller ket kavout ar restr \"$1\".", "unexpected": "Talvoudenn dic'hortoz : \"$1\"=\"$2\".", "formerror": "Fazi: Dibosupl eo kinnig ar furmskrid", @@ -482,9 +485,23 @@ "resetpass_submit": "Cheñch ar ger-tremen ha kevreañ", "changepassword-success": "Cheñchet eo bet ho ker-tremen !", "changepassword-throttled": "Betek re hoc'h heus klasket kevreañ en aner.\nGortozit $1, mar plij, a-raok esaeañ en-dro.", + "botpasswords-label-appid": "Anv ar robot", "botpasswords-label-create": "Krouiñ", + "botpasswords-label-update": "Hizivaat", "botpasswords-label-cancel": "Nullañ", "botpasswords-label-delete": "Dilemel", + "botpasswords-label-resetpassword": "Adderaouekaat ar ger-tremen", + "botpasswords-bad-appid": "N'eo ket reizh anv ar robot « $1 »", + "botpasswords-insert-failed": "C'hwitet eo ouzhpennadenn ar robot « $1 ». Hag ouzhpennet eo bet ?", + "botpasswords-update-failed": "C'hwitet eo bet hizivadur anv ar robot « $1 ». Ha dilamet eo bet ?", + "botpasswords-created-title": "Ger-tremen robotoù krouet", + "botpasswords-created-body": "Krouet mat eo bet ar ger-tremen « $1 ».", + "botpasswords-updated-title": "Ger-tremen robotoù hizivaet", + "botpasswords-updated-body": "Hizivaet mat eo bet ar ger-tremen « $1 ».", + "botpasswords-deleted-title": "Ger-tremen robotoù dilamet", + "botpasswords-deleted-body": "Ar ger-tremen robotoù « $1 » zo bet dilamet.", + "botpasswords-newpassword": "\"$2\" eo ar ger-tremen evit kevreañ gant $1. Enrollit anezhañ, par plij, evit ober dave dezhañ diwezhatoc'h.", + "botpasswords-no-provider": "N'eo ket hegerz BotPasswordsSessionProvider.", "resetpass_forbidden": "N'haller ket cheñch ar gerioù-termen", "resetpass-no-info": "Ret eo deoc'h bezañ kevreet a-benn mont d'ar bajenn-se war-eeun.", "resetpass-submit-loggedin": "Cheñch ger-tremen", @@ -1272,7 +1289,6 @@ "upload-dialog-button-done": "Graet", "upload-dialog-button-save": "Enrollañ", "upload-dialog-button-upload": "Enporzhiañ", - "upload-form-label-select-file": "Diuzañ ur restr", "upload-form-label-infoform-title": "Munudoù", "upload-form-label-infoform-name": "Anv", "upload-form-label-infoform-description": "Deskrivadur", @@ -1561,6 +1577,15 @@ "suppress": "Dindan evezh", "querypage-disabled": "Diweredekaet eo bet ar bajenn dibar-mañ evit aesaat d'ar reizhiad un tammig.", "apihelp-no-such-module": "N'eo ket bet kavet ar vodulenn \"$1\".", + "apisandbox": "Poull-traezh API", + "apisandbox-api-disabled": "Diweredekaet eo API war al lec'hienn-mañ.", + "apisandbox-intro": "Grit gant ar bajenn-mañ evit amprouiñ '''servij Web API MediaWiki'''.\nKit da deuler ur sell war [//www.mediawiki.org/wiki/API:Main_page titouroù an API] evit gouzout hiroc'h war an doare da embreger API. Da skouer :\n[//www.mediawiki.org/wiki/API#A_simple_example gwelet danvez ur bennbajenn]. Dibabit un oberiadenn bennak evit gwelet skouerioù all", + "apisandbox-submit": "Sevel ar goulenn", + "apisandbox-reset": "Riñsañ", + "apisandbox-examples": "Skouer", + "apisandbox-results": "Disoc'h", + "apisandbox-request-url-label": "Goulenn URL :", + "apisandbox-request-time": "Pad ar goulenn: $1", "booksources": "Oberennoù dave", "booksources-search-legend": "Klask en oberennoù dave", "booksources-isbn": "ISBN :", diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json index 6b2b073580..38b8ffc359 100644 --- a/languages/i18n/ce.json +++ b/languages/i18n/ce.json @@ -192,9 +192,9 @@ "protect_change": "хийца", "protectthispage": "Ларъе хӀара агӀо", "unprotect": "Ларъяр хийцар", - "unprotectthispage": "Хийца хӀокху агӀона ларъяр", + "unprotectthispage": "ХӀокху агӀонан ларъяр хийца", "newpage": "Керла агӀонаш", - "talkpage": "Дийцаре йилла хӀара агӀо", + "talkpage": "ХӀара агӀо йийцаре йилла", "talkpagelinktext": "Дийцаре", "specialpage": "Белхан агӀо", "personaltools": "Долахь болу гӀирсаш", @@ -209,9 +209,9 @@ "templatepage": "Хьажа кепа агӀоне", "viewhelppage": "Схьаэца гӀо", "categorypage": "Хьажа категорешан агӀоне", - "viewtalkpage": "Хьажа дийцаре", + "viewtalkpage": "Дийцаре хьажа", "otherlanguages": "Кхечу маттахь дерш", - "redirectedfrom": "(ДӀасахьажийна кху $1)", + "redirectedfrom": "($1 дӀасахьажийна кхузе)", "redirectpagesub": "АгӀо-дӀасахьажорг", "redirectto": "ДӀасахьажор тӀе:", "lastmodifiedat": "ХӀокху агӀон тӀаьххьаралера хийцам: $1, $2.", @@ -371,7 +371,7 @@ "logouttext": "'''Ахьа болх дӀаберзийна.'''\n\nЦхьайолу агӀонаш чохь хьо хьай цӀарца болх беш сана хила тарло ишта ца хилийта керлаякха браузеран кэш.", "cannotlogoutnow-title": "ХӀинца чудаха таро яц", "welcomeuser": "Марша ДогӀийла, $1!", - "welcomecreation-msg": "Хьан декъашхочун дӀаяздар кхоьлина.\nДиц ма делахь {{SITENAME}} сайтан [[Special:Preferences|декъашхочун гӀирс]].", + "welcomecreation-msg": "Хьан хьесапан (учётни) дӀаяздар кхоьллина.\nДиц ма делахь {{SITENAME}} сайтан [[Special:Preferences|декъашхочун гӀирс]] чекхбаккха.", "yourname": "Декъашхочун цӀе:", "userlogin-yourname": "Декъашхочун цӀе", "userlogin-yourname-ph": "Язъе декъашхочун цӀе", @@ -685,7 +685,7 @@ "undo-summary-username-hidden": "Юхадаьккхина декъашхочун нисдарш $1, цунна цӀе дӀахьулйина", "cantcreateaccounttitle": "Декъашхочун дӀаяздар кхолла йиш яц", "viewpagelogs": "Гайта хӀокху агӀонан тептар", - "nohistory": "ХӀокху агӀона хийцамаш бина хила бац.", + "nohistory": "ХӀокху агӀонан хийцамаш ца бина.", "currentrev": "Карара верси", "currentrev-asof": "Карара верси $1", "revisionasof": "Верси $1", @@ -822,7 +822,7 @@ "searchprofile-advanced-tooltip": "Дехарца йолу цӀерийн анашкахь лахар", "search-result-size": "$1 ({{PLURAL:$2|$2 дош|$2 дешнаш}})", "search-result-category-size": "$1 {{PLURAL:$1|юкъаяр}} ($2 {{PLURAL:$2|1=бухара категори|бухара категореш}}, $3 {{PLURAL:$3|1=файл|файлаш}}).", - "search-redirect": "(дlасахьажийна $1)", + "search-redirect": "(дӀасахьажийна $1)", "search-section": "(дакъа $1)", "search-category": "(категори $1)", "search-file-match": "(файлан чулацаме тера хилар)", @@ -1087,7 +1087,7 @@ "action-createpage": "агӀонаш кхолла", "action-createtalk": "дийцаре агӀонаш кхоллар", "action-createaccount": "хӀара декъашхочун дӀаяздар кхоллар", - "action-history": "хӀокху агӀона исторега хьажар", + "action-history": "хӀокху агӀонан исторешка хьажар", "action-minoredit": "жима нисдар сана билгало", "action-move": "хӀокху агӀон цӀе хийца", "action-move-subpages": "хӀокху агӀона цӀе хийцар цуна массо бухара агӀонийн а", @@ -1100,7 +1100,7 @@ "action-writeapi": "нисдеш лелойо API", "action-delete": "дӀаяккха хӀара агӀо", "action-deleterevision": "агӀона хӀара верси дӀаяккхар", - "action-deletedhistory": "хӀокху агӀона дӀаяккхинцу исторега хьажар", + "action-deletedhistory": "хӀокху агӀонан дӀаяьккхинчу исторешка хьажар", "action-browsearchive": "ДӀаяхна агӀонаш лахар", "action-undelete": "хӀара агӀо меттахӀоттор", "action-suppressrevision": "хӀокху къайлаха йолу агӀон версеш хьажар а, меттахӀоттор а", @@ -1653,7 +1653,7 @@ "removedwatchtext": "АгӀо «[[:$1]]» дӀаяьккхина яра хьан [[Special:Watchlist|тергаме могӀанан юкъар]].", "removedwatchtext-short": "«$1» агӀо хьан тергаман магӀам чура дӀаяьккхина.", "watch": "Тидам бе", - "watchthispage": "Тергам бé хӀокху агӀона", + "watchthispage": "ХӀокху агӀонан тидам беш хила", "unwatch": "Тергамах къаста", "unwatchthispage": "ДӀадаккха терго яр", "notanarticle": "Яззам бац", @@ -2114,7 +2114,7 @@ "tooltip-n-help": "ГӀоде меттиг", "tooltip-t-whatlinkshere": "Массо агӀон могӀам, хӀокху агӀонтӀе хьажийна йолу", "tooltip-t-recentchangeslinked": "ТӀаьххьарлера хийцамаш хӀокху агӀонашкахь, хьажийна хӀара агӀо болу", - "tooltip-feed-rss": "ХӀокху агӀона трансляци RSS-рца", + "tooltip-feed-rss": "RSS-ехь йолу хӀокху агӀонан трансляци", "tooltip-feed-atom": "Хьагайтар оцу Atom цани хlокху агlон", "tooltip-t-contributions": "ХӀокху декъашхочо хийцина йолу агӀонийн могӀам", "tooltip-t-emailuser": "ДӀабахьийта хаам оцу декъашхона", diff --git a/languages/i18n/de.json b/languages/i18n/de.json index bfffb5a43f..34af301b37 100644 --- a/languages/i18n/de.json +++ b/languages/i18n/de.json @@ -717,7 +717,7 @@ "newarticle": "(Neu)", "newarticletext": "Du bist einem Link zu einer Seite gefolgt, die nicht vorhanden ist.\nUm diese Seite anzulegen, trage deinen Text in das untenstehende Bearbeitungsfeld ein (weitere Informationen auf der [$1 Hilfeseite]).\nSofern du fälschlicherweise hier bist, klicke auf die Schaltfläche '''Zurück''' deines Browsers.", "anontalkpagetext": "----''Diese Seite dient dazu, einem nicht angemeldeten Benutzer Nachrichten zu hinterlassen. Es wird seine IP-Adresse zur Identifizierung verwendet. IP-Adressen können von mehreren Benutzern gemeinsam verwendet werden. Wenn du mit den Kommentaren auf dieser Seite nichts anfangen kannst, richten sie sich vermutlich an einen früheren Inhaber deiner IP-Adresse und du kannst sie ignorieren. Du kannst dir auch ein [[Special:UserLogin/signup|Benutzerkonto erstellen]] oder dich [[Special:UserLogin|anmelden]], um künftig Verwechslungen mit anderen anonymen Benutzern zu vermeiden.''", - "noarticletext": "Diese Seite enthält momentan noch keinen Text.\nDu kannst sie [{{fullurl:{{FULLPAGENAME}}|action=edit}} bearbeiten],\nihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]]\noder die zugehörigen [{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten].", + "noarticletext": "Diese Seite enthält momentan noch keinen Text.\nDu kannst sie [{{fullurl:{{FULLPAGENAME}}|action=edit}} erstellen],\nihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]]\noder die zugehörigen [{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten].", "noarticletext-nopermission": "Diese Seite enthält momentan noch keinen Text und du bist auch nicht dazu berechtigt, diese Seite zu erstellen.\nDu kannst ihren Titel auf anderen Seiten [[Special:Search/{{PAGENAME}}|suchen]] oder die zugehörigen [{{fullurl:{{#special:Log}}|page={{FULLPAGENAMEE}}}} Logbücher betrachten].", "missing-revision": "Die Version $1 der Seite namens „{{FULLPAGENAME}}“ ist nicht vorhanden.\n\nDieser Fehler wird normalerweise von einem veralteten Link zur Versionsgeschichte einer Seite verursacht, die zwischenzeitlich gelöscht wurde.\nEinzelheiten sind im [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} Lösch-Logbuch] einsehbar.", "userpage-userdoesnotexist": "Das Benutzerkonto „$1“ ist nicht vorhanden. Bitte prüfe, ob du diese Seite wirklich erstellen/bearbeiten willst.", diff --git a/languages/i18n/en.json b/languages/i18n/en.json index eb48dd6e7b..b278df6a28 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -671,7 +671,7 @@ "newarticletextanon": "{{int:newarticletext|$1}}", "talkpagetext": "", "anontalkpagetext": "----\nThis is the discussion page for an anonymous user who has not created an account yet, or who does not use it.\nWe therefore have to use the numerical IP address to identify him/her.\nSuch an IP address can be shared by several users.\nIf you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:UserLogin/signup|create an account]] or [[Special:UserLogin|log in]] to avoid future confusion with other anonymous users.", - "noarticletext": "There is currently no text in this page.\nYou can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} search the related logs],\nor [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].", + "noarticletext": "There is currently no text in this page.\nYou can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} search the related logs],\nor [{{fullurl:{{FULLPAGENAME}}|action=edit}} create this page].", "noarticletext-nopermission": "There is currently no text in this page.\nYou can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages, or [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} search the related logs], but you do not have permission to create this page.", "noarticletextanon": "{{int:noarticletext}}", "missing-revision": "The revision #$1 of the page named \"{{FULLPAGENAME}}\" does not exist.\n\nThis is usually caused by following an outdated history link to a page that has been deleted.\nDetails can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json index d257f96477..91cb089452 100644 --- a/languages/i18n/eo.json +++ b/languages/i18n/eo.json @@ -1214,7 +1214,7 @@ "recentchanges-label-minor": "Ĉi tiu estas eta redakto", "recentchanges-label-bot": "Ĉi tiu redakto estis farita per roboto.", "recentchanges-label-unpatrolled": "Ĉi tiu redakto ne jam estis patrolata.", - "recentchanges-label-plusminus": "La paĝa grandeco ŝanĝiĝis je ĉi tiu nombro de bajtoj", + "recentchanges-label-plusminus": "La paĝa grandeco ŝanĝiĝis je ĉi tiu nombro de bitokoj", "recentchanges-legend-heading": "'''Klarigo:'''", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (vidu ankaÅ­ [[Special:NewPages|liston de novaj paĝoj]])", "recentchanges-submit": "Montri", @@ -1251,7 +1251,7 @@ "number_of_watching_users_pageview": "[$1 {{PLURAL:$1|priatentanta uzanto|priatentantaj uzantoj}}]", "rc_categories": "Nur paĝoj el jenaj kategorioj (disigu per \"|\"):", "rc_categories_any": "Iuj el la elektitaj", - "rc-change-size-new": "$1 {{PLURAL:$1|bajto|bajtoj}} post ŝanĝo", + "rc-change-size-new": "$1 {{PLURAL:$1|bitoko|bitokoj}} post ŝanĝo", "newsectionsummary": "/* $1 */ nova sekcio", "rc-enhanced-expand": "Montri detalojn (per JavaScript)", "rc-enhanced-hide": "Kaŝi detalojn", diff --git a/languages/i18n/es.json b/languages/i18n/es.json index 18f9bc7b36..af5088eea1 100644 --- a/languages/i18n/es.json +++ b/languages/i18n/es.json @@ -135,7 +135,8 @@ "ElGatoSaez", "Joaquin1001", "YoViajo", - "Asierog" + "Asierog", + "Mgpena" ] }, "tog-underline": "Subrayar los enlaces:", @@ -764,7 +765,7 @@ "newarticle": "(Nuevo)", "newarticletext": "Has seguido un enlace a una página que aún no existe.\nPara crear esta página, escribe en el cuadro que aparece a continuación. Para más información, consulta la [$1 página de ayuda].\nSi llegaste aquí por error, vuelve a la página anterior.", "anontalkpagetext": "---- ''Esta es la página de discusión de un usuario anónimo que aún no ha creado una cuenta, o no la usa. Por lo tanto, tenemos que usar su dirección IP para identificarlo. Puede que varios usuarios compartan una misma dirección IP. Si eres un usuario anónimo y crees que se han dirigido a ti con comentarios improcedentes, por favor [[Special:UserLogin/signup|crea una cuenta]] o, si ya la tienes, [[Special:UserLogin|identifícate]] para evitar confusiones futuras con otros usuarios anónimos.''", - "noarticletext": "En este momento no hay texto en esta página.\nPuedes [[Special:Search/{{PAGENAME}}|buscar el título de esta página]] en otras páginas,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} buscar en los registros relacionados],\no [{{fullurl:{{FULLPAGENAME}}|action=edit}} editar esta página].", + "noarticletext": "Actualmente no hay texto en esta página.\nPuedes [[Special:Search/{{PAGENAME}}|buscar este título de página]] en otras páginas, o [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} buscar en los registros relacionados], pero no tienes permiso para crear esta página.", "noarticletext-nopermission": "Actualmente no hay texto en esta página.\nPuedes [[Special:Search/{{PAGENAME}}|buscar este título de página]] en otras páginas, o [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} buscar en los registros relacionados], pero no tienes permiso para crear esta página.", "missing-revision": "La revisión n.º $1 de la página «{{FULLPAGENAME}}» no existe.\n\nEsto suele ocurrir cuando se sigue un enlace de historial obsoleto que apunta a una página ya borrada.\nPuedes encontrar detalles en el [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} registro de borrados].", "userpage-userdoesnotexist": "El usuario «$1» no está registrado. Asegúrate de que realmente quieres crear o editar esta página.", diff --git a/languages/i18n/gom-deva.json b/languages/i18n/gom-deva.json index 832a2c6757..2b2519f4b9 100644 --- a/languages/i18n/gom-deva.json +++ b/languages/i18n/gom-deva.json @@ -456,7 +456,7 @@ "shown-title": "दर एका पानार {{PLURAL:$1|निकाल}} दाखय", "viewprevnext": "पळयात ($1 {{int:pipe-separator}} $2) ($3)", "searchmenu-exists": "ह्या'''विकीचेर \"[[:$1]]\" ह्या नांवाचें पान आसा .''' {{PLURAL:$2|0=|See also the other search results found.}}", - "searchmenu-new": "ह्या विकीचेर \"[[:$1]]\" हें पान रोचात! {{PLURAL:$2|सोदून मेळिल्लें पानय पळेयात.|सोदून मेळिल्ले निकाळय पळेयात.}}", + "searchmenu-new": "ह्या विकीचेर \"[[:$1]]\" हें पान रोचात! {{PLURAL:$2|सोदून मेळिल्लें पानय पळेयात.|सोदून मेळिल्ले निकाळय पळेयात.}}", "searchprofile-articles": "मजकूराचीं पानां", "searchprofile-images": "भोवमाध्यम", "searchprofile-everything": "सगळें", diff --git a/languages/i18n/gom-latn.json b/languages/i18n/gom-latn.json index 4028d1b773..459a7c3bc8 100644 --- a/languages/i18n/gom-latn.json +++ b/languages/i18n/gom-latn.json @@ -119,7 +119,7 @@ "qbmyoptions": "Mhoji panam", "faq": "Porot porot vicharlele prosn", "faqpage": "Project:Porot porot vicharlele prosn", - "actions": "Karvaio", + "actions": "Kornnio", "namespaces": "Nanvthollam", "variants": "Dusre", "navigation-heading": "Dixa-niontron suchi", @@ -460,7 +460,7 @@ "shown-title": "Dor eka panar {{PLURAL:$1|porinam}} dakhoi", "viewprevnext": "($1 {{int:pipe-separator}} $2) ($3) poloi", "searchmenu-exists": "'''Hea Wikicher \"[[:$1]]\" nanvanche pan asa.'''", - "searchmenu-new": "\"[[:$1]]\" hem pan hea vikint roch! {{PLURAL:$2|0=|Tujea sodan mellelem panui polloi.|Tujea sodan mellelem panamui polloi.}}", + "searchmenu-new": "\"[[:$1]]\" hem pan hea vikint roch! {{PLURAL:$2|0=|Tujea sodan mellelem panui polloi.|Tujea sodan mellelem panamui polloi.}}", "searchprofile-articles": "Mozkurachim panam", "searchprofile-images": "Bhovmadhiom", "searchprofile-everything": "Sogllem", diff --git a/languages/i18n/he.json b/languages/i18n/he.json index 08409ca615..dd8c7e3a10 100644 --- a/languages/i18n/he.json +++ b/languages/i18n/he.json @@ -663,8 +663,8 @@ "newarticle": "(חדש)", "newarticletext": "הגעתם לדף שעדיין איננו קיים.\nכדי ליצור את הדף הזה, התחילו להקליד בתיבת הטקסט למטה (ראו את [$1 דף העזרה] למידע נוסף).\nאם הגעתם לכאן בטעות, לחצו על כפתור החזרה (Back) בדפדפן שלכם.", "anontalkpagetext": "----\nזהו דף שיחה של משתמש אנונימי שעדיין לא יצר חשבון במערכת, או שהוא לא משתמש בו.\nלכן עלינו להשתמש בכתובת ה־IP המספרית כדי לזהותו.\nייתכן שכתובת IP זו תהיה משותפת למספר משתמשים.\nאם אתם משתמשים אנונימיים ומרגישים שקיבלתם הודעות בלתי רלוונטיות, אנא [[Special:UserLogin/signup|צרו חשבון]] או [[Special:UserLogin|היכנסו לחשבון]] כדי להימנע מבלבול עתידי עם משתמשים אנונימיים נוספים.", - "noarticletext": "אין כרגע טקסט בדף זה.\nבאפשרותכם [[Special:Search/{{PAGENAME}}|לחפש את כותרת הדף]] בדפים אחרים,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} לחפש ביומנים הרלוונטיים],\nאו [{{fullurl:{{FULLPAGENAME}}|action=edit}} לערוך דף זה].", - "noarticletext-nopermission": "אין כרגע טקסט בדף זה.\nבאפשרותכם [[Special:Search/{{PAGENAME}}|לחפש את כותרת הדף]] בדפים אחרים,\nאו [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} לחפש ביומנים הרלוונטיים],\nאך אינכם מורשים ליצור את הדף.", + "noarticletext": "אין כרגע טקסט בדף הזה.\nבאפשרותכם [[Special:Search/{{PAGENAME}}|לחפש את כותרת הדף]] בדפים אחרים,\n[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} לחפש את הדף ביומנים],\nאו [{{fullurl:{{FULLPAGENAME}}|action=edit}} ליצור את הדף].", + "noarticletext-nopermission": "אין כרגע טקסט בדף הזה.\nבאפשרותכם [[Special:Search/{{PAGENAME}}|לחפש את כותרת הדף]] בדפים אחרים,\nאו [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} לחפש את הדף ביומנים],\nאך אינכם מורשים ליצור את הדף.", "missing-revision": "גרסה #$1 של הדף \"{{FULLPAGENAME}}\" אינה קיימת.\n\nזה נגרם בדרך כלל על־ידי לחיצה על קישור ישן לגרסה קודמת של דף שנמחק.\nאפשר למצוא פרטים ב[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} יומן המחיקות].", "userpage-userdoesnotexist": "חשבון המשתמש \"$1\" אינו רשום.\nאנא בדקו אם ברצונכם ליצור/לערוך דף זה.", "userpage-userdoesnotexist-view": "חשבון המשתמש \"$1\" אינו רשום.", diff --git a/languages/i18n/hy.json b/languages/i18n/hy.json index 8f7179d684..e4fc05fa30 100644 --- a/languages/i18n/hy.json +++ b/languages/i18n/hy.json @@ -194,7 +194,7 @@ "permalink": "Մշտական հղում", "print": "Տպել", "view": "Ô´Õ«Õ¿Õ¥Õ¬", - "view-foreign": "Նայել $1-ում", + "view-foreign": "Նայել $1ում", "edit": "Խմբագրել", "edit-local": "Խմբագրել Õ¿Õ¥Õ²Õ¡ÕµÕ«Õ¶ նկարագրությունը", "create": "Ստեղծել", @@ -1081,6 +1081,7 @@ "filepage-nofile-link": "Ô±ÕµÕ½ անունով նիշք գոյություն չունի, դուք կարող եք [$1 Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡ÕµÕ¶]:", "uploadnewversion-linktext": "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ նիշքի նոր տարբերակ", "shared-repo-from": "$1-ից", + "shared-repo": "ընդհանուր շտեմարան", "shared-repo-name-wikimediacommons": "Վիքիպահեստ", "upload-disallowed-here": "Դուք չեք կարող վերագրել Õ¡ÕµÕ½ նիշքը։", "filerevert": "Հետ շրջել $1-Õ¨", diff --git a/languages/i18n/inh.json b/languages/i18n/inh.json index 35b8d40c8e..335c726744 100644 --- a/languages/i18n/inh.json +++ b/languages/i18n/inh.json @@ -8,13 +8,16 @@ "Tagir", "Умар", "아라", - "Shirayuki" + "Shirayuki", + "ElizaMag", + "Adam-Yourist" ] }, "tog-underline": "Хьожадерга |ок|алтакадар:", "tog-hideminor": "Хьат|аяздара чу кердача хувцамашa з|амига дола хувцамаш къайладаккха", "tog-hidepatrolled": "Хьат|аяздара чу кердача хувцамашa д|анийсадаь дола хувцамаш къайладаккха", "tog-newpageshidepatrolled": "Хьат|аяздара чу кердача хувцамашa хьанийсадаь дола оаг|онаш къайлаяккха", + "tog-hidecategorization": "Къайлаяккха оагӀонай категореш", "tog-extendwatchlist": "Шерадаь теркама хьат|аяздар, массадола хувцамаш чулоацаш дола, алхха т|ехьара даьраш мара а доацаш", "tog-usenewrc": "Керда хувцамашка а хьат|аяздара зембаккхарга а эргадаккхараш тоабаде (JavaScript эша)", "tog-numberheadings": "Керташкашта аланза таьрахьа хотта", @@ -43,13 +46,16 @@ "tog-watchlisthideliu": "Теркама xьат|аяздар чура хьабайза доакъошхоша хувцамаш къайладаха", "tog-watchlisthideanons": "Теркама xьат|аяздар чура ц|ийоацача доакъошхоша хувцамаш къайладаха", "tog-watchlisthidepatrolled": "Теркама xьат|аяздар чура д|анийсдаь хувцамаш къайладаха", + "tog-watchlisthidecategorization": "Къайлаяккха оагӀонай категореш", "tog-ccmeonemails": "Аз д|ахийташ дола доакъошхошоа каьхаташ са д-хоамни т|а дайта хьа", "tog-diffonly": "Шин нийсхьале в|ашинийсдара к|ала бола оаг|он чулоацам ма гойта", "tog-showhiddencats": "Къайла катагаш гойта", + "tog-useeditwarning": "Хоамбе хьадаь хувцамаш дӀа ца яздеш аз болх дӀаберзабеча ханахь", "underline-always": "Даиман", "underline-never": "Ц|аккха", "underline-default": "Мазаб|арглокхарa оттамаш хайраде", "editfont-style": "Нийсдара меттига чу йола зарба б|армат:", + "editfont-default": "Браузерен гӀирса чура шрифт", "editfont-monospace": "Башхалон зарба", "sunday": "К|иранди", "monday": "Оршот", @@ -222,6 +228,7 @@ "disclaimers": "Бокъонах юхавалаp", "disclaimerpage": "Project:Бокъонах юхавалаp", "edithelp": "Хувцама куцтохкам", + "helppage-top-gethelp": "Г|о", "mainpage": "Кертера оагӀув", "mainpage-description": "Кертера оагӀув", "policy-url": "Project:Бокъонаш", @@ -270,6 +277,7 @@ "nstab-template": "ЧIабал", "nstab-help": "Куцтохкам", "nstab-category": "Катаг", + "mainpage-nstab": "Кертера оагӀув", "nosuchaction": "Цу тайпара дулархIам бац", "nosuchspecialpage": "Изза мо гӀон оагӀув яц", "error": "ГӀалат", @@ -316,6 +324,8 @@ "mailerror": "Хоам дIабохьийташ гIалат даьннад: $1", "emailconfirmlink": "Доаржален хоамни хьожадорг дIачIоагIаде", "loginlanguagelabel": "Мотт: $1", + "pt-login": "Чувала/яла", + "pt-createaccount": "Дакъалаьцархо кхолла", "changepassword": "КъайладIоaгIа дIахувцар", "oldpassword": "Къаьна къайладIоагӀа:", "newpassword": "Керда къайладIоагӀа:", @@ -400,8 +410,8 @@ "histfirst": "къаьнараш", "histlast": "кердараш", "historyempty": "(даьсса)", - "history-feed-title": "Хувцамий искар", - "history-feed-description": "Укх оагӀуви вики тӀа хувцамий искар", + "history-feed-title": "Хувцамий истори", + "history-feed-description": "Укх оагӀуви вики тӀа хувцамий истори", "history-feed-item-nocomment": "$1гӀара $2гӀачу", "rev-delundel": "хьахьокха/къайлаяьккха", "rev-showdeleted": "хьахьокха", @@ -410,16 +420,16 @@ "revdelete-radio-unset": "Гуш йола", "revdelete-log": "Бахьан", "revdel-restore": "Кустгойтам хувца", - "pagehist": "ОагӀува искар", - "deletedhist": "ДӀадаккхамий искар", + "pagehist": "ОагӀува истори", + "deletedhist": "ДӀадаккхамий истори", "revdelete-reasonotherlist": "Кхыдола бахьан", - "mergehistory-list": "ВIашагIатоха хувцамий искар", + "mergehistory-list": "ВIашагIатоха хувцамий истори", "mergehistory-go": "ВIашагIатоха хувцамаш хьахьокха", "mergehistory-submit": "Хувцамаш вIашагIатоха", "mergehistory-empty": "ВIашагIатохара хувцамаш кораяь яц.", "mergehistory-reason": "Бахьан:", "revertmerge": "Декъа", - "history-title": "\"$1\" — хувцамий искар", + "history-title": "\"$1\" — хувцамий истори", "lineno": "МугI $1:", "compareselectedversions": "Хьаржа доржамаша тарона тIа хьажа", "editundo": "юхавала/яла", @@ -541,7 +551,7 @@ "rcshowhidemine": "$1 сай хувцамаш", "rclinks": "$2 динах
$3 $1 хинна тIехьара хувцамаш хьахьокха", "diff": "кхы.", - "hist": "искар", + "hist": "истори", "hide": "Къайлдаккха", "show": "Хьахьокха", "minoreditletter": "м", @@ -573,7 +583,7 @@ "listfiles_description": "Лоацам", "listfiles_count": "Доржамаш", "file-anchor-link": "Паьл", - "filehist": "Паьла искар", + "filehist": "Паьла истори", "filehist-help": "Хьалхе паьла мишта хиннай хьожаpгволаш/йолаш, дентаьрах/сахьата тIа пIелга тIообе.", "filehist-revert": "юхаяьккха", "filehist-current": "xIанзара", @@ -642,7 +652,7 @@ "watching": "Тохкам беча оагIув тIа тIадаккха", "unwatching": "Тохкам беча оагIув тIера дIадаккха", "deletepage": "ОагIув дIаяьккха", - "confirmdeletetext": "Оаш оагIувни (е сурти) барча дIадаккхар хьайийхай кха еррига хувцамий искар долама ковчера. \nДехар да, жоп дала, шоай из бокъонцахь де безам болаш да, шоай даьчоахь хургдолчоахь кхеташ долга, [[{{MediaWiki:Policy-url}}]] декъамачу Iоязадаь дола адаташ ца из деш долга.", + "confirmdeletetext": "Оаш оагIувни (е сурти) барча дIадаккхар хьайийхай кха еррига хувцамий истори долама ковчера. \nДехар да, жоп дала, шоай из бокъонцахь де безам болаш да, шоай даьчоахь хургдолчоахь кхеташ долга, [[{{MediaWiki:Policy-url}}]] декъамачу Iоязадаь дола адаташ ца из деш долга.", "actioncomplete": "ДулархIам баьб", "actionfailed": "Оттам даьдац", "deletedtext": "\"$1\" дIаяьккха хиннай.\nТIехьара дIадаьккха дагарчена хьожаргволаш/хьожаргьйолаш, $2 хьажа.", @@ -726,7 +736,6 @@ "move-page-legend": "ОагIува цIи хувца", "movepagetext": "КIалхара кепаца болхабеча, оаш оагIувни цIи хувцаргья, цунна хувцамий тептар кхыйола меттиге дIачудоаккхаш.\nКIаьнара цIерахь керда цIерий дIачудаккхам хургда.\nКIаьнара цIера тIа даь дола дIачудаккхамаш, шун ший лоIамахь кердадаккха йийш хургья.\nИз оаш ца дой, дехар да, [[Special:DoubleRedirects|шолха]] кхы [[Special:BrokenRedirects|вIашагIаяккха дIачудаккхамий]] кардоламахь хьажа.\nОаш жоп лу, шоай чуяккха йола Iинкаш, даим болхбеш хургдолга.\n\nЗем бахка, оагIувни цIи хувцалургьяц, изза мо цIи йолаш оагIув хилача. \nЙолаш йола оагIув хувца йийш яц, амма хийца йола оагIув юха хьахувца йийш я. \n\n'''Хоамхайтар'''\n\nЦIи хувцар, йовзаш йола оагIувнаший, доккха а цаьхха а хувцамшка дIатIадала мегаш да.\nДехар да, оаш дIахо болх белаьхь, хургдола хIама кхеташ долга, кхеталаш.", "movepagetalktext": "ТIатеха дувцама оагIув, ший лоIамахь цIи хувлургья, '''ер дага а доацар, доаца:'''\n\n*Изза мо цIи йолаш яьсса дувцама оагIув я е\n*Оаш кIалхахь белгало даьдац.\n\nИз иштта дале, кулги новкъосталца оагIувнаш вIашагIатоха е дIадехьаяккха деза шун.", - "movearticle": "ОагIува цIи хувца", "newtitle": "Керда цIи", "move-watch": "Ер оагIув теркама дагаршкахь чуяккха", "movepagebtn": "ОагIува цIи хувца", @@ -873,6 +882,7 @@ "htmlform-selectorother-other": "Кхыдола", "rightsnone": "(а)", "revdelete-summary": "хувцамий лоацам", + "searchsuggest-search": "Лаха", "special-characters-group-latin": "Лаьтмий", "special-characters-group-greek": "Джелтий", "special-characters-group-cyrillic": "Цырилиций", diff --git a/languages/i18n/is.json b/languages/i18n/is.json index c1b321e921..028cebe23b 100644 --- a/languages/i18n/is.json +++ b/languages/i18n/is.json @@ -1144,6 +1144,7 @@ "action-viewmywatchlist": "skoða vaktlistann þinn", "action-viewmyprivateinfo": "skoða persónuupplýsingar þínar", "action-editmyprivateinfo": "breyta persónuupplýsingum þínum", + "action-managechangetags": "búa til og eyða merkjum úr gagnagrunni", "nchanges": "$1 {{PLURAL:$1|breyting|breytingar}}", "enhancedrc-since-last-visit": "$1 {{PLURAL:$1|síðan síðustu heimsókn}}", "enhancedrc-history": "breytingaskrá", @@ -1227,7 +1228,7 @@ "upload-prohibited": "{{PLURAL:$2|Óheimiluð skrárgerð|Óheimilaðar skrárgerðir}}: $1.", "uploadlogpage": "Innhlaðningarskrá", "uploadlogpagetext": "Fyrir neðan er listi yfir nýlegustu innhlöðnu skrárnar.\nSjá [[Special:NewFiles|myndasafn nýrra mynda]] fyrir myndrænna yfirlit.", - "filename": "Skráarnafn", + "filename": "Skráarheiti", "filedesc": "Lýsing", "fileuploadsummary": "Ágrip:", "filereuploadsummary": "Skráarbreytingar:", @@ -1236,7 +1237,7 @@ "ignorewarning": "Hunsa viðvaranir og vista þessa skrá", "ignorewarnings": "Hunsa allar viðvaranir", "minlength1": "Skráarnöfn þurfa að vera að minnsta kosti einn stafur að lengd", - "illegalfilename": "Skráarnafnið „$1“ inniheldur stafi sem eru ekki leyfðir í síðutitlum.\nGjörðu svo vel og endurnefndu skrána og hladdu henni inn aftur.", + "illegalfilename": "Skráarheitið „$1“ inniheldur stafi sem eru ekki leyfðir í síðutitlum.\nEndurnefndu skrána og reyndu að hlaða henni inn aftur.", "filename-toolong": "Skráarnöfn mega ekki vera lengri en 240 bæt.", "badfilename": "Skáarnafninu hefur verið breytt í „$1“.", "filetype-mime-mismatch": "Skráarendingin \".$1\" samræmist ekki MIME-gerð skrárinnar ($2).", @@ -1247,11 +1248,11 @@ "filetype-missing": "Skráin hefur engan viðauka (dæmi \".jpg\").", "empty-file": "Skráin sem þú valdir var tóm.", "file-too-large": "Skráin sem þú valdir er of stór.", - "filename-tooshort": "Skráarnafnið er of stutt", + "filename-tooshort": "Skráarheitið er of stutt", "filetype-banned": "Þessi skráarending er bönnuð.", "verification-error": "Þessi skrá stóðst ekki sannprófun.", "hookaborted": "Hætt var við breytinguna sem þú reyndir að gera af viðbót.", - "illegal-filename": "Þetta skráarnafn er ekki leyft.", + "illegal-filename": "Þetta skráarheiti er ekki leyft.", "overwrite": "Óheimilt er að skrifa yfir skrá sem er þegar til.", "unknown-error": "Óþekkt villa kom upp.", "tmp-create-error": "Gat ekki búið til bráðabirgðaskrá.", @@ -1264,7 +1265,7 @@ "filepageexists": "Myndasíðan fyrir þessa síðu hefur þegar verið búin til [[:$1]], en engin skrá er til með þessu nafni.\nLýsingin sem þú skrifaðir verður ekki birt á myndasíðunni.\nTil þess að lýsingin geti birst á síðunni, þá þarft þú að breyta síðunni sérstaklega.\n[[$1|thumb]]", "fileexists-extension": "Skrá með svipuðu nafni er til: [[$2|thumb]]\n*Nafn skrárinnar sem hlaða á inn: [[:$1]]\n*Nafn skrárinnar sem er þegar til: [[:$2]]\nVilt þú kannski nota annað nafn sem er meira lýsandi fyrir skrána ?", "fileexists-thumbnail-yes": "Skráin virðist vera smækkuð mynd (smámynd).\n[[$1|thumb]]\nAthugaðu skrána [[:$1]].\nEf sú skrá er sama myndin í upprunalegri stærð er ekki þörf á að hlaða inn annarri smámynd. \\", - "file-thumbnail-no": "Skráin er líklega smámynd, því skráarnafnið byrjar á $1.\nEf skráin er í fullri upplausn haltu þá áfram að hlaða henni inn, en ef ekki breyttu þá skráarnafninu.", + "file-thumbnail-no": "Skráin er líklega smámynd, því skráarheitið byrjar á $1.\nEf skráin er í fullri upplausn haltu þá áfram að hlaða henni inn, en ef ekki breyttu þá skráarnafninu.", "fileexists-forbidden": "Skrá með þessu nafni er þegar til og ekki er hægt að skrifa yfir skránna.\nEf þú villt hlaða inn skránni þinni engu að síður, farðu þá til baka og veldu annað skráarnafn.\n[[File:$1|thumb|center|$1]]", "fileexists-shared-forbidden": "Skrá með þessu nafni er þegar til í sameiginlega myndasafninu.\nEf þú villt hlaða inn skránni þinni engu að síður, farðu þá til baka og veldu annað skráarnafn.\n[[File:$1|thumb|center|$1]]", "file-exists-duplicate": "Þessi skrá er afrit eftirfarandi {{PLURAL:$1|skráar|skráa}}:", @@ -1281,7 +1282,7 @@ "uploadvirus": "Skráin inniheldur veiru! Nánari upplýsingar: $1", "uploadjava": "Þessi skrá er ZIP skrá sem inniheldur Java .class skráarsnið.\nUpphlöðun Java skráa er óheimil, því þær hunsa öryggis hömlur.", "upload-source": "Upprunaleg skrá", - "sourcefilename": "Upprunalegt skráarnafn:", + "sourcefilename": "Upprunalegt skráarheiti:", "sourceurl": "Uppruni:", "destfilename": "Móttökuskráarnafn:", "upload-maxfilesize": "Hámarks skráarstærð: $1", @@ -1474,7 +1475,7 @@ "filedelete-maintenance": "Á meðan viðhaldi stendur er lokað fyrir eyðingu og endurvakningu skráa.", "filedelete-maintenance-title": "Mistókst að eyða skrá", "mimesearch": "MIME-leit", - "mimesearch-summary": "Þessi síða gerir þér kleift að leita eftir skrám eftir MIME-gerð þeirra.\n\nLeitarstrengurinn á að vera á þessu formi: efnistag/myndasnið eða efnistag/*, t.d. image/jpeg.", + "mimesearch-summary": "Þessi síða gerir þér kleift að leita eftir skrám eftir MIME-gerð þeirra.\n\nLeitarstrengurinn á að vera á þessu formi: efnistag/myndasnið eða efnismerki/*, t.d. image/jpeg.", "mimetype": "MIME-tegund:", "download": "Hlaða niður", "unwatchedpages": "Óvaktaðar síður", @@ -1910,7 +1911,7 @@ "undelete-search-prefix": "Sýna síður sem byrja á:", "undelete-search-submit": "Leita", "undelete-no-results": "Engar samsvarandi síður fundust í eyðingarskjalasafninu.", - "undelete-filename-mismatch": "Endurvakningu skráar mistókst með tímastipilinn $1: Skráarnafnið stenst ekki.", + "undelete-filename-mismatch": "Ekki er hægt að endurvekja útgáfu skráar með tímamerkið $1: Skráarheiti samsvara ekki.", "undelete-bad-store-key": "Endurvakningu útgáfu skráar mistókst með tímastipilinn $1: Skráin fannst ekki fyrir eyðingu.", "undelete-cleanup-error": "Villa við eyðingu ónotaðs skjalasafns $1", "undelete-missing-filearchive": "Mistókst að endurvekja skjalasafn með auðkenninu $1 því það er ekki til í gagnabankanum.\nMögulega er þegar búið að endurvekja það.", @@ -2195,7 +2196,9 @@ "import-interwiki-history": "Afrita allar breytingar þessarar síðu", "import-interwiki-templates": "Hafa með öll sniðmát", "import-interwiki-submit": "Flytja inn", - "import-upload-filename": "Skráarnafn:", + "import-mapping-namespace": "Flytja inn í nafnsvið:", + "import-mapping-subpage": "Flytja inn sem undirsíður eftirfarandi síðu:", + "import-upload-filename": "Skráarheiti:", "import-comment": "Athugasemdir:", "importtext": "Flyttu út skrána út af upprunalegu wiki með því að nota [[Special:Export|Flytja út síður]].\nVistaðu skrána á tölvunni þinni og sendu hana svo inn hér.", "importstart": "Flyt inn síður...", @@ -2359,6 +2362,7 @@ "pageinfo-watchers": "Fjöldi notenda, sem vakta síðuna", "pageinfo-few-watchers": "Vöktuð af færri en $1 {{PLURAL:$1|notanda|notendum}}", "pageinfo-redirects-name": "Fjöldi tilvísana til þessarar síðu", + "pageinfo-redirects-value": "$1", "pageinfo-subpages-name": "Undirsíður þessarar síðu", "pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|tilvísun|tilvísanir}}; $3 {{PLURAL:$3|ekki tilvísun|ekki tilvísanir}})", "pageinfo-firstuser": "Stofnandi síðunnar", @@ -2382,11 +2386,13 @@ "pageinfo-protect-cascading-yes": "Já", "pageinfo-protect-cascading-from": "Keðjuvörn stafar frá", "pageinfo-category-info": "Flokkaupplýsingar", + "pageinfo-category-total": "Heildarfjöldi meðlima", "pageinfo-category-pages": "Fjöldi síðna", "pageinfo-category-subcats": "Fjöldi undirflokka", "pageinfo-category-files": "Fjöldi skráa", "markaspatrolleddiff": "Merkja sem yfirfarið", "markaspatrolledtext": "Merkja þessa síðu sem yfirfarna", + "markaspatrolledtext-file": "Merkja þessa útgáfu skrár sem yfirfarna", "markedaspatrolled": "Merkja sem yfirfarið", "markedaspatrolledtext": "Valda breytingin [[:$1]] hefur verið merkt sem yfirfarin.", "rcpatroldisabled": "Slökkt á yfirferð nýlegra breytinga", @@ -2398,7 +2404,8 @@ "markedaspatrollederrornotify": "Mistókst að merkja síðuna sem yfirfarna.", "patrol-log-page": "Yfirferðarskrá", "patrol-log-header": "Þetta er skrá yfir yfirfarnar breytingar.", - "log-show-hide-patrol": "$1 Listi yfir vaktaðar síður", + "log-show-hide-patrol": "$1 listi yfir yfirfarnar síður", + "log-show-hide-tag": "$1 merkjaannáll", "deletedrevision": "Eyddi gamla útgáfu $1", "filedeleteerror-short": "Villa við eyðingu: $1", "filedeleteerror-long": "Það kom upp villa við eyðingu skrárinnar: $1", @@ -2411,6 +2418,7 @@ "mediawarning": "'''AÐVÖRUN''': Þessi skrá kann að hafa meinfýsinn kóða, ef keyrður kann hann að stofna kerfinu þínu í hættu.", "imagemaxsize": "Takmarka myndastærð:
''(fyrir skráarsíður)''", "thumbsize": "Stærð smámynda:", + "widthheight": "$1 × $2", "widthheightpage": "$1 × $2, $3 {{PLURAL:$3|síða|síður}}", "file-info": "stærð skráar: $1, MIME-tegund: $2", "file-info-size": "$1 × $2 mynddílar, skráarstærð: $3, MIME-gerð: $4", @@ -2421,6 +2429,7 @@ "svg-long-error": "Ógild SVG skrá: $1", "show-big-image": "Upphafleg skrá", "show-big-image-preview": "Stærð þessarar forskoðunar: $1", + "show-big-image-preview-differ": "Stærð þessarar $3 forskoðunar á $2 skránni: $1.", "show-big-image-other": "{{PLURAL:$2|Önnur upplausn|Aðrar upplausnir}}: $1.", "show-big-image-size": "$1 × $2 mynddílar", "file-info-gif-looped": "síendurtekin hreyfimynd", @@ -2434,12 +2443,18 @@ "imagelisttext": "Hér fyrir neðan er $1 {{PLURAL:$1|skrá|skrám}} raðað $2.", "newimages-summary": "Þessi kerfissíða sýnir nýlega innhlaðnar skrár.", "newimages-legend": "Sía", - "newimages-label": "Skráarnafn (eða hluti þess):", + "newimages-label": "Skráarheiti (eða hluti þess):", "newimages-showbots": "Birta innsend gögn frá vélmennum", + "newimages-hidepatrolled": "Fela yfirfarnar innsendingar", "noimages": "Ekkert að sjá.", "ilsubmit": "Leita", "bydate": "eftir dagsetningu", "sp-newimages-showfrom": "Leita af nýjum skráum frá $2, $1", + "video-dims": "$1, $2 × $3", + "seconds-abbrev": "$1 sek", + "minutes-abbrev": "$1 mín", + "hours-abbrev": "$1 klst", + "days-abbrev": "$1 d", "seconds": "$1 {{PLURAL:$1|sekúndu|sekúndum}}", "minutes": "$1 {{PLURAL:$1|mínútu|mínútum}}", "hours": "$1 {{PLURAL:$1|klukkutíma|klukkutímum}}", @@ -2597,11 +2612,13 @@ "exif-source": "Uppruni", "exif-editstatus": "Ritstjórnarleg staða myndar", "exif-urgency": "Nauðsyn", - "exif-locationdest": "Staður á myndinni", + "exif-locationdest": "Staður á mynd", + "exif-locationdestcode": "Kóði staðar á mynd", "exif-objectcycle": "Tími dags sem efnið er ætlað fyrir", "exif-contact": "Samskipta upplýsingar", "exif-writer": "Ritari myndlýsingar", "exif-languagecode": "Tungumál", + "exif-iimversion": "IIM útgáfa", "exif-iimcategory": "Flokkur", "exif-iimsupplementalcategory": "Undirflokkar", "exif-datetimeexpires": "Ekki nota eftir", @@ -2623,37 +2640,74 @@ "exif-originaldocumentid": "Einstakt auðkenni upphafslegs skjals", "exif-licenseurl": "Vefslóð höfundarleyfis", "exif-morepermissionsurl": "Aðrar leyfisupplýsingar", - "exif-attributionurl": "Þegar þetta verk er endurnotað, tengdu á", + "exif-attributionurl": "Þegar þetta verk er endurnýtt, tengdu á", + "exif-preferredattributionname": "Þegar þetta verk er endurnýtt, vísaðu í", "exif-pngfilecomment": "PNG athugasemd", "exif-disclaimer": "Fyrirvari", "exif-contentwarning": "Viðvörun innihalds myndar", "exif-giffilecomment": "GIF athugasemd", "exif-intellectualgenre": "Tegund hlutar", + "exif-subjectnewscode": "Kóði efnis í flokkunarkerfi", "exif-scenecode": "IPTC kóði myndefnis", - "exif-event": "Lýsir viðburðinum", - "exif-organisationinimage": "Lýsir félaginu", + "exif-event": "Atburður á mynd", + "exif-organisationinimage": "Stofnun/félag á mynd", + "exif-personinimage": "Persóna á mynd", "exif-originalimageheight": "Hæð myndarinnar fyrir skerðingu", "exif-originalimagewidth": "Breidd myndar fyrir skerðingu", - "exif-compression-1": "Ósamþjappað", + "exif-contact-value": "$1\n\n$2\n
\n$3\n\n$4, $5, $6 $7\n
\n$8", + "exif-subjectnewscode-value": "$2 ($1)", + "exif-compression-1": "Óþjappað", + "exif-compression-2": "CCITT Group 3 1-Dimensional Modified Huffman run length kóðun", + "exif-compression-3": "CCITT Group 3 Fax kóðun", + "exif-compression-4": "CCITT Group 4 Fax kóðun", + "exif-compression-5": "LZW", + "exif-compression-6": "JPEG (eldra)", + "exif-compression-7": "JPEG", + "exif-compression-8": "Afþjappa (Adobe)", + "exif-compression-32773": "PackBits (Macintosh RLE)", + "exif-compression-32946": "Afþjappa (PKZIP)", + "exif-compression-34712": "JPEG2000", "exif-copyrighted-true": "Höfundaréttarvarið", "exif-copyrighted-false": "Höfundaréttarstaða ekki tilgreind", + "exif-photometricinterpretation-0": "Svarthvítt (hvítt er 0)", + "exif-photometricinterpretation-1": "Svarthvítt (svart er 0)", + "exif-photometricinterpretation-2": "RGB", + "exif-photometricinterpretation-3": "Litaspjald", + "exif-photometricinterpretation-4": "Gegnsæismaski", + "exif-photometricinterpretation-5": "Aðskilið (líklegast CMYK)", + "exif-photometricinterpretation-6": "YCbCr", + "exif-photometricinterpretation-8": "CIE L*a*b*", + "exif-photometricinterpretation-9": "CIE L*a*b* (ICC kóðun)", + "exif-photometricinterpretation-10": "CIE L*a*b* (ITU kóðun)", + "exif-photometricinterpretation-32803": "Litsíunarfylki", + "exif-photometricinterpretation-34892": "Línulegt RAW", "exif-unknowndate": "Óþekkt dagsetning", "exif-orientation-1": "Venjuleg", "exif-orientation-2": "Speglað lárétt", - "exif-orientation-3": "Snýr 180°", + "exif-orientation-3": "Snúið 180°", "exif-orientation-4": "Speglað lóðrétt", "exif-orientation-5": "Snúið 90° rangsælis og speglað lóðrétt", - "exif-orientation-6": "Snýr 90° rangsælis", + "exif-orientation-6": "Snúið 90° rangsælis", "exif-orientation-7": "Snúið 90° réttsælis og speglað lóðrétt", - "exif-orientation-8": "Snýr 90° réttsælis", + "exif-orientation-8": "Snúið 90° réttsælis", "exif-planarconfiguration-2": "planar snið", + "exif-xyresolution-i": "$1 pát", + "exif-xyresolution-c": "$1 p/sm", "exif-colorspace-65535": "Ókvarðað", "exif-componentsconfiguration-0": "er ekki til", + "exif-componentsconfiguration-1": "Y", + "exif-componentsconfiguration-2": "Cb", + "exif-componentsconfiguration-3": "Cr", + "exif-componentsconfiguration-4": "R", + "exif-componentsconfiguration-5": "G", + "exif-componentsconfiguration-6": "B", "exif-exposureprogram-0": "Ekki skilgreind", "exif-exposureprogram-1": "Handvirk", "exif-exposureprogram-2": "Hefðbundin stilling", "exif-exposureprogram-3": "Forgangur ljósops", "exif-exposureprogram-4": "Forgangur lokara", + "exif-exposureprogram-5": "Listræn forritun (styður frekar dýpt sjónsviðs)", + "exif-exposureprogram-6": "Sportleg forritun (styður frekar hraða myndatöku)", "exif-exposureprogram-7": "Andlitsmynda stilling (fyrir nærmyndir með bakrunninn í þoku)", "exif-exposureprogram-8": "Landslags stilling (fyrir landslagsmyndir með skarpan bakrunn)", "exif-subjectdistance-value": "$1 metrar", @@ -2668,7 +2722,7 @@ "exif-lightsource-0": "Óþekkt", "exif-lightsource-1": "Dagsbirta", "exif-lightsource-2": "Flúrljós", - "exif-lightsource-3": "Wolfram ljós (hvítglóandi ljós)", + "exif-lightsource-3": "Tungsten ljós (glóðarpera)", "exif-lightsource-4": "Leiftur", "exif-lightsource-9": "Gott veður", "exif-lightsource-10": "Skýjað", @@ -2677,12 +2731,16 @@ "exif-lightsource-13": "Dagur hvít flúrlýsing (N 4600 - 5400K)", "exif-lightsource-14": "Köld hvít flúrlýsing (W 3900 - 4500K)", "exif-lightsource-15": "Hvít flúrlýsing (WW 3200 - 3700K)", - "exif-lightsource-17": "Staðaljós A", - "exif-lightsource-18": "Staðaljós B", - "exif-lightsource-19": "Staðaljós C", + "exif-lightsource-17": "Staðalljós A", + "exif-lightsource-18": "Staðalljós B", + "exif-lightsource-19": "Staðalljós C", + "exif-lightsource-20": "D55", + "exif-lightsource-21": "D65", + "exif-lightsource-22": "D75", + "exif-lightsource-23": "D50", "exif-lightsource-24": "ISO stúdíótungsten", - "exif-lightsource-255": "Önnur ljósuppspretta", - "exif-flash-fired-0": "Leifturljósið var slökkt", + "exif-lightsource-255": "Annar ljósgjafi", + "exif-flash-fired-0": "Leifturljósið hleypti ekki af", "exif-flash-fired-1": "Leifturljósið kviknaði", "exif-flash-mode-1": "skyldubundið leifturljós", "exif-flash-mode-2": "skyldubundin bæling leifturljóss", @@ -2691,15 +2749,17 @@ "exif-flash-redeye-1": "lagfæring rauðra-augna", "exif-focalplaneresolutionunit-2": "tommur", "exif-sensingmethod-1": "Óskilgreint", - "exif-sensingmethod-2": "Einnar-kísilflögu litsviðs skynjari", - "exif-sensingmethod-3": "Tveggja-kísilflögu litsviðs skynjari", - "exif-sensingmethod-4": "Þriggja-kísilflögu litsviðs skynjari", - "exif-sensingmethod-5": "Raðbundinn litsviðs skynjari", + "exif-sensingmethod-2": "Einnar-kísilflögu litsviðsskynjari", + "exif-sensingmethod-3": "Tveggja-kísilflögu litsviðsskynjari", + "exif-sensingmethod-4": "Þriggja-kísilflögu litsviðsskynjari", + "exif-sensingmethod-5": "Raðbundinn litsviðsskynjari", + "exif-sensingmethod-7": "Þrílínulegur skynjari", "exif-filesource-3": "Stafræn ljósmyndavél", "exif-customrendered-0": "Venjuleg vinnsla", "exif-customrendered-1": "Sérstök vinnsla", "exif-exposuremode-0": "Sjálfvirk lýsing", "exif-exposuremode-1": "Handstillt lýsing", + "exif-exposuremode-2": "Sjálfvirk mislýsing (auto bracket)", "exif-whitebalance-0": "Sjálfgefinn ljóshiti", "exif-whitebalance-1": "Handstilltur ljóshiti", "exif-scenecapturetype-0": "Staðlað", @@ -2898,6 +2958,8 @@ "watchlistedit-clear-titles": "Síður:", "watchlistedit-clear-submit": "Hreinsa vaktlistann (þetta er endanlegt!)", "watchlistedit-clear-done": "Vaktlistinn þinn hefur verið hreinsaður.", + "watchlistedit-clear-removed": "$1 {{PLURAL:$1|síða var fjarlægð|síður voru fjarlægðar}}:", + "watchlistedit-too-many": "Það eru of margar síður til að hægt sé að birta þær hér.", "watchlisttools-clear": "Hreinsa vaktlistann", "watchlisttools-view": "Sýna viðeigandi breytingar", "watchlisttools-edit": "Skoða og breyta vaktlistanum", @@ -2915,7 +2977,7 @@ "version-antispam": "Varnir gegn amasendingum", "version-other": "Aðrar", "version-mediahandlers": "Rekill margmiðlunarskráa", - "version-parser-extensiontags": "Tögg í viðauka þáttagreiningar", + "version-parser-extensiontags": "Merki í viðauka þáttunar", "version-hook-subscribedby": "Í áskrift af", "version-version": "($1)", "version-no-ext-name": "[ekkert nafn]", @@ -2946,12 +3008,12 @@ "redirect-user": "Notandanúmer", "redirect-page": "Auðkennisnúmer síðu", "redirect-revision": "Útgáfa síðu", - "redirect-file": "Skráarnafn", + "redirect-file": "Skráarheiti", "redirect-not-exists": "Gildi fannst ekki", "fileduplicatesearch": "Leita að afriti", "fileduplicatesearch-summary": "Leita að afritum sem hafa sama hakk gildi.", "fileduplicatesearch-legend": "Leita að afriti", - "fileduplicatesearch-filename": "Skráarnafn:", + "fileduplicatesearch-filename": "Skráarheiti:", "fileduplicatesearch-submit": "Leita", "fileduplicatesearch-info": "$1 × $2 mynddílar
Skráarstærð: $3
MIME-gerð: $4", "fileduplicatesearch-result-1": "Skráin „$1“ hefur engin nákvæmlega eins afrit.", @@ -2974,13 +3036,13 @@ "blankpage": "Tóm síða", "intentionallyblankpage": "Þessi síða er viljandi höfð tóm.", "external_image_whitelist": "#Ekki breyta þessari línu
\n#Settu brot úr reglulegum segðum (bara þann hluta sem er á milli //) hér fyrir neðan\n#Þær verða bornar saman við vefslóðir ytri mynda\n#Þær sem passa saman verða sýndar sem myndir, en hinar eingöngu sem tengill á myndina\n#Línur sem byrja á # verða sýndar sem athugasemdir\n#Þetta er hástafafrjálst\n\n#Settu allar reglulegar segðir fyrir ofan þessa línu. Ekki breyta þessari línu.
", - "tags": "Breyta virkum tögum", - "tag-filter": "[[Special:Tags|Tagg]]sía:", + "tags": "Breyta virkum merkjum", + "tag-filter": "[[Special:Tags|Merkja]]sía:", "tag-filter-submit": "Sía", - "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tagg|Tögg}}]]: $2)", - "tags-title": "Tög", - "tags-intro": "Þessi síða sýnir tögg, sem hugbúnaðurinn gæti merkt breytingar með, og merkingu þeirra.", - "tags-tag": "Heiti taggs", + "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Merki|Merki}}]]: $2)", + "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", "tags-display-header": "Útlit í breytingaskrám", "tags-description-header": "Tæmandi merkingarlýsing", "tags-source-header": "Frumrit", @@ -2995,26 +3057,33 @@ "tags-activate": "virkja", "tags-deactivate": "óvirkja", "tags-hitcount": "$1 {{PLURAL:$1|breyting|breytingar}}", - "tags-manage-no-permission": "Þú hefur ekki leyfi til að stjórna breytingartöggum.", - "tags-create-heading": "Stofna nýtt tagg", + "tags-manage-no-permission": "Þú hefur ekki leyfi til að stjórna breytingamerkjum.", + "tags-manage-blocked": "Þú hefur ekki leyfi til að breyta merkjum á meðan þú ert bannaður.", + "tags-create-heading": "Búa til nýtt merki", + "tags-create-explanation": "Sjálfgefið eru ný merki tiltæk notendum og vélmennum.", "tags-create-tag-name": "Heiti merkis", "tags-create-reason": "Ástæða:", "tags-create-submit": "Stofna", - "tags-create-no-name": "Þú verður að gefa upp heiti taggsins.", - "tags-create-invalid-title-chars": "Taggheiti mega ekki að innihalda stafi sem ekki má nota í síðutitlum.", - "tags-create-already-exists": "Taggið \"$1\" er nú þegar til.", - "tags-delete-title": "Eyða taggi", + "tags-create-no-name": "Þú verður að gefa upp heiti merkisins.", + "tags-create-invalid-chars": "Heiti merkja mega ekki innihalda kommur (,) eða öfug skástrik (/).", + "tags-create-invalid-title-chars": "Heiti merkja mega ekki innihalda stafi sem ekki má nota í síðutitlum.", + "tags-create-already-exists": "Merkið \"$1\" er nú þegar til.", + "tags-delete-title": "Eyða merki", + "tags-delete-explanation-initial": "Þú ert við það að eyða merkinu \"$1\" úr gagnagrunninum.", "tags-delete-reason": "Ástæða:", - "tags-delete-not-found": "Tagið \"$1\" er ekki til.", - "tags-activate-title": "Virkja tagg", + "tags-delete-submit": "Eyða þessu merki endanlega", + "tags-delete-not-found": "Merkið \"$1\" er ekki til.", + "tags-activate-title": "Virkja merki", + "tags-activate-question": "Þú ert í þann mund að virkja merkið \"$1\".", "tags-activate-reason": "Ástæða:", - "tags-activate-not-found": "Tagið \"$1\" er ekki til.", + "tags-activate-not-allowed": "Það er ekki hægt að virkja merkið \"$1\".", + "tags-activate-not-found": "Merkið \"$1\" er ekki til.", "tags-activate-submit": "Virkja", - "tags-deactivate-title": "Óvirkja tagg", + "tags-deactivate-title": "Gera merki óvirkt", "tags-deactivate-reason": "Ástæða:", "tags-deactivate-submit": "Óvirkja", - "tags-edit-title": "Breyta töggum", - "tags-edit-manage-link": "Stjórna töggum", + "tags-edit-title": "Breyta merkjum", + "tags-edit-manage-link": "Sýsla með merki", "tags-edit-existing-tags": "Fyrirliggjandi merki:", "tags-edit-existing-tags-none": "''Ekkert''", "tags-edit-new-tags": "Ný merki:", @@ -3024,6 +3093,7 @@ "tags-edit-chosen-placeholder": "Veldu einhver merki", "tags-edit-chosen-no-results": "Engin merki fundust sem samsvara", "tags-edit-reason": "Ástæða:", + "tags-edit-none-selected": "Vinsamlega veldu a.m.k. eitt merki til að bæta við eða fjarlægja.", "comparepages": "Bera saman síður", "compare-page1": "Síða 1", "compare-page2": "Síða 2", @@ -3034,7 +3104,7 @@ "compare-title-not-exists": "Umbeðinn titill er ekki til.", "compare-revision-not-exists": "Umbeðin útgáfa er ekki til.", "dberr-problems": "Því miður!Tæknilegir örðugleikar eru á þessari síðu.", - "dberr-again": "Reyndu að bíða í nokkrar mínútur og endurhladdu síðan síðuna.", + "dberr-again": "Reyndu að bíða í nokkrar mínútur og endurhlaða síðan síðuna.", "dberr-info": "(Mistókst að fá aðgang að gagnaþjóni: $1)", "dberr-info-hidden": "(Mistókst að fá aðgang að gagnaþjóni)", "dberr-usegoogle": "Þú getur notað Google til að leita á meðan.", @@ -3101,6 +3171,8 @@ "logentry-rights-autopromote": "$1 fékk sjálfvirkt {{GENDER:$2|aukin}} réttindi frá $4 til $5", "logentry-upload-upload": "$1 {{GENDER:$2|hlóð inn}} $3", "logentry-upload-overwrite": "$1 {{GENDER:$2|hlóð inn}} nýrri útgáfu af $3", + "log-name-managetags": "Breytingaskrá yfir sýsl með merki", + "logentry-managetags-create": "$1 {{GENDER:$2|bjó til}} merkið \"$4\"", "rightsnone": "(engum)", "revdelete-summary": "breytingarágrip", "feedback-adding": "Bæti við svörun á síðuna...", @@ -3133,13 +3205,13 @@ "api-error-fileexists-forbidden": "Skrá með nafninu \"$1\" er þegar til og ekki er hægt að yfirskrifa hana.", "api-error-fileexists-shared-forbidden": "Skrá með nafninu \"$1\" er þegar til á miðlæga gagnaþjóninum og ekki er hægt að yfirskrifa hana.", "api-error-file-too-large": "Skráin sem þú valdir er of stór.", - "api-error-filename-tooshort": "Skráarnafnið er of stutt", + "api-error-filename-tooshort": "Skráarheitið er of stutt", "api-error-filetype-banned": "Þessi gerð skráar er bönnuð.", "api-error-filetype-banned-type": "$1 {{PLURAL:$4|er óleyfileg skráargerð|eru óleyfilegar skráargerðir}}. {{PLURAL:$3|Leyfð skráargerð er|Leyfðar skráargerðir eru}} $2.", "api-error-filetype-missing": "Skráin hefur enga skráarendingu.", "api-error-hookaborted": "Hætt var við breytinguna sem þú reyndir að gera með viðbót.", "api-error-http": "Innri villa: Get ekki tengst vefþjón.", - "api-error-illegal-filename": "Þetta skráarnafn er ekki leyft.", + "api-error-illegal-filename": "Þetta skráarheiti er ekki leyft.", "api-error-internal-error": "Innri villa: Mistókst að vinna úr upphali þínu.", "api-error-invalid-file-key": "Innri villa: Skrá fannst ekki í bráðabirgðageymslu.", "api-error-missingparam": "Innri villa: Breytur vantar í beiðni.", diff --git a/languages/i18n/it.json b/languages/i18n/it.json index 013548e485..4f36b792e6 100644 --- a/languages/i18n/it.json +++ b/languages/i18n/it.json @@ -725,7 +725,7 @@ "newarticle": "(Nuovo)", "newarticletext": "Il collegamento appena seguito corrisponde ad una pagina non ancora esistente.\nSe vuoi creare la pagina ora, basta cominciare a scrivere il testo nella casella qui sotto (vedi la [$1 pagina di aiuto] per maggiori informazioni).\nSe il collegamento è stato aperto per errore, è sufficiente fare clic sul pulsante Indietro del proprio browser.", "anontalkpagetext": "----\n''Questa è la pagina di discussione di un utente anonimo, che non ha ancora creato un'utenza o comunque non la sta usando. Per identificarlo è quindi necessario usare il numero del suo indirizzo IP. Gli indirizzi IP possono però essere condivisi da più utenti. Se sei un utente anonimo e ritieni che i commenti presenti in questa pagina non si riferiscano a te, [[Special:UserLogin/signup|crea una nuova utenza]] o [[Special:UserLogin|entra con quella che già hai]] per evitare di essere confuso con altri utenti anonimi in futuro.''", - "noarticletext": "In questo momento la pagina richiesta è vuota. È possibile [[Special:Search/{{PAGENAME}}|cercare questo titolo]] nelle altre pagine del sito, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} cercare nei registri correlati] oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} modificare la pagina ora].", + "noarticletext": "In questo momento la pagina richiesta è vuota.\nPuoi [[Special:Search/{{PAGENAME}}|cercare questo titolo]] nelle altre pagine del sito, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} cercare nei registri correlati] oppure [{{fullurl:{{FULLPAGENAME}}|action=edit}} creare questa pagina].", "noarticletext-nopermission": "In questo momento la pagina richiesta è vuota. È possibile [[Special:Search/{{PAGENAME}}|cercare questo titolo]] nelle altre pagine del sito o [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} cercare nei registri correlati], ma non hai i permessi per creare questa pagina.", "missing-revision": "La versione #$1 della pagina \"{{FULLPAGENAME}}\" non esiste.\n\nQuesto si verifica solitamente seguendo un collegamento a una pagina cancellata, in una cronologia non aggiornata.\nI dettagli possono essere trovati nel [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} registro delle cancellazioni].", "userpage-userdoesnotexist": "L'account \"$1\" non corrisponde a un utente registrato.\nVerificare che si intenda davvero creare o modificare questa pagina.", @@ -1394,10 +1394,10 @@ "recentchangeslinked-summary": "Questa pagina speciale mostra le modifiche più recenti alle pagine collegate da quella specificata (o contenute nella categoria specificata).\nLe pagine contenute nella propria lista degli [[Special:Watchlist|Osservati speciali]] sono evidenziate in grassetto.", "recentchangeslinked-page": "Nome della pagina:", "recentchangeslinked-to": "Mostra solo le modifiche alle pagine collegate a quella specificata", - "recentchanges-page-added-to-category": "[[:$1]] aggiunto alla categoria", + "recentchanges-page-added-to-category": "[[:$1]] aggiunta alla categoria", "recentchanges-page-added-to-category-bundled": "[[:$1]] e {{PLURAL:$2|una pagina è aggiunta|$2 pagine sono aggiunte}} alla categoria", - "recentchanges-page-removed-from-category": "[[:$1]] rimosso dalla categoria", - "recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|una pagina è rimossa|$2 pagine sono rimosse}} dalla categoria", + "recentchanges-page-removed-from-category": "[[:$1]] rimossa dalla categoria", + "recentchanges-page-removed-from-category-bundled": "[[:$1]] e {{PLURAL:$2|un'altra pagina|altre $2 pagine}} rimosse dalla categoria", "autochange-username": "Modifica automatica MediaWiki", "upload": "Carica un file", "uploadbtn": "Carica", diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json index a85498a1fc..a37bf64adc 100644 --- a/languages/i18n/ko.json +++ b/languages/i18n/ko.json @@ -295,8 +295,8 @@ "policy-url": "Project:정책", "portal": "사용자 모임", "portal-url": "Project:사용자 모임", - "privacy": "개인 정보 정책", - "privacypage": "Project:개인 정보 정책", + "privacy": "개인정보 정책", + "privacypage": "Project:개인정보 정책", "badaccess": "권한 오류", "badaccess-group0": "요청한 명령을 실행할 권한이 없습니다.", "badaccess-groups": "요청한 명령은 {{PLURAL:$2|다음|다음 중 하나의}} 권한을 가진 사용자에게 제한됩니다: $1.", @@ -698,7 +698,7 @@ "previewnote": "'''이 화면은 미리 보기입니다.'''\n편집한 내용은 아직 저장하지 않았습니다!", "continue-editing": "편집 영역으로 가기", "previewconflict": "이 미리 보기는 저장할 때의 모습으로 위쪽 편집창의 문서를 반영합니다.", - "session_fail_preview": "'''세션 데이터가 없어져 편집을 저장하지 못했습니다.'''\n다시 시도하세요.\n다시 시도해도 되지 않으면 [[Special:UserLogout|로그아웃]]한 다음 다시 로그인하세요.", + "session_fail_preview": "세션 데이터가 없어져 편집을 저장하지 못했습니다.\n\n로그아웃 되었는지도 모릅니다. '''아직 로그인 상태인지 확인하고 다시 시도해주세요.'''\n다시 시도해도 되지 않으면 [[Special:UserLogout|로그아웃]]한 다음 다시 로그인하세요. 그리고 브라우저 설정에서 쿠키 사용을 허용하는지 확인하세요.", "session_fail_preview_html": "'''세션 데이터가 없어져 편집을 저장하지 못했습니다.'''\n\n{{SITENAME}}에서 HTML 입력을 허용하기 때문에, 자바스크립트 공격을 막기 위해 미리 보기는 숨겨져 있습니다.\n\n'''적합하게 편집을 시도했다면 다시 시도하세요'''\n다시 시도해도 되지 않으면 [[Special:UserLogout|로그아웃]]한 다음 다시 로그인하세요.", "token_suffix_mismatch": "'''저장하려는 내용의 문장 부호가 망가져 있습니다.'''\n문서 보호를 위해 해당 내용을 저장하지 않습니다.\n버그가 있는 익명 프록시 서비스 등을 사용할 때 이런 문제가 발생할 수 있습니다.", "edit_form_incomplete": "'''편집의 일부 내용이 서버에 전달되지 않았습니다. 편집이 손상되지 않았는지 확인하고 다시 시도해 주십시오.'''", diff --git a/languages/i18n/nap.json b/languages/i18n/nap.json index 1c7ec9d191..9ff50a1171 100644 --- a/languages/i18n/nap.json +++ b/languages/i18n/nap.json @@ -186,10 +186,10 @@ "view-foreign": "Vide ncopp'a $1", "edit": "Càgna", "edit-local": "Càgna descrizione lucale", - "create": "Cria", + "create": "Crèa", "create-local": "Azzecca descrizione lucale", "editthispage": "Càgna chesta paggena", - "create-this-page": "Cria sta paggena", + "create-this-page": "Crèa sta paggena", "delete": "Scancèlla", "deletethispage": "Scancèlla chésta paggena", "undeletethispage": "Arrepiglia chista paggena", @@ -418,14 +418,14 @@ "userlogin-joinproject": "Facite 'o riggistro ncopp'a {{SITENAME}}", "nologin": "Nun tenite ancora n'acciesso? '''$1'''.", "nologinlink": "Crialo mmo", - "createaccount": "Cria nu cunto nuovo", + "createaccount": "Crèa nu cunto nuovo", "gotaccount": "Tiene già nu cunto? '''$1'''.", "gotaccountlink": "Tràse", "userlogin-resetlink": "V'avite scurdato 'e dettaglie d'acciesso vuoste?", "userlogin-resetpassword-link": "Te sì scurdat' 'a password?", "userlogin-helplink2": "Aiuto cu l'accieso", "userlogin-loggedin": "Sì già {{GENDER:$1|connesso comme $1|connessa comme $1|connesso/a comme $1}}.\nUsa 'o modulo ccà abbascio pe trasì com'a n'atu utente.", - "userlogin-createanother": "Cria n'at'account", + "userlogin-createanother": "Crèa n'at'account", "createacct-emailrequired": "Indirizzo email", "createacct-emailoptional": "Indirizzo 'e posta elettronica (ozzionale)", "createacct-email-ph": "Scrivite 'o nderizzo mail vuosto", @@ -435,8 +435,8 @@ "createaccountreason": "Mutivo:", "createacct-reason": "Mutivo", "createacct-reason-ph": "Pecché staje crianno n'at'utenza", - "createacct-submit": "Cria 'a toja utenza", - "createacct-another-submit": "Cria nu cunto", + "createacct-submit": "Crèa 'o cunto utente vuosto", + "createacct-another-submit": "Crèa nu cunto", "createacct-benefit-heading": "{{SITENAME}} è fatta 'e perzone comme te.", "createacct-benefit-body1": "{{PLURAL:$1|càgnamiento|càgnamiente}}", "createacct-benefit-body2": "{{PLURAL:$1|paggena|paggene}}", @@ -494,7 +494,7 @@ "createacct-another-realname-tip": "'O nomme overo vuosto è ozzionale.\nSi sciglite 'e nzertà 'o nomme overo, chesto s'ausarrà pe' dà l'utente l'attribuzione d' 'a fatica fatta.", "pt-login": "Tràse", "pt-login-button": "Tràse", - "pt-createaccount": "Cria nu cunto nuovo", + "pt-createaccount": "Crèa nu cunto nuovo", "pt-userlogout": "Jèsce", "php-mail-error-unknown": "Errore scanusciuto dint'a funzione PHP mail()", "user-mail-no-addy": "Avite cercato 'e mannà na mmasciata e-mail senza indirizzo.", @@ -609,7 +609,7 @@ "summary": "Riepilego:", "subject": "Suggietto:", "minoredit": "Chisto è nu cagnamiénto piccerillo", - "watchthis": "Tiene d'uocchio chesta paggena", + "watchthis": "Tiene d'uocchio sta paggena", "savearticle": "Sarva 'a paggena", "preview": "Anteprimma", "showpreview": "Vire anteprimma", @@ -904,7 +904,7 @@ "shown-title": "Fa vere {{PLURAL:$1|'nu risultato|$1 risultate}} ppe paggena", "viewprevnext": "Vere($1 {{int:pipe-separator}} $2) ($3).", "searchmenu-exists": "'''Ncopp' 'o sito esiste na paggena c' 'o nomme \"[[:$1]]\"'''\n{{PLURAL:$2|0=|Vedite pure dint'a l'ati risultate 'e cerca.}}", - "searchmenu-new": "'''Cria a paggena \"[[:$1]]\" ncopp'â chisto wiki!''' {{PLURAL:$2|0=|Vide anche 'a paggena truovata cu 'a recerca vuosta|Vede anche 'e risultate d\"a recerca}}", + "searchmenu-new": "'''Crèa 'a paggena \"[[:$1]]\" ncopp'a stu wiki!''' {{PLURAL:$2|0=|Vedite pure 'a paggena truvata c' 'a recerca vuosta|Vedite pure 'e risultate d\"a recerca}}", "searchprofile-articles": "Paggene 'e contenute", "searchprofile-images": "Multimedia", "searchprofile-everything": "Tutto", @@ -1403,7 +1403,7 @@ "upload-maxfilesize": "Diminsione massima d' 'o file: $1", "upload-description": "Descrizione d' 'o file", "upload-options": "Opziune 'e carreca", - "watchthisupload": "Tiene d'uocchio chistu file", + "watchthisupload": "Tiene d'uocchio stu file", "filewasdeleted": "Nu file ca se chiamave cumm'a chillo c'avete primma carrecato e pò è stato scancellato.\nVedite 'e cuntrullà 'o $1 apprimma ca cuntinuate c' 'a carreca.", "filename-thumb-name": "Chesto pare nu titolo 'e miniatura. Pe' piacere nun carrecate miniature 'a stessa wiki. 'E n'atu modo, cagnate pe' piacere 'o nomme d' 'o file, facenno chesto cchiù significativo e senza prefisso 'e miniatura.", "filename-bad-prefix": "'O nomme d' 'o file ca state a carrecà accummencia pe' ''\"$1\"''', ca nurmalmente è 'o nomme c'assegnasse na machina fotografeca automatecamente ed è nu nomme nun descrittivo.\nPe' piacere scigliete n'atu nomme ca fosse cchiù descrittivo.", @@ -1909,7 +1909,7 @@ "removedwatchtext": "\"[[:$1]]\" 'e 'a paggena 'e chiacchiera soja so' state scancellata 'a l'elenco [[Special:Watchlist|'e paggene cuntrullate]] vuosto.", "removedwatchtext-short": "Chista paggena \"$1\" è stata luvata a l'elenco 'e paggene cuntrullate.", "watch": "Secuta", - "watchthispage": "Tiene d'uocchio chesta paggena", + "watchthispage": "Tiene d'uocchio sta paggena", "unwatch": "Nun segui", "unwatchthispage": "Nun cuntrullà cchiù sta paggena", "notanarticle": "Chesta paggena nun è na voce", @@ -2053,7 +2053,7 @@ "pagesize": "(byte)", "restriction-edit": "Càgna", "restriction-move": "Mòve", - "restriction-create": "Cria", + "restriction-create": "Crèa", "restriction-upload": "Carreca", "restriction-level-sysop": "prutetta", "restriction-level-autoconfirmed": "semi-prutetta", diff --git a/languages/i18n/oc.json b/languages/i18n/oc.json index 5843d1c222..6218c715b7 100644 --- a/languages/i18n/oc.json +++ b/languages/i18n/oc.json @@ -168,7 +168,7 @@ "actions": "Accions", "namespaces": "Espacis de noms", "variants": "Variantas", - "navigation-heading": "Menut de navigacion", + "navigation-heading": "Menú de navigacion", "errorpagetitle": "Error de títol", "returnto": "Tornar a la pagina $1.", "tagline": "Un article de {{SITENAME}}.", @@ -270,7 +270,7 @@ "viewsourceold": "veire la font", "editlink": "modificar", "viewsourcelink": "veire la font", - "editsectionhint": "Modificar la seccion: $1", + "editsectionhint": "Modificar la seccion : $1", "toc": "Somari", "showtoc": "afichar", "hidetoc": "amagar", @@ -1578,7 +1578,7 @@ "apisandbox-examples": "Exemples", "apisandbox-results": "Resultats", "apisandbox-request-url-label": "Requèsta URL :", - "apisandbox-request-time": "Durada de la demanda: {{PLURAL:$1|$1 ms}}", + "apisandbox-request-time": "Durada de la demanda : {{PLURAL:$1|$1 ms}}", "booksources": "Obratges de referéncia", "booksources-search-legend": "Recercar demest d'obratges de referéncia", "booksources-isbn": "ISBN :", @@ -2046,7 +2046,7 @@ "cant-move-user-page": "Avètz pas la permission de renomenar las paginas principalas d'utilizaires.", "cant-move-to-user-page": "Avètz pas la permission de tornar nomenar una pagina cap a una pagina d'utilizaire (a l'excepcion d'una sospagina).", "cant-move-category-page": "Avètz pas la permission de renomenar las paginas de categorias.", - "newtitle": "Títol novèl:", + "newtitle": "Títol novèl :", "move-watch": "Seguir aquesta pagina", "movepagebtn": "Tornar nomenar l'article", "pagemovedsub": "Cambiament de nom capitat", diff --git a/languages/i18n/pms.json b/languages/i18n/pms.json index a416870e12..63845828ea 100644 --- a/languages/i18n/pms.json +++ b/languages/i18n/pms.json @@ -301,6 +301,7 @@ "nstab-template": "Stamp", "nstab-help": "Agiut", "nstab-category": "Categorìa", + "mainpage-nstab": "Pàgina prinsipal", "nosuchaction": "Operassion nen arconossùa", "nosuchactiontext": "L'operassion che a l'ha ciamà ant l'anliura a l'é nen arconossùa.\nA peul esse che a l'abie batù mal l'adrëssa, o che a sia andàit dapress a n'anliura nen giusta.\nSossì a podrìa ëdcò esse un givo andrinta al programa dovrà da {{SITENAME}}.", "nosuchspecialpage": "A-i é gnun-a pàgina special tan-me cola che chiel a l'ha ciamà.", @@ -1926,6 +1927,7 @@ "contributions": "Contribussion dë st'{{GENDER:$1|utent}}-sì", "contributions-title": "Contribussion ëd $1", "mycontris": "Contribussion", + "anoncontribs": "Contribussion", "contribsub2": "Për {{GENDER:$3|$1}} ($2)", "contributions-userdoesnotexist": "Ël cont utent «$1» a l'é pa argistrà.", "nocontribs": "A l'é pa trovasse gnun-a modìfica che a fussa conforma a costi criteri-sì", diff --git a/languages/i18n/sah.json b/languages/i18n/sah.json index 0998ff3cd7..f7f15f1c76 100644 --- a/languages/i18n/sah.json +++ b/languages/i18n/sah.json @@ -14,7 +14,8 @@ "Krivoshapkina", "Macofe", "Matma Rex", - "Мария Олесова" + "Мария Олесова", + "Ай-Куо" ] }, "tog-underline": "Сигэлэри аннынан тардыы:", @@ -315,6 +316,7 @@ "databaseerror-query": "Ыйытык: $1", "databaseerror-function": "Функция: $1", "databaseerror-error": "Алҕас: $1", + "transaction-duration-limit-exceeded": "\nРепликация оҥорорго улахан лаг мэһэйдээбэтин туһугар транзакция тохтотуллубута, сурутуу уһуна ($1) ($2){{PLURAL:$2|}}лимиты таһынан ааһарын быһыытынан.\nЭн биир олорууга хас да элэмиэни уларытар буоллаххына, ол оннугар элбэх улахана суох операциялары оҥорорго холонон көрүҥ.", "laggedslavemode": "Болҕой: Бу сирэй бүтэһик уларытыылара суох буолуон сөп", "readonly": "Билии олоҕун уларытар бобуллубут", "enterlockreason": "Уларытыыны бобуу төрүөтүн уонна төһө өр бобулларын ый.", @@ -323,6 +325,7 @@ "missingarticle-rev": "(#-с торум: $1)", "missingarticle-diff": "(Уратыта: $1, $2)", "readonly_lag": "Билии олоҕун хос сиэрбэрдэрэ сүрүн сиэрбэри кытта мэнэйдэһэр кэмнэригэр билии олоҕо хатанна", + "nonwrite-api-promise-error": " HTTP-аат 'Promise-Non-Write-API-Action'ыытылынна, ол гынан баран ыйытык суруйуу API-модулугар барбыта.", "internalerror": "Ис алҕас (внутренняя ошибка)", "internalerror_info": "Ис алҕас: $1", "internalerror-fatal-exception": "\"$1\" тииптээх төлөрүйбэт туорааһын", @@ -374,7 +377,7 @@ "mypreferencesprotected": "Бэйэҥ туруорууларгын уларытар кыаҕыҥ суох эбит.", "ns-specialprotected": "{{ns:special}} ааттаах сирэйдэр уларытыллыбаттар.", "titleprotected": "Бу бас тыл оҥоһулларын [[User:$1|$1]] боппут.\nТөрүөтэ - ''$2''", - "filereadonlyerror": "«$1» билэни уларытар сатаммата, тоҕо диэтэххэ «$2» «ааҕарга эрэ» диэн эрэсиимҥэ турар эбит.\n\nБу эрэсиими туруорбут дьаһабыл маннык быһаарыыны хаалларбыт: «''$3''».", + "filereadonlyerror": "«$1» билэни уларытар сатаммата, тоҕо диэтэххэ «$2» «ааҕарга эрэ» диэн эрэсиимҥэ турар эбит.\n\nБу эрэсиими туруорбут систиэмэлээх дьаһабыл маннык быһаарыыны хаалларбыт: «''$3''».", "invalidtitle-knownnamespace": "«$2» аат далыгар маннык тиэкистээх «$3» сатаммат аат", "invalidtitle-unknownnamespace": "Биллибэт аат дала $1 нүөмэрдээх, \"$2\" тиэкистээх сатаммат аат", "exception-nologin": "Ааккын билиһиннэрбэтэххин", @@ -510,6 +513,7 @@ "changepassword-success": "Киирии тылыҥ этэҥҥэ уларыйда!", "changepassword-throttled": "Ааккын аһара элбэхтик билиһиннэрэ сатаатыҥ.\nБука диэн $1 буолан баран өссө киирэн көрөөр.", "botpasswords": "Оруобаттар аһарыктара", + "botpasswords-summary": "Хатыыр тыллара туттааччы учуоттуур сурутуутугар API-нан логины уонна хатыыр тылы туттубакка эрэ киирэр кыах биэрэр. Кыттааччы бота хатыыр тыллаах киириитигэр бырааба хааччахтаныан сөп.\nЭн ити тоҕо наадатын билбэт буоллаххына, бука, итини гымматыҥ ордук.Ким даҕаны эйигиттэн хаһан даҕаны эн оҥорбутуҥ уонна биллэрбитиҥ диэн ыйытыа суохтаах.", "botpasswords-disabled": "Оруобаттар аһарыктара араарыллыбыттар.", "botpasswords-no-central-id": "Оруобат аһарыгын туһанарга кииннэммит ааккынан киириэхтээххин.", "botpasswords-existing": "Билигин баар оруобат аһарыктара", @@ -522,17 +526,23 @@ "botpasswords-label-delete": "Сот", "botpasswords-label-resetpassword": "Аһарыгы саҥаттан", "botpasswords-label-grants": "Туттуллар көҥүллэр:", + "botpasswords-help-grants": " Кыттааччы учуоттуур суруйуутугар баар ыйыллыбыт кыттааччы быраабыгар киирэргэ кыах биэрэр. к. [[Special:ListGrants|көҥүллэр табылыыссаларын]] эбии информацияны ылар туһугар.", "botpasswords-label-restrictions": "Туттарга хааччахтаах:", "botpasswords-label-grants-column": "Көҥүллэннэ", "botpasswords-bad-appid": "Маннык аат «$1» сатаммат.", "botpasswords-insert-failed": "«$1» диэн ааттаах оруобаты эбэр табыллыбата. Баҕар хайыы-үйэ эбиллибитэ буолаарай?", + "botpasswords-update-failed": "\"$1\" диэн ааттаах ботаны кыайан саҥардыбатыбыт. Баҕар, сотторуллубута буолуо?", "botpasswords-created-title": "Оруобат аһарыга оҥоһулунна", "botpasswords-created-body": "«$1» оруобат аһарыга бигэргэтилиннэ.", "botpasswords-updated-title": "Оруобат аһарыга саҥардылынна", "botpasswords-updated-body": "«$1» оруобат аһарыга уларытылынна.", "botpasswords-deleted-title": "Оруобат аһарыга сотулунна", "botpasswords-deleted-body": "«$1» оруобат аһарыга сотулунна.", + "botpasswords-newpassword": "\nСаҥа хатыыр тыл $1 — $2 аннынан киириигэ. суруй аныгыскыга туттарга.", + "botpasswords-no-provider": "BotPasswordsSessionProvider кыаллыбат.", "botpasswords-restriction-failed": "Буот аһарыгын кытта сыһыаннаах хааччахтан киирии сатаммата.", + "botpasswords-invalid-name": "Кыттааччы аатыгар буот аһарыгын араарааччыта суох эбит (\"$1\").", + "botpasswords-not-exist": "«$1» кыттааччыга «$2» диэн ааттаммыт оруобакка аналлаах аһарыга суох эбит.", "resetpass_forbidden": "Киирии тылы уларытар сатаммат", "resetpass-no-info": "Ааккын билиһиннэрдэххинэ эрэ бу сирэйгэ быһа тиийиэххин сөп.", "resetpass-submit-loggedin": "Киирии тылы уларытыы", @@ -654,7 +664,7 @@ "previewnote": "'''Бу барыллаан көрүү эрэ.'''\nАтын уларытыы бигэргэтиллэ илик!", "continue-editing": "Уларытар сиргэ", "previewconflict": "Этот предварительный просмотр отражает текст в верхнем окне редактирования так, как он будет выглядеть, если вы решите записать его.", - "session_fail_preview": "'''Сиэрбэр сессия идентификаторын сүтэрэн кэбиһэн эн уларытыыгын кыайан киллэрбэтэ.\nӨссө холонон көр.\nОлох сатамматаҕына биикиттэн [[Special:UserLogout|тахсан]] баран өссө киирэн көрөөр.'''", + "session_fail_preview": "'''Сиэрбэр сессия идентификаторын сүтэрэн кэбиһэн эн уларытыыгын кыайан киллэрбэтэ.\nБаҕар, үлэ сеансын бүтэрбитиҥ буолуо. Баһаалыста, көҥүлү ааспыккын бил уонна өссө холонон көр.\n\nОлох сатамматаҕына биикиттэн [[Special:UserLogout|тахсан]] баран өссө киирэн көрөөр, ону сэргэ браузерыҥ бу саайтан cookies диэни ыларга көҥүллүүрүн бэрэбиэркэлээҥ.'''", "session_fail_preview_html": "'''Сессия дааннайдарын сүтэрэн кэбиһэн сиэрбэр эн уларытыыгын киллэрбэтэ.'''\n\n''{{SITENAME}} ыраас HTML тылы көҥүллүүр буолан JavaScript туһананнар куһаҕаны оҥоруохтарын сөп, онон эрдэ көрдөрүү араарыллыбыт.''\n\n'''Өскө бу уларытыы туох да куһаҕаны аҕалыа диэбэт буоллаххына хатылаа. Ол сатамматаҕына [[Special:UserLogout|тахсан баран]] өссө киирэн көрөөр.'''", "token_suffix_mismatch": "'''Эн уларытыыҥ киирбэтэ, тоҕо диэтэххэ эн бырагырааммаҥ сорох сурук бэлиэлэрин сыыһа көрөр эбит.\nЫстатыйаны буорту гынымаары уларытыыҥ ылыныллыбата.\nИтинник сыыһалар үксүн прокси-сиэрбэрдэри туһаннахха тахсааччылар.'''", "edit_form_incomplete": "'''Уларытыы сорҕото сиэрбэргэ тиийбэтэ. Үчүгэйдик сыныйан көр, Эн уларытыыларыҥ туох да омсото суохтар дуо. Онтон өссө боруобалаа.'''", @@ -857,6 +867,7 @@ "mergehistory-fail-bad-timestamp": "Кэм бэлиэтэ алҕастаах.", "mergehistory-fail-invalid-source": "Сирэй төрүтэ алҕастаах.", "mergehistory-fail-invalid-dest": "Барыахтаах сирэйиҥ алҕастаах.", + "mergehistory-fail-no-change": "Устуоруйа холбоһуутугар ханнык да биэрсийэ холбоһуута буолбата. Баһаалыста сирэйи уонна быстах кэмнээх кэмнэбили өссө төгүл бэрэбиэркэлээ.", "mergehistory-fail-permission": "Устуоруйаны холбуурга быраап тиийбэт", "mergehistory-fail-self-merge": "Саҕалыыр уонна түмүктүүр сирэйдэриҥ атын буолуохтаахтар", "mergehistory-fail-toobig": "Устуоруйаны холбуур табыллыбата, тоҕо диэтэххэ $1 барылга көҥүллэнэр лимииттэн элбэҕи көһөрөр наада эбит.", @@ -1739,12 +1750,19 @@ "apisandbox-submit": "Ыйытык оҥоруу", "apisandbox-reset": "Сот", "apisandbox-retry": "Хатылаа", + "apisandbox-helpurls": "Көмө сигэлэр", + "apisandbox-examples": "Холобурдар", "apisandbox-dynamic-parameters": "Дьайыы кээмэйдэрэ.", "apisandbox-dynamic-parameters-add-label": "Кэриҥи эбии.", "apisandbox-dynamic-parameters-add-placeholder": "Кэриҥ аата.", + "apisandbox-dynamic-error-exists": "«$1» диэн ааттаах параметр хайыы үйэ баар эбит.", "apisandbox-deprecated-parameters": "Эргэрбит кэриҥнэр.", + "apisandbox-fetch-token": "Токены аптамаатынан толоруу", + "apisandbox-submit-invalid-fields-title": "Сорҕото алҕастаах", "apisandbox-submit-invalid-fields-message": "Бука диэн бэлиэтэммит хонууну көннөр уонна хаттаан ук.", "apisandbox-results": "Түмүк", + "apisandbox-sending-request": "API-көрдөбүлү ыытыы…", + "apisandbox-loading-results": "API-түмүгүн ылыы…", "apisandbox-results-fixtoken": "Токены көннөрөн баран саҥаттан ыыт.", "booksources": "Кинигэлэр источниктара", "booksources-search-legend": "Кинигэ туһунан көрдөө", @@ -3203,6 +3221,7 @@ "tags-deactivate-not-allowed": "\"$1\" тиэги араарар табыллыбат.", "tags-deactivate-submit": "араар", "tags-apply-no-permission": "Бэйэҥ уларытыыгар уларытыы тиэгин туруорар кыаҕыҥ суох эбит.", + "tags-apply-blocked": "Хатана сылдьар кэмҥитигэр көннөрүүлэргитигэр уларытыы бэлиэлэрин туттаргыт табыллыбат.", "tags-apply-not-allowed-one": "«$1» тиэги илииннэн туруорар табыллыбат эбит.", "tags-apply-not-allowed-multi": "Маннык {{PLURAL:$2|тиэк илиинэн угуллубат|тиэктэр илиинэн угуллубаттар}}: $1", "tags-update-no-permission": "Сурунаал тус-туспа торумнарын уонна суруктарын тиэгин эбэр уонна уларытар кыаҕыҥ суох эбит.", diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json index 0878a24493..8f172616ae 100644 --- a/languages/i18n/sl.json +++ b/languages/i18n/sl.json @@ -642,7 +642,7 @@ "newarticle": "(Nov)", "newarticletext": "Sledili ste povezavi na stran, ki še ne obstaja.\nDa bi stran ustvarili, vnesite v spodnji obrazec besedilo\n(za več informacij glej [$1 pomoč]).\nČe ste sem prišli po pomoti, v svojem brskalniku kliknite gumb ''Nazaj''.", "anontalkpagetext": "---- ''To je pogovorna stran brezimnega uporabnika, ki si še ni ustvaril računa ali pa ga ne uporablja. Zaradi tega moramo uporabiti IP-naslov za njegovo/njeno ugotavljanje istovetnosti. Takšen IP-naslov si lahko deli več uporabnikov. Če ste brezimni uporabnik in menite, da so nepomembne pripombe namenjene vam, prosimo [[Special:UserLogin|ustvarite račun]] ali pa se [[Special:UserLogin/signup|vpišite]], da preprečite zmedo z drugimi nepodpisanimi uporabniki.''", - "noarticletext": "Na tej strani ni trenutno nobenega besedila. Naslov strani lahko poskusite [[Special:Search/{{PAGENAME}}|poiskati]] na drugih straneh, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} v dnevniških zapisih] ali pa [{{fullurl:{{FULLPAGENAME}}|action=edit}} stran uredite].", + "noarticletext": "Na tej strani ni trenutno nobenega besedila. Naslov strani lahko poskusite [[Special:Search/{{PAGENAME}}|poiskati]] na drugih straneh, [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} v dnevniških zapisih] ali pa [{{fullurl:{{FULLPAGENAME}}|action=edit}} stran ustvarite].", "noarticletext-nopermission": "Na strani trenutno ni nobenega besedila.\nLahko poskusite [[Special:Search/{{PAGENAME}}|poiskati naslov strani]] na drugih straneh ali [{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} v povezanih dnevniških zapisih], vendar za ustvarjanje strani nimate zadostnih dovoljenj.", "missing-revision": "Redakcija št. $1 strani »{{FULLPAGENAME}}« ne obstaja.\n\nPo navadi se to zgodi, ko sledite zastareli povezavi na zgodovino strani, ki jo je nekdo izbrisal.\nPodrobnosti lahko najdete v [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} dnevniku brisanja].", "userpage-userdoesnotexist": "Uporabniški račun »$1« ni registriran.\nProsimo preverite, ali res želite ustvariti/urediti to stran.", diff --git a/languages/i18n/ta.json b/languages/i18n/ta.json index da74677379..756a436963 100644 --- a/languages/i18n/ta.json +++ b/languages/i18n/ta.json @@ -44,7 +44,8 @@ "Matma Rex", "Anj.balaji", "Dineshkumar Ponnusamy", - "Sharanrajindia" + "Sharanrajindia", + "Maathavan" ] }, "tog-underline": "இணைப்புகளுக்கு அடிக்கோடிடு", @@ -1098,7 +1099,6 @@ "right-blockemail": "பயனர் மின்னஞ்சல் அனுப்புவதை தடுக்கவும்", "right-hideuser": "பயனர்பெயரை தடுத்து, மறைக்கவும்", "right-ipblock-exempt": "ஐ.பி (IP) தடுப்புகளையும், தானியங்கியான தடுப்புகளையும், வரம்புவரையான தடுப்புகளையும் மீறிச் செயல்படுக.", - "right-proxyunbannable": "தானாக தடுப்புகப்பட்ட Proxies ஐ மீறு.", "right-unblockself": "நீங்களே தடுப்பு நீக்குக", "right-protect": "பாதுகாப்பு மட்டங்களை மாற்று மற்றும் தொடர்-பாதுகாக்கப்பட்ட பக்கங்களை திருத்து", "right-editprotected": "\"{{int:protect-level-sysop}}\" ஆல் பாதுகாக்கப்பட்ட பக்கங்களை திருத்து", @@ -1134,6 +1134,7 @@ "right-managechangetags": "தரவுதளத்திலிருந்து [[Special:Tags|அடையாளங்களை]] உருவாக்கு மற்றும் நீக்கு", "right-applychangetags": "ஒருவரின் மாற்றத்துடன் [[Special:Tags|அடையாளங்களை]] செயற்படுத்து", "right-changetags": "தனியொருவரின் திருத்தம் மற்றும் செயற்பாட்டு பதிவுகளில் [[Special:Tags|அடையாளங்களை]] சேர் அல்லது நீக்கு", + "grant-group-administration": "நிர்வாக நடவடிக்கைகளை செயல்படுத்து", "newuserlogpage": "பயனர் உருவாக்கம் பற்றிய குறிப்பு", "newuserlogpagetext": "இது பயனர் படைப்புகளின் பதிவு ஆகும்.", "rightslog": "பயனர் உரிமைகள் பதிகை", @@ -1322,12 +1323,6 @@ "watchthisupload": "இந்த கோப்பினைக் கவனி", "filewasdeleted": "இப்பெயரைக் கொண்ட கோப்பு முன்பு பதிவேற்றப்பட்டு பின்னர் நீக்கப்பட்டது. பதிவேற்றத்துக்குப் முன்னர் $1 ஐச் சரிபார்க்கவும்.", "filename-bad-prefix": "நீங்கள் பதிவேற்ற எத்தனிக்கும் கோப்பின் பெயர் '''\"$1\"''' என்பதுடன் தொடங்குகிறது, பொதுவாக இது எண்மருவி கமெராக்கலால் தானியக்கமாக வழங்கப்புடும் பெயராகும். அருள் கூர்ந்து கோப்பிற்கு விளக்கமான பெயரொன்றைக் கொடுக்கவும்.", - "upload-success-subj": "வெற்றிகரமான பதிவேற்றம்", - "upload-success-msg": "[$2] லிருந்து உங்கள் தகவலேற்றம் நடக்கவில்லை.அது [[:{{ns:file}}:$1]] இங்கு கிடைக்கப்பெறும்.", - "upload-failure-subj": "பதிவேற்றத்தில் ஏற்பட்டத் தொல்லை", - "upload-failure-msg": "[$2] லிருந்து உங்கள் தகவலேற்றத்தில் சிக்கல் உள்ளது.\n$1", - "upload-warning-subj": "பதிவேற்றல் எச்சரிக்கை", - "upload-warning-msg": "$2 லிருந்து உங்கள் தகவலேற்றத்தில் சிக்கல் உள்ளது. அதை சரி செய்ய நீங்கள் இங்கே செல்லலாம் [[Special:Upload/stash/$1|upload form]].", "upload-proto-error": "பிழையான நெறி", "upload-proto-error-text": "தொலைவுப் பதிவேற்றத்துக்கு யு.ஆர்.எல். http:// அல்லது ftp:// என்ற முன்னொட்டுடன் தொடங்கவேண்டும்.", "upload-file-error": "உள்ளகத் தவறு", @@ -1624,6 +1619,13 @@ "querypage-disabled": "செயல்பாட்டு காரணங்களுக்காக இந்த சிறப்புப் பக்கம் முடக்கப்பட்டுள்ளது.", "apihelp": "ஏபிஐ உதவி", "apihelp-no-such-module": "''$1'' என்ற மாடுயூல் காணப்படவில்லை.", + "apisandbox": "API மணற்தொட்டி", + "apisandbox-api-disabled": "இத் தளத்தில் API செயலிழக்கம் செய்யப்பட்டுள்ளது.", + "apisandbox-submit": "கோரிக்கை செய்", + "apisandbox-reset": "வெறுமையாக்கு", + "apisandbox-examples": "உதாரணம்", + "apisandbox-results": "முடிவு", + "apisandbox-request-time": "வேண்டுகோள் நேரம்: $1", "booksources": "நூல் மூலங்கள்", "booksources-search-legend": "நூல் மூலங்களைத் தேடு", "booksources-search": "தேடுக", @@ -1754,7 +1756,6 @@ "wlheader-showupdated": "உங்கள் கடைசி வருகைக்குப் பின்னர் மாற்றங்கள் செய்யப்பட்ட பக்கங்கள் '''தடித்த எழுத்துக்களில்''' காட்டப்பட்டுள்ளன", "wlnote": "பின்வருவன கடைசி {{PLURAL:$2|மணித்தியாலத்தில்|'''$2''' மணித்தியாலங்களில்}} செய்யப்பட்ட {{PLURAL:$1|கடைசி ஒரு மாற்றமாகும்|கடைசி $1 மாற்றங்களாகும்}}.", "wlshowlast": "கடைசி $1 மணித்தியாலங்கள் $2 நாட்களைக் காட்டு", - "watchlistall2": "அனைத்து", "watchlist-options": "கவனிப்பு பட்டியலின் விருப்பத் தேர்வுகள்", "watching": "கவனிக்கப்படுகிறது...", "unwatching": "கவனிப்பு விடப்படுகிறது...", @@ -2257,7 +2258,7 @@ "tooltip-t-recentchangeslinked": "இப்பக்கத்துடன் இணைக்கப்பட்ட பக்கங்களில் மாற்றங்கள்", "tooltip-feed-rss": "இப்பக்கத்துக்கான ஆர்.எஸ்.எஸ். ஓடை கிடையாது", "tooltip-feed-atom": "இப்பக்கத்துக்கான அடொம் ஓடை கிடையாது", - "tooltip-t-contributions": "இப்பயனரின் பங்களிப்புக்களின் பட்டியலைப் பார்", + "tooltip-t-contributions": "{{GENDER:$1|இப்பயனரின்}} பங்களிப்புக்களின் பட்டியலைப் பார்", "tooltip-t-emailuser": "இப் பயனருக்கு மின்னஞ்சல் செய்", "tooltip-t-info": "இப்பக்கத்தைப்பற்றி மேலதிக விபரம்", "tooltip-t-upload": "கோப்புகளைப் பதிவேற்றுக", @@ -3204,5 +3205,6 @@ "special-characters-group-lao": "இலாவோ", "special-characters-group-khmer": "கெமெர்", "special-characters-title-minus": "கழித்தல் குறி", - "api-error-blacklisted": "தயவுகூர்ந்து வேறு, விளக்கமான தலைப்பைத் தேர்ந்தெடுக்கவும்." + "api-error-blacklisted": "தயவுகூர்ந்து வேறு, விளக்கமான தலைப்பைத் தேர்ந்தெடுக்கவும்.", + "randomrootpage": "தற்போக்கு வேர்ப் பக்கம்" } diff --git a/languages/i18n/uk.json b/languages/i18n/uk.json index 858a578dee..2ccb76f095 100644 --- a/languages/i18n/uk.json +++ b/languages/i18n/uk.json @@ -1035,7 +1035,7 @@ "restoreprefs": "Відновити всі стандартні налаштування (у всіх розділах)", "prefs-editing": "Редагування", "rows": "Рядків:", - "columns": "Колонок:", + "columns": "Стовпців:", "searchresultshead": "Пошук", "stub-threshold": "Поріг для визначення оформлення посилань на стаби ($1):", "stub-threshold-sample-link": "зразок", @@ -1181,7 +1181,7 @@ "right-apihighlimits": "розширення обмежень на виконання API-запитів", "right-writeapi": "використання API для запису", "right-delete": "вилучення сторінок", - "right-bigdelete": "Вилучення сторінок з великою історією", + "right-bigdelete": "вилучення сторінок з великою історією", "right-deletelogentry": "вилучення та відновлення окремих записів журналу", "right-deleterevision": "вилучення та відновлення окремих версій сторінок", "right-deletedhistory": "перегляд історії вилучених сторінок без перегляду вилученого тексту", @@ -1348,7 +1348,7 @@ "rcshowhidemine-show": "показати", "rcshowhidemine-hide": "приховати", "rcshowhidecategorization": "$1 категоризацію сторінок", - "rcshowhidecategorization-show": "Показати", + "rcshowhidecategorization-show": "показати", "rcshowhidecategorization-hide": "Приховати", "rclinks": "Показати останні $1 редагувань за $2 днів
$3", "diff": "різн.", @@ -1917,7 +1917,7 @@ "listgrouprights-addgroup-all": "можливість додавати до всіх груп", "listgrouprights-removegroup-all": "можливість виключати з усіх груп", "listgrouprights-addgroup-self": "може додавати {{PLURAL:$2|1=групу|групи}} до свого облікового запису: $1", - "listgrouprights-removegroup-self": "Можливість вилучити зі свого облікового запису {{PLURAL:$2|1=групу|групи}}: $1", + "listgrouprights-removegroup-self": "можливість вилучити зі свого облікового запису {{PLURAL:$2|1=групу|групи}}: $1", "listgrouprights-addgroup-self-all": "Може додавати всі групи до свого облікового запису", "listgrouprights-removegroup-self-all": "може вилучати всі групи зі свого облікового запису", "listgrouprights-namespaceprotection-header": "Обмеження простору назв", diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json index 0b89559c81..6351ac42e7 100644 --- a/languages/i18n/vi.json +++ b/languages/i18n/vi.json @@ -580,8 +580,8 @@ "passwordreset-emailtext-ip": "Ai đó (có thể là bạn, từ địa chỉ IP $1) đã yêu cầu tái tạo mật khẩu của bạn \ntại {{SITENAME}} ($4). {{PLURAL:$3|Tài khoản|Các tài khoản}} dưới đây gắn liền \nvới địa chỉ thư điện tử này:\n\n$2\n\n{{PLURAL:$3|Mật khẩu|Các mật khẩu}} tạm này sẽ hết hạn trong vòng {{PLURAL:$5|một ngày|$5 ngày}}. Bạn nên đăng nhập\nngay bây giờ để chọn mật khẩu mới. Nếu bạn không phải là người yêu cầu\nhoặc đã nhớ lại mật khẩu hiện hành, và bạn không còn\nmuốn thay đổi nó, xin vui lòng bỏ qua thông điệp này và tiếp tục sử dụng\nmật khẩu cũ.", "passwordreset-emailtext-user": "Thành viên $1 tại {{SITENAME}} đã yêu cầu tái tạo mật khẩu tại {{SITENAME}} \n($4). {{PLURAL:$3|Tài khoản|Các tài khoản}} dưới đây gắn liền với địa chỉ thư điện tử này:\n\n$2\n\n{{PLURAL:$3|Mật khẩu|Các mật khẩu}} tạm này sẽ hết hạn trong vòng {{PLURAL:$5|một ngày|$5 ngày}}. Bạn nên đăng nhập\nngay bây giờ để chọn mật khẩu mới. Nếu bạn không phải là người yêu cầu hoặc đã nhớ lại mật khẩu hiện hành, và bạn không còn\nmuốn thay đổi nó, xin vui lòng bỏ qua thông điệp này và tiếp tục sử dụng\nmật khẩu cũ.", "passwordreset-emailelement": "Tên người dùng: \n$1\n\nMật khẩu tạm: \n$2", - "passwordreset-emailsentemail": "Nếu đây là đúng địa chỉ thư điện tử của tài khoản của bạn, một thư điện tử để tái tạo mật khẩu sẽ được gửi cho bạn.", - "passwordreset-emailsentusername": "Nếu một địa chỉ thư điện tử tương ứng đã được đăng ký, chúng tôi sẽ gửi thông tin để đặt lại mật khẩu qua thư điện tử.", + "passwordreset-emailsentemail": "Nếu đây là đúng địa chỉ thư điện tử của tài khoản của bạn, một thư điện tử dùng để tái tạo mật khẩu sẽ được gửi cho bạn.", + "passwordreset-emailsentusername": "Nếu một địa chỉ thư điện tử đã gắn với tên người dùng này thì một thư điện tử để đặt lại mật khẩu sẽ được gửi đến.", "passwordreset-emailsent-capture": "Thư điện tử để tái tạo mật khẩu đã được gửi, nội dung như sau.", "passwordreset-emailerror-capture": "Chúng tôi đã tạo thư tái tạo mật khẩu dưới đây, nhưng không thể gửi đến {{GENDER:$2}}người dùng: $1", "changeemail": "Đổi hoặc gỡ địa chỉ thư điện tử", diff --git a/languages/i18n/wuu.json b/languages/i18n/wuu.json index c8fb4ee03c..733403aaa0 100644 --- a/languages/i18n/wuu.json +++ b/languages/i18n/wuu.json @@ -25,24 +25,24 @@ ] }, "tog-underline": "鏈接下橫線:", - "tog-hideminor": "此垡變化裏囥脫小編", - "tog-hidepatrolled": "此垡變化裏囥脫巡脫編", + "tog-hideminor": "近段辰光个改动里囥脱小编辑", + "tog-hidepatrolled": "近段辰光个改动里囥脱巡查过个编辑", "tog-newpageshidepatrolled": "新頁表裏囥脫巡脫頁", "tog-hidecategorization": "囥脱对页面个分类", - "tog-extendwatchlist": "擴大關注表,顯示全部變化,弗單清此垡個", + "tog-extendwatchlist": "扩展关注表来显示所有改动,弗光是最近个", "tog-usenewrc": "使用折叠版个近段辰光个改动搭关注表", "tog-numberheadings": "標題自動編號", - "tog-showtoolbar": "顯示編傢伙欄", - "tog-editondblclick": "捺兩記編頁", - "tog-editsectiononrightclick": "用右捺標題編段", + "tog-showtoolbar": "显示编辑工具条", + "tog-editondblclick": "双击编辑页面", + "tog-editsectiononrightclick": "右击段落标题编辑段落", "tog-watchcreations": "拿我建个页面搭我传个文件加到我个关注表里去", "tog-watchdefault": "拿我编个页面搭文件加到我个关注表里去", "tog-watchmoves": "畀我移个页搭文件加进我个监控列表里去", "tog-watchdeletion": "畀我刪脫個頁搭文件加進我個關注表裏", "tog-watchrollback": "拿我执行过回退个页面加到我个关注表里去", "tog-minordefault": "默认拿所有编辑标记成细编辑", - "tog-previewontop": "編寫框頭前顯示先望", - "tog-previewonfirst": "頭垡編寫顯示先望", + "tog-previewontop": "来拉编辑框上头显示预览", + "tog-previewonfirst": "头一届编辑辰光显示预览", "tog-enotifwatchlistpages": "我关注表里个页面或文件有改动个辰光发电子邮件畀我", "tog-enotifusertalkpages": "我个讨论页有改动个辰光发邮件畀我", "tog-enotifminoredits": "頁搭文件細編也用電子信通知我", @@ -51,19 +51,19 @@ "tog-oldsig": "本生个签名:", "tog-fancysig": "拿签名当成维基文本(弗自动链接)", "tog-uselivepreview": "使用实时预览", - "tog-forceeditsummary": "編要空白到提醒我", - "tog-watchlisthideown": "關注表裏囥脫我所編", - "tog-watchlisthidebots": "關注表裏囥脫機器人所編", + "tog-forceeditsummary": "朆写编辑摘要个辰光提醒我", + "tog-watchlisthideown": "关注表里囥脱我个编辑", + "tog-watchlisthidebots": "关注表里囥脱机器人个编辑", "tog-watchlisthideminor": "關注表裏囥脫細編", - "tog-watchlisthideliu": "關注表裏囥脫已登用戶所編", - "tog-watchlisthideanons": "關注表裏囥脫隱姓埋名用戶所編", - "tog-watchlisthidepatrolled": "關注表裏囥脫巡脫編", + "tog-watchlisthideliu": "关注表里囥脱登录用户个编辑", + "tog-watchlisthideanons": "关注表里囥脱匿名用户个编辑", + "tog-watchlisthidepatrolled": "关注表里囥脱巡查过个编辑", "tog-watchlisthidecategorization": "囥脱对页面个分类", "tog-ccmeonemails": "拿我发畀其他用户个电子邮件也发只副本畀我自家", "tog-diffonly": "比较两只修订版本两样个辰光弗显示页面内容", "tog-showhiddencats": "顯示囥脫分類", "tog-norollbackdiff": "执行退回之后弗显示两样", - "tog-useeditwarning": "離開編頁朆保存到提醒我", + "tog-useeditwarning": "离开编辑页面朆保存个辰光警告我", "tog-prefershttps": "登录后老世用保险连接", "underline-always": "老世", "underline-never": "老世弗", @@ -585,7 +585,7 @@ "newarticle": "(新)", "newarticletext": "倷跟著链接来着一个还弗勒里个页面。要创建该页面呢,就勒下底个框里向开始写([$1 帮助页面]浪有更加多个信息)。要是倷是弗用心到该𡍲个说话,请点击浏览器个返回揿钮。", "anontalkpagetext": "---- ''箇是一个还弗曾建立账户个匿名用户个讨论页, 箇咾我伲只好用IP地址来搭渠联络。该IP地址可能由几名用户共享。如果侬是一名匿名用户并认为箇只页面高头个评语搭侬弗搭界,请 [[Special:UserLogin/signup|创建新账户]]或[[Special:UserLogin|登录]]来避免垃拉将来搭其他匿名用户混淆。''", - "noarticletext": "箇只页面目前呒没文本。侬可以垃拉其他页面高头[[Special:Search/{{PAGENAME}}|寻该只标题]]、[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 寻相关日志]或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 编辑此页]。", + "noarticletext": "箇只页面目前呒没文本。侬可以垃拉其他页面高头[[Special:Search/{{PAGENAME}}|寻该只标题]]、[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 寻相关日志]或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 建立此页]。", "noarticletext-nopermission": "箇只页面目前呒不文本。侬可以垃拉其他页面高头[[Special:Search/{{PAGENAME}}|寻箇页标题]],或者[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 寻相关日志],但必过侬呒不权限建立箇只页面。", "userpage-userdoesnotexist": "用户账户“$1”弗曾创建。请垃拉创建/编辑迭个页面前头先检查一记。", "userpage-userdoesnotexist-view": "用户账户“$1”弗曾创建。", @@ -923,7 +923,7 @@ "yourlanguage": "界面语言:", "yournick": "新签名:", "badsig": "无效原始签名;检查 HTML 标签。", - "yourgender": "侬希望畀哪亨称呼?", + "yourgender": "侬个性别?", "gender-unknown": "提到侬个辰光,软件会尽量用性别中立个词", "gender-male": "男", "gender-female": "女", @@ -1023,7 +1023,7 @@ "recentchanges-legend": "近段辰光个改动选项", "recentchanges-summary": "登该个页面浪跟踪最近对维基百科个改动。", "recentchanges-feed-description": "跟踪此订阅垃拉 wiki 高头个最近更改。", - "recentchanges-label-newpage": "建新页来编", + "recentchanges-label-newpage": "箇编辑建立着新页面", "recentchanges-label-minor": "箇是小编写", "recentchanges-label-bot": "箇编辑由机器人执行", "recentchanges-label-unpatrolled": "该编辑还朆巡查", @@ -1265,7 +1265,7 @@ "confirm": "确认", "excontentauthor": "内容是:“$1”,唯一贡献者是“[[Special:Contributions/$2|$2]]”([[User talk:$2|讲张]])", "historywarning": "警告:侬要删脱个页面有$1次{{PLURAL:$1|修订}}历史:", - "confirmdeletetext": "侬即将删除一只页面或图像以及其历史。\n请确定侬要进行此项操作,并且了解其后果,同时侬个行为符合[[{{MediaWiki:Policy-url}}|the policy]]。", + "confirmdeletetext": "侬即将删除一只页面搭著伊个所有历史。请确认侬要进行此项操作,并且了解其后果,同时侬个行为符合[[{{MediaWiki:Policy-url}}|政策]]。", "actioncomplete": "操作完成哉", "deletedtext": "“$1”已经畀删除脱哉。最近删除个记录请参见$2。", "dellogpage": "删除记录", diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json index 54bee8931d..60ae906adc 100644 --- a/languages/i18n/zh-hans.json +++ b/languages/i18n/zh-hans.json @@ -721,7 +721,7 @@ "newarticle": "(新页面)", "newarticletext": "您点击了一个尚不存在的页面的链接。要创建该页面,请在下面的编辑框中输入内容(更多信息请见[$1 帮助页面])。如果您是错误地进入了此页面,请点击您的浏览器的返回按钮。", "anontalkpagetext": "----\n这是一个还未建立账户的匿名用户的讨论页, 因此我们只能用IP地址来与他或她联络。该IP地址可能由几名用户共享。如果您是一名匿名用户并认为此页上的评语与您无关,请[[Special:UserLogin/signup|创建新账户]]或[[Special:UserLogin|登录]]以避免在未来与其他匿名用户混淆。", - "noarticletext": "本页面目前没有内容。您可以在其他页面中[[Special:Search/{{PAGENAME}}|搜索本页标题]]、[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 搜索相关日志]或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 编辑本页面]。", + "noarticletext": "本页面目前没有内容。您可以在其他页面中[[Special:Search/{{PAGENAME}}|搜索本页标题]]、[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 搜索相关日志]或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 创建本页面]。", "noarticletext-nopermission": "本页面目前没有内容。您可以在其他页面中[[Special:Search/{{PAGENAME}}|搜索本页标题]]或[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 搜索相关日志],但您没有权限创建本页面。", "missing-revision": "“{{FULLPAGENAME}}”的版本#$1不存在。\n\n这通常是因为进入了一个已被删除的页面的历史链接。\n详细信息可以在[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 删除日志]中找到。", "userpage-userdoesnotexist": "用户账户“$1”没有注册。请在创建/编辑本页前检查。", diff --git a/resources/Resources.php b/resources/Resources.php index 1179a9a78e..f4e5e72bfc 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1480,6 +1480,7 @@ return [ ], 'mediawiki.action.view.redirectPage' => [ 'position' => 'top', + 'targets' => [ 'desktop', 'mobile' ], 'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css', ], 'mediawiki.action.view.rightClickEdit' => [ diff --git a/resources/lib/oojs-ui/i18n/nan.json b/resources/lib/oojs-ui/i18n/nan.json new file mode 100644 index 0000000000..7fdf532cc3 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/nan.json @@ -0,0 +1,17 @@ +{ + "@metadata": { + "authors": [ + "Luuva" + ] + }, + "ooui-dialog-message-accept": "Liáu-kái", + "ooui-dialog-message-reject": "Chhú-siau", + "ooui-dialog-process-error": "Ū mi̍h bô hó-sè", + "ooui-dialog-process-dismiss": "Koaiⁿ tiāu", + "ooui-dialog-process-retry": "Koh chhì khòaⁿ-māi", + "ooui-dialog-process-continue": "Kè-sio̍k", + "ooui-selectfile-button-select": "Soán-tek 1-ê tóng-àn", + "ooui-selectfile-not-supported": "Só͘ soán ê tóng-àn bô siū chi-chhî", + "ooui-selectfile-placeholder": "Iáu-bē soán tóng-àn", + "ooui-selectfile-dragdrop-placeholder": "Kā tóng-àn tàn chia" +} diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 58b0ed0719..a32660a00d 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.15.4 + * OOjs UI v0.16.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-02-17T02:03:23Z + * Date: 2016-02-22T22:33:33Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index 633c5584b3..6d9dbd882b 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.15.4 + * OOjs UI v0.16.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-02-17T02:03:27Z + * Date: 2016-02-22T22:33:37Z */ .oo-ui-element-hidden { display: none !important; @@ -264,6 +264,9 @@ .oo-ui-indicatorElement.oo-ui-indicatorElement-indicator { opacity: 0.8; } +.oo-ui-labelElement .oo-ui-labelElement-label-highlight { + font-weight: bold; +} .oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); } @@ -739,8 +742,11 @@ width: 100%; max-width: 50em; } +.oo-ui-dropdownInputWidget .oo-ui-dropdownWidget, +.oo-ui-dropdownInputWidget select { + display: block; +} .oo-ui-dropdownInputWidget select { - display: inline-block; width: 100%; resize: none; -webkit-box-sizing: border-box; @@ -786,7 +792,7 @@ } .oo-ui-textInputWidget input, .oo-ui-textInputWidget textarea { - display: inline-block; + display: block; width: 100%; resize: none; -webkit-box-sizing: border-box; @@ -980,7 +986,7 @@ } .oo-ui-dropdownWidget-handle { width: 100%; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -1089,6 +1095,3 @@ cursor: default; opacity: 0.2; } -.oo-ui-comboBoxInputWidget > .oo-ui-selectWidget { - margin-top: -3px; -} diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 2062ec69dd..7c9fffd552 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.15.4 + * OOjs UI v0.16.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-02-17T02:03:27Z + * Date: 2016-02-22T22:33:37Z */ .oo-ui-element-hidden { display: none !important; @@ -366,6 +366,9 @@ background-position: center center; background-repeat: no-repeat; } +.oo-ui-labelElement .oo-ui-labelElement-label-highlight { + font-weight: bold; +} .oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/mediawiki/images/textures/pending.gif); } @@ -903,8 +906,11 @@ width: 100%; max-width: 50em; } +.oo-ui-dropdownInputWidget .oo-ui-dropdownWidget, +.oo-ui-dropdownInputWidget select { + display: block; +} .oo-ui-dropdownInputWidget select { - display: inline-block; width: 100%; resize: none; -webkit-box-sizing: border-box; @@ -1023,7 +1029,7 @@ } .oo-ui-textInputWidget input, .oo-ui-textInputWidget textarea { - display: inline-block; + display: block; width: 100%; resize: none; -webkit-box-sizing: border-box; @@ -1247,7 +1253,7 @@ } .oo-ui-dropdownWidget-handle { width: 100%; - display: inline-block; + display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -1324,9 +1330,6 @@ .oo-ui-dropdownWidget.oo-ui-indicatorElement .oo-ui-dropdownWidget-handle .oo-ui-labelElement-label { margin-right: 2em; } -.oo-ui-dropdownWidget .oo-ui-selectWidget { - border-top-color: #ffffff; -} .oo-ui-comboBoxInputWidget { display: inline-block; position: relative; diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index f0b96d5036..67d3c02c6f 100644 --- a/resources/lib/oojs-ui/oojs-ui-core.js +++ b/resources/lib/oojs-ui/oojs-ui-core.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.15.4 + * OOjs UI v0.16.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-02-17T02:03:23Z + * Date: 2016-02-22T22:33:33Z */ ( function ( OO ) { @@ -253,8 +253,10 @@ OO.ui.debounce = function ( func, wait, immediate ) { if ( immediate && !timeout ) { func.apply( context, args ); } - clearTimeout( timeout ); - timeout = setTimeout( later, wait ); + if ( !timeout || wait ) { + clearTimeout( timeout ); + timeout = setTimeout( later, wait ); + } }; }; @@ -264,7 +266,7 @@ OO.ui.debounce = function ( func, wait, immediate ) { * @param {HTMLElement} node * @param {string} eventName * @param {Function} handler - * @deprecated + * @deprecated since 0.15.0 */ OO.ui.addCaptureEventListener = function ( node, eventName, handler ) { node.addEventListener( eventName, handler, true ); @@ -276,7 +278,7 @@ OO.ui.addCaptureEventListener = function ( node, eventName, handler ) { * @param {HTMLElement} node * @param {string} eventName * @param {Function} handler - * @deprecated + * @deprecated since 0.15.0 */ OO.ui.removeCaptureEventListener = function ( node, eventName, handler ) { node.removeEventListener( eventName, handler, true ); @@ -608,13 +610,13 @@ OO.ui.Element.static.unsafeInfuse = function ( idOrNode, domPromise ) { } if ( domPromise ) { // pick up dynamic state, like focus, value of form inputs, scroll position, etc. - state = data.gatherPreInfuseState( $elem ); + state = data.constructor.static.gatherPreInfuseState( $elem, data ); // restore dynamic state after the new element is re-inserted into DOM under infused parent domPromise.done( data.restorePreInfuseState.bind( data, state ) ); infusedChildren = $elem.data( 'ooui-infused-children' ); if ( infusedChildren && infusedChildren.length ) { infusedChildren.forEach( function ( data ) { - var state = data.gatherPreInfuseState( $elem ); + var state = data.constructor.static.gatherPreInfuseState( $elem, data ); domPromise.done( data.restorePreInfuseState.bind( data, state ) ); } ); } @@ -2636,8 +2638,6 @@ OO.ui.mixin.IndicatorElement.prototype.getIndicatorTitle = function () { * as a plaintext string, a jQuery selection of elements, or a function that will produce a string * in the future. See the [OOjs UI documentation on MediaWiki] [2] for examples. * [2]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Icons,_Indicators,_and_Labels#Labels - * @cfg {boolean} [autoFitLabel=true] Fit the label to the width of the parent element. - * The label will be truncated to fit if necessary. */ OO.ui.mixin.LabelElement = function OoUiMixinLabelElement( config ) { // Configuration initialization @@ -2646,7 +2646,6 @@ OO.ui.mixin.LabelElement = function OoUiMixinLabelElement( config ) { // Properties this.$label = null; this.label = null; - this.autoFitLabel = config.autoFitLabel === undefined || !!config.autoFitLabel; // Initialization this.setLabel( config.label || this.constructor.static.label ); @@ -2677,6 +2676,33 @@ OO.initClass( OO.ui.mixin.LabelElement ); */ OO.ui.mixin.LabelElement.static.label = null; +/* Static methods */ + +/** + * Highlight the first occurrence of the query in the given text + * + * @param {string} text Text + * @param {string} query Query to find + * @return {jQuery} Text with the first match of the query + * sub-string wrapped in highlighted span + */ +OO.ui.mixin.LabelElement.static.highlightQuery = function ( text, query ) { + var $result = $( '' ), + offset = text.toLowerCase().indexOf( query.toLowerCase() ); + + if ( !query.length || offset === -1 ) { + return $result.text( text ); + } + $result.append( + document.createTextNode( text.slice( 0, offset ) ), + $( '' ) + .addClass( 'oo-ui-labelElement-label-highlight' ) + .text( text.slice( offset, offset + query.length ) ), + document.createTextNode( text.slice( offset + query.length ) ) + ); + return $result.contents(); +}; + /* Methods */ /** @@ -2722,6 +2748,17 @@ OO.ui.mixin.LabelElement.prototype.setLabel = function ( label ) { return this; }; +/** + * Set the label as plain text with a highlighted query + * + * @param {string} text Text label to set + * @param {string} query Substring of text to highlight + * @chainable + */ +OO.ui.mixin.LabelElement.prototype.setHighlightedQuery = function ( text, query ) { + return this.setLabel( this.constructor.static.highlightQuery( text, query ) ); +}; + /** * Get the label. * @@ -2736,12 +2773,9 @@ OO.ui.mixin.LabelElement.prototype.getLabel = function () { * Fit the label. * * @chainable + * @deprecated since 0.16.0 */ OO.ui.mixin.LabelElement.prototype.fitLabel = function () { - if ( this.$label && this.$label.autoEllipsis && this.autoFitLabel ) { - this.$label.autoEllipsis( { hasSpan: false, tooltip: true } ); - } - return this; }; @@ -5866,7 +5900,6 @@ OO.ui.MenuSelectWidget = function OoUiMenuSelectWidget( config ) { OO.ui.mixin.ClippableElement.call( this, $.extend( {}, config, { $clippable: this.$group } ) ); // Properties - this.newItems = null; this.autoHide = config.autoHide === undefined || !!config.autoHide; this.filterFromInput = !!config.filterFromInput; this.$input = config.$input ? config.$input : config.input ? config.input.$input : null; @@ -6032,26 +6065,9 @@ OO.ui.MenuSelectWidget.prototype.chooseItem = function ( item ) { * @inheritdoc */ OO.ui.MenuSelectWidget.prototype.addItems = function ( items, index ) { - var i, len, item; - // Parent method OO.ui.MenuSelectWidget.parent.prototype.addItems.call( this, items, index ); - // Auto-initialize - if ( !this.newItems ) { - this.newItems = []; - } - - for ( i = 0, len = items.length; i < len; i++ ) { - item = items[ i ]; - if ( this.isVisible() ) { - // Defer fitting label until item has been attached - item.fitLabel(); - } else { - this.newItems.push( item ); - } - } - // Reevaluate clipping this.clip(); @@ -6088,7 +6104,7 @@ OO.ui.MenuSelectWidget.prototype.clearItems = function () { * @inheritdoc */ OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) { - var i, len, change; + var change; visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length; change = visible !== this.isVisible(); @@ -6101,12 +6117,6 @@ OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) { this.bindKeyDownListener(); this.bindKeyPressListener(); - if ( this.newItems && this.newItems.length ) { - for ( i = 0, len = this.newItems.length; i < len; i++ ) { - this.newItems[ i ].fitLabel(); - } - this.newItems = null; - } this.toggleClipping( true ); if ( this.getSelectedItem() ) { @@ -6851,7 +6861,7 @@ OO.ui.InputWidget.prototype.getValue = function () { /** * Set the directionality of the input, either RTL (right-to-left) or LTR (left-to-right). * - * @deprecated since v0.13.1, use #setDir directly + * @deprecated since v0.13.1; use #setDir directly * @param {boolean} isRTL Directionality is right-to-left * @chainable */ @@ -7184,7 +7194,7 @@ OO.ui.CheckboxInputWidget.static.gatherPreInfuseState = function ( node, config * @protected */ OO.ui.CheckboxInputWidget.prototype.getInputElement = function () { - return $( '' ); + return $( '' ).attr( 'type', 'checkbox' ); }; /** @@ -7314,7 +7324,7 @@ OO.ui.DropdownInputWidget.prototype.getInputElement = function ( config ) { if ( config.$input ) { return config.$input.addClass( 'oo-ui-element-hidden' ); } - return $( '' ); + return $( '' ).attr( 'type', 'hidden' ); }; /** @@ -7476,7 +7486,7 @@ OO.ui.RadioInputWidget.static.gatherPreInfuseState = function ( node, config ) { * @protected */ OO.ui.RadioInputWidget.prototype.getInputElement = function () { - return $( '' ); + return $( '' ).attr( 'type', 'radio' ); }; /** @@ -7591,7 +7601,7 @@ OO.ui.RadioSelectInputWidget.static.gatherPreInfuseState = function ( node, conf * @protected */ OO.ui.RadioSelectInputWidget.prototype.getInputElement = function () { - return $( '' ); + return $( '' ).attr( 'type', 'hidden' ); }; /** @@ -8133,7 +8143,7 @@ OO.ui.TextInputWidget.prototype.adjustSize = function () { OO.ui.TextInputWidget.prototype.getInputElement = function ( config ) { return config.multiline ? $( '