Merge ^/head r303250 through r304235.

154 files changed, 1166 insertions, 922 deletions

diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index b63ab812ea34..4e1592adf74a 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -49,7 +49,9 @@ MLINKS+=	bitstring.3 bit_alloc.3 \
 		bitstring.3 bit_clear.3 \
 		bitstring.3 bit_decl.3 \
 		bitstring.3 bit_ffc.3 \
+		bitstring.3 bit_ffc_at.3 \
 		bitstring.3 bit_ffs.3 \
+		bitstring.3 bit_ffs_at.3 \
 		bitstring.3 bit_nclear.3 \
 		bitstring.3 bit_nset.3 \
 		bitstring.3 bit_set.3 \
diff --git a/share/man/man3/pthread_getcpuclockid.3 b/share/man/man3/pthread_getcpuclockid.3
index de0e6bcfd5ef..c36be81e58dc 100644
--- a/share/man/man3/pthread_getcpuclockid.3
+++ b/share/man/man3/pthread_getcpuclockid.3
@@ -51,8 +51,8 @@
 The
 .Fn pthread_getcpuclockid
 returns the clock ID of the CPU-time clock of the thread specified by
-.Fa thread_id .
-If the thread described by
+.Fa thread_id ,
+if the thread described by
 .Fa thread_id
 exists.
 .Sh RETURN VALUES
@@ -61,7 +61,9 @@ Upon successful completion,
 returns zero; otherwise, an error number is returned to indicate the
 error.
 .Sh ERRORS
-The pthread_getcpuclockid() function will fail if:
+The
+.Fn pthread_getcpuclockid
+function will fail if:
 .Bl -tag -width Er
 .It Bq Er ESRCH
 The value specified by
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index fc412de5b1ae..1dfc96483445 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd April 16, 2015
+.Dd August 16, 2016
 .Dt PTHREAD_TESTCANCEL 3
 .Os
 .Sh NAME
@@ -114,6 +114,7 @@ function is a cancellation point if
 .Fa cmd
 is
 .Dv F_SETLKW .
+.It Fn fdatasync
 .It Fn fsync
 .It Fn kevent
 The
diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3
index bde4687b0eb1..1023c65a5640 100644
--- a/share/man/man3/queue.3
+++ b/share/man/man3/queue.3
@@ -28,12 +28,13 @@
 .\"	@(#)queue.3	8.2 (Berkeley) 1/24/94
 .\" $FreeBSD$
 .\"
-.Dd June 24, 2015
+.Dd August 15, 2016
 .Dt QUEUE 3
 .Os
 .Sh NAME
 .Nm SLIST_CLASS_ENTRY ,
 .Nm SLIST_CLASS_HEAD ,
+.Nm SLIST_CONCAT ,
 .Nm SLIST_EMPTY ,
 .Nm SLIST_ENTRY ,
 .Nm SLIST_FIRST ,
@@ -75,6 +76,7 @@
 .Nm STAILQ_SWAP ,
 .Nm LIST_CLASS_ENTRY ,
 .Nm LIST_CLASS_HEAD ,
+.Nm LIST_CONCAT ,
 .Nm LIST_EMPTY ,
 .Nm LIST_ENTRY ,
 .Nm LIST_FIRST ,
@@ -125,6 +127,7 @@ lists and tail queues
 .\"
 .Fn SLIST_CLASS_ENTRY "CLASSTYPE"
 .Fn SLIST_CLASS_HEAD "HEADNAME" "CLASSTYPE"
+.Fn SLIST_CONCAT "SLIST_HEAD *head1" "SLIST_HEAD *head2" "TYPE" "SLIST_ENTRY NAME"
 .Fn SLIST_EMPTY "SLIST_HEAD *head"
 .Fn SLIST_ENTRY "TYPE"
 .Fn SLIST_FIRST "SLIST_HEAD *head"
@@ -141,7 +144,7 @@ lists and tail queues
 .Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME"
 .Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME"
 .Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME"
-.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "SLIST_ENTRY NAME"
+.Fn SLIST_SWAP "SLIST_HEAD *head1" "SLIST_HEAD *head2" "TYPE"
 .\"
 .Fn STAILQ_CLASS_ENTRY "CLASSTYPE"
 .Fn STAILQ_CLASS_HEAD "HEADNAME" "CLASSTYPE"
@@ -164,10 +167,11 @@ lists and tail queues
 .Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME"
 .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME"
-.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "STAILQ_ENTRY NAME"
+.Fn STAILQ_SWAP "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" "TYPE"
 .\"
 .Fn LIST_CLASS_ENTRY "CLASSTYPE"
 .Fn LIST_CLASS_HEAD "HEADNAME" "CLASSTYPE"
+.Fn LIST_CONCAT "LIST_HEAD *head1" "LIST_HEAD *head2" "TYPE" "LIST_ENTRY NAME"
 .Fn LIST_EMPTY "LIST_HEAD *head"
 .Fn LIST_ENTRY "TYPE"
 .Fn LIST_FIRST "LIST_HEAD *head"
@@ -249,6 +253,8 @@ Singly-linked lists add the following functionality:
 .Bl -enum -compact -offset indent
 .It
 O(n) removal of any entry in the list.
+.It
+O(n) concatenation of two lists.
 .El
 .Pp
 Singly-linked tail queues add the following functionality:
@@ -296,6 +302,8 @@ Linked lists are the simplest of the doubly linked data structures.
 They add the following functionality over the above:
 .Bl -enum -compact -offset indent
 .It
+O(n) concatenation of two lists.
+.It
 They may be traversed backwards.
 .El
 However:
@@ -401,6 +409,19 @@ evaluates to an initializer for the list
 .Fa head .
 .Pp
 The macro
+.Nm SLIST_CONCAT
+concatenates the list headed by
+.Fa head2
+onto the end of the one headed by
+.Fa head1
+removing all entries from the former.
+Use of this macro should be avoided as it traverses the entirety of the
+.Fa head1
+list.
+A singly-linked tail queue should be used if this macro is needed in
+high-usage code paths or to operate on long lists.
+.Pp
+The macro
 .Nm SLIST_EMPTY
 evaluates to true if there are no elements in the list.
 .Pp
@@ -508,6 +529,9 @@ The macro
 removes the element
 .Fa elm
 from the list.
+Use of this macro should be avoided as it traverses the entire list.
+A doubly-linked list should be used if this macro is needed in
+high-usage code paths or to operate on long lists.
 .Pp
 The macro
 .Nm SLIST_SWAP
@@ -724,6 +748,9 @@ The macro
 removes the element
 .Fa elm
 from the tail queue.
+Use of this macro should be avoided as it traverses the entire list.
+A doubly-linked tail queue should be used if this macro is needed in
+high-usage code paths or to operate on long tail queues.
 .Pp
 The macro
 .Nm STAILQ_SWAP
@@ -823,6 +850,19 @@ evaluates to an initializer for the list
 .Fa head .
 .Pp
 The macro
+.Nm LIST_CONCAT
+concatenates the list headed by
+.Fa head2
+onto the end of the one headed by
+.Fa head1
+removing all entries from the former.
+Use of this macro should be avoided as it traverses the entirety of the
+.Fa head1
+list.
+A tail queue should be used if this macro is needed in
+high-usage code paths or to operate on long lists.
+.Pp
+The macro
 .Nm LIST_EMPTY
 evaluates to true if there are no elements in the list.
 .Pp
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 1cd099b0b5a4..e85e531aa802 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -269,7 +269,6 @@ MAN=	aac.4 \
 	mac_stub.4 \
 	mac_test.4 \
 	malo.4 \
-	mcd.4 \
 	md.4 \
 	mdio.4 \
 	me.4 \
diff --git a/share/man/man4/gpioled.4 b/share/man/man4/gpioled.4
index 3e305959809f..3fb4c4d64e9d 100644
--- a/share/man/man4/gpioled.4
+++ b/share/man/man4/gpioled.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 14, 2014
+.Dd July 30, 2016
 .Dt GPIOLED 4
 .Os
 .Sh NAME
@@ -71,6 +71,8 @@ to create for
 Which pin on the GPIO interface to map to this instance.
 Please note that this mask should only ever have one bit set
 (any other bits - i.e., pins - will be ignored).
+.It Va hint.gpioled.%d.invert
+If set to 1, the pin will be set to 0 to light the LED, and 1 to clear it.
 .El
 .Pp
 On a
diff --git a/share/man/man4/if_ntb.4 b/share/man/man4/if_ntb.4
index 2f363dcc8efc..6f52d7774264 100644
--- a/share/man/man4/if_ntb.4
+++ b/share/man/man4/if_ntb.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2016
+.Dd July 29, 2016
 .Dt IF_NTB 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ The following tunables are settable from the
 .Bl -ohang
 .It Va hw.if_ntb.num_queues
 Number of transport queues to use per interface.
-Default is 1.
+Default is unlimited.
 .El
 .Sh DESCRIPTION
 The
@@ -84,3 +84,6 @@ Later improvements were done by
 .An Conrad E. Meyer Aq Mt cem@FreeBSD.org
 and
 .An Alexander Motin Aq Mt mav@FreeBSD.org .
+.Sh BUGS
+Linux supports only one queue per interface, so manual configuration
+may be required for compatibility.
diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4
index 45c0bf2c30cb..9b906d7c2d29 100644
--- a/share/man/man4/iwm.4
+++ b/share/man/man4/iwm.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 1, 2015
+.Dd July 26, 2016
 .Dt IWM 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@ Choose one from:
 .Cd "device iwm3160fw"
 .Cd "device iwm7260fw"
 .Cd "device iwm7265fw"
+.Cd "device iwm8000Cfw"
 .Ed
 .Pp
 Or you can use
@@ -65,6 +66,7 @@ if_iwm_load="YES"
 iwm3160fw_load="YES"
 iwm7260fw_load="YES"
 iwm7265fw_load="YES"
+iwm8000Cfw_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
@@ -73,8 +75,10 @@ driver provides support for:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
 .It Intel Dual Band Wireless AC 3160
+.It Intel Dual Band Wireless AC 3165
 .It Intel Dual Band Wireless AC 7260
 .It Intel Dual Band Wireless AC 7265
+.It Intel Dual Band Wireless AC 8260
 .El
 .Pp
 .Nm
diff --git a/share/man/man4/iwmfw.4 b/share/man/man4/iwmfw.4
index 0e1832c1fedc..190f8061da32 100644
--- a/share/man/man4/iwmfw.4
+++ b/share/man/man4/iwmfw.4
@@ -22,7 +22,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 28, 2015
+.Dd July 26, 2016
 .Dt IWMFW 4
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@ of the following:
 .Cd "device iwm3160fw"
 .Cd "device iwm7260fw"
 .Cd "device iwm7265fw"
+.Cd "device iwm8000Cfw"
 .Ed
 .Pp
 Alternatively, to load the driver as a
@@ -54,10 +55,11 @@ module at boot time, place the following line in
 iwm3160fw_load="YES"
 iwm7260fw_load="YES"
 iwm7265fw_load="YES"
+iwm8000Cfw_load="YES"
 .Ed
 .Sh DESCRIPTION
 This module provides access to firmware sets for the
-Intel Dual Band Wireless WiFi 3160, 7260 and 7265 series of
+Intel Dual Band Wireless WiFi 3160, 3165, 7260, 7265 and 8260 series of
 IEEE 802.11n/11ac adapters.
 It may be
 statically linked into the kernel, or loaded as a module.
