Hello community,
here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2014-07-10 08:18:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-06-10 14:37:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2014-07-10 09:31:38.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jul 1 21:36:07 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.0.0
+ * Final release of KDE Frameworks 5
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/kde-frameworks-5.0.php
+
+-------------------------------------------------------------------
Old:
----
kwindowsystem-4.100.0.tar.xz
New:
----
kwindowsystem-5.0.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwindowsystem.spec ++++++
--- /var/tmp/diff_new_pack.V4YmWe/_old 2014-07-10 09:31:38.000000000 +0200
+++ /var/tmp/diff_new_pack.V4YmWe/_new 2014-07-10 09:31:38.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5WindowSystem5
Name: kwindowsystem
-Version: 4.100.0
+Version: 5.0.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.14
+BuildRequires: extra-cmake-modules >= 1.0.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem
BuildRequires: libqt5-linguist-devel >= 5.2.0
@@ -37,7 +37,7 @@
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz
+Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kwindowsystem-4.100.0.tar.xz -> kwindowsystem-5.0.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/CMakeLists.txt new/kwindowsystem-5.0.0/CMakeLists.txt
--- old/kwindowsystem-4.100.0/CMakeLists.txt 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/CMakeLists.txt 2014-07-01 20:36:04.000000000 +0200
@@ -3,7 +3,7 @@
project(KWindowSystem)
# ECM setup
-find_package(ECM 0.0.14 REQUIRED NO_MODULE)
+find_package(ECM 1.0.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 "4.100.0") # handled by release scripts
+set(KF5_VERSION "5.0.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-4.100.0/autotests/kwindowsystemx11test.cpp new/kwindowsystem-5.0.0/autotests/kwindowsystemx11test.cpp
--- old/kwindowsystem-4.100.0/autotests/kwindowsystemx11test.cpp 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/autotests/kwindowsystemx11test.cpp 2014-07-01 20:36:04.000000000 +0200
@@ -43,6 +43,7 @@
void testShowingDesktopChanged();
void testWorkAreaChanged();
void testWindowTitleChanged();
+ void testMinimizeWindow();
};
void KWindowSystemX11Test::testActiveWindowChanged()
@@ -343,6 +344,37 @@
QCOMPARE(info.iconName(), expectedName);
}
+void KWindowSystemX11Test::testMinimizeWindow()
+{
+ NETRootInfo rootInfo(QX11Info::connection(), NET::Supported | NET::SupportingWMCheck);
+ if (qstrcmp(rootInfo.wmName(), "Openbox") != 0 &&
+ qstrcmp(rootInfo.wmName(), "KWin") != 0) {
+ QSKIP("Test minimize window might not be supported on the used window manager.");
+ }
+ QWidget widget;
+ widget.show();
+ QTest::qWaitForWindowExposed(&widget);
+
+ KWindowInfo info(widget.winId(), NET::WMState | NET::XAWMState);
+ QVERIFY(!info.isMinimized());
+
+ KWindowSystem::minimizeWindow(widget.winId());
+ // create a roundtrip, updating minimized state is done by the window manager and wait a short time
+ QX11Info::setAppTime(QX11Info::getTimestamp());
+ QTest::qWait(200);
+
+ KWindowInfo info2(widget.winId(), NET::WMState | NET::XAWMState);
+ QVERIFY(info2.isMinimized());
+
+ KWindowSystem::unminimizeWindow(widget.winId());
+ // create a roundtrip, updating minimized state is done by the window manager and wait a short time
+ QX11Info::setAppTime(QX11Info::getTimestamp());
+ QTest::qWait(200);
+
+ KWindowInfo info3(widget.winId(), NET::WMState | NET::XAWMState);
+ QVERIFY(!info3.isMinimized());
+}
+
QTEST_MAIN(KWindowSystemX11Test)
#include "kwindowsystemx11test.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/af/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/af/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/af/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/af/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -14,7 +14,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ar/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ar/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ar/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ar/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -33,7 +33,7 @@
"X-Generator: Translate Toolkit 1.10.0\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/as/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/as/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/as/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/as/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Generator: Lokalize 0.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ast/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ast/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ast/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ast/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Poedit-Language: asturian\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/be/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/be/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/be/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/be/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/be@latin/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/be@latin/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/be@latin/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/be@latin/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/bg/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/bg/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/bg/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/bg/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/bn/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/bn/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/bn/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/bn/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"X-Generator: Lokalize 1.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/bn_IN/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/bn_IN/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/bn_IN/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/bn_IN/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,7 +21,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/br/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/br/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/br/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/br/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/bs/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/bs/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/bs/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/bs/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -29,7 +29,7 @@
"X-Environment: kde\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ca/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ca/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ca/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ca/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -1,12 +1,11 @@
# Translation of kwindowsystem5_qt.po to Catalan
-# Copyright (C) 1998-2014 This_file_is_part_of_KDE
+# Copyright (C) 2014 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006.
+# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
# Antoni Bella Pérez , 2003, 2006, 2011, 2012, 2013.
# Albert Astals Cid , 2004, 2005, 2007.
-# Sebastia Pla Sanz , 2006, 2007.
# Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
# Robert Millan , 2009.
# Orestes Mas , 2010.
@@ -27,7 +26,7 @@
"X-Accelerator-Marker: &\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ca@valencia/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ca@valencia/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ca@valencia/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ca@valencia/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"X-Accelerator-Marker: &\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/crh/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/crh/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/crh/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/crh/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/cs/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/cs/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/cs/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/cs/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/csb/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/csb/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/csb/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/csb/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"|| n%100>=20) ? 1 : 2)\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/cy/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/cy/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/cy/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/cy/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -31,7 +31,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/da/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/da/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/da/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/da/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/de/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/de/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/de/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/de/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -25,7 +25,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/el/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/el/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/el/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/el/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -31,7 +31,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/en_GB/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/en_GB/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/en_GB/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/en_GB/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -2,25 +2,25 @@
# Malcolm Hunter , 2002,2003,2004, 2005, 2006, 2007, 2008, 2009.
# Jonathan Riddell , 2003.
# Andrew Coles , 2004, 2005, 2009, 2010.
+# Steve Allewell , 2014.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2010-12-14 12:18+0000\n"
-"Last-Translator: Andrew Coles \n"
-"Language-Team: British English \n"
-"Language: \n"
+"PO-Revision-Date: 2014-06-28 11:05+0100\n"
+"Last-Translator: Steve Allewell \n"
+"Language-Team: British English \n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
-#, fuzzy, qt-format
-#| msgid "Desktop %1"
+#: kwindowsystem_x11.cpp:953
+#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
msgstr "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/eo/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/eo/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/eo/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/eo/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/es/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/es/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/es/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/es/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/et/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/et/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/et/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/et/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,7 +21,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/eu/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/eu/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/eu/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/eu/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/fa/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/fa/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/fa/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/fa/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/fi/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/fi/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/fi/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/fi/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -39,7 +39,7 @@
"X-POT-Import-Date: 2013-01-13 20:43:21+0000\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/fr/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/fr/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/fr/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/fr/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -35,7 +35,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/fy/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/fy/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/fy/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/fy/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ga/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ga/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ga/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ga/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,7 +21,7 @@
"3 : 4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/gl/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/gl/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/gl/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/gl/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -28,7 +28,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/gu/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/gu/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/gu/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/gu/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ha/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ha/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ha/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ha/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Generator: Lokalize 0.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/he/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/he/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/he/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/he/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -32,7 +32,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hi/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hi/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hi/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hi/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,7 +21,7 @@
"X-Generator: Lokalize 1.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hne/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hne/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hne/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hne/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 0.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hr/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hr/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hr/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hr/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -30,7 +30,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hsb/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hsb/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hsb/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hsb/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"X-Generator: KAider 0.1\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hu/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hu/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hu/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hu/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -17,7 +17,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/hy/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/hy/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/hy/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/hy/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ia/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ia/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ia/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ia/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -18,7 +18,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/id/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/id/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/id/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/id/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2014-02-04 20:08+0700\n"
+"PO-Revision-Date: 2014-06-26 19:23+0700\n"
"Last-Translator: Andhika Padmawan \n"
"Language-Team: Indonesian \n"
"Language: id\n"
@@ -18,9 +18,8 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
-#, fuzzy, qt-format
-#| msgid "Desktop %1"
+#: kwindowsystem_x11.cpp:953
+#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
msgstr "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/is/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/is/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/is/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/is/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -29,7 +29,7 @@
"\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/it/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/it/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/it/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/it/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ja/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ja/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ja/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ja/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"X-Generator: Lokalize 1.1\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ka/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ka/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ka/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ka/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -17,7 +17,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/kk/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/kk/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/kk/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/kk/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -24,7 +24,7 @@
"\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/km/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/km/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/km/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/km/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -17,7 +17,7 @@
"X-Language: km-KH\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/kn/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/kn/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/kn/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/kn/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"X-Generator: Lokalize 1.0\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ko/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ko/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ko/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ko/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ku/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ku/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ku/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ku/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"X-Poedit-SourceCharset: utf-8\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/lb/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/lb/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/lb/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/lb/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -17,7 +17,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/lt/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/lt/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/lt/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/lt/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -24,7 +24,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/lv/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/lv/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/lv/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/lv/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -26,7 +26,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/mai/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/mai/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/mai/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/mai/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,7 +21,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/mk/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/mk/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/mk/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/mk/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -30,7 +30,7 @@
"2;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ml/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ml/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ml/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ml/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -24,7 +24,7 @@
"X-Poedit-Country: INDIA\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/mr/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/mr/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/mr/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/mr/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ms/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ms/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ms/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ms/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=2; plural=1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/nb/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/nb/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/nb/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/nb/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -26,7 +26,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/nds/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/nds/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/nds/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/nds/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -16,11 +16,11 @@
"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"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ne/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ne/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ne/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ne/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/nl/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/nl/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/nl/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/nl/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -32,7 +32,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/nn/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/nn/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/nn/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/nn/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/or/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/or/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/or/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/or/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -24,7 +24,7 @@
"X-Generator: KBabel 1.11.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/pa/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/pa/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/pa/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/pa/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -25,7 +25,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/pl/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/pl/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/pl/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/pl/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -29,7 +29,7 @@
"|| n%100>=20) ? 1 : 2);\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ps/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ps/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ps/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ps/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Poedit-Country: AFGHANISTAN\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/pt/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/pt/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/pt/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/pt/kwindowsystem5_qt.po 2014-07-01 20:36:04.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:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/pt_BR/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/pt_BR/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/pt_BR/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/pt_BR/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -29,7 +29,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ro/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ro/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ro/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ro/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"20)) ? 1 : 2;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ru/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ru/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ru/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ru/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -34,7 +34,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/se/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/se/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/se/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/se/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Text-Markup: kde4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/si/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/si/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/si/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/si/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -17,7 +17,7 @@
"X-Generator: Lokalize 1.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sk/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sk/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sk/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sk/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sl/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sl/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sl/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sl/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -11,13 +11,13 @@
# Andrej Vernekar , 2005, 2007, 2008, 2009, 2010.
# Jure Repinc , 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
# Andrej Vernekar , 2008, 2011, 2012.
-# Andrej Mernik , 2012, 2013.
+# Andrej Mernik , 2012, 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
-"PO-Revision-Date: 2013-11-26 18:31+0100\n"
+"PO-Revision-Date: 2014-06-12 14:56+0200\n"
"Last-Translator: Andrej Mernik \n"
"Language-Team: Slovenian \n"
"Language: sl\n"
@@ -29,9 +29,8 @@
"%100==4 ? 3 : 0);\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
-#, fuzzy, qt-format
-#| msgid "Desktop %1"
+#: kwindowsystem_x11.cpp:953
+#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
msgstr "Namizje %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sq/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sq/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sq/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sq/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -16,7 +16,7 @@
"X-Generator: Lokalize 1.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sr/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sr/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sr/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sr/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,9 +22,8 @@
"X-Environment: kde\n"
"X-Wrapping: fine\n"
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_mac.cpp:580
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_win.cpp:632
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_x11.cpp:925
+#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
+#: kwindowsystem_x11.cpp:925
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sr@ijekavian/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sr@ijekavian/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sr@ijekavian/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sr@ijekavian/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,9 +21,8 @@
"X-Text-Markup: qtrich\n"
"X-Environment: kde\n"
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_mac.cpp:580
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_win.cpp:632
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_x11.cpp:925
+#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
+#: kwindowsystem_x11.cpp:925
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sr@ijekavianlatin/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,9 +21,8 @@
"X-Text-Markup: qtrich\n"
"X-Environment: kde\n"
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_mac.cpp:580
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_win.cpp:632
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_x11.cpp:925
+#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
+#: kwindowsystem_x11.cpp:925
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sr@latin/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sr@latin/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sr@latin/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sr@latin/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -21,9 +21,8 @@
"X-Text-Markup: qtrich\n"
"X-Environment: kde\n"
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_mac.cpp:580
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_win.cpp:632
-#: ../../home/scripty/prod/git-unstable/frameworks_kwindowsystem/src/kwindowsystem_x11.cpp:925
+#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
+#: kwindowsystem_x11.cpp:925
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/sv/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/sv/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/sv/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/sv/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -14,7 +14,7 @@
"X-Generator: Lokalize 1.4\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ta/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ta/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ta/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ta/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 1.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/te/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/te/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/te/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/te/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -26,7 +26,7 @@
"4;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/tg/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/tg/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/tg/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/tg/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/th/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/th/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/th/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/th/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/tr/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/tr/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/tr/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/tr/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -32,7 +32,7 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/tt/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/tt/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/tt/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/tt/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -18,7 +18,7 @@
"X-Generator: Lokalize 1.2\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/ug/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/ug/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/ug/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/ug/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -19,7 +19,7 @@
"X-Generator: Poedit 1.5.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/uk/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/uk/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/uk/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/uk/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -1,5 +1,7 @@
-# translation of kdelibs4.po to Ukrainian
-# Translation of kdelibs4.po to Ukrainian
+# Translation of kwindowsystem5_qt.po to Ukrainian
+# Copyright (C) 2014 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
#
# Eugene Onischenko , 2002, 2003, 2004, 2005, 2006.
# Andriy Rysin , 2002, 2003, 2006, 2007.
@@ -7,7 +9,7 @@
# Yuri Chornoivan , 2008, 2009, 2010, 2011, 2012, 2013, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: kdelibs4\n"
+"Project-Id-Version: kwindowsystem5_qt\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
"PO-Revision-Date: 2014-03-28 18:55+0200\n"
@@ -22,7 +24,7 @@
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/uz/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/uz/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/uz/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/uz/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/uz@cyrillic/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/uz@cyrillic/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/uz@cyrillic/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/uz@cyrillic/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/vi/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/vi/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/vi/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/vi/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -20,7 +20,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/wa/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/wa/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/wa/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/wa/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -23,7 +23,7 @@
"X-Poedit-Language: Walloon\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/xh/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/xh/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/xh/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/xh/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -24,7 +24,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/zh_CN/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/zh_CN/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/zh_CN/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -26,7 +26,7 @@
"X-Generator: Lokalize 1.5\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/zh_HK/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/zh_HK/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/zh_HK/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/zh_HK/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -36,7 +36,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, fuzzy, qt-format
#| msgid "Desktop %1"
msgctxt "KWindowSystem|"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/po/zh_TW/kwindowsystem5_qt.po new/kwindowsystem-5.0.0/po/zh_TW/kwindowsystem5_qt.po
--- old/kwindowsystem-4.100.0/po/zh_TW/kwindowsystem5_qt.po 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/po/zh_TW/kwindowsystem5_qt.po 2014-07-01 20:36:04.000000000 +0200
@@ -27,7 +27,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
#: kwindowsystem_mac.cpp:580 kwindowsystem_win.cpp:632
-#: kwindowsystem_x11.cpp:925
+#: kwindowsystem_x11.cpp:953
#, qt-format
msgctxt "KWindowSystem|"
msgid "Desktop %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/CMakeLists.txt new/kwindowsystem-5.0.0/src/CMakeLists.txt
--- old/kwindowsystem-4.100.0/src/CMakeLists.txt 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/CMakeLists.txt 2014-07-01 20:36:04.000000000 +0200
@@ -82,16 +82,15 @@
ecm_generate_headers(KWindowSystem_HEADERS
HEADER_NAMES
KKeyServer
+ KSelectionOwner
+ KSelectionWatcher
KStartupInfo
KUserTimestamp
KWindowEffects
KWindowInfo
KWindowSystem
KXMessages
- KSelectionOwner
- KSelectionWatcher
NETWM # does not match the classnames in that file...
- KWindowSystem
REQUIRED_HEADERS KWindowSystem_HEADERS
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowinfo.cpp new/kwindowsystem-5.0.0/src/kwindowinfo.cpp
--- old/kwindowsystem-4.100.0/src/kwindowinfo.cpp 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowinfo.cpp 2014-07-01 20:36:04.000000000 +0200
@@ -146,6 +146,11 @@
return 0;
}
+QStringList KWindowInfoPrivateDummy::activities() const
+{
+ return QStringList();
+}
+
QRect KWindowInfoPrivateDummy::geometry() const
{
return QRect();
@@ -313,6 +318,11 @@
DELEGATE(desktop, )
}
+QStringList KWindowInfo::activities() const
+{
+ DELEGATE(activities, )
+}
+
QRect KWindowInfo::geometry() const
{
DELEGATE(geometry, )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowinfo.h new/kwindowsystem-5.0.0/src/kwindowinfo.h
--- old/kwindowsystem-4.100.0/src/kwindowinfo.h 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowinfo.h 2014-07-01 20:36:04.000000000 +0200
@@ -27,6 +27,7 @@
#include
#include <QWidgetList> //For WId
#include <QExplicitlySharedDataPointer>
+#include <QStringList>
#include
@@ -377,6 +378,34 @@
*/
int desktop() const;
/**
+ * Returns the list of activity UUIDs this window belongs to.
+ *
+ * The Plasma workspace allows the user to separate her work into
+ * different activities, by assigning windows, documents etc. to
+ * the specific ones. An activity is an abstract concept whose meaning
+ * can differ from one user to another. Typical examples of activities
+ * are "developing a KDE project", "studying the 19th century art",
+ * "composing music", "lazing on a Sunday afternoon" etc.
+ *
+ * If the list is empty, or contains a null UUID, the window is on
+ * all activities.
+ *
+ * Requires NET::WM2Activities passed as properties parameter to the constructor.
+ *
+ * @code
+ * QWidget *window = new QWidget(Q_NULLPTR);
+ * window->show();
+ * KWindowInfo info(window->winId(), 0, NET::WM2Activities);
+ * if (info.valid())
+ * info.desktop();
+ * @endcode
+ *
+ * @note Activities are only supported on Plasma Workspace on X11
+ *
+ * @since 5.0
+ */
+ QStringList activities() const;
+ /**
* Returns the position and size of the window contents.
*
* Requires NET::WMGeometry passed as properties parameter to the constructor.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowinfo_p.h new/kwindowsystem-5.0.0/src/kwindowinfo_p.h
--- old/kwindowsystem-4.100.0/src/kwindowinfo_p.h 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowinfo_p.h 2014-07-01 20:36:04.000000000 +0200
@@ -24,6 +24,7 @@
#include <QByteArray>
#include <QRect>
#include <QString>
+#include <QStringList>
#include <QSharedData>
#include <QWidgetList> //For WId
@@ -85,6 +86,8 @@
template <class T>
int desktop() const;
template <class T>
+ QStringList activities() const;
+ template <class T>
QRect geometry() const;
template <class T>
QRect frameGeometry() const;
@@ -140,6 +143,7 @@
bool onAllDesktops() const;
bool isOnDesktop(int desktop) const;
int desktop() const;
+ QStringList activities() const;
QRect geometry() const;
QRect frameGeometry() const;
WId transientFor() const;
@@ -183,6 +187,7 @@
DELGATE(QString, iconName)
DELGATE(bool, onAllDesktops)
DELGATE(int, desktop)
+DELGATE(QStringList, activities)
DELGATE(QRect, geometry)
DELGATE(QRect, frameGeometry)
DELGATE(WId, transientFor)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowinfo_p_x11.h new/kwindowsystem-5.0.0/src/kwindowinfo_p_x11.h
--- old/kwindowsystem-4.100.0/src/kwindowinfo_p_x11.h 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowinfo_p_x11.h 2014-07-01 20:36:04.000000000 +0200
@@ -45,6 +45,7 @@
bool onAllDesktops() const;
bool isOnDesktop(int desktop) const;
int desktop() const;
+ QStringList activities() const;
QRect geometry() const;
QRect frameGeometry() const;
WId transientFor() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowinfo_x11.cpp new/kwindowsystem-5.0.0/src/kwindowinfo_x11.cpp
--- old/kwindowsystem-4.100.0/src/kwindowinfo_x11.cpp 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowinfo_x11.cpp 2014-07-01 20:36:04.000000000 +0200
@@ -291,6 +291,16 @@
return m_info->desktop();
}
+QStringList KWindowInfoPrivateX11::activities() const
+{
+#if !defined(KDE_NO_WARNING_OUTPUT)
+ if (!(m_info->passedProperties2() & NET::WM2Activities)) {
+ qWarning() << "Pass NET::WM2Activities to KWindowInfo";
+ }
+#endif
+ return QString::fromLatin1(m_info->activities()).split(QLatin1Char(','));
+}
+
QRect KWindowInfoPrivateX11::geometry() const
{
#if !defined(KDE_NO_WARNING_OUTPUT)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-4.100.0/src/kwindowsystem_x11.cpp new/kwindowsystem-5.0.0/src/kwindowsystem_x11.cpp
--- old/kwindowsystem-4.100.0/src/kwindowsystem_x11.cpp 2014-06-01 14:39:41.000000000 +0200
+++ new/kwindowsystem-5.0.0/src/kwindowsystem_x11.cpp 2014-07-01 20:36:04.000000000 +0200
@@ -363,6 +363,7 @@
static bool atoms_created = false;
static Atom _wm_protocols;
+static Atom _wm_change_state;
static Atom kwm_utf8_string;
static void create_atoms(Display *dpy)
@@ -377,6 +378,9 @@
atoms[n] = &_wm_protocols;
names[n++] = "WM_PROTOCOLS";
+ atoms[n] = &_wm_change_state;
+ names[n++] = "WM_CHANGE_STATE";
+
atoms[n] = &kwm_utf8_string;
names[n++] = "UTF8_STRING";
@@ -777,23 +781,46 @@
info.setState(0, state);
}
+// enum values for ICCCM 4.1.2.4 and 4.1.4, defined to not depend on xcb-icccm
+enum {
+ _ICCCM_WM_STATE_WITHDRAWN = 0,
+ _ICCCM_WM_STATE_NORMAL = 1,
+ _ICCCM_WM_STATE_ICONIC = 3
+};
+
void KWindowSystemPrivateX11::minimizeWindow(WId win)
{
- XIconifyWindow(QX11Info::display(), win, QX11Info::appScreen());
+ create_atoms();
+ // as described in ICCCM 4.1.4
+ xcb_client_message_event_t ev;
+ memset(&ev, 0, sizeof(ev));
+ ev.response_type = XCB_CLIENT_MESSAGE;
+ ev.window = win;
+ ev.type = _wm_change_state;
+ ev.format = 32;
+ ev.data.data32[0] = _ICCCM_WM_STATE_ICONIC;
+ ev.data.data32[1] = 0;
+ ev.data.data32[2] = 0;
+ ev.data.data32[3] = 0;
+ ev.data.data32[4] = 0;
+ xcb_send_event(QX11Info::connection(), false, QX11Info::appRootWindow(),
+ XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT,
+ reinterpret_cast(&ev));
}
void KWindowSystemPrivateX11::unminimizeWindow(WId win)
{
- XMapWindow(QX11Info::display(), win);
+ xcb_map_window(QX11Info::connection(), win);
}
void KWindowSystemPrivateX11::raiseWindow(WId win)
{
NETRootInfo info(QX11Info::connection(), NET::Supported);
if (info.isSupported(NET::WM2RestackWindow)) {
- info.restackRequest(win, NET::FromTool, None, Above, QX11Info::appUserTime());
+ info.restackRequest(win, NET::FromTool, XCB_WINDOW_NONE, XCB_STACK_MODE_ABOVE, QX11Info::appUserTime());
} else {
- XRaiseWindow(QX11Info::display(), win);
+ const uint32_t values[] = { XCB_STACK_MODE_ABOVE };
+ xcb_configure_window(QX11Info::connection(), win, XCB_CONFIG_WINDOW_STACK_MODE, values);
}
}
@@ -801,9 +828,10 @@
{
NETRootInfo info(QX11Info::connection(), NET::Supported);
if (info.isSupported(NET::WM2RestackWindow)) {
- info.restackRequest(win, NET::FromTool, None, Below, QX11Info::appUserTime());
+ info.restackRequest(win, NET::FromTool, XCB_WINDOW_NONE, XCB_STACK_MODE_BELOW, QX11Info::appUserTime());
} else {
- XLowerWindow(QX11Info::display(), win);
+ const uint32_t values[] = { XCB_STACK_MODE_BELOW };
+ xcb_configure_window(QX11Info::connection(), win, XCB_CONFIG_WINDOW_STACK_MODE, values);
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org