diff options
| -rw-r--r-- | CMakeL10n.txt | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kopete_otr.kdevses | 28 | ||||
| -rw-r--r-- | kopete_otr.tdevelop | 262 | ||||
| -rw-r--r-- | kopete_otr.tdevelop.pcs | bin | 148901 -> 0 bytes | |||
| -rw-r--r-- | src/otrguiclient.cpp | 18 | ||||
| -rw-r--r-- | src/otrguiclient.h | 2 | ||||
| -rw-r--r-- | src/otrlchatinterface.cpp | 4 | ||||
| -rw-r--r-- | src/otrlchatinterface.h | 2 | ||||
| -rw-r--r-- | src/otrplugin-factory.h | 2 | ||||
| -rw-r--r-- | src/otrplugin.cpp | 22 | ||||
| -rw-r--r-- | src/otrplugin.h | 2 | ||||
| -rw-r--r-- | src/otrpreferences.cpp | 12 | ||||
| -rw-r--r-- | src/otrpreferences.h | 2 | ||||
| -rw-r--r-- | src/otrprefs.ui | 25 | ||||
| -rw-r--r-- | src/privkeypopup.h | 2 | ||||
| -rw-r--r-- | src/smppopup.h | 2 | ||||
| -rw-r--r-- | src/smppopupui.ui | 16 | ||||
| -rw-r--r-- | src/verifypopup.h | 2 | ||||
| -rw-r--r-- | src/verifypopupui.ui | 7 | ||||
| -rw-r--r-- | translations/desktop_files/ru.po | 30 | ||||
| -rw-r--r-- | translations/messages/de.po | 79 | ||||
| -rw-r--r-- | translations/messages/kopete_otr.pot | 79 |
23 files changed, 126 insertions, 487 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 16e3f52..a9c7e38 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index b771fdd..ae70ffa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,16 @@ ############################################ -cmake_minimum_required( VERSION 3.1 ) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) #### general package setup project( kopete_otr ) -set( VERSION R14.1.0 ) #### include essential cmake modules @@ -29,7 +32,6 @@ include( CheckCXXSourceCompiles ) #### include our cmake modules -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) diff --git a/kopete_otr.kdevses b/kopete_otr.kdevses deleted file mode 100644 index f0c7931..0000000 --- a/kopete_otr.kdevses +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <DocsAndViews NumberOfDocuments="1" > - <Doc0 NumberOfViews="1" URL="file:///home/dreadhead/Develop/kopete_otr/trunk/kopete_otr/po/de.po" > - <View0 Encoding="UTF-8" line="285" Type="Source" /> - </Doc0> - </DocsAndViews> - <pluginList> - <kdevdebugger> - <breakpointList/> - <showInternalCommands value="0" /> - </kdevdebugger> - <kdevastyle> - <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" /> - <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" /> - </kdevastyle> - <kdevbookmarks> - <bookmarks/> - </kdevbookmarks> - <kdevvalgrind> - <executable path="" params="" /> - <valgrind path="" params="" /> - <calltree path="" params="" /> - <tdecachegrind path="" /> - </kdevvalgrind> - </pluginList> -</KDevPrjSession> diff --git a/kopete_otr.tdevelop b/kopete_otr.tdevelop deleted file mode 100644 index d3d40fd..0000000 --- a/kopete_otr.tdevelop +++ /dev/null @@ -1,262 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Michael Zanetti</author> - <email>michael_zanetti@gmx.net</email> - <version>0.3</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <ignoreparts/> - <projectname>kopete_otr</projectname> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <defaultencoding/> - </general> - <kdevcppsupport> - <qt> - <version>3</version> - <used>true</used> - <includestyle>3</includestyle> - <designerintegration>ExternalDesigner</designerintegration> - <root>/usr/qt/3</root> - <qmake>/usr/qt/3/bin/qmake</qmake> - <designer>/usr/qt/3/bin/designer</designer> - <designerpluginpaths/> - </qt> - <references/> - <codecompletion> - <automaticCodeCompletion>false</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - <showOnlyAccessibleItems>false</showOnlyAccessibleItems> - <completionBoxItemOrder>0</completionBoxItemOrder> - <howEvaluationContextMenu>true</howEvaluationContextMenu> - <showCommentWithArgumentHint>true</showCommentWithArgumentHint> - <statusBarTypeEvaluation>false</statusBarTypeEvaluation> - <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> - <processPrimaryTypes>true</processPrimaryTypes> - <processFunctionArguments>false</processFunctionArguments> - <preProcessAllHeaders>false</preProcessAllHeaders> - <parseMissingHeaders>false</parseMissingHeaders> - <resolveIncludePaths>true</resolveIncludePaths> - <alwaysParseInBackground>true</alwaysParseInBackground> - <usePermanentCaching>true</usePermanentCaching> - <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> - <includePaths>.;</includePaths> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> - <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> - </codecompletion> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <splitheadersource> - <enabled>false</enabled> - <synchronize>true</synchronize> - <orientation>Vertical</orientation> - </splitheadersource> - <designerintegration> - <tqtdesigner/> - </designerintegration> - </kdevcppsupport> - <kdevautoproject> - <general> - <activetarget>src/libkotr.la</activetarget> - <useconfiguration>default</useconfiguration> - </general> - <run> - <mainprogram>/usr/kde/3.5/bin/kopete</mainprogram> - <directoryradio>executable</directoryradio> - <programargs/> - <globaldebugarguments/> - <globalcwd>/home/dreadhead/Develop/kopete_otr/trunk/kopete_otr</globalcwd> - <useglobalprogram>true</useglobalprogram> - <terminal>false</terminal> - <autocompile>false</autocompile> - <autoinstall>false</autoinstall> - <autotdesu>false</autotdesu> - <envvars/> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>GccOptions</ccompiler> - <cxxcompiler>GppOptions</cxxcompiler> - <f77compiler>G77Options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full --prefix=/usr</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - <envvars/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - </debug> - <default> - <envvars/> - <configargs>--enable-debug</configargs> - <builddir/> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevg77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <cxxflags/> - <f77flags/> - </default> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <runmultiplejobs>false</runmultiplejobs> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - <subclassing> - <subclass uifile="/src/privkeypopupui.ui" sourcefile="/src/privkeypopup.cpp" /> - <subclass uifile="/src/privkeypopupui.ui" sourcefile="/src/privkeypopup.h" /> - <subclass uifile="/src/smppopupui.ui" sourcefile="/src/smppopup.cpp" /> - <subclass uifile="/src/smppopupui.ui" sourcefile="/src/smppopup.h" /> - </subclassing> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - <programargs/> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevdocumentation> - <projectdoc> - <docsystem>Doxygen Documentation Collection</docsystem> - <docurl>kopete_otr.tag</docurl> - </projectdoc> - </kdevdocumentation> - <substmap> - <APPNAME>kopete_otr</APPNAME> - <APPNAMELC>kopete_otr</APPNAMELC> - <APPNAMESC>Kopete_otr</APPNAMESC> - <APPNAMEUC>KOPETE_OTR</APPNAMEUC> - <AUTHOR>Frank Scheffold</AUTHOR> - <EMAIL>frank.scheffold@gmx.de</EMAIL> - <LICENSE>GPL</LICENSE> - <LICENSEFILE>COPYING</LICENSEFILE> - <VERSION>0.1</VERSION> - <YEAR>2007</YEAR> - <dest>/home/frank/Programme/kopete_otr</dest> - </substmap> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> diff --git a/kopete_otr.tdevelop.pcs b/kopete_otr.tdevelop.pcs Binary files differdeleted file mode 100644 index dea303e..0000000 --- a/kopete_otr.tdevelop.pcs +++ /dev/null diff --git a/src/otrguiclient.cpp b/src/otrguiclient.cpp index 48dc193..c7a2b92 100644 --- a/src/otrguiclient.cpp +++ b/src/otrguiclient.cpp @@ -48,24 +48,24 @@ OtrGUIClient::OtrGUIClient( Kopete::ChatSession *parent, const char *name ) setInstance( OTRPlugin::plugin()->instance() ); connect( OTRPlugin::plugin(), - TQT_SIGNAL( destroyed( TQObject * ) ), this, - TQT_SLOT( deleteLater() ) + TQ_SIGNAL( destroyed( TQObject * ) ), this, + TQ_SLOT( deleteLater() ) ); - connect(this, TQT_SIGNAL( signalOtrChatsession(Kopete::ChatSession*, bool) ), OTRPlugin::plugin(), TQT_SLOT(slotEnableOtr(Kopete::ChatSession*, bool))); + connect(this, TQ_SIGNAL( signalOtrChatsession(Kopete::ChatSession*, bool) ), OTRPlugin::plugin(), TQ_SLOT(slotEnableOtr(Kopete::ChatSession*, bool))); - connect( OTRPlugin::plugin(), TQT_SIGNAL( goneSecure( Kopete::ChatSession *, int ) ), - this, TQT_SLOT( encryptionEnabled( Kopete::ChatSession *, int ) ) ); + connect( OTRPlugin::plugin(), TQ_SIGNAL( goneSecure( Kopete::ChatSession *, int ) ), + this, TQ_SLOT( encryptionEnabled( Kopete::ChatSession *, int ) ) ); - connect( this, TQT_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQT_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) ); + connect( this, TQ_SIGNAL( signalVerifyFingerprint( Kopete::ChatSession * ) ), OTRPlugin::plugin(), TQ_SLOT(slotVerifyFingerprint( Kopete::ChatSession * )) ); m_manager = parent; otrActionMenu = new TDEActionMenu(i18n("OTR Settings"),"otr_disabled", actionCollection(), "otr_settings"); otrActionMenu->setDelayed( false ); - actionEnableOtr = new TDEAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQT_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); - actionDisableOtr = new TDEAction(i18n("End OTR session"), "otr_disabled",0, this,TQT_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); - actionVerifyFingerprint = new TDEAction(i18n("Authenticate Contact"), "signature",0, this,TQT_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); + actionEnableOtr = new TDEAction(i18n( "Start OTR session" ), "otr_private", 0,this,TQ_SLOT(slotEnableOtr()),actionCollection(), "enable_otr"); + actionDisableOtr = new TDEAction(i18n("End OTR session"), "otr_disabled",0, this,TQ_SLOT(slotDisableOtr()), actionCollection(), "disable_otr"); + actionVerifyFingerprint = new TDEAction(i18n("Authenticate Contact"), "signature",0, this,TQ_SLOT(slotVerifyFingerprint()), actionCollection(), "verify_fingerprint"); otrActionMenu->insert(actionEnableOtr); otrActionMenu->insert(actionDisableOtr); diff --git a/src/otrguiclient.h b/src/otrguiclient.h index 9eaef0e..fe99d73 100644 --- a/src/otrguiclient.h +++ b/src/otrguiclient.h @@ -47,7 +47,7 @@ namespace Kopete { class ChatSession; } class OtrGUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index 5e11453..3830a66 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -212,7 +212,7 @@ static void gone_secure(void *opdata, ConnContext *context){ } #ifdef HAVE_LIBOTR_0400 - session->setProperty("otr-instag", QString::number(context->their_instance)); + session->setProperty("otr-instag", TQString::number(context->their_instance)); #endif // HAVE_LIBOTR_0400 } @@ -587,7 +587,7 @@ OtrlChatInterface::OtrlChatInterface(){ unsigned int interval = otrl_message_poll_get_default_interval(userstate); forwardSecrecyTimerStart(interval); - connect(&m_forwardSecrecyTimer, SIGNAL(timeout()), this, SLOT(otrlMessagePoll())); + connect(&m_forwardSecrecyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(otrlMessagePoll())); #endif // HAVE_LIBOTR_0400 } diff --git a/src/otrlchatinterface.h b/src/otrlchatinterface.h index c4a9428..75f102a 100644 --- a/src/otrlchatinterface.h +++ b/src/otrlchatinterface.h @@ -43,7 +43,7 @@ extern "C" { class KDE_EXPORT OtrlChatInterface: public TQObject { - Q_OBJECT + TQ_OBJECT public: ~OtrlChatInterface(); diff --git a/src/otrplugin-factory.h b/src/otrplugin-factory.h index a38ea5f..6844a14 100644 --- a/src/otrplugin-factory.h +++ b/src/otrplugin-factory.h @@ -26,7 +26,7 @@ class OTRPluginFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: OTRPluginFactory( const TDEAboutData* ); diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index a78cfd5..83dc502 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -68,14 +68,14 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, m_inboundHandler = new OtrMessageHandlerFactory(this); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); -// connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), -// this, TQT_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); +// connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), +// this, TQ_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), - this, TQT_SLOT( slotNewChatSessionWindow( Kopete::ChatSession * ) ) ); - TQObject::connect( this, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), + this, TQ_SLOT( slotNewChatSessionWindow( Kopete::ChatSession * ) ) ); + TQObject::connect( this, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); @@ -124,8 +124,8 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, fpfingerprintsbup.close(); kdDebug() << "Waiting for accounts to update keyfile format" << endl; - connect( Kopete::AccountManager::self(), TQT_SIGNAL( accountRegistered( Kopete::Account * ) ), - this, TQT_SLOT( accountReady( Kopete::Account * ) ) ); + connect( Kopete::AccountManager::self(), TQ_SIGNAL( accountRegistered( Kopete::Account * ) ), + this, TQ_SLOT( accountReady( Kopete::Account * ) ) ); } // Checking file Permissions @@ -145,8 +145,8 @@ OTRPlugin::OTRPlugin( TDEInstance *instance, TQObject *parent, const char *name, otrPolicyMenu->setItems( policies ); otrPolicyMenu->popupMenu()->insertSeparator( 1 ); otrPolicyMenu->setEnabled( false ); - connect( otrPolicyMenu, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotSetPolicy() ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) ); + connect( otrPolicyMenu, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotSetPolicy() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactSelected( bool ) ), this, TQ_SLOT( slotSelectionChanged( bool ) ) ); setXMLFile( "otrui.rc" ); diff --git a/src/otrplugin.h b/src/otrplugin.h index 23943aa..9e23473 100644 --- a/src/otrplugin.h +++ b/src/otrplugin.h @@ -67,7 +67,7 @@ public: class KDE_EXPORT OTRPlugin : public Kopete::Plugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index b88c602..c0d1048 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -76,12 +76,12 @@ OTRPreferences::OTRPreferences(TQWidget *parent, const char* /*name*/, const TQS otrlConfInterface = new OtrlConfInterface( preferencesDialog ); - connect( preferencesDialog->btGenFingerprint, TQT_SIGNAL(clicked()), TQT_SLOT(generateFingerprint())); - connect( preferencesDialog->cbKeys, TQT_SIGNAL(activated(int)), TQT_SLOT(showPrivFingerprint(int))); - connect( preferencesDialog->btVerify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyFingerprint())); - connect( preferencesDialog->twSettings, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(fillFingerprints())); - connect( preferencesDialog->tbFingerprints, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(updateButtons(int, int))); - connect( preferencesDialog->btForget, TQT_SIGNAL( clicked() ), TQT_SLOT( forgetFingerprint() ) ); + connect( preferencesDialog->btGenFingerprint, TQ_SIGNAL(clicked()), TQ_SLOT(generateFingerprint())); + connect( preferencesDialog->cbKeys, TQ_SIGNAL(activated(int)), TQ_SLOT(showPrivFingerprint(int))); + connect( preferencesDialog->btVerify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyFingerprint())); + connect( preferencesDialog->twSettings, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(fillFingerprints())); + connect( preferencesDialog->tbFingerprints, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(updateButtons(int, int))); + connect( preferencesDialog->btForget, TQ_SIGNAL( clicked() ), TQ_SLOT( forgetFingerprint() ) ); int index = 0; int accountnr = 0; diff --git a/src/otrpreferences.h b/src/otrpreferences.h index f4b4f16..b49467d 100644 --- a/src/otrpreferences.h +++ b/src/otrpreferences.h @@ -30,7 +30,7 @@ */ class OTRPreferences : public TDECModule { - Q_OBJECT + TQ_OBJECT public: OTRPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); diff --git a/src/otrprefs.ui b/src/otrprefs.ui index 2bcf214..300c16c 100644 --- a/src/otrprefs.ui +++ b/src/otrprefs.ui @@ -52,9 +52,6 @@ <property name="text"> <string>&Generate</string> </property> - <property name="accel"> - <string>Alt+G</string> - </property> </widget> <widget class="TQComboBox" row="0" column="1"> <property name="name"> @@ -111,9 +108,6 @@ <property name="text"> <string>&Opportunistic</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="toolTip" stdset="0"> <string>Encrypt messages automatically if the other side supports OTR</string> </property> @@ -125,9 +119,6 @@ <property name="text"> <string>Ne&ver</string> </property> - <property name="accel"> - <string>Alt+V</string> - </property> <property name="toolTip" stdset="0"> <string>Never encrypt messages</string> </property> @@ -139,9 +130,6 @@ <property name="text"> <string>&Manual</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -159,9 +147,6 @@ <property name="text"> <string>Al&ways</string> </property> - <property name="accel"> - <string>Alt+W</string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -262,9 +247,6 @@ <property name="text"> <string>&Verify Fingerprint</string> </property> - <property name="accel"> - <string>Alt+V</string> - </property> </widget> <widget class="TQPushButton" row="1" column="1"> <property name="name"> @@ -276,18 +258,15 @@ <property name="text"> <string>F&orget Fingerprint</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> </widget> </grid> </widget> </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot access="private">generateFingerprint()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/src/privkeypopup.h b/src/privkeypopup.h index fab64ab..ef38d69 100644 --- a/src/privkeypopup.h +++ b/src/privkeypopup.h @@ -29,7 +29,7 @@ class PrivKeyPopup : public PrivKeyPopupUI { - Q_OBJECT + TQ_OBJECT public: PrivKeyPopup(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/src/smppopup.h b/src/smppopup.h index 10801dd..7b0c8a3 100644 --- a/src/smppopup.h +++ b/src/smppopup.h @@ -32,7 +32,7 @@ extern "C"{ class SMPPopup : public SMPPopupUI { - Q_OBJECT + TQ_OBJECT public: SMPPopup(TQWidget* parent = 0, const char* name = 0, TQString title = TQString::null, WFlags fl = 0, ConnContext *context = 0, Kopete::ChatSession *session = 0, bool initiate = true ); diff --git a/src/smppopupui.ui b/src/smppopupui.ui index 8319ed2..98ff60e 100644 --- a/src/smppopupui.ui +++ b/src/smppopupui.ui @@ -30,9 +30,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -49,9 +46,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string>Alt+C</string> - </property> </widget> <widget class="KLineEdit"> <property name="name"> @@ -119,9 +113,6 @@ <property name="text"> <string>&Manual Authentication</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -138,9 +129,6 @@ <property name="text"> <string>&Help</string> </property> - <property name="accel"> - <string>Alt+H</string> - </property> </widget> </widget> <images> @@ -174,12 +162,12 @@ <slot>manualAuth()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>manualAuth()</slot> <slot>respondSMP()</slot> <slot>openHelp()</slot> <slot>cancelSMP()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/src/verifypopup.h b/src/verifypopup.h index 934de5d..b9e5c70 100644 --- a/src/verifypopup.h +++ b/src/verifypopup.h @@ -26,7 +26,7 @@ class VerifyPopup : public VerifyPopupUI { - Q_OBJECT + TQ_OBJECT public: VerifyPopup(TQWidget* parent = 0, const char* name = 0, Kopete::ChatSession *session = NULL, bool modal = FALSE, WFlags fl = 0 ); diff --git a/src/verifypopupui.ui b/src/verifypopupui.ui index 2749db7..e0bb1c1 100644 --- a/src/verifypopupui.ui +++ b/src/verifypopupui.ui @@ -26,9 +26,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> </widget> <spacer row="3" column="0" rowspan="1" colspan="2"> <property name="name"> @@ -100,9 +97,9 @@ <slot>close()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>cbChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po new file mode 100644 index 0000000..8654674 --- /dev/null +++ b/translations/desktop_files/ru.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-01-31 03:03+0100\n" +"PO-Revision-Date: 2024-04-19 20:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kopete-otr-desktop-files/ru/>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kopete_otr.desktop:2 kopete_otr_config.desktop:2 +msgid "OTR" +msgstr "OTR" + +#. Comment +#: kopete_otr.desktop:4 kopete_otr_config.desktop:4 +msgid "Encrypt chat sessions with Off-The-Record encryption" +msgstr "" +"Шифрование сеансов чата с помощью криптографического протокола Off-The-Record" diff --git a/translations/messages/de.po b/translations/messages/de.po index 86c6f34..14d80c7 100644 --- a/translations/messages/de.po +++ b/translations/messages/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2022-09-08 18:28+0000\n" "PO-Revision-Date: 2019-12-21 13:56+0000\n" "Last-Translator: Chris <xchrisx@uber.space>\n" "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" @@ -243,22 +243,22 @@ msgstr "OTR" msgid "&Default" msgstr "&Voreinstellung" -#: otrplugin.cpp:143 otrprefs.ui:160 +#: otrplugin.cpp:143 otrprefs.ui:148 #, no-c-format msgid "Al&ways" msgstr "&Immer" -#: otrplugin.cpp:143 otrprefs.ui:112 +#: otrplugin.cpp:143 otrprefs.ui:109 #, no-c-format msgid "&Opportunistic" msgstr "&Automatisch" -#: otrplugin.cpp:143 otrprefs.ui:140 +#: otrplugin.cpp:143 otrprefs.ui:131 #, no-c-format msgid "&Manual" msgstr "&Manuell" -#: otrplugin.cpp:143 otrprefs.ui:126 +#: otrplugin.cpp:143 otrprefs.ui:120 #, no-c-format msgid "Ne&ver" msgstr "&Nie" @@ -393,103 +393,78 @@ msgstr "Private Schlüssel" msgid "&Generate" msgstr "&Erzeugen" -#: otrprefs.ui:56 -#, no-c-format -msgid "Alt+G" -msgstr "Alt+E" - -#: otrprefs.ui:75 +#: otrprefs.ui:72 #, no-c-format msgid "Account:" msgstr "Konto:" -#: otrprefs.ui:91 +#: otrprefs.ui:88 #, no-c-format msgid "No Fingerprint" msgstr "Kein Fingerabdruck" -#: otrprefs.ui:101 +#: otrprefs.ui:98 #, no-c-format msgid "Default Policy" msgstr "Voreinstellung für Verschlüsselung" -#: otrprefs.ui:115 otrprefs.ui:280 smppopupui.ui:34 verifypopupui.ui:30 -#, no-c-format -msgid "Alt+O" -msgstr "Alt+O" - -#: otrprefs.ui:118 +#: otrprefs.ui:112 #, no-c-format msgid "Encrypt messages automatically if the other side supports OTR" msgstr "" "Nachrichten automatisch verschlüsseln wenn die andere Seite OTR unterstützt" -#: otrprefs.ui:129 otrprefs.ui:266 -#, no-c-format -msgid "Alt+V" -msgstr "Alt+V" - -#: otrprefs.ui:132 +#: otrprefs.ui:123 #, no-c-format msgid "Never encrypt messages" msgstr "Nachrichten nie verschlüsseln" -#: otrprefs.ui:143 smppopupui.ui:123 -#, no-c-format -msgid "Alt+M" -msgstr "Alt+M" - -#: otrprefs.ui:149 +#: otrprefs.ui:137 #, no-c-format msgid "Encrypt messages if the other side requests an OTR connection" msgstr "Nachrichten auf Anfrage verschlüsseln" -#: otrprefs.ui:163 -#, no-c-format -msgid "Alt+W" -msgstr "Alt+I" - -#: otrprefs.ui:169 +#: otrprefs.ui:154 #, no-c-format msgid "Always encrypt messages" msgstr "Nachrichten immer verschlüsseln" -#: otrprefs.ui:198 +#: otrprefs.ui:183 #, no-c-format msgid "K&nown Fingerprints" msgstr "&Bekannte Fingerabdrücke" -#: otrprefs.ui:207 +#: otrprefs.ui:192 #, no-c-format msgid "User" msgstr "Benutzer" -#: otrprefs.ui:212 +#: otrprefs.ui:197 #, no-c-format msgid "Status" msgstr "Status" -#: otrprefs.ui:217 +#: otrprefs.ui:202 #, no-c-format msgid "Verified" msgstr "Überprüft" -#: otrprefs.ui:222 +#: otrprefs.ui:207 #, no-c-format msgid "Fingerprint" msgstr "Fingerabdruck" -#: otrprefs.ui:227 +#: otrprefs.ui:212 #, no-c-format msgid "Protocol" msgstr "Protokoll" -#: otrprefs.ui:263 +#: otrprefs.ui:248 #, no-c-format msgid "&Verify Fingerprint" msgstr "Fingerabdruck &überprüfen" -#: otrprefs.ui:277 +#: otrprefs.ui:259 #, no-c-format msgid "F&orget Fingerprint" msgstr "Fingerabdruck &löschen" @@ -499,27 +474,17 @@ msgstr "Fingerabdruck &löschen" msgid "Please wait while generating the private key" msgstr "Bitte warten Sie während der private Schlüssel erzeugt wird" -#: smppopupui.ui:53 -#, no-c-format -msgid "Alt+C" -msgstr "Alt+C" - -#: smppopupui.ui:82 +#: smppopupui.ui:76 #, no-c-format msgid "Please enter the secret passphrase to authenticate this contact." msgstr "" "Bitte geben Sie das Passwort um diesen Kontakt zu authentifizieren ein." -#: smppopupui.ui:120 +#: smppopupui.ui:114 #, no-c-format msgid "&Manual Authentication" msgstr "&Manuelle Überprüfung" -#: smppopupui.ui:142 -#, no-c-format -msgid "Alt+H" -msgstr "Alt+H" - #~ msgid "Yes" #~ msgstr "Ja" diff --git a/translations/messages/kopete_otr.pot b/translations/messages/kopete_otr.pot index 2d960aa..2e0a580 100644 --- a/translations/messages/kopete_otr.pot +++ b/translations/messages/kopete_otr.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2022-09-08 18:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -218,22 +218,22 @@ msgstr "" msgid "&Default" msgstr "" -#: otrplugin.cpp:143 otrprefs.ui:160 +#: otrplugin.cpp:143 otrprefs.ui:148 #, no-c-format msgid "Al&ways" msgstr "" -#: otrplugin.cpp:143 otrprefs.ui:112 +#: otrplugin.cpp:143 otrprefs.ui:109 #, no-c-format msgid "&Opportunistic" msgstr "" -#: otrplugin.cpp:143 otrprefs.ui:140 +#: otrplugin.cpp:143 otrprefs.ui:131 #, no-c-format msgid "&Manual" msgstr "" -#: otrplugin.cpp:143 otrprefs.ui:126 +#: otrplugin.cpp:143 otrprefs.ui:120 #, no-c-format msgid "Ne&ver" msgstr "" @@ -353,102 +353,77 @@ msgstr "" msgid "&Generate" msgstr "" -#: otrprefs.ui:56 -#, no-c-format -msgid "Alt+G" -msgstr "" - -#: otrprefs.ui:75 +#: otrprefs.ui:72 #, no-c-format msgid "Account:" msgstr "" -#: otrprefs.ui:91 +#: otrprefs.ui:88 #, no-c-format msgid "No Fingerprint" msgstr "" -#: otrprefs.ui:101 +#: otrprefs.ui:98 #, no-c-format msgid "Default Policy" msgstr "" -#: otrprefs.ui:115 otrprefs.ui:280 smppopupui.ui:34 verifypopupui.ui:30 -#, no-c-format -msgid "Alt+O" -msgstr "" - -#: otrprefs.ui:118 +#: otrprefs.ui:112 #, no-c-format msgid "Encrypt messages automatically if the other side supports OTR" msgstr "" -#: otrprefs.ui:129 otrprefs.ui:266 -#, no-c-format -msgid "Alt+V" -msgstr "" - -#: otrprefs.ui:132 +#: otrprefs.ui:123 #, no-c-format msgid "Never encrypt messages" msgstr "" -#: otrprefs.ui:143 smppopupui.ui:123 -#, no-c-format -msgid "Alt+M" -msgstr "" - -#: otrprefs.ui:149 +#: otrprefs.ui:137 #, no-c-format msgid "Encrypt messages if the other side requests an OTR connection" msgstr "" -#: otrprefs.ui:163 -#, no-c-format -msgid "Alt+W" -msgstr "" - -#: otrprefs.ui:169 +#: otrprefs.ui:154 #, no-c-format msgid "Always encrypt messages" msgstr "" -#: otrprefs.ui:198 +#: otrprefs.ui:183 #, no-c-format msgid "K&nown Fingerprints" msgstr "" -#: otrprefs.ui:207 +#: otrprefs.ui:192 #, no-c-format msgid "User" msgstr "" -#: otrprefs.ui:212 +#: otrprefs.ui:197 #, no-c-format msgid "Status" msgstr "" -#: otrprefs.ui:217 +#: otrprefs.ui:202 #, no-c-format msgid "Verified" msgstr "" -#: otrprefs.ui:222 +#: otrprefs.ui:207 #, no-c-format msgid "Fingerprint" msgstr "" -#: otrprefs.ui:227 +#: otrprefs.ui:212 #, no-c-format msgid "Protocol" msgstr "" -#: otrprefs.ui:263 +#: otrprefs.ui:248 #, no-c-format msgid "&Verify Fingerprint" msgstr "" -#: otrprefs.ui:277 +#: otrprefs.ui:259 #, no-c-format msgid "F&orget Fingerprint" msgstr "" @@ -458,22 +433,12 @@ msgstr "" msgid "Please wait while generating the private key" msgstr "" -#: smppopupui.ui:53 -#, no-c-format -msgid "Alt+C" -msgstr "" - -#: smppopupui.ui:82 +#: smppopupui.ui:76 #, no-c-format msgid "Please enter the secret passphrase to authenticate this contact." msgstr "" -#: smppopupui.ui:120 +#: smppopupui.ui:114 #, no-c-format msgid "&Manual Authentication" msgstr "" - -#: smppopupui.ui:142 -#, no-c-format -msgid "Alt+H" -msgstr "" |