diff --git a/share/man/man4/mcd.4 b/share/man/man4/mcd.4
deleted file mode 100644
index 3a79eee41799..000000000000
--- a/share/man/man4/mcd.4
+++ /dev/null
@@ -1,165 +0,0 @@
-.\"
-.\" Copyright (c) 1994 Keith E. Walker
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd December 8, 1994
-.Dt MCD 4
-.Os
-.Sh NAME
-.Nm mcd
-.Nd Mitsumi CD-ROM driver
-.Sh SYNOPSIS
-.Cd "device mcd"
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.mcd.0.at="isa"
-.Cd hint.mcd.0.port="0x300"
-.Cd hint.mcd.0.irq="10"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides a data and audio interface to the Mitsumi-brand CD-ROM
-player.
-The CD-ROM player must be interfaced to the ISA bus through
-one of the Mitsumi proprietary controller boards.
-The controller
-boards supported are the LU002S, LU005S, the FX001 and the quite
-common FX001D.
-.Pp
-The
-.Nm
-driver responds to disk-specific
-.Fn ioctl
-commands, namely the
-.Dv DIOCGPART
-command.
-Other disk-specific
-.Fn ioctl
-commands will return an error.
-.Pp
-The
-.Nm
-driver also responds to special CD-ROM
-.Fn ioctl
-commands.
-These commands
-control the CD-ROM player's audio features.
-The commands are:
-.Pp
-.Bl -tag -width CDIOCREADSUBCHANNEL -compact -offset indent
-.It CDIOCREADSUBCHANNEL
-get sub-channel information on current status of disc playing
-.It CDIOCREADTOCHEADER
-get table of contents header
-.It CDIOCREADTOCENTRYS
-gets all of the table of contents
-.It CDIOCPLAYTRACKS
-begins audio playing at location specified
-.It CDIOCPLAYBLOCKS
-fails with error
-.Er EINVAL
-.It CDIOCPLAYMSF
-begins audio playing at location specified
-.It CDIOCRESUME
-resumes playing a previously paused disc
-.It CDIOCPAUSE
-pauses a playing disc
-.It CDIOCSTART
-begins playing a disc
-.It CDIOCSTOP
-stops a previously playing disc
-.It CDIOCEJECT
-opens the disc tray (there is no support for a corresponding un-eject
-command).
-.It CDIOCRESET
-stops any play and resets the Mitsumi controller board
-.It CDIOCSETDEBUG
-cause the kernel to print debug messages to the console about the
-.Nm
-driver
-.It CDIOCCLRDEBUG
-cause the kernel to quit printing debug messages about the
-.Nm
-driver
-.El
-.Pp
-The
-.Fn ioctl
-commands defined above are the only ones that the
-.Nm
-driver supports.
-There are other CD-ROM related
-.Fn ioctl
-commands (such as
-.Dv CDIOCSETVOL
-and
-.Dv CDIOCSETSTERIO )
-which are available
-and may be supported by future versions of the driver.
-.Sh FILES
-.Bl -tag -width /dev/(r)mcd0a -compact
-.It Pa /dev/(r)mcd0a
-accesses
-.Bx
-partition on the disc.
-Normally, there is only
-one file system on a CD-ROM disc.
-.It Pa /dev/(r)mcd0c
-accesses raw device.
-.El
-.Sh NOTES
-The character-mode devices for the
-.Nm
-driver should only be used for accessing the audio features of the
-CD-ROM player as the performance on data is abysmal.
-.Pp
-The current version of the driver uses neither the DMA or IRQ
-features of the interface board, although it has an interrupt handler
-for any IRQ requests that are generated.
-Until the DMA features are
-supported, the only interrupts that the board generates are those that
-are not supported by the driver anyway.
-.Sh SEE ALSO
-.In sys/cdio.h
-.Sh HISTORY
-An
-.Nm
-driver appeared in
-.Fx 1.0 .
-.Sh AUTHORS
-.An -nosplit
-The driver was written by
-.An Holger Veit
-(data part) and
-.An Brian Moore
-(audio part).
-Changes were provided by
-.An Gary Clark II ,
-.An Andrew A. Chernov ,
-and
-.An Jordan K. Hubbard .
diff --git a/share/man/man4/ng_checksum.4 b/share/man/man4/ng_checksum.4
new file mode 100644
index 000000000000..5ede910b7997
--- /dev/null
+++ b/share/man/man4/ng_checksum.4
@@ -0,0 +1,141 @@
+.\" Copyright (c) 2015 Dmitry Vagin <daemon.hammer@ya.ru>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 29, 2015
+.Dt NG_CHECKSUM 4
+.Os
+.Sh NAME
+.Nm ng_checksum
+.Nd IP checksum node type
+.Sh SYNOPSIS
+.In netgraph/ng_checksum.h
+.Sh DESCRIPTION
+The
+.Nm checksum
+node can calculate and prepare for calculation in hardware
+IPv4 header, TCP, UDP checksum.
+.Sh HOOKS
+This node type has two hooks:
+.Bl -tag -width ".Va out"
+.It Va in
+Packets received on this hook are processed according to settings specified
+in config and then forwarded to
+.Ar out
+hook, if it exists and connected. Otherwise they are reflected back to the
+.Ar in
+hook.
+.It Va out
+Packets received on this hook are forwarded to
+.Ar in
+hook without any changes.
+.El
+.Sh CONTROL MESSAGES
+This node type supports the generic control messages, plus the following:
+.Bl -tag -width foo
+.It Dv NGM_CHECKSUM_SETDLT Pq Ic setdlt
+Sets data link type on the
+.Va in
+hook. Currently, supported types are
+.Cm DLT_RAW
+(raw IP datagrams) and
+.Cm DLT_EN10MB
+(Ethernet). DLT_ definitions can be found in
+.In net/bpf.h
+header. Currently used values are
+.Cm DLT_EN10MB
+= 1 and
+.Cm DLT_RAW
+= 12.
+.It Dv NGM_CHECKSUM_GETDLT Pq Ic getdlt
+This control message obtains data link type on the
+.Va in
+hook.
+.It Dv NGM_CHECKSUM_SETCONFIG Pq Ic setconfig
+Sets node configuration. The following
+.Vt "struct ng_checksum_config"
+must be supplied as an argument:
+.Bd -literal -offset 4n
+struct ng_checksum_config {
+	uint64_t	csum_flags;
+	uint64_t	csum_offload;
+};
+.Ed
+.Pp
+The
+.Va csum_flags
+can be set to any combination of CSUM_IP, CSUM_TCP, CSUM_UDP, CSUM_TCP_IPV6 and CSUM_UDP_IPV6
+(other values are ignored) for instructing node need calculate the corresponding checksum.
+.Pp
+The
+.Va csum_offload
+can be set to any combination of CSUM_IP, CSUM_TCP, CSUM_UDP, CSUM_TCP_IPV6 and CSUM_UDP_IPV6
+(other values are ignored) for instructing node what checksum can calculate in hardware.
+.Pp
+Also processed any combination of CSUM_IP, CSUM_TCP, CSUM_UDP, CSUM_TCP_IPV6 and CSUM_UDP_IPV6 sets before on mbuf.
+.It Dv NGM_CHECKSUM_GETCONFIG Pq Ic getconfig
+This control message obtains current node configuration,
+returned as
+.Vt "struct ng_checksum_config" .
+.It Dv NGM_CHECKSUM_GET_STATS Pq Ic getstats
+Returns node statistics as a
+.Vt "struct ng_checksum_stats" .
+.It Dv NGM_CHECKSUM_CLR_STATS Pq Ic clrstats
+Clear node statistics.
+.It Dv NGM_CHECKSUM_GETCLR_STATS Pq Ic getclrstats
+This command is identical to
+.Dv NGM_CHECKSUM_GET_STATS ,
+except that the statistics are also atomically cleared.
+.El
+.Sh SHUTDOWN
+This node shuts down upon receipt of a
+.Dv NGM_SHUTDOWN
+control message, or when all hooks have been disconnected.
+.Sh EXAMPLES
+.Xr ngctl 8
+script:
+.Bd -literal -offset 4n
+/usr/sbin/ngctl -f- <<-SEQ
+	msg checksum-1: "setdlt 1"
+	ngctl msg checksum-1: "setconfig { csum_flags=0 csum_offload=6 }"
+.Ed
+.Pp
+Set data link type to
+.Cm DLT_EN10MB
+(Ethernet), not set additional checksum flags, set hardware
+can calculate CSUM_IP_UDP|CSUM_IP_TCP.
+.Sh SEE ALSO
+.Xr netgraph 4 ,
+.Xr ng_patch 4 ,
+.Xr ngctl 8
+.Sh HISTORY
+The
+.Nm
+node type was implemented in
+.Fx 10.2 
+and first submitted in 
+.Fx 12.0 .
+.Sh AUTHORS
+.An "Dmitry Vagin" Aq daemon.hammer@ya.ru .
diff --git a/share/man/man4/ntb_hw.4 b/share/man/man4/ntb_hw.4
index 901ee73d2783..b6dffce166de 100644
--- a/share/man/man4/ntb_hw.4
+++ b/share/man/man4/ntb_hw.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2016
+.Dd July 28, 2016
 .Dt NTB_HW 4
 .Os
 .Sh NAME
@@ -51,6 +51,20 @@ The following tunables are settable from the
 .It Va hw.ntb.debug_level
 Driver debug level.
 The default value is 0, higher means more verbose.
+.It Va hint.ntb_hw. Ns Ar X Ns Va .config
+Configures NTB resources split between several consumer devices.
+Configuration of multiple consumer devices separated by commas.
+Each device can be configured as: "<name>[:<mw>[:<spad>[:<db>]]]", where:
+.Va name
+is a name of the driver which should attach the device (empty means any),
+.Va mw
+is a number of memory windows to allocate (empty means all available),
+.Va spad
+is a number of scratchpad registers to allocate (empty means all available),
+.Va db
+is a number of doorbells to allocate (empty means all available).
+The default configuration is empty string, which means single device
+with all available resources allowing any driver attachment.
 .El
 .Sh DESCRIPTION
 The NTB allows you to connect two computer systems using a PCIe link if they
@@ -69,7 +83,7 @@ The hardware provides 2-3 memory windows to the other system's memory,
 On Xeon processors one of memory windows is typically consumed by the driver
 to workaround multiple hardware erratas.
 .Sh CONFIGURATION
-Tne NTB configuration should be set by BIOS.
+The NTB configuration should be set by BIOS.
 It includes enabling NTB, choosing between NTB-to-NTB or NTB-to-Root Port mode,
 enabling split BAR mode (one of two 64-bit BARs can be split into two 32-bit
 ones) and configuring BAR sizes in bits (from 12 to 29/39) for both NTB sides.
diff --git a/share/man/man4/ntb_transport.4 b/share/man/man4/ntb_transport.4
index 33800c40fafb..43b412cd8f5f 100644
--- a/share/man/man4/ntb_transport.4
+++ b/share/man/man4/ntb_transport.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2016
+.Dd July 29, 2016
 .Dt NTB_TRANSPORT 4
 .Os
 .Sh NAME
@@ -44,10 +44,15 @@ The following tunables are settable from the
 .It Va hw.ntb_transport.debug_level
 Driver debug level.
 The default value is 0, higher means more verbose.
-.It Va hw.ntb_transport.max_num_clients
-Number of bidirectional queues to setup.
-The default value is 0, that means one queue per available memory window.
-Maximal number is limited by number of doorbells.
+.It Va hint.ntb_transport. Ns Ar X Ns Va .config
+Configures queues allocation for consumer devices, separated by commas.
+Each device can be configured as: "<name>[:<queues>]", where:
+.Va name
+is a name of the driver which should attach the device (empty means any),
+.Va queues
+is a number of queues to allocate (empty means automatic),
+The default configuration is empty string, which means single device
+with one queue per memory window allowing any driver attachment.
 .El
 .Sh DESCRIPTION
 The
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index b1a056b970a7..68aaa4454592 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 3, 2008
+.Dd August 9, 2016
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -229,7 +229,8 @@ The status tells the user the disposition of his request for a device list.
 The possible status values are:
 .Bl -ohang
 .It PCI_GETCONF_LAST_DEVICE
-This means that there are no more devices in the PCI device list after the
+This means that there are no more devices in the PCI device list matching
+the specified criteria after the
 ones returned in the
 .Va matches
 buffer.
@@ -245,9 +246,7 @@ and
 to zero to start over at the beginning of the list.
 .It PCI_GETCONF_MORE_DEVS
 This tells the user that his buffer was not large enough to hold all of the
-remaining devices in the device list that possibly match his criteria.
-It is possible for this status to be returned, even when none of the remaining
-devices in the list would match the user's criteria.
+remaining devices in the device list that match his criteria.
 .It PCI_GETCONF_ERROR
 This indicates a general error while servicing the user's request.
 If the
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 4d5acbcadc43..6b9f6873626d 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -468,10 +468,11 @@ be selected by setting this variable to
 .Ql sc
 or
 .Ql vt .
-If not set, the default console in the
+The
 .Pa GENERIC
-kernel is
-.Xr vt 4 .
+kernel uses
+.Xr vt 4
+when this value is not set.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/xxxxyyyyzzz -compact
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index f275a4da45f9..54f503f5c2c8 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -633,7 +633,8 @@ when trying to use a TCP function block that is not available;
 .Xr mod_cc 4 ,
 .Xr siftr 4 ,
 .Xr syncache 4 ,
-.Xr setkey 8
+.Xr setkey 8 ,
+.Xr tcp_functions 9
 .Rs
 .%A "V. Jacobson"
 .%A "R. Braden"
diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4
index adf6ecc1ee21..400d5d188cc0 100644
--- a/share/man/man4/vt.4
+++ b/share/man/man4/vt.4
@@ -201,10 +201,11 @@ Set this value to
 or
 .Ql sc
 to choose a specific system console, overriding the default.
-If not set, the default in the
+The
 .Pa GENERIC
-kernel is
-.Nm .
+kernel uses
+.Nm
+when this value is not set.
 .It Va kern.vt.fb.default_mode
 Set this value to a graphic mode to override the default mode picked by the
 .Nm
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 07baddb2aff3..61a73e5b0787 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 292283 2015-12-15 18:42:30Z bdrewery
 .\" $FreeBSD$
-.Dd June 28, 2016
+.Dd July 28, 2016
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1002,13 +1002,13 @@ amd64/amd64 and arm64/aarch64.
 Set to use GCC's stack unwinder (instead of LLVM's libunwind).
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITH_LLVM_LIBUNWIND
 .\" from FreeBSD: head/tools/build/options/WITH_LLVM_LIBUNWIND 293450 2016-01-09 00:42:07Z emaste
 Set to use LLVM's libunwind stack unwinder (instead of GCC's unwinder).
 .Pp
 It is a default setting on
-arm64/aarch64.
+amd64/amd64, arm64/aarch64, i386/i386 and pc98/i386.
 .It Va WITHOUT_LOCALES
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LOCALES 156932 2006-03-21 07:50:50Z ru
 Set to not build localization files; see
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index f519e0f20f28..aff86cf9e8ad 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1015,7 +1015,6 @@ MLINKS+=lock.9 lockdestroy.9 \
 	lock.9 lockmgr_printinfo.9 \
 	lock.9 lockmgr_recursed.9 \
 	lock.9 lockmgr_rw.9 \
-	lock.9 lockmgr_waiters.9 \
 	lock.9 lockstatus.9
 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9
 MLINKS+=make_dev.9 destroy_dev.9 \
@@ -1303,6 +1302,7 @@ MLINKS+=pci.9 pci_alloc_msi.9 \
 	pci.9 pci_get_vpd_ident.9 \
 	pci.9 pci_get_vpd_readonly.9 \
 	pci.9 pci_iov_attach.9 \
+	pci.9 pci_iov_attach_name.9 \
 	pci.9 pci_iov_detach.9 \
 	pci.9 pci_msi_count.9 \
 	pci.9 pci_msix_count.9 \
@@ -1766,6 +1766,7 @@ MLINKS+=timeout.9 callout.9 \
 	timeout.9 callout_schedule_sbt_curcpu.9 \
 	timeout.9 callout_schedule_sbt_on.9 \
 	timeout.9 callout_stop.9 \
+	timeout.9 callout_when.9 \
 	timeout.9 untimeout.9
 MLINKS+=ucred.9 cred_update_thread.9 \
 	ucred.9 crcopy.9 \
diff --git a/share/man/man9/bitset.9 b/share/man/man9/bitset.9
index 19f53a2a029c..ef5511503333 100644
--- a/share/man/man9/bitset.9
+++ b/share/man/man9/bitset.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2015
+.Dd July 29, 2016
 .Dt BITSET 9
 .Os
 .Sh NAME
@@ -77,9 +77,9 @@
 .Fn BIT_EMPTY "const SETSIZE" "struct STRUCTNAME *bitset"
 .Ft bool
 .Fn BIT_ISFULLSET "const SETSIZE" "struct STRUCTNAME *bitset"
-.Ft size_t
+.Ft int
 .Fn BIT_FFS "const SETSIZE" "struct STRUCTNAME *bitset"
-.Ft size_t
+.Ft int
 .Fn BIT_COUNT "const SETSIZE" "struct STRUCTNAME *bitset"
 .\"
 .Ft bool
diff --git a/share/man/man9/cpuset.9 b/share/man/man9/cpuset.9
index fb0a9fcd95b1..1d778ad940d3 100644
--- a/share/man/man9/cpuset.9
+++ b/share/man/man9/cpuset.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2015
+.Dd July 29, 2016
 .Dt CPUSET 9
 .Os
 .Sh NAME
@@ -75,9 +75,9 @@
 .Fn CPU_EMPTY "cpuset_t *cpuset"
 .Ft bool
 .Fn CPU_ISFULLSET "cpuset_t *cpuset"
-.Ft size_t
+.Ft int
 .Fn CPU_FFS "cpuset_t *cpuset"
-.Ft size_t
+.Ft int
 .Fn CPU_COUNT "cpuset_t *cpuset"
 .\"
 .Ft bool
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index db99cad4abaa..001c5f182120 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -39,7 +39,6 @@
 .Nm lockmgr_printinfo ,
 .Nm lockmgr_recursed ,
 .Nm lockmgr_rw ,
-.Nm lockmgr_waiters ,
 .Nm lockstatus ,
 .Nm lockmgr_assert
 .Nd "lockmgr family of functions"
@@ -66,8 +65,6 @@
 .Ft int
 .Fn lockmgr_rw "struct lock *lkp" "u_int flags" "struct rwlock *ilk"
 .Ft int
-.Fn lockmgr_waiters "const struct lock *lkp"
-.Ft int
 .Fn lockstatus "const struct lock *lkp"
 .Pp
 .Cd "options INVARIANTS"
@@ -279,10 +276,6 @@ function returns true if the lock is recursed, 0
 otherwise.
 .Pp
 The
