[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-desktop] /: Rename the translation catalog (avoid conflicts)
From: Luigi Toscano <null () kde ! org>
Date: 2017-04-30 14:54:08
Message-ID: E1d4qEi-0005Y7-OH () code ! kde ! org
[Download RAW message or body]
Git commit d601eb794a052b2b61f4d05941aae00a7fe8771a by Luigi Toscano.
Committed on 30/04/2017 at 14:52.
Pushed by ltoscano into branch 'master'.
Rename the translation catalog (avoid conflicts)
Avoid the conflict with their still-shipped counterparts from
kdelibs and kde-runtime.
M +1 -1 attica-kde/kdeplugin/CMakeLists.txt
M +1 -1 attica-kde/kdeplugin/Messages.sh
M +1 -1 kcms/baloo/CMakeLists.txt
M +1 -1 kcms/baloo/Messages.sh
M +1 -1 kcms/componentchooser/CMakeLists.txt
M +1 -1 kcms/componentchooser/Messages.sh
M +1 -1 kcms/emoticons/CMakeLists.txt
M +1 -1 kcms/emoticons/Messages.sh
M +1 -1 kcms/icons/CMakeLists.txt
M +1 -1 kcms/icons/Messages.sh
M +1 -1 kcms/kded/CMakeLists.txt
M +1 -1 kcms/kded/Messages.sh
M +1 -1 kcms/knotify/CMakeLists.txt
M +1 -1 kcms/knotify/Messages.sh
M +1 -1 kcms/phonon/CMakeLists.txt
M +1 -1 kcms/phonon/Messages.sh
M +1 -1 knetattach/Messages.sh
M +1 -1 knetattach/main.cpp
M +1 -1 solid-device-automounter/kcm/CMakeLists.txt
M +1 -1 solid-device-automounter/kcm/Messages.sh
https://commits.kde.org/plasma-desktop/d601eb794a052b2b61f4d05941aae00a7fe8771a
diff --git a/attica-kde/kdeplugin/CMakeLists.txt \
b/attica-kde/kdeplugin/CMakeLists.txt index 6f54afdb..72a0f618 100644
--- a/attica-kde/kdeplugin/CMakeLists.txt
+++ b/attica-kde/kdeplugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"attica_kde\")
+add_definitions(-DTRANSLATION_DOMAIN=\"attica_kde_plugin\")
ecm_qt_declare_logging_category(SRCS
HEADER "attica_plugin_debug.h"
diff --git a/attica-kde/kdeplugin/Messages.sh b/attica-kde/kdeplugin/Messages.sh
index 7721b2b3..c70efbb4 100644
--- a/attica-kde/kdeplugin/Messages.sh
+++ b/attica-kde/kdeplugin/Messages.sh
@@ -1,2 +1,2 @@
#! /bin/sh
-$XGETTEXT *.cpp -o $podir/attica_kde.pot
+$XGETTEXT *.cpp -o $podir/attica_kde_plugin.pot
diff --git a/kcms/baloo/CMakeLists.txt b/kcms/baloo/CMakeLists.txt
index 7415289e..2cba6535 100644
--- a/kcms/baloo/CMakeLists.txt
+++ b/kcms/baloo/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_baloofile\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_baloofile\")
set(kcm_file_SRCS
kcm.cpp
diff --git a/kcms/baloo/Messages.sh b/kcms/baloo/Messages.sh
index bba65efa..6e4a0f99 100755
--- a/kcms/baloo/Messages.sh
+++ b/kcms/baloo/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/kcm_baloofile.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcm5_baloofile.pot
rm -f rc.cpp
diff --git a/kcms/componentchooser/CMakeLists.txt \
b/kcms/componentchooser/CMakeLists.txt index 5820689a..f4b4d97f 100644
--- a/kcms/componentchooser/CMakeLists.txt
+++ b/kcms/componentchooser/CMakeLists.txt
@@ -1,5 +1,5 @@
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmcomponentchooser\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_componentchooser\")
add_subdirectory( componentservices )
diff --git a/kcms/componentchooser/Messages.sh b/kcms/componentchooser/Messages.sh
index 124de14e..ef984bf1 100644
--- a/kcms/componentchooser/Messages.sh
+++ b/kcms/componentchooser/Messages.sh
@@ -1,3 +1,3 @@
#! /usr/bin/env bash
$EXTRACTRC *.ui >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcmcomponentchooser.pot
+$XGETTEXT *.cpp -o $podir/kcm5_componentchooser.pot
diff --git a/kcms/emoticons/CMakeLists.txt b/kcms/emoticons/CMakeLists.txt
index 69e21489..3080bd79 100644
--- a/kcms/emoticons/CMakeLists.txt
+++ b/kcms/emoticons/CMakeLists.txt
@@ -1,5 +1,5 @@
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_emoticons\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_emoticons\")
set(kcmemoticons_SRCS emoticonslist.cpp)
ki18n_wrap_ui(kcmemoticons_SRCS emoticonslist.ui)
diff --git a/kcms/emoticons/Messages.sh b/kcms/emoticons/Messages.sh
index 9673e76a..34bd664a 100644
--- a/kcms/emoticons/Messages.sh
+++ b/kcms/emoticons/Messages.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
$EXTRACTRC *.ui >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcm_emoticons.pot
+$XGETTEXT *.cpp -o $podir/kcm5_emoticons.pot
diff --git a/kcms/icons/CMakeLists.txt b/kcms/icons/CMakeLists.txt
index e3bd6339..1af908c0 100644
--- a/kcms/icons/CMakeLists.txt
+++ b/kcms/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmicons\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_icons\")
add_subdirectory(tests)
diff --git a/kcms/icons/Messages.sh b/kcms/icons/Messages.sh
index 3704cdce..ee8142c7 100644
--- a/kcms/icons/Messages.sh
+++ b/kcms/icons/Messages.sh
@@ -1,2 +1,2 @@
#! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/kcmicons.pot
+$XGETTEXT *.cpp -o $podir/kcm5_icons.pot
diff --git a/kcms/kded/CMakeLists.txt b/kcms/kded/CMakeLists.txt
index 94b11ee3..2fdd9898 100644
--- a/kcms/kded/CMakeLists.txt
+++ b/kcms/kded/CMakeLists.txt
@@ -1,5 +1,5 @@
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmkded\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_kded\")
add_library(kcm_kded MODULE kcmkded.cpp)
target_link_libraries(kcm_kded KF5::ConfigWidgets KF5::Service KF5::I18n Qt5::DBus)
diff --git a/kcms/kded/Messages.sh b/kcms/kded/Messages.sh
index 4cf0cc4c..1bd356b1 100644
--- a/kcms/kded/Messages.sh
+++ b/kcms/kded/Messages.sh
@@ -1,2 +1,2 @@
#! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/kcmkded.pot
+$XGETTEXT *.cpp -o $podir/kcm5_kded.pot
diff --git a/kcms/knotify/CMakeLists.txt b/kcms/knotify/CMakeLists.txt
index 746d11d6..ee91d129 100644
--- a/kcms/knotify/CMakeLists.txt
+++ b/kcms/knotify/CMakeLists.txt
@@ -1,5 +1,5 @@
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmnotify\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_notify\")
########### next target ###############
diff --git a/kcms/knotify/Messages.sh b/kcms/knotify/Messages.sh
index 95a35d4f..eebdfc23 100644
--- a/kcms/knotify/Messages.sh
+++ b/kcms/knotify/Messages.sh
@@ -1,3 +1,3 @@
#! /usr/bin/env bash
$EXTRACTRC *.ui >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcmnotify.pot
+$XGETTEXT *.cpp -o $podir/kcm5_notify.pot
diff --git a/kcms/phonon/CMakeLists.txt b/kcms/phonon/CMakeLists.txt
index feba15a6..b07d8611 100644
--- a/kcms/phonon/CMakeLists.txt
+++ b/kcms/phonon/CMakeLists.txt
@@ -2,7 +2,7 @@ find_package(Phonon4Qt5 4.6.60 NO_MODULE)
include_directories(BEFORE ${PHONON_INCLUDES})
add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
# KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_phonon\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_phonon\")
find_package(PulseAudio 0.9.16)
diff --git a/kcms/phonon/Messages.sh b/kcms/phonon/Messages.sh
index c6ecc597..5d45ba85 100644
--- a/kcms/phonon/Messages.sh
+++ b/kcms/phonon/Messages.sh
@@ -13,6 +13,6 @@ dirs=`cat dirs`
find $dirs -maxdepth 1 -name "*.cpp" -print > files
find $dirs -maxdepth 1 -name "*.cc" -print >> files
find $dirs -maxdepth 1 -name "*.h" -print >> files
-$XGETTEXT --files-from=files -o $podir/kcm_phonon.pot
+$XGETTEXT --files-from=files -o $podir/kcm5_phonon.pot
rm -f dirs
rm -f files
diff --git a/knetattach/Messages.sh b/knetattach/Messages.sh
index 1c0b4d80..f4e9a126 100644
--- a/knetattach/Messages.sh
+++ b/knetattach/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC *.ui >> rc.cpp
-$XGETTEXT *.cpp *.h -o $podir/knetattach.pot
+$XGETTEXT *.cpp *.h -o $podir/knetattach5.pot
rm -f rc.cpp
diff --git a/knetattach/main.cpp b/knetattach/main.cpp
index e02cda0e..a732475e 100644
--- a/knetattach/main.cpp
+++ b/knetattach/main.cpp
@@ -26,7 +26,7 @@
#include "knetattach.h"
int main(int argc, char **argv) {
- KLocalizedString::setApplicationDomain("knetattach");
+ KLocalizedString::setApplicationDomain("knetattach5");
KAboutData aboutData(QLatin1String("knetattach"), i18n("KDE Network Wizard"), \
PROJECT_VERSION, i18n("KDE Network Wizard"),KAboutLicense::GPL, i18n("(c) 2004 George \
Staikos"), QLatin1String("http://www.kde.org/"));
diff --git a/solid-device-automounter/kcm/CMakeLists.txt \
b/solid-device-automounter/kcm/CMakeLists.txt index 9590defb..fc8829d2 100644
--- a/solid-device-automounter/kcm/CMakeLists.txt
+++ b/solid-device-automounter/kcm/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm_device_automounter\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_device_automounter\")
set(kcm_device_automounter_SRCS DeviceAutomounterKCM.cpp DeviceModel.cpp)
diff --git a/solid-device-automounter/kcm/Messages.sh \
b/solid-device-automounter/kcm/Messages.sh index 61adecdc..0853e367 100644
--- a/solid-device-automounter/kcm/Messages.sh
+++ b/solid-device-automounter/kcm/Messages.sh
@@ -1,3 +1,3 @@
#! /bin/sh
$EXTRACTRC *.ui *.kcfg >> rc.cpp
-$XGETTEXT *.cpp -o $podir/kcm_device_automounter.pot
+$XGETTEXT *.cpp -o $podir/kcm5_device_automounter.pot
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic