WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225854
Change subject: New Wikidata Build - 2015-07-20T10:00:01+0000
......................................................................
New Wikidata Build - 2015-07-20T10:00:01+0000
Change-Id: I3edcfca62958801cd3c92d0d915e2383cead84a9
---
M composer.lock
A extensions/Wikibase/client/i18n/prs.json
M extensions/Wikibase/client/i18n/sv.json
M extensions/Wikibase/client/i18n/tl.json
M extensions/Wikibase/lib/i18n/lt.json
M extensions/Wikibase/lib/i18n/sv.json
M extensions/Wikibase/repo/i18n/ady-cyrl.json
M extensions/Wikibase/repo/i18n/ca.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/fr.json
M extensions/Wikibase/repo/i18n/lb.json
M extensions/Wikibase/repo/i18n/lt.json
A extensions/Wikibase/repo/i18n/prs.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/tl.json
M extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
M vendor/composer/installed.json
18 files changed, 185 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/54/225854/1
diff --git a/composer.lock b/composer.lock
index 27cb82b..40275fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "17665286ee05883a5b4a908e19821d2b1fa88bac"
+ "reference": "6ca1a851462cd7e2b18cdf008ac3771a862545b9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/17665286ee05883a5b4a908e19821d2b1fa88bac";,
- "reference": "17665286ee05883a5b4a908e19821d2b1fa88bac",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6ca1a851462cd7e2b18cdf008ac3771a862545b9";,
+ "reference": "6ca1a851462cd7e2b18cdf008ac3771a862545b9",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-07-18 21:25:09"
+ "time": "2015-07-19 22:00:19"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/prs.json
b/extensions/Wikibase/client/i18n/prs.json
new file mode 100644
index 0000000..fc91aa0
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/prs.json
@@ -0,0 +1,11 @@
+{
+ "@metadata": {
+ "authors": [
+ "Mjbmr"
+ ]
+ },
+ "tooltip-t-wikibase": "پیوند به آیتم مخزن داده متصل",
+ "wikibase-dataitem": "آیتم {{WBREPONAME}}",
+ "wikibase-editlinks": "ویرایش پیوندها",
+ "wikibase-editlinkstitle": "ویرایش پیوندهای بین زبانی"
+}
diff --git a/extensions/Wikibase/client/i18n/sv.json
b/extensions/Wikibase/client/i18n/sv.json
index c9cbaf3..f5c04e0 100644
--- a/extensions/Wikibase/client/i18n/sv.json
+++ b/extensions/Wikibase/client/i18n/sv.json
@@ -14,11 +14,14 @@
"apihelp-query+pageterms-description": "Få termer associerade med en
sida via ett associerat dataobjekt.",
"apihelp-query+pageterms-example-simple": "Få alla termer associerade
med sidan 'London', på användarens språk.",
"apihelp-query+pageterms-example-label-en": "Få etiketter och alias
associerade med sidan 'London', på engelska.",
- "apihelp-query+pageterms-param-terms": "Den typen av termer som ska
hämtas, t.ex. 'label', 'description', eller 'alias'.",
+ "apihelp-query+pageterms-param-terms": "Den typen av termer som ska
hämtas, t.ex. 'description'. Om ej angivt returneras alla typer.",
+ "apihelp-query+wikibase-description": "Hämta information om
Wikibase-klienten och det tillhörande Wikibase-centralförvaret.",
+ "apihelp-query+wikibase-example": "Hämta URL-sökvägen och annan
information om Wikibase-klienten och centralförvaret.",
+ "apihelp-query+wikibase-param-prop": "Vilka egenskaper att
hämta:\n;<kbd>url</kbd>: Bas-URL, skript-sökväg och artikel-sökväg för
Wikibase-centralförvaret.\n;<kbd>siteid</kbd>: siteid för denna webbplats.",
"wikibase-after-page-move": "Du kan också [$1 uppdatera] det
associerade objektet på {{WBREPONAME}} för att bevara språklänkarna i den
flyttade sidan.",
- "wikibase-after-page-move-queued": "[$1 {{WBREPONAME}}objektet] som är
associerat med denna sida kommer snart uppdateras automatiskt.",
+ "wikibase-after-page-move-queued": "[$1 {{WBREPONAME}}objektet] som är
associerat med denna sida kommer att uppdateras automatiskt. Notera att detta
kanske inte sker omedelbart.",
"wikibase-after-page-delete": "Du kan också ta bort länken till den här
sidan från tillhörande [$1 {{WBREPONAME}}-objekt] för att upprätthålla
språklänkar.",
- "wikibase-after-page-delete-queued": "[$1 {{WBREPONAME}}-objektet]
associerat med denna sida kommer snart att uppdateras automatiskt.",
+ "wikibase-after-page-delete-queued": "[$1 {{WBREPONAME}}-objektet]
associerat med denna sida kommer att uppdateras automatiskt. Notera att detta
kanske inte sker omedelbart.",
"wikibase-comment-add": "Ett {{WBREPONAME}}objekt har skapats.",
"wikibase-comment-remove": "Tillhörande {{WBREPONAME}}objekt togs bort.
Språklänkar togs bort.",
"wikibase-comment-linked": "Ett {{WBREPONAME}}objekt har länkats till
den här sidan.",
@@ -56,10 +59,11 @@
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}}redigering",
"wikibase-replicationnote": "Observera att det kan ta flera minuter
innan ändringarna är synliga på alla wikier.",
"wikibase-watchlist-show-changes-pref": "Visa
{{WBREPONAME}}redigeringar i din bevakningslista",
+ "wikibase-error-deserialize-error": "Misslyckades med att avserialisera
data.",
"wikibase-error-serialize-error": "Misslyckades att serialisera data.",
"wikibase-error-invalid-entity-id": "Det angivna ID:et är okänt för
systemet. Var god använd ett giltigt enhets-ID.",
- "special-unconnectedpages": "Sidor som inte är anslutna till objekt",
- "wikibase-unconnectedpages-legend": "Alternativ för sidor som inte är
anslutna",
+ "unconnectedpages": "Sidor som inte är anslutna till objekt",
+ "unconnectedpages-summary": "Denna sida listar sidor utan något
anslutet dataobjekt (i namnrymder som stöder objekt). Denna sida är sorterad
efter fallande sid-ID, så att nyare sidor listas först.",
"wikibase-unconnectedpages-page": "Börja resultatlistan med sidan:",
"wikibase-unconnectedpages-submit": "Gå",
"wikibase-unconnectedpages-invalid-language": "\"$1\" är inte en giltig
språkkod.",
diff --git a/extensions/Wikibase/client/i18n/tl.json
b/extensions/Wikibase/client/i18n/tl.json
index 542650f..2cbbe8e 100644
--- a/extensions/Wikibase/client/i18n/tl.json
+++ b/extensions/Wikibase/client/i18n/tl.json
@@ -10,5 +10,7 @@
"wikibase-dataitem": "Aytem na {{WBREPONAME}}",
"wikibase-editlinks": "Baguhin ang mga kawing",
"wikibase-editlinkstitle": "Baguhin ang mga kawing inter-wika",
- "wikibase-rc-hide-wikidata-show": "Ipakita"
+ "wikibase-rc-hide-wikidata-hide": "Itago",
+ "wikibase-rc-hide-wikidata-show": "Ipakita",
+ "wikibase-otherprojects": "Iba pang mga proyekto"
}
diff --git a/extensions/Wikibase/lib/i18n/lt.json
b/extensions/Wikibase/lib/i18n/lt.json
index 9eff8f8..88545ac 100644
--- a/extensions/Wikibase/lib/i18n/lt.json
+++ b/extensions/Wikibase/lib/i18n/lt.json
@@ -3,7 +3,8 @@
"authors": [
"Eitvys200",
"Hugo.arg",
- "Salpusnis"
+ "Salpusnis",
+ "Albertas"
]
},
"wikibase-lib-desc": "Apima bendrą Wikibase ir Wikibase kliento
išplėtimų funkcionalumą.",
@@ -63,7 +64,28 @@
"wikibase-validator-no-such-entity": "$1 nerasta",
"wikibase-validator-no-such-property": "$1 savybė nerasta",
"wikibase-validator-bad-value": "Pažeista duomenų reikšmė: $1",
+ "wikibase-validator-bad-value-type": "Bloga reikšmė, kurios tipas $1,
tikėtasi $2",
+ "wikibase-validator-bad-url": "Netinkamai suformatuotas URL: $1",
+ "wikibase-validator-bad-url-scheme": "Nepalaikoma URL schema: $1",
+ "wikibase-validator-unknown-unit": "Nežinomi vienetai: $1",
+ "wikibase-validator-not-allowed": "Netinkama reikšmė: $1",
+ "wikibase-validator-no-validators": "Uždrausta",
"datatypes-type-wikibase-item": "Įrašas",
+ "datatypes-type-wikibase-property": "Savybė",
"datatypes-type-commonsMedia": "Vikitekos byla",
- "version-wikibase": "Vikibazė"
+ "version-wikibase": "Vikibazė",
+ "wikibase-time-precision-Gannum": "$1 milijardų metų po Kristaus",
+ "wikibase-time-precision-Mannum": "$1 milijonų metų po Kristaus",
+ "wikibase-time-precision-annum": "$1 metų po Kristaus",
+ "wikibase-time-precision-millennium": "$1. tūkstantmetyje",
+ "wikibase-time-precision-century": "$1. amžiuje",
+ "wikibase-time-precision-10annum": "$1-taisiais",
+ "wikibase-time-precision-BCE-Gannum": "$1 milijardų metų po Kristaus",
+ "wikibase-time-precision-BCE-Mannum": "$1 milijonų metų po Kristaus",
+ "wikibase-time-precision-BCE-annum": "$1 metų po Kristaus",
+ "wikibase-time-precision-BCE-millennium": "$1. tūkstantmetis prieš
Kristų",
+ "wikibase-time-precision-BCE-century": "$1. amžius prieš Kristų",
+ "wikibase-time-precision-BCE-10annum": "$1-taisiais prieš Kristų",
+ "wikibase-snakformatter-valuetype-mismatch": "Reikšmės tipas \"$1\"
neatitinka savybės tipo \"$2\".",
+ "wikibase-snakformatter-property-not-found": "Nerasta savybė $1,
nepavyko nustatyti, kokį duomenų tipą naudoti."
}
diff --git a/extensions/Wikibase/lib/i18n/sv.json
b/extensions/Wikibase/lib/i18n/sv.json
index 95c7f38..7b4718a 100644
--- a/extensions/Wikibase/lib/i18n/sv.json
+++ b/extensions/Wikibase/lib/i18n/sv.json
@@ -24,6 +24,7 @@
"wikibase-error-autocomplete-response": "Servern svarade: $1",
"wikibase-error-ui-no-external-page": "Den angivna artikeln kunde inte
hittas på den motsvarande webbplatsen.",
"wikibase-error-ui-edit-conflict": "Det finns en redigeringskonflikt.
Vänligen ladda om och spara igen.",
+ "wikibase-language-fallback-transliteration-hint": "$1
(translittererad)",
"wikibase-quantitydetails-amount": "Mängd",
"wikibase-quantitydetails-upperbound": "Övre gräns",
"wikibase-quantitydetails-lowerbound": "Undre gräns",
@@ -83,6 +84,8 @@
"wikibase-time-precision-BCE-Gannum": "$1 miljarder år f.v.t.",
"wikibase-time-precision-BCE-Mannum": "$1 miljoner år f.v.t.",
"wikibase-time-precision-BCE-annum": "$1 år f.v.t.",
+ "wikibase-time-precision-BCE-millennium": "$1 årtusendet f.Kr.",
+ "wikibase-time-precision-BCE-century": "$1 århundradet f.Kr.",
"wikibase-time-precision-BCE-10annum": "$1-talet f.v.t.",
"wikibase-snakformatter-valuetype-mismatch": "Värdets typ \"$1\"
stämmer inte med egenskapens typ \"$2\".",
"wikibase-snakformatter-property-not-found": "Egenskap $1 hittades
inte, kan inte avgöra vilken datatyp som ska användas."
diff --git a/extensions/Wikibase/repo/i18n/ady-cyrl.json
b/extensions/Wikibase/repo/i18n/ady-cyrl.json
index 69d5312..7fba070 100644
--- a/extensions/Wikibase/repo/i18n/ady-cyrl.json
+++ b/extensions/Wikibase/repo/i18n/ady-cyrl.json
@@ -2,10 +2,12 @@
"@metadata": {
"authors": [
"SamGamgee",
- "TheRossatron"
+ "TheRossatron",
+ "SmartNart12"
]
},
"wikibase-edit": "е1аз",
"wikibase-add": "хэгъахъу",
- "wikibase-sitelinks-special": "Нэмык1 сайтхэр"
+ "wikibase-sitelinks-special": "Нэмык1 сайтхэр",
+ "wikibase-aliases-empty": "Синонимхэр гъэнэфагъэхэп"
}
diff --git a/extensions/Wikibase/repo/i18n/ca.json
b/extensions/Wikibase/repo/i18n/ca.json
index 62d419f..a765adb 100644
--- a/extensions/Wikibase/repo/i18n/ca.json
+++ b/extensions/Wikibase/repo/i18n/ca.json
@@ -133,6 +133,7 @@
"wikibase-setsitelink-introfull": "Esteu definint l'enllaç de lloc en
$2 de [[$1]].",
"wikibase-modifyentity-id": "ID:",
"wikibase-modifyterm-language": "Codi d'idioma:",
+ "wikibase-mergeitems-success": "$1 ha sigut fusionat amb èxit amb $3 i
redirigit.",
"wikibase-history-title-with-label": "«$2» ($1): Historial de
revisions",
"wikibase-entitieswithoutlabel-label-language": "Codi d'idioma:",
"wikibase-entitieswithoutlabel-submit": "Cerca",
diff --git a/extensions/Wikibase/repo/i18n/en.json
b/extensions/Wikibase/repo/i18n/en.json
index e8d5fd2..53133fe 100644
--- a/extensions/Wikibase/repo/i18n/en.json
+++ b/extensions/Wikibase/repo/i18n/en.json
@@ -568,6 +568,7 @@
"apihelp-wbsearchentities-description": "Searches for entities using
labels and aliases.\nReturns a label and description for the entity in the user
language if possible.\nReturns details of the matched term.\nThe matched term
text is also present in the aliases key if different from the display label.",
"apihelp-wbsearchentities-param-search": "Search for this text.",
"apihelp-wbsearchentities-param-language": "Search in this language.",
+ "apihelp-wbsearchentities-param-strictlanguage": "Whether to disable
language fallback",
"apihelp-wbsearchentities-param-type": "Search for this type of
entity.",
"apihelp-wbsearchentities-param-limit": "Maximal number of results",
"apihelp-wbsearchentities-param-continue": "Offset where to continue a
search",
diff --git a/extensions/Wikibase/repo/i18n/es.json
b/extensions/Wikibase/repo/i18n/es.json
index d228e2b..7ff7e09 100644
--- a/extensions/Wikibase/repo/i18n/es.json
+++ b/extensions/Wikibase/repo/i18n/es.json
@@ -70,8 +70,8 @@
"wikibase-sitelink-site-edit-placeholder": "sitio",
"wikibase-sitelink-page-edit-placeholder": "página",
"wikibase-alias-edit-placeholder": "escribe un alias",
- "wikibase-label-input-help-message": "Introduce la etiqueta de esta
entidad en $1.",
- "wikibase-description-input-help-message": "Introduce una breve
descripción para esta entidad en $1.",
+ "wikibase-label-input-help-message": "Escribe la etiqueta de esta
entidad en $1.",
+ "wikibase-description-input-help-message": "Escribe una breve
descripción para esta entidad en $1.",
"wikibase-statements": "Declaraciones",
"wikibase-terms": "En otros idiomas",
"wikibase-sitelinks": "Enlaces a sitios",
@@ -98,7 +98,7 @@
"wikibase-disambiguation-title": "Desambiguación para \"$1\"",
"wb-special-newitem-new-item-notification": "Nuevo elemento $1 creado y
redirigido a la página correspondiente. Volver a $2.",
"wikibase-aliases-label": "Alias y nombres alternativos:",
- "wikibase-aliases-input-help-message": "Para que sea fácil encontrar
esta entidad, puedes introducir nombres alternativos.",
+ "wikibase-aliases-input-help-message": "Para que sea más fácil
encontrar esta entidad, puedes escribir nombres alternativos.",
"wikibase-aliases-empty": "No hay alias definidos.",
"wikibase-propertypage-datatype": "Tipo de dato",
"wikibase-claimview-snak-tooltip": "Ingresa un valor correspondiente a
la propiedad \"$1\". Si la propiedad no tiene ningún valor asignado o si éste
no se conoce, puedes elegir una alternativa y especificar un valor
personalizado haciendo clic en el icono junto a la caja de entrada del valor.",
diff --git a/extensions/Wikibase/repo/i18n/fr.json
b/extensions/Wikibase/repo/i18n/fr.json
index 0a8fd81..9f4c31c 100644
--- a/extensions/Wikibase/repo/i18n/fr.json
+++ b/extensions/Wikibase/repo/i18n/fr.json
@@ -509,7 +509,7 @@
"apihelp-wbgetentities-example-6": "Obtenez des entités d'identifiant
Q42 avec tous les intitulés dans toutes les langues",
"apihelp-wbgetentities-example-7": "Récupérer les types de données des
propriétés P17 et P3",
"apihelp-wbgetentities-example-8": "Récupérer les entités avec ID Q42
avec tous les alias en anglais",
- "apihelp-wbgetentities-example-9": "Récupérer les entités
d'identifiants Q1 et Q42 avec leurs descriptions en anglais, en allemand et en
français (si elles existent)",
+ "apihelp-wbgetentities-example-9": "Récupérer les entités
d'identifiants Q1 et Q42 avec leurs descriptions en anglais, en allemand et en
français",
"apihelp-wbgetentities-example-10": "Obtenir l'élément de la page
\"Berlin\" sur le site \"enwiki\", avec les attributs de langue en langue
anglaise",
"apihelp-wbgetentities-example-11": "Obtenir l'élément de la page
\"Berlin\" sur le site \"enwiki\" après normalisation du titre de \"berlin\"",
"apihelp-wbgetentities-example-12": "Récupérer les liens de site pour
l'élément Q42",
diff --git a/extensions/Wikibase/repo/i18n/lb.json
b/extensions/Wikibase/repo/i18n/lb.json
index 8f89284..47e5f2c 100644
--- a/extensions/Wikibase/repo/i18n/lb.json
+++ b/extensions/Wikibase/repo/i18n/lb.json
@@ -265,6 +265,7 @@
"apihelp-wbmergeitems-example-2": "Fusionéiert Date vun Q555 an Q3",
"apihelp-wbsearchentities-param-search": "No dësem Text sichen.",
"apihelp-wbsearchentities-param-language": "An dëser Sprooch sichen.",
+ "apihelp-wbsearchentities-param-strictlanguage": "Ob Ersatzsproochen
ausgeschalt solle ginn",
"apihelp-wbsearchentities-example-2": "No \"abc\" an der Englescher
Sprooch siche mat enger Limite vu 50",
"apihelp-wbsetaliases-param-summary": "Resumé fir d'Ännerung.\nEng
automatesch generéiert Bemierkung gëtt virdru gesat. D'Limite vun der Längt vun
der automatescher Bemierkung zesumme mam Resumé ass 260 Zeechen. Denkt drun
datt alles wat iwwer déi Limite erausgeet automatesch ofgeschnidde gëtt.",
"apihelp-wbsetaliases-param-bot": "Dës Ännerung als Bot markéieren. Dës
URL-Markéierung gëtt nëmme respektéiert wann de Benotzer zu der Grupp \"Bot\"
gehéiert.",
diff --git a/extensions/Wikibase/repo/i18n/lt.json
b/extensions/Wikibase/repo/i18n/lt.json
index 1e1be9b..2591e4a 100644
--- a/extensions/Wikibase/repo/i18n/lt.json
+++ b/extensions/Wikibase/repo/i18n/lt.json
@@ -10,6 +10,7 @@
"Salpusnis"
]
},
+ "wikibase-desc": "Struktūruotų duomenų talpykla",
"wikibase-entity": "esybė",
"wikibase-entity-item": "įrašas",
"wikibase-entity-property": "savybė",
@@ -145,10 +146,45 @@
"wikibase-newproperty-datatype": "Duomenų tipas:",
"wikibase-newproperty-invalid-datatype": "Nurodytas neteisingas duomenų
tipas.",
"special-newitem": "Sukurti naują įrašą",
- "wikibase-newitem-summary": "Būtinai
[[Special:ItemByTitle|įsitikinkite, kad įrašas dar neegzistuoja]]!<br
/>Turėtumėte sukurti [[Help:Žymą|žymą]] ir [[Help:Aprašymą|aprašymą]] visiems
naujiems įrašams.",
+ "wikibase-newitem-summary": "Įsitikinkite, kad
[[Special:ItemByTitle|pažymėjote, ar elementas jau egzistuoja]]!<br />\nJūs
turėtumėte sukurti [[Help:Label|žymę]] ir [[Help:Description|aprašymą]]
kiekvienam naujam elementui.",
"wikibase-newitem-fieldset": "Sukurti naują įrašą",
"wikibase-newitem-site": "Pirmo susieto puslapio svetainė",
"wikibase-newitem-page": "Pirmo susieto puslapio pavadinimas",
+ "wikibase-newitem-no-external-page": "Tinklapyje nepavyko rasti
nurodytojo puslapio.",
+ "wikibase-newitem-not-recognized-siteid": "Nepavyko atpažinti nurodyto
tinklapio identifikatoriaus.",
+ "wikibase-newentity-label": "Žymė:",
+ "wikibase-newentity-description": "Aprašymas:",
+ "wikibase-newentity-submit": "Sukurti",
+ "special-setlabel": "Nustatyti žymę",
+ "wikibase-setlabel-introfull": "Nustatote žyme $2 elementui [[$1]].",
+ "wikibase-setlabel-intro": "Ši forma leidžia nustatyti esybės žymę.
Jums reikia pateikti esybės id (pvz. Q23), kalbos kodą (pvz. \"lt\") ir kokią
žymę nustatyti.",
+ "wikibase-setlabel-label": "Žymė:",
+ "wikibase-setlabel-submit": "Nustatyti žymę",
+ "special-setdescription": "Nustatyti aprašymą",
+ "wikibase-setdescription-introfull": "Jūs nustatote aprašymą $2
elementui [[$1]].",
+ "wikibase-setdescription-intro": "Ši forma leidžia nustatyti esybės
aprašymą. Jūs reikia pateikti esybės id (pvz. Q23), kalbos kodą (pvz. \"lt\")
ir kokį aprašymą nustatyti.",
+ "wikibase-setdescription-label": "Aprašymas:",
+ "wikibase-setdescription-submit": "Nustatyti aprašymą",
+ "special-setaliases": "Nustatyti alternatyvius vardus",
+ "wikibase-setaliases-introfull": "Jūs nustatinėjate alternatyvius
vardus $2 elementui [[$1]]. Keli alternatyvūs vardai atskiriami vertikalaus
brūkšnio (<code>|</code>) simboliu.",
+ "wikibase-setaliases-intro": "Ši forma leidžia nustatyti esybės
alternatyvius vardus. Jūs turite nurodyti esybės id (pvz. Q23), kalbos kodą
(pvz. \"lt\") ir kokius alternatyvius vardus nurodyti. Keli alternatyvūs vardai
gali būti atskiriami vertikalaus brūkšnio (<code>|</code>) simboliu.",
+ "wikibase-setaliases-label": "Alternatyvūs vardai:",
+ "wikibase-setaliases-submit": "Nustatyti alternatyvius vardus",
+ "special-setlabeldescriptionaliases": "Nustatyti žymę, aprašymą ir
alternatyvius vardus",
+ "wikibase-setlabeldescriptionaliases-introfull": "Jūs nustatinėjate
žymę, aprašymą ir alternatyvius vardus $2 elementui [[$1]]. Keli alternatyvūs
vardai atskiriami vertikalaus brūkšnio (<code>|</code>) simboliu.",
+ "wikibase-setlabeldescriptionaliases-intro": "Ši forma leidžia
nustatyti esybės žymę, aprašymą ir alternatyvius vardus. Jūs turite pateikti
esybės id (pvz. \"Q23) ir kalbos kodą (pvz. \"lt\").",
+ "wikibase-setlabeldescriptionaliases-label-label": "Žymė:",
+ "wikibase-setlabeldescriptionaliases-description-label": "Aprašymas:",
+ "wikibase-setlabeldescriptionaliases-aliases-label": "Alternatyvūs
vardai:",
+ "wikibase-setlabeldescriptionaliases-submit": "Nustatyti žymę, aprašymą
ir alternatyvius vardus",
+ "special-setsitelink": "Nustatyti tinklapio nuorodą",
+ "wikibase-setsitelink-introfull": "Jūs nustatinėjate tinklapio nuorodą
$2 elementui [[$1]].",
+ "wikibase-setsitelink-intro": "Ši forma leidžia nustatyti elemento
tinklapio nuorodą. Jūs turite pateikti elemento id (pvz. Q23), tinklapio id
(pvz. \"enwiki\") ir kokią tinklapio nuorodą nustatyti.",
+ "wikibase-setsitelink-intro-badges": "Papildomai galite nustatyti
įvairius, žemiau nurodytus, ženkliukus šiai tinklapio nuorodai.",
+ "wikibase-setsitelink-site": "Tinklapio id:",
+ "wikibase-setsitelink-label": "Tinklapio nuoroda:",
+ "wikibase-setsitelink-badges": "Ženkliukai:",
+ "wikibase-setsitelink-submit": "Nustatyti tinklapio nuorodą",
"wikibase-modifyterm-language": "Kalbos kodas:",
"wikibase-entitieswithoutlabel-label-language": "Kalbos kodas:",
"wikibase-restoreold": "perkrauti",
diff --git a/extensions/Wikibase/repo/i18n/prs.json
b/extensions/Wikibase/repo/i18n/prs.json
new file mode 100644
index 0000000..5119a53
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/prs.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Mjbmr"
+ ]
+ },
+ "wikibase-edit": "ویرایش"
+}
diff --git a/extensions/Wikibase/repo/i18n/qqq.json
b/extensions/Wikibase/repo/i18n/qqq.json
index 3c910ae..f52dc12 100644
--- a/extensions/Wikibase/repo/i18n/qqq.json
+++ b/extensions/Wikibase/repo/i18n/qqq.json
@@ -596,6 +596,7 @@
"apihelp-wbsearchentities-description":
"{{doc-apihelp-description|wbsearchentities}}",
"apihelp-wbsearchentities-param-search":
"{{doc-apihelp-param|wbsearchentities|search}}",
"apihelp-wbsearchentities-param-language":
"{{doc-apihelp-param|wbsearchentities|language}}",
+ "apihelp-wbsearchentities-param-strictlanguage":
"{{doc-apihelp-param|wbsearchentities|strictlanguage}}",
"apihelp-wbsearchentities-param-type":
"{{doc-apihelp-param|wbsearchentities|type}}",
"apihelp-wbsearchentities-param-limit":
"{{doc-apihelp-param|wbsearchentities|limit}}",
"apihelp-wbsearchentities-param-continue":
"{{doc-apihelp-param|wbsearchentities|continue}}",
diff --git a/extensions/Wikibase/repo/i18n/tl.json
b/extensions/Wikibase/repo/i18n/tl.json
index c0f0adf..87b0399 100644
--- a/extensions/Wikibase/repo/i18n/tl.json
+++ b/extensions/Wikibase/repo/i18n/tl.json
@@ -18,12 +18,14 @@
"wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "Sa
marami pang mga wika",
"wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label":
"Isaayos/Kumpigurahin",
"wikibase-label-edit-placeholder": "ipasok ang katatakan",
+ "wikibase-description-empty": "Walang nakatakdang paglalarawan",
"wikibase-description-edit-placeholder": "ipasok ang paglalarawan",
"wikibase-sitelink-site-edit-placeholder": "pook",
"wikibase-sitelink-page-edit-placeholder": "artikulo",
"wikibase-alias-edit-placeholder": "magpasok ng isang palayaw",
"wikibase-label-input-help-message": "Ipasok ang pamagat ng pangkat ng
dato na ito sa loob ng $1.",
"wikibase-description-input-help-message": "Magpasok ng isang maiksing
paglalarawan sa loob ng $1.",
+ "wikibase-sitelinks": "Listahan ng mga pahinang nakakawing papunta sa
bagay na ito",
"wikibase-sitelinks-empty": "Wala pang kawing na pampook para sa bagay
na ito.",
"wikibase-sitelinks-input-help-message": "Magtakda ng isang kawing na
papunta sa isang pahinang may kaugnayan sa bagay na ito.",
"wikibase-remove": "tanggalin",
@@ -42,6 +44,7 @@
"wikibase-aliases-label": "Nakikilala rin bilang:",
"wikibase-aliases-input-help-message": "Kung nakikilala ang pangkat ng
dato sa ilalim na mas mahigit kaysa sa isang partikular na pangalan,
makakapagpasok ka ng mga bansag at mga kasingkahulugan, upang matagpuan ito sa
pamamagitan ng kasalit na mga pangalan nito.",
"wikibase-aliases-empty": "Walang bansag na nabigyan ng kahulugan.",
+ "wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|sanggunian|mga sanggunian}}",
"wikibase-move-error": "Hindi ka maaaring maglipat ng mga pahinang nasa
loob ng puwang ng pangalan ng datp, at hindi ka maaaring maglipat ng mga pahina
na papasok dito.",
"wikibase-itemlink": "$1 $2",
"wikibase-itemlink-id-wrapper": "($1)",
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
index ef1261b..8ad1a55 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -8,14 +8,18 @@
use User;
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\MergeItems;
+use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\Interactors\ItemMergeInteractor;
use Wikibase\Repo\Interactors\RedirectCreationInteractor;
+use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Test\EntityModificationTestHelper;
use Wikibase\Test\MockRepository;
+use Wikibase\Test\MockSiteStore;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Lib\ClaimGuidGenerator;
/**
* @covers Wikibase\Repo\Api\MergeItems
@@ -51,8 +55,6 @@
protected function setUp() {
parent::setUp();
- $this->setUpSites();
-
$this->entityModificationTestHelper = new
EntityModificationTestHelper();
$this->apiModuleTestHelper = new ApiModuleTestHelper();
@@ -71,18 +73,9 @@
) );
}
- private function setUpSites() {
- static $isSetup = false;
-
- if ( !$isSetup ) {
- $sitesTable =
WikibaseRepo::getDefaultInstance()->getSiteStore();
- $sitesTable->clear();
- $sitesTable->saveSites( TestSites::getSites() );
-
- $isSetup = true;
- }
- }
-
+ /**
+ * @return EntityPermissionChecker
+ */
private function getPermissionCheckers() {
$permissionChecker = $this->getMock(
'Wikibase\Repo\Store\EntityPermissionChecker' );
@@ -143,14 +136,22 @@
$resultBuilder = $apiHelperFactory->getResultBuilder( $module );
$summaryFormatter = $wikibaseRepo->getSummaryFormatter();
- $changeOpsFactory =
$wikibaseRepo->getChangeOpFactoryProvider()->getMergeChangeOpFactory();
+ $changeOpsFactoryProvider = new ChangeOpFactoryProvider(
+ $this->getConstraintProvider(),
+ new ClaimGuidGenerator(),
+
WikibaseRepo::getDefaultInstance()->getClaimGuidValidator(),
+
WikibaseRepo::getDefaultInstance()->getStatementGuidParser(),
+ $this->getSnakValidator(),
+ $this->getTermValidatorFactory(),
+ new MockSiteStore( TestSites::getSites() )
+ );
$module->setServices(
$idParser,
$errorReporter,
$resultBuilder,
new ItemMergeInteractor(
- $changeOpsFactory,
+
$changeOpsFactoryProvider->getMergeChangeOpFactory(),
$this->mockRepository,
$this->mockRepository,
$this->getPermissionCheckers(),
@@ -161,6 +162,56 @@
);
}
+ /**
+ * @return EntityConstraintProvider
+ */
+ private function getConstraintProvider() {
+ $constraintProvider = $this->getMockBuilder(
'Wikibase\Validators\EntityConstraintProvider' )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $constraintProvider->expects( $this->any() )
+ ->method( 'getUpdateValidators' )
+ ->will( $this->returnValue( array() ) );
+
+ return $constraintProvider;
+ }
+
+ /**
+ * @return SnakValidator
+ */
+ private function getSnakValidator() {
+ $snakValidator = $this->getMockBuilder(
'Wikibase\Validators\SnakValidator' )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $snakValidator->expects( $this->any() )
+ ->method( 'validate' )
+ ->will( $this->returnValue( Status::newGood() ) );
+
+ return $snakValidator;
+ }
+
+ /**
+ * @return TermValidatorFactory
+ */
+ private function getTermValidatorFactory() {
+ $dupeDetector = $this->getMockBuilder(
'Wikibase\LabelDescriptionDuplicateDetector' )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $dupeDetector->expects( $this->any() )
+ ->method( 'detectTermConflicts' )
+ ->will( $this->returnValue( Status::newGood() ) );
+
+ return new TermValidatorFactory(
+ 100,
+ array( 'en', 'de', 'fr' ),
+ new BasicEntityIdParser(),
+ $dupeDetector
+ );
+ }
+
private function callApiModule( $params, EntityRedirect
$expectedRedirect = null ) {
$module = $this->apiModuleTestHelper->newApiModule(
'Wikibase\Repo\Api\MergeItems', 'wbmergeitems', $params );
$this->overrideServices( $module, $expectedRedirect );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b7f267c..7714672 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1165,12 +1165,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "17665286ee05883a5b4a908e19821d2b1fa88bac"
+ "reference": "6ca1a851462cd7e2b18cdf008ac3771a862545b9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/17665286ee05883a5b4a908e19821d2b1fa88bac";,
- "reference": "17665286ee05883a5b4a908e19821d2b1fa88bac",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6ca1a851462cd7e2b18cdf008ac3771a862545b9";,
+ "reference": "6ca1a851462cd7e2b18cdf008ac3771a862545b9",
"shasum": ""
},
"require": {
@@ -1200,7 +1200,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
- "time": "2015-07-18 21:25:09",
+ "time": "2015-07-19 22:00:19",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/225854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3edcfca62958801cd3c92d0d915e2383cead84a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
