[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b821be4

The following commit has been merged in the master branch:
commit b821be46bcf1cff101056574380a96981f637578
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Fri Dec 16 16:55:14 2011 +0100

    Fix krazy issues in common-internals
    
    Fix ambiguous translations.
    Make constructor explicit.
    Fix typo.
    Fix Copyright headers.
    
    REVIEW: 103420
---
 KTelepathy/Models/groups-model-item.cpp   |  2 +-
 KTelepathy/Models/groups-model-item.h     |  2 +-
 KTelepathy/Models/groups-model.cpp        |  2 +-
 KTelepathy/Models/groups-model.h          |  2 +-
 KTelepathy/presence.cpp                   | 12 ++++++------
 KTelepathy/service-availability-checker.h |  2 +-
 KTelepathy/text-parser.h                  |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/KTelepathy/Models/groups-model-item.cpp b/KTelepathy/Models/groups-model-item.cpp
index d4363b0..9e8f07a 100644
--- a/KTelepathy/Models/groups-model-item.cpp
+++ b/KTelepathy/Models/groups-model-item.cpp
@@ -2,7 +2,7 @@
  * Contact groups model item, represents a group in the contactlist tree
  * This file is based on TelepathyQtYell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/KTelepathy/Models/groups-model-item.h b/KTelepathy/Models/groups-model-item.h
index fefcde0..c994f3d 100644
--- a/KTelepathy/Models/groups-model-item.h
+++ b/KTelepathy/Models/groups-model-item.h
@@ -2,7 +2,7 @@
  * Contact groups model item, represents a group in the contactlist tree
  * This file is based on TelepathyQtYell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/KTelepathy/Models/groups-model.cpp b/KTelepathy/Models/groups-model.cpp
index ad363d2..f576d1c 100644
--- a/KTelepathy/Models/groups-model.cpp
+++ b/KTelepathy/Models/groups-model.cpp
@@ -2,7 +2,7 @@
  * Contact groups model
  * This file is based on TelepathyQtYell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/KTelepathy/Models/groups-model.h b/KTelepathy/Models/groups-model.h
index 23f5c3f..e38cbf0 100644
--- a/KTelepathy/Models/groups-model.h
+++ b/KTelepathy/Models/groups-model.h
@@ -2,7 +2,7 @@
  * Contact groups model
  * This file is based on TelepathyQtYell Models
  *
- * Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2010 Collabora Ltd. <info at collabora.com>
  * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/KTelepathy/presence.cpp b/KTelepathy/presence.cpp
index b9e6aff..d291a81 100644
--- a/KTelepathy/presence.cpp
+++ b/KTelepathy/presence.cpp
@@ -70,17 +70,17 @@ QString Presence::displayString() const
 {
     switch (type()) {
         case Tp::ConnectionPresenceTypeAvailable:
-            return i18n("Available");
+            return i18nc("IM presence: a person is available", "Available");
         case Tp::ConnectionPresenceTypeBusy:
-            return i18n("Busy");
+            return i18nc("IM presence: a person is busy", "Busy");
         case Tp::ConnectionPresenceTypeAway:
-            return i18n("Away");
+            return i18nc("IM presence: a person is away", "Away");
         case Tp::ConnectionPresenceTypeExtendedAway:
-            return i18n("Not available");
+            return i18nc("IM presence: a person is not available", "Not available");
         case Tp::ConnectionPresenceTypeHidden:
-            return i18n("Invisible");
+            return i18nc("IM presence: a person is invisible", "Invisible");
         case Tp::ConnectionPresenceTypeOffline:
-            return i18n("Offline");
+            return i18nc("IM presence: a person is offline", "Offline");
         default:
             return QString();
     }
diff --git a/KTelepathy/service-availability-checker.h b/KTelepathy/service-availability-checker.h
index fad1fc5..c2d7b83 100644
--- a/KTelepathy/service-availability-checker.h
+++ b/KTelepathy/service-availability-checker.h
@@ -35,7 +35,7 @@ class KTELEPATHY_EXPORT ServiceAvailabilityChecker : public QObject
 {
     Q_OBJECT
 public:
-    ServiceAvailabilityChecker(const QString & serviceName, QObject *parent = 0);
+    explicit ServiceAvailabilityChecker(const QString & serviceName, QObject *parent = 0);
     virtual ~ServiceAvailabilityChecker();
 
     bool isAvailable() const;
diff --git a/KTelepathy/text-parser.h b/KTelepathy/text-parser.h
index 37eed91..aae4672 100644
--- a/KTelepathy/text-parser.h
+++ b/KTelepathy/text-parser.h
@@ -32,7 +32,7 @@ namespace KTp
 {
 
 /**
- * Usefull data container
+ * Useful data container
  *
  * @var QList urlRanges
  * @var QStringList fixedUrls

-- 
ktp-common-internals packaging