![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2014-07-15 10:06:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2014-06-10 14:36:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-07-15 10:06:35.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 11 09:48:35 UTC 2014 - hrvoje.senjan@gmail.com + +- Define kf5_version within package + +------------------------------------------------------------------- +Tue Jul 1 21:35:49 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 +- Drop 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch, + merged upstream + +------------------------------------------------------------------- Old: ---- 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch frameworkintegration-4.100.0.tar.xz New: ---- frameworkintegration-5.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.zpVmmc/_old 2014-07-15 10:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.zpVmmc/_new 2014-07-15 10:06:36.000000000 +0200 @@ -18,19 +18,20 @@ %define lname libKF5Style5 Name: frameworkintegration -Version: 4.100.0 +Version: 5.0.0 Release: 0 +%define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.14 +BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{_kf5_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_version} +BuildRequires: kconfig-devel >= %{kf5_version} +BuildRequires: kconfigwidgets-devel >= %{kf5_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_version} -BuildRequires: kiconthemes-devel >= %{_kf5_version} -BuildRequires: kio-devel >= %{_kf5_version} -BuildRequires: knotifications-devel >= %{_kf5_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_version} +BuildRequires: ki18n-devel >= %{kf5_version} +BuildRequires: kiconthemes-devel >= %{kf5_version} +BuildRequires: kio-devel >= %{kf5_version} +BuildRequires: knotifications-devel >= %{kf5_version} +BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: libQt5Gui-private-headers-devel >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 @@ -41,10 +42,8 @@ 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 -# PATCH-FIX-UPSTREAM 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch -- kde#334858 -Patch0: 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,8 +71,8 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{_kf5_version} -Requires: kiconthemes-devel >= %{_kf5_version} +Requires: kconfigwidgets-devel >= %{kf5_version} +Requires: kiconthemes-devel >= %{kf5_version} %description devel Framework Integration is a set of plugins responsible for better @@ -85,7 +84,6 @@ %lang_package -n %lname %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build ++++++ frameworkintegration-4.100.0.tar.xz -> frameworkintegration-5.0.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/CMakeLists.txt new/frameworkintegration-5.0.0/CMakeLists.txt --- old/frameworkintegration-4.100.0/CMakeLists.txt 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/CMakeLists.txt 2014-07-01 20:26:12.000000000 +0200 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -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}) @@ -19,8 +19,8 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "4.100.0") # handled by release scripts -set(KF5_DEP_VERSION "4.100.0") # handled by release scripts +set(KF5_VERSION "5.0.0") # handled by release scripts +set(KF5_DEP_VERSION "5.0.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/autotests/kfiledialog_unittest.cpp new/frameworkintegration-5.0.0/autotests/kfiledialog_unittest.cpp --- old/frameworkintegration-4.100.0/autotests/kfiledialog_unittest.cpp 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/autotests/kfiledialog_unittest.cpp 2014-07-01 20:26:12.000000000 +0200 @@ -98,12 +98,10 @@ /* * Disabled because of a bug in Qt that causes the wrong viewMode value to be returned. A patch - * is in Qt's gerrit: https://codereview.qt-project.org/#change,84137 - * It's not yet in Qt 5.4 therefore Qt 5.5 is the minimal version with this patch. However, the - * patch is likely going to be accepted earlier. The version check below will have to - * be changed accordingly once the patch lands. + * is in Qt's gerrit: https://codereview.qt-project.org/#change,84137 and is in Qt since 5.3.1. + * TODO: remove the version check once this project requires Qt 5.3.1 or higher. */ -#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 1)) QCOMPARE(dialog.viewMode(), qtViewMode); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ar/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ar/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ar/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/po/ar/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1,93 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Safa Alfulaij <safa1996alfulaij@gmail.com>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-24 09:35+0300\n" +"Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n" +"Language-Team: Arabic <doc@arabeyes.org>\n" +"Language: arMIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Lokalize 1.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "يفتح..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "يحفظ..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "مجلد جديد" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "مجلد جديد" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"أنشأ مجلدًا جديدًا في:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "يوجد ملف أو مجلد بالاسم %1 بالفعل." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "لا صلاحيات لديك لإنشاء ذلك المجلد." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "اختر مجلدًا" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "مجلد جديد..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "مجلد جديد..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "انقل إلى المهملات" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "احذف" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "أظهر المجلدات المخفيّة" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "خصائص" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "أظهر المجلدات المخفيّة" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ca/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ca/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ca/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/ca/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -4,27 +4,28 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Josep Ma. Ferrer <txemaq@gmail.com>, 2014. +# Antoni Bella Pérez <antonibella5@orange.es>, 2014. msgid "" msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" -"PO-Revision-Date: 2014-04-17 17:07+0200\n" -"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-24 18:52+0200\n" +"Last-Translator: Antoni Bella Pérez <antonibella5@orange.es>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "X-Accelerator-Marker: &\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "S'està obrint..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "S'està desant..." @@ -75,7 +76,7 @@ #: platformtheme/kdirselectdialog.cpp:347 msgctxt "@action:inmenu" msgid "Move to Trash" -msgstr "Mou a la paperera" +msgstr "Llença a la paperera" #: platformtheme/kdirselectdialog.cpp:354 msgctxt "@action:inmenu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/cs/frameworkintegration5.po new/frameworkintegration-5.0.0/po/cs/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/cs/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/cs/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-16 09:56+0200\n" "Last-Translator: Vít Pelčák <vit@pelcak.org>\n" "Language-Team: Czech <kde-i18n-doc@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Otevírám..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Ukládám..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/de/frameworkintegration5.po new/frameworkintegration-5.0.0/po/de/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/de/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/de/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-15 11:34+0200\n" "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Öffnen ..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Speichern ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/en_GB/frameworkintegration5.po new/frameworkintegration-5.0.0/po/en_GB/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/en_GB/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/po/en_GB/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1,94 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Steve Allewell <steve.allewell@gmail.com>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-28 13:00+0100\n" +"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n" +"Language-Team: British English <kde-l10n-en_gb@kde.org>\n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "Opening..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "Saving..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "New Folder" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "New Folder" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Create new folder in:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "A file or folder named %1 already exists." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "You do not have permission to create that folder." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Select Folder" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "New Folder..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "New Folder..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Move to Wastebin" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Delete" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Show Hidden Folders" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Properties" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Show Hidden Folders" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/es/frameworkintegration5.po new/frameworkintegration-5.0.0/po/es/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/es/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/es/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-18 22:25+0200\n" "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n" "Language-Team: Spanish <kde-l10n-es@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Abriendo..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Guardando..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/fi/frameworkintegration5.po new/frameworkintegration-5.0.0/po/fi/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/fi/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/fi/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-15 21:37+0300\n" "Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n" "Language-Team: Finnish <lokalisointi@lists.coss.fi>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Avataan…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Tallennetaan…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/gl/frameworkintegration5.po new/frameworkintegration-5.0.0/po/gl/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/gl/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/gl/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-12 23:11+0200\n" "Last-Translator: Marce Villarino <mvillarino@kde-espana.org>\n" "Language-Team: Galician <kde-i18n-doc@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Estase a abrir..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Estase a gardar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/hu/frameworkintegration5.po new/frameworkintegration-5.0.0/po/hu/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/hu/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/hu/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-22 14:51+0200\n" "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n" "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Megnyitás…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Mentés…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ia/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ia/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ia/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/ia/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-22 13:55+0200\n" "Last-Translator: G.Sora <g.sora@tiscali.it>\n" "Language-Team: Interlingua <kde-l10n-ia@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Aperiente ..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Salveguardante..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/it/frameworkintegration5.po new/frameworkintegration-5.0.0/po/it/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/it/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/it/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-25 17:05+0200\n" "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Apertura in corso..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Salvataggio in corso..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ko/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ko/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ko/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/ko/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-28 02:22+0900\n" "Last-Translator: Park Shinjo <kde@peremen.name>\n" "Language-Team: Korean <kde@peremen.name>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "여는 중..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "저장 중..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/nds/frameworkintegration5.po new/frameworkintegration-5.0.0/po/nds/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/nds/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/nds/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-22 22:24+0200\n" "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Bi to opmaken..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Bi to sekern..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/nl/frameworkintegration5.po new/frameworkintegration-5.0.0/po/nl/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/nl/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/nl/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-15 09:37+0200\n" "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Bezig met openen..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Bezig met opslaan..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/pa/frameworkintegration5.po new/frameworkintegration-5.0.0/po/pa/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/pa/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/po/pa/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1,92 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# A S Alam <aalam@users.sf.net>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-28 22:32-0500\n" +"Last-Translator: A S Alam <aalam@users.sf.net>\n" +"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" +"Language: pa\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "ਨਵਾਂ ਫੋਲਡਰ" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "ਨਵਾਂ ਫੋਲਡਰ" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "" + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "ਇਹ ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡੇ ਕੋਲ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।" + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "ਫੋਲਡਰ ਚੁਣੋ" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "ਨਵਾਂ ਫੋਲਡਰ..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "ਨਵਾਂ ਫੋਲਡਰ..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "ਹਟਾਓ" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "ਲੁਕਵੇਂ ਫੋਲਡਰ ਵੇਖੋ" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "ਵਿਸ਼ੇਸ਼ਤਾ" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/pl/frameworkintegration5.po new/frameworkintegration-5.0.0/po/pl/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/pl/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/pl/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-16 17:29+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -18,11 +18,11 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Otwieranie..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Zapisywanie..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/pt/frameworkintegration5.po new/frameworkintegration-5.0.0/po/pt/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/pt/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/pt/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-03-29 12:31+0000\n" "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n" "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n" @@ -12,11 +12,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "A abrir..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "A gravar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/pt_BR/frameworkintegration5.po new/frameworkintegration-5.0.0/po/pt_BR/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/pt_BR/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/pt_BR/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-16 00:00-0300\n" "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" @@ -18,11 +18,11 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Abrindo..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Salvando..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ro/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ro/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ro/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/ro/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-02 12:07+0300\n" "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n" "Language-Team: Romanian <kde-i18n-ro@kde.org>\n" @@ -18,11 +18,11 @@ "20)) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Se deschide..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Se salvează..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/ru/frameworkintegration5.po new/frameworkintegration-5.0.0/po/ru/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/ru/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/po/ru/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1,97 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Alexander Potashev <aspotashev@gmail.com>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-25 04:16+0400\n" +"Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n" +"Language-Team: Russian <kde-russian@lists.kde.ru>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" + +# BUGME: "Выбор файла для открытия"? --aspotashev +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "Открытие" + +# BUGME: "Выбор файла для сохранения"? --aspotashev +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "Сохранение" + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "Новая папка" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "Создание папки" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Создать новую папку в:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "Файл или папка с именем %1 уже существует." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "У вас нет прав для создания этой папки." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Выбор папки" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Создать папку..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Создать папку..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Удалить в корзину" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Удалить" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Показывать скрытые папки" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Свойства" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Показывать скрытые папки" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sk/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sk/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sk/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sk/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-16 20:41+0200\n" "Last-Translator: Roman Paholík <wizzardsk@gmail.com>\n" "Language-Team: Slovak <kde-sk@linux.sk>\n" @@ -15,11 +15,11 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Otvára sa..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Ukladám..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sl/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sl/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sl/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/po/sl/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1,95 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Andrej Mernik <andrejm@ubuntu.si>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-11 11:46+0200\n" +"Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n" +"Language-Team: Slovenian <lugos-slo@lugos.si>\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Generator: Lokalize 1.5\n" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "Odpiranje ..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "Shranjevanje ..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "Nova mapa" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "Nova mapa" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"Ustvari novo mapo v:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "Datoteka ali mapa %1 že obstaja." + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "Nimate dovoljenja za ustvaritev te mape." + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "Izberite mapo" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "Nova mapa ..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "Nova mapa ..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "Premakni v Smeti" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "Izbriši" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "Pokaži skrite mape" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "Lastnosti" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "Pokaži skrite mape" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sr/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sr/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sr/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sr/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -8,12 +8,15 @@ "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" -"Language: \n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:211 msgid "Opening..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sr@ijekavian/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sr@ijekavian/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sr@ijekavian/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sr@ijekavian/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -8,12 +8,15 @@ "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" -"Language: \n" +"Language: sr@ijekavian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:211 msgid "Opening..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sr@ijekavianlatin/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sr@ijekavianlatin/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -8,12 +8,15 @@ "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" -"Language: \n" +"Language: sr@ijekavianlatin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:211 msgid "Opening..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sr@latin/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sr@latin/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sr@latin/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sr@latin/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -8,12 +8,15 @@ "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" -"Language: \n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" +"X-Environment: kde\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:211 msgid "Opening..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/sv/frameworkintegration5.po new/frameworkintegration-5.0.0/po/sv/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/sv/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/sv/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-15 18:37+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n" "Language-Team: Swedish <kde-i18n-doc@kde.org>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Öppnar..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Sparar..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/tr/frameworkintegration5.po new/frameworkintegration-5.0.0/po/tr/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/tr/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/tr/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" -"PO-Revision-Date: 2014-04-14 13:19+0200\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-06-03 20:33+0200\n" "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" "Language-Team: Turkish <kde-l10n-tr@kde.org>\n" "Language: tr\n" @@ -17,23 +17,23 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Açılıyor..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Kaydediliyor..." #: platformtheme/kdirselectdialog.cpp:132 msgctxt "folder name" msgid "New Folder" -msgstr "" +msgstr "Yeni Klasör" #: platformtheme/kdirselectdialog.cpp:137 msgctxt "@title:window" msgid "New Folder" -msgstr "" +msgstr "Yeni Klasör" #: platformtheme/kdirselectdialog.cpp:138 #, kde-format @@ -42,51 +42,53 @@ "Create new folder in:\n" "%1" msgstr "" +"Şurada yeni klasör oluştur:\n" +"%1" #: platformtheme/kdirselectdialog.cpp:168 #, kde-format msgid "A file or folder named %1 already exists." -msgstr "" +msgstr "%1 isminde bir dosya veya klasör zaten mevcut." #: platformtheme/kdirselectdialog.cpp:171 msgid "You do not have permission to create that folder." -msgstr "" +msgstr "Bu klasörü yaratmak için gerekli izinlere sahip değilsiniz." #: platformtheme/kdirselectdialog.cpp:285 msgctxt "@title:window" msgid "Select Folder" -msgstr "" +msgstr "Klasör Seç" #: platformtheme/kdirselectdialog.cpp:294 msgctxt "@action:button" msgid "New Folder..." -msgstr "" +msgstr "Yeni Klasör..." #: platformtheme/kdirselectdialog.cpp:340 msgctxt "@action:inmenu" msgid "New Folder..." -msgstr "" +msgstr "Yeni Klasör..." #: platformtheme/kdirselectdialog.cpp:347 msgctxt "@action:inmenu" msgid "Move to Trash" -msgstr "" +msgstr "Çöp Kutusuna Taşı" #: platformtheme/kdirselectdialog.cpp:354 msgctxt "@action:inmenu" msgid "Delete" -msgstr "" +msgstr "Sil" #: platformtheme/kdirselectdialog.cpp:363 msgctxt "@option:check" msgid "Show Hidden Folders" -msgstr "" +msgstr "Gizli Klasörleri Göster" #: platformtheme/kdirselectdialog.cpp:370 msgctxt "@action:inmenu" msgid "Properties" -msgstr "" +msgstr "Özellikler" #: platformtheme/kfiletreeview.cpp:192 msgid "Show Hidden Folders" -msgstr "" +msgstr "Gizli Klasörleri Göster" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/uk/frameworkintegration5.po new/frameworkintegration-5.0.0/po/uk/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/uk/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/uk/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -1,12 +1,14 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of frameworkintegration5.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. # # Yuri Chornoivan <yurchor@ukr.net>, 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-15 08:19+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n" @@ -18,11 +20,11 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Відкриття…" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Збереження…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/po/zh_TW/frameworkintegration5.po new/frameworkintegration-5.0.0/po/zh_TW/frameworkintegration5.po --- old/frameworkintegration-4.100.0/po/zh_TW/frameworkintegration5.po 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/po/zh_TW/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-04-22 10:04+0800\n" "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" "Language-Team: Chinese Traditional <kde-tw@googlegroups.com>\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "開啟中..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "儲存中..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/src/platformtheme/CMakeLists.txt new/frameworkintegration-5.0.0/src/platformtheme/CMakeLists.txt --- old/frameworkintegration-4.100.0/src/platformtheme/CMakeLists.txt 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/src/platformtheme/CMakeLists.txt 2014-07-01 20:26:12.000000000 +0200 @@ -1,3 +1,18 @@ +if(NOT APPLE) + find_package(XCB COMPONENTS XCB) + set_package_properties(XCB PROPERTIES + TYPE RECOMMENDED + PURPOSE "Required for flushing the XCB connection on the X11 Platform" + ) + set(HAVE_X11 ${XCB_XCB_FOUND}) + if (XCB_XCB_FOUND) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + endif() +else() + set(HAVE_X11 FALSE) +endif() + +configure_file(config-platformtheme.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-platformtheme.h ) set(platformtheme_SRCS kdeplatformtheme.cpp @@ -30,4 +45,8 @@ KF5::Notifications ) +if(HAVE_X11) + target_link_libraries(KDEPlatformTheme PRIVATE Qt5::X11Extras XCB::XCB) +endif() + install(TARGETS KDEPlatformTheme DESTINATION ${QT_PLUGIN_INSTALL_DIR}/platformthemes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/src/platformtheme/config-platformtheme.h.cmake new/frameworkintegration-5.0.0/src/platformtheme/config-platformtheme.h.cmake --- old/frameworkintegration-4.100.0/src/platformtheme/config-platformtheme.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.0.0/src/platformtheme/config-platformtheme.h.cmake 2014-07-01 20:26:12.000000000 +0200 @@ -0,0 +1 @@ +#cmakedefine01 HAVE_X11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/src/platformtheme/kdeplatformfiledialoghelper.cpp new/frameworkintegration-5.0.0/src/platformtheme/kdeplatformfiledialoghelper.cpp --- old/frameworkintegration-4.100.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-07-01 20:26:12.000000000 +0200 @@ -28,6 +28,8 @@ #include <klocalizedstring.h> #include <kdiroperator.h> #include <KUrlComboBox> +#include <KSharedConfig> +#include <KWindowConfig> #include <QVBoxLayout> #include <QDialogButtonBox> #include <QPushButton> @@ -192,6 +194,9 @@ KDEPlatformFileDialogHelper::~KDEPlatformFileDialogHelper() { + KSharedConfig::Ptr conf = KSharedConfig::openConfig(); + KConfigGroup group = conf->group("FileDialogSize"); + KWindowConfig::saveWindowSize(m_dialog->windowHandle(), group); delete m_dialog; } @@ -229,11 +234,12 @@ } } } - } void KDEPlatformFileDialogHelper::exec() { +// FIXME should KWindowConfig::restoreWindowSize, but then we dont' have a windowHandle yet and +// after exec is already too late. m_dialog->exec(); } @@ -249,6 +255,8 @@ m_dialog->setModal(windowModality != Qt::NonModal); if (windowModality == Qt::NonModal) { m_dialog->show(); + KSharedConfig::Ptr conf = KSharedConfig::openConfig(); + KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize")); } return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/src/platformtheme/main.cpp new/frameworkintegration-5.0.0/src/platformtheme/main.cpp --- old/frameworkintegration-4.100.0/src/platformtheme/main.cpp 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/src/platformtheme/main.cpp 2014-07-01 20:26:12.000000000 +0200 @@ -22,6 +22,16 @@ #include "kdeplatformtheme.h" +#include <config-platformtheme.h> +#if (QT_VERSION < QT_VERSION_CHECK(5, 3, 1)) +#if HAVE_X11 +#include <QCoreApplication> +#include <QAbstractEventDispatcher> +#include <QX11Info> +#include <xcb/xcb.h> +#endif +#endif + class KdePlatformThemePlugin : public QPlatformThemePlugin { Q_OBJECT @@ -34,8 +44,37 @@ { Q_UNUSED(key) Q_UNUSED(paramList) +#if (QT_VERSION < QT_VERSION_CHECK(5, 3, 1)) + // Must be done after we have an event-dispatcher. By posting a method invocation + // we are sure that by the time the method is called we have an event-dispatcher. + QMetaObject::invokeMethod(this, "setupXcbFlush", Qt::QueuedConnection); +#endif return new KdePlatformTheme; } + +public Q_SLOTS: + void setupXcbFlush(); }; +void KdePlatformThemePlugin::setupXcbFlush() +{ +#if (QT_VERSION < QT_VERSION_CHECK(5, 3, 1)) +#if HAVE_X11 + // this is a workaround for BUG 334858 + // it ensures that the xcb connection gets flushed before the EventDispatcher + // is going to block. Qt does not guarantee this in all cases. + // For Qt this issue is addressed in https://codereview.qt-project.org/85654 + // TODO: remove again once we depend on a Qt version with the patch. + if (!QX11Info::isPlatformX11() || qstrcmp(qVersion(), "5.3.1") >= 0) { + return; + } + connect(QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, + []() { + xcb_flush(QX11Info::connection()); + } + ); +#endif +#endif +} + #include "main.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.100.0/tests/qfiledialogtest.cpp new/frameworkintegration-5.0.0/tests/qfiledialogtest.cpp --- old/frameworkintegration-4.100.0/tests/qfiledialogtest.cpp 2014-06-01 14:03:39.000000000 +0200 +++ new/frameworkintegration-5.0.0/tests/qfiledialogtest.cpp 2014-07-01 20:26:12.000000000 +0200 @@ -26,6 +26,7 @@ int main(int argc, char **argv) { QApplication app(argc, argv); + app.setApplicationName(QStringLiteral("QFileDialogTest")); QCommandLineParser parser; parser.addHelpOption(); parser.addOption(QCommandLineOption(QStringList(QStringLiteral("staticFunction")), QStringLiteral("Test one of the static convencience function: 'getExistingDirectory'"), QStringLiteral("function name"))); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org