From 2d0e01aba2a7716e12ece222dad6184467888408 Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 13 Apr 2013 22:30:02 +0000 Subject: [PATCH] MFC r219937, r220094, r221383, r222307, r222817, r222994, r223545, r223638, r225846, r225853, r225854, r226121, r226320, r226351, r228991, r229164, r230876, r231274, r231516, r232105, r232353, r234221, r234320, r234446, r234600, r236392, r236733, r238058, r238976, r239498, r240362, r240548, r242549, r242849, r242900, r245447, r247752, r249113 Merge all outstanding calendar commits. Discussed with: gjb, des git-svn-id: svn://svn.freebsd.org/base/stable/8@249452 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.bin/calendar/calendars/calendar.all | 1 + usr.bin/calendar/calendars/calendar.birthday | 3 +- usr.bin/calendar/calendars/calendar.brazilian | 13 ++ usr.bin/calendar/calendars/calendar.freebsd | 38 +++- usr.bin/calendar/calendars/calendar.history | 4 +- usr.bin/calendar/calendars/calendar.music | 2 +- .../calendars/hr_HR.ISO8859-2/calendar.all | 6 +- .../hr_HR.ISO8859-2/calendar.praznici | 6 +- .../calendars/pt_BR.ISO8859-1/calendar.all | 15 ++ .../pt_BR.ISO8859-1/calendar.commemorative | 191 ++++++++++++++++++ .../pt_BR.ISO8859-1/calendar.holidays | 25 +++ .../pt_BR.ISO8859-1/calendar.mcommemorative | 22 ++ .../calendars/pt_BR.UTF-8/calendar.all | 16 ++ .../pt_BR.UTF-8/calendar.commemorative | 191 ++++++++++++++++++ .../calendars/pt_BR.UTF-8/calendar.holidays | 25 +++ .../pt_BR.UTF-8/calendar.mcommemorative | 22 ++ .../calendars/ru_RU.KOI8-R/calendar.all | 7 +- .../calendars/ru_RU.KOI8-R/calendar.msk | 16 -- 18 files changed, 567 insertions(+), 36 deletions(-) create mode 100644 usr.bin/calendar/calendars/calendar.brazilian create mode 100644 usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.all create mode 100644 usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.commemorative create mode 100644 usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.holidays create mode 100644 usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.mcommemorative create mode 100644 usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.all create mode 100644 usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative create mode 100644 usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.holidays create mode 100644 usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.mcommemorative delete mode 100644 usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all index 545c0e4e8..6ed1ccee6 100644 --- a/usr.bin/calendar/calendars/calendar.all +++ b/usr.bin/calendar/calendars/calendar.all @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday index c51779999..adf14a2a4 100644 --- a/usr.bin/calendar/calendars/calendar.birthday +++ b/usr.bin/calendar/calendars/calendar.birthday @@ -6,6 +6,7 @@ #ifndef _calendar_birthday_ #define _calendar_birthday_ +#undef unix 01/01 J.D. Salinger born, 1919 01/01 Paul Revere born in Boston, 1735 @@ -291,7 +292,7 @@ 12/12 E.G. Robinson born, 1893 12/14 George Washington dies, 1799 12/17 William Safire (Safir) born, 1929 -12/18 Konrad Zuse died in Hünfeld, 1995 +12/18 Konrad Zuse died in Hünfeld, 1995 12/20 Carl Sagan died, 1996 12/21 Benjamin Disraeli born, 1804 12/22 Giacomo Puccini born, 1858 diff --git a/usr.bin/calendar/calendars/calendar.brazilian b/usr.bin/calendar/calendars/calendar.brazilian new file mode 100644 index 000000000..d847cb3f4 --- /dev/null +++ b/usr.bin/calendar/calendars/calendar.brazilian @@ -0,0 +1,13 @@ +/* + * $FreeBSD$ + * + * Brazilian calendar file(s), originally submitted by + * Renato Tambellini + */ + +#ifndef _calendar_brazilian_ +#define _calendar_brazilian_ + +#include + +#endif diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 62c302767..aac230488 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -22,6 +22,7 @@ 01/16 Ariff Abdullah born in Kuala Lumpur, Malaysia, 1978 01/16 Dmitry Sivachenko born in Moscow, USSR, 1978 01/16 Vanilla I. Shu born in Taipei, Taiwan, Republic of China, 1978 +01/17 Raphael Kubo da Costa born in Sao Paulo, Sao Paulo, Brazil, 1989 01/18 Dejan Lesjak born in Ljubljana, Slovenia, Yugoslavia, 1977 01/19 Marshall Kirk McKusick born in Wilmington, Delaware, United States, 1954 01/19 Ruslan Ermilov born in Simferopol, USSR, 1974 @@ -45,12 +46,15 @@ 02/01 Juli Mallett born in Washington, Pennsylvania, United States, 1985 02/02 Diomidis D. Spinellis born in Athens, Greece, 1967 02/02 Michael W Lucas born in Detroit, Michigan, United States, 1967 -02/02 Yoichi Nakayama born in Tsu, Mie, Japan, 1976 02/02 Dmitry Chagin born in Stalingrad, USSR, 1976 +02/02 Yoichi Nakayama born in Tsu, Mie, Japan, 1976 +02/03 Jason Helfman born in Royal Oak, Michigan, United States, 1972 +02/04 Eitan Adler born in West Hempstead, New York, United States, 1991 02/05 Frank Laszlo born in Howell, Michigan, United States, 1983 02/10 David Greenman born in Portland, Oregon, United States, 1968 02/10 Paul Richards born in Ammanford, Carmarthenshire, United Kingdom, 1968 02/10 Simon Barner born in Rosenheim, Bayern, Germany, 1980 +02/10 Jason E. Hale born in Pittsburgh, Pennsylvania, Unites States, 1982 02/13 Jesper Skriver born in Aarhus, Denmark, 1975 02/13 Steve Wills born in Lynchburg, Virginia, United States, 1975 02/13 Andrey Slusar born in Odessa, USSR, 1979 @@ -68,7 +72,6 @@ 02/24 Johan Karlsson born in Mariannelund, Sweden, 1974 02/24 Colin Percival born in Burnaby, Canada, 1981 02/26 Pietro Cerutti born in Faido, Switzerland, 1984 -05/19 Sofian Brabez born in Toulouse, France, 1984 02/28 Daichi GOTO born in Shimizu Suntou, Shizuoka, Japan, 1980 03/01 Hye-Shik Chang born in Daejeon, Republic of Korea, 1980 03/02 Cy Schubert born in Edmonton, Alberta, Canada, 1956 @@ -116,6 +119,7 @@ 04/03 Tong Liu born in Beijing, People's Republic of China, 1981 04/03 Gabor Pali born in Kunhegyes, Hungary, 1982 04/05 Stacey Son born in Burley, Idaho, United States, 1967 +04/06 Peter Jeremy born in Sydney, New South Wales, Australia, 1961 04/07 Edward Tomasz Napierala born in Wolsztyn, Poland, 1981 04/08 Jordan K. Hubbard born in Honolulu, Hawaii, United States, 1963 04/09 Ceri Davies born in Haverfordwest, Pembrokeshire, United Kingdom, 1976 @@ -124,10 +128,12 @@ 04/12 Ed Schouten born in Oss, the Netherlands, 1986 04/13 Oliver Braun born in Nuremberg, Bavaria, Germany, 1972 04/14 Crist J. Clark born in Milwaukee, Wisconsin, United States, 1970 +04/14 Glen J. Barber born in Wilkes-Barre, Pennsylvania, United States, 1981 04/15 David Malone born in Dublin, Ireland, 1973 04/17 Dryice Liu born in Jinan, Shandong, China, 1975 04/22 Joerg Wunsch born in Dresden, Sachsen, Germany, 1962 04/22 Jun Kuriyama born in Matsue, Shimane, Japan, 1973 +04/22 Jakub Klama born in Blachownia, Silesia, Poland, 1989 04/26 Rene Ladan born in Geldrop, the Netherlands, 1980 04/29 Adam Weinberger born in Berkeley, California, United States, 1980 04/29 Eric Anholt born in Portland, Oregon, United States, 1983 @@ -140,6 +146,7 @@ 05/08 Sean Kelly born in Walnut Creek, California, United States, 1982 05/09 Daniel Eischen born in Syracuse, New York, United States, 1963 05/09 Aaron Dalton born in Boise, Idaho, United States, 1973 +05/09 Jase Thew born in Abergavenny, Gwent, United Kingdom, 1974 05/10 Markus Brueffer born in Gronau, Nordrhein-Westfalen, Germany, 1977 05/11 Jesus Rodriguez born in Barcelona, Spain, 1972 05/11 Roman Kurakin born in Moscow, USSR, 1979 @@ -152,11 +159,13 @@ 05/17 Thomas Abthorpe born in Port Arthur, Ontario, Canada, 1968 05/19 Philippe Charnier born in Fontainebleau, France, 1966 05/19 Ian Dowse born in Dublin, Ireland, 1975 -05/20 Dan Moschuk died in Burlington, Ontario, Canada, 2010 +05/19 Sofian Brabez born in Toulouse, France, 1984 +05/20 Dan Moschuk died in Burlington, Ontario, Canada, 2010 05/21 Kris Kennaway born in Winnipeg, Manitoba, Canada, 1978 05/22 Clive Tong-I Lin born in Changhua, Taiwan, Republic of China, 1978 05/22 Michael Bushkov born in Rostov-on-Don, Russian Federation, 1985 05/22 Rui Paulo born in Evora, Portugal, 1986 +05/22 David Naylor born in Johannesburg, South Africa, 1988 05/23 Munechika Sumikawa born in Osaka, Osaka, Japan, 1972 05/24 Duncan McLennan Barclay born in London, Middlesex, United Kingdom, 1970 05/24 Oliver Lehmann born in Karlsburg, Germany, 1981 @@ -176,7 +185,8 @@ 06/04 Justin Gibbs born in San Pedro, California, United States, 1973 06/04 Jason Evans born in Greeley, Colorado, United States, 1973 06/04 Thomas Moestl born in Braunschweig, Niedersachsen, Germany, 1980 -06/04 Zack Kirsch born in Memphis, Tennessee, United States, 1982 +06/04 Devin Teske born in Arcadia, California, United States, 1982 +06/04 Zack Kirsch born in Memphis, Tennessee, United States, 1982 06/06 Sergei Kolobov born in Karpinsk, Russian Federation, 1972 06/06 Alan Eldridge died in Denver, Colorado, 2003 06/07 Jimmy Olgeni born in Milano, Italy, 1976 @@ -213,6 +223,7 @@ 07/11 Jesus R. Camou born in Hermosillo, Sonora, Mexico, 1983 07/15 Gary Jennejohn born in Rochester, New York, United States, 1950 07/16 Suleiman Souhlal born in Roma, Italy, 1983 +07/16 Davide Italiano born in Milazzo, Italy, 1989 07/17 Michael Chin-Yuan Wu born in Taipei, Taiwan, Republic of China, 1980 07/19 Masafumi NAKANE born in Okazaki, Aichi, Japan, 1972 07/19 Simon L. Nielsen born in Copenhagen, Denmark, 1980 @@ -222,6 +233,7 @@ 07/22 Jens Schweikhardt born in Waiblingen, Baden-Wuerttemberg, Germany, 1967 07/22 Lukas Ertl born in Weissenbach/Enns, Steiermark, Austria, 1976 07/23 Sergey A. Osokin born in Krasnogorsky, Stepnogorsk, Akmolinskaya region, Kazakhstan, 1972 +07/23 Andrey Zonov born in Kirov, Russian Federation, 1985 07/24 Alexander Nedotsukov born in Ulyanovsk, Russian Federation, 1974 07/24 Alberto Villa born in Vercelli, Italy, 1987 07/27 Andriy Gapon born in Kyrykivka, Sumy region, Ukraine, 1976 @@ -234,6 +246,7 @@ 08/05 Alfred Perlstein born in Brooklyn, New York, United States, 1978 08/06 Anton Berezin born in Dnepropetrovsk, Ukraine, 1970 08/06 John-Mark Gurney born in Detroit, Michigan, United States, 1978 +08/06 Damjan Marion born in Rijeka, Croatia, 1978 08/07 Jonathan Mini born in San Mateo, California, United States, 1979 08/08 Mikolaj Golub born in Kharkov, USSR, 1977 08/10 Peter Pentchev born in Sofia, Bulgaria, 1977 @@ -257,21 +270,27 @@ 08/29 Thomas Gellekum born in Moenchengladbach, Nordrhein-Westfalen, Germany, 1967 08/29 Max Laier born in Karlsruhe, Germany, 1981 09/01 Pyun YongHyeon born in Kimcheon, Korea, 1968 +09/01 William Grzybowski born in Parana, Brazil, 1988 09/03 Max Khon born in Novosibirsk, USSR, 1976 09/03 Cheng-Lung Sung born in Taipei, Taiwan, Republic of China, 1977 09/05 Mark Robert Vaughan Murray born in Harare, Mashonaland, Zimbabwe, 1961 09/05 Adrian Harold Chadd born in Perth, Western Australia, Australia, 1979 09/07 Tim Bishop born in Cornwall, United Kingdom, 1978 +09/07 Chris Rees born in Kettering, United Kingdom, 1987 09/08 Boris Samorodov born in Krasnodar, Russian Federation, 1963 09/09 Yoshio Mita born in Hiroshima, Japan, 1972 09/10 Wesley R. Peters born in Hartford, Alabama, United States, 1961 09/12 Weongyo Jeong born in Haman, Korea, 1980 09/12 Benedict Christopher Reuschling born in Darmstadt, Germany, 1981 09/12 William C. Fumerola II born in Detroit, Michigan, United States, 1981 +09/14 Matthew Seaman born in Bristol, United Kingdom, 1965 +09/15 Aleksandr Rybalko born in Odessa, Ukraine, 1977 09/15 Dima Panov born in Khabarovsk, Russian Federation, 1978 09/17 Maxim Bolotin born in Rostov-on-Don, Russian Federation, 1976 09/18 Matthew Fleming born in Cleveland, Ohio, United States, 1975 09/20 Kevin Lo born in Taipei, Taiwan, Republic of China, 1972 +09/21 Gleb Kurtsou born in Minsk, Belarus, 1984 +09/22 Bryan Drewery born in San Diego, California, United States, 1984 09/27 Neil Blakey-Milner born in Port Elizabeth, South Africa, 1978 09/27 Renato Botelho born in Araras, Sao Paulo, Brazil, 1979 09/28 Greg Lehey born in Melbourne, Victoria, Australia, 1948 @@ -280,6 +299,7 @@ 09/30 Hiten M. Pandya born in Dar-es-Salaam, Tanzania, East Africa, 1986 09/30 Third quarter status reports are due on 10/15 10/02 Beat Gaetzi born in Zurich, Switzerland, 1980 +10/02 Grzegorz Blach born in Starachowice, Poland, 1985 10/05 Hiroki Sato born in Yamagata, Japan, 1977 10/05 Chris Costello born in Houston, Texas, United States, 1985 10/09 Stefan Walter born in Werne, Nordrhein-Westfalen, Germany, 1978 @@ -290,12 +310,14 @@ 10/18 Sheldon Hearn born in Cape Town, Western Cape, South Africa, 1974 10/19 Nicholas Souchu born in Suresnes, Hauts-de-Seine, France, 1972 10/19 Nick Barkas born in Longview, Washington, United States, 1981 -10/20 Joel Dahl born in Lidkoping, Sweden, 1983 +10/20 Joel Dahl born in Bitterna, Skaraborg, Sweden, 1983 10/20 Dmitry Marakasov born in Moscow, Russian Federation, 1984 10/21 Ben Smithurst born in Sheffield, South Yorkshire, United Kingdom, 1981 10/22 Jean-Sebastien Pedron born in Redon, Ille-et-Vilaine, France, 1980 10/23 Mario Sergio Fujikawa Ferreira born in Brasilia, Distrito Federal, Brazil, 1976 10/25 Eric Melville born in Los Gatos, California, United States, 1980 +10/25 Julien Laffaye born in Toulouse, France, 1988 +10/25 Ashish SHUKLA born in Kanpur, India, 1985 10/26 Philip M. Gollucci born in Silver Spring, Maryland, United States, 1979 10/27 Takanori Watanabe born in Numazu, Shizuoka, Japan, 1972 11/05 M. Warner Losh born in Kansas City, Kansas, United States, 1966 @@ -303,6 +325,7 @@ 11/09 Antoine Brodin born in Bagnolet, France, 1981 11/10 Gregory Neil Shapiro born in Providence, Rhode Island, United States, 1970 11/13 John Baldwin born in Stuart, Virginia, United States, 1977 +11/14 Jeremie Le Hen born in Nancy, France, 1980 11/15 Lars Engels born in Hilden, Nordrhein-Westfalen, Germany, 1980 11/15 Tijl Coosemans born in Duffel, Belgium, 1983 11/16 Jose Maria Alcaide Salinas born in Madrid, Spain, 1962 @@ -319,10 +342,11 @@ 11/28 Stanislav Sedov born in Chelyabinsk, USSR, 1985 12/01 Hajimu Umemoto born in Nara, Japan, 1961 12/01 Alexey Dokuchaev born in Magadan, USSR, 1980 -12/02 Ermal Luçi born in Tirane, Albania, 1980 +12/02 Ermal Luçi born in Tirane, Albania, 1980 12/03 Diane Bruce born in Ottawa, Ontario, Canada, 1952 12/05 Ivan Voras born in Slavonski Brod, Croatia, 1981 12/06 Stefan Farfeleder born in Wien, Austria, 1980 +12/11 Ganael Laplanche born in Reims, France, 1980 12/15 James FitzGibbon born in Amersham, Buckinghamshire, United Kingdom, 1974 12/15 Timur I. Bakeyev born in Kazan, Republic of Tatarstan, USSR, 1974 12/18 Chris Timmons born in Ellensburg, Washington, United States, 1964 @@ -332,6 +356,8 @@ 12/22 Maxim Sobolev born in Dnepropetrovsk, Ukraine, 1976 12/23 Sean Chittenden born in Seattle, Washington, United States, 1979 12/23 Alejandro Pulver born in Buenos Aires, Argentina, 1989 +12/24 Guido Falsi born in Firenze, Italy, 1978 +12/25 Niclas Zeising born in Stockholm, Sweden, 1986 12/28 Soren Schmidt born in Maribo, Denmark, 1960 12/28 Ade Lovett born in London, England, 1969 12/28 Marius Strobl born in Cham, Bavaria, Germany, 1978 diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history index b170f43a1..a05a6ffdf 100644 --- a/usr.bin/calendar/calendars/calendar.history +++ b/usr.bin/calendar/calendars/calendar.history @@ -302,7 +302,7 @@ 09/11 Terrorists destroy World Trade Center in New York, 2001 09/12 German paratroopers rescue Mussolini from captivity in Rome, 1943 09/12 Germany annexes Sudetenland, 1938 -09/13 58° C (136.4° F) measured at el Azizia, Libya, 1922 +09/13 58 °C (136.4 °F) measured at el Azizia, Libya, 1922 09/13 British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759 09/13 Building of Hadrian's Wall begun, 122 09/13 Chiang Kai-Shek becomes president of China, 1943 @@ -411,7 +411,7 @@ 11/09 Roosevelt establishes the Civil Works Administration, 1933 11/10 41 Women arrested in suffragette demonstrations near White House, 1917 11/10 Cpt. Wirz, commandant of Andersonville Prison hanged, 1865 -11/10 Henry Stanley asks David Livingston, "Dr. Livingston, I presume?", 1871 +11/10 Henry Stanley asks David Livingstone, "Dr. Livingstone, I presume?", 1871 11/11 Washington becomes the 42nd state, 1889 11/12 Dr. Sun Yat-sen's Birthday in Taiwan 11/12 USA first exports oil to Europe, 1861 diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music index 557e63bdc..967f6af4c 100644 --- a/usr.bin/calendar/calendars/calendar.music +++ b/usr.bin/calendar/calendars/calendar.music @@ -225,7 +225,7 @@ 12/08 Jim Morrison is born in Melbourne, Florida, 1943 12/08 John Lennon is shot and killed in New York City, 1980 12/09 The Who's "Tommy" premieres in London, 1973 -12/11 (Louis) Hector Berlioz born in La-Côte-Saint-André, 1803 +12/11 (Louis) Hector Berlioz born in La-Côte-Saint-André, 1803 12/13 Ted Nugent, the motor city madman, born in Detroit, 1949 12/15 Thomas Edison receives patent on the phonograph, 1877 12/16 Don McLean's "American Pie" is released, 1971 diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all index 326571a2a..8c4591092 100644 --- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all +++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all @@ -4,9 +4,9 @@ * $FreeBSD$ */ -#ifndef _hr_HR_ISO8859_2_all -#define _hr_HR_ISO8859_2_all +#ifndef _hr_HR_ISO8859_2_all_ +#define _hr_HR_ISO8859_2_all_ #include -#endif /* !_hr_HR_ISO8859_2_all */ +#endif /* !_hr_HR_ISO8859_2_all_ */ diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici index a1e93fbf0..60ae5e30b 100644 --- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici +++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici @@ -4,8 +4,8 @@ * $FreeBSD$ */ -#ifndef _hr_HR_ISO8859_2_praznici -#define _hr_HR_ISO8859_2_praznici +#ifndef _hr_HR_ISO8859_2_praznici_ +#define _hr_HR_ISO8859_2_praznici_ LANG=hr_HR.ISO8859-2 @@ -41,4 +41,4 @@ Easter+39 Uza 03/NedjeljaLast Poèetak ljetnog vremena 10/NedjeljaLast Kraj ljetnog vremena -#endif /* !_hr_HR_ISO8859_2_praznici */ +#endif /* !_hr_HR_ISO8859_2_praznici_ */ diff --git a/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.all new file mode 100644 index 000000000..cdffa483d --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.all @@ -0,0 +1,15 @@ +/* + * $FreeBSD$ + * + * Brazilian calendar originally submitted by + * Renato Tambellini + */ + +#ifndef _pt_BR_ISO8859_1_all_ +#define _pt_BR_ISO8859_1_all_ + +#include +#include +#include + +#endif /* !_pt_BR.ISO8859_1_all_ */ diff --git a/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.commemorative b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.commemorative new file mode 100644 index 000000000..9be5debae --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.commemorative @@ -0,0 +1,191 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian commemorative days + * + * http://www.ibge.gov.br/ibgeteen/datas/home.html + */ + +#ifndef _pt_BR_ISO8859_1_commemorative_ +#define _pt_BR_ISO8859_1_commemorative_ + +LANG=pt_BR.ISO8859-1 + +01/06 Dia nacional do fotógrafo +01/06 Dia da gratidão +01/07 Dia da liberdade de culto +01/09 Dia do Fico +01/12 Aniversário de Belém +01/20 Dia do farmacêutico +01/20 Dia nacional do fusca +01/21 Dia mundial da religião +01/24 Dia da Previdência Social +01/25 Dia do carteiro +01/25 Aniversário da cidade de São Paulo +01/28 Aniversário da abertura dos portos no Brasil, em 1808 +01/30 Dia da saudade +02/01 Dia do publicitário +02/04 Aniversário de Macapá +02/07 Dia do gráfico +02/16 Dia do repórter +02/19 Dia do esportista +03/01 Aniversário da cidade do Rio de Janeiro +03/02 Dia do turismo +03/05 Dia do filatelista brasileiro +03/07 Dia do fuzileiro naval +03/08 Dia internacional da mulher +03/10 Dia do telefone +03/12 Aniversário de Recife +03/12 Dia do bibliotecário +03/14 Dia nacional da poesia +03/15 Dia da escola +03/15 Dia mundial do consumidor +03/17 Aniversário de Aracaju +03/21 Dia da eliminação da discriminação racial +03/22 Dia mundial da água +03/23 Aniversário de Florianópolis +03/23 Dia do meteorologista +03/26 Aniversário de Porto Alegre +03/27 Dia do circo +03/27 Dia do teatro +03/28 Dia do revisor e do diagramador +03/29 Aniversário de Curitiba +03/31 Aniversário do golpe militar +04/01 Dia da mentira +04/02 Dia internacional do livro para crianças +04/07 Dia mundial da saúde +04/07 Dia do jornalismo +04/08 Dia mundial de combate ao câncer +04/08 Dia da natação +04/08 Aniversário de Cuiabá +04/12 Aniversário de Fortaleza +04/13 Dia dos jovens +04/14 Dia internacional do café +04/15 Dia mundial do desenhista +04/15 Dia da conservação do solo +04/19 Dia do índio +04/20 Dia do diplomata +04/21 Aniversário de Brasília +04/21 Dia do metalúrgico +04/22 Dia do descobrimento do Brasil +04/22 Dia do planeta Terra +04/22 Dia da Força Aérea Brasileira +04/23 Dia mundial do escoteiro +04/25 Dia do contabilista +04/27 Dia da empregada doméstica +04/28 Dia da educação +04/30 Dia do ferroviário +05/05 Dia do cartógrafo +05/08 Dia do artista plástico +05/08 Dia internacional da Cruz Vermelha +05/12 Dia mundial do enfermeiro +05/13 Dia da abolição da escravatura +05/13 Dia do automóvel +05/15 Dia do assistente social +05/16 Dia do gari +05/17 Dia internacional das telecomunicações +05/18 Dia mundial dos museus +05/20 Aniversário de Palmas +05/21 Dia da Língua Nacional +05/22 Dia do apicultor +05/24 Dia do vestibulando +05/25 Dia da indústria +05/27 Dia do profissional liberal +05/29 Dia do estatístico +05/29 Dia do geógrafo +05/30 Dia do geólogo +06/01 Dia da imprensa +06/04 Dia internacional das crianças vítimas de agressão +06/05 Dia mundial do meio ambiente e da ecologia +06/09 Dia do porteiro +06/10 Dia da Língua Portuguesa +06/11 Dia da Marinha do Brasil +06/12 Dia dos namorados +06/15 Dia do paleontólogo +06/18 Dia do químico +06/19 Dia do migrante +06/21 Dia da música +06/22 Dia do aeroviário +06/25 Dia do imigrante +06/26 Dia internacional do combate às drogas +06/26 Dia do metrologista +06/29 Dia da telefonista +06/29 Dia do pescador +07/01 Dia da vacina BCG +07/02 Dia do bombeiro +07/09 Aniversário de Boa Vista +07/11 Dia mundial da população +07/12 Dia do engenheiro florestal +07/13 Dia mundial do rock +07/17 Dia de proteção às florestas +07/19 Dia do futebol +07/20 Chegada do homem à Lua +07/20 Dia da amizade +07/25 Dia do escritor +07/27 Dia nacional da prevenção de acidentes de trabalho +07/28 Dia do agricultor +08/11 Dia do advogado +08/11 Dia da televisão +08/13 Dia do economista +08/15 Dia da informática +08/16 Aniversário de Teresina +08/21 Dia da habitação +08/22 Dia do folclore +08/25 Dia do soldado +08/26 Aniversário de Campo Grande +08/27 Dia do psicólogo +08/31 Dia do nutricionista +09/03 Dia do biólogo +09/08 Dia mundial da alfabetização +09/08 Aniversário de Vitória +09/08 Aniversário de São Luís +09/09 Dia do administrador +09/09 Dia do médico veterinário +09/16 Dia internacional para preservação da camada de ozônio +09/18 Dia dos símbolos nacionais +09/21 Dia do idoso +09/21 Dia da árvore +09/25 Dia do rádio +09/25 Dia nacional do trânsito +09/30 Dia da secretária +10/04 Dia dos animais +10/05 Dia da promulgação da atual Constituição brasileira +10/11 Dia nacional da pessoa portadora de deficiência física +10/12 Dia da criança +10/12 Dia do descobrimento da América +10/12 Dia do agrônomo +10/13 Dia do fisioterapeuta +10/14 Dia da pecuária +10/15 Dia do professor +10/16 Dia mundial da alimentação +10/18 Dia do médico +10/23 Dia do aviador +10/24 Dia da ONU +10/25 Dia da democracia +10/25 Dia do dentista +10/28 Dia do funcionário público +10/29 Dia nacional do livro +10/30 Dia do comércio +10/31 Dia das bruxas +11/05 Dia do cinema brasileiro +11/19 Dia da bandeira +11/20 Dia nacional da consciência negra +11/30 Dia do teólogo +11/30 Dia da reforma agrária +12/01 Dia mundial de luta contra a AIDS +12/02 Dia da astronomia +12/03 Dia internacional das pessoas portadoras de deficiência +12/04 Dia do orientador educacional +12/05 Aniversário de Maceió +12/05 Dia internacional do voluntário +12/08 Dia da família +12/09 Dia do fonoaudiólogo +12/10 Dia da declaração dos direitos do homem +12/11 Dia do engenheiro +12/11 Dia do arquiteto +12/12 Aniversário de Belo Horizonte +12/28 Aniversário de Rio Branco + +#endif diff --git a/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.holidays b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.holidays new file mode 100644 index 000000000..caf1139e4 --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.holidays @@ -0,0 +1,25 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian holidays + * + * Federal laws 662/1949, 6.802/1980, 9.093/1995 and 10.607/2002. + */ + +#ifndef _pt_BR_ISO8859_1_holidays_ +#define _pt_BR_ISO8859_1_holidays_ + +LANG=pt_BR.ISO8859-1 + +01/01 Dia da confraternização universal e da paz +04/21 Dia do Tiradentes +05/01 Dia do trabalho +09/07 Dia da independência do Brasil +10/12 Dia da Nossa Senhora Aparecida +11/02 Dia de Finados +11/15 Dia da proclamação da República +12/25 Natal + +#endif diff --git a/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.mcommemorative b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.mcommemorative new file mode 100644 index 000000000..1a113f8f9 --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.ISO8859-1/calendar.mcommemorative @@ -0,0 +1,22 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian mobile commemorative days + * + * http://www.novomilenio.inf.br/porto/mapas/nmcalenp.htm + */ + +#ifndef _pt_BR_ISO8859_1_mcommemorative_ +#define _pt_BR_ISO8859_1_mcommemorative_ + +LANG=pt_BR.ISO8859-1 + +Easter-47 Carnaval +Easter-7 Domingo de Ramos +Easter-2 Sexta-feira Santa +Easter Páscoa +Easter+60 Corpus Christi + +#endif diff --git a/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.all b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.all new file mode 100644 index 000000000..25db5e13a --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.all @@ -0,0 +1,16 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian calendar + */ + +#ifndef _pt_BR_UTF_8_all_ +#define _pt_BR_UTF_8_all_ + +#include +#include +#include + +#endif /* !_pt_BR.UTF_8_all_ */ diff --git a/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative new file mode 100644 index 000000000..2620aae24 --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.commemorative @@ -0,0 +1,191 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian commemorative days + * + * http://www.ibge.gov.br/ibgeteen/datas/home.html + */ + +#ifndef _pt_BR_UTF_8_commemorative_ +#define _pt_BR_UTF_8_commemorative_ + +LANG=pt_BR.UTF-8 + +01/06 Dia nacional do fotógrafo +01/06 Dia da gratidão +01/07 Dia da liberdade de culto +01/09 Dia do Fico +01/12 Aniversário de Belém +01/20 Dia do farmacêutico +01/20 Dia nacional do fusca +01/21 Dia mundial da religião +01/24 Dia da Previdência Social +01/25 Dia do carteiro +01/25 Aniversário da cidade de São Paulo +01/28 Aniversário da abertura dos portos no Brasil, em 1808 +01/30 Dia da saudade +02/01 Dia do publicitário +02/04 Aniversário de Macapá +02/07 Dia do gráfico +02/16 Dia do repórter +02/19 Dia do esportista +03/01 Aniversário da cidade do Rio de Janeiro +03/02 Dia do turismo +03/05 Dia do filatelista brasileiro +03/07 Dia do fuzileiro naval +03/08 Dia internacional da mulher +03/10 Dia do telefone +03/12 Aniversário de Recife +03/12 Dia do bibliotecário +03/14 Dia nacional da poesia +03/15 Dia da escola +03/15 Dia mundial do consumidor +03/17 Aniversário de Aracaju +03/21 Dia da eliminação da discriminação racial +03/22 Dia mundial da água +03/23 Aniversário de Florianópolis +03/23 Dia do meteorologista +03/26 Aniversário de Porto Alegre +03/27 Dia do circo +03/27 Dia do teatro +03/28 Dia do revisor e do diagramador +03/29 Aniversário de Curitiba +03/31 Aniversário do golpe militar +04/01 Dia da mentira +04/02 Dia internacional do livro para crianças +04/07 Dia mundial da saúde +04/07 Dia do jornalismo +04/08 Dia mundial de combate ao câncer +04/08 Dia da natação +04/08 Aniversário de Cuiabá +04/12 Aniversário de Fortaleza +04/13 Dia dos jovens +04/14 Dia internacional do café +04/15 Dia mundial do desenhista +04/15 Dia da conservação do solo +04/19 Dia do índio +04/20 Dia do diplomata +04/21 Aniversário de Brasília +04/21 Dia do metalúrgico +04/22 Dia do descobrimento do Brasil +04/22 Dia do planeta Terra +04/22 Dia da Força Aérea Brasileira +04/23 Dia mundial do escoteiro +04/25 Dia do contabilista +04/27 Dia da empregada doméstica +04/28 Dia da educação +04/30 Dia do ferroviário +05/05 Dia do cartógrafo +05/08 Dia do artista plástico +05/08 Dia internacional da Cruz Vermelha +05/12 Dia mundial do enfermeiro +05/13 Dia da abolição da escravatura +05/13 Dia do automóvel +05/15 Dia do assistente social +05/16 Dia do gari +05/17 Dia internacional das telecomunicações +05/18 Dia mundial dos museus +05/20 Aniversário de Palmas +05/21 Dia da Língua Nacional +05/22 Dia do apicultor +05/24 Dia do vestibulando +05/25 Dia da indústria +05/27 Dia do profissional liberal +05/29 Dia do estatístico +05/29 Dia do geógrafo +05/30 Dia do geólogo +06/01 Dia da imprensa +06/04 Dia internacional das crianças vítimas de agressão +06/05 Dia mundial do meio ambiente e da ecologia +06/09 Dia do porteiro +06/10 Dia da Língua Portuguesa +06/11 Dia da Marinha do Brasil +06/12 Dia dos namorados +06/15 Dia do paleontólogo +06/18 Dia do químico +06/19 Dia do migrante +06/21 Dia da música +06/22 Dia do aeroviário +06/25 Dia do imigrante +06/26 Dia internacional do combate às drogas +06/26 Dia do metrologista +06/29 Dia da telefonista +06/29 Dia do pescador +07/01 Dia da vacina BCG +07/02 Dia do bombeiro +07/09 Aniversário de Boa Vista +07/11 Dia mundial da população +07/12 Dia do engenheiro florestal +07/13 Dia mundial do rock +07/17 Dia de proteção às florestas +07/19 Dia do futebol +07/20 Chegada do homem à Lua +07/20 Dia da amizade +07/25 Dia do escritor +07/27 Dia nacional da prevenção de acidentes de trabalho +07/28 Dia do agricultor +08/11 Dia do advogado +08/11 Dia da televisão +08/13 Dia do economista +08/15 Dia da informática +08/16 Aniversário de Teresina +08/21 Dia da habitação +08/22 Dia do folclore +08/25 Dia do soldado +08/26 Aniversário de Campo Grande +08/27 Dia do psicólogo +08/31 Dia do nutricionista +09/03 Dia do biólogo +09/08 Dia mundial da alfabetização +09/08 Aniversário de Vitória +09/08 Aniversário de São Luís +09/09 Dia do administrador +09/09 Dia do médico veterinário +09/16 Dia internacional para preservação da camada de ozônio +09/18 Dia dos símbolos nacionais +09/21 Dia do idoso +09/21 Dia da árvore +09/25 Dia do rádio +09/25 Dia nacional do trânsito +09/30 Dia da secretária +10/04 Dia dos animais +10/05 Dia da promulgação da atual Constituição brasileira +10/11 Dia nacional da pessoa portadora de deficiência física +10/12 Dia da criança +10/12 Dia do descobrimento da América +10/12 Dia do agrônomo +10/13 Dia do fisioterapeuta +10/14 Dia da pecuária +10/15 Dia do professor +10/16 Dia mundial da alimentação +10/18 Dia do médico +10/23 Dia do aviador +10/24 Dia da ONU +10/25 Dia da democracia +10/25 Dia do dentista +10/28 Dia do funcionário público +10/29 Dia nacional do livro +10/30 Dia do comércio +10/31 Dia das bruxas +11/05 Dia do cinema brasileiro +11/19 Dia da bandeira +11/20 Dia nacional da consciência negra +11/30 Dia do teólogo +11/30 Dia da reforma agrária +12/01 Dia mundial de luta contra a AIDS +12/02 Dia da astronomia +12/03 Dia internacional das pessoas portadoras de deficiência +12/04 Dia do orientador educacional +12/05 Aniversário de Maceió +12/05 Dia internacional do voluntário +12/08 Dia da família +12/09 Dia do fonoaudiólogo +12/10 Dia da declaração dos direitos do homem +12/11 Dia do engenheiro +12/11 Dia do arquiteto +12/12 Aniversário de Belo Horizonte +12/28 Aniversário de Rio Branco + +#endif diff --git a/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.holidays b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.holidays new file mode 100644 index 000000000..7df0c3418 --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.holidays @@ -0,0 +1,25 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian holidays + * + * Federal laws 662/1949, 6.802/1980, 9.093/1995 and 10.607/2002. + */ + +#ifndef _pt_BR_UTF_8_holidays_ +#define _pt_BR_UTF_8_holidays_ + +LANG=pt_BR.UTF-8 + +01/01 Dia da confraternização universal e da paz +04/21 Dia do Tiradentes +05/01 Dia do trabalho +09/07 Dia da independência do Brasil +10/12 Dia da Nossa Senhora Aparecida +11/02 Dia de Finados +11/15 Dia da proclamação da República +12/25 Natal + +#endif diff --git a/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.mcommemorative b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.mcommemorative new file mode 100644 index 000000000..b3eb7325f --- /dev/null +++ b/usr.bin/calendar/calendars/pt_BR.UTF-8/calendar.mcommemorative @@ -0,0 +1,22 @@ +/* + * $FreeBSD$ + * + * Originally submitted by Renato Tambellini + * + * Brazilian mobile commemorative days + * + * http://www.novomilenio.inf.br/porto/mapas/nmcalenp.htm + */ + +#ifndef _pt_BR_UTF_8_mcommemorative_ +#define _pt_BR_UTF_8_mcommemorative_ + +LANG=pt_BR.UTF-8 + +Easter-47 Carnaval +Easter-7 Domingo de Ramos +Easter-2 Sexta-feira Santa +Easter Páscoa +Easter+60 Corpus Christi + +#endif diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all index b2de01ee8..c7d1cfadb 100644 --- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all +++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all @@ -4,14 +4,13 @@ * $FreeBSD$ */ -#ifndef _ru_RU_KOI8_R_all -#define _ru_RU_KOI8_R_all +#ifndef _ru_RU_KOI8_R_all_ +#define _ru_RU_KOI8_R_all_ #include #include #include -#include #include #include -#endif /* !_ru_RU_KOI8_R_all */ +#endif /* !_ru_RU_KOI8_R_all_ */ diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk deleted file mode 100644 index 5e279859b..000000000 --- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ - * - * $FreeBSD$ - */ - -#ifndef _ru_RU_KOI8_R_msk_ -#define _ru_RU_KOI8_R_msk_ - -LANG=ru_RU.KOI8-R - -03/SunLast îÁÞÁÌÏ ÍÏÓËÏ×ÓËÏÇÏ ÌÅÔÎÅÇÏ ×ÒÅÍÅÎÉ; ÞÁÓÙ ÐÅÒÅ×ÏÄÑÔÓÑ ×ÐÅÒÅÄ -10/SunLast ëÏÎÅà ÍÏÓËÏ×ÓËÏÇÏ ÌÅÔÎÅÇÏ ×ÒÅÍÅÎÉ; ÞÁÓÙ ÐÅÒÅ×ÏÄÑÔÓÑ ÎÁÚÁÄ - -#endif /* !_ru_RU_KOI8_R_msk_ */ - -- 2.45.0