diff -Nru kconfig-5.33.0/autotests/kdesktopfiletest.cpp kconfig-5.34.0/autotests/kdesktopfiletest.cpp
--- kconfig-5.33.0/autotests/kdesktopfiletest.cpp	2017-04-01 19:29:57.000000000 +0000
+++ kconfig-5.34.0/autotests/kdesktopfiletest.cpp	2017-05-06 09:29:40.000000000 +0000
@@ -255,3 +255,34 @@
         QVERIFY(!desktopFile.tryExec());
     }
 }
+
+void KDesktopFileTest::testLocateLocal_data()
+{
+    QString systemConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last();
+    QString writableConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
+    QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last();
+    QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+
+    QTest::addColumn<QString>("path");
+    QTest::addColumn<QString>("result");
+
+    QTest::newRow("configLocation, system-wide") << systemConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop";
+    QTest::newRow("autostart, system-wide") << systemConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop";
+    QTest::newRow("dataLocation, system-wide") << systemDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop";
+    QTest::newRow("applications, system-wide") << systemDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop";
+    QTest::newRow("desktop-directories, system-wide") << systemDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory";
+    QTest::newRow("configLocation, writable") << writableConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop";
+    QTest::newRow("autostart, writable") << writableConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop";
+    QTest::newRow("dataLocation, writable") << writableDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop";
+    QTest::newRow("applications, writable") << writableDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop";
+    QTest::newRow("desktop-directories, writable") << writableDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory";
+    QTest::newRow("unknown location") << "/test.desktop" << writableDataLocation + "/test.desktop";
+}
+
+void KDesktopFileTest::testLocateLocal()
+{
+    QFETCH(QString, path);
+    QFETCH(QString, result);
+
+    QCOMPARE(KDesktopFile::locateLocal(path), result);
+}
diff -Nru kconfig-5.33.0/autotests/kdesktopfiletest.h kconfig-5.34.0/autotests/kdesktopfiletest.h
--- kconfig-5.33.0/autotests/kdesktopfiletest.h	2017-04-01 19:29:57.000000000 +0000
+++ kconfig-5.34.0/autotests/kdesktopfiletest.h	2017-05-06 09:29:40.000000000 +0000
@@ -34,6 +34,8 @@
     void testActionGroup();
     void testIsAuthorizedDesktopFile();
     void testTryExecWithAuthorizeAction();
+    void testLocateLocal_data();
+    void testLocateLocal();
 
 };
 
diff -Nru kconfig-5.33.0/CMakeLists.txt kconfig-5.34.0/CMakeLists.txt
--- kconfig-5.33.0/CMakeLists.txt	2017-04-01 19:29:57.000000000 +0000
+++ kconfig-5.34.0/CMakeLists.txt	2017-05-06 09:29:40.000000000 +0000
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.33.0") # handled by release scripts
+set(KF5_VERSION "5.34.0") # handled by release scripts
 project(KConfig VERSION ${KF5_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.33.0  NO_MODULE)
+find_package(ECM 5.34.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff -Nru kconfig-5.33.0/debian/changelog kconfig-5.34.0/debian/changelog
--- kconfig-5.33.0/debian/changelog	2017-04-29 17:04:32.000000000 +0000
+++ kconfig-5.34.0/debian/changelog	2017-05-15 20:25:25.000000000 +0000
@@ -1,3 +1,9 @@
+kconfig (5.34.0-0ubuntu1) artful; urgency=low
+
+  * New upstream release (5.34.0)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Mon, 15 May 2017 21:25:25 +0100
+
 kconfig (5.33.0-0ubuntu1) artful; urgency=low
 
   * New upstream release (5.33.0)
diff -Nru kconfig-5.33.0/debian/control kconfig-5.34.0/debian/control
--- kconfig-5.33.0/debian/control	2017-04-29 17:04:32.000000000 +0000
+++ kconfig-5.34.0/debian/control	2017-05-15 20:25:25.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Maximiliano Curia <maxy@debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.33.0~),
+               extra-cmake-modules (>= 5.34.0~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.6.1~),
                qttools5-dev (>= 5.6.1~),
diff -Nru kconfig-5.33.0/po/bg/kconfig5_qt.po kconfig-5.34.0/po/bg/kconfig5_qt.po
--- kconfig-5.33.0/po/bg/kconfig5_qt.po	2017-04-01 19:29:57.000000000 +0000
+++ kconfig-5.34.0/po/bg/kconfig5_qt.po	2017-05-06 09:29:40.000000000 +0000
@@ -1,8 +1,5 @@
-# translation of kwriteconfig.po to Bulgarian
-# Bulgarian translation of KDE.
-# This file is licensed under the GPL.
-#
-# $Id: kconfig5_qt.po 1482726 2017-02-15 04:58:07Z scripty $
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
 #
 # Zlatko Popov <zlatkopopov@fsa-bg.org>, 2007, 2008.
 msgid ""
diff -Nru kconfig-5.33.0/src/core/kdesktopfile.cpp kconfig-5.34.0/src/core/kdesktopfile.cpp
--- kconfig-5.33.0/src/core/kdesktopfile.cpp	2017-04-01 19:29:57.000000000 +0000
+++ kconfig-5.34.0/src/core/kdesktopfile.cpp	2017-05-06 09:29:40.000000000 +0000
@@ -83,14 +83,14 @@
     // Relative to config? (e.g. for autostart)
     Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
         if (path.startsWith(dir + plus)) {
-            relativePath = dir.mid(path.length() + 1);
+            relativePath = path.mid(dir.length() + 1);
             return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + relativePath;
         }
     }
     // Relative to xdg data dir? (much more common)
     Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
         if (path.startsWith(dir + plus)) {
-            relativePath = dir.mid(path.length() + 1);
+            relativePath = path.mid(dir.length() + 1);
         }
     }
     if (relativePath.isEmpty()) {