Hello community, here is the log from the commit of package kxmlgui for openSUSE:Factory checked in at 2015-06-23 12:12:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kxmlgui (Old) and /work/SRC/openSUSE:Factory/.kxmlgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kxmlgui" Changes: -------- --- /work/SRC/openSUSE:Factory/kxmlgui/kxmlgui.changes 2015-05-18 21:29:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kxmlgui.new/kxmlgui.changes 2015-06-23 12:12:33.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 7 19:07:59 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.11.0 + * Add session management for KMainWindow (kde#346768) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php +- Drop 0001-Add-session-management-for-KMainWindow.patch, merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Add-session-management-for-KMainWindow.patch kxmlgui-5.10.0.tar.xz New: ---- kxmlgui-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kxmlgui.spec ++++++ --- /var/tmp/diff_new_pack.jAJyQC/_old 2015-06-23 12:12:33.000000000 +0200 +++ /var/tmp/diff_new_pack.jAJyQC/_new 2015-06-23 12:12:33.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5XmlGui5 -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kxmlgui -Version: 5.10.0 +Version: 5.11.0 Release: 0 %define kf5_version %{version} BuildRequires: attica-qt5-devel >= %{_tar_path} @@ -51,8 +51,6 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM 0001-Add-session-management-for-KMainWindow.patch -Patch0: 0001-Add-session-management-for-KMainWindow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -95,7 +93,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ kxmlgui-5.10.0.tar.xz -> kxmlgui-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/CMakeLists.txt new/kxmlgui-5.11.0/CMakeLists.txt --- old/kxmlgui-5.10.0/CMakeLists.txt 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/CMakeLists.txt 2015-06-06 23:30:51.000000000 +0200 @@ -3,21 +3,25 @@ project(KXmlGui) # ECM setup -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(ECMMarkNonGuiExecutable) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(FeatureSummary) + include(GenerateExportHeader) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.10.0") # handled by release scripts -set(KF5_DEP_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.0") # handled by release scripts +set(KF5_DEP_VERSION "5.11.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KXMLGUI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/autotests/icons/oxygen/index.theme new/kxmlgui-5.11.0/autotests/icons/oxygen/index.theme --- old/kxmlgui-5.10.0/autotests/icons/oxygen/index.theme 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/autotests/icons/oxygen/index.theme 2015-06-06 23:30:51.000000000 +0200 @@ -24,7 +24,7 @@ Name[nb]=Oxygen Name[nds]=Oxygen Name[nl]=Oxygen -Name[nn]=Oksygen +Name[nn]=Oxygen Name[pa]=ਆਕਸੀਜਨ Name[pl]=Tlen Name[pt]=Oxygen @@ -70,6 +70,7 @@ Comment[nb]=Oxygen-laget Comment[nds]=Oxygen-Koppel Comment[nl]=Oxygen-team +Comment[nn]=Oxygen-laget Comment[pa]=ਆਕਸੀਜਨ ਟੀਮ Comment[pl]=Zespół Oxygen Comment[pt]=Equipa do Oxygen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/ca/kxmlgui5.po new/kxmlgui-5.11.0/po/ca/kxmlgui5.po --- old/kxmlgui-5.10.0/po/ca/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/ca/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -14,14 +14,14 @@ "Project-Id-Version: kxmlgui5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2015-04-21 22:13+0200\n" +"PO-Revision-Date: 2015-05-23 18:18+0200\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -369,8 +369,9 @@ "The application for which you wish to submit a bug report - if incorrect, " "please use the Report Bug menu item of the correct application" msgstr "" -"L'aplicació per a la que voleu enviar un informe d'error -si és incorrecta-, " -"useu l'element de menú «Informa d'un error» des de l'aplicació correcta" +"L'aplicació per a la qual voleu enviar un informe d'error -si és " +"incorrecta-, useu l'element de menú «Informa d'un error» des de l'aplicació " +"correcta" #: kbugreport.cpp:166 msgid "Application: " @@ -485,7 +486,7 @@ "programes del sistema sense cap relació (o tot el sistema) no funcionin</" "li><li>causen una pèrdua greu de dades</li><li>introdueixen un forat de " "seguretat en el sistema on s'instal·la el paquet afectat</li></ul>\n" -"<p>L'error del que esteu informant causa algun dels danys esmentats? Si no " +"<p>L'error del qual esteu informant causa algun dels danys esmentats? Si no " "ho fa, si us plau, trieu una severitat més baixa. Gràcies.</p>" #: kbugreport.cpp:437 @@ -503,7 +504,7 @@ "en qüestió no es pugui usar en la pràctica</li><li>causen una pèrdua de " "dades</li><li>introdueixen un forat de seguretat que permet l'accés als " "comptes dels usuaris que usen el paquet afectat</li></ul>\n" -"<p>L'error del que esteu informant causa algun dels danys esmentats? Si no " +"<p>L'error del qual esteu informant causa algun dels danys esmentats? Si no " "ho fa, si us plau, trieu una severitat més baixa. Gràcies.</p>" #: kbugreport.cpp:451 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/cs/kxmlgui5.po new/kxmlgui-5.11.0/po/cs/kxmlgui5.po --- old/kxmlgui-5.10.0/po/cs/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/cs/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -9,15 +9,15 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2014-08-25 13:09+0200\n" +"PO-Revision-Date: 2015-04-24 14:16+0100\n" "Last-Translator: Vít Pelčák <v...@pelcak.org>\n" -"Language-Team: American English <kde-i18n-...@kde.org>\n" +"Language-Team: Czech <kde-i18n-...@kde.org>\n" "Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Language: cs_CZ\n" "X-Source-Language: en_US\n" @@ -1048,10 +1048,8 @@ msgstr "Globální:" #: kshortcutseditor.cpp:704 -#, fuzzy -#| msgid "Global Alternate" msgid "Global alternate:" -msgstr "Globální alternativa" +msgstr "Globální alternativa:" #: kshortcutseditor.cpp:719 msgid "Action Name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/fi/kxmlgui5.po new/kxmlgui-5.11.0/po/fi/kxmlgui5.po --- old/kxmlgui-5.10.0/po/fi/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/fi/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -27,15 +27,15 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2014-12-11 16:26+0200\n" +"PO-Revision-Date: 2015-04-23 00:37+0200\n" "Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n" -"Language-Team: Finnish <kde-i18n-...@kde.org>\n" +"Language-Team: Finnish <lokalisoi...@lists.coss.fi>\n" "Language: fi\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-POT-Import-Date: 2013-01-13 20:43:21+0000\n" msgctxt "NAME OF TRANSLATORS" @@ -1071,10 +1071,8 @@ msgstr "Työpöydänlaajuinen:" #: kshortcutseditor.cpp:704 -#, fuzzy -#| msgid "Global Alternate" msgid "Global alternate:" -msgstr "Vaihtoehtoinen työpöydänlaajuinen" +msgstr "Vaihtoehtoinen työpöydänlaajuinen:" #: kshortcutseditor.cpp:719 msgid "Action Name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/it/kxmlgui5.po new/kxmlgui-5.11.0/po/it/kxmlgui5.po --- old/kxmlgui-5.10.0/po/it/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/it/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -10,30 +10,30 @@ # Pino Toscano <toscano.p...@tiscali.it>, 2008. # Federico Zenith <federico.zen...@member.fsf.org>, 2008, 2012, 2013, 2014, 2015. # Innocenzo Ventre <innocenzo.ven...@gmail.com>, 2012. -# Vincenzo Reale <smart2...@baslug.org>, 2014. +# Vincenzo Reale <smart2...@baslug.org>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2015-01-11 20:36+0100\n" -"Last-Translator: Federico Zenith <zenith.feder...@gmail.com>\n" +"PO-Revision-Date: 2015-04-27 20:44+0100\n" +"Last-Translator: Vincenzo Reale <smart2...@baslug.org>\n" "Language-Team: Italian <kde-i18n...@kde.org>\n" "Language: it\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" msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "" -"Federico Zenith,Vincenzo Reale,Dario Panico,Nicola Ruggero,Federico Cozzi" +"Vincenzo Reale,Federico Zenith,Dario Panico,Nicola Ruggero,Federico Cozzi" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "federico.zen...@member.fsf.org,,,," +msgstr "smart2...@baslug.org,,,," #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:271 #, kde-format @@ -1067,10 +1067,8 @@ msgstr "Globale:" #: kshortcutseditor.cpp:704 -#, fuzzy -#| msgid "Global Alternate" msgid "Global alternate:" -msgstr "Alternativa globale" +msgstr "Alternativa globale:" #: kshortcutseditor.cpp:719 msgid "Action Name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/nb/kxmlgui5.po new/kxmlgui-5.11.0/po/nb/kxmlgui5.po --- old/kxmlgui-5.10.0/po/nb/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/nb/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -1,25 +1,26 @@ # Translation of kxmlgui5 to Norwegian Bokmål # -# Knut Yrvin <kn...@skolelinux.no>, 2002, 2003, 2004, 2005. +# Knut Yrvin <knut.yr...@gmail.com>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <bjor...@skogkatt.homelinux.org>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eskild Hustvedt <zerod...@skolelinux.no>, 2004, 2005. # Gaute Hvoslef Kvalnes <ga...@verdsveven.com>, 2004, 2005. -# Axel Bojer <ax...@skolelinux.no>, 2005, 2006. +# Axel Bojer <a...@bojer.no>, 2005, 2006. # Nils Kristian Tomren <s...@nilsk.net>, 2005, 2007. # Øyvind A. Holm <su...@sunbase.org>, 2009. +# Karl Ove Hufthammer <k...@huftis.org>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2015-04-27 19:43+0200\n" -"Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" +"PO-Revision-Date: 2015-06-03 18:51+0100\n" +"Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -31,7 +32,7 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "kn...@skolelinux.no,ax...@skolelinux.no,bjor...@skogkatt.homelinux.org" +msgstr "knut.yr...@gmail.com,a...@bojer.no,bjor...@skogkatt.homelinux.org" #: kaboutapplicationdialog.cpp:81 khelpmenu.cpp:271 #, kde-format @@ -54,8 +55,8 @@ "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE " "Frameworks %3</html>" msgstr "" -"<html><font size=\"5\">%1</font><br/><b>versjon %2</b><br/>Bruker KDE " -"Ranneverk %3</html>" +"<html><font size=\"5\">%1</font><br/><b>versjon %2</b><br/>Bruker KDE-" +"rammeverk %3</html>" #: kaboutapplicationdialog.cpp:142 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/nn/kxmlgui5.po new/kxmlgui-5.11.0/po/nn/kxmlgui5.po --- old/kxmlgui-5.10.0/po/nn/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/nn/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -2,21 +2,21 @@ # # Gaute Hvoslef Kvalnes <ga...@verdsveven.com>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <korsv...@skulelinux.no>, 2003, 2005. -# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Karl Ove Hufthammer <k...@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Eirik U. Birkeland <eir...@gmail.com>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2013-05-12 14:38+0200\n" +"PO-Revision-Date: 2015-06-04 18:33+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -43,7 +43,7 @@ "<html><font size=\"5\">%1</font><br /><b>Versjon %2</b><br /> </html>" #: kaboutapplicationdialog.cpp:103 -#, fuzzy, kde-format +#, kde-format msgctxt "" "Program name, version and KDE platform version; do not translate " "'Development Platform'" @@ -51,8 +51,8 @@ "<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE " "Frameworks %3</html>" msgstr "" -"<html><font size=\"5\">%1</font><br/><b>versjon %2</b><br/>Brukar KDE %3</" -"html>" +"<html><font size=\"5\">%1</font><br /><b>Versjon %2</b><br />Brukar KDE-" +"rammeverk %3</html>" #: kaboutapplicationdialog.cpp:142 #, kde-format @@ -185,16 +185,16 @@ msgstr "Om KDE" #: kaboutkdedialog_p.cpp:46 -#, fuzzy, kde-format +#, kde-format msgid "" "<html><font size=\"5\">KDE - Be Free!</font><br /><b>Frameworks Version %1</" "b></html>" msgstr "" -"<html><font size=\"5\">KDE – ver fri!</font><br /><b>Plattformversjon %1</" +"<html><font size=\"5\">KDE – ver fri!</font><br /><b>Rammeverk versjon %1</" "b></html>" #: kaboutkdedialog_p.cpp:56 -#, fuzzy, kde-format +#, kde-format msgid "" "<html><b>KDE</b> is a world-wide network of software engineers, artists, " "writers, translators and facilitators who are committed to <a href=" @@ -207,13 +207,13 @@ "and the software we produce.</html>" msgstr "" "<html><b>KDE</b> er eit verdsfemnande nettverk av folk som programmerar, " -"teiknar, komponerer, dokumenterer eller hjelper til på andre måtar med " -"utvikling av <a href=\"%1\">fri programvare</a>. Me har i fellesskap laga " -"fleire hundre frie program, som no inngår som ein del av KDE-" +"teiknar, komponerer, dokumenterer, set om eller hjelper til på andre måtar " +"med utvikling av <a href=\"%1\">fri programvare</a>. Me har i fellesskap " +"laga fleire hundre frie program, som no inngår som ein del av KDE-" "utviklingsplattforma og KDE-programdistribusjonen.<br/><br/>KDE er eit " "fellesskap der inga enkel gruppe, firma eller organisasjon kontrollerer " "kjeldekoden til produkta, og alle er velkomne til å bidra – du òg.<br/><br/" -">Du finn meir informasjon om KDE og programma me utviklar på <a href=\"%2\">" +">Du finn meir informasjon om KDE og programma me utviklar på <a href=\"%2\">" "%2</a>.</html>" #: kaboutkdedialog_p.cpp:75 @@ -539,9 +539,8 @@ msgstr "<h2>Snøggtastar endra</h2>" #: kcheckaccelerators.cpp:275 kcheckaccelerators.cpp:286 -#, fuzzy msgid "Old Text" -msgstr "Finn tekst" +msgstr "Gammal tekst" #: kcheckaccelerators.cpp:277 kcheckaccelerators.cpp:295 msgid "New Text" @@ -767,7 +766,6 @@ ">Vel ein annan kombinasjon.</qt>" #: kkeysequencewidget.cpp:273 -#, fuzzy msgid "" "Click on the button, then enter the shortcut like you would in the program.\n" "Example for Ctrl+A: hold the Ctrl key and press A." @@ -840,9 +838,8 @@ msgstr "Ikkje tilkopla." #: ksendbugmail/main.cpp:51 -#, fuzzy msgid "Connection timed out." -msgstr "Tidsavbrot på sambandet" +msgstr "Tidsavbrot på sambandet." #: ksendbugmail/main.cpp:54 msgid "Time out waiting for server interaction." @@ -854,19 +851,16 @@ msgstr "Tenaren sa: «%1»" #: ksendbugmail/main.cpp:89 -#, fuzzy msgid "Sends a bug report by email." -msgstr "Send feilrapport." +msgstr "Meld frå om feil via e-post." #: ksendbugmail/main.cpp:91 -#, fuzzy msgid "The subject line of the email." -msgstr "Storleik på dialogvindauge" +msgstr "Emnelinja i e-posten." #: ksendbugmail/main.cpp:92 -#, fuzzy msgid "The email address to send the bug report to." -msgstr "E-postadressa feilrapporten vert send til." +msgstr "E-postadressa som feilrapporten skal sendast til." #: kshortcuteditwidget.cpp:62 msgid "Default:" @@ -1052,7 +1046,7 @@ #: kshortcutseditor.cpp:704 msgid "Global alternate:" -msgstr "" +msgstr "Globalt alternativ:" #: kshortcutseditor.cpp:719 msgid "Action Name" @@ -1140,7 +1134,7 @@ #: ktoolbar.cpp:308 msgctxt "Toolbar orientation" msgid "Orientation" -msgstr "" +msgstr "Retning" #: ktoolbar.cpp:310 msgctxt "toolbar position string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/pl/kxmlgui5.po new/kxmlgui-5.11.0/po/pl/kxmlgui5.po --- old/kxmlgui-5.10.0/po/pl/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/pl/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2015-04-25 07:42+0200\n" +"PO-Revision-Date: 2015-06-05 08:23+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" @@ -108,7 +108,7 @@ ">\n" ">\n" ">\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -1198,7 +1198,7 @@ "The language for this application has been changed. The change will take " "effect the next time the application is started." msgstr "" -"Język tego programu został zmieniony. Zmiany odniosą skutek przy następnym " +"Język tego programu został zmieniony. Zmiany odniosą skutek po następnym " "uruchomieniu programu." #: kswitchlanguagedialog_p.cpp:282 kswitchlanguagedialog_p.cpp:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/sl/kxmlgui5.po new/kxmlgui-5.11.0/po/sl/kxmlgui5.po --- old/kxmlgui-5.10.0/po/sl/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/sl/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2015-04-23 17:08+0200\n" +"PO-Revision-Date: 2015-05-08 13:38+0200\n" "Last-Translator: Andrej Mernik <andr...@ubuntu.si>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" "Language: sl\n" @@ -254,12 +254,13 @@ "documentation, then a visit to <a href=\"%2\">%2</a> will provide you with " "what you need.</html>" msgstr "" -"<html>Za pridružitev skupnosti KDE vam ni treba biti programski razvijalec. " -"Priključite se lahko narodnim skupinam, ki prevajajo uporabniške vmesnike. " -"Ustvarjate lahko grafiko, teme, zvoke in izboljšano dokumentacijo. Odločitev " -"je vaša!<br /><br />Obiščite <a href=\"%1\">%1</a> za podrobnosti o " -"nekaterih projektih, pri katerih lahko sodelujete.<br /><br />Če potrebujete " -"več podrobnosti ali dokumentacije, obiščite <a href=\"%2\">%2</a>.</html>" +"<html>Da postanete član ekipe KDE, ne rabite biti razvijalec programske " +"opreme. Pridružite se lahko državnim ekipam, ki prevajajo vmesnike " +"programov. Zagotovite lahko grafike, teme, zvoke in izboljšano " +"dokumentacijo. O tem odločate vi!<br /> <br />Obiščite <a href=\"%1\">%1</a> " +"za podrobnosti o projektih v katerih lahko sodelujete.<br /><br />Če " +"potrebujete več podrobnosti ali dokumentacijo, obiščite <a href=\"%2\">%2</" +"a>.</html>" #: kaboutkdedialog_p.cpp:115 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/tr/kxmlgui5.po new/kxmlgui-5.11.0/po/tr/kxmlgui5.po --- old/kxmlgui-5.10.0/po/tr/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/tr/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -22,8 +22,8 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2014-11-12 00:33+0200\n" -"Last-Translator: Kaan Ozdincer <kaanozdin...@gmail.com>\n" +"PO-Revision-Date: 2015-05-19 10:11+0000\n" +"Last-Translator: Necdet <necdetyu...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -1061,10 +1061,8 @@ msgstr "Masaüstü Geneli:" #: kshortcutseditor.cpp:704 -#, fuzzy -#| msgid "Global Alternate" msgid "Global alternate:" -msgstr "Genel Alternatif" +msgstr "Genel alternatif:" #: kshortcutseditor.cpp:719 msgid "Action Name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/po/zh_TW/kxmlgui5.po new/kxmlgui-5.11.0/po/zh_TW/kxmlgui5.po --- old/kxmlgui-5.10.0/po/zh_TW/kxmlgui5.po 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/po/zh_TW/kxmlgui5.po 2015-06-06 23:30:51.000000000 +0200 @@ -10,15 +10,15 @@ # Goodhorse <frank...@goodhorse.idv.tw>, 2008. # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006-2009, 2010. # Franklin Weng <frank...@mail.everfocus.com.tw>, 2010, 2011, 2012. -# Franklin Weng <frank...@goodhorse.idv.tw>, 2010, 2011, 2012, 2013, 2014. +# Franklin Weng <frank...@goodhorse.idv.tw>, 2010, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-04-21 11:46+0000\n" -"PO-Revision-Date: 2014-04-22 11:13+0800\n" -"Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" -"Language-Team: Chinese Traditional <kde...@googlegroups.com>\n" +"PO-Revision-Date: 2015-05-13 16:51+0800\n" +"Last-Translator: Franklin\n" +"Language-Team: Chinese Traditional <kde-i18n-...@kde.org>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +28,7 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Frank Weng (a.k.a. Franklin)" +msgstr "Franklin Weng" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" @@ -1006,10 +1006,8 @@ msgstr "全域：" #: kshortcutseditor.cpp:704 -#, fuzzy -#| msgid "Global Alternate" msgid "Global alternate:" -msgstr "全域替代" +msgstr "全域替代：" #: kshortcutseditor.cpp:719 msgid "Action Name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kxmlgui-5.10.0/src/kmainwindow.cpp new/kxmlgui-5.11.0/src/kmainwindow.cpp --- old/kxmlgui-5.10.0/src/kmainwindow.cpp 2015-05-03 17:26:39.000000000 +0200 +++ new/kxmlgui-5.11.0/src/kmainwindow.cpp 2015-06-06 23:30:51.000000000 +0200 @@ -127,8 +127,10 @@ { } -bool KMWSessionManager::saveState(QSessionManager &) +bool KMWSessionManager::saveState(QSessionManager &sm) { + KConfigGui::setSessionConfig(sm.sessionId(), sm.sessionKey()); + KConfig *config = KConfigGui::sessionConfig(); if (KMainWindow::memberList().count()) { // According to Jochen Wilhelmy <digis...@cs.tu-berlin.de>, this @@ -144,6 +146,19 @@ KConfigGroup group(config, "Number"); group.writeEntry("NumberOfWindows", n); + + // store new status to disk + config->sync(); + + // generate discard command for new file + QString localFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + config->name(); + if (QFile::exists(localFilePath)) { + QStringList discard; + discard << QLatin1String("rm"); + discard << localFilePath; + sm.setDiscardCommand(discard); + } + return true; }
