Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2018-07-21 10:12:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Sat Jul 21 10:12:55 2018 rev:37 rq:623283 version:5.48.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2018-06-22 13:26:45.669771829 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2018-07-21 10:12:57.475132499 +0200 @@ -1,0 +2,14 @@ +Mon Jul 16 04:37:40 UTC 2018 - [email protected] + +- Update to 5.48.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.48.0.php +- Changes since 5.47.0: + * Use more nullptr + * holidays/plan2/holiday_jp_* - add missing metainfo + * updated Japanese holidays (in Japanese and English) BUG: 365241 FIXED-IN: 5.48.0 (kde#365241) + * holidays/plan2/holiday_th_en-gb - updated Thailand (UK English) for 2018 BUG: 393770 FIXED-IN: 5.48.0 (kde#393770) + * add Venezula holidays (Spanish) BUG: 334305 FIXED-IN: 5.48.0 (kde#334305) + +------------------------------------------------------------------- Old: ---- kholidays-5.47.0.tar.xz New: ---- kholidays-5.48.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.Aq2Qay/_old 2018-07-21 10:12:57.919132396 +0200 +++ /var/tmp/diff_new_pack.Aq2Qay/_new 2018-07-21 10:12:57.919132396 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Holidays5 -%define _tar_path 5.47 +%define _tar_path 5.48 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) -%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kholidays -Version: 5.47.0 +Version: 5.48.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later ++++++ kholidays-5.47.0.tar.xz -> kholidays-5.48.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/CMakeLists.txt new/kholidays-5.48.0/CMakeLists.txt --- old/kholidays-5.47.0/CMakeLists.txt 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/CMakeLists.txt 2018-07-08 00:30:47.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.47.0") +set(KF5_VERSION "5.48.0") project(KHolidays VERSION ${KF5_VERSION}) -find_package(ECM 5.47.0 REQUIRED NO_MODULE) +find_package(ECM 5.48.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/holidays/holidays.qrc new/kholidays-5.48.0/holidays/holidays.qrc --- old/kholidays-5.47.0/holidays/holidays.qrc 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/holidays/holidays.qrc 2018-07-08 00:30:47.000000000 +0200 @@ -126,6 +126,7 @@ <file>plan2/holiday_ua_uk</file> <file>plan2/holiday_us_en-us</file> <file>plan2/holiday_uy_es</file> + <file>plan2/holiday_ve_es</file> <file>plan2/holiday_wf_fr</file> <file>plan2/holiday_yt_fr</file> <file>plan2/holiday_za_en-gb</file> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/holidays/plan2/holiday_jp_en-us new/kholidays-5.48.0/holidays/plan2/holiday_jp_en-us --- old/kholidays-5.47.0/holidays/plan2/holiday_jp_en-us 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/holidays/plan2/holiday_jp_en-us 2018-07-08 00:30:47.000000000 +0200 @@ -2,131 +2,81 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> -:: Jumpei Ogawa <[email protected]> +:: Firas Kraiem <[email protected]> :: :: Language: English :: -:: Updated: 2017-05-07 +:: Updated: 2016-07-09 :: :: Source: http://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html :: http://www.nao.ac.jp/faq/a0301.html :: -:: Note: On each Februaries, Vernal and Autumnal Equinox Days of next year are announced by government. -:: Currently Equinox Days on and after 2019 are expected dates and may be changed. -:: :: Metadata country "JP" language "en_US" :name "optional - defaults to country name" -description "National holiday file for Japan" +description "National Holiday file for Japan" + :: Public Holidays "New Year's Day" public on january 1 "Coming of Age Day" public on second monday in january "National Foundation Day" public on february 11 - -:: Equinox Days on and after 2019 are expected dates. See notes above. -"Vernal Equinox Day" public on march 20 2000 -"Vernal Equinox Day" public on march 20 2001 -"Vernal Equinox Day" public on march 21 2002 -"Vernal Equinox Day" public on march 21 2003 -"Vernal Equinox Day" public on march 20 2004 -"Vernal Equinox Day" public on march 20 2005 -"Vernal Equinox Day" public on march 21 2006 -"Vernal Equinox Day" public on march 21 2007 -"Vernal Equinox Day" public on march 20 2008 -"Vernal Equinox Day" public on march 20 2009 -"Vernal Equinox Day" public on march 21 2010 -"Vernal Equinox Day" public on march 21 2011 -"Vernal Equinox Day" public on march 20 2012 -"Vernal Equinox Day" public on march 20 2013 -"Vernal Equinox Day" public on march 21 2014 -"Vernal Equinox Day" public on march 21 2015 -"Vernal Equinox Day" public on march 20 2016 -"Vernal Equinox Day" public on march 20 2017 -"Vernal Equinox Day" public on march 21 2018 -"Vernal Equinox Day" public on march 21 2019 -"Vernal Equinox Day" public on march 20 2020 -"Vernal Equinox Day" public on march 20 2021 -"Vernal Equinox Day" public on march 21 2022 -"Vernal Equinox Day" public on march 21 2023 -"Vernal Equinox Day" public on march 20 2024 -"Vernal Equinox Day" public on march 20 2025 -"Vernal Equinox Day" public on march 20 2026 -"Vernal Equinox Day" public on march 21 2027 -"Vernal Equinox Day" public on march 20 2028 -"Vernal Equinox Day" public on march 20 2029 -"Vernal Equinox Day" public on march 20 2030 - "Showa Day" public on april 29 "Constitution Day" public on may 3 "Greenery Day" public on may 4 "Children's Day" public on may 5 "Oceans' Day" public on third monday in july -"Mountain Day" public on august 11 +"Mountains' Day" public on august 11 "Respect for Senior Citizens Day" public on third monday in september - -:: Equinox Days on and after 2019 are expected dates. See notes above. -"Autumnal Equinox Day" public on september 23 2000 -"Autumnal Equinox Day" public on september 23 2001 -"Autumnal Equinox Day" public on september 23 2002 -"Autumnal Equinox Day" public on september 23 2003 -"Autumnal Equinox Day" public on september 23 2004 -"Autumnal Equinox Day" public on september 23 2005 -"Autumnal Equinox Day" public on september 23 2006 -"Autumnal Equinox Day" public on september 23 2007 -"Autumnal Equinox Day" public on september 23 2008 -"Autumnal Equinox Day" public on september 23 2009 -"Autumnal Equinox Day" public on september 23 2010 -"Autumnal Equinox Day" public on september 23 2011 -"Autumnal Equinox Day" public on september 22 2012 -"Autumnal Equinox Day" public on september 23 2013 -"Autumnal Equinox Day" public on september 23 2014 -"Autumnal Equinox Day" public on september 23 2015 -"Autumnal Equinox Day" public on september 22 2016 -"Autumnal Equinox Day" public on september 23 2017 -"Autumnal Equinox Day" public on september 23 2018 -"Autumnal Equinox Day" public on september 23 2019 -"Autumnal Equinox Day" public on september 22 2020 -"Autumnal Equinox Day" public on september 23 2021 -"Autumnal Equinox Day" public on september 23 2022 -"Autumnal Equinox Day" public on september 23 2023 -"Autumnal Equinox Day" public on september 22 2024 -"Autumnal Equinox Day" public on september 23 2025 -"Autumnal Equinox Day" public on september 23 2026 -"Autumnal Equinox Day" public on september 23 2027 -"Autumnal Equinox Day" public on september 22 2028 -"Autumnal Equinox Day" public on september 23 2029 -"Autumnal Equinox Day" public on september 23 2030 - "Sports Day" public on second monday in october "Culture Day" public on november 3 "Labor Thanksgiving Day" public on november 23 "The Emperor's Birthday" public on december 23 -:: If a "National Holiday" is on Sunday,the following day -:: shall be a substitute holiday. -"Substitute holiday" public on march 21 2005 -"Substitute holiday" public on january 2 2006 -"Substitute holiday" public on february 12 2007 -"Substitute holiday" public on april 30 2007 -"Substitute holiday" public on september 24 2007 -"Substitute holiday" public on december 24 2007 -"Substitute holiday" public on november 24 2008 -"Substitute holiday" public on march 22 2010 -"Substitute holiday" public on march 21 2016 -"Substitute holiday" public on january 2 2017 -"Substitute holiday" public on february 12 2018 -"Substitute holiday" public on april 30 2018 -"Substitute holiday" public on september 24 2018 -"Substitute holiday" public on december 24 2018 +:: If a "Public Holiday" is on a Sunday, the first following day which is not +:: a "Public Holiday" shall be a substitute holiday. If a day which is not a +:: "Public Holiday" is between two "Public Holidays", it shall be a citizens' +:: holiday. Substitute holidays and citizens' holidays are not legally "Public +:: Holidays" (so in particular not for the purpose of determining such +:: holidays), but they are identical in practice. + +"Substitute holiday" public on 22.3.2010 +"Substitute holiday" public on 2.1.2012 +"Substitute holiday" public on 30.4.2012 +"Substitute holiday" public on 24.12.2012 +"Substitute holiday" public on 6.5.2013 +"Substitute holiday" public on 4.11.2013 +"Substitute holiday" public on 6.5.2014 +"Substitute holiday" public on 24.11.2014 +"Substitute holiday" public on 6.5.2015 +"Substitute holiday" public on 21.3.2016 +"Substitute holiday" public on 2.1.2017 +"Substitute holiday" public on 12.2.2018 +"Substitute holiday" public on 30.4.2018 +"Substitute holiday" public on 24.9.2018 +"Substitute holiday" public on 24.12.2018 +"Substitute holiday" public on 6.5.2019 +"Substitute holiday" public on 12.8.2019 +"Substitute holiday" public on 4.11.2019 + +"Citizens' holiday" public on 22.9.2015 :: Religious :: Financial :: Cultural +"St. Valentine's Day" on february 14 +"Girls' Festival" on march 3 +"Buddha's Birthday" on april 8 +"May Day" on may 1 +"Boys' Festival" on may 5 +"Mother's Day" on second sunday in may +"Father's Day" on third sunday in june +"Festival of the Weaver Star" on july 7 +"Christmas" on december 25 :: School diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/holidays/plan2/holiday_jp_ja new/kholidays-5.48.0/holidays/plan2/holiday_jp_ja --- old/kholidays-5.47.0/holidays/plan2/holiday_jp_ja 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/holidays/plan2/holiday_jp_ja 2018-07-08 00:30:47.000000000 +0200 @@ -2,66 +2,30 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> -:: Jumpei Ogawa <[email protected]> +:: Firas Kraiem <[email protected]> :: :: Language: Japanese :: -:: Updated: 2017-05-07 +:: Updated: 2016-07-09 :: :: Source: http://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html :: http://www.nao.ac.jp/faq/a0301.html :: -:: Note: On each Februaries, Vernal and Autumnal Equinox Days of next year are announced by government. -:: Currently Equinox Days on and after 2019 are expected dates and may be changed. :: Metadata country "JP" language "ja" :name "optional - defaults to country name" -description "日本の国民の休日のファイルです。" +description "National Holiday file for Japan" -:: Public Holidays + +:: Public Holidays (国民の祝日) :"New Year's Day" -"元旦" public on january 1 +"元日" public on january 1 :"Coming of Age Day" "成人の日" public on second monday in january :"National Foundation Day" "建国記念日" public on february 11 - -:"Vernal Equinox Day" -:: Equinox Days on and after 2019 are expected dates. See notes above. -"春分の日" public on march 20 2000 -"春分の日" public on march 20 2001 -"春分の日" public on march 21 2002 -"春分の日" public on march 21 2003 -"春分の日" public on march 20 2004 -"春分の日" public on march 20 2005 -"春分の日" public on march 21 2006 -"春分の日" public on march 21 2007 -"春分の日" public on march 20 2008 -"春分の日" public on march 20 2009 -"春分の日" public on march 21 2010 -"春分の日" public on march 21 2011 -"春分の日" public on march 20 2012 -"春分の日" public on march 20 2013 -"春分の日" public on march 21 2014 -"春分の日" public on march 21 2015 -"春分の日" public on march 20 2016 -"春分の日" public on march 20 2017 -"春分の日" public on march 21 2018 -"春分の日" public on march 21 2019 -"春分の日" public on march 20 2020 -"春分の日" public on march 20 2021 -"春分の日" public on march 21 2022 -"春分の日" public on march 21 2023 -"春分の日" public on march 20 2024 -"春分の日" public on march 20 2025 -"春分の日" public on march 20 2026 -"春分の日" public on march 21 2027 -"春分の日" public on march 20 2028 -"春分の日" public on march 20 2029 -"春分の日" public on march 20 2030 - :"Showa Day" "昭和の日" public on april 29 :"Constitution Day" @@ -71,78 +35,65 @@ :"Children's Day" "こどもの日" public on may 5 :"Oceans' Day" -"海の日" public on third monday in july -:"Mountain Day" -"山の日" public on august 11 +"海の日" public on third monday in july +:"Mountains' Day" +"山の日" public on august 11 :"Respect for Senior Citizens Day" "敬老の日" public on third monday in september -:"Autumnal Equinox Day" -:: Equinox Days on and after 2019 are expected dates. See notes above. -"秋分の日" public on september 23 2000 -"秋分の日" public on september 23 2001 -"秋分の日" public on september 23 2002 -"秋分の日" public on september 23 2003 -"秋分の日" public on september 23 2004 -"秋分の日" public on september 23 2005 -"秋分の日" public on september 23 2006 -"秋分の日" public on september 23 2007 -"秋分の日" public on september 23 2008 -"秋分の日" public on september 23 2009 -"秋分の日" public on september 23 2010 -"秋分の日" public on september 23 2011 -"秋分の日" public on september 22 2012 -"秋分の日" public on september 23 2013 -"秋分の日" public on september 23 2014 -"秋分の日" public on september 23 2015 -"秋分の日" public on september 22 2016 -"秋分の日" public on september 23 2017 -"秋分の日" public on september 23 2018 -"秋分の日" public on september 23 2019 -"秋分の日" public on september 22 2020 -"秋分の日" public on september 23 2021 -"秋分の日" public on september 23 2022 -"秋分の日" public on september 23 2023 -"秋分の日" public on september 22 2024 -"秋分の日" public on september 23 2025 -"秋分の日" public on september 23 2026 -"秋分の日" public on september 23 2027 -"秋分の日" public on september 22 2028 -"秋分の日" public on september 23 2029 -"秋分の日" public on september 23 2030 - :"Sports Day" "体育の日" public on second monday in october :"Culture Day" "文化の日" public on november 3 :"Labor Thanksgiving Day" -"勤労感謝の日" public on november 23 +"勤労感謝の日" public on november 23 :"The Emperor's Birthday" "天皇誕生日" public on december 23 -:: If a "National Holiday" is on Sunday,the following day -:: shall be a substitute holiday. +:: If a "Public Holiday" is on a Sunday, the first following day which is not +:: a "Public Holiday" shall be a substitute holiday. If a day which is not a +:: "Public Holiday" is between two "Public Holidays", it shall be a citizens' +:: holiday. Substitute holidays and citizens' holidays are not legally "Public +:: Holidays" (so in particular not for the purpose of determining such +:: holidays), but they are identical in practice. + :"Substitute holiday" -"振替休日" public on march 21 2005 -"振替休日" public on january 2 2006 -"振替休日" public on february 12 2007 -"振替休日" public on april 30 2007 -"振替休日" public on september 24 2007 -"振替休日" public on december 24 2007 -"振替休日" public on november 24 2008 -"振替休日" public on march 22 2010 -"振替休日" public on march 21 2016 -"振替休日" public on january 2 2017 -"振替休日" public on february 12 2018 -"振替休日" public on april 30 2018 -"振替休日" public on september 24 2018 -"振替休日" public on december 24 2018 +"振替休日" public on 22.3.2010 +"振替休日" public on 2.1.2012 +"振替休日" public on 30.4.2012 +"振替休日" public on 24.12.2012 +"振替休日" public on 6.5.2013 +"振替休日" public on 4.11.2013 +"振替休日" public on 6.5.2014 +"振替休日" public on 24.11.2014 +"振替休日" public on 6.5.2015 +"振替休日" public on 21.3.2016 +"振替休日" public on 2.1.2017 +"振替休日" public on 12.2.2018 +"振替休日" public on 30.4.2018 +"振替休日" public on 24.9.2018 +"振替休日" public on 24.12.2018 +"振替休日" public on 6.5.2019 +"振替休日" public on 12.8.2019 +"振替休日" public on 4.11.2019 + +:"Citizens' holiday" +"国民の休日" public on 22.9.2015 :: Religious :: Financial :: Cultural +:"St. Valentine's Day" on february 14 +:"Girls' Festival" on march 3 +:"Buddha's Birthday" on april 8 +:"May Day" on may 1 +:"Boys' Festival" on may 5 +:"Mother's Day" on second sunday in may +:"Father's Day" on third sunday in june +:"Festival of the Weaver Star" on july 7 +:"Christmas" on december 25 :: School diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/holidays/plan2/holiday_th_en-gb new/kholidays-5.48.0/holidays/plan2/holiday_th_en-gb --- old/kholidays-5.47.0/holidays/plan2/holiday_th_en-gb 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/holidays/plan2/holiday_th_en-gb 2018-07-08 00:30:47.000000000 +0200 @@ -5,7 +5,7 @@ :: :: Author: Gerald Williams <[email protected]> :: -:: Updated: +:: Updated: May 31 2018 :: :: Source: :: @@ -18,35 +18,47 @@ :: Public Holidays "New Years Day" public on January 1 -:"Makha Bucha Day" public on February 11 -"Chakri Memorial Day" public on April 6 -"Songkran Festival" public on April 13 length 3 days -"Coranation Day" public on May 5 -:"Royal Ploughing Ceremony Day" public on May 8 -:"Visakha Bucha Day" public on May 10 -:"Mid Year Day" public on July 1 -:"Asarnha Bucha Day" public on July 8 -:"Khao Phansa Day" public on July 9 -"HM The Queens Birthday" public on August 12 -"Chulalongkorn Day" public on October 23 -"HM The King's Birthdayday" public on December 5 +"Bridge Public Holiday" public on January 2 +"Labor Day" public on May 1 +"Royal Ploughing Ceremony Day" public on May 14 +"His Majesty King Vajiralongkorn's Birthday" public on July 28 +"King's Birthday holiday" public on July 30 +"Her Majesty the Queen's Birthday" public on August 12 length 2 days +"Mother's Day" public on August 12 length 2 days +"His Majesty the late King Bhumibol Adulyadej Memorial Day" public on October 13 +"Anniversary of the Death of King Bhumibol" public on October 15 +"King Chulalongkorn Memorial Day" public on October 23 +"Father's Day" public on December 5 "Constitution Day" public on December 10 -"New Years Eve" public on December 31 +"Christmas Eve" public on December 24 +"Christmas Day" public on December 25 +"New Year's Eve" public on December 31 :: Religious Holidays +"Makha Bucha" public on March 1 +"Chakri Day" public on April 6 +"Visakha Bucha" public on May 29 +"Asalha Bucha" public on July 27 +"Buddhist Lent Day" public on July 28 :: Financial :: Cultural +"National Children's Day" public on January 13 +"Valentine's Day" public on February 14 +"Chinese Lunar New Year's Day" public on February 16 length 3 days +"Songkran Festival" public on April 12 length 5 days +"Halloween" public on October 31 +"Loy Krathong" public on November 22 :: School +"Teachers' Day" public on January 16 :: Daylight Saving :: Seasons -"Hot season begins" seasonal on march 1 -"Rainy season begins" seasonal on june 1 -"Cool season begins" seasonal on november 1 +"Hot season begins" seasonal on March 1 +"Rainy season begins" seasonal on June 1 +"Cool season begins" seasonal on November 1 :: Name Days - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/holidays/plan2/holiday_ve_es new/kholidays-5.48.0/holidays/plan2/holiday_ve_es --- old/kholidays-5.47.0/holidays/plan2/holiday_ve_es 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.48.0/holidays/plan2/holiday_ve_es 2018-07-08 00:30:47.000000000 +0200 @@ -0,0 +1,35 @@ +:: +:: Country: Venezuela +:: +:: Language: Spanish +:: +:: Author: Daniel Klopp +:: +:: Updated: 03-MAY-2014 +:: +:: Source: http://www.lottt.gob.ve/ley-del-trabajo/titulo-iii/#capituloviii +:: http://www.ilo.org/dyn/travail/docs/2030/Law%20No.29.541.pdf +:: http://es.wikipedia.org/wiki/Venezuela#Festividades +:: + +:: Metadata +country "VE" +language "es" +:name "optional - defaults to country name" +description "Feriados Nacionales de Venezuela" + +:: Public Holidays +"Año Nuevo" public on january 1 +"Lunes de Carnaval" public on easter minus 48 +"Martes de Carnaval" public on easter minus 47 +"Jueves Santo" public on easter minus 3 +"Viernes Santo" public on easter minus 2 +"Declaración de la Independencia" public on april 19 +"Día del Trabajador" public on may 1 +"Batalla de Carabobo" public on june 24 +"Día de la Independencia" public on july 5 +"Natalicio de Simón Bolívar" public on july 24 +"Día de la Resistencia Indígena" public on october 12 +"Nochebuena" public on december 24 +"Navidad" public on december 25 +"Fin de Año" public on december 31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/po/se/libkholidays5_qt.po new/kholidays-5.48.0/po/se/libkholidays5_qt.po --- old/kholidays-5.47.0/po/se/libkholidays5_qt.po 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/po/se/libkholidays5_qt.po 2018-07-08 00:30:47.000000000 +0200 @@ -40,229 +40,229 @@ msgid "September Equinox" msgstr "" -#: holidayregion.cpp:187 +#: holidayregion.cpp:882 msgctxt "HolidayRegion|Canadian region" msgid "Quebec" msgstr "" -#: holidayregion.cpp:189 +#: holidayregion.cpp:884 msgctxt "HolidayRegion|German region" msgid "Bavaria" msgstr "" -#: holidayregion.cpp:191 +#: holidayregion.cpp:886 msgctxt "HolidayRegion|Spanish region" msgid "Catalonia" msgstr "" -#: holidayregion.cpp:193 +#: holidayregion.cpp:888 msgctxt "HolidayRegion|UK Region" msgid "England and Wales" msgstr "" -#: holidayregion.cpp:195 +#: holidayregion.cpp:890 msgctxt "HolidayRegion|UK Region" msgid "England" msgstr "" -#: holidayregion.cpp:197 +#: holidayregion.cpp:892 msgctxt "HolidayRegion|UK Region" msgid "Wales" msgstr "" -#: holidayregion.cpp:199 +#: holidayregion.cpp:894 msgctxt "HolidayRegion|UK Region" msgid "Scotland" msgstr "" -#: holidayregion.cpp:201 +#: holidayregion.cpp:896 msgctxt "HolidayRegion|UK Region" msgid "Northern Ireland" msgstr "" -#: holidayregion.cpp:203 +#: holidayregion.cpp:898 msgctxt "HolidayRegion|Italian Region" msgid "South Tyrol" msgstr "" -#: holidayregion.cpp:205 +#: holidayregion.cpp:900 msgctxt "HolidayRegion|" msgid "New South Wales" msgstr "" -#: holidayregion.cpp:207 +#: holidayregion.cpp:902 msgctxt "HolidayRegion|Australian Region" msgid "Queensland" msgstr "" -#: holidayregion.cpp:209 +#: holidayregion.cpp:904 msgctxt "HolidayRegion|Australian Region" msgid "Victoria" msgstr "" -#: holidayregion.cpp:211 +#: holidayregion.cpp:906 msgctxt "HolidayRegion|Australian Region" msgid "South Australia" msgstr "" -#: holidayregion.cpp:213 +#: holidayregion.cpp:908 msgctxt "HolidayRegion|Australian Region" msgid "Northern Territory" msgstr "" -#: holidayregion.cpp:215 +#: holidayregion.cpp:911 msgctxt "HolidayRegion|Australian Region" msgid "Australian Capital Territory" msgstr "" -#: holidayregion.cpp:217 +#: holidayregion.cpp:914 msgctxt "HolidayRegion|Australian Region" msgid "Western Australia" msgstr "" -#: holidayregion.cpp:219 +#: holidayregion.cpp:917 msgctxt "HolidayRegion|Australian Region" msgid "Tasmania" msgstr "" -#: holidayregion.cpp:221 +#: holidayregion.cpp:920 msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" msgid "Republic of Srpska" msgstr "" -#: holidayregion.cpp:239 +#: holidayregion.cpp:939 msgctxt "HolidayRegion|Holiday type" msgid "Public" msgstr "" -#: holidayregion.cpp:241 +#: holidayregion.cpp:941 msgctxt "HolidayRegion|Holiday type" msgid "Civil" msgstr "" -#: holidayregion.cpp:243 +#: holidayregion.cpp:943 msgctxt "HolidayRegion|Holiday type" msgid "Religious" msgstr "" -#: holidayregion.cpp:245 +#: holidayregion.cpp:945 msgctxt "HolidayRegion|Holiday type" msgid "Government" msgstr "" -#: holidayregion.cpp:247 +#: holidayregion.cpp:947 msgctxt "HolidayRegion|Holiday type" msgid "Financial" msgstr "" -#: holidayregion.cpp:249 +#: holidayregion.cpp:949 msgctxt "HolidayRegion|Holiday type" msgid "Cultural" msgstr "" -#: holidayregion.cpp:251 +#: holidayregion.cpp:951 msgctxt "HolidayRegion|Holiday type" msgid "Commemorative" msgstr "" -#: holidayregion.cpp:253 +#: holidayregion.cpp:953 msgctxt "HolidayRegion|Holiday type" msgid "Historical" msgstr "" -#: holidayregion.cpp:255 +#: holidayregion.cpp:955 msgctxt "HolidayRegion|Holiday type" msgid "School" msgstr "" -#: holidayregion.cpp:257 +#: holidayregion.cpp:957 msgctxt "HolidayRegion|Holiday type" msgid "Seasonal" msgstr "" -#: holidayregion.cpp:259 +#: holidayregion.cpp:959 msgctxt "HolidayRegion|Holiday type" msgid "Name Days" msgstr "" -#: holidayregion.cpp:261 +#: holidayregion.cpp:961 msgctxt "HolidayRegion|Holiday type" msgid "Personal" msgstr "" -#: holidayregion.cpp:263 +#: holidayregion.cpp:963 msgctxt "HolidayRegion|Holiday type" msgid "Christian" msgstr "" -#: holidayregion.cpp:265 +#: holidayregion.cpp:965 msgctxt "HolidayRegion|Holiday type" msgid "Anglican" msgstr "" -#: holidayregion.cpp:267 +#: holidayregion.cpp:967 msgctxt "HolidayRegion|Holiday type" msgid "Catholic" msgstr "" -#: holidayregion.cpp:269 +#: holidayregion.cpp:969 msgctxt "HolidayRegion|Holiday type" msgid "Protestant" msgstr "" -#: holidayregion.cpp:271 +#: holidayregion.cpp:971 msgctxt "HolidayRegion|Holiday type" msgid "Orthodox" msgstr "" -#: holidayregion.cpp:273 +#: holidayregion.cpp:973 msgctxt "HolidayRegion|Holiday type" msgid "Jewish" msgstr "" -#: holidayregion.cpp:275 +#: holidayregion.cpp:975 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Orthodox" msgstr "" -#: holidayregion.cpp:277 +#: holidayregion.cpp:977 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Conservative" msgstr "" -#: holidayregion.cpp:279 +#: holidayregion.cpp:979 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Reform" msgstr "" -#: holidayregion.cpp:281 +#: holidayregion.cpp:981 msgctxt "HolidayRegion|Holiday type" msgid "Islamic" msgstr "" -#: holidayregion.cpp:283 +#: holidayregion.cpp:983 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sunni" msgstr "" -#: holidayregion.cpp:285 +#: holidayregion.cpp:985 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Shia" msgstr "" -#: holidayregion.cpp:287 +#: holidayregion.cpp:987 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sufi" msgstr "" -#: holidayregion.cpp:293 +#: holidayregion.cpp:994 #, qt-format msgctxt "" "HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" msgid "%1 - %2" msgstr "" -#: holidayregion.cpp:300 +#: holidayregion.cpp:1004 msgctxt "HolidayRegion|Unknown holiday region" msgid "Unknown" msgstr "" @@ -347,62 +347,62 @@ msgid "Pisces" msgstr "" -#: zodiac.cpp:272 +#: zodiac.cpp:270 msgctxt "HolidayRegion|zodiac symbol for Aries" msgid "ram" msgstr "" -#: zodiac.cpp:274 +#: zodiac.cpp:272 msgctxt "HolidayRegion|zodiac symbol for Taurus" msgid "bull" msgstr "" -#: zodiac.cpp:276 +#: zodiac.cpp:274 msgctxt "HolidayRegion|zodiac symbol for Gemini" msgid "twins" msgstr "" -#: zodiac.cpp:278 +#: zodiac.cpp:276 msgctxt "HolidayRegion|zodiac symbol for Cancer" msgid "crab" msgstr "" -#: zodiac.cpp:280 +#: zodiac.cpp:278 msgctxt "HolidayRegion|zodiac symbol for Leo" msgid "lion" msgstr "" -#: zodiac.cpp:282 +#: zodiac.cpp:280 msgctxt "HolidayRegion|zodiac symbol for Virgo" msgid "virgin" msgstr "" -#: zodiac.cpp:284 +#: zodiac.cpp:282 msgctxt "HolidayRegion|zodiac symbol for Libra" msgid "scales" msgstr "" -#: zodiac.cpp:286 +#: zodiac.cpp:284 msgctxt "HolidayRegion|zodiac symbol for Scorpion" msgid "scorpion" msgstr "" -#: zodiac.cpp:288 +#: zodiac.cpp:286 msgctxt "HolidayRegion|zodiac symbol for Sagittarius" msgid "archer" msgstr "" -#: zodiac.cpp:290 +#: zodiac.cpp:288 msgctxt "HolidayRegion|zodiac symbol for Capricorn" msgid "goat" msgstr "" -#: zodiac.cpp:292 +#: zodiac.cpp:290 msgctxt "HolidayRegion|zodiac symbol for Aquarius" msgid "water carrier" msgstr "" -#: zodiac.cpp:294 +#: zodiac.cpp:292 msgctxt "HolidayRegion|zodiac symbol for Pices" msgid "fish" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.48.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.47.0/po/zh_CN/libkholidays5_qt.po 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/po/zh_CN/libkholidays5_qt.po 2018-07-08 00:30:47.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-05-18 06:23-0400\n" +"PO-Revision-Date: 2018-07-03 17:35\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/src/parsers/plan2/FlexLexer.h new/kholidays-5.48.0/src/parsers/plan2/FlexLexer.h --- old/kholidays-5.47.0/src/parsers/plan2/FlexLexer.h 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/src/parsers/plan2/FlexLexer.h 2018-07-08 00:30:47.000000000 +0200 @@ -75,7 +75,7 @@ virtual int yylex() = 0; // Call yylex with new input/output sources. - int yylex(FLEX_STD istream * new_in, FLEX_STD ostream *new_out = 0) + int yylex(FLEX_STD istream * new_in, FLEX_STD ostream *new_out = nullptr) { switch_streams(new_in, new_out); return yylex(); @@ -83,8 +83,8 @@ // Switch to new input/output streams. A nil stream pointer // indicates "keep the current one". - virtual void switch_streams(FLEX_STD istream *new_in = 0, - FLEX_STD ostream *new_out = 0) = 0; + virtual void switch_streams(FLEX_STD istream *new_in = nullptr, + FLEX_STD ostream *new_out = nullptr) = 0; int lineno() const { return yylineno; } @@ -116,7 +116,7 @@ public: // arg_yyin and arg_yyout default to the cin and cout, but we // only make that assignment when initializing in yylex(). - yyFlexLexer(FLEX_STD istream *arg_yyin = 0, FLEX_STD ostream *arg_yyout = 0); + yyFlexLexer(FLEX_STD istream *arg_yyin = nullptr, FLEX_STD ostream *arg_yyout = nullptr); ~yyFlexLexer() override; @@ -129,7 +129,7 @@ void yypop_buffer_state(); virtual int yylex() override; - virtual void switch_streams(FLEX_STD istream * new_in, FLEX_STD ostream *new_out = 0) override; + virtual void switch_streams(FLEX_STD istream * new_in, FLEX_STD ostream *new_out = nullptr) override; virtual int yywrap(); protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/src/parsers/plan2/holidayscannerplan_p.h new/kholidays-5.48.0/src/parsers/plan2/holidayscannerplan_p.h --- old/kholidays-5.47.0/src/parsers/plan2/holidayscannerplan_p.h 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/src/parsers/plan2/holidayscannerplan_p.h 2018-07-08 00:30:47.000000000 +0200 @@ -64,7 +64,7 @@ class HolidayScannerPlan : public HolidayScannerFlexLexer { public: - HolidayScannerPlan(std::istream *arg_yyin = 0, std::ostream *arg_yyout = 0); + HolidayScannerPlan(std::istream *arg_yyin = nullptr, std::ostream *arg_yyout = nullptr); ~HolidayScannerPlan() override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.47.0/src/parsers/plan2/position.hh new/kholidays-5.48.0/src/parsers/plan2/position.hh --- old/kholidays-5.47.0/src/parsers/plan2/position.hh 2018-06-02 19:55:44.000000000 +0200 +++ new/kholidays-5.48.0/src/parsers/plan2/position.hh 2018-07-08 00:30:47.000000000 +0200 @@ -58,7 +58,7 @@ /// Construct a position. position () - : filename (0), line (1), column (1) + : filename (nullptr), line (1), column (1) { }
