[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=4f84eb6

The following commit has been merged in the master branch:
commit 4f84eb695c834e60ac88a5b65263ab7336f38f3f
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Sep 26 18:58:37 2011 +0200

    Create a category in system settings for Telepathy configs
    
    Reviewed-by: David Edmundson
    REVIEW: 102710
---
 src/CMakeLists.txt                 |  4 ++++
 src/kcm_telepathy_accounts.desktop | 49 +++++++-------------------------------
 src/settings-im-and-voip.desktop   | 10 ++++++++
 3 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc837a4..f01cdf5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,3 +39,7 @@ install (TARGETS kcm_telepathy_accounts
 install (FILES kcm_telepathy_accounts.desktop
          DESTINATION ${SERVICES_INSTALL_DIR}
 )
+
+install (FILES settings-im-and-voip.desktop
+         DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/src/kcm_telepathy_accounts.desktop b/src/kcm_telepathy_accounts.desktop
index b81181f..451ca1e 100644
--- a/src/kcm_telepathy_accounts.desktop
+++ b/src/kcm_telepathy_accounts.desktop
@@ -1,47 +1,8 @@
 [Desktop Entry]
-Comment=Add, edit and remove your instant messaging and VoIP accounts.
-Comment[cs]=Přidávejte, editujte a odstraňujte vaše účty pro VoIP a IM.
-Comment[da]=Tilføj, redigér og fjern dine instant messaging- og VoIP-konti.
-Comment[de]=Hinzufügen, Bearbeiten und Entfernen Ihrer Instant-Messaging- und VoIP-Zugänge.
-Comment[es]=Añadir, editar y eliminar sus cuentas de mensajería instantánea y de VoIP.
-Comment[et]=Kiirsuhtlus- ja VoIP kontode lisamine, muutmine ja eemaldamine.
-Comment[fr]=Ajoutez, modifiez et supprimez vos comptes de messagerie instantanée et VoIP.
-Comment[hu]=Azonnali üzenetküldő- és VoIP-fiókok hozzáadása, szerkesztése és eltávolítása.
-Comment[it]=Aggiungi, modifica e rimuovi i tuoi account di messaggistica istantanea e VoIP.
-Comment[km]=បន្ថែម កែ​សម្រួល និង​យក​​​ការ​ផ្ញើ​សារ​ជា​បន្ទាន់ និង​គណនី​ VoIP ចេញ ។
-Comment[nds]=Kortnarichten- un VoIP-Kontos tofögen, bewerken oder wegmaken
-Comment[nl]=Voeg toe, bewerk en verwijder uw Instant Messaging- en VOIP-accounts.
-Comment[pa]=ਆਪਣੇ ਤੁਰੰਤ ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰੋ, ਸੋਧੋ ਅਤੇ ਹਟਾਉ।
-Comment[pl]=Dodawaj, edytuj i usuwaj swoje konta VoIP i komunikatorów internetowych.
-Comment[pt]=Adicionar, editar e remover as suas contas de mensagens instantâneas e VoIP.
-Comment[pt_BR]=Adicione, edite e remova suas contas de mensageiro instantâneo e VoIP.
-Comment[sv]=Lägg till, redigera och ta bort konton för direktmeddelanden och IP-telefon.
-Comment[uk]=Додавайте, змінюйте і вилучайте ваші облікові записи на службах миттєвого обміну повідомленнями та VoIP.
-Comment[x-test]=xxAdd, edit and remove your instant messaging and VoIP accounts.xx
+Type=Service
 Exec=kcmshell4 kcm_telepathy_accounts
-Icon=blockdevice
-Name=Instant Messaging and VoIP Accounts
-Name[cs]=IM a VoIP účty
-Name[da]=Instant messaging- og VoIP-konti
-Name[de]=Instant-Messaging- und VoIP-Zugänge
-Name[es]=Cuentas de mensajería instantánea y de VoIP
-Name[et]=Kiirsuhtlus- ja VoIP kontod
-Name[fr]=Comptes de messagerie instantanée et VoIP
-Name[hu]=Azonnali üzenetküldő és VoIP-fiókok
-Name[it]=Account di messaggistica istantanea e VoIP
-Name[km]=ការ​ផ្ញើ​សារ​ជា​បន្ទាន់ និង​គណនី​ VoIP
-Name[nds]=Kortnarichten- un VoIP-Kontos
-Name[nl]=Instant Messaging- en VoIP-accounts
-Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ
-Name[pl]=Konta komunikatorów internetowych i VoIP
-Name[pt]=Contas de Mensagens Instantâneas e VoIP
-Name[pt_BR]=Contas de mensageiro instantâneo e VoIP
-Name[sv]=Konton för direktmeddelande och IP-telefon
-Name[uk]=Облікові записи на службах миттєвого обміну повідомленнями та VoIP
-Name[x-test]=xxInstant Messaging and VoIP Accountsxx
 StartupNotify=true
 Terminal=false
-Type=Service
 X-KDE-ServiceTypes=KCModule
 X-DBUS-StartupType=
 X-KDE-HasReadOnlyMode=false
@@ -50,5 +11,11 @@ X-KDE-ParentApp=kcontrol
 X-KDE-SubstituteUID=false
 X-KDE-RootOnly=false
 Categories=Qt;KDE;X-KDE-settings-network;
-X-KDE-System-Settings-Parent-Category=network-and-connectivity
+X-KDE-System-Settings-Parent-Category=im-and-voip
 Icon=telepathy-kde
+
+Name=Accounts
+Name[cs]=Účty
+Name[x-test]=xxAccountsxx
+Comment=Add, edit and remove your instant messaging and VoIP accounts.
+Comment[x-test]=xxAdd, edit and remove your instant messaging and VoIP accounts.xx
diff --git a/src/settings-im-and-voip.desktop b/src/settings-im-and-voip.desktop
new file mode 100644
index 0000000..7012d4c
--- /dev/null
+++ b/src/settings-im-and-voip.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=SystemSettingsCategory
+X-KDE-System-Settings-Category=im-and-voip
+X-KDE-System-Settings-Parent-Category=network-and-connectivity
+X-KDE-Weight=200
+Icon=telepathy-kde
+
+Name=Instant Messaging and VoIP
+Name[cs]=Instantní Komunikace a VoIP
\ No newline at end of file

-- 
ktp-accounts-kcm packaging