Fix the clock display for the Danish, Italian, and Chinese locales. FreeBSD's

strftime(3) does not support the '-' (no pad) modifier that GNU date does.

10 files changed, 348 insertions, 2 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 2787b2217487..f037c36d1556 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.4
diff --git a/x11/gnome-panel/files/patch-po_da.po b/x11/gnome-panel/files/patch-po_da.po
new file mode 100644
index 000000000000..96bfea954001
--- /dev/null
+++ b/x11/gnome-panel/files/patch-po_da.po
@@ -0,0 +1,29 @@
+--- po/da.po.orig	Wed Oct  1 15:54:18 2003
++++ po/da.po	Wed Oct  1 15:56:23 2003
+@@ -48,7 +48,7 @@
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%a %-d. %b"
++msgstr "%a %d. %b"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -75,7 +75,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%A den %-d. %B"
++msgstr "%A den %d. %B"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"
+@@ -95,7 +95,7 @@
+ 
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%A, %-d. %B %Y"
++msgstr "%A, %d. %B %Y"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnome-panel/files/patch-po_it.po b/x11/gnome-panel/files/patch-po_it.po
new file mode 100644
index 000000000000..00118bd344bc
--- /dev/null
+++ b/x11/gnome-panel/files/patch-po_it.po
@@ -0,0 +1,59 @@
+--- po/it.po.orig	Wed Oct  1 15:55:34 2003
++++ po/it.po	Wed Oct  1 15:56:12 2003
+@@ -17,23 +17,23 @@
+ 
+ #: applets/clock/clock.c:219
+ msgid "%l:%M:%S %p"
+-msgstr "%-I.%M.%S %p"
++msgstr "%I.%M.%S %p"
+ 
+ #: applets/clock/clock.c:219
+ msgid "%l:%M %p"
+-msgstr "%-I.%M %p"
++msgstr "%I.%M %p"
+ 
+ #: applets/clock/clock.c:221 applets/clock/clock.c:773
+ msgid "%H:%M:%S"
+-msgstr "%-H.%M.%S"
++msgstr "%H.%M.%S"
+ 
+ #: applets/clock/clock.c:221 applets/clock/clock.c:775
+ msgid "%H:%M"
+-msgstr "%-H.%M"
++msgstr "%H.%M"
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%a %-d %b"
++msgstr "%a %d %b"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -60,7 +60,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%A %-d %B"
++msgstr "%A %d %B"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"
+@@ -72,15 +72,15 @@
+ 
+ #: applets/clock/clock.c:768
+ msgid "%I:%M:%S %p"
+-msgstr "%-I.%M.%S %p"
++msgstr "%I.%M.%S %p"
+ 
+ #: applets/clock/clock.c:770
+ msgid "%I:%M %p"
+-msgstr "%-I.%M %p"
++msgstr "%I.%M %p"
+ 
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%A, %-d %B %Y"
++msgstr "%A, %d %B %Y"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnome-panel/files/patch-po_zh_CN.po b/x11/gnome-panel/files/patch-po_zh_CN.po
new file mode 100644
index 000000000000..5c68615e7e8c
--- /dev/null
+++ b/x11/gnome-panel/files/patch-po_zh_CN.po
@@ -0,0 +1,65 @@
+--- po/zh_CN.po.orig	Wed Oct  1 15:56:29 2003
++++ po/zh_CN.po	Wed Oct  1 15:57:06 2003
+@@ -24,27 +24,27 @@
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:219
+ msgid "%l:%M:%S %p"
+-msgstr "%-H:%M:%S"
++msgstr "%H:%M:%S"
+ 
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:219
+ msgid "%l:%M %p"
+-msgstr "%-H:%M"
++msgstr "-H:%M"
+ 
+ # applets/mini-commander/src/message.c:105
+ #: applets/clock/clock.c:221 applets/clock/clock.c:773
+ msgid "%H:%M:%S"
+-msgstr "%-H:%M:%S"
++msgstr "%H:%M:%S"
+ 
+ # applets/mini-commander/src/message.c:105
+ #: applets/clock/clock.c:221 applets/clock/clock.c:775
+ msgid "%H:%M"
+-msgstr "%-H:%M"
++msgstr "%H:%M"
+ 
+ # applets/gen_util/clock.c:131
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%-m月%-d日%A"
++msgstr "%m月%d日%A"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -72,7 +72,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%-m月%-d日%A"
++msgstr "%m月%d日%A"
+ 
+ # panel/panel_config.c:705
+ #: applets/clock/clock.c:472
+@@ -86,17 +86,17 @@
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:768
+ msgid "%I:%M:%S %p"
+-msgstr "%p %-I:%M:%S"
++msgstr "%p %I:%M:%S"
+ 
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:770
+ msgid "%I:%M %p"
+-msgstr "%p %-I:%M "
++msgstr "%p %I:%M "
+ 
+ # applets/clockmail/clockmail.c:133
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%Y年%-m月%-d日%A"
++msgstr "%Y年%m月%d日%A"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnome-panel/files/patch-po_zh_TW.po b/x11/gnome-panel/files/patch-po_zh_TW.po
new file mode 100644
index 000000000000..3e7e16c45ddb
--- /dev/null
+++ b/x11/gnome-panel/files/patch-po_zh_TW.po
@@ -0,0 +1,20 @@
+--- po/zh_TW.po.orig	Wed Oct  1 15:57:10 2003
++++ po/zh_TW.po	Wed Oct  1 15:57:19 2003
+@@ -40,7 +40,7 @@
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%-m月%-d日(%a)"
++msgstr "%m月%d日(%a)"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -67,7 +67,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%-m月%-d日(%A)"
++msgstr "%m月%d日(%A)"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 2787b2217487..f037c36d1556 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.4
diff --git a/x11/gnomepanel/files/patch-po_da.po b/x11/gnomepanel/files/patch-po_da.po
new file mode 100644
index 000000000000..96bfea954001
--- /dev/null
+++ b/x11/gnomepanel/files/patch-po_da.po
@@ -0,0 +1,29 @@
+--- po/da.po.orig	Wed Oct  1 15:54:18 2003
++++ po/da.po	Wed Oct  1 15:56:23 2003
+@@ -48,7 +48,7 @@
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%a %-d. %b"
++msgstr "%a %d. %b"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -75,7 +75,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%A den %-d. %B"
++msgstr "%A den %d. %B"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"
+@@ -95,7 +95,7 @@
+ 
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%A, %-d. %B %Y"
++msgstr "%A, %d. %B %Y"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnomepanel/files/patch-po_it.po b/x11/gnomepanel/files/patch-po_it.po
new file mode 100644
index 000000000000..00118bd344bc
--- /dev/null
+++ b/x11/gnomepanel/files/patch-po_it.po
@@ -0,0 +1,59 @@
+--- po/it.po.orig	Wed Oct  1 15:55:34 2003
++++ po/it.po	Wed Oct  1 15:56:12 2003
+@@ -17,23 +17,23 @@
+ 
+ #: applets/clock/clock.c:219
+ msgid "%l:%M:%S %p"
+-msgstr "%-I.%M.%S %p"
++msgstr "%I.%M.%S %p"
+ 
+ #: applets/clock/clock.c:219
+ msgid "%l:%M %p"
+-msgstr "%-I.%M %p"
++msgstr "%I.%M %p"
+ 
+ #: applets/clock/clock.c:221 applets/clock/clock.c:773
+ msgid "%H:%M:%S"
+-msgstr "%-H.%M.%S"
++msgstr "%H.%M.%S"
+ 
+ #: applets/clock/clock.c:221 applets/clock/clock.c:775
+ msgid "%H:%M"
+-msgstr "%-H.%M"
++msgstr "%H.%M"
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%a %-d %b"
++msgstr "%a %d %b"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -60,7 +60,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%A %-d %B"
++msgstr "%A %d %B"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"
+@@ -72,15 +72,15 @@
+ 
+ #: applets/clock/clock.c:768
+ msgid "%I:%M:%S %p"
+-msgstr "%-I.%M.%S %p"
++msgstr "%I.%M.%S %p"
+ 
+ #: applets/clock/clock.c:770
+ msgid "%I:%M %p"
+-msgstr "%-I.%M %p"
++msgstr "%I.%M %p"
+ 
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%A, %-d %B %Y"
++msgstr "%A, %d %B %Y"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnomepanel/files/patch-po_zh_CN.po b/x11/gnomepanel/files/patch-po_zh_CN.po
new file mode 100644
index 000000000000..5c68615e7e8c
--- /dev/null
+++ b/x11/gnomepanel/files/patch-po_zh_CN.po
@@ -0,0 +1,65 @@
+--- po/zh_CN.po.orig	Wed Oct  1 15:56:29 2003
++++ po/zh_CN.po	Wed Oct  1 15:57:06 2003
+@@ -24,27 +24,27 @@
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:219
+ msgid "%l:%M:%S %p"
+-msgstr "%-H:%M:%S"
++msgstr "%H:%M:%S"
+ 
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:219
+ msgid "%l:%M %p"
+-msgstr "%-H:%M"
++msgstr "-H:%M"
+ 
+ # applets/mini-commander/src/message.c:105
+ #: applets/clock/clock.c:221 applets/clock/clock.c:773
+ msgid "%H:%M:%S"
+-msgstr "%-H:%M:%S"
++msgstr "%H:%M:%S"
+ 
+ # applets/mini-commander/src/message.c:105
+ #: applets/clock/clock.c:221 applets/clock/clock.c:775
+ msgid "%H:%M"
+-msgstr "%-H:%M"
++msgstr "%H:%M"
+ 
+ # applets/gen_util/clock.c:131
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%-m月%-d日%A"
++msgstr "%m月%d日%A"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -72,7 +72,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%-m月%-d日%A"
++msgstr "%m月%d日%A"
+ 
+ # panel/panel_config.c:705
+ #: applets/clock/clock.c:472
+@@ -86,17 +86,17 @@
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:768
+ msgid "%I:%M:%S %p"
+-msgstr "%p %-I:%M:%S"
++msgstr "%p %I:%M:%S"
+ 
+ # applets/gen_util/clock.c:157
+ #: applets/clock/clock.c:770
+ msgid "%I:%M %p"
+-msgstr "%p %-I:%M "
++msgstr "%p %I:%M "
+ 
+ # applets/clockmail/clockmail.c:133
+ #: applets/clock/clock.c:809
+ msgid "%A, %B %d %Y"
+-msgstr "%Y年%-m月%-d日%A"
++msgstr "%Y年%m月%d日%A"
+ 
+ #: applets/clock/clock.c:850
+ #, c-format
diff --git a/x11/gnomepanel/files/patch-po_zh_TW.po b/x11/gnomepanel/files/patch-po_zh_TW.po
new file mode 100644
index 000000000000..3e7e16c45ddb
--- /dev/null
+++ b/x11/gnomepanel/files/patch-po_zh_TW.po
@@ -0,0 +1,20 @@
+--- po/zh_TW.po.orig	Wed Oct  1 15:57:10 2003
++++ po/zh_TW.po	Wed Oct  1 15:57:19 2003
+@@ -40,7 +40,7 @@
+ 
+ #: applets/clock/clock.c:227
+ msgid "%a %b %d"
+-msgstr "%-m月%-d日(%a)"
++msgstr "%m月%d日(%a)"
+ 
+ #. translators: reverse the order of these arguments
+ #. *              if the time should come before the
+@@ -67,7 +67,7 @@
+ #. Show date in tooltip
+ #: applets/clock/clock.c:344
+ msgid "%A %B %d"
+-msgstr "%-m月%-d日(%A)"
++msgstr "%m月%d日(%A)"
+ 
+ #: applets/clock/clock.c:472
+ msgid "Calendar"