Fix merge conflict

32 files changed, 64 insertions, 32 deletions

diff --git a/localization/jquery-ui-timepicker-af.js b/localization/jquery-ui-timepicker-af.js
index da922d5..0ad850a 100644
--- a/localization/jquery-ui-timepicker-af.js
+++ b/localization/jquery-ui-timepicker-af.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',

 		amNames: ['AM', 'A'],

 		pmNames: ['PM', 'P'],

-		ampm: false

+		ampm: false,

+		isRTL: false

 	};

 	$.timepicker.setDefaults($.timepicker.regional['af']);

 })(jQuery);

diff --git a/localization/jquery-ui-timepicker-bg.js b/localization/jquery-ui-timepicker-bg.js
index 9b2bf42..1ccf6db 100644
--- a/localization/jquery-ui-timepicker-bg.js
+++ b/localization/jquery-ui-timepicker-bg.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['bg']);
 })(jQuery);
\ No newline at end of file
diff --git a/localization/jquery-ui-timepicker-ca.js b/localization/jquery-ui-timepicker-ca.js
index d4d9abb..3551130 100644
--- a/localization/jquery-ui-timepicker-ca.js
+++ b/localization/jquery-ui-timepicker-ca.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ca']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-cs.js b/localization/jquery-ui-timepicker-cs.js
index 74ef405..3c14875 100644
--- a/localization/jquery-ui-timepicker-cs.js
+++ b/localization/jquery-ui-timepicker-cs.js
@@ -14,7 +14,8 @@
 		timeFormat: 'h:m',
 		amNames: ['dop.', 'AM', 'A'],
 		pmNames: ['odp.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['cs']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-de.js b/localization/jquery-ui-timepicker-de.js
index 741298b..ebf76c1 100644
--- a/localization/jquery-ui-timepicker-de.js
+++ b/localization/jquery-ui-timepicker-de.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['vorm.', 'AM', 'A'],
 		pmNames: ['nachm.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['de']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-el.js b/localization/jquery-ui-timepicker-el.js
index 207abb5..b475a62 100644
--- a/localization/jquery-ui-timepicker-el.js
+++ b/localization/jquery-ui-timepicker-el.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['π.μ.', 'AM', 'A'],
 		pmNames: ['μ.μ.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['el']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-es.js b/localization/jquery-ui-timepicker-es.js
index 2d76f9b..d1cfc9a 100644
--- a/localization/jquery-ui-timepicker-es.js
+++ b/localization/jquery-ui-timepicker-es.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['es']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-et.js b/localization/jquery-ui-timepicker-et.js
index fc86b34..8417690 100644
--- a/localization/jquery-ui-timepicker-et.js
+++ b/localization/jquery-ui-timepicker-et.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['et']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-fi.js b/localization/jquery-ui-timepicker-fi.js
index 18ba718..d21b781 100644
--- a/localization/jquery-ui-timepicker-fi.js
+++ b/localization/jquery-ui-timepicker-fi.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['ap.', 'AM', 'A'],
 		pmNames: ['ip.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['fi']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-fr.js b/localization/jquery-ui-timepicker-fr.js
index ac8159d..c2315b5 100644
--- a/localization/jquery-ui-timepicker-fr.js
+++ b/localization/jquery-ui-timepicker-fr.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['fr']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-gl.js b/localization/jquery-ui-timepicker-gl.js
index 09fea0b..2717bcc 100644
--- a/localization/jquery-ui-timepicker-gl.js
+++ b/localization/jquery-ui-timepicker-gl.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['gl']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-he.js b/localization/jquery-ui-timepicker-he.js
index bf4a107..429f84a 100644
--- a/localization/jquery-ui-timepicker-he.js
+++ b/localization/jquery-ui-timepicker-he.js
@@ -14,7 +14,8 @@
 		timeFormat: "hh:mm tt",
 		amNames: ['לפנה"צ', 'AM', 'A'],
 		pmNames: ['אחה"צ', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: true
 	};
 	$.timepicker.setDefaults($.timepicker.regional["he"]);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-hu.js b/localization/jquery-ui-timepicker-hu.js
index 956d986..af84b5f 100644
--- a/localization/jquery-ui-timepicker-hu.js
+++ b/localization/jquery-ui-timepicker-hu.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['de.', 'AM', 'A'],
 		pmNames: ['du.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['hu']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-id.js b/localization/jquery-ui-timepicker-id.js
index e802738..7645f13 100644
--- a/localization/jquery-ui-timepicker-id.js
+++ b/localization/jquery-ui-timepicker-id.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['id']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-it.js b/localization/jquery-ui-timepicker-it.js
index d519670..10b2ab4 100644
--- a/localization/jquery-ui-timepicker-it.js
+++ b/localization/jquery-ui-timepicker-it.js
@@ -14,7 +14,8 @@
         timeFormat: 'hh:mm',
         amNames: ['m.', 'AM', 'A'],
         pmNames: ['p.', 'PM', 'P'],
-        ampm: false
+        ampm: false,
+        isRTL: false
     };
     $.timepicker.setDefaults($.timepicker.regional['it']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-ja.js b/localization/jquery-ui-timepicker-ja.js
index aa05d6a..cd267e3 100644
--- a/localization/jquery-ui-timepicker-ja.js
+++ b/localization/jquery-ui-timepicker-ja.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['午前', 'AM', 'A'],
 		pmNames: ['午後', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ja']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-ko.js b/localization/jquery-ui-timepicker-ko.js
index 2e002d7..c238d87 100644
--- a/localization/jquery-ui-timepicker-ko.js
+++ b/localization/jquery-ui-timepicker-ko.js
@@ -14,7 +14,8 @@
 		timeFormat: 'tt h:mm',
 		amNames: ['오전', 'AM', 'A'],
 		pmNames: ['오후', 'PM', 'P'],
-		ampm: true
+		ampm: true,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ko']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-lt.js b/localization/jquery-ui-timepicker-lt.js
index a67e267..662b639 100644
--- a/localization/jquery-ui-timepicker-lt.js
+++ b/localization/jquery-ui-timepicker-lt.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['priešpiet', 'AM', 'A'],
 		pmNames: ['popiet', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['lt']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-nl.js b/localization/jquery-ui-timepicker-nl.js
index 181b911..b31b89a 100644
--- a/localization/jquery-ui-timepicker-nl.js
+++ b/localization/jquery-ui-timepicker-nl.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['nl']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-no.js b/localization/jquery-ui-timepicker-no.js
index c34348b..9997345 100644
--- a/localization/jquery-ui-timepicker-no.js
+++ b/localization/jquery-ui-timepicker-no.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['am', 'AM', 'A'],
 		pmNames: ['pm', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['no']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-pl.js b/localization/jquery-ui-timepicker-pl.js
index 085eb88..16dab12 100644
--- a/localization/jquery-ui-timepicker-pl.js
+++ b/localization/jquery-ui-timepicker-pl.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pl']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-pt-BR.js b/localization/jquery-ui-timepicker-pt-BR.js
index efbae6d..ea86993 100644
--- a/localization/jquery-ui-timepicker-pt-BR.js
+++ b/localization/jquery-ui-timepicker-pt-BR.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pt-BR']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-pt.js b/localization/jquery-ui-timepicker-pt.js
index eef52f6..c9b05bb 100644
--- a/localization/jquery-ui-timepicker-pt.js
+++ b/localization/jquery-ui-timepicker-pt.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['a.m.', 'AM', 'A'],
 		pmNames: ['p.m.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['pt']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-ro.js b/localization/jquery-ui-timepicker-ro.js
index da66135..0224bdb 100644
--- a/localization/jquery-ui-timepicker-ro.js
+++ b/localization/jquery-ui-timepicker-ro.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ro']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-ru.js b/localization/jquery-ui-timepicker-ru.js
index b1878a0..4469a11 100644
--- a/localization/jquery-ui-timepicker-ru.js
+++ b/localization/jquery-ui-timepicker-ru.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['ru']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-sk.js b/localization/jquery-ui-timepicker-sk.js
index 1eaacde..8c57fb7 100644
--- a/localization/jquery-ui-timepicker-sk.js
+++ b/localization/jquery-ui-timepicker-sk.js
@@ -14,7 +14,8 @@
 		timeFormat: 'h:m',
 		amNames: ['dop.', 'AM', 'A'],
 		pmNames: ['pop.', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['sk']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-sv.js b/localization/jquery-ui-timepicker-sv.js
index 742dffa..d5a123e 100644
--- a/localization/jquery-ui-timepicker-sv.js
+++ b/localization/jquery-ui-timepicker-sv.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['sv']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-tr.js b/localization/jquery-ui-timepicker-tr.js
index aca1258..bc054b2 100644
--- a/localization/jquery-ui-timepicker-tr.js
+++ b/localization/jquery-ui-timepicker-tr.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['ÖÖ', 'Ö'],
 		pmNames: ['ÖS', 'S'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['tr']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-uk.js b/localization/jquery-ui-timepicker-uk.js
index dd5d1df..d6830d8 100644
--- a/localization/jquery-ui-timepicker-uk.js
+++ b/localization/jquery-ui-timepicker-uk.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['uk']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-vi.js b/localization/jquery-ui-timepicker-vi.js
index c2c3b99..1116f9d 100644
--- a/localization/jquery-ui-timepicker-vi.js
+++ b/localization/jquery-ui-timepicker-vi.js
@@ -14,7 +14,8 @@
 		timeFormat: 'h:m',
 		amNames: ['SA', 'AM', 'A'],
 		pmNames: ['CH', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['vi']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-zh-CN.js b/localization/jquery-ui-timepicker-zh-CN.js
index ea0729d..a5af91b 100644
--- a/localization/jquery-ui-timepicker-zh-CN.js
+++ b/localization/jquery-ui-timepicker-zh-CN.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['zh-CN']);
 })(jQuery);
diff --git a/localization/jquery-ui-timepicker-zh-TW.js b/localization/jquery-ui-timepicker-zh-TW.js
index 792aaac..e8e6ba8 100644
--- a/localization/jquery-ui-timepicker-zh-TW.js
+++ b/localization/jquery-ui-timepicker-zh-TW.js
@@ -14,7 +14,8 @@
 		timeFormat: 'hh:mm tt',
 		amNames: ['上午', 'AM', 'A'],
 		pmNames: ['下午', 'PM', 'P'],
-		ampm: false
+		ampm: false,
+		isRTL: false
 	};
 	$.timepicker.setDefaults($.timepicker.regional['zh-TW']);
 })(jQuery);