This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch jessie in repository tzdata.
commit 96258ba8aaa429a163fa4e2a4b8aea1519fc3f89 Author: Aurelien Jarno <aurel...@aurel32.net> Date: Sun Mar 12 22:13:33 2017 +0100 Allow partially translated choices in debconf templates. --- debian/changelog | 1 + debian/rules | 1 + debian/tzdata.templates | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fdc2986..082386e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ tzdata (2017a-0+deb8u1) UNRELEASED; urgency=medium - Mongolia no longer observes DST. - Magallanes region diverges from Santiago starting 2017-05-13, the America/Punta_Arenas zone has been added. + * Allow partially translated choices in debconf templates. -- Aurelien Jarno <aure...@debian.org> Sun, 12 Mar 2017 22:08:44 +0100 diff --git a/debian/rules b/debian/rules index 0cc039d..a5e8b90 100755 --- a/debian/rules +++ b/debian/rules @@ -94,6 +94,7 @@ endif echo "Template: tzdata/Zones/$$i" ; \ echo "Type: select" ; \ echo "# Translators: do not translate underscores. You can use spaces instead." ; \ + echo "#flag:partial" ; \ if [ "$$i" = "Etc" ] || [ "$$i" = "SystemV" ] ; then \ echo -n "Choices: " ; \ else \ diff --git a/debian/tzdata.templates b/debian/tzdata.templates index a93ce2f..a001b43 100644 --- a/debian/tzdata.templates +++ b/debian/tzdata.templates @@ -14,6 +14,7 @@ _Description: Geographic area: Template: tzdata/Zones/Africa Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Abidjan, Accra, Addis_Ababa, Algiers, Asmara, Bamako, Bangui, Banjul, Bissau, Blantyre, Brazzaville, Bujumbura, Cairo, Casablanca, Ceuta, Conakry, Dakar, Dar_es_Salaam, Djibouti, Douala, El_Aaiun, Freetown, Gaborone, Harare, Johannesburg, Juba, Kampala, Khartoum, Kigali, Kinshasa, Lagos, Libreville, Lome, Luanda, Lubumbashi, Lusaka, Malabo, Maputo, Maseru, Mbabane, Mogadishu, Monrovia, Nairobi, Ndjamena, Niamey, Nouakchott, Ouagadougou, Porto-Novo, Sao_Tome, Timbuktu, Tripoli, [...] _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -21,13 +22,15 @@ _Description: Time zone: Template: tzdata/Zones/America Type: select # Translators: do not translate underscores. You can use spaces instead. -__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Ch [...] +#flag:partial +__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Ch [...] _Description: Time zone: Please select the city or region corresponding to your time zone. Template: tzdata/Zones/Antarctica Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Casey, Davis, DumontDUrville, Macquarie, Mawson, McMurdo, Palmer, Rothera, Syowa, Troll, Vostok _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -35,6 +38,7 @@ _Description: Time zone: Template: tzdata/Zones/Australia Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -42,6 +46,7 @@ _Description: Time zone: Template: tzdata/Zones/Arctic Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Longyearbyen _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -49,6 +54,7 @@ _Description: Time zone: Template: tzdata/Zones/Asia Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, [...] _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -56,6 +62,7 @@ _Description: Time zone: Template: tzdata/Zones/Atlantic Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -63,6 +70,7 @@ _Description: Time zone: Template: tzdata/Zones/Europe Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Amsterdam, Andorra, Astrakhan, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Busingen, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kiev, Kirov, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Saratov, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, [...] _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -70,6 +78,7 @@ _Description: Time zone: Template: tzdata/Zones/Indian Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Antananarivo, Chagos, Christmas, Cocos, Comoro, Kerguelen, Mahe, Maldives, Mauritius, Mayotte, Reunion _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -77,6 +86,7 @@ _Description: Time zone: Template: tzdata/Zones/Pacific Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -84,6 +94,7 @@ _Description: Time zone: Template: tzdata/Zones/SystemV Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -91,6 +102,7 @@ _Description: Time zone: Template: tzdata/Zones/US Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial __Choices: Alaska, Aleutian, Arizona, Central, Eastern, Hawaii, Indiana-Starke, Michigan, Mountain, Pacific, Pacific-New, Samoa _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -98,6 +110,7 @@ _Description: Time zone: Template: tzdata/Zones/Etc Type: select # Translators: do not translate underscores. You can use spaces instead. +#flag:partial 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 city or region corresponding to your time zone. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/tzdata.git