Browse Source

Additional k => tde renaming and fixes

Slávek Banko 5 years ago
parent
commit
58131a7401
100 changed files with 2050 additions and 2050 deletions
  1. 1
    1
      admin
  2. 109
    109
      koffice-i18n-bg/acinclude.m4
  3. 3
    3
      koffice-i18n-bg/configure.in
  4. 3
    3
      koffice-i18n-bg/messages/koffice/desktop_koffice.po
  5. 31
    31
      koffice-i18n-bg/messages/koffice/kformdesigner.po
  6. 109
    109
      koffice-i18n-ca/acinclude.m4
  7. 3
    3
      koffice-i18n-ca/configure.in
  8. 11
    11
      koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook
  9. 2
    2
      koffice-i18n-ca/docs/koffice/chalk/installation.docbook
  10. 1
    1
      koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook
  11. 1
    1
      koffice-i18n-ca/docs/koffice/kchart/index.docbook
  12. 7
    7
      koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook
  13. 7
    7
      koffice-i18n-ca/docs/koffice/kspread/a11y.docbook
  14. 1
    1
      koffice-i18n-ca/docs/koffice/kugar/index.docbook
  15. 7
    7
      koffice-i18n-ca/docs/koffice/kword/a11y.docbook
  16. 1
    1
      koffice-i18n-ca/docs/koffice/kword/index.docbook
  17. 3
    3
      koffice-i18n-ca/messages/koffice/desktop_koffice.po
  18. 31
    31
      koffice-i18n-ca/messages/koffice/kformdesigner.po
  19. 109
    109
      koffice-i18n-cs/acinclude.m4
  20. 3
    3
      koffice-i18n-cs/configure.in
  21. 3
    3
      koffice-i18n-cs/messages/koffice/desktop_koffice.po
  22. 31
    31
      koffice-i18n-cs/messages/koffice/kformdesigner.po
  23. 109
    109
      koffice-i18n-cy/acinclude.m4
  24. 3
    3
      koffice-i18n-cy/configure.in
  25. 3
    3
      koffice-i18n-cy/messages/koffice/desktop_koffice.po
  26. 31
    31
      koffice-i18n-cy/messages/koffice/kformdesigner.po
  27. 109
    109
      koffice-i18n-da/acinclude.m4
  28. 3
    3
      koffice-i18n-da/configure.in
  29. 11
    11
      koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook
  30. 2
    2
      koffice-i18n-da/docs/koffice/chalk/installation.docbook
  31. 1
    1
      koffice-i18n-da/docs/koffice/chalk/tutorial-select-layer.docbook
  32. 1
    1
      koffice-i18n-da/docs/koffice/kchart/index.docbook
  33. 7
    7
      koffice-i18n-da/docs/koffice/kpresenter/a11y.docbook
  34. 1
    1
      koffice-i18n-da/docs/koffice/kpresenter/menus.docbook
  35. 7
    7
      koffice-i18n-da/docs/koffice/kspread/a11y.docbook
  36. 1
    1
      koffice-i18n-da/docs/koffice/kugar/index.docbook
  37. 7
    7
      koffice-i18n-da/docs/koffice/kword/a11y.docbook
  38. 1
    1
      koffice-i18n-da/docs/koffice/kword/index.docbook
  39. 3
    3
      koffice-i18n-da/messages/koffice/desktop_koffice.po
  40. 31
    31
      koffice-i18n-da/messages/koffice/kformdesigner.po
  41. 109
    109
      koffice-i18n-de/acinclude.m4
  42. 3
    3
      koffice-i18n-de/configure.in
  43. 11
    11
      koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook
  44. 1
    1
      koffice-i18n-de/docs/koffice/chalk/faq.docbook
  45. 2
    2
      koffice-i18n-de/docs/koffice/chalk/installation.docbook
  46. 1
    1
      koffice-i18n-de/docs/koffice/chalk/introduction.docbook
  47. 1
    1
      koffice-i18n-de/docs/koffice/chalk/tutorial-select-layer.docbook
  48. 1
    1
      koffice-i18n-de/docs/koffice/kchart/index.docbook
  49. 7
    7
      koffice-i18n-de/docs/koffice/kpresenter/a11y.docbook
  50. 7
    7
      koffice-i18n-de/docs/koffice/kspread/a11y.docbook
  51. 1
    1
      koffice-i18n-de/docs/koffice/kugar/index.docbook
  52. 7
    7
      koffice-i18n-de/docs/koffice/kword/a11y.docbook
  53. 1
    1
      koffice-i18n-de/docs/koffice/kword/index.docbook
  54. 3
    3
      koffice-i18n-de/messages/koffice/desktop_koffice.po
  55. 31
    31
      koffice-i18n-de/messages/koffice/kformdesigner.po
  56. 109
    109
      koffice-i18n-el/acinclude.m4
  57. 3
    3
      koffice-i18n-el/configure.in
  58. 3
    3
      koffice-i18n-el/messages/koffice/desktop_koffice.po
  59. 31
    31
      koffice-i18n-el/messages/koffice/kformdesigner.po
  60. 109
    109
      koffice-i18n-en_GB/acinclude.m4
  61. 3
    3
      koffice-i18n-en_GB/configure.in
  62. 3
    3
      koffice-i18n-en_GB/messages/koffice/desktop_koffice.po
  63. 31
    31
      koffice-i18n-en_GB/messages/koffice/kformdesigner.po
  64. 109
    109
      koffice-i18n-es/acinclude.m4
  65. 3
    3
      koffice-i18n-es/configure.in
  66. 2
    2
      koffice-i18n-es/docs/koffice/chalk/installation.docbook
  67. 1
    1
      koffice-i18n-es/docs/koffice/chalk/tutorial-select-layer.docbook
  68. 1
    1
      koffice-i18n-es/docs/koffice/kchart/index.docbook
  69. 7
    7
      koffice-i18n-es/docs/koffice/kpresenter/a11y.docbook
  70. 7
    7
      koffice-i18n-es/docs/koffice/kspread/a11y.docbook
  71. 1
    1
      koffice-i18n-es/docs/koffice/kugar/index.docbook
  72. 7
    7
      koffice-i18n-es/docs/koffice/kword/a11y.docbook
  73. 1
    1
      koffice-i18n-es/docs/koffice/kword/index.docbook
  74. 3
    3
      koffice-i18n-es/messages/koffice/desktop_koffice.po
  75. 31
    31
      koffice-i18n-es/messages/koffice/kformdesigner.po
  76. 109
    109
      koffice-i18n-et/acinclude.m4
  77. 3
    3
      koffice-i18n-et/configure.in
  78. 11
    11
      koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
  79. 2
    2
      koffice-i18n-et/docs/koffice/chalk/installation.docbook
  80. 1
    1
      koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook
  81. 1
    1
      koffice-i18n-et/docs/koffice/kchart/index.docbook
  82. 7
    7
      koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook
  83. 7
    7
      koffice-i18n-et/docs/koffice/kspread/a11y.docbook
  84. 1
    1
      koffice-i18n-et/docs/koffice/kugar/index.docbook
  85. 7
    7
      koffice-i18n-et/docs/koffice/kword/a11y.docbook
  86. 1
    1
      koffice-i18n-et/docs/koffice/kword/index.docbook
  87. 3
    3
      koffice-i18n-et/messages/koffice/desktop_koffice.po
  88. 31
    31
      koffice-i18n-et/messages/koffice/kformdesigner.po
  89. 109
    109
      koffice-i18n-eu/acinclude.m4
  90. 3
    3
      koffice-i18n-eu/configure.in
  91. 3
    3
      koffice-i18n-eu/messages/koffice/desktop_koffice.po
  92. 31
    31
      koffice-i18n-eu/messages/koffice/kformdesigner.po
  93. 109
    109
      koffice-i18n-fa/acinclude.m4
  94. 3
    3
      koffice-i18n-fa/configure.in
  95. 3
    3
      koffice-i18n-fa/messages/koffice/desktop_koffice.po
  96. 31
    31
      koffice-i18n-fa/messages/koffice/kformdesigner.po
  97. 109
    109
      koffice-i18n-fi/acinclude.m4
  98. 3
    3
      koffice-i18n-fi/configure.in
  99. 3
    3
      koffice-i18n-fi/messages/koffice/desktop_koffice.po
  100. 0
    0
      koffice-i18n-fi/messages/koffice/kformdesigner.po

