Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2019-09-23 12:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Mon Sep 23 12:23:22 2019 rev:52 rq:730930 version:5.62.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2019-08-19 21:25:12.372672898 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new.7948/kholidays.changes 2019-09-23 12:23:23.677748023 +0200 @@ -1,0 +2,13 @@ +Sat Sep 7 20:36:47 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.62.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.62.0.php +- Changes since 5.61.0: + * Display filename where we return an error + * Remove unused includes + * Include ECMGeneratePriFile after KDEInstallDirs +- Replace pkgconfig(Qt5Foo) with cmake(Qt5Foo) in build requirements + +------------------------------------------------------------------- Old: ---- kholidays-5.61.0.tar.xz kholidays-5.61.0.tar.xz.sig New: ---- kholidays-5.62.0.tar.xz kholidays-5.62.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.QIADTo/_old 2019-09-23 12:23:24.141747947 +0200 +++ /var/tmp/diff_new_pack.QIADTo/_new 2019-09-23 12:23:24.141747947 +0200 @@ -17,29 +17,28 @@ %define lname libKF5Holidays5 -%define _tar_path 5.61 +%define _tar_path 5.62 # 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.61.0 +Version: 5.62.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: %{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz %if %{with lang} -Source1: %{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Qml) %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) %endif @@ -61,7 +60,7 @@ Summary: Development files for the KDE PIM Holiday API Group: Development/Libraries/KDE Requires: %{lname} = %{version} -Requires: pkgconfig(Qt5Core) +Requires: cmake(Qt5Core) %description devel This package contains necessary include files and libraries needed ++++++ kholidays-5.61.0.tar.xz -> kholidays-5.62.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/CMakeLists.txt new/kholidays-5.62.0/CMakeLists.txt --- old/kholidays-5.61.0/CMakeLists.txt 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/CMakeLists.txt 2019-09-07 15:59:04.000000000 +0200 @@ -1,15 +1,14 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.61.0") +set(KF5_VERSION "5.62.0") project(KHolidays VERSION ${KF5_VERSION}) -find_package(ECM 5.61.0 REQUIRED NO_MODULE) +find_package(ECM 5.62.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) include(GenerateExportHeader) include(ECMGenerateHeaders) -include(ECMGeneratePriFile) include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMPoQmTools) @@ -19,6 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMCoverageOption) include(ECMAddQch) +include(ECMGeneratePriFile) set(KHOLIDAYS_LIB_VERSION ${KF5_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/po/br/libkholidays5_qt.po new/kholidays-5.62.0/po/br/libkholidays5_qt.po --- old/kholidays-5.61.0/po/br/libkholidays5_qt.po 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/po/br/libkholidays5_qt.po 2019-09-07 15:59:04.000000000 +0200 @@ -12,7 +12,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Qt-Contexts: true\n" #: astroseasons.cpp:145 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/po/lt/libkholidays5_qt.po new/kholidays-5.62.0/po/lt/libkholidays5_qt.po --- old/kholidays-5.61.0/po/lt/libkholidays5_qt.po 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/po/lt/libkholidays5_qt.po 2019-09-07 15:59:04.000000000 +0200 @@ -8,8 +8,8 @@ "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: 2015-08-30 16:07+0200\n" -"Last-Translator: Liudas Ališauskas <liu...@akmc.lt>\n" +"PO-Revision-Date: 2019-09-05 17:52+0300\n" +"Last-Translator: Moo\n" "Language-Team: Lithuanian <kde-i18n...@kde.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -17,49 +17,40 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Poedit 2.2.1\n" "X-Qt-Contexts: true\n" #: astroseasons.cpp:145 msgctxt "AstroSeasons|" msgid "June Solstice" -msgstr "" +msgstr "Birželio saulėgrįža" #: astroseasons.cpp:147 msgctxt "AstroSeasons|" msgid "December Solstice" -msgstr "" +msgstr "Gruodžio saulėgrįža" #: astroseasons.cpp:149 msgctxt "AstroSeasons|" msgid "March Equinox" -msgstr "" +msgstr "Kovo lygiadienis" #: astroseasons.cpp:151 msgctxt "AstroSeasons|" msgid "September Equinox" -msgstr "" +msgstr "Rugsėjo lygiadienis" #: holidayregion.cpp:893 -#, fuzzy -#| msgctxt "Canadian region" -#| msgid "Quebec" msgctxt "HolidayRegion|Canadian region" msgid "Quebec" msgstr "Kvebekas" #: holidayregion.cpp:895 -#, fuzzy -#| msgctxt "German region" -#| msgid "Bavaria" msgctxt "HolidayRegion|German region" msgid "Bavaria" msgstr "Bavarija" #: holidayregion.cpp:897 -#, fuzzy -#| msgctxt "Spanish region" -#| msgid "Catalonia" msgctxt "HolidayRegion|Spanish region" msgid "Catalonia" msgstr "Katalonija" @@ -67,108 +58,69 @@ #: holidayregion.cpp:899 msgctxt "HolidayRegion|UK Region" msgid "England and Wales" -msgstr "" +msgstr "Anglija ir Velsas" #: holidayregion.cpp:901 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "England" msgctxt "HolidayRegion|UK Region" msgid "England" msgstr "Anglija" #: holidayregion.cpp:903 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Wales" msgctxt "HolidayRegion|UK Region" msgid "Wales" msgstr "Velsas" #: holidayregion.cpp:905 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Scotland" msgctxt "HolidayRegion|UK Region" msgid "Scotland" msgstr "Škotija" #: holidayregion.cpp:907 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Northern Ireland" msgctxt "HolidayRegion|UK Region" msgid "Northern Ireland" msgstr "Šiaurės Airija" #: holidayregion.cpp:909 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "South Australia" msgctxt "HolidayRegion|Italian Region" msgid "South Tyrol" -msgstr "Pietų Australija" +msgstr "Pietų Tirolis" #: holidayregion.cpp:911 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "New South Wales" msgctxt "HolidayRegion|" msgid "New South Wales" msgstr "Naujasis Pietų Velsas" #: holidayregion.cpp:913 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Queensland" msgctxt "HolidayRegion|Australian Region" msgid "Queensland" -msgstr "Kvynslandas" +msgstr "Kvinslandas" #: holidayregion.cpp:915 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Victoria" msgctxt "HolidayRegion|Australian Region" msgid "Victoria" msgstr "Viktorija" #: holidayregion.cpp:917 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "South Australia" msgctxt "HolidayRegion|Australian Region" msgid "South Australia" msgstr "Pietų Australija" #: holidayregion.cpp:919 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Northern Territory" msgctxt "HolidayRegion|Australian Region" msgid "Northern Territory" -msgstr "Šiaurės Teritorija" +msgstr "Šiaurės teritorija" #: holidayregion.cpp:922 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Australian Capital Territory" msgctxt "HolidayRegion|Australian Region" msgid "Australian Capital Territory" msgstr "Australijos sostinės teritorija" #: holidayregion.cpp:925 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Western Australia" msgctxt "HolidayRegion|Australian Region" msgid "Western Australia" msgstr "Vakarų Australija" #: holidayregion.cpp:928 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Tasmania" msgctxt "HolidayRegion|Australian Region" msgid "Tasmania" msgstr "Tasmanija" @@ -176,85 +128,64 @@ #: holidayregion.cpp:931 msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" msgid "Republic of Srpska" -msgstr "" +msgstr "Serbų respublika" #: holidayregion.cpp:950 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Public" msgctxt "HolidayRegion|Holiday type" msgid "Public" -msgstr "Vieša" +msgstr "Visuomeninės" #: holidayregion.cpp:952 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Civil" msgctxt "HolidayRegion|Holiday type" msgid "Civil" -msgstr "Civilinis" +msgstr "Civilinės" #: holidayregion.cpp:954 msgctxt "HolidayRegion|Holiday type" msgid "Religious" -msgstr "" +msgstr "Religinės" #: holidayregion.cpp:956 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Government" msgctxt "HolidayRegion|Holiday type" msgid "Government" -msgstr "Vyriausybė" +msgstr "Valstybinės" #: holidayregion.cpp:958 msgctxt "HolidayRegion|Holiday type" msgid "Financial" -msgstr "" +msgstr "Finansinės" #: holidayregion.cpp:960 msgctxt "HolidayRegion|Holiday type" msgid "Cultural" -msgstr "" +msgstr "Kultūrinės" #: holidayregion.cpp:962 msgctxt "HolidayRegion|Holiday type" msgid "Commemorative" -msgstr "" +msgstr "Atminimo" #: holidayregion.cpp:964 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Victoria" msgctxt "HolidayRegion|Holiday type" msgid "Historical" -msgstr "Viktorija" +msgstr "Istorinės" #: holidayregion.cpp:966 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "School" msgctxt "HolidayRegion|Holiday type" msgid "School" -msgstr "Mokymosi" +msgstr "Mokyklinės" #: holidayregion.cpp:968 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Personal" msgctxt "HolidayRegion|Holiday type" msgid "Seasonal" -msgstr "Asmeninės" +msgstr "Sezoninės" #: holidayregion.cpp:970 msgctxt "HolidayRegion|Holiday type" msgid "Name Days" -msgstr "" +msgstr "Vardadieniai" #: holidayregion.cpp:972 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Personal" msgctxt "HolidayRegion|Holiday type" msgid "Personal" msgstr "Asmeninės" @@ -262,252 +193,196 @@ #: holidayregion.cpp:974 msgctxt "HolidayRegion|Holiday type" msgid "Christian" -msgstr "" +msgstr "Krikščioniškos" #: holidayregion.cpp:976 msgctxt "HolidayRegion|Holiday type" msgid "Anglican" -msgstr "" +msgstr "Anglikonų" #: holidayregion.cpp:978 msgctxt "HolidayRegion|Holiday type" msgid "Catholic" -msgstr "" +msgstr "Katalikų" #: holidayregion.cpp:980 msgctxt "HolidayRegion|Holiday type" msgid "Protestant" -msgstr "" +msgstr "Protestantų" #: holidayregion.cpp:982 msgctxt "HolidayRegion|Holiday type" msgid "Orthodox" -msgstr "" +msgstr "Stačiatikių" #: holidayregion.cpp:984 msgctxt "HolidayRegion|Holiday type" msgid "Jewish" -msgstr "" +msgstr "Žydų" #: holidayregion.cpp:986 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Orthodox" -msgstr "" +msgstr "Žydų ortodoksų" #: holidayregion.cpp:988 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Conservative" -msgstr "" +msgstr "Žydų konservatyvių" #: holidayregion.cpp:990 msgctxt "HolidayRegion|Holiday type" msgid "Jewish Reform" -msgstr "" +msgstr "Žydų reformistinių" #: holidayregion.cpp:992 msgctxt "HolidayRegion|Holiday type" msgid "Islamic" -msgstr "" +msgstr "Musulmonų" #: holidayregion.cpp:994 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sunni" -msgstr "" +msgstr "Musulmonų sunitų" #: holidayregion.cpp:996 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Shia" -msgstr "" +msgstr "Musulmonų šiitų" #: holidayregion.cpp:998 msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sufi" -msgstr "" +msgstr "Musulmonų sufitų" #: holidayregion.cpp:1005 #, qt-format msgctxt "" "HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" msgid "%1 - %2" -msgstr "" +msgstr "%1 - %2" #: holidayregion.cpp:1015 -#, fuzzy -#| msgctxt "Unknown holiday region" -#| msgid "Unknown" msgctxt "HolidayRegion|Unknown holiday region" msgid "Unknown" msgstr "Nežinomos" #: lunarphase.cpp:46 -#, fuzzy -#| msgid "New Moon" msgctxt "LunarPhase|" msgid "New Moon" -msgstr "Jaunatis" +msgstr "Jaunatis (Naujas mėnulis)" #: lunarphase.cpp:48 -#, fuzzy -#| msgid "Full Moon" msgctxt "LunarPhase|" msgid "Full Moon" -msgstr "Pilnatis" +msgstr "Pilnatis (Pilnas mėnulis)" #: lunarphase.cpp:50 -#, fuzzy -#| msgid "First Quarter Moon" msgctxt "LunarPhase|" msgid "First Quarter Moon" -msgstr "Priešpilnis" +msgstr "Priešpilnis (Pirmo ketvirčio mėnulis)" #: lunarphase.cpp:52 -#, fuzzy -#| msgid "Last Quarter Moon" msgctxt "LunarPhase|" msgid "Last Quarter Moon" -msgstr "Delčia" +msgstr "Delčia (Paskutinio ketvirčio mėnulis)" #: zodiac.cpp:79 -#, fuzzy -#| msgid "Aries" msgctxt "Zodiac|" msgid "Aries" msgstr "Avinas" #: zodiac.cpp:81 -#, fuzzy -#| msgid "Taurus" msgctxt "Zodiac|" msgid "Taurus" msgstr "Tauras" #: zodiac.cpp:83 -#, fuzzy -#| msgid "Gemini" msgctxt "Zodiac|" msgid "Gemini" msgstr "Dvyniai" #: zodiac.cpp:85 -#, fuzzy -#| msgid "Cancer" msgctxt "Zodiac|" msgid "Cancer" msgstr "Vėžys" #: zodiac.cpp:87 -#, fuzzy -#| msgid "Leo" msgctxt "Zodiac|" msgid "Leo" msgstr "Liūtas" #: zodiac.cpp:89 -#, fuzzy -#| msgid "Virgo" msgctxt "Zodiac|" msgid "Virgo" msgstr "Mergelė" #: zodiac.cpp:91 -#, fuzzy -#| msgid "Libra" msgctxt "Zodiac|" msgid "Libra" msgstr "Svarstyklės" #: zodiac.cpp:93 -#, fuzzy -#| msgid "Scorpio" msgctxt "Zodiac|" msgid "Scorpio" msgstr "Skorpionas" #: zodiac.cpp:95 -#, fuzzy -#| msgid "Sagittarius" msgctxt "Zodiac|" msgid "Sagittarius" msgstr "Šaulys" #: zodiac.cpp:97 -#, fuzzy -#| msgid "Capricorn" msgctxt "Zodiac|" msgid "Capricorn" msgstr "Ožiaragis" #: zodiac.cpp:99 -#, fuzzy -#| msgid "Aquarius" msgctxt "Zodiac|" msgid "Aquarius" msgstr "Vandenis" #: zodiac.cpp:101 -#, fuzzy -#| msgid "Pisces" msgctxt "Zodiac|" msgid "Pisces" -msgstr "svarstyklės" +msgstr "Žuvys" #: zodiac.cpp:270 msgctxt "HolidayRegion|zodiac symbol for Aries" msgid "ram" -msgstr "" +msgstr "avinas" #: zodiac.cpp:272 -#, fuzzy -#| msgctxt "zodiac symbol for Taurus" -#| msgid "bull" msgctxt "HolidayRegion|zodiac symbol for Taurus" msgid "bull" -msgstr "jautis" +msgstr "tauras" #: zodiac.cpp:274 -#, fuzzy -#| msgctxt "zodiac symbol for Gemini" -#| msgid "twins" msgctxt "HolidayRegion|zodiac symbol for Gemini" msgid "twins" msgstr "dvyniai" #: zodiac.cpp:276 -#, fuzzy -#| msgctxt "zodiac symbol for Cancer" -#| msgid "crab" msgctxt "HolidayRegion|zodiac symbol for Cancer" msgid "crab" -msgstr "Krabas" +msgstr "vėžys" #: zodiac.cpp:278 -#, fuzzy -#| msgctxt "zodiac symbol for Leo" -#| msgid "lion" msgctxt "HolidayRegion|zodiac symbol for Leo" msgid "lion" msgstr "liūtas" #: zodiac.cpp:280 -#, fuzzy -#| msgctxt "zodiac symbol for Virgo" -#| msgid "virgin" msgctxt "HolidayRegion|zodiac symbol for Virgo" msgid "virgin" msgstr "mergelė" #: zodiac.cpp:282 -#, fuzzy -#| msgctxt "zodiac symbol for Libra" -#| msgid "scales" msgctxt "HolidayRegion|zodiac symbol for Libra" msgid "scales" msgstr "svarstyklės" #: zodiac.cpp:284 -#, fuzzy -#| msgctxt "zodiac symbol for Scorpion" -#| msgid "scorpion" msgctxt "HolidayRegion|zodiac symbol for Scorpion" msgid "scorpion" msgstr "skorpionas" @@ -515,12 +390,9 @@ #: zodiac.cpp:286 msgctxt "HolidayRegion|zodiac symbol for Sagittarius" msgid "archer" -msgstr "" +msgstr "šaulys" #: zodiac.cpp:288 -#, fuzzy -#| msgctxt "zodiac symbol for Capricorn" -#| msgid "goat" msgctxt "HolidayRegion|zodiac symbol for Capricorn" msgid "goat" msgstr "ožiaragis" @@ -528,12 +400,9 @@ #: zodiac.cpp:290 msgctxt "HolidayRegion|zodiac symbol for Aquarius" msgid "water carrier" -msgstr "" +msgstr "vandenis" #: zodiac.cpp:292 -#, fuzzy -#| msgctxt "zodiac symbol for Pices" -#| msgid "fish" msgctxt "HolidayRegion|zodiac symbol for Pices" msgid "fish" msgstr "žuvis" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/po/ml/libkholidays5_qt.po new/kholidays-5.62.0/po/ml/libkholidays5_qt.po --- old/kholidays-5.61.0/po/ml/libkholidays5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.62.0/po/ml/libkholidays5_qt.po 2019-09-07 15:59:04.000000000 +0200 @@ -0,0 +1,399 @@ +msgid "" +msgstr "" +"Project-Id-Version: libkholidays5_qt\n" +"Last-Translator: Automatically generated\n" +"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc." +"org.in>\n" +"Language: ml\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: astroseasons.cpp:145 +msgctxt "AstroSeasons|" +msgid "June Solstice" +msgstr "" + +#: astroseasons.cpp:147 +msgctxt "AstroSeasons|" +msgid "December Solstice" +msgstr "" + +#: astroseasons.cpp:149 +msgctxt "AstroSeasons|" +msgid "March Equinox" +msgstr "" + +#: astroseasons.cpp:151 +msgctxt "AstroSeasons|" +msgid "September Equinox" +msgstr "" + +#: holidayregion.cpp:893 +msgctxt "HolidayRegion|Canadian region" +msgid "Quebec" +msgstr "" + +#: holidayregion.cpp:895 +msgctxt "HolidayRegion|German region" +msgid "Bavaria" +msgstr "" + +#: holidayregion.cpp:897 +msgctxt "HolidayRegion|Spanish region" +msgid "Catalonia" +msgstr "" + +#: holidayregion.cpp:899 +msgctxt "HolidayRegion|UK Region" +msgid "England and Wales" +msgstr "" + +#: holidayregion.cpp:901 +msgctxt "HolidayRegion|UK Region" +msgid "England" +msgstr "" + +#: holidayregion.cpp:903 +msgctxt "HolidayRegion|UK Region" +msgid "Wales" +msgstr "" + +#: holidayregion.cpp:905 +msgctxt "HolidayRegion|UK Region" +msgid "Scotland" +msgstr "" + +#: holidayregion.cpp:907 +msgctxt "HolidayRegion|UK Region" +msgid "Northern Ireland" +msgstr "" + +#: holidayregion.cpp:909 +msgctxt "HolidayRegion|Italian Region" +msgid "South Tyrol" +msgstr "" + +#: holidayregion.cpp:911 +msgctxt "HolidayRegion|" +msgid "New South Wales" +msgstr "" + +#: holidayregion.cpp:913 +msgctxt "HolidayRegion|Australian Region" +msgid "Queensland" +msgstr "" + +#: holidayregion.cpp:915 +msgctxt "HolidayRegion|Australian Region" +msgid "Victoria" +msgstr "" + +#: holidayregion.cpp:917 +msgctxt "HolidayRegion|Australian Region" +msgid "South Australia" +msgstr "" + +#: holidayregion.cpp:919 +msgctxt "HolidayRegion|Australian Region" +msgid "Northern Territory" +msgstr "" + +#: holidayregion.cpp:922 +msgctxt "HolidayRegion|Australian Region" +msgid "Australian Capital Territory" +msgstr "" + +#: holidayregion.cpp:925 +msgctxt "HolidayRegion|Australian Region" +msgid "Western Australia" +msgstr "" + +#: holidayregion.cpp:928 +msgctxt "HolidayRegion|Australian Region" +msgid "Tasmania" +msgstr "" + +#: holidayregion.cpp:931 +msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" +msgid "Republic of Srpska" +msgstr "" + +#: holidayregion.cpp:950 +msgctxt "HolidayRegion|Holiday type" +msgid "Public" +msgstr "" + +#: holidayregion.cpp:952 +msgctxt "HolidayRegion|Holiday type" +msgid "Civil" +msgstr "" + +#: holidayregion.cpp:954 +msgctxt "HolidayRegion|Holiday type" +msgid "Religious" +msgstr "" + +#: holidayregion.cpp:956 +msgctxt "HolidayRegion|Holiday type" +msgid "Government" +msgstr "" + +#: holidayregion.cpp:958 +msgctxt "HolidayRegion|Holiday type" +msgid "Financial" +msgstr "" + +#: holidayregion.cpp:960 +msgctxt "HolidayRegion|Holiday type" +msgid "Cultural" +msgstr "" + +#: holidayregion.cpp:962 +msgctxt "HolidayRegion|Holiday type" +msgid "Commemorative" +msgstr "" + +#: holidayregion.cpp:964 +msgctxt "HolidayRegion|Holiday type" +msgid "Historical" +msgstr "" + +#: holidayregion.cpp:966 +msgctxt "HolidayRegion|Holiday type" +msgid "School" +msgstr "" + +#: holidayregion.cpp:968 +msgctxt "HolidayRegion|Holiday type" +msgid "Seasonal" +msgstr "" + +#: holidayregion.cpp:970 +msgctxt "HolidayRegion|Holiday type" +msgid "Name Days" +msgstr "" + +#: holidayregion.cpp:972 +msgctxt "HolidayRegion|Holiday type" +msgid "Personal" +msgstr "" + +#: holidayregion.cpp:974 +msgctxt "HolidayRegion|Holiday type" +msgid "Christian" +msgstr "" + +#: holidayregion.cpp:976 +msgctxt "HolidayRegion|Holiday type" +msgid "Anglican" +msgstr "" + +#: holidayregion.cpp:978 +msgctxt "HolidayRegion|Holiday type" +msgid "Catholic" +msgstr "" + +#: holidayregion.cpp:980 +msgctxt "HolidayRegion|Holiday type" +msgid "Protestant" +msgstr "" + +#: holidayregion.cpp:982 +msgctxt "HolidayRegion|Holiday type" +msgid "Orthodox" +msgstr "" + +#: holidayregion.cpp:984 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish" +msgstr "" + +#: holidayregion.cpp:986 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Orthodox" +msgstr "" + +#: holidayregion.cpp:988 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Conservative" +msgstr "" + +#: holidayregion.cpp:990 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Reform" +msgstr "" + +#: holidayregion.cpp:992 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic" +msgstr "" + +#: holidayregion.cpp:994 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Sunni" +msgstr "" + +#: holidayregion.cpp:996 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Shia" +msgstr "" + +#: holidayregion.cpp:998 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Sufi" +msgstr "" + +#: holidayregion.cpp:1005 +#, qt-format +msgctxt "" +"HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" +msgid "%1 - %2" +msgstr "" + +#: holidayregion.cpp:1015 +msgctxt "HolidayRegion|Unknown holiday region" +msgid "Unknown" +msgstr "" + +#: lunarphase.cpp:46 +msgctxt "LunarPhase|" +msgid "New Moon" +msgstr "" + +#: lunarphase.cpp:48 +msgctxt "LunarPhase|" +msgid "Full Moon" +msgstr "" + +#: lunarphase.cpp:50 +msgctxt "LunarPhase|" +msgid "First Quarter Moon" +msgstr "" + +#: lunarphase.cpp:52 +msgctxt "LunarPhase|" +msgid "Last Quarter Moon" +msgstr "" + +#: zodiac.cpp:79 +msgctxt "Zodiac|" +msgid "Aries" +msgstr "" + +#: zodiac.cpp:81 +msgctxt "Zodiac|" +msgid "Taurus" +msgstr "" + +#: zodiac.cpp:83 +msgctxt "Zodiac|" +msgid "Gemini" +msgstr "" + +#: zodiac.cpp:85 +msgctxt "Zodiac|" +msgid "Cancer" +msgstr "" + +#: zodiac.cpp:87 +msgctxt "Zodiac|" +msgid "Leo" +msgstr "" + +#: zodiac.cpp:89 +msgctxt "Zodiac|" +msgid "Virgo" +msgstr "" + +#: zodiac.cpp:91 +msgctxt "Zodiac|" +msgid "Libra" +msgstr "" + +#: zodiac.cpp:93 +msgctxt "Zodiac|" +msgid "Scorpio" +msgstr "" + +#: zodiac.cpp:95 +msgctxt "Zodiac|" +msgid "Sagittarius" +msgstr "" + +#: zodiac.cpp:97 +msgctxt "Zodiac|" +msgid "Capricorn" +msgstr "" + +#: zodiac.cpp:99 +msgctxt "Zodiac|" +msgid "Aquarius" +msgstr "" + +#: zodiac.cpp:101 +msgctxt "Zodiac|" +msgid "Pisces" +msgstr "" + +#: zodiac.cpp:270 +msgctxt "HolidayRegion|zodiac symbol for Aries" +msgid "ram" +msgstr "" + +#: zodiac.cpp:272 +msgctxt "HolidayRegion|zodiac symbol for Taurus" +msgid "bull" +msgstr "" + +#: zodiac.cpp:274 +msgctxt "HolidayRegion|zodiac symbol for Gemini" +msgid "twins" +msgstr "" + +#: zodiac.cpp:276 +msgctxt "HolidayRegion|zodiac symbol for Cancer" +msgid "crab" +msgstr "" + +#: zodiac.cpp:278 +msgctxt "HolidayRegion|zodiac symbol for Leo" +msgid "lion" +msgstr "" + +#: zodiac.cpp:280 +msgctxt "HolidayRegion|zodiac symbol for Virgo" +msgid "virgin" +msgstr "" + +#: zodiac.cpp:282 +msgctxt "HolidayRegion|zodiac symbol for Libra" +msgid "scales" +msgstr "" + +#: zodiac.cpp:284 +msgctxt "HolidayRegion|zodiac symbol for Scorpion" +msgid "scorpion" +msgstr "" + +#: zodiac.cpp:286 +msgctxt "HolidayRegion|zodiac symbol for Sagittarius" +msgid "archer" +msgstr "" + +#: zodiac.cpp:288 +msgctxt "HolidayRegion|zodiac symbol for Capricorn" +msgid "goat" +msgstr "" + +#: zodiac.cpp:290 +msgctxt "HolidayRegion|zodiac symbol for Aquarius" +msgid "water carrier" +msgstr "" + +#: 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.61.0/po/tg/libkholidays5_qt.po new/kholidays-5.62.0/po/tg/libkholidays5_qt.po --- old/kholidays-5.61.0/po/tg/libkholidays5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-5.62.0/po/tg/libkholidays5_qt.po 2019-09-07 15:59:04.000000000 +0200 @@ -0,0 +1,401 @@ +# Victor Ibragimov <victor.ibragi...@gmail.com>, 2019. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2019-08-18 15:00+0500\n" +"Last-Translator: Victor Ibragimov <victor.ibragi...@gmail.com>\n" +"Language-Team: English <kde-i18n-...@kde.org>\n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 19.04.3\n" + +#: astroseasons.cpp:145 +msgctxt "AstroSeasons|" +msgid "June Solstice" +msgstr "Инқилоби тобистонаи офтоб" + +#: astroseasons.cpp:147 +msgctxt "AstroSeasons|" +msgid "December Solstice" +msgstr "Инқилоби зимистонаи офтоб" + +#: astroseasons.cpp:149 +msgctxt "AstroSeasons|" +msgid "March Equinox" +msgstr "Эътидоли баҳорӣ" + +#: astroseasons.cpp:151 +msgctxt "AstroSeasons|" +msgid "September Equinox" +msgstr "Эътидоли тирамоҳӣ" + +#: holidayregion.cpp:893 +msgctxt "HolidayRegion|Canadian region" +msgid "Quebec" +msgstr "Квебек" + +#: holidayregion.cpp:895 +msgctxt "HolidayRegion|German region" +msgid "Bavaria" +msgstr "Бавария" + +#: holidayregion.cpp:897 +msgctxt "HolidayRegion|Spanish region" +msgid "Catalonia" +msgstr "Каталония" + +#: holidayregion.cpp:899 +msgctxt "HolidayRegion|UK Region" +msgid "England and Wales" +msgstr "Англия ва Уэлс" + +#: holidayregion.cpp:901 +msgctxt "HolidayRegion|UK Region" +msgid "England" +msgstr "Англия" + +#: holidayregion.cpp:903 +msgctxt "HolidayRegion|UK Region" +msgid "Wales" +msgstr "Уэлс" + +#: holidayregion.cpp:905 +msgctxt "HolidayRegion|UK Region" +msgid "Scotland" +msgstr "Шотландия" + +#: holidayregion.cpp:907 +msgctxt "HolidayRegion|UK Region" +msgid "Northern Ireland" +msgstr "Ирландияи шимолӣ" + +#: holidayregion.cpp:909 +msgctxt "HolidayRegion|Italian Region" +msgid "South Tyrol" +msgstr "Тироли Ҷанубӣ" + +#: holidayregion.cpp:911 +msgctxt "HolidayRegion|" +msgid "New South Wales" +msgstr "Уэлси Ҷанубии Нав" + +#: holidayregion.cpp:913 +msgctxt "HolidayRegion|Australian Region" +msgid "Queensland" +msgstr "Квинсленд" + +#: holidayregion.cpp:915 +msgctxt "HolidayRegion|Australian Region" +msgid "Victoria" +msgstr "Виктория" + +#: holidayregion.cpp:917 +msgctxt "HolidayRegion|Australian Region" +msgid "South Australia" +msgstr "Австралияи Ҷанубӣ" + +#: holidayregion.cpp:919 +msgctxt "HolidayRegion|Australian Region" +msgid "Northern Territory" +msgstr "Минтақаи шимолӣ" + +#: holidayregion.cpp:922 +msgctxt "HolidayRegion|Australian Region" +msgid "Australian Capital Territory" +msgstr "Минтақаи пойтахти Австралия" + +#: holidayregion.cpp:925 +msgctxt "HolidayRegion|Australian Region" +msgid "Western Australia" +msgstr "Австралияи Ғарбӣ" + +#: holidayregion.cpp:928 +msgctxt "HolidayRegion|Australian Region" +msgid "Tasmania" +msgstr "Тасмания" + +#: holidayregion.cpp:931 +msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" +msgid "Republic of Srpska" +msgstr "Ҷумҳурии Сербия" + +#: holidayregion.cpp:950 +msgctxt "HolidayRegion|Holiday type" +msgid "Public" +msgstr "Ҷамъиятӣ" + +#: holidayregion.cpp:952 +msgctxt "HolidayRegion|Holiday type" +msgid "Civil" +msgstr "Иҷтимоӣ" + +#: holidayregion.cpp:954 +msgctxt "HolidayRegion|Holiday type" +msgid "Religious" +msgstr "Динӣ" + +#: holidayregion.cpp:956 +msgctxt "HolidayRegion|Holiday type" +msgid "Government" +msgstr "Ҳукумат" + +#: holidayregion.cpp:958 +msgctxt "HolidayRegion|Holiday type" +msgid "Financial" +msgstr "Молӣ" + +#: holidayregion.cpp:960 +msgctxt "HolidayRegion|Holiday type" +msgid "Cultural" +msgstr "Фарҳангӣ" + +#: holidayregion.cpp:962 +msgctxt "HolidayRegion|Holiday type" +msgid "Commemorative" +msgstr "Ёдгорӣ" + +#: holidayregion.cpp:964 +msgctxt "HolidayRegion|Holiday type" +msgid "Historical" +msgstr "Таърихӣ" + +#: holidayregion.cpp:966 +msgctxt "HolidayRegion|Holiday type" +msgid "School" +msgstr "Мактаб" + +#: holidayregion.cpp:968 +msgctxt "HolidayRegion|Holiday type" +msgid "Seasonal" +msgstr "Мавсимӣ" + +#: holidayregion.cpp:970 +msgctxt "HolidayRegion|Holiday type" +msgid "Name Days" +msgstr "Номҳои рӯзҳо" + +#: holidayregion.cpp:972 +msgctxt "HolidayRegion|Holiday type" +msgid "Personal" +msgstr "Шахсӣ" + +#: holidayregion.cpp:974 +msgctxt "HolidayRegion|Holiday type" +msgid "Christian" +msgstr "Насронӣ" + +#: holidayregion.cpp:976 +msgctxt "HolidayRegion|Holiday type" +msgid "Anglican" +msgstr "Англиканӣ" + +#: holidayregion.cpp:978 +msgctxt "HolidayRegion|Holiday type" +msgid "Catholic" +msgstr "Катoликӣ" + +#: holidayregion.cpp:980 +msgctxt "HolidayRegion|Holiday type" +msgid "Protestant" +msgstr "Протестант" + +#: holidayregion.cpp:982 +msgctxt "HolidayRegion|Holiday type" +msgid "Orthodox" +msgstr "Собитқадам" + +#: holidayregion.cpp:984 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish" +msgstr "Яҳудӣ" + +#: holidayregion.cpp:986 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Orthodox" +msgstr "Собитқадами яҳудӣ" + +#: holidayregion.cpp:988 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Conservative" +msgstr "Яҳудии куҳнапаpаcтӣ" + +#: holidayregion.cpp:990 +msgctxt "HolidayRegion|Holiday type" +msgid "Jewish Reform" +msgstr "Ислоҳоти яҳудӣ" + +#: holidayregion.cpp:992 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic" +msgstr "Исломӣ" + +#: holidayregion.cpp:994 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Sunni" +msgstr "Исломии суннӣ" + +#: holidayregion.cpp:996 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Shia" +msgstr "Исломии шиа" + +#: holidayregion.cpp:998 +msgctxt "HolidayRegion|Holiday type" +msgid "Islamic Sufi" +msgstr "Исломии сӯфӣ" + +#: holidayregion.cpp:1005 +#, qt-format +msgctxt "" +"HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" +msgid "%1 - %2" +msgstr "%1 - %2" + +#: holidayregion.cpp:1015 +msgctxt "HolidayRegion|Unknown holiday region" +msgid "Unknown" +msgstr "Номаълум" + +#: lunarphase.cpp:46 +msgctxt "LunarPhase|" +msgid "New Moon" +msgstr "Моҳи нав" + +#: lunarphase.cpp:48 +msgctxt "LunarPhase|" +msgid "Full Moon" +msgstr "Моҳи пурра" + +#: lunarphase.cpp:50 +msgctxt "LunarPhase|" +msgid "First Quarter Moon" +msgstr "Моҳи чоряки якум" + +#: lunarphase.cpp:52 +msgctxt "LunarPhase|" +msgid "Last Quarter Moon" +msgstr "Моҳи чоряки охирон" + +#: zodiac.cpp:79 +msgctxt "Zodiac|" +msgid "Aries" +msgstr "Ҳамал" + +#: zodiac.cpp:81 +msgctxt "Zodiac|" +msgid "Taurus" +msgstr "Савр" + +#: zodiac.cpp:83 +msgctxt "Zodiac|" +msgid "Gemini" +msgstr "Ҷавзо" + +#: zodiac.cpp:85 +msgctxt "Zodiac|" +msgid "Cancer" +msgstr "Саратон" + +#: zodiac.cpp:87 +msgctxt "Zodiac|" +msgid "Leo" +msgstr "Асад" + +#: zodiac.cpp:89 +msgctxt "Zodiac|" +msgid "Virgo" +msgstr "Сунбула" + +#: zodiac.cpp:91 +msgctxt "Zodiac|" +msgid "Libra" +msgstr "Мизон" + +#: zodiac.cpp:93 +msgctxt "Zodiac|" +msgid "Scorpio" +msgstr "Ақраб" + +#: zodiac.cpp:95 +msgctxt "Zodiac|" +msgid "Sagittarius" +msgstr "Қавс" + +#: zodiac.cpp:97 +msgctxt "Zodiac|" +msgid "Capricorn" +msgstr "Ҷадӣ" + +#: zodiac.cpp:99 +msgctxt "Zodiac|" +msgid "Aquarius" +msgstr "Далв" + +#: zodiac.cpp:101 +msgctxt "Zodiac|" +msgid "Pisces" +msgstr "Ҳут" + +#: zodiac.cpp:270 +msgctxt "HolidayRegion|zodiac symbol for Aries" +msgid "ram" +msgstr "ҳамал" + +#: zodiac.cpp:272 +msgctxt "HolidayRegion|zodiac symbol for Taurus" +msgid "bull" +msgstr "савр" + +#: zodiac.cpp:274 +msgctxt "HolidayRegion|zodiac symbol for Gemini" +msgid "twins" +msgstr "ҷавзо" + +#: zodiac.cpp:276 +msgctxt "HolidayRegion|zodiac symbol for Cancer" +msgid "crab" +msgstr "саратон" + +#: zodiac.cpp:278 +msgctxt "HolidayRegion|zodiac symbol for Leo" +msgid "lion" +msgstr "асад" + +#: zodiac.cpp:280 +msgctxt "HolidayRegion|zodiac symbol for Virgo" +msgid "virgin" +msgstr "санбула" + +#: zodiac.cpp:282 +msgctxt "HolidayRegion|zodiac symbol for Libra" +msgid "scales" +msgstr "мизон" + +#: zodiac.cpp:284 +msgctxt "HolidayRegion|zodiac symbol for Scorpion" +msgid "scorpion" +msgstr "каждум" + +#: zodiac.cpp:286 +msgctxt "HolidayRegion|zodiac symbol for Sagittarius" +msgid "archer" +msgstr "қавс" + +#: zodiac.cpp:288 +msgctxt "HolidayRegion|zodiac symbol for Capricorn" +msgid "goat" +msgstr "ҷадӣ" + +#: zodiac.cpp:290 +msgctxt "HolidayRegion|zodiac symbol for Aquarius" +msgid "water carrier" +msgstr "далв" + +#: 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.61.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.62.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.61.0/po/zh_CN/libkholidays5_qt.po 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/po/zh_CN/libkholidays5_qt.po 2019-09-07 15:59:04.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-07-18 14:58\n" +"PO-Revision-Date: 2019-09-05 09:25\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/holiday.cpp new/kholidays-5.62.0/src/holiday.cpp --- old/kholidays-5.61.0/src/holiday.cpp 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/holiday.cpp 2019-09-07 15:59:04.000000000 +0200 @@ -25,8 +25,6 @@ #include "holiday.h" #include "holiday_p.h" -#include <QDateTime> -#include <QFile> #include <QSharedData> using namespace KHolidays; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/holiday_p.h new/kholidays-5.62.0/src/holiday_p.h --- old/kholidays-5.61.0/src/holiday_p.h 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/holiday_p.h 2019-09-07 15:59:04.000000000 +0200 @@ -26,10 +26,7 @@ #define KHOLIDAYS_HOLIDAY_P_H #include "holiday.h" - #include <QDateTime> -#include <QFile> -#include <QLocale> #include <QSharedData> namespace KHolidays diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/holidayregion.cpp new/kholidays-5.62.0/src/holidayregion.cpp --- old/kholidays-5.61.0/src/holidayregion.cpp 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/holidayregion.cpp 2019-09-07 15:59:04.000000000 +0200 @@ -27,7 +27,7 @@ #include "holidayregion.h" -#include <QDateTime> +#include <QLocale> #include <QDirIterator> #include <QFile> #include <QFileInfo> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/holidayregion.h new/kholidays-5.62.0/src/holidayregion.h --- old/kholidays-5.61.0/src/holidayregion.h 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/holidayregion.h 2019-09-07 15:59:04.000000000 +0200 @@ -27,7 +27,6 @@ #include "kholidays_export.h" -#include <QList> #include <QSharedDataPointer> #include <QString> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/parsers/plan2/holidayparserplan.cpp new/kholidays-5.62.0/src/parsers/plan2/holidayparserplan.cpp --- old/kholidays-5.61.0/src/parsers/plan2/holidayparserplan.cpp 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/parsers/plan2/holidayparserplan.cpp 2019-09-07 15:59:04.000000000 +0200 @@ -1170,7 +1170,7 @@ /* If not already recovering from an error, report this error. */ if (!yyerrstatus_) { ++yynerrs_; - error(yylloc, yysyntax_error_(yystate, yytoken)); + error(yylloc, yysyntax_error_(yylloc.begin.filename, yystate, yytoken)); } yyerror_range[0] = yylloc; @@ -1290,7 +1290,7 @@ // Generate an error message. std::string -HolidayParserPlan::yysyntax_error_(int yystate, int tok) +HolidayParserPlan::yysyntax_error_(std::string *filename, int yystate, int tok) { std::string res; YYUSE(yystate); @@ -1326,6 +1326,7 @@ if (yycheck_[x + yyn] == x && x != yyterror_) { res += (!count++) ? ", expecting " : " or "; res += yytnamerr_(yytname_[x]); + res += ". Filepath : " + *filename; } } } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.61.0/src/parsers/plan2/holidayparserplan.hpp new/kholidays-5.62.0/src/parsers/plan2/holidayparserplan.hpp --- old/kholidays-5.61.0/src/parsers/plan2/holidayparserplan.hpp 2019-08-03 21:54:21.000000000 +0200 +++ new/kholidays-5.62.0/src/parsers/plan2/holidayparserplan.hpp 2019-09-07 15:59:04.000000000 +0200 @@ -204,7 +204,7 @@ /// Generate an error message. /// \param state the state where the error occurred. /// \param tok the lookahead token. - virtual std::string yysyntax_error_ (int yystate, int tok); + virtual std::string yysyntax_error_ (std::string *filename, int yystate, int tok); #if YYDEBUG /// \brief Report a symbol value on the debug stream.
