Merge remote-tracking branch 'origin/master' into overridablelangstrings

Conflicts:
	inc/plugin.php

2 files changed, 39 insertions, 25 deletions

diff --git a/inc/lang/af/jquery.ui.datepicker.js b/inc/lang/af/jquery.ui.datepicker.js
index 0922ef7a1..ec86242d6 100644
--- a/inc/lang/af/jquery.ui.datepicker.js
+++ b/inc/lang/af/jquery.ui.datepicker.js
@@ -1,23 +1,37 @@
 /* Afrikaans initialisation for the jQuery UI date picker plugin. */
 /* Written by Renier Pretorius. */
-jQuery(function($){
-	$.datepicker.regional['af'] = {
-		closeText: 'Selekteer',
-		prevText: 'Vorige',
-		nextText: 'Volgende',
-		currentText: 'Vandag',
-		monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
-		'Julie','Augustus','September','Oktober','November','Desember'],
-		monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
-		'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
-		dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
-		dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
-		dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
-		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
-		firstDay: 1,
-		isRTL: false,
-		showMonthAfterYear: false,
-		yearSuffix: ''};
-	$.datepicker.setDefaults($.datepicker.regional['af']);
-});
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([ "../datepicker" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery.datepicker );
+	}
+}(function( datepicker ) {
+
+datepicker.regional['af'] = {
+	closeText: 'Selekteer',
+	prevText: 'Vorige',
+	nextText: 'Volgende',
+	currentText: 'Vandag',
+	monthNames: ['Januarie','Februarie','Maart','April','Mei','Junie',
+	'Julie','Augustus','September','Oktober','November','Desember'],
+	monthNamesShort: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun',
+	'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
+	dayNames: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
+	dayNamesShort: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
+	dayNamesMin: ['So','Ma','Di','Wo','Do','Vr','Sa'],
+	weekHeader: 'Wk',
+	dateFormat: 'dd/mm/yy',
+	firstDay: 1,
+	isRTL: false,
+	showMonthAfterYear: false,
+	yearSuffix: ''};
+datepicker.setDefaults(datepicker.regional['af']);
+
+return datepicker.regional['af'];
+
+}));
diff --git a/inc/lang/af/lang.php b/inc/lang/af/lang.php
index 008110450..70672fbdd 100644
--- a/inc/lang/af/lang.php
+++ b/inc/lang/af/lang.php
@@ -25,7 +25,7 @@ $lang['btn_back']              = 'Terug';
 $lang['btn_backlink']          = 'Wat skakel hierheen';
 $lang['btn_subscribe']         = 'Hou bladsy dop';
 $lang['btn_register']          = 'Skep gerus \'n rekening';
-$lang['loggedinas']            = 'Ingeteken as';
+$lang['loggedinas']            = 'Ingeteken as:';
 $lang['user']                  = 'Gebruikernaam';
 $lang['pass']                  = 'Wagwoord';
 $lang['newpass']               = 'Nuive wagwoord';
@@ -52,7 +52,7 @@ $lang['mediaroot']             = 'root';
 $lang['toc']                   = 'Inhoud';
 $lang['current']               = 'huidige';
 $lang['line']                  = 'Streak';
-$lang['youarehere']            = 'Jy is hier';
+$lang['youarehere']            = 'Jy is hier:';
 $lang['by']                    = 'by';
 $lang['restored']              = 'Het terug gegaan na vroeëre weergawe (%s)';
 $lang['summary']               = 'Voorskou';
@@ -64,7 +64,7 @@ $lang['qb_hr']                 = 'Horisontale streep';
 $lang['qb_sig']                = 'Handtekening met datum';
 $lang['admin_register']        = 'Skep gerus \'n rekening';
 $lang['btn_img_backto']        = 'Terug na %s';
-$lang['img_date']              = 'Datem';
-$lang['img_camera']            = 'Camera';
+$lang['img_date']              = 'Datem:';
+$lang['img_camera']            = 'Camera:';
 $lang['i_wikiname']            = 'Wiki Naam';
 $lang['i_funcna']              = 'PHP funksie <code>%s</code> is nie beskibaar nie. Miskien is dit af gehaal.';