+ 1
- 1
admin

@@ -1 +1 @@
1
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
1
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

+ 109
- 109
koffice-i18n-bg/acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
374
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420 1420
     [  ac_qt_includes="$withval"/include
1421
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1421
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
1424 1424
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1462
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464 1464
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
1644 1644
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1645 1645
 if test "$kde_cv_uic_plugins" != yes; then
1646 1646
 	AC_MSG_ERROR([
1647
-you need to install kdelibs first.
1647
+you need to install tdelibs first.
1648 1648
 
1649
-If you did install kdelibs, then the Qt version that is picked up by
1650
-this configure is not the same version you used to compile kdelibs. 
1651
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1649
+If you did install tdelibs, then the Qt version that is picked up by
1650
+this configure is not the same version you used to compile tdelibs. 
1651
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1652 1652
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1653 1653
 configuration settings.
1654 1654
 ])
@@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
1785 1785
 
1786 1786
 if test "$kde_qtver" = 1; then
1787 1787
   kde_check_header="ksock.h"
1788
-  kde_check_lib="libkdecore.la"
1788
+  kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791 1791
   kde_check_lib="libtdeio.la"
@@ -1793,8 +1793,8 @@ fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-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/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1796
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1808
+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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
1824 1824
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827
-by kdelibs])
1827
+by tdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
1839 1839
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1840 1840
 fi
1841 1841
 
1842
-else dnl test -z $1, e.g. from kdelibs
1842
+else dnl test -z $1, e.g. from tdelibs
1843 1843
 
1844 1844
   ac_cv_have_kde="have_kde=no"
1845 1845
 
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032 2032
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2033
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2033
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
2036 2036
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2073
-   AC_SUBST(LIB_KIO, "-ltdeio")
2071
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077 2077
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
2078 2078
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2079
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2086
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2089
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2090 2090
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2094
-   AC_SUBST(LIB_KIO, "-ltdeio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2092
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2095
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097 2097
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2100
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2106
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107
-   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
2108
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])
2111 2111
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2170 2170
 else
2171 2171
   case "$1" in
2172 2172
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2173
-		kde_cv_proto_$1="yes - in libkdefakes"
2173
+		kde_cv_proto_$1="yes - in libtdefakes"
2174 2174
 		;;
2175 2175
 	*)
2176 2176
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3502 3502
     AC_ARG_ENABLE(libsuffix,
3503 3503
         AC_HELP_STRING([--enable-libsuffix],
3504 3504
             [/lib directory suffix (64,32,none,auto[=default])]),
3505
-            kdelibsuff=$enableval, kdelibsuff="auto")
3505
+            tdelibsuff=$enableval, tdelibsuff="auto")
3506 3506
     
3507
-    if test "$kdelibsuff" = "auto"; then
3507
+    if test "$tdelibsuff" = "auto"; then
3508 3508
     
3509 3509
 cat > conftest.c << EOF
3510 3510
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
3512 3512
  return 0;
3513 3513
 }
3514 3514
 EOF
3515
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3515
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3516 3516
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3517 3517
     p 
3518 3518
 }'`
3519 3519
 	rm -rf conftest.*
3520 3520
     fi	
3521 3521
 	
3522
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3523
-       kdelibsuff=
3522
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3523
+       tdelibsuff=
3524 3524
     fi
3525
-    if test -z "$kdelibsuff"; then
3525
+    if test -z "$tdelibsuff"; then
3526 3526
         AC_MSG_RESULT([not using lib directory suffix])
3527 3527
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3528 3528
     else
3529 3529
         if test "$libdir" = '${exec_prefix}/lib'; then
3530
-            libdir="$libdir${kdelibsuff}"
3530
+            libdir="$libdir${tdelibsuff}"
3531 3531
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3532 3532
         fi
3533
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3534
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3533
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3534
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3535 3535
     fi
3536 3536
 ])
3537 3537
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
3549 3549
 AC_ARG_PROGRAM
3550 3550
 AM_INIT_AUTOMAKE($1, $2)
3551 3551
 AM_DISABLE_LIBRARIES
3552
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3552
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3553 3553
 AC_CHECK_COMPILERS
3554 3554
 KDE_PROG_LIBTOOL
3555 3555
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi
4556 4556
 
4557 4557
 PYTHONINC=-I$python_incdir
4558 4558
 
4559
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4559
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4560 4560
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4561 4561
 if test ! -r $python_libdir/libpython$version.so; then
4562 4562
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
4946 4946
   AC_SUBST(CONF_FILES)
4947 4947
 ])dnl
4948 4948
 
4949
-dnl This sets the prefix, for arts and kdelibs
4949
+dnl This sets the prefix, for arts and tdelibs
4950 4950
 dnl Do NOT use in any other module.
4951
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4951
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4952 4952
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4953 4953
 [
4954 4954
   unset CDPATH
4955
-  dnl make $KDEDIR the default for the installation
4956
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4955
+  dnl make $TDEDIR the default for the installation
4956
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4957 4957
 
4958 4958
   if test "x$prefix" = "xNONE"; then
4959 4959
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
4977 4977
   unset CDPATH
4978 4978
   dnl We can't give real code to that macro, only a value.
4979 4979
   dnl It only matters for --help, since we set the prefix in this function anyway.
4980
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4980
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4981 4981
 
4982 4982
   KDE_SET_DEFAULT_BINDIRS
4983 4983
   if test "x$prefix" = "xNONE"; then
4984
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
4985
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4984
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
4985
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4986 4986
   else
4987
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
4987
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
4988 4988
     kde_save_PATH="$PATH"
4989 4989
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
4990
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4990
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4991 4991
     PATH="$kde_save_PATH"
4992 4992
   fi
4993 4993
 
4994 4994
   kde_libs_prefix=`$KDECONFIG --prefix`
4995 4995
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
4996
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
4996
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
4997 4997
                     This means it has been moved since you installed it.
4998
-                    This won't work. Please recompile kdelibs for the new prefix.
4998
+                    This won't work. Please recompile tdelibs for the new prefix.
4999 4999
                     ])
5000 5000
   fi
5001 5001
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
5003 5003
   AC_MSG_CHECKING([where to install])
5004 5004
   if test "x$prefix" = "xNONE"; then
5005 5005
     prefix=$kde_libs_prefix
5006
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
5006
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
5007 5007
   else
5008 5008
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
5009 5009
     given_prefix=$prefix
@@ -5661,7 +5661,7 @@ ssl_includes=""
5661 5661
 AC_ARG_WITH(ssl-dir,
5662 5662
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5663 5663
     [  ac_ssl_includes="$withval"/include
5664
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5664
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5665 5665
     ])
5666 5666
 
5667 5667
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5681 5681
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5682 5682
   ac_ssl_includes="$ssl_incdir"
5683 5683
 
5684
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
5684
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
5685 5685
   if test ! "$ac_ssl_libraries" = "NO"; then
5686 5686
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5687 5687
   fi
@@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5918 5918
 dnl also defines KSTUFF_PKG_ERRORS on error
5919 5919
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5920 5920
 
5921
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5921
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5922 5922
    if test "$prefix" != "$kde_libs_prefix"; then
5923
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5923
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5924 5924
    fi
5925 5925
    export PKG_CONFIG_PATH
5926 5926
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

