diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 120 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/README | 4 | ||||
| -rw-r--r-- | kdiff3.kdevelop | 4 | ||||
| -rw-r--r-- | kdiff3.spec | 4 | ||||
| -rw-r--r-- | kdiff3plugin/po/de.po | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/it.po | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/nl.po | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/pt.po | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/README | 26 | ||||
| -rw-r--r-- | po/createqm | 2 | ||||
| -rw-r--r-- | po/cvsgetpo | 6 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/lt.po | 8 | ||||
| -rw-r--r-- | po/nl.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 |
21 files changed, 100 insertions, 100 deletions
@@ -68,7 +68,7 @@ Requirements & Installation: packages (RPMs) that contain include files for compilation: - xorg-x11-devel (or x11-devel) - qt-devel - - kdelibs-devel + - tdelibs-devel Installation for KDE3: - Make sure your shell-variable QTDIR is correct. (echo $QTDIR). diff --git a/acinclude.m4 b/acinclude.m4 index ebb2f93..648e7f1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -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}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,7 +4946,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4994,9 +4994,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - 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" + 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" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/configure.in b/configure.in index c8fcd7d..87a6394 100644 --- a/configure.in +++ b/configure.in @@ -149,7 +149,7 @@ if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_ fi if (test $warn_konq); - then echo "NOTICE: Since the Konqueror-headers were not found KDiff3 will be built without support for its service-menus and the KDiff3-service menu will not be built. (Install the package containing konq_popupmenu.h. Possibly kdebase-devel or on Debian libkonq4-dev etc.)" + then echo "NOTICE: Since the Konqueror-headers were not found KDiff3 will be built without support for its service-menus and the KDiff3-service menu will not be built. (Install the package containing konq_popupmenu.h. Possibly tdebase-devel or on Debian libkonq4-dev etc.)" fi if test "$all_tests" = "bad"; then @@ -63,8 +63,8 @@ for i in `ls ../en | grep png`; do ln -s ../en/$i $i; done Command to retrieve other translations from cvs: -cvs co kde-i18n/subdirs -#for i in `cat kde-i18n/subdirs`; do cvs co kde-i18n/$i/docs/kdeextragear-1/kdiff3/index.docbook; done +cvs co tde-i18n/subdirs +#for i in `cat tde-i18n/subdirs`; do cvs co tde-i18n/$i/docs/kdeextragear-1/kdiff3/index.docbook; done for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/docs/extragear-utils/kdiff3/index.docbook -O $i.docbook; done If a new translation is available, diff --git a/kdiff3.kdevelop b/kdiff3.kdevelop index 2547054..5fc04a9 100644 --- a/kdiff3.kdevelop +++ b/kdiff3.kdevelop @@ -1,5 +1,5 @@ <?xml version = '1.0'?> -<kdevelop> +<tdevelop> <general> <author>Joachim Eibl</author> <email>joachim dot eibl at gmx dot de</email> @@ -188,4 +188,4 @@ <customArguments/> <customTagfilePath/> </ctagspart> -</kdevelop> +</tdevelop> diff --git a/kdiff3.spec b/kdiff3.spec index f3f3fa4..6052dac 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -10,11 +10,11 @@ Group: Development/Tools Source: http://heanet.dl.sourceforge.net/sourceforge/kdiff3/kdiff3-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: kdelibs > 3.3 +Requires: tdelibs > 3.3 BuildRequires: gcc-c++ >= 3.2 BuildRequires: xorg-x11-devel BuildRequires: qt-devel >= 3.3 -BuildRequires: kdelibs-devel >= 3.3 +BuildRequires: tdelibs-devel >= 3.3 %description Shows the differences line by line and character by character (!). diff --git a/kdiff3plugin/po/de.po b/kdiff3plugin/po/de.po index 6c398ed..abf7c79 100644 --- a/kdiff3plugin/po/de.po +++ b/kdiff3plugin/po/de.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2006-11-19 08:46+0100\n" "PO-Revision-Date: 2007-01-29 22:54+0100\n" "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n" -"Language-Team: German <kde-i18n-de@kde.org>\n" +"Language-Team: German <tde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/kdiff3plugin/po/it.po b/kdiff3plugin/po/it.po index dd98c15..e7fad1b 100644 --- a/kdiff3plugin/po/it.po +++ b/kdiff3plugin/po/it.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-11-19 08:46+0100\n" "PO-Revision-Date: 2006-11-22 07:28+0100\n" "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n" -"Language-Team: Italian <kde-i18n-it@kde.org>\n" +"Language-Team: Italian <tde-i18n-it@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/kdiff3plugin/po/nl.po b/kdiff3plugin/po/nl.po index 1c8291c..45a5444 100644 --- a/kdiff3plugin/po/nl.po +++ b/kdiff3plugin/po/nl.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-11-19 08:46+0100\n" "PO-Revision-Date: 2006-11-27 00:11+0100\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" -"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" +"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/kdiff3plugin/po/pt.po b/kdiff3plugin/po/pt.po index ec8364d..d90c664 100644 --- a/kdiff3plugin/po/pt.po +++ b/kdiff3plugin/po/pt.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2006-11-19 08:46+0100\n" "PO-Revision-Date: 2006-11-19 14:49+0000\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" -"Language-Team: pt <kde-i18n-pt@kde.org>\n" +"Language-Team: pt <tde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/kdiff3plugin/po/pt_BR.po b/kdiff3plugin/po/pt_BR.po index 808af36..4abdda3 100644 --- a/kdiff3plugin/po/pt_BR.po +++ b/kdiff3plugin/po/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2006-11-19 08:46+0100\n" "PO-Revision-Date: 2006-11-26 22:39-0200\n" "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n" -"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" +"Language-Team: Brazilian Portuguese <tde-i18n-pt_br@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,17 +10,17 @@ grep "Language-Team" *.po az Azerbaijani <translation-team-az@lists.sourceforge.net> ca LANGUAGE <LL@li.org> da Danish <dansk@klid.dk> -de Deutsch <kde-i18n-de@kde.org> +de Deutsch <tde-i18n-de@kde.org> en_GB British English <kde-en-gb@kde.me.uk> es espaniol <kde-es@kybs.de> et Estonian <kde-et@linux.ee> fr French <kde-francophone@kde.org> hu Hungarian <kde-lista@sophia.jpte.hu> -it Italian <kde-i18n-it@kde.org> -nl Nederlands <kde-i18n-nl@kde.org> +it Italian <tde-i18n-it@kde.org> +nl Nederlands <tde-i18n-nl@kde.org> pl Polish -pt_BR Brazilian Portuguese <kde-i18n-pt_BR@mail.kde.org> -pt Portuguese <kde-i18n-pt@kde.org> +pt_BR Brazilian Portuguese <tde-i18n-pt_BR@mail.kde.org> +pt Portuguese <tde-i18n-pt@kde.org> ro Romanian <ro-kde@egroups.com> ru Russian <ru@li.org> sr Serbian @@ -89,9 +89,9 @@ translation is within KDE-libs or within Qt. But the translations are available: For Qt-strings in $QTDIR/translations (already as .qm-files) For KDE-libs in the SVN-repository, where we can reuse the previous trick to get -all kdelibs*.po-files: +all tdelibs*.po-files: - for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/messages/kdelibs/kdelibs.po -O kdelibs_$i.po; done + for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/messages/tdelibs/tdelibs.po -O tdelibs_$i.po; done Finally the program must only read the correct translation tables: @@ -103,15 +103,15 @@ Finally the program must only read the correct translation tables: qtTranslator.load( QString("qt_")+QTextCodec::locale(), translationDir ); app.installTranslator( &qtTranslator ); - QTranslator kdelibsTranslator( 0 ); - kdelibsTranslator.load( QString("kdelibs_")+QTextCodec::locale(), translationDir ); - app.installTranslator( &kdelibsTranslator ); + QTranslator tdelibsTranslator( 0 ); + tdelibsTranslator.load( QString("tdelibs_")+QTextCodec::locale(), translationDir ); + app.installTranslator( &tdelibsTranslator ); This should do the job, if the translation-tables can be found. The difficult part is: Where to search for the files, because this depends on where the program was installed. (I didn't solve this puzzle yet.) -Because it's too much effort to copy all kdelibs*.po-files along: Here is a little info +Because it's too much effort to copy all tdelibs*.po-files along: Here is a little info about how to extract only the needed strings and to create the qm-files. 1. Only src/kreplacements/kreplacements.cpp contains strings, that were not covered by @@ -119,8 +119,8 @@ about how to extract only the needed strings and to create the qm-files. xgettext --keyword=i18n --keyword=I18N_NOOP -C ../src/kreplacements/kreplacements.cpp -o kreplacements.pot (xgettext is usually part of package gettext-devel) -2. Take only needed strings and translations from kdelibs*.po: - msgmerge --no-fuzzy-matching kdelibs_de.po kreplacements.pot >kreplacements_de.po +2. Take only needed strings and translations from tdelibs*.po: + msgmerge --no-fuzzy-matching tdelibs_de.po kreplacements.pot >kreplacements_de.po 3. Concatenate the normal de.po and kreplacements_de.po: msgcat --use-first de.po kreplacements_de.po >kdiff3_de.po diff --git a/po/createqm b/po/createqm index 1b2dac9..5fb9e9c 100644 --- a/po/createqm +++ b/po/createqm @@ -1,7 +1,7 @@ for i in `cat subdirs` ; do if [ -a $i.po ]; then echo $i - msgmerge --no-fuzzy-matching kdelibspo/kdelibs_$i.po kreplacements.pot >kreplacements_$i.po + msgmerge --no-fuzzy-matching tdelibspo/tdelibs_$i.po kreplacements.pot >kreplacements_$i.po msgcat --use-first $i.po kreplacements_$i.po >kdiff3_$i.po /usr/lib/qt3/bin/msg2qm kdiff3_$i.po kdiff3_$i.qm rm kdiff3_$i.po kreplacements_$i.po diff --git a/po/cvsgetpo b/po/cvsgetpo index 0967a4e..3c974db 100644 --- a/po/cvsgetpo +++ b/po/cvsgetpo @@ -1,3 +1,3 @@ -cvs co kde-i18n/subdirs -for i in `cat kde-i18n/subdirs`; do cvs co kde-i18n/$i/messages/kdeextragear-1/kdiff3.po; done -for i in `cat kde-i18n/subdirs`; do cp -p kde-i18n/$i/messages/kdeextragear-1/kdiff3.po $i.po; done +cvs co tde-i18n/subdirs +for i in `cat tde-i18n/subdirs`; do cvs co tde-i18n/$i/messages/kdeextragear-1/kdiff3.po; done +for i in `cat tde-i18n/subdirs`; do cp -p tde-i18n/$i/messages/kdeextragear-1/kdiff3.po $i.po; done @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2006-11-05 08:45+0100\n" "PO-Revision-Date: 2006-07-09 10:25+0200\n" "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n" -"Language-Team: German <kde-i18n-de@kde.org>\n" +"Language-Team: German <tde-i18n-de@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2006-11-05 08:45+0100\n" "PO-Revision-Date: 2006-12-08 16:52+0100\n" "Last-Translator: Marcello Anni <marcello.anni@alice.it>\n" -"Language-Team: italiano <kde-i18n-it@kde.org>\n" +"Language-Team: italiano <tde-i18n-it@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -141,7 +141,7 @@ msgstr "" "Vardas\n" "#-#-#-#-# kio.po (kio) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" +"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" "Vardas\n" @@ -191,7 +191,7 @@ msgstr "" "Vardas\n" "#-#-#-#-# kmail.po (kmail) #-#-#-#-#\n" "Vardas\n" -"#-#-#-#-# libkdenetwork.po (libkdenetwork) #-#-#-#-#\n" +"#-#-#-#-# libtdenetwork.po (libtdenetwork) #-#-#-#-#\n" "Vardas\n" "#-#-#-#-# ktnef.po (ktnef) #-#-#-#-#\n" "Vardas\n" @@ -1559,7 +1559,7 @@ msgid "Unicode" msgstr "" "#-#-#-#-# kcmkonsole.po (kcmkonsole) #-#-#-#-#\n" "Unikodinis\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" +"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "Unikodas\n" "#-#-#-#-# kofficefilters.po (kofficefilters) #-#-#-#-#\n" "Unikodas\n" @@ -2479,7 +2479,7 @@ msgstr "" "Konfigūruoti...\n" "#-#-#-#-# kcmfonts.po (kcmfonts) #-#-#-#-#\n" "Konfigūruoti...\n" -"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n" +"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n" "Konfigūruoti...\n" "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" "Konfigūruoti...\n" @@ -14,7 +14,7 @@ msgstr "" "POT-Creation-Date: 2006-11-05 08:45+0100\n" "PO-Revision-Date: 2006-11-27 00:05+0100\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" -"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" +"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -6,7 +6,7 @@ # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # Tomasz Waleµczak <tom@w.pl>, 2004. # Tomasz Waleńczak <tom@w.pl>, 2004. -# Michal Rudolf <mrudolf@kdewebdev.org>, 2004. +# Michal Rudolf <mrudolf@tdewebdev.org>, 2004. # Marcin Bokszczanin <mboksz@bcig.pl>, 2005. # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005. # Robert Gomulka <rgom@o2.pl>, 2005. @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2006-11-05 08:45+0100\n" "PO-Revision-Date: 2006-11-05 14:35+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" -"Language-Team: pt <kde-i18n-pt@kde.org>\n" +"Language-Team: pt <tde-i18n-pt@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ee8734..36abf3d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgstr "" "POT-Creation-Date: 2006-11-05 08:45+0100\n" "PO-Revision-Date: 2007-01-30 20:41-0200\n" "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n" -"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" +"Language-Team: Brazilian Portuguese <tde-i18n-pt_br@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" |