Merge "Use correct letter case"

diff --git a/includes/Message.php b/includes/Message.php
index 3bd7755..15d9786 100644 (file)
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -290,6 +290,7 @@ class Message implements MessageSpecifier, Serializable {
                        'format' => $this->format,
                        'useDatabase' => $this->useDatabase,
                        'title' => $this->title,
+                       'titlestr' => $this->title ? $this->title->getFullText() : null,
                ] );
        }
 
@@ -300,6 +301,10 @@ class Message implements MessageSpecifier, Serializable {
         */
        public function unserialize( $serialized ) {
                $data = unserialize( $serialized );
+               if ( !is_array( $data ) ) {
+                       throw new InvalidArgumentException( __METHOD__ . ': Invalid serialized data' );
+               }
+
                $this->interface = $data['interface'];
                $this->key = $data['key'];
                $this->keysToTry = $data['keysToTry'];
@@ -307,7 +312,15 @@ class Message implements MessageSpecifier, Serializable {
                $this->format = $data['format'];
                $this->useDatabase = $data['useDatabase'];
                $this->language = $data['language'] ? Language::factory( $data['language'] ) : false;
-               $this->title = $data['title'];
+
+               if ( isset( $data['titlestr'] ) ) {
+                       $this->title = Title::newFromText( $data['titlestr'] );
+               } elseif ( isset( $data['title'] ) && $data['title'] instanceof Title ) {
+                       // Old serializations from before December 2018
+                       $this->title = $data['title'];
+               } else {
+                       $this->title = null; // Explicit for sanity
+               }
        }
 
        /**

diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php
index 6d3b72c..fc1f6df 100644 (file)
--- a/includes/Revision/RevisionStore.php
+++ b/includes/Revision/RevisionStore.php
@@ -1624,7 +1624,7 @@ class RevisionStore
                        $row->role_name = $this->slotRoleStore->getName( (int)$row->slot_role_id );
                        $row->model_name = $this->contentModelStore->getName( (int)$row->content_model );
 
-                       $contentCallback = function ( SlotRecord $slot ) use ( $queryFlags, $row ) {
+                       $contentCallback = function ( SlotRecord $slot ) use ( $queryFlags ) {
                                return $this->loadSlotContent( $slot, null, null, null, $queryFlags );
                        };
 

diff --git a/includes/Storage/NameTableStore.php b/includes/Storage/NameTableStore.php
index c1dd09d..27194ab 100644 (file)
--- a/includes/Storage/NameTableStore.php
+++ b/includes/Storage/NameTableStore.php
@@ -205,7 +205,7 @@ class NameTableStore {
         *
         * @param int $connFlags ILoadBalancer::CONN_XXX flags. Optional.
         *
-        * @return \string[] The freshly reloaded name map
+        * @return string[] The freshly reloaded name map
         */
        public function reloadMap( $connFlags = 0 ) {
                $this->tableCache = $this->loadTable(

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index d014503..25e4aae 100644 (file)
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -174,7 +174,7 @@ class InfoAction extends FormlessAction {
         * @param string $table The table that will be added to the content
         * @param string $name The name of the row
         * @param string $value The value of the row
-        * @param string $id The ID to use for the 'tr' element
+        * @param string|null $id The ID to use for the 'tr' element
         * @return string The table with the row added
         */
        protected function addRow( $table, $name, $value, $id ) {

diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index 35cb83a..f4e7463 100644 (file)
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -418,7 +418,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
                if ( is_null( $resultPageSet ) ) {
                        // Try to add the result data in one go and pray that it fits
                        $code = $this->bl_code;
-                       $data = array_map( function ( $arr ) use ( $result, $code ) {
+                       $data = array_map( function ( $arr ) use ( $code ) {
                                if ( isset( $arr['redirlinks'] ) ) {
                                        $arr['redirlinks'] = array_values( $arr['redirlinks'] );
                                        ApiResult::setIndexedTagName( $arr['redirlinks'], $code );

diff --git a/includes/api/i18n/nb.json b/includes/api/i18n/nb.json
index 5e30c1a..3ba6228 100644 (file)
--- a/includes/api/i18n/nb.json
+++ b/includes/api/i18n/nb.json
@@ -24,7 +24,7 @@
        "apihelp-main-param-origin": "Når man aksesserer API-en som bruker en domene-kryssende AJAX-forespørsel (CORS), sett denne til det opprinnelige domenet. Denne må tas med i alle pre-flight-forespørsler, og derfor være en del av spørre-URI-en (ikke POST-kroppen).\n\nFor autentiserte forespørsler må denne stemme helt med en av de opprinnelige i <code>Origin</code>-headeren, slik at den må settes til noe a la <kbd>https://en.wikipedia.org</kbd> eller <kbd>https://meta.wikimedia.org</kbd>. Hvis denne parameteren ikke stemmer med <code>Origin</code>-headeren, returneres et 403-svar. Hvis denne parameteren stemmer med <code>Origin</code>-headeren og originalen er hvitlistet, vil <code>Access-Control-Allow-Origin</code> og <code>Access-Control-Allow-Credentials</code>-headere bli satt.\n\nFor ikke-autentiserte forepørsler, spesifiser <kbd>*</kbd>. Denne vil gjøre at <code>Access-Control-Allow-Origin</code>-headeren blir satt, men <code>Access-Control-Allow-Credentials</code> blir <code>false</code> og alle bruerspesifikke data blir begrenset.",
        "apihelp-main-param-uselang": "Språk å bruke for meldingsoversettelser. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> med <kbd>siprop=languages</kbd> returnerer en liste over språkkoder, eller spesifiser <kbd>user</kbd> for å bruke den nåværende brukerens språkpreferanser, eller spesifiser <kbd>content</kbd> for å bruke denne wikiens innholdsspråk.",
        "apihelp-main-param-errorformat": "Formater som kan brukes for advarsels- og feiltekster.\n; plaintext: Wikitext der HTML-tagger er fjernet og elementer byttet ut.\n; wikitext: Ubehandlet wikitext.\n; html: HTML.\n; raw: Meldingsnøkler og -parametre.\n; none: Ingen tekst, bare feilkoder.\n; bc: Format brukt før MediaWiki 1.29. <var>errorlang</var> og <var>errorsuselocal</var> ses bort fra.",
-       "apihelp-main-param-errorlang": "Språk som skal brukes for advarsler og feil. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> med <kbd>siprop=languages/<kbd> returnerer ei liste over språkkoder, eller angi <kbd>content</kbd> for å bruke wikiens innholdsspråk, eller angi <kbd>uselang</kbd> for å bruke samme verdi som <var>uselang</var>-parameteren.",
+       "apihelp-main-param-errorlang": "Språk som skal brukes for advarsler og feil. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> med <kbd>siprop=languages</kbd> returnerer ei liste over språkkoder, eller angi <kbd>content</kbd> for å bruke wikiens innholdsspråk, eller angi <kbd>uselang</kbd> for å bruke samme verdi som <var>uselang</var>-parameteren.",
        "apihelp-main-param-errorsuselocal": "Hvis gitt, vil feiltekster bruke lokalt tilpassede meldinger fra {{ns:MediaWiki}}-navnerommet.",
        "apihelp-block-summary": "Blokker en bruker.",
        "apihelp-block-param-user": "Brukernavn, IP-adresse eller IP-intervall som skal blokkeres. Kan ikke brukes sammen med <var>$1userid</var>",

diff --git a/includes/api/i18n/zh-hant.json b/includes/api/i18n/zh-hant.json
index 9c6e090..e3c0293 100644 (file)
--- a/includes/api/i18n/zh-hant.json
+++ b/includes/api/i18n/zh-hant.json
@@ -309,6 +309,7 @@
        "apihelp-parse-paramvalue-prop-displaytitle": "添加已解析 wiki 文字的標題。",
        "apihelp-parse-paramvalue-prop-headitems": "提供放置頁面裡的 <code>&lt;head&gt;</code> 之項目。",
        "apihelp-parse-paramvalue-prop-headhtml": "取得頁面已解析的 <code>&lt;head&gt;</code>。",
+       "apihelp-parse-paramvalue-prop-jsconfigvars": "針對頁面提供指定的 JavaScript 設置變數。若要套用，請使用 <code>mw.config.set()</code>。",
        "apihelp-parse-paramvalue-prop-encodedjsconfigvars": "指定頁面的 JavaScript 設置變量為 JSON 字串。",
        "apihelp-parse-paramvalue-prop-iwlinks": "在已解析的 wiki 文字提供跨 wiki 連結。",
        "apihelp-parse-paramvalue-prop-wikitext": "指定被解析的原始 wiki 文字。",
@@ -318,6 +319,7 @@
        "apihelp-parse-paramvalue-prop-parsetree": "修訂內容的 XML 解析樹狀（需要內容模組 <code>$1</code>）",
        "apihelp-parse-paramvalue-prop-parsewarnings": "提供發生在解析內容時的警告。",
        "apihelp-parse-param-wrapoutputclass": "要包在解析器輸出內容的 CSS 類別。",
+       "apihelp-parse-param-effectivelanglinks": "包含由擴充提供的語言連結（與 <kbd>$1prop=langlinks</kbd> 一起使用）。",
        "apihelp-parse-param-disablelimitreport": "從解析輸出內容裡省略限制報告（\"NewPP limit report\"）。",
        "apihelp-parse-param-disablepp": "請改用<var>$1disablelimitreport</var>。",
        "apihelp-parse-param-disableeditsection": "從解析輸出內容省略編輯段落連結。",
@@ -1271,6 +1273,8 @@
        "api-help-parameters": "{{PLURAL:$1|參數}}：",
        "api-help-param-deprecated": "已停用。",
        "api-help-param-required": "此參數為必填。",
+       "api-help-param-templated": "此為[[Special:ApiHelp/main#main/templatedparams|模板參數]]。當做出請求時，$2。",
+       "api-help-param-templated-var-first": "在參數名稱裡的 <var>&#x7B;$1&#x7D;</var> 應替換成 <var>$2</var> 的值",
        "api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> 與 <var>$2</var> 的值",
        "api-help-datatypes-header": "資料類型",
        "api-help-datatypes": "至MediaWiki的輸入值應為NFC標準化的UTF-8。MediaWiki可以嘗試轉換其他輸入值，但這可能導致一些操作失敗（例如附帶MD5檢查的[[Special:ApiHelp/edit|編輯]]）。\n\n一些在API請求中的參數類型需要更進一步解釋：\n;boolean\n:布林參數產生作用就像HTML複選框一樣：如果參數被指定，無論何值都被視為真（true）。如果要假值（false），則必須省略參數。\n;timestamp\n:時間戳記可被指定為多種格式。推荐使用ISO 8601日期和時間標準。所有時間為UTC時間，包含的任何時區都會被忽略。\n:* ISO 8601日期和時間，<kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd>（標點和<kbd>Z</kbd>為選用）\n:* 帶小數秒（會被忽略）的ISO 8601日期和時間，<kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>.<var>00001</var>Z</kbd>（破折號、冒號和<kbd>Z</kbd>為選用）\n:* MediaWiki格式，<kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* 一般數字格式，<kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>（<kbd>GMT</kbd>、<kbd>+<var>##</var></kbd>或<kbd>-<var>##</var></kbd>的選用時區會被忽略）\n:* EXIF格式，<kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* RFC 2822格式（時區可省略），<kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* RFC 850格式（時區可省略），<kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* C ctime格式，<kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* 從1970-01-01T00:00:00Z開始的秒數，作為1到13位數的整數（除了<kbd>0</kbd>）\n:* 字串<kbd>now</kbd>\n;替代多值分隔符號\n:使用多個值的參數通常會與垂直線符號（|）分隔的值一起提交，例如<kbd>param=value1|value2</kbd>或<kbd>param=value1%7Cvalue2</kbd>。如果值必須包含垂直線符號，使用U+001F（單位分隔符號）作為分隔符號，''並且''在值前加前綴U+001F，例如<kbd>param=%1Fvalue1%1Fvalue2</kbd>。",
@@ -1306,6 +1310,7 @@
        "api-help-examples": "{{PLURAL:$1|範例}}：",
        "api-help-permissions": "{{PLURAL:$1|權限}}：",
        "api-help-permissions-granted-to": "{{PLURAL:$1|已授權給}}: $2",
+       "api-help-right-apihighlimits": "在 API 查詢使用較高的限制（慢查詢：$1；快查詢：$2）。慢查詢的限制也適用於多值參數。",
        "api-help-open-in-apisandbox": "<small>[在沙盒中開啟]</small>",
        "api-help-authmanager-general-usage": "使用此模組的一般程式是：\n# 通過 <kbd>amirequestsfor=$4</kbd> 取得來自 <kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd> 的可用欄位，和來自 <kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd> 的<kbd>$5</kbd>權杖。\n# 向用戶顯示欄位，並獲得其提交的內容。\n# 提交（POST）至此模組，提供 <var>$1returnurl</var> 及任何相關欄位。\n# 在回應中檢查 <samp>status</samp>。\n#* 如果您收到了 <samp>PASS</samp>（成功）或<samp>FAIL</samp>（失敗），則認為操作結束。成功與否如上句所示。\n#* 如果您收到了 <samp>UI</samp>，向用戶顯示新欄位，並再次獲取其提交的內容。然後再次使用 <var>$1continue</var>，向本模組提交相關欄位，並重復第四步。\n#* 如果您收到了 <samp>REDIRECT</samp>，將使用者指向<samp>redirecttarget</samp> 中的目標，等待其返回<var>$1returnurl</var>。然後再次使用 <var>$1continue</var>，向本模組提交返回 URL 中提供的一切欄位，並重復第四步。\n#* 如果您收到了 <samp>RESTART</samp>，這意味著身份驗證正常運作，但我們沒有連結的使用者帳戶。您可以將此視為 <samp>UI</samp>或<samp>FAIL</samp>。",
        "api-help-authmanagerhelper-requests": "只使用這些身份驗證請求，透過自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>回傳的<samp>id</samp>與<kbd>amirequestsfor=$1</kbd>，或來自此模組之前的回應。",
@@ -1316,6 +1321,8 @@
        "api-help-authmanagerhelper-returnurl": "為第三方身份驗證流程傳回URL，必須為絕對值。需要此值或<var>$1continue</var>兩者之一。\n\n在接收<samp>REDIRECT</samp>回應時，一般狀況下您將打開瀏覽器或網站瀏覽功能到特定的<samp>redirecttarget</samp> URL以進行第三方身份驗證流程。當它完成時，第三方會將瀏覽器或網站瀏覽功能送至此URL。您應當提取任何來自URL的查詢或POST參數，並將之作為<var>$1continue</var>請求傳遞至此API模組。",
        "api-help-authmanagerhelper-continue": "此請求是在先前的<samp>UI</samp>或<samp>REDIRECT</samp>回應之後的後續動作。必須為此值或<var>$1returnurl</var>。",
        "api-help-authmanagerhelper-additional-params": "此模組允許額外參數，取決於可用的身份驗證請求。使用<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>与<kbd>amirequestsfor=$1</kbd>（或之前來自此模組的回應，如果合適）以決定可用請求及其使用的欄位。",
+       "apierror-allimages-redirect": "當使用 <kbd>allimages</kbd> 作為產生器時，請改用 <kbd>gaifilterredir=nonredirects</kbd> 而不是 <var>redirects</var>。",
+       "apierror-allpages-generator-redirects": "當使用 <kbd>allpages</kbd> 作為產生器時，請改用 <kbd>gapfilterredir=nonredirects</kbd> 而不是 <var>redirects</var>。",
        "apierror-appendnotsupported": "無法附加到使用內容模組 $1 的頁面。",
        "apierror-articleexists": "您所嘗試建立的條目剛剛已被創建。",
        "apierror-assertbotfailed": "斷言使用者擁有的 <code>bot</code> 權限失效。",
@@ -1324,6 +1331,8 @@
        "apierror-autoblocked": "您的 IP 位址已經被自動封鎖，因為它曾經被一名已封鎖的使用者使用過。",
        "apierror-bad-badfilecontexttitle": "在 <var>$1badfilecontexttitle</var> 參數的無效標題。",
        "apierror-badconfig-resulttoosmall": "在此 wiki 上 <code>$wgAPIMaxResultSize</code> 的值太小，而無法含有基本結果資訊。",
+       "apierror-badcontinue": "無效的繼續參數。您應該傳遞由前一個查詢所回傳的原有值。",
+       "apierror-baddiff": "無法取得差異。不存在一個或兩個修訂，或是您沒有權限來檢視它們。",
        "apierror-baddiffto": "<var>$1diffto</var> 必須設定成非負值的數字、<kbd>prev</kbd>、<kbd>next</kbd>、或 <kbd>cur</kbd>。",
        "apierror-badformat-generic": "內容模組 $2 不支援使用請求格式 $1。",
        "apierror-badformat": "由 $3 所使用的內容模組 $2 不支援使用請求格式 $1。",
@@ -1337,6 +1346,7 @@
        "apierror-badquery": "無效的查詢。",
        "apierror-badtimestamp": "用於時間戳記參數 <var>$1</var> 的值「$2」無效。",
        "apierror-badtoken": "無效 CSRF 權杖。",
+       "apierror-badupload": "檔案上傳參數 <var>$1</var> 不是一個檔案上傳，請確定在您的 POST 有使用 <code>multipart/form-data</code>，並且在 <code>Content-Disposition</code> 標頭有包含檔案名稱。",
        "apierror-badurl": "用於 URL 參數 <var>$1</var> 的值「$2」無效。",
        "apierror-baduser": "用於使用者參數 <var>$1</var> 的值「$2」無效。",
        "apierror-bad-watchlist-token": "提供無效的監視清單權杖。請在 [[Special:Preferences]] 設定正確權杖。",
@@ -1357,6 +1367,9 @@
        "apierror-cantundelete": "無法取消刪除：請求的修訂可能不存在，或是可能已被取消刪除。",
        "apierror-changeauth-norequest": "建立更改請求失敗。",
        "apierror-cidrtoobroad": "不能接受超出 /$2 的 $1 CIDR 範圍。",
+       "apierror-compare-no-title": "無法在不帶標題之下預先儲存轉換。請嘗試指定 <var>fromtitle</var> 或 <var>totitle</var>。",
+       "apierror-compare-nosuchfromsection": "在 'from' 內容裡沒有段落$1。",
+       "apierror-compare-nosuchtosection": "在 'to' 內容裡沒有段落$1。",
        "apierror-compare-notext": "參數 <var>$1</var> 不能在缺少 <var>$2</var> 的情況下使用。",
        "apierror-contentserializationexception": "內容序列化失敗：$1",
        "apierror-copyuploadbaddomain": "不允許從此網域來透過 URL 上傳。",
@@ -1386,7 +1399,9 @@
        "apierror-invalidoldimage": "<var>oldimage</var> 參數含有無效格式。",
        "apierror-invalidparammix-cannotusewith": "參數 <kbd>$1</kbd> 不能與 <kbd>$2</kbd> 一起使用。",
        "apierror-invalidparammix-mustusewith": "<kbd>$1</kbd> 參數僅能與 <kbd>$2</kbd> 一起使用。",
+       "apierror-invalidparammix-parse-new-section": "<kbd>section=new</kbd> 不能連同 <var>oldid</var>、<var>pageid</var>、或 <var>page</var> 參數。請使用 <var>title</var> 與 <var>text</var>。",
        "apierror-invalidparammix": "{{PLURAL:$2|參數}} $1 不能一起使用。",
+       "apierror-invalidsection": "<var>section</var> 參數必須是有效的段落 ID 或 <kbd>new</kbd>。",
        "apierror-invalidsha1base36hash": "所提供的 SHA1Base36 雜湊無效。",
        "apierror-invalidsha1hash": "所提供的 SHA1 雜湊無效。",
        "apierror-invalidtitle": "錯誤標題「$1」。",
@@ -1483,6 +1498,7 @@
        "apierror-systemblocked": "您已被 MediaWiki 給自動封鎖。",
        "apierror-templateexpansion-notwikitext": "模板擴展僅支援用於 wiki 文字內容。$1使用內容模組 $2。",
        "apierror-timeout": "伺服器未有在預計的時間內回應。",
+       "apierror-toofewexpiries": "提供了 $1 個逾期{{PLURAL:$1|時間戳記|時間戳記}}，所需要的{{PLURAL:$2|是|是}} $2 個。",
        "apierror-toomanyvalues": "替參數 <var>$1</var> 提供太多的值。限制為 $2。",
        "apierror-unknownaction": "指定的操作 <kbd>$1</kbd> 無法識別出。",
        "apierror-unknownerror-editpage": "不明編輯頁面錯誤：$1。",
@@ -1500,10 +1516,14 @@
        "apierror-writeapidenied": "您不被允許透過 API 來編輯此 wiki。",
        "apiwarn-alldeletedrevisions-performance": "為了在產生標題時能有更好效能，請設定 <kbd>$1dir=newer</kbd>。",
        "apiwarn-badurlparam": "無法解析$2的 <var>$1urlparam</var>。這僅能用在寬度與高度。",
+       "apiwarn-checktoken-percentencoding": "在 URL 裡進行適當百分比編碼的權杖中，檢查像是「+」的符號。",
        "apiwarn-compare-nocontentmodel": "沒有可確定的內容模組，假定為 $1。",
        "apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> 已棄用。請改用 <kbd>prop=deletedrevisions</kbd> 或 <kbd>list=alldeletedrevisions</kbd>。",
        "apiwarn-deprecation-httpsexpected": "當應為 HTTPS 時，HTTP 要被使用。",
+       "apiwarn-deprecation-login-botpw": "透過 <kbd>action=login</kbd> 的主帳號登入已棄用，並可能會在無警告的情況下停止運作。要繼續以 <kbd>action=clientlogin</kbd> 登入，請參閱 [[Special:BotPasswords]]；若要繼續安全使用主帳號登入，則請參閱 <kbd>action=clientlogin</kbd>。",
+       "apiwarn-deprecation-login-nobotpw": "透過 <kbd>action=login</kbd> 的主帳號登入已棄用，並可能會在無警告的情況下停止運作。若要安全登入，請參閱 <kbd>action=clientlogin</kbd>。",
        "apiwarn-deprecation-login-token": "透過 <kbd>action=login</kbd> 來取得權杖已棄用。請改用 <kbd>action=query&meta=tokens&type=login</kbd>。",
+       "apiwarn-deprecation-missingparam": "因為未指定 <var>$1</var>，輸出內容使用到過去舊有的格式。該格式已棄用，並且往後都只會使用新格式。",
        "apiwarn-deprecation-parameter": "參數 <var>$1</var> 已棄用。",
        "apiwarn-deprecation-parse-headitems": "<kbd>prop=headitems</kbd> 自 MediaWiki 的 1.28 版本後已被棄用。當建立新 HTML 文件時請使用 <kbd>prop=headhtml</kbd>，或是當更新文件客戶端時請使用 <kbd>prop=modules|jsconfigvars</kbd>。",
        "apiwarn-deprecation-purge-get": "透過 GET 方式使用的 <kbd>action=purge</kbd> 已棄用，請以 POST 替代。",
@@ -1520,6 +1540,8 @@
        "apiwarn-notfile": "「$1」不是一個檔案。",
        "apiwarn-nothumb-noimagehandler": "無法建立縮圖，因為$1沒有相關的圖片處理器。",
        "apiwarn-parse-nocontentmodel": "未提供 <var>title</var> 或 <var>contentmodel</var>，應是 $1。",
+       "apiwarn-parse-revidwithouttext": "<var>revid</var> 在不帶有 <var>text</var> 的情況下使用，且請求了已解析頁面屬性。請問您是指要使用 <var>oldid</var> 而不是 <var>revid</var> 嗎？",
+       "apiwarn-parse-titlewithouttext": "<var>title</var> 在不帶有 <var>text</var> 的情況下使用，且請求了已解析頁面屬性。請問您是指要使用 <var>page</var> 而不是 <var>title</var> 嗎？",
        "apiwarn-tokennotallowed": "「$1」操作不允許目前的使用者。",
        "apiwarn-tokens-origin": "當未套用相同來源方針，權杖可能無法取得。",
        "apiwarn-truncatedresult": "結果會被截短，否則將會大於 $1 位元組限制。",

diff --git a/includes/installer/WebInstallerUpgrade.php b/includes/installer/WebInstallerUpgrade.php
index a6157b5..46efc40 100644 (file)
--- a/includes/installer/WebInstallerUpgrade.php
+++ b/includes/installer/WebInstallerUpgrade.php
@@ -39,14 +39,13 @@ class WebInstallerUpgrade extends WebInstallerPage {
                        if ( $this->parent->request->wasPosted() && !$this->getVar( '_ExistingDBSettings' ) ) {
                                // Done message acknowledged
                                return 'continue';
-                       } else {
-                               // Back button click
-                               // Show the done message again
-                               // Make them click back again if they want to do the upgrade again
-                               $this->showDoneMessage();
-
-                               return 'output';
                        }
+                       // Back button click
+                       // Show the done message again
+                       // Make them click back again if they want to do the upgrade again
+                       $this->showDoneMessage();
+
+                       return 'output';
                }
 
                // wgDBtype is generally valid here because otherwise the previous page
@@ -73,15 +72,13 @@ class WebInstallerUpgrade extends WebInstallerPage {
                                }
                                $this->setVar( '_UpgradeDone', true );
                                $this->showDoneMessage();
-
-                               return 'output';
                        } else {
                                $this->startForm();
                                $this->parent->showError( 'config-upgrade-error' );
                                $this->endForm();
-
-                               return 'output';
                        }
+
+                       return 'output';
                }
 
                $this->startForm();

diff --git a/includes/libs/mime/XmlTypeCheck.php b/includes/libs/mime/XmlTypeCheck.php
index 9cfaf67..a270105 100644 (file)
--- a/includes/libs/mime/XmlTypeCheck.php
+++ b/includes/libs/mime/XmlTypeCheck.php
@@ -418,7 +418,7 @@ class XmlTypeCheck {
         * We whitelist an extremely restricted subset of DTD features.
         *
         * Safe is defined as:
-        *  * Only contains entity defintions (e.g. No <!ATLIST )
+        *  * Only contains entity definitions (e.g. No <!ATLIST )
         *  * Entity definitions are not "system" entities
         *  * Entity definitions are not "parameter" (i.e. %) entities
         *  * Entity definitions do not reference other entites except &amp;

diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index c6bcc7a..bc5ea46 100644 (file)
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -64,7 +64,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
        protected $keyspace = 'local';
        /** @var LoggerInterface */
        protected $logger;
-       /** @var callback|null */
+       /** @var callable|null */
        protected $asyncHandler;
        /** @var int Seconds */
        protected $syncTimeout;

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index e7586cf..ed5c7f5 100644 (file)
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1166,7 +1166,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         *
         * @param string $key
         * @param int $ttl
-        * @param callback $callback
+        * @param callable $callback
         * @param array $opts Options map for getWithSetCallback()
         * @param float|null &$asOf Cache generation timestamp of returned value [returned]
         * @return mixed

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 2c40c72..f151d85 100644 (file)
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -97,9 +97,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
        protected $connLogger;
        /** @var LoggerInterface */
        protected $queryLogger;
-       /** @var callback Error logging callback */
+       /** @var callable Error logging callback */
        protected $errorLogger;
-       /** @var callback Deprecation logging callback */
+       /** @var callable Deprecation logging callback */
        protected $deprecationLogger;
 
        /** @var resource|null Database connection */

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index de67b84..032d481 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -57,7 +57,7 @@ class ParserOptions {
 
        /**
         * Lazy-loaded options
-        * @var callback[]
+        * @var callable[]
         */
        private static $lazyOptions = [
                'dateformat' => [ __CLASS__, 'initDateFormat' ],

diff --git a/includes/password/PasswordPolicyChecks.php b/includes/password/PasswordPolicyChecks.php
index 04ee6e9..3c56535 100644 (file)
--- a/includes/password/PasswordPolicyChecks.php
+++ b/includes/password/PasswordPolicyChecks.php
@@ -87,7 +87,7 @@ class PasswordPolicyChecks {
                $username = $user->getName();
                $contLang = MediaWikiServices::getInstance()->getContentLanguage();
                if (
-                       $policyVal && $contLang->lc( $password ) === $contLang->lc( $username )
+                       $policyVal && hash_equals( $contLang->lc( $username ), $contLang->lc( $password ) )
                ) {
                        $status->error( 'password-name-match' );
                }
@@ -110,12 +110,15 @@ class PasswordPolicyChecks {
                $status = Status::newGood();
                $username = $user->getName();
                if ( $policyVal ) {
-                       if ( isset( $blockedLogins[$username] ) && $password == $blockedLogins[$username] ) {
+                       if (
+                               isset( $blockedLogins[$username] ) &&
+                               hash_equals( $blockedLogins[$username], $password )
+                       ) {
                                $status->error( 'password-login-forbidden' );
                        }
 
                        // Example from ApiChangeAuthenticationRequest
-                       if ( $password === 'ExamplePassword' ) {
+                       if ( hash_equals( 'ExamplePassword', $password ) ) {
                                $status->error( 'password-login-forbidden' );
                        }
                }

diff --git a/includes/search/SearchSuggestionSet.php b/includes/search/SearchSuggestionSet.php
index cb1f831..f1da246 100644 (file)
--- a/includes/search/SearchSuggestionSet.php
+++ b/includes/search/SearchSuggestionSet.php
@@ -80,7 +80,7 @@ class SearchSuggestionSet {
 
        /**
         * Call array_map on the suggestions array
-        * @param callback $callback
+        * @param callable $callback
         * @return array
         */
        public function map( $callback ) {
@@ -89,7 +89,7 @@ class SearchSuggestionSet {
 
        /**
         * Filter the suggestions array
-        * @param callback $callback Callable accepting single SearchSuggestion
+        * @param callable $callback Callable accepting single SearchSuggestion
         *  instance returning bool false to remove the item.
         * @return int The number of suggestions removed
         */

diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 1476e85..8466399 100644 (file)
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -254,7 +254,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 
                $allReqs = AuthManager::singleton()->getAuthenticationRequests(
                        $this->authAction, $this->getUser() );
-               $this->authRequests = array_filter( $allReqs, function ( $req ) use ( $subPage ) {
+               $this->authRequests = array_filter( $allReqs, function ( $req ) {
                        return !in_array( get_class( $req ), $this->getRequestBlacklist(), true );
                } );
        }

diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php
index 74ec6b5..e8a7d2d 100644 (file)
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -224,7 +224,7 @@ class BlockListPager extends TablePager {
                                                'ul',
                                                [],
                                                implode( '', array_map( function ( $prop ) {
-                                                       return HTML::rawElement(
+                                                       return Html::rawElement(
                                                                'li',
                                                                [],
                                                                $prop
@@ -264,7 +264,7 @@ class BlockListPager extends TablePager {
                                continue;
                        }
 
-                       $items[] = HTML::rawElement(
+                       $items[] = Html::rawElement(
                                'li',
                                [],
                                Linker::link( $restriction->getTitle() )

diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index 4d6a96b..66a56fe 100644 (file)
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -1088,7 +1088,8 @@
        "timezonelegend": "المنطقة الزمنية:",
        "localtime": "الوقت المحلي:",
        "timezoneuseserverdefault": "استخدام الويكي الافتراضي ($1)",
-       "timezoneuseoffset": "آخر (حدد الفرق)",
+       "timezoneuseoffset": "غير ذلك (حدد الإزاحة أدناه)",
+       "timezone-useoffset-placeholder": "مثال القيم: \"-07:00\" أو \"01:00\"",
        "servertime": "وقت الخادم:",
        "guesstimezone": "أدخل التوقيت من المتصفح",
        "timezoneregion-africa": "أفريقيا",

diff --git a/languages/i18n/azb.json b/languages/i18n/azb.json
index 0f573ff..9187e33 100644 (file)
--- a/languages/i18n/azb.json
+++ b/languages/i18n/azb.json
@@ -1187,6 +1187,7 @@
        "rcfilters-group-results-by-page": "دییشیکلیکلری صفحه‌لرینه گؤره سیرالا",
        "rcfilters-activefilters": "چالیشقان فیلترلر",
        "rcfilters-activefilters-hide": "گیزلت",
+       "rcfilters-advancedfilters": "گئنیش فیلترلر",
        "rcfilters-limit-title": "دَییشدیرمه سایی‌سی",
        "rcfilters-date-popup-title": "آختاریش چاغی",
        "rcfilters-days-title": "سوْن گۆنلر",
@@ -1207,7 +1208,10 @@
        "rcfilters-filtergroup-automated": "اوْتوماتیک دییشدیرمه‌لر",
        "rcfilters-filter-humans-label": "اینسان (غئیر روْبات)",
        "rcfilters-filter-humans-description": "اینسان اَلی ایله دییشدیرمه‌لر",
+       "rcfilters-filtergroup-reviewstatus": "یوخلاما وضعیتی",
        "rcfilters-filter-minor-label": "کیچیک دَییشدیرمه‌لر",
+       "rcfilters-filtergroup-watchlist": "ایزلنمیش صفحه‌لر",
+       "rcfilters-filter-watchlist-watched-label": "ایزلنمیش",
        "rcfilters-filtergroup-changetype": "دَییشیکلیک نوعو",
        "rcfilters-filter-pageedits-label": "صفحه دییشدیرمه‌لری",
        "rcfilters-filter-newpages-label": "صفحه یاراتما",
@@ -1215,6 +1219,7 @@
        "rcfilters-filter-logactions-label": "چالیشمالار ژورنالی",
        "rcfilters-filtergroup-lastRevision": "سوْن نوسخه‌لر",
        "rcfilters-filter-lastrevision-label": "سوْن نوسخه",
+       "rcfilters-filter-previousrevision-label": "سوْن نوسخه اولمایان",
        "rcfilters-exclude-button-off": "سئچیلمیشلرین چیخاریلماسی",
        "rcfilters-exclude-button-on": "سئچیلمیشلرین چیخاریلماسی",
        "rcfilters-view-tags": "اتیکتلنمیش دییشدیرمه‌لر",
@@ -1735,8 +1740,8 @@
        "trackingcategories-disabled": "بؤلمه باغلانیب‌دیر.",
        "mailnologin": "گؤندرمه آدرسی یوخدور",
        "mailnologintext": "باشقا ایستیفاده‌چیلره ایمیل گؤندرک اوچون، [[Special:UserLogin|گیریش]] ائدیب و [[Special:Preferences|ترجیحلر]]ینیزده گئچرلی ایمیل آدرسی وئرمه‌لیسینیز.",
-       "emailuser": "بÙ\88 اÛ\8cستÛ\8cÙ\81ادÙ\87â\80\8cÚ\86Û\8câ\80\8cÛ\8cÙ\87 اÛ\8cÙ\85یل گؤندر",
-       "emailuser-title-target": "بÙ\88 {{GENDER:$1|اÛ\8cستÛ\8cÙ\81ادÙ\87â\80\8cÚ\86Û\8c}}â\80\8cÛ\8cÙ\87 اÛ\8cÙ\85یل گؤندر",
+       "emailuser": "بÙ\88 اÛ\8cØ´Ù\84دÙ\86Ù\87 اÛ\8cÙ\85ئیل گؤندر",
+       "emailuser-title-target": "بÙ\88 {{GENDER:$1|اÛ\8cØ´Ù\84دÙ\86Ù\87}}â\80\8c اÛ\8cÙ\85ئیل گؤندر",
        "emailuser-title-notarget": "ایستیفاده‌چی‌یه ایمیل گؤندر",
        "emailpagetext": "آشاغیداکی فورمدان، بو {{GENDER:$1|ایستیفاده‌چی}}‌یه ایمئیل گؤندرمک اۆچون ایستیفاده ائده بیلرسینیز.\n[[Special:Preferences|اؤز ترجیحلرینیز]]ده وئرن ایمئیل آدرسی، بو ایمئیلین \"From\" یئرینده گؤستریله‌رک ایمئیلی آلان سیزه موستقیم جاواب گؤندره بیلر.",
        "defemailsubject": "«$1» آدلی ایستیفاده‌چی‌دن، {{SITENAME}} ایمیلی",

diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json
index fad0d1a..dbec79d 100644 (file)
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -1028,7 +1028,7 @@
        "timezonelegend": "Часавы пояс:",
        "localtime": "Мясцовы час:",
        "timezoneuseserverdefault": "Выкарыстоўваць стандартныя налады {{GRAMMAR:родны|{{SITENAME}}}} ($1)",
-       "timezoneuseoffset": "Іншы (пазначце розьніцу ў часе)",
+       "timezoneuseoffset": "Іншы (пазначце ніжэй розьніцу ў часе)",
        "servertime": "Час на сэрвэры:",
        "guesstimezone": "Запоўніць з браўзэра",
        "timezoneregion-africa": "Афрыка",
@@ -1807,7 +1807,7 @@
        "upload-disallowed-here": "Вы ня можаце перазапісаць гэты файл.",
        "filerevert": "Вярнуць $1",
        "filerevert-legend": "Вярнуць папярэднюю вэрсію файлу",
-       "filerevert-intro": "Вы вяртаеце '''[[Media:$1|$1]]''' да [вэрсіі $4 ад $3, $2].",
+       "filerevert-intro": "Вы вяртаеце файл <strong>[[Media:$1|$1]]</strong> да [$4 вэрсіі ад $3, $2].",
        "filerevert-comment": "Прычына:",
        "filerevert-defaultcomment": "Вернутая вэрсія ад $2 $1 ($3)",
        "filerevert-submit": "Вярнуць",

diff --git a/languages/i18n/be.json b/languages/i18n/be.json
index ae084e0..f0c83c7 100644 (file)
--- a/languages/i18n/be.json
+++ b/languages/i18n/be.json
@@ -979,7 +979,7 @@
        "search-showingresults": "{{PLURAL:$4|Вынік <strong>$1</strong> з <strong>$3</strong>|Вынікі <strong>$1 — $2</strong> з <strong>$3</strong>}}",
        "search-nonefound": "Нічога не было знойдзена.",
        "search-nonefound-thiswiki": "Няма вынікаў, якія б адпавядалі такому запыту на гэтым сайце.",
-       "powersearch-legend": "Падрабязны пошук",
+       "powersearch-legend": "Пашыраны пошук",
        "powersearch-ns": "Шукаць у прасторах назваў:",
        "powersearch-togglelabel": "Пазначыць:",
        "powersearch-toggleall": "Усе",

diff --git a/languages/i18n/da.json b/languages/i18n/da.json
index bf079bd..462d835 100644 (file)
--- a/languages/i18n/da.json
+++ b/languages/i18n/da.json
@@ -1059,7 +1059,8 @@
        "timezonelegend": "Tidszone:",
        "localtime": "Lokaltid:",
        "timezoneuseserverdefault": "Brug wiki'ens standardindstilling ($1)",
-       "timezoneuseoffset": "Anden (angiv forskel)",
+       "timezoneuseoffset": "Anden (angiv forskel forneden)",
+       "timezone-useoffset-placeholder": "Eksempelværdier: \"-07:00\" eller \"01:00\"",
        "servertime": "Serverens tid:",
        "guesstimezone": "Hent tidszone fra browseren",
        "timezoneregion-africa": "Afrika",

diff --git a/languages/i18n/de.json b/languages/i18n/de.json
index 036bd08..992040c 100644 (file)
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -1108,7 +1108,8 @@
        "timezonelegend": "Zeitzone:",
        "localtime": "Ortszeit:",
        "timezoneuseserverdefault": "Standardzeit dieses Wikis nutzen ($1)",
-       "timezoneuseoffset": "Andere (Unterschied angeben)",
+       "timezoneuseoffset": "Andere (unten Unterschied angeben)",
+       "timezone-useoffset-placeholder": "Beispielwerte: „-07:00“ oder „01:00“",
        "servertime": "Aktuelle Zeit auf dem Server:",
        "guesstimezone": "Vom Browser übernehmen",
        "timezoneregion-africa": "Afrika",

diff --git a/languages/i18n/dty.json b/languages/i18n/dty.json
index 79f89e9..d22d6d2 100644 (file)
--- a/languages/i18n/dty.json
+++ b/languages/i18n/dty.json
@@ -1400,7 +1400,7 @@
        "specialpages-group-changes": "अल्लैका परिवर्तन लगहरू",
        "tags": "मान्य परिवर्तन ट्यागहरू",
        "tag-filter": "[[Special:Tags|पुछड]] छानिन्या",
-       "tag-list-wrapper": "[[Special:Tags|{{PLURAL:$1|à¤\9fà¥\8dयाà¤\97|à¤\9fà¥\8dयाà¤\97हरà¥\82}}]]: $2",
+       "tag-list-wrapper": "[[Special:Tags|{{PLURAL:$1|à¤\9fà¥\8dयाà¤\97|à¤\9fà¥\8dयाà¤\97à¤\85न}}]]: $2",
        "tags-active-no": "नाइँ",
        "tags-hitcount": "$1 {{PLURAL:$1|परिवर्तन|परिवर्तनहरू}}",
        "tags-create-no-name": "तमीले ट्याग नाम निर्दिष्ट गद्दु पड्ड्या हुन्छ ।",

diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index c43d74c..df93640 100644 (file)
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -339,9 +339,9 @@
        "nospecialpagetext": "<strong>Vi petis malvalidan specialan paĝon.</strong>\n\nListo de validaj specialaj paĝoj estas trovebla ĉe [[Special:SpecialPages|{{int:specialpages}}]].",
        "error": "Eraro",
        "databaseerror": "Datumbaza eraro",
-       "databaseerror-text": "Datumbaza eraro de la mendo okazis.\nĈi tiu eble indikas cimon de la programaro.",
+       "databaseerror-text": "Datumbaza eraro de la serĉmendo okazis.\nĈi tiu eble indikas cimon de la programaro.",
        "databaseerror-textcl": "Datumbaza eraro de la mendo okazis.",
-       "databaseerror-query": "Mendo: $1",
+       "databaseerror-query": "Serĉmendo: $1",
        "databaseerror-function": "Funkcio: $1",
        "databaseerror-error": "Eraro: $1",
        "transaction-duration-limit-exceeded": "Por eviti krei egan atendotempon de replikado, tiu transakcio estis ĉesigita pro la skribdaŭro ($1) superigis la limon da $2 {{plural:$2|sekondo|sekondoj}}.",
@@ -2678,9 +2678,9 @@
        "tooltip-pt-watchlist": "Listo de paĝoj kies ŝanĝojn vi priatentas.",
        "tooltip-pt-mycontris": "Listo de viaj kontribuoj",
        "tooltip-pt-anoncontribs": "Listo de redaktoj faritaj el ĉi tiu IPa adreso",
-       "tooltip-pt-login": "Vi kuraĝigas ensaluti, tamen ne estas devige.",
+       "tooltip-pt-login": "Ni rekomendas ke vi ensalutu, kvankam tio ne estas devige.",
        "tooltip-pt-logout": "Elsaluti",
-       "tooltip-pt-createaccount": "Ni rekomendas al vi kreon de uzantokonto kaj ensaluto; tamen, tio ne estas deviga",
+       "tooltip-pt-createaccount": "Ni rekomendas ke vi kreu uzantokonton kaj ensalutu, kvankam tio ne estas deviga",
        "tooltip-ca-talk": "Diskuto pri la artikolo",
        "tooltip-ca-edit": "Redakti ĉi tiun paĝon",
        "tooltip-ca-addsection": "Starti novan sekcion",
@@ -2713,7 +2713,7 @@
        "tooltip-t-info": "Pli da informo pri ĉi tiu paĝo",
        "tooltip-t-upload": "Alŝuti dosierojn",
        "tooltip-t-specialpages": "Listo de ĉiuj specialaj paĝoj",
-       "tooltip-t-print": "Printebla versio de ĉi tiu paĝo",
+       "tooltip-t-print": "Presebla versio de ĉi tiu paĝo",
        "tooltip-t-permalink": "Konstanta ligilo al ĉi versio de la paĝo",
        "tooltip-ca-nstab-main": "Vidi la artikolon",
        "tooltip-ca-nstab-user": "Vidi la personan paĝon de la uzanto",
@@ -3404,6 +3404,7 @@
        "version-specialpages": "Specialaj paĝoj",
        "version-parserhooks": "Sintaksaj hokoj",
        "version-variables": "Variabloj",
+       "version-editors": "Redaktoroj",
        "version-antispam": "Kontraŭspamilo",
        "version-other": "Alia",
        "version-mediahandlers": "Mediaj traktiloj",

diff --git a/languages/i18n/fa.json b/languages/i18n/fa.json
index 689e2a0..590df32 100644 (file)
--- a/languages/i18n/fa.json
+++ b/languages/i18n/fa.json
@@ -69,7 +69,8 @@
                        "Iriman",
                        "Matěj Suchánek",
                        "Amirsara",
-                       "Physicsch"
+                       "Physicsch",
+                       "Nbi"
                ]
        },
        "tog-underline": "خط کشیدن زیر پیوندها:",
@@ -387,6 +388,7 @@
        "badarticleerror": "نمی‌توان این عمل را بر این صفحه انجام داد.",
        "cannotdelete": "امکان حذف صفحه یا تصویر «$1» وجود ندارد.\nممکن است قبلاً فرد دیگری آن را حذف کرده باشد.",
        "cannotdelete-title": "نمی‌توان صفحهٔ «$1» را حذف کرد",
+       "delete-scheduled": "صفحه $1 برای حذف برنامه‌ریزی شده‌است. لطفاً صبور باشید.",
        "delete-hook-aborted": "حذف توسط قلاب لغو شد.\nتوضیحی در این مورد داده نشد.",
        "no-null-revision": "امکان ایجاد نسخهٔ پوچ تازه برای صفحهٔ «$1» وجود نداشت",
        "badtitle": "عنوان بد",
@@ -519,6 +521,7 @@
        "passwordtooshort": "گذرواژه باید دست‌کم {{PLURAL:$1|۱ حرف|$1 حرف}} داشته باشد.",
        "passwordtoolong": "گذرواژه نمی تواند حروفش بیشتر از {{PLURAL:$1|۱ حرف|$1 حرف}}  باشد.",
        "passwordtoopopular": "گذرواژه‌های متداول را نمی‌توانید استفاده کنید. لطفاً گذرواژه‌ای انتخاب کنید که حدس‌زدن آن سخت باشد.",
+       "passwordinlargeblacklist": "گذرواژه انتخابی در فهرست گذرواژه‌های معمول قرار دارد. لطفاً یک گذرواژه یکتاتر انتخاب کنید.",
        "password-name-match": "گذرواژهٔ شما باید با نام کاربری شما تفاوت داشته باشد.",
        "password-login-forbidden": "استفاده از این نام کاربری و گذرواژه ممنوع است.",
        "mailmypassword": "بازنشانی گذرواژه",
@@ -1080,6 +1083,7 @@
        "localtime": "زمان محلی:",
        "timezoneuseserverdefault": "استفاده از پیش‌فرض ویکی ($1)",
        "timezoneuseoffset": "دیگر (اختلاف را مشخص کنید)",
+       "timezone-useoffset-placeholder": "مثال مقادیر: \"-07:00\" یا \"01:00\"",
        "servertime": "زمان سرور:",
        "guesstimezone": "از مرورگر گرفته شود",
        "timezoneregion-africa": "آفریقا",
@@ -3577,6 +3581,7 @@
        "redirect-file": "نام پرونده",
        "redirect-logid": "سیاهه شناسه",
        "redirect-not-exists": "مقدار پیدا نشد",
+       "redirect-not-numeric": "مقادیر غیر عددی",
        "fileduplicatesearch": "جستجو برای پرونده‌های تکراری",
        "fileduplicatesearch-summary": "جستجو برای پرونده‌های تکراری بر اساس مقدار درهم‌شدهٔ آن‌ها صورت می‌گیرد.",
        "fileduplicatesearch-filename": "نام پرونده:",

diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json
index e598609..48cfb2d 100644 (file)
--- a/languages/i18n/fi.json
+++ b/languages/i18n/fi.json
@@ -509,6 +509,7 @@
        "passwordtooshort": "Salasanan täytyy olla vähintään {{PLURAL:$1|yhden merkin pituinen|$1 merkkiä pitkä}}.",
        "passwordtoolong": "Salasanat saavat olla enintään $1 {{PLURAL:$1|merkin}} pituisia.",
        "passwordtoopopular": "Tavanomaisen kaltaisia salasanoja ei saa käyttää. Valitse salasana, joka on vaikeampi arvata.",
+       "passwordinlargeblacklist": "Annettu salasana on erittäin yleisesti käytettyjen salasanojen listalla. Valitse yksilöllisempi salasana.",
        "password-name-match": "Salasanasi täytyy olla eri kuin käyttäjätunnuksesi.",
        "password-login-forbidden": "Tämän käyttäjänimen ja salasanan käyttö on estetty.",
        "mailmypassword": "Hanki uusi salasana",
@@ -1073,6 +1074,7 @@
        "localtime": "Paikallinen aika",
        "timezoneuseserverdefault": "Käytä oletusta ($1)",
        "timezoneuseoffset": "Muu (määritä aikaero)",
+       "timezone-useoffset-placeholder": "Esimerkkiarvoja: \"-07:00\" tai \"01:00\"",
        "servertime": "Palvelimen aika",
        "guesstimezone": "Utele selaimelta",
        "timezoneregion-africa": "Afrikka",

diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index b457f4c..821f4da 100644 (file)
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -1189,7 +1189,8 @@
        "timezonelegend": "Fuseau horaire :",
        "localtime": "Heure locale :",
        "timezoneuseserverdefault": "Utiliser la valeur par défaut du wiki ($1)",
-       "timezoneuseoffset": "Autre (spécifier le décalage)",
+       "timezoneuseoffset": "Autre (spécifier le décalage ci-dessous)",
+       "timezone-useoffset-placeholder": "Exemple de valeurs: « -07:00 » ou « 01:00 »",
        "servertime": "Heure du serveur :",
        "guesstimezone": "Utiliser la valeur du navigateur",
        "timezoneregion-africa": "Afrique",

diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index d091092..75d725c 100644 (file)
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -1049,7 +1049,8 @@
        "timezonelegend": "אזור זמן:",
        "localtime": "שעה מקומית:",
        "timezoneuseserverdefault": "ברירת המחדל של האתר ($1)",
-       "timezoneuseoffset": "אחר (יש לציין את ההפרש)",
+       "timezoneuseoffset": "אחר (יש לכתוב למטה את ההפרש)",
+       "timezone-useoffset-placeholder": "ערכים לדוגמה: \"-07:00\" או \"01:00\"",
        "servertime": "השעה הנוכחית בשרת:",
        "guesstimezone": "קבלה מהדפדפן",
        "timezoneregion-africa": "אפריקה",

diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json
index a0b2d6a..2205e10 100644 (file)
--- a/languages/i18n/ia.json
+++ b/languages/i18n/ia.json
@@ -1028,7 +1028,8 @@
        "timezonelegend": "Fuso horari:",
        "localtime": "Hora local:",
        "timezoneuseserverdefault": "Usar le valor predefinite del wiki ($1)",
-       "timezoneuseoffset": "Altere (specifica le differentia)",
+       "timezoneuseoffset": "Altere (specifica le differentia hic infra)",
+       "timezone-useoffset-placeholder": "Exemplo de valores: \"-07:00\" or \"01:00\"",
        "servertime": "Hora del servitor:",
        "guesstimezone": "Obtener del navigator",
        "timezoneregion-africa": "Africa",

diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json
index 7ede986..69190ca 100644 (file)
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -1082,6 +1082,7 @@
        "localtime": "현지 시각:",
        "timezoneuseserverdefault": "위키 기본값 사용 ($1)",
        "timezoneuseoffset": "기타 (시차를 입력해주세요)",
+       "timezone-useoffset-placeholder": "예시 값: \"-07:00\" 또는 \"01:00\"",
        "servertime": "서버 시각:",
        "guesstimezone": "웹 브라우저 설정에서 가져오기",
        "timezoneregion-africa": "아프리카",

diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json
index bf2be0c..f67a07c 100644 (file)
--- a/languages/i18n/nb.json
+++ b/languages/i18n/nb.json
@@ -1065,7 +1065,8 @@
        "timezonelegend": "Tidssone:",
        "localtime": "Lokaltid:",
        "timezoneuseserverdefault": "Bruk wikistandard ($1)",
-       "timezoneuseoffset": "Annet (spesifiser forskjell)",
+       "timezoneuseoffset": "Annet (spesifiser forskjellen nedenfor)",
+       "timezone-useoffset-placeholder": "Eksempler: «-07:00» eller «01:00»",
        "servertime": "Serverens tid er nå:",
        "guesstimezone": "Hent tidssone fra nettleseren",
        "timezoneregion-africa": "Afrika",

diff --git a/languages/i18n/ne.json b/languages/i18n/ne.json
index 76efaca..c356a49 100644 (file)
--- a/languages/i18n/ne.json
+++ b/languages/i18n/ne.json
@@ -350,7 +350,7 @@
        "badarticleerror": "यो कार्य यस पृष्ठमा गर्न मिल्दैन।",
        "cannotdelete": "\"$1\" पृष्ठ वा फ़ाइल मेट्नसकिएन।\nयो अघिबाट नैं मेटिएको हुनुपर्छ।",
        "cannotdelete-title": "पृष्ठ  \"$1\" लाई मेट्न सकिएन",
-       "delete-scheduled": "$1 पà¥\83षà¥\8dठ मà¥\87à¤\9fाà¤\89नà¤\95à¥\8b लाà¤\97à¥\80 निर्धारित गरिएकाे छ।\nकृपया धैर्य हुनुहोस्।",
+       "delete-scheduled": "$1 पà¥\83षà¥\8dठ मà¥\87à¤\9fाà¤\89नà¤\95à¥\8b लाà¤\97ि निर्धारित गरिएकाे छ।\nकृपया धैर्य हुनुहोस्।",
        "delete-hook-aborted": "हुकले सम्पादनकार्य बन्द गरिदियो ।\nकुनै कारण दिइएन ।",
        "no-null-revision": "$1 पृष्ठको लागि खालि पुनरावलोकन सिर्जना गर्न सकिएन",
        "badtitle": "गलत शीर्षक",
@@ -473,7 +473,7 @@
        "nosuchusershort": " \"$1\" नामको कुनै पनि प्रयोगकर्ता भेटिएन।\n तपाईंको हिज्जे जाँच्नुहोस् ।",
        "nouserspecified": "तपाँईले प्रयोगकर्ताको नाम जनाउनुपर्छ।",
        "login-userblocked": "यस प्रयोगकर्तालाई रोक लगाइएको छ। प्रवेश गर्ने अनुमति छैन।",
-       "wrongpassword": "यà¥\81à¤\9cरनà¥\87म वा पासवरà¥\8dड à¤\97लत हालनà¥\81भयाà¥\87।\nà¤\95à¥\83पया फà¥\87रि पà¥\8dरयास à¤\97रà¥\8dनà¥\81हà¥\8bला।",
+       "wrongpassword": "पà¥\8dरयà¥\8bà¤\97à¤\95रà¥\8dता नाम वा पासवरà¥\8dड à¤\97लत हालà¥\8dनà¥\81भयाà¥\87।\nà¤\95à¥\83पया फà¥\87रि पà¥\8dरयास à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d।",
        "wrongpasswordempty": "हालिएको पासवर्ड खालि थियो।\nकृपया फेरी प्रयास गर्नुहोला।",
        "passwordtooshort": "पासवर्ड कम्तिमा {{PLURAL:$1|१ अक्षर|$1 अक्षरहरू}}को हुनुपर्छ।",
        "passwordtoolong": "पासवर्ड {{PLURAL:$1|१ अक्षर|$1 अक्षरहरू}} भन्दा लामो हुनु हुदैन ।",
@@ -613,7 +613,7 @@
        "savechanges": "परिवर्तन सङ्ग्रह गर्नुहोस्",
        "publishpage": "पृष्ठ प्रकाशित गर्ने",
        "publishchanges": "परिवर्तनहरू प्रकाशित गर्ने",
-       "savearticle-start": "पà¥\83षà¥\8dठ सà¤\82à¤\97à¥\8dरह à¤\97रà¥\8dनà¥\87…",
+       "savearticle-start": "पà¥\83षà¥\8dठ सà¤\99à¥\8dà¤\97à¥\8dरह à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d…",
        "savechanges-start": "परिवर्तनहरू सङ्ग्रह गर्नुहोस्",
        "publishpage-start": "पृष्ठ प्रकाशित...",
        "publishchanges-start": "परिवर्तनहरू प्रकाशित...",
@@ -829,7 +829,7 @@
        "revdelete-submit": "{{PLURAL:$1|छानिएको संशोधन|छानिएका संशोधनहरु}}मा प्रयोग गर्ने",
        "revdelete-success": "संशोधन दृश्यता अद्यतन भयो।",
        "revdelete-failure": "'''संशोधन दृश्यता अद्यतन गर्न सकिएन:'''\n$1",
-       "logdelete-success": "दà¥\83षà¥\8dà¤\9fि लà¤\97 सफलतापà¥\82रà¥\8dवà¤\95 मिलाà¤\87यà¥\8b ।",
+       "logdelete-success": "लà¤\97 दà¥\83शà¥\8dयता सफलतापà¥\82रà¥\8dवà¤\95 मिलाà¤\87यà¥\8b।",
        "logdelete-failure": "'''लग दृष्टि मिलाउन सकिएन :'''\n$1",
        "revdel-restore": "दृष्टि परिवर्तन गर्ने",
        "pagehist": "पृष्ठको इतिहास",
@@ -918,7 +918,7 @@
        "search-category": "(श्रेणी $1)",
        "search-file-match": "(भेटिएका फाइल सामाग्री)",
        "search-suggest": "कतै तपाईंको खोजाई : $1 त होइन ?",
-       "search-interwiki-caption": "समà¥\8dबनà¥\8dधà¥\80 परियà¥\8bà¤\9cनाहरà¥\82à¤\95ा परिणामहरू",
+       "search-interwiki-caption": "भà¥\8dरातà¥\83 परियà¥\8bà¤\9cनाहरà¥\82बाà¤\9f परिणामहरू",
        "search-interwiki-default": "$1देखिका नतिजाहरू:",
        "search-interwiki-more": "(अझै)",
        "search-interwiki-more-results": "धेरै परिणामहरू",
@@ -962,7 +962,7 @@
        "prefs-watchlist-edits": "निगरानी सूचीमा देखाउनको लागि उच्चतम परिवर्तन संख्या:",
        "prefs-watchlist-edits-max": "उच्चतम संख्या : १०००",
        "prefs-watchlist-token": "अवलोकन सूची टोकन:",
-       "prefs-watchlist-managetokens": "टोकन व्यवस्थापन",
+       "prefs-watchlist-managetokens": "टोकनहरू व्यवस्थापन",
        "prefs-misc": "साधारण",
        "prefs-resetpass": "प्रवेश शब्द परिवर्तन",
        "prefs-changeemail": "इमेल परिवर्तन गर्ने",
@@ -1175,9 +1175,9 @@
        "grant-group-email": "इ-मेल पठाउनुहोस्",
        "grant-createaccount": "खाताहरू खोल्नुहोस्",
        "grant-createeditmovepage": "पृष्ठहरूमा परिवर्तन गर्नुहोस्",
-       "grant-editmycssjs": "तपाईंको प्रयोगकर्ताकाे CSS/JavaScript सम्पादन गर्नुहोस्",
+       "grant-editmycssjs": "तपाईंको प्रयोगकर्ता सीएसएस/जेसन/जावास्क्रिप्ट (CSS/JSON/JavaScript) सम्पादन गर्नुहोस्",
        "grant-editmyoptions": "तपाईंको प्रयोगकर्ता अभिरूचीहरूलाई सम्पादन गर्नुहोस्",
-       "grant-editmywatchlist": "à¤\85वलà¥\8bà¤\95नसà¥\82à¤\9aà¥\80 समà¥\8dपादन à¤\97रà¥\8dनà¥\87",
+       "grant-editmywatchlist": "तपाà¤\88à¤\81à¤\95à¥\8b à¤\85वलà¥\8bà¤\95नसà¥\82à¤\9aà¥\80 समà¥\8dपादन à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d",
        "grant-sendemail": "अन्य प्रयोगकर्ताहरूलाई इमेल पठाउने",
        "grant-viewdeleted": "मेटाइएका फाइल तथा पृष्ठहरू हेर्ने",
        "newuserlogpage": "प्रयोगकर्ता श्रृजना लग",
@@ -1187,7 +1187,7 @@
        "action-read": "यो पृष्ठ पढ्ने",
        "action-edit": "यो पृष्ठ सम्पादन गर्ने",
        "action-createpage": "यो पृष्ठ सृजना गर्ने",
-       "action-createtalk": "याà¥\87 à¤\9bलफल पà¥\83षà¥\8dठ सà¥\83à¤\9cना à¤\97रà¥\8dनà¥\87",
+       "action-createtalk": "याà¥\87 à¤\9bलफल पà¥\83षà¥\8dठ सà¥\83à¤\9cना à¤\97रà¥\8dनà¥\81हà¥\8bसà¥\8d",
        "action-createaccount": "यो प्रयोगकर्ताखाता बनाउने",
        "action-history": "यस पृष्ठको इतिहास हेर्ने",
        "action-minoredit": "यस सम्पादनलाई साधारणको रुपमा चिनो लगाउने",

diff --git a/languages/i18n/nn.json b/languages/i18n/nn.json
index df6b5f6..70f4c47 100644 (file)
--- a/languages/i18n/nn.json
+++ b/languages/i18n/nn.json
@@ -593,8 +593,11 @@
        "summary-preview": "Førehandsvising av endringssamandraget:",
        "subject-preview": "Førehandsvising av emne/overskrift:",
        "blockedtitle": "Brukaren er blokkert",
-       "blockedtext": "'''Brukarnamnet ditt eller IP-adressa di er blokkert'''\n\nBlokkeringa vart gjord av $1.\nDenne grunnen vart gjeven: ''$2''.\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa var meint for: $7\n\nDu kan kontakte $1 eller ein annan [[{{MediaWiki:Grouppage-sysop}}|administrator]] for å diskutere blokkeringa.\nVer merksam på at du ikkje kan bruke «send e-post til brukar»-funksjonen så lenge du ikkje har ei gyldig e-postadresse registrert i [[Special:Preferences|innstillingane dine]]. Du kan heller ikkje bruke funksjonen dersom du er blokkert frå å sende e-post.\nIP-adressa di er $3, og blokkeringsnummeret er $5.\nTak med alle opplysningane over ved eventuelle førespurnader.",
-       "autoblockedtext": "IP-adressa di er automatisk blokkert fordi ho vart brukt av ein annan brukar som vart blokkert av $1. Grunne til dette vart gjeve som: ''$2''.\n\n* Blokkeringa byrja: $8\n* Blokkeringa går ut: $6\n* Blokkeringa er meint for: $7\n\nDu kan kontakte $1 eller ein annan [[{{MediaWiki:Grouppage-sysop}}|administrator]] for å diskutere blokkeringa. Ver merksam på at du ikkje kan bruke «send e-post til brukar»-funksjonen så lenge du ikkje har ei gyldig e-postadresse registrert i [[Special:Preferences|innstillingane dine]].\n\nIP-adressa di er $3, og blokkeringnummeret ditt er #$5.\nVer venleg og opplyse dette ved eventuelle førespurnader.",
+       "blocked-email-user": "<strong>Brukarnamnet ditt er blokkert frå å senda e-post. Du kan framleis endra andre sider på denne wikien.</strong> Du kan sjå alle detaljane om blokkeringa i [[Special:MyContributions|bidragslista]].\n\nBlokkeringa vart gjord av $1.\n\nDen oppgjevne årsaka er <em>$2</em>.\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa gjeld brukar: $7\n* Blokkerings-ID #$5",
+       "blockedtext-partial": "<strong>Brukarnamnet ditt er blokkert frå å endra denne sida. Du kan framleis endra andre sider på denne wikien.</strong> Du kan sjå alle detaljane om blokkeringa i [[Special:MyContributions|bidragslista]].\n\nBlokkeringa vart gjord av $1.\n\nDen oppgjevne årsaka er <em>$2</em>.\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa gjeld brukar: $7\n* Blokkerings-ID #$5",
+       "blockedtext": "<strong>Brukarnamnet ditt eller IP-adressa di er blokkert.</strong>\n\nBlokkeringa vart gjord av $1.\nDen oppgjevne årsaka er <em>$2</em>.\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa gjeld brukar: $7\n\nDu kan kontakte $1 eller ein annan [[{{MediaWiki:Grouppage-sysop}}|administrator]] for å diskutere blokkeringa.\nVer merksam på at du ikkje kan bruke «{{int:emailuser}}»-funksjonen minder du har ei gyldig e-postadresse registrert i [[Special:Preferences|innstillingane dine]] og ikkje er blokkert frå å bruke denne funksjonen.\nDen gjeldande IP-adressa di er $3, og blokkerings-ID-en er #$5.\nTa med alle opplysingane over ved eventuelle førespurnader.",
+       "autoblockedtext": "IP-adressa di vart blokkert automatisk fordi ho vart brukt av ein annan brukar som var blokkert av $1.\nDen oppgjevne årsaka er:\n\n:<em>$2</em>\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa gjeld brukar: $7\n\nDu kan kontakte $1 eller ein annan [[{{MediaWiki:Grouppage-sysop}}|administrator]] for å diskutere blokkeringa.\n\nVer merksam på at du ikkje kan bruke «{{int:emailuser}}»-funksjonen minder du har ei gyldig e-postadresse registrert i [[Special:Preferences|innstillingane dine]] og ikkje er blokkert frå å bruke denne funksjonen.\n\nDen gjeldande IP-adressa di er $3, og blokkerings-ID-en er #$5.\nTa med alle opplysingane over ved eventuelle førespurnader.",
+       "systemblockedtext": "Brukarnamnet ditt eller IP-adressa di vart blokkert automatisk av MediaWiki.\nDen oppgjevne årsaka er:\n\n:<em>$2</em>\n\n* Blokkeringa byrja: $8\n* Blokkeringa endar: $6\n* Blokkeringa gjeld brukar: $7\n\nDen gjeldande IP-adressa di er $3.\nTa med alle opplysingane over ved eventuelle førespurnader.",
        "blockednoreason": "inga grunngjeving",
        "whitelistedittext": "Du lyt $1 for å endre sider.",
        "confirmedittext": "Du må stadfeste e-postadressa di før du kan endre sidene. Ver venleg og legg inn og stadfest e-postadressa di i [[Special:Preferences|innstillingane dine]].",
@@ -2092,7 +2095,7 @@
        "autoblockid": "Autoblokker #$1",
        "block": "Blokker brukar",
        "unblock": "Opphev blokkering av brukar",
-       "blockip": "Blokker brukar",
+       "blockip": "Blokker {{GENDER:$1|brukar}}",
        "blockiptext": "Bruk skjemaet nedanfor for å blokkere skrivetilgangen frå ei spesifikk IP-adresse eller brukarnamn. Dette bør berre gjerast for å hindre hærverk, og i samsvar med [[{{MediaWiki:Policy-url}}|retningslinene]].",
        "ipaddressorusername": "IP-adresse eller brukarnamn",
        "ipbexpiry": "Opphøyrstid:",
@@ -3124,6 +3127,7 @@
        "tags-create-reason": "Årsak:",
        "tags-create-submit": "Opprett",
        "tags-create-no-name": "Du må oppgje eit merkenamn.",
+       "tags-update-blocked": "Du kan ikkje leggja til eller fjerna merke medan {{GENDER:$1|du}} er blokkert.",
        "tags-edit-title": "Endra merke",
        "tags-edit-existing-tags-none": "«Ingen»",
        "tags-edit-chosen-placeholder": "Vel nokre merke",
@@ -3181,6 +3185,9 @@
        "revdelete-unrestricted": "fjerna avgrensingar for administratorar",
        "logentry-block-block": "$1 {{GENDER:$2|blokkerte}} {{GENDER:$4|$3}} for $5 $6",
        "logentry-block-unblock": "$1 {{GENDER:$2|oppheva}} blokkeringa av {{GENDER:$4|$3}}",
+       "logentry-block-reblock": "$1 {{GENDER:$2|endra}} innstillingar for blokkeringa av {{GENDER:$4|$3}} som endar $5 $6",
+       "logentry-partialblock-reblock": "$1 {{GENDER:$2|endra}} innstillingar for blokkeringa av {{GENDER:$4|$3}} som hindrar endring av {{PLURAL:$8|sida|sidene}} $7 og som endar $5 $6",
+       "logentry-non-editing-block-reblock": "$1 {{GENDER:$2|endra}} innstillingar for blokkeringa av {{GENDER:$4|$3}} for visse handlingar som ikkje er endringar og som endar $5 $6",
        "logentry-suppress-reblock": "$1 {{GENDER:$2|endra}} blokkeringsinnstillingar for {{GENDER:$4|$3}} med opphøyrstid $5 $6",
        "logentry-merge-merge": "$1 {{GENDER:$2|fletta}} $3 inn i $4 (versjonar til og med $5)",
        "logentry-move-move": "$1 {{GENDER:$2|flytte}} sida $3 til $4",
@@ -3316,9 +3323,11 @@
        "date-range-from": "Frå dato:",
        "date-range-to": "Til dato:",
        "randomrootpage": "Tilfeldig rotside",
+       "log-action-filter-block": "Blokkeringstype:",
        "log-action-filter-newusers": "Type kontooppretting:",
        "log-action-filter-rights": "Type endring av rettar:",
        "log-action-filter-all": "Alle",
+       "log-action-filter-block-block": "Blokkering",
        "log-action-filter-delete-delete_redir": "Overskriving av omdirigering",
        "log-action-filter-delete-restore": "Attoppretting av side",
        "log-action-filter-delete-revision": "Versjonssletting",
@@ -3329,6 +3338,7 @@
        "log-action-filter-newusers-autocreate": "Automatisk oppretting",
        "log-action-filter-newusers-byemail": "Oppretting med passord sendt på e-post",
        "log-action-filter-suppress-revision": "Versjonsundertrykking",
+       "log-action-filter-suppress-block": "Fjerning av brukar ved blokkering",
        "authmanager-userdoesnotexist": "Brukarkontoen «$1» er ikkje oppretta.",
        "authmanager-provider-temporarypassword": "Mellombels passord",
        "userjsispublic": "Merk: JavaScript-undersider bør ikkje innehalda konfidensielle data sidan dei er synlege for andre brukarar.",

diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index 9720dae..32ee769 100644 (file)
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -1115,6 +1115,7 @@
        "localtime": "Czas lokalny:",
        "timezoneuseserverdefault": "Użyj domyślnej dla tej wiki ($1)",
        "timezoneuseoffset": "Inna (określ różnicę czasu)",
+       "timezone-useoffset-placeholder": "Przykładowe wartości: \"-07:00\" lub \"01:00\"",
        "servertime": "Czas serwera:",
        "guesstimezone": "Pobierz z przeglądarki",
        "timezoneregion-africa": "Afryka",

diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json
index 2072ca4..2835539 100644 (file)
--- a/languages/i18n/pt-br.json
+++ b/languages/i18n/pt-br.json
@@ -125,30 +125,30 @@
        "tog-newpageshidepatrolled": "Ocultar páginas patrulhadas da lista de páginas novas",
        "tog-hidecategorization": "Ocultar a categorização das páginas",
        "tog-extendwatchlist": "Expandir a lista de páginas vigiadas para mostrar todas as mudanças, não apenas as mais recentes",
-       "tog-usenewrc": "Agrupar alterações por páginas nas mudanças recentes e nas páginas vigiadas",
+       "tog-usenewrc": "Agrupar alterações por páginas nas mudanças recentes e na lista de páginas vigiadas",
        "tog-numberheadings": "Auto-numerar cabeçalhos",
        "tog-editondblclick": "Editar páginas no clique duplo",
-       "tog-editsectiononrightclick": "Habilitar edição de seção por clique com o botão direito no título da seção (requer JavaScript)",
-       "tog-watchcreations": "Adicionar as páginas e arquivos que \neu criar à minha lista de páginas vigiadas",
-       "tog-watchdefault": "Adicionar as páginas e arquivos que eu editar à minha lista de páginas vigiadas",
-       "tog-watchmoves": "Adicionar as páginas e arquivos que eu mover à minha lista de páginas vigiadas",
-       "tog-watchdeletion": "Adicionar as páginas e arquivos que eu eliminar à minha lista de páginas vigiadas",
-       "tog-watchuploads": "Adicionar arquivos que envio para minha lista de vigiados",
-       "tog-watchrollback": "Adicionar páginas onde fiz uma reversão às minhas páginas vigiadas",
+       "tog-editsectiononrightclick": "Habilitar edição de seção por clique com o botão direito no título da seção",
+       "tog-watchcreations": "Adicionar páginas e arquivos que eu criar à minha lista de páginas vigiadas",
+       "tog-watchdefault": "Adicionar páginas e arquivos que eu editar à minha lista de páginas vigiadas",
+       "tog-watchmoves": "Adicionar páginas e arquivos que eu mover à minha lista de páginas vigiadas",
+       "tog-watchdeletion": "Adicionar páginas e arquivos que eu eliminar à minha lista de páginas vigiadas",
+       "tog-watchuploads": "Adicionar arquivos que eu carregar à minha lista de páginas vigiadas",
+       "tog-watchrollback": "Adicionar páginas onde fiz uma reversão à minha lista de páginas vigiadas",
        "tog-minordefault": "Marcar todas as edições como menores por padrão",
        "tog-previewontop": "Mostrar previsão antes da caixa de edição",
        "tog-previewonfirst": "Mostrar previsão na primeira edição",
        "tog-enotifwatchlistpages": "Notificar-me por e-mail quando uma página ou um arquivo vigiado for alterado",
-       "tog-enotifusertalkpages": "Receber email quando minha página de discussão for editada",
+       "tog-enotifusertalkpages": "Receber e-mail quando minha página de discussão for editada",
        "tog-enotifminoredits": "Notificar-me por e-mail também sobre edições menores de páginas ou arquivos",
-       "tog-enotifrevealaddr": "Revelar meu endereço de email nas mensagens de notificação",
+       "tog-enotifrevealaddr": "Revelar meu endereço de e-mail nas mensagens de notificação",
        "tog-shownumberswatching": "Mostrar o número de usuários que estão vigiando",
        "tog-oldsig": "Assinatura atual:",
        "tog-fancysig": "Tratar assinatura como wikitexto (sem ligação automática)",
        "tog-uselivepreview": "Mostrar visualizações sem recarregar a página",
        "tog-forceeditsummary": "Avisar-me ao introduzir um sumário de edição vazio",
-       "tog-watchlisthideown": "Ocultar as minhas edições da lista de páginas vigiadas",
-       "tog-watchlisthidebots": "Ocultar edições de bots da lista de páginas vigiadas",
+       "tog-watchlisthideown": "Ocultar minhas edições da lista de páginas vigiadas",
+       "tog-watchlisthidebots": "Ocultar edições de robôs da lista de páginas vigiadas",
        "tog-watchlisthideminor": "Ocultar edições menores da lista de páginas vigiadas",
        "tog-watchlisthideliu": "Ocultar edições de usuários autenticados da lista de páginas vigiadas",
        "tog-watchlistreloadautomatically": "Recarregar a lista de páginas vigiadas automaticamente sempre que um filtro for alterado (requer JavaScript)",
@@ -159,7 +159,7 @@
        "tog-ccmeonemails": "Receber cópias de e-mails que eu enviar a outros usuários",
        "tog-diffonly": "Não mostrar o conteúdo da página ao comparar duas edições",
        "tog-showhiddencats": "Exibir categorias ocultas",
-       "tog-norollbackdiff": "Omitir diferenças após desfazer edições em bloco",
+       "tog-norollbackdiff": "Omitir diferenças após fazer uma reversão",
        "tog-useeditwarning": "Avisar-me quando eu deixar uma janela de edição sem ter salvo as alterações",
        "tog-prefershttps": "Usar sempre uma conexão segura enquanto estiver conectado",
        "underline-always": "Sempre",
@@ -240,24 +240,24 @@
        "category-empty": "<em>No momento, esta categoria não possui nenhuma página ou arquivo multimídia.</em>",
        "hidden-categories": "{{PLURAL:$1|Categoria oculta|Categorias ocultas}}",
        "hidden-category-category": "Categorias ocultas",
-       "category-subcat-count": "{{PLURAL:$2|Esta categoria possui apenas a seguinte subcategoria.|Esta categoria possui as seguintes $1 subcategorias, de um total de $2.}}",
-       "category-subcat-count-limited": "Esta categoria possui {{PLURAL:$1|a seguinte sub-categoria|as $1 sub-categorias a seguir}}.",
-       "category-article-count": "{{PLURAL:$2|Esta categoria contém apenas a seguinte página.|As seguintes $1 páginas pertencem a esta categoria, de um total de $2.}}",
+       "category-subcat-count": "{{PLURAL:$2|Esta categoria possui apenas a seguinte subcategoria.|Esta categoria possui {{PLURAL:$1|a seguinte subcategoria|as seguintes $1 subcategorias}}, de um total de $2.}}",
+       "category-subcat-count-limited": "Esta categoria possui {{PLURAL:$1|a seguinte subcategoria|as $1 subcategorias a seguir}}.",
+       "category-article-count": "{{PLURAL:$2|Esta categoria contém apenas a seguinte página.|{{PLURA:$1|A seguinte página pertence|As seguintes $1 páginas pertencem}} a esta categoria, de um total de $2.}}",
        "category-article-count-limited": "Esta categoria possui {{PLURAL:$1|a seguinte página|as $1 páginas a seguir}}.",
        "category-file-count": "{{PLURAL:$2|Esta categoria possui apenas o seguinte arquivo.|Esta categoria possui {{PLURAL:$1|o seguinte arquivo|os $1 arquivos a seguir}}, de um total de $2.}}",
        "category-file-count-limited": "Esta categoria possui {{PLURAL:$1|um arquivo|$1 arquivos}}.",
        "listingcontinuesabbrev": "cont.",
        "index-category": "Páginas indexadas",
        "noindex-category": "Páginas não indexadas",
-       "broken-file-category": "Páginas com links inválidos para arquivos",
+       "broken-file-category": "Páginas com ligações inválidas para arquivos",
        "categoryviewer-pagedlinks": "($1) ($2)",
        "category-header-numerals": "$1–$2",
        "about": "Sobre",
        "article": "Página de conteúdo",
        "newwindow": "(abre numa nova janela)",
        "cancel": "Cancelar",
-       "moredotdotdot": "Mais...",
-       "morenotlisted": "Esta lista está incompleta.",
+       "moredotdotdot": "Mais…",
+       "morenotlisted": "Esta lista pode estar incompleta.",
        "mypage": "Página",
        "mytalk": "Discussão",
        "anontalk": "Discussão",
@@ -265,7 +265,7 @@
        "and": "&#32;e",
        "faq": "Perguntas frequentes",
        "actions": "Ações",
-       "namespaces": "Domínios",
+       "namespaces": "Espaços nominais",
        "variants": "Variantes",
        "navigation-heading": "Menu de navegação",
        "errorpagetitle": "Erro",
@@ -273,18 +273,18 @@
        "tagline": "De {{SITENAME}}",
        "help": "Ajuda",
        "search": "Pesquisa",
-       "search-ignored-headings": " #<!-- deixe esta linha exatamente como está --> <pre>\n# Subtítulos que serão ignorados pela busca.\n# Mudanças feitas aqui têm efeito quando a página com o subtítulo é indexada.\n# Você pode forçar a reindexação realizando uma edição nula.\n# A sintaxe é a seguinte:\n#   * Tudo a partir do caractere \"#\" até o final da linha é um comentário\n#   * Cada linha não vazia é o título exato a ser ignorado, inclusive no uso de maiúsculas\nReferências\nLigações externas\nVer também\n #</pre> <!-- deixe esta linha exatamente como está -->",
+       "search-ignored-headings": " #<!-- deixe esta linha exatamente como está --> <pre>\n# Cabeçalhos que serão ignorados pela busca.\n# Mudanças feitas aqui têm efeito quando a página com o cabeçalho é indexada.\n# Você pode forçar a reindexação realizando uma edição nula.\n# A sintaxe é a seguinte:\n#   * Tudo a partir do caractere \"#\" até o final da linha é um comentário.\n#   * Cada linha não vazia é o título exato a ser ignorado, inclusive no uso de maiúsculas.\nReferências\nLigações externas\nVer também\n #</pre> <!-- deixe esta linha exatamente como está -->",
        "searchbutton": "Pesquisar",
        "go": "Ir",
        "searcharticle": "Ir",
        "history": "Histórico da página",
        "history_short": "Histórico",
-       "history_small": "Histórico",
+       "history_small": "histórico",
        "updatedmarker": "atualizado desde a minha última visita",
        "printableversion": "Versão para impressão",
        "permalink": "Ligação permanente",
        "print": "Imprimir",
-       "view": "Ver",
+       "view": "Visualizar",
        "view-foreign": "Ver em $1",
        "edit": "Editar",
        "edit-local": "Editar descrição local",
@@ -292,7 +292,7 @@
        "create-local": "Adicionar descrição local",
        "delete": "Eliminar",
        "undelete_short": "Restaurar {{PLURAL:$1|uma edição|$1 edições}}",
-       "viewdeleted_short": "Ver {{PLURAL:$1|uma edição eliminada|$1 edições eliminadas}}",
+       "viewdeleted_short": "Ver {{PLURAL:$1|a edição eliminada|as $1 edições eliminadas}}",
        "protect": "Proteger",
        "protect_change": "alterar",
        "unprotect": "Alterar a proteção",
@@ -316,7 +316,7 @@
        "redirectedfrom": "(Redirecionado de $1)",
        "redirectpagesub": "Página de redirecionamento",
        "redirectto": "Redirecionar para:",
-       "lastmodifiedat": "Esta página foi modificada pela última vez em $1, às $2",
+       "lastmodifiedat": "Esta página foi modificada pela última vez em $1, às $2.",
        "viewcount": "Esta página foi acessada {{PLURAL:$1|uma vez|$1 vezes}}.",
        "protectedpage": "Página protegida",
        "jumpto": "Ir para:",
@@ -327,12 +327,12 @@
        "pool-timeout": "Tempo limite de espera para o bloqueio excedido",
        "pool-queuefull": "A fila de processos está cheia",
        "pool-errorunknown": "Erro desconhecido",
-       "pool-servererror": "O servidor de contador do pool não está disponível ($1).",
+       "pool-servererror": "O servidor de contador de processos não está disponível ($1).",
        "poolcounter-usage-error": "Erro de uso: $1",
        "aboutsite": "Sobre {{SITENAME}}",
        "aboutpage": "Project:Sobre",
        "copyright": "Conteúdo disponível sob $1, salvo indicação em contrário.",
-       "copyrightpage": "{{ns:project}}:Direitos_de_autor",
+       "copyrightpage": "{{ns:project}}:Direitos de autor",
        "currentevents": "Eventos atuais",
        "currentevents-url": "Project:Eventos atuais",
        "disclaimers": "Termo de responsabilidade",
@@ -347,7 +347,7 @@
        "privacy": "Política de privacidade",
        "privacypage": "Project:Política de privacidade",
        "badaccess": "Erro de permissão",
-       "badaccess-group0": "Você não está autorizado a executar a ação requisitada.",
+       "badaccess-group0": "Você não tem autorização para executar a ação requisitada.",
        "badaccess-groups": "A ação que você tentou executar está limitada a usuários {{PLURAL:$2|do grupo|de um dos seguintes grupos}}: $1.",
        "versionrequired": "É necessária a versão $1 do MediaWiki",
        "versionrequiredtext": "Esta página requer a versão $1 do MediaWiki para ser utilizada.\nVeja a [[Special:Version|página sobre a versão do sistema]].",
@@ -355,7 +355,7 @@
        "pagetitle": "$1 - {{SITENAME}}",
        "pagetitle-view-mainpage": "{{SITENAME}}",
        "backlinksubtitle": "← $1",
-       "retrievedfrom": "Disponível em \"$1\"",
+       "retrievedfrom": "Disponível em “$1”",
        "youhavenewmessages": "{{PLURAL:$3|Você tem}} $1 ($2).",
        "youhavenewmessagesfromusers": "{{PLURAL:$4|Você tem}} $1 de {{PLURAL:$3|outro usuário|$3 usuários}} ($2).",
        "youhavenewmessagesmanyusers": "Você tem $1 de muitos usuários ($2).",
@@ -373,14 +373,14 @@
        "hidetoc": "ocultar",
        "collapsible-collapse": "Ocultar",
        "collapsible-expand": "Expandir",
-       "confirmable-confirm": "{{GENDER:$1|Tem}} a certeza?",
+       "confirmable-confirm": "{{GENDER:$1|Tem}} certeza?",
        "confirmable-yes": "Sim",
        "confirmable-no": "Não",
        "thisisdeleted": "Ver ou restaurar $1?",
        "viewdeleted": "Ver $1?",
        "restorelink": "{{PLURAL:$1|uma edição eliminada|$1 edições eliminadas}}",
-       "feedlinks": "Feed:",
-       "feed-invalid": "Tipo inválido de inscrição de feeds.",
+       "feedlinks": "''Feed'':",
+       "feed-invalid": "Tipo inválido de inscrição de ''feed''.",
        "feed-unavailable": "Os \"feeds\" não se encontram disponíveis",
        "site-rss-feed": "Feed RSS $1",
        "site-atom-feed": "Feed Atom $1",
@@ -414,8 +414,8 @@
        "databaseerror-function": "Função: $1",
        "databaseerror-error": "Erro: $1",
        "transaction-duration-limit-exceeded": "Para evitar a criação de lag replicação alta, esta operação foi abortada porque a duração de gravação ($1) excedeu o limite de $2 {{PLURAL:$2|segundo|segundos}}. Se você está mudando muitos itens de uma vez, tente fazer várias operações menores em vez disso.",
-       "laggedslavemode": "Aviso: a página poderá não conter atualizações recentes.",
-       "readonly": "Banco de dados disponível no modo \"somente leitura\"",
+       "laggedslavemode": "<strong>Aviso:</strong> a página poderá não conter atualizações recentes.",
+       "readonly": "Banco de dados trancado",
        "enterlockreason": "Entre com um motivo para trancá-lo, incluindo uma estimativa de quando poderá novamente ser destrancado",
        "readonlytext": "O banco de dados está atualmente bloqueado para novos artigos e outras modificações, provavelmente por uma manutenção de rotina de banco de dados, após o que estará de volta ao normal.\n\nO administrador do sistema que fez o bloqueio oferece a seguinte explicação: $1",
        "missing-article": "O banco de dados não encontrou o texto de uma página que deveria ter encontrado, com o nome \"$1\" $2.\n\nIsso normalmente é causado ao acessar um link de diferença (dif) desatualizado ou para o histórico de uma página que foi apagada.\n\nSe este não for o caso, você pode ter encontrado um defeito (bug) no software.\nAnote a URL e reporte o ocorrido a um [[Special:ListUsers/sysop|administrador]].",
@@ -425,22 +425,22 @@
        "nonwrite-api-promise-error": "O cabeçalho HTTP \"Promise-Non-Write-API-Action\" foi enviado, mas a requisição era para um módulo de escrita de API.",
        "internalerror": "Erro interno",
        "internalerror_info": "Erro interno: $1",
-       "internalerror-fatal-exception": "Excepção fatal do tipo \"$1\"",
-       "filecopyerror": "Não foi possível copiar o arquivo \"$1\" para \"$2\".",
-       "filerenameerror": "Não foi possível renomear o arquivo \"$1\" para \"$2\".",
-       "filedeleteerror": "Não foi possível eliminar o arquivo \"$1\".",
-       "directorycreateerror": "Não foi possível criar o diretório \"$1\".",
-       "directoryreadonlyerror": "Diretorio \"$1\" é somente leitura.",
-       "directorynotreadableerror": "O diretório \"$1\" não é legível.",
-       "filenotfound": "Não foi possível encontrar o arquivo \"$1\".",
-       "unexpected": "Valor não esperado: \"$1\"=\"$2\".",
-       "formerror": "Erro: Não foi possível enviar o formulário",
+       "internalerror-fatal-exception": "Exceção fatal do tipo “$1”",
+       "filecopyerror": "Não foi possível copiar o arquivo “$1” para “$2”.",
+       "filerenameerror": "Não foi possível renomear o arquivo “$1” para “$2”.",
+       "filedeleteerror": "Não foi possível eliminar o arquivo “$1”.",
+       "directorycreateerror": "Não foi possível criar o diretório “$1”.",
+       "directoryreadonlyerror": "O diretorio “$1” é somente leitura.",
+       "directorynotreadableerror": "O diretório “$1”\" não é legível.",
+       "filenotfound": "Não foi possível encontrar o arquivo “$1”.",
+       "unexpected": "Valor não esperado: “$1”=“$2”.",
+       "formerror": "Erro: Não foi possível enviar o formulário.",
        "badarticleerror": "Esta ação não pode ser realizada nesta página.",
-       "cannotdelete": "Não foi possível eliminar a página ou arquivo $1.\nÉ possível que ele já tenha sido eliminado por outra pessoa.",
-       "cannotdelete-title": "Não é possível eliminar a página \"$1\"",
-       "delete-scheduled": "A página \"$1\" está agendada para eliminação.\nAguarde a mesma, por favor.",
-       "delete-hook-aborted": "A eliminação foi cancelada por um \"hook\".\nNão foi dada nenhuma explicação.",
-       "no-null-revision": "Não foi possível criar nova revisão nula para a página \"$1\"",
+       "cannotdelete": "Não foi possível eliminar a página ou arquivo “$1”.\nÉ possível que ele já tenha sido eliminado por outra pessoa.",
+       "cannotdelete-title": "Não é possível eliminar a página “$1”",
+       "delete-scheduled": "A página “$1” está agendada para eliminação.\nAguarde a mesma, por favor.",
+       "delete-hook-aborted": "A eliminação foi cancelada por um ''hook''.\nNão foi dada nenhuma explicação.",
+       "no-null-revision": "Não foi possível criar nova revisão nula para a página “$1”",
        "badtitle": "Título inválido",
        "badtitletext": "O título de página solicitado era inválido, vazio, ou um link interlínguas ou interwikis incorreto.\nTalvez contenha um ou mais caracteres que não podem ser usados em títulos.",
        "title-invalid-empty": "O título da página solicitada está vazio ou contém somente o nome do espaço de nomes.",
@@ -1139,7 +1139,8 @@
        "timezonelegend": "Fuso horário:",
        "localtime": "Horário local:",
        "timezoneuseserverdefault": "Utilizar padrão da wiki ($1)",
-       "timezoneuseoffset": "Outro (especificar desvio horário)",
+       "timezoneuseoffset": "Outro (especificar desvio horário abaixo)",
+       "timezone-useoffset-placeholder": "Exemplo de valores: \"-07:00\" ou \"01:00\"",
        "servertime": "Horário do servidor:",
        "guesstimezone": "Preencher a partir do navegador",
        "timezoneregion-africa": "África",

diff --git a/languages/i18n/sr-ec.json b/languages/i18n/sr-ec.json
index 1ec2744..c0acf9e 100644 (file)
--- a/languages/i18n/sr-ec.json
+++ b/languages/i18n/sr-ec.json
@@ -439,7 +439,7 @@
        "password-change-forbidden": "Не можете да промените лозинку на овом викију.",
        "externaldberror": "Дошло је до грешке при потврди идентитета базе података или вам није дозвољено да ажурирате свој спољни налог.",
        "login": "Пријава",
-       "login-security": "Ð\9fоÑ\82вÑ\80да ваÑ\88ег индентитета",
+       "login-security": "Ð\92еÑ\80иÑ\84икаÑ\86иÑ\98а индентитета",
        "nav-login-createaccount": "Пријавите се / отворите налог",
        "logout": "Одјава",
        "userlogout": "Одјава",
@@ -450,7 +450,7 @@
        "userlogin-resetpassword-link": "Заборавили сте лозинку?",
        "userlogin-helplink2": "Помоћ при пријављивању",
        "userlogin-loggedin": "Већ сте пријављени као {{GENDER:$1|$1}}.\nКористите доњи образац да бисте се пријавили као други корисник.",
-       "userlogin-reauth": "Ð\9cоÑ\80аÑ\82е да Ñ\81е поново пÑ\80иÑ\98авиÑ\82е да биÑ\81Ñ\82е поÑ\82вÑ\80дили да сте {{GENDER:$1|$1}}.",
+       "userlogin-reauth": "Ð\9cоÑ\80аÑ\82е да Ñ\81е поново пÑ\80иÑ\98авиÑ\82е да биÑ\81Ñ\82е веÑ\80иÑ\84иковали да сте {{GENDER:$1|$1}}.",
        "userlogin-createanother": "Отвори још један налог",
        "createacct-emailrequired": "Имејл-адреса",
        "createacct-emailoptional": "Имејл-адреса (опционално)",
@@ -1014,19 +1014,19 @@
        "prefs-watchlist": "Списак надгледања",
        "prefs-editwatchlist": "Уређивање списка надгледања",
        "prefs-editwatchlist-label": "Уреди уносе на списку надгледања:",
-       "prefs-editwatchlist-edit": "пÑ\80икажи и Ñ\83клони наÑ\81лове са списка надгледања",
-       "prefs-editwatchlist-raw": "уреди необрађени списак надгледања",
-       "prefs-editwatchlist-clear": "оÑ\87иÑ\81Ñ\82и Ñ\81пиÑ\81ак надгледања",
+       "prefs-editwatchlist-edit": "Ð\9fÑ\80иказ и Ñ\83клаÑ\9aаÑ\9aе наÑ\81лова са списка надгледања",
+       "prefs-editwatchlist-raw": "Уређивање необрађеног списка надгледања",
+       "prefs-editwatchlist-clear": "ЧиÑ\88Ñ\9bеÑ\9aе Ñ\81пиÑ\81ка надгледања",
        "prefs-watchlist-days": "Број дана у списку надгледања:",
        "prefs-watchlist-days-max": "Највише $1 {{PLURAL:$1|дан|дана|дана}}",
        "prefs-watchlist-edits": "Највећи број промена приказаних на списку надгледања:",
        "prefs-watchlist-edits-max": "Највећи број: 1000",
        "prefs-watchlist-token": "Токен списка надгледања:",
-       "prefs-watchlist-managetokens": "УпÑ\80авÑ\99аÑ\98 токенима",
+       "prefs-watchlist-managetokens": "УпÑ\80авÑ\99аÑ\9aе токенима",
        "prefs-misc": "Разно",
-       "prefs-resetpass": "пÑ\80омени лозинкÑ\83",
-       "prefs-changeemail": "Ð\9fÑ\80омени или Ñ\83клони имеÑ\98л-адÑ\80еÑ\81Ñ\83",
-       "prefs-setemail": "Постави имејл-адресу",
+       "prefs-resetpass": "Ð\9fÑ\80омена лозинке",
+       "prefs-changeemail": "Ð\9fÑ\80омена или Ñ\83клаÑ\9aаÑ\9aе имеÑ\98л-адÑ\80еÑ\81е",
+       "prefs-setemail": "Постављање имејл-адресе",
        "prefs-email": "Опције имејла",
        "prefs-rendering": "Изглед",
        "saveprefs": "Сачувај",
@@ -1035,7 +1035,7 @@
        "searchresultshead": "Претрага",
        "stub-threshold": "Праг за форматирање веза као клице ($1):",
        "stub-threshold-sample-link": "пример",
-       "stub-threshold-disabled": "онемогућено",
+       "stub-threshold-disabled": "Ð\9eнемогућено",
        "recentchangesdays": "Број дана у скорашњим изменама:",
        "recentchangesdays-max": "Највише $1 {{PLURAL:$1|дан|дана}}",
        "recentchangescount": "Подразумевани број измена за приказ у скорашњим изменама, историјама страница и дневницима:",
@@ -1046,10 +1046,11 @@
        "savedrights": "Корисничке групе {{GENDER:$1|корисника|кориснице}} $1 су сачуване.",
        "timezonelegend": "Временска зона:",
        "localtime": "Локално време:",
-       "timezoneuseserverdefault": "подразумеване вредности ($1)",
-       "timezoneuseoffset": "друго (унесите одступање)",
+       "timezoneuseserverdefault": "Користи подразумеване вредности викија ($1)",
+       "timezoneuseoffset": "Друго (наведите одступање испод)",
+       "timezone-useoffset-placeholder": "Примери вредности: „-07:00” или „01:00”",
        "servertime": "Време на серверу:",
-       "guesstimezone": "попуни из прегледача",
+       "guesstimezone": "Ð\9fопуни из прегледача",
        "timezoneregion-africa": "Африка",
        "timezoneregion-america": "Америка",
        "timezoneregion-antarctica": "Антарктик",
@@ -1065,12 +1066,12 @@
        "email-blacklist-label": "Забрани примање имејлова од следећих корисника:",
        "prefs-searchoptions": "Претрага",
        "prefs-namespaces": "Именски простори",
-       "default": "подÑ\80азÑ\83мевана",
+       "default": "подÑ\80азÑ\83мевано",
        "prefs-files": "Датотеке",
        "prefs-custom-css": "прилагођени CSS",
        "prefs-custom-json": "Прилагођени JSON",
        "prefs-custom-js": "прилагођени JavaScript",
-       "prefs-common-config": "Дељени CSS/JSON/јаваскрипт за све теме:",
+       "prefs-common-config": "Дељени CSS/JSON/JavaScript за све теме:",
        "prefs-reset-intro": "Можете користити ову страницу да поново поставите своја подешавања на подразумеване вредности сајта.\nОво се не може опозвати.",
        "prefs-emailconfirm-label": "Потврда имејла:",
        "youremail": "Имејл:",
@@ -1097,7 +1098,7 @@
        "prefs-help-realname": "Право име је опционално.\nАко је наведено, биће коришћено за приписивање вашег рада.",
        "prefs-help-email": "Имејл адреса је опционална, али је потребна за ресетовање лозинке, ако је заборавите.",
        "prefs-help-email-others": "Такође можете изабрати да допустите другима да вас контактирају преко имејла путем везе на вашој корисничкој страници или страници за разговор.\nВаша имејл адреса неће бити приказана другим корисницима који вас контактирају.",
-       "prefs-help-email-required": "Ð\98меÑ\98л-адÑ\80еÑ\81а Ñ\98е неопÑ\85одна.",
+       "prefs-help-email-required": "Ð\9fоÑ\82Ñ\80ебна Ñ\98е имеÑ\98л-адÑ\80еÑ\81а.",
        "prefs-info": "Основне информације",
        "prefs-i18n": "Интернационализација",
        "prefs-signature": "Потпис",

diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json
index e9698e3..7b329b9 100644 (file)
--- a/languages/i18n/tr.json
+++ b/languages/i18n/tr.json
@@ -1118,6 +1118,7 @@
        "localtime": "Yerel saat:",
        "timezoneuseserverdefault": "Viki varsayılanını kullanın ($1)",
        "timezoneuseoffset": "Diğer (ofset belirtin)",
+       "timezone-useoffset-placeholder": "Örnek değerler: \"-07:00\" veya \"01:00\"",
        "servertime": "Sunucu saati:",
        "guesstimezone": "Tarayıcınız sizin yerinize doldursun",
        "timezoneregion-africa": "Afrika",
@@ -1183,6 +1184,7 @@
        "prefs-advancedwatchlist": "Gelişmiş seçenekler",
        "prefs-displayrc": "Görüntüleme seçenekleri",
        "prefs-displaywatchlist": "Görüntüleme seçenekleri",
+       "prefs-pageswatchlist": "İzlenen sayfalar",
        "prefs-tokenwatchlist": "Anahtar",
        "prefs-diffs": "Farklar",
        "prefs-help-prefershttps": "Bu tercih bir sonraki girişinizde etkili olacaktır.",
@@ -1322,6 +1324,7 @@
        "grant-group-file-interaction": "Medya ile etkileşim kur",
        "grant-group-watchlist-interaction": "İzleme listenle etkileşim kur",
        "grant-group-email": "E-posta gönder",
+       "grant-group-high-volume": "Yüksek hacimli etkinlik gerçekleştir",
        "grant-group-customization": "Özelleştirme ve tercihler",
        "grant-group-private-information": "Sizinle ilgili özel verilere erişme",
        "grant-group-other": "Çeşitli aktivite",
@@ -1515,6 +1518,7 @@
        "rcfilters-filter-watchlistactivity-unseen-label": "Görülmemiş değişiklikler",
        "rcfilters-filter-watchlistactivity-unseen-description": "Değişiklikler gerçekleştiğinden beri ziyaret etmediğiniz sayfalardaki değişiklikler.",
        "rcfilters-filter-watchlistactivity-seen-label": "Görülmüş değişiklikler",
+       "rcfilters-filter-watchlistactivity-seen-description": "Değişiklikler gerçekleştiğinden beri ziyaret ettiğiniz sayfalardaki değişiklikler",
        "rcfilters-filtergroup-changetype": "Değişiklik türü",
        "rcfilters-filter-pageedits-label": "Sayfa düzenlemeleri",
        "rcfilters-filter-pageedits-description": "Viki içeriği, tartışmalar, kategori açıklamalarındaki düzenlemeler...",
@@ -1754,6 +1758,7 @@
        "uploadstash-badtoken": "İşlemin gerçekleştirilmesi başarısız oldu, muhtemelen düzenleme yetkileriniz zaman aşımına uğradı. Lütfen yeniden deneyin.",
        "uploadstash-errclear": "Dosyaların silinmesi başarısız oldu.",
        "uploadstash-refresh": "Dosya listelerini yenile",
+       "uploadstash-thumbnail": "küçük resmi görüntüle",
        "uploadstash-bad-path-unknown-type": "Bilinmeyen tür \"$1\".",
        "uploadstash-bad-path-unrecognized-thumb-name": "Tanınmayan başparmak adı.",
        "invalid-chunk-offset": "Geçersiz öbek ofset",

diff --git a/languages/i18n/uz.json b/languages/i18n/uz.json
index 4e9ec64..6cc95fc 100644 (file)
--- a/languages/i18n/uz.json
+++ b/languages/i18n/uz.json
@@ -15,7 +15,8 @@
                        "Ximik1991",
                        "Bmansurov",
                        "Fitoschido",
-                       "ديفيد"
+                       "ديفيد",
+                       "Malikxan"
                ]
        },
        "tog-underline": "Havolaning tagiga chizish:",
@@ -174,6 +175,7 @@
        "view": "Koʻrish",
        "view-foreign": "$1da koʻrish",
        "edit": "Tahrirlash",
+       "edit-local": "Mahalliy izohni tahrirlash",
        "create": "Yaratish",
        "create-local": "Mahalliy tavsifini qoʻshish",
        "delete": "O‘chirish",
@@ -219,6 +221,7 @@
        "disclaimers": "Masʼuliyatdan voz kechish",
        "disclaimerpage": "Project:Masʼuliyatdan voz kechish",
        "edithelp": "Tahrirlash yordami",
+       "helppage-top-gethelp": "Yordam",
        "mainpage": "Bosh sahifa",
        "mainpage-description": "Bosh sahifa",
        "policy-url": "Project:Qoida",
@@ -316,6 +319,7 @@
        "myprivateinfoprotected": "Sizda shaxsiy maʻlumotlaringizni tahrirlashga ruxsat mavjud emas.",
        "mypreferencesprotected": "Sizda afzalliklarni tahrirlashga ruxsat mavjud emas.",
        "ns-specialprotected": "\"{{ns:special}}\" nomfazosi sahifalari tahrirlanishi mumkin emas.",
+       "invalidtitle": "Yaroqsiz sarlavha",
        "exception-nologin": "Siz tizimda o'zingizni tanishtirmadingiz",
        "exception-nologin-text": "Bu sahifani koʻrish yoki soʻralgan amalni bajarish uchun tizimga kirishingiz lozim.",
        "virus-badscanner": "Moslamada xato. Noma'lum virus aniqlovchi: ''$1''",

diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json
index 2b82b70..98dd283 100644 (file)
--- a/languages/i18n/zh-hant.json
+++ b/languages/i18n/zh-hant.json
@@ -1113,7 +1113,8 @@
        "timezonelegend": "時區：",
        "localtime": "當地時間：",
        "timezoneuseserverdefault": "使用 Wiki 預設值 ($1)",
-       "timezoneuseoffset": "其他 (指定時差)",
+       "timezoneuseoffset": "其它（以下指定時差）",
+       "timezone-useoffset-placeholder": "範例：\"-07:00\" 或 \"01:00\"",
        "servertime": "伺服器時間：",
        "guesstimezone": "使用瀏覽器設定值",
        "timezoneregion-africa": "非洲",