[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0d6f5e2

The following commit has been merged in the master branch:
commit 0d6f5e22a4369a8e5211d89969e40eb4c913be66
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Wed Apr 15 17:45:16 2015 +0200

    add xgettext:no-c-format not to confuse i18n()
---
 plugins/share/share_config.cpp | 4 +++-
 plugins/share/share_config.ui  | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/share/share_config.cpp b/plugins/share/share_config.cpp
index 818748b..84a9b17 100644
--- a/plugins/share/share_config.cpp
+++ b/plugins/share/share_config.cpp
@@ -33,6 +33,8 @@ ShareConfig::ShareConfig(QWidget *parent, const QVariantList& args)
     , m_ui(new Ui::ShareConfigUi())
 {
     m_ui->setupUi(this);
+    // xgettext:no-c-format
+    m_ui->commentLabel->setText(i18n("%1 in the path will be replaced with the specific device name."));
 
     connect(m_ui->kurlrequester, SIGNAL(textChanged(QString)), this, SLOT(changed()));
 }
@@ -55,7 +57,7 @@ void ShareConfig::load()
 {
     KCModule::load();
 
-    m_ui->kurlrequester->setUrl(config()->get("incoming_path", QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))));
+    m_ui->kurlrequester->setUrl(QUrl::fromLocalFile(config()->get("incoming_path", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation))));
 
     Q_EMIT changed(false);
 }
diff --git a/plugins/share/share_config.ui b/plugins/share/share_config.ui
index ef919f9..f86aab3 100644
--- a/plugins/share/share_config.ui
+++ b/plugins/share/share_config.ui
@@ -48,11 +48,7 @@
        </layout>
       </item>
       <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>%1 in the path will be replaced with the specific device name.</string>
-        </property>
-       </widget>
+       <widget class="QLabel" name="commentLabel"/>
       </item>
      </layout>
     </widget>

-- 
kdeconnect packaging