Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2018-08-24 16:53:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Fri Aug 24 16:53:22 2018 rev:38 rq:630609 version:5.49.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2018-07-21 10:12:57.475132499 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2018-08-24 16:53:25.117312895 +0200 @@ -1,0 +2,16 @@ +Sun Aug 19 09:19:06 UTC 2018 - [email protected] + +- Update to 5.49.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.49.0.php +- Changes since 5.48.0: + * Install the sunrise/sunset computation header + * Added leap year day as (cultural) holiday for Norway + * Minor formatting changes (e.g. newlines) + * Added ‘name’ entry for Norwegian holiday files + * Added descriptions for Norwegian holiday files + * more Japanese holiday updates from phanect + * Update holiday_jp_ja and holiday_jp-en_us (kde#365241) + +------------------------------------------------------------------- Old: ---- kholidays-5.48.0.tar.xz New: ---- kholidays-5.49.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.bEIbSa/_old 2018-08-24 16:53:25.473313314 +0200 +++ /var/tmp/diff_new_pack.bEIbSa/_new 2018-08-24 16:53:25.473313314 +0200 @@ -17,20 +17,20 @@ %define lname libKF5Holidays5 -%define _tar_path 5.48 +%define _tar_path 5.49 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kholidays -Version: 5.48.0 +Version: 5.49.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: http://www.kde.org -Source: %{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig ++++++ kholidays-5.48.0.tar.xz -> kholidays-5.49.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/.gitignore new/kholidays-5.49.0/.gitignore --- old/kholidays-5.48.0/.gitignore 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/.gitignore 2018-08-04 12:58:20.000000000 +0200 @@ -1,7 +1,6 @@ # Ignore the following files *~ *.[oa] -*.diff *.kate-swp *.kdev4 .kdev_include_paths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/CMakeLists.txt new/kholidays-5.49.0/CMakeLists.txt --- old/kholidays-5.48.0/CMakeLists.txt 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/CMakeLists.txt 2018-08-04 12:58:20.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.48.0") +set(KF5_VERSION "5.49.0") project(KHolidays VERSION ${KF5_VERSION}) -find_package(ECM 5.48.0 REQUIRED NO_MODULE) +find_package(ECM 5.49.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.48.0/holidays/plan2/holiday_jp_en-us new/kholidays-5.49.0/holidays/plan2/holiday_jp_en-us --- old/kholidays-5.48.0/holidays/plan2/holiday_jp_en-us 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/holidays/plan2/holiday_jp_en-us 2018-08-04 12:58:20.000000000 +0200 @@ -2,15 +2,25 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> +:: Jumpei Ogawa <[email protected]> :: Firas Kraiem <[email protected]> :: :: Language: English :: -:: Updated: 2016-07-09 +:: Updated: 2018-07-16 :: :: 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" :: Metadata country "JP" @@ -23,60 +33,125 @@ "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 -"Mountains' Day" public on august 11 +"Mountain 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 "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 +:: 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 holiday. Those 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 +"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 january 2 2012 +"Substitute holiday" public on april 30 2012 +"Substitute holiday" public on december 24 2012 +"Substitute holiday" public on may 6 2013 +"Substitute holiday" public on november 4 2013 +"Substitute holiday" public on may 6 2014 +"Substitute holiday" public on november 24 2014 +"Substitute holiday" public on may 6 2015 +"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 +"Substitute holiday" public on may 6 2019 +"Substitute holiday" public on august 12 2019 +"Substitute holiday" public on november 4 2019 -"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 +"Holiday" public on september 22 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.48.0/holidays/plan2/holiday_jp_ja new/kholidays-5.49.0/holidays/plan2/holiday_jp_ja --- old/kholidays-5.48.0/holidays/plan2/holiday_jp_ja 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/holidays/plan2/holiday_jp_ja 2018-08-04 12:58:20.000000000 +0200 @@ -2,30 +2,67 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> +:: Jumpei Ogawa <[email protected]> :: Firas Kraiem <[email protected]> :: :: Language: Japanese :: -:: Updated: 2016-07-09 +:: Updated: 2018-07-16 :: :: 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 "National Holiday file for Japan" +description "日本の国民の休日のファイルです。" - -:: 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" @@ -35,65 +72,94 @@ :"Children's Day" "こどもの日" public on may 5 :"Oceans' Day" -"海の日" public on third monday in july -:"Mountains' Day" -"山の日" public on august 11 +"海の日" public on third monday in july +:"Mountain 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 "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 +:: 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 holiday. Those holidays are not legally "Public :: Holidays" (so in particular not for the purpose of determining such :: holidays), but they are identical in practice. +"振替休日" 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 january 2 2012 +"振替休日" public on april 30 2012 +"振替休日" public on december 24 2012 +"振替休日" public on may 6 2013 +"振替休日" public on november 4 2013 +"振替休日" public on may 6 2014 +"振替休日" public on november 24 2014 +"振替休日" public on may 6 2015 +"振替休日" 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 may 6 2019 +"振替休日" public on august 12 2019 +"振替休日" public on november 4 2019 -:"Substitute holiday" -"振替休日" 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 +"休日" public on september 22 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.48.0/holidays/plan2/holiday_no_nb new/kholidays-5.49.0/holidays/plan2/holiday_no_nb --- old/kholidays-5.48.0/holidays/plan2/holiday_no_nb 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/holidays/plan2/holiday_no_nb 2018-08-04 12:58:20.000000000 +0200 @@ -13,8 +13,8 @@ :: Metadata country "NO" language "nb" -:name "optional - defaults to country name" -:description "(please add description in source language) National holiday file for Norway" +name "Norge (bokmål)" +description "Høytids-, flagg- og andre merkedager i Norge" :: Public Holidays "Nyttårsdag" public on january 1 @@ -68,9 +68,7 @@ "Nyttårsaften" civil on december 31 :: Andre "Valentinsdagen" cultural on february 14 -:: Original version was "on 29.2" but appears every year in error due to no validity checking -:: Re-enable when new parser which has noop ability -::"Skuddårsdagen" cultural on ((leapyear year) ? [2/29] : noop) +"Skuddårsdagen" cultural on ((leapyear year) ? [2/29] : noop) "Den internasjonale kvinnedagen" cultural on march 8 "Aprilsnarr" cultural on april 1 "Unionsoppløsningen 1905" cultural on june 7 @@ -90,6 +88,3 @@ "Vintertid starter" seasonal on last sunday in october :: Name Days - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/holidays/plan2/holiday_no_nn new/kholidays-5.49.0/holidays/plan2/holiday_no_nn --- old/kholidays-5.48.0/holidays/plan2/holiday_no_nn 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/holidays/plan2/holiday_no_nn 2018-08-04 12:58:20.000000000 +0200 @@ -13,8 +13,8 @@ :: Metadata country "NO" language "nn" -:name "optional - defaults to country name" -:description "(please add description in source language) National holiday file for Norway" +name "Noreg (nynorsk)" +description "Høgtids-, flagg- og andre merkedagar i Noreg" :: Public Holidays "Nyttårsdag" public on january 1 @@ -54,6 +54,7 @@ :: Mors- og farsdag "Morsdag" cultural on second sunday in february "Farsdag" cultural on second sunday in november + :: Offisielle flaggdager som ikkje er høgtidsdagar "Prinsesse Ingrid Alexandras fødselsdag" civil on january 21 "Samefolkets dag" civil on february 6 @@ -67,8 +68,7 @@ "Nyttårsaftan" civil on december 31 :: Andre "Valentinsdagen" cultural on february 14 -:: Re-enable when new parser which has noop ability -::"Skotårsdagen" cultural on ((leapyear year) ? [2/29] : noop) +"Skotårsdagen" cultural on ((leapyear year) ? [2/29] : noop) "Den internasjonale kvinnedagen" cultural on march 8 "Aprilsnarr" cultural on april 1 "Unionsoppløysinga 1905" cultural on june 7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/po/nb/libkholidays5_qt.po new/kholidays-5.49.0/po/nb/libkholidays5_qt.po --- old/kholidays-5.48.0/po/nb/libkholidays5_qt.po 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/po/nb/libkholidays5_qt.po 2018-08-04 12:58:20.000000000 +0200 @@ -1,19 +1,20 @@ # Translation of libkholidays5_qt to Norwegian Bokmål # # Bjørn Steensrud <[email protected]>, 2007, 2010, 2012, 2014. +# Karl Ove Hufthammer <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: libkholidays\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2014-09-23 22:05+0200\n" -"Last-Translator: Bjørn Steensrud <[email protected]>\n" +"PO-Revision-Date: 2018-07-17 10:47+0100\n" +"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -23,386 +24,386 @@ #: astroseasons.cpp:38 msgctxt "AstroSeasons|" msgid "June Solstice" -msgstr "" +msgstr "Sommersolverv" #: astroseasons.cpp:40 msgctxt "AstroSeasons|" msgid "December Solstice" -msgstr "" +msgstr "Vintersolverv" #: astroseasons.cpp:42 msgctxt "AstroSeasons|" msgid "March Equinox" -msgstr "" +msgstr "Vårjevndøgn" #: astroseasons.cpp:44 msgctxt "AstroSeasons|" msgid "September Equinox" -msgstr "" +msgstr "Høstjevndøgn" #: holidayregion.cpp:882 msgctxt "HolidayRegion|Canadian region" msgid "Quebec" -msgstr "" +msgstr "Quebec" #: holidayregion.cpp:884 msgctxt "HolidayRegion|German region" msgid "Bavaria" -msgstr "" +msgstr "Bayern" #: holidayregion.cpp:886 msgctxt "HolidayRegion|Spanish region" msgid "Catalonia" -msgstr "" +msgstr "Katalonia" #: holidayregion.cpp:888 msgctxt "HolidayRegion|UK Region" msgid "England and Wales" -msgstr "" +msgstr "England og Wales" #: holidayregion.cpp:890 msgctxt "HolidayRegion|UK Region" msgid "England" -msgstr "" +msgstr "England" #: holidayregion.cpp:892 msgctxt "HolidayRegion|UK Region" msgid "Wales" -msgstr "" +msgstr "Wales" #: holidayregion.cpp:894 msgctxt "HolidayRegion|UK Region" msgid "Scotland" -msgstr "" +msgstr "Skottland" #: holidayregion.cpp:896 msgctxt "HolidayRegion|UK Region" msgid "Northern Ireland" -msgstr "" +msgstr "Nord-Irland" #: holidayregion.cpp:898 msgctxt "HolidayRegion|Italian Region" msgid "South Tyrol" -msgstr "" +msgstr "Sør-Tyrol" #: holidayregion.cpp:900 msgctxt "HolidayRegion|" msgid "New South Wales" -msgstr "" +msgstr "New South Wales" #: holidayregion.cpp:902 msgctxt "HolidayRegion|Australian Region" msgid "Queensland" -msgstr "" +msgstr "Queensland" #: holidayregion.cpp:904 msgctxt "HolidayRegion|Australian Region" msgid "Victoria" -msgstr "" +msgstr "Victoria" #: holidayregion.cpp:906 msgctxt "HolidayRegion|Australian Region" msgid "South Australia" -msgstr "" +msgstr "Sør-Australia" #: holidayregion.cpp:908 msgctxt "HolidayRegion|Australian Region" msgid "Northern Territory" -msgstr "" +msgstr "Nordterritoriet" #: holidayregion.cpp:911 msgctxt "HolidayRegion|Australian Region" msgid "Australian Capital Territory" -msgstr "" +msgstr "Australian Capital Territory" #: holidayregion.cpp:914 msgctxt "HolidayRegion|Australian Region" msgid "Western Australia" -msgstr "" +msgstr "Vest-Australia" #: holidayregion.cpp:917 msgctxt "HolidayRegion|Australian Region" msgid "Tasmania" -msgstr "" +msgstr "Tasmania" #: holidayregion.cpp:920 msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" msgid "Republic of Srpska" -msgstr "" +msgstr "Republika Srpska" #: holidayregion.cpp:939 msgctxt "HolidayRegion|Holiday type" msgid "Public" -msgstr "" +msgstr "Offentlig" #: holidayregion.cpp:941 msgctxt "HolidayRegion|Holiday type" msgid "Civil" -msgstr "" +msgstr "Borgerlig" #: holidayregion.cpp:943 msgctxt "HolidayRegion|Holiday type" msgid "Religious" -msgstr "" +msgstr "Religiøs" #: holidayregion.cpp:945 msgctxt "HolidayRegion|Holiday type" msgid "Government" -msgstr "" +msgstr "Statlig" #: holidayregion.cpp:947 msgctxt "HolidayRegion|Holiday type" msgid "Financial" -msgstr "" +msgstr "Finansiell" #: holidayregion.cpp:949 msgctxt "HolidayRegion|Holiday type" msgid "Cultural" -msgstr "" +msgstr "Kulturell" #: holidayregion.cpp:951 msgctxt "HolidayRegion|Holiday type" msgid "Commemorative" -msgstr "" +msgstr "Minnedag" #: holidayregion.cpp:953 msgctxt "HolidayRegion|Holiday type" msgid "Historical" -msgstr "" +msgstr "Historisk" #: holidayregion.cpp:955 msgctxt "HolidayRegion|Holiday type" msgid "School" -msgstr "" +msgstr "Skole" #: holidayregion.cpp:957 msgctxt "HolidayRegion|Holiday type" msgid "Seasonal" -msgstr "" +msgstr "Årstid" #: holidayregion.cpp:959 msgctxt "HolidayRegion|Holiday type" msgid "Name Days" -msgstr "" +msgstr "Navnedager" #: holidayregion.cpp:961 msgctxt "HolidayRegion|Holiday type" msgid "Personal" -msgstr "" +msgstr "Personlig" #: holidayregion.cpp:963 msgctxt "HolidayRegion|Holiday type" msgid "Christian" -msgstr "" +msgstr "Kristen" #: holidayregion.cpp:965 msgctxt "HolidayRegion|Holiday type" msgid "Anglican" -msgstr "" +msgstr "Anglikansk" #: holidayregion.cpp:967 msgctxt "HolidayRegion|Holiday type" msgid "Catholic" -msgstr "" +msgstr "Katolsk" #: holidayregion.cpp:969 msgctxt "HolidayRegion|Holiday type" msgid "Protestant" -msgstr "" +msgstr "Protestantisk" #: holidayregion.cpp:971 msgctxt "HolidayRegion|Holiday type" msgid "Orthodox" -msgstr "" +msgstr "Ortodoks" #: holidayregion.cpp:973 msgctxt "HolidayRegion|Holiday type" msgid "Jewish" -msgstr "" +msgstr "Jødisk" #: holidayregion.cpp:975 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Orthodox" -msgstr "" +msgstr "Jødisk – ortodoks" #: holidayregion.cpp:977 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Conservative" -msgstr "" +msgstr "Jødisk – konservativ" #: holidayregion.cpp:979 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Reform" -msgstr "" +msgstr "Jødisk – reform" #: holidayregion.cpp:981 msgctxt "HolidayRegion|Holiday type" msgid "Islamic" -msgstr "" +msgstr "Islamsk" #: holidayregion.cpp:983 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sunni" -msgstr "" +msgstr "Islamsk – sunni" #: holidayregion.cpp:985 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Shia" -msgstr "" +msgstr "Islamsk – sjia" #: holidayregion.cpp:987 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sufi" -msgstr "" +msgstr "Islamsk – sufistisk" #: holidayregion.cpp:994 #, qt-format msgctxt "" "HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" msgid "%1 - %2" -msgstr "" +msgstr "%1 – %2" #: holidayregion.cpp:1004 msgctxt "HolidayRegion|Unknown holiday region" msgid "Unknown" -msgstr "" +msgstr "Ukjent" #: lunarphase.cpp:46 msgctxt "LunarPhase|" msgid "New Moon" -msgstr "" +msgstr "Nymåne" #: lunarphase.cpp:48 msgctxt "LunarPhase|" msgid "Full Moon" -msgstr "" +msgstr "Fullmåne" #: lunarphase.cpp:50 msgctxt "LunarPhase|" msgid "First Quarter Moon" -msgstr "" +msgstr "Ny, halvmåne" #: lunarphase.cpp:52 msgctxt "LunarPhase|" msgid "Last Quarter Moon" -msgstr "" +msgstr "Ne, halvmåne" #: zodiac.cpp:79 msgctxt "Zodiac|" msgid "Aries" -msgstr "" +msgstr "Væren" #: zodiac.cpp:81 msgctxt "Zodiac|" msgid "Taurus" -msgstr "" +msgstr "Tyren" #: zodiac.cpp:83 msgctxt "Zodiac|" msgid "Gemini" -msgstr "" +msgstr "Tvillingene" #: zodiac.cpp:85 msgctxt "Zodiac|" msgid "Cancer" -msgstr "" +msgstr "Krepsen" #: zodiac.cpp:87 msgctxt "Zodiac|" msgid "Leo" -msgstr "" +msgstr "Løven" #: zodiac.cpp:89 msgctxt "Zodiac|" msgid "Virgo" -msgstr "" +msgstr "Jomfruen" #: zodiac.cpp:91 msgctxt "Zodiac|" msgid "Libra" -msgstr "" +msgstr "Vekten" #: zodiac.cpp:93 msgctxt "Zodiac|" msgid "Scorpio" -msgstr "" +msgstr "Skorpionen" #: zodiac.cpp:95 msgctxt "Zodiac|" msgid "Sagittarius" -msgstr "" +msgstr "Skytten" #: zodiac.cpp:97 msgctxt "Zodiac|" msgid "Capricorn" -msgstr "" +msgstr "Steinbukken" #: zodiac.cpp:99 msgctxt "Zodiac|" msgid "Aquarius" -msgstr "" +msgstr "Vannmannen" #: zodiac.cpp:101 msgctxt "Zodiac|" msgid "Pisces" -msgstr "" +msgstr "Fiskene" #: zodiac.cpp:270 msgctxt "HolidayRegion|zodiac symbol for Aries" msgid "ram" -msgstr "" +msgstr "væren" #: zodiac.cpp:272 msgctxt "HolidayRegion|zodiac symbol for Taurus" msgid "bull" -msgstr "" +msgstr "tyren" #: zodiac.cpp:274 msgctxt "HolidayRegion|zodiac symbol for Gemini" msgid "twins" -msgstr "" +msgstr "tvillingene" #: zodiac.cpp:276 msgctxt "HolidayRegion|zodiac symbol for Cancer" msgid "crab" -msgstr "" +msgstr "krepsen" #: zodiac.cpp:278 msgctxt "HolidayRegion|zodiac symbol for Leo" msgid "lion" -msgstr "" +msgstr "løven" #: zodiac.cpp:280 msgctxt "HolidayRegion|zodiac symbol for Virgo" msgid "virgin" -msgstr "" +msgstr "jomfruen" #: zodiac.cpp:282 msgctxt "HolidayRegion|zodiac symbol for Libra" msgid "scales" -msgstr "" +msgstr "vekten" #: zodiac.cpp:284 msgctxt "HolidayRegion|zodiac symbol for Scorpion" msgid "scorpion" -msgstr "" +msgstr "skorpionen" #: zodiac.cpp:286 msgctxt "HolidayRegion|zodiac symbol for Sagittarius" msgid "archer" -msgstr "" +msgstr "skytten" #: zodiac.cpp:288 msgctxt "HolidayRegion|zodiac symbol for Capricorn" msgid "goat" -msgstr "" +msgstr "steinbukken" #: zodiac.cpp:290 msgctxt "HolidayRegion|zodiac symbol for Aquarius" msgid "water carrier" -msgstr "" +msgstr "vannmannen" #: zodiac.cpp:292 msgctxt "HolidayRegion|zodiac symbol for Pices" msgid "fish" -msgstr "" +msgstr "fiskene" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/po/uk/libkholidays5_qt.po new/kholidays-5.49.0/po/uk/libkholidays5_qt.po --- old/kholidays-5.48.0/po/uk/libkholidays5_qt.po 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/po/uk/libkholidays5_qt.po 2018-08-04 12:58:20.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of libkholidays5_qt.po to Ukrainian -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.48.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.49.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.48.0/po/zh_CN/libkholidays5_qt.po 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/po/zh_CN/libkholidays5_qt.po 2018-08-04 12:58:20.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-07-03 17:35\n" +"PO-Revision-Date: 2018-07-24 08:41\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.48.0/src/CMakeLists.txt new/kholidays-5.49.0/src/CMakeLists.txt --- old/kholidays-5.48.0/src/CMakeLists.txt 2018-07-08 00:30:47.000000000 +0200 +++ new/kholidays-5.49.0/src/CMakeLists.txt 2018-08-04 12:58:20.000000000 +0200 @@ -47,6 +47,7 @@ Holiday HolidayRegion LunarPhase + SunRiseSet Zodiac PREFIX KHolidays REQUIRED_HEADERS KHolidays_HEADERS
