Merge commit 'fa89acd'

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

1 files changed, 25 insertions, 7 deletions

diff --git a/languages/i18n/lus.json b/languages/i18n/lus.json
index b064f8f3..fa8e3aab 100644
--- a/languages/i18n/lus.json
+++ b/languages/i18n/lus.json
@@ -387,12 +387,11 @@
 	"resetpass-wrong-oldpass": "Thurûk dik lo emaw thi tawh.\nI thurûk i thlâk hlawhtling tawh a nih loh pawhin thurûk lailâwk i dil a ni thei.",
 	"resetpass-temp-password": "Thurûk lailâwk:",
 	"passwordreset": "Thurûk ziakţha rawh",
-	"passwordreset-legend": "Thurûk ziakţha rawh",
 	"passwordreset-username": "Hmangtu hming:",
 	"passwordreset-domain": "Huamchin:",
 	"passwordreset-email": "E-chenhmun:",
 	"passwordreset-emailtitle": "{{SITENAME}}-a siangchan chanchin kim",
-	"passwordreset-emailelement": "Hmangtuhming: $1\nThurûk lailâwk: $2",
+	"passwordreset-emailelement": "Hmangtuhming: \n$1\n\nThurûk lailâwk: \n$2",
 	"passwordreset-emailsent": "Hriat nawntirna e-lehkha thawn fel a ni.",
 	"passwordreset-emailsent-capture": "Hriat nawntirna e-lehkha thawn a ni, a hnuaia tarlan ang khuan.",
 	"passwordreset-emailerror-capture": "Hriat nawntirna e-lehkha siam chhuah a ni a, a hnuaia tarlan ang khuan; mahsé thawn hlawhchham a ni: $1",
@@ -964,7 +963,6 @@
 	"nlinks": "$1 {{PLURAL:$1||}} Zawmna $1",
 	"nmembers": "A chhungah  {{PLURAL:$1||$1}} a awm.",
 	"nrevisions": "siamṭhatna $1 {{PLURAL:$1||}}",
-
 	"nimagelinks": "Phêk $1-ah {{PLURAL:$1||}} hman a ni.",
 	"ntransclusions": "phêk $1-ah {{PLURAL:$1||}} hman a ni.",
 	"specialpage-empty": "Thuhawn a awm lo tlat.",
@@ -1126,7 +1124,6 @@
 	"delete-toobig": "Hë phêk hian siam danglam a tâwk ngun mangkhèng, vawi $1 {{PLURAL:$1||}} chüang zet.\nHetiang phêk nuaibo hi hrêk deuh hlek a ni, tum loh puia {{SITENAME}} tihchingpen däl tùrin.",
 	"delete-warning-toobig": "Hë phêk hian tihdanglam a lo tâwk nasa tawh mangkhèng, vawi $1 {{PLURAL:$1||}} chüang zet.\nHemi nuaibo hian {{SITENAME}} hriatna-khawlpui hnathawh a tisukuk palh thei; \nfimkhur zui hräm ang che.",
 	"rollback": "Siamṭhatna sûtna",
-	"rollback_short": "Sûtlêtna",
 	"rollbacklink": "sûtlêtna",
 	"rollbackfailed": "Sûtlêt a tlawlh",
 	"cantrollback": "Siamṭhatna a sûtlêt theih loh;\na siamṭhatu hnuhnüng ber hi hë phêk tawktu awm chhun a la ni tlat.",
@@ -1455,9 +1452,30 @@
 	"logentry-newusers-create": "$1 hian hmangtu siangchan a siam.",
 	"logentry-newusers-create2": "$1 hian hmangtu siangchan $3 a siam.",
 	"logentry-newusers-autocreate": "Siangchan $1 hi amahin a insiam.",
-	"feedback-subject": "Thupui:",
-	"feedback-message": "Thu",
 	"feedback-cancel": "Sûtna",
+	"feedback-message": "Thu",
+	"feedback-subject": "Thupui:",
 	"searchsuggest-search": "Zawnna",
-	"searchsuggest-containing": "hemi thu telna hi..."
+	"searchsuggest-containing": "hemi thu telna hi...",
+	"special-characters-group-latin": "Latin",
+	"special-characters-group-latinextended": "Latin säwizàu",
+	"special-characters-group-ipa": "IPA",
+	"special-characters-group-symbols": "Chhinchhiahnate",
+	"special-characters-group-greek": "Grik",
+	"special-characters-group-cyrillic": "Sirilik (russia hawrawp ang chi)",
+	"special-characters-group-arabic": "arabik",
+	"special-characters-group-arabicextended": "Arabik sâwizàu",
+	"special-characters-group-persian": "Persia",
+	"special-characters-group-hebrew": "Hebrai",
+	"special-characters-group-bangla": "benggawli",
+	"special-characters-group-tamil": "Tamil ṭawng",
+	"special-characters-group-telugu": "Telegu",
+	"special-characters-group-sinhala": "Sinhala",
+	"special-characters-group-gujarati": "Gujarati",
+	"special-characters-group-devanagari": "Hindihawrawp",
+	"special-characters-group-thai": "Thaiţawng",
+	"special-characters-group-lao": "Lao",
+	"special-characters-group-khmer": "Khmer",
+	"mw-widgets-dateinput-placeholder-day": "KKKK-TT-NN",
+	"mw-widgets-dateinput-placeholder-month": "KKKK-TT"
 }