diff --git a/ChangeLog b/ChangeLog
index 2693fb2c72..63ceb48de6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,135 @@
+2018-12-28  Rafal Luzynski  <digitalfreak@lingonborough.com>
+
+	[BZ #10496]
+	* localedata/locales/aa_DJ (t_fmt): Set to "%l:%M:%S %p".
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/aa_ER (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/aa_ER@saaho (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/aa_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/am_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/byn_ER (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/om_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/sid_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/so_DJ (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/so_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/so_SO (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/ti_ER (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/ti_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/tig_ER (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/wal_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+
+	* localedata/locales/anp_IN (t_fmt): Set to "%I:%M:%S %p %Z".
+	* localedata/locales/ar_IN (t_fmt): Likewise.
+	* localedata/locales/bhb_IN (t_fmt): Likewise.
+	* localedata/locales/bho_IN (t_fmt): Likewise.
+	* localedata/locales/bi_VU (t_fmt): Likewise.
+	* localedata/locales/bn_BD (t_fmt): Likewise.
+	* localedata/locales/bn_IN (t_fmt): Likewise.
+	* localedata/locales/brx_IN (t_fmt): Likewise.
+	* localedata/locales/doi_IN (t_fmt): Likewise.
+	* localedata/locales/en_HK (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/en_IN (t_fmt): Likewise.
+	* localedata/locales/en_PH (t_fmt): Likewise.
+	* localedata/locales/gu_IN (t_fmt): Likewise.
+	* localedata/locales/hi_IN (t_fmt): Likewise.
+	* localedata/locales/hif_FJ (t_fmt): Likewise.
+	* localedata/locales/hne_IN (t_fmt): Likewise.
+	* localedata/locales/kn_IN (t_fmt): Likewise.
+	* localedata/locales/kok_IN (t_fmt): Likewise.
+	* localedata/locales/ks_IN (t_fmt): Likewise.
+	* localedata/locales/ks_IN@devanagari (t_fmt): Likewise.
+	* localedata/locales/mag_IN (t_fmt): Likewise.
+	* localedata/locales/mai_IN (t_fmt): Likewise.
+	* localedata/locales/mjw_IN (t_fmt): Likewise.
+	* localedata/locales/ml_IN (t_fmt): Likewise.
+	* localedata/locales/mni_IN (t_fmt): Likewise.
+	* localedata/locales/mr_IN (t_fmt): Likewise.
+	* localedata/locales/ms_MY (t_fmt): Likewise.
+	* localedata/locales/pa_IN (t_fmt): Likewise.
+	* localedata/locales/raj_IN (t_fmt): Likewise.
+	* localedata/locales/sa_IN (t_fmt): Likewise.
+	* localedata/locales/sat_IN (t_fmt): Likewise.
+	* localedata/locales/sd_IN (t_fmt): Likewise.
+	* localedata/locales/sd_IN@devanagari (t_fmt): Likewise.
+	* localedata/locales/tcy_IN (t_fmt): Likewise.
+	* localedata/locales/the_NP (t_fmt): Likewise.
+	* localedata/locales/to_TO (t_fmt): Likewise.
+	* localedata/locales/ur_IN (t_fmt): Likewise.
+
+	* localedata/locales/hif_FJ (d_t_fmt): Set to
+	"%A %d %b %Y %I:%M:%S %p".
+	(date_fmt): Add, set to "%A %d %b %Y %I:%M:%S %p %Z".
+
+	* localedata/locales/ar_AE (t_fmt): Set to "%Z %I:%M:%S %p".
+	* localedata/locales/ar_BH (t_fmt): Likewise.
+	* localedata/locales/ar_DZ (t_fmt): Likewise.
+	* localedata/locales/ar_EG (t_fmt): Likewise.
+	* localedata/locales/ar_IQ (t_fmt): Likewise.
+	* localedata/locales/ar_JO (t_fmt): Likewise.
+	* localedata/locales/ar_KW (t_fmt): Likewise.
+	* localedata/locales/ar_LB (t_fmt): Likewise.
+	* localedata/locales/ar_LY (t_fmt): Likewise.
+	* localedata/locales/ar_OM (t_fmt): Likewise.
+	* localedata/locales/ar_QA (t_fmt): Likewise.
+	* localedata/locales/ar_SD (t_fmt): Likewise.
+	* localedata/locales/ar_SS (t_fmt): Likewise.
+	* localedata/locales/ar_SY (t_fmt): Likewise.
+	* localedata/locales/ar_TN (t_fmt): Likewise.
+	* localedata/locales/ar_YE (t_fmt): Likewise.
+
+	* localedata/locales/gez_ER (t_fmt): Set to "%l:%M:%S<U1361>%p".
+	(t_fmt_ampm): Likewise.
+	* localedata/locales/gez_ET (t_fmt): Likewise.
+	(t_fmt_ampm): Likewise.
+
+	* localedata/locales/ta_IN (t_fmt): Set to "%p %I:%M:%S %Z".
+	(t_fmt_ampm): Likewise.
+	(d_t_fmt): Set to "%A %d %B %Y %p %I:%M:%S %Z".
+
+	* localedata/locales/zh_HK (t_fmt):
+	Set to "%p %I<U6642>%M<U5206>%S<U79D2> %Z".
+
+	* localedata/locales/ar_MA (t_fmt_ampm): Set to "" (empty string)
+	because this locale does not use the 12-hour clock.
+	(t_fmt): Set to "%Z %H:%M:%S".
+	(d_t_fmt): Set to "%d %b, %Y %Z %H:%M:%S".
+
+	* localedata/locales/mt_MT (t_fmt_ampm): Set to "" (empty string)
+	because this locale does not use the 12-hour clock.
+	(t_fmt): Set to "%H:%M:%S %Z".
+	(d_t_fmt): Set to "%A, %d ta %b, %Y %H:%M:%S %Z".
+
+	* localedata/locales/so_KE (t_fmt_ampm): Set to "" (empty string)
+	because this locale does not use the 12-hour clock.
+	(t_fmt): Set to "%T".
+	(d_t_fmt): Set to "%A, %B %e, %Y %X %Z".
+	(date_fmt): Set to "%A, %B %e, %X %Z %Y".
+
+	* localedata/locales/ta_LK (t_fmt_ampm): Set to "" (empty string)
+	because this locale does not use the 12-hour clock.
+	(t_fmt): Set to "%H:%M:%S %Z".
+	(d_t_fmt): Set to "%A %d %B %Y %H:%M:%S %Z".
+
+	* localedata/locales/bg_BG (t_fmt_ampm): Set to "" (empty string)
+	because this locale does not use the 12-hour clock.
+	* localedata/locales/cs_CZ (t_fmt_ampm): Likewise.
+	* localedata/locales/sk_SK (t_fmt_ampm): Likewise.
+
 2018-12-28  Rafal Luzynski  <digitalfreak@lingonborough.com>
 
 	[BZ #10496]
diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ
index fcb9af8abc..98e1505404 100644
--- a/localedata/locales/aa_DJ
+++ b/localedata/locales/aa_DJ
@@ -220,10 +220,10 @@ am_pm    "saaku";"carra"
 d_fmt   "%d.%m.%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 d_t_fmt    "%a %d %b %Y %r %Z"
diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER
index 1c6ce6b081..6d20ae907b 100644
--- a/localedata/locales/aa_ER
+++ b/localedata/locales/aa_ER
@@ -194,10 +194,10 @@ am_pm    "saaku";"carra"
 d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 d_t_fmt    "%A, %B %e, %Y %r %Z"
diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho
index ac1124ef48..1a2b16676f 100644
--- a/localedata/locales/aa_ER@saaho
+++ b/localedata/locales/aa_ER@saaho
@@ -179,10 +179,10 @@ am_pm    "saaku";"carra"
 d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 d_t_fmt    "%A, %B %e, %Y %r %Z"
diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET
index 770820d583..93fcdb7ff9 100644
--- a/localedata/locales/aa_ET
+++ b/localedata/locales/aa_ET
@@ -196,10 +196,10 @@ am_pm    "saaku";"carra"
 d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 d_t_fmt    "%A, %B %e, %Y %r %Z"
diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET
index e5fe88a4cd..7846d6278c 100644
--- a/localedata/locales/am_ET
+++ b/localedata/locales/am_ET
@@ -1039,10 +1039,10 @@ am_pm    "<U1321><U12CB><U1275>";/
 d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፣ %B %e ቀን %Y %r %Z
diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN
index b65c8732bd..eb3f35a19c 100644
--- a/localedata/locales/anp_IN
+++ b/localedata/locales/anp_IN
@@ -130,7 +130,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE
index be1caf4aab..3701909dd0 100644
--- a/localedata/locales/ar_AE
+++ b/localedata/locales/ar_AE
@@ -133,7 +133,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH
index ff744dfc9d..94a6f8b746 100644
--- a/localedata/locales/ar_BH
+++ b/localedata/locales/ar_BH
@@ -137,7 +137,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ
index 2b744fca28..420076cf72 100644
--- a/localedata/locales/ar_DZ
+++ b/localedata/locales/ar_DZ
@@ -142,7 +142,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG
index c8cb3180bf..2ec46b10d2 100644
--- a/localedata/locales/ar_EG
+++ b/localedata/locales/ar_EG
@@ -140,7 +140,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN
index 82fa3a6fff..85116e5e9c 100644
--- a/localedata/locales/ar_IN
+++ b/localedata/locales/ar_IN
@@ -106,7 +106,7 @@ d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ
index 333871c4ad..2483b04167 100644
--- a/localedata/locales/ar_IQ
+++ b/localedata/locales/ar_IQ
@@ -142,7 +142,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO
index 748515e0bc..5d532b4ac4 100644
--- a/localedata/locales/ar_JO
+++ b/localedata/locales/ar_JO
@@ -154,7 +154,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW
index 617df5df89..bec97f3dad 100644
--- a/localedata/locales/ar_KW
+++ b/localedata/locales/ar_KW
@@ -136,7 +136,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB
index 85a38c2a27..0c1405b37a 100644
--- a/localedata/locales/ar_LB
+++ b/localedata/locales/ar_LB
@@ -153,7 +153,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY
index bcf04f0503..c6bbee43bc 100644
--- a/localedata/locales/ar_LY
+++ b/localedata/locales/ar_LY
@@ -136,7 +136,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA
index 78e10ab415..88890f71e6 100644
--- a/localedata/locales/ar_MA
+++ b/localedata/locales/ar_MA
@@ -136,16 +136,16 @@ mon         "<U064A><U0646><U0627><U064A><U0631>";/
 am_pm       "<U0635>";"<U0645>"
 %
 % Appropriate date and time representation
-d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
+d_t_fmt     "%d %b, %Y %Z %H:%M:%S"
 %
 % Appropriate date representation
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %H:%M:%S"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "%Z %I:%M:%S %p"
+t_fmt_ampm  ""
 week 7;19971130;1
 first_weekday 7
 first_workday 1
diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM
index 950f60c680..00fae2b94e 100644
--- a/localedata/locales/ar_OM
+++ b/localedata/locales/ar_OM
@@ -136,7 +136,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA
index f0f2e0cf19..cedfedcdf3 100644
--- a/localedata/locales/ar_QA
+++ b/localedata/locales/ar_QA
@@ -136,7 +136,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD
index d5d89b1e6e..d8e9112d56 100644
--- a/localedata/locales/ar_SD
+++ b/localedata/locales/ar_SD
@@ -142,7 +142,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS
index 24b859549d..cfd3ea45d0 100644
--- a/localedata/locales/ar_SS
+++ b/localedata/locales/ar_SS
@@ -141,7 +141,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY
index 996df663f5..b786f685c6 100644
--- a/localedata/locales/ar_SY
+++ b/localedata/locales/ar_SY
@@ -153,7 +153,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN
index e0033f9e38..d4daf2c9e9 100644
--- a/localedata/locales/ar_TN
+++ b/localedata/locales/ar_TN
@@ -142,7 +142,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE
index ba4d9f95b0..a0ad9ca130 100644
--- a/localedata/locales/ar_YE
+++ b/localedata/locales/ar_YE
@@ -136,7 +136,7 @@ d_t_fmt     "%d %b, %Y %Z %I:%M:%S %p"
 d_fmt       "%d %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%Z %I:%M:%S "
+t_fmt       "%Z %I:%M:%S %p"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%Z %I:%M:%S %p"
diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
index 7a9cfa0a5d..f2136cdb16 100644
--- a/localedata/locales/bg_BG
+++ b/localedata/locales/bg_BG
@@ -276,7 +276,7 @@ d_t_fmt    "%x (%a) %X %Z"
 d_fmt      "%e.%m.%Y"
 t_fmt      "%k:%M:%S"
 am_pm      "";""
-t_fmt_ampm "%l:%M:%S"
+t_fmt_ampm ""
 %
 week 7;19971130;4
 first_weekday 2
diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN
index 42b95c6844..df723360c9 100644
--- a/localedata/locales/bhb_IN
+++ b/localedata/locales/bhb_IN
@@ -111,7 +111,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN
index d96cc4a902..851e4b5ace 100644
--- a/localedata/locales/bho_IN
+++ b/localedata/locales/bho_IN
@@ -117,7 +117,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/bi_VU b/localedata/locales/bi_VU
index 88bf70a61b..15787b93f9 100644
--- a/localedata/locales/bi_VU
+++ b/localedata/locales/bi_VU
@@ -102,7 +102,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%A %d %b %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S %Z"
+t_fmt       "%I:%M:%S %p %Z"
 % Equivalent of AM PM
 am_pm	"AM";"PM"
 %
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index 73efd1cbc3..214c805c83 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -137,7 +137,7 @@ mon         "<U099C><U09BE><U09A8><U09C1><U09AF><U09BC><U09BE><U09B0><U09C0>";/
 am_pm       "<U09AA><U09C2><U09B0><U09CD><U09AC><U09BE><U09B9><U09CD><U09A3>";"<U0985><U09AA><U09B0><U09BE><U09B9><U09CD><U09A3>"
 d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 t_fmt_ampm  "%I:%M:%S %p %Z"
 week 7;19971130;1
 first_weekday 6
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index 72bbae68f7..ad22b893d4 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -124,7 +124,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN
index 7d253effcc..db775705ca 100644
--- a/localedata/locales/brx_IN
+++ b/localedata/locales/brx_IN
@@ -120,7 +120,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-m//%-d//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER
index 53ed9597de..608378d205 100644
--- a/localedata/locales/byn_ER
+++ b/localedata/locales/byn_ER
@@ -196,11 +196,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፡ %B %e ዮም %Y %r %Z
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 41fbd2be93..f6b9731390 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -367,7 +367,7 @@ d_fmt 		"%-d.%-m.%Y"
 
 t_fmt		"%H:%M:%S"
 
-t_fmt_ampm	"%I:%M:%S"
+t_fmt_ampm	""
 
 am_pm   	"";""
 
diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN
index 02dce6bbfe..f6288679b0 100644
--- a/localedata/locales/doi_IN
+++ b/localedata/locales/doi_IN
@@ -119,7 +119,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index 2caf8dec56..547c0a10d6 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -127,10 +127,10 @@ d_t_fmt     "%A, %B %d, %Y %p%I:%M:%S %Z"
 d_fmt       "%A, %B %d, %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "%p%I:%M:%S %Z"
+t_fmt_ampm  "%I:%M:%S %p %Z"
 %
 week 7;19971130;1
 END LC_TIME
diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN
index 32cfe85b0c..e932931f5d 100644
--- a/localedata/locales/en_IN
+++ b/localedata/locales/en_IN
@@ -108,7 +108,7 @@ d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
 d_fmt       "%d//%m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH
index 074c9a5b22..e73fce98ff 100644
--- a/localedata/locales/en_PH
+++ b/localedata/locales/en_PH
@@ -130,7 +130,7 @@ d_t_fmt     "%A, %d %B, %Y %I:%M:%S %p %Z"
 d_fmt       "%A, %d %B, %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER
index 351c8e9fc7..261f9da0aa 100644
--- a/localedata/locales/gez_ER
+++ b/localedata/locales/gez_ER
@@ -192,11 +192,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S<U1361>%p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X<U1361>%p"
+t_fmt_ampm "%l:%M:%S<U1361>%p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፥%B፡%e፡መዓልት፡%Y፡%r፡%Z"
diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET
index ae38783827..bc8e0d392e 100644
--- a/localedata/locales/gez_ET
+++ b/localedata/locales/gez_ET
@@ -193,11 +193,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S<U1361>%p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X<U1361>%p"
+t_fmt_ampm "%l:%M:%S<U1361>%p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፥%B፡%e፡መዓልት፡%Y፡%r፡%Z"
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index cd7e23a4be..e80d551613 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -151,7 +151,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index a94365519f..a7614fbaa6 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -167,7 +167,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/hif_FJ b/localedata/locales/hif_FJ
index 5433bb4a2a..4d61d1d622 100644
--- a/localedata/locales/hif_FJ
+++ b/localedata/locales/hif_FJ
@@ -96,13 +96,16 @@ mon     "January";/
 am_pm   "Purvahan";"Aparaahna"
 %
 % Appropriate date and time representation
-d_t_fmt "%A %d %b %Y %I:%M:%S %Z"
+d_t_fmt "%A %d %b %Y %I:%M:%S %p"
+%
+% Appropriate date and time representation for date(1)
+date_fmt "%A %d %b %Y %I:%M:%S %p %Z"
 %
 % Appropriate date representation
 d_fmt   "%A %d %b %Y"
 %
 % Appropriate time representation
-t_fmt   "%I:%M:%S %Z"
+t_fmt   "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN
index 3de008e001..61fc7fa2c3 100644
--- a/localedata/locales/hne_IN
+++ b/localedata/locales/hne_IN
@@ -117,7 +117,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index b6443d12c8..4b3b5cff75 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -154,7 +154,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN
index 5eed1af0e3..ed0090ae76 100644
--- a/localedata/locales/kok_IN
+++ b/localedata/locales/kok_IN
@@ -117,7 +117,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d-%-m-%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN
index 9ab8707922..4ab05a79dc 100644
--- a/localedata/locales/ks_IN
+++ b/localedata/locales/ks_IN
@@ -127,7 +127,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-m//%-d//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari
index 72841eb6c2..3273affedd 100644
--- a/localedata/locales/ks_IN@devanagari
+++ b/localedata/locales/ks_IN@devanagari
@@ -119,7 +119,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-m//%-d//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN
index 93282a9878..09c169bd1c 100644
--- a/localedata/locales/mag_IN
+++ b/localedata/locales/mag_IN
@@ -118,7 +118,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN
index a8fdc86ebc..50ba5aa434 100644
--- a/localedata/locales/mai_IN
+++ b/localedata/locales/mai_IN
@@ -120,7 +120,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt   "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt   "%I:%M:%S  %Z"
+t_fmt   "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mjw_IN b/localedata/locales/mjw_IN
index cc573cf8c1..5c7629f704 100644
--- a/localedata/locales/mjw_IN
+++ b/localedata/locales/mjw_IN
@@ -92,7 +92,7 @@ d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
 d_fmt        "%-d//%-m//%y"
 
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index d7a8f43f1e..2857a97554 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -298,7 +298,7 @@ d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
 d_fmt     "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt     "%I:%M:%S  %Z"
+t_fmt     "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm     "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN
index 256c8db832..831eff0910 100644
--- a/localedata/locales/mni_IN
+++ b/localedata/locales/mni_IN
@@ -119,7 +119,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index 0ad08f7b3b..fc75268a33 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -194,7 +194,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY
index 66b5dd98e9..275cfbcf27 100644
--- a/localedata/locales/ms_MY
+++ b/localedata/locales/ms_MY
@@ -138,7 +138,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%A %d %b %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
index a6ab7b1dad..b56b6baab4 100644
--- a/localedata/locales/mt_MT
+++ b/localedata/locales/mt_MT
@@ -212,16 +212,16 @@ mon         "Jannar";/
 am_pm       "";""
 %
 % Appropriate date and time representation
-d_t_fmt     "%A, %d ta %b, %Y %I:%M:%S %p %Z"
+d_t_fmt     "%A, %d ta %b, %Y %H:%M:%S %Z"
 %
 % Appropriate date representation
 d_fmt       "%A, %d ta %b, %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%H:%M:%S %Z"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "%I:%M:%S %p %Z"
+t_fmt_ampm  ""
 week 7;19971130;1
 END LC_TIME
 
diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET
index dcef30e385..881b43fb17 100644
--- a/localedata/locales/om_ET
+++ b/localedata/locales/om_ET
@@ -208,10 +208,10 @@ am_pm    "WD";"WB"
 d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 d_t_fmt    "%A, %B %e, %Y %r %Z"
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index ca28f21162..a1ef516251 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -146,7 +146,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/raj_IN b/localedata/locales/raj_IN
index e4d30b7d6f..9dd10267c2 100644
--- a/localedata/locales/raj_IN
+++ b/localedata/locales/raj_IN
@@ -129,7 +129,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN
index 4eaf6fe1fe..362294af5a 100644
--- a/localedata/locales/sa_IN
+++ b/localedata/locales/sa_IN
@@ -155,7 +155,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d-%m-%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN
index d7b92f69b3..f73d4ac121 100644
--- a/localedata/locales/sat_IN
+++ b/localedata/locales/sat_IN
@@ -119,7 +119,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN
index e5ab80b062..08a9ba1071 100644
--- a/localedata/locales/sd_IN
+++ b/localedata/locales/sd_IN
@@ -127,7 +127,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari
index d57cea639b..509845132e 100644
--- a/localedata/locales/sd_IN@devanagari
+++ b/localedata/locales/sd_IN@devanagari
@@ -124,7 +124,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET
index ce67a7ad54..fd564453af 100644
--- a/localedata/locales/sid_ET
+++ b/localedata/locales/sid_ET
@@ -202,11 +202,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index 94e6e12bb2..b923741cbe 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -172,7 +172,7 @@ d_fmt 		"%d.%m.%Y"
 
 t_fmt		"%H:%M:%S"
 
-t_fmt_ampm	"%I:%M:%S"
+t_fmt_ampm	""
 
 am_pm   	"";""
 
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 3fd5cc030d..a21297731e 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -202,11 +202,11 @@ d_fmt   "%d.%m.%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index 4da4f15726..2f8fe420cc 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -199,11 +199,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index d434f37cbe..18ef57adbe 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -199,19 +199,19 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%T"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm ""
 %
 % Appropriate date and time representation (%c)
 %
-d_t_fmt    "%A, %B %e, %Y %r %Z"
+d_t_fmt    "%A, %B %e, %Y %X %Z"
 %
 % Appropriate date representation (date(1))
 %
-date_fmt    "%A, %B %e, %r %Z %Y"
+date_fmt    "%A, %B %e, %X %Z %Y"
 %
 week 7;19971130;1
 END LC_TIME
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index 713bf79608..b0a935ee71 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -247,11 +247,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index 5a083d2658..5e40629ff1 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -127,16 +127,16 @@ mon         "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BBF><U0BAA><U0BCD><
 am_pm       "<U0B95><U0BBE><U0BB2><U0BC8>";"<U0BAE><U0BBE><U0BB2><U0BC8>"
 %
 % Appropriate date and time representation
-d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
+d_t_fmt     "%A %d %B %Y %p %I:%M:%S %Z"
 %
 % Appropriate date representation
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%p %I:%M:%S %Z"
 %
 % Appropriate 12 h time representation (%r)
-t_fmt_ampm  "%I:%M:%S %p %Z"
+t_fmt_ampm  "%p %I:%M:%S %Z"
 %
 week 7;19971130;1
 END LC_TIME
diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK
index c843f892ce..ca5c1165c2 100644
--- a/localedata/locales/ta_LK
+++ b/localedata/locales/ta_LK
@@ -85,10 +85,10 @@ mon         "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BBF><U0BAA><U0BCD><
             "<U0B9A><U0BC6><U0BAA><U0BCD><U0B9F><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B85><U0B95><U0BCD><U0B9F><U0BCB><U0BAA><U0BB0><U0BCD>";/
             "<U0BA8><U0BB5><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B9F><U0BBF><U0B9A><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>"
 am_pm       "<U0B95><U0BBE><U0BB2><U0BC8>";"<U0BAE><U0BBE><U0BB2><U0BC8>"
-d_t_fmt     "%A %d %B %Y %I:%M:%S %p %Z"
+d_t_fmt     "%A %d %B %Y %H:%M:%S %Z"
 d_fmt       "%-d//%-m//%y"
-t_fmt       "%I:%M:%S  %Z"
-t_fmt_ampm  "%I:%M:%S %p %Z"
+t_fmt       "%H:%M:%S %Z"
+t_fmt_ampm  ""
 
 week 7;19971130;1
 first_weekday 2
diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN
index ba93d673c8..a356801352 100644
--- a/localedata/locales/tcy_IN
+++ b/localedata/locales/tcy_IN
@@ -130,7 +130,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP
index 993e62fbfc..037ffa97f5 100644
--- a/localedata/locales/the_NP
+++ b/localedata/locales/the_NP
@@ -121,7 +121,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%A %d %b %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER
index 77b9666c5e..890bbb6d3c 100644
--- a/localedata/locales/ti_ER
+++ b/localedata/locales/ti_ER
@@ -239,11 +239,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፡ %B %e መዓልቲ %Y %r %Z
diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET
index 6c387604e9..e7c8ec362b 100644
--- a/localedata/locales/ti_ET
+++ b/localedata/locales/ti_ET
@@ -1040,11 +1040,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፣ %B %e መዓልቲ %Y %r %Z
diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER
index d6afaf147d..403a919580 100644
--- a/localedata/locales/tig_ER
+++ b/localedata/locales/tig_ER
@@ -196,11 +196,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፡ %B %e ዮም %Y %r %Z
diff --git a/localedata/locales/to_TO b/localedata/locales/to_TO
index 7abe8685df..afffb619ca 100644
--- a/localedata/locales/to_TO
+++ b/localedata/locales/to_TO
@@ -91,7 +91,6 @@ abday  "S<U0101>p";/
        "Fal";/
        "Tok"
 % Equivalent of AM PM
-% hengihengi, efiafi
 am_pm  "hengihengi";"efiafi"
 
 %
@@ -102,10 +101,9 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%A %d %b %Y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
-% %I:%M:%S %p %Z
 t_fmt_ampm "%I:%M:%S %p %Z"
 END LC_TIME
 %
diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN
index 062cbf0937..26a9142bb5 100644
--- a/localedata/locales/ur_IN
+++ b/localedata/locales/ur_IN
@@ -127,7 +127,7 @@ d_t_fmt     "%A %d %b %Y %I:%M:%S %p %Z"
 d_fmt       "%-d//%-m//%y"
 %
 % Appropriate time representation
-t_fmt       "%I:%M:%S  %Z"
+t_fmt       "%I:%M:%S %p %Z"
 %
 % Appropriate 12 h time representation (%r)
 t_fmt_ampm  "%I:%M:%S %p %Z"
diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET
index 4811bd8eaf..65b8e5f5be 100644
--- a/localedata/locales/wal_ET
+++ b/localedata/locales/wal_ET
@@ -206,11 +206,11 @@ d_fmt   "%d//%m//%Y"
 %
 % Appropriate time representation (%X)
 %
-t_fmt "%l:%M:%S"
+t_fmt "%l:%M:%S %p"
 %
 % Appropriate AM/PM time representation (%r)
 %
-t_fmt_ampm "%X %p"
+t_fmt_ampm "%l:%M:%S %p"
 %
 % Appropriate date and time representation (%c)
 %	"%A፣ %B %e ጋላሳ  %Y %r %Z
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index c130878f3d..5085c69c39 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -133,8 +133,8 @@ d_t_fmt     "%Y<U5E74>%m<U6708>%d<U65E5> %A %H:%M:%S"
 d_fmt       "%Y<U5E74>%m<U6708>%d<U65E5> %A"
 %
 % Appropriate time representation
-% %I時%M分%S秒 %Z
-t_fmt       "%I<U6642>%M<U5206>%S<U79D2> %Z"
+% %p %I時%M分%S秒 %Z
+t_fmt       "%p %I<U6642>%M<U5206>%S<U79D2> %Z"
 %
 % Appropriate 12 h time representation (%r)
 % Update by Roger So <roger.so@sw-linux.com>