Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 9 insertions, 7 deletions

diff --git a/languages/i18n/so.json b/languages/i18n/so.json
index b538424b..1e4efde2 100644
--- a/languages/i18n/so.json
+++ b/languages/i18n/so.json
@@ -103,7 +103,7 @@
 	"nov": "Nof",
 	"dec": "Dis",
 	"pagecategories": "{{PLURAL:$1|Qeybta|Qeybaha}}",
-	"category_header": "Maqaalada ku jirta qeybta \"$1\"",
+	"category_header": "Bogagga ku jira qeybta \"$1\"",
 	"subcategories": "Qeybaha hoose",
 	"category-media-header": "Wararka ku jiro qeybta\"$1\"",
 	"category-empty": "''Qeybtaan hadda wax maqaal ah kuma jirto''",
@@ -405,12 +405,11 @@
 	"resetpass-temp-password": "Ereysir ku meel gaar ah:",
 	"passwordreset": "Bedel ereysirka",
 	"passwordreset-text-many": "{{PLURAL:$1|Gali mid ka mid ah macluumaadkaada asaasiga ah si erey sirtaada usoo ceshato.}}",
-	"passwordreset-legend": "Bedel ereysirka",
 	"passwordreset-username": "Magaca gudagalka",
 	"passwordreset-email": "Ciwaanka e-mailka",
 	"passwordreset-emailtext-ip": "(Qof laga yaabo in ee tahay adi, oo ka socdo ciwaanka IP'ka $1)  ayaa  codsaday xasuus faah faahin akoonkaada {{SITENAME}}\n($4). Isticmaaladaan soo socota {{PLURAL:$3|akoonkooda waxee|akoonkooda waxee}} la xiriiraan ciwaankaan e-mailka ah:\n\n$2\n\n{{PLURAL:$3|eraysirkaan kumeel gaarka ah|Eraysiryadaan kumeel gaarka ah}} waxay dhacaayaan {{PLURAL:$5|hal maalin|$5 maalmood}}.\nWaa in aad gudaha gashaa oo e-mail cusub doorataa hadda. Hadii ee qof kale codsigaan sameysay, ama hadii aad soo xasuusatay eraysirkaagii hore, oo aadna u baahneen in aad badashid, iska ilaaw fariintaan siina isticmaal eraysirkaagii duqi ahaa.",
 	"passwordreset-emailtext-user": "Isticmaale $1 ee {{SITENAME}} wuxuu codsaday xasuus faah faahin akoonkaada {{SITENAME}}\n($4). Isticmaaladaan soo socota {{PLURAL:$3|akoonkooda waxee|akoonkooda waxee}} la xiriiraan ciwaankaan e-mailka ah:\n\n$2\n\n{{PLURAL:$3|eraysirkaan kumeel gaarka ah|Eraysiryadaan kumeel gaarka ah}} waxay dhacaayaan {{PLURAL:$5|hal maalin|$5 maalmood}}.\nWaa in aad gudaha gashaa oo e-mail cusub doorataa hadda. Hadii ee qof kale codsigaan sameysay, ama hadii aad soo xasuusatay eraysirkaagii hore, oo aadna u baahneen in aad badashid, iska ilaaw fariintaan siina isticmaal eraysirkaagii duqi ahaa.",
-	"passwordreset-emailelement": "Magaca gudagalka: $1\nEreysirka kumeelgaarka ah: $2",
+	"passwordreset-emailelement": "Magaca gudagalka: \n$1\n\nEreysirka kumeelgaarka ah: \n$2",
 	"passwordreset-emailerror-capture": "E-mail xasuus ah ayaa la sameeyay, oo ka arki kartid hoosta,laakiin wuxuu ku guul dareestay in isticmaalaha loo diro: $1",
 	"changeemail": "Bedel ciwaanka E-mailka",
 	"changeemail-oldemail": "Ciwaanka e-mailka hadda jiro:",
