Merge commit 'fa89acd'

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

1 files changed, 17 insertions, 8 deletions

diff --git a/languages/i18n/vep.json b/languages/i18n/vep.json
index 7caba5d5..687433ab 100644
--- a/languages/i18n/vep.json
+++ b/languages/i18n/vep.json
@@ -431,12 +431,11 @@
 	"resetpass-wrong-oldpass": "Vär pordaigaine vai nügüdläine peitsana.\nVoib olda, tö olet jo toižetanuded peitsanan vai pakinuded uden peitsanan.",
 	"resetpass-temp-password": "Pordaigaline peitsana:",
 	"passwordreset": "Peitsanan alustuz",
-	"passwordreset-legend": "Peitsanan alustuz",
 	"passwordreset-username": "Kävutajan nimi:",
 	"passwordreset-domain": "Domen",
 	"passwordreset-capture": "Ozutada-k loptud kirjeine?",
 	"passwordreset-email": "E-počtan adres:",
-	"passwordreset-emailelement": "Kävutajannimi: $1\nAigaline peitsana: $2",
+	"passwordreset-emailelement": "Kävutajannimi: \n$1\n\nAigaline peitsana: \n$2",
 	"passwordreset-emailsent": "Muštatai kirjeine uden peitsananke oigetihe e-počtadme.",
 	"changeemail": "Toižetada e-počtan adres",
 	"changeemail-no-info": "Miše kirjutada necil lehtpolel, teile pidab kirjutadas sistemha.",
@@ -1179,7 +1178,6 @@
 	"nlinks": "$1 {{PLURAL:$1|kosketuz|kosketust}}",
 	"nmembers": "$1 {{PLURAL:$1|ühtnii|ühtnijad}}",
 	"nrevisions": "$1 {{PLURAL:$1|versii|versijad}}",
-
 	"specialpage-empty": "Ecind ei ole andnu rezul'tatad.",
 	"lonelypages": "Üksjäižed lehtpoled",
 	"lonelypagestext": "Ozutadud lehtpolid ei kosketagoi toižed necen saitan lehtpoled; ozutadud lehtpoled mugažo ei olgoi mülütadud toižihe lehtpolihe.",
@@ -1291,7 +1289,6 @@
 	"listgrouprights-removegroup-self-all": "Sab heitta poiš kaik gruppad ičeze sistemkirjutandaspäi",
 	"mailnologin": "Ei ole adresan oigendamižen täht",
 	"emailuser": "Oigeta e-kirjeine necile kävutajale",
-	"emailpage": "Kirjeine kävutajale",
 	"defemailsubject": "$1-kävutajan počt {{SITENAME}}-saitalpäi",
 	"usermaildisabled": "Kävutajan e-počt ei ole kävutamižes",
 	"noemailtitle": "Ei ole e-počtan adresad",
@@ -1672,7 +1669,6 @@
 	"import-interwiki-history": "Kopiruida kaik necen lehtpolen toižetamižen istorii",
 	"import-interwiki-templates": "Mülütada kaik šablonad",
 	"import-interwiki-submit": "Import",
-	"import-interwiki-namespace": "Metnimiavaruz:",
 	"import-upload-filename": "Failan nimi:",
 	"import-comment": "Kommentarii:",
 	"importstart": "Lehtpoliden import...",
@@ -1694,9 +1690,7 @@
 	"import-token-mismatch": "Andmused oma kadonuded. Olgat hüväd, toštkat tegend völ kerdan.",
 	"import-invalid-interwiki": "Ei voi importiruida neciš wikišpäi.",
 	"importlogpage": "Importan aigkirj",
-	"import-logentry-upload": "importiruidihe [[$1]] failan jügetoitandan abul",
 	"import-logentry-upload-detail": "{{PLURAL:$1|üks' versii|$1 versijad}}",
-	"import-logentry-interwiki": "toi toižes wikišpäi lehtpolen $1",
 	"import-logentry-interwiki-detail": "$1 {{PLURAL:$1|üks' versii|versijad}} $2-wikišpäi",
 	"javascripttest": "JavaScriptan kodvmine",
 	"tooltip-pt-userpage": "Teiden kävutajan lehtpol'",
@@ -2311,5 +2305,20 @@
 	"expand_templates_xml_output": "XML-lähtmižvend",
 	"expand_templates_ok": "OK",
 	"expand_templates_remove_comments": "Čuta kommentarijad",
-	"expand_templates_preview": "Ezikacund"
+	"expand_templates_preview": "Ezikacund",
+	"special-characters-group-latin": "Latinalaine",
+	"special-characters-group-latinextended": "Levitadud latinalaine",
+	"special-characters-group-ipa": "IPA",
+	"special-characters-group-symbols": "Simvolad",
+	"special-characters-group-greek": "Grekalaine",
+	"special-characters-group-cyrillic": "Kirilline",
+	"special-characters-group-arabic": "Arabine",
+	"special-characters-group-arabicextended": "Araban levitadud",
+	"special-characters-group-persian": "Persižed",
+	"special-characters-group-hebrew": "Evrejine",
+	"special-characters-group-telugu": "Telugu",
+	"special-characters-group-gujarati": "Gudžarati",
+	"special-characters-group-thai": "Tai",
+	"special-characters-group-lao": "Lao",
+	"special-characters-group-khmer": "Khmeran"
 }