+ 3
- 3
koffice-i18n-bg/configure.in View File

@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
3 3
 dnl =======================================================
4 4
 
5 5
 AC_INIT(messages/Makefile.am)
6
-AM_INIT_AUTOMAKE(kde-i18n-bg, "3.5.7")
6
+AM_INIT_AUTOMAKE(koffice-i18n-bg, "3.5.7")
7 7
 AM_CONFIG_HEADER(config.h)
8 8
 AC_SUBST(AUTODIRS)
9 9
 AM_KDE_WITH_NLS
@@ -23,13 +23,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
23 23
   # And if so, warn when they don't match
24 24
   if test "$kde_libs_prefix" != "$given_prefix"; then
25 25
     # And if kde doesn't know about the prefix yet
26
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
26
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
27 27
     if test $? -ne 0; then
28 28
       echo ""
29 29
       echo "Warning: you chose to install this package in $given_prefix,"
30 30
       echo "but KDE was found in $kde_libs_prefix."
31 31
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
32
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
32
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
33 33
       echo "Then restart KDE."
34 34
       echo ""
35 35
     fi

+ 3
- 3
koffice-i18n-bg/messages/koffice/desktop_koffice.po View File

@@ -576,7 +576,7 @@ msgstr "Name=Контейнери"
576 576
 msgid "Name=Basic Widgets"
577 577
 msgstr "Name=Основни графични обекти"
578 578
 
579
-#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3
579
+#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3
580 580
 msgid "Name=Form Designer KDevelop Plugin"
581 581
 msgstr "Name=Приставка на KDevelop за проектиране на форми"
582 582
 
@@ -1899,11 +1899,11 @@ msgstr "Name=Компонент за текстообработка в KOffice"
1899 1899
 msgid "GenericName=Text Documents"
1900 1900
 msgstr "GenericName=Текстови документи"
1901 1901
 
1902
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6
1902
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6
1903 1903
 msgid "Name=KDE Addressbook Plugin"
1904 1904
 msgstr "Name=Приставка за адресника на KDE"
1905 1905
 
1906
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55
1906
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55
1907 1907
 msgid ""
1908 1908
 "Comment=This datasource type lets you use your KDE Address Book entries."
1909 1909
 msgstr ""

+ 31
- 31
koffice-i18n-bg/messages/koffice/kformdesigner.po View File

@@ -26,36 +26,36 @@ msgstr "KFormDesigner"
26 26
 msgid "Document to open"
27 27
 msgstr "Документ за отваряне"
28 28
 
29
-#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
29
+#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
30 30
 msgid "Form Designer Part"
31 31
 msgstr "Част за проектиране на форми"
32 32
 
33
-#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
33
+#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
34 34
 msgid "Objects"
35 35
 msgstr "Обекти"
36 36
 
37
-#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
37
+#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
38 38
 msgid "Clear Widget Contents"
39 39
 msgstr "Изчистване съдържанието на управляващ елемент"
40 40
 
41
-#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
41
+#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
42 42
 msgid "Delete Widget"
43 43
 msgstr "Изтриване на графичен елемент"
44 44
 
45
-#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
45
+#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
46 46
 msgid "Preview Form"
47 47
 msgstr "Форма за преглед"
48 48
 
49
-#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
49
+#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
50 50
 #: test/kfd_part.cpp:218
51 51
 msgid "Edit Tab Order"
52 52
 msgstr "Редактиране на реда на страниците"
53 53
 
54
-#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
54
+#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
55 55
 msgid "Edit Pixmap Collection"
56 56
 msgstr "Редактиране на колекция с пикселни карти"
57 57
 
58
-#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216
58
+#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216
59 59
 #: test/kfd_part.cpp:220
60 60
 msgid "Edit Form Connections"
61 61
 msgstr "Редактиране на колекция с форми"
@@ -96,75 +96,75 @@ msgstr "Вер&тикално в разделител"
96 96
 msgid "&Ungroup Widgets"
97 97
 msgstr "&Разгрупиране на управляващи елементи"
98 98
 
99
-#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
99
+#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
100 100
 msgid "Bring Widget to Front"
101 101
 msgstr "Преместване на преден план"
102 102
 
103
-#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
103
+#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
104 104
 msgid "Send Widget to Back"
105 105
 msgstr "Преместване на заден план"
106 106
 
107
-#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
107
+#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
108 108
 msgid "Align Widgets' Positions"
109 109
 msgstr "Подравняване позицията на графичните елементи"
110 110
 
111
-#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
111
+#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
112 112
 msgid "To Left"
113 113
 msgstr "В ляво"
114 114
 
115
-#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
115
+#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
116 116
 msgid "To Right"
117 117
 msgstr "В дясно"
118 118
 
119
-#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
119
+#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
120 120
 msgid "To Top"
121 121
 msgstr "Горе"
122 122
 
123
-#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
123
+#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
124 124
 msgid "To Bottom"
125 125
 msgstr "Долу"
126 126
 
127
-#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235
127
+#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235
128 128
 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252
129 129
 msgid "To Grid"
130 130
 msgstr "Спрямо мрежата"
131 131
 
132
-#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
132
+#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
133 133
 msgid "Adjust Widgets' Sizes"
134 134
 msgstr "Регулиране размера на графичните елементи"
135 135
 
136
-#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
136
+#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
137 137
 msgid "To Fit"
138 138
 msgstr "Оптимален размер"
139 139
 
140
-#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
140
+#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
141 141
 msgid "To Shortest"
142 142
 msgstr "Спрямо най-късия"
143 143
 
144
-#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
144
+#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
145 145
 msgid "To Tallest"
146 146
 msgstr "Спрямо най-високия"
147 147
 
148
-#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
148
+#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
149 149
 msgid "To Narrowest"
150 150
 msgstr "Спрямо най-ниския"
151 151
 
152
-#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
152
+#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
153 153
 msgid "To Widest"
154 154
 msgstr "Спрямо най-широкия"
155 155
 
156 156
 #: factories/stdwidgetfactory.cpp:111 form.cpp:134
157
-#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
157
+#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
158 158
 msgid "Form"
159 159
 msgstr "Форма"
160 160
 
161
-#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279
162
-#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
161
+#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279
162
+#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
163 163
 #: test/kfd_part.cpp:334
164 164
 msgid "*.ui|Qt Designer UI Files"
165 165
 msgstr "*.ui|Qt Designer UI Files"
166 166
 
167
-#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
167
+#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
168 168
 msgid ""
169 169
 "The form \"%1\" has been modified.\n"
170 170
 "Do you want to save your changes or discard them?"
@@ -172,7 +172,7 @@ msgstr ""
172 172
 "Форма \"%1\" е променена.\n"
173 173
 "Искате ли промените да бъдат записани?"
174 174
 
175
-#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
175
+#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
176 176
 msgid "Close Form"
177 177
 msgstr "Затваряне на форма"
178 178
 
@@ -1132,19 +1132,19 @@ msgstr "Нов елемент"
1132 1132
 msgid "Sub Item"
1133 1133
 msgstr "Под елемент"
1134 1134
 
1135
-#: kdevelop_plugin/kfd_kdev_part.cpp:218
1135
+#: tdevelop_plugin/kfd_kdev_part.cpp:218
1136 1136
 msgid "Lay Out Widgets &Horizontally"
1137 1137
 msgstr "&Хоризонтално подравняване"
1138 1138
 
1139
-#: kdevelop_plugin/kfd_kdev_part.cpp:219
1139
+#: tdevelop_plugin/kfd_kdev_part.cpp:219
1140 1140
 msgid "Lay Out Widgets &Vertically"
1141 1141
 msgstr "&Вертикално подравняване"
1142 1142
 
1143
-#: kdevelop_plugin/kfd_kdev_part.cpp:220
1143
+#: tdevelop_plugin/kfd_kdev_part.cpp:220
1144 1144
 msgid "Lay Out Widgets in &Grid"