@@ -482,6 +481,7 @@
 	"semiprotectedpagewarning": "'''Fiiro gaar ah:''' Boggaan waa la difaacay si ee isticmaalada isdiiwaan geliyay kaliya wax uuga badalaan.\nFariinta gudagalihii ugu danbeeyay hoostaan ee ku qorontahay:",
 	"cascadeprotectedwarning": "'''Digniin:''' Boggaan waa la difaacay si ee maamulada kaliya wax uuga badalaan, sababtoo ah waxaa ku jirto kaskadyadaan la difaacay oo soo sosocoto {{PLURAL:$1|bog|boggaga}}:",
 	"templatesused": "{{PLURAL:$1|Tusmo|Tusmooyinka}} lagu isticmaalay boggaan:",
+	"templatesusedpreview": "{{PLURAL:$1|Tusmo|Tusmooyin}} loo adeegsaday horfiirintaan:",
 	"template-protected": "(la difaacay)",
 	"template-semiprotected": "(difaaca-fudud)",
 	"hiddencategories": "Boggaan wuxuu ka mid yahay {{PLURAL:$1|1 qeyb oo qarsoon|$1 oo ah qeybaha qarsoon}}:",
@@ -837,7 +837,6 @@
 	"mailnologin": "Ma'jiro cinwaan wax lagu diro",
 	"mailnologintext": "Waa in aad [[Special:UserLogin|gudaha ku jirtaa]]\nkuna haysatid E-boosto sax ah [[Special:Preferences|dooqyadaada]],\nsi aad ugu dirto E-boosto isticmaalayaasha kale.",
 	"emailuser": "E-mail u dir isticmaalahaan",
-	"emailpage": "Isticmaalaha e-mailka",
 	"noemailtitle": "Malahan cinwaan E-mail",
 	"emailfrom": "Ka socoto:",
 	"emailto": "Ku:",
@@ -846,7 +845,7 @@
 	"emailsend": "Dir",
 	"emailccme": "E-mail iigu soo dir fariinteyda oo koobi ah.",
 	"emailsent": "E-mailka waa la diray",
-	"emailsenttext": "Fariintaadii E-mailka aheeyd waa la diray.",
+	"emailsenttext": "Farriintaadii E-mailka ahayd waa la diray.",
 	"watchlist": "Liiska-waardiyaha",
 	"mywatchlist": "Liiska-waardiyaha",
 	"watchlistfor2": "Ku socoto $1 $2",
@@ -882,7 +881,6 @@
 	"actioncomplete": "Amarka waa la'dhamaystiray",
 	"actionfailed": "Shaqada waad ku guul dareesatay",
 	"dellogpage": "Tirtiraha guda galaheeda",
-	"rollback_short": "Soo celi",
 	"rollbacklink": "dib u soo celi",
 	"rollbacklinkcount-morethan": "soo celinta in kabadan $1 {{PLURAL:$1|badal|badallo}}",
 	"revertpage": "Wuxuu dib u noqay badalkii oo sameeyay  [[Special:Contributions/$2|$2]] ([[User talk:$2|talk]]) kuna celiyay badalkii ka  danbeeyay oo sameeyay  [[User:$1|$1]]",
@@ -1114,6 +1112,10 @@
 	"api-error-unknown-code": "Qalad la aqoon: \"$1\"",
 	"api-error-unknown-warning": "Digniin la aqoon: $1",
 	"api-error-uploaddisabled": "Soo gelinta waa laga xiray wikigaan.",
+	"limitreport-title": "Faahfaahin caddeymo:",
 	"limitreport-cputime": "Waqtiga adeegsiga CPU",
-	"limitreport-walltime": "Waqtiga dhabta ah adeegsiga"
+	"limitreport-walltime": "Waqtiga dhabta ah adeegsiga",
+	"limitreport-ppvisitednodes": "Tirooyinka gutinada ee maskaxda",
+	"limitreport-ppgeneratednodes": "Gutinada ay horay u soo booqatay maskaxda",
+	"limitreport-expensivefunctioncount": "Tirada isle'egta gutinada xilgudashada"
 }