Merge commit 'fa89acd'

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

1 files changed, 11 insertions, 4 deletions

diff --git a/languages/i18n/ace.json b/languages/i18n/ace.json
index 6ef231de..5bab69ad 100644
--- a/languages/i18n/ace.json
+++ b/languages/i18n/ace.json
@@ -37,7 +37,7 @@
 	"tog-shownumberswatching": "Peuleumah jumeulah ureueng kalon",
 	"tog-oldsig": "Tanda jaroe jinoe:",
 	"tog-fancysig": "Peujeuet tanda jaroe sibagoe naseukah wiki (hana hubông keudroe)",
-	"tog-uselivepreview": "Ngui peuleumah hasé langsông (baci)",
+	"tog-uselivepreview": "Ngui peuleumah hasé langsông",
 	"tog-forceeditsummary": "Peuingat lôn meunyo plôk neuringkaih neuandam mantöng soh",
 	"tog-watchlisthideown": "Peusöm nyang lôn andam nibak dapeuta keunalön",
 	"tog-watchlisthidebots": "Peusöm nyang teuandam nibak dapeuta keunalön",
@@ -212,6 +212,7 @@
 	"otherlanguages": "Bahsa la’én",
 	"redirectedfrom": "(Geupeupinah nibak $1)",
 	"redirectpagesub": "Laman peuninah",
+	"redirectto": "Peupinah u:",
 	"lastmodifiedat": "Laman nyoë seuneulheuëh geuubah bak $1 poh $2.",
 	"viewcount": "Laman nyoë ka geusaweuë {{PLURAL:$1|sigo|$sigo}}.<br />",
 	"protectedpage": "Laman teupeulindông",
@@ -232,6 +233,7 @@
 	"disclaimers": "Beunantah",
 	"disclaimerpage": "Project:Beunantah umom",
 	"edithelp": "Bantu andam",
+	"helppage-top-gethelp": "Beunantu",
 	"mainpage": "Ôn Keuë",
 	"mainpage-description": "Ôn Keuë",
 	"policy-url": "Project:Neuatô",
@@ -263,6 +265,8 @@
 	"hidetoc": "peusom",
 	"collapsible-collapse": "Peuubeut",
 	"collapsible-expand": "Peuluwaih",
+	"confirmable-yes": "Nyoe",
+	"confirmable-no": "Kön",
 	"thisisdeleted": "Eu atawa peuriwang $1?",
 	"viewdeleted": "Eu $1?",
 	"restorelink": "$1 {{PLURAL:$1|neuandam|neuandam}} nyang ka geusampoh",
@@ -457,7 +461,6 @@
 	"passwordreset": "Atô keulayi lageuëm rahsia",
 	"passwordreset-text-one": "Neupeuleungkap formulir nyoë keu meuatô keulayi narit rahsia",
 	"passwordreset-text-many": "{{PLURAL:$1|Neupasoë saboh kutak dimeuyub nyoë keu neuteumèe narit rahsia siat rot e-surat}}",
-	"passwordreset-legend": "Atô keulayi lageuëm rahsia",
 	"passwordreset-disabled": "Meuatô narit rahsia keulayi ka geupeumaté lam wiki nyoë",
 	"passwordreset-emaildisabled": "Tanda e-surat ka geupeumaté lam wiki nyoë",
 	"passwordreset-username": "Ureueng ngui:",
@@ -466,7 +469,7 @@
 	"passwordreset-capture-help": "Meunyoë droëneuh neuceuë kutak nyoë, e-surat (ngon narit rahsia siat) ka geupeuleumah keudroëneuh ngon geukirém cit keu ureuëng ngui",
 	"passwordreset-email": "Alamat surat-e:",
 	"passwordreset-emailtitle": "Teuneurang nan ureueng ngui bak {{SITENAME}}",
-	"passwordreset-emailelement": "Nan ureuëng ngui: $1\nLageuëm rahsia sijamong: $2",
+	"passwordreset-emailelement": "Nan ureuëng ngui: \n$1\n\nLageuëm rahsia sijamong: \n$2",
 	"changeemail": "Gantoe alamat surat-e",
 	"changeemail-no-info": "Droeneuh suwah neutamöng mangat jeuet neu'eu laman nyoe",
 	"changeemail-oldemail": "Alamat surat-e jinoe:",
@@ -961,7 +964,6 @@
 	"emailuser": "Surat-e ureuëng ngui",
 	"emailuser-title-target": "Peu'ét surat-e keu {{GENDER:$1|ureuëng ngui}} nyoë",
 	"emailuser-title-notarget": "Peu'ét surat-e",
-	"emailpage": "Peu'ét surat-e keu ureuëng ngui",
 	"emailusername": "Ureueng ngui:",
 	"emailusernamesubmit": "Kirém",
 	"email-legend": "Kirém surat-e keu ureueng ngui {{SITENAME}} la'én",
@@ -1171,8 +1173,13 @@
 	"metadata-expand": "Peuleumah tapeusili teunamah",
 	"metadata-collapse": "Peusom tapeusili teunamah",
 	"metadata-fields": "Bideuëng mètadata gamba nyang na lam peusan nyoë keuneuk geupasoë bak tampilan halaman gamba 'oh watèë tabel mètadata geutôp.\nData nyang la'én eunteuk teupeusom keudroë.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
+	"exif-orientation": "Orientasi",
 	"exif-xresolution": "Resolusi linteuëng",
 	"exif-yresolution": "Rèsolusi buju",
+	"exif-software": "Software geungui",
+	"exif-exifversion": "Versi Exif",
+	"exif-datetimedigitized": "Uroë buleuën ngön watèë digital",
+	"exif-orientation-1": "Biasa",
 	"namespacesall": "ban dum",
 	"monthsall": "ban dum",
 	"recreate": "Peugöt ulang",