From 885d90404a23b3a5036d64d99920cb8f7874bdd5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:06 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tde-i18n-bs/messages/tdebase/kreadconfig.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-ca/docs/tdebase/ksplashml/index.docbook | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-da/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-da/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-de/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-el/messages/tdeadmin/kpackage.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-eo/messages/tdeadmin/kpackage.po | 4 ++-- tde-i18n-eo/messages/tdebase/kreadconfig.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-es/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-es/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ tde-i18n-es/messages/tdeadmin/kpackage.po | 4 ++-- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-et/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-et/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ .../docs/tdewebdev/kommander/extending.docbook | 6 +++--- tde-i18n-fi/messages/tdeadmin/kpackage.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-fr/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-fr/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ tde-i18n-fr/messages/tdeadmin/kpackage.po | 4 ++-- tde-i18n-he/messages/tdebase/kreadconfig.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-it/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-it/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ tde-i18n-it/messages/tdeadmin/kpackage.po | 4 ++-- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-lv/messages/tdebase/kreadconfig.po | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-nl/docs/tdebase/ksplashml/index.docbook | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-pl/docs/tdebase/ksplashml/index.docbook | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-pt/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-pt/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-pt_BR/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-pt_BR/messages/tdeadmin/kpackage.po | 4 ++-- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-ro/messages/tdeadmin/kpackage.po | 4 ++-- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-ru/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-ru/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ tde-i18n-ru/messages/tdeadmin/kpackage.po | 4 ++-- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- .../docs/tdebase/kinfocenter/samba/index.docbook | 2 +- tde-i18n-sl/messages/tdebase/kreadconfig.po | 2 +- tde-i18n-ss/messages/tdebase/kreadconfig.po | 2 +- tde-i18n-sv/docs/tdebase/ksplashml/index.docbook | 2 +- tde-i18n-sv/docs/tdevelop/kdearch/index.docbook | 12 ++++++------ .../docs/tdewebdev/kommander/extending.docbook | 6 +++--- tde-i18n-ta/messages/tdeadmin/kpackage.po | 2 +- tde-i18n-ta/messages/tdebase/kreadconfig.po | 2 +- 58 files changed, 109 insertions(+), 109 deletions(-) diff --git a/tde-i18n-bs/messages/tdebase/kreadconfig.po b/tde-i18n-bs/messages/tdebase/kreadconfig.po index 4e99439e50f..bb9d6689890 100644 --- a/tde-i18n-bs/messages/tdebase/kreadconfig.po +++ b/tde-i18n-bs/messages/tdebase/kreadconfig.po @@ -40,7 +40,7 @@ msgstr "KReadConfig" #: kreadconfig.cpp:48 msgid "Read KConfig entries - for use in shell scripts" -msgstr "Čita KGlobal::config() unose - za korištenje u shell skriptama" +msgstr "Čita TDEGlobal::config() unose - za korištenje u shell skriptama" #: _translatorinfo.cpp:1 msgid "" diff --git a/tde-i18n-ca/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-ca/docs/tdebase/kinfocenter/samba/index.docbook index a112d7846a9..236d67bf3a2 100644 --- a/tde-i18n-ca/docs/tdebase/kinfocenter/samba/index.docbook +++ b/tde-i18n-ca/docs/tdebase/kinfocenter/samba/index.docbook @@ -279,7 +279,7 @@ Ús de KProcessTDEProcess en substitució de popen, i verificació d'errors: &David.Faure; &David.Faure.mail;Brug af KProcessTDEProcess i stedet for popen, og mere fejlretning: &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Bekvem adgang til indstillinger som ikke er programspecifikke. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Starter og styrer underprocesser. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > Verwendung von KProcessTDEProcess anstelle von popen, sowie Fehlerkorrekturen: &David.Faure; &David.Faure.mail;Use of KProcessTDEProcess instead of popen, and more error checking: &David.Faure; &David.Faure.mail;Uso de KProcessTDEProcess en sustitución de popen, y verificación de errores: &David.Faure; &David.Faure.mail;.<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Acceso cómodo a las preferencias que no son específicas de la aplicación. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Invoca y controla procesos hijo. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > KProcessTDEProcessi kasutamine popeni asemel ja hulganisi vigade kontrolli: &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Hõlpus ligipääs rakendusest otseselt mittesõltuvatele seadistustele. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Kutsub välja ja juhib alamprotsesse. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > if (KommanderWidget::inEditor) { - setPixmap(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); setFrameStyle(QFrame::Box | QFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -307,7 +307,7 @@ public: MinuKomPlugin::MinuKomPlugin() { - addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(KGlobal::iconLoader()->loadIcon("ikooninimi", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("ikooninimi", KIcon::NoGroup, KIcon::SizeMedium))); //add my other widgets here } @@ -433,7 +433,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *par >KomStdPlugin::KomStdPlugin() { ... - addWidget("MyWidgetName", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); ... } diff --git a/tde-i18n-fi/messages/tdeadmin/kpackage.po b/tde-i18n-fi/messages/tdeadmin/kpackage.po index a2ed5e87225..c443e1767ad 100644 --- a/tde-i18n-fi/messages/tdeadmin/kpackage.po +++ b/tde-i18n-fi/messages/tdeadmin/kpackage.po @@ -888,7 +888,7 @@ msgstr "Aikavalvonta: %1" #: procbuf.cpp:145 #, c-format msgid "Kprocess error:%1" -msgstr "KProcess virhe:%1" +msgstr "TDEProcess virhe:%1" #. i18n: file kpackageui.rc line 13 #: rc.cpp:6 diff --git a/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook index b1066f5dfca..4a49727c8de 100644 --- a/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook +++ b/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook @@ -265,7 +265,7 @@ Utilisation de KProcessTDEProcess au lieu de popen et plus de recherche d'erreurs : &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Accès pratique aux réglages non spécifiques à une application. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Invoque et contrôle les processus enfants. @@ -454,7 +454,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > Uso di KProcessTDEProcess invece di popen, ed ulteriore controllo degli errori: &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > È un comodo accesso alle impostazioni non specifiche dell'applicazione. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Chiama e controlla i processi figlio. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > popenの代わりにKProcessを使用し、エラーチェックを強化:popenの代わりにTDEProcessを使用し、エラーチェックを強化: David Faure David.Faure@insa-lyon.frGebruik van KProcessTDEProcess in plaats van popen en meerdere fout-controles: &David.Faure; &David.Faure.mail;Użycie KProcessTDEProcess zamiast popen, korekta dalszych błędów: &David.Faure; &David.Faure.mail;Utilização do KProcessTDEProcess em vez do 'popen', entre outras verificações de erros: &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Um acesso conveniente a configurações não-específicas de uma aplicação. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Invoca e controla os processos-filhos. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > Uso do KProcessTDEProcess ao invés do popen, e mais correções de erros: &David.Faure; &David.Faure.mail;Utilizarea KProcessTDEProcess în loc de popen şi verificări extensive de erori: &David.Faure; &David.Faure.mail;Использование KProcessTDEProcess вместо popen и дополнительная проверка ошибок: &David.Faure; &David.Faure.mail;<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Доступ к общим настройкам. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Запуск и контроль дочерних процессов. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > Použitie KProcess namiesto popen a opravy chýb:Použitie TDEProcess namiesto popen a opravy chýb: David Faure David.Faure@insa-lyon.fr Uporaba KProcess namesto popen in preverjanje napak:Uporaba TDEProcess namesto popen in preverjanje napak: David Faure David.Faure@insa-lyon.fr<ulink url="kdeapi:tdecore/KGlobalSettings" ->KGlobalSettings</ulink +><ulink url="kdeapi:tdecore/TDEGlobalSettings" +>TDEGlobalSettings</ulink > Bekväm åtkomst till inställningar som inte är programspecifika. @@ -295,8 +295,8 @@ <ulink url="kdeapi:tdecore/KProcess" ->KProcess</ulink +><ulink url="kdeapi:tdecore/TDEProcess" +>TDEProcess</ulink > Startar och styr underprocesser. @@ -452,7 +452,7 @@ <ulink url="kdeapi:tdecore/KGlobalAccel" +><ulink url="kdeapi:tdecore/TDEGlobalAccel" ></ulink > if (KommanderWidget::inEditor) { - setPixmap(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)); setFrameStyle(QFrame::Box | QFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); @@ -306,7 +306,7 @@ public: MyKomPlugin::MyKomPlugin() { - addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); // lägg till mina andra komponenter här } @@ -432,7 +432,7 @@ QWidget *WidgetFactory::createWidget( const QString &className, QWidget *par >KomStdPlugin::KomStdPlugin() { ... - addWidget("MyWidgetName", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium))); ... } diff --git a/tde-i18n-ta/messages/tdeadmin/kpackage.po b/tde-i18n-ta/messages/tdeadmin/kpackage.po index 7e13175097b..e1fa0c2c861 100644 --- a/tde-i18n-ta/messages/tdeadmin/kpackage.po +++ b/tde-i18n-ta/messages/tdeadmin/kpackage.po @@ -871,7 +871,7 @@ msgstr "செய்யப்பட்டது" #: procbuf.cpp:121 msgid "Kprocess Failure" -msgstr "KProcess தவறல்" +msgstr "TDEProcess தவறல்" #: procbuf.cpp:139 #, c-format diff --git a/tde-i18n-ta/messages/tdebase/kreadconfig.po b/tde-i18n-ta/messages/tdebase/kreadconfig.po index 02bebe97026..5ffc10e51f7 100644 --- a/tde-i18n-ta/messages/tdebase/kreadconfig.po +++ b/tde-i18n-ta/messages/tdebase/kreadconfig.po @@ -39,7 +39,7 @@ msgstr "KReadConfig" #: kreadconfig.cpp:48 msgid "Read KConfig entries - for use in shell scripts" -msgstr "KGlobal::config() நுழைவுகளை - ஓட்டு நிரல்களில் பயன்படுத்து" +msgstr "TDEGlobal::config() நுழைவுகளை - ஓட்டு நிரல்களில் பயன்படுத்து" #: _translatorinfo.cpp:1 msgid ""