r2177 - in tzdata/trunk/debian: . po
Author: aurel32
Date: 2007-05-05 11:53:11 +0000 (Sat, 05 May 2007)
New Revision: 2177
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/control
tzdata/trunk/debian/po/en.po
tzdata/trunk/debian/po/fr.po
tzdata/trunk/debian/po/pt.po
tzdata/trunk/debian/po/ru.po
tzdata/trunk/debian/po/templates.pot
tzdata/trunk/debian/rules
tzdata/trunk/debian/templates
Log:
* Partly merge patch from the Debconf templates review (closes:
bug#422186).
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/changelog 2007-05-05 11:53:11 UTC (rev 2177)
@@ -3,9 +3,11 @@
* debian/po/en.po: fixes two typo. Thanks to Thijs Kinkhorst (closes:
#421889).
* New Russian debconf translation, by Yuri Kozlov (closes: bug#421499).
- * New Portuguese debconf translation, by Rui Branco (closes: bug#422329).
+ * New Portuguese debconf translation, by Rui Branco (closes: bug#422329).
+ * Partly merge patch from the Debconf templates review (closes:
+ bug#422186).
- -- Aurelien Jarno <aurel32@debian.org> Sat, 05 May 2007 13:40:45 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 05 May 2007 13:52:54 +0200
tzdata (2007e-6) unstable; urgency=low
Modified: tzdata/trunk/debian/control
===================================================================
--- tzdata/trunk/debian/control 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/control 2007-05-05 11:53:11 UTC (rev 2177)
@@ -11,8 +11,9 @@
Architecture: all
Depends: debconf | debconf-2.0
Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: Time Zone and Daylight Saving Time Data
- This package contains data that represent the history of local time for many
- representative locations around the globe. It is updated periodically to
- reflect changes made by political bodies to time zone boundaries, UTC offsets,
- and daylight-saving rules
+Description: time zone and daylight-saving time data
+ This package contains data required for the implementation of
+ standard local time for many representative locations around the
+ globe. It is updated periodically to reflect changes made by
+ political bodies to time zone boundaries, UTC offsets, and
+ daylight-saving rules.
Modified: tzdata/trunk/debian/po/en.po
===================================================================
--- tzdata/trunk/debian/po/en.po 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/po/en.po 2007-05-05 11:53:11 UTC (rev 2177)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-25 07:21-0600\n"
+"POT-Creation-Date: 2007-05-05 13:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,56 +18,77 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Africa"
msgstr "Africa"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "America"
msgstr "America"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Antarctica"
msgstr "Antarctica"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Australia"
msgstr "Australia"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Arctic"
msgstr "Arctic Ocean"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Asia"
msgstr "Asia"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -76,32 +97,44 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Canada"
msgstr "Canada"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Europe"
msgstr "Europe"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Indian"
msgstr "Indian Ocean"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -110,16 +143,22 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "SystemV"
msgstr "System V timezones"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Etc"
msgstr "None of the above"
@@ -133,9 +172,11 @@
#. Type: select
#. Description
#: ../templates:1002
+#, fuzzy
msgid ""
-"Please select the geographic area in which you live, then you will be shown "
-"a list of cities which represent the time zone in which they are located."
+"Please select the geographic area you live in. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
msgstr ""
"Please select the geographic area in which you live, then you will be shown "
"a list of cities which represent the time zone in which they are located."
@@ -486,8 +527,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Time zone:"
msgstr "Time zone:"
@@ -519,8 +560,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Please select the time zone corresponding to your location."
msgstr "Please select the time zone corresponding to your location."
@@ -2766,290 +2807,3 @@
msgid "Yap"
msgstr "Yap"
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4"
-msgstr "AST4"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4ADT"
-msgstr "AST4ADT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6"
-msgstr "CST6"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6CDT"
-msgstr "CST6CDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5"
-msgstr "EST5"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5EDT"
-msgstr "EST5EDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "HST10"
-msgstr "HST10"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7"
-msgstr "MST7"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7MDT"
-msgstr "MST7MDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8"
-msgstr "PST8"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8PDT"
-msgstr "PST8PDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9"
-msgstr "YST9"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9YDT"
-msgstr "YST9YDT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT"
-msgstr "GMT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+0"
-msgstr "GMT+0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+1"
-msgstr "GMT+1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+10"
-msgstr "GMT+10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+11"
-msgstr "GMT+11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+12"
-msgstr "GMT+12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+2"
-msgstr "GMT+2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+3"
-msgstr "GMT+3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+4"
-msgstr "GMT+4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+5"
-msgstr "GMT+5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+6"
-msgstr "GMT+6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+7"
-msgstr "GMT+7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+8"
-msgstr "GMT+8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+9"
-msgstr "GMT+9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-0"
-msgstr "GMT-0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-1"
-msgstr "GMT-1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-10"
-msgstr "GMT-10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-11"
-msgstr "GMT-11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-12"
-msgstr "GMT-12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-13"
-msgstr "GMT-13"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-14"
-msgstr "GMT-14"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-2"
-msgstr "GMT-2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-3"
-msgstr "GMT-3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-4"
-msgstr "GMT-4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-5"
-msgstr "GMT-5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-6"
-msgstr "GMT-6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-7"
-msgstr "GMT-7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-8"
-msgstr "GMT-8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-9"
-msgstr "GMT-9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT0"
-msgstr "GMT0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Greenwich"
-msgstr "Greenwich"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UCT"
-msgstr "UCT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UTC"
-msgstr "UTC"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Universal"
-msgstr "Universal"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Zulu"
-msgstr "Zulu"
Modified: tzdata/trunk/debian/po/fr.po
===================================================================
--- tzdata/trunk/debian/po/fr.po 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/po/fr.po 2007-05-05 11:53:11 UTC (rev 2177)
@@ -1,73 +1,106 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# THIS FILE IS AUTOMATICALLY GENERATED FROM THE MASTER FILE
+# packages/po/fr.po
#
-#, fuzzy
+# DO NOT MODIFY IT DIRECTLY : SUCH CHANGES WILL BE LOST
+#
+# translation of fr.po to French
+# French messages for debian-installer.
+# Copyright (C) 2004 Software in the Public Interest, Inc.
+# This file is distributed under the same license as debian-installer.
+#
+# Christian Perrier <bubulle@debian.org>, 2002-2004.
+# Pierre Machard <pmachard@debian.org>, 2002-2004.
+# Denis Barbier <barbier@debian.org>, 2002-2004.
+# Philippe Batailler <philippe.batailler@free.fr>, 2002-2004.
+# Michel Grentzinger <mic.grentz@online.fr>, 2003-2004.
+# Christian Perrier <bubulle@debian.org>, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-25 07:21-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2007-05-05 13:42+0200\n"
+"PO-Revision-Date: 2005-11-28 06:42+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Generator: KBabel 1.11.2\n"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Africa"
msgstr "Afrique"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "America"
msgstr "Amérique"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Antarctica"
-msgstr "Océan Antarctique"
+msgstr "Ocean Antarctique"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Australia"
msgstr "Australie"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Arctic"
msgstr "Océan Arctique"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Asia"
msgstr "Asie"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -76,32 +109,44 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Canada"
msgstr "Canada"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Europe"
msgstr "Europe"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Indian"
msgstr "Océan Indien"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -110,16 +155,22 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "SystemV"
msgstr "Système V"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Etc"
msgstr "Autre"
@@ -134,8 +185,9 @@
#. Description
#: ../templates:1002
msgid ""
-"Please select the geographic area in which you live, then you will be shown "
-"a list of cities which represent the time zone in which they are located."
+"Please select the geographic area you live in. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
msgstr ""
#. Type: select
@@ -232,7 +284,7 @@
#. Choices
#: ../templates:2001
msgid "Ceuta"
-msgstr ""
+msgstr "Ceuta et Melilla"
#. Type: select
#. Choices
@@ -244,7 +296,7 @@
#. Choices
#: ../templates:2001
msgid "Dakar"
-msgstr ""
+msgstr "Dakar"
#. Type: select
#. Choices
@@ -484,8 +536,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Time zone:"
msgstr ""
@@ -517,8 +569,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Please select the time zone corresponding to your location."
msgstr ""
@@ -550,7 +602,7 @@
#. Choices
#: ../templates:3001
msgid "Araguaina"
-msgstr ""
+msgstr "Araguaina"
#. Type: select
#. Choices
@@ -580,7 +632,7 @@
#. Choices
#: ../templates:3001
msgid "Bahia"
-msgstr ""
+msgstr "Bahia"
#. Type: select
#. Choices
@@ -592,7 +644,7 @@
#. Choices
#: ../templates:3001
msgid "Belem"
-msgstr ""
+msgstr "Belém"
#. Type: select
#. Choices
@@ -610,7 +662,7 @@
#. Choices
#: ../templates:3001
msgid "Boa_Vista"
-msgstr ""
+msgstr "Boa Vista"
#. Type: select
#. Choices
@@ -640,7 +692,7 @@
#. Choices
#: ../templates:3001
msgid "Campo_Grande"
-msgstr ""
+msgstr "Campo Grande"
#. Type: select
#. Choices
@@ -706,7 +758,7 @@
#. Choices
#: ../templates:3001
msgid "Cuiaba"
-msgstr ""
+msgstr "Cuiabá"
#. Type: select
#. Choices
@@ -760,7 +812,7 @@
#. Choices
#: ../templates:3001
msgid "Eirunepe"
-msgstr ""
+msgstr "Eirunepe"
#. Type: select
#. Choices
@@ -784,7 +836,7 @@
#. Choices
#: ../templates:3001
msgid "Fortaleza"
-msgstr ""
+msgstr "Fortaleza"
#. Type: select
#. Choices
@@ -796,7 +848,7 @@
#. Choices
#: ../templates:3001
msgid "Godthab"
-msgstr ""
+msgstr "Godthab"
#. Type: select
#. Choices
@@ -832,7 +884,7 @@
#. Choices
#: ../templates:3001
msgid "Guayaquil"
-msgstr ""
+msgstr "Guayaquil"
#. Type: select
#. Choices
@@ -916,7 +968,7 @@
#. Choices
#: ../templates:3001
msgid "Los_Angeles"
-msgstr ""
+msgstr "Los Angeles"
#. Type: select
#. Choices
@@ -928,25 +980,25 @@
#. Choices
#: ../templates:3001
msgid "Maceio"
-msgstr ""
+msgstr "Maceió"
#. Type: select
#. Choices
#: ../templates:3001
msgid "Managua"
-msgstr ""
+msgstr "Manaus"
#. Type: select
#. Choices
#: ../templates:3001
msgid "Manaus"
-msgstr ""
+msgstr "Manaus"
#. Type: select
#. Choices
#: ../templates:3001
msgid "Martinique"
-msgstr ""
+msgstr "Martinique"
#. Type: select
#. Choices
@@ -1006,7 +1058,7 @@
#. Choices
#: ../templates:3001
msgid "Montreal"
-msgstr ""
+msgstr "Montréal"
#. Type: select
#. Choices
@@ -1090,7 +1142,7 @@
#. Choices
#: ../templates:3001
msgid "Porto_Velho"
-msgstr ""
+msgstr "Porto Velho"
#. Type: select
#. Choices
@@ -1114,7 +1166,7 @@
#. Choices
#: ../templates:3001
msgid "Recife"
-msgstr ""
+msgstr "Recife"
#. Type: select
#. Choices
@@ -1132,7 +1184,7 @@
#. Choices
#: ../templates:3001
msgid "Rio_Branco"
-msgstr ""
+msgstr "Rio Branco"
#. Type: select
#. Choices
@@ -1144,7 +1196,7 @@
#. Choices
#: ../templates:3001
msgid "Santiago"
-msgstr ""
+msgstr "Santiago"
#. Type: select
#. Choices
@@ -1156,13 +1208,13 @@
#. Choices
#: ../templates:3001
msgid "Sao_Paulo"
-msgstr ""
+msgstr "São Paulo"
#. Type: select
#. Choices
#: ../templates:3001
msgid "Scoresbysund"
-msgstr ""
+msgstr "Scoresbysund - Ittoqqortoormiit"
#. Type: select
#. Choices
@@ -1216,7 +1268,7 @@
#. Choices
#: ../templates:3001
msgid "Thule"
-msgstr ""
+msgstr "Thule - Pituffik"
#. Type: select
#. Choices
@@ -1282,61 +1334,61 @@
#. Choices
#: ../templates:4001
msgid "Casey"
-msgstr ""
+msgstr "Base Casey"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Davis"
-msgstr ""
+msgstr "Base Davis"
#. Type: select
#. Choices
#: ../templates:4001
msgid "DumontDUrville"
-msgstr ""
+msgstr "Base Dumont-d'Urville"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Mawson"
-msgstr ""
+msgstr "Base Mawson"
#. Type: select
#. Choices
#: ../templates:4001
msgid "McMurdo"
-msgstr ""
+msgstr "Base McMurdo"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Palmer"
-msgstr ""
+msgstr "Base Palmer"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Rothera"
-msgstr ""
+msgstr "Base Rothera"
#. Type: select
#. Choices
#: ../templates:4001
msgid "South_Pole"
-msgstr ""
+msgstr "Base Scott-Admundsen"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Syowa"
-msgstr ""
+msgstr "Base Syowa"
#. Type: select
#. Choices
#: ../templates:4001
msgid "Vostok"
-msgstr ""
+msgstr "Base Vostok"
#. Type: select
#. Choices
@@ -1348,13 +1400,13 @@
#. Choices
#: ../templates:5001
msgid "Adelaide"
-msgstr ""
+msgstr "Adelaide"
#. Type: select
#. Choices
#: ../templates:5001
msgid "Brisbane"
-msgstr ""
+msgstr "Brisbane"
#. Type: select
#. Choices
@@ -1408,13 +1460,13 @@
#. Choices
#: ../templates:5001
msgid "Lord_Howe"
-msgstr ""
+msgstr "Île Lord Howe"
#. Type: select
#. Choices
#: ../templates:5001
msgid "Melbourne"
-msgstr ""
+msgstr "Melbourne"
#. Type: select
#. Choices
@@ -1450,7 +1502,7 @@
#. Choices
#: ../templates:5001
msgid "Sydney"
-msgstr ""
+msgstr "Sydney"
#. Type: select
#. Choices
@@ -1510,13 +1562,13 @@
#. Choices
#: ../templates:7001
msgid "Aqtau"
-msgstr ""
+msgstr "Aqtau"
#. Type: select
#. Choices
#: ../templates:7001
msgid "Aqtobe"
-msgstr ""
+msgstr "Aqtobe"
#. Type: select
#. Choices
@@ -1582,7 +1634,7 @@
#. Choices
#: ../templates:7001
msgid "Choibalsan"
-msgstr ""
+msgstr "Choibalsan"
#. Type: select
#. Choices
@@ -1660,7 +1712,7 @@
#. Choices
#: ../templates:7001
msgid "Hovd"
-msgstr ""
+msgstr "Hovd"
#. Type: select
#. Choices
@@ -1674,19 +1726,19 @@
#. Choices
#: ../templates:7001 ../templates:10001
msgid "Istanbul"
-msgstr "Istanbul"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:7001
msgid "Jakarta"
-msgstr ""
+msgstr "Djakarta (Java et Sumatra)"
#. Type: select
#. Choices
#: ../templates:7001
msgid "Jayapura"
-msgstr ""
+msgstr "Jayapura (Irian Jaya et Moluques)"
#. Type: select
#. Choices
@@ -1776,7 +1828,7 @@
#. Choices
#: ../templates:7001
msgid "Manila"
-msgstr ""
+msgstr "Manaus"
#. Type: select
#. Choices
@@ -1790,13 +1842,13 @@
#. Choices
#: ../templates:7001 ../templates:10001
msgid "Nicosia"
-msgstr "Nicosie"
+msgstr ""
#. Type: select
#. Choices
#: ../templates:7001
msgid "Novosibirsk"
-msgstr ""
+msgstr "Novosibirsk"
#. Type: select
#. Choices
@@ -1880,7 +1932,7 @@
#. Choices
#: ../templates:7001
msgid "Sakhalin"
-msgstr ""
+msgstr "Île Sakhaline"
#. Type: select
#. Choices
@@ -2012,7 +2064,7 @@
#. Choices
#: ../templates:8001
msgid "Azores"
-msgstr ""
+msgstr "Açores"
#. Type: select
#. Choices
@@ -2024,7 +2076,7 @@
#. Choices
#: ../templates:8001
msgid "Canary"
-msgstr ""
+msgstr "Îles Canaries"
#. Type: select
#. Choices
@@ -2054,7 +2106,7 @@
#. Choices
#: ../templates:8001
msgid "Madeira"
-msgstr ""
+msgstr "Madère"
#. Type: select
#. Choices
@@ -2090,7 +2142,7 @@
#. Choices
#: ../templates:9001
msgid "East-Saskatchewan"
-msgstr ""
+msgstr "Saskatchewan de l'Est"
#. Type: select
#. Choices
@@ -2108,19 +2160,19 @@
#. Choices
#: ../templates:9001
msgid "Newfoundland"
-msgstr ""
+msgstr "Terre-Neuve"
#. Type: select
#. Choices
#: ../templates:9001
msgid "Saskatchewan"
-msgstr ""
+msgstr "Saskatchewan"
#. Type: select
#. Choices
#: ../templates:9001
msgid "Yukon"
-msgstr ""
+msgstr "Yukon"
#. Type: select
#. Choices
@@ -2131,6 +2183,7 @@
#. Type: select
#. Choices
#: ../templates:10001
+#, fuzzy
msgid "Andorra"
msgstr "Andorre"
@@ -2162,7 +2215,7 @@
#. Choices
#: ../templates:10001
msgid "Bratislava"
-msgstr "Brastislava"
+msgstr "Bratislava"
#. Type: select
#. Choices
@@ -2174,7 +2227,7 @@
#. Choices
#: ../templates:10001
msgid "Bucharest"
-msgstr "Bucarest"
+msgstr "Bucarestg"
#. Type: select
#. Choices
@@ -2384,7 +2437,7 @@
#. Choices
#: ../templates:10001
msgid "Tallinn"
-msgstr "Tallinn"
+msgstr "Tallin"
#. Type: select
#. Choices
@@ -2534,19 +2587,19 @@
#. Choices
#: ../templates:12001
msgid "Auckland"
-msgstr ""
+msgstr "Auckland"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Chatham"
-msgstr ""
+msgstr "îles Chatham"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Easter"
-msgstr ""
+msgstr "Île de Pâques"
#. Type: select
#. Choices
@@ -2582,13 +2635,13 @@
#. Choices
#: ../templates:12001
msgid "Galapagos"
-msgstr ""
+msgstr "Îles Galapagos"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Gambier"
-msgstr ""
+msgstr "Îles Gambier"
#. Type: select
#. Choices
@@ -2612,7 +2665,7 @@
#. Choices
#: ../templates:12001
msgid "Johnston"
-msgstr ""
+msgstr "Atoll Johnston"
#. Type: select
#. Choices
@@ -2624,7 +2677,7 @@
#. Choices
#: ../templates:12001
msgid "Kosrae"
-msgstr ""
+msgstr "Kosrae"
#. Type: select
#. Choices
@@ -2642,13 +2695,13 @@
#. Choices
#: ../templates:12001
msgid "Marquesas"
-msgstr ""
+msgstr "Îles Marquises"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Midway"
-msgstr ""
+msgstr "îles Midway"
#. Type: select
#. Choices
@@ -2696,7 +2749,7 @@
#. Choices
#: ../templates:12001
msgid "Ponape"
-msgstr ""
+msgstr "Ponape"
#. Type: select
#. Choices
@@ -2720,13 +2773,13 @@
#. Choices
#: ../templates:12001
msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Tahiti"
-msgstr ""
+msgstr "Tahiti (îles de la Société)"
#. Type: select
#. Choices
@@ -2744,13 +2797,13 @@
#. Choices
#: ../templates:12001
msgid "Truk"
-msgstr ""
+msgstr "Truk"
#. Type: select
#. Choices
#: ../templates:12001
msgid "Wake"
-msgstr ""
+msgstr "île Wake"
#. Type: select
#. Choices
@@ -2762,292 +2815,4 @@
#. Choices
#: ../templates:12001
msgid "Yap"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4ADT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6CDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5EDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "HST10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7MDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8PDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9YDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+1"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+11"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+12"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+2"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+3"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-1"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-11"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-12"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-13"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-14"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-2"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-3"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Greenwich"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UCT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UTC"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Universal"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Zulu"
-msgstr ""
+msgstr "Yap"
Modified: tzdata/trunk/debian/po/pt.po
===================================================================
--- tzdata/trunk/debian/po/pt.po 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/po/pt.po 2007-05-05 11:53:11 UTC (rev 2177)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tzdata 2007e-6\n"
"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-25 07:21-0600\n"
+"POT-Creation-Date: 2007-05-05 13:42+0200\n"
"PO-Revision-Date: 2007-05-01 23:04+0100\n"
"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -19,56 +19,77 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Africa"
msgstr "África"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "America"
msgstr "América"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Antarctica"
msgstr "Antárctida"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Australia"
msgstr "Austrália"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Arctic"
msgstr "Árctico"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Asia"
msgstr "Ásia"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -77,32 +98,44 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Canada"
msgstr "Canadá"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Europe"
msgstr "Europa"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Indian"
msgstr "Índico"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -111,16 +144,22 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "SystemV"
msgstr "SystemV"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Etc"
msgstr "Etc"
@@ -134,12 +173,14 @@
#. Type: select
#. Description
#: ../templates:1002
+#, fuzzy
msgid ""
-"Please select the geographic area in which you live, then you will be shown "
-"a list of cities which represent the time zone in which they are located."
+"Please select the geographic area you live in. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
msgstr ""
-"Por favor escolha a área geográfica onde vive, depois ser-lhe-á mostrada "
-"uma lista de cidades que representam o fuso horário em que se encontra."
+"Por favor escolha a área geográfica onde vive, depois ser-lhe-á mostrada uma "
+"lista de cidades que representam o fuso horário em que se encontra."
#. Type: select
#. Choices
@@ -487,8 +528,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Time zone:"
msgstr "Fuso Horário:"
@@ -520,8 +561,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Please select the time zone corresponding to your location."
msgstr "Por favor escolha o fuso horário do sítio onde se encontra."
@@ -1751,10 +1792,10 @@
msgid "Kuwait"
msgstr "Kuwait"
+# Mação ?
#. Type: select
#. Choices
#: ../templates:7001
-# Mação ?
msgid "Macao"
msgstr "Macau"
@@ -2768,291 +2809,3 @@
msgid "Yap"
msgstr "Yap"
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4"
-msgstr "AST4"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4ADT"
-msgstr "AST4ADT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6"
-msgstr "CST6"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6CDT"
-msgstr "CST6CDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5"
-msgstr "EST5"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5EDT"
-msgstr "EST5EDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "HST10"
-msgstr "HST10"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7"
-msgstr "MST7"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7MDT"
-msgstr "MST7MDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8"
-msgstr "PST8"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8PDT"
-msgstr "PST8PDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9"
-msgstr "YST9"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9YDT"
-msgstr "YST9YDT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT"
-msgstr "GMT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+0"
-msgstr "GMT+0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+1"
-msgstr "GMT+1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+10"
-msgstr "GMT+10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+11"
-msgstr "GMT+11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+12"
-msgstr "GMT+12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+2"
-msgstr "GMT+2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+3"
-msgstr "GMT+3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+4"
-msgstr "GMT+4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+5"
-msgstr "GMT+5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+6"
-msgstr "GMT+6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+7"
-msgstr "GMT+7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+8"
-msgstr "GMT+8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+9"
-msgstr "GMT+9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-0"
-msgstr "GMT-0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-1"
-msgstr "GMT-1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-10"
-msgstr "GMT-10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-11"
-msgstr "GMT-11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-12"
-msgstr "GMT-12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-13"
-msgstr "GMT-13"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-14"
-msgstr "GMT-14"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-2"
-msgstr "GMT-2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-3"
-msgstr "GMT-3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-4"
-msgstr "GMT-4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-5"
-msgstr "GMT-5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-6"
-msgstr "GMT-6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-7"
-msgstr "GMT-7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-8"
-msgstr "GMT-8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-9"
-msgstr "GMT-9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT0"
-msgstr "GMT0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Greenwich"
-msgstr "Greenwich"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UCT"
-msgstr "UCT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UTC"
-msgstr "UTC"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Universal"
-msgstr "Universal"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Zulu"
-msgstr "Zulu"
-
Modified: tzdata/trunk/debian/po/ru.po
===================================================================
--- tzdata/trunk/debian/po/ru.po 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/po/ru.po 2007-05-05 11:53:11 UTC (rev 2177)
@@ -6,68 +6,90 @@
msgstr ""
"Project-Id-Version: 2007e-6\n"
"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-25 07:21-0600\n"
+"POT-Creation-Date: 2007-05-05 13:42+0200\n"
"PO-Revision-Date: 2007-04-29 21:28+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Africa"
msgstr "Африка"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "America"
msgstr "Америка"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Antarctica"
msgstr "Антарктида"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Australia"
msgstr "Австралия"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Arctic"
msgstr "Арктика"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Asia"
msgstr "Азия"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -76,32 +98,44 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Canada"
msgstr "Канада"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Europe"
msgstr "Европа"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Indian"
msgstr "Индийский регион"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -110,16 +144,22 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "SystemV"
msgstr "В соотвествии с SystemV"
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Etc"
msgstr "Другой"
@@ -133,13 +173,14 @@
#. Type: select
#. Description
#: ../templates:1002
+#, fuzzy
msgid ""
-"Please select the geographic area in which you live, then you will be shown "
-"a list of cities which represent the time zone in which they are located."
+"Please select the geographic area you live in. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
msgstr ""
-"Выберите географический район в котором вы живёте, "
-"затем вам предложат список городов, которые расположены "
-"в этом часовом поясе."
+"Выберите географический район в котором вы живёте, затем вам предложат "
+"список городов, которые расположены в этом часовом поясе."
#. Type: select
#. Choices
@@ -487,8 +528,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Time zone:"
msgstr "Часовой пояс:"
@@ -520,8 +561,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Please select the time zone corresponding to your location."
msgstr "Выберите часовой пояс в том месте, где вы сейчас находитесь."
@@ -2767,291 +2808,3 @@
msgid "Yap"
msgstr "Яп"
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4"
-msgstr "AST4"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4ADT"
-msgstr "AST4ADT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6"
-msgstr "CST6"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6CDT"
-msgstr "CST6CDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5"
-msgstr "EST5"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5EDT"
-msgstr "EST5EDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "HST10"
-msgstr "HST10"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7"
-msgstr "MST7"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7MDT"
-msgstr "MST7MDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8"
-msgstr "PST8"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8PDT"
-msgstr "PST8PDT"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9"
-msgstr "YST9"
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9YDT"
-msgstr "YST9YDT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT"
-msgstr "GMT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+0"
-msgstr "GMT+0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+1"
-msgstr "GMT+1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+10"
-msgstr "GMT+10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+11"
-msgstr "GMT+11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+12"
-msgstr "GMT+12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+2"
-msgstr "GMT+2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+3"
-msgstr "GMT+3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+4"
-msgstr "GMT+4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+5"
-msgstr "GMT+5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+6"
-msgstr "GMT+6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+7"
-msgstr "GMT+7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+8"
-msgstr "GMT+8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+9"
-msgstr "GMT+9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-0"
-msgstr "GMT-0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-1"
-msgstr "GMT-1"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-10"
-msgstr "GMT-10"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-11"
-msgstr "GMT-11"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-12"
-msgstr "GMT-12"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-13"
-msgstr "GMT-13"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-14"
-msgstr "GMT-14"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-2"
-msgstr "GMT-2"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-3"
-msgstr "GMT-3"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-4"
-msgstr "GMT-4"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-5"
-msgstr "GMT-5"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-6"
-msgstr "GMT-6"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-7"
-msgstr "GMT-7"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-8"
-msgstr "GMT-8"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-9"
-msgstr "GMT-9"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT0"
-msgstr "GMT0"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Greenwich"
-msgstr "Гринвич"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UCT"
-msgstr "UCT"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UTC"
-msgstr "UTC"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Universal"
-msgstr "Универсальное"
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Zulu"
-msgstr "Зулу"
-
Modified: tzdata/trunk/debian/po/templates.pot
===================================================================
--- tzdata/trunk/debian/po/templates.pot 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/po/templates.pot 2007-05-05 11:53:11 UTC (rev 2177)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-25 07:21-0600\n"
+"POT-Creation-Date: 2007-05-05 13:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,56 +18,77 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Africa"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "America"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Antarctica"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Australia"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Arctic"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Asia"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -76,32 +97,44 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Canada"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Europe"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Indian"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#. Type: select
#. Choices
#: ../templates:1001 ../templates:9001
@@ -110,16 +143,22 @@
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "SystemV"
msgstr ""
#. Type: select
#. Choices
-#. Translators: "Etc" will present users with a list
+#. Note to translators:
+#. - "Etc" will present users with a list
#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
#: ../templates:1001
msgid "Etc"
msgstr ""
@@ -134,8 +173,9 @@
#. Description
#: ../templates:1002
msgid ""
-"Please select the geographic area in which you live, then you will be shown "
-"a list of cities which represent the time zone in which they are located."
+"Please select the geographic area you live in. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
msgstr ""
#. Type: select
@@ -484,8 +524,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Time zone:"
msgstr ""
@@ -517,8 +557,8 @@
#. Description
#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13002
-#: ../templates:14002
+#: ../templates:10002 ../templates:11002 ../templates:12002 ../templates:13001
+#: ../templates:14001
msgid "Please select the time zone corresponding to your location."
msgstr ""
@@ -2763,291 +2803,3 @@
#: ../templates:12001
msgid "Yap"
msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "AST4ADT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "CST6CDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "EST5EDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "HST10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "MST7MDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "PST8PDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:13001
-msgid "YST9YDT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+1"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+11"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+12"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+2"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+3"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT+9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-1"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-10"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-11"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-12"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-13"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-14"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-2"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-3"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-4"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-6"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-7"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-8"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT-9"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "GMT0"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Greenwich"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UCT"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "UTC"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Universal"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:14001
-msgid "Zulu"
-msgstr ""
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/rules 2007-05-05 11:53:11 UTC (rev 2177)
@@ -75,19 +75,26 @@
# Generate the templates file
( echo "Template: tzdata/Areas" ; \
echo "Type: select" ; \
- echo "# Translators: \"Etc\" will present users with a list" ; \
- echo "# of \"GMT+xx\" or \"GMT-xx\" timezones" ; \
+ echo "# Note to translators:" ; \
+ echo "# - \"Etc\" will present users with a list" ; \
+ echo "# of \"GMT+xx\" or \"GMT-xx\" timezones" ; \
+ echo "# - SystemV will give the choice between zone named as per SystemV conventions:" ; \
+ echo "# EST5, MST7, etc." ; \
echo -n "__Choices: " ; \
echo "$(TEMPLATES_AREAS)" | sed -e 's# #, #g' -e 's#, $$##' ; \
echo "_Description: Geographic area:" ; \
- echo " Please select the geographic area in which you live, then you will" ; \
- echo " be shown a list of cities which represent the time zone in which they" ; \
- echo " are located." ; \
+ echo " Please select the geographic area you live in. Subsequent" ; \
+ echo " configuration questions will narrow this down by presenting a list of" ; \
+ echo " cities, representing the time zones in which they are located." ; \
echo ; \
for i in $(TEMPLATES_AREAS) ; do \
echo "Template: tzdata/Zones/$$i" ; \
echo "Type: select" ; \
- echo -n "__Choices: " ; \
+ if [ "$$i" = "Etc" ] || [ "$$i" = "SystemV" ] ; then \
+ echo -n "Choices: " ; \
+ else \
+ echo -n "__Choices: " ; \
+ fi ; \
cd $(CURDIR)/tzgen/$$i ; \
find . -maxdepth 1 -type f | sed -e 's#^\./##' | sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \
echo "_Description: Time zone:" ; \
Modified: tzdata/trunk/debian/templates
===================================================================
--- tzdata/trunk/debian/templates 2007-05-05 11:41:43 UTC (rev 2176)
+++ tzdata/trunk/debian/templates 2007-05-05 11:53:11 UTC (rev 2177)
@@ -1,12 +1,15 @@
Template: tzdata/Areas
Type: select
-# Translators: "Etc" will present users with a list
-# of "GMT+xx" or "GMT-xx" timezones
+# Note to translators:
+# - "Etc" will present users with a list
+# of "GMT+xx" or "GMT-xx" timezones
+# - SystemV will give the choice between zone named as per SystemV conventions:
+# EST5, MST7, etc.
__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Canada, Europe, Indian, Pacific, SystemV, Etc
_Description: Geographic area:
- Please select the geographic area in which you live, then you will
- be shown a list of cities which represent the time zone in which they
- are located.
+ Please select the geographic area you live in. Subsequent
+ configuration questions will narrow this down by presenting a list of
+ cities, representing the time zones in which they are located.
Template: tzdata/Zones/Africa
Type: select
@@ -76,13 +79,13 @@
Template: tzdata/Zones/SystemV
Type: select
-__Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT
+Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT
_Description: Time zone:
Please select the time zone corresponding to your location.
Template: tzdata/Zones/Etc
Type: select
-__Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu
+Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu
_Description: Time zone:
Please select the time zone corresponding to your location.
Reply to: