diff options
-rw-r--r-- | doc/kgeography/index.docbook | 6 | ||||
-rw-r--r-- | doc/khangman/index.docbook | 10 | ||||
-rw-r--r-- | doc/kstars/dumpmode.docbook | 2 | ||||
-rw-r--r-- | doc/kstars/install.docbook | 6 | ||||
-rw-r--r-- | doc/kvoctrain/index.docbook | 2 | ||||
-rwxr-xr-x | khangman/add_language | 2 | ||||
-rw-r--r-- | khangman/khangman/khangman.cpp | 10 | ||||
-rw-r--r-- | khangman/khangman/khangmanview.cpp | 2 | ||||
-rw-r--r-- | klettres/klettres/klettres.cpp | 10 | ||||
-rw-r--r-- | kstars/INSTALL | 12 | ||||
-rw-r--r-- | kstars/README | 2 | ||||
-rw-r--r-- | kstars/README.ephemerides | 4 | ||||
-rw-r--r-- | kstars/kstars/indidriver.cpp | 2 | ||||
-rw-r--r-- | kstars/kstars/kstarsdata.cpp | 4 | ||||
-rw-r--r-- | kverbos/kverbos/kverbosuser.cpp | 2 | ||||
-rw-r--r-- | kverbos/kverbos/kverbosuser.h | 2 |
16 files changed, 39 insertions, 39 deletions
diff --git a/doc/kgeography/index.docbook b/doc/kgeography/index.docbook index b594792b..217bba8a 100644 --- a/doc/kgeography/index.docbook +++ b/doc/kgeography/index.docbook @@ -401,16 +401,16 @@ You can find <ulink url="http://kgeography.berlios.de/gen_map.pl">here</ulink> a Before sending your map to Albert <email>tsdgeos@terra.es</email>, you should test it to see it has no errors. To achieve that, you have to do the following: <itemizedlist> <listitem> - <para>Put the map description and map image file in <filename class="directory">$<envar>KDEDIR</envar>/share/apps/kgeography/</filename></para> + <para>Put the map description and map image file in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/kgeography/</filename></para> </listitem> <listitem> - <para>Put the flag <acronym>PNG</acronym> files (if any) in <filename class="directory">$<envar>KDEDIR</envar>/share/apps/kgeography/flags/</filename></para> + <para>Put the flag <acronym>PNG</acronym> files (if any) in <filename class="directory">$<envar>TDEDIR</envar>/share/apps/kgeography/flags/</filename></para> </listitem> </itemizedlist> Once that has been done you should be able of opening your map from inside &kgeography;. </para> <para> - If you don't know which is your <filename class="directory">$<envar>KDEDIR</envar></filename>, type <userinput><command>kde-config</command> <option>--prefix</option></userinput> in a shell. + If you don't know which is your <filename class="directory">$<envar>TDEDIR</envar></filename>, type <userinput><command>kde-config</command> <option>--prefix</option></userinput> in a shell. </para> </sect1> <sect1 id="non-political-maps"> diff --git a/doc/khangman/index.docbook b/doc/khangman/index.docbook index cbe25d2e..968813d6 100644 --- a/doc/khangman/index.docbook +++ b/doc/khangman/index.docbook @@ -731,10 +731,10 @@ Please contact Anne-Marie by email if you need further information.</para> When you get a new language via <menuchoice><guimenu>Game</guimenu> <guimenuitem>Get Words in New Language...</guimenuitem></menuchoice>, the new language data is stored in <filename class="directory">$~/.kde/share/apps/khangman/data</filename> in the language code folder. The available language dir names are also stored in the &khangman; config file in <filename>~/.kde/share/config/khangmanrc</filename>. </para> <para> -The provider name (i.e. the address of the website where to download the new languages) is stored in <filename>$KDEDIR/share/apps/khangman/khangmanrc</filename>. +The provider name (i.e. the address of the website where to download the new languages) is stored in <filename>$TDEDIR/share/apps/khangman/khangmanrc</filename>. </para> <para> -The English language (default) and the user language from his i18n package(s) (if available) are stored in <filename class="directory">$KDEDIR/share/apps/khangman</filename>. +The English language (default) and the user language from his i18n package(s) (if available) are stored in <filename class="directory">$TDEDIR/share/apps/khangman</filename>. </para> <para> In the configuration file, stored for each user in his <filename>~/.kde/share/config/khangmanrc</filename> are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the KNewStuff dialog. @@ -770,11 +770,11 @@ language, the word to guess is the translation in the new language. <para>The game installs by default in <filename class="directory">/usr/local/kde</filename> so add <filename class="directory">/usr/local/kde/bin</filename> to your path and set -the <envar>KDEDIR</envar> variable to <filename +the <envar>TDEDIR</envar> variable to <filename class="directory">/usr/local/kde</filename> before running the game. An easy way is to configure &khangman; with the option -<option>--prefix</option>=$<envar>KDEDIR</envar> where -$<envar>KDEDIR</envar> is where the rest of &kde; is installed. This +<option>--prefix</option>=$<envar>TDEDIR</envar> where +$<envar>TDEDIR</envar> is where the rest of &kde; is installed. This could vary widely, depending on the distribution and operating system you.</para> </answer> diff --git a/doc/kstars/dumpmode.docbook b/doc/kstars/dumpmode.docbook index 19fdbcf8..6a61ab48 100644 --- a/doc/kstars/dumpmode.docbook +++ b/doc/kstars/dumpmode.docbook @@ -37,7 +37,7 @@ they default to 640 and 480, respectively. </para> <para> By default, &kstars; will read in the options values stored in -your <filename>$KDEHOME/share/config/kstarsrc</filename> file +your <filename>$TDEHOME/share/config/kstarsrc</filename> file to determine where the image will be centered, and how it is rendered. This means you need to run &kstars; in normal GUI mode, and exit the program when it is set up with the desired diff --git a/doc/kstars/install.docbook b/doc/kstars/install.docbook index 4b15a8ac..a943a94f 100644 --- a/doc/kstars/install.docbook +++ b/doc/kstars/install.docbook @@ -69,12 +69,12 @@ but it will use as much as you have got when panning or zooming. In order to compile and install &kstars; on your system, type the following in the base folder of the unpacked &kstars; distribution: <screen width="40"> -<prompt>%</prompt> <userinput>./configure --prefix=$KDEDIR</userinput> +<prompt>%</prompt> <userinput>./configure --prefix=$TDEDIR</userinput> <prompt>%</prompt> <userinput>make</userinput> <prompt>%</prompt> <userinput>make install</userinput> </screen> </para><para> -Please do not forget the prefix argument to configure. If your <envar>KDEDIR</envar> +Please do not forget the prefix argument to configure. If your <envar>TDEDIR</envar> variable is not set, set prefix to whatever folder &kde; is installed in: this is usually either <filename class="directory">/usr</filename>, <filename class="directory">/opt/kde</filename>, or @@ -96,7 +96,7 @@ At this point, there are no special configuration options or requirements. If &kstars; complains that there are missing data files, become <systemitem class="username">root</systemitem> and manually copy all files in <filename class="directory">kstars/data/</filename> to -<filename class="directory">$(KDEDIR)/apps/kstars/</filename> (If you +<filename class="directory">$(TDEDIR)/apps/kstars/</filename> (If you do not have <systemitem class="username">root</systemitem> privileges, copy them to <filename class="directory">~/.kde/share/apps/kstars/.</filename>) diff --git a/doc/kvoctrain/index.docbook b/doc/kvoctrain/index.docbook index 4644aea9..41f79fb6 100644 --- a/doc/kvoctrain/index.docbook +++ b/doc/kvoctrain/index.docbook @@ -1069,7 +1069,7 @@ in your own language which is shown in the header buttons in the <listitem><para>Additionally you can add a nice icon to your language which is shown in the table header button.</para> <para>&kde; 2 stores those pixmaps under -<filename>$<envar>KDEDIR</envar>/share/locale/l10n/<replaceable>language +<filename>$<envar>TDEDIR</envar>/share/locale/l10n/<replaceable>language -code</replaceable></filename>.</para></listitem> </varlistentry> diff --git a/khangman/add_language b/khangman/add_language index 7f9e8da9..19f4954c 100755 --- a/khangman/add_language +++ b/khangman/add_language @@ -11,7 +11,7 @@ echo "Please send your files tarred and zipped to annemarie.mahfouf@free.fr and The script will carry on, please just do not commit the files. Please NEVER commit in a BRANCH." # Check for valid language code -all_langs=$KDEDIR/share/locale/all_languages +all_langs=$TDEDIR/share/locale/all_languages if test -e $all_langs ; then grep -q "^\[$1\]$" $all_langs if test $? != 0 ; then diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 84273617..116d880b 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -205,7 +205,7 @@ void KHangMan::setLanguages() if (m_languages.isEmpty()) return; - //find duplicated entries in KDEDIR and KDEHOME + //find duplicated entries in TDEDIR and TDEHOME TQStringList temp_languages; for (uint i=0; i<m_languages.count(); i++) { @@ -231,7 +231,7 @@ void KHangMan::setLanguages() config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); } - // We look in $KDEDIR/share/locale/all_languages from + // We look in $TDEDIR/share/locale/all_languages from // tdelibs/tdecore/all_languages to find the name of the country // corresponding to the code and the language the user set. KConfig entry(locate("locale", "all_languages")); @@ -317,7 +317,7 @@ void KHangMan::loadLevels() } } - //find duplicated entries in KDEDIR and KDEHOME + //find duplicated entries in TDEDIR and TDEHOME TQString last; for ( TQStringList::Iterator it = levels.begin(); it != levels.end(); ) { @@ -424,7 +424,7 @@ void KHangMan::loadLangToolBar() TQFile myFile; myFile.setName(locate("data", myString)); - // Let's look in local KDEHOME dir then + // Let's look in local TDEHOME dir then if (!myFile.exists()) { TQString myString=TQString("khangman/data/%1/%1.txt") .tqarg(Prefs::selectedLanguage()) @@ -434,7 +434,7 @@ void KHangMan::loadLangToolBar() } if (!myFile.exists()) { - TQString mString=i18n("File $KDEDIR/share/apps/khangman/%1.txt not found;\n" + TQString mString=i18n("File $TDEDIR/share/apps/khangman/%1.txt not found;\n" "check your installation.").tqarg(Prefs::selectedLanguage()); KMessageBox::sorry( this, mString, i18n("Error") ); diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index c65a0b97..e3a646cf 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -591,7 +591,7 @@ void KHangManView::game() TQFile myFile; myFile.setName(locate("data", myString)); if (!myFile.exists()) { - TQString mString = i18n("File $KDEDIR/share/apps/khangman/data/%1/%2 not found!\n" + TQString mString = i18n("File $TDEDIR/share/apps/khangman/data/%1/%2 not found!\n" "Check your installation, please!") .tqarg(Prefs::selectedLanguage()) .tqarg(Prefs::levelFile()); diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index d1f96e59..d1d5e550 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -103,7 +103,7 @@ void KLettres::findLanguages() if (m_languages.isEmpty()) return; Prefs::setLanguages(m_languages); Prefs::writeConfig(); - //find duplicated entries in KDEDIR and KDEHOME + //find duplicated entries in TDEDIR and TDEHOME TQStringList temp_languages; for (uint i=0; i<m_languages.count(); i++) { @@ -129,7 +129,7 @@ void KLettres::findLanguages() if (!config->readEntry(tmp)) config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString())); } - //we look in $KDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages + //we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages //to find the name of the country //corresponding to the code and the language the user set KConfig entry(locate("locale", "all_languages")); @@ -173,9 +173,9 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument) //if xml file is not found, program exits if (!layoutFile.exists()) { - kdWarning() << "sounds.xml file not found in $KDEDIR/share/apps/klettres/"+Prefs::language() << endl; + kdWarning() << "sounds.xml file not found in $TDEDIR/share/apps/klettres/"+Prefs::language() << endl; TQString mString=i18n("The file sounds.xml was not found in\n" - "$KDEDIR/share/apps/klettres/\n\n" + "$TDEDIR/share/apps/klettres/\n\n" "Please install this file and start KLettres again.\n\n"); KMessageBox::information( this, mString,"KLettres - Error" ); kapp->quit();//exit(1); @@ -458,7 +458,7 @@ void KLettres::loadLangToolBar() if (!myFile.exists()) { - TQString mString=i18n("File $KDEDIR/share/apps/klettres/%1.txt not found;\n" + TQString mString=i18n("File $TDEDIR/share/apps/klettres/%1.txt not found;\n" "please check your installation.").tqarg(m_languages[Prefs::languageNumber()]); KMessageBox::sorry( this, mString, i18n("Error") ); diff --git a/kstars/INSTALL b/kstars/INSTALL index 374d1ee8..baec6bca 100644 --- a/kstars/INSTALL +++ b/kstars/INSTALL @@ -2,14 +2,14 @@ Basic Installation ================== ==---> Don't forget to specify the install directory on the configure - command line: `./configure --prefix=$KDEDIR'. If KDEDIR is not + command line: `./configure --prefix=$TDEDIR'. If TDEDIR is not defined, then substitute the top-level directory of your KDE installation. You can determine this with, for example - "which konqueror". The KDEDIR is everything before "bin" + "which konqueror". The TDEDIR is everything before "bin" (i.e., if it's /usr/bin/konqueror, then use "./configure --prefix=/usr"). - KDEDIR is typically /usr or /opt/kde or /opt/kde2 or /opt/trinity + TDEDIR is typically /usr or /opt/kde or /opt/kde2 or /opt/trinity ==---> Dependencies: KStars is a KDE application. To build it from source code, you will need to have the following packages installed. @@ -71,12 +71,12 @@ The simplest way to compile this package is: `configure' itself. **IMPORTANT NOTE: For some reason, the configure script isn't - reading the $KDEDIR environemnt variable. As a result, it + reading the $TDEDIR environemnt variable. As a result, it will install files below the root directort (/) because it sets $prefix="". So, be sure to give the cmd-line argument to set this directly: - 'configure --prefix=$KDEDIR' - or, if KDEDIR is not defined, substitute the top-lavel directory of + 'configure --prefix=$TDEDIR' + or, if TDEDIR is not defined, substitute the top-lavel directory of your KDE installation. For example: 'configure --prefix=/usr' (default for Redhat and Mandrake) diff --git a/kstars/README b/kstars/README index 0c5993dc..82dc1ab0 100644 --- a/kstars/README +++ b/kstars/README @@ -37,7 +37,7 @@ This is the file README. 2. KStars documentation ----------------------- -The KStars handbook can be found in your $(KDEDIR)/share/doc/HTML/<lang>/kstars/ +The KStars handbook can be found in your $(TDEDIR)/share/doc/HTML/<lang>/kstars/ directory. You can also easily access it from the Help menu, or by pressing the [F1] key, or by visiting http://edu.kde.org/kstars/handbook/ diff --git a/kstars/README.ephemerides b/kstars/README.ephemerides index 104deeaf..2ccbe84d 100644 --- a/kstars/README.ephemerides +++ b/kstars/README.ephemerides @@ -40,7 +40,7 @@ Step 2: The Comets Under "ASCII Files", click on the "Comets" link, and save this file as ~/.kde/share/apps/kstars/comets.dat (or as -$KDEDIR/share/apps/kstars/comets.dat for a system-wide install). +$TDEDIR/share/apps/kstars/comets.dat for a system-wide install). Step 3: The Asteroids @@ -74,5 +74,5 @@ out the first 2000 lines, like this: You may want to rename this object before sorting.]] FInally, copy "asteroids.dat" to ~/.kde/share/apps/kstars/ (for -single-user install) or $KDEDIR/share/apps/kstars/ (for system +single-user install) or $TDEDIR/share/apps/kstars/ (for system install). diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 14bbb89c..5814989b 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -570,7 +570,7 @@ bool INDIDriver::readXMLDriver() if ( !KSUtils::openDataFile( file, indiFile ) ) { - KMessageBox::error(0, i18n("Unable to find device driver file 'drivers.xml'. Please locate the file and place it in one of the following locations:\n\n \t$(KDEDIR)/share/apps/kstars/%1 \n\t~/.kde/share/apps/kstars/%1")); + KMessageBox::error(0, i18n("Unable to find device driver file 'drivers.xml'. Please locate the file and place it in one of the following locations:\n\n \t$(TDEDIR)/share/apps/kstars/%1 \n\t~/.kde/share/apps/kstars/%1")); return false; } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index e4f557f4..15f5178c 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -1775,7 +1775,7 @@ void KStarsData::initError(TQString s, bool required = false) { "KStars cannot run properly without this file. " "To continue loading, place the file in one of the " "following locations, then press Retry:\n\n" ).tqarg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + i18n( "Otherwise, press Cancel to shutdown." ); caption = i18n( "Critical File Not Found: %1" ).tqarg( s ); @@ -1784,7 +1784,7 @@ void KStarsData::initError(TQString s, bool required = false) { "KStars can still run without this file. " "However, to avoid seeing this message in the future, you can " "place the file in one of the following locations, then press Retry:\n\n" ).tqarg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + i18n( "Otherwise, press Cancel to continue loading without this file." ).tqarg( s ); caption = i18n( "Non-Critical File Not Found: %1" ).tqarg( s ); diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp index d3337e7c..90896a3b 100644 --- a/kverbos/kverbos/kverbosuser.cpp +++ b/kverbos/kverbos/kverbosuser.cpp @@ -202,7 +202,7 @@ void KVerbosUser::wrong() }; } -// Saves all the user information to the $KDEHOME/apps/kverbos/data/username.kverbos file +// Saves all the user information to the $TDEHOME/apps/kverbos/data/username.kverbos file bool KVerbosUser::saveUser(const int& res, const int& num) { bool re = false; diff --git a/kverbos/kverbos/kverbosuser.h b/kverbos/kverbos/kverbosuser.h index 11ba9564..d2f40d7b 100644 --- a/kverbos/kverbos/kverbosuser.h +++ b/kverbos/kverbos/kverbosuser.h @@ -90,7 +90,7 @@ TQString suggestVerb(); * be moved to the list with the wrong verbs. */ void wrong(); - /** Saves all the user information to the $KDEHOME/apps/kverbos/data/username.kverbos file */ + /** Saves all the user information to the $TDEHOME/apps/kverbos/data/username.kverbos file */ bool saveUser(const int& res, const int& num); /** Retrieve the old results and the number of sessions */ bool getResults(int& s, TQString d[], int r[][2]); |