diff options
34 files changed, 59 insertions, 58 deletions
diff --git a/admin b/admin -Subproject 7fc9aedfb802dbb23da9f54134dd1c381124bc5 +Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b diff --git a/ark/ark_dummy.cpp b/ark/ark_dummy.cpp index efd89d8..717ba3c 100644 --- a/ark/ark_dummy.cpp +++ b/ark/ark_dummy.cpp @@ -1,3 +1,3 @@ #include <kdemacros.h> extern "C" int kdemain(int argc, char* argv[]); -extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } +extern "C" TDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } diff --git a/ark/main.cpp b/ark/main.cpp index c5e4f13..3ec8593 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -62,7 +62,7 @@ static TDECmdLineOptions option[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char *argv[] ) { TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ), "2.6.4", I18N_NOOP( "TDE Archiving tool" ), diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index baa8329..f250428 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kcharselectapplet"); return new CharSelectApplet(configFile, KPanelApplet::Normal, diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 130bf43..8d06d30 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -2267,7 +2267,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e) #include "kcalc.moc" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData aboutData( "kcalc", I18N_NOOP("KCalc"), version, description, TDEAboutData::License_GPL, diff --git a/kcalc/knumber/knumber.h b/kcalc/knumber/knumber.h index 2bccc35..e5f60e3 100644 --- a/kcalc/knumber/knumber.h +++ b/kcalc/knumber/knumber.h @@ -59,7 +59,7 @@ class TQString; * * @author Klaus Niederkrueger <kniederk@math.uni-koeln.de> */ -class KDE_EXPORT KNumber +class TDE_EXPORT KNumber { public: static KNumber const Zero; diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp index 4daaaab..f58a193 100644 --- a/kdf/kcmdf.cpp +++ b/kdf/kcmdf.cpp @@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const extern "C" { - KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ ) + TDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ ) { return new KDiskFreeWidget( parent , "kdf" ); } diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index bb01672..ddb185e 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -1257,7 +1257,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain (int argc, char **argv) +extern "C" TDE_EXPORT int kdemain (int argc, char **argv) { bool have_top_window = false; diff --git a/khexedit/lib/khexedit_export.h b/khexedit/lib/khexedit_export.h index f922516..8d10660 100644 --- a/khexedit/lib/khexedit_export.h +++ b/khexedit/lib/khexedit_export.h @@ -20,6 +20,6 @@ #include <kdemacros.h> -#define KHEXEDIT_EXPORT KDE_EXPORT +#define KHEXEDIT_EXPORT TDE_EXPORT #endif diff --git a/klaptopdaemon/daemon_state.h b/klaptopdaemon/daemon_state.h index 0764e08..2ec5548 100644 --- a/klaptopdaemon/daemon_state.h +++ b/klaptopdaemon/daemon_state.h @@ -31,7 +31,7 @@ #include <tqimage.h> #include <tdelibs_export.h> -class KDE_EXPORT daemon_state +class TDE_EXPORT daemon_state { public: daemon_state(); diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 4a7545d..20843f7 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -51,7 +51,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { + TDE_EXPORT KDEDModule *create_klaptopdaemon(const TQCString& name) { return new laptop_daemon(name); } } diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 258f833..7a8c06b 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -48,49 +48,49 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) { return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) { return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) { return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) { return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) { return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) { return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) { return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) { return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) { return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) { return new ButtonsConfig(parent, "kcmlaptop"); } - KDE_EXPORT void init_battery() + TDE_EXPORT void init_battery() { TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("BatteryDefault"); @@ -111,12 +111,12 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) { return new LaptopModule(parent, "kcmlaptop"); } - KDE_EXPORT void init_laptop() + TDE_EXPORT void init_laptop() { init_battery(); } diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index 42d8c16..c7ca415 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -34,7 +34,7 @@ struct power_result { // ATTENTION: if you change something in here, please update ALL of the // ported sections in the implementation file! -class KDE_EXPORT laptop_portable { +class TDE_EXPORT laptop_portable { public: static void power_management_restart(); // reset internal state static int has_power_management(); // returns 1 if this computer has power management diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp index c994057..bf3d5e6 100644 --- a/klaptopdaemon/wake_laptop.cpp +++ b/klaptopdaemon/wake_laptop.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <tdeapplication.h> -KDE_EXPORT void +TDE_EXPORT void wake_laptop_daemon() { DCOPClient *dclient = kapp->dcopClient(); diff --git a/kmilo/kmilod/displayskin.h b/kmilo/kmilod/displayskin.h index dbeebe6..e8b679b 100644 --- a/kmilo/kmilod/displayskin.h +++ b/kmilo/kmilod/displayskin.h @@ -29,7 +29,7 @@ namespace KMilo { -class KDE_EXPORT DisplaySkin { +class TDE_EXPORT DisplaySkin { public: DisplaySkin(); virtual ~DisplaySkin(); diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index 187b848..1598bb5 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -42,7 +42,7 @@ using namespace KMilo; extern "C" { - KDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kmilod(const TQCString &name) { return new KMiloD(name); } } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index 9dc9127..819fd9a 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -34,7 +34,7 @@ class TDEConfig; namespace KMilo { class KMiloInterface; -class KDE_EXPORT Monitor : public TQObject { +class TDE_EXPORT Monitor : public TQObject { public: Monitor(TQObject *parent, const char *name, const TQStringList&); virtual ~Monitor(); diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h index f0e3f4e..8de9fdb 100644 --- a/kregexpeditor/kregexpeditorgui.h +++ b/kregexpeditor/kregexpeditorgui.h @@ -34,7 +34,7 @@ class KRegExpEditorPrivate; @author Jesper Kjr Pedersen <blackie@kde.org> @version 0.1 **/ -class KDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterface { TQ_OBJECT @@ -64,7 +64,7 @@ private: KRegExpEditorPrivate* _editor; }; -class KDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface +class TDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEditorInterface { TQ_OBJECT diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 4d70777..445ba8c 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) + TDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { TDEGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 60a6902..b5f1156 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -70,7 +70,7 @@ namespace KSim ~ChangedPluginList() {} }; - class KDE_EXPORT ConfigDialog : public KDialogBase + class TDE_EXPORT ConfigDialog : public KDialogBase { TQ_OBJECT diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 92e2923..6526f2d 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -46,7 +46,7 @@ namespace KSim class ConfigDialog; class ChangedPluginList; - class KDE_EXPORT MainView : public TQWidget, virtual public DCOPObject + class TDE_EXPORT MainView : public TQWidget, virtual public DCOPObject { TQ_OBJECT // diff --git a/ksim/library/chart.h b/ksim/library/chart.h index be075bf..1cb53be 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -33,7 +33,7 @@ namespace KSim * provides a graph displaying data onscreen using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Chart : public TQWidget, public KSim::Base + class TDE_EXPORT Chart : public TQWidget, public KSim::Base { TQ_OBJECT diff --git a/ksim/library/common.h b/ksim/library/common.h index 9fc01c0..6f6ae56 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -72,7 +72,7 @@ namespace KSim * @short base class for widgets * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Base + class TDE_EXPORT Base { public: Base(); diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h index 8f7376d..f16a67e 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -33,7 +33,7 @@ namespace KSim /** * @internal */ - class KDE_EXPORT Config + class TDE_EXPORT Config { public: Config(TDEConfig *config); diff --git a/ksim/library/label.h b/ksim/library/label.h index aad3285..40c0b48 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -34,7 +34,7 @@ namespace KSim * @short Label widget * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Label : public TQWidget, public KSim::Base + class TDE_EXPORT Label : public TQWidget, public KSim::Base { TQ_OBJECT diff --git a/ksim/library/led.h b/ksim/library/led.h index bcc256d..de912c8 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -34,7 +34,7 @@ namespace KSim * @short led using gkrellm themes * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Led : public TQPixmap + class TDE_EXPORT Led : public TQPixmap { public: enum Type { First = 0, Second }; @@ -104,7 +104,7 @@ namespace KSim * @short Label widget with 2 leds * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT LedLabel : public KSim::Progress + class TDE_EXPORT LedLabel : public KSim::Progress { TQ_OBJECT diff --git a/ksim/library/pluginglobal.h b/ksim/library/pluginglobal.h index e094198..7258ce5 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -38,7 +38,7 @@ namespace KSim * A class that holds various information about a plugin * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Plugin + class TDE_EXPORT Plugin { public: /** @@ -135,7 +135,7 @@ namespace KSim * use pluginList() from KSim::PluginLoader instead * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginList : public TQValueList<Plugin> + class TDE_EXPORT PluginList : public TQValueList<Plugin> { public: /** diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index 477828e..7f3b3f8 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -27,7 +27,7 @@ namespace KSim { - class KDE_EXPORT PluginInfo + class TDE_EXPORT PluginInfo { friend class PluginLoader; public: @@ -61,7 +61,7 @@ namespace KSim * Provides a loader for the plugins * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginLoader : public TQObject + class TDE_EXPORT PluginLoader : public TQObject { TQ_OBJECT diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index 805141f..e7dc363 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -29,7 +29,7 @@ class TDEConfig; #define KSIM_INIT_PLUGIN(className) \ extern "C" { \ - KDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ + TDE_EXPORT KSim::PluginObject *init_plugin(const char *name) { \ return new className(name); \ } \ } @@ -50,7 +50,7 @@ namespace KSim * @see KSim::PluginView KSim::PluginPage * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginObject + class TDE_EXPORT PluginObject { public: /** @@ -111,7 +111,7 @@ namespace KSim * the config() to gain access to your config file * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginPage : public TQWidget + class TDE_EXPORT PluginPage : public TQWidget { TQ_OBJECT @@ -160,7 +160,7 @@ namespace KSim * when apply or ok gets clicked in the config dialog * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT PluginView : public TQWidget + class TDE_EXPORT PluginView : public TQWidget { TQ_OBJECT diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 9780e64..1439652 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -30,7 +30,7 @@ namespace KSim * provides a label with a progress bar meter * @author Robbie Ward <linuxphreak@gmx.co.uk> */ - class KDE_EXPORT Progress : public KSim::Label + class TDE_EXPORT Progress : public KSim::Label { TQ_OBJECT diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index c70dc92..cb38b2c 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -44,7 +44,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT Theme + class TDE_EXPORT Theme { friend class ThemeLoader; public: @@ -397,7 +397,7 @@ namespace KSim * @author Robbie Ward <linuxphreak@gmx.co.uk> * @short Provides a loader for the themes */ - class KDE_EXPORT ThemeLoader + class TDE_EXPORT ThemeLoader { public: /** diff --git a/tdelirc/irkick/main.cpp b/tdelirc/irkick/main.cpp index 5d5a791..612262d 100644 --- a/tdelirc/irkick/main.cpp +++ b/tdelirc/irkick/main.cpp @@ -17,7 +17,7 @@ #include "irkick.h" -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData *aboutData = new TDEAboutData("irkick", I18N_NOOP("IRKick"), VERSION, I18N_NOOP("The TDE Infrared Remote Control Server"), TDEAboutData::License_GPL, "(c) 2003, Gav Wood", 0, 0, "gav@kde.org"); aboutData->addAuthor("Gav Wood", I18N_NOOP("Author"), "gav@kde.org", "http://www.indigoarchive.net/gav/"); diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index 92f0fd9..a22508c 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -546,7 +546,7 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } diff --git a/translations/desktop_files/kdf-desktops/ru.po b/translations/desktop_files/kdf-desktops/ru.po index 6e707ab..ce7da94 100644 --- a/translations/desktop_files/kdf-desktops/ru.po +++ b/translations/desktop_files/kdf-desktops/ru.po @@ -1,27 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Egor Ermakov <eg.ermakov2016@yandex.ru>, 2022. +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-21 15:48+0200\n" -"PO-Revision-Date: 2022-08-30 08:56+0000\n" -"Last-Translator: Egor Ermakov <eg.ermakov2016@yandex.ru>\n" +"PO-Revision-Date: 2024-05-11 22:02+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/tdeutils/kdf-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" +"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 #: kcmdf.desktop:10 msgid "Storage Devices" -msgstr "Устройства хранения данных" +msgstr "Запоминающие устройства" #. Comment #: kcmdf.desktop:12 |