diff -Nru ktp-auth-handler-0.5.2/CMakeLists.txt ktp-auth-handler-0.6.0/CMakeLists.txt --- ktp-auth-handler-0.5.2/CMakeLists.txt 2012-12-16 01:34:15.000000000 +0000 +++ ktp-auth-handler-0.6.0/CMakeLists.txt 2013-04-01 18:45:46.000000000 +0000 @@ -1,11 +1,12 @@ project(ktp-auth-handler) -set(KTP_AUTH_HANDLER_VERSION "0.5.2") +set(KTP_AUTH_HANDLER_VERSION "0.6.0") set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH} ) +cmake_policy(SET CMP0002 OLD) set(IS_KTP_INTERNAL_MODULE TRUE) set(KDE_MIN_VERSION "4.4.75") @@ -13,19 +14,19 @@ find_package (TelepathyQt4 0.8.9 REQUIRED) find_package (KTp REQUIRED) find_package (QJSON REQUIRED) +find_package (QCA2 REQUIRED) include (KDE4Defaults) include (MacroLibrary) -add_definitions (${KDE4_DEFINITIONS} - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_KEYWORDS -) +add_definitions (${KDE4_DEFINITIONS}) include_directories (${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR} ${KTP_INCLUDE_DIR} ${QJSON_INCLUDE_DIR} + ${QCA2_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/kssl ) set(ktp_auth_handler_SRCS @@ -41,7 +42,6 @@ x-messenger-oauth2-prompt.cpp conference-auth-op.cpp conference-auth-observer.cpp - ${ktp_common_internals_SRCS} ) configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) @@ -61,12 +61,13 @@ ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QJSON_LIBRARIES} + ${QCA2_LIBRARIES} ) configure_file(org.freedesktop.Telepathy.Client.KTp.SASLHandler.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service) -#configure_file(org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in -# ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service) +configure_file(org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in + ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service) configure_file(org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service) @@ -75,10 +76,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) -#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service -# DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service + DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) install(FILES KTp.SASLHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) -#install(FILES KTp.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) +install(FILES KTp.TLSHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) install(FILES KTp.ConfAuthObserver.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/) find_package(Msgfmt REQUIRED) find_package(Gettext REQUIRED) diff -Nru ktp-auth-handler-0.5.2/cmake/modules/FindQJSON.cmake ktp-auth-handler-0.6.0/cmake/modules/FindQJSON.cmake --- ktp-auth-handler-0.5.2/cmake/modules/FindQJSON.cmake 2012-12-16 01:22:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/cmake/modules/FindQJSON.cmake 2013-04-01 18:44:54.000000000 +0000 @@ -5,42 +5,44 @@ # QJSON_LIBRARIES - the qjson library # QJSON_INCLUDE_DIR - the include path of the qjson library # +# Copyright (C) 2012 Raphael Kubo da Costa +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) - - # Already in cache - set (QJSON_FOUND TRUE) +# QJSON v0.7.2+ provides a QJSONConfig.cmake, which should be used if found. +find_package(QJSON QUIET NO_MODULE) -else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) -# -# if (NOT WIN32) -# # use pkg-config to get the values of QJSON_INCLUDE_DIRS -# # and QJSON_LIBRARY_DIRS to add as hints to the find commands. -# include (FindPkgConfig) -# pkg_check_modules (QJSON REQUIRED QJson>=0.5) -# endif (NOT WIN32) - - find_library (QJSON_LIBRARIES - NAMES - qjson - PATHS - ${QJSON_LIBRARY_DIRS} - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_path (QJSON_INCLUDE_DIR - NAMES - parser.h - PATH_SUFFIXES - qjson - PATHS - ${QJSON_INCLUDE_DIRS} - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) +# QJSON <=0.7.1 provide variables with lower case prefix +# This happens only on some distribution, so we check if the lowercase +# variable is set, before setting the uppercase one. +if (${QJSON_VERSION} VERSION_LESS "0.7.2") + if (qjson_LIBRARIES) + set (QJSON_LIBRARIES ${qjson_LIBRARIES}) + endif() + if (qjson_INCLUDE_DIR) + set (QJSON_INCLUDE_DIR ${qjson_INCLUDE_DIR}) + endif() +endif() + +if (QJSON_FOUND) + set(REQUIRED_LIBS QJSON_CONFIG) +else (QJSON_FOUND) + find_package(PkgConfig) + pkg_check_modules(PC_QJSON QJson>=0.5) + + find_library(QJSON_LIBRARIES + NAMES qjson + HINTS ${PC_QJSON_LIBDIR} ${PC_QJSON_LIBRARY_DIRS} + ) + + find_path(QJSON_INCLUDE_DIR + NAMES qjson/parser.h + HINTS ${PC_QJSON_INCLUDEDIR} ${PC_QJSON_INCLUDE_DIRS} + ) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) + set(REQUIRED_LIBS QJSON_LIBRARIES QJSON_INCLUDE_DIR) +endif (QJSON_FOUND) -endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(QJSON DEFAULT_MSG ${REQUIRED_LIBS}) diff -Nru ktp-auth-handler-0.5.2/debian/changelog ktp-auth-handler-0.6.0/debian/changelog --- ktp-auth-handler-0.5.2/debian/changelog 2013-01-06 14:01:31.000000000 +0000 +++ ktp-auth-handler-0.6.0/debian/changelog 2013-04-08 16:18:04.000000000 +0000 @@ -1,8 +1,28 @@ -ktp-auth-handler (0.5.2-0ubuntu1~ubuntu12.04.1~ppa1) precise; urgency=low +ktp-auth-handler (0.6.0-0ubuntu1~ubuntu12.04.1~ppa1) precise; urgency=low * No-change backport to precise - -- Rohan Garg Sun, 06 Jan 2013 19:31:31 +0530 + -- Rohan Garg Mon, 08 Apr 2013 21:48:04 +0530 + +ktp-auth-handler (0.6.0-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Rohan Garg Wed, 03 Apr 2013 11:14:45 +0100 + +ktp-auth-handler (0.5.80-0ubuntu1) raring; urgency=low + + * New upstream release + - Update install files + - Add libqca2-dev as build-dep + + -- Rohan Garg Thu, 07 Mar 2013 16:28:21 +0000 + +ktp-auth-handler (0.5.3-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Rohan Garg Mon, 18 Feb 2013 16:20:26 +0530 ktp-auth-handler (0.5.2-0ubuntu1) raring; urgency=low diff -Nru ktp-auth-handler-0.5.2/debian/control ktp-auth-handler-0.6.0/debian/control --- ktp-auth-handler-0.5.2/debian/control 2012-12-18 18:48:39.000000000 +0000 +++ ktp-auth-handler-0.6.0/debian/control 2013-04-03 10:14:45.000000000 +0000 @@ -9,9 +9,10 @@ libtelepathy-qt4-dev (>= 0.9.0), kdelibs5-dev (>= 4:4.6), cmake (>= 2.8), - libktpcommoninternalsprivate-dev (>= 0.5.2), + libktpcommoninternalsprivate-dev (>= 0.6.0), libqtwebkit-dev, - libqjson-dev + libqjson-dev, + libqca2-dev Standards-Version: 3.9.3 Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-auth-handler Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-auth-handler.git diff -Nru ktp-auth-handler-0.5.2/debian/kde-telepathy-auth-handler.install ktp-auth-handler-0.6.0/debian/kde-telepathy-auth-handler.install --- ktp-auth-handler-0.5.2/debian/kde-telepathy-auth-handler.install 2012-06-15 09:56:40.000000000 +0000 +++ ktp-auth-handler-0.6.0/debian/kde-telepathy-auth-handler.install 2013-03-07 16:37:57.000000000 +0000 @@ -1,4 +1,5 @@ usr/lib/kde4/libexec/ktp-auth-handler usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service -usr/share/telepathy/clients/KTp.SASLHandler.client +usr/share/telepathy/clients/*.client +usr/share/dbus-1/services/* usr/share/locale/* diff -Nru ktp-auth-handler-0.5.2/debian/watch ktp-auth-handler-0.6.0/debian/watch --- ktp-auth-handler-0.5.2/debian/watch 2012-06-16 16:05:43.000000000 +0000 +++ ktp-auth-handler-0.6.0/debian/watch 2013-04-03 10:14:45.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/([\d.]+)/src/ktp-auth-handler-([\d.]+).tar.bz2 +ftp://ftp.kde.org/pub/kde/stable/kde-telepathy/([\d.]+)/src/ktp-auth-handler-([\d.]+).tar.bz2 diff -Nru ktp-auth-handler-0.5.2/kssl/kssl.h ktp-auth-handler-0.6.0/kssl/kssl.h --- ktp-auth-handler-0.5.2/kssl/kssl.h 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/kssl/kssl.h 2013-04-01 18:44:54.000000000 +0000 @@ -0,0 +1,169 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2000-2005 George Staikos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _KSSL_H +#define _KSSL_H + +#include + +class QIODevice; +class KSSLPrivate; +class KSSLSession; + +/** + * KDE SSL Wrapper Class + * + * This class implements KDE's SSL support by wrapping OpenSSL. + * + * @author George Staikos + * @see KExtendedSocket, TCPSlaveBase + * @short KDE SSL Class + */ +class KIO_EXPORT KSSL { +public: + /** + * Construct a KSSL object + * + * @param init Set this to false if you do not want this class to + * immediately initialize OpenSSL. + */ + KSSL(bool init = true); + + /** + * Destroy this KSSL object + * + * Does not close any socket. + */ + ~KSSL(); + + /** + * Determine if SSL is available and works. + * + * @return true is SSL is available and usable + */ + static bool doesSSLWork(); + + /** + * Initialize OpenSSL. + * + * @return true on success + * + * This will do nothing if it is already initialized. + * @see reInitialize + */ + bool initialize(); + + /** + * This is used for applicationss which do STARTTLS or something + * similar. It creates a TLS method regardless of the user's settings. + * + * @return true if TLS is successfully initialized + */ + bool TLSInit(); + + /** + * Set an SSL session to use. This deep copies the session so it + * doesn't have to remain valid. You need to call it after calling + * initialize or reInitialize. The ID is cleared in close(). + * + * @param session A valid session to reuse. If 0L, it will clear the + * session ID in memory. + * + * @return true on success + */ + bool setSession(const KSSLSession *session); + + /** + * Close the SSL session. + */ + void close(); + + /** + * Reinitialize OpenSSL. + * + * @return true on success + * + * This is not generally needed unless you are reusing the KSSL object + * for a new session. + * @see initialize + */ + bool reInitialize(); + + /** + * Trigger a reread of KSSL configuration and reInitialize() KSSL. + * + * @return true on successful reinitalizations + * + * If you setAutoReconfig() to false, then this will simply + * reInitialize() and not read in the new configuration. + * @see setAutoReconfig + */ + bool reconfig(); + + /** + * Enable or disable automatic reconfiguration on initialize(). + * + * @param ar Set to false in order to disable auto-reloading of the + * KSSL configuration during initialize(). + * + * By default, KSSL will read its configuration on initialize(). You + * might want to disable this for performance reasons. + */ + void setAutoReconfig(bool ar); + + /** + * This will reseed the pseudo-random number generator with the EGD + * (entropy gathering daemon) if the EGD is configured and enabled. + * You don't need to call this yourself normally. + * + * @return 0 on success + */ + int seedWithEGD(); + + /** + * Set a new KSSLSettings instance as the settings. This deletes the + * current instance of KSSLSettings. + * + * @param settings A new, valid settings object. + * + * @return true on success + */ + bool setSettings(KSSLSettings *settings); + + /** + * One is built by the constructor, so this will only return a NULL + * pointer if you set one with setSettings(). + * + * @return the current settings instance + */ + KSSLSettings * settings(); + +private: + static bool m_bSSLWorks; + bool m_bInit; + bool m_bAutoReconfig; + KSSLSettings *m_cfg; + + KSSLPrivate *d; +}; + + +#endif + diff -Nru ktp-auth-handler-0.5.2/kssl/ksslcertificatemanager.h ktp-auth-handler-0.6.0/kssl/ksslcertificatemanager.h --- ktp-auth-handler-0.5.2/kssl/ksslcertificatemanager.h 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/kssl/ksslcertificatemanager.h 2013-04-01 18:44:54.000000000 +0000 @@ -0,0 +1,99 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2007, 2008, 2010 Andreas Hartmetz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _INCLUDE_KSSLCERTIFICATEMANAGER_H +#define _INCLUDE_KSSLCERTIFICATEMANAGER_H + +#include "ktcpsocket.h" + +#include +#include +#include +#include +#include + +class QSslCertificate; +class KSslCertificateRulePrivate; +class KSslCertificateManagerPrivate; + +//### document this... :/ +class KDECORE_EXPORT KSslCertificateRule +{ +public: + KSslCertificateRule(const QSslCertificate &cert = QSslCertificate(), + const QString &hostName = QString()); + KSslCertificateRule(const KSslCertificateRule &other); + ~KSslCertificateRule(); + KSslCertificateRule &operator=(const KSslCertificateRule &other); + + QSslCertificate certificate() const; + QString hostName() const; + void setExpiryDateTime(const QDateTime &dateTime); + QDateTime expiryDateTime() const; + void setRejected(bool rejected); + bool isRejected() const; + bool isErrorIgnored(KSslError::Error error) const; + void setIgnoredErrors(const QList &errors); + void setIgnoredErrors(const QList &errors); + QList ignoredErrors() const; + QList filterErrors(const QList &errors) const; + QList filterErrors(const QList &errors) const; +private: + KSslCertificateRulePrivate *const d; +}; + + +//### document this too... :/ +class KDECORE_EXPORT KSslCertificateManager +{ +public: + static KSslCertificateManager *self(); + void setRule(const KSslCertificateRule &rule); + void clearRule(const KSslCertificateRule &rule); + void clearRule(const QSslCertificate &cert, const QString &hostName); + KSslCertificateRule rule(const QSslCertificate &cert, const QString &hostName) const; + + // do not use, it does nothing! +#ifndef KDE_NO_DEPRECATED + KDE_DEPRECATED void setRootCertificates(const QList &rootCertificates) + { Q_UNUSED(rootCertificates) } +#endif + // use caCertificates() instead +#ifndef KDE_NO_DEPRECATED + KDE_DEPRECATED QList rootCertificates() const + { return caCertificates(); } +#endif + + QList caCertificates() const; + + static QList nonIgnorableErrors(const QList &); + static QList nonIgnorableErrors(const QList &); + +private: + friend class KSslCertificateManagerContainer; + friend class KSslCertificateManagerPrivate; + KSslCertificateManager(); + ~KSslCertificateManager(); + + KSslCertificateManagerPrivate *const d; +}; + + +#endif diff -Nru ktp-auth-handler-0.5.2/kssl/ksslinfodialog.h ktp-auth-handler-0.6.0/kssl/ksslinfodialog.h --- ktp-auth-handler-0.5.2/kssl/ksslinfodialog.h 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/kssl/ksslinfodialog.h 2013-04-01 18:44:54.000000000 +0000 @@ -0,0 +1,101 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2000-2003 George Staikos + * Copyright (C) 2000 Malte Starostik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _KSSLINFODIALOG_H +#define _KSSLINFODIALOG_H + +#include +#include + +#include "ktcpsocket.h" + +/** + * KDE SSL Information Dialog + * + * This class creates a dialog that can be used to display information about + * an SSL session. + * + * There are NO GUARANTEES that KSslInfoDialog will remain binary compatible/ + * Contact staikos@kde.org for details if needed. + * + * @author George Staikos + * @see KSSL + * @short KDE SSL Information Dialog + */ +class KIO_EXPORT KSslInfoDialog : public KDialog { + Q_OBJECT +public: + /** + * Construct a KSSL Information Dialog + * + * @param parent the parent widget + */ + explicit KSslInfoDialog(QWidget *parent = 0); + + /** + * Destroy this dialog + */ + virtual ~KSslInfoDialog(); + + /** + * Tell the dialog if the connection has portions that may not be + * secure (ie. a mixture of secure and insecure frames) + * + * @param isIt true if security is in question + */ + void setSecurityInQuestion(bool isIt); + + /** + * Set information to display about the SSL connection. + * + * @param certificateChain the certificate chain leading from the certificate + * authority to the peer. + * @param ip the ip of the remote host + * @param host the remote hostname + * @param sslProtocol the version of SSL in use (SSLv2, SSLv3, TLSv1) + * @param cipher the cipher in use + * @param usedBits the used bits of the key + * @param bits the key size of the cipher in use + * @param validationErrors errors validating the certificates, if any + */ + void setSslInfo(const QList &certificateChain, + const QString &ip, const QString &host, + const QString &sslProtocol, const QString &cipher, + int usedBits, int bits, + const QList > &validationErrors); + + void setMainPartEncrypted(bool); + void setAuxiliaryPartsEncrypted(bool); + + static QList > errorsFromString(const QString &s); + +private: + void updateWhichPartsEncrypted(); + + class KSslInfoDialogPrivate; + KSslInfoDialogPrivate* const d; + +private Q_SLOTS: + void launchConfig(); + void displayFromChain(int); +}; + +#endif diff -Nru ktp-auth-handler-0.5.2/kssl/ksslsettings.h ktp-auth-handler-0.6.0/kssl/ksslsettings.h --- ktp-auth-handler-0.5.2/kssl/ksslsettings.h 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/kssl/ksslsettings.h 2013-04-01 18:44:54.000000000 +0000 @@ -0,0 +1,169 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2000-2003 George Staikos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef _KSSLSETTINGS_H +#define _KSSLSETTINGS_H + +#include + +#include + +#include + +class KSSLSettingsPrivate; + +/** + * KDE SSL Settings + * + * This class contains some of the SSL settings for easy use. + * + * @author George Staikos + * @see KSSL + * @short KDE SSL Settings + */ +class KIO_EXPORT KSSLSettings { +public: + /** + * Construct a KSSL Settings object + * + * @param readConfig read in the configuration immediately if true + */ + KSSLSettings(bool readConfig = true); + + /** + * Destroy this KSSL Settings object + */ + ~KSSLSettings(); + + /** + * Does the user want to be warned on entering SSL mode + * @return true if the user wants to be warned + */ + bool warnOnEnter() const; + + /** + * Change the user's warnOnEnter() setting + * @param x true if the user is to be warned + * @see warnOnEnter + */ + void setWarnOnEnter(bool x); + + /** + * Does the user want to be warned on sending unencrypted data + * @return true if the user wants to be warned + * @see setWarnOnUnencrypted + */ + bool warnOnUnencrypted() const; + + /** + * Change the user's warnOnUnencrypted() setting + * @param x true if the user is to be warned + * @see warnOnUnencrypted + */ + void setWarnOnUnencrypted(bool x); + + /** + * Does the user want to be warned on leaving SSL mode + * @return true if the user wants to be warned + */ + bool warnOnLeave() const; + + /** + * Change the user's warnOnLeave() setting + * @param x true if the user is to be warned + * @see warnOnLeave + */ + void setWarnOnLeave(bool x); + + /** + * Does the user want to be warned during mixed SSL/non-SSL mode + * @return true if the user wants to be warned + */ + bool warnOnMixed() const; + + /** + * Does the user want to use the Entropy Gathering Daemon? + * @return true if the user wants to use EGD + */ + bool useEGD() const; + + /** + * Does the user want to use an entropy file? + * @return true if the user wants to use an entropy file + */ + bool useEFile() const; + + /** + * Does the user want X.509 client certificates to always be sent when + * possible? + * @return true if the user always wants a certificate sent + */ + bool autoSendX509() const; + + /** + * Does the user want to be prompted to send X.509 client certificates + * when possible? + * @return true if the user wants to be prompted + */ + bool promptSendX509() const; + + /** + * Get the OpenSSL cipher list for selecting the list of ciphers to + * use in a connection. + * @return the cipher list + */ + QString getCipherList(); + + /** + * Get the configured path to the entropy gathering daemon or entropy + * file. + * @return the path + */ + QString& getEGDPath(); + + /** + * Load the user's settings. + */ + void load(); + + /** + * Revert to default settings. + */ + void defaults(); + + /** + * Save the current settings. + */ + void save(); + +private: + KConfig *m_cfg; + bool m_bWarnOnEnter, m_bWarnOnUnencrypted, m_bWarnOnLeave, m_bWarnOnMixed; + bool m_bWarnSelfSigned, m_bWarnRevoked, m_bWarnExpired; + + QList v3ciphers, v3selectedciphers; + QList v3bits; + + KSSLSettingsPrivate* const d; +}; + + +#endif + diff -Nru ktp-auth-handler-0.5.2/main.cpp ktp-auth-handler-0.6.0/main.cpp --- ktp-auth-handler-0.5.2/main.cpp 2012-12-16 01:22:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/main.cpp 2013-04-01 18:44:54.000000000 +0000 @@ -68,33 +68,24 @@ Tp::ClientRegistrarPtr clientRegistrar = Tp::ClientRegistrar::create( accountFactory, connectionFactory, channelFactory); - int handlers = 1; - - Tp::SharedPtr saslHandler = Tp::SharedPtr(new SaslHandler); - if (!clientRegistrar->registerClient( - Tp::AbstractClientPtr(saslHandler), QLatin1String("KTp.SASLHandler"))) { - handlers -= 1; - } - + QMap handlers; + handlers.insert(QLatin1String("KTp.SASLHandler"), Tp::SharedPtr(new SaslHandler)); + handlers.insert(QLatin1String("KTp.TLSHandler"), Tp::SharedPtr(new TlsHandler)); Tp::ChannelClassSpecList confAuthFilter = Tp::ChannelClassSpecList() << Tp::ChannelClassSpec::textChatroom(); - Tp::SharedPtr confAuthObserver = Tp::SharedPtr(new ConferenceAuthObserver(confAuthFilter)); - if (!clientRegistrar->registerClient( - Tp::AbstractClientPtr(confAuthObserver), QLatin1String("KTp.ConfAuthObserver"))) { - kWarning() << "Could not register the room auth observer!"; - } - + handlers.insert(QLatin1String("KTp.ConfAuthObserver"), Tp::SharedPtr(new ConferenceAuthObserver(confAuthFilter))); -#if 0 - Tp::SharedPtr tlsHandler = Tp::SharedPtr(new TlsHandler); - if (!clientRegistrar->registerClient( - Tp::AbstractClientPtr(tlsHandler), QLatin1String("KTp.TLSHandler"))) { - handlers -= 1; + int loadedHandlers = handlers.count(); + QMap::ConstIterator iter = handlers.constBegin(); + for (; iter != handlers.constEnd(); ++iter) { + if (!clientRegistrar->registerClient(iter.value(), iter.key())) { + loadedHandlers--; + } } -#endif - if (!handlers) { + if (loadedHandlers == 0) { kDebug() << "No handlers registered. Exiting"; return 1; } + return app.exec(); } diff -Nru ktp-auth-handler-0.5.2/po/CMakeLists.txt ktp-auth-handler-0.6.0/po/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/CMakeLists.txt 2012-12-16 01:34:15.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/CMakeLists.txt 2013-04-01 18:45:46.000000000 +0000 @@ -1,4 +1,6 @@ +add_subdirectory( bs ) add_subdirectory( ca ) +add_subdirectory( ca@valencia ) add_subdirectory( cs ) add_subdirectory( da ) add_subdirectory( de ) @@ -10,9 +12,13 @@ add_subdirectory( ga ) add_subdirectory( gl ) add_subdirectory( hu ) +add_subdirectory( ia ) add_subdirectory( it ) add_subdirectory( ja ) +add_subdirectory( kk ) +add_subdirectory( km ) add_subdirectory( lt ) +add_subdirectory( mr ) add_subdirectory( nb ) add_subdirectory( nds ) add_subdirectory( nl ) @@ -20,12 +26,15 @@ add_subdirectory( pt ) add_subdirectory( pt_BR ) add_subdirectory( ro ) +add_subdirectory( ru ) add_subdirectory( sk ) +add_subdirectory( sl ) add_subdirectory( sr ) add_subdirectory( sr@ijekavian ) add_subdirectory( sr@ijekavianlatin ) add_subdirectory( sr@latin ) add_subdirectory( sv ) add_subdirectory( uk ) +add_subdirectory( vi ) add_subdirectory( zh_CN ) add_subdirectory( zh_TW ) diff -Nru ktp-auth-handler-0.5.2/po/bs/CMakeLists.txt ktp-auth-handler-0.6.0/po/bs/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/bs/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/bs/CMakeLists.txt 2013-04-01 18:45:01.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( bs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/bs/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/bs/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/bs/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/bs/ktp-auth-handler.po 2013-04-01 18:45:01.000000000 +0000 @@ -0,0 +1,118 @@ +# Bosnian translation for bosnianuniversetranslation +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the bosnianuniversetranslation package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: bosnianuniversetranslation\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-10-27 23:34+0000\n" +"Last-Translator: Samir Ribić \n" +"Language-Team: Bosnian \n" +"Language: bs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-12-21 01:43+0000\n" +"X-Generator: Launchpad (build 16378)\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Samir Ribić" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "samir.ribic@etf.unsa.ba" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Molim, navedite lozinku za sobu ćaskanja %1" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Telepathy upravljač autentifikacije" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Glavni programer" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Server nije prošao provjeru autentičnosti (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Serverska autentifikacija" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalji" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Nastavi" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Odustani" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Želite li prihvatiti certifikat zauvijek bez upita?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Zauvijek" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Samo &trenutna sesija" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Greška autentifikacije" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Korisnik prekinuo autentifikaciju" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Unesite lozinku za vaš nalog" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Nalog:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Lozinka" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Snimi lozinku" diff -Nru ktp-auth-handler-0.5.2/po/ca/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ca/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ca/ktp-auth-handler.po 2012-12-16 01:24:23.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ca/ktp-auth-handler.po 2013-04-01 18:45:02.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" "PO-Revision-Date: 2012-04-28 22:40+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -28,22 +28,64 @@ msgid "Your emails" msgstr "txemaq@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gestor d'autenticació del Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Desenvolupador" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Error d'autenticació" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/ca@valencia/CMakeLists.txt ktp-auth-handler-0.6.0/po/ca@valencia/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/ca@valencia/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ca@valencia/CMakeLists.txt 2013-04-01 18:45:03.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( ca@valencia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/ca@valencia/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ca@valencia/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ca@valencia/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ca@valencia/ktp-auth-handler.po 2013-04-01 18:45:03.000000000 +0000 @@ -0,0 +1,118 @@ +# Translation of ktp-auth-handler.po to Catalan +# Copyright (C) 2012 This_file_is_part_of_KDE +# This file is distributed under the license LGPL version 2.1 or +# version 3 or later versions approved by the membership of KDE e.V. +# +# Josep Ma. Ferrer , 2012. +msgid "" +msgstr "" +"Project-Id-Version: ktp-auth-handler\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-04-28 22:40+0200\n" +"Last-Translator: Josep Ma. Ferrer \n" +"Language-Team: Catalan \n" +"Language: ca@valencia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Josep Ma. Ferrer" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "txemaq@gmail.com" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Gestor d'autenticació del Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Desenvolupador" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +#| msgid "Authentication error" +msgid "Server Authentication" +msgstr "Error d'autenticació" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Error d'autenticació" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Autenticació cancel·lada per l'usuari" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Introduïu la contrasenya del compte" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Compte:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Contrasenya:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Guarda la contrasenya" diff -Nru ktp-auth-handler-0.5.2/po/cs/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/cs/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/cs/ktp-auth-handler.po 2012-12-16 01:24:43.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/cs/ktp-auth-handler.po 2013-04-01 18:45:04.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2011, 2012. -# Tomáš Chvátal , 2012. +# Vít Pelčák , 2011, 2012, 2013. +# Tomáš Chvátal , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-07-31 14:08+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-08 13:12+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -26,22 +26,65 @@ msgid "Your emails" msgstr "vit@pelcak.org, tomas.chvatal@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Prosím zadejte heslo pro místnost %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Správce ověření Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Vývojář" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Server nesplnil test věrohodnosti (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Ověření serveru" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "Po&drobnosti" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Po&kračovat" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "Z&rušit" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Přejete si přijmout tento certifikát navždy bez dalšího dotazování?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Vždy" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Pouze &aktuální sezení" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -55,7 +98,7 @@ #. i18n: ectx: property (text), widget (KTitleWidget, title) #: x-telepathy-password-prompt.ui:45 msgid "Please Enter Your Account Password" -msgstr "Prosím zadejte heslo k Vašemu účtu" +msgstr "Prosím zadejte heslo k vašemu účtu" #. i18n: ectx: property (text), widget (QLabel, label_2) #: x-telepathy-password-prompt.ui:57 diff -Nru ktp-auth-handler-0.5.2/po/da/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/da/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/da/ktp-auth-handler.po 2012-12-16 01:25:02.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/da/ktp-auth-handler.po 2013-04-01 18:45:06.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2011, 2012. +# Martin Schlander , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-09 15:20+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-30 09:49+0100\n" "Last-Translator: Martin Schlander \n" -"Language-Team: Danish \n" -"Language: \n" +"Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,22 +25,65 @@ msgid "Your emails" msgstr "mschlander@opensuse.org" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Angiv venligst adgangskode til chatrummet %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Autentificeringshåndtering til Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Udvikler" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Serveren klarede ikke godkendelsestjekket (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Servergodkendelse" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detaljer" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Fortsæt" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Annullér" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Vil du gerne acceptere dette certifikat altid uden at blive spurgt?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Altid" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Kun nuværende session" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,5 +114,11 @@ msgid "Save Password" msgstr "Gem adgangskode" +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Acceptér dette certifikat fra %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Ikke-betroet certifikat" + #~ msgid "TextLabel" #~ msgstr "TekstEtiket" diff -Nru ktp-auth-handler-0.5.2/po/de/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/de/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/de/ktp-auth-handler.po 2012-12-16 01:25:09.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/de/ktp-auth-handler.po 2013-04-01 18:45:06.000000000 +0000 @@ -1,18 +1,18 @@ # Frederik Schwarzer , 2011, 2012. -# Burkhard Lück , 2012. +# Burkhard Lück , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-05-28 20:38+0200\n" -"Last-Translator: Frederik Schwarzer \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-08 21:53+0100\n" +"Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -23,22 +23,65 @@ msgid "Your emails" msgstr "schwarzer@kde.org" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Bitte geben Sie für den Chatraum %1 ein Passwort an" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy-Hilfsprogramm zur Authentifizierung" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Entwickler" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Die Echtheitsprüfung des Servers (%1) ist fehlgeschlagen.\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Server-Authentifizierung" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Details" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Fortsetzen" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Abbrechen" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Soll dieses Zertifikat dauerhaft ohne Rückfrage akzeptiert werden?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Dauerhaft" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Nur &aktuelle Sitzung" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -69,5 +112,12 @@ msgid "Save Password" msgstr "Passwort speichern" +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "" +#~ "Möchten Sie dieses Zertifikat von %1 akzeptieren?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Nicht vertrauenswürdiges Zertifikat" + #~ msgid "TextLabel" #~ msgstr "TextLabel" diff -Nru ktp-auth-handler-0.5.2/po/el/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/el/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/el/ktp-auth-handler.po 2012-12-16 01:25:15.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/el/ktp-auth-handler.po 2013-04-01 18:45:07.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-30 16:52+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-10 21:32+0200\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" "Language: el\n" @@ -25,22 +25,65 @@ msgid "Your emails" msgstr "sstavra@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Συμπληρώστε έναν κωδικό πρόσβασης για την αίθουσα συνομιλίας %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Χειριστής ταυτοποίησης telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Προγραμματιστής" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Ο εξυπηρετητής απέτυχε στον έλεγχο ταυτοποίησης (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Εξυπηρετητής ταυτοποίησης" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Λεπτομέρειες" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Συ&νέχεια" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Ακύρωση" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Θέλετε να αποδεχθείτε αυτό το πιστοποιητικό για πάντα χωρίς προτροπή;" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Για πάντα" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Για την &τρέχουσα συνεδρία μόνο" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +113,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Αποθήκευση κωδικού πρόσβασης" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Αποδοχή αυτού του πιστοποιητικού από %1;
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Μη έμπιστο πιστοποιητικό" diff -Nru ktp-auth-handler-0.5.2/po/es/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/es/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/es/ktp-auth-handler.po 2012-12-16 01:25:34.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/es/ktp-auth-handler.po 2013-04-01 18:45:08.000000000 +0000 @@ -2,13 +2,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Kira J. Fernández , 2011, 2012. -# Raul Gonzalez , 2012. +# Raul Gonzalez , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-10-31 13:59+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-22 14:37+0100\n" "Last-Translator: Raul Gonzalez \n" "Language-Team: Spanish \n" "Language: es\n" @@ -26,22 +26,65 @@ msgid "Your emails" msgstr "raulgf83@gmail.com,kirajfdez@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Por favor, proporcione una contraseña para la sala de chat %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gestor de autenticación de Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Desarrollador" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"El servidor no ha podido comprobar la autenticidad (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autenticación del servidor" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalles" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinuar" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Cancelar" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "¿Desea aceptar siempre este certificado sin ser preguntado?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Siempre" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Solo la sesión a&ctual" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,3 +114,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Guardar contraseña" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Aceptar este certificado de %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Certificado no seguro" diff -Nru ktp-auth-handler-0.5.2/po/et/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/et/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/et/ktp-auth-handler.po 2012-12-16 01:25:41.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/et/ktp-auth-handler.po 2013-04-01 18:45:09.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-10 02:34+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-12-10 11:36+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,22 +25,64 @@ msgid "Your emails" msgstr "bald@smail.ee" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Palun sisesta jututoa %1 parool" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy autentimise käitleja" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Arendaja" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Autentimise tõrge" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +112,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Parooli salvestamine" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Kas aktsepteerida %1 sertifikaat?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Ebausaldusväärne sertifikaat" diff -Nru ktp-auth-handler-0.5.2/po/fi/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/fi/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/fi/ktp-auth-handler.po 2012-12-16 01:25:59.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/fi/ktp-auth-handler.po 2013-04-01 18:45:10.000000000 +0000 @@ -1,48 +1,93 @@ # Copyright © 2012 This_file_is_part_of_KDE # This file is distributed under the same license as the ktp-auth-handler package. # Tommi Nieminen , 2012. +# Lasse Liehu , 2013. # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: +# Author: Artnay msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-04-15 23:16+0300\n" -"Last-Translator: Tommi Nieminen \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-05 23:51+0200\n" +"Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-06-15 07:10:32+0000\n" -"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-07-04\n" +"X-POT-Import-Date: 2013-01-13 20:43:16+0000\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Tommi Nieminen" +msgstr "Tommi Nieminen, Lasse Liehu" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "translator@legisign.org" +msgstr "translator@legisign.org, lasse.liehu@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Anna keskusteluhuoneelle %1 salasana" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy-tunnistautumiskäsittelijä" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Kehittäjä" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Palvelin ei läpäissyt aitoustestiä (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Palvelimen varmennus" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Yksityiskohdat" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Jatka" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Peru" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Haluatko hyväksyä varmenteen pysyvästi?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Pysyvästi" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Vain nykyisen istunnon ajaksi" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -72,3 +117,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Tallenna salasana" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Hyväksytäänkö tämä varmenne taholta %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Epäluotettava varmenne" diff -Nru ktp-auth-handler-0.5.2/po/fr/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/fr/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/fr/ktp-auth-handler.po 2012-12-16 01:26:06.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/fr/ktp-auth-handler.po 2013-04-01 18:45:11.000000000 +0000 @@ -1,14 +1,14 @@ # translation of ktp-auth-handler.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Joëlle Cornavin , 2012. +# Joëlle Cornavin , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-07-10 10:19+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-21 19:40+0100\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" "Language: fr\n" @@ -16,6 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -25,22 +26,66 @@ msgid "Your emails" msgstr "jcorn@free.fr" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Veuillez fournir un mot de passe pour le salon %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gestionnaire d'authentification de Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Développeur" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Le serveur n'a pas réussi à vérifier l'authenticité (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Authentification du serveur" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Détails" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinuer" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Annuler" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"Voulez-vous accepter ce certificat indéfiniment sans recevoir d'invite ?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Indéfiniment" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Session actuelle seulement" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/ga/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ga/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ga/ktp-auth-handler.po 2012-12-16 01:26:18.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ga/ktp-auth-handler.po 2013-04-01 18:45:12.000000000 +0000 @@ -6,11 +6,11 @@ msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" -"Language: \n" +"Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,22 +25,64 @@ msgid "Your emails" msgstr "kscanne@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Cuir focal faire do sheomra comhrá %1 isteach" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Láimhseálaí Fíordheimhnithe Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Forbróir" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Earráid fhíordheimhnithe" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +112,10 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Sábháil focal faire" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "" +#~ "An bhfuil fonn ort glacadh leis an teastas seo ó %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Teastas neamhiontaofa" diff -Nru ktp-auth-handler-0.5.2/po/gl/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/gl/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/gl/ktp-auth-handler.po 2012-12-16 01:26:25.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/gl/ktp-auth-handler.po 2013-04-01 18:45:12.000000000 +0000 @@ -2,19 +2,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Xosé , 2012. +# Miguel Branco , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-28 00:50+0100\n" -"Last-Translator: Xosé \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-01-13 15:57+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" @@ -28,22 +29,64 @@ msgid "Your emails" msgstr "xosecalvo@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Xestor de autenticación do Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Desenvolvedor" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Erro de autenticación" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -57,7 +100,7 @@ #. i18n: ectx: property (text), widget (KTitleWidget, title) #: x-telepathy-password-prompt.ui:45 msgid "Please Enter Your Account Password" -msgstr "Introduza o contrasinal da súa conta" +msgstr "Introduce o contrasinal da súa conta" #. i18n: ectx: property (text), widget (QLabel, label_2) #: x-telepathy-password-prompt.ui:57 @@ -72,4 +115,4 @@ #. i18n: ectx: property (text), widget (QCheckBox, savePassword) #: x-telepathy-password-prompt.ui:85 msgid "Save Password" -msgstr "Gravar o contrasinal" +msgstr "Gardar o contrasinal" diff -Nru ktp-auth-handler-0.5.2/po/hu/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/hu/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/hu/ktp-auth-handler.po 2012-12-16 01:27:15.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/hu/ktp-auth-handler.po 2013-04-01 18:45:16.000000000 +0000 @@ -2,19 +2,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Kristóf Kiszel , 2012. +# Balázs Úr , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-17 12:40+0100\n" -"Last-Translator: Kristóf Kiszel \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-29 11:07+0100\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" -"Language: \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "NAME OF TRANSLATORS" @@ -25,22 +26,66 @@ msgid "Your emails" msgstr "ulysses@kubuntu.org" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Adjon meg egy jelszót ehhez a csevegő szobához: %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy hitelesítéskezelő" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Fejlesztő" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"A kiszolgáló biztonsági ellenőrzése nem sikerült (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "A kiszolgáló ellenőrzése" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Részletek" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "F&olytatás" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Mégse" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"El szeretné fogadni ezt a tanúsítványt rákérdezés nélkül a továbbiakban?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "Mindi&g" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Csak a jelenlegi munkamenetben" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +115,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Jelszó mentése" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Elfogadja ezt a tanúsítványt innen: %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Nem megbízható tanúsítvány" diff -Nru ktp-auth-handler-0.5.2/po/ia/CMakeLists.txt ktp-auth-handler-0.6.0/po/ia/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/ia/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ia/CMakeLists.txt 2013-04-01 18:45:16.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( ia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/ia/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ia/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ia/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ia/ktp-auth-handler.po 2013-04-01 18:45:16.000000000 +0000 @@ -0,0 +1,115 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Giovanni Sora , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-13 13:45+0100\n" +"Last-Translator: Giovanni Sora \n" +"Language-Team: Interlingua \n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Giovanni Sora" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "g.sora@tiscali.it" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Pro favor forni un contrasigno pro le sala de conversation %1" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Gerente de authentication de Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Developpator" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Le servitor falleva le controlo de authorisation (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Authentication de servitor" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalios" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinua" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Cancella" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Tu volerea acceptar iste certification per sempre sin esser demandate?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Per sempre" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Solo pro le session ¤te" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Error de authentication" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Usator cancellava authentication" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Pro favor, inserta tu contrasigno de conto" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Conto:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Contrasigno:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Salveguarda contrasigno" diff -Nru ktp-auth-handler-0.5.2/po/it/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/it/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/it/ktp-auth-handler.po 2012-12-16 01:27:47.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/it/ktp-auth-handler.po 2013-04-01 18:45:18.000000000 +0000 @@ -2,13 +2,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Pino Toscano , 2011, 2012. +# Pino Toscano , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-05 10:18+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-07 12:50+0100\n" "Last-Translator: Pino Toscano \n" "Language-Team: Italian \n" "Language: it\n" @@ -26,22 +26,66 @@ msgid "Your emails" msgstr "toscano.pino@tiscali.it" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Inserisci una password per la stanza di chat %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gestore dell'autenticazione di Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Sviluppatore" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Il server non ha passato il controllo di autenticità (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Errore di autenticazione" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Dettagli" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinua" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Annulla" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"Vuoi accettare questo certificato per sempre senza che venga più chiesto?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Per sempre" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Solo per la sessione corrente" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,3 +115,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Salva password" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Accettare questo certificato da %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Certificato non affidabile" diff -Nru ktp-auth-handler-0.5.2/po/ja/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ja/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ja/ktp-auth-handler.po 2012-12-16 01:27:54.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ja/ktp-auth-handler.po 2013-04-01 18:45:18.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: telepathy-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" "PO-Revision-Date: 2011-10-25 22:58-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -22,22 +22,63 @@ msgid "Your emails" msgstr "" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/kk/CMakeLists.txt ktp-auth-handler-0.6.0/po/kk/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/kk/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/kk/CMakeLists.txt 2013-04-01 18:45:19.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( kk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/kk/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/kk/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/kk/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/kk/ktp-auth-handler.po 2013-04-01 18:45:19.000000000 +0000 @@ -0,0 +1,117 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Sairan Kikkarin , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-28 02:26+0600\n" +"Last-Translator: Sairan Kikkarin \n" +"Language-Team: Kazakh \n" +"Language: kk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +# +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Сайран Киккарин" + +# +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "sairan@computer.org" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "%1 әңгіме бөлмесінің паролін келтіріңіз" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Telepathy-ның аутентификация тадағышы" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Құрастырушы" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Сервер шындылық тексеруден өткен жоқ (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Сервер аутентификациясы" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Егжей-тегжейі" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Жа&лғастыру" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "Қ&айту" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Куәлік келешекте қосымша сұрақсыз үнемі қабылдансын ба?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Үнемі" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Тек &осы сеанс үшін" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Аутентификация қатесі" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Пайдаланушы аутентификацияны доғарды" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Тіркелгінің паролін келтіріңіз" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Тіркелгі:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Паролі:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Паролі сақталсын" diff -Nru ktp-auth-handler-0.5.2/po/km/CMakeLists.txt ktp-auth-handler-0.6.0/po/km/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/km/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/km/CMakeLists.txt 2013-04-01 18:45:20.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( km ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/km/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/km/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/km/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/km/ktp-auth-handler.po 2013-04-01 18:45:20.000000000 +0000 @@ -0,0 +1,118 @@ +# translation of ktp-auth-handler.po to Khmer +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Khoem Sokhem , 2012. +msgid "" +msgstr "" +"Project-Id-Version: ktp-auth-handler\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-07-10 15:05+0700\n" +"Last-Translator: Khoem Sokhem \n" +"Language-Team: Khmer\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "ខឹម សុខែម, ម៉ន ម៉េត, សេង សុត្ថា, ចាន់ សម្បត្តិរតនៈ, សុខ សុភា" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" +"khoemsokhem@khmeros.info,​​mornmet@khmeros.info,sutha@khmeros.info," +"ratanak@khmeros.info,sophea@khmeros.info" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "កម្មវិធី​ដោះស្រាយការ​ផ្ទៀងផ្ទាត់ Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "អ្នក​អភិវឌ្ឍន៍" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +#| msgid "Authentication error" +msgid "Server Authentication" +msgstr "កំហុស​ក្នុងការ​ផ្ទៀងផ្ទាត់" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "កំហុស​ក្នុងការ​ផ្ទៀងផ្ទាត់" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "អ្នកប្រើបានបោះបង់ការ​ផ្ទៀងផ្ទាត់" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​គណនី​របស់​អ្នក" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "គណនី ៖" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "ពាក្យសម្ងាត់ ៖" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "រក្សាទុកពាក្យ​សម្ងាត់" diff -Nru ktp-auth-handler-0.5.2/po/lt/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/lt/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/lt/ktp-auth-handler.po 2012-12-16 01:28:45.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/lt/ktp-auth-handler.po 2013-04-01 18:45:22.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" "PO-Revision-Date: 2012-10-28 14:24+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -28,22 +28,64 @@ msgid "Your emails" msgstr "stikonas@gmail.com,liudas@akmc.lt" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy tapatumo nustatymas" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Programuotojas" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Autentifikavimosi klaida" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/mr/CMakeLists.txt ktp-auth-handler-0.6.0/po/mr/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/mr/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/mr/CMakeLists.txt 2013-04-01 18:45:25.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( mr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/mr/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/mr/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/mr/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/mr/ktp-auth-handler.po 2013-04-01 18:45:25.000000000 +0000 @@ -0,0 +1,113 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-22 17:13+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: Marathi \n" +"Language: mr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "चेतन खोना" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "chetan@kompkin.com" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "डेव्हिड एड्मंडसन" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "विकासकर्ता" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "डेनियल ई. डोमेनिचेल्ली" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "सर्व्हरला अधिप्रमाणनाची गरज आहे" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "तपशील (&D)" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "चालू ठेवा (&N)" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "रद्द करा (&C)" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "नेहमीसाठी (&F)" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "परवानगी विषयक त्रुटी" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "खाते :" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "गुप्तशब्द :" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "गुप्तशब्द साठवा" diff -Nru ktp-auth-handler-0.5.2/po/nb/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/nb/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/nb/ktp-auth-handler.po 2012-12-16 01:29:36.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/nb/ktp-auth-handler.po 2013-04-01 18:45:26.000000000 +0000 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-02-08 10:46+0100\n" +"POT-Creation-Date: 2013-02-07 02:57+0100\n" +"PO-Revision-Date: 2012-12-10 21:58+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "Language: nb\n" @@ -27,22 +27,63 @@ msgid "Your emails" msgstr " " -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Skriv inn passord for praterommet %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy autentiseringsbehandler" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Utvikler" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detaljer" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/nds/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/nds/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/nds/ktp-auth-handler.po 2012-12-16 01:29:42.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/nds/ktp-auth-handler.po 2013-04-01 18:45:27.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: telepathy-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" "PO-Revision-Date: 2011-10-25 19:21+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -26,22 +26,64 @@ msgid "Your emails" msgstr "m.j.wiese@web.de" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy-Identiteetprööv-Hanteerprogramm" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Programmschriever" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Identiteetprööv fehlslaan" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/nl/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/nl/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/nl/ktp-auth-handler.po 2012-12-16 01:29:55.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/nl/ktp-auth-handler.po 2013-04-01 18:45:28.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2012. +# Freek de Kruijf , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-17 14:02+0100\n" -"Last-Translator: Freek de Kruijf \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-07 11:50+0100\n" +"Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" -"Language: \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,22 +25,66 @@ msgid "Your emails" msgstr "freekdekruijf@kde.nl" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Biedt een wachtwoord voor de chatroom %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Behandelaar van authenticatie voor Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Ontwikkelaar" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"De server kwam niet door de authenticatietest (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Serverauthenticatie" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Details" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Doorgaa&n" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Annuleren" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"Wilt u dit certificaat voor altijd accepteren zonder te worden gewaarschuwd?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Voor altijd" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Alleen huidige sessie" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +114,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Wachtwoord opslaan" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Dit certificaat van %1 accepteren?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Niet-vertrouwd certificaat" diff -Nru ktp-auth-handler-0.5.2/po/pl/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/pl/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/pl/ktp-auth-handler.po 2012-12-16 01:30:34.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/pl/ktp-auth-handler.po 2013-04-01 18:45:30.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-06 08:10+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-12-24 12:32+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -26,22 +26,64 @@ msgid "Your emails" msgstr "lukasz.wojnilowicz@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Proszę podaj hasło dla tego okna rozmowy %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Obsługiwanie uwierzytelnienia Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Programista" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "Błąd uwierzytelnienia" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,3 +113,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Zapisz hasło" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Akceptuj ten certyfikat z %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Niezaufany certyfikat" diff -Nru ktp-auth-handler-0.5.2/po/pt/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/pt/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/pt/ktp-auth-handler.po 2012-12-16 01:30:47.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/pt/ktp-auth-handler.po 2013-04-01 18:45:31.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-04 11:17+0000\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-12-05 10:21+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" @@ -21,22 +21,65 @@ msgid "Your emails" msgstr "zepires@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Por favor, indique uma senha para a sala de conversação %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gestão de Autenticação do Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Desenvolvimento" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"O certificado do servidor não passou o teste de autenticidade (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autenticação do Servidor" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalhes" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinuar" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Cancelar" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Quer aceitar este certificado sempre, sem que seja notificado?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Sempre" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Só na Sessão A&ctual" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -66,3 +109,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Guardar a Senha" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Deseja aceitar este certificado de %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Certificado não-fidedigno" diff -Nru ktp-auth-handler-0.5.2/po/pt_BR/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/pt_BR/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/pt_BR/ktp-auth-handler.po 2012-12-16 01:30:54.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/pt_BR/ktp-auth-handler.po 2013-04-01 18:45:32.000000000 +0000 @@ -1,21 +1,22 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE +# Translation of ktp-auth-handler.po to Brazilian Portuguese +# Copyright (C) 2011-2013 This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# André Marcelo Alvarenga , 2011. +# André Marcelo Alvarenga , 2011, 2012, 2013. # Luiz Fernando Ranghetti , 2012. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-04 20:27-0200\n" -"Last-Translator: Luiz Fernando Ranghetti \n" -"Language-Team: Brazilian Portuguese \n" -"Language: \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-07 08:30-0200\n" +"Last-Translator: André Marcelo Alvarenga \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgctxt "NAME OF TRANSLATORS" @@ -26,22 +27,65 @@ msgid "Your emails" msgstr "alvarenga@kde.org" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Informe a senha da sala de bate-papo %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Gerenciamento de autenticação do Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Desenvolvedor" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"O servidor falhou no teste de autenticidade (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autenticação do servidor" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalhes" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinuar" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Cancelar" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Deseja sempre aceitar este certificado sem solicitar confirmação?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Sempre" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "S&omente nesta sessão" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/ro/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ro/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ro/ktp-auth-handler.po 2012-12-16 01:31:01.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ro/ktp-auth-handler.po 2013-04-01 18:45:32.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2012. +# Sergiu Bivol , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-10-16 23:44+0300\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-03-16 12:15+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,22 +26,66 @@ msgid "Your emails" msgstr "sergiu@ase.md" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Furnizați o parolă pentru camera de discuții %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Administrator de autentificare Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Dezvoltator" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele Galdi" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Serverul nu a trecut testul de autenticitate (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autentificare server" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalii" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Co&ntinuă" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Renunță" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"Doriți să acceptați permanent acest certificat fără să mai fiți întrebat?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Permanent" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Numai sesiunea &curentă" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,3 +115,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "Salvează parola" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Acceptați acest certificat de la %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Certificat fără încredere" diff -Nru ktp-auth-handler-0.5.2/po/ru/CMakeLists.txt ktp-auth-handler-0.6.0/po/ru/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/ru/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ru/CMakeLists.txt 2013-04-01 18:45:33.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/ru/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/ru/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/ru/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/ru/ktp-auth-handler.po 2013-04-01 18:45:33.000000000 +0000 @@ -0,0 +1,119 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Efremov , 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-11 22:25+0400\n" +"Last-Translator: Yuri Efremov \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Юрий Ефремов" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "yur.arh@gmail.com" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Укажите пароль для чата %1" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Обработчик аутентификации Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Разработчик" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Сервер не прошёл проверку подлинности (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Авторизация на сервере" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Подробности" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Пр&одолжить" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "О&тмена" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Принять навсегда этот сертификат без запросов в будущем?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "Принять &навсегда" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Только для &текущего сеанса" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Ошибка аутентификации" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Аутентификация отменена пользователем" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Введите пароль для учётной записи" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Учётная запись:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Пароль:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Сохранить пароль" diff -Nru ktp-auth-handler-0.5.2/po/sk/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sk/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sk/ktp-auth-handler.po 2012-12-16 01:31:32.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sk/ktp-auth-handler.po 2013-04-01 18:45:35.000000000 +0000 @@ -1,18 +1,19 @@ # translation of ktp-auth-handler.po to Slovak -# Roman Paholik , 2012. +# Richard Frič , 2012. +# Roman Paholík , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-02-08 15:20+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-14 09:24+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" msgctxt "NAME OF TRANSLATORS" @@ -23,31 +24,74 @@ msgid "Your emails" msgstr "wizzardsk@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Prosím zadajte heslo pre miestnosť %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" -msgstr "Spracovač autentifikácie Telepathy" +msgstr "Spracovač overení Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Vývojár" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Server nesplnil overenie pravosti (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Overenie servera" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detaily" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Pokračovať" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Zrušiť" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Chcete navždy akceptovať tento certifikát bez ďalšieho opýtania?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "Na&vždy" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Iba pre &aktuálne sedenia" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" -msgstr "Chyba autentikácie" +msgstr "Chyba overenia" #: x-messenger-oauth2-auth-operation.cpp:121 #: x-telepathy-password-auth-operation.cpp:108 msgid "User cancelled auth" -msgstr "Použivateľ zrušil autentifikáciu" +msgstr "Používateľ zrušil overenie" #. i18n: ectx: property (text), widget (KTitleWidget, title) #: x-telepathy-password-prompt.ui:45 diff -Nru ktp-auth-handler-0.5.2/po/sl/CMakeLists.txt ktp-auth-handler-0.6.0/po/sl/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/sl/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sl/CMakeLists.txt 2013-04-01 18:45:35.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( sl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/sl/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sl/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sl/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sl/ktp-auth-handler.po 2013-04-01 18:45:35.000000000 +0000 @@ -0,0 +1,117 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Andrej Vernekar , 2012. +# Andrej Mernik , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-10 19:30+0100\n" +"Last-Translator: Andrej Mernik \n" +"Language-Team: Slovenian \n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Andrej Vernekar,Andrej Mernik" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "andrej.vernekar@gmail.com,andrejm@ubuntu.si" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Podajte geslo za sobo klepeta %1" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Ročnik za overitev za Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Razvijalec" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Strežnik ni prestal overitvenega preizkusa (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Overjanje strežnika" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "Po&drobnosti" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Nadaljuj" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "Prekli&či" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Ali bi radi trajno sprejeli to potrdilo brez nadaljnjih vprašanj?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Trajno" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Samo za trenutno sejo" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Napaka med overitvijo" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Uporabniško preklicana overitev" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Vnesite geslo vašega računa" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Račun:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Geslo:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Shrani geslo" diff -Nru ktp-auth-handler-0.5.2/po/sr/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sr/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sr/ktp-auth-handler.po 2012-12-16 01:31:44.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sr/ktp-auth-handler.po 2013-04-01 18:45:36.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of ktp-auth-handler.po into Serbian. # Mladen Pejakovic , 2012. -# Chusslove Illich , 2012. +# Chusslove Illich , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-03-19 01:08+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-09 22:46+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -27,22 +27,65 @@ msgid "Your emails" msgstr "pejakm@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Унесите лозинку собе за ћаскање %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Руковалац аутентификацијом за Телепатију" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "Дејвид Едмундсон" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Програмер" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Данијеле Доменичели" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Сервер није прошао аутентификацију (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Аутентификација сервера" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Детаљи" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Настави" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Одустани" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Желите ли да прихватите овај сертификат заувек, без даљег питања?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Заувек" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Само за текућу сесију" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/sr@ijekavian/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sr@ijekavian/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sr@ijekavian/ktp-auth-handler.po 2012-12-16 01:31:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sr@ijekavian/ktp-auth-handler.po 2013-04-01 18:45:36.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of ktp-auth-handler.po into Serbian. # Mladen Pejakovic , 2012. -# Chusslove Illich , 2012. +# Chusslove Illich , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-03-19 01:08+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-09 22:46+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr@ijekavian\n" @@ -27,22 +27,65 @@ msgid "Your emails" msgstr "pejakm@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Унесите лозинку собе за ћаскање %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Руковалац аутентификацијом за Телепатију" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "Дејвид Едмундсон" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Програмер" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Данијеле Доменичели" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Сервер није прошао аутентификацију (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Аутентификација сервера" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Детаљи" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Настави" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Одустани" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Желите ли да прихватите овај сертификат заувек, без даљег питања?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Заувек" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Само за текућу сесију" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/sr@ijekavianlatin/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sr@ijekavianlatin/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sr@ijekavianlatin/ktp-auth-handler.po 2012-12-16 01:31:57.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sr@ijekavianlatin/ktp-auth-handler.po 2013-04-01 18:45:37.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of ktp-auth-handler.po into Serbian. # Mladen Pejakovic , 2012. -# Chusslove Illich , 2012. +# Chusslove Illich , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-03-19 01:08+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-09 22:46+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr@ijekavianlatin\n" @@ -27,22 +27,65 @@ msgid "Your emails" msgstr "pejakm@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Unesite lozinku sobe za ćaskanje %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Rukovalac autentifikacijom za Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "Dejvid Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Programer" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Danijele Domeničeli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Server nije prošao autentifikaciju (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autentifikacija servera" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalji" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Nastavi" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Odustani" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Želite li da prihvatite ovaj sertifikat zauvek, bez daljeg pitanja?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Zauvek" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Samo za tekuću sesiju" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/sr@latin/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sr@latin/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sr@latin/ktp-auth-handler.po 2012-12-16 01:32:03.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sr@latin/ktp-auth-handler.po 2013-04-01 18:45:37.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of ktp-auth-handler.po into Serbian. # Mladen Pejakovic , 2012. -# Chusslove Illich , 2012. +# Chusslove Illich , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: ktp-auth-handler\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-03-19 01:08+0100\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-09 22:46+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr@latin\n" @@ -27,22 +27,65 @@ msgid "Your emails" msgstr "pejakm@gmail.com" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Unesite lozinku sobe za ćaskanje %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Rukovalac autentifikacijom za Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "Dejvid Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Programer" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Danijele Domeničeli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Server nije prošao autentifikaciju (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Autentifikacija servera" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detalji" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "&Nastavi" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Odustani" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Želite li da prihvatite ovaj sertifikat zauvek, bez daljeg pitanja?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&Zauvek" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Samo za tekuću sesiju" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" diff -Nru ktp-auth-handler-0.5.2/po/sv/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/sv/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/sv/ktp-auth-handler.po 2012-12-16 01:32:16.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/sv/ktp-auth-handler.po 2013-04-01 18:45:38.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stefan Asserhall , 2011, 2012. +# Stefan Asserhall , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-03 17:17+0100\n" -"Last-Translator: Stefan Asserhall \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-11 22:17+0100\n" +"Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -25,22 +25,66 @@ msgid "Your emails" msgstr "stefan.asserhall@comhem.se" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Ange ett lösenord för chattrummet %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy-behörighetshanterare" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Utvecklare" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Behörighetkontrollen misslyckades för servern (%1).\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Serverbehörighetskontroll" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Detaljinformation" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Fort&sätt" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Avbryt" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" +"Vill du acceptera det här certifikatet för alltid utan att bli tillfrågad?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "&För alltid" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "&Endast aktuell session" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -71,6 +115,12 @@ msgid "Save Password" msgstr "Spara lösenord" +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Acceptera certifikatet från %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Opålitligt certifikat" + #~ msgid "TextLabel" #~ msgstr "Textetikett" diff -Nru ktp-auth-handler-0.5.2/po/uk/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/uk/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/uk/ktp-auth-handler.po 2012-12-16 01:33:24.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/uk/ktp-auth-handler.po 2013-04-01 18:45:42.000000000 +0000 @@ -1,20 +1,20 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) 2012 KDE e.V. +# This file is distributed under the same license as the KTelepathy package. # -# Yuri Chornoivan , 2011, 2012. +# Yuri Chornoivan , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-04 08:20+0200\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-07 07:25+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" -"Language: \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" @@ -26,22 +26,65 @@ msgid "Your emails" msgstr "yurchor@ukr.net" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Будь ласка, вкажіть пароль до кімнати спілкування %1" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Засіб обробки даних розпізнавання Telepathy" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "Розробник" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"Сервер не пройшов перевірку на достовірність (%1)\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "Розпізнавання сервера" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "&Подробиці" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "Про&довжити" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "&Скасувати" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "Хочете назавжди прийняти цей сертифікат без запитів у майбутньому?" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "На&завжди" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "Тільки &поточний сеанс" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -72,5 +115,11 @@ msgid "Save Password" msgstr "Зберегти пароль" +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Прийняти цей сертифікат від %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Ненадійний сертифікат" + #~ msgid "TextLabel" #~ msgstr "TextLabel" diff -Nru ktp-auth-handler-0.5.2/po/vi/CMakeLists.txt ktp-auth-handler-0.6.0/po/vi/CMakeLists.txt --- ktp-auth-handler-0.5.2/po/vi/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/vi/CMakeLists.txt 2013-04-01 18:45:43.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( vi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru ktp-auth-handler-0.5.2/po/vi/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/vi/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/vi/ktp-auth-handler.po 1970-01-01 00:00:00.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/vi/ktp-auth-handler.po 2013-04-01 18:45:43.000000000 +0000 @@ -0,0 +1,121 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Lê Hoàng Phương , 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-01-08 10:38+0800\n" +"Last-Translator: Lê Hoàng Phương \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.5\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Lê Hoàng Phương" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "herophuong93@gmail.com" + +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "Hãy tạo một mật khẩu cho phòng trò chuyện %1" + +#: main.cpp:48 +msgid "Telepathy Authentication Handler" +msgstr "Trình xử lý xác thực Telepathy" + +#: main.cpp:50 +msgid "David Edmundson" +msgstr "David Edmundson" + +#: main.cpp:50 main.cpp:51 +msgid "Developer" +msgstr "Nhà phát triển" + +#: main.cpp:51 +msgid "Daniele E. Domenichelli" +msgstr "Daniele E. Domenichelli" + +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +#| msgid "Authentication error" +msgid "Server Authentication" +msgstr "Lỗi xác thực" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + +#: x-messenger-oauth2-auth-operation.cpp:106 +#: x-telepathy-password-auth-operation.cpp:84 +msgid "Authentication error" +msgstr "Lỗi xác thực" + +#: x-messenger-oauth2-auth-operation.cpp:121 +#: x-telepathy-password-auth-operation.cpp:108 +msgid "User cancelled auth" +msgstr "Người dùng đã huỷ xác thực" + +#. i18n: ectx: property (text), widget (KTitleWidget, title) +#: x-telepathy-password-prompt.ui:45 +msgid "Please Enter Your Account Password" +msgstr "Hãy nhập mật khẩu tài khoản của bạn" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: x-telepathy-password-prompt.ui:57 +msgid "Account:" +msgstr "Tài khoản:" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: x-telepathy-password-prompt.ui:71 +msgid "Password:" +msgstr "Mật khẩu:" + +#. i18n: ectx: property (text), widget (QCheckBox, savePassword) +#: x-telepathy-password-prompt.ui:85 +msgid "Save Password" +msgstr "Lưu mật khẩu" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "Chấp nhận chứng thực từ %1?
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "Chứng thực không tin tưởng" diff -Nru ktp-auth-handler-0.5.2/po/zh_CN/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/zh_CN/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/zh_CN/ktp-auth-handler.po 2012-12-16 01:34:02.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/zh_CN/ktp-auth-handler.po 2013-04-01 18:45:45.000000000 +0000 @@ -2,20 +2,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Ni Hui , 2012. +# Weng Xuetian , 2012. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-22 15:00+0800\n" -"Last-Translator: Ni Hui \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2012-12-10 21:09-0500\n" +"Last-Translator: Weng Xuetian \n" "Language-Team: Chinese Simplified \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -25,22 +26,64 @@ msgid "Your emails" msgstr "kde-china@kde.org" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "请提供聊天室 %1 的密码" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" -msgstr "" +msgstr "Telepathy 验证处理器" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "开发者" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +#, fuzzy +msgid "Server Authentication" +msgstr "验证错误" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -49,7 +92,7 @@ #: x-messenger-oauth2-auth-operation.cpp:121 #: x-telepathy-password-auth-operation.cpp:108 msgid "User cancelled auth" -msgstr "" +msgstr "用户取消了验证" #. i18n: ectx: property (text), widget (KTitleWidget, title) #: x-telepathy-password-prompt.ui:45 @@ -70,3 +113,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "保存密码" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "接受来自%1的证书？
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "不信任的证书" diff -Nru ktp-auth-handler-0.5.2/po/zh_TW/ktp-auth-handler.po ktp-auth-handler-0.6.0/po/zh_TW/ktp-auth-handler.po --- ktp-auth-handler-0.5.2/po/zh_TW/ktp-auth-handler.po 2012-12-16 01:34:15.000000000 +0000 +++ ktp-auth-handler-0.6.0/po/zh_TW/ktp-auth-handler.po 2013-04-01 18:45:46.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Franklin Weng , 2012. +# Franklin Weng , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-08-28 20:46+0200\n" -"PO-Revision-Date: 2012-01-04 08:36+0800\n" -"Last-Translator: Franklin Weng \n" -"Language-Team: Chinese Traditional \n" -"Language: \n" +"POT-Creation-Date: 2013-03-27 10:06+0100\n" +"PO-Revision-Date: 2013-02-21 08:26+0800\n" +"Last-Translator: Franklin Weng \n" +"Language-Team: Chinese Traditional \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,22 +25,65 @@ msgid "Your emails" msgstr "franklin at goodhorse dot idv dot tw" -#: main.cpp:47 +#: conference-auth-op.cpp:94 +#, kde-format +msgid "Please provide a password for the chat room %1" +msgstr "請提供聊天室 %1 的密碼" + +#: main.cpp:48 msgid "Telepathy Authentication Handler" msgstr "Telepathy 認證處理器" -#: main.cpp:49 +#: main.cpp:50 msgid "David Edmundson" msgstr "David Edmundson" -#: main.cpp:49 main.cpp:50 +#: main.cpp:50 main.cpp:51 msgid "Developer" msgstr "開發者" -#: main.cpp:50 +#: main.cpp:51 msgid "Daniele E. Domenichelli" msgstr "Daniele E. Domenichelli" +#: tls-cert-verifier-op.cpp:135 +#, kde-format +msgid "" +"The server failed the authenticity check (%1).\n" +"\n" +msgstr "" +"此伺服器憑證未能通過認證測試 (%1)。\n" +"\n" + +#: tls-cert-verifier-op.cpp:145 tls-cert-verifier-op.cpp:163 +msgid "Server Authentication" +msgstr "伺服端認證" + +#: tls-cert-verifier-op.cpp:146 +msgid "&Details" +msgstr "詳細資料(&D)" + +#: tls-cert-verifier-op.cpp:147 +msgid "Co&ntinue" +msgstr "繼續(&N)" + +#: tls-cert-verifier-op.cpp:148 +msgid "&Cancel" +msgstr "取消(&C)" + +#: tls-cert-verifier-op.cpp:160 +msgid "" +"Would you like to accept this certificate forever without being prompted?" +msgstr "您希望以後不提示就接受該憑證嗎？" + +#: tls-cert-verifier-op.cpp:164 +msgid "&Forever" +msgstr "永遠(&F)" + +#: tls-cert-verifier-op.cpp:165 +msgid "&Current Session only" +msgstr "只用於目前的工作階段(&C)" + #: x-messenger-oauth2-auth-operation.cpp:106 #: x-telepathy-password-auth-operation.cpp:84 msgid "Authentication error" @@ -70,3 +113,9 @@ #: x-telepathy-password-prompt.ui:85 msgid "Save Password" msgstr "儲存密碼" + +#~ msgid "Accept this certificate from %1?
%2
" +#~ msgstr "要接受從 %1 來的憑證嗎？
%2
" + +#~ msgid "Untrusted certificate" +#~ msgstr "未受信任的憑證" diff -Nru ktp-auth-handler-0.5.2/tls-cert-verifier-op.cpp ktp-auth-handler-0.6.0/tls-cert-verifier-op.cpp --- ktp-auth-handler-0.5.2/tls-cert-verifier-op.cpp 2012-12-16 01:22:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/tls-cert-verifier-op.cpp 2013-04-01 18:44:54.000000000 +0000 @@ -1,6 +1,7 @@ /* * Copyright (C) 2011 Collabora Ltd. * @author Andre Moreira Magalhaes + * Copyright (C) 2013 Dan Vrátil * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +27,12 @@ #include #include -#include +#include + +#include "kssl/ksslcertificatemanager.h" +#include "kssl/ksslinfodialog.h" + +#include TlsCertVerifierOp::TlsCertVerifierOp(const Tp::AccountPtr &account, const Tp::ConnectionPtr &connection, @@ -72,46 +78,28 @@ m_certType = qdbus_cast(props.value(QLatin1String("CertificateType"))); m_certData = qdbus_cast(props.value(QLatin1String("CertificateChainData"))); - if(m_certType.compare(QLatin1String("x509"), Qt::CaseInsensitive)) { - kWarning() << "This is not an x509 certificate"; + if(m_certType.compare(QLatin1String("\"x509\""), Qt::CaseInsensitive)) { + Tp::TLSCertificateRejectionList rejections; + m_authTLSCertificateIface->Reject(rejections); + m_channel->requestClose(); + setFinishedWithError(QLatin1String("Cert.Unknown"), + QLatin1String("Invalid certificate type")); + return; } + // Initialize QCA module + QCA::Initializer initializer; + + QCA::CertificateChain chain; Q_FOREACH (const QByteArray &data, m_certData) { - // FIXME How to chech if it is QSsl::Pem or QSsl::Der? QSsl::Der works for kdetalk - QList certs = QSslCertificate::fromData(data, QSsl::Der); - Q_FOREACH (const QSslCertificate &cert, certs) { - kDebug() << cert; - kDebug() << "Issuer Organization:" << cert.issuerInfo(QSslCertificate::Organization); - kDebug() << "Issuer Common Name:" << cert.issuerInfo(QSslCertificate::CommonName); - kDebug() << "Issuer Locality Name:" << cert.issuerInfo(QSslCertificate::LocalityName); - kDebug() << "Issuer Organizational Unit Name:" << cert.issuerInfo(QSslCertificate::OrganizationalUnitName); - kDebug() << "Issuer Country Name:" << cert.issuerInfo(QSslCertificate::CountryName); - kDebug() << "Issuer State or Province Name:" << cert.issuerInfo(QSslCertificate::StateOrProvinceName); - kDebug() << "Subject Organization:" << cert.subjectInfo(QSslCertificate::Organization); - kDebug() << "Subject Common Name:" << cert.subjectInfo(QSslCertificate::CommonName); - kDebug() << "Subject Locality Name:" << cert.subjectInfo(QSslCertificate::LocalityName); - kDebug() << "Subject Organizational Unit Name:" << cert.subjectInfo(QSslCertificate::OrganizationalUnitName); - kDebug() << "Subject Country Name:" << cert.subjectInfo(QSslCertificate::CountryName); - kDebug() << "Subject State Or Province Name:" << cert.subjectInfo(QSslCertificate::StateOrProvinceName); - kDebug() << "Effective Date:" << cert.effectiveDate(); - kDebug() << "Expiry Date:" << cert.expiryDate(); - kDebug() << "Public Key:" << cert.publicKey(); - kDebug() << "Serial Number:" << cert.serialNumber(); - kDebug() << "Version" << cert.version(); - kDebug() << "Is Valid?" << cert.isValid(); - } + chain << QCA::Certificate::fromDER(data); } - //TODO Show a nice dialog - if (KMessageBox::questionYesNo(0, - i18n("Accept this certificate from %1?
%2
", m_hostname, QString::fromLatin1(m_certData.first().toHex())), - i18n("Untrusted certificate")) == KMessageBox::Yes) { - // TODO Remember value + if (verifyCertChain(chain)) { m_authTLSCertificateIface->Accept().waitForFinished(); setFinished(); } else { Tp::TLSCertificateRejectionList rejections; - // TODO Add reason m_authTLSCertificateIface->Reject(rejections); m_channel->requestClose(); setFinishedWithError(QLatin1String("Cert.Untrusted"), @@ -119,4 +107,160 @@ } } +bool TlsCertVerifierOp::verifyCertChain(const QCA::CertificateChain& chain) +{ + const QList primary = QSslCertificate::fromData(chain.primary().toDER(), QSsl::Der); + KSslCertificateManager *const cm = KSslCertificateManager::self(); + KSslCertificateRule rule = cm->rule(primary.first(), m_hostname); + + // Find all errors then are not ignored by the rule + QList errors; + Q_FOREACH(const QCA::Certificate &cert, chain) { + QCA::Validity validity = cert.validate(CACollection(), QCA::CertificateCollection(), QCA::UsageTLSClient, QCA::ValidateAll); + if (validity == QCA::ValidityGood) { + continue; + } + + KSslError::Error error = validityToError(validity); + if (!rule.ignoredErrors().contains(error)) { + errors << KSslError(error); + } + } + + // If all errors are ignored, just accept + if (errors.isEmpty()) { + return true; + } + + QString message = i18n("The server failed the authenticity check (%1).\n\n", m_hostname); + Q_FOREACH(const KSslError &error, errors) { + message.append(error.errorString()); + message.append(QLatin1Char('\n')); + } + + int msgResult; + do { + msgResult = KMessageBox::warningYesNoCancel(0, + message, + i18n("Server Authentication"), + KGuiItem(i18n("&Details"), QLatin1String("dialog-information")), // yes + KGuiItem(i18n("Co&ntinue"), QLatin1String("arrow-right")), // no + KGuiItem(i18n("&Cancel"), QLatin1String("dialog-cancel"))); + if (msgResult == KMessageBox::Yes) { + showSslDialog(chain, errors); + } else if (msgResult == KMessageBox::Cancel) { + return false; // reject + } + // Fall through on KMessageBox::No + } while (msgResult == KMessageBox::Yes); + + // Save the user's choice to ignore the SSL errors. + msgResult = KMessageBox::warningYesNo( + 0, + i18n("Would you like to accept this " + "certificate forever without " + "being prompted?"), + i18n("Server Authentication"), + KGuiItem(i18n("&Forever"), QLatin1String("flag-green")), + KGuiItem(i18n("&Current Session only"), QLatin1String("chronometer"))); + QDateTime ruleExpiry = QDateTime::currentDateTime(); + if (msgResult == KMessageBox::Yes) { + // Accept forever ("for a very long time") + ruleExpiry = ruleExpiry.addYears(1000); + } else { + // Accept "for a short time", half an hour. + ruleExpiry = ruleExpiry.addSecs(30*60); + } + + rule.setExpiryDateTime(ruleExpiry); + rule.setIgnoredErrors(errors); + cm->setRule(rule); + + return true; +} + +void TlsCertVerifierOp::showSslDialog(const QCA::CertificateChain &chain, const QList &errors) const +{ + QString errorStr; + Q_FOREACH (const KSslError &error, errors) { + errorStr += QString::number(static_cast(error.error())) + QLatin1Char('\t'); + errorStr += QLatin1Char('\n'); + } + errorStr.chop(1); + + // No way to tell whether QSsl::TlsV1 or QSsl::TlsV1Ssl3 + KSslCipher cipher = QSslCipher(QLatin1String("TLS"), QSsl::TlsV1); + QString sslCipher = cipher.encryptionMethod() + QLatin1Char('\n'); + sslCipher += cipher.authenticationMethod() + QLatin1Char('\n'); + sslCipher += cipher.keyExchangeMethod() + QLatin1Char('\n'); + sslCipher += cipher.digestMethod(); + + const QList qchain = chainToList(chain); + QPointer dialog(new KSslInfoDialog(0)); + dialog->setSslInfo(qchain, + QString(), // we don't know the IP + m_hostname, // the URL + QLatin1String("TLS"), + sslCipher, + cipher.usedBits(), + cipher.supportedBits(), + KSslInfoDialog::errorsFromString(errorStr)); + + dialog->exec(); + delete dialog; +} + +KSslError::Error TlsCertVerifierOp::validityToError(QCA::Validity validity) const +{ + switch (validity) { + case QCA::ValidityGood: + return KSslError::NoError; + case QCA::ErrorRejected: + return KSslError::RejectedCertificate; + case QCA::ErrorUntrusted: + return KSslError::UntrustedCertificate; + case QCA::ErrorSignatureFailed: + return KSslError::CertificateSignatureFailed; + case QCA::ErrorInvalidCA: + return KSslError::InvalidCertificateAuthorityCertificate; + case QCA::ErrorInvalidPurpose: + return KSslError::InvalidCertificatePurpose; + case QCA::ErrorSelfSigned: + return KSslError::SelfSignedCertificate; + case QCA::ErrorRevoked: + return KSslError::RevokedCertificate; + case QCA::ErrorPathLengthExceeded: + return KSslError::PathLengthExceeded; + case QCA::ErrorExpired: // fall-through + case QCA::ErrorExpiredCA: + return KSslError::ExpiredCertificate; + case QCA::ErrorValidityUnknown: + return KSslError::UnknownError; + } + + return KSslError::UnknownError; +} + +QCA::CertificateCollection TlsCertVerifierOp::CACollection() const +{ + QList certs = KSslCertificateManager::self()->caCertificates(); + QCA::CertificateCollection collection; + + Q_FOREACH(const QSslCertificate &cert, certs) { + collection.addCertificate(QCA::Certificate::fromDER(cert.toDer())); + } + + return collection; +} + +QList< QSslCertificate > TlsCertVerifierOp::chainToList(const QCA::CertificateChain& chain) const +{ + QList certs; + Q_FOREACH(const QCA::Certificate &cert, chain) { + certs << QSslCertificate::fromData(cert.toDER(), QSsl::Der); + } + + return certs; +} + #include "tls-cert-verifier-op.moc" diff -Nru ktp-auth-handler-0.5.2/tls-cert-verifier-op.h ktp-auth-handler-0.6.0/tls-cert-verifier-op.h --- ktp-auth-handler-0.5.2/tls-cert-verifier-op.h 2012-12-16 01:22:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/tls-cert-verifier-op.h 2013-04-01 18:44:54.000000000 +0000 @@ -2,6 +2,7 @@ * Copyright (C) 2011 Collabora Ltd. * @author Andre Moreira Magalhaes * Copyright (C) 2011 David Edmundson + * Copyright (C) 2013 Dan Vrátil * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +32,10 @@ // FIXME: Move this to tp-qt4 itself #include "types.h" +#include +#include + +class QSslCertificate; class TlsCertVerifierOp : public Tp::PendingOperation { Q_OBJECT @@ -48,6 +53,13 @@ void gotProperties(Tp::PendingOperation *op); private: + bool verifyCertChain(const QCA::CertificateChain &chain); + void showSslDialog(const QCA::CertificateChain &chain, const QList &errors) const; + KSslError::Error validityToError(QCA::Validity validity) const; + + QCA::CertificateCollection CACollection() const; + QList chainToList(const QCA::CertificateChain &chain) const; + Tp::AccountPtr m_account; Tp::ConnectionPtr m_connection; Tp::ChannelPtr m_channel; diff -Nru ktp-auth-handler-0.5.2/x-telepathy-password-prompt.cpp ktp-auth-handler-0.6.0/x-telepathy-password-prompt.cpp --- ktp-auth-handler-0.5.2/x-telepathy-password-prompt.cpp 2012-12-16 01:22:50.000000000 +0000 +++ ktp-auth-handler-0.6.0/x-telepathy-password-prompt.cpp 2013-04-01 18:44:54.000000000 +0000 @@ -30,11 +30,13 @@ { ui->setupUi(mainWidget()); + setAttribute(Qt::WA_ShowWithoutActivating); setWindowIcon(KIcon(QLatin1String("telepathy-kde"))); ui->accountName->setText(account->displayName()); ui->accountIcon->setPixmap(KIcon(QLatin1String("dialog-password")).pixmap(60, 60)); ui->title->setPixmap(KIcon(account->iconName()).pixmap(22, 22)); + ui->passwordLineEdit->setFocus(); if (walletInterface->isOpen()) { ui->savePassword->setChecked(true);