diff -Nru umbrello-19.04.2/cmake/modules/ECMKDE4Macros.cmake umbrello-19.04.3/cmake/modules/ECMKDE4Macros.cmake --- umbrello-19.04.2/cmake/modules/ECMKDE4Macros.cmake 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/cmake/modules/ECMKDE4Macros.cmake 2019-07-06 09:30:51.000000000 +0000 @@ -54,6 +54,9 @@ macro(add_executable) # avoid recursive loops + if(NOT DEFINED in_add_executable) + set(in_add_executable 0) + endif() math(EXPR in_add_executable "${in_add_executable} + 1") if(${in_find_package} OR ${in_add_executable} GREATER 1) _add_executable(${ARGV}) @@ -96,6 +99,9 @@ macro(find_package package) # avoid recursive loops + if(NOT DEFINED in_find_package) + set(in_find_package 0) + endif() math(EXPR in_find_package "${in_find_package} + 1") #message("-- ${ARGV} --") if("${package}" MATCHES "^(Qt5)") diff -Nru umbrello-19.04.2/CMakeLists.txt umbrello-19.04.3/CMakeLists.txt --- umbrello-19.04.2/CMakeLists.txt 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/CMakeLists.txt 2019-07-06 09:30:51.000000000 +0000 @@ -5,7 +5,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set(UMBRELLO_VERSION_MAJOR "2") MATH(EXPR UMBRELLO_VERSION_MINOR "30-${KDE_APPLICATIONS_VERSION_MINOR}") diff -Nru umbrello-19.04.2/debian/changelog umbrello-19.04.3/debian/changelog --- umbrello-19.04.2/debian/changelog 2019-06-08 14:18:02.000000000 +0000 +++ umbrello-19.04.3/debian/changelog 2019-07-11 13:22:08.000000000 +0000 @@ -1,3 +1,9 @@ +umbrello (4:19.04.3-0ubuntu1) eoan; urgency=medium + + * New upstream release (19.04.3) + + -- Rik Mills Thu, 11 Jul 2019 14:22:08 +0100 + umbrello (4:19.04.2-0ubuntu1) eoan; urgency=medium * New upstream release (19.04.2) diff -Nru umbrello-19.04.2/po/ar/umbrello.po umbrello-19.04.3/po/ar/umbrello.po --- umbrello-19.04.2/po/ar/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/ar/umbrello.po 2019-07-09 00:15:01.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2007-10-14 16:00+0000\n" "Last-Translator: Youssef Chahibi \n" "Language-Team: \n" @@ -4028,7 +4028,7 @@ msgid "Docbook Generation Failed..." msgstr "الجيل failed." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, fuzzy, kde-format msgid "Exporting to DocBook..." msgstr "صدِّر شكل ، نموذج إلى DocBook" diff -Nru umbrello-19.04.2/po/bg/umbrello.po umbrello-19.04.3/po/bg/umbrello.po --- umbrello-19.04.2/po/bg/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/bg/umbrello.po 2019-07-09 00:15:01.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2011-07-27 13:53+0300\n" "Last-Translator: Yasen Pramatarov \n" "Language-Team: Bulgarian \n" @@ -4107,7 +4107,7 @@ msgid "Docbook Generation Failed..." msgstr "Грешка при създаване на Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Изнасяне в DocBook..." diff -Nru umbrello-19.04.2/po/bs/umbrello.po umbrello-19.04.3/po/bs/umbrello.po --- umbrello-19.04.2/po/bs/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/bs/umbrello.po 2019-07-09 00:15:01.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2015-02-25 21:00+0100\n" "Last-Translator: Samir Ribić \n" "Language-Team: \n" @@ -4132,7 +4132,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook generisanje nije uspjelo..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksportovanje u DocBook..." diff -Nru umbrello-19.04.2/po/ca/umbrello.po umbrello-19.04.3/po/ca/umbrello.po --- umbrello-19.04.2/po/ca/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/ca/umbrello.po 2019-07-09 00:15:01.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-04-01 21:30+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -4105,7 +4105,7 @@ msgid "Docbook Generation Failed..." msgstr "Ha fallat la generació del Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "S'està exportant el model a DocBook..." diff -Nru umbrello-19.04.2/po/ca@valencia/umbrello.po umbrello-19.04.3/po/ca@valencia/umbrello.po --- umbrello-19.04.2/po/ca@valencia/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/ca@valencia/umbrello.po 2019-07-09 00:15:01.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-04-01 21:30+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -4105,7 +4105,7 @@ msgid "Docbook Generation Failed..." msgstr "Ha fallat la generació del Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "S'està exportant el model a DocBook..." diff -Nru umbrello-19.04.2/po/cs/umbrello.po umbrello-19.04.3/po/cs/umbrello.po --- umbrello-19.04.2/po/cs/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/cs/umbrello.po 2019-07-09 00:15:02.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-06-14 17:11+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" @@ -4054,7 +4054,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/da/umbrello.po umbrello-19.04.3/po/da/umbrello.po --- umbrello-19.04.2/po/da/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/da/umbrello.po 2019-07-09 00:15:02.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-03-03 17:38+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish\n" @@ -4105,7 +4105,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-generering fejlede..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksporterer til Docbook..." diff -Nru umbrello-19.04.2/po/de/umbrello.po umbrello-19.04.3/po/de/umbrello.po --- umbrello-19.04.2/po/de/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/de/umbrello.po 2019-07-09 00:15:02.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-16 07:06+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -4110,7 +4110,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-Erstellung fehlgeschlagen ..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Nach DocBook exportieren ..." diff -Nru umbrello-19.04.2/po/el/umbrello.po umbrello-19.04.3/po/el/umbrello.po --- umbrello-19.04.2/po/el/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/el/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-10-18 16:33+0300\n" "Last-Translator: Long Run \n" "Language-Team: Greek \n" @@ -4150,7 +4150,7 @@ msgid "Docbook Generation Failed..." msgstr "Αποτυχία δημιουργίας Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Εξαγωγή σε DocBook..." diff -Nru umbrello-19.04.2/po/en_GB/umbrello.po umbrello-19.04.3/po/en_GB/umbrello.po --- umbrello-19.04.2/po/en_GB/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/en_GB/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-12-02 12:49+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" @@ -4093,7 +4093,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook Generation Failed..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exporting to DocBook..." diff -Nru umbrello-19.04.2/po/eo/umbrello.po umbrello-19.04.3/po/eo/umbrello.po --- umbrello-19.04.2/po/eo/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/eo/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2007-12-06 23:25+0100\n" "Last-Translator: Oliver M. Kellogg \n" "Language-Team: Esperanto \n" @@ -4177,7 +4177,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-generado malsukcesis..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksportanta al DocBook..." diff -Nru umbrello-19.04.2/po/es/umbrello.po umbrello-19.04.3/po/es/umbrello.po --- umbrello-19.04.2/po/es/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/es/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-13 22:42+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -4107,7 +4107,7 @@ msgid "Docbook Generation Failed..." msgstr "Generación de docbook fallida..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exportando a DocBook..." diff -Nru umbrello-19.04.2/po/et/umbrello.po umbrello-19.04.3/po/et/umbrello.po --- umbrello-19.04.2/po/et/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/et/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2016-07-28 00:10+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -4117,7 +4117,7 @@ msgid "Docbook Generation Failed..." msgstr "DocBooki genereerimise nurjus..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksport DocBook-vormingusse..." diff -Nru umbrello-19.04.2/po/eu/umbrello.po umbrello-19.04.3/po/eu/umbrello.po --- umbrello-19.04.2/po/eu/umbrello.po 2019-06-04 00:13:04.000000000 +0000 +++ umbrello-19.04.3/po/eu/umbrello.po 2019-07-09 00:15:03.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2006-05-26 09:18+0200\n" "Last-Translator: marcos \n" "Language-Team: \n" @@ -4306,7 +4306,7 @@ msgid "Docbook Generation Failed..." msgstr "&Kode sorreraren morroia..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, fuzzy, kde-format #| msgid "Exporting view..." msgid "Exporting to DocBook..." diff -Nru umbrello-19.04.2/po/fa/umbrello.po umbrello-19.04.3/po/fa/umbrello.po --- umbrello-19.04.2/po/fa/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/fa/umbrello.po 2019-07-09 00:15:04.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2014-07-19 17:56+0430\n" "Last-Translator: Mohi Mirdamadi \n" "Language-Team: Farsi (Persian) \n" @@ -4193,7 +4193,7 @@ msgid "Docbook Generation Failed..." msgstr "جادوگر تولید &کد...‌" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, fuzzy, kde-format msgid "Exporting to DocBook..." msgstr "&صادرات مدل به DocBook‌" diff -Nru umbrello-19.04.2/po/fi/umbrello.po umbrello-19.04.3/po/fi/umbrello.po --- umbrello-19.04.2/po/fi/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/fi/umbrello.po 2019-07-09 00:15:04.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2016-05-27 23:12+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" @@ -4125,7 +4125,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-luonti epäonnistui…" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Viedään DocBookiksi…" diff -Nru umbrello-19.04.2/po/fr/umbrello.po umbrello-19.04.3/po/fr/umbrello.po --- umbrello-19.04.2/po/fr/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/fr/umbrello.po 2019-07-09 00:15:04.000000000 +0000 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-03-18 17:51+0800\n" "Last-Translator: Simon Depiets \n" "Language-Team: French \n" @@ -4141,7 +4141,7 @@ msgid "Docbook Generation Failed..." msgstr "La génération du DocBook a échoué..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exporter en DocBook..." diff -Nru umbrello-19.04.2/po/ga/umbrello.po umbrello-19.04.3/po/ga/umbrello.po --- umbrello-19.04.2/po/ga/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/ga/umbrello.po 2019-07-09 00:15:04.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdesdk/umbrello.po\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -4073,7 +4073,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/gl/umbrello.po umbrello-19.04.3/po/gl/umbrello.po --- umbrello-19.04.2/po/gl/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/gl/umbrello.po 2019-07-09 00:15:04.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-03-28 13:39+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" @@ -4099,7 +4099,7 @@ msgid "Docbook Generation Failed..." msgstr "Fallou a xeración de Docbook…" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Estase a exportar a DocBook…" diff -Nru umbrello-19.04.2/po/hi/umbrello.po umbrello-19.04.3/po/hi/umbrello.po --- umbrello-19.04.2/po/hi/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/hi/umbrello.po 2019-07-09 00:15:05.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2008-02-24 17:02+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: Hindi \n" @@ -4141,7 +4141,7 @@ msgid "Docbook Generation Failed..." msgstr "डॉकबुग बनाना असफल..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "डाकबुक में निर्यात किया जा रहा है..." diff -Nru umbrello-19.04.2/po/hr/umbrello.po umbrello-19.04.3/po/hr/umbrello.po --- umbrello-19.04.2/po/hr/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/hr/umbrello.po 2019-07-09 00:15:05.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: umbrello 0\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2004-04-20 13:30+CEST\n" "Last-Translator: auto\n" "Language-Team: Croatian \n" @@ -4149,7 +4149,7 @@ msgid "Docbook Generation Failed..." msgstr "Čarobnjak za generiranje &kôda..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, fuzzy, kde-format msgid "Exporting to DocBook..." msgstr "Izlazim..." diff -Nru umbrello-19.04.2/po/hu/umbrello.po umbrello-19.04.3/po/hu/umbrello.po --- umbrello-19.04.2/po/hu/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/hu/umbrello.po 2019-07-09 00:15:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: KDE 4.2\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2014-12-09 21:45+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -4135,7 +4135,7 @@ msgid "Docbook Generation Failed..." msgstr "Nem sikerült a Docbook-generálás..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exportálás DocBook formátumban..." diff -Nru umbrello-19.04.2/po/it/umbrello.po umbrello-19.04.3/po/it/umbrello.po --- umbrello-19.04.2/po/it/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/it/umbrello.po 2019-07-09 00:15:05.000000000 +0000 @@ -4,13 +4,13 @@ # Andrea Rizzi , 2004. # Federico Zenith , 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. # Federico Zenith , 2008, 2012, 2013, 2014, 2015. -# Luigi Toscano , 2017, 2018. +# Luigi Toscano , 2017, 2018, 2019. # msgid "" msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-18 23:07+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" @@ -4099,7 +4099,7 @@ msgid "Docbook Generation Failed..." msgstr "Generazione di DocBook non riuscita." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Esportazione a DocBook..." diff -Nru umbrello-19.04.2/po/ja/umbrello.po umbrello-19.04.3/po/ja/umbrello.po --- umbrello-19.04.2/po/ja/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/ja/umbrello.po 2019-07-09 00:15:06.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2008-11-05 23:34+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" @@ -4210,7 +4210,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook の生成失敗..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "DocBook でエクスポート..." diff -Nru umbrello-19.04.2/po/kk/umbrello.po umbrello-19.04.3/po/kk/umbrello.po --- umbrello-19.04.2/po/kk/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/kk/umbrello.po 2019-07-09 00:15:06.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2013-11-08 01:50+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -4126,7 +4126,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-ты құру жаңылысы..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "DocBook-қа экспорттау..." diff -Nru umbrello-19.04.2/po/km/umbrello.po umbrello-19.04.3/po/km/umbrello.po --- umbrello-19.04.2/po/km/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/km/umbrello.po 2019-07-09 00:15:06.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2008-12-19 10:23+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -4016,7 +4016,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/ko/umbrello.po umbrello-19.04.3/po/ko/umbrello.po --- umbrello-19.04.2/po/ko/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/ko/umbrello.po 2019-07-09 00:15:06.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2015-01-18 01:25+0900\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -4070,7 +4070,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/lt/umbrello.po umbrello-19.04.3/po/lt/umbrello.po --- umbrello-19.04.2/po/lt/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/lt/umbrello.po 2019-07-09 00:15:07.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2015-12-29 16:00+0200\n" "Last-Translator: Mindaugas Baranauskas \n" "Language-Team: lt \n" @@ -4078,7 +4078,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksportuojama į DocBook..." diff -Nru umbrello-19.04.2/po/mr/umbrello.po umbrello-19.04.3/po/mr/umbrello.po --- umbrello-19.04.2/po/mr/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/mr/umbrello.po 2019-07-09 00:15:07.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2013-03-06 17:45+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -4027,7 +4027,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/nb/umbrello.po umbrello-19.04.3/po/nb/umbrello.po --- umbrello-19.04.2/po/nb/umbrello.po 2019-06-04 00:13:05.000000000 +0000 +++ umbrello-19.04.3/po/nb/umbrello.po 2019-07-09 00:15:08.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2014-04-28 19:43+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -4122,7 +4122,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-generering feilet …" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksporterer til DocBook …" diff -Nru umbrello-19.04.2/po/nds/umbrello.po umbrello-19.04.3/po/nds/umbrello.po --- umbrello-19.04.2/po/nds/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/nds/umbrello.po 2019-07-09 00:15:08.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2011-12-15 07:28+0100\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -4184,7 +4184,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook-Opstellen fehlslaan..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Bi to exporteren na't DocBook-Formaat..." diff -Nru umbrello-19.04.2/po/nl/umbrello.po umbrello-19.04.3/po/nl/umbrello.po --- umbrello-19.04.2/po/nl/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/nl/umbrello.po 2019-07-09 00:15:08.000000000 +0000 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-08 10:36+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -4117,7 +4117,7 @@ msgid "Docbook Generation Failed..." msgstr "Aanmaken van Docbook mislukt..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Bezig met exporteren naar DocBook..." diff -Nru umbrello-19.04.2/po/nn/umbrello.po umbrello-19.04.3/po/nn/umbrello.po --- umbrello-19.04.2/po/nn/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/nn/umbrello.po 2019-07-09 00:15:08.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2009-06-16 00:45+0200\n" "Last-Translator: Eirik U. Birkeland \n" "Language-Team: Norwegian Nynorsk \n" @@ -4017,7 +4017,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/pl/umbrello.po umbrello-19.04.3/po/pl/umbrello.po --- umbrello-19.04.2/po/pl/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/pl/umbrello.po 2019-07-09 00:15:08.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-01-20 07:54+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -4092,7 +4092,7 @@ msgid "Docbook Generation Failed..." msgstr "Generacja plików Docbook nie powiodła się..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Eksportowanie do formatu DocBook..." diff -Nru umbrello-19.04.2/po/pt/umbrello_kdevphp5.po umbrello-19.04.3/po/pt/umbrello_kdevphp5.po --- umbrello-19.04.2/po/pt/umbrello_kdevphp5.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/pt/umbrello_kdevphp5.po 2019-07-09 00:15:09.000000000 +0000 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2018-01-05 12:19+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru umbrello-19.04.2/po/pt/umbrello_kdevphp.po umbrello-19.04.3/po/pt/umbrello_kdevphp.po --- umbrello-19.04.2/po/pt/umbrello_kdevphp.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/pt/umbrello_kdevphp.po 2019-07-09 00:15:09.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2018-01-05 12:19+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru umbrello-19.04.2/po/pt/umbrello.po umbrello-19.04.3/po/pt/umbrello.po --- umbrello-19.04.2/po/pt/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/pt/umbrello.po 2019-07-09 00:15:09.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-08 11:14+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -4119,7 +4119,7 @@ msgid "Docbook Generation Failed..." msgstr "A Geração do Docbook Falhou..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "A exportar para DocBook..." diff -Nru umbrello-19.04.2/po/pt_BR/umbrello.po umbrello-19.04.3/po/pt_BR/umbrello.po --- umbrello-19.04.2/po/pt_BR/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/pt_BR/umbrello.po 2019-07-09 00:15:09.000000000 +0000 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-12-12 15:38-0200\n" "Last-Translator: Luiz Fernando Ranghetti \n" "Language-Team: Portuguese \n" @@ -4105,7 +4105,7 @@ msgid "Docbook Generation Failed..." msgstr "Geração do Docbook Falhou..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exportando para DocBook..." diff -Nru umbrello-19.04.2/po/ro/umbrello.po umbrello-19.04.3/po/ro/umbrello.po --- umbrello-19.04.2/po/ro/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/ro/umbrello.po 2019-07-09 00:15:09.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2012-12-22 11:47+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -4118,7 +4118,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/ru/umbrello.po umbrello-19.04.3/po/ru/umbrello.po --- umbrello-19.04.2/po/ru/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/ru/umbrello.po 2019-07-09 00:15:09.000000000 +0000 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2014-02-24 15:21+0400\n" "Last-Translator: Alexander Lakhin \n" "Language-Team: Russian \n" @@ -4140,7 +4140,7 @@ msgid "Docbook Generation Failed..." msgstr "Ошибка генерации Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Экспорт модели в DocBook..." diff -Nru umbrello-19.04.2/po/sk/umbrello.po umbrello-19.04.3/po/sk/umbrello.po --- umbrello-19.04.2/po/sk/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/sk/umbrello.po 2019-07-09 00:15:09.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-01-03 15:44+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -4101,7 +4101,7 @@ msgid "Docbook Generation Failed..." msgstr "Generovanie Docbook zlyhalo..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exportovanie do DocBook..." diff -Nru umbrello-19.04.2/po/sl/umbrello.po umbrello-19.04.3/po/sl/umbrello.po --- umbrello-19.04.2/po/sl/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/sl/umbrello.po 2019-07-09 00:15:10.000000000 +0000 @@ -1,7 +1,7 @@ # translation of umbrello.po to Slovenian # Translation of umbrello.po to Slovenian # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# $Id: umbrello.po 1542253 2019-05-20 06:55:29Z scripty $ +# $Id: umbrello.po 1545534 2019-07-03 06:27:51Z scripty $ # $Source$ # # Gregor Rakar , 2003, 2004, 2005. @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-01-14 14:06+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -4109,7 +4109,7 @@ msgid "Docbook Generation Failed..." msgstr "Ustvarjanje Docbook je spodletelo ...." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Izvažanje v DocBook ..." diff -Nru umbrello-19.04.2/po/sv/umbrello.po umbrello-19.04.3/po/sv/umbrello.po --- umbrello-19.04.2/po/sv/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/sv/umbrello.po 2019-07-09 00:15:10.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-08 20:05+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -4090,7 +4090,7 @@ msgid "Docbook Generation Failed..." msgstr "Misslyckades skapa Docbook..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Exporterar till Docbook..." diff -Nru umbrello-19.04.2/po/tr/umbrello_kdevphp.po umbrello-19.04.3/po/tr/umbrello_kdevphp.po --- umbrello-19.04.2/po/tr/umbrello_kdevphp.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/tr/umbrello_kdevphp.po 2019-07-09 00:15:10.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Turkish \n" -"Language: \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru umbrello-19.04.2/po/tr/umbrello.po umbrello-19.04.3/po/tr/umbrello.po --- umbrello-19.04.2/po/tr/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/tr/umbrello.po 2019-07-09 00:15:10.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2017-07-13 17:24+0000\n" "Last-Translator: Mete \n" "Language-Team: Turkish \n" @@ -4086,7 +4086,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook Oluşturuma İşlemi Başarısız Oldu..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "DockBook olarak Dışarıya Aktarılıyor..." diff -Nru umbrello-19.04.2/po/ug/umbrello.po umbrello-19.04.3/po/ug/umbrello.po --- umbrello-19.04.2/po/ug/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/ug/umbrello.po 2019-07-09 00:15:10.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -4042,7 +4042,7 @@ msgid "Docbook Generation Failed..." msgstr "" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "" diff -Nru umbrello-19.04.2/po/uk/umbrello.po umbrello-19.04.3/po/uk/umbrello.po --- umbrello-19.04.2/po/uk/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/uk/umbrello.po 2019-07-09 00:15:11.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2018-11-08 07:02+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -4100,7 +4100,7 @@ msgid "Docbook Generation Failed..." msgstr "Створення Docbook зазнало невдачі…" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "Експорт до DocBook…" diff -Nru umbrello-19.04.2/po/zh_CN/umbrello.po umbrello-19.04.3/po/zh_CN/umbrello.po --- umbrello-19.04.2/po/zh_CN/umbrello.po 2019-06-04 00:13:06.000000000 +0000 +++ umbrello-19.04.3/po/zh_CN/umbrello.po 2019-07-09 00:15:11.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-06-02 13:20\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" @@ -4060,7 +4060,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook 生成失败..." -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "导出到 DocBook..." diff -Nru umbrello-19.04.2/po/zh_TW/umbrello.po umbrello-19.04.3/po/zh_TW/umbrello.po --- umbrello-19.04.2/po/zh_TW/umbrello.po 2019-06-04 00:13:07.000000000 +0000 +++ umbrello-19.04.3/po/zh_TW/umbrello.po 2019-07-09 00:15:11.000000000 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: umbrello\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:41+0200\n" +"POT-Creation-Date: 2019-07-03 07:33+0200\n" "PO-Revision-Date: 2019-01-03 18:37+0800\n" "Last-Translator: pan93412 \n" "Language-Team: Chinese \n" @@ -4062,7 +4062,7 @@ msgid "Docbook Generation Failed..." msgstr "Docbook 產生失敗。" -#: docgenerators/docbookgeneratorjob.cpp:103 +#: docgenerators/docbookgeneratorjob.cpp:193 #, kde-format msgid "Exporting to DocBook..." msgstr "匯出到 DocBook..." diff -Nru umbrello-19.04.2/test/import/python/method-parameters.py umbrello-19.04.3/test/import/python/method-parameters.py --- umbrello-19.04.2/test/import/python/method-parameters.py 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/test/import/python/method-parameters.py 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,22 @@ + +class TestMethodParameters(): + def method(self): + pass + + def method_params(self,a,b): + pass + + def method_params_simple_default_values(self,a=0,a=-1,b=None,c="str",d=0.1): + pass + + def method_params_dict(self,a={} b={'a':1,'b':2}): + pass + + def method_params_dict_nested(self,a={} b={'a':1,'b':{'a':1,'b':2}}): + pass + + def method_params_list(self,a=[], b=[1,2]): + pass + + def method_params_tuple(self,a=(), b=(1,2)): + pass diff -Nru umbrello-19.04.2/test/import/python/types.py umbrello-19.04.3/test/import/python/types.py --- umbrello-19.04.2/test/import/python/types.py 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/test/import/python/types.py 2019-07-06 09:30:51.000000000 +0000 @@ -2,6 +2,12 @@ # see https://docs.python.org/3/tutorial/classes.html#class-and-instance-variables +class ReferencedType(): + def __init__(self, a=0, b=0): + pass + +myobject = ReferencedType() + class Types(): class_variable_bool_true=True class_variable_bool_false=False @@ -11,8 +17,14 @@ class_variable_negative_float=-1.0876544 class_variable_string="1234" class_variable_list=[] + class_variable_list_params=[1,2] class_variable_dict={} - class_variable_object=bpy.types.render + class_variable_dict_params={'a':1, 'b':2} + class_variable_tuple=() + class_variable_tuple_params=(1,2,3) + class_variable_object=myobject + class_variable_object_type=ReferencedType() + class_variable_object_type_params=ReferencedType(1,2) # We import instance variables only from __init__() def __init__(): @@ -25,8 +37,14 @@ self.test() # should be ignored self.instance_variable_string="1234" self.instance_variable_list=[] + self.instance_variable_list_params=[1,2] self.instance_variable_dict={} - self.instance_variable_object=bpy.types.render + self.instance_variable_dict_params={'a':1, 'b':2} + self.instance_variable_tuples=() + self.instance_variable_tuple_params=(1,2,3) + self.instance_variable_object=myobject + self.instance_variable_object_type=ReferencedType() + self.instance_variable_object_type_params=ReferencedType(1,2) def test(): - pass \ No newline at end of file + pass diff -Nru umbrello-19.04.2/test/import/python/visibility.py umbrello-19.04.3/test/import/python/visibility.py --- umbrello-19.04.2/test/import/python/visibility.py 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/test/import/python/visibility.py 2019-07-06 09:30:51.000000000 +0000 @@ -5,6 +5,10 @@ _protected=0 public=0 + # public by default + def __init__(self): + pass + def public(self): pass diff -Nru umbrello-19.04.2/umbrello/CMakeLists.txt umbrello-19.04.3/umbrello/CMakeLists.txt --- umbrello-19.04.2/umbrello/CMakeLists.txt 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/umbrello/CMakeLists.txt 2019-07-06 09:30:51.000000000 +0000 @@ -1,4 +1,5 @@ add_subdirectory( headings ) +add_subdirectory(docgenerators) if(ENABLE_OBJECT_DIAGRAM) set(ACTION_NEW_OBJECT_DIAGRAM "") @@ -664,13 +665,6 @@ install(FILES org.kde.umbrello.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) endif() -install( FILES - docgenerators/xmi2docbook.xsl - docgenerators/docbook2xhtml.xsl - docgenerators/xmi.css - docgenerators/common.ent - DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} ) - install( DIRECTORY layouts DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} diff -Nru umbrello-19.04.2/umbrello/codeimport/pythonimport.cpp umbrello-19.04.3/umbrello/codeimport/pythonimport.cpp --- umbrello-19.04.2/umbrello/codeimport/pythonimport.cpp 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/umbrello/codeimport/pythonimport.cpp 2019-07-06 09:30:51.000000000 +0000 @@ -208,65 +208,140 @@ } /** + * Parses a python initializer + * @param _keyword current string from parser + * @param type returns type of assignment + * @param value returns assignment value + * @return success status of parsing + */ +bool PythonImport::parseInitializer(const QString &_keyword, QString &type, QString &value) +{ + QString keyword = _keyword; + if (_keyword == QLatin1String("-")) + keyword.append(advance()); + + if (keyword == QLatin1String("[")) { + type = QLatin1String("list"); + int index = m_srcIndex; + skipToClosing(QLatin1Char('[')); + for (int i = index; i <= m_srcIndex; i++) + value += m_source[i]; + } else if (keyword == QLatin1String("{")) { + type = QLatin1String("dict"); + int index = m_srcIndex; + skipToClosing(QLatin1Char('{')); + for (int i = index; i <= m_srcIndex; i++) + value += m_source[i]; + } else if (keyword == QLatin1String("(")) { + type = QLatin1String("tuple"); + int index = m_srcIndex; + skipToClosing(QLatin1Char('(')); + for (int i = index; i <= m_srcIndex; i++) + value += m_source[i]; + } else if (keyword.startsWith(QLatin1String("\""))) { + type = QLatin1String("string"); + value = keyword; + } else if (keyword == QLatin1String("True") || keyword == QLatin1String("False")) { + type = QLatin1String("bool"); + value = keyword; + } else if (keyword.contains(QRegExp(QLatin1String("-?\\d+\\.\\d*")))) { + type = QLatin1String("float"); + value = keyword; + } else if (keyword.contains(QRegExp(QLatin1String("-?\\d+")))) { + type = QLatin1String("int"); + value = keyword; + } else if (keyword.toLower() == QLatin1String("none")) { + type = QLatin1String("object"); + value = keyword; + } else if (!keyword.isEmpty()) { + if (lookAhead() == QLatin1String("(")) { + advance(); + type = keyword; + int index = m_srcIndex; + skipToClosing(QLatin1Char('(')); + for (int i = index; i <= m_srcIndex; i++) + value += m_source[i]; + } else + type = QLatin1String("object"); + } else + type = QLatin1String("object"); + return true; +} + +/** * Parse assignments in the form \ '=' \ * Instance variables are identified by a prefixed 'self.'. + * @param keyword current string from parser * @return success status of parsing */ -bool PythonImport::parseAssignmentStmt(const QString keyword) +bool PythonImport::parseAssignmentStmt(const QString &keyword) { - QString variable = keyword; - advance(); - QString value = advance(); - if (value == QLatin1String("-")) - value.append(advance()); + QString variableName = keyword; bool isStatic = true; - if (variable.startsWith(QLatin1String("self."))) { - variable.remove(0,5); + if (variableName.startsWith(QLatin1String("self."))) { + variableName.remove(0,5); isStatic = false; } Uml::Visibility::Enum visibility = Uml::Visibility::Public; - if (variable.startsWith(QLatin1String("__"))) { + if (variableName.startsWith(QLatin1String("__"))) { visibility = Uml::Visibility::Private; - variable.remove(0, 2); - } else if (variable.startsWith(QLatin1String("_"))) { + variableName.remove(0, 2); + } else if (variableName.startsWith(QLatin1String("_"))) { visibility = Uml::Visibility::Protected; - variable.remove(0, 1); + variableName.remove(0, 1); } + QString type; - if (value == QLatin1String("[")) { - if (lookAhead() == QLatin1String("]")) { - advance(); - type = QLatin1String("list"); - value = QLatin1String(""); - } - } else if (value == QLatin1String("{")) { - if (lookAhead() == QLatin1String("}")) { - advance(); - type = QLatin1String("dict"); - value = QLatin1String(""); - } - } else if (value.startsWith(QLatin1String("\""))) { - type = QLatin1String("string"); - } else if (value == QLatin1String("True") || value == QLatin1String("False")) { - type = QLatin1String("bool"); - } else if (value.contains(QRegExp(QLatin1String("-?\\d+\\.\\d*")))) { - type = QLatin1String("float"); - } else if (value.contains(QRegExp(QLatin1String("-?\\d+")))) { - type = QLatin1String("int"); - } else if (!value.isEmpty()) { - type = QLatin1String("object"); + QString initialValue; + if (advance() == QLatin1String("=")) { + + if (!parseInitializer(advance(), type, initialValue)) + return false; } - UMLObject* o = Import_Utils::insertAttribute(m_klass, visibility, variable, + UMLObject* o = Import_Utils::insertAttribute(m_klass, visibility, variableName, type, m_comment, false); UMLAttribute* a = o->asUMLAttribute(); - a->setInitialValue(value); + a->setInitialValue(initialValue); a->setStatic(isStatic); return true; } /** + * Parses method parameter list + * @param op UMLOperation instance to add parameter + * @return success status of parsing + */ +bool PythonImport::parseMethodParameters(UMLOperation *op) +{ + bool firstParam = true; + UMLAttribute *attr = nullptr; + while (m_srcIndex < m_source.count() && advance() != QLatin1String(")")) { + const QString& parName = m_source[m_srcIndex]; + if (attr && parName == QLatin1String("=")) { + QString type, value; + parseInitializer(advance(), type, value); + attr->setInitialValue(value); + attr->setTypeName(type); + } else { + if (firstParam) { + if (parName.compare(QLatin1String("self"), Qt::CaseInsensitive) != 0) { + m_isStatic = true; + attr = Import_Utils::addMethodParameter(op, QLatin1String("string"), parName); + } + firstParam = false; + } else { + attr = Import_Utils::addMethodParameter(op, QLatin1String("string"), parName); + } + } + if (lookAhead() == QLatin1String(",")) + advance(); + } + return true; +} + +/** * Implement abstract operation from NativeImportBase. * @return success status of operation */ @@ -314,13 +389,16 @@ } QString name = advance(); + bool isConstructor = name == QLatin1String("__init__"); Uml::Visibility::Enum visibility = Uml::Visibility::Public; - if (name.startsWith(QLatin1String("__"))) { - name = name.mid(2); - visibility = Uml::Visibility::Private; - } else if (name.startsWith(QLatin1String("_"))) { - name = name.mid(1); - visibility = Uml::Visibility::Protected; + if (!isConstructor) { + if (name.startsWith(QLatin1String("__"))) { + name = name.mid(2); + visibility = Uml::Visibility::Private; + } else if (name.startsWith(QLatin1String("_"))) { + name = name.mid(1); + visibility = Uml::Visibility::Protected; + } } UMLOperation *op = Import_Utils::makeOperation(m_klass, name); if (advance() != QLatin1String("(")) { @@ -328,24 +406,15 @@ skipBody(); return true; } - bool firstParam = true; - while (m_srcIndex < srcLength && advance() != QLatin1String(")")) { - const QString& parName = m_source[m_srcIndex]; - if (firstParam) { - if (parName.compare(QLatin1String("self"), Qt::CaseInsensitive) != 0) { - m_isStatic = true; - Import_Utils::addMethodParameter(op, QLatin1String("string"), parName); - } - firstParam = false; - } else { - /*UMLAttribute *att =*/ Import_Utils::addMethodParameter(op, QLatin1String("string"), parName); - } - if (advance() != QLatin1String(",")) - break; + if (!parseMethodParameters(op)) { + uError() << "importPython error on parsing method parameter for method " << name; + skipBody(); + return true; } + Import_Utils::insertMethod(m_klass, op, visibility, QLatin1String("string"), m_isStatic, false /*isAbstract*/, false /*isFriend*/, - false /*isConstructor*/, false, m_comment); + isConstructor, false, m_comment); m_isStatic = false; int srcIndex = m_srcIndex; op->setSourceCode(skipBody()); @@ -356,7 +425,7 @@ } // parse instance variables from __init__ method - if (name == QLatin1String("__init__")) { + if (isConstructor) { int indexSave = m_srcIndex; m_srcIndex = srcIndex; advance(); diff -Nru umbrello-19.04.2/umbrello/codeimport/pythonimport.h umbrello-19.04.3/umbrello/codeimport/pythonimport.h --- umbrello-19.04.2/umbrello/codeimport/pythonimport.h 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/umbrello/codeimport/pythonimport.h 2019-07-06 09:30:51.000000000 +0000 @@ -13,6 +13,8 @@ #include "nativeimportbase.h" +class UMLOperation; + /** * Python code import * @author Oliver Kellogg @@ -27,8 +29,10 @@ protected: void initVars(); - bool parseAssignmentStmt(const QString keyword); + bool parseInitializer(const QString &keyword, QString &type, QString &value); + bool parseAssignmentStmt(const QString &keyword); + bool parseMethodParameters(UMLOperation *op); bool parseStmt(); void fillSource(const QString& line); diff -Nru umbrello-19.04.2/umbrello/docgenerators/CMakeLists.txt umbrello-19.04.3/umbrello/docgenerators/CMakeLists.txt --- umbrello-19.04.2/umbrello/docgenerators/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/CMakeLists.txt 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,10 @@ +install( FILES + xmi2docbook.xsl + docbook2xhtml.xsl + xmi.css + common.ent + DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} ) + +install( DIRECTORY + simple4125 + DESTINATION ${UMBRELLO_DATA_INSTALL_DIR} ) diff -Nru umbrello-19.04.2/umbrello/docgenerators/docbookgeneratorjob.cpp umbrello-19.04.3/umbrello/docgenerators/docbookgeneratorjob.cpp --- umbrello-19.04.2/umbrello/docgenerators/docbookgeneratorjob.cpp 2019-05-31 10:33:15.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/docbookgeneratorjob.cpp 2019-07-06 09:30:51.000000000 +0000 @@ -41,6 +41,88 @@ extern int xmlLoadExtDtdDefaultValue; +#define MAX_PATHS 64 +xmlExternalEntityLoader defaultEntityLoader = NULL; +static xmlChar *paths[MAX_PATHS + 1]; +static int nbpaths = 0; +static QHash replaceURLList; + +/* +* Entity loading control and customization. +* taken from kdelibs/kdoctools/xslt.cpp +*/ +static xmlParserInputPtr xsltprocExternalEntityLoader(const char *_URL, const char *ID,xmlParserCtxtPtr ctxt) +{ + xmlParserInputPtr ret; + warningSAXFunc warning = NULL; + + // use local available dtd versions instead of fetching it everytime from the internet + QString url = QLatin1String(_URL); + QHash::const_iterator i; + for(i = replaceURLList.constBegin(); i != replaceURLList.constEnd(); i++) + { + if (url.startsWith(i.key())) + { + url.replace(i.key(),i.value()); + qDebug() << "converted" << _URL << "to" << url; + } + } + char URL[1024]; + strcpy(URL,url.toLatin1().constData()); + + const char *lastsegment = URL; + const char *iter = URL; + + if (nbpaths > 0) { + while (*iter != 0) { + if (*iter == '/') + lastsegment = iter + 1; + iter++; + } + } + + if ((ctxt != NULL) && (ctxt->sax != NULL)) { + warning = ctxt->sax->warning; + ctxt->sax->warning = NULL; + } + + if (defaultEntityLoader != NULL) { + ret = defaultEntityLoader(URL, ID, ctxt); + if (ret != NULL) { + if (warning != NULL) + ctxt->sax->warning = warning; + qDebug() << "Loaded URL=\"" << URL << "\" ID=\"" << ID << "\""; + return(ret); + } + } + for (int i = 0;i < nbpaths;i++) { + xmlChar *newURL; + + newURL = xmlStrdup((const xmlChar *) paths[i]); + newURL = xmlStrcat(newURL, (const xmlChar *) "/"); + newURL = xmlStrcat(newURL, (const xmlChar *) lastsegment); + if (newURL != NULL) { + ret = defaultEntityLoader((const char *)newURL, ID, ctxt); + if (ret != NULL) { + if (warning != NULL) + ctxt->sax->warning = warning; + qDebug() << "Loaded URL=\"" << newURL << "\" ID=\"" << ID << "\""; + xmlFree(newURL); + return(ret); + } + xmlFree(newURL); + } + } + if (warning != NULL) { + ctxt->sax->warning = warning; + if (URL != NULL) + warning(ctxt, "failed to load external entity \"%s\"\n", URL); + else if (ID != NULL) + warning(ctxt, "failed to load external entity \"%s\"\n", ID); + } + return(NULL); +} + DocbookGeneratorJob::DocbookGeneratorJob(QObject* parent): QThread(parent) { @@ -86,6 +168,14 @@ if (xsltFile.isEmpty()) xsltFile = QLatin1String(DOCGENERATORS_DIR) + QLatin1Char('/') + xslBaseName; + if (!defaultEntityLoader) { + defaultEntityLoader = xmlGetExternalEntityLoader(); + xmlSetExternalEntityLoader(xsltprocExternalEntityLoader); + QFileInfo xsltFilePath(xsltFile); + + replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/sdocbook.dtd")] = QString(QLatin1String("file:///%1/simple4125/sdocbook.dtd")).arg(xsltFilePath.absolutePath()); + } + xmlSubstituteEntitiesDefault(1); xmlLoadExtDtdDefaultValue = 1; cur = xsltParseStylesheetFile((const xmlChar *)xsltFile.toLatin1().constData()); diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbcent.mod umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbcent.mod --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbcent.mod 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbcent.mod 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +%ISOlat1; + + +%ISOnum; + + +%ISOpub; + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbhier.mod umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbhier.mod --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbhier.mod 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbhier.mod 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbpool.mod umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbpool.mod --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdbpool.mod 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdbpool.mod 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook.css umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook.css --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook.css 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook.css 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,679 @@ +abbrev +{ + display: inline; +} + +abstract +{ + margin-left: 0.5in; + margin-right: 0.5in; + display: inline; +} + +acronym +{ + display: inline; +} + +address +{ + white-space: pre; + display: block; +} + +anchor +{ + display: inline; +} + +appendix +{ + display: block; +} + +articleinfo +{ + display: none; +} + +article +{ + display: block; +} + +audiodata +{ + display: none; +} + +audioobject +{ + display: none; +} + +author +{ + display: inline; +} + +authorgroup +{ + display: inline; +} + +authorinitials +{ + display: inline; +} + +bibliomisc +{ + display: inline; +} + +bibliomset +{ + display: inline; +} + +biblioset +{ + display: inline; +} + +blockquote +{ + display: block; + margin-left: 0.5in; + margin-right: 0.5in; +} + +caption +{ + display: none; +} + +citetitle +{ + display: inline; + font-style: italic; +} + +city +{ + display: inline; +} + +colspec +{ + display: none; +} + +command +{ + display: inline; + font-style: italic; +} + +computeroutput +{ + display: inline; + font-family: monospace; +} + +copyright +{ + display: inline; +} + +corpauthor +{ + display: inline; +} + +country +{ + display: inline; +} + +date +{ + display: inline; +} + +articleinfo +{ + display: none; +} + +appendixinfo +{ + display: none; +} + +edition +{ + display: inline; +} + +editor +{ + display: inline; +} + +email +{ + display: inline; + font-style: italic; +} + +emphasis +{ + display: inline; + font-style: italic; +} + +entry +{ + display: table-cell; +} + +example +{ + display: block; +} + +fax +{ + display: inline; +} + +figure +{ + display: block; +} + +filename +{ + display: inline; + font-style: italic; +} + +firstname +{ + display: inline; +} + +footnote +{ + display: inline; +} + +holder +{ + display: inline; +} + +honorific +{ + display: inline; +} + +imagedata +{ + display: inline; +} + +imageobject +{ + display: inline; +} + +informaltable +{ + display: block; +} + +inlinemediaobject +{ + display: inline; +} + +isbn +{ + display: inline; +} + +issn +{ + display: inline; +} + +issuenum +{ + display: inline; +} + +itemizedlist +{ + display: block; + list-style-type: disc; +} + +keyword +{ + display: inline; +} + +keywordset +{ + display: inline; +} + +legalnotice +{ + display: inline; +} + +lineage +{ + display: inline; +} + +lineannotation +{ + display: inline; +} + +link +{ + display: inline; +} + +listitem +{ + display: list-item; +} + +literal +{ + display: inline; +} + +literallayout +{ + display: inline; +} + +mediaobject +{ + display: inline; +} + +member +{ + display: inline; +} + +note +{ + display: inline; +} + +objectinfo +{ + display: inline; +} + +option +{ + display: inline; +} + +orderedlist +{ + display: block; + list-style-type: decimal; +} + +otheraddr +{ + display: inline; +} + +othercredit +{ + display: inline; +} + +othername +{ + display: inline; +} + +pagenums +{ + display: inline; +} + +para +{ + display: block; +} + +phone +{ + display: inline; +} + +phrase +{ + display: inline; +} + +pob +{ + display: inline; +} + +postcode +{ + display: inline; +} + +printhistory +{ + display: inline; +} + +procedure +{ + display: inline; +} + +programlisting +{ + display: inline; +} + +pubdate +{ + display: inline; +} + +publisher +{ + display: inline; +} + +publishername +{ + display: inline; +} + +quote +{ + display: inline; +} + +replaceable +{ + display: inline; +} + +revhistory +{ + display: inline; +} + +revision +{ + display: inline; +} + +revnumber +{ + display: inline; +} + +revremark +{ + display: inline; +} + +row +{ + display: table-row; +} + +section +{ + display: block; +} + +sectioninfo +{ + display: none; +} + +sidebar +{ + display: block; +} + +simplelist +{ + display: inline; +} + +state +{ + display: inline; +} + +step +{ + display: inline; +} + +street +{ + display: inline; +} + +substeps +{ + display: inline; +} + +subtitle +{ + display: inline; +} + +surname +{ + display: inline; +} + +systemitem +{ + display: inline; +} + +tbody +{ + display: table-row-group; +} + +term +{ + display: inline; +} + +textobject +{ + display: inline; +} + +tgroup +{ + display: table; +} + +thead +{ + display: table-row-group; +} + +title +{ + display: block; +} + +article title +{ + font-size: 36pt; + font-weight: bold; + display: block; +} + +section title +{ + font-size: 24pt; + font-weight: bold; + display: block; +} + +section section title +{ + font-size: 20pt; + font-weight: bold; + display: block; +} + +section section section title +{ + font-size: 18pt; + font-weight: bold; + display: block; +} + +section section section section title +{ + font-size: 16pt; + font-weight: bold; + display: block; +} + +section section section section section title +{ + font-size: 14pt; + font-weight: bold; + display: block; +} + +section section section section section section title +{ + font-size: 12pt; + font-weight: bold; + display: block; +} + +appendix title +{ + font-size: 24pt; + font-weight: bold; + display: block; +} + +appendix section title +{ + font-size: 22pt; + font-weight: bold; + display: block; +} + +appendix section section title +{ + font-size: 18pt; + font-weight: bold; + display: block; +} + +appendix section section section title +{ + font-size: 16pt; + font-weight: bold; + display: block; +} + +appendix section section section section title +{ + font-size: 14pt; + font-weight: bold; + display: block; +} + +appendix section section section section section title +{ + font-size: 12pt; + font-weight: bold; + display: block; +} + +titleabbrev +{ + display: none; +} + +trademark +{ + display: inline; +} + +ulink +{ + display: inline; +} + +userinput +{ + display: inline; +} + +variablelist +{ + display: inline; +} + +varlistentry +{ + display: inline; +} + +videodata +{ + display: inline; +} + +videoobject +{ + display: inline; +} + +volumenum +{ + display: inline; +} + +xref +{ + display: inline; +} + +year +{ + display: inline; +} + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook-custom.dtd umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook-custom.dtd --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook-custom.dtd 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook-custom.dtd 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + +]]> + + + +%sinclist; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%sdbcent; + + + + + + + + + + + + + + + + + + + + + +%docbook; + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + +]]> + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook.dtd umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook.dtd --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbook.dtd 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbook.dtd 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,1569 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbookref-custom.dtd umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbookref-custom.dtd --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbookref-custom.dtd 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbookref-custom.dtd 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + +%sdocbook-custom.dtd; + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbookref.dtd umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbookref.dtd --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sdocbookref.dtd 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sdocbookref.dtd 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,1729 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru umbrello-19.04.2/umbrello/docgenerators/simple4125/sinclist.mod umbrello-19.04.3/umbrello/docgenerators/simple4125/sinclist.mod --- umbrello-19.04.2/umbrello/docgenerators/simple4125/sinclist.mod 1970-01-01 00:00:00.000000000 +0000 +++ umbrello-19.04.3/umbrello/docgenerators/simple4125/sinclist.mod 2019-07-06 09:30:51.000000000 +0000 @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +