Rename KDEHOME and KDEDIR

pull/1/head
Timothy Pearson 11 years ago
parent 62bf6d9af0
commit fed7602677
  1. 26
      acinclude.m4
  2. 4
      amarok/src/scripts/webcontrol/WebPublisher.py
  3. 2
      configure.in
  4. 4
      po/gl/amarok.po
  5. 4
      po/lo/amarok.po
  6. 4
      po/nb/amarok.po
  7. 2
      po/rw/amarok.po
  8. 4
      po/ss/amarok.po
  9. 4
      po/ta/amarok.po
  10. 4
      po/tg/amarok.po

@ -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=""
@ -1818,7 +1818,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"
@ -1830,7 +1830,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"
@ -3574,7 +3574,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
@ -4973,12 +4973,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
@ -5002,7 +5002,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

@ -19,8 +19,8 @@ import string
# find directory containing common Zeroconf files
temp=sys.path[:]
sys.path.insert(0,os.path.abspath(os.path.dirname(sys.argv[0])+'/../common'))
if not os.getenv("KDEDIR") is None: sys.path.insert(0,os.getenv("KDEDIR")+"/share/apps/amarok/scripts/common")
if not os.getenv("KDEDIRS") is None: sys.path=[p+"/share/apps/amarok/scripts/common" for p in string.split(os.getenv("KDEDIRS"),os.pathsep)]+sys.path
if not os.getenv("TDEDIR") is None: sys.path.insert(0,os.getenv("TDEDIR")+"/share/apps/amarok/scripts/common")
if not os.getenv("TDEDIRS") is None: sys.path=[p+"/share/apps/amarok/scripts/common" for p in string.split(os.getenv("TDEDIRS"),os.pathsep)]+sys.path
from Publisher import *
sys.path=temp

@ -1725,7 +1725,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

@ -14150,8 +14150,8 @@ msgstr "amaroK"
#~ msgid "Reading metadata"
#~ msgstr "Volvendo a ler os meta-datos"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd non está a correr con <b>prioridade de tempo real</b>, o que pode ocasionar saltos e vacilacións na reprodución.</p><p>Para usar a prioridade de tempo real, abra o Centro de Control do KDE e habilite \"Correr coa prioridade máis alta posíbel\" en <i>Sistema de Son</i> na pola <i>Son e multimedia</i>. Para algúns pode ser necesario asegurarse que \"$KDEDIR/bin/arswrapper\" ten <b>marcar suid</b> como (chmod +s).</p><p>Pode suceder, porén, que a reprodución sexa boa sen necesidade de incrementar a prioridade de artsd.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd non está a correr con <b>prioridade de tempo real</b>, o que pode ocasionar saltos e vacilacións na reprodución.</p><p>Para usar a prioridade de tempo real, abra o Centro de Control do KDE e habilite \"Correr coa prioridade máis alta posíbel\" en <i>Sistema de Son</i> na pola <i>Son e multimedia</i>. Para algúns pode ser necesario asegurarse que \"$TDEDIR/bin/arswrapper\" ten <b>marcar suid</b> como (chmod +s).</p><p>Pode suceder, porén, que a reprodución sexa boa sen necesidade de incrementar a prioridade de artsd.</p>"
#~ msgid "aRts Problem"
#~ msgstr "Problema con aRts"

