diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/nl.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/pt_PT.po | 2 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rwxr-xr-x | src/configgeneralpage.cpp | 2 |
13 files changed, 29 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 363ec67..d9545ba 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="" @@ -1794,7 +1794,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" @@ -1806,7 +1806,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" @@ -3497,7 +3497,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 @@ -4894,12 +4894,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 @@ -4924,7 +4924,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 0472847..2e324e4 100644 --- a/configure.in +++ b/configure.in @@ -246,7 +246,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 @@ -521,10 +521,10 @@ msgstr "Benutzerskript ausführen (für erfahrene Benutzer)" #: configgeneralpage.cpp:184 msgid "" -"Executes a script after every finished conversion. Have a look at $KDEDIR/" +"Executes a script after every finished conversion. Have a look at $TDEDIR/" "soundkonverter/userscript.sh" msgstr "" -"Führe einen Skript nach jeder Konvertireung aus. Siehe $KDEDIR/" +"Führe einen Skript nach jeder Konvertireung aus. Siehe $TDEDIR/" "soundkonverter/userscript.sh" #: configpluginspage.cpp:39 @@ -521,7 +521,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 @@ -524,7 +524,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 @@ -568,10 +568,10 @@ msgstr "Felhasználói parancsfájl futtatása (haladó felhasználóknak)" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" "Parancsfájl lefuttatása minden konvertálás után. Nézzen rá erre: " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" #: configpluginspage.cpp:39 msgid "Installed plugins" @@ -511,10 +511,10 @@ msgstr "Esegui script utente (per utenti avanzati)" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" "Esegui uno script quando la conversione è completata.\n" -"controllare il file $KDEDIR/soundkonverter/userscript.sh" +"controllare il file $TDEDIR/soundkonverter/userscript.sh" #: configpluginspage.cpp:39 msgid "Installed plugins" @@ -555,10 +555,10 @@ msgstr "Script van gebruiker uitvoeren (voor gevorderden)" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" "Voert een script uit na elke afgeronde conversie. Kijk eens naar " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" #: configpluginspage.cpp:39 msgid "Installed plugins" @@ -515,7 +515,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 diff --git a/po/pt_BR.po b/po/pt_BR.po index 952e569..1b3bace 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -514,7 +514,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 diff --git a/po/pt_PT.po b/po/pt_PT.po index 9719959..d7ab901 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -552,7 +552,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 @@ -520,7 +520,7 @@ msgstr "" #: configgeneralpage.cpp:184 msgid "" "Executes a script after every finished conversion. Have a look at " -"$KDEDIR/soundkonverter/userscript.sh" +"$TDEDIR/soundkonverter/userscript.sh" msgstr "" #: configpluginspage.cpp:39 diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp index effc8ad..b389f81 100755 --- a/src/configgeneralpage.cpp +++ b/src/configgeneralpage.cpp @@ -181,7 +181,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c TQHBoxLayout* executeUserScriptBox = new TQHBoxLayout( box, 6 ); cExecuteUserScript = new TQCheckBox( i18n("Execute user script (for advanced users)"), parent, "cAskForNewOptions" ); - TQToolTip::add( cExecuteUserScript, i18n("Executes a script after every finished conversion. Have a look at $KDEDIR/soundkonverter/userscript.sh") ); + TQToolTip::add( cExecuteUserScript, i18n("Executes a script after every finished conversion. Have a look at $TDEDIR/soundkonverter/userscript.sh") ); cExecuteUserScript->setChecked( config->data.general.executeUserScript ); executeUserScriptBox->addWidget( cExecuteUserScript ); connect( cExecuteUserScript, TQT_SIGNAL(toggled(bool)), |