1145 1145
 msgstr "Подравняване &спрямо мрежата"
1146 1146
 
1147
-#: kdevelop_plugin/kfd_kdev_part.cpp:221
1147
+#: tdevelop_plugin/kfd_kdev_part.cpp:221
1148 1148
 msgid "&Break Layout"
1149 1149
 msgstr "&Прекъсване на подредба"
1150 1150
 

+ 109
- 109
koffice-i18n-ca/acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
374
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420 1420
     [  ac_qt_includes="$withval"/include
1421
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1421
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
1424 1424
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1462
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464 1464
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
1644 1644
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1645 1645
 if test "$kde_cv_uic_plugins" != yes; then
1646 1646
 	AC_MSG_ERROR([
1647
-you need to install kdelibs first.
1647
+you need to install tdelibs first.
1648 1648
 
1649
-If you did install kdelibs, then the Qt version that is picked up by
1650
-this configure is not the same version you used to compile kdelibs. 
1651
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1649
+If you did install tdelibs, then the Qt version that is picked up by
1650
+this configure is not the same version you used to compile tdelibs. 
1651
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1652 1652
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1653 1653
 configuration settings.
1654 1654
 ])
@@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
1785 1785
 
1786 1786
 if test "$kde_qtver" = 1; then
1787 1787
   kde_check_header="ksock.h"
1788
-  kde_check_lib="libkdecore.la"
1788
+  kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791 1791
   kde_check_lib="libtdeio.la"
@@ -1793,8 +1793,8 @@ fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-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/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1796
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1808
+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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
1824 1824
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827
-by kdelibs])
1827
+by tdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
1839 1839
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1840 1840
 fi
1841 1841
 
1842
-else dnl test -z $1, e.g. from kdelibs
1842
+else dnl test -z $1, e.g. from tdelibs
1843 1843
 
1844 1844
   ac_cv_have_kde="have_kde=no"
1845 1845
 
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032 2032
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2033
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2033
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
2036 2036
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2073
-   AC_SUBST(LIB_KIO, "-ltdeio")
2071
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077 2077
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
2078 2078
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2079
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2086
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2089
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2090 2090
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2094
-   AC_SUBST(LIB_KIO, "-ltdeio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2092
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2095
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097 2097
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2100
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2106
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107
-   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
2108
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])
2111 2111
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2170 2170
 else
2171 2171
   case "$1" in
2172 2172
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2173
-		kde_cv_proto_$1="yes - in libkdefakes"
2173
+		kde_cv_proto_$1="yes - in libtdefakes"
2174 2174
 		;;
2175 2175
 	*)
2176 2176
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3502 3502
     AC_ARG_ENABLE(libsuffix,
3503 3503
         AC_HELP_STRING([--enable-libsuffix],
3504 3504
             [/lib directory suffix (64,32,none,auto[=default])]),
3505
-            kdelibsuff=$enableval, kdelibsuff="auto")
3505
+            tdelibsuff=$enableval, tdelibsuff="auto")
3506 3506
     
3507
-    if test "$kdelibsuff" = "auto"; then
3507
+    if test "$tdelibsuff" = "auto"; then
3508 3508
     
3509 3509
 cat > conftest.c << EOF
3510 3510
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
3512 3512
  return 0;
3513 3513
 }
3514 3514
 EOF
3515
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3515
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3516 3516
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3517 3517
     p 
3518 3518
 }'`
3519 3519
 	rm -rf conftest.*
3520 3520
     fi	
3521 3521
 	
3522
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3523
-       kdelibsuff=
3522
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3523
+       tdelibsuff=
3524 3524
     fi
3525
-    if test -z "$kdelibsuff"; then
3525
+    if test -z "$tdelibsuff"; then
3526 3526
         AC_MSG_RESULT([not using lib directory suffix])
3527 3527
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3528 3528
     else
3529 3529
         if test "$libdir" = '${exec_prefix}/lib'; then
3530
-            libdir="$libdir${kdelibsuff}"
3530
+            libdir="$libdir${tdelibsuff}"
3531 3531
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3532 3532
         fi
3533
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3534
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3533
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3534
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3535 3535
     fi
3536 3536
 ])
3537 3537
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
3549 3549
 AC_ARG_PROGRAM
3550 3550
 AM_INIT_AUTOMAKE($1, $2)
3551 3551
 AM_DISABLE_LIBRARIES
3552
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3552
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3553 3553
 AC_CHECK_COMPILERS
3554 3554
 KDE_PROG_LIBTOOL
3555 3555
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi
4556 4556
 
4557 4557
 PYTHONINC=-I$python_incdir
4558 4558
 
4559
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4559
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4560 4560
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4561 4561
 if test ! -r $python_libdir/libpython$version.so; then
4562 4562
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
4946 4946
   AC_SUBST(CONF_FILES)
4947 4947
 ])dnl
4948 4948
 
4949
-dnl This sets the prefix, for arts and kdelibs
4949
+dnl This sets the prefix, for arts and tdelibs
4950 4950
 dnl Do NOT use in any other module.
4951
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4951
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4952 4952
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4953 4953
 [
4954 4954
   unset CDPATH
4955
-  dnl make $KDEDIR the default for the installation
4956
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4955
+  dnl make $TDEDIR the default for the installation
4956
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4957 4957
 
4958 4958
   if test "x$prefix" = "xNONE"; then
4959 4959
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
4977 4977
   unset CDPATH
4978 4978
   dnl We can't give real code to that macro, only a value.
4979 4979
   dnl It only matters for --help, since we set the prefix in this function anyway.
4980
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4980
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4981 4981
 
4982 4982
   KDE_SET_DEFAULT_BINDIRS
4983 4983
   if test "x$prefix" = "xNONE"; then
4984
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
4985
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4984
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
4985
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4986 4986
   else
4987
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
4987
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
4988 4988
     kde_save_PATH="$PATH"
4989 4989
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
4990
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4990
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4991 4991
     PATH="$kde_save_PATH"
4992 4992
   fi
4993 4993
 
4994 4994
   kde_libs_prefix=`$KDECONFIG --prefix`
4995 4995
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
4996
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
4996
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
4997 4997
                     This means it has been moved since you installed it.
4998
-                    This won't work. Please recompile kdelibs for the new prefix.
4998
+                    This won't work. Please recompile tdelibs for the new prefix.
4999 4999
                     ])
5000 5000
   fi
5001 5001
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
5003 5003
   AC_MSG_CHECKING([where to install])
5004 5004
   if test "x$prefix" = "xNONE"; then
5005 5005
     prefix=$kde_libs_prefix
5006
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
5006
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
5007 5007
   else
5008 5008
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
5009 5009
     given_prefix=$prefix
@@ -5661,7 +5661,7 @@ ssl_includes=""
5661 5661
 AC_ARG_WITH(ssl-dir,
5662 5662
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5663 5663
     [  ac_ssl_includes="$withval"/include
5664
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5664
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5665 5665
     ])
5666 5666
 
5667 5667
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5681 5681
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5682 5682
   ac_ssl_includes="$ssl_incdir"
5683 5683
 
5684
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
5684
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
5685 5685
   if test ! "$ac_ssl_libraries" = "NO"; then
5686 5686
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5687 5687
   fi
@@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5918 5918
 dnl also defines KSTUFF_PKG_ERRORS on error
5919 5919
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5920 5920
 
5921
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5921
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5922 5922
    if test "$prefix" != "$kde_libs_prefix"; then
5923
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5923
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5924 5924
    fi
5925 5925
    export PKG_CONFIG_PATH
5926 5926
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

+ 3
- 3
koffice-i18n-ca/configure.in View File

@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
3 3
 dnl =======================================================
4 4
 
5 5
 AC_INIT(messages/Makefile.am)