@ -13434,8 +13434,8 @@ msgstr ""
#~ msgid "Add Media"
#~ msgstr "매체 더하기"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd가 <b>실시간 우선순위</b> 상태로 실행중이 아닙니다. 이로 인해서 재생이 원활하지 않을 수도 있습니다.<p><p>실시간 우선순위 기능을 사용하려면, KDE 제어판을 연 다음, <i>Sound & Multimedia</i>의 <i>Sound System</i> 메뉴에서 \"Run with highest possible priority\" 옵션을 켜십시오. 경우에 따라서는 \"$KDEDIR/bin/artswrapper\"이 <b>suid 설정</b>되었는지를 확인해야 할 수도 있습니다(chmod +s).</p><p>이렇게 하면 artsd의 우선순위를 올려주지 않아도 재생이 원활하게 이루어짐을 볼 수 있습니다.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd가 <b>실시간 우선순위</b> 상태로 실행중이 아닙니다. 이로 인해서 재생이 원활하지 않을 수도 있습니다.<p><p>실시간 우선순위 기능을 사용하려면, KDE 제어판을 연 다음, <i>Sound & Multimedia</i>의 <i>Sound System</i> 메뉴에서 \"Run with highest possible priority\" 옵션을 켜십시오. 경우에 따라서는 \"$TDEDIR/bin/artswrapper\"이 <b>suid 설정</b>되었는지를 확인해야 할 수도 있습니다(chmod +s).</p><p>이렇게 하면 artsd의 우선순위를 올려주지 않아도 재생이 원활하게 이루어짐을 볼 수 있습니다.</p>"
#~ msgid "aRts Problem"
#~ msgstr "aRts 문제"

@ -13729,8 +13729,8 @@ msgstr "Kjør Amarok …"
#~ msgid "Reading metadata"
#~ msgstr "Leser metadata"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>Nissen artsd kjører ikke med <b>sanntidsprioritet</b>, og dette kan føre til at lydavspillingen hakker.<p><p>Hvis du vil bruke sanntidsprioritet åpner du kontrollpanelet i KDE, og slår så på «Lyd | Lydsystem | Kjør lydtjener med høyeste prioritet (sanntidsprioritet)». Du må kanskje også se til at «$KDEDIR/bin/artswrapper» er <b>set suid</b> (chmod +s).</p><p>Men det kan også være at lydavspillingen vil fungere helt fint uten at du trenger å øke prioriteten til artsd.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>Nissen artsd kjører ikke med <b>sanntidsprioritet</b>, og dette kan føre til at lydavspillingen hakker.<p><p>Hvis du vil bruke sanntidsprioritet åpner du kontrollpanelet i KDE, og slår så på «Lyd | Lydsystem | Kjør lydtjener med høyeste prioritet (sanntidsprioritet)». Du må kanskje også se til at «$TDEDIR/bin/artswrapper» er <b>set suid</b> (chmod +s).</p><p>Men det kan også være at lydavspillingen vil fungere helt fint uten at du trenger å øke prioriteten til artsd.</p>"
#~ msgid "aRts Problem"
#~ msgstr "Problem med aRts"

@ -14575,7 +14575,7 @@ msgstr "Ikibambara"
#~ msgstr "Muyunguruzi..."
#, fuzzy
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p> ni OYA Na: <b> Icyihutirwa </b> Gicurasi Inyumvo Kuri \" Gusimbuka \" na . <p> <p> Koresha Icyihutirwa , Gufungura i MukusanyaKDE na Gushoboza \" Na: kirekire kurusha ibindi Icyihutirwa \" , <i> </i> in i <i> & </i> . Abantu Gicurasi Kuri Kugenzura \" $ //\" ni <b> Gushyiraho </b> ( + S ) . </p> <p> Gicurasi Gushaka , , ni i Icyihutirwa Bya . </p> "
#, fuzzy

@ -13759,8 +13759,8 @@ msgstr ""
#~ msgid "Reading metadata"
#~ msgstr "Čitam metapodatke"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd ne radi sa <b>prioritetom u realnom vremenu</b> što može dovesti do preskoka i zastoja u reprodukciji zvuka.<p></p><p>Za korišćenje prioriteta u realnom vremenu, otvorite Kontrolni centar KDE-a i uključite „Pokreni sa najvišim prioritetom“, pod <i>Zvučni sistem</i>, u grani <i>Zvuk i multimedija</i>. Ponekad je potrebno i da „$KDEDIR/bin/artswrapper“ ima <b>set suid</b> (chmod +s).</p><p>Može biti da je reprodukcija dobra i bez povećanja prioriteta artsd-a.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>artsd ne radi sa <b>prioritetom u realnom vremenu</b> što može dovesti do preskoka i zastoja u reprodukciji zvuka.<p></p><p>Za korišćenje prioriteta u realnom vremenu, otvorite Kontrolni centar KDE-a i uključite „Pokreni sa najvišim prioritetom“, pod <i>Zvučni sistem</i>, u grani <i>Zvuk i multimedija</i>. Ponekad je potrebno i da „$TDEDIR/bin/artswrapper“ ima <b>set suid</b> (chmod +s).</p><p>Može biti da je reprodukcija dobra i bez povećanja prioriteta artsd-a.</p>"
#~ msgid "aRts Problem"
#~ msgstr "Problem sa aRts-om"

