-Security reminder: If you have PHP's register_globals option set, you should
-turn it off. Although MediaWiki will work with it enabled, it exposes your
-server to potential security vulnerabilities.
+Security reminder: If you have PHP's register_globals option set, you must
+turn it off. MediaWiki will no longer work with it enabled.
== MediaWiki 1.24 ==
production.
=== Configuration changes in 1.24 ===
+* MediaWiki will no longer run if register_globals is enabled. It has been
+ deprecated for 5 years now, and was removed in PHP 5.4. For more information
+ about why, see <https://www.mediawiki.org/wiki/register_globals>.
* The server's canonical hostname is available as $wgServerName, which is
exposed in both mw.config and ApiQuerySiteInfo.
* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch,
prefixes (i.e. turned into interlanguage links when $wgInterwikiMagic is set
to true).
* $wgParserTestRemote has been removed.
+* $wgCountTotalSearchHits has been removed. If you're concerned about efficiency
+ of search, you should use something like CirrusSearch instead of built in
+ search.
+* Users in the 'sysop' group have access to Special:MergeHistory by default.
=== New features in 1.24 ===
* Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
The feature needs to be enabled with $wgPageLanguageUseDB=true and
permission needs to be set for 'pagelang'.
* Upgrade Moment.js to v2.7.0.
+* (bug 67042) Added support for the HTML5 <rtc> tag for East Asian typography.
=== Bug fixes in 1.24 ===
* (bug 49116) Footer copyright notice is now always displayed in user language
set of hooks has been removed and replaced by a single new hook
SpecialPageBeforeFormDisplay.
* (bug 65781) Removed block warning on included {{Special:Contributions}}
+* Removed Skin::makeGlobalVariablesScript. (deprecated since 1.19)
+* Removed MWNamespace::isMain(). (deprecated since 1.19)
+* Removed Preferences::loadOldSearchNs(). (deprecated since 1.19)
+* Removed OutputPage::getStatusMessage(). (deprecated since 1.18)
+* Removed OutputPage::isUserJsAllowed(). (deprecated since 1.18)
+* Removed Title::updateTitleProtection(). (deprecated since 1.19)
+* Removed ParserOptions::setSkin(). (deprecated since 1.19)
+* Removed Title::escapeCanonicalURL(). (deprecated since 1.19)
+* Removed Title::escapeLocalURL(). (deprecated since 1.19)
+* Removed Title::escapeFullURL(). (deprecated since 1.19)
==== Renamed classes ====
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
/**
* To use a profiler, copy this file to StartProfiler.php,
- * and add something like this:
+ * and add either:
*
- * $wgProfiler['class'] = 'Profiler';
+ * // Does not support the debugging toolbar
+ * // Stores profiling information in the database
+ * // Requires running maintenance/archives/patch-profiling.sql
+ * $wgProfiler['class'] = 'ProfilerSimpleDB'
+ *
+ * or:
+ *
+ * // Supports the debugging toolbar
+ * // Does not store profiling information in the database
+ * $wgProfiler['class'] = 'ProfilerStandard';
*
* Or for a sampling profiler:
* if ( !mt_rand( 0, 100 ) ) {
- * $wgProfiler['class'] = 'Profiler';
+ * $wgProfiler['class'] = 'ProfilerSimpleDB';
* } else {
* $wgProfiler['class'] = 'ProfilerStub';
* }
'MagicWordwgVariableIDs': When defining new magic words IDs.
$variableIDs: array of strings
-'MakeGlobalVariablesScript': Called right before Skin::makeVariablesScript is
-executed. Ideally, this hook should only be used to add variables that depend on
+'MakeGlobalVariablesScript': Called at end of OutputPage::getJSVars.
+Ideally, this hook should only be used to add variables that depend on
the current page/request; static configuration should be added through
ResourceLoaderGetConfigVars instead.
&$vars: variable (or multiple variables) to be added into the output of
To enable the profileinfo.php itself, you'll need to set $wgDBadminuser
and $wgDBadminpassword in your LocalSettings.php, as well as $wgEnableProfileInfo
- See also https://www.mediawiki.org/wiki/How_to_debug#Profiling.
+ See also https://www.mediawiki.org/wiki/Manual:Profiling .
thumb.php
Script used to resize images if it is configured to be done when the web
300
);
+/**
+ * When defined, is an array of image widths used as buckets for thumbnail generation.
+ * The goal is to save resources by generating thumbnails based on reference buckets instead of
+ * always using the original. This will incur a speed gain but cause a quality loss.
+ *
+ * The buckets generation is chained, with each bucket generated based on the above bucket
+ * when possible. File handlers have to opt into using that feature. For now only BitmapHandler
+ * supports it.
+ */
+$wgThumbnailBuckets = null;
+
+/**
+ * When using thumbnail buckets as defined above, this sets the minimum distance with the bucket
+ * above the requested size. The distance represents how pany extra pixels of width the bucket needs
+ * in order to be used as the reference for a given thumbnail. For example, with the following buckets:
+ *
+ * $wgThumbnailBuckets = array ( 128, 256, 512 );
+ *
+ * and a distance of 50:
+ *
+ * $wgThumbnailMinimumBucketDistance = 50;
+ *
+ * If we want to render a thumbnail of width 220px, the 512px bucket will be used,
+ * because 220 + 50 = 270 and the closest bucket bigger than 270px is 512.
+ */
+$wgThumbnailMinimumBucketDistance = 0;
+
/**
* Default parameters for the "<gallery>" tag
*/
*/
$wgCacheEpoch = '20030516000000';
+/**
+ * Directory where GitInfo will look for pre-computed cache files. If false,
+ * $wgCacheDirectory/gitinfo will be used.
+ */
+$wgGitInfoCacheDirectory = false;
+
/**
* Bump this number when changing the global style sheets and JavaScript.
*
$wgGroupPermissions['sysop']['suppressredirect'] = true;
#$wgGroupPermissions['sysop']['pagelang'] = true;
#$wgGroupPermissions['sysop']['upload_by_url'] = true;
-#$wgGroupPermissions['sysop']['mergehistory'] = true;
+$wgGroupPermissions['sysop']['mergehistory'] = true;
// Permission to change users' group assignments
$wgGroupPermissions['bureaucrat']['userrights'] = true;
*/
$wgSearchHighlightBoundaries = '[\p{Z}\p{P}\p{C}]';
-/**
- * Set to true to have the search engine count total
- * search matches to present in the Special:Search UI.
- * Not supported by every search engine shipped with MW.
- *
- * This could however be slow on larger wikis, and is pretty flaky
- * with the current title vs content split. Recommend avoiding until
- * that's been worked out cleanly; but this may aid in testing the
- * search UI and API to confirm that the result count works.
- */
-$wgCountTotalSearchHits = false;
-
/**
* Template for OpenSearch suggestions, defaults to API action=opensearch
*
*/
public function __construct( $repoDir, $usePrecomputed = true ) {
$this->cacheFile = self::getCacheFilePath( $repoDir );
+ wfDebugLog( 'gitinfo',
+ "Computed cacheFile={$this->cacheFile} for {$repoDir}"
+ );
if ( $usePrecomputed &&
$this->cacheFile !== null &&
is_readable( $this->cacheFile )
file_get_contents( $this->cacheFile ),
true
);
+ wfDebugLog( 'gitinfo', "Loaded git data from cache for {$repoDir}" );
}
if ( !$this->cacheIsComplete() ) {
+ wfDebugLog( 'gitinfo', "Cache incomplete for {$repoDir}" );
$this->basedir = $repoDir . DIRECTORY_SEPARATOR . '.git';
if ( is_readable( $this->basedir ) && !is_dir( $this->basedir ) ) {
$GITfile = file_get_contents( $this->basedir );
* Compute the path to the cache file for a given directory.
*
* @param string $repoDir The root directory of the repo where .git can be found
- * @return string Path to GitInfo cache file in $wgCacheDirectory or null if
- * $wgCacheDirectory is false (cache disabled).
+ * @return string Path to GitInfo cache file in $wgGitInfoCacheDirectory or
+ * null if $wgGitInfoCacheDirectory is false (cache disabled).
+ * @since 1.24
*/
protected static function getCacheFilePath( $repoDir ) {
- global $IP, $wgCacheDirectory;
- if ( $wgCacheDirectory ) {
- // Transform path to git repo to something we can safely embed in a filename
- $repoName = $repoDir;
- if ( strpos( $repoName, $IP ) === 0 ) {
+ global $IP, $wgGitInfoCacheDirectory;
+
+ if ( $wgGitInfoCacheDirectory ) {
+ // Convert both $IP and $repoDir to canonical paths to protect against
+ // $IP having changed between the settings files and runtime.
+ $realIP = realpath( $IP );
+ $repoName = realpath( $repoDir );
+ if ( $repoName === false ) {
+ // Unit tests use fake path names
+ $repoName = $repoDir;
+ }
+ if ( strpos( $repoName, $realIP ) === 0 ) {
// Strip $IP from path
- $repoName = substr( $repoName, strlen( $IP ) );
+ $repoName = substr( $repoName, strlen( $realIP ) );
}
+ // Transform path to git repo to something we can safely embed in
+ // a filename
$repoName = strtr( $repoName, DIRECTORY_SEPARATOR, '-' );
$fileName = 'info' . $repoName . '.json';
- return implode(
- DIRECTORY_SEPARATOR,
- array( $wgCacheDirectory, 'gitinfo', $fileName )
- );
+ return "{$wgGitInfoCacheDirectory}/{$fileName}";
}
return null;
}
$this->getRemoteUrl();
if ( !$this->cacheIsComplete() ) {
- wfDebugLog( "Failed to compute GitInfo for \"{$this->basedir}\"" );
+ wfDebugLog( 'gitinfo',
+ "Failed to compute GitInfo for \"{$this->basedir}\""
+ );
return;
}
return !self::isTalk( $index );
}
- /**
- * @see self::isSubject
- * @deprecated since 1.19 Please use the more consistently named isSubject
- * @return bool
- */
- public static function isMain( $index ) {
- wfDeprecated( __METHOD__, '1.19' );
- return self::isSubject( $index );
- }
-
/**
* Is the given namespace a talk namespace?
*
);
}
- /**
- * Return whether user JavaScript is allowed for this page
- * @deprecated since 1.18 Load modules with ResourceLoader, and origin and
- * trustworthiness is identified and enforced automagically.
- * @return bool
- */
- public function isUserJsAllowed() {
- wfDeprecated( __METHOD__, '1.18' );
- return $this->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) >=
- ResourceLoaderModule::ORIGIN_USER_INDIVIDUAL;
- }
-
/**
* Show what level of JavaScript / CSS untrustworthiness is allowed on this page
* @see ResourceLoaderModule::$origin
}
}
- /**
- * Get the message associated with the HTTP response code $code
- *
- * @param int $code Status code
- * @return string|null Message or null if $code is not in the list of messages
- *
- * @deprecated since 1.18 Use HttpStatus::getMessage() instead.
- */
- public static function getStatusMessage( $code ) {
- wfDeprecated( __METHOD__, '1.18' );
- return HttpStatus::getMessage( $code );
- }
-
/**
* Finally, all the text has been munged and accumulated into
* the object, let's actually output it:
/**
* Get an array containing the variables to be set in mw.config in JavaScript.
*
- * DO NOT CALL THIS FROM OUTSIDE OF THIS CLASS OR Skin::makeGlobalVariablesScript().
- * This is only public until that function is removed. You have been warned.
- *
* Do not add things here which can be evaluated in ResourceLoaderStartUpModule
* - in other words, page-independent/site-wide variables (without state).
* You will only be adding bloat to the html page and causing page caches to
* have to be purged on configuration changes.
* @return array
*/
- public function getJSVars() {
+ private function getJSVars() {
global $wgContLang;
$curRevisionId = 0;
return array( $result, 'mailerror' );
}
}
-
- /**
- * @deprecated since 1.19
- * @param User $user
- * @return array
- */
- public static function loadOldSearchNs( $user ) {
- wfDeprecated( __METHOD__, '1.19' );
-
- $searchableNamespaces = SearchEngine::searchableNamespaces();
- // Back compat with old format
- $arr = array();
-
- foreach ( $searchableNamespaces as $ns => $name ) {
- if ( $user->getOption( 'searchNs' . $ns ) ) {
- $arr[] = $ns;
- }
- }
-
- return $arr;
- }
}
/** Some tweaks to allow js prefs to work */
'h2', 'h3', 'h4', 'h5', 'h6', 'cite', 'code', 'em', 's',
'strike', 'strong', 'tt', 'var', 'div', 'center',
'blockquote', 'ol', 'ul', 'dl', 'table', 'caption', 'pre',
- 'ruby', 'rt', 'rb', 'rp', 'p', 'span', 'abbr', 'dfn',
+ 'ruby', 'rb', 'rp', 'rt', 'rtc', 'p', 'span', 'abbr', 'dfn',
'kbd', 'samp', 'data', 'time', 'mark'
);
$htmlsingle = array(
# http://www.whatwg.org/html/text-level-semantics.html#the-ruby-element
'ruby' => $common,
# rbc
- # rtc
'rb' => $common,
- 'rt' => $common, #array_merge( $common, array( 'rbspan' ) ),
'rp' => $common,
+ 'rt' => $common, #array_merge( $common, array( 'rbspan' ) ),
+ 'rtc' => $common,
# MathML root element, where used for extensions
# 'title' may not be 100% valid here; it's XHTML
$wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
}
+if ( $wgGitInfoCacheDirectory === false && $wgCacheDirectory !== false ) {
+ $wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo";
+}
+
if ( isset( $wgFileStore['deleted']['directory'] ) ) {
$wgDeletedDirectory = $wgFileStore['deleted']['directory'];
}
}
}
- /**
- * Make a "<script>" tag containing global variables
- *
- * @deprecated since 1.19
- * @param mixed $unused
- * @return string HTML fragment
- */
- public static function makeGlobalVariablesScript( $unused ) {
- global $wgOut;
-
- wfDeprecated( __METHOD__, '1.19' );
-
- return self::makeVariablesScript( $wgOut->getJSVars() );
- }
-
/**
* Get the query to generate a dynamic stylesheet
*
/**
* The following actions use messages which, if made particular to
* the any specific skins, would break the Ajax code which makes this
- * action happen entirely inline. Skin::makeGlobalVariablesScript
+ * action happen entirely inline. OutputPage::getJSVars
* defines a set of messages in a javascript object - and these
* messages are assumed to be global for all skins. Without making
* a change to that procedure these messages will have to remain as
* @param object $obj Object to check.
* @return void
*/
- static function unstub( $obj ) {
+ static function unstub( &$obj ) {
if ( $obj instanceof StubObject ) {
- $obj->_unstub( 'unstub', 3 );
+ $obj = $obj->_unstub( 'unstub', 3 );
}
}
* @param string $name Name of the method called in this object.
* @param int $level Level to go in the stack trace to get the function
* who called this function.
+ * @return The unstubbed version of itself
* @throws MWException
*/
function _unstub( $name = '_unstub', $level = 2 ) {
$GLOBALS[$this->global] = $this->_newObject();
--$recursionLevel;
wfProfileOut( $fname );
+ return $GLOBALS[$this->global];
}
}
}
return $ret;
}
- /**
- * Get an HTML-escaped version of the URL form, suitable for
- * using in a link, without a server name or fragment
- *
- * @see self::getLocalURL for the arguments.
- * @param string $query
- * @param bool|string $query2
- * @return string The URL
- * @deprecated since 1.19
- */
- public function escapeLocalURL( $query = '', $query2 = false ) {
- wfDeprecated( __METHOD__, '1.19' );
- return htmlspecialchars( $this->getLocalURL( $query, $query2 ) );
- }
-
- /**
- * Get an HTML-escaped version of the URL form, suitable for
- * using in a link, including the server name and fragment
- *
- * @see self::getLocalURL for the arguments.
- * @return string The URL
- * @deprecated since 1.19
- */
- public function escapeFullURL( $query = '', $query2 = false ) {
- wfDeprecated( __METHOD__, '1.19' );
- return htmlspecialchars( $this->getFullURL( $query, $query2 ) );
- }
-
/**
* Get the URL form for an internal link.
* - Used in various Squid-related code, in case we have a different
return $url;
}
- /**
- * HTML-escaped version of getCanonicalURL()
- *
- * @see self::getLocalURL for the arguments.
- * @since 1.18
- * @return string
- * @deprecated since 1.19
- */
- public function escapeCanonicalURL( $query = '', $query2 = false ) {
- wfDeprecated( __METHOD__, '1.19' );
- return htmlspecialchars( $this->getCanonicalURL( $query, $query2 ) );
- }
-
/**
* Get the edit URL for this Title
*
return $this->mTitleProtection;
}
- /**
- * Update the title protection status
- *
- * @deprecated since 1.19; use WikiPage::doUpdateRestrictions() instead.
- * @param string $create_perm Permission required for creation
- * @param string $reason Reason for protection
- * @param string $expiry Expiry timestamp
- * @return bool
- */
- public function updateTitleProtection( $create_perm, $reason, $expiry ) {
- wfDeprecated( __METHOD__, '1.19' );
-
- global $wgUser;
-
- $limit = array( 'create' => $create_perm );
- $expiry = array( 'create' => $expiry );
-
- $page = WikiPage::factory( $this );
- $cascade = false;
- $status = $page->doUpdateRestrictions( $limit, $expiry, $cascade, $reason, $wgUser );
-
- return $status->isOK();
- }
-
/**
* Remove any title protection due to page existing
*/
* @file
*/
-# Protect against register_globals
+# Die if register_globals is enabled (PHP <=5.3)
# This must be done before any globals are set by the code
if ( ini_get( 'register_globals' ) ) {
- if ( isset( $_REQUEST['GLOBALS'] ) || isset( $_FILES['GLOBALS'] ) ) {
- die( '<a href="http://www.hardened-php.net/globals-problem">'
- . '$GLOBALS overwrite vulnerability</a>' );
- }
-
- $verboten = array(
- 'GLOBALS',
- '_SERVER',
- 'HTTP_SERVER_VARS',
- '_GET',
- 'HTTP_GET_VARS',
- '_POST',
- 'HTTP_POST_VARS',
- '_COOKIE',
- 'HTTP_COOKIE_VARS',
- '_FILES',
- 'HTTP_POST_FILES',
- '_ENV',
- 'HTTP_ENV_VARS',
- '_REQUEST',
- '_SESSION',
- 'HTTP_SESSION_VARS'
- );
-
- foreach ( $_REQUEST as $name => $value ) {
- if ( in_array( $name, $verboten ) ) {
- header( "HTTP/1.1 500 Internal Server Error" );
- echo "register_globals security paranoia: trying to overwrite superglobals, aborting.";
- die( -1 );
- }
- unset( $GLOBALS[$name] );
- }
+ die( 'MediaWiki does not support installations where register_globals is enabled. '
+ . 'Please see <a href="https://www.mediawiki.org/wiki/register_globals">mediawiki.org</a> '
+ . 'for help on how to disable it.' );
}
# bug 15461: Make IE8 turn off content sniffing. Everybody else should ignore this
$form->setWrapperLegendMsg( 'filerevert-legend' );
$form->setSubmitTextMsg( 'filerevert-submit' );
$form->addHiddenField( 'oldimage', $this->getRequest()->getText( 'oldimage' ) );
+ $form->setTokenSalt( array( 'revert', $this->getTitle()->getPrefixedDBkey() ) );
}
protected function getFormFields() {
* @param mixed $value The value being parsed
* @param bool $allowMultiple Can $value contain more than one value
* separated by '|'?
- * @param mixed $allowedValues An array of values to check against. If
+ * @param string[]|null $allowedValues An array of values to check against. If
* null, all values are accepted.
- * @return mixed (allowMultiple ? an_array_of_values : a_single_value)
+ * @return string|string[] (allowMultiple ? an_array_of_values : a_single_value)
*/
protected function parseMultiValue( $valueName, $value, $allowMultiple, $allowedValues ) {
if ( trim( $value ) === '' && $allowMultiple ) {
/**
* Add a set of tables to the internal array
- * @param mixed $tables Table name or array of table names
- * @param mixed $alias Table alias, or null for no alias. Cannot be
+ * @param string|string[] $tables Table name or array of table names
+ * @param string|null $alias Table alias, or null for no alias. Cannot be
* used with multiple tables
*/
protected function addTables( $tables, $alias = null ) {
/**
* Extracts from a single sql row the data needed to describe one recent change.
*
- * @param mixed $row The row from which to extract the data.
+ * @param stdClass $row The row from which to extract the data.
* @return array An array mapping strings (descriptors) to their respective string values.
* @access public
*/
/**
* Extract fields from the database row and append them to a result array
*
- * @param mixed $row
+ * @param stdClass $row
* @return array
*/
private function extractRowInfo( $row ) {
$options['connectTimeout'] = 1;
}
if ( !isset( $options['readTimeout'] ) ) {
- $options['readTimeout'] = 31; // handles up to 30 second blocking commands
+ $options['readTimeout'] = 1;
}
if ( !isset( $options['persistent'] ) ) {
$options['persistent'] = false;
* Optional, default is 1 second.
* - readTimeout : The timeout for operation reads, in seconds.
* Commands like BLPOP can fail if told to wait longer than this.
- * Optional, default is 60 seconds.
+ * Optional, default is 1 second.
* - persistent : Set this to true to allow connections to persist across
* multiple web requests. False by default.
* - password : The authentication password, will be sent to Redis in clear text.
return true;
}
+ /**
+ * Adjust or reset the connection handle read timeout value
+ *
+ * @param Redis $conn
+ * @param integer $timeout Optional
+ */
+ public function resetTimeout( Redis $conn, $timeout = null ) {
+ $conn->setOption( Redis::OPT_READ_TIMEOUT, $timeout ?: $this->readTimeout );
+ }
+
/**
* Make sure connections are closed for sanity
*/
public function __call( $name, $arguments ) {
$conn = $this->conn; // convenience
+ // Work around https://github.com/nicolasff/phpredis/issues/70
+ $lname = strtolower( $name );
+ if ( ( $lname === 'blpop' || $lname == 'brpop' )
+ && is_array( $arguments[0] ) && isset( $arguments[1] )
+ ) {
+ $this->pool->resetTimeout( $conn, $arguments[1] + 1 );
+ } elseif ( $lname === 'brpoplpush' && isset( $arguments[2] ) ) {
+ $this->pool->resetTimeout( $conn, $arguments[2] + 1 );
+ }
+
$conn->clearLastError();
- $res = call_user_func_array( array( $conn, $name ), $arguments );
- if ( preg_match( '/^ERR operation not permitted\b/', $conn->getLastError() ) ) {
- $this->pool->reauthenticateConnection( $this->server, $conn );
- $conn->clearLastError();
+ try {
$res = call_user_func_array( array( $conn, $name ), $arguments );
- wfDebugLog( 'redis', "Used automatic re-authentication for method '$name'." );
+ if ( preg_match( '/^ERR operation not permitted\b/', $conn->getLastError() ) ) {
+ $this->pool->reauthenticateConnection( $this->server, $conn );
+ $conn->clearLastError();
+ $res = call_user_func_array( array( $conn, $name ), $arguments );
+ wfDebugLog( 'redis', "Used automatic re-authentication for method '$name'." );
+ }
+ } catch ( RedisException $e ) {
+ $this->pool->resetTimeout( $conn ); // restore
+ throw $e;
}
$this->lastError = $conn->getLastError() ?: $this->lastError;
+ $this->pool->resetTimeout( $conn ); // restore
+
return $res;
}
return false;
}
+ if ( $schema === false ) {
+ global $wgDBmwschema;
+ $schema = $wgDBmwschema;
+ }
+
$res = $this->query( "SELECT 1 FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
AND TABLE_SCHEMA = '$schema' AND TABLE_NAME = '$table'" );
// Used internally, we want the schema split off from the table name and returned
// as a list with 3 elements (database, schema, table)
$table = explode( '.', $table );
- if ( count( $table ) == 2 ) {
+ while ( count( $table ) < 3 ) {
array_unshift( $table, false );
}
}
* In Postgres when using FOR UPDATE, only the main table and tables that are inner joined
* can be locked. That means tables in an outer join cannot be FOR UPDATE locked. Trying to do
* so causes a DB error. This wrapper checks which tables can be locked and adjusts it accordingly.
+ *
+ * MySQL uses "ORDER BY NULL" as an optimization hint, but that syntax is illegal in PostgreSQL.
*/
function selectSQLText( $table, $vars, $conds = '', $fname = __METHOD__,
$options = array(), $join_conds = array()
}
}
}
+
+ if ( isset( $options['ORDER BY'] ) && $options['ORDER BY'] == 'NULL' ) {
+ unset( $options['ORDER BY'] );
+ }
}
return parent::selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds );
* @return bool
*/
function forEachForeignRepo( $callback, $params = array() ) {
+ if ( !$this->reposInitialised ) {
+ $this->initialiseRepos();
+ }
foreach ( $this->foreignRepos as $repo ) {
$args = array_merge( array( $repo ), $params );
if ( call_user_func_array( $callback, $args ) ) {
* @return bool
*/
function hasForeignRepos() {
+ if ( !$this->reposInitialised ) {
+ $this->initialiseRepos();
+ }
return (bool)$this->foreignRepos;
}
/** @var string Required Repository class type */
protected $repoClass = 'FileRepo';
+ /** @var array Cache of tmp filepaths pointing to generated bucket thumbnails, keyed by width */
+ protected $tmpBucketedThumbCache = array();
+
/**
* Call this constructor from child classes.
*
return false;
}
+ /**
+ * Return the smallest bucket from $wgThumbnailBuckets which is at least
+ * $wgThumbnailMinimumBucketDistance larger than $desiredWidth. The returned bucket, if any,
+ * will always be bigger than $desiredWidth.
+ *
+ * @param int $desiredWidth
+ * @param int $page
+ * @return bool|int
+ */
+ public function getThumbnailBucket( $desiredWidth, $page = 1 ) {
+ global $wgThumbnailBuckets, $wgThumbnailMinimumBucketDistance;
+
+ $imageWidth = $this->getWidth( $page );
+
+ if ( $imageWidth === false ) {
+ return false;
+ }
+
+ if ( $desiredWidth > $imageWidth ) {
+ return false;
+ }
+
+ if ( !$wgThumbnailBuckets ) {
+ return false;
+ }
+
+ $sortedBuckets = $wgThumbnailBuckets;
+
+ sort( $sortedBuckets );
+
+ foreach ( $sortedBuckets as $bucket ) {
+ if ( $bucket > $imageWidth ) {
+ return false;
+ }
+
+ if ( $bucket - $wgThumbnailMinimumBucketDistance > $desiredWidth ) {
+ return $bucket;
+ }
+ }
+
+ // Image is bigger than any available bucket
+ return false;
+ }
+
/**
* Returns ID or name of user who uploaded the file
* STUB
return null;
}
$extension = $this->getExtension();
- list( $thumbExt, ) = $this->handler->getThumbType(
+ list( $thumbExt, ) = $this->getHandler()->getThumbType(
$extension, $this->getMimeType(), $params );
- $thumbName = $this->handler->makeParamString( $params ) . '-' . $name;
+ $thumbName = $this->getHandler()->makeParamString( $params ) . '-' . $name;
if ( $thumbExt != $extension ) {
$thumbName .= ".$thumbExt";
}
* @return MediaTransformOutput|bool False on failure
*/
function transform( $params, $flags = 0 ) {
- global $wgUseSquid, $wgIgnoreImageErrors, $wgThumbnailEpoch;
+ global $wgThumbnailEpoch;
wfProfileIn( __METHOD__ );
do {
} elseif ( $flags & self::RENDER_FORCE ) {
wfDebug( __METHOD__ . " forcing rendering per flag File::RENDER_FORCE\n" );
}
- }
- // If the backend is ready-only, don't keep generating thumbnails
- // only to return transformation errors, just return the error now.
- if ( $this->repo->getReadOnlyReason() !== false ) {
- $thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $params, $flags );
- break;
+ // If the backend is ready-only, don't keep generating thumbnails
+ // only to return transformation errors, just return the error now.
+ if ( $this->repo->getReadOnlyReason() !== false ) {
+ $thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $params, $flags );
+ break;
+ }
}
- // Create a temp FS file with the same extension and the thumbnail
- $thumbExt = FileBackend::extensionFromPath( $thumbPath );
- $tmpFile = TempFSFile::factory( 'transform_', $thumbExt );
+ $tmpFile = $this->makeTransformTmpFile( $thumbPath );
+
if ( !$tmpFile ) {
$thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $params, $flags );
- break;
+ } else {
+ $thumb = $this->generateAndSaveThumb( $tmpFile, $params, $flags );
}
- $tmpThumbPath = $tmpFile->getPath(); // path of 0-byte temp file
-
- // Actually render the thumbnail...
- wfProfileIn( __METHOD__ . '-doTransform' );
- $thumb = $handler->doTransform( $this, $tmpThumbPath, $thumbUrl, $params );
- wfProfileOut( __METHOD__ . '-doTransform' );
- $tmpFile->bind( $thumb ); // keep alive with $thumb
-
- if ( !$thumb ) { // bad params?
- $thumb = false;
- } elseif ( $thumb->isError() ) { // transform error
- $this->lastError = $thumb->toText();
- // Ignore errors if requested
- if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
- $thumb = $handler->getTransform( $this, $tmpThumbPath, $thumbUrl, $params );
- }
- } elseif ( $this->repo && $thumb->hasFile() && !$thumb->fileIsSource() ) {
- // Copy the thumbnail from the file system into storage...
- $disposition = $this->getThumbDisposition( $thumbName );
- $status = $this->repo->quickImport( $tmpThumbPath, $thumbPath, $disposition );
- if ( $status->isOK() ) {
- $thumb->setStoragePath( $thumbPath );
- } else {
- $thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $params, $flags );
+ } while ( false );
+
+ wfProfileOut( __METHOD__ );
+
+ return is_object( $thumb ) ? $thumb : false;
+ }
+
+ /**
+ * Generates a thumbnail according to the given parameters and saves it to storage
+ * @param TempFSFile $tmpFile Temporary file where the rendered thumbnail will be saved
+ * @param array $transformParams
+ * @param int $flags
+ * @return bool|MediaTransformOutput
+ */
+ public function generateAndSaveThumb( $tmpFile, $transformParams, $flags ) {
+ global $wgUseSquid, $wgIgnoreImageErrors;
+
+ $handler = $this->getHandler();
+
+ $normalisedParams = $transformParams;
+ $handler->normaliseParams( $this, $normalisedParams );
+
+ $thumbName = $this->thumbName( $normalisedParams );
+ $thumbUrl = $this->getThumbUrl( $thumbName );
+ $thumbPath = $this->getThumbPath( $thumbName ); // final thumb path
+
+ $tmpThumbPath = $tmpFile->getPath();
+
+ if ( $handler->supportsBucketing() ) {
+ $this->generateBucketsIfNeeded( $normalisedParams, $flags );
+ }
+
+ // Actually render the thumbnail...
+ wfProfileIn( __METHOD__ . '-doTransform' );
+ $thumb = $handler->doTransform( $this, $tmpThumbPath, $thumbUrl, $transformParams );
+ wfProfileOut( __METHOD__ . '-doTransform' );
+ $tmpFile->bind( $thumb ); // keep alive with $thumb
+
+ if ( !$thumb ) { // bad params?
+ $thumb = false;
+ } elseif ( $thumb->isError() ) { // transform error
+ $this->lastError = $thumb->toText();
+ // Ignore errors if requested
+ if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) {
+ $thumb = $handler->getTransform( $this, $tmpThumbPath, $thumbUrl, $transformParams );
+ }
+ } elseif ( $this->repo && $thumb->hasFile() && !$thumb->fileIsSource() ) {
+ // Copy the thumbnail from the file system into storage...
+ $disposition = $this->getThumbDisposition( $thumbName );
+ $status = $this->repo->quickImport( $tmpThumbPath, $thumbPath, $disposition );
+ if ( $status->isOK() ) {
+ $thumb->setStoragePath( $thumbPath );
+ } else {
+ $thumb = $this->transformErrorOutput( $thumbPath, $thumbUrl, $transformParams, $flags );
+ }
+ // Give extensions a chance to do something with this thumbnail...
+ wfRunHooks( 'FileTransformed', array( $this, $thumb, $tmpThumbPath, $thumbPath ) );
+ }
+
+ // Purge. Useful in the event of Core -> Squid connection failure or squid
+ // purge collisions from elsewhere during failure. Don't keep triggering for
+ // "thumbs" which have the main image URL though (bug 13776)
+ if ( $wgUseSquid ) {
+ if ( !$thumb || $thumb->isError() || $thumb->getUrl() != $this->getURL() ) {
+ SquidUpdate::purge( array( $thumbUrl ) );
+ }
+ }
+
+ return $thumb;
+ }
+
+ /**
+ * Generates chained bucketed thumbnails if needed
+ * @param array $params
+ * @param int $flags
+ * @return bool Whether at least one bucket was generated
+ */
+ protected function generateBucketsIfNeeded( $params, $flags = 0 ) {
+ if ( !$this->repo
+ || !isset( $params['physicalWidth'] )
+ || !isset( $params['physicalHeight'] )
+ || !( $bucket = $this->getThumbnailBucket( $params['physicalWidth'] ) )
+ || $bucket == $params['physicalWidth'] ) {
+ return false;
+ }
+
+ $bucketPath = $this->getBucketThumbPath( $bucket );
+
+ if ( $this->repo->fileExists( $bucketPath ) ) {
+ return false;
+ }
+
+ $params['physicalWidth'] = $bucket;
+ $params['width'] = $bucket;
+
+ $params = $this->getHandler()->sanitizeParamsForBucketing( $params );
+
+ $bucketName = $this->getBucketThumbName( $bucket );
+
+ $tmpFile = $this->makeTransformTmpFile( $bucketPath );
+
+ if ( !$tmpFile ) {
+ return false;
+ }
+
+ $thumb = $this->generateAndSaveThumb( $tmpFile, $params, $flags );
+
+ if ( !$thumb || $thumb->isError() ) {
+ return false;
+ }
+
+ $this->tmpBucketedThumbCache[ $bucket ] = $tmpFile->getPath();
+ // For the caching to work, we need to make the tmp file survive as long as
+ // this object exists
+ $tmpFile->bind( $this );
+
+ return true;
+ }
+
+ /**
+ * Returns the most appropriate source image for the thumbnail, given a target thumbnail size
+ * @param array $params
+ * @return array source path and width/height of the source
+ */
+ public function getThumbnailSource( $params ) {
+ if ( $this->repo
+ && $this->getHandler()->supportsBucketing()
+ && isset( $params['physicalWidth'] )
+ && $bucket = $this->getThumbnailBucket( $params['physicalWidth'] )
+ ) {
+ if ( $this->getWidth() != 0 ) {
+ $bucketHeight = round( $this->getHeight() * ( $bucket / $this->getWidth() ) );
+ } else {
+ $bucketHeight = 0;
+ }
+
+ // Try to avoid reading from storage if the file was generated by this script
+ if ( isset( $this->tmpBucketedThumbCache[ $bucket ] ) ) {
+ $tmpPath = $this->tmpBucketedThumbCache[ $bucket ];
+
+ if ( file_exists( $tmpPath ) ) {
+ return array(
+ 'path' => $tmpPath,
+ 'width' => $bucket,
+ 'height' => $bucketHeight
+ );
}
- // Give extensions a chance to do something with this thumbnail...
- wfRunHooks( 'FileTransformed', array( $this, $thumb, $tmpThumbPath, $thumbPath ) );
}
- // Purge. Useful in the event of Core -> Squid connection failure or squid
- // purge collisions from elsewhere during failure. Don't keep triggering for
- // "thumbs" which have the main image URL though (bug 13776)
- if ( $wgUseSquid ) {
- if ( !$thumb || $thumb->isError() || $thumb->getUrl() != $this->getURL() ) {
- SquidUpdate::purge( array( $thumbUrl ) );
+ $bucketPath = $this->getBucketThumbPath( $bucket );
+
+ if ( $this->repo->fileExists( $bucketPath ) ) {
+ $fsFile = $this->repo->getLocalReference( $bucketPath );
+
+ if ( $fsFile ) {
+ return array(
+ 'path' => $fsFile->getPath(),
+ 'width' => $bucket,
+ 'height' => $bucketHeight
+ );
}
}
- } while ( false );
+ }
- wfProfileOut( __METHOD__ );
+ // Original file
+ return array(
+ 'path' => $this->getLocalRefPath(),
+ 'width' => $this->getWidth(),
+ 'height' => $this->getHeight()
+ );
+ }
- return is_object( $thumb ) ? $thumb : false;
+ /**
+ * Returns the repo path of the thumb for a given bucket
+ * @param int $bucket
+ * @return string
+ */
+ protected function getBucketThumbPath( $bucket ) {
+ $thumbName = $this->getBucketThumbName( $bucket );
+ return $this->getThumbPath( $thumbName );
+ }
+
+ /**
+ * Returns the name of the thumb for a given bucket
+ * @param int $bucket
+ * @return string
+ */
+ protected function getBucketThumbName( $bucket ) {
+ return $this->thumbName( array( 'physicalWidth' => $bucket ) );
+ }
+
+ /**
+ * Creates a temp FS file with the same extension and the thumbnail
+ * @param string $thumbPath Thumbnail path
+ * @returns TempFSFile
+ */
+ protected function makeTransformTmpFile( $thumbPath ) {
+ $thumbExt = FileBackend::extensionFromPath( $thumbPath );
+ return TempFSFile::factory( 'transform_', $thumbExt );
}
/**
return false;
}
- return $this->handler->getImageSize( $this, $filePath );
+ return $this->getHandler()->getImageSize( $this, $filePath );
}
/**
protected $mWrapperLegend = false;
+ /**
+ * Salt for the edit token.
+ * @var string|array
+ */
+ protected $mTokenSalt = '';
+
/**
* If true, sections that contain both fields and subsections will
* render their subsections before their fields.
// Session tokens for logged-out users have no security value.
// However, if the user gave one, check it in order to give a nice
// "session expired" error instead of "permission denied" or such.
- $submit = $this->getUser()->matchEditToken( $editToken );
+ $submit = $this->getUser()->matchEditToken( $editToken, $this->mTokenSalt );
} else {
$submit = true;
}
return $this;
}
+ /**
+ * Set the salt for the edit token.
+ *
+ * Only useful when the method is "post".
+ *
+ * @since 1.24
+ * @param string|array Salt to use
+ * @return HTMLForm $this for chaining calls
+ */
+ public function setTokenSalt( $salt ) {
+ $this->mTokenSalt = $salt;
+
+ return $this;
+ }
+
/**
* Display the form (sending to the context's OutputPage object), with an
* appropriate error message or stack of messages, and any validation errors, etc.
if ( $this->getMethod() == 'post' ) {
$html .= Html::hidden(
'wpEditToken',
- $this->getUser()->getEditToken(),
+ $this->getUser()->getEditToken( $this->mTokenSalt ),
array( 'id' => 'wpEditToken' )
) . "\n";
$html .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . "\n";
$select->setAttribute( 'disabled', 'disabled' );
}
- if ( isset( $this->mParams['tabindex'] ) ) {
- $select->setAttribute( 'tabindex', $this->mParams['tabindex'] );
+ $allowedParams = array( 'tabindex', 'size' );
+ $customParams = $this->getAttributes( $allowedParams );
+ foreach( $customParams as $name => $value ) {
+ $select->setAttribute( $name, $value );
}
if ( $this->mClass !== '' ) {
$this->settings[$var] = $GLOBALS[$var];
}
- $compiledDBs = array();
+ $this->compiledDBs = array();
foreach ( self::getDBTypes() as $type ) {
$installer = $this->getDBInstaller( $type );
if ( !$installer->isCompiled() ) {
continue;
}
- $compiledDBs[] = $type;
-
- $defaults = $installer->getGlobalDefaults();
-
- foreach ( $installer->getGlobalNames() as $var ) {
- if ( isset( $defaults[$var] ) ) {
- $this->settings[$var] = $defaults[$var];
- } else {
- $this->settings[$var] = $GLOBALS[$var];
- }
- }
+ $this->compiledDBs[] = $type;
}
- $this->compiledDBs = $compiledDBs;
$this->parserTitle = Title::newFromText( 'Installer' );
$this->parserOptions = new ParserOptions; // language will be wrong :(
/**
* Environment check for register_globals.
+ * Prevent installation if enabled
*/
protected function envCheckRegisterGlobals() {
if ( wfIniGetBool( 'register_globals' ) ) {
- $this->showMessage( 'config-register-globals' );
+ $this->showMessage( 'config-register-globals-error' );
+ return false;
}
+
+ return true;
}
/**
'password' => $password,
'dbname' => false,
'flags' => 0,
+ 'schema' => $this->getVar( 'wgDBmwschema' ),
'tablePrefix' => $this->getVar( 'wgDBprefix' ) ) );
$db->prepareStatements( false );
$db->scrollableCursor( false );
return $status;
}
+ public function getGlobalDefaults() {
+ // The default $wgDBmwschema is null, which breaks Postgres and other DBMSes that require
+ // the use of a schema, so we need to set it here
+ return array(
+ 'wgDBmwschema' => 'mediawiki',
+ );
+ }
+
/**
* Try to see if the login exists
* @param string $user Username to check
* @param string $user User name
* @param string $password Password
* @param string $dbName Database name
+ * @param string $schema Database schema
* @return Status
*/
- protected function openConnectionWithParams( $user, $password, $dbName ) {
+ protected function openConnectionWithParams( $user, $password, $dbName, $schema ) {
$status = Status::newGood();
try {
- $db = new DatabasePostgres(
- $this->getVar( 'wgDBserver' ),
- $user,
- $password,
- $dbName
- );
+ $db = Database::factory( 'postgres', array(
+ 'host' => $this->getVar( 'wgDBserver' ),
+ 'user' => $user,
+ 'password' => $password,
+ 'dbname' => $dbName,
+ 'schema' => $schema ) );
$status->value = $db;
} catch ( DBConnectionError $e ) {
$status->fatal( 'config-connection-error', $e->getMessage() );
return $this->openConnectionWithParams(
$this->getVar( '_InstallUser' ),
$this->getVar( '_InstallPassword' ),
- $this->getVar( 'wgDBname' ) );
+ $this->getVar( 'wgDBname' ),
+ $this->getVar( 'wgDBmwschema' ) );
case 'create-tables':
$status = $this->openPgConnection( 'create-schema' );
if ( $status->isOK() ) {
$status = Status::newGood();
foreach ( $dbs as $db ) {
try {
- $conn = new DatabasePostgres(
- $this->getVar( 'wgDBserver' ),
+ $conn = $this->openConnectionWithParams(
$user,
$password,
- $db );
+ $db,
+ $this->getVar( 'wgDBmwschema' ) );
} catch ( DBConnectionError $error ) {
$conn = false;
$status->fatal( 'config-pg-test-error', $db,
return $status;
}
+ public function getGlobalDefaults() {
+ // The default $wgDBmwschema is null, which breaks Postgres and other DBMSes that require
+ // the use of a schema, so we need to set it here
+ return array(
+ 'wgDBmwschema' => 'mediawiki',
+ );
+ }
+
public function setupPLpgSQL() {
// Connect as the install user, since it owns the database and so is
// the user that needs to run "CREATE LANGAUGE"
"config-no-db": "Could not find a suitable database driver! You need to install a database driver for PHP.\nThe following database types are supported: $1.\n\nIf you compiled PHP yourself, reconfigure it with a database client enabled, for example, using <code>./configure --with-mysqli</code>.\nIf you installed PHP from a Debian or Ubuntu package, then you also need to install, for example, the <code>php5-mysql</code> package.",
"config-outdated-sqlite": "<strong>Warning:</strong> you have SQLite $1, which is lower than minimum required version $2. SQLite will be unavailable.",
"config-no-fts3": "<strong>Warning:</strong> SQLite is compiled without the [//sqlite.org/fts3.html FTS3 module], search features will be unavailable on this backend.",
- "config-register-globals": "<strong>Warning: PHP's <code>[http://php.net/register_globals register_globals]</code> option is enabled.\nDisable it if you can.</strong>\nMediaWiki will work, but your server is exposed to potential security vulnerabilities.",
+ "config-register-globals-error": "<strong>Error: PHP's <code>[http://php.net/register_globals register_globals]</code> option is enabled.\nIt must be disabled to continue with installation.</strong>\nSee [https://www.mediawiki.org/wiki/register_globals https://www.mediawiki.org/wiki/register_globals] for help on how to do so.",
"config-magic-quotes-runtime": "<strong>Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-runtime magic_quotes_runtime] is active!'</strong>\nThis option corrupts data input unpredictably.\nYou cannot install or use MediaWiki unless this option is disabled.",
"config-magic-quotes-sybase": "<strong>Fatal: [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] is active!</strong>\nThis option corrupts data input unpredictably.\nYou cannot install or use MediaWiki unless this option is disabled.",
"config-mbstring": "<strong>Fatal: [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] is active!</strong>\nThis option causes errors and may corrupt data unpredictably.\nYou cannot install or use MediaWiki unless this option is disabled.",
"config-no-db": "{{doc-important|Do not translate \"<code>./configure --with-mysqli</code>\" and \"<code>php5-mysql</code>\".}}\nParameters:\n* $1 is comma separated list of database types supported by MediaWiki.",
"config-outdated-sqlite": "Used as warning. Parameters:\n* $1 - the version of SQLite that has been installed\n* $2 - minimum version",
"config-no-fts3": "A \"[[:wikipedia:Front and back ends|backend]]\" is a system or component that ordinary users don't interact with directly and don't need to know about, and that is responsible for a distinct task or service - for example, a storage back-end is a generic system for storing data which other applications can use. Possible alternatives for back-end are \"system\" or \"service\", or (depending on context and language) even leave it untranslated.",
- "config-register-globals": "Status message in the MediaWiki installer environment checks.",
+ "config-register-globals-error": "Error message in the MediaWiki installer environment checks.",
"config-magic-quotes-runtime": "{{Related|Config-fatal}}",
"config-magic-quotes-sybase": "{{Related|Config-fatal}}",
"config-mbstring": "{{Related|Config-fatal}}",
} else {
$blob = $this->popAndDeleteBlob( $conn );
}
- if ( $blob === false ) {
+ if ( !is_string( $blob ) ) {
break; // no jobs; nothing to do
}
$count += $released + $pruned + $undelayed;
JobQueue::incrStats( 'job-recycle', $this->type, $released, $this->wiki );
JobQueue::incrStats( 'job-abandon', $this->type, $abandoned, $this->wiki );
+ JobQueue::incrStats( 'job-undelay', $this->type, $undelayed, $this->wiki );
}
} catch ( RedisException $e ) {
$this->throwRedisException( $conn, $e );
/**
* Get the message associated with HTTP response code $code
*
- * Replace OutputPage::getStatusMessage( $code )
- *
* @param $code Integer: status code
* @return String or null: message or null if $code is not in the list of
* messages
if ( !$this->normaliseParams( $image, $params ) ) {
return new TransformParameterError( $params );
}
+
# Create a parameter array to pass to the scaler
$scalerParams = array(
# The size to which the image will be resized
}
# Transform functions and binaries need a FS source file
- $scalerParams['srcPath'] = $image->getLocalRefPath();
+ $thumbnailSource = $image->getThumbnailSource( $params );
+
+ $scalerParams['srcPath'] = $thumbnailSource['path'];
+ $scalerParams['srcWidth'] = $thumbnailSource['width'];
+ $scalerParams['srcHeight'] = $thumbnailSource['height'];
+
if ( $scalerParams['srcPath'] === false ) { // Failed to get local copy
wfDebugLog( 'thumbnail',
sprintf( 'Thumbnail failed on %s: could not get local copy of "%s"',
}
}
} elseif ( $params['mimeType'] == 'image/x-xcf' ) {
- $animation_post = array( '-layers', 'merge' );
+ // Before merging layers, we need to set the background
+ // to be transparent to preserve alpha, as -layers merge
+ // merges all layers on to a canvas filled with the
+ // background colour. After merging we reset the background
+ // to be white for the default background colour setting
+ // in the PNG image (which is used in old IE)
+ $animation_post = array(
+ '-background', 'transparent',
+ '-layers', 'merge',
+ '-background', 'white',
+ );
wfSuppressWarnings();
$xcfMeta = unserialize( $image->getMetadata() );
wfRestoreWarnings();
}
/**
- * Rerurns whether the file needs to be rendered. Returns true if the
+ * Returns whether the file needs to be rendered. Returns true if the
* file requires rotation and we are able to rotate it.
*
* @param File $file
->numParams( $file->getWidth(), $file->getHeight() )->text();
}
}
+
+ public function sanitizeParamsForBucketing( $params ) {
+ $params = parent::sanitizeParamsForBucketing( $params );
+
+ // We unset the height parameters in order to let normaliseParams recalculate them
+ // Otherwise there might be a height discrepancy
+ if ( isset( $params['height'] ) ) {
+ unset( $params['height'] );
+ }
+
+ if ( isset( $params['physicalHeight'] ) ) {
+ unset( $params['physicalHeight'] );
+ }
+
+ return $params;
+ }
}
return parent::rotate( $file, $params );
}
}
+
+ public function supportsBucketing() {
+ return true;
+ }
+
+ public function sanitizeParamsForBucketing( $params ) {
+ $params = parent::sanitizeParamsForBucketing( $params );
+
+ // Quality needs to be cleared for bucketing. Buckets need to be default quality
+ if ( isset( $params['quality'] ) ) {
+ unset( $params['quality'] );
+ }
+
+ return $params;
+ }
}
public function isExpensiveToThumbnail( $file ) {
return false;
}
+
+ /**
+ * Returns whether or not this handler supports the chained generation of thumbnails according
+ * to buckets
+ * @return boolean
+ * @since 1.24
+ */
+ public function supportsBucketing() {
+ return false;
+ }
+
+ /**
+ * Returns a normalised params array for which parameters have been cleaned up for bucketing
+ * purposes
+ * @param array $params
+ * @return array
+ */
+ public function sanitizeParamsForBucketing( $params ) {
+ return $params;
+ }
}
return $wgLang->commaList( $info );
}
+
+ public function supportsBucketing() {
+ return true;
+ }
}
// list of disallowed tags for DISPLAYTITLE
// these will be escaped even though they are allowed in normal wiki text
$bad = array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div', 'blockquote', 'ol', 'ul', 'li', 'hr',
- 'table', 'tr', 'th', 'td', 'dl', 'dd', 'caption', 'p', 'ruby', 'rb', 'rt', 'rp', 'br' );
+ 'table', 'tr', 'th', 'td', 'dl', 'dd', 'caption', 'p', 'ruby', 'rb', 'rt', 'rtc', 'rp', 'br' );
// disallow some styles that could be used to bypass $wgRestrictDisplayTitle
if ( $wgRestrictDisplayTitle ) {
return wfSetVar( $this->mTidy, $x );
}
- /** @deprecated since 1.19 */
- function setSkin( $x ) {
- wfDeprecated( __METHOD__, '1.19' );
- }
-
function setInterfaceMessage( $x ) {
return wfSetVar( $this->mInterfaceMessage, $x );
}
if rSlot ~= 'w' and redis.call('exists',kSlotsNextRelease) == 1 then
if 1*redis.call('zScore',kSlotsNextRelease,rSlot) ~= (rSlotTime + rExpiry) then
-- Slot lock expired and was released already
- elseif redis.call('lLen',kSlots) >= (1*rMaxWorkers - 1) then
- -- Clear list to save space; it will re-init as needed
+ elseif redis.call('lLen',kSlots) >= 1*rMaxWorkers then
+ -- Slots somehow got out of sync; reset the list for sanity
+ redis.call('del',kSlots,kSlotsNextRelease)
+ elseif redis.call('lLen',kSlots) == (1*rMaxWorkers - 1) and redis.call('zCard',kWaiting) == 0 then
+ -- Slot list will be made full; clear it to save space (it re-inits as needed)
+ -- since nothing is waiting on being unblocked by a push to the list
redis.call('del',kSlots,kSlotsNextRelease)
else
-- Add slot back to pool and update the "next release" time
}
protected function searchInternal( $term, $fulltext ) {
- global $wgCountTotalSearchHits;
-
// This seems out of place, why is this called with empty term?
if ( trim( $term ) === '' ) {
return null;
);
$total = null;
- if ( $wgCountTotalSearchHits ) {
- $query = $this->getCountQuery( $filteredTerm, $fulltext );
- $totalResult = $this->db->select(
- $query['tables'], $query['fields'], $query['conds'],
- __METHOD__, $query['options'], $query['joins']
- );
-
- $row = $totalResult->fetchObject();
- if ( $row ) {
- $total = intval( $row->c );
- }
- $totalResult->free();
+ $query = $this->getCountQuery( $filteredTerm, $fulltext );
+ $totalResult = $this->db->select(
+ $query['tables'], $query['fields'], $query['conds'],
+ __METHOD__, $query['options'], $query['joins']
+ );
+
+ $row = $totalResult->fetchObject();
+ if ( $row ) {
+ $total = intval( $row->c );
}
+ $totalResult->free();
return new SqlSearchResultSet( $resultSet, $this->searchTerms, $total );
}
}
function getTotalHits() {
- return $this->totalHits;
+ if ( !is_null( $this->totalHits ) ) {
+ return $this->totalHits;
+ } else {
+ // Special:Search expects a number here.
+ return $this->numRows();
+ }
}
}
}
protected function searchInternal( $term, $fulltext ) {
- global $wgCountTotalSearchHits, $wgContLang;
+ global $wgContLang;
if ( !$this->fulltextSearchSupported() ) {
return null;
$resultSet = $this->db->query( $this->getQuery( $filteredTerm, $fulltext ) );
$total = null;
- if ( $wgCountTotalSearchHits ) {
- $totalResult = $this->db->query( $this->getCountQuery( $filteredTerm, $fulltext ) );
- $row = $totalResult->fetchObject();
- if ( $row ) {
- $total = intval( $row->c );
- }
- $totalResult->free();
+ $totalResult = $this->db->query( $this->getCountQuery( $filteredTerm, $fulltext ) );
+ $row = $totalResult->fetchObject();
+ if ( $row ) {
+ $total = intval( $row->c );
}
+ $totalResult->free();
return new SqlSearchResultSet( $resultSet, $this->searchTerms, $total );
}
);
$download = $this->msg( 'parentheses' )->rawParams( $download )->escaped();
+ // Add delete links if allowed
+ // From https://github.com/Wikia/app/pull/3859
+ if ( $filePage->userCan( 'delete', $this->getUser() ) ) {
+ $deleteMsg = $this->msg( 'listfiles-delete' )->escaped();
+
+ $delete = Linker::linkKnown(
+ $filePage, $deleteMsg, array(), array( 'action' => 'delete' )
+ );
+ $delete = $this->msg( 'parentheses' )->rawParams( $delete )->escaped();
+
+ return "$link $download $delete";
+ }
+
return "$link $download";
} else {
return htmlspecialchars( $value );
$thumb->toHtml( array( 'desc-link' => true ) ) .
'</td>' .
'<td style="vertical-align: top;">' .
- "{$link} {$fileMatch}" .
+ "{$link} {$redirect} {$section} {$fileMatch}" .
$extract .
"<div class='mw-search-result-data'>{$score}{$desc} - {$date}{$related}</div>" .
'</td>' .
}
$rows[$subject] .=
- Xml::openElement(
- 'td', array( 'style' => 'white-space: nowrap' )
- ) .
+ Xml::openElement( 'td' ) .
Xml::checkLabel(
$name,
"ns{$namespace}",
}
// Return final output
- return Xml::openElement(
- 'fieldset',
- array( 'id' => 'mw-searchoptions', 'style' => 'margin:0em;' )
- ) .
+ return Xml::openElement( 'fieldset', array( 'id' => 'mw-searchoptions' ) ) .
Xml::element( 'legend', null, $this->msg( 'powersearch-legend' )->text() ) .
Xml::tags( 'h4', null, $this->msg( 'powersearch-ns' )->parse() ) .
Html::element( 'div', array( 'id' => 'mw-search-togglebox' ) ) .
function getQueryInfo() {
return array(
- 'tables' => array( 'imagelinks', 'image' ),
+ 'tables' => array(
+ 'imagelinks',
+ 'page',
+ 'redirect',
+ 'img1' => 'image',
+ 'img2' => 'image',
+ ),
'fields' => array(
'namespace' => NS_FILE,
'title' => 'il_to',
'value' => 'COUNT(*)'
),
- 'conds' => array( 'img_name IS NULL' ),
+ 'conds' => array(
+ 'img1.img_name' => null,
+ // We also need to exclude file redirects
+ 'img2.img_name' => null,
+ ),
'options' => array( 'GROUP BY' => 'il_to' ),
- 'join_conds' => array( 'image' =>
- array( 'LEFT JOIN',
- array( 'il_to = img_name' )
+ 'join_conds' => array(
+ 'img1' => array( 'LEFT JOIN',
+ 'il_to = img1.img_name'
+ ),
+ 'page' => array( 'LEFT JOIN', array(
+ 'il_to = page_title',
+ 'page_namespace' => NS_FILE,
+ ) ),
+ 'redirect' => array( 'LEFT JOIN', array(
+ 'page_id = rd_from',
+ 'rd_namespace' => NS_FILE,
+ 'rd_interwiki' => ''
+ ) ),
+ 'img2' => array( 'LEFT JOIN',
+ 'rd_title = img2.img_name'
)
)
);
'tt-latn' => 'tatarça', # Tatar (Latin script)
'tum' => 'chiTumbuka', # Tumbuka
'tw' => 'Twi', # Twi, (FIXME!)
- 'ty' => 'Reo Mā`ohi', # Tahitian
+ 'ty' => 'reo tahiti', # Tahitian
'tyv' => 'тыва дыл', # Tyvan
'udm' => 'удмурт', # Udmurt
'ug' => 'ئۇيغۇرچە / Uyghurche', # Uyghur (multiple scripts - defaults to Arabic)
"viewsourcetext": "تمكنك مطالعة و نسخ مصدر هذه الصفحة:",
"viewyourtext": "يمكنك استعراض و نسخ مصدر ''' تعديلاتك ''' في هذه الصفحة:",
"protectedinterface": "توفر هذه الصفحة نص الواجهة للبرنامج على هذا الويكي، وهي محمية لمنع سوء أستخدامها.\nلإضافة أو تغيير الترجمات لجميع مشاريع الويكي، رجاءً أستخدم [//translatewiki.net/ translatewiki.net]، مشروع الترجمة الخاص بميدياويكي.",
- "editinginterface": "'''تحذير:''' أنت تقوم بتحرير صفحة تستخدم في الواجهة النصية للبرنامج.\nسوف تؤثر التغييرات في هذه الصفحة على مظهر واجهة المستخدم للمستخدمين الآخرين على هذا الويكي.\nلإضافة أو تغيير الترجمات في جميع مشاريع الويكي، رجاءً استخدم [//translatewiki.net/ translatewiki.net]، مشروع الترجمة الخاص بميدياويكي.",
+ "editinginterface": "<strong>تنبيه:</strong> تعديل هذه الصفحة سيحفظ في هذا الويكي فقط. لتعميم التعديل على جميع مشاريع ميدياويكي، عدلها في [//translatewiki.net/ مشروع ترجمة الويكي].",
"cascadeprotected": "تمت حماية هذه الصفحة من التعديل لأنها مدمجة في {{PLURAL:$1||الصفحة التالية، والتي|الصفحتين التاليتين، واللتين|الصفحات التالية، والتي}} تم استعمال خاصية \"حماية الصفحات المدمجة\" {{PLURAL:$1||بها|بهما|بها}}:\n$2",
"namespaceprotected": "لا تمتلك الصلاحية لتعديل الصفحات في نطاق '''$1'''.",
"customcssprotected": "أنت لا تمتلك السماح لتعديل صفحة الCSS هذه، لأنها تحتوي على الإعدادات الشخصية لمستخدم آخر.",
"exbeforeblank": "المحتوى قبل الإفراغ كان: '$1'",
"delete-confirm": "حذف \"$1\"",
"delete-legend": "حذف",
- "historywarning": "'''تحذير:''' الصفحة التي توشك على حذفها لها تاريخ فيه {{PLURAL:$1||مراجعة واحدة|مراجعتان|$1 مراجعات|$1 مراجعة}} تقريبا:",
+ "historywarning": "'''تنبيه:''' الصفحة التي تريد حذفها بها {{PLURAL:$1|نسخة|نسخة واحدة|نسختان|$1 نسخ|$1 نسخة}}. انظر",
"confirmdeletetext": "أنت على وشك أن تقوم بحذف صفحة بالإضافة إلى كل تاريخها.\nمن فضلك التأكد من عزمك على الحذف، وبأنك مدرك للعواقب، وبأنك تقوم بهذا بالتوافق مع [[{{MediaWiki:Policy-url}}|السياسة]].",
"actioncomplete": "انتهاء العملية",
"actionfailed": "الفعل فشل",
"delete-edit-reasonlist": "عدل أسباب الحذف",
"delete-toobig": "لهذه الصفحة تاريخ تعديل طويل، أكثر من {{PLURAL:$1||مراجعة واحدة|مراجعتين|$1 مراجعات|$1 مراجعة}}.\nقُيّد محذف مثل هذه الصفحات لمنع الاضطراب المفاجئة في {{SITENAME}}.",
"delete-warning-toobig": "لهذه الصفحة تاريخ تعديل طويل، أكثر من {{PLURAL:$1||مراجعة واحدة|مراجعتين|$1 مراجعات|$1 مراجعة}}.\nقد يؤدي حذفها إلى اضطراب عمليات قاعدة البيانات في {{SITENAME}}؛\nاستمر مع الحذر.",
- "deleting-backlinks-warning": "'''تحذير:''' ترتبط [[Special:WhatLinksHere/{{FULLPAGENAME}}|صفحات أخرى]] بالصفحة التي أنت على وشك حذفها.",
+ "deleting-backlinks-warning": "[[Special:WhatLinksHere/{{FULLPAGENAME}}|تتصل صفحات أخرى]] بالصفحة التي تريد حذفها.",
"rollback": "استرجاع التعديلات",
"rollback_short": "استرجع",
"rollbacklink": "استرجع",
"rclistfrom": "Ipahiling an baguhon na mga kaliwatan magpoon kan $3 $2",
"rcshowhideminor": "$1 saradit na mga pagliwat",
"rcshowhideminor-show": "Ipatanaw",
- "rcshowhideminor-hide": "Tagoa",
+ "rcshowhideminor-hide": "Itago",
"rcshowhidebots": "$1 mga gantaw",
"rcshowhidebots-show": "Ipatanaw",
- "rcshowhidebots-hide": "Tagoa",
+ "rcshowhidebots-hide": "Itago",
"rcshowhideliu": "$1 rehistradong mga paragamit",
"rcshowhideliu-show": "Ipatanaw",
- "rcshowhideliu-hide": "Tagoa",
+ "rcshowhideliu-hide": "Itago",
"rcshowhideanons": "$1 mga dae bistong paragamit",
"rcshowhideanons-show": "Ipatanaw",
- "rcshowhideanons-hide": "Tagoa",
+ "rcshowhideanons-hide": "Itago",
"rcshowhidepatr": "$1 patrolyadong mga pagliwat",
"rcshowhidepatr-show": "Ipatanaw",
"rcshowhidepatr-hide": "Tagoa",
"rcshowhidemine": "$1 sakong mga pagliliwat",
"rcshowhidemine-show": "Ipatanaw",
- "rcshowhidemine-hide": "Tagoa",
+ "rcshowhidemine-hide": "Itago",
"rclinks": "Ipahilíng an $1 huring mga kaliwatan sa laog nin huring $2 na mga aldaw<br />$3",
"diff": "kalaenan",
"hist": "sagaysay",
"duplicate-defaultsort": "'''Patanid tabi:''' An susing panugmad kan salansan na \"$2\" minasalimbaw sa dating susing panugmad kan salansan na \"$1\".",
"version": "Bersyon",
"version-extensions": "Instaladong mga ekstensyon",
+ "version-skins": "Mga kublit",
"version-specialpages": "Espesyal na mga pahina",
"version-parserhooks": "Mga pangawil kan parser",
"version-variables": "Mga kabalanggayahan",
"version-antispam": "Pan-spam na pangataman",
- "version-skins": "Mga kublit",
"version-other": "An iba pa",
"version-mediahandlers": "Mga Midyang Tagakapot",
"version-hooks": "Mga pangawil",
"pagelang-name": "Старонка",
"pagelang-language": "Мова",
"pagelang-use-default": "Ужываць мову па змоўчаньні",
- "pagelang-select-lang": "Абярыце мову"
+ "pagelang-select-lang": "Абярыце мову",
+ "right-pagelang": "Зьмяніць мову старонкі",
+ "action-pagelang": "зьмену мовы старонкі"
}
"nospecialpagetext": "<strong>Вы звярнуліся па няправільную адмысловую старонку.</strong>\n\nПералік правільных адмысловых старонак ёсць на [[Special:SpecialPages|{{int:specialpages}}]].",
"error": "Памылка",
"databaseerror": "Памылка базы дадзеных",
+ "databaseerror-text": "Здарылася памылка запыту да базы звестак.\nГэта можа ўказваць на няспраўнасць у праграме.",
+ "databaseerror-textcl": "Здарылася памылка запыту да базы звестак.",
"databaseerror-query": "Запыт: $1",
"databaseerror-function": "Функцыя: $1",
"databaseerror-error": "Памылка: $1",
"file-info-png-looped": "бясконца",
"file-info-png-repeat": "паўтараецца $1 {{PLURAL:$1|раз|разоў}}",
"file-info-png-frames": "$1 {{PLURAL:$1|кадр|кадраў}}",
+ "file-no-thumb-animation": "<strong>Заўвага: З-за тэхнічных абмежаванняў мініяцюры гэтага файла не будуць анімаванымі.</strong>",
+ "file-no-thumb-animation-gif": "<strong>Заўвага: З-за тэхнічных абмежаванняў мініяцюры файлаў GIF высокага разрознення, такіх як гэты, ствараюцца без анімацыі.</strong>",
"newimages": "Новыя файлы",
"imagelisttext": "Ніжэй даецца спіс з '''$1''' {{PLURAL:$1|файла|файлаў}} у парадку $2.",
"newimages-summary": "Тут паказаныя нядаўна ўкладзеныя файлы.",
"limitreport-title": "Звесткі прафілявання парсера:",
"limitreport-cputime-value": "$1 {{PLURAL:$1|секунда|секунды|секундаў}}",
"limitreport-walltime-value": "$1 {{PLURAL:$1|секунда|секунды|секундаў}}",
+ "limitreport-ppvisitednodes": "Колькасць вузлоў, наведаных прэпрацэсарам",
+ "limitreport-ppgeneratednodes": "Колькасць вузлоў, створаных прэпрацэсарам",
"limitreport-postexpandincludesize": "Памер уключэнняў па разгортванні",
"limitreport-postexpandincludesize-value": "$1/$2 {{PLURAL:$2|байт|байты|байтаў}}",
"limitreport-templateargumentsize": "Памер аргументаў шаблона",
"tog-hidepatrolled": "हाल के परिवर्तन में मामूली संपादन छुपाईं",
"tog-newpageshidepatrolled": "नयका पृष्ठ के सूची में से जाँचल पृष्क के छुपाँई",
"tog-extendwatchlist": "मात्र हाल के परिवर्तन ही नाही,बल्कि सब परिवर्तन के देखावे खातिर ध्यान सूची के विस्तारित करीं",
- "tog-usenewrc": "तà¥\81रà¤\82त à¤à¤\88ल परिवरà¥\8dतन à¤\86 धà¥\8dयानसà¥\82à¤\9aà¥\80 परिवरà¥\8dतनà¥\8bà¤\82 à¤\95à¥\87 पनà¥\8dना à¤\95à¥\87 à¤\85नà¥\81सार समà¥\82ह मà¥\87à¤\82 बाà¤\81à¤\9fà¥\80 (à¤\9cावासà¥\8dà¤\95à¥\8dरिपà¥\8dà¤\9f à¤\86वशà¥\8dयà¤\95)",
+ "tog-usenewrc": "तà¥\81रà¤\82त à¤à¤\88ल परिवरà¥\8dतन मà¥\87à¤\82 à¤\86 धà¥\8dयानसà¥\82à¤\9aà¥\80 मà¥\87à¤\82 à¤à¤\88ल परिवरà¥\8dतनन à¤\95à¥\87 पनà¥\8dना à¤\85नà¥\81सार समà¥\82ह मà¥\87à¤\82 बाà¤\82à¤\9fà¥\80",
"tog-numberheadings": "स्वयं-सांख्यिकी शिर्षक",
- "tog-showtoolbar": "समà¥\8dपादन à¤\94à¤\9cारà¥\8d बà¤\95à¥\8dसा à¤\95à¥\87 दिà¤\96ाà¤\87लà¥\8d à¤\9cाà¤\8f",
- "tog-editondblclick": "दà¥\81à¤\88 à¤\95à¥\8dलिà¤\95 पर पà¥\83षà¥\8dठसà¤\82पादित à¤\95रà¥\80à¤\82 (à¤\9cावासà¥\8dà¤\95à¥\8dरिपà¥\8dà¤\9f à¤\86वशà¥\8dयà¤\95 बा)",
- "tog-editsectiononrightclick": "अनुभाग शीर्षक पर दायाँ क्लिक कर अनुभाग सम्पादित करीं (जावास्क्रिप्ट आवश्यक बा)",
+ "tog-showtoolbar": "समà¥\8dपादन à¤\94à¤\9cारपà¤\9fà¥\8dà¤\9fà¥\80 à¤\95à¥\87 दिà¤\96ावल à¤\9cाव",
+ "tog-editondblclick": "दà¥\81à¤\88 à¤\95à¥\8dलिà¤\95 पर पनà¥\8dना सà¤\82पादन à¤\95रà¥\80à¤\82",
+ "tog-editsectiononrightclick": "अनुभाग शीर्षक पर दायाँ क्लिक कर अनुभाग सम्पादित करीं",
"tog-watchcreations": "हमरा द्वारा निर्मित पृष्ठ आ हमरा द्वारा लादल फ़ाइलन के हमार ध्यानसूची में जोड़ी",
"tog-watchdefault": "हमरा द्वारा निर्मित पृष्ठ आ हमरा द्वारा लादल फ़ाइलन के हमार ध्यानसूची में जोड़ी",
"tog-watchmoves": "हमरा द्वारा स्थानांतरित पृष्ठ आ लादल फाईल के हमरा ध्यानसूची में जोड़ी",
"tog-shownumberswatching": "ध्यान रखे वालन सदस्यन के देखावल जाव",
"tog-oldsig": "वर्तमान हस्ताक्षर:",
"tog-fancysig": "हस्ताक्षर के विकी पाठ के रुप में उपयोग करीं (बिना स्वचालित कड़ी के)",
- "tog-uselivepreview": "लाà¤\88व पà¥\81रà¥\8dवालà¥\8bà¤\95न à¤\95à¥\87 पà¥\8dरयà¥\8bà¤\97 à¤\95रà¥\80à¤\82 (à¤\9cावासà¥\8dà¤\95à¥\8dरिपà¥\8dà¤\9f हà¥\8bà¤\96à¥\87 à¤\95à¥\87 à¤\9aाहà¥\80à¤\82) (पà¥\8dरयà¥\8bà¤\97à¤\95à¥\8dषम)",
+ "tog-uselivepreview": "लाà¤\87व पà¥\81रà¥\8dवालà¥\8bà¤\95न à¤\95à¥\87 पà¥\8dरयà¥\8bà¤\97 à¤\95रà¥\80à¤\82 (पà¥\8dरयà¥\8bà¤\97ातà¥\8dमà¤\95)",
"tog-forceeditsummary": "यदि सम्पादन सारांश ना दिहल होखे त हमके सूचित करब",
"tog-watchlisthideown": "हमार ध्यान दिहल पन्ना के सूची से हमरा खातिर परिवर्तन छिपाईं",
"tog-watchlisthidebots": "हमार ध्यान सूची से बोट द्वारा करल गईल परिवर्तन के छिपाईं",
"category-empty": "''इ श्रेणी में इ समय कउनो पन्ना या मीडिया नइखे।''",
"hidden-categories": "{{PLURAL:$1|छुपावल गईल श्रेणी|छुपावल गईल श्रेणीं}}",
"hidden-category-category": "छुपावल गइल श्रेणीं",
- "category-subcat-count": "{{PLURAL:$2|à¤\87 शà¥\8dरà¥\87णà¥\80 मà¥\87à¤\82 मातà¥\8dर निमà¥\8dनलिà¤\96ित à¤\89पशà¥\8dरà¥\87णà¥\80 बा|à¤\87 शà¥\8dरà¥\87णà¥\80 मà¥\87à¤\82 निमà¥\8dनलिà¤\96ित {{PLURAL:$1|à¤\89पशà¥\8dरà¥\87णà¥\80|$1 à¤\89पशà¥\8dरà¥\87णà¥\80याà¤\82}} बाड़à¥\87, à¤\95à¥\81ल à¤\89पशà¥\8dरà¥\87णà¥\80याà¤\82 $2 बाड़à¥\87।}}",
+ "category-subcat-count": "{{PLURAL:$2|à¤\87 शà¥\8dरà¥\87णà¥\80 मà¥\87à¤\82 मातà¥\8dर निमà¥\8dनलिà¤\96ित à¤\89पशà¥\8dरà¥\87णà¥\80 बा|à¤\87 शà¥\8dरà¥\87णà¥\80 मà¥\87à¤\82 निमà¥\8dनलिà¤\96ित {{PLURAL:$1|à¤\89पशà¥\8dरà¥\87णà¥\80|$1 à¤\89पशà¥\8dरà¥\87णियाà¤\82}} बाड़à¥\87, à¤\95à¥\81ल à¤\89पशà¥\8dरà¥\87णियाà¤\81$2}}",
"category-subcat-count-limited": "इ श्रेणी में निम्नलिखित {{PLURAL:$1|उपश्रेणी बा|$1 उपश्रेणीं बाड़े}}।",
- "category-article-count": "{{PLURAL:$2|इ श्रेणी में मात्र निम्नलिखित पन्ना बा।|इ श्रेणी में निम्नलिखित {{PLURAL:$1|पन्ना बा|$1 पन्नें}}, कुल पन्नें $2 बाड़े।}}",
+ "category-article-count": "{{PLURAL:$2|इ श्रेणी में मात्र निम्नलिखित पन्न बा।|इ श्रेणी में निम्नलिखित {{PLURAL:$1|पन्ना बा|$1 पन्ना बाड़े}, कुल पन्ना $2}}",
"category-article-count-limited": "निम्नलिखित {{PLURAL:$1|पन्ना|$1 पन्ना}} इ श्रेणीं में बा।",
"category-file-count": "{{PLURAL:$2|इ श्रेणी में मात्र निम्नलिखित फ़ाइल बा।|इ श्रेणी में निम्नलिखित {{PLURAL:$1|फ़ाइल|$1 फ़ाइलं}} बाड़े, कुल फ़ाइलं $2}}",
"category-file-count-limited": "वर्तमान में निम्नलिखित {{PLURAL:$1|पन्ना|$1 पन्नां}} इ श्रेणीं में बाड़े।",
"newwindow": "(नया विंडो में खोलीं)",
"cancel": "निरस्त",
"moredotdotdot": "अउर...",
- "morenotlisted": "à¤\85धिà¤\95 सà¥\82à¤\9aà¥\80बदà¥\8dध नà¤\87à¤\96à¥\87...",
+ "morenotlisted": "à¤\87 सà¥\82à¤\9aà¥\80 पà¥\82रà¥\8dण नà¤\87à¤\96à¥\87।",
"mypage": "पन्ना",
"mytalk": "राउर बात",
"anontalk": "इ आइ॰पी खातिर वार्ता",
"permalink": "स्थायी लिंक",
"print": "छापीं",
"view": "देखीं",
+ "view-foreign": "$1 पर देखीं",
"edit": "सम्पादन",
+ "edit-local": "क्षेत्रीय विवरण देखीं",
"create": "बनाईं",
+ "create-local": "क्षेत्रीय विवरण जोड़ीं",
"editthispage": "ई पन्ना के सम्पादन करीं",
"create-this-page": "ई पन्ना के निर्माण करीं",
"delete": "मिटाईं",
"articlepage": "सामग्री पन्ना देखीं",
"talk": "बात-चीत",
"views": "विचारसूची",
- "toolbox": "à¤\94à¤\9cार-पà¥\87à¤\9fà¥\80",
+ "toolbox": "à¤\89पà¤\95रण",
"userpage": "प्रयोगकर्ता पन्ना देखीं",
"projectpage": "परियोजना पन्ना देखीं",
"imagepage": "फाईल पन्ना देखीँ",
"jumptonavigation": "परिभ्रमण",
"jumptosearch": "खोजीं",
"view-pool-error": "क्षमा करीं, ई समय सर्वर पर बहुत ज्यादा लोड बढ़ गईल बा।\nई पन्ना के बहुते प्रयोगकर्ता लोग देखे के कोशिश कर रहल बानी।\nई पन्ना के फिर से देखे से पहिले कृपया कुछ देर तक इन्तजार करीं।\n\n$1",
+ "generic-pool-error": "क्षमा करीं, ई समय सर्वर पर बहुत ज्यादा लोड बढ़ गईल बा।\nई संसाधन के बहुते प्रयोगकर्ता लोग देखे के कोशिश कर रहल बानी।\nई संसाधन तक पहुँच बनावे के कोशिश से पहिले कृपया कुछ देर तक इन्तजार करीं।",
"pool-timeout": "तालाबन्दी खातिर प्रतीक्षा समय समाप्त",
"pool-queuefull": "पूल पंक्ति भर गइल",
"pool-errorunknown": "अज्ञात त्रुटि",
+ "pool-servererror": "पूल काउंटर सेवा उपलब्ध नाही बा ($1)।",
"aboutsite": "{{SITENAME}} के बारे में",
"aboutpage": "Project:बारे में",
- "copyright": "सामà¤\97à¥\8dरà¥\80 $1 à¤\95à¥\87 तहत à¤\89पलबà¥\8dध बा।",
+ "copyright": "à¤\89पलबà¥\8dध सामà¤\97à¥\8dरà¥\80 $1 à¤\95à¥\87 à¤\85धà¥\80न à¤\89पलबà¥\8dध बा à¤\9cब तà¤\95 à¤\95à¥\80 à¤\85लà¤\97 सà¥\87 à¤\89लà¥\8dलà¥\87à¤\96 ना à¤\95रल à¤\97à¤\88ल हà¥\8bà¤\96à¥\87 ।",
"copyrightpage": "{{ns:project}}:लेखाधिकार",
"currentevents": "हाल के घटना",
"currentevents-url": "Project:हाल के घटना",
"youhavenewmessages": "रउआ लगे बा $1 ($2).",
"youhavenewmessagesfromusers": "रउआ खातिर {{PLURAL:$3|एगो अन्य सदस्य|$3 अन्य सदस्यन}} के $1 बा। ($2)",
"youhavenewmessagesmanyusers": "रउआ खातिर कई सदस्यन द्वारा $1 बा। ($2)",
- "newmessageslinkplural": "{{PLURAL:$1|à¤\8fà¤\97à¥\8b नया सनà¥\8dदà¥\87श बा|नया सनà¥\8dदà¥\87श बाड़न}}",
- "newmessagesdifflinkplural": "{{PLURAL:$1|पिछला|पिछलका}} बदलाव",
+ "newmessageslinkplural": "{{PLURAL:$1|à¤\8fà¤\95 नया सनà¥\8dदà¥\87श|999=नयà¤\95ा सनà¥\8dदà¥\87श}}",
+ "newmessagesdifflinkplural": "पिछला {{PLURAL:$1|बदलाव|999=बदलावं}}",
"youhavenewmessagesmulti": "रउआ लगे $1 पर नया सन्देश बा",
"editsection": "सम्पादन",
"editold": "सम्पादन",
"nospecialpagetext": "<strong>रउआ एगो अवैद्य विशेष पन्ना के अनुरोध कईले बानी।</strong>\n\nवैद्य विशेष पन्ना के सूची मिल सकत बा [[Special:SpecialPages|{{int:specialpages}}]] पर।",
"error": "त्रुटी",
"databaseerror": "डेटाबेस त्रुटी",
+ "databaseerror-text": "डाटाबेस अनुरोध त्रुटि भइल बा।\nसंभवतः सॉफ़्टवेयर में गड़बड़ी बा।",
+ "databaseerror-textcl": "डाटाबेस अनुरोध त्रुटि उत्त्पन्न हो गईल बा।",
+ "databaseerror-query": "अनुरोध: $1",
+ "databaseerror-function": "फ़ंक्शन: $1",
+ "databaseerror-error": "त्रुटि: $1",
"laggedslavemode": "'''चेतावनी:''' इ पन्ना पर हाल के बदलाव ना होखे के आशंका बा।",
"readonly": "डेटाबेस लॉक बा",
"enterlockreason": "लॉक करे के कारण दिहीं, साथे लॉक खुले के समय के लगभग आकलन दिहीं।",
"invalidtitle-knownnamespace": "\"$2\" नामस्थान आ \"$3\" पाठ्य वाला गलत शीर्षक",
"invalidtitle-unknownnamespace": "अज्ञात नामस्थान संख्या $1 आ नाम \"$2\" वाला गलत शीर्षक",
"exception-nologin": "खाता में प्रवेश नईखीं भईल",
- "exception-nologin-text": "इ पन्ना अथवा कार्य खातिर रउआ विकि प्रवेश (लॉग इन) होना आवश्यक है।",
+ "exception-nologin-text": "इ पन्ना अथवा कार्य के सक्षम करे खातिर कृपया [[Special:Userlogin|लॉग इन]] करीं।",
+ "exception-nologin-text-manual": "इ पन्ना अथवा कार्य के सक्षम करे खातिर कृपया $1 करीं।",
"virus-badscanner": "गलत जमाव: अज्ञात वायरस जाँचक: ''$1''",
"virus-scanfailed": "जाँच विफल (कोड $1)",
"virus-unknownscanner": "अज्ञात ऐंटीवायरस:",
"gotaccount": "का पहिले से एगो खाता बा? $1.",
"gotaccountlink": "खाता में प्रवेश",
"userlogin-resetlink": "का रउआ आपन प्रवेश जानकारी भूला गइल बानी?",
- "userlogin-resetpassword-link": "आपन गुप्तशब्द के फिर से बहाल करीं",
+ "userlogin-resetpassword-link": "आपन गुप्तशब्द भूला गईनी का?",
+ "userlogin-helplink2": "खाता प्रवेश साथ मदद",
+ "userlogin-loggedin": "रउआ {{GENDER:$1|$1}} के रूप में पहिले से लॉग्ड इन बानीं।\nकौनो अन्य सदस्य के रूप में लॉग इन करे खातिर निम्नलिखित फ़ॉर्म के प्रयोग करीं।",
+ "userlogin-createanother": "एगो दोसर खाता बनाईं",
"createacct-emailrequired": "ई-मेल पता",
"createacct-emailoptional": "ई-मेल पता (वैकल्पिक)",
"createacct-email-ph": "आपन ई-मेल पता लिखीं",
"passwordtooshort": "गुप्त-शब्द कम से कम {{PLURAL:$1|1 अक्षर|$1 अक्षर}} के होवे के चाहीं।",
"password-name-match": "राउर गुप्त-शब्द राउर प्रयोगकर्ता नाम से अलग होवे के चाहीं।",
"password-login-forbidden": "इस सदस्यनाम आ गुप्तशब्द के प्रयोग वर्जित बा।",
- "mailmypassword": "नया à¤\97à¥\81पà¥\8dत-शबà¥\8dद à¤\88-मà¥\87ल पर à¤à¥\87à¤\9cीं",
+ "mailmypassword": "à¤\97à¥\81पà¥\8dतशबà¥\8dद रिसà¥\87à¤\9f à¤\95रीं",
"passwordremindertitle": "{{SITENAME}} खातिर नया अस्थायी गुप्त-शब्द",
"passwordremindertext": "केहु (शायद रउए, $1 आइ॰पी पता से) {{SITENAME}} ($4) पर प्रयोग खातिर नया गुप्तशब्द के निवेदन कईले बानी। सदस्य \"$2\" खातिर एगो अस्थायी गुप्तशब्द बना दिहल गईल बा, आ ई अभी \"$3\" बा। यदि ई राउरे आशय रहल, त अब रउआ खाता प्रवेश खातिर एगो नया गुप्तशब्द चुने के पड़ी।\nराउर अस्थायी गुप्तशब्द के अवधि {{PLURAL:$5|एक दिन|$5 दिनं}} में समाप्त हो जाई।\n\nयदि इ निवेदन केहु अउर कइले रहल, या रउआ आपन पुरान गुप्तशब्द अब नइखी बदले के चाहत काहे कि रउआ राउर पुरनका गुप्तशब्द के स्मरण हो आइल बा, त रउआ इ संदेश के अनदेखा कर सकत बानी, आ आपन पुरान गुप्तशब्द के प्रयोग पहिले हि जइसन कर सकत बानी।",
"noemail": "\"$1\" सदस्य खातिर कउनो भी ई-मेल पता दर्ज नइखे करल गइल।",
"noemailcreate": "रउआ एगो जायज ई-मेल पता उपलब्ध करावे के पड़ी।",
"passwordsent": "\"$1\" के ई-मेल पता पर एगो नया गुप्तशब्द भेज दिहल गइल बा।\nई-मेल पावे के बाद कृपया दुबारा खाता में प्रवेश करब।",
"blocked-mailpassword": "राउर आइ॰पी पता के सम्पादन करे से वंचित कर दिहल गइल बा, आ गलत प्रयोग रोके खातिर गुप्तशब्द पुनः प्राप्ति के सुविधा इ आइ॰पी पर बंद कर दिहल गइल बा।",
- "eauthentsent": "दरà¥\8dà¤\9c à¤\95रावल à¤\97à¤\87ल à¤\88-मà¥\87ल पता पर à¤\8fà¤\97à¥\8b पà¥\81षà¥\8dà¤\9fिà¤\95रण à¤\88-मà¥\87ल à¤à¥\87à¤\9c दिहल à¤\97à¤\87ल बा।\nरà¤\89à¤\86 à¤\89 à¤\88-मà¥\87ल पर दिहल à¤\97à¤\87ल निरà¥\8dदà¥\87श à¤\95à¥\87 à¤\85नà¥\81सरण à¤\95र à¤\95à¥\87 à¤\88-मà¥\87ल पता à¤\95à¥\87 पà¥\81षà¥\8dà¤\9fिà¤\95रण à¤\95रावà¥\87 à¤\95à¥\87 पड़à¥\80, à¤\93à¤\95रा बादà¥\87 à¤\85हिà¤\9cा सà¥\87 à¤\95à¤\89नà¥\8b दà¥\82सर à¤\88-मà¥\87ल à¤à¥\87à¤\9cल à¤\9cाà¤\88।",
+ "eauthentsent": "दरà¥\8dà¤\9c à¤\95रावल à¤\97à¤\87ल à¤\88-मà¥\87ल पता पर à¤\8fà¤\97à¥\8b पà¥\81षà¥\8dà¤\9fिà¤\95रण à¤\88-मà¥\87ल à¤à¥\87à¤\9c दिहल à¤\97à¤\87ल बा।\nà¤\89 à¤\96ाता पर à¤\95à¥\8cनà¥\8b दà¥\81सर à¤\88मà¥\87ल à¤à¥\87à¤\9cल à¤\9cाà¤\93 à¤\89 सà¥\87 पहिलà¥\87, रà¤\89à¤\86 à¤à¥\87à¤\9cल à¤\97à¤\88ल à¤\88-मà¥\87ल पर दिहल à¤\97à¤\87ल निरà¥\8dदà¥\87श à¤\95à¥\87 à¤\85नà¥\81सरण à¤\95र à¤\95à¥\87 à¤\88-मà¥\87ल पता à¤\95à¥\87 पà¥\81षà¥\8dà¤\9fिà¤\95रण à¤\95रावà¥\87 à¤\95à¥\87 पड़à¥\80 ताà¤\95ि पता à¤\9aलà¥\87 à¤\95à¥\80 सहà¥\80 मà¥\87à¤\82 à¤\89 राà¤\89रà¥\87 à¤\96ाता ह।",
"throttled-mailpassword": "पिछला {{PLURAL:$1|एक घंटा|$1 घंटा}} के अंदर एगो गुप्तशब्द पुनर्स्थापन ई-मेल भेजल जा चुकल बा।\nदुरुपयोग से बचावे खातिर {{PLURAL:$1|एक घंटा|$1 घंटा}} में सिर्फ एगो गुप्तशब्द पुनर्स्थापन ई-मेल भेजल जाई।",
"mailerror": "ई-मेल भेजे में त्रुटि: $1",
"acct_creation_throttle_hit": "राउर आइ॰पी पता से आईल आगंतुक पिछला चौबीस घंटा में इ विकि पर {{PLURAL:$1|एक खाता|$1 खाता}} बना चुकल बानी, इ समयावधि में इहे अधिकतम सीमा बा।\nअतः इ समय इ आइ॰पी पता के प्रयोग करे वाला आगंतुक अउर अधिक खाता नइखन बना सकत।",
- "emailauthenticated": "राउर ई-मेल पता के पुष्ट दिनांक $2 के $3 बजे हो चुकल रहे।",
- "emailnotauthenticated": "राउर ई-मेल पता के अभी तक प्रमाणिकरण नइखे भईल।\nनिम्नलिखित कउनो भी सुविधा खातिर रउआ ई-मेल ना भेजल जाई।",
+ "emailauthenticated": "$2 के $3 पर राउर ई-मेल पता के पुष्टीकरण हो चुकल बा।",
+ "emailnotauthenticated": "राà¤\89र à¤\88-मà¥\87ल पता à¤\95à¥\87 à¤\85à¤à¥\80 तà¤\95 पà¥\8dरमाणिà¤\95रण नà¤\87à¤\96à¥\87 à¤à¤\88ल।\nनिमà¥\8dनलिà¤\96ित à¤\95à¤\89नà¥\8b à¤à¥\80 सà¥\81विधा à¤\96ातिर रà¤\89à¤\86 à¤\95à¥\87 à¤\95à¥\8cनà¥\8b à¤à¥\80 à¤\88-मà¥\87ल ना à¤à¥\87à¤\9cल à¤\9cाà¤\88।",
"noemailprefs": "इ सुविधा के प्रयोग करे खातिर आपन वरियता में एगो ई-मेल पता दिहीं।",
"emailconfirmlink": "अपना ई-मेल पता कन्फर्म करीं",
"invalidemailaddress": "राउर ई-मेल पता स्वीकार करल नइखे जा सकत काहे कि ई-मेल के जउन रुप दिखाई दे रहल बा उ गलत लागत बा।\nकृपया एगो सहि ई-मेल पता उपलब्ध कराईं या उ जगह के खाली छोड़ दिहीं।",
"loginlanguagelabel": "भाषा: $1",
"suspicious-userlogout": "राउर खाता से बाहर जाये के अनुरोध अस्वीकृत कर दिहल गइल बा काहे कि अइसन लग रहल बा कि इ कउनो खराब ब्राउज़र या कैश करे वाली प्रॉक्सी द्वारा भेजल गईल रहल।",
"createacct-another-realname-tip": "असली नाम वैकल्पिक बा।\nयदि रउआ इ के उपलब्ध करावे के चुनत बानी त, एकर प्रयोग सदस्य के ओकरा काम के अधिकार देवे खातिर होखी।",
+ "pt-login": "खाता में प्रवेश",
+ "pt-login-button": "खाता में प्रवेश",
+ "pt-createaccount": "खाता बनाईं",
+ "pt-userlogout": "खाता से बाहर",
"php-mail-error-unknown": "PHP के mail() फ़ंक्शन में अज्ञात त्रुटि बा।",
"user-mail-no-addy": "बिना कउनो ई-मेल पता के ई-मेल भेजे के प्रयत्न भईल बा।",
"user-mail-no-body": "एगो खाली अथवा बहुत छोट ई-मेल भेजे के प्रयत्न भईल बा।",
"changepassword": "गुप्त शब्द बदलीं",
- "resetpass_announce": "रà¤\89à¤\86 à¤\88-मà¥\87ल सà¥\87 पà¥\8dरापà¥\8dत à¤\85सà¥\8dथायà¥\80 à¤\95à¥\8bड सà¥\87 à¤\96ाता मà¥\87à¤\82 पà¥\8dरवà¥\87श à¤à¤\88ल बानà¥\80।\nà¤\96ाता पà¥\8dरवà¥\87श à¤\95à¥\87 पà¥\82रा à¤\95रà¥\87 à¤\96ातिर रà¤\89à¤\86 à¤\87हाà¤\81 à¤\8fà¤\97à¥\8b नया à¤\97à¥\81पà¥\8dतशबà¥\8dद दà¥\87वà¥\87 à¤\95à¥\87 पड़à¥\80:",
+ "resetpass_announce": "लà¥\89à¤\97 à¤\87न समà¥\8dपà¥\82रà¥\8dण à¤\95रà¥\87 à¤\96ातिर रà¤\89à¤\86 à¤\8fà¤\97à¥\8b नया पासवरà¥\8dड दà¥\87वà¥\87 à¤\95à¥\87 हà¥\8bà¤\88।",
"resetpass_header": "खाता के गुप्तशब्द बदलीं",
"oldpassword": "पुराना गुप्त-शब्द:",
"newpassword": "नया गुप्त-शब्द:",
"retypenew": "नया गुप्त-शब्द पुन: डालीं:",
"resetpass_submit": "गुप्तशब्द बनाईं आ खाता में प्रवेश करीं",
"changepassword-success": "राउर गुप्तशब्द सफलतापुर्वक बदल दिहल गईल बा!",
+ "changepassword-throttled": "रउआ हाले में कईयन बार खाता में प्रवेश करे के कोशिश कर चुकल बानी।\nकृपया $1 प्रतिक्षा करला के बाद फिर से प्रयास करब।",
"resetpass_forbidden": "गुप्तशब्द बदलल नइखे जा सकत",
"resetpass-no-info": "इ पन्ना के सिधे प्रयोग करे खातिर रउआ पहिले खाता में प्रवेश करे के पड़ी।",
"resetpass-submit-loggedin": "गुप्त शब्द बदलीं",
"resetpass-submit-cancel": "रद्द करीं",
"resetpass-wrong-oldpass": "अवैद्य अस्थायी या वर्तमान गुप्तशब्द।\nरउआ पहिले हिं सफलतापूर्वक आपन गुप्तशब्द बदल चुकल बानी, या रउआ एगो अस्थायी गुप्तशब्द के अनुरोध कइले होखब।",
+ "resetpass-recycled": "रीसेट करे खातिर नया पासवर्ड में कृपया आपन वर्तमान पासवर्ड के अलावा कौनो अन्य पासवर्ड के प्रयोग करीं।",
+ "resetpass-temp-emailed": "अस्थाई ईमेल कोड के द्वारा रउआ लॉग इन भइल बानी।\nलॉग इन पूरा करे खातिर, रउआ एगो नया पासवर्ड सेट करे के पड़ी:",
"resetpass-temp-password": "अस्थायी गुप्तशब्द:",
"resetpass-abort-generic": "कउनो एक्सटेंशन द्वारा गुप्तशब्द में बदलाव रोक दिहल गईल बा।",
+ "resetpass-expired": "राउर पासवर्ड की वैधता अवधि समाप्त हो चुकल बा। कृपया लॉग इन करे खातिर एगो नया पासवर्ड सेट करीं।",
"passwordreset": "गुप्तशब्द रिसेट करीं",
"passwordreset-text-one": "आपन गुप्तशब्द के पुनर्स्थापित करे खातिर इ फॉर्म भरीं।",
"passwordreset-text-many": "{{PLURAL:$1|आपन गुप्तशब्द पुनर्स्थापित करे खातिर निम्न में से कउनो एगो स्थान भरीं।}}",
"permissionserrors": "अनुमति त्रुटी",
"log-fulllog": "पूरा लॉग देखीं",
"edit-conflict": "संपादन अंतर्विरोध",
+ "postedit-confirmation-created": "पन्ना बना दिहल गईल।",
"postedit-confirmation-saved": "राउर सम्पादन सुरक्षित कर दिहल गईल।",
"invalid-content-data": "अवैध डाटा सामग्री",
"content-model-wikitext": "विकीपाठ्य",
"prefs-editing": "संपादन",
"searchresultshead": "खोज",
"savedprefs": "राउर वरीयताएँ सुरक्षित कर दिहल गईल।",
+ "timezoneregion-africa": "अफ़्रीका",
+ "timezoneregion-america": "अमेरिका",
+ "timezoneregion-antarctica": "अंटार्कटिका",
+ "timezoneregion-arctic": "आर्कटिक",
"timezoneregion-asia": "एशिया",
+ "timezoneregion-atlantic": "एटलांटिक महासागर",
"timezoneregion-australia": "अस्ट्रेलिया",
"timezoneregion-europe": "यूरोप",
"timezoneregion-indian": "हिंद महासागर",
"yourrealname": "असली नाम",
"yourlanguage": "भाषा:",
"prefs-preview": "पूर्वावलोकन",
+ "action-move": "ई पन्ना के स्थांतरण करीं",
+ "action-delete": "ई पन्ना के मिटाईं",
"recentchanges": "तुरंत भईल परिवर्तन",
"recentchanges-legend": "हाल के परिवर्तन संबंधी विकल्प",
"recentchanges-label-newpage": "ई सम्पादन से एगो नवका पृष्ठ तैयार हो गइल बा",
"recentchanges-label-minor": "ई एगो छोटा सम्पाद बा",
+ "recentchanges-legend-heading": "'''कुंजी:'''",
"rcshowhideminor": "$1 छोट सम्पादन",
+ "rcshowhideminor-show": "दिखाईं",
+ "rcshowhideminor-hide": "छुपाँई",
"diff": "अन्तर",
"hist": "इति",
"hide": "छुपाँई",
"recentchangeslinked": "सम्बन्धित बदलाव",
"recentchangeslinked-feed": "सम्बन्धित बदलाव",
"recentchangeslinked-toolbox": "सम्बन्धित बदलाव",
+ "recentchangeslinked-page": "पन्ना नाम:",
"upload": "फाईल लादीं",
+ "filedesc": "सारांश",
+ "fileuploadsummary": "सारांश:",
+ "filesource": "स्रोत:",
+ "unknown-error": "अज्ञात त्रुटि उत्पन्न हो गईल बा।",
"file-anchor-link": "फ़ाइल",
"filehist": "पन्ना के इतिहास",
"filehist-deleteall": "सब मिटाईं",
"token_suffix_mismatch": "'''S'ha rebutjat la vostra modificació perquè el vostre client ha fet malbé els caràcters de puntuació en el testimoni d'edició. S'ha rebutjat la modificació per a evitar la corrupció del text de la pàgina. Açò passa a vegades quan s'utilitza un servei web de servidor intermediari anònim amb problemes.'''",
"edit_form_incomplete": "'''Certes parts del formulari de modificació no han arribat al servidor, verifiqueu que les vostres modificacions estan intactes i proveu-ho de nou.'''",
"editing": "Edició de la pàgina «$1»",
- "creating": "S'està creant $1",
- "editingsection": "Edició de «$1» (secció)",
- "editingcomment": "Edició de «$1» (secció nova)",
+ "creating": "Creació de la pàgina «$1»",
+ "editingsection": "Edició de la pàgina «$1» (secció)",
+ "editingcomment": "Edició de la pàgina «$1» (secció nova)",
"editconflict": "Conflicte d'edició: $1",
"explainconflict": "Algú més ha canviat aquesta pàgina des que l'heu editada.\nL'àrea de text superior conté el text de la pàgina com existeix actualment.\nEls vostres canvis es mostren en l'àrea de text inferior.\nHaureu de fusionar els vostres canvis en el text existent.\n'''Només''' el text de l'àrea superior es desarà quan premeu el botó «{{int:savearticle}}».",
"yourtext": "El vostre text",
"Mega programmer",
"Sasan700",
"Умар",
- "아라"
+ "아라",
+ "Kaganer"
]
},
"tog-underline": "КӀел сиз хьакха хьажорган:",
"login-abort-generic": "Сестемин довзийта тарцаделира",
"loginlanguagelabel": "Мотт: $1",
"suspicious-userlogout": "Хьан сеанс чекхъяккха дина дехаш кхочуш цадина, иза нийса йоцу браузерца дар бахьнехь я прокси кэш еш хилар бахьнехь.",
+ "createacct-another-realname-tip": "Декъашхочун бакъ цӀе (яз ца йича мега).\nАхьа и язяхь, агӀона хийцам бича хьан цӀе гуш хира ю.",
"pt-login": "ЧугӀо",
"pt-login-button": "ЧугӀо",
"pt-createaccount": "Кхолла декъашхочун дӀаяздар",
"revdelete-reason-dropdown": "Даржина долу дӀаяккхаран баьхьанаш \n** Авторан бакъонаш талхор\n** Бита йиш йоцу шех лаьцна хаам\n** Бакъдоцург зуламан хаам",
"revdelete-otherreason": "Кхин бахьна/тӀетохар:",
"revdelete-reasonotherlist": "Кхин бахьна",
- "revdelete-edit-reasonlist": "Бахьанин могӀам нисяр",
+ "revdelete-edit-reasonlist": "Бахьанин могӀам нисбар",
"revdelete-offender": "АгӀона версен автор:",
"suppressionlog": "Хьулдаран тептар",
"mergehistory": "Нисдарин истори цхьаьнатохар",
"http-read-error": "Ешаран гӀалат HTTP.",
"http-timed-out": "Хьежаран хан чекхели HTTP-жоп дехаран.",
"http-curl-error": "URLан гӀалат: $1",
+ "upload-curl-error6": "Билгал дина адресе хьажа цало.",
"upload-curl-error28": "Чуйоккху хан чеккхелла",
"license": "Бакъойалар:",
"license-header": "Бакъойалар",
"filedelete-otherreason": "Кхин бахьна:",
"filedelete-reason-otherlist": "Кхин бахьна",
"filedelete-reason-dropdown": "* Даржина долу дӀаяккхаран баьхьанаш \n** Авторан бакъонаш талхор\n** ЦхӀатера файлаш хилар",
- "filedelete-edit-reasonlist": "Бахьанин могӀам нисяр",
+ "filedelete-edit-reasonlist": "Бахьанин могӀам нисбар",
"filedelete-maintenance-title": "Файл дӀаяккха цало",
"mimesearch": "MIME хула лаха",
"mimesearch-summary": "ХӀокху агӀоно йиш хуьлуьйту MIME-тайпан файлаш харжа. Яздеш долу формат: чулацаман тайп/бухара тайп, масала <code>image/jpeg</code>.",
"deleteotherreason": "Кхин бахьна/тӀетохар:",
"deletereasonotherlist": "Кхин бахьна",
"deletereason-dropdown": "* Даржина долу дӀаяккхаран баьхьанаш \n** зулма \n** авторан лаамца\n** авторан бакъонаш талхор",
- "delete-edit-reasonlist": "Бахьанин могӀам нисяр",
+ "delete-edit-reasonlist": "Бахьанин могӀам нисбар",
"deleting-backlinks-warning": "'''ДӀахьедар:''' Ахьа дӀайоккхуш йолчун тӀе товжийна [[Special:WhatLinksHere/{{FULLPAGENAME}}|кхин агӀонаш]] ю.",
"rollback": "Юхабаккха хийцам",
"rollback_short": "Юхаяккхар",
"modifiedarticleprotection": "агlонан гlаролли локхалла хийцина «[[$1]]»",
"unprotectedarticle": "ГӀоролла дӀадаьстина «[[$1]]»",
"movedarticleprotection": "«[[$2]]» агӀона тӀера гӀаролла «[[$1]]» агӀона тӀе даьккхина",
- "protect-title": "Ð\9eÑ\86Ñ\83нна «$1» гÓ\80оÑ\80алла даÑ\80",
+ "protect-title": "Ð\93Ó\80оÑ\80алла Ñ\85Ó\80оÑ\82Ñ\82оÑ\80: «$1»",
"protect-title-notallowed": "ГӀораллин бараме хьажар «$1»",
"prot_1movedto2": "«[[$1]]» цӀе хийцина → «[[$2]]»",
"protect-badnamespace-title": "ГӀораладан цалуш йолу цӀерийн меттиг",
"protect-otherreason": "Кхин бахьна/тӀетохар:",
"protect-otherreason-op": "Кхин бахьна",
"protect-dropdown": "* ГӀоралла дарна баьхьаш \n** сих-сиха зулам дар \n** дуккха спам хилар\n** нисдаршан тӀом \n** гӀараялл агӀо",
- "protect-edit-reasonlist": "Бахьанин могӀам нисяр",
+ "protect-edit-reasonlist": "Бахьанин могӀам нисбар",
"protect-expiry-options": "1 сахьт:1 hour,1 де:1 day,1 кӀиран:1 week,2 кӀиран:2 weeks,1 бутт:1 month,3 бутт:3 months,6 бутт:6 months,1 шо:1 year,цlкъа:infinite",
"restriction-type": "Бакъонаш:",
"restriction-level": "ТӀекхочаран локхалла:",
"contribsub2": "Къинхьегам $1 ($2)",
"contributions-userdoesnotexist": "«$1» декъашхочун дӀаяздар дӀаяздина яц.",
"nocontribs": "Дехарца хийцамаш цакарий.",
- "uctop": " (тlаьхьара)",
+ "uctop": "(карара)",
"month": "Баттаца (я хьалхе):",
"year": "Шерачохь (я хьалхе):",
"sp-contributions-newbies": "Гайта бекъ къинхьегам, керла дlабазбиначара бина болу",
"istemplate": "юкъаялийнарш",
"isimage": "Файлан хьажораг",
"whatlinkshere-prev": "{{PLURAL:$1|1=хьалхайодарг|хьалхайодарш}} $1",
- "whatlinkshere-next": "{{PLURAL:$1|тlаьхьайогlург|тlаьхьайогlурш|тlаьхьайогlурш}} $1",
+ "whatlinkshere-next": "{{PLURAL:$1|тӀаьхьайогӀург|тӀаьхьайогӀурш}} $1",
"whatlinkshere-links": "← хьажоргаш",
"whatlinkshere-hideredirs": "$1 дӀасахьажорш",
"whatlinkshere-hidetrans": "$1 латораш",
"ipbsubmit": "Блоктоха хӀокху декъашхочун/адресна",
"ipbother": "Кхин хан:",
"ipboptions": "2 сахьат:2 hours,1 де:1 day,3 де:3 days,1 кlиран:1 week,2 кlиран:2 weeks,1 бутт:1 month,3 бутт:3 months,6 бутт:6 months,1 шо:1 year,цӀкъа:infinite",
+ "ipbhidename": "Нисдарийн а могӀаман а чура декъашхочун цӀе хьул йе",
"ipbwatchuser": "ТӀетоха тергаме могӀам юкъа цуьнан долахь йолу агӀо а цуьнан дийцаре агӀо а",
"ipb-disableusertalk": "Цамагдо шин дийцаре агӀо та я блоктоьхна хан чекхъяллалц",
"ipb-change-block": "Юхаблоктоха декъашхочун оьцу хийцамашца",
"blockipsuccesssub": "Блоктохар чакхдели",
"blockipsuccesstext": "[[Special:Contributions/$1|«$1»]] {{GENDER:$1|блоктоьхна}}.<br />\nХьажа. [[Special:BlockList|блоктоьхна IP-адресийнн могӀам]].",
"ipb-blockingself": "Хьо хьайна блоктоха гӀерта! Лаьий хьона и кхочушдан?",
- "ipb-edit-dropdown": "Бахьанин могӀам нисяр",
+ "ipb-edit-dropdown": "Бахьанин могӀам нисбар",
"ipb-unblock-addr": "ДӀаякхаблок $1",
"ipb-unblock": "дӀаякхаблок декъашхонтӀера я IP-адрес тӀера",
"ipb-blocklist": "Блоктоьхнарш",
"block-log-flags-noautoblock": "ша блоктухарг дӏаяйина",
"block-log-flags-noemail": "цамаго кехаташ кхехӀита",
"block-log-flags-nousertalk": "шин дийцаре агӀо тая лууш дац",
+ "block-log-flags-angry-autoblock": "латина шуьйра автоблоктохар",
"block-log-flags-hiddenname": "декъашхочун цӀе къайлаяьккхина",
+ "range_block_disabled": "Куьйгалхошна диапазонашна блоктоха цамага до.",
"ipb_expiry_invalid": "Дешдерг дан нийса йоцу хан.",
"ipb_already_blocked": "«$1» хӀинцале блоктоьхна ю.",
"ipb-needreblock": "ХӀокху $1 декъашхочун {{GENDER:$1|блоктоьхна ю}}. Лаьий хьуна блоктохаран параметраш хийца?",
"ipb_cant_unblock": "ГӀалат: блоктохар цакарий $1. Иза хӀинцале дӀаяьккхина хила мега.",
"ip_range_invalid": "IP-адресийн магийна йоцу диапазон.",
"proxyblocker": "Проксин блоктохар",
+ "lockdb": "Хаамийн база еша бен цалуш йе",
+ "unlockdb": "Хаамийн базан чу дӀаяздарш дан аьтту меттахӀотта бе",
+ "lockbtn": "Хаамийн база еша бен цалуш йе",
+ "unlockbtn": "Хаамийн базан чу дӀаяздарш дан аьтту меттахӀотта бе",
+ "locknoconfirm": "Ахьа бакъдеш йолу меттиге билгало йилина яц.",
+ "lockdbsuccesssub": "Хаамийн базан блоктоьхна",
+ "unlockdbsuccesssub": "Хаамийн базан тӀера блокдӀаяьккхина",
"move-page": "$1 — цӀе хийцар",
"move-page-legend": "ЦӀe хийца яр",
"movepagetext": "Бухахь йолу форманца агӀон цӀе хийцало. Цул совнах цуьна хийцаман тептар кхоьчу метте доккха. Хьалхалера цӀарахь хиръю керла кхоьллина агӀонан хьажораг.\n\nХьовсалаш [[Special:DoubleRedirects|шалха]] а [[Special:BrokenRedirects|йохна хьажоргаш]] юй техь аьлла.\n\nШу жоьпехь ду хьажоргаш нийса некъ гойтуш хиларан.\n\nТидам бе хьалхалера агӀон цӀе ‘’’хийцалур яц’’’ иштта цӀе йолу агӀо йолуш елахь. Юкъардаккхар: йолуш йолу агӀо кхоьчухьа хьажораг елахь, я еса елахь а, цуьна хийцаме истори яцахь а.\n\nИ бохург ду шун агӀонан цӀе юха а хьалха хилларгчунтӀе хийца йиш ю, амма йолуш йолу агӀо дӀаяккха йиш яц.\n\n'''ДӀАХЬЕДАР!'''\n\nЦӀе хийцар бахьнехь гӀаръяьлла агӀонашна дукха дагахь боцу хийцамаш хила тарло. Цундела цӀе хийцале шеш хила тарлучу тӀехьонашах кхета аьлла тешна хила.",
"filemissing": "Файл цакарий",
"thumbnail_error": "Миниатюра кхолларна гӀалат: $1",
"thumbnail_error_remote": "ГӀалатах хаам $1:\n$2",
+ "thumbnail_image-missing": "$1 файл йоцчух тера ду",
"import": "АгӀонаш чуяхар",
"importinterwiki": "Викиюкъахь-импорт",
"import-interwiki-source": "Вики-хьост/агlо:",
"tooltip-ca-nstab-template": "Куцкепа агlо",
"tooltip-ca-nstab-help": "ГӀоьна агӀо",
"tooltip-ca-nstab-category": "Категорешан агӀо",
- "tooltip-minoredit": "Къастам бé хlокху хийцамна кlеззиг боуш санна",
+ "tooltip-minoredit": "Къастам бé хӀокху хийцамна кӀеззиг болуш санна",
"tooltip-save": "Хьан хийцамаш lалашбой",
"tooltip-preview": "Дехар до, агlо lалаш йарал хьалха хьажа муха йу яз!",
"tooltip-diff": "Гайта долуш долу йозанах бина болу хийцам.",
"ago": "$1 хьалха",
"just-now": "хӀинца",
"hours-ago": "$1 сахьт хьалха",
- "minutes-ago": "$1 минут хьалха",
+ "minutes-ago": "$1 {{PLURAL:$1|минут}} хьалха",
"seconds-ago": "$1 {{PLURAL:$1|секунд}} хьалха",
"monday-at": "оршотан дийнахь $1",
"tuesday-at": "шинара дийнахь $1",
"exif-datetimeexpires": "Ма лелае тӀехьа",
"exif-datetimereleased": "Араяларан терахь",
"exif-originaltransmissionref": "ДӀадолалун меттиган код",
+ "exif-identifier": "ID",
"exif-lens": "ID",
"exif-serialnumber": "Камеран серин номер",
"exif-cameraownername": "Камера ерг",
"exif-whitebalance-0": "Къайн автоматически баланс",
"exif-whitebalance-1": "Куьйга хӀоттийна къайн баланс",
"exif-scenecapturetype-0": "Стандартан",
+ "exif-scenecapturetype-3": "Буса даьккхина сурт",
"exif-gaincontrol-0": "Яц",
+ "exif-gaincontrol-1": "Жим докха дар",
+ "exif-gaincontrol-2": "Дукху доккха дар",
+ "exif-gaincontrol-3": "Дуккху жим дар",
+ "exif-gaincontrol-4": "Дукху жим дар",
"exif-contrast-0": "Лартӏахь",
"exif-contrast-1": "КӀеда айина",
"exif-contrast-2": "ЧӀогӀа айина",
"exif-dc-type": "Медиан тайп",
"exif-rating-rejected": "ДӀайайина",
"exif-isospeedratings-overflow": "65535 дукха",
+ "exif-iimcategory-ace": "Исбаьхьалла, культура а синкъерам а",
+ "exif-iimcategory-clj": "Зулам дар а Ӏедал а",
+ "exif-iimcategory-dis": "Ирча бохам а авари а",
+ "exif-iimcategory-fin": "Экономика а бизнес а",
+ "exif-iimcategory-edu": "Дешна хилар",
"exif-iimcategory-lab": "Къинхьегам",
"exif-urgency-normal": "Диканиг ($1)",
"exif-urgency-low": "Лахара ($1)",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|хийцина}} хӏокхуна $3 бакъо",
"logentry-rights-autopromote": "$1 {{GENDER:$2|вара|яра}} автоматически {{GENDER:$2|сихьа ваьлла|сихьа яьлла}} $4 $5 чу",
"rightsnone": "(яц)",
+ "feedback-bugornote": "Хьайн техникин халонах лаьцна яздан хӀума делахь, дехар до, [$1 хаам бе тхоьга].\nДацахь хьан йиш ю хӀокху атта кепаца «[$3 $2]» агӀонг къамел тӀетоха хьан декъашхочун цӀарца, кхин лелош йолу браузер билгал еш.",
"feedback-subject": "Къамел:",
"feedback-message": "Хаам:",
"feedback-cancel": "Цаоьшу",
"license-nopreview": "(Preview not available)",
"upload_source_url": "(a valid, publicly accessible URL)",
"upload_source_file": "(a file on your computer)",
+ "listfiles-delete": "delete",
"listfiles-summary": "This special page shows all uploaded files.",
"listfiles_search_for": "Search for media name:",
"imgfile": "file",
"Mcervera",
"Wifidel",
"Macofe",
- "Koavf"
+ "Koavf",
+ "Themasterriot"
]
},
"tog-underline": "Subrayar los enlaces:",
"recentchanges-summary": "Sigue los cambios más recientes de la wiki en esta página.",
"recentchanges-noresult": "No hubo cambios durante el período seleccionado que respondan a esos criterios.",
"recentchanges-feed-description": "Realiza un seguimiento de los cambios más recientes en el wiki en este canal.",
- "recentchanges-label-newpage": "Esta edición inició una página",
+ "recentchanges-label-newpage": "Esta edición creó una página",
"recentchanges-label-minor": "Esta es una edición menor",
"recentchanges-label-bot": "Esta edición fue realizada por un robot",
"recentchanges-label-unpatrolled": "Esta edición todavía no se ha patrullado",
"아라",
"Scoopfinder",
"Akeron",
- "Linedwell"
+ "Linedwell",
+ "Yona b"
]
},
"tog-underline": "Souligner les liens :",
"tog-numberheadings": "Cuir àireamhan ri ceann-sgrìobhaidhean leis fhèin",
"tog-showtoolbar": "Seall am bàr-inneal deasachaidh",
"tog-editondblclick": "Tòisich air deasachadh duilleige le briogadh dùbailte",
- "tog-editsectiononrightclick": "Cuir an comas deasachadh earrainn le briogadh deas air tiotal de dh'earrainn",
+ "tog-editsectiononrightclick": "Cuir an comas deasachadh earrainn le briogadh deas air tiotal na h-earrainn",
"tog-watchcreations": "Cuir duilleagan a chruthaicheas mi air a' chlàr-fhaire agam",
"tog-watchdefault": "Cuir duilleagan a dheasaicheas mi air a' chlàr-fhaire agam",
"tog-watchmoves": "Cuir duilleagan a ghluaiseas mi air a' chlàr-fhaire agam",
"tog-showhiddencats": "Seall na roinnean-seòrsa falaichte",
"tog-norollbackdiff": "Na seall na diofaran às dèidh roladh air ais",
"tog-useeditwarning": "Thoir rabhadh dhomh ma bhios mi an impis duilleag deasachaidh fhàgail mus do shàbhail mi na mùthaidhean agam",
- "tog-prefershttps": "Cleachd ceangal tèarainte an-còmhnaidh nuair a bhios mi clàraichte a-staigh",
+ "tog-prefershttps": "Cleachd ceangal tèarainte an-còmhnaidh nuair a bhios mi air logadh a-steach",
"underline-always": "An-còmhnaidh",
"underline-never": "Na dèan seo idir",
"underline-default": "Bun-roghainn a' bhrabhsair no a' chraicinn",
"filereadonlyerror": "Cha ghabh am faidhle \"$1\" atharrachadh a chionn 's gu bheil ionad-tasgaidh fhaidhlichean \"$2\" ri leughadh a-mhàin.\nThug an rianaire a ghlais e seachad an t-adhbhar a leanas: \"$3\".",
"invalidtitle-knownnamespace": "Tiotal mì-dhligheach leis an ainm-spàs \"$2\" agus an teacsa \"$3\"",
"invalidtitle-unknownnamespace": "Tiotal mì-dhligheach leis an àireamh ainm-spàis $1 agus an teacsa \"$2\"",
- "exception-nologin": "Chan eil thu air clàradh a-steach",
- "exception-nologin-text": "Feumaidh tu [[Special:Userlogin|clàradh a-steach]] mus fhaic thu an duilleag seo no mus urrainn dhut seo a dhèanamh.",
+ "exception-nologin": "Chan eil thu air logadh a-steach",
+ "exception-nologin-text": "Feumaidh tu [[Special:Userlogin|logadh a-steach]] mus fhaic thu an duilleag seo no mus urrainn dhut seo a dhèanamh.",
"exception-nologin-text-manual": "Ma tha thu ag iarraidh cothrom air an duilleag no air a' ghnìomh seo, $1.",
"virus-badscanner": "Droch cho-dhealbhachd: sganair bhìorasan neo-aithnichte: <em>$1</em>",
"virus-scanfailed": "dh'fhàillig an sganadh (còd $1)",
"virus-unknownscanner": "sganair bhìorasan neo-aithnichte:",
- "logouttext": "<strong>Chaidh do chlàradh a-mach.</strong>\n\nThoir an aire gum bi coltas air cuid dhe na duilleagan mar gum biodh tu air clàradh a-steach gus am falamhaich thu tasgadan a' bhrabhsair agad.",
+ "logouttext": "<strong>Chaidh do logadh a-mach.</strong>\n\nThoir an aire gum bi coltas air cuid dhe na duilleagan mar gum biodh tu air logadh a-steach gus am falamhaich thu tasgadan a' bhrabhsair agad.",
"welcomeuser": "Fàilte ort, $1",
"welcomecreation-msg": "Chaidh an cunntas agad a chruthachadh.\nNa dìochuimhnich na [[Special:Preferences|roghainnean agad air {{SITENAME}}]] a ghleusadh dhut fhèin.",
"yourname": "Ainm-cleachdaiche:",
"userlogin-yourname": "Ainm-cleachdaiche",
"userlogin-yourname-ph": "Cuir a-steach an t-ainm-cleachdaiche agad",
"createacct-another-username-ph": "Cuir a-steach an t-ainm-cleachdaiche",
- "yourpassword": "Am facal-faire agad",
+ "yourpassword": "Facal-faire:",
"userlogin-yourpassword": "Facal-faire",
"userlogin-yourpassword-ph": "Cuir a-steach am facal-faire agad",
"createacct-yourpassword-ph": "Cuir a-steach facal-faire",
"createacct-yourpasswordagain": "Dearbh am facal-faire",
"createacct-yourpasswordagain-ph": "Cuir a-steach am facal-faire a-rithist",
"remembermypassword": "Cuimhnich gu bheil mi air logadh a-steach air a' choimpiutair seo (suas gu $1 {{PLURAL:$1|latha|latha|làithean|latha}})",
- "userlogin-remembermypassword": "Cum clàraichte a-staigh mi",
+ "userlogin-remembermypassword": "Cum air logadh a-steach mi",
"userlogin-signwithsecure": "Cleachd ceangal tèarainte",
"yourdomainname": "An àrainn-lìn agad:",
"password-change-forbidden": "Chan urrainn dhut faclan-faire atharrachadh air an uicipeid seo.",
"gotaccountlink": "Log a-steach",
"userlogin-resetlink": "Na dhìochuimhnich thu d' ainm is facal-faire?",
"userlogin-resetpassword-link": "Na dhìochuimhnich thu am facal-faire agad?",
- "userlogin-helplink2": "Taic le clàradh a-steach",
- "userlogin-loggedin": "Chaidh do chlàradh mar $1 mu thràth.\nCleachd am foirm gu h-ìosal airson clàradh a-steach mar chleachdaiche eile.",
+ "userlogin-helplink2": "Taic le logadh a-steach",
+ "userlogin-loggedin": "Chaidh do logadh a-steach mar $1 mu thràth.\nCleachd am foirm gu h-ìosal airson logadh a-steach mar chleachdaiche eile.",
"userlogin-createanother": "Cruthaich cunntas eile",
"createacct-emailrequired": "Seòladh puist-d",
"createacct-emailoptional": "Seòladh puist-d (roghainneil)",
"password-login-forbidden": "Tha an t-ainm-cleachdaiche 's am facal-faire seo toirmisgte.",
"mailmypassword": "Ath-shuidhich am facal-faire",
"passwordremindertitle": "Facal-faire sealach ùr airson {{SITENAME}}",
- "passwordremindertext": "Dh'iarr cuideigin ('s mathaid gun do dh'iarr thusa seo on t-seòladh IP $1) facal-faire ùr airson {{SITENAME}} ($4). Chaidh facal-faire sealach a chruthachadh airson \"$2\" a tha 'na \"$3\".\nMa bha sin fa-near dhut, bidh agad ri clàradh a-steach agus facal-faire ùr a thaghadh\nan-dràsta fhèin. Falbhaidh an ùine air an fhacal-fhaire sealach agad ann an {{PLURAL:$5|$5 latha|$5 latha|$5 làithean|$5 latha}}.\n\nMa dh'iarr cuideigin eile seo no ma chuimhnich thu am facal-faire agad 's mur eil thu\nairson atharrachadh tuilleadh, 's urrainn dhut an teachdaireachd seo a leigeil seachad\nagus leantainn ort leis an t-seann fhacal-faire.",
+ "passwordremindertext": "Dh'iarr cuideigin ('s mathaid gun do dh'iarr thusa seo on t-seòladh IP $1) facal-faire ùr airson {{SITENAME}} ($4). Chaidh facal-faire sealach a chruthachadh airson \"$2\" a tha 'na \"$3\".\nMa bha sin fa-near dhut, bidh agad ri logadh a-steach agus facal-faire ùr a thaghadh\nan-dràsta fhèin. Falbhaidh an ùine air an fhacal-fhaire sealach agad ann an {{PLURAL:$5|$5 latha|$5 latha|$5 làithean|$5 latha}}.\n\nMa dh'iarr cuideigin eile seo no ma chuimhnich thu am facal-faire agad 's mur eil thu\nairson atharrachadh tuilleadh, 's urrainn dhut an teachdaireachd seo a leigeil seachad\nagus leantainn ort leis an t-seann fhacal-faire.",
"noemail": "Cha deach post-d a chlàradh airson a' chleachdaiche \"$1\".",
"noemailcreate": "Feumaidh tu post-d dligheach a chur ann",
- "passwordsent": "Chaidh facal-faire ùr a chur dhan phost-d a chaidh a chlàradh airson \"$1\".\nClàraich a-steach a-rithist nuair a gheibh thu e.",
+ "passwordsent": "Chaidh facal-faire ùr a chur dhan phost-d a chaidh a chlàradh airson \"$1\".\nDèan logadh a-steach a-rithist nuair a gheibh thu e.",
"blocked-mailpassword": "Chaidh bacadh a chur air an t-seòladh IP agad 's chan eil cead deasachaidh agad agus chan urrainn dhut an gleus a chum aiseag an fhacail-fhaire a chleachdadh gus casg a chur air mì-ghnàthachadh.",
"eauthentsent": "Chaidh post-d dearbhaidh a chur dhan phost-d a chaidh ainmeachadh.\nMus dèid post-d sam bith eile a chur dhan chunntas, feumaidh tu leantainn ris an stiùireadh sa phost-d mar dhearbhadh gur ann agadsa a tha an cunntas.",
"throttled-mailpassword": "Chaidh post-d a chur airson ath-shuidheachadh facail-fhaire mu thràth $1 {{PLURAL:$1|uair|uair|uairean|uair}} a thìde air ais.\nGus casg a chur air mì-ghnàthachadh, cha chuir sinn ach aon chuimhneachan facail-fhaire gach $1 {{PLURAL:$1|uair|uair|uairean|uair}} a thìde.",
"accountcreated": "Cunntas cruthaichte",
"accountcreatedtext": "Chaidh an cunntas cleachdaiche airson [[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|na deasbaireachd]]) a chruthachadh.",
"createaccount-title": "Cruthachadh cunntais airson {{SITENAME}}",
- "createaccount-text": "Chruthaich cuideigin cunntas airson a' phost-d agad air {{SITENAME}} ($4) air a bheil \"$2\", leis an fhacal-fhaire \"$3\".\nBu chòir dhut clàradh a-steach agus am facal-faire agad atharrachadh gu h-ìosal an-dràsta.\n\n'S urrainn dhut an teachdaireachd seo a leigeil seachad ma chaidh an cunntas a chruthachadh air mhearachd.",
- "login-throttled": "Dh'fheuch thu ri clàradh a-steach ro thric o chionn ghoirid.\nFuirich ort $1 mus feuch thu ris a-rithist.",
- "login-abort-generic": "Cha do shoirbhich leat leis a' chlàradh a-steach - Chaidh sgur dheth",
+ "createaccount-text": "Chruthaich cuideigin cunntas airson a' phost-d agad air {{SITENAME}} ($4) air a bheil \"$2\", leis an fhacal-fhaire \"$3\".\nBu chòir dhut logadh a-steach agus am facal-faire agad atharrachadh gu h-ìosal an-dràsta.\n\n'S urrainn dhut an teachdaireachd seo a leigeil seachad ma chaidh an cunntas a chruthachadh air mhearachd.",
+ "login-throttled": "Dh'fheuch thu ri logadh a-steach ro thric o chionn ghoirid.\nFuirich ort $1 mus feuch thu ris a-rithist.",
+ "login-abort-generic": "Cha do shoirbhich leat leis an logadh a-steach - Chaidh sgur dheth",
"loginlanguagelabel": "Cànan: $1",
- "suspicious-userlogout": "Chaidh d' iarrtas airson clàradh a-mach a dhiùltadh a chionn 's gu bheil coltas gun deach a chur le brabhsair briste no le progsaidh tasglannaidh.",
+ "suspicious-userlogout": "Chaidh d' iarrtas airson logadh a-mach a dhiùltadh a chionn 's gu bheil coltas gun deach a chur le brabhsair briste no le progsaidh tasglannaidh.",
"createacct-another-realname-tip": "Cha leig thu leas innse dè am fìor-ainm a tha ort.\nMa bheir thu seachad e, thèid seo a chleachdadh gus urram a thoirt dha na h-ùghdaran airson an cuid obrach.",
"pt-login": "Log a-steach",
"pt-login-button": "Log a-steach",
"user-mail-no-addy": "Cha do ghabh am post-d a chur leis nach robh seòladh puist-d ann.",
"user-mail-no-body": "Bha bodhaig na teachdaireachd bàn no air leth goirid.",
"changepassword": "Atharraich facal-faire",
- "resetpass_announce": "Gus an clàradh a-steach a choileanadh, tha agad ri facal-faire ùr a shuidheachadh.",
+ "resetpass_announce": "Gus an logadh a-steach a choileanadh, tha agad ri facal-faire ùr a shuidheachadh.",
"resetpass_text": "<!-- Cuir teacsa an-seo -->",
"resetpass_header": "Atharraich facal-faire a' chunntais",
"oldpassword": "Seann fhacal-faire",
"newpassword": "Facal-faire ùr",
"retypenew": "Ath-sgrìobh am facal-faire ùr",
- "resetpass_submit": "Suidhich am facal-faire 's clàraich a-steach",
+ "resetpass_submit": "Suidhich am facal-faire 's dèan logadh a-steach",
"changepassword-success": "Chaidh am facal-faire agad atharrachadh!",
- "changepassword-throttled": "Dh'fheuch thu ri clàradh a-steach ro thric o chionn ghoirid.\nFuirich ort $1 mus feuch thu ris a-rithist.",
+ "changepassword-throttled": "Dh'fheuch thu ri logadh a-steach ro thric o chionn ghoirid.\nFuirich ort $1 mus feuch thu ris a-rithist.",
"resetpass_forbidden": "Cha ghabh na faclan-faire atharrachadh",
- "resetpass-no-info": "Feumaidh tu clàradh a-steach mus dèan thu inntrigeadh dìreach dhan duilleag seo.",
+ "resetpass-no-info": "Feumaidh tu logadh a-steach mus dèan thu inntrigeadh dìreach dhan duilleag seo.",
"resetpass-submit-loggedin": "Atharraich am facal-faire",
"resetpass-submit-cancel": "Sguir dheth",
"resetpass-wrong-oldpass": "Tha am facal-faire sealach no làithreach mì-dhligheach.\nSaoil an do dh'atharraich thu am facal-faire agad mu thràth no an do dh'iarr thu facal-faire sealach ùr?",
"resetpass-recycled": "Tagh facal-faire ùr nach eil co-ionnann ris an fhacal-fhaire a tha agad an-dràsta.",
- "resetpass-temp-emailed": "Rinn thu clàradh a-steach le còd sealach a fhuair thu air a' phost-d.\nAirson clàradh a-steach slàn a dhèanamh, feumaidh tu facal-faire ùr a shuidheachadh an-seo:",
+ "resetpass-temp-emailed": "Rinn thu logadh a-steach le còd sealach a fhuair thu air a' phost-d.\nAirson logadh a-steach slàn a dhèanamh, feumaidh tu facal-faire ùr a shuidheachadh an-seo:",
"resetpass-temp-password": "Facal-faire sealach:",
"resetpass-abort-generic": "Chuir leudachan crìoch air atharrachadh an fhacail-fhaire.",
- "resetpass-expired": "Dh'fhalbh an ùine air an fhacal-fhaire agad. Suidhich facal-faire ùr airson clàradh a-steach.",
+ "resetpass-expired": "Dh'fhalbh an ùine air an fhacal-fhaire agad. Suidhich facal-faire ùr airson logadh a-steach.",
"resetpass-expired-soft": "Dh'fhalbh an ùine air an fhacal-fhaire agad is feumaidh tu ath-shuidheachadh. Tagh fear ùr no briog air \"{{int:resetpass-submit-cancel}}\" gus ath-shuidheachadh às a dhèidh seo.",
"resetpass-validity-soft": "Chan eil am facal-faire seo dligheach: $1\n\nTagh facal-faire ùr an-dràsta no briog air \"{{int:resetpass-submit-cancel}}\" gus ath-shuidheachadh às a dhèidh seo.",
"passwordreset": "Ath-shuidhich am facal-faire",
"passwordreset-capture-help": "Ma chuireas tu cromag sa bhogsa seo, chì thusa am post-d (leis an fhacal-fhaire sealach) agus gheibh an cleachdaiche e cuideachd.",
"passwordreset-email": "Seòladh puist-d:",
"passwordreset-emailtitle": "Dàta a' chunntais air {{SITENAME}}",
- "passwordreset-emailtext-ip": "Dh'iarr cuideigin (thu fhèin, 's mathaid, on t-seòladh IP $1) am facal-faire airson {{SITENAME}} ($4) ath-shuidheachadh. Tha {{PLURAL:$3|an cunntas|na cunntasan}} a leanas co-cheangailte ris a' phost-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut clàradh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
- "passwordreset-emailtext-user": "Dh'iarr an cleachdaiche $1 air {{SITENAME}} ath-shuidheachadh an fhacail-fhaire air {{SITENAME}} ($4). Tha {{PLURAL:$3|an cunntas-cleachdaiche|na cunntasan-cleachdaiche}} a leanas co-cheangailte ris an t-seòladh puist-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut clàradh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
+ "passwordreset-emailtext-ip": "Dh'iarr cuideigin (thu fhèin, 's mathaid, on t-seòladh IP $1) am facal-faire airson {{SITENAME}} ($4) ath-shuidheachadh. Tha {{PLURAL:$3|an cunntas|na cunntasan}} a leanas co-cheangailte ris a' phost-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut logadh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
+ "passwordreset-emailtext-user": "Dh'iarr an cleachdaiche $1 air {{SITENAME}} ath-shuidheachadh an fhacail-fhaire air {{SITENAME}} ($4). Tha {{PLURAL:$3|an cunntas-cleachdaiche|na cunntasan-cleachdaiche}} a leanas co-cheangailte ris an t-seòladh puist-d seo:\n\n$2\n\nFalbhaidh an ùine air {{PLURAL:$3|an fhacal-fhaire shealach|na faclan-faire sealach}} seo an ceann $5 {{PLURAL:$5|latha|latha|làithean|latha}}.\nBu chòir dhut logadh a-steach agus facal-faire ùr a thaghadh an-dràsta. Ma dh'iarr cuideigin eile seo no ma chuimhnich thu air an fhacal-fhaire agad 's mur eil thu airson atharrachadh tuilleadh, leig seachad an teachdaireachd seo 's lean ort leis an t-seann fhacal-fhaire.",
"passwordreset-emailelement": "Ainm-cleachdaiche: $1\nFacal-faire sealach: $2",
"passwordreset-emailsent": "Chaidh post-d airson ath-shuidheachadh an fhacail-fhaire a chur.",
"passwordreset-emailsent-capture": "Chaidh post-d a chum ath-shuidheachadh an fhacail-fhaire a chur agus chì thu sin gu h-ìosal.",
"changeemail": "Atharraich am post-d",
"changeemail-header": "Atharraich cunntas a' phuist-d",
"changeemail-text": "Lìon am foirm seo gus am post-d agad atharrachadh. Feumaidh tu am facal-faire agad a chur a-steach a-rithist gus a dhearbhadh.",
- "changeemail-no-info": "Feumaidh tu clàradh a-steach mus dèan thu inntrigeadh dìreach dhan duilleag seo.",
+ "changeemail-no-info": "Feumaidh tu logadh a-steach mus dèan thu inntrigeadh dìreach dhan duilleag seo.",
"changeemail-oldemail": "An seòladh puist-d làithreach:",
"changeemail-newemail": "An seòladh puist-d ùr:",
"changeemail-none": "(chan eil gin)",
"changeemail-password": "Am facal-faire agad air {{SITENAME}}:",
"changeemail-submit": "Atharraich am post-d",
"changeemail-cancel": "Sguir dheth",
- "changeemail-throttled": "Dh'fheuch thu ri clàradh a-steach ro thric.\nFuirich ort $1 mus feuch thu ris a-rithist.",
+ "changeemail-throttled": "Dh'fheuch thu ri logadh a-steach ro thric.\nFuirich ort $1 mus feuch thu ris a-rithist.",
"resettokens": "Ath-shuidhich na tòcanan",
"resettokens-text": "'S urrainn dhut tòcanan ath-shuidheachadh a bheir cothrom dhut air cuid a dhàta prìobhaideach a tha co-cheangailte ris a' chunntas agad.\n\nBu chòir dhut seo a dhèanamh ma thug thu do chuideigin e air mhearachd no ma bhris cuideigin a-steach air a' chunntas agad.",
"resettokens-no-tokens": "Chan eil tòcan ann a ghabhas ath-shuidheachadh.",
"preview": "Ro-shealladh",
"showpreview": "Seall an ro-shealladh",
"showdiff": "Seall na mùthaidhean",
- "anoneditwarning": "<strong>Rabhadh:</strong> Chan eil thu air logadh a-steach.\nThèid an seòladh IP agad a chlàrachadh ann an eachdraidh na duilleige seo.",
- "anonpreviewwarning": "<em>Chan eil thu air clàradh a-steach. Ma nì thu sàbhaladh, thèid an seòladh IP agad a chlàradh ann an eachdraidh deasachadh na duilleige seo.</em>",
+ "anoneditwarning": "<strong>Rabhadh:</strong> Chan eil thu air logadh a-steach.\nThèid an seòladh IP agad a chlàradh ann an eachdraidh na duilleige seo.",
+ "anonpreviewwarning": "<em>Chan eil thu air logadh a-steach. Ma nì thu sàbhaladh, thèid an seòladh IP agad a chlàradh ann an eachdraidh deasachadh na duilleige seo.</em>",
"missingsummary": "<strong>Cuimhnich:</strong> Cha dug thu seachad gearr-chunntas air na dh'atharraich thu.\nMa bhriogas tu air \"{{int:savearticle}}\" a-rithist, thèid na dheasaich thu a shàbhaladh as aonais gearr-chunntais.",
"missingcommenttext": "Cuir a-steach beachd gu h-ìosal.",
"missingcommentheader": "<strong>Cuimhnich:</strong> Cha dug thu seachad cuspair/ceann airson a' bheachd seo.\nMa bhriogas tu air \"{{int:savearticle}}\" a-rithist, thèid na dheasaich thu a shàbhaladh as aonais.",
"confirmedittext": "Feumaidh tu am post-d agad a dhearbhadh mus urrainn dhut duilleagan a dheasachadh.\nSuidhich is dearbhaich am post-d agad ann an [[Special:Preferences|roghainnean a' chleachdaiche]]",
"nosuchsectiontitle": "Cha ghabh an earrann a lorg",
"nosuchsectiontext": "Dh'fheuch thu ri earrann a dheasachadh nach eil ann.\nDh'fhaoidte gun deach a ghluasad no a sguabadh às fhad 's a bha thu a' coimhead air an duilleag.",
- "loginreqtitle": "Feumaidh tu clàradh a-steach",
+ "loginreqtitle": "Feumaidh tu logadh a-steach",
"loginreqlink": "log a-steach",
"loginreqpagetext": "Feumaidh tu $1 mus urrainn dhut coimhead air duilleagan eile.",
"accmailtitle": "Facal-faire air a chur.",
- "accmailtext": "Chaidh facal-faire a chruthachadh air thuaiream airson [[User talk:$1|$1]] 's a chur gu $2.\n\nGabhaidh am facal-faire airson a' chunntais ùir seo atharrachadh air an fo <em>[[Special:ChangePassword|atharraich facal-faire]]</em> às dèidh dhan chleachdaiche clàradh a-steach.",
+ "accmailtext": "Chaidh facal-faire a chruthachadh air thuaiream airson [[User talk:$1|$1]] 's a chur gu $2.\n\nGabhaidh am facal-faire airson a' chunntais ùir seo atharrachadh air an fo <em>[[Special:ChangePassword|atharraich facal-faire]]</em> às dèidh dhan chleachdaiche logadh a-steach.",
"newarticle": "(Ùr)",
"newarticletext": "Lean thu ri ceangal gu duilleag nach eil ann fhathast.\nCuir teacs sa bhogsa gu h-ìosal gus an duilleag seo a chruthachadh (seall air [$1 duilleag na cobharach] airson barrachd fiosrachaidh).\nMura robh dùil agad ris an duilleag seo a ruigsinn, briog air a' phutan <strong>air ais</strong> 'nad bhrabhsair.",
- "anontalkpagetext": "----\n<em>Seo an duilleag deasbaireachd aig cleachdaiche gun urra nach do chruthaich cunntas fhathast no nach eil 'ga chleachdadh.</em>\nFeumaidh sinn an àireamh IP aca a chleachdadh air sgàth sin.\nFaodadh grunn chleachdaichean seòladh IP mar a chleachdadh còmhla.\nMas e cleachdaiche gun urra a tha annad 's ma tha thu dhen bheachd nach eil na beachdan seo a' buntainn riut, nach [[Special:UserLogin/signup|clàraich thu]] no [[Special:UserLogin|clàraich a-steach]] gus bùrach mar seo a sheachnadh san àm ri teachd?",
+ "anontalkpagetext": "----\n<em>Seo an duilleag deasbaireachd aig cleachdaiche gun urra nach do chruthaich cunntas fhathast no nach eil 'ga chleachdadh.</em>\nFeumaidh sinn an àireamh IP aca a chleachdadh air sgàth sin.\nFaodadh grunn chleachdaichean seòladh IP mar a chleachdadh còmhla.\nMas e cleachdaiche gun urra a tha annad 's ma tha thu dhen bheachd nach eil na beachdan seo a' buntainn riut, nach [[Special:UserLogin/signup|clàraich thu]] no nach dèan thu [[Special:UserLogin|logadh a-steach]] gus bùrach mar seo a sheachnadh san àm ri teachd?",
"noarticletext": "Chan eil teacsa sam bith anns an duilleag seo an-dràsta.\n'S urrainn dhut [[Special:Search/{{PAGENAME}}|an tiotal seo a lorg]] ann an duilleagan eile,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} na logaichean co-cheangailte a rannsachadh],\nno [{{fullurl:{{FULLPAGENAME}}|action=edit}} an duilleag seo a dheasachadh]</span>.",
"noarticletext-nopermission": "Chan eil teacsa sam bith san duilleag seo an-dràsta.\n'S urrainn dhut [[Special:Search/{{PAGENAME}}|tiotal na duilleige seo a lorg]] ann an duilleagan eile, no <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} na logaichean co-cheangailte a rannsachadh]</span> ach chan eil cead agad an duilleag seo a chruthachadh.",
"missing-revision": "Chan eil mùthadh #$1 na duilleige \"{{FULLPAGENAME}}\" ann.\n\nMar is trice, tachraidh seo ma leanas tu ceangal san eachdraidh a tha fìor aosta 's a tha a' dol gu duilleag a chaidh a sguabadh às.\nGheibh thu mion-fhiosrachadh ann an [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} loga nan duilleagan a chaidh a sguabadh às].",
"previewnote": "<strong>Cuimhnich nach eil ann ach ro-shealladh.</strong>\nCha deach na mùthaidhean agad a shàbhaladh fhathast!",
"continue-editing": "Rach gun raon deasachaidh",
"previewconflict": "Tha an ro-shealladh seo a' sealltainn dhut an teacsa san raon teacsa gu h-àrd mar a nochdas e ma shàbhaileas tu an-dràsta.",
- "session_fail_preview": "<strong>Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.</strong>\nNach fheuch thu ris a-rithist?\nMur obraich e fhathast, feuch is [[Special:UserLogout|clàraich a-mach]] is a-steach a-rithist an uairsin.",
- "session_fail_preview_html": "<strong>Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.</strong>\n\n<em>A chionn 's gun do chuir {{SITENAME}} còd HTML an comas, tha an ro-shealladh falaichte mar dhìon an aghaidh ionnsaighean JavaScript.</em>\n\n<strong>Mas e deasachadh dligheach a tha seo, feuch ris a-rithist.</strong>\nMur obraich e fhathast, feuch is [[Special:UserLogout|clàraich a-mach]] is a-steach a-rithist an uairsin.",
+ "session_fail_preview": "<strong>Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.</strong>\nNach fheuch thu ris a-rithist?\nMur obraich e fhathast, feuch is [[Special:UserLogout|log a-mach]] is a-steach a-rithist an uairsin.",
+ "session_fail_preview_html": "<strong>Duilich! Cha b' urrainn dhuinn na dheasaich thu a làimhseachadh air sgàth call dàta an t-seisein.</strong>\n\n<em>A chionn 's gun do chuir {{SITENAME}} còd HTML an comas, tha an ro-shealladh falaichte mar dhìon an aghaidh ionnsaighean JavaScript.</em>\n\n<strong>Mas e deasachadh dligheach a tha seo, feuch ris a-rithist.</strong>\nMur obraich e fhathast, feuch is dèan [[Special:UserLogout|logadh a-mach]] is a-steach a-rithist an uairsin.",
"token_suffix_mismatch": "<strong>Dhiùlt sinn na dheasaich thu a chionn 's gun do chuir an cliant agad na caractaran puingeachaidh tro chèile san tòcan deasachaidh.</strong>\nDhiùlt sinn na dheasaich thu air eagal 's gun coirbeadh e teacsa na duilleige.\nTachraidh seo uaireannan ma chleachdar seirbheis-lìn progsaidh gun urra a tha làn de mhearachdan.",
"edit_form_incomplete": "<strong>Cha do ràinig cuid dhen fhoirm deasachaidh am frithealaichte; dèan cinnteach gu bheil gach deasachadh agad slàn is feuch ris a-rithist.</strong>",
"editing": "A' deasachadh $1",
"hiddencategories": "Tha an duilleag seo 'na ball de {{PLURAL:$1|$1 roinn-seòrsa fhalaichte|$1 roinn-seòrsa fhalaichte|$1 roinnean-seòrsa falaichte|$1 roinn-seòrsa fhalaichte}}:",
"edittools": "<!-- Nochdaidh an teacsa seo fo fhoirmean deasachaidh 's luchdaidh suas. -->",
"edittools-upload": "-",
- "nocreatetext": "Chuir {{SITENAME}} bacadh air cruthachadh de dhuilleagan ùra.\n'S urrainn dhut tilleadh is duilleag a tha ann mu thràth a dheasachadh no [[Special:UserLogin|clàradh a-steach no cunntas a chruthachadh]].",
+ "nocreatetext": "Chuir {{SITENAME}} bacadh air cruthachadh de dhuilleagan ùra.\n'S urrainn dhut tilleadh is duilleag a tha ann mu thràth a dheasachadh no [[Special:UserLogin|logadh a-steach no cunntas a chruthachadh]].",
"nocreate-loggedin": "Chan eil cead agad duilleagan ùra a chruthachadh.",
"sectioneditnotsupported-title": "Chan eil taic ri deasachadh earrannan",
"sectioneditnotsupported-text": "Chan eil taic ri deasachadh earrannan air an duilleag seo.",
"datedefault": "Gun roghainnean",
"prefs-labs": "Feartan nan deuchainn-lannan",
"prefs-user-pages": "Duilleagan a' chleachdaiche",
- "prefs-personal": "Pròifil a' chleachdaiche",
+ "prefs-personal": "Pròifil",
"prefs-rc": "Mùthaidhean ùra",
"prefs-watchlist": "An clàr-faire",
"prefs-watchlist-days": "Co mheud latha a sheallar air a' chlàr-fhaire:",
"prefs-rendering": "Coltas",
"saveprefs": "Sàbhail",
"restoreprefs": "Aisig na roghainnean bunaiteach uile (anns gach earrann)",
- "prefs-editing": "A' deasachadh",
+ "prefs-editing": "Deasachadh",
"rows": "Sreathan",
"columns": "Colbhan",
"searchresultshead": "Lorg",
"prefs-memberingroups-type": "$1",
"prefs-registration": "Àm clàraidh:",
"prefs-registration-date-time": "$1",
- "yourrealname": "An dearbh ainm a th' ort:",
+ "yourrealname": "D' fhìor-ainm:",
"yourlanguage": "Cànan:",
"yourvariant": "Eug-samhail cànan na susbaint:",
"prefs-help-variant": "Do roghainn eug-samhail sgrìobhaidh a thèid duilleagan na h-uicipeid seo a shealltainn innte.",
"prefs-help-signature": "Bu chòir dhut d' ainm a chur ri beachdan air duilleagan deasbaireachd le \"<nowiki>~~~~</nowiki>\" agus chithear d' ainm agus stampa ama 'na àite an uairsin.",
"badsig": "Tha co-chàradh an t-soidhnidh mì-dhligheach.\nThoir sùil air na tagaichean HTML.",
"badsiglength": "Tha an t-earr-sgrìobhadh agad ro fhada.\nChan fhaod e a bhith nas fhaide na $1 {{PLURAL:$1|charactar|charactar|caractaran|caractar}}.",
- "yourgender": "Dè a' ghnè a tha annad:",
+ "yourgender": "Do ghnè:",
"gender-unknown": "B' fhearr leam gun a bhith 'ga leigeil ris",
"gender-male": "Deasaichidh e duilleagan na h-uicidh",
"gender-female": "Deasaichidh i duilleagan na h-Uicipeid",
"tog-watchdeletion": "Az általam törölt lapok és fájlok felvétele a figyelőlistámra",
"tog-minordefault": "Alapértelmezetten minden szerkesztésemet jelölje aprónak",
"tog-previewontop": "Előnézet megjelenítése a szerkesztőablak előtt",
- "tog-previewonfirst": "Előnézet első szerkesztésnél",
+ "tog-previewonfirst": "Előnézet mutatása az első szerkesztésnél",
"tog-enotifwatchlistpages": "Kapjak értesítést e-mailben, ha egy általam figyelt lap vagy fájl megváltozik",
"tog-enotifusertalkpages": "Kapjak értesítést e-mailben, ha megváltozik a vitalapom",
"tog-enotifminoredits": "Kapjak értesítést e-mailben a lapok és fájlok apró változtatásairól",
"content-failed-to-parse": "Gat ekki þáttað $2 efni samkvæmt $1 líkani: $3",
"invalid-content-data": "Ógild efnisgögn.",
"content-not-allowed-here": "„$1“ efni er ekki leyfilegt á síðunni [[$2]]",
- "editwarning-warning": "Ef farið er frá þessari síðu gætu þær breytingar sem þú hefur gert tapast.\nEf þú ert skráður inn, þá getur þú óvirkjað þessi skilaboð í „Breytingarflipanum\" undir stillingum.",
+ "editwarning-warning": "Ef farið er frá þessari síðu gætu þær breytingar sem þú hefur gert tapast.\nEf þú ert skráður inn, þá getur þú óvirkjað þessi skilaboð í „{{int:prefs-editing}}\" undir stillingum.",
"content-model-wikitext": "wiki-texti",
"content-model-text": "hreinn texti",
"content-model-javascript": "JavaScript",
"currentrev": "Núverandi útgáfa",
"currentrev-asof": "Núverandi breyting frá og með $1",
"revisionasof": "Útgáfa síðunnar $1",
- "revision-info": "Útgáfa frá $1 eftir $2",
+ "revision-info": "Útgáfa frá $1 eftir $2\nÚtgáfa frá $1 eftir {{GENDER:$6|$2}}$7",
"previousrevision": "←Fyrri útgáfa",
"nextrevision": "Næsta útgáfa→",
"currentrevisionlink": "Núverandi útgáfa",
"gender-unknown": "Ég vil heldur ekki gefa upp",
"gender-male": "Hann breytir wikisíðum",
"gender-female": "Hún breytir wikisíðum",
- "prefs-help-gender": "Valfrjálst: notað til að aðgreina kynin í meldingum hugbúnaðarins. Þessar upplýsingar verða aðgengilegar öllum.",
+ "prefs-help-gender": "Þessi stilling er valfrjáls. Notað til að aðgreina kynin í meldingum hugbúnaðarins. Þessar upplýsingar verða aðgengilegar öllum.",
"email": "Tölvupóstur",
"prefs-help-realname": "Alvöru nafn er valfrjálst.\nEf þú kýst að gefa það upp, verður það notað til að gefa þér heiður af verkum þínum.",
"prefs-help-email": "Tölvupóstfang er valfrjálst, en gerir þér kleift að fá nýtt lykilorð ef þú gleymir lykilorðinu þínu.",
"right-reupload-shared": "Hunsa skrár á sameiginlegu myndasafni staðbundið",
"right-upload_by_url": "Hlaða inn skrám frá vefslóð",
"right-purge": "Hreinsa skyndiminni síðu án staðfestingar",
- "right-autoconfirmed": "Breyta hálfvernduðum síðum",
+ "right-autoconfirmed": "Sneiða hjá takmörkunum vistfanga",
"right-bot": "Eru meðhöndlaðir eins og sjálfvirk aðgerð",
"right-nominornewtalk": "Ekki láta minniháttar breytingar á spjallsíðum kveða upp áminningu um ný skilaboð",
"right-apihighlimits": "Setja hærri mörk á fjölda API fyrirspurna",
"windows-nonascii-filename": "Þessi wiki styður ekki skráarnöfn með sérstökum stöfum",
"fileexists": "Skrá með þessu nafni er þegar til, skoðaðu <strong>[[:$1]]</strong> ef þú ert óviss um hvort þú viljir breyta henni, ekki verður skrifað yfir gömlu skránna hlaðiru inn nýrri með sama nafni heldur verður núverandi útgáfa geymd í útgáfusögu.\n[[$1|thumb]]",
"filepageexists": "Myndasíðan fyrir þessa síðu hefur þegar verið búin til <strong>[[:$1]]</strong>, 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áarinnar sem hlaða á inn: <strong>[[:$1]]</strong>\n*Nafn skráarinnar sem er þegar til: <strong>[[:$2]]</strong>\nVinsamlegast veldu annað skráarnafn.",
+ "fileexists-extension": "Skrá með svipuðu nafni er til: [[$2|thumb]]\n*Nafn skráarinnar sem hlaða á inn: <strong>[[:$1]]</strong>\n*Nafn skráarinnar sem er þegar til: <strong>[[:$2]]</strong>\nVilt þú kanski nota annað nafn sem er meira lýsandi fyrir skránna ?",
"fileexists-thumbnail-yes": "Skráin virðist vera smámynd [[$1|thumb]]\nVinsamlegast athugaðu skránna <strong>[[:$1]]</strong>.\nEf skráin er sama myndin í upprunalegri stærð er ekki þörf á annari smámynd.",
"file-thumbnail-no": "Skráin er líklega smámynd, því skráarnafnið byrjar á <strong>$1</strong>.\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]]",
"pageswithprop-submit": "Áfram",
"doubleredirects": "Tvöfaldar tilvísanir",
"doubleredirectstext": "Þessi síða er listi yfir skrár sem eru tilvísanir á aðrar tilvísanir.\nHver lína inniheldur tengla á fyrstu og aðra tilvísun auk þeirrar síðu sem seinni tilvísunin beinist að, sem er oftast sú síða sem allar tilvísanirnar eiga að benda á.\n<del>Yfirstrikaðar</del> færslur hafa verið leiðréttar.",
- "double-redirect-fixed-move": "[[$1]] hefur verið færð.\nHún er tilvísun á [[$2]].",
- "double-redirect-fixed-maintenance": "Laga tvöfalda tilvísun frá [[$1]] til [[$2]].",
+ "double-redirect-fixed-move": "[[$1]] hefur verið færð.\nHún var uppfærð sjálfkrafa og tilvísar núna á [[$2]].",
+ "double-redirect-fixed-maintenance": "Laga sjálfvirkt tvöfalda tilvísun frá [[$1]] til [[$2]] í viðhalds aðgerð.",
"double-redirect-fixer": "Laga tilvísun",
"brokenredirects": "Brotnar tilvísanir",
"brokenredirectstext": "Eftirfarandi tilvísanir vísa á síður sem ekki eru til:",
"wantedtemplates": "Eftirsótt snið",
"mostlinked": "Mest ítengdu síður",
"mostlinkedcategories": "Mest ítengdu flokkar",
- "mostlinkedtemplates": "Mest ítengdu snið",
+ "mostlinkedtemplates": "Mest ítengdu síður",
"mostcategories": "Mest flokkaðar greinar",
"mostimages": "Mest ítengdu skrárnar",
"mostinterwikis": "Síður með flestm tungumálatenglum",
"pageinfo-length": "Lengd síðunnar (í bætum)",
"pageinfo-article-id": "Einkennisnúmer síðunnar",
"pageinfo-language": "Tungumál síðunnar",
- "pageinfo-robot-policy": "Leitarvélastaða",
+ "pageinfo-robot-policy": "Attriðaskráning af vélmennum",
"pageinfo-robot-index": "Heimilað",
"pageinfo-robot-noindex": "Ekki heimilað",
"pageinfo-views": "Fjöldi innlita",
"duplicate-defaultsort": "'''Viðvörun:''' Sjálfgildur flýtihnappur \"$2\" tekur yfir fyrri flýtihnapp \"$1\".",
"version": "Útgáfa",
"version-extensions": "Uppsettar viðbætur",
+ "version-skins": "Uppsett þemu",
"version-specialpages": "Kerfissíður",
"version-variables": "Breytur",
"version-antispam": "Amapósts sía",
- "version-skins": "Þemu",
"version-other": "Aðrar",
"version-mediahandlers": "Rekill margmiðlunarskráa",
"version-parser-extensiontags": "Þáttuð smáforrita tög",
"watchthis": "Бұл бетті бақылау",
"savearticle": "Бетті сақтау",
"preview": "Қарап шығу",
- "showpreview": "Алдын ала қарау",
+ "showpreview": "Алдын-ала қарау",
"showdiff": "Өзгерістерді көрсет",
"anoneditwarning": "<strong> Ескерту:</strong> Сіз жүйеге кірмегенсіз.\nIP мекенжайыңыз бұл беттің өңделу тарихында жазылып алынады.",
"anonpreviewwarning": "<em>Сіз жүйеге кірмегенсіз. IP мекенжайыңыз бұл беттің өңделу тарихында жазылып алынады.</em>",
"expand_templates_generate_xml": "Weis d'Struktur vum XML",
"expand_templates_generate_rawhtml": "HTML-Format weisen",
"expand_templates_preview": "Kucken ouni ofzespäicheren",
+ "pagelanguage": "Eraussiche vun der Sprooch vun der Säit",
"pagelang-name": "Säit",
"pagelang-language": "Sprooch",
"pagelang-use-default": "Standard-Sprooch benotzen",
"pagelang-select-lang": "Sprooch eraussichen",
"right-pagelang": "Sprooch vun der Säit änneren",
- "action-pagelang": "d'Sprooch vun der Säit änneren"
+ "action-pagelang": "d'Sprooch vun der Säit änneren",
+ "log-description-pagelang": "Dëst ass a Log mat den Ännerunge vun de Sprooche vun de Säiten."
}
"rcnotefrom": "Dit bin de wiezigingen sinds <strong>$2</strong> (maximum van <strong>$1</strong> wiezigingen).",
"rclistfrom": "Bekiek wiezigingen vanaof $3 $2",
"rcshowhideminor": "$1 kleine wiezigingen",
- "rcshowhideminor-show": "Bekieken",
- "rcshowhideminor-hide": "Verbargen",
+ "rcshowhideminor-show": "Bekiek",
+ "rcshowhideminor-hide": "Verbarg",
"rcshowhidebots": "$1 botgebrukers",
- "rcshowhidebots-show": "Bekieken",
- "rcshowhidebots-hide": "Verbargen",
+ "rcshowhidebots-show": "Bekiek",
+ "rcshowhidebots-hide": "Verbarg",
"rcshowhideliu": "$1 eregistreerden gebrukers",
- "rcshowhideliu-show": "Bekieken",
- "rcshowhideliu-hide": "Verbargen",
+ "rcshowhideliu-show": "Bekiek",
+ "rcshowhideliu-hide": "Verbarg",
"rcshowhideanons": "$1 anonieme gebrukers",
- "rcshowhideanons-show": "Bekieken",
- "rcshowhideanons-hide": "Verbargen",
+ "rcshowhideanons-show": "Bekiek",
+ "rcshowhideanons-hide": "Verbarg",
"rcshowhidepatr": "$1 nao-ekeken bewarkingen",
- "rcshowhidepatr-show": "Bekieken",
- "rcshowhidepatr-hide": "Verbargen",
+ "rcshowhidepatr-show": "Bekiek",
+ "rcshowhidepatr-hide": "Verbarg",
"rcshowhidemine": "$1 mien bewarkingen",
- "rcshowhidemine-show": "Bekieken",
- "rcshowhidemine-hide": "Verbargen",
+ "rcshowhidemine-show": "Bekiek",
+ "rcshowhidemine-hide": "Verbarg",
"rclinks": "Bekiek de leste $1 wiezigingen van de aofgeleupen $2 dagen<br />$3",
"diff": "wiezig",
"hist": "gesch",
"download": "binnenhaolen",
"unwatchedpages": "Ziejen die niet evolgd wörden",
"listredirects": "Lieste van deurverwiezingen",
+ "listduplicatedfiles": "Lieste mit bestaanden mit duplikaoten",
"unusedtemplates": "Ongebruukten mallen",
"unusedtemplatestext": "Hieronder staon alle ziejen in de naamruumte \"{{ns:template}}\" die nargens gebruukt wörden.\nVergeet niet de verwiezingen nao te kieken veurda'j de mal vortdoon.",
"unusedtemplateswlh": "aandere verwiezingen",
"listgrouprights-removegroup-self": "Kan {{PLURAL:$2|groep|groepen}} vortdoon van eigen gebruker: $1",
"listgrouprights-addgroup-self-all": "Kan alle groepen bie de eigen gebruker doon",
"listgrouprights-removegroup-self-all": "Kan alle groepen vortdoon van eigen gebruker",
+ "trackingcategories": "Volgkategorieën",
"mailnologin": "Niet an-emeld.",
"mailnologintext": "Je mutten [[Special:UserLogin|an-emeld]] ween en n geldig e-mailadres in \"[[Special:Preferences|mien veurkeuren]]\" invoeren um disse funksie te kunnen gebruken.",
"emailuser": "n Bericht sturen",
"tog-hidepatrolled": "ਤਾਜ਼ਾ ਤਬਦੀਲੀਆਂ ਵਿੱਚੋਂ ਜਾਂਚੀਆਂ ਸੋਧਾਂ ਲੁਕਾਓ",
"tog-newpageshidepatrolled": "ਨਵੀਂ ਸਫ਼ਾ ਸੂਚੀ ਵਿੱਚੋਂ ਜਾਂਚੇ ਸਫ਼ੇ ਲੁਕਾਓ",
"tog-extendwatchlist": "ਸਿਰਫ਼ ਤਾਜ਼ਾ ਹੀ ਨਹੀਂ, ਸਗੋਂ ਸਾਰੀਆਂ ਤਬਦੀਲੀਆਂ ਨੂੰ ਵਖਾਉਣ ਲਈ ਨਿਗਰਾਨੀ-ਲਿਸਟ ਨੂੰ ਵਧਾਓ",
- "tog-usenewrc": "ਤਾà¨\9c਼ਾ ਤਬਦà©\80ਲà©\80à¨\86à¨\82 à¨\85ਤà©\87 ਨਿà¨\97ਰਾਨà©\80-ਲਿਸà¨\9f ਵਿੱà¨\9a ਸਫ਼à©\87 ਮà©\81ਤਾਬà¨\95 ਤਬਦà©\80ਲà©\80à¨\86à¨\82 ਦà©\87 à¨\97ਰà©\81ੱà¨\95 ਬਣਾਓ (ਜਾਵਾਸਕਰਿਪਟ ਲੋੜੀਂਦੀ ਹੈ)",
+ "tog-usenewrc": "ਹਾਲà©\80à¨\86 ਤਬਦà©\80ਲà©\80à¨\86à¨\82 à¨\85ਤà©\87 ਨਿà¨\97ਰਾਨà©\80-ਲਿਸà¨\9f ਵਿੱà¨\9a ਸਫ਼à©\87 ਮà©\81ਤਾਬà¨\95 ਤਬਦà©\80ਲà©\80à¨\86à¨\82 ਦà©\87 à¨\97ਰà©\81ੱਪ ਬਣਾਓ (ਜਾਵਾਸਕਰਿਪਟ ਲੋੜੀਂਦੀ ਹੈ)",
"tog-numberheadings": "ਆਟੋ-ਨੰਬਰ ਸਿਰਨਾਵੇਂ",
"tog-showtoolbar": "ਸੋਧ ਸੰਦਬਕਸਾ ਵੇਖੋ",
"tog-editondblclick": "ਦੋ ਵਾਰ ਕਲਿੱਕ ਕਰਨ 'ਤੇ ਸਫ਼ੇ ਸੋਧੋ",
"mypreferencesprotected": "ਤੁਹਾਨੂੰ ਆਪਣੀਆਂ ਪਸੰਦਾਂ ਵਿੱਚ ਸੋਧ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।",
"ns-specialprotected": "ਖ਼ਾਸ ਸਫ਼ਿਆਂ ’ਚ ਫੇਰ-ਬਦਲ ਨਹੀਂ ਹੋ ਸਕਦੇ।",
"titleprotected": "ਇਹ ਸਿਰਲੇਖ [[User:$1|$1]] ਵੱਲੋਂ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਦਿੱਤਾ ਹੋਇਆ ਕਾਰਨ ਹੈ, \"''$2''\"।",
- "filereadonlyerror": "\"$1\" ਫ਼ਾà¨\88ਲ ਵਿੱà¨\9a ਤਬਦà©\80ਲà©\80 ਨਹà©\80à¨\82 ਹà©\8b ਰਹà©\80 à¨\95ਿà¨\89à¨\82à¨\95ਿ ਫ਼ਾà¨\88ਲ à¨à©°à¨¡à¨¾à¨° \"$2\" ਸਿਰਫ਼ ਪà©\9cà©\8dਹਨਯà©\8bà¨\97 ਰà©\82ਪ ਵਿà¨\9a ਹà©\88।\n\nà¨\89ਹ ਪà©\8dਰਸ਼ਾਸà¨\95, à¨\9cਿਹਨà©\87 à¨\87ਹ ਰà©\8bà¨\95 ਲਾà¨\88 ਹà©\88, ਦਾ à¨\95ਹਿਣਾ ਹà©\88:",
+ "filereadonlyerror": "\"$1\" ਫ਼ਾà¨\88ਲ ਵਿੱà¨\9a ਤਬਦà©\80ਲà©\80 ਨਹà©\80à¨\82 ਹà©\8b ਸà¨\95ਦà©\80 à¨\95ਿà¨\89à¨\82à¨\95ਿ ਫ਼ਾà¨\88ਲ à¨à©°à¨¡à¨¾à¨° \"$2\" ਸਿਰਫ਼ ਵà©\87à¨\96ਣਯà©\8bà¨\97 ਰà©\82ਪ ਵਿà¨\9a ਹà©\88।\n\nà¨\89ਹ ਪà©\8dਰਬੰਧà¨\95, à¨\9cਿਹਨà©\87 à¨\87ਹ ਰà©\8bà¨\95 ਲਾà¨\88 ਹà©\88, ਦਾ à¨\95ਹਿਣਾ ਹà©\88: ''$3''",
"invalidtitle-knownnamespace": "ਥਾਂ-ਨਾਮ \"$2\" ਅਤੇ ਲਿਖਤ \"$3\" ਵਾਲ਼ਾ ਗ਼ਲਤ ਸਿਰਲੇਖ",
"invalidtitle-unknownnamespace": "ਅਣਜਾਣ ਨਾਂ-ਸਥਾਨ ਗਿਣਤੀ $1 ਅਤੇ ਲਿਖਤ $2 ਵਾਲ਼ਾ ਗ਼ਲਤ ਸਿਰਲੇਖ",
"exception-nologin": "ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ",
"virus-badscanner": "ਮੰਦਾ ਪ੍ਰਬੰਧ: ਅਣਜਾਣ ਵਾਇਰਸ ਸਕੈਨਰ: ''$1''",
"virus-scanfailed": "ਸਕੈਨ ਫੇਲ੍ਹ ਹੈ (ਕੋਡ $1)",
"virus-unknownscanner": "ਅਣਪਛਾਤਾ ਐਂਟੀਵਾਇਰਸ:",
- "logouttext": "'''ਹੁਣ ਤੁਸੀਂ ਵਿਦਾਈ ਲੈ ਚੁੱਕੇ ਹੋ।'''\n\nਤੁਸੀਂ {{SITENAME}} ਦੀ ਵਰਤੋਂ ਗੁਮਨਾਮ ਰਹਿ ਕੇ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਦੁਬਾਰਾ ਇਹੋ ਜਾਂ ਵੱਖਰੇ ਵਰਤੋਂਕਾਰ ਵਜੋਂ ਦਾਖ਼ਲਾ ਲੈ ਸਕਦੇ ਹੋ।\nਧਿਆਨ ਦਿਉ ਕਿ ਜਿੰਨੀ ਦੇਰ ਤੱਕ ਤੁਸੀਂ ਆਪਣੇ ਬਰਾਊਜ਼ਰ ਦਾ ਕੈਸ਼ ਸਾਫ਼ ਨਹੀਂ ਕਰਦੇ, ਕੁਝ ਸਫ਼ੇ ਇੱਦਾਂ ਵਿਖਣਗੇ ਜਿਵੇਂ ਤੁਸੀਂ ਅਜੇ ਵੀ ਦਾਖ਼ਲ ਹੀ ਹੋ।",
+ "logouttext": "<strong>ਹੁਣ ਤੁਸੀਂ ਵਿਦਾਈ ਲੈ ਚੁੱਕੇ ਹੋ।</strong> ਧਿਆਨ ਦਿਉ ਕਿ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣੇ ਬਰਾਊਜ਼ਰ ਦਾ ਕੈਸ਼ ਸਾਫ਼ ਨਹੀਂ ਕਰਦੇ, ਕੁਝ ਸਫ਼ੇ ਏਦਾਂ ਵਿਖਾਈ ਦੇ ਸਕਦੇ ਹਨ ਕਿ ਜਿਵੇਂ ਤੁਸੀਂ ਅਜੇ ਵੀ ਲਾਗਇਨ ਹੀ ਹੋ।",
"welcomeuser": "$1 ਜੀ ਆਇਆਂ ਨੂੰ!",
"welcomecreation-msg": "ਤੁਹਾਡਾ ਖਾਤਾ ਬਣ ਚੁੱਕਾ ਹੈ। ਆਪਣੀਆਂ [[Special:Preferences|{{SITENAME}} ਪਸੰਦ]] ਬਦਲਣੀ ਨਾ ਭੁੱਲੋ।",
"yourname": "ਵਰਤੋਂਕਾਰ-ਨਾਂ:",
"createacct-benefit-body3": "ਹਾਲੀਆ {{PLURAL:$1|ਯੋਗਦਾਨੀ}}",
"badretype": "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੇ ਪਾਸਵਰਡ ਮਿਲਦੇ ਨਹੀਂ ਹਨ।",
"userexists": "ਯੂਜ਼ਰ-ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਚੁਣੋ ਜੀ।",
- "loginerror": "ਲਾਗਇਨ ਗਲਤੀ",
+ "loginerror": "ਲਾà¨\97à¨\87ਨ à¨\97਼ਲਤà©\80",
"createacct-error": "ਖਾਤਾ ਬਣਾਉਣ ਵਿਚ ਗਲਤੀ",
"createaccounterror": "ਖਾਤਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: $1",
"nocookiesnew": "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਪਰ ਤੁਸੀਂ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਹੈ।{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.",
"user-mail-no-addy": "ਬਿਨਾਂ ਈ-ਮੇਲ ਪਤਾ ਦਿੱਤੇ ਈ-ਮੇਲ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ।",
"user-mail-no-body": "ਖ਼ਾਲੀ ਜਾਂ ਬਹੁਤੀ ਛੋਟੀ ਸਮੱਗਰੀ ਨਾਲ਼ ਈਮੇਲ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਗਈ",
"changepassword": "ਪਾਸਵਰਡ ਬਦਲੋ",
- "resetpass_announce": "ਤà©\81ਸà©\80à¨\82 à¨\87ੱà¨\95 à¨\86ਰà¨\9c਼à©\80 à¨\88-ਮà©\87ਲ à¨\95à©\80ਤà©\87 à¨\95à©\8bਡ ਨਾਲ ਲਾà¨\97à¨\87ਨ à¨\95à©\80ਤਾ ਹà©\88। ਲਾà¨\97à¨\87ਨ ਪà©\82ਰਾ à¨\95ਰਨ ਲà¨\88, ਤà©\81ਹਾਨà©\82à©° à¨\87ੱਥà©\87 ਨਵਾà¨\82 ਪਾਸਵਰਡ ਦà©\87ਣਾ ਪਵà©\87à¨\97ਾ:",
+ "resetpass_announce": "ਲਾà¨\97à¨\87ਨ ਪà©\82ਰਾ à¨\95ਰਨ ਲà¨\88 ਤà©\81ਹਾਨà©\82à©° ਨਵਾà¨\82 ਪਾਸਵਰਡ ਬਣਾà¨\89ਣਾ ਪਵà©\87à¨\97ਾ।",
"resetpass_header": "ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਬਦਲੋ",
"oldpassword": "ਪੁਰਾਣਾ ਪਾਸਵਰਡ:",
"newpassword": "ਨਵਾਂ ਪਾਸਵਰਡ:",
"resetpass-abort-generic": "ਇੱਕ ਐਕਸਟੈਂਸ਼ਨ ਵੱਲੋਂ ਪਾਸਵਰਡ ਦੀ ਤਬਦੀਲੀ ਰੱਦ ਕੀਤੀ ਗਈ",
"passwordreset": "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ",
"passwordreset-text-one": "ਪਾਸਵਰਡ ਦੁਬਾਰਾ ਬਣਾਉਣ ਲਈ ਇਹ ਫ਼ਾਰਮ ਭਰੋ।",
- "passwordreset-text-many": "{{PLURAL:$1|à¨\86ਪਣਾ ਪਾਸਵਰਡ ਮà©\81à©\9c ਬਣਾà¨\89ਣ ਲਈ ਕੋਈ ਇੱਕ ਥਾਂ ਭਰੋ।}}",
+ "passwordreset-text-many": "{{PLURAL:$1|à¨\88-ਮà©\87ਲ à¨\9c਼ਰà©\80à¨\8f à¨\86ਪਣਾ à¨\86ਰà¨\9c਼à©\80 ਪਾਸਵਰਡ ਹਾਸਲ à¨\95ਰਨ ਲਈ ਕੋਈ ਇੱਕ ਥਾਂ ਭਰੋ।}}",
"passwordreset-legend": "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ",
"passwordreset-disabled": "ਇਸ ਵਿਕੀ ਤੇ ਪਾਸਵਰਡ ਰੀਸੈੱਟ ਬੰਦ ਕੀਤੇ ਗਏ ਹਨ।",
"passwordreset-emaildisabled": "ਇਹ ਵਿਕਿ ਉੱਤੇ ਈਮੇਲ ਫੀਚਰ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ।",
"currentrev": "ਮੌਜੂਦਾ ਰੀਵਿਜ਼ਨ",
"currentrev-asof": "$1 ਮੁਤਾਬਕ ਸਭ ਤੋਂ ਨਵਾਂ ਰੀਵਿਜਨ",
"revisionasof": "$1 ਦਾ ਰੀਵਿਜਨ",
- "revision-info": "$2 ਦਾ ਬਣਾਇਆ $1 ਦਾ ਰੀਵਿਜਨ",
+ "revision-info": "{{GENDER:$6|$2}}$7 ਦਾ ਬਣਾਇਆ $1 ਦਾ ਰੀਵਿਜ੍ਹਨ",
"previousrevision": "←ਪੁਰਾਣਾ ਰੀਵਿਜਨ",
"nextrevision": "ਨਵਾਂ ਰੀਵਿਜਨ →",
"currentrevisionlink": "ਸਭ ਤੋ ਨਵਾਂ ਰੀਵਿਜਨ",
"searchprofile-images": "ਮਲਟੀਮੀਡੀਆ",
"searchprofile-everything": "ਸਭ ਕੁਝ",
"searchprofile-advanced": "ਉੱਨਤ",
- "searchprofile-articles-tooltip": "$1 ਵਿੱਚ ਖੋਜ",
+ "searchprofile-articles-tooltip": "$1 ਵਿੱਚ ਖੋਜੋ",
"searchprofile-images-tooltip": "ਫ਼ਾਈਲਾਂ ਖੋਜੋ",
"searchprofile-everything-tooltip": "ਸਾਰੀ ਸਮੱਗਰੀ ਵਿੱਚੋਂ ਖੋਜੋ (ਗੱਲ-ਬਾਤ ਸਫ਼ਿਆਂ ਸਮੇਤ)",
"searchprofile-advanced-tooltip": "ਆਪਣੀਆਂ ਬਣਾਈਆਂ ਨਾਂ-ਥਾਂਵਾਂ ਵਿੱਚ ਖੋਜੋ",
"watchlisttools-raw": "ਕੱਚੀ ਨਿਗਰਾਨ-ਸੂਚੀ ਸੋਧੋ",
"duplicate-defaultsort": "ਪੁਰਾਣੀ ਮੂਲ ਕਰਮਾਂਕਨ ਕੁੰਜੀ $1 ਦੇ ਬਜਾਏ ਹੁਣ ਮੂਲ ਕਰਮਾਂਕਨ ਕੁੰਜੀ $2 ਹੋਵੇਗੀ।",
"version": "ਵਰਜਨ",
- "version-specialpages": "ਖ਼ਾਸ ਸਫ਼ੇ",
"version-skins": "ਸਕਿਨਾਂ",
+ "version-specialpages": "ਖ਼ਾਸ ਸਫ਼ੇ",
"version-other": "ਹੋਰ",
"version-hooks": "ਹੁੱਕਾਂ",
"version-hook-name": "ਹੁੱਕ ਦਾ ਨਾਂ",
"unprotectthispage": "Alterar a proteção desta página",
"newpage": "Página nova",
"talkpage": "Dialogar sobre esta página",
- "talkpagelinktext": "Discussão",
+ "talkpagelinktext": "discussão",
"specialpage": "Página especial",
"personaltools": "Ferramentas pessoais",
"postcomment": "Nova seção",
"duplicate-defaultsort": "Aviso: A chave de ordenação padrão \"$2\" sobrepõe-se à anterior chave de ordenação padrão \"$1\".",
"version": "Versão",
"version-extensions": "Extensões instaladas",
- "version-skins": "Temas",
+ "version-skins": "Temas instalados",
"version-specialpages": "Páginas especiais",
"version-parserhooks": "Hooks do analisador (parser)",
"version-variables": "Variáveis",
"expand_templates_remove_nowiki": "Suprima marcações <nowiki> no resultado",
"expand_templates_generate_xml": "Mostrar árvore de análise (parse) do XML",
"expand_templates_generate_rawhtml": "Mostrar HTML puro",
- "expand_templates_preview": "Pré-visualização"
+ "expand_templates_preview": "Pré-visualização",
+ "pagelang-select-lang": "Selecionar idioma",
+ "right-pagelang": "Mudar idioma da página",
+ "action-pagelang": "mudar idioma da página",
+ "log-name-pagelang": "Mudar idioma do log"
}
"unprotectthispage": "Alterar a proteção desta página",
"newpage": "Página nova",
"talkpage": "Discutir esta página",
- "talkpagelinktext": "Discussão",
+ "talkpagelinktext": "discussão",
"specialpage": "Página especial",
"personaltools": "Ferramentas pessoais",
"postcomment": "Seção nova",
"license-nopreview": "Error message when a certain license does not exist",
"upload_source_url": "Used in [[Special:Upload]].\n\nSee also:\n* {{msg-mw|Sourcefilename|label}}\n* {{msg-mw|Sourceurl|label}}\n* {{msg-mw|Upload source file}}\n* {{msg-mw|Upload-maxfilesize}}",
"upload_source_file": "Used in [[Special:Upload]].\n\nSee also:\n* {{msg-mw|Sourcefilename|label}}\n* {{msg-mw|Sourceurl|label}}\n* {{msg-mw|Upload source url}}\n* {{msg-mw|Upload-maxfilesize}}",
+ "listfiles-delete": "Text of the delete links next to the entries on [[Special:ListFiles]], surrounded by parentheses.",
"listfiles-summary": "This message is displayed at the top of [[Special:ImageList]] to explain how to use that special page.",
"listfiles_search_for": "Input label for the form displayed on [[Special:ListFiles]].",
"imgfile": "{{Identical|File}}",
"tog-minordefault": "Shëno të gjitha redaktimet si të vogla automatikisht",
"tog-previewontop": "Vendose kutinë e bocetit sipër kutisë së redaktimeve",
"tog-previewonfirst": "Tregoje bocetin në redaktimin e parë",
- "tog-enotifwatchlistpages": "Më njofto me e-mail kur ndryshohet një faqe apo skedaë nga lista ime e faqeve nën mbikqyrje",
+ "tog-enotifwatchlistpages": "Më njofto me e-mail kur ndryshohet një faqe apo skedarë nga lista ime e faqeve nën mbikqyrje",
"tog-enotifusertalkpages": "Më njofto me e-mail kur faqja ime e dikutimeve të përdoruesit ndryshohet",
"tog-enotifminoredits": "Më njofto me e-mail edhe kur ka redaktime të vogla në faqe dhe skedave",
"tog-enotifrevealaddr": "Tregoje adresën time të e-mail-it në e-mail-et njoftuese",
"thu": "Enj",
"fri": "Pr",
"sat": "Sht",
- "january": "janar",
- "february": "shkurt",
- "march": "mars",
- "april": "prill",
- "may_long": "maj",
- "june": "qershor",
- "july": "korrik",
- "august": "gusht",
- "september": "shtator",
- "october": "tetor",
- "november": "nëntor",
- "december": "dhjetor",
- "january-gen": "janar",
- "february-gen": "shkurt",
- "march-gen": "mars",
- "april-gen": "prill",
- "may-gen": "maj",
- "june-gen": "qershor",
+ "january": "Janar",
+ "february": "Shkurt",
+ "march": "Mars",
+ "april": "Prill",
+ "may_long": "Maj",
+ "june": "Qershor",
+ "july": "Korrik",
+ "august": "Gusht",
+ "september": "Shtator",
+ "october": "Tetor",
+ "november": "Nëntor",
+ "december": "Dhjetor",
+ "january-gen": "Janar",
+ "february-gen": "Shkurt",
+ "march-gen": "Mars",
+ "april-gen": "Prill",
+ "may-gen": "Maj",
+ "june-gen": "Qershor",
"july-gen": "korrik",
- "august-gen": "gusht",
- "september-gen": "shtator",
- "october-gen": "tetor",
- "november-gen": "nëntor",
- "december-gen": "dhjetor",
+ "august-gen": "Gusht",
+ "september-gen": "Shtator",
+ "october-gen": "Tetor",
+ "november-gen": "Nëntor",
+ "december-gen": "Dhjetor",
"jan": "Jan",
"feb": "Shku",
"mar": "Mar",
"oct": "Tet",
"nov": "Nën",
"dec": "Dhje",
- "january-date": "$1 janar",
- "february-date": "$1 shkurt",
- "march-date": "$1 mars",
- "april-date": "$1 prill",
- "may-date": "$1 maj",
- "june-date": "$1 qershor",
- "july-date": "$1 korrik",
- "august-date": "$1 gusht",
- "september-date": "$1 shtator",
- "october-date": "$1 tetor",
- "november-date": "$1 nëntor",
- "december-date": "$1 dhjetor",
+ "january-date": "$1 Janar",
+ "february-date": "Shkurt, <span class=\"notranslate\" translate=\"asnjë\">$1</span>",
+ "march-date": "Mars <span class=\"notranslate\" translate=\"asnjë\">$1</span>",
+ "april-date": "Prill <span class=\"notranslate\" translate=\"asnjë\">$1</span>",
+ "may-date": "$1 Maj",
+ "june-date": "$1 Qershor",
+ "july-date": "$1 Korrik",
+ "august-date": "$1 Gusht",
+ "september-date": "$1 Shtator",
+ "october-date": "$1 Tetor",
+ "november-date": "$1 Nëntor",
+ "december-date": "$1 Dhjetor",
"pagecategories": "{{PLURAL:$1|Kategoria|Kategoritë}}",
"category_header": "Artikuj në kategorinë \"$1\"",
"subcategories": "Nën-kategori",
"anontalk": "Diskutimet për këtë IP",
"navigation": "Shfleto",
"and": " dhe",
- "qbfind": "Kërko",
+ "qbfind": "Gjeni",
"qbbrowse": "Shfletoni",
"qbedit": "Redaktoni",
"qbpageoptions": "Kjo faqe",
"qbmyoptions": "Faqet e mia",
"faq": "Pyetje që bëhen shpesh",
- "faqpage": "Project: Pyetje që bëhen shpesh",
+ "faqpage": "Projekt: Pyetje që bëhen shpesh",
"actions": "Veprimet",
"namespaces": "Hapsirat e emrit",
"variants": "Variante",
"invalidtitle-knownnamespace": "Titull jo i vlefshëm me hapësirën \"$2\" dhe teksti \"$3\"",
"invalidtitle-unknownnamespace": "Titull jo i vlefshëm me numrin e panjohur të hapësirës së emrit $1 dhe tekstit \"$2\"",
"exception-nologin": "I paqasur",
- "exception-nologin-text": "Kjo faqe ose ky veprim ju kërkon që të qaseni në këtë wiki.",
+ "exception-nologin-text": "Ju lutem [[Special:Userlogin|hyni brënda]] për të qenë në gjendje të hyni në këtë faqe ose veprim.",
"exception-nologin-text-manual": "Ju lutem <span class=\"notranslate\" translate=\"asnjë\">$1</span> që të jeni në gjendje për të hyrë në këtë faqe ose të veproni.",
"virus-badscanner": "Konfiguracion i parregullt: Skaner i panjohur virusesh: ''$1''",
"virus-scanfailed": "skani dështoi (code $1)",
"createacct-benefit-heading": "{{SITENAME}} është bërë nga njerëz si ju.",
"createacct-benefit-body1": "$1 {{PLURAL:$1|redaktim|redaktime}}",
"createacct-benefit-body2": "\n{{Plural: $ 1 | faqe | faqe}}",
+ "createacct-benefit-body3": "kohët e fundit <span class=\"notranslate\" translate=\"asnjë\">{{PLURAL:$1|</span>kontribues|kontribuesit}}",
"badretype": "Fjalëkalimet nuk janë njësoj.",
"userexists": "Emri i përdoruesit që kërkuat është në përdorim. \nZgjidhni një emër tjetër.",
"loginerror": "Gabim gjatë identifikimit",
+ "createacct-error": "krijim gabim llogarie",
"createaccounterror": "I pamundur krijimi i llogarisë: $1",
"nocookiesnew": "Llogaria e përdoruesit u krijua por ju nuk jeni identifikuar ende.\n{{SITENAME}} shfrytëzon \"cookies\" për të identifikuar përdoruesit.\nJu nuk mundësoni lejimin e \"cookies\".\nJu lutemi, mundësojini ato, pastaj identifikohuni me anë të të dhënave tuaja të reja: emri i përdoruesit dhe fjalëkalimi.",
"nocookieslogin": "{{SITENAME}} shfrytëzon \"cookies\" për identifikimin e përdoruesve.\nYou nuk lejoni shfrytëzimin e \"cookies\".\nJu lutemi, lejoni shfrytëzimin e \"cookies\" dhe provojeni përsëri.",
"passwordtooshort": "Fjalëkalimi juaj është i pavlefshëm ose tepër i shkurtër. Ai duhet të ketë së paku {{PLURAL:$1|1 shkronjë|$1 shkronja}} dhe duhet të jetë i ndryshëm nga emri i përdoruesit.",
"password-name-match": "Fjalëkalimi juaj duhet të jetë i ndryshëm nga emri juaj.",
"password-login-forbidden": "Përdorimi i kësaj nofke dhe fjalëkalimi është i ndaluar.",
- "mailmypassword": "Më dërgo një fjalëkalim të ri tek adresa ime",
+ "mailmypassword": "Ridergo fjalekalimin",
"passwordremindertitle": "Kërkesë për fjalëkalim të ri tek {{SITENAME}}",
"passwordremindertext": "Dikush (sigurisht ju, nga adresa IP adresa $1) kërkoi një fjalëkalim të ri për hyrje tek {{SITENAME}} ($4). U krijua fjalëkalimi i përkohshëm për përdoruesin \"$2\" dhe u dërgua tek \"$3\". Nëse ky ishte tentimi juaj duhet që të kyçeni dhe ndërroni fjalëkalimin tani. Fjalëkalimi juaj i përkohshëm do të skadojë {{PLURAL:$5|një dite|$5 ditësh}}.\n\nNëse ndokush tjetër ka bërë këtë kërkesë, ose nëse ju kujtohet fjalëkalimin dhe nuk doni që ta ndërroni, mund të e injoroni këtë porosi dhe të vazhdoni të përdorni fjalëkalimin e vjetër.",
"noemail": "Regjistri nuk ka adresë për përdoruesin \"$1\".",
"noemailcreate": "Ju duhet të sigurojë një adresë e e-mailit të saktë.",
"passwordsent": "Një fjalëkalim i ri është dërguar tek adresa e regjistruar për \"$1\". Provojeni përsëri hyrjen mbasi ta keni marrë fjalëkalimin.",
"blocked-mailpassword": "IP adresa juaj është bllokuar , si e tillë nuk lejohet të përdor funksionin pë rikthim të fjalkalimit , në mënyrë që të parandalohet abuzimi.",
- "eauthentsent": "Një eMail konfirmues u dërgua te adresa e dhënë.\nPara se të pranohen eMail nga përdoruesit e tjerë, duhet që adressa e juaj të vërtetohet.\nJu lutemi ndiqni këshillat në eMailin e pranuar.",
+ "eauthentsent": "Një email konfirmimi është dërguar në adresën e caktuar të e-mailit.\nParase te dergohen emaile të tjerë në llogarinë tuaj, duhet të ndiqni udhëzimet në email, për të konfirmuar se llogaria është vërtetë e juaja.",
"throttled-mailpassword": "Një kujtesë e fjalëkalimit është dërguar gjatë {{PLURAL:$1|orës|$1 orëve}} të kaluara. Për t'u mbrojtur nga abuzime vetëm një kujtesë dërgohet çdo {{PLURAL:$1|orë|$1 orë}}.",
"mailerror": "Gabim duke dërguar postën: $1",
"acct_creation_throttle_hit": "Nuk lejoheni të krijoni më llogari pasi keni krijuar {{PLURAL:$1|1|$1}}.",
"accountcreatedtext": "Llogarija e Përdoruesit për $1 u krijua",
"createaccount-title": "Hapja e llogarive për {{SITENAME}}",
"createaccount-text": "Dikush ka përdorur adresën tuaj për të hapur një llogari tek {{SITENAME}} ($4) të quajtur \"$2\" me fjalëkalimin \"$3\".\nDuhet të hyni brenda dhe të ndërroni fjalëkalimin tani nëse ky person jeni ju. Përndryshe shpërfilleni këtë mesazh.",
- "login-throttled": "Keni bërë shumë tentime të njëpasnjëshme në fjalëkalimin e kësaj llogarie. Ju lutemi prisni para tentimit përsëri.",
+ "login-throttled": "Keni bërë shumë tentime të njëpasnjëshme në fjalëkalimin e kësaj llogarie. Ju lutemi prisni para se te tentoni përsëri.",
"login-abort-generic": "login juaj ishte i pasuksesshëm - Ndërpre",
"loginlanguagelabel": "Gjuha: $1",
"suspicious-userlogout": "Kërkesa juaj për të shkëputet u mohua sepse duket sikur është dërguar nga një shfletues të thyer ose caching proxy.",
+ "createacct-another-realname-tip": "* Emri i vërtetë nuk është i domosdoshëm: Nëse e jepni do të përmendeni si kontribues për punën që ke bërë.",
+ "pt-login": "Hyni",
+ "pt-login-button": "Hyni",
+ "pt-createaccount": "Krijo llogari",
+ "pt-userlogout": "Dil",
"php-mail-error-unknown": "Gabim i panjohur në funksionin e postës PHP ()",
"user-mail-no-addy": "Provuat të dërgoni një korrespondencë pa adresë elektronike",
+ "user-mail-no-body": "U përpoqët të dërgonio email me një përmbajtje të shkurtër dhe të paarsyeshme.",
"changepassword": "Ndërroni fjalëkalimin",
- "resetpass_announce": "Ju keni hyrë me një kod të përkohshëm.\nPër të hyrë tërësisht duhet të vendosni një fjalëkalim të ri këtu:",
+ "resetpass_announce": "Për të përfunduar regjistrimin, ju duhet të vendosni një fjalëkalim të ri.",
"resetpass_header": "Ndrysho fjalëkalimin e llogarisë",
"oldpassword": "I vjetri",
"newpassword": "I riu",
"retypenew": "I riu përsëri",
"resetpass_submit": "Ndrysho fjalëkalimin dhe hyni brenda",
- "changepassword-success": "Fjalëkalimi juaj është ndryshuar me sukses! Mund të hyni brenda...",
+ "changepassword-success": "Fjalëkalimin juaj ka ndryshuar me sukses!",
+ "changepassword-throttled": "Keni bërë shumë tentime të njëpasnjëshme në fjalëkalimin e kësaj llogarie. Ju lutemi prisni para se te tentoni përsëri.",
"resetpass_forbidden": "Fjalëkalimet nuk mund të ndryshohen",
"resetpass-no-info": "Duhet të jeni i kyçur që të keni qasje direkte në këtë faqe.",
"resetpass-submit-loggedin": "Ndrysho fjalëkalimin",
"resetpass-submit-cancel": "Anulo",
"resetpass-wrong-oldpass": "Fjalëkalimi momental ose i përkohshëm nuk është i vlefshëm. Ndoshta tanimë me sukses keni ndërruar fjalëkalimin, ose keni kërkuar fjalëkalim të përkohshëm.",
+ "resetpass-recycled": "Ju lutemi rivendosni fjalëkalimin tuaj për diçka tjetër përveç fjalëkalimin tuaj të tanishme.",
+ "resetpass-temp-emailed": "Ju keni hyrë në me një koditë përkohshme të dërguar me email .\nPër të përfundojë logging in, ju duhet të vendosni një fjalëkalim të ri këtu:",
"resetpass-temp-password": "Fjalëkalimi i përkohshëm:",
+ "resetpass-abort-generic": "Ndryshimi i fjalëkalimi dështoi nga një zgjerim.",
"resetpass-expired": "Fjalëkalimin tuaj ka skaduar. Ju lutem vendosni një fjalëkalim të ri për të hyr.",
"resetpass-expired-soft": "Fjalëkalimi juaj ka skaduar dhe duhet të rivendoset. Ju lutem zgjidhni një fjalëkalim të ri tani, ose klikoni \"{{int:resetpass-submit-cancel}}\" për ta rivendosur më vonë.",
+ "resetpass-validity-soft": "Fjalëkalimi juaj ka skaduar dhe duhet të rivendoset. Ju lutem zgjidhni një fjalëkalim të ri tani, ose klikoni \"{{int:resetpass-submit-cancel}}\" për ta rivendosur më vonë.",
"passwordreset": "Ndrysho fjalkalimin",
+ "passwordreset-text-one": "Plotësoni këtë formular për të marrë një fjalëkalim të përkohshëm nëpërmjet postës elektronike.",
+ "passwordreset-text-many": "<span class=\"notranslate\" translate=\"asnjë\">{{PLURAL:$1|</span>Mbush një nga fushat për të marrë një fjalëkalim të përkohshëm nëpërmjet postës elektronike.}}",
"passwordreset-legend": "Ndrysho fjalkalimin",
"passwordreset-disabled": "Rivendosja e fjalëkalimit është deaktivizuar në këtë wiki.",
+ "passwordreset-emaildisabled": "Karakteristikat e Email janë të paaftë në këtë wiki.",
"passwordreset-username": "Nofka:",
"passwordreset-domain": "Domain:",
"passwordreset-capture": "Dëshiron të shikosh e-mail-in që rezulton?",
"Calak"
]
},
- "tog-underline": "Підкреслювати посилання:\nПідкреслювання посилань:",
+ "tog-underline": "Підкреслювання посилань:",
"tog-hideminor": "Приховати незначні редагування у списку останніх змін",
"tog-hidepatrolled": "Приховувати патрульовані редагування у списку нових редагувань",
"tog-newpageshidepatrolled": "Приховувати патрульовані сторінки у списку нових сторінок",
"unexpected": "Неочікуване значення: «$1»=«$2».",
"formerror": "Помилка: неможливо передати дані форми",
"badarticleerror": "Ця дія не може бути виконана на цій сторінці.",
- "cannotdelete": "Неможливо вилучити сторінку або файл \"$1\".\nМожливо, її (його) вже вилучив хтось інший.",
+ "cannotdelete": "Неможливо вилучити сторінку або файл «$1».\nМожливо, її (його) вже вилучив хтось інший.",
"cannotdelete-title": "Не вдається видалити сторінку «$1»",
"delete-hook-aborted": "Вилучення було скасовано процедурою-перехоплювачем. \nНіяких поясненень надано не було.",
"no-null-revision": "Не вдалося створити нульову версію сторінки «$1»",
"namespaceprotected": "У вас нема дозволу редагувати сторінки в просторі назв «$1».",
"customcssprotected": "У вас немає прав на редагування цієї CSS-сторінки, так як вона містить особисті налаштування іншого користувача.",
"customjsprotected": "У вас немає дозволу на редагування цієї JavaScript-сторінки, так як вона містить особисті налаштування іншого користувача.",
- "mycustomcssprotected": "У вас немає прав для редагування цієї CSS сторінки.",
+ "mycustomcssprotected": "У Ð\92ас немає прав для редагування цієї CSS сторінки.",
"mycustomjsprotected": "Ви не маєте дозволу для редагування цієї сторінки JavaScript.",
"myprivateinfoprotected": "У Вас немає дозволу на редагування своєї приватної інформації.",
"mypreferencesprotected": "У Вас немає дозволу на редагування своїх налаштувань.",
"userrights": "Керування правами користувачів",
"userrights-lookup-user": "Керування групами користувача",
"userrights-user-editname": "Введіть ім'я користувача:",
- "editusergroup": "Редагувати групи користувача",
+ "editusergroup": "Редагувати групи користувачів",
"editinguser": "Зміна прав користувача '''[[User:$1|$1]]''' $2",
- "userrights-editusergroup": "Змінити групи користувача",
+ "userrights-editusergroup": "Змінити групи користувачів",
"saveusergroups": "Зберегти групи користувача",
"userrights-groupsmember": "Член груп:",
"userrights-groupsmember-auto": "Неявний член:",
"filehist-comment": "备注",
"imagelinks": "文件用途",
"linkstoimage": "以下$1个页面链接至本文件：",
- "linkstoimage-more": "超过$1个页面连接到这个文件。\n此处只列出首$1个链接到该文件的页面。\n您也可以查看[[Special:WhatLinksHere/$2|完整的列表]]。",
+ "linkstoimage-more": "超过$1个{{PLURAL:$1|页面链接至}}本文件。下面的列表只显示链接至本文件的{{PLURAL:$1|首个页面|前$1个页面}}。[[Special:WhatLinksHere/$2|完整列表]]。",
"nolinkstoimage": "没有页面链接到本文件。",
"morelinkstoimage": "查看连接到这个文件的[[Special:WhatLinksHere/$1|更多链接]]。",
"linkstoimage-redirect": "$1（文件重定向）$2",
true
);
$this->addOption( 'confpath', "Path to write LocalSettings.php to ($IP)", false, true );
+ $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in PostgreSQL/Microsoft SQL Server (mediawiki)', false, true );
/*
- $this->addOption( 'dbschema', 'The schema for the MediaWiki DB in pg (mediawiki)', false, true );
$this->addOption( 'namespace', 'The project namespace (same as the "name" argument)', false, true );
*/
$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
mw.log.deprecate( $, 'toJSON', $.toJSON, 'Use JSON.stringify instead (module "json" for polyfill).' );
mw.log.deprecate( $, 'evalJSON', $.evalJSON, 'Use JSON.parse instead (module "json" for polyfill).' );
mw.log.deprecate( $, 'secureEvalJSON', $.secureEvalJSON, 'Use JSON.parse instead (module "json" for polyfill).' );
- mw.log.deprecate( $, 'quoteString', $.quoteString, 'Use JSON.parse instead (module "json" for polyfill).' );
+ mw.log.deprecate( $, 'quoteString', $.quoteString, 'Use JSON.stringify instead (module "json" for polyfill).' );
}( mediaWiki, jQuery ) );
* Show gallery captions when focused. Copied directly from jquery.mw-jump.js.
* Also Dynamically resize images to justify them.
*/
-( function ( $, mw ) {
+( function ( $ ) {
$( function () {
var isTouchScreen,
gettingFocus,
$imageElm,
imageElm,
$caption,
- hookInfo,
i,
j,
avgZoom,
}
if ( curRow[j].aspect === 0 || !isFinite( curRow[j].aspect ) ) {
- mw.log( 'Skipping item ' + j + ' due to aspect: ' + curRow[j].aspect );
// One of the dimensions are 0. Probably should
// not try to resize.
combinedPadding += curRow[j].width;
// Also on the off chance there is a bug in this
// code, would prevent accidentally expanding to
// be 10 billion pixels wide.
- mw.log( 'mw.page.gallery: Cannot fit row, aspect is ' + preferredHeight / curRowHeight );
if ( i === rows.length - 1 ) {
// If its the last row, and we can't fit it,
// don't make the entire row huge.
}
if ( !isFinite( preferredHeight ) ) {
// This *definitely* should not happen.
- mw.log( 'mw.page.gallery: Trying to resize row ' + i + ' to ' + preferredHeight + '?!' );
// Skip this row.
continue;
}
if ( preferredHeight < 5 ) {
// Well something clearly went wrong...
- mw.log( {
- maxWidth: maxWidth,
- combinedPadding: combinedPadding,
- combinedAspect: combinedAspect,
- wantedWidth: wantedWidth
- } );
- mw.log( 'mw.page.gallery: [BUG!] Fitting row ' + i + ' to too small a size: ' + preferredHeight );
// Skip this row.
continue;
}
if ( newWidth < 60 || !isFinite( newWidth ) ) {
// Making something skinnier than this will mess up captions,
- mw.log( 'mw.page.gallery: Tried to make image ' + newWidth + 'px wide but too narrow.' );
if ( newWidth < 1 || !isFinite( newWidth ) ) {
$innerDiv.height( preferredHeight );
// Don't even try and touch the image size if it could mean
$caption.width( curRow[j].captionWidth + ( newWidth - curRow[j].imgWidth ) );
}
- hookInfo = {
- fullWidth: newWidth + padding,
- imgWidth: newWidth,
- imgHeight: preferredHeight,
- $innerDiv: $innerDiv,
- $imageDiv: $imageDiv,
- $outerDiv: $outerDiv,
- // Whether the hook took action
- resolved: false
- };
-
- /**
- * Gallery resize.
- *
- * If your handler resizes an image, it should also set the resolved
- * property to true. Additionally, because this module only exposes this
- * logic temporarily, you should load your module in position top to
- * ensure it is registered before this runs (FIXME: Don't use mw.hook)
- *
- * See TimedMediaHandler for an example.
- *
- * @event mediawiki_page_gallery_resize
- * @member mw.hook
- * @param {Object} hookInfo
- */
- mw.hook( 'mediawiki.page.gallery.resize' ).fire( hookInfo );
-
- if ( !hookInfo.resolved ) {
- if ( imageElm ) {
- // We don't always have an img, e.g. in the case of an invalid file.
- imageElm.width = newWidth;
- imageElm.height = preferredHeight;
- } else {
- // Not a file box.
- $imageDiv.height( preferredHeight );
- }
+ if ( imageElm ) {
+ // We don't always have an img, e.g. in the case of an invalid file.
+ imageElm.width = newWidth;
+ imageElm.height = preferredHeight;
+ } else {
+ // Not a file box.
+ $imageDiv.height( preferredHeight );
}
}
}
}() );
} );
} );
-}( jQuery, mediaWiki ) );
+}( jQuery ) );
float: left;
}
+ &.mw-halign-none {
+ /* @noflip */
+ margin: 0;
+ /* @noflip */
+ clear: none;
+ /* @noflip */
+ float: none;
+ }
+
&.mw-halign-center {
margin: 0 auto .5em auto;
display: table;
}
fieldset#mw-searchoptions table td {
padding-right: 1em;
+ white-space: nowrap;
}
fieldset#mw-searchoptions div.divider {
clear: both;
} catch ( e ) {
// A user-defined callback raised an exception.
// Swallow it to protect our state machine!
- log( 'Exception thrown by job.error', e );
+ log( 'Exception thrown by user callback', e );
}
}
}
{
+ "@metadata": {
+ "authors": [
+ "Robby"
+ ]
+ },
"skinname-monobook": "MonoBook",
+ "monobook-desc": "De klassesche Look vu MediaWiki zanter 2004, benannt no der Schwaarzwäissfoto vun engem Buch am Hannergrond vun der Säit",
"monobook.css": "/* Dës CSS huet nëmmen Afloss op de Skin ''Monobook'' */"
}
vertical-align: text-bottom;
}
-/* TODO: Remove #bodyContent selector (kept for backwards compatibility with cached html) */
-#bodyContent,
.mw-body-content {
position: relative;
line-height: @content-line-height;
"vector-view-edit": "Golygu",
"vector-view-history": "Gweld yr hanes",
"vector-view-view": "Darllen",
- "vector-view-viewsource": "Dangos côd y dudalen"
+ "vector-view-viewsource": "Dangos côd y dudalen",
+ "vector-more-actions": "Rhagor"
}
"vector-action-move": "Атауын өзгерту",
"vector-action-protect": "Қорғау",
"vector-action-undelete": "Жоймау",
- "vector-action-unprotect": "Ò\9aоÑ\80Ò\93анÑ\8bÑ\81Ñ\82Ñ\8b өзгерту",
+ "vector-action-unprotect": "Ò\9aоÑ\80Ò\93анÑ\8bÑ\81Ñ\8bн өзгерту",
"vector-view-create": "Бастау",
"vector-view-edit": "Өңдеу",
"vector-view-history": "Өңделу тарихы",
"Robby"
]
},
+ "vector-skin-desc": "Modern Versioun vu Monobook mat frëschem Look a ville Verbesserunge vun der Benotzerfrëndlechkeet",
"vector-action-addsection": "Sujet derbäisetzen",
"vector-action-delete": "Läschen",
"vector-action-move": "Réckelen",
</p>
!! end
-## a,rtc not permitted
+## a not permitted
## i,b,br omitted
!! test
Text-level semantic html elements in wikitext
<sub>text</sub>
<u>text</u>
<mark>text</mark>
-<ruby><rb>明日<rp>(</rp><rt>Ashita</rt><rp>)</rp></rb></ruby>
+<ruby><rb>明日</rb><rp>(</rp><rt>Ashita</rt><rp> </rp><rtc>あした</rtc><rp>)</rp></ruby>
<bdi>text</bdi>
<bdo>text</bdo>
<span>text</span>
<sub>text</sub>
<u>text</u>
<mark>text</mark>
-<ruby><rb>明日<rp>(</rp><rt>Ashita</rt><rp>)</rp></rb></ruby>
+<ruby><rb>明日</rb><rp>(</rp><rt>Ashita</rt><rp> </rp><rtc>あした</rtc><rp>)</rp></ruby>
<bdi>text</bdi>
<bdo>text</bdo>
<span>text</span>
</p>
!! end
+# test cases taken from
+# http://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element
+!! test
+Ruby markup (W3C-style)
+!! wikitext
+; Mono-ruby for individual base characters
+: <ruby>日<rt>に</rt>本<rt>ほん</rt>語<rt>ご</rt></ruby>
+; Group ruby
+: <ruby>今日<rt>きょう</rt></ruby>
+; Jukugo ruby
+: <ruby>法<rb>華</rb><rb>経</rb><rt>ほ</rt><rt>け</rt><rt>きょう</rt></ruby>
+; Inline ruby
+: <ruby>東<rb>京</rb><rp>(</rp><rt>とう</rt><rt>きょう</rt><rp>)</rp></ruby>
+; Double-sided ruby
+: <ruby><rb>旧</rb><rb>金</rb><rb>山</rb><rt>jiù</rt><rt>jīn</rt><rt>shān</rt><rtc>San Francisco</rtc></ruby>
+
+<ruby>
+<rb>♥</rb><rtc><rt>Heart</rt></rtc><rtc lang=fr><rt>Cœur</rt></rtc>
+<rb>☘</rb><rtc><rt>Shamrock</rt></rtc><rtc lang=fr><rt>Trèfle</rt></rtc>
+<rb>✶</rb><rtc><rt>Star</rt></rtc><rtc lang=fr><rt>Étoile</rt></rtc>
+</ruby>
+!! html
+<dl><dt> Mono-ruby for individual base characters</dt>
+<dd> <ruby>日<rt>に</rt>本<rt>ほん</rt>語<rt>ご</rt></ruby></dd>
+<dt> Group ruby</dt>
+<dd> <ruby>今日<rt>きょう</rt></ruby></dd>
+<dt> Jukugo ruby</dt>
+<dd> <ruby>法<rb>華</rb><rb>経</rb><rt>ほ</rt><rt>け</rt><rt>きょう</rt></ruby></dd>
+<dt> Inline ruby</dt>
+<dd> <ruby>東<rb>京</rb><rp>(</rp><rt>とう</rt><rt>きょう</rt><rp>)</rp></ruby></dd>
+<dt> Double-sided ruby</dt>
+<dd> <ruby><rb>旧</rb><rb>金</rb><rb>山</rb><rt>jiù</rt><rt>jīn</rt><rt>shān</rt><rtc>San Francisco</rtc></ruby></dd></dl>
+<p><ruby>
+<rb>♥</rb><rtc><rt>Heart</rt></rtc><rtc lang="fr"><rt>Cœur</rt></rtc>
+<rb>☘</rb><rtc><rt>Shamrock</rt></rtc><rtc lang="fr"><rt>Trèfle</rt></rtc>
+<rb>✶</rb><rtc><rt>Star</rt></rtc><rtc lang="fr"><rt>Étoile</rt></rtc>
+</ruby>
+</p>
+!! end
+
!! test
Non-word characters don't terminate tag names (bug 17663, 40670, 52022)
!! wikitext
protected $dependencies = array();
protected $group = null;
protected $source = 'local';
+ protected $script = '';
+ protected $styles = '';
protected $skipFunction = null;
protected $targets = array( 'test' );
}
}
+ public function getScript( ResourceLoaderContext $context ) {
+ return $this->script;
+ }
+
+ public function getStyles( ResourceLoaderContext $context ) {
+ return array( '' => $this->styles );
+ }
+
public function getDependencies() {
return $this->dependencies;
}
protected function setUp() {
parent::setUp();
- $this->setMwGlobals( 'wgCacheDirectory', __DIR__ . '/../data' );
+ $this->setMwGlobals( 'wgGitInfoCacheDirectory', __DIR__ . '/../data/gitinfo' );
}
public function testValidJsonData() {
'wgScript' => '/wiki/index.php',
'wgArticlePath' => '/wiki/$1',
'wgWellFormedXml' => true,
+ 'wgCapitalLinks' => true,
) );
if ( $title === false ) {
* @covers ParserOutput::addLanguageLink
*/
public function testUpdate_langlinks() {
+ $this->setMwGlobals( array(
+ 'wgCapitalLinks' => true,
+ ) );
+
/** @var ParserOutput $po */
list( $t, $po ) = $this->makeTitleAndParserOutput( "Testing", 111 );
'message' => 'On request with handheld querystring and media is screen, returns null'
) );
}
+
+ public static function provideMakeResourceLoaderLink() {
+ return array(
+ // Load module script only
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ),
+ '<script src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=scripts&skin=vector&*"></script>
+'
+ ),
+ // Load module styles only
+ // This also tests the order the modules are put into the url
+ array(
+ array( array( 'test.baz', 'test.foo', 'test.bar' ), ResourceLoaderModule::TYPE_STYLES ),
+ '<link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.bar%2Cbaz%2Cfoo&only=styles&skin=vector&*">
+'
+ ),
+ // Load private module (combined)
+ array(
+ array( 'test.quux', ResourceLoaderModule::TYPE_COMBINED ),
+ '<script>if(window.mw){
+mw.loader.implement("test.quux",function($,jQuery){mw.test.baz({token:123});},{"css":[".mw-icon{transition:none}\n/* cache key: wiki:resourceloader:filter:minify-css:7:fd8ea20b3336b2bfb230c789d430067a */"]},{});
+/* cache key: wiki:resourceloader:filter:minify-js:7:274ccee17be73cd5f4dda5dc2a819188 */
+}</script>
+'
+ ),
+ // Load module script with with ESI
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS, true ),
+ '<script><esi:include src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=scripts&skin=vector&*" /></script>
+'
+ ),
+ // Load module styles with with ESI
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_STYLES, true ),
+ '<style><esi:include src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=styles&skin=vector&*" /></style>
+',
+ ),
+ );
+ }
+
+
+ /**
+ * @dataProvider provideMakeResourceLoaderLink
+ * @covers OutputPage::makeResourceLoaderLink
+ */
+ public function testMakeResourceLoaderLink( $args, $expectedHtml) {
+ $this->setMwGlobals( array(
+ 'wgResourceLoaderUseESI' => true,
+ 'wgLoadScript' => 'http://127.0.0.1:8080/w/load.php',
+ // Affects whether CDATA is inserted
+ 'wgWellFormedXml' => false,
+ // Cache key is based on database name, and affects output;
+ // this test should not touch the database anyways.
+ 'wgDBname' => 'wiki',
+ 'wgDBprefix' => '',
+ ) );
+ $class = new ReflectionClass( 'OutputPage' );
+ $method = $class->getMethod( 'makeResourceLoaderLink' );
+ $method->setAccessible( true );
+ $ctx = new RequestContext();
+ $out = new OutputPage( $ctx );
+ $rl = $out->getResourceLoader();
+ $rl->register( array(
+ 'test.foo' => new ResourceLoaderTestModule(array(
+ 'script' => 'mw.test.foo( { a: true } );',
+ 'styles' => '.mw-test-foo { content: "style"; }',
+ )),
+ 'test.bar' => new ResourceLoaderTestModule(array(
+ 'script' => 'mw.test.bar( { a: true } );',
+ 'styles' => '.mw-test-bar { content: "style"; }',
+ )),
+ 'test.baz' => new ResourceLoaderTestModule(array(
+ 'script' => 'mw.test.baz( { a: true } );',
+ 'styles' => '.mw-test-baz { content: "style"; }',
+ )),
+ 'test.quux' => new ResourceLoaderTestModule(array(
+ 'script' => 'mw.test.baz( { token: 123 } );',
+ 'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
+ 'group' => 'private',
+ )),
+ ) );
+ $links = $method->invokeArgs( $out, $args );
+ $this->assertEquals( $expectedHtml, $links['html'] );
+ }
}
$this->setMwGlobals( array(
'wgContLang' => Language::factory( 'en' ),
'wgLanguageCode' => 'en',
+ 'wgCapitalLinks' => true,
) );
}
NS_MEDIAWIKI => 'editinterface',
),
) );
+ // Without this testUserBlock will use a non-English context on non-English MediaWiki
+ // installations (because of how Title::checkUserBlock is implemented) and fail.
+ RequestContext::resetMain();
$this->userName = 'Useruser';
$this->altUserName = 'Altuseruser';
* @covers WikiPage::getRedirectTarget
*/
public function testGetRedirectTarget( $title, $model, $text, $target ) {
+ $this->setMwGlobals( array(
+ 'wgCapitalLinks' => true,
+ ) );
+
$page = $this->createPage( $title, $text, $model );
# sanity check, because this test seems to fail for no reason for some people.
}
public function testTitlesGetNormalized() {
-
global $wgMetaNamespace;
+ $this->setMwGlobals( array(
+ 'wgCapitalLinks' => true,
+ ) );
+
$data = $this->doApiRequest( array(
'action' => 'query',
'titles' => 'Project:articleA|article_B' ) );
* @dataProvider provideTestTitlePartToKey
*/
function testTitlePartToKey( $titlePart, $namespace, $expected, $expectException ) {
+ $this->setMwGlobals( array(
+ 'wgCapitalLinks' => true,
+ ) );
+
$api = new MockApiQueryBase();
$exceptionCaught = false;
try {
),
'wgUseTidy' => false,
'wgAlwaysUseTidy' => false,
+ 'wgCapitalLinks' => true,
) );
// bypass hooks that force custom rendering
--- /dev/null
+<?php
+class RepoGroupTest extends MediaWikiTestCase {
+
+ function testHasForeignRepoNegative() {
+ $this->setMWGlobals( 'wgForeignFileRepos', array() );
+ RepoGroup::destroySingleton();
+ FileBackendGroup::destroySingleton();
+ $this->assertFalse( RepoGroup::singleton()->hasForeignRepos() );
+ }
+
+ function testHasForeignRepoPositive() {
+ $this->setUpForeignRepo();
+ $this->assertTrue( RepoGroup::singleton()->hasForeignRepos() );
+ }
+
+ function testForEachForeignRepo() {
+ $this->setUpForeignRepo();
+ $fakeCallback = $this->getMock( 'RepoGroupTestHelper' );
+ $fakeCallback->expects( $this->once() )->method( 'callback' );
+ RepoGroup::singleton()->forEachForeignRepo( array( $fakeCallback, 'callback' ), array( array() ) );
+ }
+
+ function testForEachForeignRepoNone() {
+ $this->setMWGlobals( 'wgForeignFileRepos', array() );
+ RepoGroup::destroySingleton();
+ FileBackendGroup::destroySingleton();
+ $fakeCallback = $this->getMock( 'RepoGroupTestHelper' );
+ $fakeCallback->expects( $this->never() )->method( 'callback' );
+ RepoGroup::singleton()->forEachForeignRepo( array( $fakeCallback, 'callback' ), array( array() ) );
+ }
+
+ private function setUpForeignRepo() {
+ global $wgUploadDirectory;
+ $this->setMWGlobals( 'wgForeignFileRepos', array( array(
+ 'class' => 'ForeignAPIRepo',
+ 'name' => 'wikimediacommons',
+ 'backend' => 'wikimediacommons-backend',
+ 'apibase' => 'https://commons.wikimedia.org/w/api.php',
+ 'hashLevels' => 2,
+ 'fetchDescription' => true,
+ 'descriptionCacheExpiry' => 43200,
+ 'apiThumbCacheExpiry' => 86400,
+ 'directory' => $wgUploadDirectory
+ ) ) );
+ RepoGroup::destroySingleton();
+ FileBackendGroup::destroySingleton();
+ }
+}
+
+/**
+ * Quick helper class to use as a mock callback for RepoGroup::singleton()->forEachForeignRepo.
+ */
+class RepoGroupTestHelper {
+ function callback( FileRepo $repo, array $foo ) {
+ return true;
+ }
+}
--- /dev/null
+<?php
+
+class FileRepoFileTest extends MediaWikiMediaTestCase {
+ /**
+ * @dataProvider getThumbnailBucketProvider
+ * @covers File::getThumbnailBucket
+ */
+ public function testGetThumbnailBucket( $data ) {
+ $this->setMwGlobals( 'wgThumbnailBuckets', $data['buckets'] );
+ $this->setMwGlobals( 'wgThumbnailMinimumBucketDistance', $data['minimumBucketDistance'] );
+
+ $fileMock = $this->getMockBuilder( 'File' )
+ ->setConstructorArgs( array( 'fileMock', false ) )
+ ->setMethods( array( 'getWidth' ) )
+ ->getMockForAbstractClass();
+
+ $fileMock->expects( $this->any() )->method( 'getWidth' )->will(
+ $this->returnValue( $data['width'] ) );
+
+ $this->assertEquals(
+ $data['expectedBucket'],
+ $fileMock->getThumbnailBucket( $data['requestedWidth'] ),
+ $data['message'] );
+ }
+
+ public function getThumbnailBucketProvider() {
+ $defaultBuckets = array( 256, 512, 1024, 2048, 4096 );
+
+ return array(
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 120,
+ 'expectedBucket' => 256,
+ 'message' => 'Picking bucket bigger than requested size'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 300,
+ 'expectedBucket' => 512,
+ 'message' => 'Picking bucket bigger than requested size'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 1024,
+ 'expectedBucket' => 2048,
+ 'message' => 'Picking bucket bigger than requested size'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 2048,
+ 'expectedBucket' => false,
+ 'message' => 'Picking no bucket because none is bigger than the requested size'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 3500,
+ 'expectedBucket' => false,
+ 'message' => 'Picking no bucket because requested size is bigger than original'
+ ) ),
+ array( array(
+ 'buckets' => array( 1024 ),
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 1024,
+ 'expectedBucket' => false,
+ 'message' => 'Picking no bucket because requested size equals biggest bucket'
+ ) ),
+ array( array(
+ 'buckets' => null,
+ 'minimumBucketDistance' => 0,
+ 'width' => 3000,
+ 'requestedWidth' => 1024,
+ 'expectedBucket' => false,
+ 'message' => 'Picking no bucket because no buckets have been specified'
+ ) ),
+ array( array(
+ 'buckets' => array( 256, 512 ),
+ 'minimumBucketDistance' => 10,
+ 'width' => 3000,
+ 'requestedWidth' => 245,
+ 'expectedBucket' => 256,
+ 'message' => 'Requested width is distant enough from next bucket for it to be picked'
+ ) ),
+ array( array(
+ 'buckets' => array( 256, 512 ),
+ 'minimumBucketDistance' => 10,
+ 'width' => 3000,
+ 'requestedWidth' => 246,
+ 'expectedBucket' => 512,
+ 'message' => 'Requested width is too close to next bucket, picking next one'
+ ) ),
+ );
+ }
+
+ /**
+ * @dataProvider getThumbnailSourceProvider
+ * @covers File::getThumbnailSource
+ */
+ public function testGetThumbnailSource( $data ) {
+ $backendMock = $this->getMockBuilder( 'FSFileBackend' )
+ ->setConstructorArgs( array( array( 'name' => 'backendMock', 'wikiId' => wfWikiId() ) ) )
+ ->getMock();
+
+ $repoMock = $this->getMockBuilder( 'FileRepo' )
+ ->setConstructorArgs( array( array( 'name' => 'repoMock', 'backend' => $backendMock ) ) )
+ ->setMethods( array( 'fileExists', 'getLocalReference' ) )
+ ->getMock();
+
+ $fsFile = new FSFile( 'fsFilePath' );
+
+ $repoMock->expects( $this->any() )->method( 'fileExists' )->will(
+ $this->returnValue( true ) );
+
+ $repoMock->expects( $this->any() )->method( 'getLocalReference' )->will(
+ $this->returnValue( $fsFile ) );
+
+ $handlerMock = $this->getMock( 'BitmapHandler', array( 'supportsBucketing' ) );
+ $handlerMock->expects( $this->any() )->method( 'supportsBucketing' )->will(
+ $this->returnValue( $data['supportsBucketing'] ) );
+
+ $fileMock = $this->getMockBuilder( 'File' )
+ ->setConstructorArgs( array( 'fileMock', $repoMock ) )
+ ->setMethods( array( 'getThumbnailBucket', 'getLocalRefPath', 'getHandler' ) )
+ ->getMockForAbstractClass();
+
+ $fileMock->expects( $this->any() )->method( 'getThumbnailBucket' )->will(
+ $this->returnValue( $data['thumbnailBucket'] ) );
+
+ $fileMock->expects( $this->any() )->method( 'getLocalRefPath' )->will(
+ $this->returnValue( 'localRefPath' ) );
+
+ $fileMock->expects( $this->any() )->method( 'getHandler' )->will(
+ $this->returnValue( $handlerMock ) );
+
+ $reflection = new ReflectionClass( $fileMock );
+ $reflection_property = $reflection->getProperty( 'handler' );
+ $reflection_property->setAccessible( true );
+ $reflection_property->setValue( $fileMock, $handlerMock );
+
+ if ( !is_null( $data['tmpBucketedThumbCache'] ) ) {
+ $reflection_property = $reflection->getProperty( 'tmpBucketedThumbCache' );
+ $reflection_property->setAccessible( true );
+ $reflection_property->setValue( $fileMock, $data['tmpBucketedThumbCache'] );
+ }
+
+ $result = $fileMock->getThumbnailSource(
+ array( 'physicalWidth' => $data['physicalWidth'] ) );
+
+ $this->assertEquals( $data['expectedPath'], $result['path'], $data['message'] );
+ }
+
+ public function getThumbnailSourceProvider() {
+ return array(
+ array( array(
+ 'supportsBucketing' => true,
+ 'tmpBucketedThumbCache' => null,
+ 'thumbnailBucket' => 1024,
+ 'physicalWidth' => 2048,
+ 'expectedPath' => 'fsFilePath',
+ 'message' => 'Path downloaded from storage'
+ ) ),
+ array( array(
+ 'supportsBucketing' => true,
+ 'tmpBucketedThumbCache' => array( 1024 => '/tmp/shouldnotexist' + rand() ),
+ 'thumbnailBucket' => 1024,
+ 'physicalWidth' => 2048,
+ 'expectedPath' => 'fsFilePath',
+ 'message' => 'Path downloaded from storage because temp file is missing'
+ ) ),
+ array( array(
+ 'supportsBucketing' => true,
+ 'tmpBucketedThumbCache' => array( 1024 => '/tmp' ),
+ 'thumbnailBucket' => 1024,
+ 'physicalWidth' => 2048,
+ 'expectedPath' => '/tmp',
+ 'message' => 'Temporary path because temp file was found'
+ ) ),
+ array( array(
+ 'supportsBucketing' => false,
+ 'tmpBucketedThumbCache' => null,
+ 'thumbnailBucket' => 1024,
+ 'physicalWidth' => 2048,
+ 'expectedPath' => 'localRefPath',
+ 'message' => 'Original file path because bucketing is unsupported by handler'
+ ) ),
+ array( array(
+ 'supportsBucketing' => true,
+ 'tmpBucketedThumbCache' => null,
+ 'thumbnailBucket' => false,
+ 'physicalWidth' => 2048,
+ 'expectedPath' => 'localRefPath',
+ 'message' => 'Original file path because no width provided'
+ ) ),
+ );
+ }
+
+ /**
+ * @dataProvider generateBucketsIfNeededProvider
+ * @covers File::generateBucketsIfNeeded
+ */
+ public function testGenerateBucketsIfNeeded( $data ) {
+ $this->setMwGlobals( 'wgThumbnailBuckets', $data['buckets'] );
+
+ $backendMock = $this->getMockBuilder( 'FSFileBackend' )
+ ->setConstructorArgs( array( array( 'name' => 'backendMock', 'wikiId' => wfWikiId() ) ) )
+ ->getMock();
+
+ $repoMock = $this->getMockBuilder( 'FileRepo' )
+ ->setConstructorArgs( array( array( 'name' => 'repoMock', 'backend' => $backendMock ) ) )
+ ->setMethods( array( 'fileExists', 'getLocalReference' ) )
+ ->getMock();
+
+ $fileMock = $this->getMockBuilder( 'File' )
+ ->setConstructorArgs( array( 'fileMock', $repoMock ) )
+ ->setMethods( array( 'getWidth', 'getBucketThumbPath', 'makeTransformTmpFile', 'generateAndSaveThumb', 'getHandler' ) )
+ ->getMockForAbstractClass();
+
+ $handlerMock = $this->getMock( 'JpegHandler', array( 'supportsBucketing' ) );
+ $handlerMock->expects( $this->any() )->method( 'supportsBucketing' )->will(
+ $this->returnValue( true ) );
+
+ $fileMock->expects( $this->any() )->method( 'getHandler' )->will(
+ $this->returnValue( $handlerMock ) );
+
+ $reflectionMethod = new ReflectionMethod( 'File', 'generateBucketsIfNeeded' );
+ $reflectionMethod->setAccessible( true );
+
+ $fileMock->expects( $this->any() )
+ ->method( 'getWidth' )
+ ->will( $this->returnValue( $data['width'] ) );
+
+ $fileMock->expects( $data['expectedGetBucketThumbPathCalls'] )
+ ->method( 'getBucketThumbPath' );
+
+ $repoMock->expects( $data['expectedFileExistsCalls'] )
+ ->method( 'fileExists' )
+ ->will( $this->returnValue( $data['fileExistsReturn'] ) );
+
+ $fileMock->expects( $data['expectedMakeTransformTmpFile'] )
+ ->method( 'makeTransformTmpFile' )
+ ->will( $this->returnValue( $data['makeTransformTmpFileReturn'] ) );
+
+ $fileMock->expects( $data['expectedGenerateAndSaveThumb'] )
+ ->method( 'generateAndSaveThumb' )
+ ->will( $this->returnValue( $data['generateAndSaveThumbReturn'] ) );
+
+ $this->assertEquals( $data['expectedResult'],
+ $reflectionMethod->invoke(
+ $fileMock,
+ array(
+ 'physicalWidth' => $data['physicalWidth'],
+ 'physicalHeight' => $data['physicalHeight'] )
+ ),
+ $data['message'] );
+ }
+
+ public function generateBucketsIfNeededProvider() {
+ $defaultBuckets = array( 256, 512, 1024, 2048, 4096 );
+
+ return array(
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'width' => 256,
+ 'physicalWidth' => 256,
+ 'physicalHeight' => 100,
+ 'expectedGetBucketThumbPathCalls' => $this->never(),
+ 'expectedFileExistsCalls' => $this->never(),
+ 'fileExistsReturn' => null,
+ 'expectedMakeTransformTmpFile' => $this->never(),
+ 'makeTransformTmpFileReturn' => false,
+ 'expectedGenerateAndSaveThumb' => $this->never(),
+ 'generateAndSaveThumbReturn' => false,
+ 'expectedResult' => false,
+ 'message' => 'No bucket found, nothing to generate'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'width' => 5000,
+ 'physicalWidth' => 300,
+ 'physicalHeight' => 200,
+ 'expectedGetBucketThumbPathCalls' => $this->once(),
+ 'expectedFileExistsCalls' => $this->once(),
+ 'fileExistsReturn' => true,
+ 'expectedMakeTransformTmpFile' => $this->never(),
+ 'makeTransformTmpFileReturn' => false,
+ 'expectedGenerateAndSaveThumb' => $this->never(),
+ 'generateAndSaveThumbReturn' => false,
+ 'expectedResult' => false,
+ 'message' => 'File already exists, no reason to generate buckets'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'width' => 5000,
+ 'physicalWidth' => 300,
+ 'physicalHeight' => 200,
+ 'expectedGetBucketThumbPathCalls' => $this->once(),
+ 'expectedFileExistsCalls' => $this->once(),
+ 'fileExistsReturn' => false,
+ 'expectedMakeTransformTmpFile' => $this->once(),
+ 'makeTransformTmpFileReturn' => false,
+ 'expectedGenerateAndSaveThumb' => $this->never(),
+ 'generateAndSaveThumbReturn' => false,
+ 'expectedResult' => false,
+ 'message' => 'Cannot generate temp file for bucket'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'width' => 5000,
+ 'physicalWidth' => 300,
+ 'physicalHeight' => 200,
+ 'expectedGetBucketThumbPathCalls' => $this->once(),
+ 'expectedFileExistsCalls' => $this->once(),
+ 'fileExistsReturn' => false,
+ 'expectedMakeTransformTmpFile' => $this->once(),
+ 'makeTransformTmpFileReturn' => new TempFSFile( '/tmp/foo' ),
+ 'expectedGenerateAndSaveThumb' => $this->once(),
+ 'generateAndSaveThumbReturn' => false,
+ 'expectedResult' => false,
+ 'message' => 'Bucket image could not be generated'
+ ) ),
+ array( array(
+ 'buckets' => $defaultBuckets,
+ 'width' => 5000,
+ 'physicalWidth' => 300,
+ 'physicalHeight' => 200,
+ 'expectedGetBucketThumbPathCalls' => $this->once(),
+ 'expectedFileExistsCalls' => $this->once(),
+ 'fileExistsReturn' => false,
+ 'expectedMakeTransformTmpFile' => $this->once(),
+ 'makeTransformTmpFileReturn' => new TempFSFile( '/tmp/foo' ),
+ 'expectedGenerateAndSaveThumb' => $this->once(),
+ 'generateAndSaveThumbReturn' => new ThumbnailImage( false, 'bar', false, false ),
+ 'expectedResult' => true,
+ 'message' => 'Bucket image could not be generated'
+ ) ),
+ );
+ }
+}
* serialization function.
*/
public function provider() {
- return array(
+ $tests = array(
array( 'nil', null, 'c0' ),
array( 'bool', true, 'c3' ),
array( 'bool', false, 'c2' ),
array( 'uint 8', 128, 'cc80' ),
array( 'uint 16', 1000, 'cd03e8' ),
array( 'uint 32', 100000, 'ce000186a0' ),
- array( 'uint 64', 10000000000, 'cf00000002540be400' ),
array( 'negative fixnum', -1, 'ff' ),
array( 'negative fixnum', -2, 'fe' ),
array( 'int 8', -128, 'd080' ),
array( 'int 8', -35, 'd0dd' ),
array( 'int 16', -1000, 'd1fc18' ),
array( 'int 32', -100000, 'd2fffe7960' ),
- array( 'int 64', -10000000000, 'd3fffffffdabf41c00' ),
- array( 'int 64', -223372036854775807, 'd3fce66c50e2840001' ),
- array( 'int 64', -9223372036854775807, 'd38000000000000001' ),
array( 'double', 0.1, 'cb3fb999999999999a' ),
array( 'double', 1.1, 'cb3ff199999999999a' ),
array( 'double', 123.456, 'cb405edd2f1a9fbe77' ),
'82a36f6e6501a374776f02'
),
);
+
+ if ( PHP_INT_SIZE > 4 ) {
+ $tests[] = array( 'uint 64', 10000000000, 'cf00000002540be400' );
+ $tests[] = array( 'int 64', -10000000000, 'd3fffffffdabf41c00' );
+ $tests[] = array( 'int 64', -223372036854775807, 'd3fce66c50e2840001' );
+ $tests[] = array( 'int 64', -9223372036854775807, 'd38000000000000001' );
+ }
+
+ return $tests;
}
/**
*/
public function testPack( $type, $value, $expected ) {
$actual = bin2hex( MWMessagePack::pack( $value ) );
- $this->assertEquals( $actual, $expected, $type );
+ $this->assertEquals( $expected, $actual, $type );
}
}
}
/** @todo document */
- public function testAllBytes() {
- $this->doTestBytes( '', '' );
- $this->doTestBytes( 'x', '' );
- $this->doTestBytes( '', 'x' );
- $this->doTestBytes( 'x', 'x' );
+ public function provideAllBytes() {
+ return array(
+ array( '', '' ),
+ array( 'x', '' ),
+ array( '', 'x' ),
+ array( 'x', 'x' ),
+ );
}
- /** @todo document */
- function doTestBytes( $head, $tail ) {
+ /**
+ * @dataProvider provideAllBytes
+ * @todo document
+ */
+ function testBytes( $head, $tail ) {
for ( $i = 0x0; $i < 256; $i++ ) {
$char = $head . chr( $i ) . $tail;
$clean = UtfNormal::cleanUp( $char );
}
}
- /** @todo document */
- public function testDoubleBytes() {
- $this->doTestDoubleBytes( '', '' );
- $this->doTestDoubleBytes( 'x', '' );
- $this->doTestDoubleBytes( '', 'x' );
- $this->doTestDoubleBytes( 'x', 'x' );
- }
-
/**
+ * @dataProvider provideAllBytes
* @todo document
*/
- function doTestDoubleBytes( $head, $tail ) {
+ function testDoubleBytes( $head, $tail ) {
for ( $first = 0xc0; $first < 0x100; $first += 2 ) {
for ( $second = 0x80; $second < 0x100; $second += 2 ) {
$char = $head . chr( $first ) . chr( $second ) . $tail;
}
}
- /** @todo document */
- public function testTripleBytes() {
- $this->doTestTripleBytes( '', '' );
- $this->doTestTripleBytes( 'x', '' );
- $this->doTestTripleBytes( '', 'x' );
- $this->doTestTripleBytes( 'x', 'x' );
- }
-
- /** @todo document */
- function doTestTripleBytes( $head, $tail ) {
+ /**
+ * @dataProvider provideAllBytes
+ * @todo document
+ */
+ function testTripleBytes( $head, $tail ) {
for ( $first = 0xc0; $first < 0x100; $first += 2 ) {
for ( $second = 0x80; $second < 0x100; $second += 2 ) {
#for( $third = 0x80; $third < 0x100; $third++ ) {
class MediaWikiSiteTest extends SiteTest {
public function testNormalizePageTitle() {
+ $this->setMwGlobals( array(
+ 'wgCapitalLinks' => true,
+ ) );
+
$site = new MediaWikiSite();
$site->setGlobalId( 'enwiki' );
*/
class MediaWikiPageLinkRendererTest extends MediaWikiTestCase {
+ protected function setUp() {
+ parent::setUp();
+
+ $this->setMwGlobals( array(
+ 'wgContLang' => Language::factory( 'en' ),
+ ) );
+ }
+
/**
* Returns a mock GenderCache that will return "female" always.
*
'wgAllowUserJs' => false,
'wgDefaultLanguageVariant' => false,
'wgLocalInterwikis' => array( 'localtestiw' ),
+ 'wgCapitalLinks' => true,
// NOTE: this is why global state is evil.
// TODO: refactor access to the interwiki codes so it can be injected.
dépôts / lhc / web / wiklou.git / commitdiff