summaryrefslogtreecommitdiffstats
path: root/tde-i18n-it
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
commit885d90404a23b3a5036d64d99920cb8f7874bdd5 (patch)
treebd876b447715b3987c7b6c2c77ca04b3d870e515 /tde-i18n-it
parentfbd0d7aacf83e98be86e714d220941dc7b5c5e0b (diff)
downloadtde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.tar.gz
tde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-it')
-rw-r--r--tde-i18n-it/docs/tdebase/kinfocenter/samba/index.docbook2
-rw-r--r--tde-i18n-it/docs/tdebase/ksplashml/index.docbook2
-rw-r--r--tde-i18n-it/docs/tdevelop/kdearch/index.docbook12
-rw-r--r--tde-i18n-it/messages/tdeadmin/kpackage.po4
4 files changed, 10 insertions, 10 deletions
diff --git a/tde-i18n-it/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-it/docs/tdebase/kinfocenter/samba/index.docbook
index 7d02d96fa26..48e6ac4e651 100644
--- a/tde-i18n-it/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-it/docs/tdebase/kinfocenter/samba/index.docbook
@@ -281,7 +281,7 @@
<listitem
><para
>Uso di <classname
->KProcess</classname
+>TDEProcess</classname
> invece di popen, ed ulteriore controllo degli errori:</para>
<para
>&David.Faure; &David.Faure.mail;</para
diff --git a/tde-i18n-it/docs/tdebase/ksplashml/index.docbook b/tde-i18n-it/docs/tdebase/ksplashml/index.docbook
index 016a9285190..2418316218e 100644
--- a/tde-i18n-it/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-it/docs/tdebase/ksplashml/index.docbook
@@ -1390,7 +1390,7 @@ void Theme2k::initUi()
mText-&gt;setFixedHeight( 48 );
setFixedSize( vbox-&gt;sizeHint() );
- QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
+ QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
}
diff --git a/tde-i18n-it/docs/tdevelop/kdearch/index.docbook b/tde-i18n-it/docs/tdevelop/kdearch/index.docbook
index 7c7693d6a73..8d7a296cb80 100644
--- a/tde-i18n-it/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-it/docs/tdevelop/kdearch/index.docbook
@@ -237,8 +237,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KGlobalSettings"
->KGlobalSettings</ulink
+><ulink url="kdeapi:tdecore/TDEGlobalSettings"
+>TDEGlobalSettings</ulink
></title>
<para
>È un comodo accesso alle impostazioni non specifiche dell'applicazione. </para>
@@ -295,8 +295,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
></title>
<para
>Chiama e controlla i processi figlio. </para>
@@ -452,7 +452,7 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
></ulink
></title>
<para
@@ -3360,7 +3360,7 @@ int kdemain(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
TDEInstance instance("kio_ftp");
- (void) KGlobal::locale();
+ (void) TDEGlobal::locale();
if (argc != 4) {
fprintf(stderr, "Usage: kio_ftp protocol "
diff --git a/tde-i18n-it/messages/tdeadmin/kpackage.po b/tde-i18n-it/messages/tdeadmin/kpackage.po
index f5295d714c2..ee27b143c83 100644
--- a/tde-i18n-it/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-it/messages/tdeadmin/kpackage.po
@@ -881,7 +881,7 @@ msgstr "Fatto"
#: procbuf.cpp:121
msgid "Kprocess Failure"
-msgstr "Errore di KProcess"
+msgstr "Errore di TDEProcess"
#: procbuf.cpp:139
#, c-format
@@ -891,7 +891,7 @@ msgstr "Tempo massimo: %1"
#: procbuf.cpp:145
#, c-format
msgid "Kprocess error:%1"
-msgstr "Errore di KProcess: %1"
+msgstr "Errore di TDEProcess: %1"
#. i18n: file kpackageui.rc line 13
#: rc.cpp:6