6
-AM_INIT_AUTOMAKE(kde-i18n-ca, "3.5.7")
6
+AM_INIT_AUTOMAKE(koffice-i18n-ca, "3.5.7")
7 7
 AM_CONFIG_HEADER(config.h)
8 8
 AC_SUBST(AUTODIRS)
9 9
 AM_KDE_WITH_NLS
@@ -41,13 +41,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
41 41
   # And if so, warn when they don't match
42 42
   if test "$kde_libs_prefix" != "$given_prefix"; then
43 43
     # And if kde doesn't know about the prefix yet
44
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
44
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
45 45
     if test $? -ne 0; then
46 46
       echo ""
47 47
       echo "Warning: you chose to install this package in $given_prefix,"
48 48
       echo "but KDE was found in $kde_libs_prefix."
49 49
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
50
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
50
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
51 51
       echo "Then restart KDE."
52 52
       echo ""
53 53
     fi

+ 11
- 11
koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook View File

@@ -246,8 +246,8 @@ Icon=
246 246
 Name=User-visible Name
247 247
 ServiceTypes=Chalk/Filter
248 248
 Type=Service
249
-X-KDE-Library=chalkLIBRARYNAME
250
-X-KDE-Version=2
249
+X-TDE-Library=chalkLIBRARYNAME
250
+X-TDE-Version=2
251 251
 </programlisting>
252 252
 </para
253 253
 ><para
@@ -412,7 +412,7 @@ ToolStar::~ToolStar()
412 412
 
413 413
 <para
414 414
 >El &chalk; 1.5 carrega els endollables amb <literal
415
->X-KDE-Version=2</literal
415
+>X-TDE-Version=2</literal
416 416
 > al fitxer <literal role="extension"
417 417
 >.desktop</literal
418 418
 >. Els endollables del &chalk; 1.6 seran probablement binàriament incompatibles amb els de l'1.5 i necessitaran la versió número 3. Els endollables del &chalk; 2.0 plugins necessitaran la versió número 3. Sí, això no és completament lògic. </para>
@@ -1407,10 +1407,10 @@ METASOURCES = AUTO
1407 1407
 >Importa: </para>
1408 1408
 
1409 1409
 <programlisting
1410
->X-KDE-Export=application/x-chalk
1411
-X-KDE-Import=image/x-xcf-gimp
1412
-X-KDE-Weight=1
1413
-X-KDE-Library=libchalkXXXimport
1410
+>X-TDE-Export=application/x-chalk
1411
+X-TDE-Import=image/x-xcf-gimp
1412
+X-TDE-Weight=1
1413
+X-TDE-Library=libchalkXXXimport
1414 1414
 ServiceTypes=KOfficeFilter
1415 1415
 </programlisting>
1416 1416
 
@@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter
1418 1418
 >Exporta: </para>
1419 1419
 
1420 1420
 <programlisting
1421
->X-KDE-Export=image/x-xcf-gimp
1422
-X-KDE-Import=application/x-chalk
1421
+>X-TDE-Export=image/x-xcf-gimp
1422
+X-TDE-Import=application/x-chalk
1423 1423
 ServiceTypes=KOfficeFilter
1424 1424
 Type=Service
1425
-X-KDE-Weight=1
1426
-X-KDE-Library=libchalkXXXexport
1425
+X-TDE-Weight=1
1426
+X-TDE-Library=libchalkXXXexport
1427 1427
 </programlisting>
1428 1428
 
1429 1429
 <para

+ 2
- 2
koffice-i18n-ca/docs/koffice/chalk/installation.docbook View File

@@ -13,8 +13,8 @@
13 13
 
14 14
 <!--
15 15
 List any special requirements for your application here. This should include:
16
-.Libraries or other software that is not included in kdesupport,
17
-kdelibs, or kdebase.
16
+.Libraries or other software that is not included in tdesupport,
17
+tdelibs, or tdebase.
18 18
 .Hardware requirements like amount of RAM, disk space, graphics card
19 19
 capabilities, screen resolution, special expansion cards, etc.
20 20
 .Operating systems the app will run on. If your app is designed only for a

+ 1
- 1
koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook View File

@@ -24,7 +24,7 @@
24 24
 <para
25 25
 >La imatge de dalt és la imatge amb la qual treballarem. Inicieu el chalk amb aquesta imatge (a la carpeta de documentació <filename
26 26
 >$<envar
27
->KDEDIR</envar
27
+>TDEDIR</envar
28 28
 >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename
29 29
 >) i deseu-la a la vostra carpeta d'inici (escollint <guilabel
30 30
 >Desa imatge com a...</guilabel

+ 1
- 1
koffice-i18n-ca/docs/koffice/kchart/index.docbook View File

@@ -64,7 +64,7 @@
64 64
 <keyword
65 65
 >KDE</keyword>
66 66
 <keyword
67
->kdeutils</keyword>
67
+>tdeutils</keyword>
68 68
 <keyword
69 69
 >Kchart</keyword>
70 70
 <keyword

+ 7
- 7
koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook View File

@@ -21,21 +21,21 @@
21 21
 <sect1 id="a11y-install">
22 22
 <title
23 23
 >Instal·lar el mòdul <command
24
->kdeaccessibility</command
24
+>tdeaccessibility</command
25 25
 ></title>
26 26
 <indexterm
27 27
 ><primary
28
->kdeaccessibility</primary
28
+>tdeaccessibility</primary
29 29
 ></indexterm>
30 30
 <para
31 31
 >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command
32
->kdeaccessibility</command
32
+>tdeaccessibility</command
33 33
 >. El mòdul <command
34
->kdeaccessibility</command
34
+>tdeaccessibility</command
35 35
 > forma part del projecte &kde; <ulink url="http://www.kde.org"
36 36
 >http://www.kde.org</ulink
37 37
 >. El paquet <command
38
->kdeaccessibility</command
38
+>tdeaccessibility</command
39 39
 > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para>
40 40
 
41 41
 <para
@@ -118,7 +118,7 @@
118 118
 ></indexterm>
119 119
 <para
120 120
 >El mòdul <command
121
->kdeaccessibility</command
121
+>tdeaccessibility</command
122 122
 > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag"
123 123
 >&kmagnifier;</ulink
124 124
 >. Si està instal·lada, la podeu fer funcionar des de <menuchoice
@@ -147,7 +147,7 @@
147 147
 ></indexterm>
148 148
 <para
149 149
 >El mòdul <command
150
->kdeaccessibility</command
150
+>tdeaccessibility</command
151 151
 > inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kpresenter; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el <ulink url="help:kttsd"
152 152
 >Manual de KTTS</ulink
153 153
 >. Per activar la característica TTS en &kspread;, seleccioneu <menuchoice

+ 7
- 7
koffice-i18n-ca/docs/koffice/kspread/a11y.docbook View File

@@ -21,21 +21,21 @@
21 21
 <sect1 id="a11y-install">
22 22
 <title
23 23
 >Instal·lar el mòdul <command
24
->kdeaccessibility</command
24
+>tdeaccessibility</command
25 25
 ></title>
26 26
 <indexterm
27 27
 ><primary
28
->kdeaccessibility</primary
28
+>tdeaccessibility</primary
29 29
 ></indexterm>
30 30
 <para
31 31
 >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command
32
->kdeaccessibility</command
32
+>tdeaccessibility</command
33 33
 >. El mòdul <command
34
->kdeaccessibility</command
34
+>tdeaccessibility</command
35 35
 > forma part del projecte &kde; <ulink url="http://www.kde.org"
36 36
 >http://www.kde.org</ulink
37 37
 >. El paquet <command
38
->kdeaccessibility</command
38
+>tdeaccessibility</command
39 39
 > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para>
40 40
 
41 41
 <para
@@ -112,7 +112,7 @@
112 112
 ></indexterm>
113 113
 <para
114 114
 >El mòdul <command
115
->kdeaccessibility</command
115
+>tdeaccessibility</command
116 116
 > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag"