-.Fn lockmgr_waiters
-function returns true if the lock has waiters, 0 otherwise.
-.Pp
-The
 .Fn lockstatus
 function returns the status of the lock in relation to the current thread.
 .Pp
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index a53f971ad0bb..161f9aa13292 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 24, 2016
+.Dd August 3, 2016
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -50,6 +50,7 @@
 .Nm pci_get_vpd_ident ,
 .Nm pci_get_vpd_readonly ,
 .Nm pci_iov_attach ,
+.Nm pci_iov_attach_name ,
 .Nm pci_iov_detach ,
 .Nm pci_msi_count ,
 .Nm pci_msix_count ,
@@ -152,6 +153,14 @@
 .Ft int
 .Fn pci_iov_attach "device_t dev" "nvlist_t *pf_schema" "nvlist_t *vf_schema"
 .Ft int
+.Fo pci_iov_attach_name
+.Fa "device_t dev"
+.Fa "nvlist_t *pf_schema"
+.Fa "nvlist_t *vf_schema"
+.Fa "const char *fmt"
+.Fa "..."
+.Fc
+.Ft int
 .Fn pci_iov_detach "device_t dev"
 .Sh DESCRIPTION
 The
@@ -595,6 +604,20 @@ and is responsible for freeing them.
 The driver must never free the schemas itself.
 .Pp
 The
+.Fn pci_iov_attach_name
+function is a variant of
+.Fn pci_iov_attach
+that allows the name of the associated character device in
+.Pa /dev/iov
+to be specified by
+.Fa fmt .
+The
+.Fn pci_iov_attach
+function uses the name of
+.Fa dev
+as the device name.
+.Pp
+The
 .Fn pci_iov_detach
 function is used to advise the SR-IOV infrastructure that the driver for the
 given device is attempting to detach and that all SR-IOV resources for the
diff --git a/share/man/man9/tcp_functions.9 b/share/man/man9/tcp_functions.9
index 06c42ff0fa60..b998dd0dd7df 100644
--- a/share/man/man9/tcp_functions.9
+++ b/share/man/man9/tcp_functions.9
@@ -114,14 +114,17 @@ struct tcp_function_block {
 			    struct inpcb *inp, struct tcpcb *tp);
 	/* Optional memory allocation/free routine */
 	void	(*tfb_tcp_fb_init)(struct tcpcb *);
-	void	(*tfb_tcp_fb_fini)(struct tcpcb *);
+	void	(*tfb_tcp_fb_fini)(struct tcpcb *, int);
 	/* Optional timers, must define all if you define one */
 	int	(*tfb_tcp_timer_stop_all)(struct tcpcb *);
 	void	(*tfb_tcp_timer_activate)(struct tcpcb *,
 			    uint32_t, u_int);
 	int	(*tfb_tcp_timer_active)(struct tcpcb *, uint32_t);
 	void	(*tfb_tcp_timer_stop)(struct tcpcb *, uint32_t);
+	/* Optional functions */
 	void	(*tfb_tcp_rexmit_tmr)(struct tcpcb *);
+	void	(*tfb_tcp_handoff_ok)(struct tcpcb *);
+	/* System use */
 	volatile uint32_t tfb_refcnt;
 	uint32_t  tfb_flags;
 };
@@ -157,6 +160,16 @@ in the
 .Va tfb_tcp_fb_fini
 field.
 .Pp
+If the
+.Va tfb_tcp_fb_fini
+argument is non-NULL, the function to which it points is called when the
+kernel is destroying the TCP control block or when the socket is transitioning
+to use a different TCP stack.
+The function is called with arguments of the TCP control block and an integer
+flag.
+The flag will be zero if the socket is transitioning to use another TCP stack
+or one if the TCP control block is being destroyed.
+.Pp
 If the TCP stack implements additional timers, the TCP stack should set a
 non-NULL pointer in the
 .Va tfb_tcp_timer_stop_all ,
@@ -193,6 +206,37 @@ However, care must be taken to ensure the retransmit timer leaves the
 TCP control block in a valid state for the remainder of the retransmit
 timer logic.
 .Pp
+A user may select a new TCP stack before calling
+.Xr connect 2
+or
+.Xr listen 2 .
+Optionally, a TCP stack may also allow a user to begin using the TCP stack for
+a connection that is in a later state by setting a non-NULL function pointer in
+the
+.Va tfb_tcp_handoff_ok
+field.
+If this field is non-NULL and a user attempts to select that TCP stack after
+calling
+.Xr connect 2
+or
+.Xr listen 2
+for that socket, the kernel will call the function pointed to by the
+.Va tfb_tcp_handoff_ok
+field.
+The function should return 0 if the user is allowed to switch the socket to use
+the TCP stack. Otherwise, the function should return an error code, which will
+be returned to the user.
+If the
+.Va tfb_tcp_handoff_ok
+field is
+.Dv NULL
+and a user attempts to select the TCP stack after calling
+.Xr connect 2
+or
+.Xr listen 2
+for that socket, the operation will fail and the kernel will return
+.Er EINVAL .
+.Pp
 The
 .Va tfb_refcnt
 and
@@ -269,8 +313,10 @@ The
 .Fa blk
 argument references a function block that is not currently registered.
 .Sh SEE ALSO
-.Xr malloc 9 ,
-.Xr tcp 4
+.Xr connect 2 ,
+.Xr listen 2 ,
+.Xr tcp 4 ,
+.Xr malloc 9
 .Sh HISTORY
 This framework first appeared in
 .Fx 11.0 .
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 73925b2947d7..54b63d22272d 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 4, 2016
+.Dd July 27, 2016
 .Dt TIMEOUT 9
 .Os
 .Sh NAME
@@ -56,6 +56,7 @@
 .Nm callout_schedule_sbt_curcpu ,
 .Nm callout_schedule_sbt_on ,
 .Nm callout_stop ,
+.Nm callout_when ,
 .Nm timeout ,
 .Nm untimeout
 .Nd execute a function after a specified length of time
@@ -91,20 +92,48 @@ struct callout_handle handle = CALLOUT_HANDLE_INITIALIZER(&handle);
 .Ft int
 .Fn callout_reset "struct callout *c" "int ticks" "timeout_t *func" "void *arg"
 .Ft int
-.Fn callout_reset_curcpu "struct callout *c" "int ticks" "timeout_t *func" \
-"void *arg"
+.Fo callout_reset_curcpu
+.Fa "struct callout *c"
+.Fa "int ticks"
+.Fa "timeout_t *func"
+.Fa "void *arg"
+.Fc
 .Ft int
-.Fn callout_reset_on "struct callout *c" "int ticks" "timeout_t *func" \
-"void *arg" "int cpu"
+.Fo callout_reset_on
+.Fa "struct callout *c"
+.Fa "int ticks"
+.Fa "timeout_t *func"
+.Fa "void *arg"
+.Fa "int cpu"
+.Fc
 .Ft int
-.Fn callout_reset_sbt "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "timeout_t *func" "void *arg" "int flags"
+.Fo callout_reset_sbt
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "timeout_t *func"
+.Fa "void *arg"
+.Fa "int flags"
+.Fc
 .Ft int
-.Fn callout_reset_sbt_curcpu "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "timeout_t *func" "void *arg" "int flags"
+.Fo callout_reset_sbt_curcpu
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "timeout_t *func"
+.Fa "void *arg"
+.Fa "int flags"
+.Fc
 .Ft int
-.Fn callout_reset_sbt_on "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "timeout_t *func" "void *arg" "int cpu" "int flags"
+.Fo callout_reset_sbt_on
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "timeout_t *func"
+.Fa "void *arg"
+.Fa "int cpu"
+.Fa "int flags"
+.Fc
 .Ft int
 .Fn callout_schedule "struct callout *c" "int ticks"
 .Ft int
@@ -112,16 +141,37 @@ struct callout_handle handle = CALLOUT_HANDLE_INITIALIZER(&handle);
 .Ft int
 .Fn callout_schedule_on "struct callout *c" "int ticks" "int cpu"
 .Ft int
-.Fn callout_schedule_sbt "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "int flags"
+.Fo callout_schedule_sbt
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "int flags"
+.Fc
 .Ft int
-.Fn callout_schedule_sbt_curcpu "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "int flags"
+.Fo callout_schedule_sbt_curcpu
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "int flags"
+.Fc
 .Ft int
-.Fn callout_schedule_sbt_on "struct callout *c" "sbintime_t sbt" \
-"sbintime_t pr" "int cpu" "int flags"
+.Fo callout_schedule_sbt_on
+.Fa "struct callout *c"
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t pr"
+.Fa "int cpu"
+.Fa "int flags"
+.Fc
 .Ft int
 .Fn callout_stop "struct callout *c"
+.Ft sbintime_t
+.Fo callout_when
+.Fa "sbintime_t sbt"
+.Fa "sbintime_t precision"
+.Fa "int flags"
+.Fa "sbintime_t *sbt_res"
+.Fa "sbintime_t *precision_res"
+.Fc
 .Ft struct callout_handle
 .Fn timeout "timeout_t *func" "void *arg" "int ticks"
 .Ft void
@@ -387,6 +437,26 @@ or this value is used as the length of the time window.
 Smaller values
 .Pq which result in larger time intervals
 allow the callout subsystem to aggregate more events in one timer interrupt.
+.It Dv C_PRECALC
+The
+.Fa sbt
+argument specifies the absolute time at which the callout should be run,
+and the
+.Fa pr
+argument specifies the requested precision, which will not be
+adjusted during the scheduling process.
+The
+.Fa sbt
+and
+.Fa pr
+values should be calculated by an earlier call to
+.Fn callout_when
+which uses the user-supplied
+.Fa sbt ,
+.Fa pr ,
+and
+.Fa flags
+values.
 .It Dv C_HARDCLOCK
 Align the timeouts to
 .Fn hardclock
@@ -503,6 +573,39 @@ but it
 .Em does not
 clear it when a callout expires normally via the execution of the
 callout function.
+.Pp
+The
+.Fn callout_when
+function may be used to pre-calculate the absolute time at which the
+timeout should be run and the precision of the scheduled run time
+according to the required time
+.Fa sbt ,
+precision
+.Fa precision ,
+and additional adjustments requested by the
+.Fa flags
+argument.
+Flags accepted by the
+.Fn callout_when
+function are the same as flags for the
+.Fn callout_reset
+function.
+The resulting time is assigned to the variable pointed to by the
+.Fa sbt_res
+argument, and the resulting precision is assigned to
+.Fa *precision_res .
+When passing the results to
+.Fa callout_reset ,
+add the
+.Va C_PRECALC
+flag to
+.Fa flags ,
+to avoid incorrect re-adjustment.
+The function is intended for situations where precise time of the callout
+run should be known in advance, since
+trying to read this time from the callout structure itself after a
+.Fn callout_reset
+call is racy.
 .Ss "Avoiding Race Conditions"
 The callout subsystem invokes callout functions from its own thread
 context.
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 5c60b835f66f..ad5cd466744c 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -338,7 +338,7 @@ FreeBSD 5.2           |      |                 |                       |
  |     |              |      |                 |               DragonFly 4.4.1
  |  FreeBSD           |      |            OpenBSD 5.9                  |
  |   10.3             |      |                 |                       |
- |                    |      |                 |                       |
+ |                    |      |                 |               DragonFly 4.6.0
  *--FreeBSD           |      |                 |                       |
  |   11.0             |      |                 |                       |
  |                    |      |                 |                       |
@@ -691,6 +691,7 @@ OpenBSD 5.8		2015-10-18 [OBD]
 DragonFly 4.4.1		2015-12-07 [DFB]
 OpenBSD 5.9		2016-03-29 [OBD]
 FreeBSD 10.3		2016-04-04 [FBD]
+DragonFly 4.6.0		2016-08-02 [DFB]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 69c2e3ea6125..bab00b0a4852 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -259,7 +259,7 @@ peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004/03/08"]
 peter [label="Peter Wemm\npeter@FreeBSD.org\n1995/07/04"]
 peterj [label="Peter Jeremy\npeterj@FreeBSD.org\n2012/09/14"]
 pfg [label="Pedro Giffuni\npfg@FreeBSD.org\n2011/12/01"]
-phil [label="Phil Shafer\nphil@FreeBSD.ogr\n2016/12/30"]
+phil [label="Phil Shafer\nphil@FreeBSD.ogr\n2015/12/30"]
 philip [label="Philip Paeps\nphilip@FreeBSD.org\n2004/01/21"]
 phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"]
 pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"]
@@ -312,6 +312,7 @@ theraven [label="David Chisnall\ntheraven@FreeBSD.org\n2011/11/11"]
 thompsa [label="Andrew Thompson\nthompsa@FreeBSD.org\n2005/05/25"]
 ticso [label="Bernd Walter\nticso@FreeBSD.org\n2002/01/31"]
 tijl [label="Tijl Coosemans\ntijl@FreeBSD.org\n2010/07/16"]
+tsoome [label="Toomas Soome\ntsoome@FreeBSD.org\n2016/08/10"]
 trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2008/08/22"]
 trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/05/28"]
 trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2011/03/10"]
@@ -363,6 +364,8 @@ adrian -> sgalabov
 
 ae -> melifaro
 
+allanjude -> tsoome
+
 alc -> davide
 
 andre -> qingli
@@ -520,6 +523,7 @@ imp -> sanpei
 imp -> shiba
 imp -> takawata
 imp -> toshi
+imp -> tsoome
 imp -> uch
 
 jake -> bms
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 8437e8cffd19..82f862235e02 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -25,16 +25,16 @@ _misc [label="Miscellaneous Hats"]
 
 # Development teams go here alphabetically sorted
 
-core [label="Core Team\ncore@FreeBSD.org\nbapt, emaste, gavin,\nglebius, gnn, hrs,\npeter, rwatson, theraven"]
+core [label="Core Team\ncore@FreeBSD.org\nallanjude, bapt, bcr,\nbenno, emaste, gnn,\nhrs, jhb, kmoore"]
 coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"]
 doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nmat, swills, miwi"]
+portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nmat, swills"]
 portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"]
 re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, gavin, gjb,\nglebius, remko"]
-portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, eadler, feld, jgh, junovitch, miwi, rea, sbz, simon, swills, zi"]
+portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, eadler, feld, jgh, junovitch, rea, sbz, simon, swills, zi"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\ncperciva, simon, nectar"]
 srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"]
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index fb5948e708b4..210e6008246c 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -331,6 +331,7 @@ PROGS_CXX	PROG and PROGS_CXX in one Makefile.  To define
 		- DEBUG_FLAGS
 		- DPADD
 		- DPSRCS
+		- INTERNALPROG (no installation)
 		- LDADD
 		- LDFLAGS
 		- LIBADD
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index d26ba76f85e3..3254bdadc061 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -24,8 +24,8 @@ PROGS += ${PROGS_CXX}
 # just one of many
 PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
 			PROGNAME SRCS STRIP WARNS
