diff options
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | kdiff3plugin/kdiff3plugin.cpp | 6 | ||||
| -rw-r--r-- | src/kdiff3_part.cpp | 2 | ||||
| -rw-r--r-- | src/kreplacements/tdeinstance.h (renamed from src/kreplacements/kinstance.h) | 0 | ||||
| -rw-r--r-- | translations/desktop_files/hu.po | 20 | ||||
| -rw-r--r-- | translations/messages/kdiff3/hu.po | 15 |
6 files changed, 25 insertions, 20 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d1e3778..60ed46e 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -10,7 +10,7 @@ find_package( TQt ) find_package( TDE ) -tde_setup_architecture_flags( ) +tde_setup_compiler_flags( ) include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index 2773b16..c9d24cd 100644 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <kgenericfactory.h> #include <kurl.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> //#include <iostream> @@ -35,7 +35,7 @@ static TQStringList* s_pHistory=0; class KDiff3PluginFactory : public KGenericFactory < KDiff3Plugin, KonqPopupMenu > { - KSimpleConfig* m_pConfig; + TDESimpleConfig* m_pConfig; public: KDiff3PluginFactory( const char* instanceName = 0 ) : KGenericFactory< KDiff3Plugin, KonqPopupMenu >( instanceName ) @@ -45,7 +45,7 @@ public: { //std::cout << "New History: " << instanceName << std::endl; s_pHistory = new TQStringList; - m_pConfig = new KSimpleConfig( "kdiff3pluginrc", false ); + m_pConfig = new TDESimpleConfig( "kdiff3pluginrc", false ); *s_pHistory = m_pConfig->readListEntry("HistoryStack"); } } diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 75fa4ad..ddc2bdb 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -19,7 +19,7 @@ #include "kdiff3_part.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> diff --git a/src/kreplacements/kinstance.h b/src/kreplacements/tdeinstance.h index 53443ee..53443ee 100644 --- a/src/kreplacements/kinstance.h +++ b/src/kreplacements/tdeinstance.h diff --git a/translations/desktop_files/hu.po b/translations/desktop_files/hu.po index 2473c37..7094135 100644 --- a/translations/desktop_files/hu.po +++ b/translations/desktop_files/hu.po @@ -1,35 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Szia Tomi <sziatomi01@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-28 10:45+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: 2025-12-11 23:51+0000\n" +"Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n" +"Language-Team: Hungarian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kdiff3-desktop-files/hu/>\n" "Language: hu\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.18.2\n" #. Name #: kdiff3plugin/kdiff3_plugin.desktop:4 msgid "Compare/Merge Files/Directories" -msgstr "" +msgstr "Fájlok/könyvtárak összehasonlítása vagy egyesítése" #. Name #: kdiff3plugin/kdiff3plugin.desktop:4 msgid "Compare/Merge Files/Directories with KDiff3" msgstr "" +"Fájlok/könyvtárak összehasonlítása vagy egyesítése a KDiff3 használatával" #. Name #: src/kdiff3.desktop:3 msgid "KDiff3" -msgstr "" +msgstr "KDiff3" #. GenericName #: src/kdiff3.desktop:5 @@ -44,4 +46,4 @@ msgstr "Segédprogram fájlok, könyvtárak összehasonlításához" #. Name #: src/kdiff3part.desktop:3 msgid "KDiff3Part" -msgstr "" +msgstr "KDiff3-komponens" diff --git a/translations/messages/kdiff3/hu.po b/translations/messages/kdiff3/hu.po index c89c303..cdb80d7 100644 --- a/translations/messages/kdiff3/hu.po +++ b/translations/messages/kdiff3/hu.po @@ -1,18 +1,21 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # Tamas Szanto <tszanto@mol.hu>, 2003. -# +# Szia Tomi <sziatomi01@gmail.com>, 2025. msgid "" msgstr "" "Project-Id-Version: KDE 3.2\n" "POT-Creation-Date: 2023-11-26 18:16+0000\n" -"PO-Revision-Date: 2004-01-09 11:11+0100\n" -"Last-Translator: Tamas Szanto <tszanto@mol.hu>\n" -"Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n" +"PO-Revision-Date: 2025-12-11 23:51+0000\n" +"Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n" +"Language-Team: Hungarian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kdiff3/hu/>\n" "Language: hu\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.18.2\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -28,7 +31,7 @@ msgstr "tszanto@mol.hu" #: diff.cpp:248 msgid "Writing clipboard data to temp file failed." -msgstr "" +msgstr "A vágólap tartalmának ideiglenes fájlba mentése nem sikerült." #: diff.cpp:252 msgid "From Clipboard" @@ -1185,7 +1188,7 @@ msgstr "Nem található összehasonlítható fájlpár." #: kdiff3_part.cpp:298 msgid "KDiff3Part" -msgstr "KDiff3Part" +msgstr "KDiff3-komponens" #: kdiff3_shell.cpp:78 msgid "" |