117 117
 >&kmagnifier;</ulink
118 118
 >. Si està instal·lada, la podeu fer funcionar des de <menuchoice
@@ -141,7 +141,7 @@
141 141
 ></indexterm>
142 142
 <para
143 143
 >El mòdul <command
144
->kdeaccessibility</command
144
+>tdeaccessibility</command
145 145
 > inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kspread; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el <ulink url="help:kttsd"
146 146
 >Manual de KTTS</ulink
147 147
 >. Per activar la característica TTS en &kspread;, seleccioneu <menuchoice

+ 1
- 1
koffice-i18n-ca/docs/koffice/kugar/index.docbook View File

@@ -98,7 +98,7 @@
98 98
 <keyword
99 99
 >KDE</keyword>
100 100
 <keyword
101
->kdeutils</keyword>
101
+>tdeutils</keyword>
102 102
 <keyword
103 103
 >kugar</keyword>
104 104
 <keyword

+ 7
- 7
koffice-i18n-ca/docs/koffice/kword/a11y.docbook View File

@@ -21,21 +21,21 @@
21 21
 <sect1 id="a11y-install">
22 22
 <title
23 23
 >Instal·lar el mòdul <command
24
->kdeaccessibility</command
24
+>tdeaccessibility</command
25 25
 ></title>
26 26
 <indexterm
27 27
 ><primary
28
->kdeaccessibility</primary
28
+>tdeaccessibility</primary
29 29
 ></indexterm>
30 30
 <para
31 31
 >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command
32
->kdeaccessibility</command
32
+>tdeaccessibility</command
33 33
 >. El mòdul <command
34
->kdeaccessibility</command
34
+>tdeaccessibility</command
35 35
 > forma part del projecte &kde; <ulink url="http://www.kde.org"
36 36
 >http://www.kde.org</ulink
37 37
 >. El paquet <command
38
->kdeaccessibility</command
38
+>tdeaccessibility</command
39 39
 > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para>
40 40
 
41 41
 <para
@@ -112,7 +112,7 @@
112 112
 ></indexterm>
113 113
 <para
114 114
 >El mòdul <command
115
->kdeaccessibility</command
115
+>tdeaccessibility</command
116 116
 > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag"
117 117
 >&kmagnifier;</ulink
118 118
 >. Si està instal·lada, la podeu fer funcionar des de <menuchoice
@@ -141,7 +141,7 @@
141 141
 ></indexterm>
142 142
 <para
143 143
 >El mòdul <command
144
->kdeaccessibility</command
144
+>tdeaccessibility</command
145 145
 > inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kword; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el <ulink url="help:kttsd"
146 146
 >Manual de KTTS</ulink
147 147
 >. Per activar la característica TTS en &kword;, seleccioneu <menuchoice

+ 1
- 1
koffice-i18n-ca/docs/koffice/kword/index.docbook View File

@@ -1494,7 +1494,7 @@
1494 1494
 
1495 1495
 <listitem>
1496 1496
 <para
1497
->Les biblioteques de &kde; 3.3.0 (kdelibs) i el paquet base de &kde; 3.3.0 (kdebase). Es poden obtenir des de la <ulink url="http://www.kde.org"
1497
+>Les biblioteques de &kde; 3.3.0 (tdelibs) i el paquet base de &kde; 3.3.0 (tdebase). Es poden obtenir des de la <ulink url="http://www.kde.org"
1498 1498
 >pàgina web de &kde;</ulink
1499 1499
 >.</para>
1500 1500
 <tip

+ 3
- 3
koffice-i18n-ca/messages/koffice/desktop_koffice.po View File

@@ -579,7 +579,7 @@ msgstr "Name=Estris contenidors"
579 579
 msgid "Name=Basic Widgets"
580 580
 msgstr "Name=Estris estàndard"
581 581
 
582
-#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3
582
+#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3
583 583
 msgid "Name=Form Designer KDevelop Plugin"
584 584
 msgstr "Name=Endollat de disseny de formulari de KDevelop"
585 585
 
@@ -1908,11 +1908,11 @@ msgstr "Name=Component de processament de text de KOffice"
1908 1908
 msgid "GenericName=Text Documents"
1909 1909
 msgstr "GenericName=Documents de text"
1910 1910
 
1911
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6
1911
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6
1912 1912
 msgid "Name=KDE Addressbook Plugin"
1913 1913
 msgstr "Name=Connector de llibreta d'adreces KDE"
1914 1914
 
1915
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55
1915
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55
1916 1916
 msgid ""
1917 1917
 "Comment=This datasource type lets you use your KDE Address Book entries."
1918 1918
 msgstr ""

+ 31
- 31
koffice-i18n-ca/messages/koffice/kformdesigner.po View File

@@ -24,36 +24,36 @@ msgstr "KFormDesigner"
24 24
 msgid "Document to open"
25 25
 msgstr "Document a obrir"
26 26
 
27
-#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
27
+#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
28 28
 msgid "Form Designer Part"
29 29
 msgstr "Part del dissenyador de formularis"
30 30
 
31
-#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
31
+#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158
32 32
 msgid "Objects"
33 33
 msgstr "Objectes"
34 34
 
35
-#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
35
+#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215
36 36
 msgid "Clear Widget Contents"
37 37
 msgstr "Esborra el  continguts dels estris"
38 38
 
39
-#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
39
+#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216
40 40
 msgid "Delete Widget"
41 41
 msgstr "Esborra estri"
42 42
 
43
-#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
43
+#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217
44 44
 msgid "Preview Form"
45 45
 msgstr "Previsualitza el formulari"
46 46
 
47
-#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
47
+#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41
48 48
 #: test/kfd_part.cpp:218
49 49
 msgid "Edit Tab Order"
50 50
 msgstr "Edita l'ordre de tabulació"
51 51
 
52
-#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
52
+#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219
53 53
 msgid "Edit Pixmap Collection"
54 54
 msgstr "Edita la col·lecció de mapes de píxels"
55 55
 
56
-#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216
56
+#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216
57 57
 #: test/kfd_part.cpp:220
58 58
 msgid "Edit Form Connections"
59 59
 msgstr "Edita les connexions de formulari"
@@ -94,75 +94,75 @@ msgstr "verticalment en &divisors"
94 94
 msgid "&Ungroup Widgets"
95 95
 msgstr "&desagrupa estris"
96 96
 
97
-#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
97
+#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240
98 98
 msgid "Bring Widget to Front"
99 99
 msgstr "Porta l'estri a davant"
100 100
 
101
-#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
101
+#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241
102 102
 msgid "Send Widget to Back"
103 103
 msgstr "Envia l'estri a darrera"
104 104
 
105
-#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
105
+#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243
106 106
 msgid "Align Widgets' Positions"
107 107
 msgstr "Alinia les posicions dels estris"
108 108
 
109
-#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
109
+#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244
110 110
 msgid "To Left"
111 111
 msgstr "A l'esquerra"
112 112
 
113
-#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
113
+#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245
114 114
 msgid "To Right"
115 115
 msgstr "A la dreta"
116 116
 
117
-#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
117
+#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246
118 118
 msgid "To Top"
119 119
 msgstr "A dalt"
120 120
 
121
-#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
121
+#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247
122 122
 msgid "To Bottom"
123 123
 msgstr "A baix"
124 124
 
125
-#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235
125
+#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235
126 126
 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252
127 127
 msgid "To Grid"
128 128
 msgstr "A la graella"
129 129
 
130
-#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
130
+#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250
131 131
 msgid "Adjust Widgets' Sizes"
132 132
 msgstr "Ajusta les mides dels estris"
133 133
 
134
-#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
134
+#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251
135 135
 msgid "To Fit"
136 136
 msgstr "Per a encaixar"
137 137
 
138
-#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
138
+#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253
139 139
 msgid "To Shortest"
140 140
 msgstr "Al més curt"