-PROG_VARS +=	CFLAGS CXXFLAGS DEBUG_FLAGS DPADD LDADD LIBADD LINKS \
-		LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
+PROG_VARS +=	CFLAGS CXXFLAGS DEBUG_FLAGS DPADD INTERNALPROG LDADD LIBADD \
+		LINKS LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
 .if empty(${PROG_OVERRIDE_VARS:M$v})
 .if defined(${v}.${PROG})
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 428924516b43..11794b329140 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -111,12 +111,30 @@ CWARNFLAGS+=	-Wno-format
 
 # GCC 5.2.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 50200
-CWARNFLAGS+=	-Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logical-not-parentheses -Wno-error=bool-compare -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=clobbered -Wno-error=cast-align -Wno-error=extra -Wno-error=attributes -Wno-error=inline -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=strict-aliasing -Wno-error=address
+CWARNFLAGS+=	-Wno-error=address			\
+		-Wno-error=array-bounds			\
+		-Wno-error=attributes			\
+		-Wno-error=bool-compare			\
+		-Wno-error=cast-align			\
+		-Wno-error=clobbered			\
+		-Wno-error=enum-compare			\
+		-Wno-error=extra			\
+		-Wno-error=inline			\
+		-Wno-error=logical-not-parentheses	\
+		-Wno-error=strict-aliasing		\
+		-Wno-error=uninitialized		\
+		-Wno-error=unused-but-set-variable	\
+		-Wno-error=unused-function		\
+		-Wno-error=unused-value
 .endif
 
 # GCC 6.1.0
 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100
-CWARNFLAGS+=	-Wno-error=unused-const-variable= -Wno-error=nonnull-compare -Wno-error=shift-negative-value -Wno-error=misleading-indentation -Wno-error=tautological-compare
+CWARNFLAGS+=	-Wno-error=misleading-indentation	\
+		-Wno-error=nonnull-compare		\
+		-Wno-error=shift-negative-value		\
+		-Wno-error=tautological-compare		\
+		-Wno-error=unused-const-variable
 .endif
 
 # How to handle FreeBSD custom printf format specifiers.
@@ -172,7 +190,7 @@ CFLAGS+=	${SSP_CFLAGS}
 # Allow user-specified additional warning flags, plus compiler and file
 # specific flag overrides, unless we've overriden this...
 .if ${MK_WARNS} != "no"
-CFLAGS+=	${CWARNFLAGS} ${CWARNFLAGS.${COMPILER_TYPE}}
+CFLAGS+=	${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}}
 CFLAGS+=	${CWARNFLAGS.${.IMPSRC:T}}
 .endif
 
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index b3b2152f4486..b24afd1dc38e 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -222,7 +222,7 @@ WITH_META_STATS= t
 .if ${MACHINE} == "host"
 MK_SHARED_TOOLCHAIN= no
 .endif
-TOOLCHAIN_VARS=	AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJDUMP OBJCOPY RANLIB \
+TOOLCHAIN_VARS=	AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJCOPY RANLIB \
 		STRINGS SIZE LLVM_TBLGEN
 _toolchain_bin_CLANG_TBLGEN=	/usr/bin/clang-tblgen
 _toolchain_bin_LLVM_TBLGEN=	/usr/bin/llvm-tblgen
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 30fab90c6003..943e25d8577a 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -243,6 +243,7 @@ _DP_radius=	md
 .else
 _DP_radius=	crypto
 .endif
+_DP_rtld_db=	elf procstat
 _DP_procstat=	kvm util elf
 .if ${MK_CXX} == "yes"
 .if ${MK_LIBCPLUSPLUS} != "no"
@@ -254,7 +255,7 @@ _DP_proc=	supcplusplus
 .if ${MK_CDDL} != "no"
 _DP_proc+=	ctf
 .endif
-_DP_proc+=	elf rtld_db util
+_DP_proc+=	elf procstat rtld_db util
 _DP_mp=	crypto
 _DP_memstat=	kvm
 _DP_magic=	z
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index d41eb25d17f6..3dd66aa7df71 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -235,15 +235,18 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
 # In-tree binutils/gcc are older versions without modern architecture support.
 .if ${__T} == "aarch64" || ${__T} == "riscv64"
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB
-__DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
-.else
-__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
 .endif
 .if ${__T} == "riscv64"
 BROKEN_OPTIONS+=PROFILE # "sorry, unimplemented: profiler support for RISC-V"
 BROKEN_OPTIONS+=TESTS   # "undefined reference to `_Unwind_Resume'"
 BROKEN_OPTIONS+=CXX     # "libcxxrt.so: undefined reference to `_Unwind_Resume_or_Rethrow'"
 .endif
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
+    ${__T} == "riscv64"
+__DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
+.else
+__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
+.endif
 .if ${__T} == "aarch64" || ${__T} == "amd64"
 __DEFAULT_YES_OPTIONS+=LLDB
 .else
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 3dcd40460d32..31a302b51047 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -237,8 +237,6 @@ OBJCFLAGS	?=	${OBJCINCLUDES} ${CFLAGS} -Wno-import
 
 OBJCOPY		?=	objcopy
 
-OBJDUMP		?=	objdump
-
 PC		?=	pc
 PFLAGS		?=
 
diff --git a/share/timedef/af_ZA.UTF-8.src b/share/timedef/af_ZA.UTF-8.src
index 23912dd3066d..373ac64059c4 100644
--- a/share/timedef/af_ZA.UTF-8.src
+++ b/share/timedef/af_ZA.UTF-8.src
@@ -7,15 +7,15 @@
 Jan.
 Feb.
 Mrt.
-Apr
+Apr.
 Mei
-Jun
-Jul
-Aug
-Sep
-Okt
-Nov
-Des
+Jun.
+Jul.
+Aug.
+Sep.
+Okt.
+Nov.
+Des.
 #
 # Long month names (as in a date)
 Januarie
@@ -50,20 +50,20 @@ Vrydag
 Saterdag
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%Y-%m-%d
+%m/%d/%Y
 #
 # c_fmt
-%d %B %Y %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 vm.
 nm.
 #
 # date_fmt
-%d %B %Y %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 Januarie
diff --git a/share/timedef/am_ET.UTF-8.src b/share/timedef/am_ET.UTF-8.src
index c69c0ff91f08..1c982266d5a0 100644
--- a/share/timedef/am_ET.UTF-8.src
+++ b/share/timedef/am_ET.UTF-8.src
@@ -50,20 +50,20 @@
 ቅዳሜ
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
 %d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 ጥዋት
 ከሰዓት
 #
 # date_fmt
-%A %e %B %Y %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 ጃንዩወሪ
diff --git a/share/timedef/ar_JO.UTF-8.src b/share/timedef/ar_JO.UTF-8.src
index 8fb1f54329a2..f19c656a4dda 100644
--- a/share/timedef/ar_JO.UTF-8.src
+++ b/share/timedef/ar_JO.UTF-8.src
@@ -50,20 +50,20 @@
 السبت
 #
 # X_fmt
-%OI:%OM:%OS %p
+%H:%M:%S
 #
 # x_fmt
-%Oe�/%Om�/%Oy
+%d/%m/%Y
 #
 # c_fmt
-%Oe %B، %Oy %OI:%OM:%OS %p
+%a %b %e %X %Y
 #
 # AM/PM
 ص
 Ù…
 #
 # date_fmt
-%Oe %B، %Oy %OI:%OM:%OS %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 كانون الثاني
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%OI:%OM:%OS %p
-# EOF
+%I:%M:%S %p
+#mEOF
diff --git a/share/timedef/ar_MA.UTF-8.src b/share/timedef/ar_MA.UTF-8.src
index 12e9b8780b02..1b230f39ba4f 100644
--- a/share/timedef/ar_MA.UTF-8.src
+++ b/share/timedef/ar_MA.UTF-8.src
@@ -50,20 +50,20 @@
 السبت
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%e�/%m�/%Y
+%d/%m/%Y
 #
 # c_fmt
-%e %B، %Y %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 ص
 Ù…
 #
 # date_fmt
-%e %B، %Y %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 يناير
diff --git a/share/timedef/ar_SA.UTF-8.src b/share/timedef/ar_SA.UTF-8.src
index 58528917a77d..d658b574e881 100644
--- a/share/timedef/ar_SA.UTF-8.src
+++ b/share/timedef/ar_SA.UTF-8.src
@@ -50,20 +50,20 @@
 السبت
 #
 # X_fmt
-%OI:%OM:%OS %p
+%H:%M:%S
 #
 # x_fmt
-%Oe�/%Om�/%Oy
+%d/%m/%Y
 #
 # c_fmt
-%Oe %B، %Oy %OI:%OM:%OS %p
+%a %b %e %X %Y
 #
 # AM/PM
 ص
 Ù…
 #
 # date_fmt
-%Oe %B، %Oy %OI:%OM:%OS %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 يناير
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%OI:%OM:%OS %p
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/be_BY.CP1131.src b/share/timedef/be_BY.CP1131.src
index 148add2096e6..6eeb82489355 100644
--- a/share/timedef/be_BY.CP1131.src
+++ b/share/timedef/be_BY.CP1131.src
@@ -50,20 +50,20 @@
 áã¡®â 
 #
 # X_fmt
-%H.%M.%S
+%H:%M:%S
 #
 # x_fmt
 %d.%m.%y
 #
 # c_fmt
-%A %e %B %Y %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 ¤  ¯ «ã¤­ï
 ¯ á«ï ¯ «ã¤­ï
 #
 # date_fmt
-%A %e %B %Y %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 áâ㤧¥­ì
diff --git a/share/timedef/be_BY.CP1251.src b/share/timedef/be_BY.CP1251.src
index e8d688d7a8f9..4209e4f00cf2 100644
--- a/share/timedef/be_BY.CP1251.src
+++ b/share/timedef/be_BY.CP1251.src
@@ -56,14 +56,14 @@
 %d.%m.%y
 #
 # c_fmt
-%A %e %B %Y %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 äà ïàëóäíÿ
 ïàñëÿ ïàëóäíÿ
 #
 # date_fmt
-%A %e %B %Y %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ñòóäçåíü
diff --git a/share/timedef/be_BY.ISO8859-5.src b/share/timedef/be_BY.ISO8859-5.src
index fa19cb5c06e2..933926474825 100644
--- a/share/timedef/be_BY.ISO8859-5.src
+++ b/share/timedef/be_BY.ISO8859-5.src
@@ -56,14 +56,14 @@
 %d.%m.%y
 #
 # c_fmt
-%A %e %B %Y %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 ÔÐ ßÐÛãÔÝï
 ßÐáÛï ßÐÛãÔÝï
 #
 # date_fmt
-%A %e %B %Y %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 áâãÔ×ÕÝì
diff --git a/share/timedef/be_BY.UTF-8.src b/share/timedef/be_BY.UTF-8.src
index 987716b4e32b..0f25439ab473 100644
--- a/share/timedef/be_BY.UTF-8.src
+++ b/share/timedef/be_BY.UTF-8.src
@@ -56,14 +56,14 @@
 %d.%m.%y
 #
 # c_fmt
-%A %e %B %Y %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 да палудн�
 па�л� палудн�
 #
 # date_fmt
-%A %e %B %Y %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 �тудзень
diff --git a/share/timedef/bg_BG.CP1251.src b/share/timedef/bg_BG.CP1251.src
index 1e1a6a5d943b..13a3126cdb41 100644
--- a/share/timedef/bg_BG.CP1251.src
+++ b/share/timedef/bg_BG.CP1251.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y г.
+%d.%m.%y
 #
 # c_fmt
-%A %e %B %Y ã. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 ïð.îá.
 ñë.îá.
 #
 # date_fmt
-%A %e %B %Y ã. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ÿíóàðè
diff --git a/share/timedef/bg_BG.UTF-8.src b/share/timedef/bg_BG.UTF-8.src
index e543fde0e706..b533e7dba098 100644
--- a/share/timedef/bg_BG.UTF-8.src
+++ b/share/timedef/bg_BG.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y г.
+%d.%m.%y
 #
 # c_fmt
-%A %e %B %Y г. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 пр.об.
 �л.об.
 #
 # date_fmt
-%A %e %B %Y г. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 �нуари
diff --git a/share/timedef/ca_IT.ISO8859-15.src b/share/timedef/ca_IT.ISO8859-15.src
index fa6deed541bd..393129b7b8cc 100644
--- a/share/timedef/ca_IT.ISO8859-15.src
+++ b/share/timedef/ca_IT.ISO8859-15.src
@@ -53,17 +53,17 @@ dissabte
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B de %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%A %e %B de %Y, %H:%M:%S %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 de gener
diff --git a/share/timedef/ca_IT.UTF-8.src b/share/timedef/ca_IT.UTF-8.src
index 58e4c180eb4e..5dfd3841d9af 100644
--- a/share/timedef/ca_IT.UTF-8.src
+++ b/share/timedef/ca_IT.UTF-8.src
@@ -53,17 +53,17 @@ dissabte
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B de %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%A %e %B de %Y, %H:%M:%S %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 de gener
diff --git a/share/timedef/cs_CZ.ISO8859-2.src b/share/timedef/cs_CZ.ISO8859-2.src
index 163a34e23cdb..84b853bbdb9a 100644
--- a/share/timedef/cs_CZ.ISO8859-2.src
+++ b/share/timedef/cs_CZ.ISO8859-2.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%Y/%m/%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 dopoledne
 odpoledne
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e. %B %Y %X %Z
 #
 # Long month names (without case ending)
 leden
diff --git a/share/timedef/cs_CZ.UTF-8.src b/share/timedef/cs_CZ.UTF-8.src
index 822f3c49c1da..a0e7b392eb14 100644
--- a/share/timedef/cs_CZ.UTF-8.src
+++ b/share/timedef/cs_CZ.UTF-8.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%Y/%m/%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 dopoledne
 odpoledne
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e. %B %Y %X %Z
 #
 # Long month names (without case ending)
 leden
diff --git a/share/timedef/da_DK.ISO8859-15.src b/share/timedef/da_DK.ISO8859-15.src
index 09e151316692..9951e981e7c2 100644
--- a/share/timedef/da_DK.ISO8859-15.src
+++ b/share/timedef/da_DK.ISO8859-15.src
@@ -50,20 +50,20 @@ fredag
 lørdag
 #
 # X_fmt
-%H.%M.%S
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%Y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y kl. %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/da_DK.UTF-8.src b/share/timedef/da_DK.UTF-8.src
index 9f38447b6596..aa8877f4f5fe 100644
--- a/share/timedef/da_DK.UTF-8.src
+++ b/share/timedef/da_DK.UTF-8.src
@@ -50,20 +50,20 @@ fredag
 lørdag
 #
 # X_fmt
-%H.%M.%S
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%Y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y kl. %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/de_AT.ISO8859-15.src b/share/timedef/de_AT.ISO8859-15.src
index 6c7b592f905a..457fc3d942d9 100644
--- a/share/timedef/de_AT.ISO8859-15.src
+++ b/share/timedef/de_AT.ISO8859-15.src
@@ -53,17 +53,17 @@ Samstag
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y um %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 vorm.
 nachm.
 #
 # date_fmt
-%A %e %B %Y um %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Jänner
diff --git a/share/timedef/de_AT.UTF-8.src b/share/timedef/de_AT.UTF-8.src
index 6da579694e0a..67ee9cd974a0 100644
--- a/share/timedef/de_AT.UTF-8.src
+++ b/share/timedef/de_AT.UTF-8.src
@@ -53,17 +53,17 @@ Samstag
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y um %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 vorm.
 nachm.
 #
 # date_fmt
