summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m426
-rw-r--r--configure.in2
-rw-r--r--doc/da/index.docbook4
-rw-r--r--doc/et/index.docbook4
-rw-r--r--doc/it/index.docbook4
-rw-r--r--doc/konversation/index.docbook4
-rw-r--r--doc/pt/index.docbook4
-rw-r--r--doc/ru/index.docbook4
-rw-r--r--doc/sv/index.docbook4
-rwxr-xr-xkonversation/scripts/mail2
-rw-r--r--konversation/src/scriptlauncher.cpp2
11 files changed, 30 insertions, 30 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 52752f3..607c6af 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -382,13 +382,13 @@ same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done
else
kde_result=problems
fi
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes
KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
- test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
- if test -n "$KDEDIRS"; then
+ test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+ if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS
IFS=:
- for dir in $KDEDIRS; do
+ for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs "
done
IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
- test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET=""
@@ -1809,7 +1809,7 @@ fi
if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"
@@ -1821,7 +1821,7 @@ So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -3562,7 +3562,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS
@@ -4961,12 +4961,12 @@ AC_DEFUN([KDE_CONF_FILES],
dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
[
unset CDPATH
- dnl make $KDEDIR the default for the installation
- AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+ dnl make $TDEDIR the default for the installation
+ AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
@@ -4990,7 +4990,7 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH
dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway.
- AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+ AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then
diff --git a/configure.in b/configure.in
index 0c5f566..43b6ae6 100644
--- a/configure.in
+++ b/configure.in
@@ -198,7 +198,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+ echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
index 714d1e7..f40f2d8 100644
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -4716,7 +4716,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4772,7 +4772,7 @@ $@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $lin
> i stedet. Kig i eksisterende scriptfiler for flere eksempler på at skrive scripter.</para>
<para
->For at kunne køre et script som du har skrevet, skal du installere det ved at kopiere det til $KDEDIR/share/apps/konversation/scripts eller til $HOME/.kde/share/apps/konversation/scripts. Du skal også give filen kørerettigheder, for eksempel med <userinput
+>For at kunne køre et script som du har skrevet, skal du installere det ved at kopiere det til $TDEDIR/share/apps/konversation/scripts eller til $HOME/.kde/share/apps/konversation/scripts. Du skal også give filen kørerettigheder, for eksempel med <userinput
><replaceable
>chmod a+x mit_script</replaceable
></userinput
diff --git a/doc/et/index.docbook b/doc/et/index.docbook
index 5d481ed..cf32b5b 100644
--- a/doc/et/index.docbook
+++ b/doc/et/index.docbook
@@ -4756,7 +4756,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4812,7 +4812,7 @@ $@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $lin
>. Skriptide kirjutamisega aitab kindlasti paremini tutvuda näiteskriptide põhjalik uurimine.</para>
<para
->Kui soovid enda loodud skripti käivitada, tuleb see sul paigadalda, kopeerides skripti kataloogi $KDEDIR/share/apps/konversation/scripts või $HOME/.kde/share/apps/konversation/scripts. Failile tuleb anda ka käivitamisõigused, näiteks käsuga <userinput
+>Kui soovid enda loodud skripti käivitada, tuleb see sul paigadalda, kopeerides skripti kataloogi $TDEDIR/share/apps/konversation/scripts või $HOME/.kde/share/apps/konversation/scripts. Failile tuleb anda ka käivitamisõigused, näiteks käsuga <userinput
><replaceable
>chmod a+x minuskript</replaceable
></userinput
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
index 6091dfc..1c48be2 100644
--- a/doc/it/index.docbook
+++ b/doc/it/index.docbook
@@ -4710,7 +4710,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4766,7 +4766,7 @@ $@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $lin
>. Guarda i file script esistenti per ulteriori esempi di come scrivere script.</para>
<para
->Per poter eseguire uno script che hai scritto tu, devi installarlo copiandolo in $KDEDIR/share/apps/konversation/scripts o in $HOME/.kde/share/apps/konversation/scripts. Devi anche dare al file privilegi di esecuzione, per esempio <userinput
+>Per poter eseguire uno script che hai scritto tu, devi installarlo copiandolo in $TDEDIR/share/apps/konversation/scripts o in $HOME/.kde/share/apps/konversation/scripts. Devi anche dare al file privilegi di esecuzione, per esempio <userinput
><replaceable
>chmod a+x mioscript</replaceable
></userinput
diff --git a/doc/konversation/index.docbook b/doc/konversation/index.docbook
index 3197881..f537eb0 100644
--- a/doc/konversation/index.docbook
+++ b/doc/konversation/index.docbook
@@ -2741,7 +2741,7 @@ passing it <userinput><replaceable>uname -a</replaceable></userinput>. This sen
<para>To get a list of all available scripts, type the following command in a
&konsole; screen.</para>
-<para><userinput><replaceable>ls $KDEDIR/share/apps/konversation/scripts</replaceable></userinput></para>
+<para><userinput><replaceable>ls $TDEDIR/share/apps/konversation/scripts</replaceable></userinput></para>
<para>You can write your own scripts. Scripts are shell scripts and can be written in
any shell language, such as bash, perl, or python. When &konversation; runs a script, the
@@ -2782,7 +2782,7 @@ in the tab without sending it to other users, use <computeroutput>info</computer
instead. Look at the existing script files for more examples of writing scripts.</para>
<para>To be able to run a script you have written, you must install it by copying
-it to $KDEDIR/share/apps/konversation/scripts or to $HOME/.kde/share/apps/konversation/scripts. You must also give the file execute
+it to $TDEDIR/share/apps/konversation/scripts or to $HOME/.kde/share/apps/konversation/scripts. You must also give the file execute
privilege, for example <userinput><replaceable>chmod a+x myscript</replaceable></userinput>.</para>
</sect1>
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
index f480dbb..c10123c 100644
--- a/doc/pt/index.docbook
+++ b/doc/pt/index.docbook
@@ -4738,7 +4738,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4794,7 +4794,7 @@ $@ | while read linha; do dcop $PORT Konversation say $SERVIDOR "$DESTINO" "$@:
> em alternativa. Veja os programa existentes para aprender mais exemplos de programação.</para>
<para
->Para ser capaz de executar um programa que tenha criado, precisa de o instalar, copiando-o para tal para $KDEDIR/share/apps/konversation/scripts ou para $HOME/.kde/share/apps/konversation/scripts. Precisa também de ceder permissões de execução ao ficheiro, por exemplo com um <userinput
+>Para ser capaz de executar um programa que tenha criado, precisa de o instalar, copiando-o para tal para $TDEDIR/share/apps/konversation/scripts ou para $HOME/.kde/share/apps/konversation/scripts. Precisa também de ceder permissões de execução ao ficheiro, por exemplo com um <userinput
><replaceable
>chmod a+x programa</replaceable
></userinput
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 8cfbd5d..3181439 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -4736,7 +4736,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4792,7 +4792,7 @@ $@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $lin
>. Взглянув на существующие файлы сценариев, вы получите более полное представление о них.</para>
<para
->Чтобы получить возможность запустить собственный сценарий, вы должны скопировать его в $KDEDIR/share/apps/konversation/scripts или в $HOME/.kde/share/apps/konversation/scripts. Необходимо также дать ему права на исполнение, например таким образом: <userinput
+>Чтобы получить возможность запустить собственный сценарий, вы должны скопировать его в $TDEDIR/share/apps/konversation/scripts или в $HOME/.kde/share/apps/konversation/scripts. Необходимо также дать ему права на исполнение, например таким образом: <userinput
><replaceable
>chmod a+x имя_файла</replaceable
></userinput
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
index 89a6727..f4ff340 100644
--- a/doc/sv/index.docbook
+++ b/doc/sv/index.docbook
@@ -4742,7 +4742,7 @@ mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@";
<para
><userinput
><replaceable
->ls $KDEDIR/share/apps/konversation/scripts</replaceable
+>ls $TDEDIR/share/apps/konversation/scripts</replaceable
></userinput
></para>
@@ -4798,7 +4798,7 @@ $@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $lin
> istället. Titta i befintliga skriptfiler för mer exempel på att skriva skript.</para>
<para
->För att kunna köra ett skript som du har skrivit, måste du installera det genom att kopiera det till $KDEDIR/share/apps/konversation/scripts eller till $HOME/.kde/share/apps/konversation/scripts. Du måste också ge filen körrättigheter, till exempel med <userinput
+>För att kunna köra ett skript som du har skrivit, måste du installera det genom att kopiera det till $TDEDIR/share/apps/konversation/scripts eller till $HOME/.kde/share/apps/konversation/scripts. Du måste också ge filen körrättigheter, till exempel med <userinput
><replaceable
>chmod a+x mitt_skript</replaceable
></userinput
diff --git a/konversation/scripts/mail b/konversation/scripts/mail
index b5882b1..7757d4f 100755
--- a/konversation/scripts/mail
+++ b/konversation/scripts/mail
@@ -52,7 +52,7 @@ getmails()
if [[ -z "$3" ]] ; then
echo "Scripts are not meant to be called from the command line."
- echo "This script should be installed to $KDEDIR/share/apps/konversation/scripts"
+ echo "This script should be installed to $TDEDIR/share/apps/konversation/scripts"
echo "Then executed with /script from the konversation"
echo
echo The output is:
diff --git a/konversation/src/scriptlauncher.cpp b/konversation/src/scriptlauncher.cpp
index 40c2300..2f8b255 100644
--- a/konversation/src/scriptlauncher.cpp
+++ b/konversation/src/scriptlauncher.cpp
@@ -44,7 +44,7 @@ void ScriptLauncher::launchScript(const TQString& target, const TQString &parame
// send the script all the information it will need
TQStringList parameterList=TQStringList::split(' ',parameter);
- // find script path (could be installed for all users in $KDEDIR/share/apps/ or
+ // find script path (could be installed for all users in $TDEDIR/share/apps/ or
// for one user alone in $HOME/.kde/share/apps/
TQString scriptPath(kstddir.findResource("data","konversation/scripts/"+parameterList[0]));