Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2015-05-11 19:37:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2015-04-13 20:27:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2015-05-11 19:48:20.000000000 +0200 @@ -1,0 +2,10 @@ +Sun May 3 19:49:53 UTC 2015 - [email protected] + +- Update to 5.10.0 + * Don't depend on QX11Info in KXUtils::createPixmapFromHandle + (kde#346496) + * New method NETWinInfo::xcbConnection() -> xcb_connection_t* + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.10.0.php + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.9.0.tar.xz New: ---- kwindowsystem-5.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.o0UiZk/_old 2015-05-11 19:48:20.000000000 +0200 +++ /var/tmp/diff_new_pack.o0UiZk/_new 2015-05-11 19:48:20.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5WindowSystem5 -%define _tar_path 5.9 +%define _tar_path 5.10 Name: kwindowsystem -Version: 5.9.0 +Version: 5.10.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kwindowsystem-5.9.0.tar.xz -> kwindowsystem-5.10.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/CMakeLists.txt new/kwindowsystem-5.10.0/CMakeLists.txt --- old/kwindowsystem-5.9.0/CMakeLists.txt 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/CMakeLists.txt 2015-05-03 17:26:08.000000000 +0200 @@ -3,7 +3,7 @@ project(KWindowSystem) # ECM setup -find_package(ECM 5.9.0 REQUIRED NO_MODULE) +find_package(ECM 5.10.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.9.0") # handled by release scripts +set(KF5_VERSION "5.10.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWINDOWSYSTEM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/af/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/af/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/af/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/af/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -15,7 +15,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ar/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ar/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ar/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ar/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -17,7 +17,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/as/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/as/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/as/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/as/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ast/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ast/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ast/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ast/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/be/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/be/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/be/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/be/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/be@latin/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/be@latin/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/be@latin/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/be@latin/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/bg/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/bg/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/bg/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/bg/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/bn/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/bn/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/bn/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/bn/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/bn_IN/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/bn_IN/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/bn_IN/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/bn_IN/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/br/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/br/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/br/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/br/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/bs/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/bs/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/bs/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/bs/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -14,7 +14,7 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ca/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ca/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ca/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ca/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -27,7 +27,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ca@valencia/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ca@valencia/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ca@valencia/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ca@valencia/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/crh/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/crh/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/crh/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/crh/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/cs/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/cs/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/cs/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/cs/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/csb/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/csb/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/csb/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/csb/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/cy/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/cy/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/cy/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/cy/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -31,7 +31,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/da/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/da/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/da/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/da/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/de/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/de/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/de/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/de/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -26,7 +26,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/el/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/el/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/el/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/el/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -32,7 +32,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/en_GB/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/en_GB/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/en_GB/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/en_GB/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/eo/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/eo/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/eo/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/eo/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/es/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/es/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/es/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/es/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/et/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/et/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/et/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/et/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/eu/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/eu/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/eu/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/eu/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/fa/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/fa/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/fa/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/fa/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/fi/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/fi/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/fi/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/fi/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -40,7 +40,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/fr/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/fr/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/fr/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/fr/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-03-16 18:32+0100\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" @@ -36,7 +36,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/fy/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/fy/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/fy/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/fy/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ga/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ga/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ga/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ga/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/gd/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/gd/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/gd/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/gd/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -14,7 +14,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/gl/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/gl/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/gl/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/gl/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -29,7 +29,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/gu/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/gu/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/gu/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/gu/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ha/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ha/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ha/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ha/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/he/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/he/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/he/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/he/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -33,7 +33,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hi/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hi/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hi/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hi/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hne/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hne/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hne/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hne/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hr/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hr/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hr/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hr/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -31,7 +31,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hsb/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hsb/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hsb/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hsb/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hu/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hu/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hu/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hu/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/hy/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/hy/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/hy/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/hy/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ia/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ia/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ia/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ia/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/id/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/id/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/id/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/id/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/is/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/is/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/is/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/is/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/it/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/it/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/it/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/it/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ja/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ja/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ja/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ja/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ka/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ka/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ka/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ka/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/kk/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/kk/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/kk/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/kk/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/km/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/km/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/km/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/km/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/kn/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/kn/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/kn/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/kn/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ko/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ko/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ko/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ko/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -1,8 +1,8 @@ # Korean messages for kdelibs. # Copyright (C) Free Software Foundation, Inc. # Cho Sung Jae <[email protected]>, 2007. -# Park Shinjo <[email protected]>, 2007, 2008, 2009, 2010, 2011. -# Park Shinjo <[email protected]>, 2011, 2012, 2013, 2014, 2015. +# Shinjo Park <[email protected]>, 2007, 2008, 2009, 2010, 2011. +# Shinjo Park <[email protected]>, 2011, 2012, 2013, 2014, 2015. # msgid "" msgstr "" @@ -10,7 +10,7 @@ "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2015-01-18 17:09+0900\n" -"Last-Translator: Park Shinjo <[email protected]>\n" +"Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ku/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ku/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ku/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ku/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/lb/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/lb/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/lb/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/lb/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/lt/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/lt/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/lt/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/lt/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -25,7 +25,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/lv/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/lv/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/lv/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/lv/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -27,7 +27,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/mai/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/mai/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/mai/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/mai/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -22,7 +22,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/mk/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/mk/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/mk/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/mk/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -31,7 +31,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ml/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ml/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ml/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ml/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -25,7 +25,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/mr/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/mr/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/mr/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/mr/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ms/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ms/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ms/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ms/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/nb/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/nb/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/nb/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/nb/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -27,7 +27,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:946 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/nds/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/nds/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/nds/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/nds/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ne/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ne/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ne/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ne/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/nl/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/nl/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/nl/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/nl/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -33,7 +33,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/nn/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/nn/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/nn/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/nn/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:946 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/oc/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/oc/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/oc/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/oc/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/or/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/or/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/or/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/or/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/pa/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/pa/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/pa/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/pa/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -26,7 +26,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/pl/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/pl/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/pl/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/pl/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -30,7 +30,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ps/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ps/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ps/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ps/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/pt/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/pt/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/pt/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/pt/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -7,7 +7,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/pt_BR/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/pt_BR/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/pt_BR/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/pt_BR/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -30,7 +30,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ro/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ro/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ro/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ro/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ru/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ru/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ru/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ru/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -35,7 +35,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/se/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/se/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/se/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/se/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:946 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/si/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/si/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/si/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/si/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -18,7 +18,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sk/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sk/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sk/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sk/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sl/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sl/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sl/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sl/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -30,7 +30,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sq/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sq/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sq/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sq/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -17,7 +17,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sr/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sr/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sr/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sr/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sr@ijekavian/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sr@ijekavian/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sr@ijekavian/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sr@ijekavian/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sr@latin/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sr@latin/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sr@latin/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sr@latin/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/sv/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/sv/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/sv/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/sv/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -14,7 +14,7 @@ "X-Generator: Lokalize 1.4\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ta/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ta/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ta/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ta/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/te/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/te/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/te/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/te/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -27,7 +27,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/tg/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/tg/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/tg/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/tg/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/th/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/th/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/th/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/th/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -23,7 +23,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/tr/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/tr/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/tr/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/tr/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -34,7 +34,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/tt/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/tt/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/tt/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/tt/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/ug/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/ug/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/ug/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/ug/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -20,7 +20,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/uk/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/uk/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/uk/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/uk/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -25,7 +25,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/uz/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/uz/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/uz/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/uz/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/uz@cyrillic/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/uz@cyrillic/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/uz@cyrillic/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/uz@cyrillic/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -19,7 +19,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/vi/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/vi/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/vi/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/vi/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -21,7 +21,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/wa/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/wa/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/wa/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/wa/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -24,7 +24,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/xh/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/xh/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/xh/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/xh/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -25,7 +25,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/zh_CN/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/zh_CN/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/zh_CN/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -27,7 +27,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/zh_HK/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/zh_HK/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/zh_HK/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/zh_HK/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -37,7 +37,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, fuzzy, qt-format #| msgid "Desktop %1" msgctxt "KWindowSystem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/po/zh_TW/kwindowsystem5_qt.po new/kwindowsystem-5.10.0/po/zh_TW/kwindowsystem5_qt.po --- old/kwindowsystem-5.9.0/po/zh_TW/kwindowsystem5_qt.po 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/po/zh_TW/kwindowsystem5_qt.po 2015-05-03 17:26:08.000000000 +0200 @@ -28,7 +28,7 @@ "X-Qt-Contexts: true\n" #: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632 -#: kwindowsystem_x11.cpp:947 +#: kwindowsystem_x11.cpp:939 #, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/src/kwindowsystem_x11.cpp new/kwindowsystem-5.10.0/src/kwindowsystem_x11.cpp --- old/kwindowsystem-5.9.0/src/kwindowsystem_x11.cpp 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/src/kwindowsystem_x11.cpp 2015-05-03 17:26:08.000000000 +0200 @@ -48,7 +48,7 @@ #endif static Atom net_wm_cm; -static void create_atoms(Display *dpy = QX11Info::display()); +static void create_atoms(); static const NET::Properties windowsProperties = NET::ClientList | NET::ClientListStacking | NET::Supported | @@ -92,8 +92,8 @@ -1, false), QAbstractNativeEventFilter(), strutSignalConnected(false), - haveXfixes(false), compositingEnabled(false), + haveXfixes(false), what(_what), winId(XCB_WINDOW_NONE) { @@ -367,7 +367,7 @@ static Atom _wm_change_state; static Atom kwm_utf8_string; -static void create_atoms(Display *dpy) +static void create_atoms() { if (!atoms_created) { const int max = 20; @@ -386,12 +386,12 @@ names[n++] = "UTF8_STRING"; char net_wm_cm_name[ 100 ]; - sprintf(net_wm_cm_name, "_NET_WM_CM_S%d", DefaultScreen(dpy)); + sprintf(net_wm_cm_name, "_NET_WM_CM_S%d", QX11Info::appScreen()); atoms[n] = &net_wm_cm; names[n++] = net_wm_cm_name; // we need a const_cast for the shitty X API - XInternAtoms(dpy, const_cast<char **>(names), n, false, atoms_return); + XInternAtoms(QX11Info::display(), const_cast<char **>(names), n, false, atoms_return); for (int i = 0; i < n; i++) { *atoms[i] = atoms_return[i]; } @@ -680,7 +680,7 @@ xcb_pixmap_t p_mask = info->icccmIconPixmapMask(); if (p != XCB_PIXMAP_NONE) { - QPixmap pm = KXUtils::createPixmapFromHandle(p, p_mask); + QPixmap pm = KXUtils::createPixmapFromHandle(info->xcbConnection(), p, p_mask); if (scale && width > 0 && height > 0 && !pm.isNull() && (pm.width() != width || pm.height() != height)) { result = QPixmap::fromImage(pm.toImage().scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); @@ -831,20 +831,12 @@ bool KWindowSystemPrivateX11::compositingActive() { - if (QX11Info::display()) { - init(INFO_BASIC); - if (s_d_func()->haveXfixes) { - return s_d_func()->compositingEnabled; - } else { - create_atoms(); - return XGetSelectionOwner(QX11Info::display(), net_wm_cm); - } - } else { // work even without QApplication instance - Display *dpy = XOpenDisplay(NULL); - create_atoms(dpy); - bool ret = XGetSelectionOwner(dpy, net_wm_cm) != None; - XCloseDisplay(dpy); - return ret; + init(INFO_BASIC); + if (s_d_func()->haveXfixes) { + return s_d_func()->compositingEnabled; + } else { + create_atoms(); + return XGetSelectionOwner(QX11Info::display(), net_wm_cm); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/src/kxutils.cpp new/kwindowsystem-5.10.0/src/kxutils.cpp --- old/kwindowsystem-5.9.0/src/kxutils.cpp 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/src/kxutils.cpp 2015-05-03 17:26:08.000000000 +0200 @@ -30,10 +30,8 @@ namespace KXUtils { -template <typename T> T fromNative(xcb_pixmap_t pixmap) +template <typename T> T fromNative(xcb_pixmap_t pixmap, xcb_connection_t *c) { - xcb_connection_t *c = QX11Info::connection(); - const xcb_get_geometry_cookie_t geoCookie = xcb_get_geometry_unchecked(c, pixmap); ScopedCPointer<xcb_get_geometry_reply_t> geo(xcb_get_geometry_reply(c, geoCookie, Q_NULLPTR)); if (geo.isNull()) { @@ -95,8 +93,11 @@ // Create QPixmap from X pixmap. Take care of different depths if needed. QPixmap createPixmapFromHandle(WId pixmap, WId pixmap_mask) { - xcb_connection_t *c = QX11Info::connection(); + return createPixmapFromHandle(QX11Info::connection(), pixmap, pixmap_mask); +} +QPixmap createPixmapFromHandle(xcb_connection_t *c, WId pixmap, WId pixmap_mask) +{ #if Q_BYTE_ORDER == Q_BIG_ENDIAN qDebug() << "Byte order not supported"; return QPixmap(); @@ -107,9 +108,9 @@ return QPixmap(); } - QPixmap pix = fromNative<QPixmap>(pixmap); + QPixmap pix = fromNative<QPixmap>(pixmap, c); if (pixmap_mask != XCB_PIXMAP_NONE) { - QBitmap mask = fromNative<QBitmap>(pixmap_mask); + QBitmap mask = fromNative<QBitmap>(pixmap_mask, c); if (mask.size() != pix.size()) { return QPixmap(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/src/kxutils_p.h new/kwindowsystem-5.10.0/src/kxutils_p.h --- old/kwindowsystem-5.9.0/src/kxutils_p.h 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/src/kxutils_p.h 2015-05-03 17:26:08.000000000 +0200 @@ -30,6 +30,8 @@ #include <kwindowsystem_export.h> +struct xcb_connection_t; + /** * Namespace with various generic X11-related functionality. */ @@ -50,6 +52,7 @@ * @since 4.0.2 */ QPixmap createPixmapFromHandle(WId pixmap, WId mask = 0); +QPixmap createPixmapFromHandle(xcb_connection_t *c, WId pixmap, WId mask = 0); /** * Compares two X timestamps, taking into account wrapping and 64bit architectures. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/src/netwm.cpp new/kwindowsystem-5.10.0/src/netwm.cpp --- old/kwindowsystem-5.9.0/src/netwm.cpp 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/src/netwm.cpp 2015-05-03 17:26:08.000000000 +0200 @@ -4988,6 +4988,11 @@ return p->opaqueRegion; } +xcb_connection_t *NETWinInfo::xcbConnection() const +{ + return p->conn; +} + void NETRootInfo::virtual_hook(int, void *) { /*BASE::virtual_hook( id, data );*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.9.0/src/netwm.h new/kwindowsystem-5.10.0/src/netwm.h --- old/kwindowsystem-5.9.0/src/netwm.h 2015-04-04 14:14:34.000000000 +0200 +++ new/kwindowsystem-5.10.0/src/netwm.h 2015-05-03 17:26:08.000000000 +0200 @@ -1009,6 +1009,13 @@ const NETWinInfo &operator=(const NETWinInfo &wintinfo); /** + Returns the xcb connection used. + + @return the XCB connection + **/ + xcb_connection_t *xcbConnection() const; + + /** Returns true if the window has any window type set, even if the type itself is not known to this implementation. Presence of a window type as specified by the NETWM spec is considered as the window supporting