-%A %e %B %Y um %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Jänner
diff --git a/share/timedef/de_DE.ISO8859-15.src b/share/timedef/de_DE.ISO8859-15.src
index 9a6828b5ddee..e7de6b3fae97 100644
--- a/share/timedef/de_DE.ISO8859-15.src
+++ b/share/timedef/de_DE.ISO8859-15.src
@@ -53,17 +53,17 @@ Samstag
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y um %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 vorm.
 nachm.
 #
 # date_fmt
-%A %e %B %Y um %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Januar
diff --git a/share/timedef/de_DE.UTF-8.src b/share/timedef/de_DE.UTF-8.src
index 8b82e473d9c7..f8708b265060 100644
--- a/share/timedef/de_DE.UTF-8.src
+++ b/share/timedef/de_DE.UTF-8.src
@@ -53,17 +53,17 @@ Samstag
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y um %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 vorm.
 nachm.
 #
 # date_fmt
-%A %e %B %Y um %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Januar
diff --git a/share/timedef/el_GR.ISO8859-7.src b/share/timedef/el_GR.ISO8859-7.src
index 15d005554a05..9db0ac0cc726 100644
--- a/share/timedef/el_GR.ISO8859-7.src
+++ b/share/timedef/el_GR.ISO8859-7.src
@@ -50,20 +50,20 @@
 ÓÜââáôï
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y - %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 ð.ì.
 ì.ì.
 #
 # date_fmt
-%A %e %B %Y - %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ÉáíïõÜñéïò
diff --git a/share/timedef/el_GR.UTF-8.src b/share/timedef/el_GR.UTF-8.src
index e38342f5ffee..641c41df4f74 100644
--- a/share/timedef/el_GR.UTF-8.src
+++ b/share/timedef/el_GR.UTF-8.src
@@ -50,20 +50,20 @@
 Σάββατο
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y - %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 π.μ.
 μ.μ.
 #
 # date_fmt
-%A %e %B %Y - %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Ιανουά�ιος
diff --git a/share/timedef/en_CA.UTF-8.src b/share/timedef/en_CA.UTF-8.src
index 181f0aa1e341..5165235ea2b8 100644
--- a/share/timedef/en_CA.UTF-8.src
+++ b/share/timedef/en_CA.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%Y-%m-%d
+%d/%m/%Y
 #
 # c_fmt
-%A, %B %e, %Y at %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A, %B %e, %Y at %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_GB.UTF-8.src b/share/timedef/en_GB.UTF-8.src
index 5479d5b66240..a03dd2dfa0ee 100644
--- a/share/timedef/en_GB.UTF-8.src
+++ b/share/timedef/en_GB.UTF-8.src
@@ -56,14 +56,14 @@ Saturday
 %d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y at %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y at %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_IE.UTF-8.src b/share/timedef/en_IE.UTF-8.src
index a4eeab9f2a77..a03dd2dfa0ee 100644
--- a/share/timedef/en_IE.UTF-8.src
+++ b/share/timedef/en_IE.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
 %d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y at %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y at %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_PH.UTF-8.src b/share/timedef/en_PH.UTF-8.src
index 788c0f57627e..7f26e33268c4 100644
--- a/share/timedef/en_PH.UTF-8.src
+++ b/share/timedef/en_PH.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
 %d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y at %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y at %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_SG.UTF-8.src b/share/timedef/en_SG.UTF-8.src
index 3dcc2c4c8756..7f26e33268c4 100644
--- a/share/timedef/en_SG.UTF-8.src
+++ b/share/timedef/en_SG.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y at %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y at %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_US.UTF-8.src b/share/timedef/en_US.UTF-8.src
index d7e47f775af9..564729b45f5c 100644
--- a/share/timedef/en_US.UTF-8.src
+++ b/share/timedef/en_US.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%m/%d/%y
+%m/%d/%Y
 #
 # c_fmt
-%A, %B %e, %Y at %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A, %B %e, %Y at %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/en_ZA.UTF-8.src b/share/timedef/en_ZA.UTF-8.src
index 5a833a74bb3f..5165235ea2b8 100644
--- a/share/timedef/en_ZA.UTF-8.src
+++ b/share/timedef/en_ZA.UTF-8.src
@@ -50,20 +50,20 @@ Friday
 Saturday
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%Y/%m/%d
+%d/%m/%Y
 #
 # c_fmt
-%d %B %Y at %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%d %B %Y at %I:%M:%S %p %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 January
diff --git a/share/timedef/es_AR.ISO8859-1.src b/share/timedef/es_AR.ISO8859-1.src
index b8e9fdb5e096..27c5b7e9bfe1 100644
--- a/share/timedef/es_AR.ISO8859-1.src
+++ b/share/timedef/es_AR.ISO8859-1.src
@@ -50,20 +50,20 @@ viernes
 sábado
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%e de %B de %Y, %I:%M:%S %p %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/es_CR.UTF-8.src b/share/timedef/es_CR.UTF-8.src
index 31727a6de23e..b0b6008c8787 100644
--- a/share/timedef/es_CR.UTF-8.src
+++ b/share/timedef/es_CR.UTF-8.src
@@ -50,20 +50,20 @@ viernes
 sábado
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%e de %B de %Y, %I:%M:%S %p %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/es_ES.ISO8859-15.src b/share/timedef/es_ES.ISO8859-15.src
index e41398af46c7..27c5b7e9bfe1 100644
--- a/share/timedef/es_ES.ISO8859-15.src
+++ b/share/timedef/es_ES.ISO8859-15.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%e de %B de %Y, %H:%M:%S %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/es_ES.UTF-8.src b/share/timedef/es_ES.UTF-8.src
index cd70a086f753..b0b6008c8787 100644
--- a/share/timedef/es_ES.UTF-8.src
+++ b/share/timedef/es_ES.UTF-8.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a. m.
 p. m.
 #
 # date_fmt
-%e de %B de %Y, %H:%M:%S %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/es_MX.ISO8859-1.src b/share/timedef/es_MX.ISO8859-1.src
index ca86c9865f2d..ff08beda308f 100644
--- a/share/timedef/es_MX.ISO8859-1.src
+++ b/share/timedef/es_MX.ISO8859-1.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
-ene
-feb
-mar
-abr
-may
-jun
-jul
-ago
-sep
-oct
-nov
-dic
+ene.
+feb.
+mar.
+abr.
+may.
+jun.
+jul.
+ago.
+sep.
+oct.
+nov.
+dic.
 #
 # Long month names (as in a date)
 enero
@@ -50,20 +50,20 @@ viernes
 sábado
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%e de %B de %Y, %I:%M:%S %p %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/es_MX.UTF-8.src b/share/timedef/es_MX.UTF-8.src
index 51a6a50cd37b..f98e33578df8 100644
--- a/share/timedef/es_MX.UTF-8.src
+++ b/share/timedef/es_MX.UTF-8.src
@@ -50,20 +50,20 @@ viernes
 sábado
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y, %I:%M:%S %p
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%e de %B de %Y, %I:%M:%S %p %Z
+%A, %e de %B de %Y, %X %Z
 #
 # Long month names (without case ending)
 enero
diff --git a/share/timedef/et_EE.ISO8859-15.src b/share/timedef/et_EE.ISO8859-15.src
index 758558c37948..f5fc047c65db 100644
--- a/share/timedef/et_EE.ISO8859-15.src
+++ b/share/timedef/et_EE.ISO8859-15.src
@@ -53,17 +53,17 @@ laupäev
 %H:%M.%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M.%S
+%a %d %b %Y %X
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y %H:%M.%S %Z
+%a %d %b %Y %X %Z
 #
 # Long month names (without case ending)
 jaanuar
diff --git a/share/timedef/eu_ES.UTF-8.src b/share/timedef/eu_ES.UTF-8.src
index c3ff11d3cde2..e5547ecbedfa 100644
--- a/share/timedef/eu_ES.UTF-8.src
+++ b/share/timedef/eu_ES.UTF-8.src
@@ -56,14 +56,14 @@ larunbata
 %Y/%m/%d
 #
 # c_fmt
-%Y(e)ko %B %e %H:%M:%S (%Z)
+%Y - %b - %e %a %X
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%Y(e)ko %B %e %H:%M:%S (%Z)
+%Y(e)ko %B-ren %ea, %X %Z
 #
 # Long month names (without case ending)
 urtarrilak
diff --git a/share/timedef/fi_FI.ISO8859-15.src b/share/timedef/fi_FI.ISO8859-15.src
index 80cbb61fe339..c0684fb72473 100644
--- a/share/timedef/fi_FI.ISO8859-15.src
+++ b/share/timedef/fi_FI.ISO8859-15.src
@@ -50,20 +50,20 @@ perjantaina
 lauantaina
 #
 # X_fmt
-%H.%M.%S
+%H:%M:%S
 #
 # x_fmt
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y klo %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 ap.
 ip.
 #
 # date_fmt
-%A %e %B %Y klo %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 tammikuuta
diff --git a/share/timedef/fi_FI.UTF-8.src b/share/timedef/fi_FI.UTF-8.src
index 9690727f2247..f97c433ad06d 100644
--- a/share/timedef/fi_FI.UTF-8.src
+++ b/share/timedef/fi_FI.UTF-8.src
@@ -50,20 +50,20 @@ perjantaina
 lauantaina
 #
 # X_fmt
-%H.%M.%S
+%H:%M:%S
 #
 # x_fmt
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y klo %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 ap.
 ip.
 #
 # date_fmt
-%A %e %B %Y klo %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 tammikuuta
diff --git a/share/timedef/fr_BE.ISO8859-15.src b/share/timedef/fr_BE.ISO8859-15.src
index abc1bd12130d..e31d98fe784c 100644
--- a/share/timedef/fr_BE.ISO8859-15.src
+++ b/share/timedef/fr_BE.ISO8859-15.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_BE.UTF-8.src b/share/timedef/fr_BE.UTF-8.src
index 00e49c96788b..e940de36fcc9 100644
--- a/share/timedef/fr_BE.UTF-8.src
+++ b/share/timedef/fr_BE.UTF-8.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_CA.ISO8859-15.src b/share/timedef/fr_CA.ISO8859-15.src
index a45b7dfcabdd..cd4429949e6d 100644
--- a/share/timedef/fr_CA.ISO8859-15.src
+++ b/share/timedef/fr_CA.ISO8859-15.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%y-%m-%d
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 md
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_CA.UTF-8.src b/share/timedef/fr_CA.UTF-8.src
index b2a4fa00c76f..03deacffc6b5 100644
--- a/share/timedef/fr_CA.UTF-8.src
+++ b/share/timedef/fr_CA.UTF-8.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%y-%m-%d
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 md
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_CH.ISO8859-15.src b/share/timedef/fr_CH.ISO8859-15.src
index 48773b7a5c29..e31d98fe784c 100644
--- a/share/timedef/fr_CH.ISO8859-15.src
+++ b/share/timedef/fr_CH.ISO8859-15.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_CH.UTF-8.src b/share/timedef/fr_CH.UTF-8.src
index cf2fce60208b..e940de36fcc9 100644
--- a/share/timedef/fr_CH.UTF-8.src
+++ b/share/timedef/fr_CH.UTF-8.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_FR.ISO8859-15.src b/share/timedef/fr_FR.ISO8859-15.src
index 6fe84b698100..e31d98fe784c 100644
--- a/share/timedef/fr_FR.ISO8859-15.src
+++ b/share/timedef/fr_FR.ISO8859-15.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%Y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/fr_FR.UTF-8.src b/share/timedef/fr_FR.UTF-8.src
index c98f4b60d3b4..e940de36fcc9 100644
--- a/share/timedef/fr_FR.UTF-8.src
+++ b/share/timedef/fr_FR.UTF-8.src
@@ -53,17 +53,17 @@ samedi
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%Y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janvier
@@ -83,5 +83,5 @@ décembre
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/he_IL.UTF-8.src b/share/timedef/he_IL.UTF-8.src
index 277cddc959c3..68a2a86981e9 100644
--- a/share/timedef/he_IL.UTF-8.src
+++ b/share/timedef/he_IL.UTF-8.src
@@ -56,14 +56,14 @@
 %d.%m.%Y
 #
 # c_fmt
-%e ב%B %Y בשעה %H:%M:%S
+%b %d %Y %X
 #
 # AM/PM
 לפנה״צ
 �חה״צ
 #
 # date_fmt
-%e ב%B %Y בשעה %H:%M:%S %Z
+%a %b %d %Y %X %Z
 #
 # Long month names (without case ending)
 ינו�ר
diff --git a/share/timedef/hi_IN.ISCII-DEV.src b/share/timedef/hi_IN.ISCII-DEV.src
index b28947e74ef3..13f84c5167b4 100644
--- a/share/timedef/hi_IN.ISCII-DEV.src
+++ b/share/timedef/hi_IN.ISCII-DEV.src
@@ -50,20 +50,20 @@
 ÕÆÛÔÚÏ
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y ³å %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 ÈÞÏèÔÚØèÆ
 ¤ÈÏÚØèÆ
 #
 # date_fmt
-%A %e %B %Y ³å %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 ºÆÔÏÜ
diff --git a/share/timedef/hi_IN.UTF-8.src b/share/timedef/hi_IN.UTF-8.src
index a3d3f7cc9457..cb4355ccd509 100644
--- a/share/timedef/hi_IN.UTF-8.src
+++ b/share/timedef/hi_IN.UTF-8.src
@@ -50,20 +50,20 @@
 शनिवार
 #
 # X_fmt
-%I:%M:%S %p
+%H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y को %I:%M:%S %p
+%a %b %e %X %Y
 #
 # AM/PM
 पूर�वाह�न
 अपराह�न
 #
 # date_fmt
-%A %e %B %Y को %I:%M:%S %p %Z
+%a %b %e %X %Z %Y
 #
 # Long month names (without case ending)
 जनवरी
diff --git a/share/timedef/hr_HR.ISO8859-2.src b/share/timedef/hr_HR.ISO8859-2.src
index 0fe34951577b..8a3a8ed68c3c 100644
--- a/share/timedef/hr_HR.ISO8859-2.src
+++ b/share/timedef/hr_HR.ISO8859-2.src
@@ -53,17 +53,17 @@ subota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y.
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y. u %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y. u %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 sijeènja
diff --git a/share/timedef/hr_HR.UTF-8.src b/share/timedef/hr_HR.UTF-8.src
index b15d5e2dbd6e..2a8b1dceb97e 100644
--- a/share/timedef/hr_HR.UTF-8.src
+++ b/share/timedef/hr_HR.UTF-8.src
@@ -53,17 +53,17 @@ subota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y.
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y. u %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y. u %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 sije�nja
diff --git a/share/timedef/hu_HU.ISO8859-2.src b/share/timedef/hu_HU.ISO8859-2.src
index d6531cd5ab27..b324918a01fa 100644
--- a/share/timedef/hu_HU.ISO8859-2.src
+++ b/share/timedef/hu_HU.ISO8859-2.src
@@ -53,17 +53,17 @@ szombat
 %H:%M:%S
 #
 # x_fmt
