diff options
28 files changed, 63 insertions, 292 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be1c2c01..82f26f1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,6 @@ cmake_minimum_required( VERSION 3.1 ) ##### general package setup ##################### project( tdewebdev ) -set( VERSION R14.0.13 ) ##### include essential cmake modules ########### @@ -33,6 +32,11 @@ include( CheckCXXSourceCompiles ) include( TDEMacros ) +##### set version number ######################## + +tde_set_project_version( ) + + ##### setup install paths ####################### include( TDESetupPaths ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 6b936f76..6a0e50de 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -64,19 +64,10 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) ##### check for libxml-2.0 - pkg_search_module( LIBXML libxml-2.0 ) + pkg_search_module( LIBXML libxml-2.0>=2.6 ) if( NOT LIBXML_FOUND ) - tde_message_fatal( "libxml-2.0 is required but was not found on your system" ) - elseif( ${LIBXML_VERSION} VERSION_LESS "2.6" ) - tde_message_fatal( "libxml-2.0 version must be, at least, up to 2.6" ) - else() - set( LIBXML_2_5 1 ) - tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - set( CMAKE_REQUIRED_LIBRARIES ${LIBXML_LIBRARIES} ) - check_function_exists( xmlSetEntityReferenceFunc HAVE_INCLUDE_FIX ) - tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + tde_message_fatal( "libxml-2.0 version >= 2.6 is required but was not found on your system" ) endif( NOT LIBXML_FOUND ) @@ -128,7 +119,7 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) tde_save( CMAKE_REQUIRED_INCLUDES ) set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - check_include_file( "libxml/DOCBparser.h" LIBXML_DOCB_ENABLED ) + set( LIBXML_DOCB_ENABLED 1 CACHE BOOL "Enable docbook input files" ) check_include_file( "libxml/xinclude.h" LIBXML_XINCLUDE_ENABLED ) tde_restore( CMAKE_REQUIRED_INCLUDES ) diff --git a/config.h.cmake b/config.h.cmake index 121c38d9..2e2ebdf4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -58,18 +58,12 @@ /* Defined if you build with cvsservice */ #cmakedefine ENABLE_CVSSERVICE 1 -/* Defined if libxml-2.0 is up to 2.6 */ -#cmakedefine LIBXML_2_5 1 - -/* Defined if you have <libxml/DOCBparser.h> header file */ +/* Defined if you build with enabled docbook input files */ #cmakedefine LIBXML_DOCB_ENABLED /* Defined if you have <libxml/xinclude.h> header file */ #cmakedefine LIBXML_XINCLUDE_ENABLED -/* Defined if you have xmlSetEntityReferenceFunc within libxml2 */ -#cmakedefine HAVE_INCLUDE_FIX 1 - /* Define the kmdr-executor executable path */ #cmakedefine KMDR_EXECUTOR_PATH "@KMDR_EXECUTOR_PATH@" diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt index 78e036f1..932c0cdd 100644 --- a/klinkstatus/src/ui/settings/CMakeLists.txt +++ b/klinkstatus/src/ui/settings/CMakeLists.txt @@ -19,17 +19,17 @@ link_directories( ##### settings (static) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" ) - tde_add_library( settings STATIC_PIC AUTOMOC SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp configsearchdialog.ui configresultsdialog.ui configidentificationdialogui.ui - ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp configidentificationdialog.cpp - + DEPENDENCIES cfg-static ) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index b39a7e7b..210703ee 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -71,9 +68,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 0a20e4e6..19374617 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -216,9 +216,6 @@ <property name="text"> <string>&Disconnect</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -253,9 +250,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -273,9 +267,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string>Alt+C</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -345,9 +336,6 @@ <property name="text"> <string>Co&nnect</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 86d1b74a..707e9921 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -544,9 +544,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -561,9 +558,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 2cc912c4..ae8ce00a 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -586,9 +586,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -603,9 +600,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -620,9 +614,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -634,9 +625,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -651,9 +639,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -665,9 +650,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -682,9 +664,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -699,9 +678,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -716,9 +692,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -733,9 +706,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -750,9 +720,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -767,9 +734,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -781,9 +745,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -795,9 +756,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -809,9 +767,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -840,9 +795,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -871,9 +823,6 @@ TextEdit5.setColor(color)</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7211785b..d723f0e2 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -218,9 +218,6 @@ endif</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -235,9 +232,6 @@ endif</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -252,9 +246,6 @@ endif</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -266,9 +257,6 @@ endif</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -283,9 +271,6 @@ endif</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -297,9 +282,6 @@ endif</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -314,9 +296,6 @@ endif</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -331,9 +310,6 @@ endif</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -348,9 +324,6 @@ endif</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -365,9 +338,6 @@ endif</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -382,9 +352,6 @@ endif</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -399,9 +366,6 @@ endif</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -413,9 +377,6 @@ endif</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -427,9 +388,6 @@ endif</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -441,9 +399,6 @@ endif</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -472,9 +427,6 @@ endif</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -503,9 +455,6 @@ endif</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp index 73d3713b..3a7c6add 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp @@ -743,9 +743,6 @@ filesInit(void) tempDocument = NULL; topStylesheet = NULL; entityNameList = arrayListNew(4, (freeItemFunc) filesFreeEntityInfo); -#if defined(HAVE_INCLUDE_FIX) && (LIBXML_VERSION < 20508) - xmlSetEntityReferenceFunc(filesEntityRef); -#endif /* setup the encoding */ encodeInBuff = xmlBufferCreate(); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 08de69d7..a3d01cab 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -82,9 +82,6 @@ #include <libxml/xmlerror.h> #include <libxml/HTMLtree.h> #include <libxml/xmlIO.h> -#ifdef LIBXML_DOCB_ENABLED -#include <libxml/DOCBparser.h> -#endif #ifdef LIBXML_XINCLUDE_ENABLED #include <libxml/xinclude.h> #endif @@ -975,22 +972,11 @@ xsldbgLoadXmlData(void) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); -# else - doc = docbParseFile((char *) - optionsGetStringOption(OPTIONS_DATA_FILE_NAME), - NULL); -# endif else #endif - -#if LIBXML_VERSION >= 20600 doc = xmlSAXParseFile(&mySAXHandler, (char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), 0); -#else - doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); -#endif if (doc == NULL) { xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME)))); if (!optionsGetIntOption(OPTIONS_SHELL)) { @@ -1031,11 +1017,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) path); -# else - doc = docbParseFile((char *) path, NULL); -# endif else #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); @@ -1100,7 +1082,7 @@ handler_routine(DWORD dwCtrlType) #endif -#if LIBXML_VERSION >= 2006000 +#if 0 /* libxml/ handlers */ void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error) { @@ -1230,16 +1212,11 @@ xsldbgInit() /* set up the parser */ xmlInitParser(); #if 0 -#if LIBXML_VERSION >= 20600 xmlSetGenericErrorFunc(NULL, NULL); xmlSetStructuredErrorFunc(NULL , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); #else xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); -#endif -#else - xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); - xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); #endif /* diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 221b5bcd..109abfbd 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -76,9 +76,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -93,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 2f98a16b..f26895bb 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -285,9 +282,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> @@ -402,9 +396,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string> </property> @@ -440,9 +431,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output will be opened automatically once the session ends.</string> </property> diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index f8d674d5..2616edab 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 92e5efd1..25eb530b 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index 266989b9..36825c1e 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -123,9 +123,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -140,9 +137,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index be3c7553..24a05ed4 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index a9a606bf..136e181b 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -94,9 +94,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 0562f61e..4f1b9d14 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -36,10 +36,6 @@ #include <tdeio/netaccess.h> //other includes -#ifdef LIBXML_2_5 -#include <libxml/hash.h> -#endif - #include <libxml/parser.h> #include <libxml/valid.h> @@ -86,7 +82,6 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if( DTD::dtd_ptr == NULL ) { TQString errorStr = i18n("Unknown"); -#ifndef LIBXML_2_5 xmlErrorPtr errorPtr = xmlGetLastError(); if (errorPtr != NULL) { @@ -105,7 +100,6 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); xmlResetError(errorPtr); } -#endif KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr)); return false; } diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 5d2e8cc8..11109c78 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -435,9 +435,6 @@ <property name="text"> <string>Remember watches across sessions</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> diff --git a/tdefilereplace/kaddstringdlgs.ui b/tdefilereplace/kaddstringdlgs.ui index 563aa33f..87098c87 100644 --- a/tdefilereplace/kaddstringdlgs.ui +++ b/tdefilereplace/kaddstringdlgs.ui @@ -51,9 +51,6 @@ <property name="text"> <string>Search and replace mode</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton" row="0" column="0"> <property name="name"> diff --git a/tdefilereplace/knewprojectdlgs.ui b/tdefilereplace/knewprojectdlgs.ui index ac46cb9c..4d77e09e 100644 --- a/tdefilereplace/knewprojectdlgs.ui +++ b/tdefilereplace/knewprojectdlgs.ui @@ -88,9 +88,6 @@ <property name="text"> <string>Search Now</string> </property> - <property name="accel"> - <string></string> - </property> <property name="default"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>Search Later</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -219,9 +213,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KComboBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> diff --git a/tdefilereplace/koptionsdlgs.ui b/tdefilereplace/koptionsdlgs.ui index 196ad2c8..dde7725f 100644 --- a/tdefilereplace/koptionsdlgs.ui +++ b/tdefilereplace/koptionsdlgs.ui @@ -55,9 +55,6 @@ <property name="text"> <string>Enable commands in replace strings</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="7" column="0"> <property name="name"> @@ -90,9 +87,6 @@ <property name="text"> <string>Case sensitive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> @@ -101,9 +95,6 @@ <property name="text"> <string>Recursive (search/replace in all sub folders)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> diff --git a/translations/desktop_files/klinkstatus-desktops/it.po b/translations/desktop_files/klinkstatus-desktops/it.po index ae2abac6..99a9b7a2 100644 --- a/translations/desktop_files/klinkstatus-desktops/it.po +++ b/translations/desktop_files/klinkstatus-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:55+0100\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" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/klinkstatus-desktop-files/it/>\n" "Language: it\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: Weblate 4.12.2\n" #. Name #: klinkstatus.desktop:2 msgid "KLinkStatus" -msgstr "" +msgstr "KLinkStatus" #. GenericName #: klinkstatus.desktop:4 @@ -29,4 +30,4 @@ msgstr "Controllo dei collegamenti" #. Name #: klinkstatus_part.desktop:2 msgid "KLinkStatusPart" -msgstr "" +msgstr "KLinkStatusPart" diff --git a/translations/desktop_files/kommander-desktops/it.po b/translations/desktop_files/kommander-desktops/it.po index 475a2d9c..6e7224e6 100644 --- a/translations/desktop_files/kommander-desktops/it.po +++ b/translations/desktop_files/kommander-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:55+0100\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" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kommander-desktop-files/it/>\n" "Language: it\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: Weblate 4.12.2\n" #. Name #: editor/kmdr-editor.desktop:2 @@ -39,14 +40,13 @@ msgstr "Esecutore per maschere di Kommander" #. Name #: part/kommander_part.desktop:2 -#, fuzzy msgid "KommanderPart" -msgstr "Editor Kommander" +msgstr "KommanderPart" #. Name #: widgets/widgets.desktop:2 msgid "Widgets" -msgstr "" +msgstr "Oggetti" #. Comment #: x-kommander.desktop:2 diff --git a/translations/desktop_files/kxsldbg-desktops/it.po b/translations/desktop_files/kxsldbg-desktops/it.po index 24812aeb..1c079958 100644 --- a/translations/desktop_files/kxsldbg-desktops/it.po +++ b/translations/desktop_files/kxsldbg-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:56+0100\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" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kxsldbg-desktop-files/it/>\n" "Language: it\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: Weblate 4.12.2\n" #. Name #: kxsldbg.desktop:2 msgid "KXSLDbg" -msgstr "" +msgstr "KXSLDbg" #. GenericName #: kxsldbg.desktop:4 @@ -29,9 +30,9 @@ msgstr "Debugger per XSLT" #. Name #: kxsldbgpart/kxsldbg_part.desktop:2 msgid "KXsldbgPart" -msgstr "" +msgstr "KXsldbgPart" #. Name #: xsldbg.desktop:2 msgid "XSLDbg" -msgstr "" +msgstr "XSLDbg" diff --git a/translations/desktop_files/quanta-desktops/it.po b/translations/desktop_files/quanta-desktops/it.po index 69f91b47..e5615a74 100644 --- a/translations/desktop_files/quanta-desktops/it.po +++ b/translations/desktop_files/quanta-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-15 23:56+0100\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" +"POT-Creation-Date: 2021-07-07 18:25+0000\n" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/quanta-desktop-files/it/>\n" "Language: it\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: Weblate 4.12.2\n" #. Name #: components/debugger/dbgp/quantadebuggerdbgp.desktop:2 msgid "DBGp" -msgstr "" +msgstr "DBGp" #. Comment #: components/debugger/dbgp/quantadebuggerdbgp.desktop:4 @@ -29,7 +30,7 @@ msgstr "Plugin di degub DBGp, vedi http://xdebug.org" #. Name #: components/debugger/gubed/quantadebuggergubed.desktop:2 msgid "Gubed" -msgstr "" +msgstr "Gubed" #. Comment #: components/debugger/gubed/quantadebuggergubed.desktop:4 @@ -52,9 +53,8 @@ msgstr "Parte browser configura TDEHTML" #. Name #: src/quanta.desktop:2 -#, fuzzy msgid "Quanta Plus" -msgstr "Progetto Quanta" +msgstr "Quanta Plus" #. GenericName #. Comment @@ -68,7 +68,7 @@ msgstr "Ambiente per lo sviluppo Web" #. Name #: src/quanta_be.desktop:2 msgid "Quanta Plus BE" -msgstr "" +msgstr "Quanta Plus BE" #. Comment #: src/x-webprj.desktop:2 diff --git a/translations/desktop_files/tdefilereplace-desktops/ru.po b/translations/desktop_files/tdefilereplace-desktops/ru.po index b5374e2c..2c1e36fb 100644 --- a/translations/desktop_files/tdefilereplace-desktops/ru.po +++ b/translations/desktop_files/tdefilereplace-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-22 01:44+0200\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" +"PO-Revision-Date: 2022-08-30 08:56+0000\n" +"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeutils/tdefilereplace-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.13.1\n" #. Name #: tdefilereplace.desktop:2 tdefilereplacepart.desktop:2 -#, fuzzy msgid "TDEFileReplace" -msgstr "Средство поиска и замены в файлах" +msgstr "TDEFileReplace" #. GenericName #: tdefilereplace.desktop:4 |