Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 7 insertions, 13 deletions

diff --git a/languages/i18n/haw.json b/languages/i18n/haw.json
index acb72eff..65176b13 100644
--- a/languages/i18n/haw.json
+++ b/languages/i18n/haw.json
@@ -6,7 +6,8 @@
 			"Kolonahe",
 			"Node ue",
 			"Singularity",
-			"Xqt"
+			"Xqt",
+			"Macofe"
 		]
 	},
 	"tog-underline": "Kahalalo i nā loulou:",
@@ -437,13 +438,11 @@
 	"passwordreset-username": "Inoa mea ho'ohana:",
 	"passwordreset-email": "Wahinoho lekauila:",
 	"changeemail": "Hoʻololi i ka wahinoho lekauila",
-	"changeemail-header": "Hoʻololi i ka wahinoho lekauila moʻokāki",
 	"changeemail-oldemail": "Wahinoho lekauila hananei:",
 	"changeemail-newemail": "Wahinoho lekauila hou:",
 	"changeemail-none": "(ʻaʻohe)",
 	"changeemail-password": "Kāu ʻōlelo hūnā {{SITENAME}}:",
 	"changeemail-submit": "Loli i kāu lekauila",
-	"changeemail-cancel": "Hoʻōki",
 	"resettokens-token-label": "$1 (helu okamanawa: $2)",
 	"bold_sample": "Ho‘okā‘ele",
 	"bold_tip": "Ho‘okā‘ele",
@@ -605,7 +604,6 @@
 	"search-relatedarticle": "Nā Mea ʻālike",
 	"searchrelated": "na mea ʻālike",
 	"searchall": "nā mea apau",
-	"showingresultsheader": "{{PLURAL:$5|<strong>$1</strong> hualoaʻa o <strong>$3</strong> mau hualoaʻa|<strong$1-$2</strong> mau hualoaʻa o <strong>$3</strong> mau hualoaʻa}} no <strong>$4</strong>",
 	"search-nonefound": "ʻAʻohe hualoaʻa no kēia huli.",
 	"powersearch-legend": "Hulina kūlana kiʻekiʻe",
 	"powersearch-ns": "Huli i loko o nā wahi inoa:",
@@ -857,7 +855,6 @@
 	"statistics": "ʻIkepilihelu",
 	"statistics-header-pages": "ʻIkepilihelu ʻaoʻao",
 	"statistics-header-edits": "ʻIkepilihelu hoʻololi",
-	"statistics-header-views": "ʻIkepilihelu nānā",
 	"statistics-header-users": "ʻIkepilihelu mea hoʻohana",
 	"statistics-header-hooks": "ʻIkepilihelu ʻē aʻe",
 	"statistics-articles": "ʻAoʻao mealoko",
@@ -887,7 +884,6 @@
 	"pager-older-n": "{{PLURAL:$1|1 aku nei|$1 aku nei}}",
 	"booksources": "Kumu puke",
 	"booksources-search-legend": "Huli i nā kūmole  puke",
-	"booksources-go": "E huli",
 	"log": "Nā Mo‘olelo",
 	"all-logs-page": "Nā Moʻolelo lehulehu apau",
 	"allpages": "Nā ‘Ao‘ao apau",
@@ -919,7 +915,7 @@
 	"watchthispage": "E nānā pono i kēia mea",
 	"unwatch": "Kiaʻi ʻole",
 	"watchlist-details": "{{PLURAL:$1|$1 ʻaoʻao|$1 mau ʻaoʻao}} a kāu papakiaʻi, me ʻole ke koe ʻana o nā ʻaoʻao walaʻau.",
-	"wlshowlast": "Hōʻike $1 hola aku nei $2 lā aku nei $3",
+	"wlshowlast": "Hōʻike $1 hola aku nei $2 lā aku nei",
 	"watchlist-options": "Nā Koho papakiaʻi",
 	"watching": "Kia‘i nei...",
 	"unwatching": "Ke wehe nei i ke kiaʻi...",
@@ -1109,7 +1105,6 @@
 	"pageinfo-language": "ʻŌlelo mealoko ʻaoʻao",
 	"pageinfo-robot-index": "ʻAe",
 	"pageinfo-robot-noindex": "ʻAʻole",
-	"pageinfo-views": "Helu o nā nānā",
 	"pageinfo-watchers": "Helu o nā mea nānā ʻaoʻao",
 	"pageinfo-redirects-name": "Helu o nā kiahou i kēia ʻaoʻao",
 	"pageinfo-subpages-name": "Helu o nā ʻaoʻao kūloko o kēia ʻaoʻao",
@@ -1183,7 +1178,6 @@
 	"exif-iimcategory-evn": "ʻĀina",
 	"exif-iimcategory-hth": "Olakino",
 	"exif-iimcategory-wea": "Anianilā",
-	"watchlistall2": "nā mea apau",
 	"namespacesall": "nā mea apau",
 	"monthsall": "nā mea apau",
 	"confirm_purge_button": "Hiki nō",
@@ -1253,12 +1247,12 @@
 	"htmlform-yes": "ʻAe",
 	"htmlform-chosen-placeholder": "Koho i kekahi koho",
 	"rightsnone": "(ʻaʻohe)",
-	"feedback-subject": "Kumunui:",
-	"feedback-message": "Pūlono:",
-	"feedback-cancel": "Hoʻōki",
-	"feedback-submit": "Hoʻouna i nā Manaʻo",
 	"feedback-adding": "Ke hoʻohui nei i ka manaʻo i ka ʻaoʻao...",
+	"feedback-cancel": "Hoʻōki",
 	"feedback-close": "Ua pau",
+	"feedback-message": "Pūlono:",
+	"feedback-subject": "Kumunui:",
+	"feedback-submit": "Waiho",
 	"searchsuggest-search": "Huli",
 	"api-error-unknown-code": "Hewa ʻikeʻole: \"$1\".",
 	"api-error-unknown-warning": "Akahele ʻikeʻole: \"$1\".",