From 9a112d5981cbbf039d7717425e888f4f0a1f3a1e Mon Sep 17 00:00:00 2001
From: Deon Heyns <heynsd@gmail.com>
Date: Sun, 10 Jun 2012 12:55:29 -0300
Subject: [PATCH 1/2] Added an Afrikaans translation

Added the Afrikaans localization
---
 localization/jquery-ui-timepicker-af.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 localization/jquery-ui-timepicker-af.js

diff --git a/localization/jquery-ui-timepicker-af.js b/localization/jquery-ui-timepicker-af.js
new file mode 100644
index 00000000..da922d5f
--- /dev/null
+++ b/localization/jquery-ui-timepicker-af.js
@@ -0,0 +1,20 @@
+/* Afrikaans translation for the jQuery Timepicker Addon */
+/* Written by Deon Heyns */
+(function($) {
+	$.timepicker.regional['af'] = {
+		timeOnlyTitle: 'Kies Tyd',
+		timeText: 'Tyd ',
+		hourText: 'Ure ',
+		minuteText: 'Minute',
+		secondText: 'Sekondes',
+		millisecText: 'Millisekondes',
+		timezoneText: 'Tydsone',
+		currentText: 'Huidige Tyd',
+		closeText: 'Klaar',
+		timeFormat: 'hh:mm tt',
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		ampm: false
+	};
+	$.timepicker.setDefaults($.timepicker.regional['af']);
+})(jQuery);

From 9e9fef56cc54e14f11f3890147b2578b520f983c Mon Sep 17 00:00:00 2001
From: Deon Heyns <heynsd@gmail.com>
Date: Sun, 10 Jun 2012 12:56:51 -0300
Subject: [PATCH 2/2] Merge changes to dev branch