r2218 - in tzdata/trunk/debian: . po
Author: schizo
Date: 2007-05-12 06:44:36 +0000 (Sat, 12 May 2007)
New Revision: 2218
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/config
tzdata/trunk/debian/po/templates.pot
Log:
* debian/config: Asmara is the canonical name for Asmera.
* debian/po/templates.pot: remove Asmera.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2007-05-11 20:35:12 UTC (rev 2217)
+++ tzdata/trunk/debian/changelog 2007-05-12 06:44:36 UTC (rev 2218)
@@ -6,6 +6,8 @@
thereby eliminating use of sed.
* debian/config: Ulaanbaatar is the canonical name, not
Ulan_Bator.
+ * debian/config: Asmara is the canonical name for Asmera.
+ * debian/po/templates.pot: remove Asmera.
-- Clint Adams <schizo@debian.org> Fri, 11 May 2007 11:14:37 -0400
Modified: tzdata/trunk/debian/config
===================================================================
--- tzdata/trunk/debian/config 2007-05-11 20:35:12 UTC (rev 2217)
+++ tzdata/trunk/debian/config 2007-05-12 06:44:36 UTC (rev 2218)
@@ -8,6 +8,9 @@
convert_timezone()
{
case "$1" in
+ ("Africa/Asmera")
+ echo "Africa/Asmara"
+ ;;
"Asia/Ashkhabad")
echo "Asia/Ashgabat"
;;
Modified: tzdata/trunk/debian/po/templates.pot
===================================================================
--- tzdata/trunk/debian/po/templates.pot 2007-05-11 20:35:12 UTC (rev 2217)
+++ tzdata/trunk/debian/po/templates.pot 2007-05-12 06:44:36 UTC (rev 2218)
@@ -211,12 +211,6 @@
#. Type: select
#. Choices
#: ../templates:2001
-msgid "Asmera"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:2001
msgid "Bamako"
msgstr ""
Reply to: