Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2014-06-10 14:36:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-14 20:26:29.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2014-06-10 14:36:37.000000000 +0200
@@ -1,0 +2,12 @@
+Sun Jun 1 18:02:20 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to 4.100.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta3.php
+- Add 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch
+ (kde#334858)
+- Added baselibs.conf
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-4.99.0.tar.xz
New:
----
0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch
baselibs.conf
frameworkintegration-4.100.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.v2Tlzr/_old 2014-06-10 14:36:37.000000000 +0200
+++ /var/tmp/diff_new_pack.v2Tlzr/_new 2014-06-10 14:36:37.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5Style5
Name: frameworkintegration
-Version: 4.99.0
+Version: 4.100.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.13
+BuildRequires: extra-cmake-modules >= 0.0.14
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{_kf5_version}
BuildRequires: kconfigwidgets-devel >= %{_kf5_version}
@@ -41,7 +41,10 @@
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source0: frameworkintegration-%{version}.tar.xz
+Source:
http://download.kde.org/unstable/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
@@ -55,6 +58,7 @@
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
Group: System/GUI/KDE
Obsoletes: libKF5Style4
+Recommends: %lname-lang = %{version}
%description -n %lname
Framework Integration is a set of plugins responsible for better
@@ -78,8 +82,10 @@
Applications do not need to link to this directly. Development files
+%lang_package -n %lname
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
@@ -89,10 +95,14 @@
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
+ %find_lang %{name}5
+
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
+%files -n %lname-lang -f %{name}5.lang
+
%files -n %lname
%defattr(-,root,root)
%doc COPYING* README*
++++++ 0001-Ensure-the-xcb-connection-gets-flushed-before-the-ev.patch ++++++
>From 6210b6bb8af128c8e93c77330af80185d8ac3bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraess...@kde.org>
Date: Wed, 21 May 2014 08:10:07 +0200
Subject: [PATCH 1/1] Ensure the xcb connection gets flushed before the event
dispatcher blocks
This is a workaround for Qt versions which do not yet have the change
https://codereview.qt-project.org/85654
It is important to have this workaround as applications can get stalled
when a framework uses xcb and doesn't flush the connection manually.
BUG: 334858
REVIEW: 118234
---
src/platformtheme/CMakeLists.txt | 19 +++++++++++++++
src/platformtheme/config-platformtheme.h.cmake | 1 +
src/platformtheme/main.cpp | 33 ++++++++++++++++++++++++++
3 files changed, 53 insertions(+)
create mode 100644 src/platformtheme/config-platformtheme.h.cmake
diff --git a/src/platformtheme/CMakeLists.txt b/src/platformtheme/CMakeLists.txt
index da77cf8..8a3b1b4 100644
--- a/src/platformtheme/CMakeLists.txt
+++ b/src/platformtheme/CMakeLists.txt
@@ -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 @@ target_link_libraries(KDEPlatformTheme
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 --git a/src/platformtheme/config-platformtheme.h.cmake
b/src/platformtheme/config-platformtheme.h.cmake
new file mode 100644
index 0000000..89858d1
--- /dev/null
+++ b/src/platformtheme/config-platformtheme.h.cmake
@@ -0,0 +1 @@
+#cmakedefine01 HAVE_X11
diff --git a/src/platformtheme/main.cpp b/src/platformtheme/main.cpp
index 21d9aa0..d2c2bb1 100644
--- a/src/platformtheme/main.cpp
+++ b/src/platformtheme/main.cpp
@@ -22,6 +22,14 @@
#include "kdeplatformtheme.h"
+#include <config-platformtheme.h>
+#if HAVE_X11
+#include <QCoreApplication>
+#include <QAbstractEventDispatcher>
+#include <QX11Info>
+#include <xcb/xcb.h>
+#endif
+
class KdePlatformThemePlugin : public QPlatformThemePlugin
{
Q_OBJECT
@@ -34,8 +42,33 @@ public:
{
Q_UNUSED(key)
Q_UNUSED(paramList)
+ // 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);
return new KdePlatformTheme;
}
+
+public Q_SLOTS:
+ void setupXcbFlush();
};
+void KdePlatformThemePlugin::setupXcbFlush()
+{
+#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()) {
+ return;
+ }
+ connect(QCoreApplication::eventDispatcher(),
&QAbstractEventDispatcher::aboutToBlock,
+ []() {
+ xcb_flush(QX11Info::connection());
+ }
+ );
+#endif
+}
+
#include "main.moc"
--
1.9.3
++++++ baselibs.conf ++++++
libKF5Style5
frameworkintegration-devel
requires "libKF5Style5-<targettype> = <version>"
++++++ frameworkintegration-4.99.0.tar.xz ->
frameworkintegration-4.100.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-4.99.0/CMakeLists.txt
new/frameworkintegration-4.100.0/CMakeLists.txt
--- old/frameworkintegration-4.99.0/CMakeLists.txt 2014-05-05
02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/CMakeLists.txt 2014-06-01
14:03:39.000000000 +0200
@@ -2,7 +2,7 @@
project(FrameworkIntegration)
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 0.0.14 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.99.0") # handled by release scripts
-set(KF5_DEP_VERSION "4.99.0") # handled by release scripts
+set(KF5_VERSION "4.100.0") # handled by release scripts
+set(KF5_DEP_VERSION "4.100.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
@@ -43,6 +43,9 @@
)
add_definitions(-DTRANSLATION_DOMAIN=\"frameworkintegration5\")
+if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ ki18n_install(po)
+endif()
add_subdirectory(src)
add_subdirectory(autotests)
add_subdirectory(tests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/ca/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/ca/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/ca/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/ca/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: frameworkintegration5\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\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 <txe...@gmail.com>\n"
"Language-Team: Catalan <kde-i18n...@kde.org>\n"
@@ -20,11 +20,11 @@
"X-Generator: Lokalize 1.4\n"
"X-Accelerator-Marker: &\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "S'està obrint..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "S'està desant..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/cs/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/cs/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/cs/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/cs/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-16 09:56+0200\n"
"Last-Translator: Vít Pelčák <v...@pelcak.org>\n"
"Language-Team: Czech <kde-i18n-...@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:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Otevírám..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Ukládám..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/de/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/de/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/de/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/de/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-15 11:34+0200\n"
"Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n"
"Language-Team: German <kde-i18n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Öffnen ..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Speichern ..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/es/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/es/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/es/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/es/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-18 22:25+0200\n"
"Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n"
"Language-Team: Spanish <kde-l10n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Abriendo..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Guardando..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/fi/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/fi/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/fi/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/fi/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-15 21:37+0300\n"
"Last-Translator: Lasse Liehu <lasse.li...@gmail.com>\n"
"Language-Team: Finnish <lokalisoi...@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:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Avataan…"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Tallennetaan…"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/gl/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/gl/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/gl/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-4.100.0/po/gl/frameworkintegration5.po
2014-06-01 14:03:39.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.
+#
+# Marce Villarino <mvillar...@kde-espana.org>, 2014.
+msgid ""
+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-05-12 23:11+0200\n"
+"Last-Translator: Marce Villarino <mvillar...@kde-espana.org>\n"
+"Language-Team: Galician <kde-i18n-...@kde.org>\n"
+"Language: gl\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:211
+msgid "Opening..."
+msgstr "Estase a abrir..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Saving..."
+msgstr "Estase a gardar..."
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Cartafol novo"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Novo cartafol"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Crear un cartafol novo en:\n"
+"%1"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Xa existe un ficheiro ou cartafol chamado %1."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "Non ten permisos para crear ese cartafol."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Escoller un cartafol"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Novo cartafol..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Novo cartafol..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Deitar no lixo"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Eliminar"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Mostrar os cartafoles agochados"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Propiedades"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Mostrar os cartafoles agochados"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/hu/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/hu/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/hu/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/hu/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-22 14:51+0200\n"
"Last-Translator: Kristóf Kiszel <ulys...@kubuntu.org>\n"
"Language-Team: Hungarian <kde-l10n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Megnyitás…"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Mentés…"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/ia/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/ia/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/ia/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/ia/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-22 13:55+0200\n"
"Last-Translator: G.Sora <g.s...@tiscali.it>\n"
"Language-Team: Interlingua <kde-l10n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Aperiente ..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Salveguardante..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/it/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/it/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/it/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/it/frameworkintegration5.po
2014-06-01 14:03:39.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-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-25 17:05+0200\n"
"Last-Translator: Vincenzo Reale <smart2...@baslug.org>\n"
"Language-Team: Italian <kde-i18n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Apertura in corso..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Salvataggio in corso..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/ko/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/ko/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/ko/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/ko/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-28 02:22+0900\n"
"Last-Translator: Park Shinjo <k...@peremen.name>\n"
"Language-Team: Korean <k...@peremen.name>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "여는 중..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "저장 중..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/nds/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/nds/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/nds/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/nds/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-22 22:24+0200\n"
"Last-Translator: Sönke Dibbern <s_dibb...@web.de>\n"
"Language-Team: Low Saxon <kde-i18n-...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Bi to opmaken..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Bi to sekern..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/nl/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/nl/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/nl/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/nl/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-15 09:37+0200\n"
"Last-Translator: Freek de Kruijf <freekdekru...@kde.nl>\n"
"Language-Team: Dutch <kde-i18n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Bezig met openen..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Bezig met opslaan..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/pl/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/pl/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/pl/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/pl/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-16 17:29+0200\n"
"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n"
"Language-Team: Polish <kde-i18n-...@kde.org>\n"
@@ -18,11 +18,11 @@
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Otwieranie..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Zapisywanie..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/pt/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/pt/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/pt/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/pt/frameworkintegration5.po
2014-06-01 14:03:39.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-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-03-29 12:31+0000\n"
"Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n"
"Language-Team: Portuguese <kde-i18n...@kde.org>\n"
@@ -12,11 +12,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "A abrir..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "A gravar..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/pt_BR/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/pt_BR/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/pt_BR/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/pt_BR/frameworkintegration5.po
2014-06-01 14:03:39.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-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-16 00:00-0300\n"
"Last-Translator: André Marcelo Alvarenga <alvare...@kde.org>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt...@kde.org>\n"
@@ -18,11 +18,11 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Abrindo..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Salvando..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/ro/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/ro/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/ro/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/ro/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-05-02 12:07+0300\n"
"Last-Translator: Sergiu Bivol <ser...@ase.md>\n"
"Language-Team: Romanian <kde-i18n...@kde.org>\n"
@@ -18,11 +18,11 @@
"20)) ? 1 : 2;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Se deschide..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Se salvează..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/sk/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sk/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/sk/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/sk/frameworkintegration5.po
2014-06-01 14:03:39.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-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-16 20:41+0200\n"
"Last-Translator: Roman Paholík <wizzar...@gmail.com>\n"
"Language-Team: Slovak <kde...@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:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Otvára sa..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Ukladám..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/sr/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sr/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/sr/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-4.100.0/po/sr/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -0,0 +1,92 @@
+# Translation of frameworkintegration5.po into Serbian.
+# Chusslove Illich <caslav.i...@gmx.net>, 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-05-19 22:29+0200\n"
+"Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n...@kde.org>\n"
+"Language: \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"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Opening..."
+msgstr "Отварам..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+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"
+"<filename>%1</filename>"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Фајл или фасцикла по имену <filename>%1</filename> већ постоји."
+
+#: 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.99.0/po/sr@ijekavian/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sr@ijekavian/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/sr@ijekavian/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-4.100.0/po/sr@ijekavian/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -0,0 +1,92 @@
+# Translation of frameworkintegration5.po into Serbian.
+# Chusslove Illich <caslav.i...@gmx.net>, 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-05-19 22:29+0200\n"
+"Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n...@kde.org>\n"
+"Language: \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"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Opening..."
+msgstr "Отварам..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+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"
+"<filename>%1</filename>"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Фајл или фасцикла по имену <filename>%1</filename> већ постоји."
+
+#: 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.99.0/po/sr@ijekavianlatin/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sr@ijekavianlatin/frameworkintegration5.po
---
old/frameworkintegration-4.99.0/po/sr@ijekavianlatin/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++
new/frameworkintegration-4.100.0/po/sr@ijekavianlatin/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -0,0 +1,92 @@
+# Translation of frameworkintegration5.po into Serbian.
+# Chusslove Illich <caslav.i...@gmx.net>, 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-05-19 22:29+0200\n"
+"Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n...@kde.org>\n"
+"Language: \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"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Opening..."
+msgstr "Otvaram..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Saving..."
+msgstr "Upisujem..."
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Nova fascikla"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Nova fascikla"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Napravi novu fasciklu u:\n"
+"<filename>%1</filename>"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Fajl ili fascikla po imenu <filename>%1</filename> već postoji."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "Nemate dozvolu da napravite tu fasciklu."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Izbor fascikle"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Nova fascikla..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Nova fascikla..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Premjesti u smeće"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Obriši"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Skrivene fascikle"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Svojstva"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Skrivene fascikle"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/sr@latin/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sr@latin/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/sr@latin/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
+++ new/frameworkintegration-4.100.0/po/sr@latin/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -0,0 +1,92 @@
+# Translation of frameworkintegration5.po into Serbian.
+# Chusslove Illich <caslav.i...@gmx.net>, 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-05-19 22:29+0200\n"
+"Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n...@kde.org>\n"
+"Language: \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"
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Opening..."
+msgstr "Otvaram..."
+
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
+msgid "Saving..."
+msgstr "Upisujem..."
+
+#: platformtheme/kdirselectdialog.cpp:132
+msgctxt "folder name"
+msgid "New Folder"
+msgstr "Nova fascikla"
+
+#: platformtheme/kdirselectdialog.cpp:137
+msgctxt "@title:window"
+msgid "New Folder"
+msgstr "Nova fascikla"
+
+#: platformtheme/kdirselectdialog.cpp:138
+#, kde-format
+msgctxt "@label:textbox"
+msgid ""
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"Napravi novu fasciklu u:\n"
+"<filename>%1</filename>"
+
+#: platformtheme/kdirselectdialog.cpp:168
+#, kde-format
+msgid "A file or folder named %1 already exists."
+msgstr "Fajl ili fascikla po imenu <filename>%1</filename> već postoji."
+
+#: platformtheme/kdirselectdialog.cpp:171
+msgid "You do not have permission to create that folder."
+msgstr "Nemate dozvolu da napravite tu fasciklu."
+
+#: platformtheme/kdirselectdialog.cpp:285
+msgctxt "@title:window"
+msgid "Select Folder"
+msgstr "Izbor fascikle"
+
+#: platformtheme/kdirselectdialog.cpp:294
+msgctxt "@action:button"
+msgid "New Folder..."
+msgstr "Nova fascikla..."
+
+#: platformtheme/kdirselectdialog.cpp:340
+msgctxt "@action:inmenu"
+msgid "New Folder..."
+msgstr "Nova fascikla..."
+
+#: platformtheme/kdirselectdialog.cpp:347
+msgctxt "@action:inmenu"
+msgid "Move to Trash"
+msgstr "Premesti u smeće"
+
+#: platformtheme/kdirselectdialog.cpp:354
+msgctxt "@action:inmenu"
+msgid "Delete"
+msgstr "Obriši"
+
+#: platformtheme/kdirselectdialog.cpp:363
+msgctxt "@option:check"
+msgid "Show Hidden Folders"
+msgstr "Skrivene fascikle"
+
+#: platformtheme/kdirselectdialog.cpp:370
+msgctxt "@action:inmenu"
+msgid "Properties"
+msgstr "Svojstva"
+
+#: platformtheme/kfiletreeview.cpp:192
+msgid "Show Hidden Folders"
+msgstr "Skrivene fascikle"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/sv/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/sv/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/sv/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/sv/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-15 18:37+0200\n"
"Last-Translator: Stefan Asserhäll <stefan.asserh...@bredband.net>\n"
"Language-Team: Swedish <kde-i18n-...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 1.4\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Öppnar..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Sparar..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/tr/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/tr/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/tr/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/tr/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-14 13:19+0200\n"
"Last-Translator: Volkan Gezer <volkange...@gmail.com>\n"
"Language-Team: Turkish <kde-l10n...@kde.org>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Açılıyor..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Kaydediliyor..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/uk/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/uk/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/uk/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/uk/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 07:59+0000\n"
"PO-Revision-Date: 2014-04-15 08:19+0300\n"
"Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n...@kde.org>\n"
@@ -18,11 +18,11 @@
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "Відкриття…"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "Збереження…"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/x-test/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/x-test/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/x-test/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/x-test/frameworkintegration5.po
1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: frameworkintegration5\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
-"PO-Revision-Date: 2014-04-27 21:05+0000\n"
-"Last-Translator: transxx.py program <n...@kde.org>\n"
-"Language-Team: KDE Test Language <kde-i18n-...@kde.org>\n"
-"Language: x-test\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
-msgid "Opening..."
-msgstr "xxOpening...xx"
-
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
-msgid "Saving..."
-msgstr "xxSaving...xx"
-
-#: platformtheme/kdirselectdialog.cpp:132
-msgctxt "folder name"
-msgid "New Folder"
-msgstr "xxNew Folderxx"
-
-#: platformtheme/kdirselectdialog.cpp:137
-msgctxt "@title:window"
-msgid "New Folder"
-msgstr "xxNew Folderxx"
-
-#: platformtheme/kdirselectdialog.cpp:138
-#, kde-format
-msgctxt "@label:textbox"
-msgid ""
-"Create new folder in:\n"
-"%1"
-msgstr ""
-"xxCreate new folder in:\n"
-"%1xx"
-
-#: platformtheme/kdirselectdialog.cpp:168
-#, kde-format
-msgid "A file or folder named %1 already exists."
-msgstr "xxA file or folder named %1 already exists.xx"
-
-#: platformtheme/kdirselectdialog.cpp:171
-msgid "You do not have permission to create that folder."
-msgstr "xxYou do not have permission to create that folder.xx"
-
-#: platformtheme/kdirselectdialog.cpp:285
-msgctxt "@title:window"
-msgid "Select Folder"
-msgstr "xxSelect Folderxx"
-
-#: platformtheme/kdirselectdialog.cpp:294
-msgctxt "@action:button"
-msgid "New Folder..."
-msgstr "xxNew Folder...xx"
-
-#: platformtheme/kdirselectdialog.cpp:340
-msgctxt "@action:inmenu"
-msgid "New Folder..."
-msgstr "xxNew Folder...xx"
-
-#: platformtheme/kdirselectdialog.cpp:347
-msgctxt "@action:inmenu"
-msgid "Move to Trash"
-msgstr "xxMove to Trashxx"
-
-#: platformtheme/kdirselectdialog.cpp:354
-msgctxt "@action:inmenu"
-msgid "Delete"
-msgstr "xxDeletexx"
-
-#: platformtheme/kdirselectdialog.cpp:363
-msgctxt "@option:check"
-msgid "Show Hidden Folders"
-msgstr "xxShow Hidden Foldersxx"
-
-#: platformtheme/kdirselectdialog.cpp:370
-msgctxt "@action:inmenu"
-msgid "Properties"
-msgstr "xxPropertiesxx"
-
-#: platformtheme/kfiletreeview.cpp:192
-msgid "Show Hidden Folders"
-msgstr "xxShow Hidden Foldersxx"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/po/zh_TW/frameworkintegration5.po
new/frameworkintegration-4.100.0/po/zh_TW/frameworkintegration5.po
--- old/frameworkintegration-4.99.0/po/zh_TW/frameworkintegration5.po
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/po/zh_TW/frameworkintegration5.po
2014-06-01 14:03:39.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2014-04-27 20:56+0000\n"
+"POT-Creation-Date: 2014-05-05 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...@googlegroups.com>\n"
@@ -17,11 +17,11 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.5\n"
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Opening..."
msgstr "開啟中..."
-#: platformtheme/kdeplatformfiledialoghelper.cpp:190
+#: platformtheme/kdeplatformfiledialoghelper.cpp:211
msgid "Saving..."
msgstr "儲存中..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/src/integrationplugin/CMakeLists.txt
new/frameworkintegration-4.100.0/src/integrationplugin/CMakeLists.txt
--- old/frameworkintegration-4.99.0/src/integrationplugin/CMakeLists.txt
2014-05-05 02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/src/integrationplugin/CMakeLists.txt
2014-06-01 14:03:39.000000000 +0200
@@ -10,4 +10,4 @@
)
install(TARGETS FrameworkIntegrationPlugin
- DESTINATION ${QT_PLUGIN_INSTALL_DIR}/kf5)
+ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-4.99.0/src/kstyle/CMakeLists.txt
new/frameworkintegration-4.100.0/src/kstyle/CMakeLists.txt
--- old/frameworkintegration-4.99.0/src/kstyle/CMakeLists.txt 2014-05-05
02:09:27.000000000 +0200
+++ new/frameworkintegration-4.100.0/src/kstyle/CMakeLists.txt 2014-06-01
14:03:39.000000000 +0200
@@ -7,9 +7,11 @@
PURPOSE "Required to pass style properties to native Windows on X11
Platform"
)
-set(HAVE_X11 ${XCB_XCB_FOUND})
-if (XCB_XCB_FOUND)
+if(NOT APPLE)
+ set(HAVE_X11 ${XCB_XCB_FOUND})
+ if (XCB_XCB_FOUND)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+ endif()
endif()
# create a Config.cmake and a ConfigVersion.cmake file and install them
@@ -33,12 +35,8 @@
KF5::IconThemes
)
-if (XCB_XCB_FOUND)
- target_link_libraries(KF5Style
- PRIVATE
- Qt5::X11Extras
- ${XCB_XCB_LIBRARY}
- )
+if(HAVE_X11)
+ target_link_libraries(KF5Style PRIVATE Qt5::X11Extras ${XCB_XCB_LIBRARY})
endif()
set_target_properties(KF5Style PROPERTIES VERSION
${FRAMEWORKINTEGRATION_VERSION_STRING}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