-%Y. %m. %d.
+%Y/%m/%d
 #
 # c_fmt
-%Y. %B %e. %H:%M:%S
+%a %b %e %X %Y
 #
 # AM/PM
 de.
 du.
 #
 # date_fmt
-%Y. %B %e. %H:%M:%S %Z
+%Y %b %e %a %X %Z
 #
 # Long month names (without case ending)
 január
@@ -83,5 +83,5 @@ december
 md
 #
 # ampm_fmt
-%p %I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/hu_HU.UTF-8.src b/share/timedef/hu_HU.UTF-8.src
index ac65083fe369..1ecc1c74d2fb 100644
--- a/share/timedef/hu_HU.UTF-8.src
+++ b/share/timedef/hu_HU.UTF-8.src
@@ -53,17 +53,17 @@ szombat
 %H:%M:%S
 #
 # x_fmt
-%Y. %m. %d.
+%Y/%m/%d
 #
 # c_fmt
-%Y. %B %e. %H:%M:%S
+%a %b %e %X %Y
 #
 # AM/PM
 de.
 du.
 #
 # date_fmt
-%Y. %B %e. %H:%M:%S %Z
+%Y %b %e %a %X %Z
 #
 # Long month names (without case ending)
 január
@@ -83,5 +83,5 @@ december
 md
 #
 # ampm_fmt
-%p %I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/hy_AM.ARMSCII-8.src b/share/timedef/hy_AM.ARMSCII-8.src
index 4054f00f9fdc..13ca41145195 100644
--- a/share/timedef/hy_AM.ARMSCII-8.src
+++ b/share/timedef/hy_AM.ARMSCII-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%d %B, %YÃ. %H:%M:%S,
+%A, %e %B %Y Ç. %X
 #
 # AM/PM
-Ï»ëûñÇó ³é³ç
-Ï»ëûñÇó Ñ»ïá
+
+
 #
 # date_fmt
-%d %B, %YÃ. %H:%M:%S, %Z
+%A, %e %B %Y é %X (%Z)
 #
 # Long month names (without case ending)
 ÑáõÝí³ñÇ
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/hy_AM.UTF-8.src b/share/timedef/hy_AM.UTF-8.src
index 5f918bf68695..9c0e4962848f 100644
--- a/share/timedef/hy_AM.UTF-8.src
+++ b/share/timedef/hy_AM.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%d %B, %YÕ©. %H:%M:%S,
+%A, %e %B %Y Õ«. %X
 #
 # AM/PM
-Õ¯Õ¥Õ½Ö…Ö€Õ«Ö� Õ¡Õ¼Õ¡Õ»
-Õ¯Õ¥Õ½Ö…Ö€Õ«Ö� Õ°Õ¥Õ¿Õ¸
+
+
 #
 # date_fmt
-%d %B, %YÕ©. %H:%M:%S, %Z
+%A, %e %B %Y Õ©. %X (%Z)
 #
 # Long month names (without case ending)
 Õ°Õ¸Ö‚Õ¶Õ¾Õ¡Ö€Õ«
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/is_IS.ISO8859-15.src b/share/timedef/is_IS.ISO8859-15.src
index 87df4a649289..541f2d504c7d 100644
--- a/share/timedef/is_IS.ISO8859-15.src
+++ b/share/timedef/is_IS.ISO8859-15.src
@@ -56,14 +56,14 @@ laugardagur
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 f.h.
 e.h.
 #
 # date_fmt
-%A %e %B %Y kl. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janúar
diff --git a/share/timedef/is_IS.UTF-8.src b/share/timedef/is_IS.UTF-8.src
index 012139c35cf2..e711ce48a1af 100644
--- a/share/timedef/is_IS.UTF-8.src
+++ b/share/timedef/is_IS.UTF-8.src
@@ -56,14 +56,14 @@ laugardagur
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 f.h.
 e.h.
 #
 # date_fmt
-%A %e %B %Y kl. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janúar
diff --git a/share/timedef/it_CH.ISO8859-15.src b/share/timedef/it_CH.ISO8859-15.src
index c5fc2be38fde..7ca4f0afbd25 100644
--- a/share/timedef/it_CH.ISO8859-15.src
+++ b/share/timedef/it_CH.ISO8859-15.src
@@ -53,17 +53,17 @@ sabato
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 gennaio
diff --git a/share/timedef/it_CH.UTF-8.src b/share/timedef/it_CH.UTF-8.src
index 305876f7988f..555b690a1319 100644
--- a/share/timedef/it_CH.UTF-8.src
+++ b/share/timedef/it_CH.UTF-8.src
@@ -53,17 +53,17 @@ sabato
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 gennaio
diff --git a/share/timedef/it_IT.ISO8859-15.src b/share/timedef/it_IT.ISO8859-15.src
index 3d9df3090240..7ca4f0afbd25 100644
--- a/share/timedef/it_IT.ISO8859-15.src
+++ b/share/timedef/it_IT.ISO8859-15.src
@@ -53,17 +53,17 @@ sabato
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 gennaio
diff --git a/share/timedef/it_IT.UTF-8.src b/share/timedef/it_IT.UTF-8.src
index 470fd102560b..555b690a1319 100644
--- a/share/timedef/it_IT.UTF-8.src
+++ b/share/timedef/it_IT.UTF-8.src
@@ -53,17 +53,17 @@ sabato
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 AM
 PM
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 gennaio
diff --git a/share/timedef/ja_JP.SJIS.src b/share/timedef/ja_JP.SJIS.src
index f5a6bff6f8b8..731909ce630d 100644
--- a/share/timedef/ja_JP.SJIS.src
+++ b/share/timedef/ja_JP.SJIS.src
@@ -50,20 +50,20 @@
 “y—j“ú
 #
 # X_fmt
-%H:%M:%S
+%HŽž%M•ª%S•b
 #
 # x_fmt
 %Y/%m/%d
 #
 # c_fmt
-%Y”N%mŒŽ%e“ú %H:%M:%S
+%a %_m/%e %T %Y
 #
 # AM/PM
 Œß‘O
 Χ΋
 #
 # date_fmt
-%Y”N%mŒŽ%e“ú %A %H:%M:%S %Z
+%Y”N %B%e“ú %A %X %Z
 #
 # Long month names (without case ending)
 1ŒŽ
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/ja_JP.UTF-8.src b/share/timedef/ja_JP.UTF-8.src
index afa495f7a849..f533967b3f42 100644
--- a/share/timedef/ja_JP.UTF-8.src
+++ b/share/timedef/ja_JP.UTF-8.src
@@ -50,20 +50,20 @@
 土曜日
 #
 # X_fmt
-%H:%M:%S
+%H時%M分%S秒
 #
 # x_fmt
 %Y/%m/%d
 #
 # c_fmt
-%Y年%m月%e日 %A %H:%M:%S
+%a %_m/%e %T %Y
 #
 # AM/PM
 ��
 �後
 #
 # date_fmt
-%Y年%m月%e日 %A %H:%M:%S %Z
+%Yå¹´ %B%eæ—¥ %A %X %Z
 #
 # Long month names (without case ending)
 1月
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/ja_JP.eucJP.src b/share/timedef/ja_JP.eucJP.src
index 3e231cdecd07..dc3aa7cb9aae 100644
--- a/share/timedef/ja_JP.eucJP.src
+++ b/share/timedef/ja_JP.eucJP.src
@@ -50,20 +50,20 @@
 ÅÚÍËÆü
 #
 # X_fmt
-%H:%M:%S
+%H»þ%Mʬ%SÉÃ
 #
 # x_fmt
 %Y/%m/%d
 #
 # c_fmt
-%Yǯ%m·î%eÆü %A %H:%M:%S
+%a %_m/%e %T %Y
 #
 # AM/PM
 ¸áÁ°
 ¸á¸å
 #
 # date_fmt
-%Yǯ%m·î%eÆü %A %H:%M:%S %Z
+%Yǯ %B%eÆü %A %X %Z
 #
 # Long month names (without case ending)
 1·î
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/kk_KZ.UTF-8.src b/share/timedef/kk_KZ.UTF-8.src
index 822b1152b419..dc88c1b985b7 100644
--- a/share/timedef/kk_KZ.UTF-8.src
+++ b/share/timedef/kk_KZ.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%A, %e %B %Y ж. %X
 #
 # AM/PM
-таңертеңгі
-тү�тен кейінгі
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%A, %e %B %Y ж. %X (%Z)
 #
 # Long month names (without case ending)
 қантар
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ko_KR.UTF-8.src b/share/timedef/ko_KR.UTF-8.src
index ac63d44500d4..98e512a7761e 100644
--- a/share/timedef/ko_KR.UTF-8.src
+++ b/share/timedef/ko_KR.UTF-8.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1ì›”
- 2ì›”
- 3ì›”
- 4ì›”
- 5ì›”
- 6ì›”
- 7ì›”
- 8ì›”
- 9ì›”
-10ì›”
-11ì›”
-12ì›”
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 1ì›”
@@ -50,20 +50,20 @@
 토요�
 #
 # X_fmt
-%p %I:%M:%S
+%H시 %M분 %S초
 #
 # x_fmt
-%y. %m. %e.
+%Y년 %b월 %e�
 #
 # c_fmt
-%Y년 %m월 %e� %p %I시 %M분 %S초
+%x %A %X
 #
 # AM/PM
 오전
 오후
 #
 # date_fmt
-%Y년 %m월 %e� %p %I시 %M분 %S초 %Z
+%c %Z
 #
 # Long month names (without case ending)
 1ì›”
diff --git a/share/timedef/ko_KR.eucKR.src b/share/timedef/ko_KR.eucKR.src
index cf610c4f6194..b85195371a95 100644
--- a/share/timedef/ko_KR.eucKR.src
+++ b/share/timedef/ko_KR.eucKR.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1¿ù
- 2¿ù
- 3¿ù
- 4¿ù
- 5¿ù
- 6¿ù
- 7¿ù
- 8¿ù
- 9¿ù
-10¿ù
-11¿ù
-12¿ù
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 1¿ù
@@ -50,20 +50,20 @@
 Åä¿äÀÏ
 #
 # X_fmt
-%p %I:%M:%S
+%H½Ã %MºÐ %SÃÊ
 #
 # x_fmt
-%y. %m. %e.
+%Y³â %b¿ù %eÀÏ
 #
 # c_fmt
-%Y³â %m¿ù %eÀÏ %p %I½Ã %MºÐ %SÃÊ
+%x %A %X
 #
 # AM/PM
 ¿ÀÀü
 ¿ÀÈÄ
 #
 # date_fmt
-%Y³â %m¿ù %eÀÏ %p %I½Ã %MºÐ %SÃÊ %Z
+%c %Z
 #
 # Long month names (without case ending)
 1¿ù
diff --git a/share/timedef/lt_LT.ISO8859-13.src b/share/timedef/lt_LT.ISO8859-13.src
index 13299598ed9e..343e486333ef 100644
--- a/share/timedef/lt_LT.ISO8859-13.src
+++ b/share/timedef/lt_LT.ISO8859-13.src
@@ -53,17 +53,17 @@ penktadienis
 %H:%M:%S
 #
 # x_fmt
-%Y-%m-%d
+%Y.%m.%d
 #
 # c_fmt
-%Y m. %B %e d. %H:%M:%S
+%a %b %e %X %Y
 #
 # AM/PM
-prieðpiet
-popiet
+
+
 #
 # date_fmt
-%Y m. %B %e d. %H:%M:%S %Z
+%A, %Y m. %B %e d. %T %Z
 #
 # Long month names (without case ending)
 sausis
@@ -83,5 +83,5 @@ gruodis
 md
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/lt_LT.UTF-8.src b/share/timedef/lt_LT.UTF-8.src
index 92033ef4497f..94cb83e0b893 100644
--- a/share/timedef/lt_LT.UTF-8.src
+++ b/share/timedef/lt_LT.UTF-8.src
@@ -53,17 +53,17 @@ penktadienis
 %H:%M:%S
 #
 # x_fmt
-%Y-%m-%d
+%Y.%m.%d
 #
 # c_fmt
-%Y m. %B %e d. %H:%M:%S
+%a %b %e %X %Y
 #
 # AM/PM
-priešpiet
-popiet
+
+
 #
 # date_fmt
-%Y m. %B %e d. %H:%M:%S %Z
+%A, %Y m. %B %e d. %T %Z
 #
 # Long month names (without case ending)
 sausis
@@ -83,5 +83,5 @@ gruodis
 md
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/lv_LV.ISO8859-13.src b/share/timedef/lv_LV.ISO8859-13.src
index 47bc891e1747..031e708a71b1 100644
--- a/share/timedef/lv_LV.ISO8859-13.src
+++ b/share/timedef/lv_LV.ISO8859-13.src
@@ -53,17 +53,17 @@ sestdiena
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d/%m/%Y
 #
 # c_fmt
-%Y. gada %e. %B %H:%M:%S
+%e. %b, %Y. gads %X
 #
 # AM/PM
-priekðpusdienâ
-pçcpusdienâ
+
+
 #
 # date_fmt
-%Y. gada %e. %B %H:%M:%S %Z
+%A, %Y. gada %e. %B %T %Z
 #
 # Long month names (without case ending)
 janvâris
@@ -83,5 +83,5 @@ decembris
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/lv_LV.UTF-8.src b/share/timedef/lv_LV.UTF-8.src
index 0c1b06be45a7..77afd8b7d1e7 100644
--- a/share/timedef/lv_LV.UTF-8.src
+++ b/share/timedef/lv_LV.UTF-8.src
@@ -53,17 +53,17 @@ sestdiena
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d/%m/%Y
 #
 # c_fmt
-%Y. gada %e. %B %H:%M:%S
+%e. %b, %Y. gads %X
 #
 # AM/PM
-priekšpusdien�
-pēcpusdien�
+
+
 #
 # date_fmt
-%Y. gada %e. %B %H:%M:%S %Z
+%A, %Y. gada %e. %B %T %Z
 #
 # Long month names (without case ending)
 janv�ris
@@ -83,5 +83,5 @@ decembris
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/mn_MN.UTF-8.src b/share/timedef/mn_MN.UTF-8.src
index fd4fa05309cb..b8591c6b163d 100644
--- a/share/timedef/mn_MN.UTF-8.src
+++ b/share/timedef/mn_MN.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%Y-%m-%d
+%Y.%m.%d
 #
 # c_fmt
-%Y оны %m �арын %e %H:%M:%S
+%Y оны %B �арын %e, %A гараг, %X 
 #
 # AM/PM
 Ò®Ó¨
 ҮХ
 #
 # date_fmt
-%Y оны %m �арын %e %H:%M:%S %Z
+%Y оны %B �арын %e, %A гараг, %X
 #
 # Long month names (without case ending)
 ��гдүг��р �ар