141 141
 
142
-#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
142
+#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254
143 143
 msgid "To Tallest"
144 144
 msgstr "Al més llarg"
145 145
 
146
-#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
146
+#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255
147 147
 msgid "To Narrowest"
148 148
 msgstr "Al més estret"
149 149
 
150
-#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
150
+#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256
151 151
 msgid "To Widest"
152 152
 msgstr "Al més ample"
153 153
 
154 154
 #: factories/stdwidgetfactory.cpp:111 form.cpp:134
155
-#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
155
+#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280
156 156
 msgid "Form"
157 157
 msgstr "Formulari"
158 158
 
159
-#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279
160
-#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
159
+#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279
160
+#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299
161 161
 #: test/kfd_part.cpp:334
162 162
 msgid "*.ui|Qt Designer UI Files"
163 163
 msgstr "*.ui|Fitxers UI del Qt Designer"
164 164
 
165
-#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
165
+#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346
166 166
 msgid ""
167 167
 "The form \"%1\" has been modified.\n"
168 168
 "Do you want to save your changes or discard them?"
@@ -170,7 +170,7 @@ msgstr ""
170 170
 "El formulari \"%1\" s'ha modificat.\n"
171 171
 "Voleu desar els vostres canvis o descartar-los?"
172 172
 
173
-#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
173
+#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348
174 174
 msgid "Close Form"
175 175
 msgstr "Tanca formulari"
176 176
 
@@ -1131,19 +1131,19 @@ msgstr "Nou ítem"
1131 1131
 msgid "Sub Item"
1132 1132
 msgstr "Sub ítem"
1133 1133
 
1134
-#: kdevelop_plugin/kfd_kdev_part.cpp:218
1134
+#: tdevelop_plugin/kfd_kdev_part.cpp:218
1135 1135
 msgid "Lay Out Widgets &Horizontally"
1136 1136
 msgstr "Ordena els estris &horitzontalment"
1137 1137
 
1138
-#: kdevelop_plugin/kfd_kdev_part.cpp:219
1138
+#: tdevelop_plugin/kfd_kdev_part.cpp:219
1139 1139
 msgid "Lay Out Widgets &Vertically"
1140 1140
 msgstr "Ordena els estris &verticalment"
1141 1141
 
1142
-#: kdevelop_plugin/kfd_kdev_part.cpp:220
1142
+#: tdevelop_plugin/kfd_kdev_part.cpp:220
1143 1143
 msgid "Lay Out Widgets in &Grid"
1144 1144
 msgstr "Ordena els estris en &graella"
1145 1145
 
1146
-#: kdevelop_plugin/kfd_kdev_part.cpp:221
1146
+#: tdevelop_plugin/kfd_kdev_part.cpp:221
1147 1147
 msgid "&Break Layout"
1148 1148
 msgstr "&Trenca la disposició"
1149 1149
 

+ 109
- 109
koffice-i18n-cs/acinclude.m4 View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
374
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
378 378
 else
379 379
   AC_MSG_ERROR([your system fails at linking a small KDE application!
380 380
 Check, if your compiler is installed correctly and if you have used the
381
-same compiler to compile Qt and kdelibs as you did use now.
381
+same compiler to compile Qt and tdelibs as you did use now.
382 382
 For more details about this problem, look at the end of config.log.])
383 383
 fi
384 384
 
385
-if eval `KDEDIR= ./conftest 2>&5`; then
385
+if eval `TDEDIR= ./conftest 2>&5`; then
386 386
   kde_result=done
387 387
 else
388 388
   kde_result=problems
389 389
 fi
390 390
 
391
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
391
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
392 392
 kde_have_all_paths=yes
393 393
 
394 394
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
547 547
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548 548
 [
549 549
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
550
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551
-    if test -n "$KDEDIRS"; then
550
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
551
+    if test -n "$TDEDIRS"; then
552 552
        kde_save_IFS=$IFS
553 553
        IFS=:
554
-       for dir in $KDEDIRS; do
554
+       for dir in $TDEDIRS; do
555 555
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
556 556
        done
557 557
        IFS=$kde_save_IFS
@@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
613 613
 
614 614
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615 615
  	    kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share"
616
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
617 617
             AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618 618
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
619 619
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
937 937
     ac_x_includes="."
938 938
   fi
939 939
   if test -z "$ac_x_libraries"; then
940
-    ac_x_libraries="/usr/lib${kdelibsuff}"
940
+    ac_x_libraries="/usr/lib${tdelibsuff}"
941 941
   fi
942 942
 esac
943 943
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
1418 1418
 AC_ARG_WITH(qt-dir,
1419 1419
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1420 1420
     [  ac_qt_includes="$withval"/include
1421
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1421
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1422 1422
        ac_qt_bindir="$withval"/bin
1423 1423
     ])
1424 1424
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
1459 1459
 
1460 1460
 qt_libdirs=""
1461 1461
 for dir in $kde_qt_dirs; do
1462
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1462
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
1463 1463
 done
1464 1464
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1465 1465
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
1644 1644
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1645 1645
 if test "$kde_cv_uic_plugins" != yes; then
1646 1646
 	AC_MSG_ERROR([
1647
-you need to install kdelibs first.
1647
+you need to install tdelibs first.
1648 1648
 
1649
-If you did install kdelibs, then the Qt version that is picked up by
1650
-this configure is not the same version you used to compile kdelibs. 
1651
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1649
+If you did install tdelibs, then the Qt version that is picked up by
1650
+this configure is not the same version you used to compile tdelibs. 
1651
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1652 1652
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1653 1653
 configuration settings.
1654 1654
 ])
@@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
1785 1785
 
1786 1786
 if test "$kde_qtver" = 1; then
1787 1787
   kde_check_header="ksock.h"
1788
-  kde_check_lib="libkdecore.la"
1788
+  kde_check_lib="libtdecore.la"
1789 1789
 else
1790 1790
   kde_check_header="ksharedptr.h"
1791 1791
   kde_check_lib="libtdeio.la"
@@ -1793,8 +1793,8 @@ fi
1793 1793
 
1794 1794
 if test -z "$1"; then
1795 1795
 
1796
-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/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1796
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1797
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1798 1798
 kde_incdirs="$ac_kde_includes $kde_incdirs"
1799 1799
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1800 1800
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1805 1805
 So, check this please and use another prefix!])
1806 1806
 fi
1807 1807
 
1808
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1808
+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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1809
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
1810 1810
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811 1811
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1812 1812
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
1824 1824
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
1825 1825
 AC_MSG_ERROR([
1826 1826
 I can't find the designer plugins. These are required and should have been installed
1827
-by kdelibs])
1827
+by tdelibs])
1828 1828
 fi
1829 1829
 
1830 1830
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
1839 1839
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
1840 1840
 fi
1841 1841
 
1842
-else dnl test -z $1, e.g. from kdelibs
1842
+else dnl test -z $1, e.g. from tdelibs
1843 1843
 
1844 1844
   ac_cv_have_kde="have_kde=no"
1845 1845
 
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
2030 2030
  kde_cxxflags_safe="$CXXFLAGS"
2031 2031
 
2032 2032
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
2033
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
2033
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
2034 2034
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
2035 2035
 
2036 2036
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2073
-   AC_SUBST(LIB_KIO, "-ltdeio")
2071
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2073
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077 2077
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
2078 2078
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2079
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2079
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2081
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2083
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2086
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2089
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2090 2090
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2094
-   AC_SUBST(LIB_KIO, "-ltdeio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2092
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
2094
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2095
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097 2097
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099 2099
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2100
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2100
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2102
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2106
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107
-   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
2108
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
2106
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
2107
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
2108
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
2109 2109
 fi
2110 2110
 ])
2111 2111
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
2170 2170
 else
2171 2171
   case "$1" in