@ -14015,8 +14015,8 @@ msgstr "அம"
#~ msgid "Filter here..."
#~ msgstr "உலி"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>ஆர இயஙகவி இத <b>நரதிி</b> இத ஒலிினணிடல \"skip\" மறி.<p><p>நரதிி பயனபடி,KDE கடயதிற மறயலபடச \"Run with highest possible priority\", <i>ஒலி </i>உளள <i> ஒலி & பலடம</i>கி. சிலர \"$KDEDIR/bin/artswrapper\" சரிக உளளத என ப <b>அமகவ</b> (chmod +s).</p><p>பினணிடல இலமல ஆரி உயர.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>ஆர இயஙகவி இத <b>நரதிி</b> இத ஒலிினணிடல \"skip\" மறி.<p><p>நரதிி பயனபடி,KDE கடயதிற மறயலபடச \"Run with highest possible priority\", <i>ஒலி </i>உளள <i> ஒலி & பலடம</i>கி. சிலர \"$TDEDIR/bin/artswrapper\" சரிக உளளத என ப <b>அமகவ</b> (chmod +s).</p><p>பினணிடல இலமல ஆரி உயர.</p>"
#~ msgid "aRts Problem"
#~ msgstr "aRts பிரசசன"

@ -14060,8 +14060,8 @@ msgstr "amaroK"
#~ msgid "Filter here..."
#~ msgstr "Дар ҳамин ҷо филтер кардан..."
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$KDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>Системаи овозии artsd бо <b>аввалияти вақти ҳозира</b> ба кор андохта нашудааст, ин метавонад ба яквақта ғоиби овоз дар вақти пурборкунии зиёди система оварад.<p><p>Барои дурусткунии ин ба Маркази идоракунии KDE гузаред ва \"Ба кор даровардан бо зиёди имкони аввалиятӣ \" гирён кунед, дар замимаи <i>Системаи овоз</i> дар шохчаи <i>Овоз & Мултимедиа</i> мебошад. Инчунин ,боварӣ дошта бошед ки \"$KDEDIR/bin/artswrapper\" <b>дорад suid</b> (chmod +s).</p> <p>Мумкин ки ба кор андозӣ хуб буда ва бе тағйироти параметрҳо шавад.</p>"
#~ msgid "<p>artsd is not running with <b>realtime priority</b> which may cause audio playback to \"skip\" and stutter.<p><p>To use realtime priority, open the KDE Control Center and enable \"Run with highest possible priority\", under <i>Sound System</i> in the <i>Sound & Multimedia</i> branch. Some people may also have to check that \"$TDEDIR/bin/artswrapper\" is <b>set suid</b> (chmod +s).</p><p>You may find, however, that playback is fine without increasing the priority of artsd.</p>"
#~ msgstr "<p>Системаи овозии artsd бо <b>аввалияти вақти ҳозира</b> ба кор андохта нашудааст, ин метавонад ба яквақта ғоиби овоз дар вақти пурборкунии зиёди система оварад.<p><p>Барои дурусткунии ин ба Маркази идоракунии KDE гузаред ва \"Ба кор даровардан бо зиёди имкони аввалиятӣ \" гирён кунед, дар замимаи <i>Системаи овоз</i> дар шохчаи <i>Овоз & Мултимедиа</i> мебошад. Инчунин ,боварӣ дошта бошед ки \"$TDEDIR/bin/artswrapper\" <b>дорад suid</b> (chmod +s).</p> <p>Мумкин ки ба кор андозӣ хуб буда ва бе тағйироти параметрҳо шавад.</p>"
#~ msgid "aRts Problem"
#~ msgstr "Масъала бо aRts"

Loading…
Cancel
Save