diff --git a/share/timedef/nb_NO.ISO8859-15.src b/share/timedef/nb_NO.ISO8859-15.src
index 8704bcbccb07..ba27fc9987e0 100644
--- a/share/timedef/nb_NO.ISO8859-15.src
+++ b/share/timedef/nb_NO.ISO8859-15.src
@@ -56,14 +56,14 @@ lørdag
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y kl. %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/nb_NO.UTF-8.src b/share/timedef/nb_NO.UTF-8.src
index 319340563d6a..4f3f8251538c 100644
--- a/share/timedef/nb_NO.UTF-8.src
+++ b/share/timedef/nb_NO.UTF-8.src
@@ -56,14 +56,14 @@ lørdag
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H.%M.%S
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y kl. %H.%M.%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/nl_BE.UTF-8.src b/share/timedef/nl_BE.UTF-8.src
index ba98f7db0ee4..4f83a384add0 100644
--- a/share/timedef/nl_BE.UTF-8.src
+++ b/share/timedef/nl_BE.UTF-8.src
@@ -53,17 +53,17 @@ zaterdag
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d-%m-%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januari
diff --git a/share/timedef/nl_NL.UTF-8.src b/share/timedef/nl_NL.UTF-8.src
index c91f0fe2c73e..4f83a384add0 100644
--- a/share/timedef/nl_NL.UTF-8.src
+++ b/share/timedef/nl_NL.UTF-8.src
@@ -53,17 +53,17 @@ zaterdag
 %H:%M:%S
 #
 # x_fmt
-%d-%m-%y
+%d-%m-%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januari
diff --git a/share/timedef/nn_NO.ISO8859-15.src b/share/timedef/nn_NO.ISO8859-15.src
index eace8b128d7b..4ccc611e9da6 100644
--- a/share/timedef/nn_NO.ISO8859-15.src
+++ b/share/timedef/nn_NO.ISO8859-15.src
@@ -56,14 +56,14 @@ laurdag
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 formiddag
 ettermiddag
 #
 # date_fmt
-%A %e %B %Y kl. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/nn_NO.UTF-8.src b/share/timedef/nn_NO.UTF-8.src
index d5b2b267db85..45def2a78746 100644
--- a/share/timedef/nn_NO.UTF-8.src
+++ b/share/timedef/nn_NO.UTF-8.src
@@ -56,14 +56,14 @@ laurdag
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y kl. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 formiddag
 ettermiddag
 #
 # date_fmt
-%A %e %B %Y kl. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/pl_PL.ISO8859-2.src b/share/timedef/pl_PL.ISO8859-2.src
index 2b8f2fb95d83..a98a349ee6f4 100644
--- a/share/timedef/pl_PL.ISO8859-2.src
+++ b/share/timedef/pl_PL.ISO8859-2.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y
+%Y.%m.%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 styczeñ
@@ -83,5 +83,5 @@ grudzieñ
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/pl_PL.UTF-8.src b/share/timedef/pl_PL.UTF-8.src
index f878e7d1a76b..8f828efb39d8 100644
--- a/share/timedef/pl_PL.UTF-8.src
+++ b/share/timedef/pl_PL.UTF-8.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y
+%Y.%m.%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 styczeń
@@ -83,5 +83,5 @@ grudzień
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/pt_BR.ISO8859-1.src b/share/timedef/pt_BR.ISO8859-1.src
index 8de28b3fb807..3ef7d6669e4c 100644
--- a/share/timedef/pt_BR.ISO8859-1.src
+++ b/share/timedef/pt_BR.ISO8859-1.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%e de %B de %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janeiro
@@ -83,5 +83,5 @@ dezembro
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/pt_BR.UTF-8.src b/share/timedef/pt_BR.UTF-8.src
index a325256da133..0a601b48113e 100644
--- a/share/timedef/pt_BR.UTF-8.src
+++ b/share/timedef/pt_BR.UTF-8.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-AM
-PM
+
+
 #
 # date_fmt
-%e de %B de %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janeiro
@@ -83,5 +83,5 @@ dezembro
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/pt_PT.ISO8859-15.src b/share/timedef/pt_PT.ISO8859-15.src
index 4faeb8579f27..3ef7d6669e4c 100644
--- a/share/timedef/pt_PT.ISO8859-15.src
+++ b/share/timedef/pt_PT.ISO8859-15.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y às %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-da manhã
-da tarde
+
+
 #
 # date_fmt
-%e de %B de %Y às %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janeiro
@@ -83,5 +83,5 @@ dezembro
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/pt_PT.UTF-8.src b/share/timedef/pt_PT.UTF-8.src
index 14e28ddf53b4..0a601b48113e 100644
--- a/share/timedef/pt_PT.UTF-8.src
+++ b/share/timedef/pt_PT.UTF-8.src
@@ -53,17 +53,17 @@ sábado
 %H:%M:%S
 #
 # x_fmt
-%d/%m/%y
+%d/%m/%Y
 #
 # c_fmt
-%e de %B de %Y às %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-da manhã
-da tarde
+
+
 #
 # date_fmt
-%e de %B de %Y às %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 janeiro
@@ -83,5 +83,5 @@ dezembro
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ro_RO.ISO8859-2.src b/share/timedef/ro_RO.ISO8859-2.src
index 083b842c3dc5..81fe63e8f49c 100644
--- a/share/timedef/ro_RO.ISO8859-2.src
+++ b/share/timedef/ro_RO.ISO8859-2.src
@@ -56,14 +56,14 @@ sâmbãtã
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y, %H:%M:%S
+%a %e %b %Y %X
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y, %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ianuarie
diff --git a/share/timedef/ro_RO.UTF-8.src b/share/timedef/ro_RO.UTF-8.src
index a9f4c347af3c..cb44c7d5fb2a 100644
--- a/share/timedef/ro_RO.UTF-8.src
+++ b/share/timedef/ro_RO.UTF-8.src
@@ -56,14 +56,14 @@ sâmbătă
 %d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y, %H:%M:%S
+%a %e %b %Y %X
 #
 # AM/PM
 a.m.
 p.m.
 #
 # date_fmt
-%A %e %B %Y, %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ianuarie
diff --git a/share/timedef/ru_RU.CP1251.src b/share/timedef/ru_RU.CP1251.src
index b7a757a4e019..396a156a1843 100644
--- a/share/timedef/ru_RU.CP1251.src
+++ b/share/timedef/ru_RU.CP1251.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y ã. %H:%M:%S
+%A, %e %B %Y ã. %X
 #
 # AM/PM
-äï
-ïï
+
+
 #
 # date_fmt
-%A %e %B %Y ã. %H:%M:%S %Z
+%A, %e %B %Y ã. %X (%Z)
 #
 # Long month names (without case ending)
 ÿíâàðü
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ru_RU.CP866.src b/share/timedef/ru_RU.CP866.src
index 4c59eb39a4fc..0f5320b9ac27 100644
--- a/share/timedef/ru_RU.CP866.src
+++ b/share/timedef/ru_RU.CP866.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y £. %H:%M:%S
+%A, %e %B %Y £. %X
 #
 # AM/PM
-¤¯
-¯¯
+
+
 #
 # date_fmt
-%A %e %B %Y £. %H:%M:%S %Z
+%A, %e %B %Y £. %X (%Z)
 #
 # Long month names (without case ending)
 ï­¢ àì
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ru_RU.ISO8859-5.src b/share/timedef/ru_RU.ISO8859-5.src
index e06304296f20..d5e128fa0c2a 100644
--- a/share/timedef/ru_RU.ISO8859-5.src
+++ b/share/timedef/ru_RU.ISO8859-5.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y Ó. %H:%M:%S
+%A, %e %B %Y Ó. %X
 #
 # AM/PM
-Ôß
-ßß
+
+
 #
 # date_fmt
-%A %e %B %Y Ó. %H:%M:%S %Z
+%A, %e %B %Y Ó. %X (%Z)
 #
 # Long month names (without case ending)
 ïÝÒÐàì
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ru_RU.KOI8-R.src b/share/timedef/ru_RU.KOI8-R.src
index 86b008603461..a4a7cc3e0fac 100644
--- a/share/timedef/ru_RU.KOI8-R.src
+++ b/share/timedef/ru_RU.KOI8-R.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y Ç. %H:%M:%S
+%A, %e %B %Y Ç. %X
 #
 # AM/PM
-ÄÐ
-ÐÐ
+
+
 #
 # date_fmt
-%A %e %B %Y Ç. %H:%M:%S %Z
+%A, %e %B %Y Ç. %X (%Z)
 #
 # Long month names (without case ending)
 ÑÎ×ÁÒØ
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/ru_RU.UTF-8.src b/share/timedef/ru_RU.UTF-8.src
index 1633d8a0a601..eda3f599bd9d 100644
--- a/share/timedef/ru_RU.UTF-8.src
+++ b/share/timedef/ru_RU.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y г. %H:%M:%S
+%A, %e %B %Y г. %X
 #
 # AM/PM
-дп
-пп
+
+
 #
 # date_fmt
-%A %e %B %Y г. %H:%M:%S %Z
+%A, %e %B %Y г. %X (%Z)
 #
 # Long month names (without case ending)
 �нварь
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/se_FI.UTF-8.src b/share/timedef/se_FI.UTF-8.src
index e854674c253d..332c67b16da9 100644
--- a/share/timedef/se_FI.UTF-8.src
+++ b/share/timedef/se_FI.UTF-8.src
@@ -56,14 +56,14 @@ laavadahke
 %Y-%m-%d
 #
 # c_fmt
-%Y %B %e %H:%M:%S
+%b %d %Y %X
 #
 # AM/PM
 iđitbeaivet
 eahketbeaivet
 #
 # date_fmt
-%Y %B %e %H:%M:%S %Z
+%a, %b %d %Y %X %Z
 #
 # Long month names (without case ending)
 ođđajagemánnu
diff --git a/share/timedef/se_NO.UTF-8.src b/share/timedef/se_NO.UTF-8.src
index 35063173d7ad..4fbb22250323 100644
--- a/share/timedef/se_NO.UTF-8.src
+++ b/share/timedef/se_NO.UTF-8.src
@@ -56,14 +56,14 @@ lávvardat
 %Y-%m-%d
 #
 # c_fmt
-%Y %B %e %H:%M:%S
+%b %d %Y %X
 #
 # AM/PM
 iđitbeaivet
 eahketbeaivet
 #
 # date_fmt
-%Y %B %e %H:%M:%S %Z
+%a, %b %d %Y %X %Z
 #
 # Long month names (without case ending)
 ođđajagemánnu
diff --git a/share/timedef/sk_SK.ISO8859-2.src b/share/timedef/sk_SK.ISO8859-2.src
index 1c586d7878d3..44e94aa3c7f2 100644
--- a/share/timedef/sk_SK.ISO8859-2.src
+++ b/share/timedef/sk_SK.ISO8859-2.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-dopoludnia
-odpoludnia
+
+
 #
 # date_fmt
-%A %e %B %Y, %H:%M:%S %Z
+%a %e. %B %Y %X %Z
 #
 # Long month names (without case ending)
 januára
@@ -83,5 +83,5 @@ decembra
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/sk_SK.UTF-8.src b/share/timedef/sk_SK.UTF-8.src
index 09d1be3d0c3a..f86533b76e83 100644
--- a/share/timedef/sk_SK.UTF-8.src
+++ b/share/timedef/sk_SK.UTF-8.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y, %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-dopoludnia
-odpoludnia
+
+
 #
 # date_fmt
-%A %e %B %Y, %H:%M:%S %Z
+%a %e. %B %Y %X %Z
 #
 # Long month names (without case ending)
 januára
@@ -83,5 +83,5 @@ decembra
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/sl_SI.ISO8859-2.src b/share/timedef/sl_SI.ISO8859-2.src
index ecfe8a4ffec0..e0d70b1afc1f 100644
--- a/share/timedef/sl_SI.ISO8859-2.src
+++ b/share/timedef/sl_SI.ISO8859-2.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%e. %m. %y
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 dop.
 pop.
 #
 # date_fmt
-%d. %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/sl_SI.UTF-8.src b/share/timedef/sl_SI.UTF-8.src
index 9cb78bf4affe..914489de4e64 100644
--- a/share/timedef/sl_SI.UTF-8.src
+++ b/share/timedef/sl_SI.UTF-8.src
@@ -53,17 +53,17 @@ sobota
 %H:%M:%S
 #
 # x_fmt
-%e. %m. %y
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 dop.
 pop.
 #
 # date_fmt
-%d. %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/sr_RS.ISO8859-2.src b/share/timedef/sr_RS.ISO8859-2.src
index c9254fc43b0f..379ef4ac36d5 100644
--- a/share/timedef/sr_RS.ISO8859-2.src
+++ b/share/timedef/sr_RS.ISO8859-2.src
@@ -53,17 +53,17 @@ subota
 %H.%M.%S
 #
 # x_fmt
-%d.%m.%y.
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S
+%d %b %Y %X
 #
 # AM/PM
 pre podne
 po podne
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z
+%a, %d %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/sr_RS.ISO8859-5.src b/share/timedef/sr_RS.ISO8859-5.src
index 99e50b6c1375..97f737d4dc57 100644
--- a/share/timedef/sr_RS.ISO8859-5.src
+++ b/share/timedef/sr_RS.ISO8859-5.src
@@ -53,17 +53,17 @@
 %H.%M.%S
 #
 # x_fmt
-%d.%m.%y.
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S
+%d %b %Y %X
 #
 # AM/PM
 ßàÕ ßÞÔÝÕ
 ßÞ ßÞÔÝÕ
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z
+%a, %d %b %Y %X %Z
 #
 # Long month names (without case ending)
 øÐÝãÐà
diff --git a/share/timedef/sr_RS.UTF-8.src b/share/timedef/sr_RS.UTF-8.src
index 096d92934c2c..d5d8481bfdd5 100644
--- a/share/timedef/sr_RS.UTF-8.src
+++ b/share/timedef/sr_RS.UTF-8.src
@@ -53,17 +53,17 @@
 %H.%M.%S
 #
 # x_fmt
-%d.%m.%y.
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S
+%d %b %Y %X
 #
 # AM/PM
 пре подне
 по подне
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z
+%a, %d %b %Y %X %Z
 #
 # Long month names (without case ending)
 јануар
diff --git a/share/timedef/sr_RS.UTF-8@latin.src b/share/timedef/sr_RS.UTF-8@latin.src
index 2f22f70bf558..ced84160d882 100644
--- a/share/timedef/sr_RS.UTF-8@latin.src
+++ b/share/timedef/sr_RS.UTF-8@latin.src
@@ -53,17 +53,17 @@ subota
 %H.%M.%S
 #
 # x_fmt
-%d.%m.%y.
+%d.%m.%Y
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S
+%d %b %Y %X
 #
 # AM/PM
 pre podne
 po podne
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z
+%a, %d %b %Y %X %Z
 #
 # Long month names (without case ending)
 januar
