Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2017-06-12 15:25:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Mon Jun 12 15:25:59 2017 rev:23 rq:502409 version:17.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2017-05-22 10:40:33.647471361 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2017-06-12 15:26:00.974657634 +0200 @@ -1,0 +2,17 @@ +Thu Jun 8 18:20:31 UTC 2017 - [email protected] + +- Add upstream patch revert-turkish-holiday-update.patch: + * Revert changes to Turkish holidays, as they cause Plasma to + crash on startup + +------------------------------------------------------------------- +Wed Jun 07 17:42:49 CEST 2017 - [email protected] + +- Update to 17.04.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.2.php +- Changes since 17.04.1: + * Update Turkish Holiday File (EN and TR) Differential Revision: https://phabricator.kde.org/D6009 + +------------------------------------------------------------------- Old: ---- kholidays-17.04.1.tar.xz New: ---- kholidays-17.04.2.tar.xz revert-turkish-holiday-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.Ymb2Kh/_old 2017-06-12 15:26:01.618566771 +0200 +++ /var/tmp/diff_new_pack.Ymb2Kh/_new 2017-06-12 15:26:01.622566206 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kholidays -Version: 17.04.1 +Version: 17.04.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) @@ -29,6 +29,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: revert-turkish-holiday-update.patch BuildRequires: extra-cmake-modules >= 5.19.0 BuildRequires: kf5-filesystem BuildRequires: pkgconfig @@ -64,6 +66,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ kholidays-17.04.1.tar.xz -> kholidays-17.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/CMakeLists.txt new/kholidays-17.04.2/CMakeLists.txt --- old/kholidays-17.04.1/CMakeLists.txt 2017-05-09 02:26:34.000000000 +0200 +++ new/kholidays-17.04.2/CMakeLists.txt 2017-06-06 02:23:43.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.1") +set(PIM_VERSION "5.5.2") project(KHolidays VERSION ${PIM_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/holidays/plan2/holiday_tr_en-gb new/kholidays-17.04.2/holidays/plan2/holiday_tr_en-gb --- old/kholidays-17.04.1/holidays/plan2/holiday_tr_en-gb 2017-04-26 07:00:23.000000000 +0200 +++ new/kholidays-17.04.2/holidays/plan2/holiday_tr_en-gb 2017-05-29 14:43:38.000000000 +0200 @@ -10,10 +10,10 @@ :: Volkan Gezer <[email protected]> :: Ömer Fadıl Usta <[email protected]> :: -:: Updated: 2013-04-19 +:: Updated: 2017-05-20 :: -:: Source: http://mevzuat.meb.gov.tr/html/114.html (for public holidays) and -:: http://www.diyanet.gov.tr/turkish/dy/Diyanet-Isleri-Baskanligi-Duyuru-9882.aspx +:: Source: http://www.mevzuat.gov.tr/MevzuatMetin/1.5.2429.pdf (for public holidays) and +:: http://www2.diyanet.gov.tr/DinHizmetleriGenelMudurlugu/Sayfalar/2017DiniG%C3%BCnlerListesi.aspx :: (for religious holidays) :: Metadata @@ -27,43 +27,27 @@ "National Sovereignty and Children's Day" public on april 23 "Labour and Solidarity Day" public on may 1 "Commemoration of Atatürk, Youth and Sports Day" public on may 19 +"Democracy and National Unity Day" public on july 15 "Victory Day" public on august 30 "Republic Day" public on october 29 :: Religious -:: We cannot use KDE Hijri calendar since is one/two days ahead -:: than holiday dates defined for Turkey -:: "Ramadan Feast" public religious on hijri shawwal 1 length 3 days -:: "Sacrifice Feast" public religious on hijri thualhijjah 10 length 4 days - -"Ramadan Feast" public religious on 08 august 2013 length 3 days -"Ramadan Feast" public religious on 28 july 2014 length 3 days -"Ramadan Feast" public religious on 17 july 2015 length 3 days - -"Sacrifice Feast" public religious on 15 october 2013 length 4 days -"Sacrifice Feast" public religious on 04 october 2014 length 4 days -"Sacrifice Feast" public religious on 23 september 2015 length 4 days - -"Night of Qadr" religious on 03 august 2013 -"Night of Qadr" religious on 23 july 2014 -"Night of Qadr" religious on 12 july 2015 - -"Mawlid" religious on 23 january 2013 -"Mawlid" religious on 12 january 2014 -"Mawlid" religious on 02 january 2015 -"Mawlid" religious on 22 december 2015 - -"Regaib Night" religious on 16 may 2013 -"Regaib Night" religious on 01 may 2014 -"Regaib Night" religious on 23 april 2015 - -"Miraj" religious on 05 june 2013 -"Miraj" religious on 25 may 2014 -"Miraj" religious on 15 may 2015 - -"Bara'ah Night" religious on 23 june 2013 -"Bara'ah Night" religious on 12 june 2014 -"Bara'ah Night" religious on 01 june 2015 + +"Ramadan Feast" public religious on hijri shawwal 1 length 3 +"Sacrifice Feast" public religious on hijri thualhijjah 10 length 4 + +"Night of Qadr" religious on hijri ramadan 26 + +"Mawlid" religious on hijri rabialawal 12 + +"Regaib Night" religious on hijri first thursday in rajab + +"Ashura" religious on hijri muharram 10 + +"Miraj" religious on hijri rajab 26 + +"Bara'ah Night" religious on hijri shabad 14 + :: Financial @@ -103,8 +87,6 @@ :: School :: Daylight Saving -"Daylight Saving Start" seasonal on ((year == 2011) ? [march 28] : [last sunday in march]) -"Daylight Saving End" seasonal on last sunday in october :: Seasons "Spring Begins" seasonal on march 21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/holidays/plan2/holiday_tr_tr new/kholidays-17.04.2/holidays/plan2/holiday_tr_tr --- old/kholidays-17.04.1/holidays/plan2/holiday_tr_tr 2017-04-26 07:00:23.000000000 +0200 +++ new/kholidays-17.04.2/holidays/plan2/holiday_tr_tr 2017-05-29 14:43:38.000000000 +0200 @@ -10,60 +10,43 @@ :: Volkan Gezer <[email protected]> :: Ömer Fadıl Usta <[email protected]> :: -:: Updated: 2013-04-19 +:: Updated: 2017-05-20 :: -:: Source: http://mevzuat.meb.gov.tr/html/114.html (for public holidays) and -:: http://www.diyanet.gov.tr/turkish/dy/Diyanet-Isleri-Baskanligi-Duyuru-9882.aspx +:: Source: http://www.mevzuat.gov.tr/MevzuatMetin/1.5.2429.pdf (for public holidays) and +:: http://www2.diyanet.gov.tr/DinHizmetleriGenelMudurlugu/Sayfalar/2017DiniG%C3%BCnlerListesi.aspx :: (for religious holidays) :: Metadata country "TR" language "tr" :name "optional - defaults to country name" -description "National holiday file for Turkey" +description "Türkiye'nin ulusal tatilleri" :: Public Holidays "Yeni Yıl Tatili" public on january 1 "Ulusal Egemenlik ve Çocuk Bayramı" public on april 23 "Emek ve Dayanışma Günü" public on may 1 "Atatürk'ü Anma, Gençlik ve Spor Bayramı" public on may 19 +"Demokrasi ve Millî Birlik Günü" public on july 15 "Zafer Bayramı" public on august 30 "Cumhuriyet Bayramı" public on october 29 :: Religious -:: We cannot use KDE Hijri calendar since is one/two days ahead -:: than holiday dates defined for Turkey -:: "Ramazan Bayramı" public religious on hijri shawwal 1 length 3 days -:: "Kurban Bayramı" public religious on hijri thualhijjah 10 length 4 days - -"Ramazan Bayramı" public religious on 08 august 2013 length 3 days -"Ramazan Bayramı" public religious on 28 july 2014 length 3 days -"Ramazan Bayramı" public religious on 17 july 2015 length 3 days - -"Kurban Bayramı" public religious on 15 october 2013 length 4 days -"Kurban Bayramı" public religious on 04 october 2014 length 4 days -"Kurban Bayramı" public religious on 23 september 2015 length 4 days - -"Kadir Gecesi" religious on 03 august 2013 -"Kadir Gecesi" religious on 23 july 2014 -"Kadir Gecesi" religious on 12 july 2015 - -"Mevlid Kandili" religious on 23 january 2013 -"Mevlid Kandili" religious on 12 january 2014 -"Mevlid Kandili" religious on 02 january 2015 -"Mevlid Kandili" religious on 22 december 2015 - -"Regaib Kandili" religious on 16 may 2013 -"Regaib Kandili" religious on 01 may 2014 -"Regaib Kandili" religious on 23 april 2015 - -"Mirac Kandili" religious on 05 june 2013 -"Mirac Kandili" religious on 25 may 2014 -"Mirac Kandili" religious on 15 may 2015 - -"Berat Kandili" religious on 23 june 2013 -"Berat Kandili" religious on 12 june 2014 -"Berat Kandili" religious on 01 june 2015 + +"Ramazan Bayramı" public religious on hijri shawwal 1 length 3 +"Kurban Bayramı" public religious on hijri thualhijjah 10 length 4 + +"Kadir Gecesi" religious on hijri ramadan 26 + +"Mevlid Kandili" religious on hijri rabialawal 12 + +"Regaib Kandili" religious on hijri first thursday in rajab + +"Aşure Günü" religious on hijri muharram 10 + +"Mirac Kandili" religious on hijri rajab 26 + +"Berat Kandili" religious on hijri shabad 14 :: Financial @@ -92,7 +75,7 @@ "Türk Dil Bayramı" cultural on september 26 "Dünya Kalp Günü" cultural on last sunday in september "Dünya Hayvanları Koruma Günü" cultural on october 4 -"Atatürk'ün Ölüm Yıldönümü" cultural on november 10 +"Atatürk'ü Anma Günü ve Atatürk Haftası" cultural on november 10 "Çocuk Hakları Günü" cultural on november 20 "Öğretmenler Günü" cultural on november 24 "Kadına Yönelik Şiddete Karşı Mücadele Günü" cultural on november 25 @@ -103,8 +86,6 @@ :: School :: Daylight Saving -"Yaz Saati Uygulaması Başlangıcı" seasonal on ((year == 2011) ? [march 28] : [last sunday in march]) -"Yaz Saati Uygulaması Bitişi" seasonal on last sunday in october :: Seasons "İlkbahar Başlangıcı" seasonal on march 21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/poqm/fr/libkholidays5_qt.po new/kholidays-17.04.2/poqm/fr/libkholidays5_qt.po --- old/kholidays-17.04.1/poqm/fr/libkholidays5_qt.po 2017-05-09 02:26:34.000000000 +0200 +++ new/kholidays-17.04.2/poqm/fr/libkholidays5_qt.po 2017-06-06 02:23:43.000000000 +0200 @@ -4,618 +4,409 @@ # Julien Richard-Foy <[email protected]>, 2008. # Xavier Claude <[email protected]>, 2010, 2011, 2012, 2013. # Sebastien Renard <[email protected]>, 2014. +# Vincent Pinon <[email protected]>, 2017. 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-07-12 13:30+0200\n" -"Last-Translator: Sebastien Renard <[email protected]>\n" +"PO-Revision-Date: 2017-05-05 09:18+0100\n" +"Last-Translator: Vincent Pinon <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" #: astroseasons.cpp:38 -#, fuzzy -#| msgid "June Solstice" msgctxt "AstroSeasons|" msgid "June Solstice" msgstr "Solstice d'été" #: astroseasons.cpp:40 -#, fuzzy -#| msgid "December Solstice" msgctxt "AstroSeasons|" msgid "December Solstice" msgstr "Solstice d'hiver" #: astroseasons.cpp:42 -#, fuzzy -#| msgid "March Equinox" msgctxt "AstroSeasons|" msgid "March Equinox" msgstr "Équinoxe de printemps" #: astroseasons.cpp:44 -#, fuzzy -#| msgid "September Equinox" msgctxt "AstroSeasons|" msgid "September Equinox" msgstr "Équinoxe d'automne" #: holidayregion.cpp:187 -#, fuzzy -#| msgctxt "Canadian region" -#| msgid "Quebec" msgctxt "HolidayRegion|Canadian region" msgid "Quebec" msgstr "Québec" #: holidayregion.cpp:189 -#, fuzzy -#| msgctxt "German region" -#| msgid "Bavaria" msgctxt "HolidayRegion|German region" msgid "Bavaria" msgstr "Bavière" #: holidayregion.cpp:191 -#, fuzzy -#| msgctxt "Spanish region" -#| msgid "Catalonia" msgctxt "HolidayRegion|Spanish region" msgid "Catalonia" msgstr "Catalogne" #: holidayregion.cpp:193 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "England and Wales" msgctxt "HolidayRegion|UK Region" msgid "England and Wales" msgstr "Angleterre et Pays de Galles" #: holidayregion.cpp:195 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "England" msgctxt "HolidayRegion|UK Region" msgid "England" msgstr "Angleterre" #: holidayregion.cpp:197 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Wales" msgctxt "HolidayRegion|UK Region" msgid "Wales" msgstr "Pays de Galles" #: holidayregion.cpp:199 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Scotland" msgctxt "HolidayRegion|UK Region" msgid "Scotland" msgstr "Écosse" #: holidayregion.cpp:201 -#, fuzzy -#| msgctxt "UK Region" -#| msgid "Northern Ireland" msgctxt "HolidayRegion|UK Region" msgid "Northern Ireland" msgstr "Irlande du Nord" #: holidayregion.cpp:203 -#, fuzzy -#| msgctxt "Italian Region" -#| msgid "South Tyrol" msgctxt "HolidayRegion|Italian Region" msgid "South Tyrol" msgstr "Tyrol du Sud" #: holidayregion.cpp:205 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "New South Wales" msgctxt "HolidayRegion|" msgid "New South Wales" msgstr "Nouvelle-Galles du Sud" #: holidayregion.cpp:207 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Queensland" msgctxt "HolidayRegion|Australian Region" msgid "Queensland" msgstr "Queensland" #: holidayregion.cpp:209 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Victoria" msgctxt "HolidayRegion|Australian Region" msgid "Victoria" msgstr "Victoria" #: holidayregion.cpp:211 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "South Australia" msgctxt "HolidayRegion|Australian Region" msgid "South Australia" msgstr "Australie méridionale" #: holidayregion.cpp:213 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Northern Territory" msgctxt "HolidayRegion|Australian Region" msgid "Northern Territory" msgstr "Territoire du Nord" #: holidayregion.cpp:215 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Australian Capital Territory" msgctxt "HolidayRegion|Australian Region" msgid "Australian Capital Territory" msgstr "Territoire de la capitale australienne" #: holidayregion.cpp:217 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Western Australia" msgctxt "HolidayRegion|Australian Region" msgid "Western Australia" msgstr "Australie occidentale" #: holidayregion.cpp:219 -#, fuzzy -#| msgctxt "Australian Region" -#| msgid "Tasmania" msgctxt "HolidayRegion|Australian Region" msgid "Tasmania" msgstr "Tasmanie" #: holidayregion.cpp:221 -#, fuzzy -#| msgctxt "Bosnian and Herzegovinian Region" -#| msgid "Republic of Srpska" msgctxt "HolidayRegion|Bosnian and Herzegovinian Region" msgid "Republic of Srpska" msgstr "République serbe de Bosnie" #: holidayregion.cpp:239 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Public" msgctxt "HolidayRegion|Holiday type" msgid "Public" msgstr "Public" #: holidayregion.cpp:241 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Civil" msgctxt "HolidayRegion|Holiday type" msgid "Civil" msgstr "Civil" #: holidayregion.cpp:243 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Religious" msgctxt "HolidayRegion|Holiday type" msgid "Religious" msgstr "Religieux" #: holidayregion.cpp:245 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Government" msgctxt "HolidayRegion|Holiday type" msgid "Government" msgstr "Gouvernement" #: holidayregion.cpp:247 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Financial" msgctxt "HolidayRegion|Holiday type" msgid "Financial" msgstr "Financier" #: holidayregion.cpp:249 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Cultural" msgctxt "HolidayRegion|Holiday type" msgid "Cultural" msgstr "Culturel" #: holidayregion.cpp:251 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Commemorative" msgctxt "HolidayRegion|Holiday type" msgid "Commemorative" msgstr "Commémoratif" #: holidayregion.cpp:253 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Historical" msgctxt "HolidayRegion|Holiday type" msgid "Historical" msgstr "Historique" #: holidayregion.cpp:255 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "School" msgctxt "HolidayRegion|Holiday type" msgid "School" msgstr "Scolaire" #: holidayregion.cpp:257 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Seasonal" msgctxt "HolidayRegion|Holiday type" msgid "Seasonal" msgstr "Saisonnier" #: holidayregion.cpp:259 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Name Days" msgctxt "HolidayRegion|Holiday type" msgid "Name Days" msgstr "Fêtes" #: holidayregion.cpp:261 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Personal" msgctxt "HolidayRegion|Holiday type" msgid "Personal" msgstr "Personnel" #: holidayregion.cpp:263 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Christian" msgctxt "HolidayRegion|Holiday type" msgid "Christian" msgstr "Chrétien" #: holidayregion.cpp:265 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Anglican" msgctxt "HolidayRegion|Holiday type" msgid "Anglican" msgstr "Anglican" #: holidayregion.cpp:267 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Catholic" msgctxt "HolidayRegion|Holiday type" msgid "Catholic" msgstr "Catholique" #: holidayregion.cpp:269 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Protestant" msgctxt "HolidayRegion|Holiday type" msgid "Protestant" msgstr "Protestant" #: holidayregion.cpp:271 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Orthodox" msgctxt "HolidayRegion|Holiday type" msgid "Orthodox" msgstr "Orthodoxe" #: holidayregion.cpp:273 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Jewish" msgctxt "HolidayRegion|Holiday type" msgid "Jewish" msgstr "Juif" #: holidayregion.cpp:275 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Jewish Orthodox" msgctxt "HolidayRegion|Holiday type" msgid "Jewish Orthodox" msgstr "Juif orthodoxe" #: holidayregion.cpp:277 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Jewish Conservative" msgctxt "HolidayRegion|Holiday type" msgid "Jewish Conservative" msgstr "Juif massorti" #: holidayregion.cpp:279 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Jewish Reform" msgctxt "HolidayRegion|Holiday type" msgid "Jewish Reform" msgstr "Juif réformé" #: holidayregion.cpp:281 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Islamic" msgctxt "HolidayRegion|Holiday type" msgid "Islamic" msgstr "Islamique" #: holidayregion.cpp:283 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Islamic Sunni" msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sunni" msgstr "Islamique Sunnite" #: holidayregion.cpp:285 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Islamic Shia" msgctxt "HolidayRegion|Holiday type" msgid "Islamic Shia" msgstr "Islamique Chiite" #: holidayregion.cpp:287 -#, fuzzy -#| msgctxt "Holiday type" -#| msgid "Islamic Sufi" msgctxt "HolidayRegion|Holiday type" msgid "Islamic Sufi" msgstr "Islamique Soufi" #: holidayregion.cpp:293 -#, fuzzy, qt-format -#| msgctxt "Holiday file display name, %1 = region name, %2 = holiday type" -#| msgid "%1 - %2" +#, qt-format msgctxt "" "HolidayRegion|Holiday file display name, %1 = region name, %2 = holiday type" msgid "%1 - %2" msgstr "%1 - %2" #: holidayregion.cpp:300 -#, fuzzy -#| msgctxt "Unknown holiday region" -#| msgid "Unknown" msgctxt "HolidayRegion|Unknown holiday region" msgid "Unknown" msgstr "Inconnu" #: lunarphase.cpp:46 -#, fuzzy -#| msgid "New Moon" msgctxt "LunarPhase|" msgid "New Moon" msgstr "Nouvelle lune" #: lunarphase.cpp:48 -#, fuzzy -#| msgid "Full Moon" msgctxt "LunarPhase|" msgid "Full Moon" msgstr "Pleine lune" #: lunarphase.cpp:50 -#, fuzzy -#| msgid "First Quarter Moon" msgctxt "LunarPhase|" msgid "First Quarter Moon" msgstr "Premier quartier" #: lunarphase.cpp:52 -#, fuzzy -#| msgid "Last Quarter Moon" msgctxt "LunarPhase|" msgid "Last Quarter Moon" msgstr "Dernier quartier" #: zodiac.cpp:79 -#, fuzzy -#| msgid "Aries" msgctxt "Zodiac|" msgid "Aries" msgstr "Bélier" #: zodiac.cpp:81 -#, fuzzy -#| msgid "Taurus" msgctxt "Zodiac|" msgid "Taurus" msgstr "Taureau" #: zodiac.cpp:83 -#, fuzzy -#| msgid "Gemini" msgctxt "Zodiac|" msgid "Gemini" msgstr "Gémeaux" #: zodiac.cpp:85 -#, fuzzy -#| msgid "Cancer" msgctxt "Zodiac|" msgid "Cancer" msgstr "Cancer" #: zodiac.cpp:87 -#, fuzzy -#| msgid "Leo" msgctxt "Zodiac|" msgid "Leo" msgstr "Lion" #: zodiac.cpp:89 -#, fuzzy -#| msgid "Virgo" msgctxt "Zodiac|" msgid "Virgo" msgstr "Vierge" #: zodiac.cpp:91 -#, fuzzy -#| msgid "Libra" msgctxt "Zodiac|" msgid "Libra" msgstr "Balance" #: zodiac.cpp:93 -#, fuzzy -#| msgid "Scorpio" msgctxt "Zodiac|" msgid "Scorpio" msgstr "Scorpion" #: zodiac.cpp:95 -#, fuzzy -#| msgid "Sagittarius" msgctxt "Zodiac|" msgid "Sagittarius" msgstr "Sagittaire" #: zodiac.cpp:97 -#, fuzzy -#| msgid "Capricorn" msgctxt "Zodiac|" msgid "Capricorn" msgstr "Capricorne" #: zodiac.cpp:99 -#, fuzzy -#| msgid "Aquarius" msgctxt "Zodiac|" msgid "Aquarius" msgstr "Verseau" #: zodiac.cpp:101 -#, fuzzy -#| msgid "Pisces" msgctxt "Zodiac|" msgid "Pisces" msgstr "Poisson" #: zodiac.cpp:272 -#, fuzzy -#| msgctxt "zodiac symbol for Aries" -#| msgid "ram" msgctxt "HolidayRegion|zodiac symbol for Aries" msgid "ram" msgstr "bélier" #: zodiac.cpp:274 -#, fuzzy -#| msgctxt "zodiac symbol for Taurus" -#| msgid "bull" msgctxt "HolidayRegion|zodiac symbol for Taurus" msgid "bull" msgstr "taureau" #: zodiac.cpp:276 -#, fuzzy -#| msgctxt "zodiac symbol for Gemini" -#| msgid "twins" msgctxt "HolidayRegion|zodiac symbol for Gemini" msgid "twins" msgstr "gémeaux" #: zodiac.cpp:278 -#, fuzzy -#| msgctxt "zodiac symbol for Cancer" -#| msgid "crab" msgctxt "HolidayRegion|zodiac symbol for Cancer" msgid "crab" msgstr "cancer" #: zodiac.cpp:280 -#, fuzzy -#| msgctxt "zodiac symbol for Leo" -#| msgid "lion" msgctxt "HolidayRegion|zodiac symbol for Leo" msgid "lion" msgstr "lion" #: zodiac.cpp:282 -#, fuzzy -#| msgctxt "zodiac symbol for Virgo" -#| msgid "virgin" msgctxt "HolidayRegion|zodiac symbol for Virgo" msgid "virgin" msgstr "vierge" #: zodiac.cpp:284 -#, fuzzy -#| msgctxt "zodiac symbol for Libra" -#| msgid "scales" msgctxt "HolidayRegion|zodiac symbol for Libra" msgid "scales" msgstr "balance" #: zodiac.cpp:286 -#, fuzzy -#| msgctxt "zodiac symbol for Scorpion" -#| msgid "scorpion" msgctxt "HolidayRegion|zodiac symbol for Scorpion" msgid "scorpion" msgstr "scorpion" #: zodiac.cpp:288 -#, fuzzy -#| msgctxt "zodiac symbol for Sagittarius" -#| msgid "archer" msgctxt "HolidayRegion|zodiac symbol for Sagittarius" msgid "archer" msgstr "sagittaire" #: zodiac.cpp:290 -#, fuzzy -#| msgctxt "zodiac symbol for Capricorn" -#| msgid "goat" msgctxt "HolidayRegion|zodiac symbol for Capricorn" msgid "goat" msgstr "capricorne" #: zodiac.cpp:292 -#, fuzzy -#| msgctxt "zodiac symbol for Aquarius" -#| msgid "water carrier" msgctxt "HolidayRegion|zodiac symbol for Aquarius" msgid "water carrier" msgstr "verseau" #: zodiac.cpp:294 -#, fuzzy -#| msgctxt "zodiac symbol for Pices" -#| msgid "fish" msgctxt "HolidayRegion|zodiac symbol for Pices" msgid "fish" msgstr "poisson" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/poqm/he/libkholidays5_qt.po new/kholidays-17.04.2/poqm/he/libkholidays5_qt.po --- old/kholidays-17.04.1/poqm/he/libkholidays5_qt.po 2017-05-09 02:26:34.000000000 +0200 +++ new/kholidays-17.04.2/poqm/he/libkholidays5_qt.po 2017-06-06 02:23:43.000000000 +0200 @@ -1,19 +1,20 @@ # translation of libkholidays.po to Hebrew # # Diego Iastrubni <[email protected]>, 2005. +# Elkana Bardugo <[email protected]>, 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: libkholidays\n" +"Project-Id-Version: libkholidays5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2005-12-03 17:30+0200\n" -"Last-Translator: Diego Iastrubni <[email protected]>\n" +"PO-Revision-Date: 2017-05-16 06:42-0400\n" +"Last-Translator: Copied by Zanata <[email protected]>\n" "Language-Team: Hebrew <[email protected]>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11\n" +"X-Generator: Zanata 3.9.6\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -74,14 +75,12 @@ #: holidayregion.cpp:201 #, fuzzy -#| msgid "Northern" msgctxt "HolidayRegion|UK Region" msgid "Northern Ireland" msgstr "צפוני" #: holidayregion.cpp:203 #, fuzzy -#| msgid "Southern" msgctxt "HolidayRegion|Italian Region" msgid "South Tyrol" msgstr "דרומי" @@ -103,14 +102,12 @@ #: holidayregion.cpp:211 #, fuzzy -#| msgid "Southern" msgctxt "HolidayRegion|Australian Region" msgid "South Australia" msgstr "דרומי" #: holidayregion.cpp:213 #, fuzzy -#| msgid "Northern" msgctxt "HolidayRegion|Australian Region" msgid "Northern Territory" msgstr "צפוני" @@ -274,28 +271,24 @@ #: lunarphase.cpp:46 #, fuzzy -#| msgid "New Moon" msgctxt "LunarPhase|" msgid "New Moon" msgstr "ירח חדש" #: lunarphase.cpp:48 #, fuzzy -#| msgid "Full Moon" msgctxt "LunarPhase|" msgid "Full Moon" msgstr "ירח מלא" #: lunarphase.cpp:50 #, fuzzy -#| msgid "First Quarter Moon" msgctxt "LunarPhase|" msgid "First Quarter Moon" msgstr "רבע ראשון של הירח" #: lunarphase.cpp:52 #, fuzzy -#| msgid "Last Quarter Moon" msgctxt "LunarPhase|" msgid "Last Quarter Moon" msgstr "רבע אחרון של הירח" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.1/poqm/tr/libkholidays5_qt.po new/kholidays-17.04.2/poqm/tr/libkholidays5_qt.po --- old/kholidays-17.04.1/poqm/tr/libkholidays5_qt.po 2017-05-09 02:26:34.000000000 +0200 +++ new/kholidays-17.04.2/poqm/tr/libkholidays5_qt.po 2017-06-06 02:23:43.000000000 +0200 @@ -635,12 +635,12 @@ #~ "will be used for non-work days, Holiday Events that are not marked in the " #~ "Holiday Region as Days Off will continue to be work days.</p>" #~ msgstr "" -#~ "<p>Resmi tatiller gibi günleri gösterir ya da hesaplarken, Tatil " -#~ "bölgesini sadece bilgi amaçlı ya da kullanmak için seçebilirsiniz. Eğer " -#~ "Tatil Bölgelerini Boş Günler olarak olarak kullanmayı seçerseniz, sadece " -#~ "Tatil Bölgesinin Boş Günlerinde olarak işaretlenmiş Tatil Olayları iş " -#~ "dışı günler olarak kullanılacaktır, Tatil Bölgesinin Boş Günleri olarak " -#~ "gösterilmemiş olanlar iş günü olarak görünmeye devam edecektir.</p>" +#~ "<p>Resmi tatiller gibi günleri gösterir ya da hesaplarken, Tatil bölgesini " +#~ "sadece bilgi amaçlı ya da kullanmak için seçebilirsiniz. Eğer Tatil " +#~ "Bölgelerini Boş Günler olarak olarak kullanmayı seçerseniz, sadece Tatil " +#~ "Bölgesinin Boş Günlerinde olarak işaretlenmiş Tatil Olayları iş dışı günler " +#~ "olarak kullanılacaktır, Tatil Bölgesinin Boş Günleri olarak gösterilmemiş " +#~ "olanlar iş günü olarak görünmeye devam edecektir.</p>" #~ msgctxt "Combobox label, Holiday Region not used" #~ msgid "Not Used" ++++++ revert-turkish-holiday-update.patch ++++++ >From f0faec0f2bdbec4b742600a9643ebc11ff9df4cd Mon Sep 17 00:00:00 2001 From: David Faure <[email protected]> Date: Thu, 8 Jun 2017 13:10:25 +0200 Subject: Revert "Update Turkish Holiday File (EN and TR)" This reverts commit 867fb26176ecf8a99c52577f718bc7397d807352. Something in there leads to a lexer error which makes kholidays exit() (e.g. plasmashell didn't start anymore) CCMAIL: [email protected], [email protected] --- holidays/plan2/holiday_tr_en-gb | 44 ++++++++++++++++++++++++++------------ holidays/plan2/holiday_tr_tr | 47 +++++++++++++++++++++++++++++------------ 2 files changed, 64 insertions(+), 27 deletions(-) mode change 100755 => 100644 holidays/plan2/holiday_tr_en-gb mode change 100755 => 100644 holidays/plan2/holiday_tr_tr diff --git a/holidays/plan2/holiday_tr_en-gb b/holidays/plan2/holiday_tr_en-gb old mode 100755 new mode 100644 index 40b3d37..be1551b --- a/holidays/plan2/holiday_tr_en-gb +++ b/holidays/plan2/holiday_tr_en-gb @@ -10,10 +10,10 @@ :: Volkan Gezer <[email protected]> :: Ömer Fadıl Usta <[email protected]> :: -:: Updated: 2017-05-20 +:: Updated: 2013-04-19 :: -:: Source: http://www.mevzuat.gov.tr/MevzuatMetin/1.5.2429.pdf (for public holidays) and -:: http://www2.diyanet.gov.tr/DinHizmetleriGenelMudurlugu/Sayfalar/2017DiniG%C3%BCnlerListesi.aspx +:: Source: http://mevzuat.meb.gov.tr/html/114.html (for public holidays) and +:: http://www.diyanet.gov.tr/turkish/dy/Diyanet-Isleri-Baskanligi-Duyuru-9882.aspx :: (for religious holidays) :: Metadata @@ -27,27 +27,43 @@ description "National holiday file for Turkey" "National Sovereignty and Children's Day" public on april 23 "Labour and Solidarity Day" public on may 1 "Commemoration of Atatürk, Youth and Sports Day" public on may 19 -"Democracy and National Unity Day" public on july 15 "Victory Day" public on august 30 "Republic Day" public on october 29 :: Religious +:: We cannot use KDE Hijri calendar since is one/two days ahead +:: than holiday dates defined for Turkey +:: "Ramadan Feast" public religious on hijri shawwal 1 length 3 days +:: "Sacrifice Feast" public religious on hijri thualhijjah 10 length 4 days -"Ramadan Feast" public religious on hijri shawwal 1 length 3 -"Sacrifice Feast" public religious on hijri thualhijjah 10 length 4 +"Ramadan Feast" public religious on 08 august 2013 length 3 days +"Ramadan Feast" public religious on 28 july 2014 length 3 days +"Ramadan Feast" public religious on 17 july 2015 length 3 days -"Night of Qadr" religious on hijri ramadan 26 +"Sacrifice Feast" public religious on 15 october 2013 length 4 days +"Sacrifice Feast" public religious on 04 october 2014 length 4 days +"Sacrifice Feast" public religious on 23 september 2015 length 4 days -"Mawlid" religious on hijri rabialawal 12 +"Night of Qadr" religious on 03 august 2013 +"Night of Qadr" religious on 23 july 2014 +"Night of Qadr" religious on 12 july 2015 -"Regaib Night" religious on hijri first thursday in rajab +"Mawlid" religious on 23 january 2013 +"Mawlid" religious on 12 january 2014 +"Mawlid" religious on 02 january 2015 +"Mawlid" religious on 22 december 2015 -"Ashura" religious on hijri muharram 10 +"Regaib Night" religious on 16 may 2013 +"Regaib Night" religious on 01 may 2014 +"Regaib Night" religious on 23 april 2015 -"Miraj" religious on hijri rajab 26 - -"Bara'ah Night" religious on hijri shabad 14 +"Miraj" religious on 05 june 2013 +"Miraj" religious on 25 may 2014 +"Miraj" religious on 15 may 2015 +"Bara'ah Night" religious on 23 june 2013 +"Bara'ah Night" religious on 12 june 2014 +"Bara'ah Night" religious on 01 june 2015 :: Financial @@ -87,6 +103,8 @@ description "National holiday file for Turkey" :: School :: Daylight Saving +"Daylight Saving Start" seasonal on ((year == 2011) ? [march 28] : [last sunday in march]) +"Daylight Saving End" seasonal on last sunday in october :: Seasons "Spring Begins" seasonal on march 21 diff --git a/holidays/plan2/holiday_tr_tr b/holidays/plan2/holiday_tr_tr old mode 100755 new mode 100644 index 5b7bb6e..7d952ea --- a/holidays/plan2/holiday_tr_tr +++ b/holidays/plan2/holiday_tr_tr @@ -10,43 +10,60 @@ :: Volkan Gezer <[email protected]> :: Ömer Fadıl Usta <[email protected]> :: -:: Updated: 2017-05-20 +:: Updated: 2013-04-19 :: -:: Source: http://www.mevzuat.gov.tr/MevzuatMetin/1.5.2429.pdf (for public holidays) and -:: http://www2.diyanet.gov.tr/DinHizmetleriGenelMudurlugu/Sayfalar/2017DiniG%C3%BCnlerListesi.aspx +:: Source: http://mevzuat.meb.gov.tr/html/114.html (for public holidays) and +:: http://www.diyanet.gov.tr/turkish/dy/Diyanet-Isleri-Baskanligi-Duyuru-9882.aspx :: (for religious holidays) :: Metadata country "TR" language "tr" :name "optional - defaults to country name" -description "Türkiye'nin ulusal tatilleri" +description "National holiday file for Turkey" :: Public Holidays "Yeni Yıl Tatili" public on january 1 "Ulusal Egemenlik ve Çocuk Bayramı" public on april 23 "Emek ve Dayanışma Günü" public on may 1 "Atatürk'ü Anma, Gençlik ve Spor Bayramı" public on may 19 -"Demokrasi ve Millî Birlik Günü" public on july 15 "Zafer Bayramı" public on august 30 "Cumhuriyet Bayramı" public on october 29 :: Religious +:: We cannot use KDE Hijri calendar since is one/two days ahead +:: than holiday dates defined for Turkey +:: "Ramazan Bayramı" public religious on hijri shawwal 1 length 3 days +:: "Kurban Bayramı" public religious on hijri thualhijjah 10 length 4 days -"Ramazan Bayramı" public religious on hijri shawwal 1 length 3 -"Kurban Bayramı" public religious on hijri thualhijjah 10 length 4 +"Ramazan Bayramı" public religious on 08 august 2013 length 3 days +"Ramazan Bayramı" public religious on 28 july 2014 length 3 days +"Ramazan Bayramı" public religious on 17 july 2015 length 3 days -"Kadir Gecesi" religious on hijri ramadan 26 +"Kurban Bayramı" public religious on 15 october 2013 length 4 days +"Kurban Bayramı" public religious on 04 october 2014 length 4 days +"Kurban Bayramı" public religious on 23 september 2015 length 4 days -"Mevlid Kandili" religious on hijri rabialawal 12 +"Kadir Gecesi" religious on 03 august 2013 +"Kadir Gecesi" religious on 23 july 2014 +"Kadir Gecesi" religious on 12 july 2015 -"Regaib Kandili" religious on hijri first thursday in rajab +"Mevlid Kandili" religious on 23 january 2013 +"Mevlid Kandili" religious on 12 january 2014 +"Mevlid Kandili" religious on 02 january 2015 +"Mevlid Kandili" religious on 22 december 2015 -"Aşure Günü" religious on hijri muharram 10 +"Regaib Kandili" religious on 16 may 2013 +"Regaib Kandili" religious on 01 may 2014 +"Regaib Kandili" religious on 23 april 2015 -"Mirac Kandili" religious on hijri rajab 26 +"Mirac Kandili" religious on 05 june 2013 +"Mirac Kandili" religious on 25 may 2014 +"Mirac Kandili" religious on 15 may 2015 -"Berat Kandili" religious on hijri shabad 14 +"Berat Kandili" religious on 23 june 2013 +"Berat Kandili" religious on 12 june 2014 +"Berat Kandili" religious on 01 june 2015 :: Financial @@ -75,7 +92,7 @@ description "Türkiye'nin ulusal tatilleri" "Türk Dil Bayramı" cultural on september 26 "Dünya Kalp Günü" cultural on last sunday in september "Dünya Hayvanları Koruma Günü" cultural on october 4 -"Atatürk'ü Anma Günü ve Atatürk Haftası" cultural on november 10 +"Atatürk'ün Ölüm Yıldönümü" cultural on november 10 "Çocuk Hakları Günü" cultural on november 20 "Öğretmenler Günü" cultural on november 24 "Kadına Yönelik Şiddete Karşı Mücadele Günü" cultural on november 25 @@ -86,6 +103,8 @@ description "Türkiye'nin ulusal tatilleri" :: School :: Daylight Saving +"Yaz Saati Uygulaması Başlangıcı" seasonal on ((year == 2011) ? [march 28] : [last sunday in march]) +"Yaz Saati Uygulaması Bitişi" seasonal on last sunday in october :: Seasons "İlkbahar Başlangıcı" seasonal on march 21 -- cgit v0.11.2
