From: jenkins-bot Date: Tue, 17 Oct 2017 22:06:25 +0000 (+0000) Subject: Merge "Fix login button label to accept RawMessage." X-Git-Tag: 1.31.0-rc.0~1737 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=1d9da64faee7051965955159feb95b8dc1617e97;hp=b1ddb0cef127d75e2045d4cc3aba4d612b2f7676 Merge "Fix login button label to accept RawMessage." --- diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php index 59efd82bca..2d1521d5d0 100644 --- a/includes/changes/ChangesListStringOptionsFilterGroup.php +++ b/includes/changes/ChangesListStringOptionsFilterGroup.php @@ -242,4 +242,14 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup { return $output; } + + /** + * Check if this filter group is currently active + * + * @param {boolean} $isStructuredUI Is structured filters UI current enabled + */ + public function isActive( $isStructuredUI ) { + // STRING_OPTIONS filter groups are exclusively active on Structured UI + return $isStructuredUI; + } } diff --git a/includes/installer/i18n/eu.json b/includes/installer/i18n/eu.json index 468488fa6b..492da036e2 100644 --- a/includes/installer/i18n/eu.json +++ b/includes/installer/i18n/eu.json @@ -45,15 +45,28 @@ "config-help-restart": "Ezabatu nahi duzu gorde duzun informazio guztia eta berrebiarazi instalazio prozesua?", "config-restart": "Bai, berriz hasi", "config-welcome": "=== Ingurumen-egiaztapenak ===\n\nOinarrizko kontrola burutzen ari da, ikusteko ia ingurumena aproposa da MediaWikia instalatzeko.\nLaguntza behar izanez gero instalazio prozesua amaitzeko ez ahaztu sartzea informazio hau .", + "config-copyright": "=== Copyright eta terminoak ===\n\n$1\n\nPrograma hau software librea da; birbana eta / edo alda dezakezu GNU Lizentzia Publiko Orokorraren baldintzapean, Free Software Foundation-ek argitaratutakoaren arabera; Lizentziaren 2. bertsioa edo (nahiago baduzu) bertsio berriago bat.\n\nPrograma hau baliagarria izango delakoan elkarbantzen da, baina bermerik gabe ; merkaturatze edo helburu jakin baterako gaitasuna berme inplizitua ere izan gabe.\nIkus GNU Lizentzia Publiko Orokorra xehetasun gehiagorako.\n\n izan beharko zenuke GNU Lizentzia Publiko Orokorraren kopia programa honekin batera; bestela, idatzi Free Software Foundation-en, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, AEB, edo [http://www.gnu.org/copyleft/gpl.html irakurri ezazu online]. .", "config-sidebar": "* [https://www.mediawiki.org MediaWiki nagusia]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Erabiltzaileentzako Gida]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Administratzaileentzako Gida]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MEG]\n----\n* Irakur nazazu\n* Oharren argitalpena\n* Kopiaketa\n* Eguneratzea", "config-env-good": "Ingurumena egiaztatu egin da. \nMediaWiki instalatu ahal duzu.", "config-env-bad": "Ingurumena egiaztatu egin da.\nEzin duzu MediaWiki-a instalatu.", "config-env-php": "PHP $1 instalatuta dago.", "config-env-hhvm": "HHVM $1 instalatuta dago.", + "config-unicode-using-intl": "[http://pecl.php.net/intl intl PECL extension] erabiltzen Unicode-ren normalizaziorako.", + "config-unicode-pure-php-warning": "Oharra: [http://pecl.php.net/intl intl PECL extension] ez dago prest Unicode-ren normalizazioa jasatzeko,PHP hutsaren ezarpena motelara itzultzen.\n\nTrafiko handiko gune bat exekutatzen baduzu, apur bat irakurri beharko zenuke [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations Unicode normalization]-ri buruz.", + "config-unicode-update-warning": "Oharra: Unicode-ren normalizazioaren bilgarriaren bertsio instalatua [http://site.icu-project.org/ ICU proiektuaren] liburutegia bertsio zaharrago bat erabiltzen du.\n[Https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations upgrade] behar duzu Unicode erabiltzeagatik kezkatuta bazaude.", + "config-no-db": "Ezin izan da aurkitu datu-basearen driver egoki bat! Instalatu behar duzu PHP-ko datu-basearen driver bat. Hurrengo datu {{PLURAL:$2|basea|baseak}} onartzen {{PLURAL:$2|da|dira}}:$1\n\n\nPHP-k zuk konpilatu baduzu, berkonfiguratu datu-basearen bezeroarekin gaituta, adibidez, ./configure --with-mysqli. erabiliz.\nDebian edo Ubuntu pakete batetik PHPa instalatu baduzu, orduan instalatu behar duzu ere bai hurrengo adibide bezalako bat php5-mysql", + "config-outdated-sqlite": "Warning: SQLite $1 daukazu, hau da, gutxieneko bertsioa $2 baino atzeratutagoa da. SQLite ez dago erabilgarri.", + "config-no-fts3": "Warning: SQLite konpilatu egin da [//sqlite.org/fts3.html FTS3 module] barik, \nbilaketa funtzioak ez dira erabilgarri izango \"backend\" honetan.", + "config-pcre-old": "Fatal: PCRE $1 edo berriagoa behar da.\nZure PHP bitarra PCRE $2 rekin lotzen da.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Informazio gehiago].", + "config-pcre-no-utf8": "Fatal: PHREko PCRE modulua PCRE_UTF8 ko laguntza gabe bildu da.\nMediaWiki-k UTF-8 euskarria behar du behar bezala funtziona dezan.", + "config-memory-raised": "PHP-ko memory_limit $1 da, $2-ra igota.", + "config-memory-bad": "Warning: PHPko memory_limit $1 da.\nZiurrenik hau oso baxua da.\nInstalazioa huts egin dezake!", "config-xcache": "[http://xcache.lighttpd.net/ XCache] instalatuta dago", "config-apc": "[http://www.php.net/apc APC] instalatuta dago", "config-apcu": "[http://www.php.net/apcu APCu] instalatuta dago", "config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] instalatuta dago", + "config-no-cache-apcu": "Warning: Ezin izan da [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] edo [http://www.iis.net/download/WinCacheForPhp WinCache] aurkitu.\nObjektu katxea ez dago aktibatuta.", + "config-mod-security": "Warning: Zure web zerbitzariak [http://modsecurity.org/mod_security] / mod_security2 aktibatu du. Honen konfigurazio komun asko sortu ahal dituzte arazoak MediaWikin eta beste software batzuetan, hautazko edukia argitaratzeko aukera ematen dutenei erabiltzaileei.\nAhal izanez gero, desgaitu egin beharko litzateke. Bestela, kontsultatu [http://modsecurity.org/documentation/ mod_security documentation] edo jarri harremanetan zure ostalariarekin ausazko akatsak aurkitzen badituzu.", "config-diff3-bad": "GNU diff3 ez da aurkitu.", "config-git": "Git bertsio-kontrol software aurkitu da: $1", "config-git-bad": "Git bertsio-kontrol software ez da aurkitu.", @@ -69,6 +82,7 @@ "config-db-name": "Datu-base izena:", "config-db-name-help": "Aukeratu zure Wikia identifikatzen duen izena.\nEzin dira espazioak eabili.\n\nErabiltzen ari bazara web hosting partekatua, hostin-eko hornitzaileak emango dizu datu-basearen izen espezifikoa edo kontrol panel baten bitzrtez zure datu-basea sortzea utziko dizu.", "config-db-name-oracle": "Datu-baseko eskema:", + "config-db-install-account": "Instalazio prozesuan erabili erabiltzaile kontua.", "config-db-username": "Datu-base lankide izena:", "config-db-password": "Datu-base pasahitza:", "config-db-install-username": "Sartu erabiliko duzun erabiltzaile izena datu-basearikn konektzatzeko instalazio prozesuaren bitartean.\nHau ez da MediaWikiaren erabiltzaile izanea; hau da datu-basearen erabiltzaile izena da.", @@ -76,7 +90,10 @@ "config-db-install-help": "Sartu instalazio prozesuan zehar datu-basearekin konektatzeko erabiliko den erabiltzaile izena eta pasahitza.", "config-db-account-lock": "Operazio arruntentan erabili erabiltzaile izena eta pasahitza berdina", "config-db-wiki-account": "Operazio arruntentaten erabili erabiltzaile kontua.", + "config-db-wiki-help": "Operazio arruntetan erabiliko den erabiltzaile izena eta pasahitza sartu.\n\nKontua ez bada existitzen, eta instalazio kontua pribilegio nahikoak baditu, erabiltzaile kontu hau sortuko da wikia erabiltzeko behar diren pribilegio minimoekin.", "config-db-prefix": "Datu-basearen taularen aurrizkiak:", + "config-db-prefix-help": "Datu-base bat elkarbanatu behar baduzu hainbat wiki orrien artean, edota MediaWiki eta best web aplikazio batekin, taula guztiei aurrizki bat gehitzea aukeratu ahal dezakezu, gatazkak ez sortzeko.\nEz erabili zuriunerik.\n\nAtal hau normalean utsik uzten da.", + "config-mysql-old": "MySQL $1 edo berriagoa behar da. Zuk $2 badaukazu.", "config-db-port": "Datu-basearen ataka:", "config-db-schema": "MediaWikirako eskema:", "config-db-schema-help": "Patroi hau normalean egokia da. Bakarrik aldatu beharrezkoa bada.", @@ -95,9 +112,15 @@ "config-header-oracle": "Oracle hobespenak", "config-header-mssql": "Microsoft SQL Server-en ezarpenak", "config-invalid-db-type": "Datu-base mota baliogabea.", + "config-missing-db-name": "\"{{int:config-db-name}}\"-rentzako balioa sartu behar duzu.", + "config-missing-db-host": "\"{{int:config-db-host}}\"-rentzako balioa sartu behar duzu.", + "config-missing-db-server-oracle": "\"{{int:config-db-host-oracle}}\"-rentzako balioa sartu behar duzu.", + "config-connection-error": "$1\n\nHost-a, erabiltzaile izena eta pasahitza egiaztatu eta saiatu berriro.", "config-db-sys-create-oracle": "Instalatzaileak bakarrik jasaten du SYSBDA kontu bat erabiltzaile kontu berri bat sortzeko.", "config-db-sys-user-exists-oracle": "$1 erabiltzaile kontua dagoeneko existitzen da. SYSDBA kontu berri bat sortzeko erabili daiteke soilik!", - "config-sqlite-name-help": "Aukeratu zure wikia identifikatzen duen izen bat.\nEz erabili espazioak edo gidoiak.\nHau erabiliko da SQLite datuen artxiborako.", + "config-postgres-old": "PostgreSQL $1 edo berriagoa behar da. Zuk $2 badaukazu.", + "config-mssql-old": "Microsoft SQL Server $1 edo berriagoa behar da. Zuk $2 badaukazu.", + "config-sqlite-name-help": "Aukeratu zure wikia identifikatzen duen izen bat.\nEz erabili zuriunerik edo gidoirik.\nHau erabiliko da SQLite datuen artxiborako.", "config-sqlite-mkdir-error": "Arazo bat sortu da datuen direktorioa sortzerakoan \"$1\".\nLokalizazio egiaztatu eta berriro saiatu.", "config-sqlite-dir-unwritable": "Ezin izan da \"$1\" direktoriora idatzi.\nAldatu baimenak web-serbidoreak idatzi ahal izateko, eta berriro saiatu.", "config-sqlite-connection-error": "$1.\n\nDatu direktorioa eta datu-basea egiaztatu eta berriro saiatu.", @@ -105,6 +128,7 @@ "config-sqlite-cant-create-db": "Ezin izan da $1 datu-basearen artxiboa sortu.", "config-upgrade-done-no-regenerate": "Eguneratze prozesua amaitu egin da.\n\nHasi ahal zara [ $1 wikia arabiltzen]", "config-regenerate": "Birsortu LocalSettings.php →", + "config-show-table-status": "SHOW TABLE STATUS kontsulta huts egin du!", "config-db-web-account": "Datu-basearen kontua web sarbiderako.", "config-db-web-help": "Aukeratu erabiliko den erabiltzaile izena eta pasahitza web serbidorea eta datu-basearen serbidorea konektatzeko, wikiren operazio normalaren bitartean.", "config-db-web-account-same": "Instalazioan erabili duzun kontu berdina erabili.", @@ -126,10 +150,12 @@ "config-ns-site-name": "Wiki izenaren berdina: $1", "config-ns-other": "Bestelakoa (zehaztu)", "config-ns-other-default": "MyWiki", + "config-project-namespace-help": "Wikipedia-ren adibidea jarraitzen, wiki askok beren orrien politika mantentzen dute beren edukien orrialdeetatik bereizita, '' 'proiektuaren izen-eremuan' ''.\nOrrialde honetako izenburu guztiek aurrizki jakin batekin hasten dira, hemen zehaztu ahal direnak.\nNormalean, aurrizkia wikiaren izenetik dator, baina ezin du \"#\" edo \":\" puntuazio-karaktereak eduki.", "config-admin-box": "Administratzaile kontua", "config-admin-name": "Zure erabiltzaile-izena:", "config-admin-password": "Pasahitza:", "config-admin-password-confirm": "Pasahitza berriz:", + "config-admin-help": "Sartu zure gustokoen erabiltzaile izena hemen, adibidez \"Joe Bloggs\".\nHau da erabiliko duzun izena wikian sartzeko.", "config-admin-name-blank": "Sartu administratzaile kontua.", "config-admin-name-invalid": "$1 erabiltzaile izena baliogabea da.\nZehaztu erabiltzaile izen desberdin bat.", "config-admin-password-blank": "Sartu pasahitza administratzaile kontuarentzako.", @@ -142,19 +168,25 @@ "config-almost-done": "Ia amaitu duzu!\nFalta den konfigurazioa saltatu ahal duzu eta zuzenean wikia instalatu.", "config-optional-continue": "Galdera gehiago egin.", "config-optional-skip": "Aspertuta nago, wikia instalatu bakarrik.", + "config-profile": "Erabiltzailearen profilaren eskubideak:", "config-profile-wiki": "Wikia ireki", "config-profile-no-anon": "Kontua sortzea beharrezkoa da", "config-profile-fishbowl": "Baimendutako editoreak bakarrik", "config-profile-private": "Wiki pribatua", "config-license": "Copyright eta lizentzia:", + "config-license-none": "Ez jarri lizentzia orriaren baimenik", "config-license-cc-by-sa": "Creative Commons-eko esleipen-lizentzia", "config-license-cc-by": "Creative Commons Aitorpena", "config-license-cc-0": "Creative Commons Zero (Jabari Publikoa)", + "config-license-gfdl": "\nGNU Free Documentation License 1.3 edo berriagoa", "config-license-pd": "Domeinu Askea", "config-license-cc-choose": "Aukeratu Creative Commons lizentzia pertsonalizatua", "config-email-settings": "E-posta hobespenak", "config-enable-email": "Aktibatu irteerako emaila.", "config-email-user": "Aktibatu erabiltzaileen arteko emaila.", + "config-email-user-help": "Baimena eman erabiltzaileei beraien artean emailak bidaltzeko, lehentasunetan aukera aktibatuta badaukate.", + "config-email-usertalk": "Aktibatu erabiltzaileen eztabaida orrien jakinarazpena", + "config-email-usertalk-help": "Erabiltzailei baimena eman jakinarazpenak jasotzeko eztabaidan orrietako aldaketei buruz, aukera hau aktibatu badaukate.", "config-email-watchlist": "Jarraipen listaren jakinarazpenak aktibatu.", "config-email-watchlist-help": "Baimena eman erabiltzaileei jakinarazpenak jasotzeko haiek ikusitako orriei buruz, lehenespenetan aktibatu badaukate.", "config-email-auth": "Aktibatu emailaren autentifikazioa.", @@ -162,20 +194,32 @@ "config-email-sender": "Itzuli helbide elektronikoa:", "config-upload-settings": "Irudi eta fitxategi igoerak", "config-upload-enable": "Fitxategi igoera gaitu", + "config-upload-help": "Fitxategiak kargatzeak zure zerbitzaria segurtasun arriskuei eragin diezaioke.\nInformazio gehiagorako, irakurri [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security security section] eskuliburuan.\n\nFitxategiak igotzea aktibatzeko, aldatu images subdirektorio modua MediaWiki-ren erroko direktorioaren azpian, web zerbitzariak honela idatz dezake.\nOndoren, gaitu aukera hau.", "config-upload-deleted": "Ezabatutako artxiboentzako direktorioa:", + "config-upload-deleted-help": "Aukeratu fitxategi bat ezabatutako artxiboak gordetzeko.\nGomendagarria da hau webgunetik ez egotea eskuragarri.", "config-logo": "Logo URL:", "config-instantcommons": "Instant Commons gaitu", + "config-cc-error": "Creative Commons lizentziaren aukeratzaileak ez du emaitzarik eman.\nEskuz sartu lizentzia.", "config-cc-again": "Berriz aukeratu...", + "config-cc-not-chosen": "Aukeratu ze Creative Common lizentzi nahi duzu eta sakatu \"proceed\"", "config-advanced-settings": "Konfigurazio aurreratua", "config-cache-options": "Objektu cachearen ezarpenak:", + "config-cache-help": "Objektuen katxea erabiltzen da MediaWikiko abiadura hobetzeko, sarritan erabiltzen diren datuak gordetzen.\nOso gomendagarria da, webgune handientzako eta ertainentzako, webgune txikiek ere ikusiko dituzte onurak.", + "config-cache-none": "Desaktibatu Katxina (ez dira funtzionaltasunak ezabatu, baina wiki orrialde handietan abiaduran eragina izan ahal du)", + "config-cache-accel": "PHP objetuen katxea (APC, APCu, XCache edo WinCache)", "config-cache-memcached": "Memcached erabili (konfigurazio eta instalazio gehiago behar du)", "config-memcached-servers": "Memcached serbidoreak:", "config-memcached-help": "Memcached-ekin erabiltzeko IP helbideen lista.\nLerro bakoitzen bat bakarrik jarri behar da eta zehaztu ze ataka erabiliko den. Adibidez:\n127.0.0.1:11211\n192.168.1.25:1234", + "config-memcache-needservers": "Memcached aukeratu duzu zure katxe mota bezala baina ez duzu zehaztu inolako serbidorerik.", "config-memcache-badip": "Sartu duzu Memcached-eko baliogabeko IP bat: $1", + "config-memcache-noport": "Ez duzu zehaztu portu bat Memcached serbidorerako: $1\nEz badakizu portua, estandarra 11211 da.", "config-memcache-badport": "Memcached-eko ataka zenbakiak $1 eta $2 artean egon behar dira.", "config-extensions": "Luzapenak", + "config-extensions-help": "Goian zerrendatutako luzapenak zure ./ extensions direktorioan detektatu dira.\n\nBeharbada konfigurazio gehaigo behar dute, baina orain gaitu ditzakezu.", "config-skins": "Itxurak", + "config-skins-help": "Goian aipatutako itxurak zure ./skins direktorioan aurkitu dira. Bat gutxienez aktibatu behar duzu, eta estandarra aukeratu.", "config-skins-use-as-default": "Erabili ikusizko estilo hau lehenezpen gisa.", + "config-skins-missing": "Ez dira itxurarik aurkitu, MediaWiki-ak oinarrizko itxura bat erabiliko du, zuk itxura egokiak instalatu arte.", "config-skins-must-enable-some": "Gutxienez aukeratu behar duzu ikusizko estilo bat aktibatzeko.", "config-skins-must-enable-default": "Lehenetsia bezala aukeratu duzun ikusizko estilo aktibatuta egon behar da.", "config-install-alreadydone": "Oharra:Badirudi MediaWikia instalatu daukazula eta berriz instalatzen saiatzen ari zarela.\n\nMesedez, hurrengo orrian jarraitu", @@ -189,6 +233,8 @@ "config-install-pg-commit": "Aldaketak egiten", "config-install-pg-plpgsql": "PL/pgSQL hizkuntza bilatzen.", "config-pg-no-plpgsql": "$1 datu-basean instalatu behar duzu PL/pgSQL hizkuntza.", + "config-pg-no-create-privs": "Zehaztu duzun kontua instalazio prozesurako ez dauka pribilegio nahikoak kontu bat sortzeko.", + "config-pg-not-in-role": "Zehaztu duzun kontua web erabiltzailerako dagoeneko existitzen da.\nInstalatzeko zehaztutako kontua ez da super erabiltzailea eta ez da web erabiltzailearen rolaren kide bat,hori dela eta ez da gai web erabiltzailearen objetuak erabiltzeko.\n\nMediaWiki-k, gaur egun, taulak web erabiltzailearenak izatea eskatzen du. Mesedez, zehaztu beste web kontuen izen bat, edo egin klik \"atzera\" botoian eta zehaztu instalazio egokia duen kontu bat.", "config-install-user": "Datubase erabiltzailea sortzen", "config-install-user-alreadyexists": "\"$1\" erabiltzailea badago.", "config-install-user-create-failed": "$1 erabiltzailea sortzerakoan huts egin du: $2", @@ -198,13 +244,16 @@ "config-install-tables": "Taulak sortzen", "config-install-tables-exist": "Oharra: Badirudi MediaWkiko- taulak dagoeneko existitzen direla. Sorrera saltatzen.", "config-install-tables-failed": "Errore: Taulen sorrerak huts egin du hurrengo erroreakin: $1", + "config-install-interwiki": "MediaWiki taula estandarrari datuak sartzen.", "config-install-interwiki-list": "Ezin izan da interwiki.list fitxategia irakurri.", + "config-install-interwiki-exists": "Oharra: Interwikiko taula badirudi sarrerak dituela. \nTaula estandarra saltatzen.", "config-install-stats": "Estatistikak hasten", "config-install-keys": "Gako sekretuak sortzen", "config-install-updates": "Saihestu egikaratzen behar ez diren aktualizazioak", "config-install-updates-failed": "Errore Sartzea eguneratze-gakoak taulen barruan huts egin du hurrengo errorearekin: $1", "config-install-sysop": "Administratzaile kontua sortzen", "config-install-subscribe-fail": "Ezin izan da mediawiki-announce -ra harpidetu: $1", + "config-install-subscribe-notpossible": "cURL ez dago instalatuta eta allow_url_fopen ez dago erabilgarri.", "config-install-mainpage": "Sortzen orri nagusia eduki estandarrarekin", "config-install-mainpage-exists": "Orri nagusia dagoeneko existitzen da, hurrengora saltatzen", "config-install-extension-tables": "Taulak sortzen aktibatutako luzapenentzako.", @@ -215,6 +264,7 @@ "config-help": "Laguntza", "config-help-tooltip": "sakatu zabaltzeko", "config-nofile": "Ezin da \"$1\" fitxategia aurkitu. Ezabatua izan da?", + "config-extension-link": "Ba al zenekien wikiak [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions extensions] onartzen dituela?\n\nArakatu [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category extensions by category] edo [https://www.mediawiki.org/wiki/Extension_Matrix Extension Matrix] ikusi ahal izateko luzapenen zerrenda.", "config-skins-screenshots": "$1 (Pantaila-irudia: $2)", "config-screenshot": "Pantaila-irudia", "mainpagetext": "MediaWiki instalatu da.", diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 20fd06a52c..3f45250508 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -1295,8 +1295,10 @@ abstract class ChangesListSpecialPage extends SpecialPage { // URL parameters can be per-group, like 'userExpLevel', // or per-filter, like 'hideminor'. if ( $filterGroup->isPerGroupRequestParameter() ) { - $filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds, - $query_options, $join_conds, $opts[$filterGroup->getName()] ); + if ( $filterGroup->isActive( $isStructuredUI ) ) { + $filterGroup->modifyQuery( $dbr, $this, $tables, $fields, $conds, + $query_options, $join_conds, $opts[$filterGroup->getName()] ); + } } else { foreach ( $filterGroup->getFilters() as $filter ) { if ( $filter->isActive( $opts, $isStructuredUI ) ) { diff --git a/languages/i18n/af.json b/languages/i18n/af.json index d7f74b7395..b5fb3d49b9 100644 --- a/languages/i18n/af.json +++ b/languages/i18n/af.json @@ -1111,7 +1111,7 @@ "recentchanges-submit": "Wys", "rcfilters-tag-remove": "Verwyder '$1'", "rcfilters-legend-heading": "Lys van afkortings:", - "rcfilters-other-review-tools": "Ander hulpmiddels", + "rcfilters-other-review-tools": "Ander hulpmiddels", "rcfilters-group-results-by-page": "Groepeer resultate per bladsy", "rcfilters-grouping-title": "Groepering", "rcfilters-activefilters": "Aktiewe filters", diff --git a/languages/i18n/ais.json b/languages/i18n/ais.json index ce82a52107..8b03d47747 100644 --- a/languages/i18n/ais.json +++ b/languages/i18n/ais.json @@ -240,6 +240,7 @@ "restorelink": "{{PLURAL:$1|masipuay a mikawaway-kalumyiti}}", "feed-invalid": "la’cusay a miaca-aazihan Feed kakuniz.", "feed-unavailable": "caayhen nipabeli RSS saca Atom ayza", + "site-rss-feed": "\"$1\" a RSS saangangan", "site-atom-feed": "$1 a Atom saangangan", "page-rss-feed": "\"$1\" a RSS saangangan", "page-atom-feed": "$1 a Atom saangangan", @@ -310,6 +311,7 @@ "yourname": "misaungayay a kalungangan:", "userlogin-yourname": "misaungayay a kalungangan", "userlogin-yourname-ph": "pisulitan tu nu misay a misaungayay a kalungangan", + "createacct-another-username-ph": "pisulit misaungayay a kalungangan", "yourpassword": "mima:", "userlogin-yourpassword": "mima", "userlogin-yourpassword-ph": "suliten nu misuay a mima", @@ -625,6 +627,7 @@ "mergehistory-empty": "inayi’ amikabuay a sumad.", "mergehistory-fail": "la’cus miteka nazipa’an mikabu, piliyaw kinsa kya kasabelih atu tuki aazihen-sulyang", "mergehistory-fail-bad-timestamp": "tatukian a suyling la’cus.", + "mergehistory-fail-invalid-dest": "pamutekan kasabelih la’cus.", "mergehistory-fail-permission": "mangadis tungus，la’cus mikabu nazipa’an.", "mergehistory-fail-self-merge": "malecad ku kalungangan nu saangangan kasabelih atu papatuzu’an kasabelih.", "mergehistory-fail-timestamps-overlap": "angangan masumad nu ayaway baziyong misaliyaw, saca i zikuz nu papatuzu’an masumad nu ayaway baziyong sa matahkal.", @@ -749,6 +752,7 @@ "prefs-custom-css": "pakuniza misanga’ CSS", "prefs-custom-js": "pakuniza misanga’ JavaScript", "prefs-common-css-js": "sacahamin nuhekalan kapulungan a CSS/JavaScript:", + "prefs-emailconfirm-label": "imyiyo(email) malucekay tuway:", "username": "{{GENDER:$1|misaungayay a kalungangan}}:", "prefs-registration": "pangangan a demiad:", "yourrealname": "tatengaay a ngangan:", @@ -854,6 +858,7 @@ "right-unblockself": "mihulak tu ku langat nu maku", "right-protect": "misumad midiput saselal atu mikawaway-kalumyiti mapatatusul midiputay a kasabelih", "right-editcontentmodel": "mikawaway-kalumyiti kasabelih a lacul tatudungen-misanga’", + "right-editinterface": "mikawaway-kalumyiti misaungayay taypuolayta", "right-editusercss": "mikawaway-kalumyiti zuma misaungayay a CSS tangan", "right-edituserjs": "mikawaway-kalumyiti zuma misaungayay a JavaScript tangan", "right-editmyuserjs": "mikawaway-kalumyiti numisuay misaungayay a JavaScript tangan", @@ -882,6 +887,7 @@ "grant-group-watchlist-interaction": "sakasaungay numisuay misisip a piazihan-tu-sulit", "grant-group-email": "pabahel imyiyo(email)", "grant-group-high-volume": "mileku sayadah a saungay nu binawlan", + "grant-group-customization": "pakuniza misanga’ atu setin tu kanamuhan", "grant-group-administration": "mileku tu mikuwanay a kawaw", "grant-group-other": "zuma saungay nu binawlan", "grant-blockusers": "milangat atu mihulak milangatay a misaungayay", @@ -891,6 +897,7 @@ "grant-editmycssjs": "mikawaway-kalumyiti numisuay a misaungayay CSS/JavaScript", "grant-editmyoptions": "mikawaway-kalumyiti misaungayay setin tu kanamuhan nu misu", "grant-editmywatchlist": "mikawaway-kalumyiti numisu misisip a piazihan-tu-sulit", + "grant-editpage": "mikawaway-kalumyiti izaway kasabelih", "grant-editprotected": "mikawaway-kalumyiti madiputay a kasabelih", "grant-highvolume": "masibek mikawaway-kalumyiti", "grant-oversight": "midimut misaungayay atu satezep paazih masumad nu ayaway", @@ -1114,6 +1121,7 @@ "uploaded-hostile-svg": "i mapatapabaway a SVG tangan yangse aazihen-paya matepa caay kaenapay a CSS.", "uploadinvalidxml": "la’cus mitingalaw matapabaway tangan a XML.", "upload-source": "saangangan a tangan", + "destfilename": "pamutekan tangan kalungangan:", "upload-maxfilesize": "hacica-tabaki nu tangan makelec: $1", "upload-description": "tangan sapuelac", "upload-options": "patapabaw mapiliay", @@ -1291,6 +1299,7 @@ "pageswithprop-submit": "mileku", "pageswithprop-prophidden-long": "midimut mangasiw tanaya’ a susin sulyang ($1) tuway", "pageswithprop-prophidden-binary": "madimut tusa-taayaw-eneng susin sulyang ($1)", + "doubleredirects": "tusaay a miliyaw patatuzu’", "brokenredirects": "malepi’ ay miliyaw patatuzu’", "brokenredirectstext": "isasa’ miliyaw patatuzu’ kasabelih masasiket a kasabelih inayi’:", "brokenredirects-delete": "misipu", @@ -1494,6 +1503,7 @@ "emailsend": "patigamitu", "emailccme": "pabahel cacay palatuh mikilulay-cudad tu imyiyo(email) nu maku.", "emailccsubject": "napatigami $1 nu misa a palatuh mikilulay-cudad: $2", + "emailsent": "mapatahkal tu i imyiyo(email)", "emailsenttext": "patigamitu ku imyiyo(email) palatuh nu misu.", "watchlist": "miazihay a piazihan tu sulit", "mywatchlist": "miazihay a piazihan tu sulit", @@ -1753,6 +1763,7 @@ "block-log-flags-nousertalk": "la’cus mikawaway-kalumyiti sasukamu kasabelih nu misu", "block-log-flags-angry-autoblock": "pangaleb lunuk-langat mawawah tuway", "range_block_disabled": "mikuwanay kapah patizeng subal milangat a tungus maedeb tuway.", + "ipb_expiry_old": "kakatukuhan a demiad mangasiw tuway.", "ipb_expiry_temp": "midimut misaungayay a kalungangan langat amana misetin kakatekuhan.", "ipb_already_blocked": "malangat \"$1\" tuway.", "ipb-needreblock": "$1 mapalangat tu. maydih kisu misetin haw?", @@ -1831,6 +1842,7 @@ "allmessages": "sisetyimo palatuh", "allmessagesname": "kalungangan", "allmessagesdefault": "pataayaw tu kawaw palatuh a sulit", + "allmessagescurrent": "ayzaay palatuh a sulit", "allmessages-filter-legend": "kilim", "allmessages-filter": "kilul misumad zasatu mikilim:", "allmessages-filter-unmodified": "caay henay misumad", @@ -1978,6 +1990,7 @@ "pageinfo-header-restrictions": "kasabelih midiput", "pageinfo-header-properties": "susin nu kasabelih", "pageinfo-display-title": "paazih tu satangahan", + "pageinfo-default-sort": "pataayaw tu kawaw pasilsilay a sasakawawen", "pageinfo-length": "kasabelih a tanaya’ (wyiyincu)", "pageinfo-article-id": "kasabelih ID", "pageinfo-language": "kasabelih lacul a kamu", @@ -2377,6 +2390,7 @@ "exif-rating-rejected": "kakaian", "exif-isospeedratings-overflow": "satabakien tu 65535", "exif-iimcategory-clj": "mungangaw atu hulic", + "exif-iimcategory-dis": "labades atu malitemuhay", "exif-iimcategory-fin": "kyizay atu syubay", "exif-iimcategory-edu": "pasubana’ay a kawaw", "exif-iimcategory-evn": "liwliw", @@ -2569,6 +2583,7 @@ "tags-edit-title": "aazihen a paya mikawaway-kalumyiti", "tags-edit-manage-link": "aazihen a paya nu kuwan", "tags-edit-logentry-selected": "mapili’ {{PLURAL:$1|cacay|yadah}} nasulitan nazipa’an saungay nu binawlan.", + "tags-edit-existing-tags": "izaway tu a taazihen-paya:", "tags-edit-existing-tags-none": "inayi’", "tags-edit-new-tags": "baluhay aazihen a paya:", "tags-edit-add": "micunus uyniyay aazihen a paya:", @@ -2628,6 +2643,7 @@ "restore-count-files": "{{PLURAL:$1|1 tangan}}", "logentry-suppress-delete": "$1 {{GENDER:$2|misatezep paazih tuway}} kasabelih $3", "revdelete-content-hid": "madimut tu ku lacul", + "revdelete-summary-hid": "madimut mikawaway-kalumyiti pecu’ nu lacul", "revdelete-content-unhid": "palawpes midimut tu lacul", "revdelete-summary-unhid": "palawpes midimut mikawaway-kalumyiti pecu’ nu lacul", "revdelete-uname-unhid": "palawpes midimut misaungayay a kalungangan", @@ -2645,7 +2661,7 @@ "logentry-upload-upload": "$1 {{GENDER:$2|masayacay tuway}} $3", "logentry-upload-overwrite": "$1 {{GENDER:$2|patapabaw tuway}} baluhay baziyong a $3", "logentry-upload-revert": "$1 {{GENDER:$2|masayacay tuway}} $3", - "log-name-managetags": "aazihan-paya kuwan tu nasulitan", + "log-name-managetags": "tazihan-paya kuwan tu nasulitan", "logentry-managetags-create": "$1 {{GENDER:$2|mapatizeng yuway}} aazihen-paya \"$4\"", "log-name-tag": "aazihen a paya nasulitan nazipa’an", "rightsnone": "(nayi’)", @@ -2658,6 +2674,7 @@ "feedback-external-bug-report-button": "munday nu patubeli", "feedback-dialog-title": "patahkal tu kamu mihwidubaku", "feedback-error1": "mungangaw: la’cus sapulita API maminay a heci", + "feedback-error2": "mungangaw: mikawaway-kalumyiti mungangaw", "feedback-error3": "mungangaw: API inayi’ patukil", "feedback-error4": "mungangaw: la’cus patiyak tu matuzu’ay a nabalucu’ hwidubaku satangahan", "feedback-message": "palatuh:", @@ -2799,7 +2816,7 @@ "log-action-filter-managetags-create": "patizeng aazihen paya", "log-action-filter-managetags-delete": "misipu aazihen a paya", "log-action-filter-managetags-activate": "aazihen a paya miteka", - "log-action-filter-managetags-deactivate": "aazihan-paya palawpesen ku pisaungay", + "log-action-filter-managetags-deactivate": "tazihan-paya palawpesen ku pisaungay", "log-action-filter-move-move": "milimad caay maliyaw misulit miliyaw patatuzu’", "log-action-filter-move-move_redir": "milimad miliyaw misulit miliyawtu tazuma nay", "log-action-filter-newusers-create": "nay paceba panganganay a misaungayay patizeng", diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json index 0150f62129..e72bda0943 100644 --- a/languages/i18n/ar.json +++ b/languages/i18n/ar.json @@ -1346,7 +1346,7 @@ "recentchanges-submit": "أظهر", "rcfilters-tag-remove": "أزل '$1'", "rcfilters-legend-heading": "قائمة الاختصارات:", - "rcfilters-other-review-tools": "أدوات مراجعة أخرى", + "rcfilters-other-review-tools": "أدوات مراجعة أخرى", "rcfilters-group-results-by-page": "جمع النتائج حسب الصفحة", "rcfilters-grouping-title": "جمع", "rcfilters-activefilters": "المرشحات النشطة", diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json index 36c29a9224..3c81a63e20 100644 --- a/languages/i18n/ast.json +++ b/languages/i18n/ast.json @@ -1291,7 +1291,7 @@ "recentchanges-submit": "Amosar", "rcfilters-tag-remove": "Desanicia '$1'", "rcfilters-legend-heading": "Llista d'abreviatures:", - "rcfilters-other-review-tools": "Otres ferramientes de revisión", + "rcfilters-other-review-tools": "Otres ferramientes de revisión", "rcfilters-group-results-by-page": "Agrupar resultancies per páxina", "rcfilters-grouping-title": "Agrupamientu", "rcfilters-activefilters": "Filtros activos", diff --git a/languages/i18n/az.json b/languages/i18n/az.json index a1d37204cd..1e34a73b23 100644 --- a/languages/i18n/az.json +++ b/languages/i18n/az.json @@ -1008,7 +1008,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (həmçinin bax: [[Special:NewPages|yeni səhifələrin siyahısı]])", "recentchanges-submit": "Göstər", "rcfilters-legend-heading": "Abreviaturalar siyahısı:", - "rcfilters-other-review-tools": "Digər yoxlama alətləri", + "rcfilters-other-review-tools": "Digər yoxlama alətləri", "rcfilters-group-results-by-page": "Dəyişiklikləri səhifələrə görə qruplaşdır", "rcfilters-grouping-title": "Qruplaşdırma", "rcfilters-activefilters": "Aktiv filtrlər", diff --git a/languages/i18n/ba.json b/languages/i18n/ba.json index 0a78d13dc0..e78f50f985 100644 --- a/languages/i18n/ba.json +++ b/languages/i18n/ba.json @@ -1296,7 +1296,7 @@ "recentchanges-submit": "Күрһәтергә", "rcfilters-tag-remove": "'$1'юй", "rcfilters-legend-heading": "Ҡыҫҡартыуҙар теҙмәһе:", - "rcfilters-other-review-tools": "Тикшереүҙең башҡа ҡоралдары", + "rcfilters-other-review-tools": "Тикшереүҙең башҡа ҡоралдары", "rcfilters-group-results-by-page": "Төркөмдөң төрлө биттәге һөҙөмтәләре", "rcfilters-grouping-title": "Төркөмләштереү", "rcfilters-activefilters": "Әүҙем фильтрҙар", diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json index 5a86dd8cab..0f00fd9c1e 100644 --- a/languages/i18n/be-tarask.json +++ b/languages/i18n/be-tarask.json @@ -970,7 +970,7 @@ "prefs-editwatchlist-raw": "Рэдагаваць нефарматаваны сьпіс назіраньня", "prefs-editwatchlist-clear": "Ачысьціць ваш сьпіс назіраньня", "prefs-watchlist-days": "Колькасьць дзён для паказу ў сьпісе назіраньня:", - "prefs-watchlist-days-max": "(максымальна $1 {{PLURAL:$1|дзень|дні|дзён}})", + "prefs-watchlist-days-max": "Максымальна $1 {{PLURAL:$1|дзень|дні|дзён}}", "prefs-watchlist-edits": "Максымальная колькасьць зьменаў для паказу ў сьпісе назіраньня:", "prefs-watchlist-edits-max": "Максымальная колькасьць: 1000", "prefs-watchlist-token": "Сакрэтны ключ сьпісу назіраньня:", @@ -1290,7 +1290,7 @@ "recentchanges-submit": "Паказаць", "rcfilters-tag-remove": "Выдаліць «$1»", "rcfilters-legend-heading": "Сьпіс абрэвіятураў:", - "rcfilters-other-review-tools": "Іншыя інструмэнты праверкі", + "rcfilters-other-review-tools": "Іншыя інструмэнты праверкі", "rcfilters-group-results-by-page": "Групаваць вынікі паводле старонак", "rcfilters-grouping-title": "Групаваньне", "rcfilters-activefilters": "Актыўныя фільтры", @@ -1303,7 +1303,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|гадзіна|гадзіны|гадзінаў}}", "rcfilters-highlighted-filters-list": "Вылучана: $1", "rcfilters-quickfilters": "Захаваныя фільтры", - "rcfilters-quickfilters-placeholder-title": "Спасылкі яшчэ не захаваныя", + "rcfilters-quickfilters-placeholder-title": "Яшчэ няма захаваных фільтраў", "rcfilters-quickfilters-placeholder-description": "Каб захаваць налады вашага фільтру і выкарыстаць іх пазьней, націсьніце на выяву закладкі ў зоне актыўнага фільтру ніжэй.", "rcfilters-savedqueries-defaultlabel": "Захаваныя фільтры", "rcfilters-savedqueries-rename": "Перайменаваць", diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json index 5f49184478..709d33bb93 100644 --- a/languages/i18n/bg.json +++ b/languages/i18n/bg.json @@ -1267,7 +1267,7 @@ "recentchanges-submit": "Показване", "rcfilters-tag-remove": "Премахване на '$1'", "rcfilters-legend-heading": "Списък на съкращенията:", - "rcfilters-other-review-tools": "Други инструменти за проверка", + "rcfilters-other-review-tools": "Други инструменти за проверка", "rcfilters-group-results-by-page": "Групиране на резултатите по страница", "rcfilters-grouping-title": "Групиране", "rcfilters-activefilters": "Активни филтри", @@ -1344,6 +1344,8 @@ "rcfilters-filter-watchlist-watchednew-description": "Промени в страниците от списъка за наблюдение, които не сте посетили от извършването им.", "rcfilters-filter-watchlist-notwatched-label": "Извън списъка за наблюдение", "rcfilters-filter-watchlist-notwatched-description": "Всички, освен промените в страници от списъка за наблюдение.", + "rcfilters-filtergroup-watchlistactivity": "Активност по списъка за наблюдение", + "rcfilters-filter-watchlistactivity-unseen-label": "Невидяни промени", "rcfilters-filter-watchlistactivity-seen-label": "Видени промени", "rcfilters-filtergroup-changetype": "Вид на промяната", "rcfilters-filter-pageedits-label": "Редакции на страници", @@ -1368,12 +1370,15 @@ "rcfilters-view-namespaces-tooltip": "Филтриране на резултатите по именни пространства", "rcfilters-view-tags-tooltip": "Филтриране на резултатите по етикети на редакциите", "rcfilters-view-return-to-default-tooltip": "Назад към главното меню на филтрите", + "rcfilters-view-tags-help-icon-tooltip": "Научете повече за Етикетираните редакции", "rcfilters-liveupdates-button": "Обновявания на живо", "rcfilters-liveupdates-button-title-off": "Показване на новите промени в реално време", "rcfilters-watchlist-markseen-button": "Отбелязване на всички промени като видени", + "rcfilters-watchlist-edit-watchlist-button": "Редактиране на списъка за наблюдение", "rcfilters-preference-label": "Скриване на подобрената версия на Последни промени", "rcfilters-preference-help": "Премахва новия дизайн на интерфейса от 2017 г. и всички инструменти, добавени тогава и след това.", "rcnotefrom": "{{PLURAL:$5|Дадена е промяната|Дадени са промените}} от $3, $4 (до $1 показани).", + "rclistfromreset": "Нулиране на избора на дата", "rclistfrom": "Показване на промени, като се започва от $3 $2", "rcshowhideminor": "$1 на малки промени", "rcshowhideminor-show": "Показване", @@ -1489,6 +1494,9 @@ "uploaddisabledtext": "Качването на файлове е забранено.", "php-uploaddisabledtext": "Качванията на файлове са спрени в PHP.\nПроверете настройката file_uploads.", "uploadscripted": "Файлът съдържа HTML или скриптов код, който може да бъде погрешно интерпретиран от браузъра.", + "uploaded-script-svg": "Намерен е скриптов елемент „$1“ в качения SVG файл.", + "uploaded-hostile-svg": "Намерен е несигурен CSS в стиловия елемент на качения SVG файл.", + "uploaded-event-handler-on-svg": "Поставянето на event-handler атрибути $1=\"$2\" не е позволено в SVG файлове.", "uploadscriptednamespace": "Този SVG файл съдържа неправилно именно пространство „$1“", "uploadinvalidxml": "XML-кода в качения файл не може да бъде анализиран.", "uploadvirus": "Файлът съдържа вирус! Подробности: $1", @@ -1543,6 +1551,8 @@ "backend-fail-read": "Файлът $1 не може да бъде прочетен.", "backend-fail-create": "Файлът „$1“ не може да бъде съхранен.", "backend-fail-maxsize": "Файлът „$1“ не може да бъде съхранен, тъй като размерът му надвишава {{PLURAL:$2|един байт|$2 байт}}.", + "backend-fail-connect": "Не е възможно свързването към бекенда за съхранение „1“.", + "backend-fail-internal": "Възникна неизвестна грешка в бекенда за съхранение „1“.", "zip-file-open-error": "Възникна грешка при отваряне на файла за проверка на ZIP.", "zip-wrong-format": "Указаният файл не е ZIP файл.", "zip-bad": "Файлът е повреден или е нечетим ZIP файл.\nСигурността му не може да бъде проверена.", @@ -1666,6 +1676,7 @@ "listredirects": "Списък на пренасочванията", "listduplicatedfiles": "Списък на повтарящи се файлове", "listduplicatedfiles-summary": "Това е списък на файловете, за които последната версия е дубликат с последната версия на друг файл. Показани са само локалните файлове.", + "listduplicatedfiles-entry": "[[:File:$1|$1]] има [[$3|{{PLURAL:$2|дубликат|$2 дубликата}}]].", "unusedtemplates": "Неизползвани шаблони", "unusedtemplatestext": "Тази страница съдържа списък на страниците в именно пространство {{ns:template}}, които не са включени в друга страница. Проверявайте за препратки към отделните шаблони преди да ги изтриете или предложите за изтриване.", "unusedtemplateswlh": "други препратки", @@ -1697,6 +1708,7 @@ "pageswithprop-legend": "Страници с page property", "pageswithprop-text": "На тази страница са показани всички страници, които използват page property.", "pageswithprop-prop": "Име на свойството:", + "pageswithprop-reverse": "Подреждане в обратен ред", "pageswithprop-submit": "Отваряне", "doubleredirects": "Двойни пренасочвания", "doubleredirectstext": "Тази страница съдържа списък със страници, които пренасочват към друга пренасочваща страница.\nВсеки ред съдържа препратки към първото и второто пренасочване, както и целта на второто пренасочване, която обикновено е „истинската“ целева страница, към която първото пренасочване би трябвало да сочи.\nЗадрасканите записи са коригирани.", @@ -1810,6 +1822,8 @@ "apisandbox-dynamic-parameters-add-label": "Добавяне на параметър:", "apisandbox-dynamic-parameters-add-placeholder": "Име на параметъра", "apisandbox-dynamic-error-exists": "Параметър с име „$1“ вече съществува.", + "apisandbox-deprecated-parameters": "Остарели параметри", + "apisandbox-fetch-token": "Автоматично попълване на маркера", "apisandbox-submit-invalid-fields-title": "Някои полета са невалидни", "apisandbox-submit-invalid-fields-message": "Моля, поправете маркираните полета и опитайте пак.", "apisandbox-results": "Резултати", @@ -1818,6 +1832,8 @@ "apisandbox-request-url-label": "URL-адрес на заявката:", "apisandbox-request-json-label": "JSON заявка:", "apisandbox-request-time": "Време на заявката: {{PLURAL:$1|$1 ms}}", + "apisandbox-alert-page": "Полета на тази страница не са валидни.", + "apisandbox-alert-field": "Стойността на това поле не е валидна.", "apisandbox-continue": "Продължаване", "apisandbox-continue-clear": "Изчистване", "apisandbox-multivalue-all-namespaces": "$1 (Всички именни пространства)", @@ -1827,6 +1843,7 @@ "booksources-search": "Търсене", "booksources-text": "По-долу е списъкът от връзки към други сайтове, продаващи нови и използвани книги или имащи повече информация за книгите, които търсите:", "booksources-invalid-isbn": "Предоставеният ISBN изглежда е невалиден; проверете за грешки и копирайте от оригиналния източник.", + "magiclink-tracking-rfc": "Страници, използващи вълшебни препратки RFC", "magiclink-tracking-pmid": "Страници, използващи вълшебни препратки PMID", "magiclink-tracking-pmid-desc": "Тази страница използва вълшебни препратки PMID. Вижте [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links mediawiki.org] как да ги пренесете.", "magiclink-tracking-isbn": "Страници, използващи вълшебни препратки ISBN", @@ -1911,6 +1928,7 @@ "trackingcategories-msg": "Категория за проследяване", "trackingcategories-name": "Име на съобщението", "trackingcategories-desc": "Критерий за включване на категория", + "restricted-displaytitle-ignored": "Страници с игнорирани заглавия за показване", "trackingcategories-nodesc": "Няма налично описание.", "trackingcategories-disabled": "Категорията е деактивирана", "mailnologin": "Няма електронна поща", @@ -2045,9 +2063,12 @@ "changecontentmodel-submit": "Променяне", "changecontentmodel-success-title": "Моделът на съдържанието беше променен", "changecontentmodel-success-text": "Типът на съдържанието на [[:$1]] е успешно променен.", + "changecontentmodel-emptymodels-title": "Не са налични модели на съдържание", + "changecontentmodel-emptymodels-text": "Съдържанието в [[:$1]] не може да бъде превърнато в никакъв тип.", "log-name-contentmodel": "Дневник на промените на модела на съдържанието", "log-description-contentmodel": "Страницата показва промените в модела на съдържанието на страниците и страниците, създадени с модел на съдържанието различен от този по подразбиране.", "logentry-contentmodel-new": "$1 {{GENDER:$2|създаде}} страницата $3, използвайки модел на съдържанието „$5“, който не е по подразбиране", + "logentry-contentmodel-change": "$1 {{GENDER:$2|промени}} модела на съдържание на страница $3 от „$4“ на „$5“", "logentry-contentmodel-change-revertlink": "връщане", "logentry-contentmodel-change-revert": "връщане", "protectlogpage": "Дневник на защитата", @@ -2238,7 +2259,9 @@ "blocklist": "Блокирани потребители", "autoblocklist": "Автоматични блокирания", "autoblocklist-submit": "Търсене", + "autoblocklist-legend": "Списък на автоматични блокирания", "autoblocklist-localblocks": "{{PLURAL:$1|Локално автоматично блокиране|Локални автоматични блокирания}}", + "autoblocklist-total-autoblocks": "Общ брой автоматични блокирания: $1", "autoblocklist-empty": "Списъкът на автоматичните блокирания е празен.", "ipblocklist": "Блокирани потребители", "ipblocklist-legend": "Търсене на блокиран потребител", @@ -2297,6 +2320,7 @@ "ipb_blocked_as_range": "Грешка: IP-адресът $1 не може да бъде разблокиран, тъй като е част от блокирания регистър $2. Можете да разблокирате адреса, като разблокирате целия регистър.", "ip_range_invalid": "Невалиден интервал за IP-адреси.", "ip_range_toolarge": "Забранено е блокиране на диапазони от IP адреси по-големи от /$1.", + "ip_range_exceeded": "IP диапазонът превишава максималния диапазон. Позволен диапазон: /$1.", "proxyblocker": "Блокировач на проксита", "proxyblockreason": "IP-адресът ви беше блокиран, тъй като е анонимно достъпен междинен сървър. Свържете се с доставчика ви на интернет и го информирайте за този сериозен проблем в сигурността.", "sorbsreason": "IP-адресът ви е записан като анонимно достъпен междинен сървър в DNSBL на {{SITENAME}}.", @@ -3102,6 +3126,7 @@ "watchlisttools-edit": "Преглед и редактиране на списъка за наблюдение", "watchlisttools-raw": "Редактиране на необработения списък за наблюдение", "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|беседа]])", + "timezone-local": "Местно", "duplicate-defaultsort": "Внимание: Ключът за сортиране по подразбиране „$2“ отменя по-ранния ключ „$1“.", "version": "Версия", "version-extensions": "Инсталирани разширения", @@ -3187,6 +3212,7 @@ "tag-filter": "Филтър на [[Special:Tags|етикета]]:", "tag-filter-submit": "Филтриране", "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Етикет|Етикети}}]]: $2)", + "tag-mw-contentmodelchange": "промяна на модела на съдържание", "tags-title": "Етикети", "tags-intro": "Тук са изброени всички етикети, които могат да се ползват за отбелязване на редакциите, както и тяхното значение.", "tags-tag": "Име на етикета", @@ -3236,12 +3262,20 @@ "tags-deactivate-reason": "Причина:", "tags-deactivate-not-allowed": "Деактивирането на етикет „$1“ не е възможно.", "tags-deactivate-submit": "Деактивиране", + "tags-apply-no-permission": "Нямате права да прилагате етикети за промени заедно с промените си.", + "tags-apply-blocked": "Не може да прилагате етикети за промени, докато сте {{GENDER:$1|блокирани}}.", + "tags-apply-not-allowed-one": "Не е позволено етикетът „$1“ да бъде прилаган ръчно.", + "tags-apply-not-allowed-multi": "Не е позволено {{PLURAL:$2|следният етикет да бъде ръчно променен|следните етикети да бъдат ръчно променени}}: $1", "tags-update-no-permission": "Нямате права за добавяне или премахване на етикети от индивидуални версии или дневници.", + "tags-update-blocked": "Не може да добавяте или премахвате етикети за промени, докато сте {{GENDER:$1|блокирани}}.", + "tags-update-add-not-allowed-one": "Не е позволено етикетът „$1“ да бъде ръчно добавян.", + "tags-update-remove-not-allowed-one": "Не е позволено етикетът „$1“ да бъде премахван.", "tags-edit-title": "Редактиране на етикетите", "tags-edit-manage-link": "Управление на етикетите", "tags-edit-revision-selected": "{{PLURAL:$1|Избрана версия|Избрани версии}} от [[:$2]]:", "tags-edit-logentry-selected": "{{PLURAL:$1|Избрано събитие|Избрани събития}}:", "tags-edit-revision-legend": "Добавяне или премахване на етикети от {{PLURAL:$1|тази редакция|всичките $1 редакции}}", + "tags-edit-logentry-legend": "Добавяне или променяне на етикети {{PLURAL:$1|в този запис в дневника|във всички $1 записи в дневника}}", "tags-edit-existing-tags": "Съществуващи етикети:", "tags-edit-existing-tags-none": "Няма", "tags-edit-new-tags": "Нови етикети:", @@ -3249,8 +3283,10 @@ "tags-edit-remove": "Премахнете тези етикети:", "tags-edit-remove-all-tags": "(изтриване на всички етикети)", "tags-edit-chosen-placeholder": "Избиране на няколко етикета", + "tags-edit-chosen-no-results": "Не са открити съответстващи етикети", "tags-edit-reason": "Причина:", "tags-edit-revision-submit": "Прилагане на промените към {{PLURAL:$1|тази редакция|$1 редакции}}", + "tags-edit-logentry-submit": "Прилагане на промените към {{PLURAL:$1|този запис в дневника|$1 записи в дневника}}", "tags-edit-success": "Промените са приложени.", "tags-edit-failure": "Промените не могат да бъдат приложени:\n$1", "tags-edit-nooldid-title": "Не е зададена версия", @@ -3265,6 +3301,7 @@ "compare-title-not-exists": "Посоченото заглавие не съществува.", "compare-revision-not-exists": "Посочената версия не съществува.", "diff-form": "'''формуляр'''", + "diff-form-submit": "Показване на разликите", "permanentlink": "Постоянна препратка", "permanentlink-revid": "ID на редакцията", "permanentlink-submit": "Към редакцията", @@ -3295,8 +3332,15 @@ "htmlform-time-placeholder": "ЧЧ:ММ:СС", "htmlform-datetime-placeholder": "ГГГГ-ММ-ДД ЧЧ:ММ:СС", "htmlform-date-invalid": "Избраната от вас стойност за дата не е разпозната. Опитайте да използвате формат ГГГГ-ММ-ДД.", + "htmlform-time-invalid": "Стойността, която сте уточнили, не е разпозната. Опитайте да използвате формат ЧЧ:ММ:СС.", "htmlform-datetime-invalid": "Избраната от вас стойност за дата не е разпозната. Опитайте да използвате формат ГГГГ-ММ-ДД ЧЧ:ММ:СС.", + "htmlform-date-toolow": "Стойността, която сте уточнили, е по-рано от най-ранната позволена дата $1.", + "htmlform-date-toohigh": "Стойността, която сте уточнили, е след най-късната позволена дата $1.", + "htmlform-time-toolow": "Стойността, която сте уточнили, е преди най-ранното позволено време $1.", + "htmlform-time-toohigh": "Стойността, която сте уточнили, е след най-късното позволено време $1.", + "htmlform-datetime-toolow": "Стойността, която сте уточнили, е преди най-ранните позволени дата и час $1.", "htmlform-title-badnamespace": "[[:$1]] не е в именното пространство „{{ns:$2}}“.", + "htmlform-title-not-creatable": "Заглавието „$1“ не може да бъде създадено", "htmlform-title-not-exists": "$1 не съществува.", "htmlform-user-not-exists": "$1 не съществува.", "htmlform-user-not-valid": "$1 не е валидно потребителско име.", @@ -3325,6 +3369,10 @@ "logentry-block-reblock": "$1 {{GENDER:$2|промени }} настройките на блокиране на {{GENDER:$4|$3}} със срок на изтичане $5 $6", "logentry-suppress-block": "$1 {{GENDER:$2|блокира}} {{GENDER:$4|$3}} със срок на изтичане $5 $6", "logentry-suppress-reblock": "$1 {{GENDER:$2|промени}} настройките на блокиране на {{GENDER:$4|$3}} със срок на изтичане $5 $6", + "logentry-import-upload": "$1 {{GENDER:$2|внесе}} $3 чрез качване на файл", + "logentry-import-upload-details": "$1 {{GENDER:$2|внесе}} $3 чрез качване на файл ($4 {{PLURAL:$4|редакция|редакции}})", + "logentry-import-interwiki": "$1 {{GENDER:$2|внесе}} $3 от друго уики", + "logentry-import-interwiki-details": "$1 {{GENDER:$2|внесе}} $3 от $5 ($4 {{PLURAL:$4|редакция|редакции}})", "logentry-merge-merge": "$1 {{GENDER:$2|сля}} $3 с $4 (редакции до $5)", "logentry-move-move": "$1 {{GENDER:$2|премести}} страница „$3“ като „$4“", "logentry-move-move-noredirect": "$1 {{GENDER:$2|премести}} страницата „$3“ като „$4“ без пренасочване", @@ -3338,6 +3386,7 @@ "logentry-newusers-byemail": "$1 {{GENDER:$2|създаде}} потребителската сметка $3, като паролата за нея беше изпратена по е-поща", "logentry-newusers-autocreate": "Сметката $1 беше {{GENDER:$2|създадена}} автоматично", "logentry-protect-move_prot": "$1 {{GENDER:$2|премести}} настройките на защита от $4 на $3", + "logentry-protect-unprotect": "$1 {{GENDER:$2|премахна}} защитата от $3", "logentry-protect-protect": "\n$1 {{GENDER:$2|защити}} $3 $4", "logentry-protect-protect-cascade": "$1 {{GENDER:$2|защити}} $3 $4 [каскадно]", "logentry-protect-modify": "$1 {{GENDER:$2|промени}} нивото на защита на $3 $4", @@ -3358,7 +3407,12 @@ "log-description-tag": "Тази страница показва, кога потребителите са добавили или премахнали [[Special:Tags|етикети]] от отделни версии или записи. Списъкът не включва подобни действия, когато те се появяват, като част от процеса на редактиране, изтриване или подобни действия.", "logentry-tag-update-add-revision": "$1 {{GENDER:$2|добави}} {{PLURAL:$7|етикета|етикетите}} $6 към редакция $4 на страница $3", "logentry-tag-update-add-logentry": "$1 {{GENDER:$2|добави}} {{PLURAL:$7|етикета|етикетите}} $6 към записа в дневника $5 на страница $3", + "logentry-tag-update-remove-revision": "$1 {{GENDER:$2|премахна}} {{PLURAL:$9|етикета|етикетите}} $8 от редакция $4 на страница $3", + "logentry-tag-update-remove-logentry": "$1 {{GENDER:$2|премахна}} {{PLURAL:$9|етикета|етикетите}} $8 от запис в дневника $5 на страница $3", + "logentry-tag-update-revision": "$1 {{GENDER:$2|обнови}} етикети на редакция $4 на страница $3 ({{PLURAL:$7|добавени}} $6; {{PLURAL:$9|премахнати}} $8)", + "logentry-tag-update-logentry": "$1 {{GENDER:$2|обнови}} етикети в запис в дневника $5 на страница $3 ({{PLURAL:$7|добавени}} $6; {{PLURAL:$9|премахнати}} $8)", "rightsnone": "(никакви)", + "rightslogentry-temporary-group": "$1 (временно, до $2)", "feedback-adding": "Добавяне на коментар към страницата...", "feedback-back": "Обратно", "feedback-bugcheck": "Страхотно! Само проверете дали това не сред вече [$1 докладваните грешки].", @@ -3366,6 +3420,7 @@ "feedback-bugornote": "Ако сте готови подробно да опишете технически проблем, моля [$1 докладвайте го тук].\nВ противен случай, можете да използвате лесния формуляр по-долу. Коментарът ви ще бъде добавен към страницата „[$3 $2]“, наред с вашето потребителско име.", "feedback-cancel": "Отказване", "feedback-close": "Готово", + "feedback-dialog-title": "Изпращане на обратна връзка", "feedback-error1": "Грешка: Неразпознат резултат от API", "feedback-error2": "Грешка: Неуспешна редакция", "feedback-error3": "Грешка: Няма отговор от API", @@ -3515,6 +3570,8 @@ "log-action-filter-upload-upload": "Ново качване", "log-action-filter-upload-overwrite": "Повторно качване", "authmanager-create-disabled": "Създаването на сметки е изключено.", + "authmanager-create-from-login": "За да създадете сметка, моля попълнете полетата.", + "authmanager-authplugin-setpass-failed-title": "Промяната на паролата е неуспешна", "authmanager-authplugin-setpass-bad-domain": "Невалиден домейн.", "authmanager-userdoesnotexist": "Няма регистрирана потребителска сметка за „$1“.", "authmanager-retype-help": "Парола (повторно) за потвърждение.", @@ -3524,7 +3581,9 @@ "authmanager-realname-help": "Истинско име на потребителя", "authmanager-provider-temporarypassword": "Временна парола", "authprovider-resetpass-skip-label": "Пропускане", + "authform-newtoken": "Липсва маркер. $1", "authform-notoken": "Липсва маркер", + "authform-wrongtoken": "Грешен маркер", "specialpage-securitylevel-not-allowed-title": "Не е позволено", "cannotauth-not-allowed-title": "Достъпът е отказан", "cannotauth-not-allowed": "Не ви е позволено да използвате тази страница", diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json index cdf953d906..f225e7dc35 100644 --- a/languages/i18n/bn.json +++ b/languages/i18n/bn.json @@ -1031,7 +1031,7 @@ "timezoneregion-europe": "ইউরোপ", "timezoneregion-indian": "ভারত মহাসাগর", "timezoneregion-pacific": "প্রশান্ত মহাসাগর", - "allowemail": "অন্য ব্যবহারকারীদেরকে আপনাকে ই-মেইল পাঠানোর অনুমতি দিন।", + "allowemail": "অন্য ব্যবহারকারীদেরকে আমাকে ইমেল করতে অনুমতি দিন", "email-blacklist-label": "আমাকে ইমেইল পাঠানো থেকে এই ব্যবহারকারীদের বিরত রাখুন:", "prefs-searchoptions": "অনুসন্ধান", "prefs-namespaces": "নামস্থানসমূহ", @@ -1312,7 +1312,7 @@ "recentchanges-submit": "দেখাও", "rcfilters-tag-remove": "'$1' সরান", "rcfilters-legend-heading": "সংক্ষিপ্ত রূপের তালিকা:", - "rcfilters-other-review-tools": "অন্যান্য পর্যালোচনা সরঞ্জাম", + "rcfilters-other-review-tools": "অন্যান্য পর্যালোচনা সরঞ্জাম", "rcfilters-group-results-by-page": "পাতা অনুযায়ী দলের ফলাফল", "rcfilters-grouping-title": "দলবদ্ধ", "rcfilters-activefilters": "সক্রিয় ছাঁকনিসমূহ", @@ -1325,7 +1325,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|ঘণ্টা}}", "rcfilters-highlighted-filters-list": "আলোকপাতাকৃত: $1", "rcfilters-quickfilters": "সংরক্ষিত ছাঁকনি", - "rcfilters-quickfilters-placeholder-title": "এখনো কোন সংযোগ সংরক্ষণ হয়নি", + "rcfilters-quickfilters-placeholder-title": "এখনো কোন ছাঁকনি সংরক্ষণ হয়নি", "rcfilters-quickfilters-placeholder-description": "আপনার ছাঁকনির সেটিং সংরক্ষণ করতে ও পরে পুনরায় ব্যবহার করতে, নীচে, সক্রিয় ছাঁকনি এলাকায় বুকমার্ক আইকনে ক্লিক করুন।", "rcfilters-savedqueries-defaultlabel": "ছাঁকনি সংরক্ষণ", "rcfilters-savedqueries-rename": "নামান্তর", diff --git a/languages/i18n/bs.json b/languages/i18n/bs.json index 10a08cebc7..424536d3ee 100644 --- a/languages/i18n/bs.json +++ b/languages/i18n/bs.json @@ -1297,7 +1297,7 @@ "recentchanges-submit": "Prikaži", "rcfilters-tag-remove": "Ukloni '$1'", "rcfilters-legend-heading": "Spisak skraćenica:", - "rcfilters-other-review-tools": "Drugi alati za pregled", + "rcfilters-other-review-tools": "Drugi alati za pregled", "rcfilters-group-results-by-page": "Grupiraj rezultate po stranicama", "rcfilters-grouping-title": "Grupiranje", "rcfilters-activefilters": "Aktivni filteri", diff --git a/languages/i18n/ca.json b/languages/i18n/ca.json index beb930c37e..8e5f5ecd2f 100644 --- a/languages/i18n/ca.json +++ b/languages/i18n/ca.json @@ -1339,7 +1339,7 @@ "recentchanges-legend-plusminus": "(''±123'')", "recentchanges-submit": "Mostra", "rcfilters-legend-heading": "Llista d'abreviatures:", - "rcfilters-other-review-tools": "Altres eines de supervisió", + "rcfilters-other-review-tools": "Altres eines de supervisió", "rcfilters-group-results-by-page": "Agrupa els resultats per pàgina", "rcfilters-grouping-title": "Agrupació", "rcfilters-activefilters": "Filtres actius", diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json index f53ded7ea3..8d836c2c30 100644 --- a/languages/i18n/ce.json +++ b/languages/i18n/ce.json @@ -1147,7 +1147,7 @@ "recentchanges-legend-heading": "Легенда: ", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (хьажа кхин [[Special:NewPages|керла агӀонийн могӀа]])", "recentchanges-submit": "Гайта", - "rcfilters-other-review-tools": "Талларан кхин гӀирсаш", + "rcfilters-other-review-tools": "Талларан кхин гӀирсаш", "rcfilters-group-results-by-page": "Карийнарш, агӀонгахь тобанаш ян", "rcfilters-grouping-title": "Тобанашца нисъяр", "rcfilters-activefilters": "Жигара литтарш", diff --git a/languages/i18n/ckb.json b/languages/i18n/ckb.json index 4b4cf9f7fe..ff67d240b0 100644 --- a/languages/i18n/ckb.json +++ b/languages/i18n/ckb.json @@ -1160,7 +1160,7 @@ "recentchanges-legend-plusminus": "(''±۱٢٣'')", "recentchanges-submit": "نیشانی بدە", "rcfilters-legend-heading": "پێرستی ناوبڕەکان:", - "rcfilters-other-review-tools": "ئامرازەکانی تری بەسەرداچوونەوە", + "rcfilters-other-review-tools": "ئامرازەکانی تری بەسەرداچوونەوە", "rcfilters-activefilters": "پاڵێوەرە چالاکەکان", "rcfilters-advancedfilters": "پاڵوێنە پێشکەوتووەکان", "rcfilters-limit-shownum": "پیشاندانی دوایین $1 دەستکاری", diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json index f45411a15f..7939fdd839 100644 --- a/languages/i18n/cs.json +++ b/languages/i18n/cs.json @@ -1313,7 +1313,7 @@ "recentchanges-submit": "Zobrazit", "rcfilters-tag-remove": "Odebrat '$1'", "rcfilters-legend-heading": "Seznam zkratek:", - "rcfilters-other-review-tools": "Další kontrolní nástroje", + "rcfilters-other-review-tools": "Další kontrolní nástroje", "rcfilters-group-results-by-page": "Seskupit výsledky podle stránky", "rcfilters-grouping-title": "Seskupování", "rcfilters-activefilters": "Aktivní filtry", @@ -1326,7 +1326,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|hodina|hodiny|hodin}}", "rcfilters-highlighted-filters-list": "Zvýrazněno: $1", "rcfilters-quickfilters": "Uložené filtry", - "rcfilters-quickfilters-placeholder-title": "Zatím neuloženy žádné odkazy", + "rcfilters-quickfilters-placeholder-title": "Zatím neuloženy žádné filtry", "rcfilters-quickfilters-placeholder-description": "Pokud chcete uložit svá nastavení filtrů a použít je později, klikněte na ikonku záložky v ploÅ¡e aktivních filtrů níže.", "rcfilters-savedqueries-defaultlabel": "Uložené filtry", "rcfilters-savedqueries-rename": "Přejmenovat", diff --git a/languages/i18n/cy.json b/languages/i18n/cy.json index 85449b7d2e..386bc5b5a1 100644 --- a/languages/i18n/cy.json +++ b/languages/i18n/cy.json @@ -70,7 +70,6 @@ "underline-never": "Byth", "underline-default": "Rhagosodyn y porwr neu'r wedd", "editfont-style": "Arddull y ffont yn y blwch golygu:", - "editfont-default": "Rhagosodyn y porwr", "editfont-monospace": "Ffont unlled", "editfont-sansserif": "Sans-seriff", "editfont-serif": "Seriff", @@ -654,7 +653,6 @@ "explainconflict": "Mae rhywun arall wedi newid y dudalen hon ers i chi ddechrau ei golygu hi.\nMae'r blwch testun uchaf yn cynnwys testun y dudalen fel y mae hi rwan.\nMae eich newidiadau chi yn ymddangos yn y blwch testun isaf.\nBydd yn rhaid i chi gyfuno eich newidiadau chi a'r testun sydd yn bodoli eisoes.\n'''Dim ond''' y testun yn y blwch testun '''uchaf''' fydd yn cael ei roi ar gadw pan wasgwch y botwm \"$1\".", "yourtext": "Eich testun", "storedversion": "Y golygiad diweddaraf yn y storfa", - "nonunicodebrowser": "'''RHYBUDD: Nid yw eich porwr yn cydymffurfio ag Unicode. Serch hyn, mae modd i chi olygu tudalennau: bydd nodau sydd ddim yn rhan o ASCII yn ymddangos yn y blwch golygu fel codau hecsadegol.'''", "editingold": "'''RHYBUDD: Rydych chi'n golygu hen ddiwygiad o'r dudalen hon. Os caiff ei chadw, bydd unrhyw newidiadau diweddarach yn cael eu colli.'''", "yourdiff": "Gwahaniaethau", "copyrightwarning": "Mae pob cyfraniad i {{SITENAME}} yn cael ei ryddhau o dan termau'r Drwydded Ddogfen Rhydd ($2) (gwelwch $1 am fanylion). Os nad ydych chi'n fodlon i'ch gwaith gael ei olygu heb drugaredd, neu i gopïau ymddangos ar draws y we, peidiwch a'i gyfrannu yma.
\nRydych chi'n cadarnhau mai chi yw awdur y cyfraniad, neu eich bod chi wedi'i gopïo o'r parth cyhoeddus (''public domain'') neu rywle rhydd tebyg. '''Nid''' yw'r mwyafrif o wefannau yn y parth cyhoeddus.\n\n'''PEIDIWCH Â CHYFRANNU GWAITH O DAN HAWLFRAINT HEB GANIATÂD!'''", @@ -1252,7 +1250,7 @@ "recentchanges-legend-plusminus": "(''±123'')", "recentchanges-submit": "Dangos", "rcfilters-legend-heading": "Rhestr o fyrfoddau:", - "rcfilters-other-review-tools": "Teclynau adolygu eraill", + "rcfilters-other-review-tools": "Teclynau adolygu eraill", "rcfilters-group-results-by-page": "Canlyniadau'r grwp bob yn ddalen", "rcfilters-grouping-title": "Grwpio", "rcfilters-activefilters": "Hidlau sydd ar waith", @@ -2170,7 +2168,6 @@ "block": "Rhwystro defnyddiwr", "unblock": "Dad-rwystro defnyddiwr", "blockip": "Rhwystro'r {{GENDER:$1|defnyddiwr}}", - "blockip-legend": "Rhwystro'r defnyddiwr", "blockiptext": "Defnyddiwch y ffurflen hon i rwystro cyfeiriad IP neu ddefnyddiwr rhag ysgrifennu i'r gronfa ddata. \nDylech chi ddim ond gwneud hyn er mwyn rhwystro fandaliaeth, a chan ddilyn [[{{MediaWiki:Policy-url}}|polisi'r wici]]. \nRhowch reswm dros rwystro'r defnyddiwr (er enghraifft, dywedwch pa dudalen(au) a fandaleiddiwyd).", "ipaddressorusername": "Cyfeiriad IP neu enw defnyddiwr:", "ipbexpiry": "Am gyfnod:", diff --git a/languages/i18n/da.json b/languages/i18n/da.json index 47209c5212..382d0123fd 100644 --- a/languages/i18n/da.json +++ b/languages/i18n/da.json @@ -578,6 +578,7 @@ "botpasswords-updated-body": "Robottens adgangskode for robotnavn »$1« for brugeren »$2« blev opdateret.", "botpasswords-deleted-title": "Bot kodeord slettet", "botpasswords-deleted-body": "Robottens adgangskode for robotnavn »$1« for brugeren »$2« blev slettet.", + "botpasswords-not-exist": "Brugeren »$1« har ikke en robotadgangskode navngivet »$2«.", "resetpass_forbidden": "Adgangskoder kan ikke ændres", "resetpass_forbidden-reason": "Adgangskoder kan ikke ændres: $1", "resetpass-no-info": "Du skal være logget på for at komme direkte til denne side.", @@ -738,7 +739,8 @@ "permissionserrorstext": "Du har ikke rettigheder til at gennemføre denne handling, {{PLURAL:$1|årsagen|årsagerne}} er:", "permissionserrorstext-withaction": "Du har ikke rettigheder til at $2 af følgende {{PLURAL:$1|grund|grunde}}:", "recreate-moveddeleted-warn": "'''Advarsel: Du er ved at genskabe en tidligere slettet side.'''\n\nOvervej om det er passende at genoprette siden. Sletnings- og flytteloggerne for siden er vist nedenfor.", - "moveddeleted-notice": "Denne side er blevet slettet.\nSletnings- og flytteloggerne for siden er vist nedenfor.", + "moveddeleted-notice": "Denne side er blevet slettet.\nSletnings-, beskyttelses- og flytteloggene for siden er vist nedenfor.", + "moveddeleted-notice-recent": "Beklager, denne side er for nylig blevet slettet (i løbet af de sidste 24 timer).\nSlette-, beskyttelses- og flytteloggene for siden er vist nedenfor.", "log-fulllog": "Vis fuldstændig log", "edit-hook-aborted": "Redigering afbrudt af en programfunktion. Ingen tilknyttet forklaring.", "edit-gone-missing": "Kunne ikke opdatere siden.\nDen ser du til at være slettet.", @@ -902,6 +904,9 @@ "mergehistory-fail-bad-timestamp": "Tidsangivelsen er ugyldig.", "mergehistory-fail-invalid-source": "Kildesiden er ugyldig.", "mergehistory-fail-invalid-dest": "Målsiden er ugyldigt.", + "mergehistory-fail-permission": "Utilstrækkelige tilladelser for at flette historik.", + "mergehistory-fail-self-merge": "Kilde- og destinationssider er ens.", + "mergehistory-fail-timestamps-overlap": "Kilderevisioner overlapper eller kommer efter destinationsrevisioner.", "mergehistory-fail-toobig": "Ude af stand til at flette historiken sammen, fordi flere end grænsen på $1 {{PLURAL:$1|version|versioner}} ville blive flyttet.", "mergehistory-no-source": "Kildesiden $1 findes ikke.", "mergehistory-no-destination": "Destinationssiden $1 findes ikke.", @@ -957,6 +962,7 @@ "search-category": "(kategorien $1)", "search-file-match": "(svarer til filens indhold)", "search-suggest": "Mente du: $1", + "search-rewritten": "Viser resultater for $1. Søg i stedet efter $2.", "search-interwiki-caption": "Resultater fra søsterprojekter", "search-interwiki-default": "Resultater fra $1:", "search-interwiki-more": "(mere)", @@ -968,6 +974,7 @@ "showingresultsinrange": "Herunder vises op til {{PLURAL:$1|1 resultat|$1 resultater}} fra nummer $2 til nummer $3.", "search-showingresults": "{{PLURAL:$4|Resultat $1 af $3|Resultat $1 - $2 af $3}}", "search-nonefound": "Søgningen gav ingen resultater.", + "search-nonefound-thiswiki": "Der var ingen resultater matchende forespørgslen på denne side.", "powersearch-legend": "Avanceret søgning", "powersearch-ns": "Søg i navnerummene:", "powersearch-togglelabel": "Marker:", @@ -1036,7 +1043,8 @@ "timezoneregion-europe": "Europa", "timezoneregion-indian": "Indiske Ocean", "timezoneregion-pacific": "Stillehavet", - "allowemail": "Tillad e-mail fra andre brugere", + "allowemail": "Tillad at andre brugere sender mig beskeder", + "email-blacklist-label": "Forbyd disse brugere i at sende mig beskeder:", "prefs-searchoptions": "Søg", "prefs-namespaces": "Navnerum", "default": "standard", @@ -1078,6 +1086,7 @@ "prefs-editor": "Redigeringsprogrammet", "prefs-preview": "Forhåndsvisning", "prefs-advancedrc": "Avancerede indstillinger", + "prefs-opt-out": "Vælg ikke at få forbedringer", "prefs-advancedrendering": "Avancerede indstillinger", "prefs-advancedsearchoptions": "Avancerede indstillinger", "prefs-advancedwatchlist": "Avancerede indstillinger", @@ -1312,7 +1321,7 @@ "recentchanges-submit": "Vis", "rcfilters-tag-remove": "Fjern »$1«", "rcfilters-legend-heading": "Liste over forkortelser:", - "rcfilters-other-review-tools": "Andre gennemgangsværktøjer", + "rcfilters-other-review-tools": "Andre gennemgangsværktøjer", "rcfilters-group-results-by-page": "Grupper resultater efter side", "rcfilters-grouping-title": "Gruppering", "rcfilters-activefilters": "Aktive filtre", @@ -2039,7 +2048,7 @@ "unwatchthispage": "Fjern overvågning", "notanarticle": "Ikke en artikel", "notvisiblerev": "Versionen er blevet slettet", - "watchlist-details": "Du har {{PLURAL:$1|$1 side|$1 sider}} på din overvågningsliste (uden at medregne diskussionssider).", + "watchlist-details": "{{PLURAL:$1|$1 side er|$1 sider er}} på din overvågningsliste (plus diskussionssider).", "wlheader-enotif": "E-mail-underretning er slået til.", "wlheader-showupdated": "Sider, der er ændret siden dit sidste besøg, er vist med '''fed skrift'''.", "wlnote": "Nedenfor ses {{PLURAL:$1|den seneste ændring|de seneste $1 ændringer}} i {{PLURAL:$2|den sidste time|de sidste $2 timer}} op til den $3 kl. $4.", diff --git a/languages/i18n/de.json b/languages/i18n/de.json index b8915d713c..8835aa467a 100644 --- a/languages/i18n/de.json +++ b/languages/i18n/de.json @@ -1370,7 +1370,7 @@ "recentchanges-submit": "Anzeigen", "rcfilters-tag-remove": "„$1“ entfernen", "rcfilters-legend-heading": "Liste von Abkürzungen:", - "rcfilters-other-review-tools": "Andere Überprüfungswerkzeuge", + "rcfilters-other-review-tools": "Andere Überprüfungswerkzeuge", "rcfilters-group-results-by-page": "Ergebnisse nach Seite gruppieren", "rcfilters-grouping-title": "Gruppierung", "rcfilters-activefilters": "Aktive Filter", @@ -1383,7 +1383,7 @@ "rcfilters-days-show-hours": "{{PLURAL:$1|Eine Stunde|$1 Stunden}}", "rcfilters-highlighted-filters-list": "Hervorgehoben: $1", "rcfilters-quickfilters": "Gespeicherte Filter", - "rcfilters-quickfilters-placeholder-title": "Noch keine Links gespeichert", + "rcfilters-quickfilters-placeholder-title": "Noch keine Filter gespeichert", "rcfilters-quickfilters-placeholder-description": "Um deine Filtereinstellungen zu speichern und später erneut zu verwenden, klicke unten auf das Lesezeichensymbol im Bereich der aktiven Filter.", "rcfilters-savedqueries-defaultlabel": "Gespeicherte Filter", "rcfilters-savedqueries-rename": "Umbenennen", diff --git a/languages/i18n/el.json b/languages/i18n/el.json index fefe514fcf..9addae6d14 100644 --- a/languages/i18n/el.json +++ b/languages/i18n/el.json @@ -1310,7 +1310,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (δείτε [[Special:NewPages|κατάλογος νέων σελίδων]])", "recentchanges-legend-plusminus": "(±123)", "recentchanges-submit": "Προβολή", - "rcfilters-other-review-tools": "Άλλα εργαλεία επιθεώρησης", + "rcfilters-other-review-tools": "Άλλα εργαλεία επιθεώρησης", "rcfilters-group-results-by-page": "Ομαδοποίηση αποτελεσμάτων ανά σελίδα", "rcfilters-grouping-title": "Ομαδοποίηση", "rcfilters-activefilters": "Ενεργά φίλτρα", diff --git a/languages/i18n/es.json b/languages/i18n/es.json index 1f00164299..700f337b08 100644 --- a/languages/i18n/es.json +++ b/languages/i18n/es.json @@ -1439,7 +1439,7 @@ "recentchanges-submit": "Mostrar", "rcfilters-tag-remove": "Quitar «$1»", "rcfilters-legend-heading": "Lista de abreviaturas:", - "rcfilters-other-review-tools": "Otras herramientas de revisión", + "rcfilters-other-review-tools": "Otras herramientas de revisión", "rcfilters-group-results-by-page": "Agrupar resultados por página", "rcfilters-grouping-title": "Agrupación", "rcfilters-activefilters": "Filtros activos", @@ -1452,7 +1452,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|hora|horas}}", "rcfilters-highlighted-filters-list": "Destacados: $1", "rcfilters-quickfilters": "Filtros guardados", - "rcfilters-quickfilters-placeholder-title": "Ningún enlace guardado aún", + "rcfilters-quickfilters-placeholder-title": "No se guardó ningún filtro aún", "rcfilters-quickfilters-placeholder-description": "Para guardar tus ajustes de filtro y reutilizarlos más tarde, pulsa en el icono del marcador en el área de Filtro activo que se encuentra a continuación.", "rcfilters-savedqueries-defaultlabel": "Filtros guardados", "rcfilters-savedqueries-rename": "Cambiar nombre", diff --git a/languages/i18n/et.json b/languages/i18n/et.json index e3e7cac3d2..ce275c840b 100644 --- a/languages/i18n/et.json +++ b/languages/i18n/et.json @@ -1304,7 +1304,7 @@ "recentchanges-submit": "Näita", "rcfilters-tag-remove": "Eemalda \"$1\"", "rcfilters-legend-heading": "Lühendite loetelu:", - "rcfilters-other-review-tools": "Muud ülevaatusriistad", + "rcfilters-other-review-tools": "Muud ülevaatusriistad", "rcfilters-group-results-by-page": "Rühmita tulemused lehekülje kaupa", "rcfilters-grouping-title": "Rühmitamine", "rcfilters-activefilters": "Aktiivsed filtrid", diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json index 73167de85f..5bf88d20d2 100644 --- a/languages/i18n/eu.json +++ b/languages/i18n/eu.json @@ -1016,7 +1016,7 @@ "timezoneregion-europe": "Europa", "timezoneregion-indian": "Indiar Ozeanoa", "timezoneregion-pacific": "Ozeano Barea", - "allowemail": "Beste erabiltzaileengandik e-posta mezuak jasotzea gaitu", + "allowemail": "Beste erabiltzaileei niri posta mezuak bidaltzea gaitu", "email-blacklist-label": "Erabiltzaile hauei niri mezu elektronikoak bidaltzen debekatu:", "prefs-searchoptions": "Bilatu", "prefs-namespaces": "Izen-tarteak", @@ -1296,7 +1296,7 @@ "recentchanges-submit": "Erakutsi", "rcfilters-tag-remove": "$1 ezabatu", "rcfilters-legend-heading": "Laburpenen zerrenda:", - "rcfilters-other-review-tools": "Beste berrikusketa tresnak", + "rcfilters-other-review-tools": "Beste berrikusketa tresnak", "rcfilters-group-results-by-page": "Talde emaitzak orrika", "rcfilters-grouping-title": "Taldekatzen", "rcfilters-activefilters": "Iragazki aktiboak", @@ -1309,7 +1309,7 @@ "rcfilters-days-show-hours": "{{PLURAL:$1|Ordu $1|$1 ordu}}", "rcfilters-highlighted-filters-list": "Azpimarratua: $1", "rcfilters-quickfilters": "Gordetako iragazkiak", - "rcfilters-quickfilters-placeholder-title": "Ez dira oraindik Link-ak gorde", + "rcfilters-quickfilters-placeholder-title": "Ez da oraindik iragazkirik gorde", "rcfilters-quickfilters-placeholder-description": "Iragazkiaren doikuntzak gordetzeko eta berrerabiltzeko geroago, egin klik lasterbide ikonoan Active Filter area eremuan, beherago.", "rcfilters-savedqueries-defaultlabel": "Gordetako iragazkiak", "rcfilters-savedqueries-rename": "Berrizendatu", @@ -3393,12 +3393,14 @@ "tags-deactivate": "desaktibatu", "tags-hitcount": "$1 {{PLURAL:$1|aldaketa|aldaketa}}", "tags-manage-no-permission": "Ez duzu etiketa aldaketak kudeatzeko baimenik.", + "tags-manage-blocked": "Ezin dezakezu etiketa aldaketa kudeatu {{GENDER:$1|you}} blokeatua egon bitartean.", "tags-create-heading": "Etiketa berria sortu", "tags-create-explanation": "Lehenespenez, sortutako etiketa berriak erabiltzaileek eta botek erabiltzeko eskuragarri egingo dira.", "tags-create-tag-name": "Etiketaren izena:", "tags-create-reason": "Arrazoia:", "tags-create-submit": "Sortu", "tags-create-no-name": "Etiketatutako izen bat zehaztu behar duzu.", + "tags-create-invalid-chars": "Etiketak izenek ezin dezakete komak (,), hodi (|), edo barruti aurreraturik (/) eraman.", "tags-create-invalid-title-chars": "Etiketa izenak ezin du orri-tituluetan erabili ezin diren karaktererik eduki.", "tags-create-already-exists": "\"$1\" etiketa badago.", "tags-create-warnings-below": "Etiketaren sorrerarekin jarraitu nahi duzu?", diff --git a/languages/i18n/fa.json b/languages/i18n/fa.json index e0350f9a06..16a2cd8473 100644 --- a/languages/i18n/fa.json +++ b/languages/i18n/fa.json @@ -1340,7 +1340,7 @@ "recentchanges-submit": "نمایش", "rcfilters-tag-remove": "حذف «$1»", "rcfilters-legend-heading": "فهرست کوته‌نوشت‌ها:", - "rcfilters-other-review-tools": "دیگر ابزارهای بازبینی", + "rcfilters-other-review-tools": "دیگر ابزارهای بازبینی", "rcfilters-group-results-by-page": "گروه‌بندی نتایج بر اساس صفحه", "rcfilters-grouping-title": "گروه‌بندی", "rcfilters-activefilters": "پالایه‌های فعال", diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json index 96990550ed..f5eab1ea42 100644 --- a/languages/i18n/fi.json +++ b/languages/i18n/fi.json @@ -1042,7 +1042,8 @@ "timezoneregion-europe": "Eurooppa", "timezoneregion-indian": "Intian valtameri", "timezoneregion-pacific": "Tyynimeri", - "allowemail": "Salli sähköpostin lähetys osoitteeseen", + "allowemail": "Salli muiden käyttäjien lähettää minulle sähköpostia", + "email-blacklist-label": "Estä näitä käyttäjiä lähettämästä minulle sähköpostia:", "prefs-searchoptions": "Haku", "prefs-namespaces": "Nimiavaruudet", "default": "oletus", @@ -1318,7 +1319,7 @@ "recentchanges-submit": "Näytä", "rcfilters-tag-remove": "Poista '$1'", "rcfilters-legend-heading": "Luettelo lyhenteistä:", - "rcfilters-other-review-tools": "Muut arviointityökalut", + "rcfilters-other-review-tools": "Muut arviointityökalut", "rcfilters-group-results-by-page": "Ryhmitä tulokset sivujen mukaan", "rcfilters-grouping-title": "Ryhmitys", "rcfilters-activefilters": "Aktiiviset suodattimet", @@ -1331,7 +1332,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|tunti|tuntia}}", "rcfilters-highlighted-filters-list": "Korostettu: $1", "rcfilters-quickfilters": "Tallennetut suodattimet", - "rcfilters-quickfilters-placeholder-title": "Ei vielä tallennettuja linkkejä", + "rcfilters-quickfilters-placeholder-title": "Ei tallennettuja suodattimia", "rcfilters-quickfilters-placeholder-description": "Tallentaaksesi suodatinasetuksesi ja käyttääksesi niitä myöhemmin, napsauta kirjanmerkkikuvaketta alla olevalla \"Aktiiviset suodattimet\" -alueella.", "rcfilters-savedqueries-defaultlabel": "Tallennetut suodattimet", "rcfilters-savedqueries-rename": "Nimeä uudelleen", @@ -1397,6 +1398,8 @@ "rcfilters-filter-watchlist-watchednew-label": "Uudet tarkkailulistan muutokset", "rcfilters-filter-watchlist-watchednew-description": "Muutokset tarkkailulistalla oleviin sivuihin, joilla et ole vieraillut sen jälkeen, kun sivuille on tehty muutoksia.", "rcfilters-filter-watchlist-notwatched-label": "Ei tarkkailulistalla", + "rcfilters-filter-watchlist-notwatched-description": "Kaikki paitsi muutokset tarkkailulistallasi oleviin sivuihin.", + "rcfilters-filtergroup-watchlistactivity": "Tarkkailulistan aktiivisuus", "rcfilters-filtergroup-changetype": "Muutoksen tyyppi", "rcfilters-filter-pageedits-label": "Sivun muokkaukset", "rcfilters-filter-pageedits-description": "Muokkaukset wikin sisältöön, keskusteluihin, luokkakuvauksiin…", diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json index 58bb306754..9c02b448d8 100644 --- a/languages/i18n/fr.json +++ b/languages/i18n/fr.json @@ -1447,7 +1447,7 @@ "recentchanges-submit": "Lister", "rcfilters-tag-remove": "Supprimer « $1 »", "rcfilters-legend-heading": "Liste des abréviations :", - "rcfilters-other-review-tools": "Autres outils de relecture", + "rcfilters-other-review-tools": "Autres outils de relecture", "rcfilters-group-results-by-page": "Grouper les résultats par page", "rcfilters-grouping-title": "Regroupement", "rcfilters-activefilters": "Filtres actifs", @@ -1460,7 +1460,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|heure|heures}}", "rcfilters-highlighted-filters-list": "Mis en évidence : $1", "rcfilters-quickfilters": "Filtres sauvegardés", - "rcfilters-quickfilters-placeholder-title": "Aucun lien n’a encore été sauvegardé", + "rcfilters-quickfilters-placeholder-title": "Aucun filtre n’a encore été sauvegardé", "rcfilters-quickfilters-placeholder-description": "Pour sauvegarder la configuration de vos filtres pour la réutiliser ultérieurement, cliquez sur l’icône des raccourcis dans la zone des filtres actifs, ci-dessous.", "rcfilters-savedqueries-defaultlabel": "Filtres sauvegardés", "rcfilters-savedqueries-rename": "Renommer", diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json index bdcf6dfc85..82b28e13cb 100644 --- a/languages/i18n/gl.json +++ b/languages/i18n/gl.json @@ -1315,7 +1315,7 @@ "recentchanges-submit": "Mostrar", "rcfilters-tag-remove": "Eliminar '$1'", "rcfilters-legend-heading": "Lista de abreviaturas:", - "rcfilters-other-review-tools": "Outras ferramentas de revisión", + "rcfilters-other-review-tools": "Outras ferramentas de revisión", "rcfilters-group-results-by-page": "Agrupar resultados por páxina", "rcfilters-grouping-title": "Agrupamento", "rcfilters-activefilters": "Filtros activos", @@ -2485,6 +2485,7 @@ "ip_range_invalid": "Rango de enderezos IP non válido.", "ip_range_toolarge": "Non están permitidos os rangos de bloqueo maiores que /$1.", "ip_range_exceeded": "O rango IP excede o rango máximo. Rango permitido: /$1.", + "ip_range_toolow": "Na práctica, non se permiten os intervalos de IPs.", "proxyblocker": "Bloqueador de proxy", "proxyblockreason": "O seu enderezo IP foi bloqueado porque é un proxy aberto.\nPor favor, contacte co seu fornecedor de acceso á Internet ou co seu soporte técnico e informe deste grave problema de seguridade.", "sorbsreason": "O seu enderezo IP está rexistrado como un proxy aberto na lista DNSBL usada por {{SITENAME}}.", diff --git a/languages/i18n/gu.json b/languages/i18n/gu.json index a3173ead71..71e1c0d17f 100644 --- a/languages/i18n/gu.json +++ b/languages/i18n/gu.json @@ -1103,7 +1103,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|નવા પાનાઓની યાદી]] પણ જુઓ)", "recentchanges-submit": "બતાવો", "rcfilters-legend-heading": "સંક્ષેપોની યાદી:", - "rcfilters-other-review-tools": "અન્ય ચકાસણી સાધનો", + "rcfilters-other-review-tools": "અન્ય ચકાસણી સાધનો", "rcfilters-activefilters": "સક્રિય ગાળકો", "rcfilters-limit-title": "દર્શાવવાના ફેરફારો", "rcfilters-limit-shownum": "છેલ્લા {{PLURAL:$1|ફેરફાર|$1 ફેરફારો}} દર્શાવો", diff --git a/languages/i18n/he.json b/languages/i18n/he.json index bde25c2e85..71aaab6fe4 100644 --- a/languages/i18n/he.json +++ b/languages/i18n/he.json @@ -1033,7 +1033,7 @@ "timezoneregion-europe": "אירופה", "timezoneregion-indian": "האוקיינוס ההודי", "timezoneregion-pacific": "האוקיינוס השקט", - "allowemail": "לאפשר למשתמשים לשלוח לי דואר אלקטרוני", + "allowemail": "לאפשר למשתמשים אחרים לשלוח לי דואר אלקטרוני", "email-blacklist-label": "חסימת המשתמשים הבאים משליחת דואר אלקטרוני אליי:", "prefs-searchoptions": "חיפוש", "prefs-namespaces": "מרחבי שם", @@ -1314,7 +1314,7 @@ "recentchanges-submit": "הצגה", "rcfilters-tag-remove": "הסרת \"$1\"", "rcfilters-legend-heading": "רשימת קיצורים:", - "rcfilters-other-review-tools": "כלי סקירה אחרים", + "rcfilters-other-review-tools": "כלי סקירה אחרים", "rcfilters-group-results-by-page": "חלוקה התוצאות לקבוצות לפי דף", "rcfilters-grouping-title": "חלוקה לקבוצות", "rcfilters-activefilters": "מסננים פעילים", @@ -1327,7 +1327,7 @@ "rcfilters-days-show-hours": "{{PLURAL:$1|שעה אחת|שעתיים|$1 שעות}}", "rcfilters-highlighted-filters-list": "מובלט: $1", "rcfilters-quickfilters": "מסננים שמורים", - "rcfilters-quickfilters-placeholder-title": "טרם נשמרו קישורים", + "rcfilters-quickfilters-placeholder-title": "טרם נשמרו מסננים", "rcfilters-quickfilters-placeholder-description": "כדי לשמור את הגדרות המסננים שלך ולהשתמש בהן מאוחר יותר, יש ללחוץ על סמל הסימנייה באזור המסנן הפעיל להלן.", "rcfilters-savedqueries-defaultlabel": "מסננים שמורים", "rcfilters-savedqueries-rename": "שינוי שם", @@ -1562,7 +1562,7 @@ "uploaded-script-svg": "נמצא אלמנט שאפשר לכתוב בו תסריט \"$1\" בקובץ ה־SVG שהועלה.", "uploaded-hostile-svg": "נמצא CSS בלתי־מאובטח באלמנט style בקובץ ה־SVG שהועלה.", "uploaded-event-handler-on-svg": "אסור להגדיר מאפייני טיפול באירועים $1=\"$2\" בקובצי SVG.", - "uploaded-href-attribute-svg": "למאפייני href בקובצי SVG מותר לקשר רק ליעדי http או https, ונמצא <$1 $2=\"$3\">.", + "uploaded-href-attribute-svg": "רכיבי יכולים לקשר (href) רק ליעדי data:‎ (קובץ מוטמע), http://‎ או https://‎, או מקטע (עם #, באותו מסמך). ברכיבים אחרים, כגון , מותרים רק יעדי data:‎ ומקטע. באפשרותך לנסות להטמיע תמונות בעת ייצוא קובץ ה־SVG שלך. נמצא <$1 $2=\"$3\">.", "uploaded-href-unsafe-target-svg": "נמצא href לנתונים לא מאובטחים <$1 $2=\"$3\"> בקובץ ה־SVG שהועלה.", "uploaded-animate-svg": "נמצא תג \"animate\" שיכול לשנות href באמצעות מאפיין \"from\" בצורת <$1 $2=\"$3\"> בקובץ ה־SVG שהועלה.", "uploaded-setting-event-handler-svg": "הגדרת מאפייני טיפול באירועים חסומה, נמצא <$1 $2=\"$3\"> בקובץ ה־SVG שהועלה.", diff --git a/languages/i18n/hi.json b/languages/i18n/hi.json index 6ab714df88..b2bd8fb35b 100644 --- a/languages/i18n/hi.json +++ b/languages/i18n/hi.json @@ -1365,7 +1365,7 @@ "recentchanges-submit": "दिखाएँ", "rcfilters-tag-remove": "निकालें$1", "rcfilters-legend-heading": "संकेतों की सूची:", - "rcfilters-other-review-tools": "दूसरे समीक्षा उपकरण", + "rcfilters-other-review-tools": "दूसरे समीक्षा उपकरण", "rcfilters-group-results-by-page": "पेज द्वारा समूह परिणाम", "rcfilters-grouping-title": "समूहीकरण", "rcfilters-activefilters": "सक्रिय फिल्टर", diff --git a/languages/i18n/hif-latn.json b/languages/i18n/hif-latn.json index b25c266380..4c45688e99 100644 --- a/languages/i18n/hif-latn.json +++ b/languages/i18n/hif-latn.json @@ -68,7 +68,6 @@ "underline-never": "Kabhi nai", "underline-default": "Skin nai to browser ke default", "editfont-style": "Badlao waala jagah ke font:", - "editfont-default": "Browser ke sadharan setting", "editfont-monospace": "Font jiske sab akcchar ke ekke chaurrai hae", "editfont-sansserif": "Sans-serif font", "editfont-serif": "Serif font", @@ -674,7 +673,6 @@ "explainconflict": "Aap ke ii panna ke badle ke suruu kare ke baad, aur koi ii panna ke badal diis hai.\nUppar ke text area panna ke text jaise abhi hai ke dekhawa jae hai.\nAap ke badlao ke lower text area me dekawa jae hai.\nAap ke aapan badlao ke existing text me merge kare ke parri.\n'''Khali''' text in the upper text area ke save karaa jai jab aap \"$1\" ke press karega.", "yourtext": "Aap ke text", "storedversion": "Bachawa gais version", - "nonunicodebrowser": "'''CHETAUNI: Aap ke browser unicode ke nai maane hae.\nEk workaround uu jagah hae jahan pe aap thik se panna ke badle sakta hae: non-ASCII akchhar edit box me hexadecimal codes dekhai.'''", "editingold": "'''WARNING: Aap ii panna ke purana version ke badalata hae.'''\nAgar aap iske save kar lia tab last badlao se abi tak ke changes will be lost.", "yourdiff": "Antar", "copyrightwarning": "Dhyann me rakho ki {{SITENAME}} ke sab yog daan $2 ($1 ke dekho aur kaankari khatir) ke niche dewa gae hai. Agar aap nai mangtaa ki aap ke likha gae koi chij ke duusra logan badle tab hain par nahii likho.
\nAap ii bhi waada kartaa hai ki iske aap likha hai aur koi duusra jagah se copy nahi karaa hai.\n'''COPYRIGHT CHIJ KE BINA ANUMATI KE HIAN PAR NAHI SUBMIT KARNA!'''", @@ -1287,7 +1285,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (aur dekho [[Special:NewPages|nawaa panna ke suchi]])", "recentchanges-submit": "Dekhao", "rcfilters-legend-heading": "Abbreviations ke suchi:", - "rcfilters-other-review-tools": "Duusra review kare waala tool:", + "rcfilters-other-review-tools": "Duusra review kare waala tool:", "rcfilters-activefilters": "Active filters", "rcfilters-advancedfilters": "Advanced filters", "rcfilters-limit-title": "Jon badlao ke dekhae ke hai", @@ -2321,7 +2319,6 @@ "block": "Sadasya ke roko", "unblock": "Sadasya ke rukawat k khalaas karo", "blockip": "{{GENDER:$1|sadasya}} ke roko", - "blockip-legend": "Sadasya ke roko", "blockiptext": "Niche ke form ke use kar ke koi khaas IP address nai to username ke write access ke roko.\nIske khaali vandalism ke roke ke khatir kaam me laae ke chaahi [[{{MediaWiki:Policy-url}}|policy]] ke niche.\nFill in a specific reason below (for example, citing particular pages that were vandalized).\nYou can block IP address ranges using the [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the largest allowed range is /$1 for IPv4 and /$2 for IPv6.", "ipaddressorusername": "IP Address nai to username:", "ipbexpiry": "Expiry:", @@ -3457,6 +3454,7 @@ "compare-invalid-title": "Jon title ke aap specify karaa hae, valid nai hae", "compare-title-not-exists": "Chuna gais title abhi nai banawa gais hai.", "compare-revision-not-exists": "Chuna gais revision abhi nai banawa gais hai.", + "diff-form": "ek '''form'''", "dberr-problems": "Maaf karna! Ii site technical difficulties experience kare hae.", "dberr-again": "Thora deri wait kar ke fir se load kare ke try karo", "dberr-info": "(Cannot access the database: $1)", diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json index 002df5de7f..a658edc06d 100644 --- a/languages/i18n/hr.json +++ b/languages/i18n/hr.json @@ -1248,7 +1248,7 @@ "recentchanges-legend-plusminus": "(±123)", "recentchanges-submit": "Prikaži", "rcfilters-legend-heading": "Popis kratica:", - "rcfilters-other-review-tools": "Ostali alati za pregledavanje:", + "rcfilters-other-review-tools": "Ostali alati za pregledavanje:", "rcfilters-group-results-by-page": "Grupiranje rezultata po stranici", "rcfilters-grouping-title": "Grupiranje", "rcfilters-activefilters": "Aktivni filtri", @@ -1954,9 +1954,9 @@ "removedwatchtext-short": "Stranica \"$1\" uklonjena je s Vašeg popisa praćenja.", "watch": "Prati", "watchthispage": "Prati ovu stranicu", - "unwatch": "Prekini praćenje", - "unwatchthispage": "Prekini praćenje", - "notanarticle": "Nije članak", + "unwatch": "Prestani pratiti", + "unwatchthispage": "Prestani pratiti stranicu", + "notanarticle": "Nije stranica sa sadržajem", "notvisiblerev": "Izmjena je obrisana", "watchlist-details": "{{PLURAL:$1|$1 stranica se nalazi|$1 stranice se nalaze|$1 stranica se nalazi}} na popisu praćenja, ne brojeći stranice za razgovor.", "wlheader-enotif": "Uključeno je izvješćivanje e-poštom.", diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json index 687e4add30..35916f57f0 100644 --- a/languages/i18n/hu.json +++ b/languages/i18n/hu.json @@ -707,6 +707,7 @@ "yourtext": "A te változatod", "storedversion": "A tárolt változat", "editingold": "'''FIGYELMEZTETÉS: A lap egy elavult változatát szerkeszted.\nHa elmented, akkor az ezen változat után végzett összes módosítás elvész.'''", + "unicode-support-fail": "Úgy tűnik, hogy a böngésződ nem támogatja az Unicode-kódolást. Ez viszont szükséges a lapok szerkesztéséhez, ezért a szerkesztésed nem lett elmentve.", "yourdiff": "Eltérések", "copyrightwarning": "Vedd figyelembe, hogy a {{SITENAME}} wikin végzett összes módosítás a(z) $2 alatt jelenik meg (lásd a(z) $1 lapot a részletekért). Ha nem akarod, hogy az írásodat módosítsák vagy továbbterjesszék, akkor ne küldd be.
\nAzt is megígéred, hogy ezt magadtól írtad, vagy egy közkincsből vagy más szabad forrásból másoltad.\n'''NE KÜLDJ BE JOGVÉDETT MUNKÁT ENGEDÉLY NÉLKÜL!'''", "copyrightwarning2": "Vedd figyelembe, hogy a {{SITENAME}} wikin végzett összes módosítást szerkeszthetik, módosíthatják vagy eltávolíthatják más szerkesztők.\nHa nem akarod, hogy az írásodat módosítsák, akkor ne küldd be.
\nAzt is megígéred, hogy ezt magadtól írtad, vagy egy közkincsből vagy más szabad forrásból másoltad (lásd a(z) $1 lapot a részletekért).\n'''NE KÜLDJ BE JOGVÉDETT MUNKÁT ENGEDÉLY NÉLKÜL!'''", @@ -1085,6 +1086,7 @@ "prefs-editor": "Szerkesztő", "prefs-preview": "Előnézet", "prefs-advancedrc": "Haladó beállítások", + "prefs-opt-out": "Fejlesztések kikapcsolása", "prefs-advancedrendering": "Haladó beállítások", "prefs-advancedsearchoptions": "Haladó beállítások", "prefs-advancedwatchlist": "Haladó beállítások", @@ -1321,7 +1323,7 @@ "recentchanges-submit": "Megjelenítés", "rcfilters-tag-remove": "$1 eltávolítása", "rcfilters-legend-heading": "Rövidítések listája:", - "rcfilters-other-review-tools": "Egyéb hasznos hivatkozások", + "rcfilters-other-review-tools": "Egyéb hasznos hivatkozások", "rcfilters-group-results-by-page": "Csoportosítás eredményei lapok szerint", "rcfilters-grouping-title": "Csoportosítás", "rcfilters-activefilters": "Aktív szűrők", @@ -1431,6 +1433,7 @@ "rcfilters-view-namespaces-tooltip": "Találatok szűrése névtér szerint", "rcfilters-view-tags-tooltip": "Találatok szűrése címkék használatával", "rcfilters-view-return-to-default-tooltip": "Vissza a főszűrőmenübe.", + "rcfilters-view-tags-help-icon-tooltip": "Tudj meg többet a jelölt szerkesztésekről", "rcfilters-liveupdates-button": "Élő frissítések", "rcfilters-liveupdates-button-title-on": "Élő frissítések kikapcsolása", "rcfilters-liveupdates-button-title-off": "A legfrissebb változtatások mutatása, amint megtörténnek", @@ -1438,6 +1441,7 @@ "rcfilters-watchlist-edit-watchlist-button": "A figyelőlistád szerkesztése", "rcfilters-watchlist-showupdated": "Az újabb változtatások amiket még nem néztél meg, vastaggal jelöltük", "rcfilters-preference-label": "A friss változtatások fejlesztett változatának elrejtése", + "rcfilters-preference-help": "A 2017-es felületátdolgozás és minden azóta hozzáadott eszköz visszaállítása.", "rcnotefrom": "Alább a $3 $4 óta történt változtatások láthatóak (legfeljebb $1 db).", "rclistfromreset": "Dátumválasztás visszaállítása", "rclistfrom": "$3, $2 után történt változtatások megtekintése", @@ -1494,6 +1498,7 @@ "uploadbtn": "Fájl feltöltése", "reuploaddesc": "Visszatérés a feltöltési űrlaphoz.", "upload-tryagain": "Módosított fájl-leírás elküldése", + "upload-tryagain-nostash": "Újra-feltöltött fájl és módosított leírás küldése", "uploadnologin": "Nem vagy bejelentkezve", "uploadnologintext": "{{UCFIRST:$1}} fájlok feltöltéséhez.", "upload_directory_missing": "A feltöltési könyvtár ($1) nem létezik vagy nem tudja létrehozni a kiszolgáló.", @@ -1673,6 +1678,7 @@ "uploadstash-errclear": "A fájlok törlése nem sikerült.", "uploadstash-refresh": "Fájlok listájának frissítése", "uploadstash-thumbnail": "bélyegkép megjelenítése", + "uploadstash-exception": "Nem sikerült eltárolni a feltöltést a stash-ben ($1): „$2”", "invalid-chunk-offset": "Érvénytelen darab eltolás", "img-auth-accessdenied": "Hozzáférés megtagadva", "img-auth-nopathinfo": "Hiányzó PATH_INFO.\nA szerver nincs beállítva, hogy továbbítsa ezt az információt.\nLehet, hogy CGI-alapú, és nem támogatja az img_auth-ot.\nLásd https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization!", diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json index b056178b06..e6e9d57b08 100644 --- a/languages/i18n/ia.json +++ b/languages/i18n/ia.json @@ -1292,7 +1292,7 @@ "recentchanges-submit": "Monstrar", "rcfilters-tag-remove": "Remover '$1'", "rcfilters-legend-heading": "Lista de abbreviationes:", - "rcfilters-other-review-tools": "Altere instrumentos de revision", + "rcfilters-other-review-tools": "Altere instrumentos de revision", "rcfilters-group-results-by-page": "Gruppar resultatos per pagina", "rcfilters-grouping-title": "Gruppamento", "rcfilters-activefilters": "Filtros active", diff --git a/languages/i18n/id.json b/languages/i18n/id.json index 439edb69a5..76420a8475 100644 --- a/languages/i18n/id.json +++ b/languages/i18n/id.json @@ -106,7 +106,6 @@ "underline-never": "Tidak pernah", "underline-default": "Kulit atau penjelajah bawaan", "editfont-style": "Gaya tulisan komputer pada kotak penyuntingan:", - "editfont-default": "Bawaan penjelajah web", "editfont-monospace": "Tulisan Monospace", "editfont-sansserif": "Tulisan Sans-serif", "editfont-serif": "Tulisan Serif", @@ -721,7 +720,6 @@ "explainconflict": "Orang lain telah menyunting halaman ini sejak Anda mulai menyuntingnya.\nBagian atas teks ini mengandung teks halaman saat ini.\nPerubahan yang Anda lakukan ditunjukkan pada bagian bawah teks.\nAnda hanya perlu menggabungkan perubahan Anda dengan teks yang telah ada.\n'''Hanya''' teks pada bagian atas halamanlah yang akan disimpan apabila Anda menekan \"$1\".", "yourtext": "Teks Anda", "storedversion": "Versi tersimpan", - "nonunicodebrowser": "'''Peringatan: Penjelajah web Anda tidak mendukung unicode.'''\nTelah terdapat sebuah solusi agar Anda dapat menyunting halaman dengan aman: karakter non-ASCII akan muncul dalam kotak edit sebagai kode heksadesimal.", "editingold": "'''Peringatan:\nAnda menyunting revisi lama suatu halaman.\nJika Anda menyimpannya, perubahan-perubahan yang dibuat sejak revisi ini akan hilang.'''", "yourdiff": "Perbedaan", "copyrightwarning": "Perhatikan bahwa semua kontribusi terhadap {{SITENAME}} dianggap dilisensikan sesuai dengan $2 (lihat $1 untuk informasi lebih lanjut). Jika Anda tidak ingin tulisan Anda disunting dan disebarkan ke halaman web yang lain, jangan kirimkan ke sini.
Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain. '''JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!'''", @@ -1340,7 +1338,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (lihat pula [[Special:NewPages|daftar halaman baru]])", "recentchanges-submit": "Tampilkan", "rcfilters-legend-heading": "Daftar singkatan:", - "rcfilters-other-review-tools": "Peralatan peninjauan lainnya", + "rcfilters-other-review-tools": "Peralatan peninjauan lainnya", "rcfilters-group-results-by-page": "Kelompokkan hasil menurut halaman", "rcfilters-grouping-title": "Kelompokkan", "rcfilters-activefilters": "Filter aktif", @@ -2384,7 +2382,6 @@ "block": "Blokir pengguna", "unblock": "Buka blokir pengguna", "blockip": "Blokir {{GENDER:$1|pengguna}}", - "blockip-legend": "Blokir pengguna", "blockiptext": "Gunakan formulir di bawah untuk memblokir akses penulisan dari sebuah alamat IP atau pengguna tertentu.\nIni hanya boleh dilakukan untuk mencegah vandalisme, dan sejalan dengan [[{{MediaWiki:Policy-url}}|kebijakan]].\nMasukkan alasan Anda di bawah (contoh, menuliskan nama halaman yang telah divandalisasi).\nAnda dapat memblok rentang IP menggunakan [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] syntax; the largest allowed range is /$1 for IPv4 and /$2 for IPv6.", "ipaddressorusername": "Alamat IP atau nama pengguna:", "ipbexpiry": "Kedaluwarsa:", diff --git a/languages/i18n/ilo.json b/languages/i18n/ilo.json index 293138ffdd..f444927937 100644 --- a/languages/i18n/ilo.json +++ b/languages/i18n/ilo.json @@ -59,7 +59,6 @@ "underline-never": "Saan uray kaanoman", "underline-default": "Kudil wenno kasisigud a pagbasabasa", "editfont-style": "Estilo ti kita ti letra ti pagurnosan a lugar:", - "editfont-default": "Kasisigud a pagbasabasa", "editfont-monospace": "Monospaced a kita ti letra", "editfont-sansserif": "Sans-serif a kita ti letra", "editfont-serif": "Serif a kita ti letra", @@ -661,7 +660,6 @@ "explainconflict": "Adda sabali a nagsukat iti daytoy a panid idi nangrugika a nagurnos.\nTi akinngato a lugar ti teksto ket aglaon ti teksto ti panid iti agdama kaaddana.\nDagiti sinukatam ket maipakita iti akinbaba a lugar ti teksto.\nNasken nga itiponmonto dagiti sinukatam iti adda a teksto.\nTi laeng teksto iti akinngato a lugar ti teksto ti maidulinto no talmegam ti \"$1\".", "yourtext": "Ti tekstom", "storedversion": "Rebision a naidulin", - "nonunicodebrowser": "Ballaag: Ti pabasabasam ket saan a maitunos iti Unicode .\nAdda sabali a mausar tapno makaurnoska kadagiti panid: Ti saan nga-ASCII a karakter ket agparang iti pagurnosan a kahon a kas dagiti heksadesimal a kodigo.", "editingold": "Ballag: Ur-urnosem ti daan a rebision iti daytoy a panid.\nNo idulinmo, mapukawto ti ania man a naaramid a binaliwan manipud iti daytoy a rebision.", "yourdiff": "Paggigiddiatan", "copyrightwarning": "Pangngaasi a laglagipen nga amin a kontribusion iti {{SITENAME}} ket naikeddeng a naipablaak babaen ti babaen ti $2 (kitaen ti $1 para kadagiti salaysay). \nNo dimo kayat a ti sinuratmo ket maurnos nga awanan-asi ken maiwaras nga awan sungsungbatan kenka, saanmon nga ited ditoy.
\nIkarkarim pay kadakami a bukodmo a sinurat daytoy, wenno kinopia manipud iti publiko a dominio wenno ti kapadpadana a nawaya a nagtaudan.\nSaan a mangited ti nakarbengan ti kopia nga obra no awan iti pammalubos!", @@ -1272,7 +1270,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (kitaen pay ti [[Special:NewPages|listaan ti baro a pampanid]])", "recentchanges-submit": "Ipakita", "rcfilters-legend-heading": "Listaan dagiti pangyababaan:", - "rcfilters-other-review-tools": "Dagiti sabali pay a pangrepaso a ramit", + "rcfilters-other-review-tools": "Dagiti sabali pay a pangrepaso a ramit", "rcfilters-group-results-by-page": "Igrupo dagiti resulta babaen ti panid", "rcfilters-grouping-title": "Pannakaigrupo", "rcfilters-activefilters": "Dagiti aktibo a sagat", @@ -1375,7 +1373,7 @@ "rcfilters-liveupdates-button": "Dagiti agdama a panagpabaro", "rcfilters-liveupdates-button-title-on": "Iddepen dagiti agdama a panagpabaro", "rcfilters-liveupdates-button-title-off": "Ipakita dgaiti baro a sinuksukatan bayatda a mapaspasamak", - "rcfilters-watchlist-markSeen-button": "Markaan amin a sinuksukatan a kas nakitan", + "rcfilters-watchlist-markseen-button": "Markaan amin a sinuksukatan a kas nakitan", "rcnotefrom": "Dita baba ket {{PLURAL:$5|ti sinukatan|dagiti sinukatan}} manipud idi $3, $4 (aginggana iti $1 a naipakita).", "rclistfromreset": "Isaad manen ti panagpili ti petsa", "rclistfrom": "Ipakita dagiti kabarbaro a sinukatan a mangrugi manipud idi $2, $3", @@ -2305,7 +2303,6 @@ "block": "Serraan ti agar-aramat", "unblock": "Ikkaten ti serra ti agar-aramat", "blockip": "Serraan ti {{GENDER:$1|agar-aramat}}", - "blockip-legend": "Serraan ti agar-aramat", "blockiptext": "Usaren ti porma dita baba tapno maserraan ti panagserrek ti panagsurat manipud iti naisangayan nga adres ti IP wenno nagan ti agar-aramat.\nDaytoy ket nasken laeng a maaramid tapno mapawilan ti bandalismo, ken segun iti [[{{MediaWiki:Policy-url}}|annuroten]].\nIkabil ti naisangayan a rason dita baba (kas pagarigan, ti panagdakamat kadagiti naisangayan a panid a nabandalismo).\nMabalinmo a serraan dagiti sakup ti adres ti IP babaen ti panagusar ti sintaksis ti [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR]; ti kadakkelan a maipalubos a sakup ket /$1 para iti IPv4 ken /$2 para iti IPv6.", "ipaddressorusername": "Adres ti IP wenno nagan ti agar-aramat:", "ipbexpiry": "Agpaso:", diff --git a/languages/i18n/it.json b/languages/i18n/it.json index d72cd44915..2e2fc9d834 100644 --- a/languages/i18n/it.json +++ b/languages/i18n/it.json @@ -1105,7 +1105,7 @@ "timezoneregion-europe": "Europa", "timezoneregion-indian": "Oceano Indiano", "timezoneregion-pacific": "Oceano Pacifico", - "allowemail": "Abilita la ricezione di messaggi email da altri utenti", + "allowemail": "Consenti ad altri utenti di inviarmi email", "email-blacklist-label": "Impedisci a questi utenti di inviarmi email:", "prefs-searchoptions": "Ricerca", "prefs-namespaces": "Namespace", @@ -1386,7 +1386,7 @@ "recentchanges-submit": "Mostra", "rcfilters-tag-remove": "Rimuovi '$1'", "rcfilters-legend-heading": "Elenco di abbreviazioni:", - "rcfilters-other-review-tools": "Altri strumenti di revisione", + "rcfilters-other-review-tools": "Altri strumenti di revisione", "rcfilters-group-results-by-page": "Raggruppa risultati per pagina", "rcfilters-grouping-title": "Raggruppamento", "rcfilters-activefilters": "Filtri attivi", diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json index 87ff8770a2..8832651f5b 100644 --- a/languages/i18n/ja.json +++ b/languages/i18n/ja.json @@ -523,7 +523,7 @@ "nocookieslogin": "{{SITENAME}}ではログインに Cookie を使用します。\nCookie を無効にしているようです。\nCookie を有効にしてから、もう一度試してください。", "nocookiesfornew": "発信元を確認できなかったため、アカウントは作成されませんでした。\nCookieを有効にしていることを確認して、このページを再読込してもう一度試してください。", "nocookiesforlogin": "{{int:nocookieslogin}}", - "createacct-loginerror": "アカウントは正常に作成されましたが、自動的にログインすることができませんでした。[[Special:UserLogin|手動でログイン]]をしてください。", + "createacct-loginerror": "アカウントは作成されましたが、自動的にログインできませんでした。[[Special:UserLogin|手動でログイン]]をしてください。", "noname": "有効な利用者名が指定されていません。", "loginsuccesstitle": "ログイン済み", "loginsuccess": "{{SITENAME}}に「$1」としてログインしました。", @@ -645,7 +645,7 @@ "passwordreset-nosuchcaller": "送信者が存在しません: $1", "passwordreset-ignored": "パスワードのリセットが処理されませんでした。プロバイダーが設定されていない可能性があります。", "passwordreset-invalidemail": "無効なメールアドレスです", - "passwordreset-nodata": "利用者名もメールアドレスも入力されていません", + "passwordreset-nodata": "利用者名とメールアドレスが入力されていません", "changeemail": "メールアドレスの変更または除去", "changeemail-header": "あなたのメールアドレスを変更するには、このフォームを完成させます。もし、あなたのアカウントから任意のメールアドレスの関連付けを削除したい場合は、フォームの送信時に、新しいメールアドレスを空白のままにします。", "changeemail-no-info": "このページに直接アクセスするためにはログインしている必要があります。", @@ -1326,7 +1326,7 @@ "action-deleterevision": "版の削除", "action-deletelogentry": "記録項目の削除", "action-deletedhistory": "ページの削除履歴の閲覧", - "action-deletedtext": "削除された版の本文を閲覧する", + "action-deletedtext": "削除された版の本文の閲覧", "action-browsearchive": "削除されたページの検索", "action-undelete": "ページの復元", "action-suppressrevision": "隠された版の確認と復元", @@ -2212,7 +2212,7 @@ "deletepage": "ページを削除", "confirm": "確認", "excontent": "内容:「$1」", - "excontentauthor": "内容:「$1」、投稿者は「[[Special:Contributions/$2|$2]]」のみ ([[User talk:$2|talk]])", + "excontentauthor": "内容:「$1」、投稿者は「[[Special:Contributions/$2|$2]]」のみ ([[User talk:$2|トーク]])", "exbeforeblank": "白紙化前の内容:「$1」", "delete-confirm": "「$1」の削除", "delete-legend": "削除", @@ -2717,7 +2717,7 @@ "tooltip-pt-mycontris": "自分の投稿の一覧", "tooltip-pt-anoncontribs": "このIPアドレスからなされた編集の一覧", "tooltip-pt-login": "ログインすることを推奨します。ただし、必須ではありません。", - "tooltip-pt-login-private": "このウィキを利用するにはログインする必要があります", + "tooltip-pt-login-private": "このウィキを利用するにはログインをしてください", "tooltip-pt-logout": "ログアウト", "tooltip-pt-createaccount": "アカウントを作成してログインすることをお勧めしますが、必須ではありません", "tooltip-ca-talk": "本文ページについての議論", @@ -2931,8 +2931,8 @@ "bydate": "日付順", "sp-newimages-showfrom": "$1の$2以降の新しいファイルを表示", "video-dims": "$1、 $2 × $3", - "seconds-abbrev": "$1 s", - "minutes-abbrev": "$1 m", + "seconds-abbrev": "$1秒", + "minutes-abbrev": "$1分", "hours-abbrev": "$1 h", "days-abbrev": "$1 d", "seconds": "{{PLURAL:$1|$1 秒}}", @@ -2943,7 +2943,7 @@ "months": "{{PLURAL:$1|$1 か月}}", "years": "{{PLURAL:$1|$1 年}}", "ago": "$1前", - "just-now": "ちょうど今", + "just-now": "たった今", "hours-ago": "$1 {{PLURAL:$1|時間}}前", "minutes-ago": "$1 {{PLURAL:$1|分}}前", "seconds-ago": "$1 {{PLURAL:$1|秒}}前", @@ -2990,9 +2990,9 @@ "variantname-shi-tfng": "シルハ語 (ティフィナグ文字)", "variantname-shi-latn": "シルハ語 (ラテン文字)", "variantname-shi": "シルハ語", - "variantname-uz": "uz", - "variantname-uz-latn": "uz-Latn", - "variantname-uz-cyrl": "uz-Cyrl", + "variantname-uz": "ウズベク語", + "variantname-uz-latn": "ウズベク語 (ラテン文字)", + "variantname-uz-cyrl": "ウズベク語 (キリル文字)", "metadata": "メタデータ", "metadata-help": "このファイルには、追加情報があります (おそらく、作成やデジタル化する際に使用したデジタルカメラやスキャナーが追加したものです)。\nこのファイルが元の状態から変更されている場合、修正されたファイルを完全に反映していない項目がある場合があります。", "metadata-expand": "拡張項目を表示", @@ -3408,7 +3408,7 @@ "confirmrecreate-noreason": "あなたが編集を開始した後、[[User:$1|$1]] ([[User talk:$1|トーク]]) がこのページを{{GENDER:$1|削除しました}}。このページを本当に再作成していいかご確認ください。", "recreate": "再作成する", "unit-pixel": "ピクセル", - "confirm-purge-title": "このページをパージする", + "confirm-purge-title": "このページのキャッシュ破棄", "confirm_purge_button": "OK", "confirm-purge-top": "このページのキャッシュを破棄しますか?", "confirm-purge-bottom": "ページのキャッシュを破棄し、強制的に最新版を表示します。", @@ -3800,8 +3800,8 @@ "logentry-delete-delete_redir": "$1 がリダイレクト「$3」を上書きにより{{GENDER:$2|削除しました}}", "logentry-delete-restore": "$1 がページ「$3 ($4)」を{{GENDER:$2|復元しました}}", "logentry-delete-restore-nocount": "$1 がページ「$3」を{{GENDER:$2|復元しました}}", - "restore-count-revisions": "$1{{PLURAL:$1|版}}", - "restore-count-files": "{{PLURAL:$1|$1ファイル}}", + "restore-count-revisions": "{{PLURAL:$1|1|$1}}件の版", + "restore-count-files": "{{PLURAL:$1|$1件のファイル}}", "logentry-delete-event": "$1 が $3 の{{PLURAL:$5|記録項目|記録項目$5件}}の閲覧レベルを{{GENDER:$2|変更しました}}: $4", "logentry-delete-revision": "$1 がページ「$3」の{{PLURAL:$5|版|$5件の版}}の閲覧レベルを{{GENDER:$2|変更しました}}: $4", "logentry-delete-event-legacy": "$1 が $3 の記録項目の閲覧レベルを{{GENDER:$2|変更しました}}", @@ -3949,8 +3949,8 @@ "pagelang-reason": "理由", "pagelang-submit": "変更", "pagelang-nonexistent-page": "ページ $1 は存在しません。", - "pagelang-unchanged-language": "ページ「$1」の言語は既に$2に設定されています。", - "pagelang-unchanged-language-default": "「$1」はすでにウィキの既定のコンテンツ言語に設定されています。", + "pagelang-unchanged-language": "ページ「$1」の言語はすでに$2に設定されています。", + "pagelang-unchanged-language-default": "ページ「$1」はすでにウィキの既定の言語に設定されています。", "pagelang-db-failed": "データベースがページの言語を変更できませんでした。", "right-pagelang": "ページの言語を変更", "action-pagelang": "ページの言語の変更", @@ -4031,8 +4031,8 @@ "date-range-to": "終了日:", "sessionmanager-tie": "複数の要求の認証方法を組み合わせることはできません: $1。", "sessionprovider-generic": "$1 セッション", - "sessionprovider-mediawiki-session-cookiesessionprovider": "クッキーベースのセッション", - "sessionprovider-nocookies": "クッキーが無効になっている可能性があります。クッキーが有効になっていることを確認し、もう一度お試しください。", + "sessionprovider-mediawiki-session-cookiesessionprovider": "Cookie ベースのセッション", + "sessionprovider-nocookies": "Cookie が無効になっている可能性があります。有効になっていることを確認し、もう一度お試しください。", "randomrootpage": "おまかせルートページ", "log-action-filter-block": "ブロックの種類", "log-action-filter-contentmodel": "コンテンツモデルの変更の種類", @@ -4053,7 +4053,7 @@ "log-action-filter-contentmodel-change": "コンテンツモデルの変更", "log-action-filter-contentmodel-new": "標準でないコンテンツ・モデルによるページの作成", "log-action-filter-delete-delete": "ページの削除", - "log-action-filter-delete-delete_redir": "リダイレクトを上書き", + "log-action-filter-delete-delete_redir": "転送の上書き", "log-action-filter-delete-restore": "ページの復帰", "log-action-filter-delete-event": "記録の削除", "log-action-filter-delete-revision": "版指定削除", @@ -4068,7 +4068,7 @@ "log-action-filter-newusers-create": "匿名利用者による作成", "log-action-filter-newusers-create2": "登録利用者による作成", "log-action-filter-newusers-autocreate": "自動的な作成", - "log-action-filter-newusers-byemail": "メールによるパスワード送信を伴う作成", + "log-action-filter-newusers-byemail": "メール送信されるパスワードによる作成", "log-action-filter-patrol-patrol": "手動巡回", "log-action-filter-patrol-autopatrol": "自動巡回", "log-action-filter-protect-protect": "保護", @@ -4101,7 +4101,7 @@ "authmanager-authplugin-create-fail": "アカウントの作成は、認証プラグインによって拒否されました。", "authmanager-authplugin-setpass-denied": "パスワードの変更は、認証プラグインによって許可されていません。", "authmanager-authplugin-setpass-bad-domain": "無効なドメインです。", - "authmanager-autocreate-noperm": "自動アカウント作成は許可されていません。", + "authmanager-autocreate-noperm": "アカウントの自動作成は許可されていません。", "authmanager-autocreate-exception": "自動アカウント作成は、以前のエラーにより一時的に無効になっています。", "authmanager-userdoesnotexist": "利用者アカウント「$1」は登録されていません。", "authmanager-userlogin-remembermypassword-help": "パスワードはセッションの長さよりも長いため、忘れないようにしてください。", @@ -4130,8 +4130,8 @@ "authform-newtoken": "トークンがありません。$1", "authform-notoken": "トークンがありません", "authform-wrongtoken": "不正なトークンです", - "specialpage-securitylevel-not-allowed-title": "許可されていません", - "specialpage-securitylevel-not-allowed": "申し訳ありませんが、あなたが同一人であるか確認できないため、このページを使用することはできません。", + "specialpage-securitylevel-not-allowed-title": "このページは利用できません", + "specialpage-securitylevel-not-allowed": "あなたが同一人であるか確認できないため、このページを利用することはできません。", "authpage-cannot-login": "ログインを開始できません。", "authpage-cannot-login-continue": "ログインを続行できません。セッションがタイムアウトした可能性が高いです。", "authpage-cannot-create": "アカウントの作成を開始できません。", diff --git a/languages/i18n/jv.json b/languages/i18n/jv.json index 099e91ae48..272fe89cfe 100644 --- a/languages/i18n/jv.json +++ b/languages/i18n/jv.json @@ -1210,7 +1210,7 @@ "recentchanges-legend-plusminus": "(''±123'')", "recentchanges-submit": "Tuduhaké", "rcfilters-legend-heading": "Pratélané cekakan:", - "rcfilters-other-review-tools": "Piranti pamriksa liyané", + "rcfilters-other-review-tools": "Piranti pamriksa liyané", "rcfilters-group-results-by-page": "Golongaké kasilé miturut kacané", "rcfilters-grouping-title": "Panggegolong", "rcfilters-activefilters": "Saringan murub", diff --git a/languages/i18n/ka.json b/languages/i18n/ka.json index 5a32cc47b7..8d8a71324b 100644 --- a/languages/i18n/ka.json +++ b/languages/i18n/ka.json @@ -1318,7 +1318,7 @@ "recentchanges-submit": "ჩვენება", "rcfilters-tag-remove": "'$1'-ის წაშლა", "rcfilters-legend-heading": "აბრევიატურების წაშლა:", - "rcfilters-other-review-tools": "შემოწმების სხვა ხელსაწყოები", + "rcfilters-other-review-tools": "შემოწმების სხვა ხელსაწყოები", "rcfilters-group-results-by-page": "ჯგუფის შედეგები გვერდების მიხედვით", "rcfilters-grouping-title": "დაჯგუფება", "rcfilters-activefilters": "აქტიური ფილტრები", diff --git a/languages/i18n/kab.json b/languages/i18n/kab.json index 4673106fcf..e93cf04716 100644 --- a/languages/i18n/kab.json +++ b/languages/i18n/kab.json @@ -1210,7 +1210,7 @@ "recentchanges-submit": "Sken", "rcfilters-tag-remove": "Kkes '$1'", "rcfilters-legend-heading": "Tabdart n isegzilen:", - "rcfilters-other-review-tools": "Ifecka-nniḍen n ucegger", + "rcfilters-other-review-tools": "Ifecka-nniḍen n ucegger", "rcfilters-group-results-by-page": "Sdukkel igmaḍ s usebter", "rcfilters-grouping-title": "Asdukkel", "rcfilters-activefilters": "Imzizdigen urmiden", diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json index 3420c1e7d1..ddc5ba9503 100644 --- a/languages/i18n/ko.json +++ b/languages/i18n/ko.json @@ -1342,7 +1342,7 @@ "recentchanges-submit": "보기", "rcfilters-tag-remove": "'$1' 제거", "rcfilters-legend-heading": "약어 목록:", - "rcfilters-other-review-tools": "다른 검토 도구", + "rcfilters-other-review-tools": "다른 검토 도구", "rcfilters-group-results-by-page": "문서별로 묶음", "rcfilters-grouping-title": "묶기", "rcfilters-activefilters": "사용 중인 필터", @@ -1355,7 +1355,7 @@ "rcfilters-days-show-hours": "$1{{PLURAL:$1|시간}}", "rcfilters-highlighted-filters-list": "강조됨: $1", "rcfilters-quickfilters": "저장된 필터", - "rcfilters-quickfilters-placeholder-title": "저장된 링크가 아직 없습니다", + "rcfilters-quickfilters-placeholder-title": "저장된 필터가 아직 없습니다", "rcfilters-quickfilters-placeholder-description": "필터 설정을 저장하고 나중에 다시 사용하려면 아래의 사용 중인 필터 영역의 북마크 아이콘을 클릭하십시오.", "rcfilters-savedqueries-defaultlabel": "저장된 필터", "rcfilters-savedqueries-rename": "이름 바꾸기", diff --git a/languages/i18n/krc.json b/languages/i18n/krc.json index 28867f5210..431a2b07c9 100644 --- a/languages/i18n/krc.json +++ b/languages/i18n/krc.json @@ -56,7 +56,6 @@ "underline-never": "Бир заманда да", "underline-default": "Браузерни джарашдырыуларын хайырландыр", "editfont-style": "Тюрлендириу джерни шрифтини тиби:", - "editfont-default": "Браузерни джарашдырыуларындан шрифт", "editfont-monospace": "Кенгленнген шрифт", "editfont-sansserif": "Sans-serif шрифт", "editfont-serif": "Сериф шрифт", @@ -555,7 +554,6 @@ "explainconflict": "Сиз тюрлендире тургъан сагъатда, ким эседа бы бетни тюрлендирген этгенди.\nБаш терезеде сиз бусагъатдагъы текстни кёресиз.\nТюбюнде терезеде сизни варинтды.\nСиз этген тюрлениулени тюб терезеден баш терезеге кёчюрюгюз.\n«$1» басылса баш терезеде текст сакъланныкъды.", "yourtext": "Сизни текстигиз", "storedversion": "Сакъланнган версия", - "nonunicodebrowser": "'''Эсгертиу: сизни браузеригиз Юникод кодировканы танымайдв.'''\nБетлени тюрлендирген сагъатда ASCII болмагъан символла оналтылыкъ кодларына алышдырыллыкъдыла.", "editingold": "'''Эсгертиу: сиз бу бетни эскирген версиясын тюрлендиресиз.'''\nСакълатхан тиекге басхан сагъатда, джангы версиялада этилген тюрлендириуле тас боллукъдула.", "yourdiff": "Айырмала", "copyrightwarning": "Статьяны текстинде бютеу къошуула, тюрлендириуле $2 лицензияны тамалында (къарагъыз: $1) чыкъгъаннга саналгъанына эс бёлюгюз!\nСизни текстлеригизни хар излегеннге эркин джайыллыгъын эмда тюрлендириллигин излеймей эсегиз, аланы бери салмагъыз.
\nДагъыда сиз, этилген тюрлениулени автору болгъаныгъызгъа, неда аланы эркин джайылыргъа эмда тюрлендирирге эркинлик берген джерледен алыннганына шагъатлыкъ этесиз.
\n'''АВТОР ХАКЪ БЛА ДЖАКЪЛАННГАН МАТЕРИАЛЛАНЫ ЭРКИНЛИКСИЗ САЛМАГЪЫЗ!'''", @@ -1045,7 +1043,7 @@ "recentchanges-legend-heading": "Легенда: ", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (къарагъыз: [[Special:NewPages|джангы бетлени тизмеси]])", "recentchanges-legend-plusminus": "(''±123'')", - "rcfilters-other-review-tools": "Башха тинтиу адырла", + "rcfilters-other-review-tools": "Башха тинтиу адырла", "rcfilters-activefilters": "Актив фильтрле", "rcfilters-limit-shownum": "Ахыр {{PLURAL:$1|тюрлениуню}} кёргюзт", "rcfilters-quickfilters-placeholder-title": "Сакъланнган джибериуле алкъын джокъдула", @@ -1721,7 +1719,6 @@ "block": "Къошулуучуну блокла", "unblock": "Къошулуучуну блок этилиуюн алыу", "blockip": "Бу къошулуучуну блок эт", - "blockip-legend": "Къошулуучуну блокга салыу", "blockiptext": "Тюбюндеги форманы хайырланыб белгили бир IP-ден неда регистрация этилген къошулуучуну тюрлениу этиуюню тыяллыкъсыз. Бу, джангыз вандализмни тыяр ючюн эм [[{{MediaWiki:Policy-url}}|джорукълагъа]] келишиулю этилирге керекди. Тюбюрек тыйыу бла байламлы ангылатыу джазыгъыз. (юлгю: -Бу- бетледе вандализм этилгенди).", "ipaddressorusername": "IP-адрес неда къошулуучу ат:", "ipbexpiry": "Бошаллыкъды (ётсе):", diff --git a/languages/i18n/ku-latn.json b/languages/i18n/ku-latn.json index 54af2cc58a..7b3dc6beaa 100644 --- a/languages/i18n/ku-latn.json +++ b/languages/i18n/ku-latn.json @@ -873,7 +873,7 @@ "rcfilters-savedqueries-new-name-label": "Nav", "rcfilters-savedqueries-cancel-label": "Betal bike", "rcfilters-filterlist-title": "Parzûn", - "rcfilters-filter-editsbyself-label": "Guhêrandinên ji yaliyê te", + "rcfilters-filter-editsbyself-label": "Guhêrandinên ji aliyê te", "rcfilters-filter-editsbyother-label": "Guherandinên ji aliyên kesên din", "rcfilters-filter-bots-label": "Bot", "rcfilters-filter-humans-label": "Mirov (ne bot)", @@ -919,7 +919,7 @@ "recentchangeslinked-feed": "Guherandinên peywend", "recentchangeslinked-toolbox": "Guherandinên peywend", "recentchangeslinked-title": "Guherandinên têkildarî \"$1\"", - "recentchangeslinked-summary": "Ev lîste, ji rûpela destnîşankirî (an jî endamên destnîşankirî) re rûpelê lîsteya guherandinên dawî ji rûpelên lînkkirî nîşandide. Ew rûpel yê di [[Special:Watchlist|lîsteya te ya şopandinê]] da bi nivîsa estûr tên nîşandan.", + "recentchangeslinked-summary": "Ev lîste, ji rûpela destnîşankirî (an jî endamên destnîşankirî) re rûpelê lîsteya guherandinên dawî ji rûpelên lînkkirî nîşandide. Ew rûpel yê di [[Special:Watchlist|lîsteya te ya şopandinê]] da bi nivîsa stûr tên nîşandan.", "recentchangeslinked-page": "Navê rûpelê:", "recentchanges-page-added-to-category": "[[:$1]] li kategoriyê hate zêdekirin", "recentchanges-page-removed-from-category": "[[:$1]] ji kategoriyê hate jêbirin", diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json index 35cb2db6bf..a9fb209069 100644 --- a/languages/i18n/lb.json +++ b/languages/i18n/lb.json @@ -1254,7 +1254,7 @@ "recentchanges-submit": "Weisen", "rcfilters-tag-remove": "'$1' ewechhuelen", "rcfilters-legend-heading": "Lëscht vun Ofkierzungen:", - "rcfilters-other-review-tools": "Aner Méiglechkeete fir z'iwwerliesen", + "rcfilters-other-review-tools": "Aner Méiglechkeete fir z'iwwerliesen", "rcfilters-group-results-by-page": "Resultater no de Säite gruppéieren", "rcfilters-grouping-title": "Gruppéieren", "rcfilters-activefilters": "Aktiv Filteren", diff --git a/languages/i18n/lfn.json b/languages/i18n/lfn.json index 4e94bef001..8a730c912d 100644 --- a/languages/i18n/lfn.json +++ b/languages/i18n/lfn.json @@ -60,7 +60,6 @@ "underline-never": "Nunca", "underline-default": "Implicada par pel o surfador", "editfont-style": "Stilo de leteras en la caxa de edita", - "editfont-default": "Implicada par surfador", "editfont-monospace": "Leteras monospasida", "editfont-sansserif": "Leteras sin serif", "editfont-serif": "Leteras con serif", @@ -1279,7 +1278,7 @@ "recentchanges-submit": "Mostra", "rcfilters-tag-remove": "Sutrae '$1'", "rcfilters-legend-heading": "Lista de cortis:", - "rcfilters-other-review-tools": "Otra utiles de revisa", + "rcfilters-other-review-tools": "Otra utiles de revisa", "rcfilters-group-results-by-page": "Grupi resultas par paje", "rcfilters-grouping-title": "Grupi", "rcfilters-activefilters": "Filtros ativa", @@ -2335,7 +2334,6 @@ "block": "Impedi usor", "unblock": "Desimpedi usor", "blockip": "Impedi {{GENDER:$1|usor}}", - "blockip-legend": "Impedi usor", "blockiptext": "Usa la formulario a su per impedi asedes scrivente de un adirije IP o nom de usor spesifada.\nOn debe fa esta sola per preveni vandalsime, e longo la [[{{MediaWiki:Policy-url}}|politica]].\nSpesifa un razona a su (per esemplo, indicante pajes individua cual ia es vandalida).\nPer impedi adirijes IP, on pote usa la sintatica [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR]; la estende la plu grande permeteda es /$1 per IPv4 e /$2 per IPv6.", "ipaddressorusername": "Adirije IP o nom de usor:", "ipbexpiry": "Desvalidi:", diff --git a/languages/i18n/li.json b/languages/i18n/li.json index d239d8ccf4..f9847625ab 100644 --- a/languages/i18n/li.json +++ b/languages/i18n/li.json @@ -1256,7 +1256,7 @@ "recentchanges-submit": "Tuin", "rcfilters-tag-remove": "Sjaf '$1' weg", "rcfilters-legend-heading": "Lies mit aafkórtinge:", - "rcfilters-other-review-tools": "Angere kentrolhölpmiddele", + "rcfilters-other-review-tools": "Angere kentrolhölpmiddele", "rcfilters-group-results-by-page": "Resultate per pagina groepere", "rcfilters-grouping-title": "Groepeer", "rcfilters-activefilters": "Aktief filters", diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json index 8e903061b7..73da77f209 100644 --- a/languages/i18n/lv.json +++ b/languages/i18n/lv.json @@ -1097,7 +1097,7 @@ "recentchanges-submit": "RādÄ«t", "rcfilters-tag-remove": "Noņemt \"$1\"", "rcfilters-legend-heading": "SaÄ«sinājumu saraksts:", - "rcfilters-other-review-tools": "Citi pārskatÄ«Å¡anas rÄ«ki", + "rcfilters-other-review-tools": "Citi pārskatÄ«Å¡anas rÄ«ki", "rcfilters-group-results-by-page": "Grupēt rezultātus pēc lapas", "rcfilters-grouping-title": "Grupēšana", "rcfilters-activefilters": "AktÄ«vie filtri", diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json index 6f3463abf5..f8fd147dbb 100644 --- a/languages/i18n/mk.json +++ b/languages/i18n/mk.json @@ -355,7 +355,7 @@ "title-invalid-too-long": "Бараниот наслов е предолг. Не смее да биде поголем од $1 {{PLURAL:$1|бајт|бајти}} шифриран според UTF-8.", "title-invalid-leading-colon": "Бараниот наслов содржи неважечки две точки на почетокот.", "perfcached": "Следните податоци се меѓускладирани и може да не се тековни. Во меѓускладот {{PLURAL:$1|е достапен највеќе еден запис|се достапни највеќе $1 записи}}.", - "perfcachedts": "Следните податоци се меѓускладирани, последен пат подновени на $1. Во меѓускладот {{PLURAL:$4|е достапен највеќе еден запис|се достапни највеќе $4 записи}}.", + "perfcachedts": "Следните податоци се меѓускладирани, последен пат подновени во $1. Во меѓускладот {{PLURAL:$4|е достапен највеќе еден запис|се достапни највеќе $4 записи}}.", "querypage-no-updates": "Подновите на оваа страница моментално се оневозможени.\nПодатоците овде во моментов нема да се подновуваат.", "viewsource": "Преглед", "viewsource-title": "Преглед на кодот на $1", @@ -1023,7 +1023,7 @@ "timezoneregion-indian": "Индиски Океан", "timezoneregion-pacific": "Тихи Океан", "allowemail": "Дозволи е-пошта од други корисници", - "email-blacklist-label": "Забрани им на следниве корисници да ми праќаат е-пошта:", + "email-blacklist-label": "Забрани е-пошта од следниве корисници:", "prefs-searchoptions": "Пребарување", "prefs-namespaces": "Именски простори", "default": "по основно", @@ -1304,7 +1304,7 @@ "recentchanges-submit": "Прикажи", "rcfilters-tag-remove": "Отстрани го „$1“", "rcfilters-legend-heading": "Список на кратенки:", - "rcfilters-other-review-tools": "Други алатки за проверка", + "rcfilters-other-review-tools": "Други алатки за проверка", "rcfilters-group-results-by-page": "Групен исход по страница", "rcfilters-grouping-title": "Групирање", "rcfilters-activefilters": "Активни филтри", @@ -1317,7 +1317,7 @@ "rcfilters-days-show-hours": "{{PLURAL:$1|еден час|$1 часа}}", "rcfilters-highlighted-filters-list": "Истакнато: $1", "rcfilters-quickfilters": "Зачувани филтри", - "rcfilters-quickfilters-placeholder-title": "Засега нема зачувани врски", + "rcfilters-quickfilters-placeholder-title": "Засега нема зачувани филтри", "rcfilters-quickfilters-placeholder-description": "За да ги зачувате вашите филтерски псотавки за да ги употребите другпат, стиснете на иконката за бележник во подрачјето „Активен филтер“ подолу.", "rcfilters-savedqueries-defaultlabel": "Зачувани филтри", "rcfilters-savedqueries-rename": "Преименувај", @@ -1553,7 +1553,7 @@ "uploaded-script-svg": "Пронајдов скриптен елемент „$1“ во подигнатата SVG-податотека.", "uploaded-hostile-svg": "Пронајдов небезбеден CSS во стилскиот елемент на подигнатата SVG-податотека.", "uploaded-event-handler-on-svg": "Задавањето на атрибути $1=\"$2\" за работа со настани не е дозволено за SVG-податотеки.", - "uploaded-href-attribute-svg": "На href-атрибутите во SVG-податотеки им е дозволено да водат само до цели со претставки http:// или https://, кои се наоѓаат на <$1 $2=\"$3\">.", + "uploaded-href-attribute-svg": " елементите може да водат (href) само до data: (вметната податотека), http:// или https://, или пак одредишта кои се fragment (#, ист документ). За останатите елементи како , се допуштаат само data: и fragment. Вметнете слики кога извезувате SVG. Најдено е <$1 $2=\"$3\">.", "uploaded-href-unsafe-target-svg": "Пронајдов href кон небезбедни податоци: URI-цел <$1 $2=\"$3\"> во подигнатата SVG-податотека.", "uploaded-animate-svg": "Пронајдов ознака „animate“ што може да го менува href, користејќи го атрибутот „from“ <$1 $2=\"$3\"> во подигнатата SVG-податотека.", "uploaded-setting-event-handler-svg": "Задавањето на атрибути за работа со настани е спречено. Пронајдов <$1 $2=\"$3\"> во подигнатата SVG-податотека.", diff --git a/languages/i18n/ml.json b/languages/i18n/ml.json index 6f7a688d0b..5c35bf02b6 100644 --- a/languages/i18n/ml.json +++ b/languages/i18n/ml.json @@ -1220,7 +1220,7 @@ "recentchanges-submit": "പ്രദർശിപ്പിക്കുക", "rcfilters-tag-remove": "'$1' നീക്കംചെയ്യുക", "rcfilters-legend-heading": "ചുരുക്കെഴുത്തുകളുടെ പട്ടിക:", - "rcfilters-other-review-tools": "മറ്റ് സംശോധന ഉപകരണങ്ങൾ", + "rcfilters-other-review-tools": "മറ്റ് സംശോധന ഉപകരണങ്ങൾ", "rcfilters-group-results-by-page": "ഫലങ്ങൾ താളനുസരിച്ച് ഗണങ്ങളാക്കുക", "rcfilters-grouping-title": "ഗണങ്ങളാക്കൽ", "rcfilters-activefilters": "സജീവ അരിപ്പകൾ", diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json index 1d0f148f53..b38e64151c 100644 --- a/languages/i18n/mr.json +++ b/languages/i18n/mr.json @@ -1264,7 +1264,7 @@ "recentchanges-legend-plusminus": "(''±१२३'')", "recentchanges-submit": "दाखवा", "rcfilters-legend-heading": "लघुरूपांची यादी:", - "rcfilters-other-review-tools": "पुनरावलोकनाची इतर साधने", + "rcfilters-other-review-tools": "पुनरावलोकनाची इतर साधने", "rcfilters-group-results-by-page": "पानानुसार गट निकाल", "rcfilters-grouping-title": "गट करणे", "rcfilters-activefilters": "सक्रिय गाळण्या", diff --git a/languages/i18n/my.json b/languages/i18n/my.json index f852e58120..e7527c6451 100644 --- a/languages/i18n/my.json +++ b/languages/i18n/my.json @@ -910,7 +910,7 @@ "recentchanges-submit": "ပြသရန်", "rcfilters-tag-remove": "'$1' ကို ဖယ်ရှားရန်", "rcfilters-legend-heading": "အတိုကောက်များ စာရင်း:", - "rcfilters-other-review-tools": "အခြား ဆန်းစစ်ကိရိယာများ", + "rcfilters-other-review-tools": "အခြား ဆန်းစစ်ကိရိယာများ", "rcfilters-group-results-by-page": "စာမျက်နှာအလိုက် ရလဒ်များ အုပ်စုဖွဲ့ရန်", "rcfilters-grouping-title": "အုပ်စုဖွဲ့ခြင်း", "rcfilters-activefilters": "သက်ဝင်နေသာ filter များ", diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json index e03c31511b..3e775b399f 100644 --- a/languages/i18n/nb.json +++ b/languages/i18n/nb.json @@ -1328,7 +1328,7 @@ "recentchanges-submit": "Vis", "rcfilters-tag-remove": "Fjern «$1»", "rcfilters-legend-heading": "Liste over forkortelser:", - "rcfilters-other-review-tools": "Andre gjennomgangsverktøy", + "rcfilters-other-review-tools": "Andre gjennomgangsverktøy", "rcfilters-group-results-by-page": "Grupper resultater etter side", "rcfilters-grouping-title": "Gruppering", "rcfilters-activefilters": "Aktive filtre", @@ -1341,7 +1341,7 @@ "rcfilters-days-show-hours": "{{PLURAL:$1|Én time|$1 timer}}", "rcfilters-highlighted-filters-list": "Fremhevet: $1", "rcfilters-quickfilters": "Lagrede filtre", - "rcfilters-quickfilters-placeholder-title": "Ingen lenker lagret enda", + "rcfilters-quickfilters-placeholder-title": "Ingen filtre lagret enda", "rcfilters-quickfilters-placeholder-description": "For Ã¥ lagre filterinnstillingene og gjenbruk dem senere, klikk pÃ¥ bokmerkeikonet i omrÃ¥det Aktive Filtre under.", "rcfilters-savedqueries-defaultlabel": "Lagrede filtre", "rcfilters-savedqueries-rename": "Gi nytt navn", @@ -1576,7 +1576,7 @@ "uploaded-script-svg": "Fant et skriptelement \"$1\" i den opplastede SVG-koden.", "uploaded-hostile-svg": "Fant usikker CSS i stilelementet til opplastet SVG-fil", "uploaded-event-handler-on-svg": "Å sette event-handler-attributtene $1=\"$2\" tillates ikke i SVG-filer.", - "uploaded-href-attribute-svg": "href-attributter i SVG-filer tillates kun for http://- eller https://-mÃ¥l; fant <$1 $2=\"$3\"%gt;.", + "uploaded-href-attribute-svg": "-elementer kan bare lenke (href) til data:- (innbygde filer), http(s)://- eller fragmentmÃ¥l (#, samme dokument). For andre elementer som tillates bare data:- og fragmentlenker. Prøv Ã¥ bygge inn bilder nÃ¥r du eksporterer SVG-en din. Fant <$1 $2=\"$3\">.", "uploaded-href-unsafe-target-svg": "Fant href til usikre data: URI-mÃ¥l <$1 $2=\"$3\"> i den opplastede SVG-filen.", "uploaded-animate-svg": "Fant en «animate»-tagg som kan endre href, bruk attributtet «from» <$1 $2=\"$3\"> i den opplastede SVG-fila.", "uploaded-setting-event-handler-svg": "Setting av event-handler-attributter er blokkert, fant <$1 $2=\"$3\"> i den opplastede SVG-fila.", diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json index 3fca19d3fd..1501e38929 100644 --- a/languages/i18n/nl.json +++ b/languages/i18n/nl.json @@ -1364,7 +1364,7 @@ "recentchanges-submit": "Weergeven", "rcfilters-tag-remove": "Verwijder '$1'", "rcfilters-legend-heading": "Lijst met afkortingen:", - "rcfilters-other-review-tools": "Andere controlehulpmiddelen", + "rcfilters-other-review-tools": "Andere controlehulpmiddelen", "rcfilters-group-results-by-page": "Resultaten per pagina groeperen", "rcfilters-grouping-title": "Groeperen", "rcfilters-activefilters": "Actieve filters", @@ -1377,7 +1377,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|uur|uren}}", "rcfilters-highlighted-filters-list": "Uitgelicht: $1", "rcfilters-quickfilters": "Opgeslagen filters", - "rcfilters-quickfilters-placeholder-title": "Nog geen koppelingen opgeslagen", + "rcfilters-quickfilters-placeholder-title": "Nog geen filters opgeslagen", "rcfilters-quickfilters-placeholder-description": "Om uw filterinstellingen op te slaan en later te kunnen hergebruiken, klik op het bladwijzer pictogram in het Actieve Filter gebied beneden.", "rcfilters-savedqueries-defaultlabel": "Opgeslagen filters", "rcfilters-savedqueries-rename": "Hernoemen", diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json index 9c21ee70e4..00352b5cf8 100644 --- a/languages/i18n/pl.json +++ b/languages/i18n/pl.json @@ -1367,7 +1367,7 @@ "recentchanges-submit": "Pokaż", "rcfilters-tag-remove": "Usuń '$1'", "rcfilters-legend-heading": "Wykaz skrótów:", - "rcfilters-other-review-tools": "Inne narzędzia do sprawdzania", + "rcfilters-other-review-tools": "Inne narzędzia do sprawdzania", "rcfilters-group-results-by-page": "Grupuj wyniki według stron", "rcfilters-grouping-title": "Grupowanie", "rcfilters-activefilters": "Aktywne filtry", @@ -1380,7 +1380,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|godzina|godziny|godzin}}", "rcfilters-highlighted-filters-list": "Podświetlono: $1", "rcfilters-quickfilters": "Zapisane filtry", - "rcfilters-quickfilters-placeholder-title": "Nie masz jeszcze zapisanych linków", + "rcfilters-quickfilters-placeholder-title": "Nie masz jeszcze zapisanych filtrów", "rcfilters-quickfilters-placeholder-description": "Aby zapisać ustawienia filtrów i używać ich później, kliknij ikonkę zakładki w polu aktywnych filtrów znajdującym się niżej.", "rcfilters-savedqueries-defaultlabel": "Zapisane filtry", "rcfilters-savedqueries-rename": "Zmień nazwę", diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json index 6232300103..9160ade40c 100644 --- a/languages/i18n/pt-br.json +++ b/languages/i18n/pt-br.json @@ -1174,7 +1174,7 @@ "viewinguserrights": "Visualizar os privilégios {{GENDER:$1|do usuário|da usuária}} [[User:$1|$1]] $2", "userrights-editusergroup": "Editar grupos {{GENDER:$1|do usuário|da usuária|do(a) usuário(a)}}", "userrights-viewusergroup": "Ver grupos de {{GENDER:$1|usuários}}", - "saveusergroups": "Salvar grupos de {{GENDER:$1|usuário}}", + "saveusergroups": "Salvar grupos {{GENDER:$1|do usuário|da usuária|do(a) usuário(a)}}", "userrights-groupsmember": "Membro de:", "userrights-groupsmember-auto": "Membro implícito de:", "userrights-groups-help": "É possível alterar os grupos em que {{GENDER:$1|este usuário|esta usuária|este(a) usuário(a)}} se encontra:\n* Uma caixa de seleção selecionada significa que {{GENDER:$1|o usuário|a usuária|o(a) usuário(a)}} encontra-se no grupo.\n* Uma caixa de seleção não selecionada significa que {{GENDER:$1|o usuário|a usuária|o(a) usuário(a)}} não se encontra no grupo.\n* Um * indica que não pode remover o grupo depois de o adicionar, ou vice-versa.\n* Um # indica que você só pode atrasar o tempo de expiração dos membros deste grupo; você não pode aumentá-lo.", @@ -1393,7 +1393,7 @@ "recentchanges-submit": "Exibir", "rcfilters-tag-remove": "Remover '$1'", "rcfilters-legend-heading": "Lista de abreviaturas:", - "rcfilters-other-review-tools": " Outras ferramentas de revisão:", + "rcfilters-other-review-tools": " Outras ferramentas de revisão:", "rcfilters-group-results-by-page": "Agrupar resultado por página", "rcfilters-grouping-title": "Agrupamento", "rcfilters-activefilters": "Filtros ativos", diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json index 7cff750d46..6403757489 100644 --- a/languages/i18n/pt.json +++ b/languages/i18n/pt.json @@ -240,7 +240,7 @@ "history_small": "histórico", "updatedmarker": "atualizado desde a minha última visita", "printableversion": "Versão para impressão", - "permalink": "Hipeligação permanente", + "permalink": "Hiperligação permanente", "print": "Imprimir", "view": "Ver", "view-foreign": "Ver em $1", @@ -1338,7 +1338,7 @@ "recentchanges": "Mudanças recentes", "recentchanges-legend": "Opções das mudanças recentes", "recentchanges-summary": "Acompanhe nesta página as mudanças mais recentes da wiki.", - "recentchanges-noresult": "Não foi realizada nenhuma alteração correspondente a esses critérios durante o período selecionado.", + "recentchanges-noresult": "Não foi realizada nenhuma alteração que corresponda a estes critérios durante o período especificado.", "recentchanges-feed-description": "Acompanhe neste ''feed'' as mudanças mais recentes da wiki.", "recentchanges-label-newpage": "Esta edição criou uma nova página", "recentchanges-label-minor": "Esta é uma edição menor", @@ -1351,7 +1351,7 @@ "recentchanges-submit": "Mostrar", "rcfilters-tag-remove": "Remover '$1'", "rcfilters-legend-heading": "Lista de abreviações:", - "rcfilters-other-review-tools": "Outras ferramentas de revisão", + "rcfilters-other-review-tools": "Outras ferramentas de revisão", "rcfilters-group-results-by-page": "Agrupar resultados por página", "rcfilters-grouping-title": "Agrupamento", "rcfilters-activefilters": "Filtros ativos", @@ -1364,7 +1364,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|hora|horas}}", "rcfilters-highlighted-filters-list": "Realçado: $1", "rcfilters-quickfilters": "Filtros gravados", - "rcfilters-quickfilters-placeholder-title": "Ainda não foi gravado nenhum link", + "rcfilters-quickfilters-placeholder-title": "Ainda não foi gravado nenhum filtro", "rcfilters-quickfilters-placeholder-description": "Para gravar as suas configurações dos filtros e reutilizá-las mais tarde, clique o ícone do marcador de página, na área dos filtros ativos abaixo.", "rcfilters-savedqueries-defaultlabel": "Filtros gravados", "rcfilters-savedqueries-rename": "Alterar o nome", diff --git a/languages/i18n/ro.json b/languages/i18n/ro.json index 9cb2afd23c..2acdca328f 100644 --- a/languages/i18n/ro.json +++ b/languages/i18n/ro.json @@ -1303,7 +1303,7 @@ "recentchanges-submit": "Afișează", "rcfilters-tag-remove": "Șterge '$1'", "rcfilters-legend-heading": "Lista abrevierilor:", - "rcfilters-other-review-tools": "Alte unelte de revizuire", + "rcfilters-other-review-tools": "Alte unelte de revizuire", "rcfilters-group-results-by-page": "Grupează rezultatele după pagină", "rcfilters-grouping-title": "Grupare", "rcfilters-activefilters": "Filtre active", diff --git a/languages/i18n/roa-tara.json b/languages/i18n/roa-tara.json index c278468331..f4a0e68eb3 100644 --- a/languages/i18n/roa-tara.json +++ b/languages/i18n/roa-tara.json @@ -988,7 +988,7 @@ "timezoneregion-europe": "Europe", "timezoneregion-indian": "Oceano Indiane", "timezoneregion-pacific": "Oceano Pacifiche", - "allowemail": "Abbilite l'e-mail da l'otre utinde", + "allowemail": "Abbilite l'otre utinde a mannarme 'na mail", "prefs-searchoptions": "Cirche", "prefs-namespaces": "Namespaces", "default": "defolt", @@ -1263,7 +1263,7 @@ "recentchanges-submit": "Fà 'ndrucà", "rcfilters-tag-remove": "Live '$1'", "rcfilters-legend-heading": "Elenghe de le abbreviazziune:", - "rcfilters-other-review-tools": "Otre struminde de revisione", + "rcfilters-other-review-tools": "Otre struminde de revisione", "rcfilters-group-results-by-page": "Raggruppe le resultate pe pàgene", "rcfilters-grouping-title": "Stoche e raggruppe", "rcfilters-activefilters": "Filtre attive", @@ -1276,7 +1276,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|ore}}", "rcfilters-highlighted-filters-list": "Evidenziate: $1", "rcfilters-quickfilters": "Filtre reggistrate", - "rcfilters-quickfilters-placeholder-title": "Nisciune collegamende reggistrate", + "rcfilters-quickfilters-placeholder-title": "Nisciune filtre reggistrate", "rcfilters-quickfilters-placeholder-description": "Pe reggistrà le 'mbostaziune d'u filtre tune e ausarle cchiù tarde, cazze sus a l'icone segnalibbre jndr'à l'arèe \"Fitlre attive\" aqquà sotte", "rcfilters-savedqueries-defaultlabel": "Filtre reggistrate", "rcfilters-savedqueries-rename": "Renomene", @@ -1296,6 +1296,7 @@ "rcfilters-empty-filter": "Nisciune filtre attive. Tutte le condrebbute avènene fatte 'ndrucà.", "rcfilters-filterlist-title": "Filtre", "rcfilters-filterlist-whatsthis": "Cumme funzionane?", + "rcfilters-highlightbutton-title": "Evidenzie le resultate", "rcfilters-highlightmenu-title": "Scacchie 'nu culore", "rcfilters-highlightmenu-help": "Scacchie 'nu culore pe evidenzià sta probbietà", "rcfilters-filterlist-noresults": "Nisciune filtre acchiate", diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json index 91f6c66724..719389ad90 100644 --- a/languages/i18n/ru.json +++ b/languages/i18n/ru.json @@ -1399,7 +1399,7 @@ "recentchanges-submit": "Показать", "rcfilters-tag-remove": "Удалить '$1'", "rcfilters-legend-heading": "Список сокращений:", - "rcfilters-other-review-tools": "Другие инструменты проверки", + "rcfilters-other-review-tools": "Другие инструменты проверки", "rcfilters-group-results-by-page": "Группировать результаты по странице", "rcfilters-grouping-title": "Группировка", "rcfilters-activefilters": "Активные фильтры", diff --git a/languages/i18n/sat.json b/languages/i18n/sat.json index 983621abb6..8d1b4fb0b1 100644 --- a/languages/i18n/sat.json +++ b/languages/i18n/sat.json @@ -233,6 +233,7 @@ "ok": "Ṭhik gea", "retrievedfrom": "\"$1\" khon ñam ạgui", "youhavenewmessages": "Amaḱ do $1 ($2) menaḱa", + "newmessagesdifflinkplural": "ᱢᱩᱪᱟᱹᱫ {{PLURAL:$1|ᱵᱚᱫᱚᱞ|999=ᱵᱚᱫᱚᱞᱠᱚ}}", "youhavenewmessagesmulti": "Amaḱ nãwã mesagko do $1 menaḱa", "editsection": "Tońge", "editold": "Toṅge", diff --git a/languages/i18n/sd.json b/languages/i18n/sd.json index 37f6244d2c..c7f7ecba11 100644 --- a/languages/i18n/sd.json +++ b/languages/i18n/sd.json @@ -904,7 +904,7 @@ "recentchanges-legend-heading": "ڪنجي:", "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (Ù¾Ú» ڏسو [[Special:NewPages|نون صفحن جي فھرست]])", "recentchanges-submit": "ڏيکاريو", - "rcfilters-other-review-tools": "نظرثانيءَ جا ٻيا اوزار", + "rcfilters-other-review-tools": "نظرثانيءَ جا ٻيا اوزار", "rcfilters-activefilters": "سرگرم ڇاڻيون", "rcfilters-advancedfilters": "متقدم ڇاڻيون", "rcfilters-limit-shownum": "آخري {{PLURAL:$1|تبديلي|$1 تبديليون}} ڏيکاريو", diff --git a/languages/i18n/sk.json b/languages/i18n/sk.json index 30434b638d..de7e5eb5e0 100644 --- a/languages/i18n/sk.json +++ b/languages/i18n/sk.json @@ -85,7 +85,6 @@ "underline-never": "Nikdy", "underline-default": "Podľa nastavení prehliadača alebo témy vzhľadu", "editfont-style": "Å týl písma oblasti na úpravy:", - "editfont-default": "Predvoľba prehliadača", "editfont-monospace": "S pevnou šírkou znaku", "editfont-sansserif": "Bezpätkové písmo", "editfont-serif": "Pätkové písmo", @@ -1281,7 +1280,7 @@ "recentchanges-submit": "ZobraziÅ¥", "rcfilters-tag-remove": "OdstrániÅ¥ '$1'", "rcfilters-legend-heading": "Zoznam skratiek:", - "rcfilters-other-review-tools": "ĎalÅ¡ie kontrolné nástroje", + "rcfilters-other-review-tools": "ĎalÅ¡ie kontrolné nástroje", "rcfilters-group-results-by-page": "ZoskupiÅ¥ výsledky podľa stránky", "rcfilters-grouping-title": "Zoskupovanie", "rcfilters-activefilters": "Aktívne filtre", @@ -2271,7 +2270,6 @@ "block": "ZablokovaÅ¥ používateľa", "unblock": "OdblokovaÅ¥ používateľa", "blockip": "ZablokovaÅ¥ {{GENDER:$1|používateľa|používateľku}}", - "blockip-legend": "ZablokovaÅ¥ používateľa", "blockiptext": "Tento formulár použite na zablokovanie možnosti zápisu z konkrétnej IP adresy alebo od konkrétneho používateľa.\nMali by ste to urobiÅ¥ len na zabránenie vandalizmu a v súlade so [[{{MediaWiki:Policy-url}}|zásadami a smernicami {{GRAMMAR:genitív|{{SITENAME}}}}]].\nNižšie uveďte konkrétny dôvod (napríklad uveďte konkrétne stránky, ktoré padli za obeÅ¥ vandalizmu).\nRozsahy IP adreies môžete blokovaÅ¥ pomocou syntaxe [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR]; najväčší povolený rozsah je /$1 v prípade IPv4 a /$2 v prípade IPv6.", "ipaddressorusername": "IP adresa alebo meno používateľa:", "ipbexpiry": "Ukončenie:", diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json index 2990e2a4d0..529c9a28d0 100644 --- a/languages/i18n/sl.json +++ b/languages/i18n/sl.json @@ -1291,7 +1291,7 @@ "recentchanges-submit": "Prikaži", "rcfilters-tag-remove": "Odstrani »$1«", "rcfilters-legend-heading": "Seznam okrajÅ¡av:", - "rcfilters-other-review-tools": "Druga orodja za pregled", + "rcfilters-other-review-tools": "Druga orodja za pregled", "rcfilters-group-results-by-page": "Združi rezultate po strani", "rcfilters-grouping-title": "Združevanje", "rcfilters-activefilters": "Dejavni filtri", @@ -1304,7 +1304,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|ura|uri|ure|ur}}", "rcfilters-highlighted-filters-list": "Označeno: $1", "rcfilters-quickfilters": "Shranjeni filtri", - "rcfilters-quickfilters-placeholder-title": "Shranjena ni Å¡e nobena povezava", + "rcfilters-quickfilters-placeholder-title": "Shranjen ni Å¡e noben filter", "rcfilters-quickfilters-placeholder-description": "Da shranite svoje nastavitve filtrov in jih ponovno uporabite pozneje, kliknite na ikono za zaznamek v območju Dejavni filtri spodaj.", "rcfilters-savedqueries-defaultlabel": "Shranjeni filtri", "rcfilters-savedqueries-rename": "Preimenuj", diff --git a/languages/i18n/sr-ec.json b/languages/i18n/sr-ec.json index 659ceaa2e0..7b99cf1b57 100644 --- a/languages/i18n/sr-ec.json +++ b/languages/i18n/sr-ec.json @@ -1280,7 +1280,7 @@ "recentchanges-submit": "Прикажи", "rcfilters-tag-remove": "Обриши $1", "rcfilters-legend-heading": "Списак скраћеница:", - "rcfilters-other-review-tools": "Остали алати за преглед", + "rcfilters-other-review-tools": "Остали алати за преглед", "rcfilters-group-results-by-page": "Групиши резултате по страницама", "rcfilters-grouping-title": "Груписање", "rcfilters-activefilters": "Активни филтери", diff --git a/languages/i18n/sr-el.json b/languages/i18n/sr-el.json index cf4abf276a..26a332932e 100644 --- a/languages/i18n/sr-el.json +++ b/languages/i18n/sr-el.json @@ -1181,7 +1181,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|spisak novih stranica]])", "recentchanges-submit": "Prikaži", "rcfilters-legend-heading": "Spisak skraćenica:", - "rcfilters-other-review-tools": "Ostali alati za pregled:", + "rcfilters-other-review-tools": "Ostali alati za pregled:", "rcfilters-activefilters": "Aktivni filteri", "rcfilters-advancedfilters": "Napredni filteri", "rcfilters-limit-title": "Prikazati izmjena", diff --git a/languages/i18n/su.json b/languages/i18n/su.json index 0e3fcc0c04..770ba7332e 100644 --- a/languages/i18n/su.json +++ b/languages/i18n/su.json @@ -1256,7 +1256,7 @@ "recentchanges-submit": "Témbongkeun", "rcfilters-tag-remove": "Pupus '$1'", "rcfilters-legend-heading": "Daptar singgetan:", - "rcfilters-other-review-tools": "Pakakas paninjauan lianna", + "rcfilters-other-review-tools": "Pakakas paninjauan lianna", "rcfilters-group-results-by-page": "Gorombolkeun hasil dumasar kaca", "rcfilters-grouping-title": "Gorombolkeun", "rcfilters-activefilters": "Panyaringan aktif", diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json index 7e5c06ba1d..f4400cade1 100644 --- a/languages/i18n/sv.json +++ b/languages/i18n/sv.json @@ -1355,7 +1355,7 @@ "recentchanges-submit": "Visa", "rcfilters-tag-remove": "Ta bort \"$1\"", "rcfilters-legend-heading": "Lista över förkortningar:", - "rcfilters-other-review-tools": "Andra granskningsverktyg", + "rcfilters-other-review-tools": "Andra granskningsverktyg", "rcfilters-group-results-by-page": "Gruppera resultat efter sida", "rcfilters-grouping-title": "Gruppering", "rcfilters-activefilters": "Aktiva filter", diff --git a/languages/i18n/te.json b/languages/i18n/te.json index 94bc39e34f..e37e79f88e 100644 --- a/languages/i18n/te.json +++ b/languages/i18n/te.json @@ -1254,7 +1254,7 @@ "recentchanges-submit": "చూపించు", "rcfilters-tag-remove": "'$1'ను తీసివెయ్యి", "rcfilters-legend-heading": "సంక్షేపాల (ఎబ్రీవియేషన్లు) జాబితా:", - "rcfilters-other-review-tools": "ఇతర సమీక్షా ఉపకరణాలు", + "rcfilters-other-review-tools": "ఇతర సమీక్షా ఉపకరణాలు", "rcfilters-group-results-by-page": "ఫలితాలను పేజీవారీగా గుదిగుచ్చు", "rcfilters-grouping-title": "గుదిగుచ్చడం", "rcfilters-activefilters": "సచేతనమైన వడపోతలు", diff --git a/languages/i18n/tl.json b/languages/i18n/tl.json index 61ce439d1b..cb2d2a788d 100644 --- a/languages/i18n/tl.json +++ b/languages/i18n/tl.json @@ -59,6 +59,7 @@ "tog-watchlisthideminor": "Itago ang mga maliliit na pagbabago mula sa tala ng mga binabantayan", "tog-watchlisthideliu": "Itago ang mga pagbabago ng mga nakalagdang tagagamit mula sa tala ng mga binabantayan", "tog-watchlistreloadautomatically": "I-karga muli ang bantayan ng awtomatiko kung kailan man nabago ang isang filter (kinakailangan ang JavaScript)", + "tog-watchlistunwatchlinks": "Magdagdag ng direktang huwag panoorin/panoorin na kawing sa talaan ng mga pinapanood (Kailangan ang JavaScript para gumana)", "tog-watchlisthideanons": "Itago ang mga pagbabago ng hindi nakikilalang mga tagagamit mula sa tala ng mga binabantayan", "tog-watchlisthidepatrolled": "Itago ang napatrolyang mga pagbabago mula sa tala ng mga binabantayan", "tog-watchlisthidecategorization": "Itago ang kategorisasyon ng mga pahina", @@ -178,11 +179,13 @@ "tagline": "Mula sa {{SITENAME}}", "help": "Tulong", "search": "Paghahanap", + "search-ignored-headings": " # 
\n# Headings that will be ignored by search.\n# Changes to this take effect as soon as the page with the heading is indexed.\n# You can force page reindexing by doing a null edit.\n# The syntax is as follows:\n#   * Everything from a \"#\" character to the end of the line is a comment.\n#   * Every non-blank line is the exact title to ignore, case and everything.\nMga sanggunian\nMga panlabas na kawing\nMakita rin\n #
", "searchbutton": "Maghanap", "go": "Gawin", "searcharticle": "Pumunta", "history": "Kasaysayan ng pahina", "history_short": "Kasaysayan", + "history_small": "kasaysayan", "updatedmarker": "isinapanahon mula noong huli kong pagdalaw", "printableversion": "Bersiyong maililimbag", "permalink": "Palagiang link", @@ -206,6 +209,9 @@ "talk": "Usapan", "views": "Mga anyo", "toolbox": "Mga kagamitan", + "tool-link-userrights": "Baguhin ang mga grupo ng {{GENDER:$1|tagagamit}}", + "tool-link-userrights-readonly": "Tingnan ang mga grupo ng {{GENDER:$1|tagagamit}}", + "tool-link-emailuser": "Gumawa ng e-liham para sa {{GENDER:$1|tagagamit}} na ito", "imagepage": "Tingnan ang pahina ng talaksan", "mediawikipage": "Tingnan ang pahina ng mensahe", "templatepage": "Tingnan ang pahina ng padron", @@ -313,6 +319,7 @@ "databaseerror-query": "Tanong: $1", "databaseerror-function": "Tungkulin: $1", "databaseerror-error": "Depekto: $1", + "transaction-duration-limit-exceeded": "Para maiwasan ang kabagalan, ang transaksyong ito ay nabigo dahil ang tagal ng pagsulat ($1) ay lumagpas sa $2 segundong hangganan.\nKung ikaw ay nagbabago ng mga maraming bagay ng sabay-sabay, subukang gumawa na lamang ng mga maliliit na operasyon.", "laggedslavemode": "'''Babala:''' Maaaring hindi naglalaman ang pahina ng mga huling dagdag.", "readonly": "Nakakandado ang kalipunan ng datos", "enterlockreason": "Maglagay ng dahilan sa pagkakandado, kasama ang taya kung kailan magtatapos ang pagkakandado", @@ -321,12 +328,16 @@ "missingarticle-rev": "(pagbabago#: $1)", "missingarticle-diff": "(Pagkakaiba: $1, $2)", "readonly_lag": "Automatikong kinandado ang kalipunan ng datos habang humahabol ang mga aliping serbidor sa pinunong kalipunan nito", + "nonwrite-api-promise-error": "Ang HTTP header na 'Promise-Non-Write-API-Action' ay ipinadala ngunit ang kahilingan ay para sa isang ''API write module''.", "internalerror": "Kamaliang panloob", "internalerror_info": "Kamaliang panloob: $1", + "internalerror-fatal-exception": "Malubhang kataliwasan ng uring \"$1\"", "filecopyerror": "Hindi makopya ang talaksang \"$1\" sa \"$2\".", "filerenameerror": "Hindi mapalitan ang pangalan ng talaksang \"$1\" sa \"$2\".", "filedeleteerror": "Hindi mabura ang talaksang \"$1\".", "directorycreateerror": "Hindi malikha ang direktoryong \"$1\".", + "directoryreadonlyerror": "Ang direktoryong \"$1\" ay basahin lamang.", + "directorynotreadableerror": "Ang direktoryong \"$1\" ay hindi mabasa.", "filenotfound": "Hindi mahanap ang talaksang \"$1\".", "unexpected": "Hindi inaasahang halaga: \"$1\"=\"$2\".", "formerror": "Kamalian: hindi maipadala ang pormularyo", @@ -337,6 +348,15 @@ "no-null-revision": "Hindi makalikha ng bagong \"null\" para sa pahina na \"$1\"", "badtitle": "Hindi kanais-nais na pamagat", "badtitletext": "Ang hiniling na pamagat ng pahina ay hindi katanggap-tanggap, wala, o isang may-maling kawing na pamagat na pangugnayang-wika (interwika) o pangugnayang wiki (interwiki).\nMaaaring naglalaman ito ng isa o higit pang mga panitik (karakter) na hindi maaaring gamitin para sa mga pamagat.", + "title-invalid-empty": "Ang kahilingang pamagat ng pahina ay walang laman o naglalaman lamang ng pangalan ng ngalan-espasyo.", + "title-invalid-utf8": "Ang kahilingang pamagat ng pahina ay naglalaman ng imbalidong pagkasunod-sunod ng UTF-8.", + "title-invalid-interwiki": "Ang kahilingang pamagat ng pahina ay naglalaman ng isang kawing ng interwiki na hindi magagamit sa mga pamagat.", + "title-invalid-talk-namespace": "Ang kahilingang pamagat ng pahina ay tumutukoy sa isang usapang pahina na hindi ummiiral.", + "title-invalid-characters": "Ang kahilingang pamagat ng pahina ay naglalaman ng mga imbalidong karakter: \"$1\".", + "title-invalid-relative": "Ang pamagat ay mayroong kaugnay na daan. Ang mga kaugnay na pamagat ng pahina (./, ../) ay imbalido, dahil hindi sila maaabot kapag hinahawakan ng browser ng tagagamit.", + "title-invalid-magic-tilde": "Ang kahilingang pamagat ng pahina ay naglalaman ng imbalidong pagkasunod-sunod ng mahikang tilda (~~~).", + "title-invalid-too-long": "Ang kahilingang pamagat ng pahina ay masyadong mahaba. Ito ay hindi dapat mas mahaba sa $1 {{PLURAL:$1|byte|bytes}} sa pag-encode sa UTF-8.", + "title-invalid-leading-colon": "Ang kahilingang pamagat ng pahina ay naglalaman ng imbalidong tutuldok sa unahan.", "perfcached": "Ang sumusunod na mga dato ay nakaligpit at maaaring hindi na napapanahon. Isang pinakamataas na {{PLURAL:$1|isang resulta|$1 mga resulta ang}} ang makukuha mula sa taguan.", "perfcachedts": "Ang sumusunod na mga dato ay nakaligpit, at dating isinapanahon noong $1. Isang pinakamataas na {{PLURAL:$4|isang resulta ang|$4 mga resulta ang}} makukuha mula sa taguan.", "querypage-no-updates": "Kasulukuyang hindi gumagana ang mga pagbabago para sa pahinang ito.\nAng mga dato dito ay hindi pa masasariwa sa kasalukuyan.", @@ -349,6 +369,7 @@ "viewyourtext": "Matitingnan at makokopya mo ang pinagmulan ng mga pagbabago papunta sa pahinang ito.", "protectedinterface": "Nagbibigay ang pahinang ito ng tekstong interface para sa software, at ikinandado para maiwasan ang pangaabuso.\nUpang dagdagan o baguhin ang mga salin para sa lahat ng mga wiki, pakigamit ang [https://translatewiki.net/ translatewiki.net], ang proyekto para sa lokalisasyon ng MediaWiki.", "editinginterface": "'''Babala:''' Binabago mo ang isang pahinang ginagamit sa pagbibigay ng tekstong panghangganan para sa sopwer.\nMakaaapekto ang mga pagbago sa pahinang ito sa anyo ng hangganang (''interface'') pantagagamit na para sa ibang mga tagagamit sa wiking ito.\nUpang magdagag o magbago ng mga salinwika, isaaalang-alang na lang po ang paggamit ng [https://translatewiki.net/wiki/Main_Page?setlang=en translatewiki.net], ang proyekto para sa lokalisasyon ng MediaWiki.", + "translateinterface": "Para magdagdag o magbago ng mga pagsasalin sa lahat ng mga wiki, maaaring gamitin ang [https://translatewiki.net/ translatewiki.net], ang proyektong panglokalisasyon ng MediaWiki.", "cascadeprotected": "Nakasanggalang ang pahinang ito mula sa mga pagbabago, dahil kabilang ito sa sumusunod na {{PLURAL:$1|pahinang|mga pahinang}} nakasanggalang sa pamamagitan ng binuhay na opsyong \"nahuhulog\" (kumakaskada):\n$2", "namespaceprotected": "Wala kang pahintulot na magbago ng mga pahinang nasa ngalan-espasyong '''$1'''.", "customcssprotected": "Wala kang pahintulot na baguhin ang pahina ng CSS na ito, dahil naglalaman ito ng mga katakdaang pansarili ng ibang tagagamit.", @@ -369,6 +390,8 @@ "virus-scanfailed": "nabigo ang paghagilap (kodigong $1)", "virus-unknownscanner": "hindi kilalang panlaban sa birus:", "logouttext": "Nakaalis ka na sa pagkaka-login.\n\nTandaan na may ilang mga pahina na patuloy na nagpapakita na parang hindi ka naka-login, hanggang alisin mo ang iyong browser cache.", + "cannotlogoutnow-title": "Hindi maka-log out ngayon", + "cannotlogoutnow-text": "Imposible ang pag-log out kapag gumagamit ng $1.", "welcomeuser": "Mabuhay, $1!", "welcomecreation-msg": "Nilikha na ang iyong account.\nHuwag kalimutang baguhin ang iyong [[Special:Preferences|mga kagustuhan sa {{SITENAME}}]].", "yourname": "Bansag:", @@ -384,10 +407,17 @@ "createacct-yourpasswordagain-ph": "Muling ilagay ang password", "userlogin-remembermypassword": "Panatilihin akong naka-login", "userlogin-signwithsecure": "Gumamit ng ligtas na koneksyon", + "cannotlogin-title": "Hindi maka-log in", + "cannotlogin-text": "Imposible and pag-log in.", + "cannotloginnow-title": "Hindi maka-log in ngayon", + "cannotloginnow-text": "Imposible ang pag-log in kapag gumagamit ng $1.", + "cannotcreateaccount-title": "Hindi makagawa ng mga account", + "cannotcreateaccount-text": "Ang direktang paggawa ng account ay hindi pinapagana sa wiking ito.", "yourdomainname": "Dominyo mo:", "password-change-forbidden": "Hindi mo maaaring palitan ang mga password sa wiking ito.", "externaldberror": "Maaaring may kamalian sa pagpapatotoo ng database o kaya hindi ka pinahintulutang isapanahon ng iyong panlabas na account.", "login": "Lumagda", + "login-security": "Patunayan ang iyong pagkakakilanlan", "nav-login-createaccount": "Lumagda / lumikha ng account", "logout": "Umalis sa pagkaka-login", "userlogout": "Umalis sa pagkaka-login", @@ -398,12 +428,14 @@ "userlogin-resetpassword-link": "Nakalimutan ba ang iyong password?", "userlogin-helplink2": "Tulong sa pag-login", "userlogin-loggedin": "Naka-login ka na bilang {{GENDER:$1|$1}}. Gamitin ang form sa ibaba upang maka-login bilang ibang tagagamit o user.", + "userlogin-reauth": "Kailangan mong mag-log in muli para mapatunayan na ikaw si {{GENDER:$1|$1}}.", "userlogin-createanother": "Lumikha ng iba pang account", "createacct-emailrequired": "Direksiyong e-liham:", "createacct-emailoptional": "Email (hindi kailangan)", "createacct-email-ph": "Ipasok ang iyong email address", "createacct-another-email-ph": "Ipasok ang email address", "createaccountmail": "Gumamit ng pansamantalang random na password at ipadala ito sa email na nakasaad sa ibaba", + "createaccountmail-help": "Maaaring magamit para gumawa ng account para sa isang tao ng hindi nalalaman ang password.", "createacct-realname": "Tunay na pangalan (maaaring wala)", "createacct-reason": "Dahilan", "createacct-reason-ph": "Bakit ka gagawa ng isa pang account?", diff --git a/languages/i18n/ug-arab.json b/languages/i18n/ug-arab.json index 2e07b2bf73..f28a37221c 100644 --- a/languages/i18n/ug-arab.json +++ b/languages/i18n/ug-arab.json @@ -62,7 +62,6 @@ "underline-never": "ھەرگىز", "underline-default": "تېرە ياكى توركۆرگۈ كۆڭۈلدىكىسى", "editfont-style": "تەھرىرلەش رايونىنىڭ خەت نۇسخا ئۇسلۇبى:", - "editfont-default": "توركۆرگۈ كۆڭۈلدىكىسى", "editfont-monospace": "تەڭ كەڭلىكتىكى خەت نۇسخا", "editfont-sansserif": "Sans-serif خەت نۇسخا", "editfont-serif": "Serif خەت نۇسخا", @@ -623,7 +622,6 @@ "explainconflict": "سىز بۇ بەتنى تەھرىرلەشكە باشلىغاندا باشقىلار ئۆزگەرتتى.\nئۈستىدىكى تېكست رامكىسىدا كۆرۈنگىنى نۆۋەتتىكى بەتتىكى مەزمۇن.\nسىزنىڭ ئۆزگەرتىشىڭىز تۆۋەندىكى تېكست رامكىسىدا كۆرۈنىدۇ.\nئۆزگەرتىشىڭىزنى نۆۋەتتىكى مەزمۇنغا قوشۇڭ.\n'''پەقەت ''' ئۈستىدىكى تېكست رامكىسىدىكى مەزمۇن \"بەت ساقلا\"نى چەككەندىن كېيىنلا ئاندىن ساقلىنىدۇ.", "yourtext": "تېكستىڭىز", "storedversion": "ساقلانغان ئۆزگەرتىلگەن نەشرى", - "nonunicodebrowser": "'''ئاگاھلاندۇرۇش: تور كۆرگۈڭىز يۇنىكودنى قوللىمايدۇ.'''\nبۇ جايدىكى خىزمەت رايونىدا بەتنى بىخەتەر ھالدا تەھرىرلىيەلەيسىز: غەيرى ASCII ھەرپلىرى ئون ئالتىلىك كودلىنىش بويىچە تېكست رامكىسىدا كۆرۈنىدۇ.", "editingold": "'''ئاگاھلاندۇرۇش: تەھرىرلەۋاتقىنىڭىز بۇ بەتنىڭ كونا نەشرى.'''\nئەگەر ئۇنى ساقلىسىڭىز، مەزكۇر نەشرىدىن كېيىنكى ھەر قانداق ئۆزگەرتىش يوقاپ كېتىدۇ.", "yourdiff": "پەرقلەر", "copyrightwarning": "دىققەت، سىزنىڭ {{SITENAME}} دىكى بارلىق تۆھپىلىرىڭىز $2 دا ئېلان قىلىنىدۇ دەپ قارىلىدۇ ($1 نىڭ تەپسىلاتىدىن كۆرۈڭ).\nئەگەر يازمىڭىزنىڭ خالىغانچە ئۆزگەرتىلىشى ياكى قايتا تارقىلىشىنى خالىمىسىڭىز، يوللىماڭ.
\n سىز يوللىغان مەزمۇننىڭ ئۆزىڭىزنىڭ يازغانلىقى ياكى يەرلىك تور دائىرىسىدىن ياكى ئەركىن مەنبەدىن كەلگەنلىكىگە كاپالەتلىك قىلىڭ.\n'''ئىجازەتكە ئېرىشمەي تۇرۇپ يوللىماڭ!'''", @@ -1144,7 +1142,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (بۇنىڭغىمۇ قاراڭ [[Special:NewPages|يېڭى بەتلەر تىزىملىگى]])", "recentchanges-submit": "كۆرسىتىش", "rcfilters-legend-heading": "قىسقارتىپ يېزىلىش تىزىملىكى:", - "rcfilters-other-review-tools": " باشقا تەكشۈرۈش قوراللىرى", + "rcfilters-other-review-tools": " باشقا تەكشۈرۈش قوراللىرى", "rcfilters-grouping-title": "گۇرۇپپىلىنىۋاتىدۇ", "rcfilters-activefilters": "قوزغىتىلىغان سۈزگۈچلەر", "rcfilters-days-title": "يېقىنقى بىر نەچچە كۈن", @@ -1899,7 +1897,6 @@ "block": "ئىشلەتكۈچىنى چەكلە", "unblock": "ئىشلەتكۈچىنى چەكلىمە", "blockip": "چەكلەنگەن ئىشلەتكۈچى", - "blockip-legend": "چەكلەنگەن ئىشلەتكۈچى", "blockiptext": "تۆۋەندىكى جەدۋەلنى ئىشلىتىپ بەلگىلىك IP ئادرېس ياكى ئىشلەتكۈچى ئاتىدىن كەلگەن يېزىش زىيارىتىنى چەكلەشكە بولىدۇ.\nپەقەت بۇزغۇنچىلىكنىڭ ئالدىنى ئېلىش ھەمدە [[{{MediaWiki:Policy-url}}|تاكتىكا]].\nسىغا ئۇيغۇن بولغان ئەھۋالدا ئاندىن بۇ مەشغۇلاتنى ئېلىپ بېرىشقا بولىدۇ. تۆۋەندە ئەمەلىي سەۋەب (مەسىلەن، بۇزۇۋېتىلگەن بەتتىن بىرنى نەقىل ئېلىش)تىن بىرنى كىرگۈزۈڭ.", "ipaddressorusername": "IP ئادرېس ياكى ئىشلەتكۈچى ئاتى:", "ipbexpiry": "مۇددىتى:", diff --git a/languages/i18n/uk.json b/languages/i18n/uk.json index a03edfc20f..4f72f70c15 100644 --- a/languages/i18n/uk.json +++ b/languages/i18n/uk.json @@ -1357,7 +1357,7 @@ "recentchanges-submit": "Показати", "rcfilters-tag-remove": "Вилучити «$1»", "rcfilters-legend-heading": "Список скорочень:", - "rcfilters-other-review-tools": "Інші інструменти перевірки", + "rcfilters-other-review-tools": "Інші інструменти перевірки", "rcfilters-group-results-by-page": "Групувати результати за сторінкою", "rcfilters-grouping-title": "Групування", "rcfilters-activefilters": "Активні фільтри", @@ -1370,7 +1370,7 @@ "rcfilters-days-show-hours": "$1 {{PLURAL:$1|година|години|годин}}", "rcfilters-highlighted-filters-list": "Виділено: $1", "rcfilters-quickfilters": "Збережені фільтри", - "rcfilters-quickfilters-placeholder-title": "Ще немає збережених посилань", + "rcfilters-quickfilters-placeholder-title": "Ще немає збережених фільтрів", "rcfilters-quickfilters-placeholder-description": "Щоб зберегти Ваші налаштування фільтрів та використати їх пізніше, клацніть на іконку закладки в ділянці активних фільтрів нижче.", "rcfilters-savedqueries-defaultlabel": "Збережені фільтри", "rcfilters-savedqueries-rename": "Перейменувати", diff --git a/languages/i18n/ur.json b/languages/i18n/ur.json index 1fab97ca89..931191067d 100644 --- a/languages/i18n/ur.json +++ b/languages/i18n/ur.json @@ -1277,7 +1277,7 @@ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (نیز [[Special:NewPages|جدید صفحات کی فہرست]]) ملاحظہ فرمائیں", "recentchanges-submit": "دکھائیں", "rcfilters-legend-heading": "اختصارات کی فہرست:", - "rcfilters-other-review-tools": "نظرثانی کے دیگر آلات", + "rcfilters-other-review-tools": "نظرثانی کے دیگر آلات", "rcfilters-group-results-by-page": "نتائج گروہ بندی بلحاظ صفحہ", "rcfilters-grouping-title": "گروہ بندی", "rcfilters-activefilters": "فعال فلٹر", diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json index 6fdd915d25..87a44253cc 100644 --- a/languages/i18n/vi.json +++ b/languages/i18n/vi.json @@ -1311,7 +1311,7 @@ "recentchanges-submit": "Xem", "rcfilters-tag-remove": "Loại bỏ “$1”", "rcfilters-legend-heading": "Danh sách chữ viết tắt:", - "rcfilters-other-review-tools": "Công cụ duyệt khác", + "rcfilters-other-review-tools": "Công cụ duyệt khác", "rcfilters-group-results-by-page": "Nhóm kết quả theo trang", "rcfilters-grouping-title": "Nhóm", "rcfilters-activefilters": "Bộ lọc hiện hành", diff --git a/languages/i18n/yi.json b/languages/i18n/yi.json index 0ab434bf56..f51559988f 100644 --- a/languages/i18n/yi.json +++ b/languages/i18n/yi.json @@ -1254,7 +1254,7 @@ "recentchanges-legend-plusminus": "(''±123'')", "recentchanges-submit": "ווייזן", "rcfilters-legend-heading": "ליסטע פון ראשי תיבות:", - "rcfilters-other-review-tools": "אנדערע רעצענזיע ווערקצייג", + "rcfilters-other-review-tools": "אנדערע רעצענזיע ווערקצייג", "rcfilters-activefilters": "אַקטיווע פילטערס", "rcfilters-advancedfilters": "פֿארגעשריטענע פֿילטערס", "rcfilters-limit-title": "ענדערונגען צו ווייזן", diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json index e0c5110e24..75e1622cc1 100644 --- a/languages/i18n/zh-hans.json +++ b/languages/i18n/zh-hans.json @@ -1375,7 +1375,7 @@ "recentchanges-submit": "显示", "rcfilters-tag-remove": "移除“$1”", "rcfilters-legend-heading": "缩写列表：", - "rcfilters-other-review-tools": "其他复核工具", + "rcfilters-other-review-tools": "其他复核工具", "rcfilters-group-results-by-page": "按页面分组结果", "rcfilters-grouping-title": "分组", "rcfilters-activefilters": "激活的过滤器", @@ -1388,7 +1388,7 @@ "rcfilters-days-show-hours": "$1{{PLURAL:$1|小时}}", "rcfilters-highlighted-filters-list": "已高亮：$1", "rcfilters-quickfilters": "已保存过滤器", - "rcfilters-quickfilters-placeholder-title": "尚未保存链接", + "rcfilters-quickfilters-placeholder-title": "尚未保存过滤器", "rcfilters-quickfilters-placeholder-description": "要保存您的过滤器设置并供日后再利用，点击下方激活的过滤器区域内的书签图标。", "rcfilters-savedqueries-defaultlabel": "保存的过滤器", "rcfilters-savedqueries-rename": "重命名", diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json index 0176775729..1dd36c8108 100644 --- a/languages/i18n/zh-hant.json +++ b/languages/i18n/zh-hant.json @@ -1361,7 +1361,7 @@ "recentchanges-legend-plusminus": "(±123)", "recentchanges-submit": "顯示", "rcfilters-legend-heading": "縮寫列表：", - "rcfilters-other-review-tools": "其他檢閱工具", + "rcfilters-other-review-tools": "其他檢閱工具", "rcfilters-group-results-by-page": "按頁面分組結果", "rcfilters-grouping-title": "分組", "rcfilters-activefilters": "使用中的過濾條件", diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js index 57d1b4108f..b17355f5ba 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js @@ -916,4 +916,35 @@ mw.rcfilters.dm.FilterGroup.prototype.isExcludedFromSavedQueries = function () { return this.excludedFromSavedQueries; }; + + /** + * Normalize a value given to this group. This is mostly for correcting + * arbitrary values for 'single option' groups, given by the user settings + * or the URL that can go outside the limits that are allowed. + * + * @param {string} value Given value + * @return {string} Corrected value + */ + mw.rcfilters.dm.FilterGroup.prototype.normalizeArbitraryValue = function ( value ) { + if ( + this.getType() === 'single_option' && + this.isAllowArbitrary() + ) { + if ( + this.getMaxValue() !== null && + value > this.getMaxValue() + ) { + // Change the value to the actual max value + return String( this.getMaxValue() ); + } else if ( + this.getMinValue() !== null && + value < this.getMinValue() + ) { + // Change the value to the actual min value + return String( this.getMinValue() ); + } + } + + return value; + }; }( mediaWiki ) ); diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js index 0d65466d2a..b8e112913a 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js @@ -17,6 +17,7 @@ this.defaultFiltersEmpty = null; this.highlightEnabled = false; this.parameterMap = {}; + this.emptyParameterState = null; this.views = {}; this.currentView = 'default'; @@ -410,6 +411,200 @@ this.emit( 'initialize' ); }; + /** + * Update filter view model state based on a parameter object + * + * @param {Object} params Parameters object + */ + mw.rcfilters.dm.FiltersViewModel.prototype.updateStateFromParams = function ( params ) { + // For arbitrary numeric single_option values make sure the values + // are normalized to fit within the limits + $.each( this.getFilterGroups(), function ( groupName, groupModel ) { + params[ groupName ] = groupModel.normalizeArbitraryValue( params[ groupName ] ); + } ); + + // Update filter states + this.toggleFiltersSelected( + this.getFiltersFromParameters( + params + ) + ); + + // Update highlight state + this.getItemsSupportingHighlights().forEach( function ( filterItem ) { + var color = params[ filterItem.getName() + '_color' ]; + if ( color ) { + filterItem.setHighlightColor( color ); + } else { + filterItem.clearHighlightColor(); + } + } ); + this.toggleHighlight( !!Number( params.highlight ) ); + + // Check all filter interactions + this.reassessFilterInteractions(); + }; + + /** + * Get a representation of an empty (falsey) parameter state + * + * @return {Object} Empty parameter state + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getEmptyParameterState = function () { + if ( !this.emptyParameterState ) { + this.emptyParameterState = $.extend( + true, + {}, + this.getParametersFromFilters( {} ), + this.getEmptyHighlightParameters(), + { highlight: '0' } + ); + } + return this.emptyParameterState; + }; + + /** + * Get a representation of only the non-falsey parameters + * + * @param {Object} [parameters] A given parameter state to minimize. If not given the current + * state of the system will be used. + * @return {Object} Empty parameter state + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getMinimizedParamRepresentation = function ( parameters ) { + var result = {}; + + parameters = parameters ? $.extend( true, {}, parameters ) : this.getCurrentParameterState(); + + // Params + $.each( this.getEmptyParameterState(), function ( param, value ) { + if ( parameters[ param ] !== undefined && parameters[ param ] !== value ) { + result[ param ] = parameters[ param ]; + } + } ); + + // Highlights + Object.keys( this.getEmptyHighlightParameters() ).forEach( function ( param ) { + if ( param !== 'highlight' && parameters[ param ] ) { + // If a highlight parameter is not undefined and not null + // add it to the result + // Ignore "highlight" parameter because that, we checked already with + // the empty parameter state (and this soon changes to an implicit value) + result[ param ] = parameters[ param ]; + } + } ); + + return result; + }; + + /** + * Get a representation of the full parameter list, including all base values + * + * @param {Object} [parameters] A given parameter state to minimize. If not given the current + * state of the system will be used. + * @param {boolean} [removeExcluded] Remove excluded and sticky parameters + * @return {Object} Full parameter representation + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getExpandedParamRepresentation = function ( parameters, removeExcluded ) { + var result = {}; + + parameters = parameters ? $.extend( true, {}, parameters ) : this.getCurrentParameterState(); + + result = $.extend( + true, + {}, + this.getEmptyParameterState(), + parameters + ); + + if ( removeExcluded ) { + result = this.removeExcludedParams( result ); + } + + return result; + }; + + /** + * Get a parameter representation of the current state of the model + * + * @param {boolean} [removeExcludedParams] Remove excluded filters from final result + * @return {Object} Parameter representation of the current state of the model + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getCurrentParameterState = function ( removeExcludedParams ) { + var excludedParams, + state = this.getMinimizedParamRepresentation( $.extend( + true, + {}, + this.getParametersFromFilters( this.getSelectedState() ), + this.getHighlightParameters(), + { + // HACK: Add highlight. This is only needed while it's + // stored as an outside state + highlight: String( Number( this.isHighlightEnabled() ) ) + } + ) ); + + if ( removeExcludedParams ) { + excludedParams = this.getExcludedParams(); + // Delete all excluded filters + $.each( state, function ( param ) { + if ( excludedParams.indexOf( param ) > -1 ) { + delete state[ param ]; + } + } ); + } + + return state; + }; + + /** + * Delete excluded and sticky filters from given object. If object isn't given, output + * the current filter state without the excluded values + * + * @param {Object} [filterState] Filter state + * @return {Object} Filter state without excluded filters + */ + mw.rcfilters.dm.FiltersViewModel.prototype.removeExcludedFilters = function ( filterState ) { + filterState = filterState !== undefined ? + $.extend( true, {}, filterState ) : + this.getFiltersFromParameters(); + + // Remove excluded filters + Object.keys( this.getExcludedFiltersState() ).forEach( function ( filterName ) { + delete filterState[ filterName ]; + } ); + + // Remove sticky filters + Object.keys( this.getStickyFiltersState() ).forEach( function ( filterName ) { + delete filterState[ filterName ]; + } ); + + return filterState; + }; + /** + * Delete excluded and sticky parameters from given object. If object isn't given, output + * the current param state without the excluded values + * + * @param {Object} [paramState] Parameter state + * @return {Object} Parameter state without excluded filters + */ + mw.rcfilters.dm.FiltersViewModel.prototype.removeExcludedParams = function ( paramState ) { + paramState = paramState !== undefined ? + $.extend( true, {}, paramState ) : + this.getCurrentParameterState(); + + // Remove excluded filters + this.getExcludedParams().forEach( function ( paramName ) { + delete paramState[ paramName ]; + } ); + + // Remove sticky filters + this.getStickyParams().forEach( function ( paramName ) { + delete paramState[ paramName ]; + } ); + + return paramState; + }; + /** * Get the names of all available filters * @@ -529,9 +724,10 @@ /** * Get an object representing default parameters state * + * @param {boolean} [excludeHiddenParams] Exclude hidden and sticky params * @return {Object} Default parameter values */ - mw.rcfilters.dm.FiltersViewModel.prototype.getDefaultParams = function () { + mw.rcfilters.dm.FiltersViewModel.prototype.getDefaultParams = function ( excludeHiddenParams ) { var result = {}; // Get default filter state @@ -539,6 +735,30 @@ $.extend( true, result, model.getDefaultParams() ); } ); + if ( excludeHiddenParams ) { + Object.keys( this.getDefaultHiddenParams() ).forEach( function ( paramName ) { + delete result[ paramName ]; + } ); + } + + return result; + }; + + /** + * Get an object representing defaults for the hidden parameters state + * + * @return {Object} Default values for hidden parameters + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getDefaultHiddenParams = function () { + var result = {}; + + // Get default filter state + $.each( this.groups, function ( name, model ) { + if ( model.isHidden() ) { + $.extend( true, result, model.getDefaultParams() ); + } + } ); + return result; }; @@ -548,6 +768,30 @@ * @return {Object} Sticky parameter values */ mw.rcfilters.dm.FiltersViewModel.prototype.getStickyParams = function () { + var result = []; + + $.each( this.groups, function ( name, model ) { + if ( model.isSticky() ) { + if ( model.isPerGroupRequestParameter() ) { + result.push( name ); + } else { + // Each filter is its own param + result = result.concat( model.getItems().map( function ( filterItem ) { + return filterItem.getParamName(); + } ) ); + } + } + } ); + + return result; + }; + + /** + * Get a parameter representation of all sticky parameters + * + * @return {Object} Sticky parameter values + */ + mw.rcfilters.dm.FiltersViewModel.prototype.getStickyParamsValues = function () { var result = {}; $.each( this.groups, function ( name, model ) { @@ -714,7 +958,9 @@ var result = {}; this.getItems().forEach( function ( filterItem ) { - result[ filterItem.getName() + '_color' ] = filterItem.getHighlightColor() || null; + if ( filterItem.isHighlightSupported() ) { + result[ filterItem.getName() + '_color' ] = filterItem.getHighlightColor() || null; + } } ); result.highlight = String( Number( this.isHighlightEnabled() ) ); @@ -730,7 +976,9 @@ var result = {}; this.getItems().forEach( function ( filterItem ) { - result[ filterItem.getName() + '_color' ] = null; + if ( filterItem.isHighlightSupported() ) { + result[ filterItem.getName() + '_color' ] = null; + } } ); result.highlight = '0'; diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js index edb9644843..29585e902d 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js @@ -80,8 +80,7 @@ * @fires initialize */ mw.rcfilters.dm.SavedQueriesModel.prototype.initialize = function ( savedQueries ) { - var model = this, - excludedParams = this.filtersModel.getExcludedParams(); + var model = this; savedQueries = savedQueries || {}; @@ -122,12 +121,24 @@ if ( normalizedData && normalizedData.params ) { // Backwards-compat fix: Remove excluded parameters from // the given data, if they exist - excludedParams.forEach( function ( name ) { - delete normalizedData.params[ name ]; - } ); + normalizedData.params = model.filtersModel.removeExcludedParams( normalizedData.params ); id = String( id ); - model.addNewQuery( obj.label, normalizedData, isDefault, id ); + + // Skip the addNewQuery method because we don't want to unnecessarily manipulate + // the given saved queries unless we literally intend to (like in backwards compat fixes) + // And the addNewQuery method also uses a minimization routine that checks for the + // validity of items and minimizes the query. This isn't necessary for queries loaded + // from the backend, and has the risk of removing values if they're temporarily + // invalid (example: if we temporarily removed a cssClass from a filter in the backend) + model.addItems( [ + new mw.rcfilters.dm.SavedQueryItemModel( + id, + obj.label, + normalizedData, + { 'default': isDefault } + ) + ] ); if ( isDefault ) { model.default = id; @@ -153,12 +164,16 @@ delete data.highlights.highlight; // Filters - newData.params = this.filtersModel.getParametersFromFilters( fullFilterRepresentation ); + newData.params = this.filtersModel.getMinimizedParamRepresentation( + this.filtersModel.getParametersFromFilters( fullFilterRepresentation ) + ); // Highlights (taking out 'highlight' itself, appending _color to keys) newData.highlights = {}; - Object.keys( data.highlights ).forEach( function ( highlightedFilterName ) { - newData.highlights[ highlightedFilterName + '_color' ] = data.highlights[ highlightedFilterName ]; + $.each( data.highlights, function ( highlightedFilterName, value ) { + if ( value ) { + newData.highlights[ highlightedFilterName + '_color' ] = data.highlights[ highlightedFilterName ]; + } } ); // Add highlight @@ -167,99 +182,30 @@ return newData; }; - /** - * Get an object representing the base state of parameters - * and highlights. - * - * This is meant to make sure that the saved queries that are - * in memory are always the same structure as what we would get - * by calling the current model's "getSelectedState" and by checking - * highlight items. - * - * In cases where a user saved a query when the system had a certain - * set of params, and then a filter was added to the system, we want - * to make sure that the stored queries can still be comparable to - * the current state, which means that we need the base state for - * two operations: - * - * - Saved queries are stored in "minimal" view (only changed params - * are stored); When we initialize the system, we merge each minimal - * query with the base state (using 'getMinimalParamList') so all - * saved queries have the exact same structure as what we would get - * by checking the getSelectedState of the filter. - * - When we save the queries, we minimize the object to only represent - * whatever has actually changed, rather than store the entire - * object. To check what actually is different so we can store it, - * we need to obtain a base state to compare against, this is - * what #getMinimalParamList does - * - * @return {Object} Base parameter state - */ - mw.rcfilters.dm.SavedQueriesModel.prototype.getBaseParamState = function () { - var allParams, - highlightedItems = {}; - - if ( !this.baseParamState ) { - allParams = this.filtersModel.getParametersFromFilters( {} ); - - // Prepare highlights - this.filtersModel.getItemsSupportingHighlights().forEach( function ( item ) { - highlightedItems[ item.getName() + '_color' ] = null; - } ); - - this.baseParamState = { - params: $.extend( true, { highlight: '0' }, allParams ), - highlights: highlightedItems - }; - } - - return this.baseParamState; - }; - - /** - * Get an object that holds only the parameters and highlights that have - * values different than the base value. - * - * This is the reverse of the normalization we do initially on loading and - * initializing the saved queries model. - * - * @param {Object} valuesObject Object representing the state of both - * filters and highlights in its normalized version, to be minimized. - * @return {Object} Minimal filters and highlights list - */ - mw.rcfilters.dm.SavedQueriesModel.prototype.getMinimalParamList = function ( valuesObject ) { - var result = { params: {}, highlights: {} }, - baseState = this.getBaseParamState(); - - // XOR results - $.each( valuesObject.params, function ( name, value ) { - if ( baseState.params !== undefined && baseState.params[ name ] !== value ) { - result.params[ name ] = value; - } - } ); - - $.each( valuesObject.highlights, function ( name, value ) { - if ( baseState.highlights !== undefined && baseState.highlights[ name ] !== value ) { - result.highlights[ name ] = value; - } - } ); - - return result; - }; - /** * Add a query item * * @param {string} label Label for the new query - * @param {Object} data Data for the new query + * @param {Object} fulldata Full data representation for the new query, combining highlights and filters * @param {boolean} isDefault Item is default * @param {string} [id] Query ID, if exists. If this isn't given, a random * new ID will be created. * @return {string} ID of the newly added query */ - mw.rcfilters.dm.SavedQueriesModel.prototype.addNewQuery = function ( label, data, isDefault, id ) { - var randomID = String( id || ( new Date() ).getTime() ), - normalizedData = this.getMinimalParamList( data ); + mw.rcfilters.dm.SavedQueriesModel.prototype.addNewQuery = function ( label, fulldata, isDefault, id ) { + var normalizedData = { params: {}, highlights: {} }, + highlightParamNames = Object.keys( this.filtersModel.getEmptyHighlightParameters() ), + randomID = String( id || ( new Date() ).getTime() ), + data = this.filtersModel.getMinimizedParamRepresentation( fulldata ); + + // Split highlight/params + $.each( data, function ( param, value ) { + if ( param !== 'highlight' && highlightParamNames.indexOf( param ) > -1 ) { + normalizedData.highlights[ param ] = value; + } else { + normalizedData.params[ param ] = value; + } + } ); // Add item this.addItems( [ @@ -305,11 +251,11 @@ */ mw.rcfilters.dm.SavedQueriesModel.prototype.findMatchingQuery = function ( fullQueryComparison ) { // Minimize before comparison - fullQueryComparison = this.getMinimalParamList( fullQueryComparison ); + fullQueryComparison = this.filtersModel.getMinimizedParamRepresentation( fullQueryComparison ); return this.getItems().filter( function ( item ) { return OO.compare( - item.getData(), + item.getCombinedData(), fullQueryComparison ); } )[ 0 ]; @@ -329,16 +275,64 @@ }; /** - * Get an item's full data + * Get the full data representation of the default query, if it exists * - * @param {string} queryID Query identifier - * @return {Object} Item's full data + * @param {boolean} [excludeHiddenParams] Exclude hidden parameters in the result + * @return {Object|null} Representation of the default params if exists. + * Null if default doesn't exist or if the user is not logged in. */ - mw.rcfilters.dm.SavedQueriesModel.prototype.getItemFullData = function ( queryID ) { - var item = this.getItemByID( queryID ); + mw.rcfilters.dm.SavedQueriesModel.prototype.getDefaultParams = function ( excludeHiddenParams ) { + var data = ( !mw.user.isAnon() && this.getItemParams( this.getDefault() ) ) || {}; + + if ( excludeHiddenParams ) { + Object.keys( this.filtersModel.getDefaultHiddenParams() ).forEach( function ( paramName ) { + delete data[ paramName ]; + } ); + } - // Fill in the base params - return item ? $.extend( true, {}, this.getBaseParamState(), item.getData() ) : {}; + return data; + }; + + /** + * Get a full parameter representation of an item data + * + * @param {Object} queryID Query ID + * @return {Object} Parameter representation + */ + mw.rcfilters.dm.SavedQueriesModel.prototype.getItemParams = function ( queryID ) { + var item = this.getItemByID( queryID ), + data = item ? item.getData() : {}; + + return !$.isEmptyObject( data ) ? this.buildParamsFromData( data ) : {}; + }; + + /** + * Build a full parameter representation given item data and model sticky values state + * + * @param {Object} data Item data + * @return {Object} Full param representation + */ + mw.rcfilters.dm.SavedQueriesModel.prototype.buildParamsFromData = function ( data ) { + // Merge saved filter state with sticky filter values + var savedFilters; + + data = data || {}; + + // In order to merge sticky filters with the data, we have to + // transform this to filters first, merge, and then back to + // parameters + savedFilters = $.extend( + true, {}, + this.filtersModel.getFiltersFromParameters( data.params ), + this.filtersModel.getStickyFiltersState() + ); + + // Return parameter representation + return this.filtersModel.getMinimizedParamRepresentation( $.extend( true, {}, + this.filtersModel.getParametersFromFilters( savedFilters ), + data.highlights, + { highlight: data.params.highlight } + ) ); }; /** @@ -347,16 +341,11 @@ * @return {Object} Object representing the state of the model and items */ mw.rcfilters.dm.SavedQueriesModel.prototype.getState = function () { - var model = this, - obj = { queries: {}, version: '2' }; + var obj = { queries: {}, version: '2' }; // Translate the items to the saved object this.getItems().forEach( function ( item ) { - var itemState = item.getState(); - - itemState.data = model.getMinimalParamList( itemState.data ); - - obj.queries[ item.getID() ] = itemState; + obj.queries[ item.getID() ] = item.getState(); } ); if ( this.getDefault() ) { diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js index 81c8306cdb..a6ff9a1c25 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js @@ -91,6 +91,15 @@ return this.data; }; + /** + * Get the combined data of this item as a flat object of parameters + * + * @return {Object} Combined parameter data + */ + mw.rcfilters.dm.SavedQueryItemModel.prototype.getCombinedData = function () { + return $.extend( true, {}, this.data.params, this.data.highlights ); + }; + /** * Check whether this item is the default * diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 5b12cf7b31..0b2dd8d381 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -369,7 +369,7 @@ * Reset to default filters */ mw.rcfilters.Controller.prototype.resetToDefaults = function () { - this.uriProcessor.updateModelBasedOnQuery( this._getDefaultParams() ); + this.filtersModel.updateStateFromParams( this._getDefaultParams() ); this.updateChangesList(); }; @@ -380,23 +380,7 @@ * @return {boolean} Defaults are all false */ mw.rcfilters.Controller.prototype.areDefaultsEmpty = function () { - var defaultParams = this._getDefaultParams(), - defaultFilters = this.filtersModel.getFiltersFromParameters( defaultParams ); - - this._deleteExcludedValuesFromFilterState( defaultFilters ); - - if ( Object.keys( defaultParams ).some( function ( paramName ) { - return paramName.match( /_color$/ ) && defaultParams[ paramName ] !== null; - } ) ) { - // There are highlights in the defaults, they're definitely - // not empty - return false; - } - - // Defaults can change in a session, so we need to do this every time - return Object.keys( defaultFilters ).every( function ( filterName ) { - return !defaultFilters[ filterName ]; - } ); + return $.isEmptyObject( this._getDefaultParams( true ) ); }; /** @@ -407,10 +391,7 @@ .getHighlightedItems() .map( function ( filterItem ) { return { name: filterItem.getName() }; } ); - this.filtersModel.emptyAllFilters(); - this.filtersModel.clearAllHighlightColors(); - // Check all filter interactions - this.filtersModel.reassessFilterInteractions(); + this.filtersModel.updateStateFromParams( {} ); this.updateChangesList(); @@ -482,7 +463,7 @@ */ mw.rcfilters.Controller.prototype.toggleHighlight = function () { this.filtersModel.toggleHighlight(); - this._updateURL(); + this.uriProcessor.updateURL(); if ( this.filtersModel.isHighlightEnabled() ) { mw.hook( 'RcFilters.highlight.enable' ).fire(); @@ -513,7 +494,7 @@ */ mw.rcfilters.Controller.prototype.setHighlightColor = function ( filterName, color ) { this.filtersModel.setHighlightColor( filterName, color ); - this._updateURL(); + this.uriProcessor.updateURL(); this._trackHighlight( 'set', { name: filterName, color: color } ); }; @@ -524,7 +505,7 @@ */ mw.rcfilters.Controller.prototype.clearHighlightColor = function ( filterName ) { this.filtersModel.clearHighlightColor( filterName ); - this._updateURL(); + this.uriProcessor.updateURL(); this._trackHighlight( 'clear', filterName ); }; @@ -628,32 +609,10 @@ * @param {boolean} [setAsDefault=false] This query should be set as the default */ mw.rcfilters.Controller.prototype.saveCurrentQuery = function ( label, setAsDefault ) { - var highlightedItems = {}, - highlightEnabled = this.filtersModel.isHighlightEnabled(), - selectedState = this.filtersModel.getSelectedState(); - - // Prepare highlights - this.filtersModel.getHighlightedItems().forEach( function ( item ) { - highlightedItems[ item.getName() + '_color' ] = highlightEnabled ? - item.getHighlightColor() : null; - } ); - - // Delete all excluded filters - this._deleteExcludedValuesFromFilterState( selectedState ); - // Add item this.savedQueriesModel.addNewQuery( label || mw.msg( 'rcfilters-savedqueries-defaultlabel' ), - { - params: $.extend( - true, - { - highlight: String( Number( this.filtersModel.isHighlightEnabled() ) ) - }, - this.filtersModel.getParametersFromFilters( selectedState ) - ), - highlights: highlightedItems - }, + this.filtersModel.getCurrentParameterState( true ), setAsDefault ); @@ -704,52 +663,27 @@ * @param {string} queryID Query id */ mw.rcfilters.Controller.prototype.applySavedQuery = function ( queryID ) { - var highlights, - queryItem = this.savedQueriesModel.getItemByID( queryID ), - data = this.savedQueriesModel.getItemFullData( queryID ), - currentMatchingQuery = this.findQueryMatchingCurrentState(); + var currentMatchingQuery, + params = this.savedQueriesModel.getItemParams( queryID ); + + currentMatchingQuery = this.findQueryMatchingCurrentState(); if ( - queryItem && - ( - // If there's already a query, don't reload it - // if it's the same as the one that already exists - !currentMatchingQuery || - currentMatchingQuery.getID() !== queryItem.getID() - ) + currentMatchingQuery && + currentMatchingQuery.getID() === queryID ) { - highlights = data.highlights; - - // Update model state from filters - this.filtersModel.toggleFiltersSelected( - // Merge filters with excluded values - $.extend( - true, - {}, - this.filtersModel.getFiltersFromParameters( data.params ), - this.filtersModel.getExcludedFiltersState() - ) - ); - - // Update highlight state - this.filtersModel.toggleHighlight( !!Number( data.params.highlight ) ); - this.filtersModel.getItems().forEach( function ( filterItem ) { - var color = highlights[ filterItem.getName() + '_color' ]; - if ( color ) { - filterItem.setHighlightColor( color ); - } else { - filterItem.clearHighlightColor(); - } - } ); + // If the query we want to load is the one that is already + // loaded, don't reload it + return; + } - // Check all filter interactions - this.filtersModel.reassessFilterInteractions(); + // Apply parameters to model + this.filtersModel.updateStateFromParams( params ); - this.updateChangesList(); + this.updateChangesList(); - // Log filter grouping - this.trackFilterGroupings( 'savedfilters' ); - } + // Log filter grouping + this.trackFilterGroupings( 'savedfilters' ); }; /** @@ -759,44 +693,11 @@ * @return {boolean} Query exists */ mw.rcfilters.Controller.prototype.findQueryMatchingCurrentState = function () { - var highlightedItems = {}, - selectedState = this.filtersModel.getSelectedState(); - - // Prepare highlights of the current query - this.filtersModel.getItemsSupportingHighlights().forEach( function ( item ) { - highlightedItems[ item.getName() + '_color' ] = item.getHighlightColor(); - } ); - - // Remove anything that should be excluded from the saved query - // this includes sticky filters and filters marked with 'excludedFromSavedQueries' - this._deleteExcludedValuesFromFilterState( selectedState ); - return this.savedQueriesModel.findMatchingQuery( - { - params: $.extend( - true, - { - highlight: String( Number( this.filtersModel.isHighlightEnabled() ) ) - }, - this.filtersModel.getParametersFromFilters( selectedState ) - ), - highlights: highlightedItems - } + this.filtersModel.getCurrentParameterState( true ) ); }; - /** - * Delete sticky filters from given object - * - * @param {Object} filterState Filter state - */ - mw.rcfilters.Controller.prototype._deleteExcludedValuesFromFilterState = function ( filterState ) { - // Remove excluded filters - $.each( this.filtersModel.getExcludedFiltersState(), function ( filterName ) { - delete filterState[ filterName ]; - } ); - }; - /** * Save the current state of the saved queries model with all * query item representation in the user settings. @@ -924,7 +825,7 @@ * without adding an history entry. */ mw.rcfilters.Controller.prototype.replaceUrl = function () { - mw.rcfilters.UriProcessor.static.replaceState( this._getUpdatedUri() ); + this.uriProcessor.replaceUpdatedUri(); }; /** @@ -960,7 +861,7 @@ updateMode = updateMode === undefined ? this.FILTER_CHANGE : updateMode; if ( updateMode === this.FILTER_CHANGE ) { - this._updateURL( params ); + this.uriProcessor.updateURL( params ); } if ( updateMode === this.FILTER_CHANGE || updateMode === this.SHOW_NEW_CHANGES ) { this.changesListModel.invalidate(); @@ -992,81 +893,17 @@ * Get an object representing the default parameter state, whether * it is from the model defaults or from the saved queries. * + * @param {boolean} [excludeHiddenParams] Exclude hidden and sticky params * @return {Object} Default parameters */ - mw.rcfilters.Controller.prototype._getDefaultParams = function () { - var savedFilters, - data = ( !mw.user.isAnon() && this.savedQueriesModel.getItemFullData( this.savedQueriesModel.getDefault() ) ) || {}; - - if ( !$.isEmptyObject( data ) ) { - // Merge saved filter state with sticky filter values - savedFilters = $.extend( - true, {}, - this.filtersModel.getFiltersFromParameters( data.params ), - this.filtersModel.getStickyFiltersState() - ); - - // Return parameter representation - return $.extend( true, {}, - this.filtersModel.getParametersFromFilters( savedFilters ), - data.highlights, - { highlight: data.params.highlight } - ); - } - return this.filtersModel.getDefaultParams(); - }; - - /** - * Update the URL of the page to reflect current filters - * - * This should not be called directly from outside the controller. - * If an action requires changing the URL, it should either use the - * highlighting actions below, or call #updateChangesList which does - * the uri corrections already. - * - * @param {Object} [params] Extra parameters to add to the API call - */ - mw.rcfilters.Controller.prototype._updateURL = function ( params ) { - var currentUri = new mw.Uri(), - updatedUri = this._getUpdatedUri(); - - updatedUri.extend( params || {} ); - - if ( - this.uriProcessor.getVersion( currentUri.query ) !== 2 || - this.uriProcessor.isNewState( currentUri.query, updatedUri.query ) - ) { - mw.rcfilters.UriProcessor.static.replaceState( updatedUri ); + mw.rcfilters.Controller.prototype._getDefaultParams = function ( excludeHiddenParams ) { + if ( this.savedQueriesModel.getDefault() ) { + return this.savedQueriesModel.getDefaultParams( excludeHiddenParams ); + } else { + return this.filtersModel.getDefaultParams( excludeHiddenParams ); } }; - /** - * Get an updated mw.Uri object based on the model state - * - * @return {mw.Uri} Updated Uri - */ - mw.rcfilters.Controller.prototype._getUpdatedUri = function () { - var uri = new mw.Uri(); - - // Minimize url - uri.query = this.uriProcessor.minimizeQuery( - $.extend( - true, - {}, - // We want to retain unrecognized params - // The uri params from model will override - // any recognized value in the current uri - // query, retain unrecognized params, and - // the result will then be minimized - uri.query, - this.uriProcessor.getUriParametersFromModel(), - { urlversion: '2' } - ) - ); - - return uri; - }; - /** * Query the list of changes from the server for the current filters * @@ -1077,8 +914,8 @@ * @return {jQuery.Promise} Promise object resolved with { content, status } */ mw.rcfilters.Controller.prototype._queryChangesList = function ( counterId, params ) { - var uri = this._getUpdatedUri(), - stickyParams = this.filtersModel.getStickyParams(), + var uri = this.uriProcessor.getUpdatedUri(), + stickyParams = this.filtersModel.getStickyParamsValues(), requestId, latestRequest; diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js index 0450639812..044712c6bf 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js @@ -6,11 +6,7 @@ * @param {mw.rcfilters.dm.FiltersViewModel} filtersModel Filters view model */ mw.rcfilters.UriProcessor = function MwRcfiltersController( filtersModel ) { - this.emptyParameterState = {}; this.filtersModel = filtersModel; - - // Initialize - this._buildEmptyParameterState(); }; /* Initialization */ @@ -59,104 +55,110 @@ }; /** - * Update the filters model based on the URI query - * This happens on initialization, and from this moment on, - * we consider the system synchronized, and the model serves - * as the source of truth for the URL. - * - * This methods should only be called once on initialiation. - * After initialization, the model updates the URL, not the - * other way around. - * - * @param {Object} [uriQuery] URI query + * Replace the current URI with an updated one from the model state */ - mw.rcfilters.UriProcessor.prototype.updateModelBasedOnQuery = function ( uriQuery ) { - var parameters; - - uriQuery = uriQuery || new mw.Uri().query; - - // For arbitrary numeric single_option values, check the uri and see if it's beyond the limit - $.each( this.filtersModel.getFilterGroups(), function ( groupName, groupModel ) { - if ( - groupModel.getType() === 'single_option' && - groupModel.isAllowArbitrary() - ) { - if ( - groupModel.getMaxValue() !== null && - uriQuery[ groupName ] > groupModel.getMaxValue() - ) { - // Change the value to the actual max value - uriQuery[ groupName ] = String( groupModel.getMaxValue() ); - } else if ( - groupModel.getMinValue() !== null && - uriQuery[ groupName ] < groupModel.getMinValue() - ) { - // Change the value to the actual min value - uriQuery[ groupName ] = String( groupModel.getMinValue() ); - } - } - } ); - - // Normalize - parameters = this._getNormalizedQueryParams( uriQuery ); + mw.rcfilters.UriProcessor.prototype.replaceUpdatedUri = function () { + this.constructor.static.replaceState( this.getUpdatedUri() ); + }; - // Update filter states - this.filtersModel.toggleFiltersSelected( - this.filtersModel.getFiltersFromParameters( - parameters + /** + * Get an updated mw.Uri object based on the model state + * + * @param {Object} [uriQuery] An external URI query to build the new uri + * with. This is mainly for tests, to be able to supply external parameters + * and make sure they are retained. + * @return {mw.Uri} Updated Uri + */ + mw.rcfilters.UriProcessor.prototype.getUpdatedUri = function ( uriQuery ) { + var uri = new mw.Uri(), + unrecognizedParams = this.getUnrecognizedParams( uriQuery || uri.query ); + + if ( uriQuery ) { + // This is mainly for tests, to be able to give the method + // an initial URI Query and test that it retains parameters + uri.query = uriQuery; + } + + uri.query = this.filtersModel.getMinimizedParamRepresentation( + $.extend( + true, + {}, + uri.query, + // The representation must be expanded so it can + // override the uri query params but we then output + // a minimized version for the entire URI representation + // for the method + this.filtersModel.getExpandedParamRepresentation() ) ); - // Update highlight state - this.filtersModel.getItems().forEach( function ( filterItem ) { - var color = parameters[ filterItem.getName() + '_color' ]; - if ( color ) { - filterItem.setHighlightColor( color ); - } else { - filterItem.clearHighlightColor(); - } - } ); - this.filtersModel.toggleHighlight( !!Number( parameters.highlight ) ); + // Reapply unrecognized params and url version + uri.query = $.extend( true, {}, uri.query, unrecognizedParams, { urlversion: '2' } ); - // Check all filter interactions - this.filtersModel.reassessFilterInteractions(); + return uri; }; /** - * Get parameters representing the current state of the model + * Get an object representing given parameters that are unrecognized by the model * - * @return {Object} Uri query parameters + * @param {Object} params Full params object + * @return {Object} Unrecognized params */ - mw.rcfilters.UriProcessor.prototype.getUriParametersFromModel = function () { - return $.extend( - true, - {}, - this.filtersModel.getParametersFromFilters(), - this.filtersModel.getHighlightParameters(), - { - highlight: String( Number( this.filtersModel.isHighlightEnabled() ) ) + mw.rcfilters.UriProcessor.prototype.getUnrecognizedParams = function ( params ) { + // Start with full representation + var givenParamNames = Object.keys( params ), + unrecognizedParams = $.extend( true, {}, params ); + + // Extract unrecognized parameters + Object.keys( this.filtersModel.getEmptyParameterState() ).forEach( function ( paramName ) { + // Remove recognized params + if ( givenParamNames.indexOf( paramName ) > -1 ) { + delete unrecognizedParams[ paramName ]; } - ); + } ); + + return unrecognizedParams; }; /** - * Build the full parameter representation based on given query parameters + * Update the URL of the page to reflect current filters * - * @private - * @param {Object} uriQuery Given URI query - * @return {Object} Full parameter state representing the URI query + * This should not be called directly from outside the controller. + * If an action requires changing the URL, it should either use the + * highlighting actions below, or call #updateChangesList which does + * the uri corrections already. + * + * @param {Object} [params] Extra parameters to add to the API call */ - mw.rcfilters.UriProcessor.prototype._expandModelParameters = function ( uriQuery ) { - var filterRepresentation = this.filtersModel.getFiltersFromParameters( uriQuery ); + mw.rcfilters.UriProcessor.prototype.updateURL = function ( params ) { + var currentUri = new mw.Uri(), + updatedUri = this.getUpdatedUri(); + + updatedUri.extend( params || {} ); + + if ( + this.getVersion( currentUri.query ) !== 2 || + this.isNewState( currentUri.query, updatedUri.query ) + ) { + this.constructor.static.replaceState( updatedUri ); + } + }; - return $.extend( true, - {}, - uriQuery, - this.filtersModel.getParametersFromFilters( filterRepresentation ), - this.filtersModel.extractHighlightValues( uriQuery ), - { - highlight: String( Number( uriQuery.highlight ) ) - } + /** + * Update the filters model based on the URI query + * This happens on initialization, and from this moment on, + * we consider the system synchronized, and the model serves + * as the source of truth for the URL. + * + * This methods should only be called once on initialiation. + * After initialization, the model updates the URL, not the + * other way around. + * + * @param {Object} [uriQuery] URI query + */ + mw.rcfilters.UriProcessor.prototype.updateModelBasedOnQuery = function ( uriQuery ) { + this.filtersModel.updateStateFromParams( + this._getNormalizedQueryParams( uriQuery || new mw.Uri().query ) ); }; @@ -181,8 +183,18 @@ // This will allow us to always have a proper check of whether // the requested new url is one to change or not, regardless of // actual parameter visibility/representation in the URL - currentParamState = this._expandModelParameters( currentUriQuery ); - updatedParamState = this._expandModelParameters( updatedUriQuery ); + currentParamState = $.extend( + true, + {}, + this.filtersModel.getMinimizedParamRepresentation( currentUriQuery ), + this.getUnrecognizedParams( currentUriQuery ) + ); + updatedParamState = $.extend( + true, + {}, + this.filtersModel.getMinimizedParamRepresentation( updatedUriQuery ), + this.getUnrecognizedParams( updatedUriQuery ) + ); return notEquivalent( currentParamState, updatedParamState ); }; @@ -196,7 +208,7 @@ */ mw.rcfilters.UriProcessor.prototype.doesQueryContainRecognizedParams = function ( uriQuery ) { var anyValidInUrl, - validParameterNames = Object.keys( this._getEmptyParameterState() ) + validParameterNames = Object.keys( this.filtersModel.getEmptyParameterState() ) .filter( function ( param ) { // Remove 'highlight' parameter from this check; // if it's the only parameter in the URL we still @@ -214,35 +226,11 @@ return anyValidInUrl || this.getVersion( uriQuery ) === 2; }; - /** - * Remove all parameters that have the same value as the base state - * This method expects uri queries of the urlversion=2 format - * - * @private - * @param {Object} uriQuery Current uri query - * @return {Object} Minimized query - */ - mw.rcfilters.UriProcessor.prototype.minimizeQuery = function ( uriQuery ) { - var baseParams = this._getEmptyParameterState(), - uriResult = $.extend( true, {}, uriQuery ); - - $.each( uriResult, function ( paramName, paramValue ) { - if ( - baseParams[ paramName ] !== undefined && - baseParams[ paramName ] === paramValue - ) { - // Remove parameter from query - delete uriResult[ paramName ]; - } - } ); - - return uriResult; - }; - /** * Get the adjusted URI params based on the url version * If the urlversion is not 2, the parameters are merged with * the model's defaults. + * Always merge in the hidden parameter defaults. * * @private * @param {Object} uriQuery Current URI query @@ -257,53 +245,18 @@ // wiki default. // Any subsequent change of the URL through the RCFilters // system will receive 'urlversion=2' - var hiddenParamDefaults = {}, + var hiddenParamDefaults = this.filtersModel.getDefaultHiddenParams(), base = this.getVersion( uriQuery ) === 2 ? {} : this.filtersModel.getDefaultParams(); - // Go over the model and get all hidden parameters' defaults - // These defaults should be applied regardless of the urlversion - // but be overridden by the URL params if they exist - $.each( this.filtersModel.getFilterGroups(), function ( groupName, groupModel ) { - if ( groupModel.isHidden() ) { - $.extend( true, hiddenParamDefaults, groupModel.getDefaultParams() ); - } - } ); - - return this.minimizeQuery( - $.extend( true, {}, hiddenParamDefaults, base, uriQuery, { urlversion: '2' } ) - ); - }; - - /** - * Get the representation of an empty parameter state - * - * @private - * @return {Object} Empty parameter state - */ - mw.rcfilters.UriProcessor.prototype._getEmptyParameterState = function () { - // Override empty parameter state with the sticky parameter values - return $.extend( true, {}, this.emptyParameterState, this.filtersModel.getStickyParams() ); - }; - - /** - * Build an empty representation of the parameters, where all parameters - * are either set to '0' or '' depending on their type. - * This must run during initialization, before highlights are set. - * - * @private - */ - mw.rcfilters.UriProcessor.prototype._buildEmptyParameterState = function () { - var emptyParams = this.filtersModel.getParametersFromFilters( {} ), - emptyHighlights = this.filtersModel.getEmptyHighlightParameters(); - - this.emptyParameterState = $.extend( + return $.extend( true, {}, - emptyParams, - emptyHighlights, - { highlight: '0' } + this.filtersModel.getMinimizedParamRepresentation( + $.extend( true, {}, hiddenParamDefaults, base, uriQuery ) + ), + { urlversion: '2' } ); }; }( mediaWiki, jQuery ) ); diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php index d96758892e..5a0834a651 100644 --- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php +++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php @@ -15,6 +15,13 @@ use Wikimedia\TestingAccessWrapper; * @covers ChangesListSpecialPage */ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase { + public function setUp() { + parent::setUp(); + $this->setMwGlobals( [ + 'wgStructuredChangeFiltersShowPreference' => true, + ] ); + } + protected function getPage() { $mock = $this->getMockBuilder( ChangesListSpecialPage::class ) ->setConstructorArgs( diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js index 38ade4ddcd..291d5c747c 100644 --- a/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js +++ b/tests/qunit/suites/resources/mediawiki.rcfilters/UriProcessor.test.js @@ -6,24 +6,24 @@ title: 'Group 1', type: 'send_unselected_if_any', filters: [ - { name: 'filter1', default: true }, - { name: 'filter2' } + { name: 'filter1', cssClass: 'filter1class', default: true }, + { name: 'filter2', cssClass: 'filter2class' } ] }, { name: 'group2', title: 'Group 2', type: 'send_unselected_if_any', filters: [ - { name: 'filter3' }, - { name: 'filter4', default: true } + { name: 'filter3', cssClass: 'filter3class' }, + { name: 'filter4', cssClass: 'filter4class', default: true } ] }, { name: 'group3', title: 'Group 3', type: 'string_options', filters: [ - { name: 'filter5' }, - { name: 'filter6' } + { name: 'filter5', cssClass: 'filter5class' }, + { name: 'filter6' } // Not supporting highlights ] } ], minimalDefaultParams = { @@ -49,55 +49,79 @@ ); } ); - QUnit.test( 'updateModelBasedOnQuery & getUriParametersFromModel', function ( assert ) { + QUnit.test( 'getUpdatedUri', function ( assert ) { var uriProcessor, - filtersModel = new mw.rcfilters.dm.FiltersViewModel(), - baseParams = { - filter1: '0', - filter2: '0', - filter3: '0', - filter4: '0', - group3: '', - highlight: '0', - group1__filter1_color: null, - group1__filter2_color: null, - group2__filter3_color: null, - group2__filter4_color: null, - group3__filter5_color: null, - group3__filter6_color: null - }; + filtersModel = new mw.rcfilters.dm.FiltersViewModel(); + + filtersModel.initializeFilters( mockFilterStructure ); + uriProcessor = new mw.rcfilters.UriProcessor( filtersModel ); + + assert.deepEqual( + ( uriProcessor.getUpdatedUri( {} ) ).query, + { urlversion: '2' }, + 'Empty model state with empty uri state, assumes the given uri is already normalized, and adds urlversion=2' + ); + + assert.deepEqual( + ( uriProcessor.getUpdatedUri( { foo: 'bar' } ) ).query, + { urlversion: '2', foo: 'bar' }, + 'Empty model state with unrecognized params retains unrecognized params' + ); + + // Update the model + filtersModel.toggleFiltersSelected( { + group1__filter1: true, // Param: filter2: '1' + group3__filter5: true // Param: group3: 'filter5' + } ); + + assert.deepEqual( + ( uriProcessor.getUpdatedUri( {} ) ).query, + { urlversion: '2', filter2: '1', group3: 'filter5' }, + 'Model state is reflected in the updated URI' + ); + + assert.deepEqual( + ( uriProcessor.getUpdatedUri( { foo: 'bar' } ) ).query, + { urlversion: '2', filter2: '1', group3: 'filter5', foo: 'bar' }, + 'Model state is reflected in the updated URI with existing uri params' + ); + } ); + + QUnit.test( 'updateModelBasedOnQuery', function ( assert ) { + var uriProcessor, + filtersModel = new mw.rcfilters.dm.FiltersViewModel(); filtersModel.initializeFilters( mockFilterStructure ); uriProcessor = new mw.rcfilters.UriProcessor( filtersModel ); uriProcessor.updateModelBasedOnQuery( {} ); assert.deepEqual( - uriProcessor.getUriParametersFromModel(), - $.extend( true, {}, baseParams, minimalDefaultParams ), + filtersModel.getCurrentParameterState(), + minimalDefaultParams, 'Version 1: Empty url query sets model to defaults' ); uriProcessor.updateModelBasedOnQuery( { urlversion: '2' } ); assert.deepEqual( - uriProcessor.getUriParametersFromModel(), - baseParams, + filtersModel.getCurrentParameterState(), + {}, 'Version 2: Empty url query sets model to all-false' ); uriProcessor.updateModelBasedOnQuery( { filter1: '1', urlversion: '2' } ); assert.deepEqual( - uriProcessor.getUriParametersFromModel(), - $.extend( true, {}, baseParams, { filter1: '1' } ), + filtersModel.getCurrentParameterState(), + $.extend( true, {}, { filter1: '1' } ), 'Parameters in Uri query set parameter value in the model' ); uriProcessor.updateModelBasedOnQuery( { highlight: '1', group1__filter1_color: 'c1', urlversion: '2' } ); assert.deepEqual( - uriProcessor.getUriParametersFromModel(), - $.extend( true, {}, baseParams, { + filtersModel.getCurrentParameterState(), + { highlight: '1', group1__filter1_color: 'c1' - } ), + }, 'Highlight parameters in Uri query set highlight state in the model' ); } ); diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js index 4eec02a9af..dde49ba00b 100644 --- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js +++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js @@ -7,6 +7,7 @@ { name: 'filter1', label: 'group1filter1-label', description: 'group1filter1-desc', default: true, + cssClass: 'filter1class', conflicts: [ { group: 'group2' } ], subset: [ { @@ -22,6 +23,7 @@ { name: 'filter2', label: 'group1filter2-label', description: 'group1filter2-desc', conflicts: [ { group: 'group2', filter: 'filter6' } ], + cssClass: 'filter2class', subset: [ { group: 'group1', @@ -29,18 +31,20 @@ } ] }, + // NOTE: This filter has no highlight! { name: 'filter3', label: 'group1filter3-label', description: 'group1filter3-desc', default: true } ] }, { name: 'group2', type: 'send_unselected_if_any', fullCoverage: true, + excludedFromSavedQueries: true, conflicts: [ { group: 'group1', filter: 'filter1' } ], filters: [ - { name: 'filter4', label: 'group2filter4-label', description: 'group2filter4-desc' }, - { name: 'filter5', label: 'group2filter5-label', description: 'group2filter5-desc', default: true }, + { name: 'filter4', label: 'group2filter4-label', description: 'group2filter4-desc', cssClass: 'filter4class' }, + { name: 'filter5', label: 'group2filter5-label', description: 'group2filter5-desc', default: true, cssClass: 'filter5class' }, { - name: 'filter6', label: 'group2filter6-label', description: 'group2filter6-desc', + name: 'filter6', label: 'group2filter6-label', description: 'group2filter6-desc', cssClass: 'filter6class', conflicts: [ { group: 'group1', filter: 'filter2' } ] } ] @@ -50,15 +54,16 @@ separator: ',', default: 'filter8', filters: [ - { name: 'filter7', label: 'group3filter7-label', description: 'group3filter7-desc' }, - { name: 'filter8', label: 'group3filter8-label', description: 'group3filter8-desc' }, - { name: 'filter9', label: 'group3filter9-label', description: 'group3filter9-desc' } + { name: 'filter7', label: 'group3filter7-label', description: 'group3filter7-desc', cssClass: 'filter7class' }, + { name: 'filter8', label: 'group3filter8-label', description: 'group3filter8-desc', cssClass: 'filter8class' }, + { name: 'filter9', label: 'group3filter9-label', description: 'group3filter9-desc', cssClass: 'filter9class' } ] }, { name: 'group4', type: 'single_option', default: 'option2', filters: [ + // NOTE: The entire group has no highlight supported { name: 'option1', label: 'group4option1-label', description: 'group4option1-desc' }, { name: 'option2', label: 'group4option2-label', description: 'group4option2-desc' }, { name: 'option3', label: 'group4option3-label', description: 'group4option3-desc' } @@ -67,18 +72,18 @@ name: 'group5', type: 'single_option', filters: [ - { name: 'option1', label: 'group5option1-label', description: 'group5option1-desc' }, - { name: 'option2', label: 'group5option2-label', description: 'group5option2-desc' }, - { name: 'option3', label: 'group5option3-label', description: 'group5option3-desc' } + { name: 'option1', label: 'group5option1-label', description: 'group5option1-desc', cssClass: 'group5opt1class' }, + { name: 'option2', label: 'group5option2-label', description: 'group5option2-desc', cssClass: 'group5opt2class' }, + { name: 'option3', label: 'group5option3-label', description: 'group5option3-desc', cssClass: 'group5opt3class' } ] }, { name: 'group6', type: 'boolean', isSticky: true, filters: [ - { name: 'group6option1', label: 'group6option1-label', description: 'group6option1-desc' }, - { name: 'group6option2', label: 'group6option2-label', description: 'group6option2-desc', default: true }, - { name: 'group6option3', label: 'group6option3-label', description: 'group6option3-desc', default: true } + { name: 'group6option1', label: 'group6option1-label', description: 'group6option1-desc', cssClass: 'group6opt1class' }, + { name: 'group6option2', label: 'group6option2-label', description: 'group6option2-desc', default: true, cssClass: 'group6opt2class' }, + { name: 'group6option3', label: 'group6option3-label', description: 'group6option3-desc', default: true, cssClass: 'group6opt3class' } ] }, { name: 'group7', @@ -86,9 +91,9 @@ isSticky: true, default: 'group7option2', filters: [ - { name: 'group7option1', label: 'group7option1-label', description: 'group7option1-desc' }, - { name: 'group7option2', label: 'group7option2-label', description: 'group7option2-desc' }, - { name: 'group7option3', label: 'group7option3-label', description: 'group7option3-desc' } + { name: 'group7option1', label: 'group7option1-label', description: 'group7option1-desc', cssClass: 'group7opt1class' }, + { name: 'group7option2', label: 'group7option2-label', description: 'group7option2-desc', cssClass: 'group7opt2class' }, + { name: 'group7option3', label: 'group7option3-label', description: 'group7option3-desc', cssClass: 'group7opt3class' } ] } ], viewsDefinition = { @@ -101,10 +106,10 @@ type: 'string_options', separator: ';', filters: [ - { name: 0, label: 'Main' }, - { name: 1, label: 'Talk' }, - { name: 2, label: 'User' }, - { name: 3, label: 'User talk' } + { name: 0, label: 'Main', cssClass: 'namespace-0' }, + { name: 1, label: 'Talk', cssClass: 'namespace-1' }, + { name: 2, label: 'User', cssClass: 'namespace-2' }, + { name: 3, label: 'User talk', cssClass: 'namespace-3' } ] } ] } @@ -141,6 +146,49 @@ group7: 'group7option2', namespace: '' }, + emptyParamRepresentation = { + filter1: '0', + filter2: '0', + filter3: '0', + filter4: '0', + filter5: '0', + filter6: '0', + group3: '', + group4: '', + group5: '', + group6option1: '0', + group6option2: '0', + group6option3: '0', + group7: '', + namespace: '', + highlight: '0', + // Null highlights + group1__filter1_color: null, + group1__filter2_color: null, + // group1__filter3_color: null, // Highlight isn't supported + group2__filter4_color: null, + group2__filter5_color: null, + group2__filter6_color: null, + group3__filter7_color: null, + group3__filter8_color: null, + group3__filter9_color: null, + // group4__option1_color: null, // Highlight isn't supported + // group4__option2_color: null, // Highlight isn't supported + // group4__option3_color: null, // Highlight isn't supported + group5__option1_color: null, + group5__option2_color: null, + group5__option3_color: null, + group6__group6option1_color: null, + group6__group6option2_color: null, + group6__group6option3_color: null, + group7__group7option1_color: null, + group7__group7option2_color: null, + group7__group7option3_color: null, + namespace__0_color: null, + namespace__1_color: null, + namespace__2_color: null, + namespace__3_color: null + }, baseFilterRepresentation = { group1__filter1: false, group1__filter2: false, @@ -278,6 +326,165 @@ ); } ); + QUnit.test( 'Parameter minimal state', function ( assert ) { + var model = new mw.rcfilters.dm.FiltersViewModel(), + cases = [ + { + input: {}, + result: {}, + msg: 'Empty parameter representation produces an empty result' + }, + { + input: { + filter1: '1', + filter2: '0', + filter3: '0', + group3: '', + group4: 'option2' + }, + result: { + filter1: '1', + group4: 'option2' + }, + msg: 'Mixed input results in only non-falsey values as result' + }, + { + input: { + filter1: '0', + filter2: '0', + filter3: '0', + group3: '', + group4: '', + group1__filter1_color: null + }, + result: {}, + msg: 'An all-falsey input results in an empty result.' + }, + { + input: { + filter1: '0', + filter2: '0', + filter3: '0', + group3: '', + group4: '', + group1__filter1_color: 'c1' + }, + result: { + group1__filter1_color: 'c1' + }, + msg: 'An all-falsey input with highlight params result in only the highlight param.' + }, + { + input: { + group1__filter1_color: 'c1', + group1__filter3_color: 'c3' // Not supporting highlights + }, + result: { + group1__filter1_color: 'c1' + }, + msg: 'Unsupported highlights are removed.' + } + ]; + + model.initializeFilters( filterDefinition, viewsDefinition ); + + cases.forEach( function ( test ) { + assert.deepEqual( + model.getMinimizedParamRepresentation( test.input ), + test.result, + test.msg + ); + } ); + } ); + + QUnit.test( 'Parameter states', function ( assert ) { + // Some groups / params have their defaults immediately applied + // to their state. These include single_option which can never + // be empty, etc. These are these states: + var parametersWithoutExcluded, + appliedDefaultParameters = { + group4: 'option2', + group5: 'option1', + // Sticky, their defaults apply immediately + group6option2: '1', + group6option3: '1', + group7: 'group7option2' + }, + model = new mw.rcfilters.dm.FiltersViewModel(); + + model.initializeFilters( filterDefinition, viewsDefinition ); + assert.deepEqual( + model.getEmptyParameterState(), + emptyParamRepresentation, + 'Producing an empty parameter state' + ); + + model.toggleFiltersSelected( { + group1__filter1: true, + group3__filter7: true + } ); + + assert.deepEqual( + model.getCurrentParameterState(), + // appliedDefaultParams applies the default value to parameters + // who must have an initial value to begin with, so we have to + // take it into account in the current state + $.extend( true, {}, appliedDefaultParameters, { + filter2: '1', + filter3: '1', + group3: 'filter7' + } ), + 'Producing a current parameter state' + ); + + // Reset + model = new mw.rcfilters.dm.FiltersViewModel(); + model.initializeFilters( filterDefinition, viewsDefinition ); + + parametersWithoutExcluded = $.extend( true, {}, appliedDefaultParameters ); + delete parametersWithoutExcluded.group7; + delete parametersWithoutExcluded.group6option2; + delete parametersWithoutExcluded.group6option3; + + assert.deepEqual( + model.getCurrentParameterState( true ), + parametersWithoutExcluded, + 'Producing a current clean parameter state without excluded filters' + ); + } ); + + QUnit.test( 'Cleaning up parameter states', function ( assert ) { + var model = new mw.rcfilters.dm.FiltersViewModel(), + cases = [ + { + input: {}, + result: {}, + msg: 'Empty parameter representation produces an empty result' + }, + { + input: { + filter1: '1', // Regular (do not strip) + group6option1: '1', // Sticky + filter4: '1', // Excluded + filter5: '0' // Excluded + }, + result: { filter1: '1' }, + msg: 'Valid input strips all sticky and excluded params regardless of value' + } + ]; + + model.initializeFilters( filterDefinition, viewsDefinition ); + + cases.forEach( function ( test ) { + assert.deepEqual( + model.removeExcludedParams( test.input ), + test.result, + test.msg + ); + } ); + + } ); + QUnit.test( 'Finding matching filters', function ( assert ) { var matches, testCases = [ diff --git a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js index 6a0592069f..539bab4f19 100644 --- a/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js +++ b/tests/qunit/suites/resources/mediawiki.rcfilters/dm.SavedQueriesModel.test.js @@ -6,28 +6,38 @@ filters: [ // Note: The fact filter2 is default means that in the // filter representation, filter1 and filter3 are 'true' - { name: 'filter1' }, - { name: 'filter2', default: true }, - { name: 'filter3' } + { name: 'filter1', cssClass: 'filter1class' }, + { name: 'filter2', cssClass: 'filter2class', default: true }, + { name: 'filter3', cssClass: 'filter3class' } ] }, { name: 'group2', type: 'string_options', separator: ',', filters: [ - { name: 'filter4' }, - { name: 'filter5' }, - { name: 'filter6' } + { name: 'filter4', cssClass: 'filter4class' }, + { name: 'filter5' }, // NOTE: Not supporting highlights! + { name: 'filter6', cssClass: 'filter6class' } ] }, { name: 'group3', type: 'boolean', isSticky: true, filters: [ - { name: 'group3option1' }, - { name: 'group3option2' }, - { name: 'group3option3' } + { name: 'group3option1', cssClass: 'filter1class' }, + { name: 'group3option2', cssClass: 'filter1class' }, + { name: 'group3option3', cssClass: 'filter1class' } ] + }, { + // Copy of the way the controller defines invert + // to check whether the conversion works + name: 'invertGroup', + type: 'boolean', + hidden: true, + filters: [ { + name: 'invert', + default: '0' + } ] } ], queriesFilterRepresentation = { queries: { @@ -54,9 +64,10 @@ }, highlights: { highlight: true, - filter1: 'c5', - group3option1: 'c1' - } + group1__filter1: 'c5', + group3__group3option1: 'c1' + }, + invert: true } } } @@ -78,8 +89,8 @@ highlight: '1' }, highlights: { - filter1_color: 'c5', - group3option1_color: 'c1' + group1__filter1_color: 'c5', + group3__group3option1_color: 'c1' } } } @@ -102,7 +113,7 @@ filter2: '1' }, highlights: { - filter5_color: 'c2' + group1__filter3_color: 'c2' } } } @@ -125,6 +136,22 @@ finalState: $.extend( true, {}, queriesParamRepresentation ), msg: 'Conversion from filter representation to parameters retains data.' }, + { + // Converting from old structure + input: $.extend( true, {}, queriesFilterRepresentation, { queries: { 1234: { data: { + filters: { + // Entire group true: normalize params + filter1: true, + filter2: true, + filter3: true + }, + highlights: { + filter3: null // Get rid of empty highlight + } + } } } } ), + finalState: $.extend( true, {}, queriesParamRepresentation ), + msg: 'Conversion from filter representation to parameters normalizes params and highlights.' + }, { // Converting from old structure with default input: $.extend( true, { default: '1234' }, queriesFilterRepresentation ), @@ -136,6 +163,13 @@ input: $.extend( true, {}, queriesParamRepresentation ), finalState: $.extend( true, {}, queriesParamRepresentation ), msg: 'Parameter representation retains its queries structure' + }, + { + // Do not touch invalid color parameters from the initialization routine + // (Normalization, or "fixing" the query should only happen when we add new query or actively convert queries) + input: $.extend( true, { queries: { 1234: { data: { highlights: { group2__filter5_color: 'c2' } } } } }, exampleQueryStructure ), + finalState: $.extend( true, { queries: { 1234: { data: { highlights: { group2__filter5_color: 'c2' } } } } }, exampleQueryStructure ), + msg: 'Structure that contains invalid highlights remains the same in initialization' } ]; @@ -151,6 +185,103 @@ } ); } ); + QUnit.test( 'Adding new queries', function ( assert ) { + var filtersModel = new mw.rcfilters.dm.FiltersViewModel(), + queriesModel = new mw.rcfilters.dm.SavedQueriesModel( filtersModel ), + cases = [ + { + methodParams: [ + 'label1', // Label + { // Data + filter1: '1', + filter2: '2', + group1__filter1_color: 'c2', + group1__filter3_color: 'c5' + }, + true, // isDefault + '1234' // ID + ], + result: { + itemState: { + label: 'label1', + data: { + params: { + filter1: '1', + filter2: '2' + }, + highlights: { + group1__filter1_color: 'c2', + group1__filter3_color: 'c5' + } + } + }, + isDefault: true, + id: '1234' + }, + msg: 'Given valid data is preserved.' + }, + { + methodParams: [ + 'label2', + { + filter1: '1', + invert: '1', + filter15: '1', // Invalid filter - removed + filter2: '0', // Falsey value - removed + group1__filter1_color: 'c3', + foobar: 'w00t' // Unrecognized parameter - removed + } + ], + result: { + itemState: { + label: 'label2', + data: { + params: { + filter1: '1', + invert: '1' + }, + highlights: { + group1__filter1_color: 'c3' + } + } + }, + isDefault: false + }, + msg: 'Given data with invalid filters and highlights is normalized' + } + ]; + + filtersModel.initializeFilters( filterDefinition ); + + // Start with an empty saved queries model + queriesModel.initialize( {} ); + + cases.forEach( function ( testCase ) { + var itemID = queriesModel.addNewQuery.apply( queriesModel, testCase.methodParams ), + item = queriesModel.getItemByID( itemID ); + + assert.deepEqual( + item.getState(), + testCase.result.itemState, + testCase.msg + ' (itemState)' + ); + + assert.equal( + item.isDefault(), + testCase.result.isDefault, + testCase.msg + ' (isDefault)' + ); + + if ( testCase.result.id !== undefined ) { + assert.equal( + item.getID(), + testCase.result.id, + testCase.msg + ' (item ID)' + ); + } + } ); + } ); + QUnit.test( 'Manipulating queries', function ( assert ) { var id1, id2, item1, matchingItem, queriesStructure = {}, @@ -166,25 +297,18 @@ id1 = queriesModel.addNewQuery( 'New query 1', { - params: { - group2: 'filter5', - highlight: '1' - }, - highlights: { - filter1_color: 'c5', - group3option1_color: 'c1' - } + group2: 'filter5', + highlight: '1', + group1__filter1_color: 'c5', + group3__group3option1_color: 'c1' } ); id2 = queriesModel.addNewQuery( 'New query 2', { - params: { - filter1: '1', - filter2: '1', - invert: '1' - }, - highlights: {} + filter1: '1', + filter2: '1', + invert: '1' } ); item1 = queriesModel.getItemByID( id1 ); @@ -207,8 +331,8 @@ highlight: '1' }, highlights: { - filter1_color: 'c5', - group3option1_color: 'c1' + group1__filter1_color: 'c5', + group3__group3option1_color: 'c1' } } }; @@ -261,14 +385,10 @@ // Find matching query matchingItem = queriesModel.findMatchingQuery( { - params: { - group2: 'filter5', - highlight: '1' - }, - highlights: { - filter1_color: 'c5', - group3option1_color: 'c1' - } + highlight: '1', + group2: 'filter5', + group1__filter1_color: 'c5', + group3__group3option1_color: 'c1' } ); assert.deepEqual( @@ -280,16 +400,13 @@ // Find matching query with 0-values (base state) matchingItem = queriesModel.findMatchingQuery( { - params: { - group2: 'filter5', - filter1: '0', - filter2: '0', - highlight: '1' - }, - highlights: { - filter1_color: 'c5', - group3option1_color: 'c1' - } + group2: 'filter5', + filter1: '0', + filter2: '0', + highlight: '1', + invert: '0', + group1__filter1_color: 'c5', + group3__group3option1_color: 'c1' } ); assert.deepEqual(