2172 2172
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
2173
-		kde_cv_proto_$1="yes - in libkdefakes"
2173
+		kde_cv_proto_$1="yes - in libtdefakes"
2174 2174
 		;;
2175 2175
 	*)
2176 2176
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3502 3502
     AC_ARG_ENABLE(libsuffix,
3503 3503
         AC_HELP_STRING([--enable-libsuffix],
3504 3504
             [/lib directory suffix (64,32,none,auto[=default])]),
3505
-            kdelibsuff=$enableval, kdelibsuff="auto")
3505
+            tdelibsuff=$enableval, tdelibsuff="auto")
3506 3506
     
3507
-    if test "$kdelibsuff" = "auto"; then
3507
+    if test "$tdelibsuff" = "auto"; then
3508 3508
     
3509 3509
 cat > conftest.c << EOF
3510 3510
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
3512 3512
  return 0;
3513 3513
 }
3514 3514
 EOF
3515
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3515
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3516 3516
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3517 3517
     p 
3518 3518
 }'`
3519 3519
 	rm -rf conftest.*
3520 3520
     fi	
3521 3521
 	
3522
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3523
-       kdelibsuff=
3522
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3523
+       tdelibsuff=
3524 3524
     fi
3525
-    if test -z "$kdelibsuff"; then
3525
+    if test -z "$tdelibsuff"; then
3526 3526
         AC_MSG_RESULT([not using lib directory suffix])
3527 3527
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3528 3528
     else
3529 3529
         if test "$libdir" = '${exec_prefix}/lib'; then
3530
-            libdir="$libdir${kdelibsuff}"
3530
+            libdir="$libdir${tdelibsuff}"
3531 3531
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3532 3532
         fi
3533
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3534
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3533
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3534
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3535 3535
     fi
3536 3536
 ])
3537 3537
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
3549 3549
 AC_ARG_PROGRAM
3550 3550
 AM_INIT_AUTOMAKE($1, $2)
3551 3551
 AM_DISABLE_LIBRARIES
3552
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
3552
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3553 3553
 AC_CHECK_COMPILERS
3554 3554
 KDE_PROG_LIBTOOL
3555 3555
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi
4556 4556
 
4557 4557
 PYTHONINC=-I$python_incdir
4558 4558
 
4559
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4559
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4560 4560
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4561 4561
 if test ! -r $python_libdir/libpython$version.so; then
4562 4562
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
4946 4946
   AC_SUBST(CONF_FILES)
4947 4947
 ])dnl
4948 4948
 
4949
-dnl This sets the prefix, for arts and kdelibs
4949
+dnl This sets the prefix, for arts and tdelibs
4950 4950
 dnl Do NOT use in any other module.
4951
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
4951
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
4952 4952
 AC_DEFUN([KDE_SET_PREFIX_CORE],
4953 4953
 [
4954 4954
   unset CDPATH
4955
-  dnl make $KDEDIR the default for the installation
4956
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
4955
+  dnl make $TDEDIR the default for the installation
4956
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4957 4957
 
4958 4958
   if test "x$prefix" = "xNONE"; then
4959 4959
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
4977 4977
   unset CDPATH
4978 4978
   dnl We can't give real code to that macro, only a value.
4979 4979
   dnl It only matters for --help, since we set the prefix in this function anyway.
4980
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
4980
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
4981 4981
 
4982 4982
   KDE_SET_DEFAULT_BINDIRS
4983 4983
   if test "x$prefix" = "xNONE"; then
4984
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
4985
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4984
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
4985
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4986 4986
   else
4987
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
4987
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
4988 4988
     kde_save_PATH="$PATH"
4989 4989
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
4990
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
4990
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
4991 4991
     PATH="$kde_save_PATH"
4992 4992
   fi
4993 4993
 
4994 4994
   kde_libs_prefix=`$KDECONFIG --prefix`
4995 4995
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
4996
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
4996
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
4997 4997
                     This means it has been moved since you installed it.
4998
-                    This won't work. Please recompile kdelibs for the new prefix.
4998
+                    This won't work. Please recompile tdelibs for the new prefix.
4999 4999
                     ])
5000 5000
   fi
5001 5001
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
5003 5003
   AC_MSG_CHECKING([where to install])
5004 5004
   if test "x$prefix" = "xNONE"; then
5005 5005
     prefix=$kde_libs_prefix
5006
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
5006
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
5007 5007
   else
5008 5008
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
5009 5009
     given_prefix=$prefix
@@ -5661,7 +5661,7 @@ ssl_includes=""
5661 5661
 AC_ARG_WITH(ssl-dir,
5662 5662
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
5663 5663
     [  ac_ssl_includes="$withval"/include
5664
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
5664
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
5665 5665
     ])
5666 5666
 
5667 5667
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
5681 5681
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
5682 5682
   ac_ssl_includes="$ssl_incdir"
5683 5683
 
5684
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
5684
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
5685 5685
   if test ! "$ac_ssl_libraries" = "NO"; then
5686 5686
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
5687 5687
   fi
@@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5918 5918
 dnl also defines KSTUFF_PKG_ERRORS on error
5919 5919
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5920 5920
 
5921
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5921
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5922 5922
    if test "$prefix" != "$kde_libs_prefix"; then
5923
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5923
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5924 5924
    fi
5925 5925
    export PKG_CONFIG_PATH
5926 5926
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])

+ 3
- 3
koffice-i18n-cs/configure.in View File

@@ -3,7 +3,7 @@ dnl FILE: configure.in.in
3 3
 dnl =======================================================
4 4
 
5 5
 AC_INIT(messages/Makefile.am)
6
-AM_INIT_AUTOMAKE(kde-i18n-cs, "3.5.7")
6
+AM_INIT_AUTOMAKE(koffice-i18n-cs, "3.5.7")
7 7
 AM_CONFIG_HEADER(config.h)
8 8
 AC_SUBST(AUTODIRS)
9 9
 AM_KDE_WITH_NLS
@@ -25,13 +25,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
25 25
   # And if so, warn when they don't match
26 26
   if test "$kde_libs_prefix" != "$given_prefix"; then
27 27
     # And if kde doesn't know about the prefix yet
28
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
28
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
29 29
     if test $? -ne 0; then
30 30
       echo ""
31 31
       echo "Warning: you chose to install this package in $given_prefix,"
32 32
       echo "but KDE was found in $kde_libs_prefix."
33 33
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
34
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
34
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
35 35
       echo "Then restart KDE."
36 36
       echo ""
37 37
     fi

+ 3
- 3
koffice-i18n-cs/messages/koffice/desktop_koffice.po View File

@@ -621,7 +621,7 @@ msgstr "Name=Kontejnery"
621 621
 msgid "Name=Basic Widgets"
622 622
 msgstr "Name=stdwidgets"
623 623
 
624
-#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3
624
+#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3
625 625
 #, fuzzy
626 626
 msgid "Name=Form Designer KDevelop Plugin"
627 627
 msgstr "Name=Návrhář formulářů"
@@ -2096,11 +2096,11 @@ msgstr "Name=Textové procesory"
2096 2096
 msgid "GenericName=Text Documents"
2097 2097
 msgstr "Name=Textový dokument"
2098 2098
 
2099
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6
2099
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6
2100 2100
 msgid "Name=KDE Addressbook Plugin"
2101 2101
 msgstr "Name=Modul Knihy adres KDE"
2102 2102
 
2103
-#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55
2103
+#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55
2104 2104
 msgid ""
2105 2105
 "Comment=This datasource type lets you use your KDE Address Book entries."
2106 2106
 msgstr "Comment=Tento zdroj dat umožňuje využít položky z Knihy adres."

+ 31
- 31
koffice-i18n-cs/messages/koffice/kformdesigner.po View File

@@ -24,36 +24,36 @@ msgstr "KFormDesigner"
24 24
 msgid "Document to open"
25 25
 msgstr "Dokument k otevření"
26 26
 
27
-#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
27
+#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120
28 28