[Xfce4-commits] <orage:master> 4.9.10.6 Fix for bug 8426 Not translatable strings in globaltime time zone
Juha Kautto
noreply at xfce.org
Wed Nov 27 13:24:01 CET 2013
Updating branch refs/heads/master
to 1a69a48735c01fbe01f8de0700d9f838af3dd05d (commit)
from 9483df87f46d7171c63c3b35030d5e66b857b738 (commit)
commit 1a69a48735c01fbe01f8de0700d9f838af3dd05d
Author: Juha Kautto <juha at xfce.org>
Date: Wed Nov 27 14:20:06 2013 +0200
4.9.10.6 Fix for bug 8426 Not translatable strings in globaltime time zone
Added missing zones. Note that this fix is actually in Orage since globaltime
uses the same code. But Orage also checks that those time zones exists in
ical, so this has less ivisible effect in Orage. Increased globaltime version
so that the change is clearer.
configure.in.in | 2 +-
globaltime/globaltime.c | 2 +-
src/timezone_names.c | 171 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 173 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index a5be8bc..ce50708 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.9.10.5-git])
+m4_define([orage_version], [4.9.10.6-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/globaltime/globaltime.c b/globaltime/globaltime.c
index cc8516a..6121837 100644
--- a/globaltime/globaltime.c
+++ b/globaltime/globaltime.c
@@ -49,7 +49,7 @@
#include "../src/orage-i18n.h"
-#define NAME_VERSION "Global Time (2.1)"
+#define NAME_VERSION "Global Time (2.2)"
global_times_struct clocks;
diff --git a/src/timezone_names.c b/src/timezone_names.c
index 6af35cf..dd6ddeb 100644
--- a/src/timezone_names.c
+++ b/src/timezone_names.c
@@ -38,6 +38,7 @@ const gchar *trans_timezone[] = {
N_("Africa/Accra"),
N_("Africa/Addis_Ababa"),
N_("Africa/Algiers"),
+ N_("Africa/Asmara"),
N_("Africa/Asmera"),
N_("Africa/Bamako"),
N_("Africa/Bangui"),
@@ -58,6 +59,7 @@ const gchar *trans_timezone[] = {
N_("Africa/Freetown"),
N_("Africa/Gaborone"),
N_("Africa/Harare"),
+ N_("Africa/Juba"),
N_("Africa/Johannesburg"),
N_("Africa/Kampala"),
N_("Africa/Khartoum"),
@@ -94,19 +96,33 @@ const gchar *trans_timezone[] = {
N_("America/Araguaina"),
N_("America/Argentina/Buenos_Aires"),
N_("America/Argentina/Catamarca"),
+ N_("America/Argentina/ComodRivadavia"),
N_("America/Argentina/Cordoba"),
N_("America/Argentina/Jujuy"),
+ N_("America/Argentina/La_Tioja"),
N_("America/Argentina/Mendoza"),
+ N_("America/Argentina/Rio_Gallegos"),
+ N_("America/Argentina/Salta"),
+ N_("America/Argentina/San_Juan"),
+ N_("America/Argentina/San_Lois"),
+ N_("America/Argentina/Tucuman"),
+ N_("America/Argentina/Ushuaia"),
N_("America/Aruba"),
N_("America/Asuncion"),
+ N_("America/Atikokan"),
+ N_("America/Atka"),
+ N_("America/Bahia"),
+ N_("America/Bahia_Banderas"),
N_("America/Barbados"),
N_("America/Belem"),
N_("America/Belize"),
+ N_("America/Blanc-Sablon"),
N_("America/Boa_Vista"),
N_("America/Bogota"),
N_("America/Boise"),
N_("America/Buenos_Aires"),
N_("America/Cambridge_Bay"),
+ N_("America/Campo_Grande"),
N_("America/Cancun"),
N_("America/Caracas"),
N_("America/Catamarca"),
@@ -114,19 +130,24 @@ const gchar *trans_timezone[] = {
N_("America/Cayman"),
N_("America/Chicago"),
N_("America/Chihuahua"),
+ N_("America/Coral_Harbour"),
N_("America/Cordoba"),
N_("America/Costa_Rica"),
+ N_("America/Creston"),
N_("America/Cuiaba"),
N_("America/Curacao"),
+ N_("America/Danmarkshavn"),
N_("America/Dawson"),
N_("America/Dawson_Creek"),
N_("America/Denver"),
N_("America/Detroit"),
N_("America/Dominica"),
N_("America/Edmonton"),
+ N_("America/Ensenada"),
N_("America/Eirunepe"),
N_("America/El_Salvador"),
N_("America/Fortaleza"),
+ N_("America/Fort_Wayne"),
N_("America/Glace_Bay"),
N_("America/Godthab"),
N_("America/Goose_Bay"),
@@ -142,7 +163,11 @@ const gchar *trans_timezone[] = {
N_("America/Indiana/Indianapolis"),
N_("America/Indiana/Knox"),
N_("America/Indiana/Marengo"),
+ N_("America/Indiana/Petersburg"),
+ N_("America/Indiana/Tell_City"),
N_("America/Indiana/Vevay"),
+ N_("America/Indiana/Vincennes"),
+ N_("America/Indiana/Winamac"),
N_("America/Indianapolis"),
N_("America/Inuvik"),
N_("America/Iqaluit"),
@@ -151,20 +176,27 @@ const gchar *trans_timezone[] = {
N_("America/Juneau"),
N_("America/Kentucky/Louisville"),
N_("America/Kentucky/Monticello"),
+ N_("America/Knox_IN"),
+ N_("America/Kralendijk"),
N_("America/La_Paz"),
N_("America/Lima"),
N_("America/Los_Angeles"),
N_("America/Louisville"),
+ N_("America/Lower_Princes"),
N_("America/Maceio"),
N_("America/Managua"),
N_("America/Manaus"),
+ N_("America/Marigot"),
N_("America/Martinique"),
+ N_("America/Matamoros"),
N_("America/Mazatlan"),
N_("America/Mendoza"),
N_("America/Menominee"),
N_("America/Merida"),
+ N_("America/Metlakatla"),
N_("America/Mexico_City"),
N_("America/Miquelon"),
+ N_("America/Moncton"),
N_("America/Monterrey"),
N_("America/Montevideo"),
N_("America/Montreal"),
@@ -173,26 +205,36 @@ const gchar *trans_timezone[] = {
N_("America/New_York"),
N_("America/Nipigon"),
N_("America/Nome"),
+ N_("America/North_Dakota/Beulah"),
+ N_("America/North_Dakota/Center"),
+ N_("America/North_Dakota/New_Salem"),
N_("America/Noronha"),
+ N_("America/Ojinaga"),
N_("America/Panama"),
N_("America/Pangnirtung"),
N_("America/Paramaribo"),
N_("America/Phoenix"),
N_("America/Port-au-Prince"),
N_("America/Port_of_Spain"),
+ N_("America/Porto_Acre"),
N_("America/Porto_Velho"),
N_("America/Puerto_Rico"),
N_("America/Rainy_River"),
N_("America/Rankin_Inlet"),
N_("America/Recife"),
N_("America/Regina"),
+ N_("America/Resolute"),
N_("America/Rio_Branco"),
N_("America/Rosario"),
+ N_("America/Santa_Isabel"),
+ N_("America/Santarem"),
N_("America/Santiago"),
N_("America/Santo_Domingo"),
N_("America/Sao_Paulo"),
N_("America/Scoresbysund"),
N_("America/Shiprock"),
+ N_("America/Sitka"),
+ N_("America/St_Barthelemy"),
N_("America/St_Johns"),
N_("America/St_Kitts"),
N_("America/St_Lucia"),
@@ -203,8 +245,10 @@ const gchar *trans_timezone[] = {
N_("America/Thule"),
N_("America/Thunder_Bay"),
N_("America/Tijuana"),
+ N_("America/Toronto"),
N_("America/Tortola"),
N_("America/Vancouver"),
+ N_("America/Virgin"),
N_("America/Whitehorse"),
N_("America/Winnipeg"),
N_("America/Yakutat"),
@@ -213,9 +257,11 @@ const gchar *trans_timezone[] = {
N_("Antarctica/Casey"),
N_("Antarctica/Davis"),
N_("Antarctica/DumontDUrville"),
+ N_("Antarctica/Macquarie"),
N_("Antarctica/Mawson"),
N_("Antarctica/McMurdo"),
N_("Antarctica/Palmer"),
+ N_("Antarctica/Rothera"),
N_("Antarctica/South_Pole"),
N_("Antarctica/Syowa"),
N_("Antarctica/Vostok"),
@@ -229,6 +275,7 @@ const gchar *trans_timezone[] = {
N_("Asia/Aqtau"),
N_("Asia/Aqtobe"),
N_("Asia/Ashgabat"),
+ N_("Asia/Ashkhabad"),
N_("Asia/Baghdad"),
N_("Asia/Bahrain"),
N_("Asia/Baku"),
@@ -237,8 +284,11 @@ const gchar *trans_timezone[] = {
N_("Asia/Bishkek"),
N_("Asia/Brunei"),
N_("Asia/Calcutta"),
+ N_("Asia/Choibalsan"),
+ N_("Asia/Chongqing"),
N_("Asia/Chungking"),
N_("Asia/Colombo"),
+ N_("Asia/Dacca"),
N_("Asia/Damascus"),
N_("Asia/Dhaka"),
N_("Asia/Dili"),
@@ -246,7 +296,9 @@ const gchar *trans_timezone[] = {
N_("Asia/Dushanbe"),
N_("Asia/Gaza"),
N_("Asia/Harbin"),
+ N_("Asia/Hebron"),
N_("Asia/Hong_Kong"),
+ N_("Asia/Ho_Chi_Minh"),
N_("Asia/Hovd"),
N_("Asia/Irkutsk"),
N_("Asia/Istanbul"),
@@ -257,25 +309,37 @@ const gchar *trans_timezone[] = {
N_("Asia/Kamchatka"),
N_("Asia/Karachi"),
N_("Asia/Kashgar"),
+ N_("Asia/Kathmandu"),
N_("Asia/Katmandu"),
+ N_("Asia/Khandyga"),
+ N_("Asia/Kolkata"),
N_("Asia/Krasnoyarsk"),
N_("Asia/Kuala_Lumpur"),
N_("Asia/Kuching"),
N_("Asia/Kuwait"),
N_("Asia/Macao"),
+ N_("Asia/Macau"),
N_("Asia/Magadan"),
+ N_("Asia/Makassar"),
N_("Asia/Manila"),
N_("Asia/Muscat"),
N_("Asia/Nicosia"),
+ N_("Asia/Novokuznetsk"),
N_("Asia/Novosibirsk"),
N_("Asia/Omsk"),
+ N_("Asia/Oral"),
N_("Asia/Phnom_Penh"),
N_("Asia/Pontianak"),
N_("Asia/Pyongyang"),
N_("Asia/Qatar"),
+ N_("Asia/Qyzylorda"),
N_("Asia/Rangoon"),
N_("Asia/Riyadh"),
+ N_("Asia/Riyadh87"),
+ N_("Asia/Riyadh88"),
+ N_("Asia/Riyadh89"),
N_("Asia/Saigon"),
+ N_("Asia/Sakhalin"),
N_("Asia/Samarkand"),
N_("Asia/Seoul"),
N_("Asia/Shanghai"),
@@ -284,11 +348,15 @@ const gchar *trans_timezone[] = {
N_("Asia/Tashkent"),
N_("Asia/Tbilisi"),
N_("Asia/Tehran"),
+ N_("Asia/Tel_Aviv"),
+ N_("Asia/Thimbu"),
N_("Asia/Thimphu"),
N_("Asia/Tokyo"),
N_("Asia/Ujung_Pandang"),
N_("Asia/Ulaanbaatar"),
+ N_("Asia/Ulan_Bator"),
N_("Asia/Urumqi"),
+ N_("Asia/Ust-Nera"),
N_("Asia/Vientiane"),
N_("Asia/Vladivostok"),
N_("Asia/Yakutsk"),
@@ -300,6 +368,7 @@ const gchar *trans_timezone[] = {
N_("Atlantic/Canary"),
N_("Atlantic/Cape_Verde"),
N_("Atlantic/Faeroe"),
+ N_("Atlantic/Faroe"),
N_("Atlantic/Jan_Mayen"),
N_("Atlantic/Madeira"),
N_("Atlantic/Reykjavik"),
@@ -307,6 +376,7 @@ const gchar *trans_timezone[] = {
N_("Atlantic/St_Helena"),
N_("Atlantic/Stanley"),
N_("Australia"),
+ N_("Australia/ACT"),
N_("Australia/Adelaide"),
N_("Australia/Brisbane"),
N_("Australia/Broken_Hill"),
@@ -317,6 +387,60 @@ const gchar *trans_timezone[] = {
N_("Australia/Melbourne"),
N_("Australia/Perth"),
N_("Australia/Sydney"),
+ N_("Brazil"),
+ N_("Brazil/Acre"),
+ N_("Brazil/DeNoronha"),
+ N_("Brazil/East"),
+ N_("Brazil/West"),
+ N_("Canada"),
+ N_("Canada/Atlantic"),
+ N_("Canada/Central"),
+ N_("Canada/East-Saskatchewan"),
+ N_("Canada/Eastern"),
+ N_("Canada/Mountain"),
+ N_("Canada/Newfoundland"),
+ N_("Canada/Pacific"),
+ N_("Canada/Saskatchewan"),
+ N_("Canada/Yukon"),
+ N_("Chile"),
+ N_("Chile/Continental"),
+ N_("Chile/EasterIsland"),
+ N_("Etc"),
+ N_("Etc/GMT"),
+ N_("Etc/GMT+0"),
+ N_("Etc/GMT+1"),
+ N_("Etc/GMT+10"),
+ N_("Etc/GMT+11"),
+ N_("Etc/GMT+12"),
+ N_("Etc/GMT+2"),
+ N_("Etc/GMT+3"),
+ N_("Etc/GMT+4"),
+ N_("Etc/GMT+5"),
+ N_("Etc/GMT+6"),
+ N_("Etc/GMT+7"),
+ N_("Etc/GMT+8"),
+ N_("Etc/GMT+9"),
+ N_("Etc/GMT-0"),
+ N_("Etc/GMT-1"),
+ N_("Etc/GMT-10"),
+ N_("Etc/GMT-11"),
+ N_("Etc/GMT-12"),
+ N_("Etc/GMT-13"),
+ N_("Etc/GMT-14"),
+ N_("Etc/GMT-2"),
+ N_("Etc/GMT-3"),
+ N_("Etc/GMT-4"),
+ N_("Etc/GMT-5"),
+ N_("Etc/GMT-6"),
+ N_("Etc/GMT-7"),
+ N_("Etc/GMT-8"),
+ N_("Etc/GMT-9"),
+ N_("Etc/GMT0"),
+ N_("Etc/Greenwich"),
+ N_("Etc/UCT"),
+ N_("Etc/UTC"),
+ N_("Etc/Universal"),
+ N_("Etc/Zulu"),
N_("Europe"),
N_("Europe/Amsterdam"),
N_("Europe/Andorra"),
@@ -328,12 +452,16 @@ const gchar *trans_timezone[] = {
N_("Europe/Brussels"),
N_("Europe/Bucharest"),
N_("Europe/Budapest"),
+ N_("Europe/Busingen"),
N_("Europe/Chisinau"),
N_("Europe/Copenhagen"),
N_("Europe/Dublin"),
N_("Europe/Gibraltar"),
+ N_("Europe/Guernsey"),
N_("Europe/Helsinki"),
+ N_("Europe/Isle_of_Man"),
N_("Europe/Istanbul"),
+ N_("Europe/Jersey"),
N_("Europe/Kaliningrad"),
N_("Europe/Kiev"),
N_("Europe/Lisbon"),
@@ -342,12 +470,14 @@ const gchar *trans_timezone[] = {
N_("Europe/Luxembourg"),
N_("Europe/Madrid"),
N_("Europe/Malta"),
+ N_("Europe/Mariehamn"),
N_("Europe/Minsk"),
N_("Europe/Monaco"),
N_("Europe/Moscow"),
N_("Europe/Nicosia"),
N_("Europe/Oslo"),
N_("Europe/Paris"),
+ N_("Europe/Podgorica"),
N_("Europe/Prague"),
N_("Europe/Riga"),
N_("Europe/Rome"),
@@ -360,11 +490,13 @@ const gchar *trans_timezone[] = {
N_("Europe/Stockholm"),
N_("Europe/Tallinn"),
N_("Europe/Tirane"),
+ N_("Europe/Tiraspol"),
N_("Europe/Uzhgorod"),
N_("Europe/Vaduz"),
N_("Europe/Vatican"),
N_("Europe/Vienna"),
N_("Europe/Vilnius"),
+ N_("Europe/Volgograd"),
N_("Europe/Warsaw"),
N_("Europe/Zagreb"),
N_("Europe/Zaporozhye"),
@@ -381,10 +513,19 @@ const gchar *trans_timezone[] = {
N_("Indian/Mauritius"),
N_("Indian/Mayotte"),
N_("Indian/Reunion"),
+ N_("Mexico"),
+ N_("Mexico/BajaNorte"),
+ N_("Mexico/BajaSur"),
+ N_("Mexico/General"),
+ N_("Mideast"),
+ N_("Mideast/Riyadh87"),
+ N_("Mideast/Riyadh88"),
+ N_("Mideast/Riyadh89"),
N_("Pacific"),
N_("Pacific/Apia"),
N_("Pacific/Auckland"),
N_("Pacific/Chatham"),
+ N_("Pacific/Chuuk"),
N_("Pacific/Easter"),
N_("Pacific/Efate"),
N_("Pacific/Enderbury"),
@@ -410,10 +551,12 @@ const gchar *trans_timezone[] = {
N_("Pacific/Pago_Pago"),
N_("Pacific/Palau"),
N_("Pacific/Pitcairn"),
+ N_("Pacific/Pohnpei"),
N_("Pacific/Ponape"),
N_("Pacific/Port_Moresby"),
N_("Pacific/Rarotonga"),
N_("Pacific/Saipan"),
+ N_("Pacific/Samoa"),
N_("Pacific/Tahiti"),
N_("Pacific/Tarawa"),
N_("Pacific/Tongatapu"),
@@ -421,5 +564,33 @@ const gchar *trans_timezone[] = {
N_("Pacific/Wake"),
N_("Pacific/Wallis"),
N_("Pacific/Yap"),
+ N_("SystemV"),
+ N_("SystemV/AST4"),
+ N_("SystemV/AST4ADT"),
+ N_("SystemV/CST6"),
+ N_("SystemV/CST6CDT"),
+ N_("SystemV/EST5"),
+ N_("SystemV/EST5/EDT"),
+ N_("SystemV/HST10"),
+ N_("SystemV/MST7"),
+ N_("SystemV/MST7/MNT"),
+ N_("SystemV/PST8"),
+ N_("SystemV/PST8/PDT"),
+ N_("SystemV/YST9"),
+ N_("SystemV/YST9/YDT"),
+ N_("US"),
+ N_("US/Alaska"),
+ N_("US/Aleutian"),
+ N_("US/Arizona"),
+ N_("US/Central"),
+ N_("US/Eastern"),
+ N_("US/East-Indiana"),
+ N_("US/Hawaii"),
+ N_("US/Indiana-Starke"),
+ N_("US/Michigan"),
+ N_("US/Mountain"),
+ N_("US/Pacific"),
+ N_("US/Pacific-New"),
+ N_("US/Samoa"),
};
More information about the Xfce4-commits
mailing list