diff --git a/share/timedef/sv_FI.ISO8859-15.src b/share/timedef/sv_FI.ISO8859-15.src
index d83ffea9c7b2..2a7cebef3fda 100644
--- a/share/timedef/sv_FI.ISO8859-15.src
+++ b/share/timedef/sv_FI.ISO8859-15.src
@@ -56,14 +56,14 @@ lördag
 %d-%m-%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 fm
 em
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januari
diff --git a/share/timedef/sv_SE.ISO8859-15.src b/share/timedef/sv_SE.ISO8859-15.src
index 46cca36e71a1..16d3cfc36357 100644
--- a/share/timedef/sv_SE.ISO8859-15.src
+++ b/share/timedef/sv_SE.ISO8859-15.src
@@ -56,14 +56,14 @@ lördag
 %Y-%m-%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 fm
 em
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januari
diff --git a/share/timedef/sv_SE.UTF-8.src b/share/timedef/sv_SE.UTF-8.src
index 321579be29d5..abd2188a6a9e 100644
--- a/share/timedef/sv_SE.UTF-8.src
+++ b/share/timedef/sv_SE.UTF-8.src
@@ -56,14 +56,14 @@ lördag
 %Y-%m-%d
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 fm
 em
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 januari
diff --git a/share/timedef/tr_TR.ISO8859-9.src b/share/timedef/tr_TR.ISO8859-9.src
index 538fea0029bf..6bf4555d54c6 100644
--- a/share/timedef/tr_TR.ISO8859-9.src
+++ b/share/timedef/tr_TR.ISO8859-9.src
@@ -53,17 +53,17 @@ Cumartesi
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 ÖÖ
 ÖS
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%e %b %Y %a %Z %X
 #
 # Long month names (without case ending)
 Ocak
@@ -83,5 +83,5 @@ Aralýk
 dm
 #
 # ampm_fmt
-%p %I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/tr_TR.UTF-8.src b/share/timedef/tr_TR.UTF-8.src
index 15f8fed50886..cb3f5ff5d607 100644
--- a/share/timedef/tr_TR.UTF-8.src
+++ b/share/timedef/tr_TR.UTF-8.src
@@ -53,17 +53,17 @@ Cumartesi
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%Y
+%d/%m/%Y
 #
 # c_fmt
-%A %e %B %Y %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
 ÖÖ
 ÖS
 #
 # date_fmt
-%A %e %B %Y %H:%M:%S %Z
+%e %b %Y %a %Z %X
 #
 # Long month names (without case ending)
 Ocak
@@ -83,5 +83,5 @@ Aralık
 dm
 #
 # ampm_fmt
-%p %I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/uk_UA.CP1251.src b/share/timedef/uk_UA.CP1251.src
index 60bc5e0187e6..fcb2969ac5e1 100644
--- a/share/timedef/uk_UA.CP1251.src
+++ b/share/timedef/uk_UA.CP1251.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y ð. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-äï
-ïï
+
+
 #
 # date_fmt
-%A %e %B %Y ð. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 ñ³÷åíü
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/uk_UA.ISO8859-5.src b/share/timedef/uk_UA.ISO8859-5.src
index b02c1f3f8b7a..9742672e635c 100644
--- a/share/timedef/uk_UA.ISO8859-5.src
+++ b/share/timedef/uk_UA.ISO8859-5.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y à. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-Ôß
-ßß
+
+
 #
 # date_fmt
-%A %e %B %Y à. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 áöçÕÝì
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/uk_UA.KOI8-U.src b/share/timedef/uk_UA.KOI8-U.src
index 59cc654d6da4..0131efd808b7 100644
--- a/share/timedef/uk_UA.KOI8-U.src
+++ b/share/timedef/uk_UA.KOI8-U.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y Ò. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-ÄÐ
-ÐÐ
+
+
 #
 # date_fmt
-%A %e %B %Y Ò. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 Ó¦ÞÅÎØ
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/uk_UA.UTF-8.src b/share/timedef/uk_UA.UTF-8.src
index d5e6a94fd88f..69eb57eece85 100644
--- a/share/timedef/uk_UA.UTF-8.src
+++ b/share/timedef/uk_UA.UTF-8.src
@@ -53,17 +53,17 @@
 %H:%M:%S
 #
 # x_fmt
-%d.%m.%y
+%d.%m.%Y
 #
 # c_fmt
-%A %e %B %Y р. %H:%M:%S
+%a %e %b %X %Y
 #
 # AM/PM
-дп
-пп
+
+
 #
 # date_fmt
-%A %e %B %Y р. %H:%M:%S %Z
+%a %e %b %Y %X %Z
 #
 # Long month names (without case ending)
 �ічень
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%I:%M:%S %p
+
 # EOF
diff --git a/share/timedef/zh_CN.GB2312.src b/share/timedef/zh_CN.GB2312.src
index efa11cd40e15..e98dc5fc28fa 100644
--- a/share/timedef/zh_CN.GB2312.src
+++ b/share/timedef/zh_CN.GB2312.src
@@ -4,84 +4,84 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
-!!#1TB
-!!#2TB
-!!#3TB
-!!#4TB
-!!#5TB
-!!#6TB
-!!#7TB
-!!#8TB
-!!#9TB
-#1#0TB
-#1#1TB
-#1#2TB
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
-R;TB
-6~TB
-H}TB
-KDTB
-NeTB
-AyTB
-F_TB
-0KTB
->ETB
-J.TB
-J.R;TB
-J.6~TB
+Ò»ÔÂ
+¶þÔÂ
+ÈýÔÂ
+ËÄÔÂ
+ÎåÔÂ
+ÁùÔÂ
+ÆßÔÂ
+°ËÔÂ
+¾ÅÔÂ
+Ê®ÔÂ
+ʮһÔÂ
+Ê®¶þÔÂ
 #
 # Short weekday names
-V\HU
-V\R;
-V\6~
-V\H}
-V\KD
-V\Ne
-V\Ay
+ÖÜÈÕ
+ÖÜÒ»
+Öܶþ
+ÖÜÈý
+ÖÜËÄ
+ÖÜÎå
+ÖÜÁù
 #
 # Long weekday names
-PGFZHU
-PGFZR;
-PGFZ6~
-PGFZH}
-PGFZKD
-PGFZNe
-PGFZAy
+ÐÇÆÚÈÕ
+ÐÇÆÚÒ»
+ÐÇÆÚ¶þ
+ÐÇÆÚÈý
+ÐÇÆÚËÄ
+ÐÇÆÚÎå
+ÐÇÆÚÁù
 #
 # X_fmt
-%p%I:%M:%S
+%Hʱ%M·Ö%SÃë
 #
 # x_fmt
-%y#/%m#/%d
+%Y/%m/%d
 #
 # c_fmt
-%YDj%mTB%eHU %p%I:%M:%S
+%a %b/%e %T %Y
 #
 # AM/PM
-IONg
-OBNg
+ÉÏÎç
+ÏÂÎç
 #
 # date_fmt
-%YDj%mTB%eHU %Z %p%I:%M:%S
+%YÄê%bÔÂ%eÈÕ %A %X %Z
 #
 # Long month names (without case ending)
-R;TB
-6~TB
-H}TB
-KDTB
-NeTB
-AyTB
-F_TB
-0KTB
->ETB
-J.TB
-J.R;TB
-J.6~TB
+Ò»ÔÂ
+¶þÔÂ
+ÈýÔÂ
+ËÄÔÂ
+ÎåÔÂ
+ÁùÔÂ
+ÆßÔÂ
+°ËÔÂ
+¾ÅÔÂ
+Ê®ÔÂ
+ʮһÔÂ
+Ê®¶þÔÂ
 #
 # md_order
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_CN.GBK.src b/share/timedef/zh_CN.GBK.src
index 9f5dd0f5a377..e98dc5fc28fa 100644
--- a/share/timedef/zh_CN.GBK.src
+++ b/share/timedef/zh_CN.GBK.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1ÔÂ
- 2ÔÂ
- 3ÔÂ
- 4ÔÂ
- 5ÔÂ
- 6ÔÂ
- 7ÔÂ
- 8ÔÂ
- 9ÔÂ
-10ÔÂ
-11ÔÂ
-12ÔÂ
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 Ò»ÔÂ
@@ -50,20 +50,20 @@
 ÐÇÆÚÁù
 #
 # X_fmt
-%p%I:%M:%S
+%Hʱ%M·Ö%SÃë
 #
 # x_fmt
-%y/%m/%d
+%Y/%m/%d
 #
 # c_fmt
-%YÄê%mÔÂ%eÈÕ %p%I:%M:%S
+%a %b/%e %T %Y
 #
 # AM/PM
 ÉÏÎç
 ÏÂÎç
 #
 # date_fmt
-%YÄê%mÔÂ%eÈÕ %Z %p%I:%M:%S
+%YÄê%bÔÂ%eÈÕ %A %X %Z
 #
 # Long month names (without case ending)
 Ò»ÔÂ
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_CN.UTF-8.src b/share/timedef/zh_CN.UTF-8.src
index 9c994d445b39..2460706f3bf3 100644
--- a/share/timedef/zh_CN.UTF-8.src
+++ b/share/timedef/zh_CN.UTF-8.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1月
- 2月
- 3月
- 4月
- 5月
- 6月
- 7月
- 8月
- 9月
-10月
-11月
-12月
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 一月
@@ -50,20 +50,20 @@
 星期六
 #
 # X_fmt
-%p%I:%M:%S
+%H时%M分%S秒
 #
 # x_fmt
-%y/%m/%d
+%Y/%m/%d
 #
 # c_fmt
-%Y年%m月%e日 %p%I:%M:%S
+%a %b/%e %T %Y
 #
 # AM/PM
 上�
 下�
 #
 # date_fmt
-%Y年%m月%e日 %Z %p%I:%M:%S
+%Y年%b月%e日 %A %X %Z
 #
 # Long month names (without case ending)
 一月
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_CN.eucCN.src b/share/timedef/zh_CN.eucCN.src
index 5589bf918881..e98dc5fc28fa 100644
--- a/share/timedef/zh_CN.eucCN.src
+++ b/share/timedef/zh_CN.eucCN.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
-¡¡£±ÔÂ
-¡¡£²ÔÂ
-¡¡£³ÔÂ
-¡¡£´ÔÂ
-¡¡£µÔÂ
-¡¡£¶ÔÂ
-¡¡£·ÔÂ
-¡¡£¸ÔÂ
-¡¡£¹ÔÂ
-£±£°ÔÂ
-£±£±ÔÂ
-£±£²ÔÂ
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 Ò»ÔÂ
@@ -50,20 +50,20 @@
 ÐÇÆÚÁù
 #
 # X_fmt
-%p%I:%M:%S
+%Hʱ%M·Ö%SÃë
 #
 # x_fmt
-%y£¯%m£¯%d
+%Y/%m/%d
 #
 # c_fmt
-%YÄê%mÔÂ%eÈÕ %p%I:%M:%S
+%a %b/%e %T %Y
 #
 # AM/PM
 ÉÏÎç
 ÏÂÎç
 #
 # date_fmt
-%YÄê%mÔÂ%eÈÕ %Z %p%I:%M:%S
+%YÄê%bÔÂ%eÈÕ %A %X %Z
 #
 # Long month names (without case ending)
 Ò»ÔÂ
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_HK.UTF-8.src b/share/timedef/zh_HK.UTF-8.src
index afd32174da98..9800bcf231eb 100644
--- a/share/timedef/zh_HK.UTF-8.src
+++ b/share/timedef/zh_HK.UTF-8.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1月
- 2月
- 3月
- 4月
- 5月
- 6月
- 7月
- 8月
- 9月
-10月
-11月
-12月
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 1月
@@ -50,20 +50,20 @@
 星期六
 #
 # X_fmt
-%p%I:%M:%S
+%H時%M分%S秒
 #
 # x_fmt
-%d/%m/%y
+%Y/%m/%d
 #
 # c_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%a %b/%e %T %Y
 #
 # AM/PM
 上�
 下�
 #
 # date_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%Y年%b月%e日 %A %X %Z
 #
 # Long month names (without case ending)
 1月
@@ -83,5 +83,5 @@
 dm
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_TW.Big5.src b/share/timedef/zh_TW.Big5.src
index 012b8702ea24..4ed7cdeeda12 100644
--- a/share/timedef/zh_TW.Big5.src
+++ b/share/timedef/zh_TW.Big5.src
@@ -4,32 +4,32 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
-¡@¢°¤ë
-¡@¢±¤ë
-¡@¢²¤ë
-¡@¢³¤ë
-¡@¢´¤ë
-¡@¢µ¤ë
-¡@¢¶¤ë
-¡@¢·¤ë
-¡@¢¸¤ë
-¢°¢¯¤ë
-¢°¢°¤ë
-¢°¢±¤ë
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
-¢°¤ë
-¢±¤ë
-¢²¤ë
-¢³¤ë
-¢´¤ë
-¢µ¤ë
-¢¶¤ë
-¢·¤ë
-¢¸¤ë
-¢°¢¯¤ë
-¢°¢°¤ë
-¢°¢±¤ë
+1¤ë
+2¤ë
+3¤ë
+4¤ë
+5¤ë
+6¤ë
+7¤ë
+8¤ë
+9¤ë
+10¤ë
+11¤ë
+12¤ë
 #
 # Short weekday names
 ¶g¤é
@@ -50,38 +50,38 @@
 ¬P´Á¤»
 #
 # X_fmt
-%p%I:%M:%S
+%H®É%M¤À%S¬í
 #
 # x_fmt
-%Y¢A%m¢A%d
+%Y/%m/%d
 #
 # c_fmt
-%Y¦~%m¤ë%e¤é %p%I:%M:%S [%Z]
+%a %b/%e %T %Y
 #
 # AM/PM
 ¤W¤È
 ¤U¤È
 #
 # date_fmt
-%Y¦~%m¤ë%e¤é %p%I:%M:%S [%Z]
+%Y¦~%b¤ë%e¤é %A %X %Z
 #
 # Long month names (without case ending)
-¢°¤ë
-¢±¤ë
-¢²¤ë
-¢³¤ë
-¢´¤ë
-¢µ¤ë
-¢¶¤ë
-¢·¤ë
-¢¸¤ë
-¢°¢¯¤ë
-¢°¢°¤ë
-¢°¢±¤ë
+1¤ë
+2¤ë
+3¤ë
+4¤ë
+5¤ë
+6¤ë
+7¤ë
+8¤ë
+9¤ë
+10¤ë
+11¤ë
+12¤ë
 #
 # md_order
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF
diff --git a/share/timedef/zh_TW.UTF-8.src b/share/timedef/zh_TW.UTF-8.src
index 9b8486556406..3121d4a4f4fc 100644
--- a/share/timedef/zh_TW.UTF-8.src
+++ b/share/timedef/zh_TW.UTF-8.src
@@ -4,18 +4,18 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
- 1月
- 2月
- 3月
- 4月
- 5月
- 6月
- 7月
- 8月
- 9月
-10月
-11月
-12月
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
 #
 # Long month names (as in a date)
 1月
@@ -50,20 +50,20 @@
 星期六
 #
 # X_fmt
-%p%I:%M:%S
+%H時%M分%S秒
 #
 # x_fmt
 %Y/%m/%d
 #
 # c_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%a %b/%e %T %Y
 #
 # AM/PM
 上�
 下�
 #
 # date_fmt
-%Y年%m月%e日 %p%I:%M:%S [%Z]
+%Y年%b月%e日 %A %X %Z
 #
 # Long month names (without case ending)
 1月
@@ -83,5 +83,5 @@
 md
 #
 # ampm_fmt
-%p%I:%M:%S
+%I:%M:%S %p
 # EOF