diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:12:39 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:12:39 -0600 |
commit | aa71e79b67fd801e4bf2dbafde9b067bc5b54a94 (patch) | |
tree | 3d828165109389c8894236ff4a7e5ad88ca2781c /tde-i18n-fr | |
parent | 2bcacec247d71e883c4295f260583cb38505aacf (diff) | |
download | tde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.tar.gz tde-i18n-aa71e79b67fd801e4bf2dbafde9b067bc5b54a94.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-fr')
-rw-r--r-- | tde-i18n-fr/docs/tdevelop/kdearch/index.docbook | 6 | ||||
-rw-r--r-- | tde-i18n-fr/docs/tdevelop/tdevelop/getting-started.docbook | 4 | ||||
-rw-r--r-- | tde-i18n-fr/messages/tdelibs/tdelibs.po | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook b/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook index 56813fc560d..cc238fb378d 100644 --- a/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook +++ b/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook @@ -173,8 +173,8 @@ <listitem ><formalpara ><title -><ulink url="kdeapi:tdecore/KAboutData" ->KAboutData</ulink +><ulink url="kdeapi:tdecore/TDEAboutData" +>TDEAboutData</ulink ></title> <para >Contient des informations sur la zone « À propos ». </para> @@ -3385,7 +3385,7 @@ Icon=ftp int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance("kio_ftp"); + TDEInstance instance("kio_ftp"); (void) KGlobal::locale(); if (argc != 4) { diff --git a/tde-i18n-fr/docs/tdevelop/tdevelop/getting-started.docbook b/tde-i18n-fr/docs/tdevelop/tdevelop/getting-started.docbook index b6eddd719ca..b9d75d9a26f 100644 --- a/tde-i18n-fr/docs/tdevelop/tdevelop/getting-started.docbook +++ b/tde-i18n-fr/docs/tdevelop/tdevelop/getting-started.docbook @@ -1286,8 +1286,8 @@ Keep lines at 80 characters length maximum. <programlisting >int main(int argc, char **argv) { - KAboutData about("bonjour", I18N_NOOP("Bonjour"), version, description, - KAboutData::License_GPL, "(C) 2006 Jean Utilisateur", 0, 0, + TDEAboutData about("bonjour", I18N_NOOP("Bonjour"), version, description, + TDEAboutData::License_GPL, "(C) 2006 Jean Utilisateur", 0, 0, "jean@utilisateur.com"); about.addAuthor( "Jean Utilisateur", 0, "joe@user.com" ); </programlisting> diff --git a/tde-i18n-fr/messages/tdelibs/tdelibs.po b/tde-i18n-fr/messages/tdelibs/tdelibs.po index ea81ee41a4e..046f847e1ef 100644 --- a/tde-i18n-fr/messages/tdelibs/tdelibs.po +++ b/tde-i18n-fr/messages/tdelibs/tdelibs.po @@ -5333,10 +5333,10 @@ msgstr "??" #: tdeui/kaboutapplication.cpp:67 msgid "" "No information available.\n" -"The supplied KAboutData object does not exist." +"The supplied TDEAboutData object does not exist." msgstr "" "Aucune information disponible.\n" -"L'objet KAboutData fourni n'existe pas." +"L'objet TDEAboutData fourni n'existe pas." #: tdeui/kaboutapplication.cpp:107 msgid "A&uthor" |