[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=743f754
The following commit has been merged in the master branch:
commit 743f7548e0636843cf620c1c4a27bf5505ed07c0
Author: Lukáš Tinkl <lukas at kde.org>
Date: Mon Sep 8 03:09:18 2014 +0200
i18n fixes
---
fileitemactionplugin/CMakeLists.txt | 1 +
fileitemactionplugin/Messages.sh | 2 +-
kcm/CMakeLists.txt | 3 ++-
kded/CMakeLists.txt | 2 +-
kded/kdeconnectd.cpp | 26 ++++++++------------------
kio/CMakeLists.txt | 1 +
plasmoid/Messages.sh | 2 +-
plugins/pausemusic/CMakeLists.txt | 2 +-
plugins/sftp/CMakeLists.txt | 2 +-
plugins/share/CMakeLists.txt | 2 +-
plugins/share/share_config.ui | 4 ++--
11 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
index e25a722..bd54366 100644
--- a/fileitemactionplugin/CMakeLists.txt
+++ b/fileitemactionplugin/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR})
add_library(kdeconnectfiletiemaction MODULE sendfileitemaction.cpp)
diff --git a/fileitemactionplugin/Messages.sh b/fileitemactionplugin/Messages.sh
index 118c912..ad6cb76 100644
--- a/fileitemactionplugin/Messages.sh
+++ b/fileitemactionplugin/Messages.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-filetiemaction.pot
+$XGETTEXT `find . -name '*.cpp'` -o $podir/kdeconnect-fileitemaction.pot
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index 7f6d069..1a20691 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kcm")
include_directories(${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
@@ -9,7 +10,7 @@ set(kcm_SRCS
devicessortproxymodel.cpp
)
-qt5_wrap_ui(kcm_SRCS kcm.ui)
+ki18n_wrap_ui(kcm_SRCS kcm.ui)
add_library(kcm_kdeconnect MODULE ${kcm_SRCS})
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 3f15693..d1e1365 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -1,4 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR})
+add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kded")
configure_file(config-kded.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kded.h)
@@ -15,4 +16,3 @@ install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
#TODO: Split this into several files for core and for each plugin
install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect)
-
diff --git a/kded/kdeconnectd.cpp b/kded/kdeconnectd.cpp
index 2b4589d..6d2fdf8 100644
--- a/kded/kdeconnectd.cpp
+++ b/kded/kdeconnectd.cpp
@@ -47,7 +47,7 @@ void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
{
::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermfd);
QSocketNotifier* snTerm = new QSocketNotifier(sigtermfd[1], QSocketNotifier::Read, app);
- QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater()));
+ QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater()));
action.sa_handler = sighandler;
sigemptyset(&action.sa_mask);
@@ -60,13 +60,13 @@ void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
int main(int argc, char* argv[])
{
K4AboutData aboutData("kdeconnect", "kdeconnect-kded",
- ki18n("kdeconnect"),
- "0.1",
- ki18n("Connect your devices and KDE"),
- K4AboutData::License_GPL,
- KLocalizedString(),
- KLocalizedString(),
- "http://albertvaka.wordpress.com");
+ ki18n("kdeconnect"),
+ "0.1",
+ ki18n("Connect your devices and KDE"),
+ K4AboutData::License_GPL,
+ KLocalizedString(),
+ KLocalizedString(),
+ "http://albertvaka.wordpress.com");
aboutData.setOrganizationDomain("kde.org");
@@ -84,13 +84,3 @@ int main(int argc, char* argv[])
return app.exec();
}
-
-
-
-
-
-
-
-
-
-
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index d025307..99f4022 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -1,4 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR})
+add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kio")
set(kio_kdeconnect_PART_SRCS
kiokdeconnect.cpp
diff --git a/plasmoid/Messages.sh b/plasmoid/Messages.sh
index 89e3c40..fc8f8ae 100755
--- a/plasmoid/Messages.sh
+++ b/plasmoid/Messages.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#.qml
-$XGETTEXT `find package -name '*.qml'` -L Java -o $podir/plasma_applet_kdeconnect.pot
+$XGETTEXT `find package -name '*.qml'` -L Java -o $podir/plasma_applet_org.kde.kdeconnect.pot
diff --git a/plugins/pausemusic/CMakeLists.txt b/plugins/pausemusic/CMakeLists.txt
index 35dc677..3fae8eb 100644
--- a/plugins/pausemusic/CMakeLists.txt
+++ b/plugins/pausemusic/CMakeLists.txt
@@ -16,7 +16,7 @@ install(FILES kdeconnect_pausemusic.desktop DESTINATION ${SERVICES_INSTALL_DIR}
# Config
set( kdeconnect_pausemusic_config_SRCS pausemusic_config.cpp )
-qt5_wrap_ui( kdeconnect_pausemusic_config_SRCS pausemusic_config.ui )
+ki18n_wrap_ui( kdeconnect_pausemusic_config_SRCS pausemusic_config.ui )
add_library(kdeconnect_pausemusic_config MODULE ${kdeconnect_pausemusic_config_SRCS} )
target_link_libraries( kdeconnect_pausemusic_config
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index 42d1c6a..283b9cd 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -24,7 +24,7 @@ generate_and_install_dbus_interface(
# Config
set( kdeconnect_sftp_config_SRCS sftp_config.cpp )
-qt5_wrap_ui( kdeconnect_sftp_config_SRCS sftp_config.ui )
+ki18n_wrap_ui( kdeconnect_sftp_config_SRCS sftp_config.ui )
add_library(kdeconnect_sftp_config MODULE ${kdeconnect_sftp_config_SRCS} )
target_link_libraries( kdeconnect_sftp_config
diff --git a/plugins/share/CMakeLists.txt b/plugins/share/CMakeLists.txt
index 896d58a..2a46f52 100644
--- a/plugins/share/CMakeLists.txt
+++ b/plugins/share/CMakeLists.txt
@@ -15,7 +15,7 @@ install(FILES kdeconnect_share.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
# Config
set( kdeconnect_share_config_SRCS share_config.cpp )
-qt5_wrap_ui( kdeconnect_share_config_SRCS share_config.ui )
+ki18n_wrap_ui( kdeconnect_share_config_SRCS share_config.ui )
add_library(kdeconnect_share_config MODULE ${kdeconnect_share_config_SRCS} )
target_link_libraries( kdeconnect_share_config
diff --git a/plugins/share/share_config.ui b/plugins/share/share_config.ui
index d6f618f..ef919f9 100644
--- a/plugins/share/share_config.ui
+++ b/plugins/share/share_config.ui
@@ -50,7 +50,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
- <string>%1 in the path will be replaced with the specific device name.</string>
+ <string>%1 in the path will be replaced with the specific device name.</string>
</property>
</widget>
</item>
@@ -75,7 +75,7 @@
<customwidgets>
<customwidget>
<class>KUrlRequester</class>
- <extends>QFrame</extends>
+ <extends>QWidget</extends>
<header>kurlrequester.h</header>
</customwidget>
</customwidgets>
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list