diff options
Diffstat (limited to 'editors')
87 files changed, 1242 insertions, 11913 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 697540671fe2..6bd28fccbf48 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.2 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ @@ -31,12 +30,14 @@ GREP?= /usr/bin/grep MOUNT?= /sbin/mount ZIP?= ${PREFIX}/bin/zip UNZIP?= ${PREFIX}/bin/unzip +ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh PASTE?= /usr/bin/paste .include <bsd.port.pre.mk> INSTALLATION_BASEDIR= OpenOffice.org1.0 +BUILD_NR= 641 DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -104,11 +105,12 @@ CXX= g++32 EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -.if !defined(USE_GCC) -BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -.endif +#.if !defined(USE_GCC) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +#.endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) @@ -133,7 +135,7 @@ USE_AUTOCONF= yes WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ - --with-os-version=${OSVERSION} + --with-os-version=${OSVERSION} \ + --with-ant-home=${LOCALBASE}/ -.if !defined(USE_GCC) -CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} -.endif +#.if !defined(USE_GCC) +#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} +#.endif .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 @@ -464,8 +467,8 @@ do-build: .endif @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) - @${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index 2ed3b84d0aa0..990a3b17fa95 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 34f2ca644b7d70573148c82d64eb6064 +MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch index 97fec46bcef4..9540987d0f65 100644 --- a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch @@ -1,82 +1,132 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002 -+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002 -@@ -47,17 +47,27 @@ - --- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 - *************** - *** 1795,1800 **** ----- 1795,1802 ---- -+--- 1795,1803 ---- - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; - + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; -++ freebsd*) JINCSUBDIRS="freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac - - --- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 - +++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -984,7 +984,7 @@ +--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 ++++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 +@@ -45,52 +45,82 @@ + CCLINK= @MAKEFILE_CCLINK@ + *** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001 + --- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003 +-*************** +-*** 995,1000 **** +---- 995,1001 ---- +- CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" +- LIBS="-lsocket -lsvipc $LIBS";; +-+ netbsd*) optimize_def="-O2";; +- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- *qnx) cat >> confdefs.h <<\EOF +- #define HAVE_QNX 1 +-*************** +-*** 1795,1800 **** +---- 1796,1803 ---- +- case "$host_os" in +- solaris*) JINCSUBDIRS="solaris";; +- linux*) JINCSUBDIRS="linux genunix";; +-+ irix*) JINCSUBDIRS="irix";; +-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +- *) JINCSUBDIRS="genunix";; +- esac +- ++@@ -984,9 +984,9 @@ + optimize_def="-O2" + LIBS="-lipc $LIBS";; + bsdi*) optimize_def="-O2";; +-freebsd*) optimize_def="-O2" ++- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" ++- LIBS="-pthread";; ++freebsd*) optimize_def="-O" -+ CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" -+ LIBS="-pthread";; +++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS" +++ LIBS="$PTHREAD_LIBS";; + hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - @@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -@@ -68,13 +78,22 @@ - #define HAVE_QNX 1 - --- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 - +++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 --@@ -1194,11 +1194,12 @@ -+@@ -1194,11 +1194,23 @@ - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva ++ irix*) optimize_def="-O2" ++ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";; ++@@ -995,6 +995,7 @@ ++ CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" ++ LIBS="-lsocket -lsvipc $LIBS";; +++netbsd*) optimize_def="-O2";; ++ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ *qnx) cat >> confdefs.h <<\EOF ++ #define HAVE_QNX 1 ++@@ -1795,6 +1796,9 @@ ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; +++ irix*) JINCSUBDIRS="irix";; +++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +++ freebsd*) JINCSUBDIRS="freebsd genunix";; ++ *) JINCSUBDIRS="genunix";; ++ esac ++ + *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 + --- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 +-*************** +-*** 1194,1204 **** +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-- else +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +- fi +- ;; +- +---- 1194,1205 ---- +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +-+ else +-+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-+ need_version=no +- fi +- ;; +- ++@@ -1194,11 +1194,12 @@ ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ++- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva ++ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - else +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ need_version=no -++ fi -++ ;; -++ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - + else -@@ -84,3 +103,24 @@ - fi - ;; - -+@@ -2019,6 +2031,20 @@ -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' ++ fi ++ ;; ++ ++@@ -1365,10 +1366,13 @@ ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd*) ++- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \ +++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no +++ need_version=no ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++@@ -2020,6 +2024,14 @@ + soname_spec='${libname}${release}.so$major' + dynamic_linker='NetBSD ld.elf_so' -++ fi ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd*) ++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -+ fi +++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' +++ soname_spec='${libname}${release}.so$major' +++ dynamic_linker='FreeBSD ld.elf_so' + shlibpath_var=LD_LIBRARY_PATH + ;; ++ diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in index 2957c2be79d2..f98720a8c3ae 100644 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice-1.0/files/patch-config_office+configure.in @@ -1,187 +1,46 @@ ---- configure.in.orig Sat Jun 8 02:49:26 2002 -+++ configure.in Mon Jul 15 13:36:23 2002 -@@ -28,6 +28,11 @@ - - Usage: --enable-gcc3 - ],,) -+AC_ARG_ENABLE(debug, -+[ --enable-debug if you like to build with debug symbols -+ -+ Usage: --enable-debug -+],,) - AC_ARG_WITH(stlport4-home, - [ --with-stlport4-home The location that STLport4 is installed in. The STL - header files are assumed to be in stlport4-home/stlport -@@ -103,6 +108,12 @@ - - Usage: --with-asm-home=<path to ml.exe directory> - ],,) -+AC_ARG_WITH(os-version, -+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice -+ with the correct OSVERSION. -+ -+ Usage: --with-os-version=<OSVERSION> -+],,) - AC_ARG_WITH(unzip-home, - [ --with-unzip-home For Windows users, please supply the path for - unzip.exe. -@@ -241,7 +252,7 @@ - if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then - AC_PROG_CC - fi --if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then -+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then - dnl ****************************************** - dnl Testing for GNU compiler and version... - dnl ****************************************** -@@ -366,8 +377,9 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -- _gcc_include_path="/usr/include/g++" -+ if test "$_os" = "NetBSD" ; then -+ _gcc_include_path="/usr" -+ _gxx_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +420,71 @@ - fi +--- configure.in.orig Thu Jan 16 13:42:46 2003 ++++ configure.in Tue Jan 21 23:09:35 2003 +@@ -352,10 +352,7 @@ + if test "$COMPATH" != "NO_GCC"; then + AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi - fi -+if test "$_os" = "FreeBSD"; then -+ dnl ****************************************** -+ dnl Testing for GNU compiler and version... -+ dnl Adapted to the FreeBSD ports system -+ dnl ****************************************** -+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3 -+ if test -n "$enable_gcc3"; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" -+ fi -+ if test -z "$CC"; then -+ CC="cc"; -+ fi -+ if test -z "$CXX"; then -+ CXX="c++"; -+ fi -+ if which $CC; then -+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'` -+ _gcc_version=`$CC -dumpversion` -+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'` -+ _gcc_machine=`$CC -dumpmachine` -+ else -+ COMPATH="NO_GCC" -+ fi -+ if test -n "$enable_gcc3"; then -+ if test "$_gcc_major" != "3"; then -+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested]) -+ COMPATH="NO_GCC" -+ fi -+ else -+ if test "$_gcc_major" != "2"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ if test "$_gcc_middle" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ if test "$_gcc_minor" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ fi -+ fi -+ fi -+ fi -+ if test "$COMPATH" != "NO_GCC"; then -+ if test $CC != "gcc" -o $CC != "cc"; then -+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include" -+ _gxx_include_path="$_gcc_include_path/g++" -+ else -+ _gcc_include_path="$PREFIX" -+ _gxx_include_path="$_gcc_include_path/g++" -+ fi -+ else -+ AC_MSG_WARN([no gcc compiler found]) -+ AC_MSG_WARN([no gcc compiler found]) >> warn -+ fi +- +-dnl Set the include paths +- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +-fi +fi -+ - if test "$_os" = "Darwin"; then - if test "$CC" = "cc"; then - AC_PATH_PROGS(_cc, cc) -@@ -589,6 +666,26 @@ - fi - fi -+dnl ************************************************************* -+dnl Testing for exception handling - dwarf2 or sjlj exceptions... -+dnl ************************************************************* -+AC_MSG_CHECKING([try to compile exception code]) -+AC_LANG_SAVE -+AC_LANG_CPLUSPLUS -+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK( -+ [#include <iostream> -+ -+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__)); -+ -+ ], -+ [__sjthrow() ], -+ [exceptions_type="sjlj"], -+ [exceptions_type="dwarf2"]) -+]) -+ -+AC_MSG_RESULT(Exceptions type: $exceptions_type) -+AC_LANG_RESTORE -+ - dnl ************************************************************** - dnl Testing for required Solaris and workshop compiler patches... - dnl ************************************************************** -@@ -815,6 +912,10 @@ - fi - if test "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1170,6 +1271,12 @@ - USE_GCC3="FALSE" + dnl =================================================================== + dnl Search all the common names for GNU make +@@ -553,14 +550,27 @@ fi -+if test -n "$enable_debug"; then -+ ENABLE_DEBUG="TRUE" + dnl =================================================================== +-dnl Set the gxx include directories ++dnl Set the gcc/gxx include directories + dnl =================================================================== ++if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then + if test "$GXX" = "yes"; then +- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` ++ if test -n "$enable_gcc3"; then ++ _gccincname1="g++-v3" ++ else ++ _gccincname1="g++-3" ++ fi ++ _gcc_include_path=".." ++ _gxx_include_path="$_gcc_include_path/$_gccincname1" ++fi +else -+ ENABLE_DEBUG="FALSE" ++if test "$GXX" = "yes"; then ++ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \ ++ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` + dnl This is the original code... +-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +fi -+ - # Print args passed to set_soenv. - if test 1 = 1; then - echo -@@ -1197,12 +1304,14 @@ - echo "\$MINGWIN32="$WITH_MINGWIN - echo "\$with_use_shell="$with_use_shell - echo "\$USE_GCC3="$USE_GCC3 -+echo "\$EXCEPTIONS="$exceptions_type -+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG - echo fi +- - # Executing the set_soenv script to setup the environment variables. - if test -z "$enable_check_only"; then -- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG - else - echo - echo Test Complete + dnl =================================================================== + dnl Extra checking for the SUN OS compiler diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 deleted file mode 100644 index 0398428dc661..000000000000 --- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 +++ /dev/null @@ -1,242 +0,0 @@ ---- set_soenv.1.orig Sun Jun 30 21:51:05 2002 -+++ set_soenv.1 Mon Oct 28 15:01:58 2002 -@@ -40,7 +40,7 @@ - # - # Set this value equal to the corresponding amount of - # command line arguments. --my $numArgs = 20; -+my $numArgs = 27; - # Determining the amount of arguments in the call. - my $numEnter = $#ARGV + 1; - if ( $numEnter != $numArgs ) -@@ -66,14 +66,15 @@ - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, - $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -- $TF_CFGDATA, $TF_SVDATA, -+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, - $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, - $USE_XPRINT, $BUILD_SOSL_RELEASE ); - # - # Platform dependent constant values. - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, -- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); -+ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -+ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -96,7 +97,7 @@ - $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, - $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, - $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, -- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); -+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); - # - #------------------------------------------- - # IId. Declaring the aliases. -@@ -145,7 +146,11 @@ - $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 - $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $USE_SHELL = $ARGV [ 18 ]; # preferred shell --$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) -+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) -+$CC = $ARGV [ 23 ]; # get cc from environment -+$CXX = $ARGV [ 24 ]; # use c++ from environment -+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type -+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build - # - #--------------------------------------------------------------- - # IIIb. Initialising the variables for the system commands, etc. -@@ -335,7 +340,14 @@ - $COMPATH = $ARGV[ 0 ]; - $CPU = "I"; - $CPUNAME = "INTEL"; -+if ($USE_GCC3 eq "TRUE") -+ { -+ $CVER = "C300"; -+ } -+else -+ { - $CVER = "C295"; -+} - $DLLSUFFIX = "fi"; - $GUI = "UNX"; - $GUIBASE = "unx"; -@@ -348,6 +360,9 @@ - $PATH_SEPERATOR = $ps; - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; -+ $OSVERSION = $ARGV[ 20 ]; -+ $PTHREAD_CFLAGS = $ARGV[ 21 ]; -+ $PTHREAD_LIBS = $ARGV[ 22 ]; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -@@ -927,7 +942,7 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$USR_LOCAL.$LIB. -@@ -935,6 +950,13 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $LD_LIBRARY_PATH = $cur_dir. -+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -+ $ps.$par_dir.$LIB. -+ $ps_STLPORT_LIB. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -+} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -970,15 +992,16 @@ - $D.$COM. - $D.$CVER. - $D.$GVER. -- $D."_PTHREADS". - $D.$OS. - $D.$CPUNAME; - if ($platform eq "$FreeBSD") --{ $SOLARDEF .= $D."X86"; -+{ $SOLARDEF .= $D."X86". -+ $D."OSVERSION=$OSVERSION". -+ " ".$PTHREAD_CFLAGS; - } - $SOLARDEF .= $D."_REENTRANT". - $D."_POSIX_PTHREAD_SEMANTICS"; --if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64")) -+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" )) - { $SOLARDEF .= $D."GLIBC=".$GLIBC; - } - $SOLARDEF .= $D."SUPD=$UPD". -@@ -995,7 +1018,7 @@ - $L.$USR_DT.$LIB. - $L.$USR_OPENWIN.$LIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. - $L.$LIB. - $L.$USR.$LIB. -@@ -1005,6 +1028,11 @@ - { $SOLAREXTRALIB = '"'.$L.$LIB. - $L.$USR.$LIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ -+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"'; -+} -+ - # Compiler include search directory paths. - if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1076,7 +1104,7 @@ - $ps.$USR.$LIB. - $ps.$USR_LOCAL.$BIN; - } --elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) - { $PATH = $cur_dir. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1095,6 +1123,22 @@ - $ps.$USR.$ds."X11".$BIN. - $ps.$USR.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $PATH = $cur_dir. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. -+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -+ $ps.'$SOLARENV'.$BIN. -+ $ps.'$JAVA_HOME'.$BIN. -+ -+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); -+ -+ $PATH .= $ps.$USR.$ds."sbin". -+ $ps.$USR.$ds."X11R6".$ds."bin". -+ $ps.$USR_LOCAL.$BIN. -+ $ps.$USR_LOCAL.$ds."sbin"; -+ $ps.$USR.$LIB; -+} -+ - elsif ($platform eq "$Winnt") - { - my ( $noldPATH ); -@@ -1195,7 +1239,7 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARLIB = '"'.$L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1210,6 +1254,15 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ $SOLARLIB = '"'.$L.$par_dir.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$JAVA_HOME'.$LIB. -+ $L_STLPORT_LIB. -+ $L.$XLIB.'"'; -+} - elsif ($platform eq "$Winnt") - { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1242,7 +1295,7 @@ - $SOLARINC .= $I.$USR.$INCLUDE; - } - $SOLARINC .= $STLPORT_stlport; --if ($platform eq "$Linux") -+if ($platform eq "$Linux" || $platform eq "$FreeBSD") - { - # This simply adds an include path, so even cases that break the FHS work - $SOLARINC .= $STLPORT_inc_stlport; -@@ -1256,11 +1309,6 @@ - { $SOLARINC .= $I.'$COMPATH'.$ds."include"; - } - --if ($platform eq "$Linux") --{ --# This simply adds an include path, so even cases that break the FHS work --$SOLARINC .= $STLPORT_inc_stlport; --} - $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". - $I.'$JAVA_HOME'.$INCLUDE; - -@@ -1428,6 +1476,9 @@ - ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); - ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); - ToFile( "TF_FILTER", "TRUE", "e" ); -+if ($ENABLE_DEBUG eq "TRUE") { -+ToFile( "debug", "true", "e" ); -+} - if ( $platform ne "$Macosx" ) - { ToFile( "PSPRINT", "TRUE", "e" ); - } elsif ( $GUIBASE eq "unx" ) { -@@ -1453,6 +1504,12 @@ - ToFile( "GUIENV", $GUIENV, "e" ); - ToFile( "GVER", $GVER, "e" ); - ToFile( "OS", $OS, "e" ); -+ToFile( "CC", $CC, "e" ); -+ToFile( "CXX", $CXX, "e" ); -+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" ); -+ToFile( "OSVERSION", $OSVERSION, "e" ); -+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" ); -+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" ); - ToFile( "OUTPATH", $OUTPATH, "e" ); - ToFile( "INPATH", $INPATH, "e" ); - ToFile( "GVERDIR", $GVERDIR, "e" ); diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+parse+sqlbison.y b/editors/openoffice-1.0/files/patch-connectivity+source+parse+sqlbison.y deleted file mode 100644 index 250c7f7e5b1b..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+parse+sqlbison.y +++ /dev/null @@ -1,98 +0,0 @@ ---- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002 -+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002 -@@ -134,21 +134,6 @@ - %token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM - %token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME - -- /* operators */ --%left <pParseNode> SQL_TOKEN_NAME --%left <pParseNode> SQL_TOKEN_OR --%left <pParseNode> SQL_TOKEN_AND -- --%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ --%left <pParseNode> '+' '-' --%left <pParseNode> '*' '/' --%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT --%left <pParseNode> ')' --%right <pParseNode> '=' --%right <pParseNode> '.' --%right <pParseNode> '(' -- -- - %nonassoc <pParseNode> SQL_TOKEN_UMINUS - - -@@ -157,31 +142,31 @@ - - %token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG - --%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY -+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY - --%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS --%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR -+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS -+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR - - %token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC - %token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP - --%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL -+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL - --%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT -+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT - --%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH -+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER - %token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC - - %token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER - --%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC --%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT -+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC -+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK - --%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM -+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM - - %token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION - %token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW --%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE -+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE - - /* ODBC KEYWORDS */ - %token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ -@@ -204,6 +189,22 @@ - %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND - %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE - -+ -+ /* operators */ -+%left SQL_TOKEN_NAME -+%left <pParseNode> SQL_TOKEN_OR -+%left <pParseNode> SQL_TOKEN_AND -+ -+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ -+%left <pParseNode> '+' '-' -+%left <pParseNode> '*' '/' -+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT -+%left ')' -+%right '=' -+%right '.' -+%right '(' -+ -+ - %token <pParseNode> SQL_TOKEN_INVALIDSYMBOL - - /*%type <pParseNode> sql_single_statement */ -@@ -3019,7 +3020,7 @@ - } - else - YYERROR; -- } -+ }; - %% - - diff --git a/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx deleted file mode 100644 index 8abdf74d97b8..000000000000 --- a/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 -+++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 -@@ -65,7 +65,7 @@ - // NOT FULLY DECLARED SERVICES - #include <string.h> - #include <stdio.h> --#if defined(WNT) || defined(LINUX) -+#if defined(WNT) || defined(LINUX) || defined(FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> diff --git a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx new file mode 100644 index 000000000000..7b01e4f554b5 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx @@ -0,0 +1,13 @@ +--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 ++++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 +@@ -124,6 +124,10 @@ + static char const s_platform_path [] = "/macosx_powerpc.plt"; + #elif defined (NETBSD) && defined (SPARC) + static char const s_platform_path [] = "/netbsd_sparc.plt"; ++#elif defined (FREEBSD) && defined (INTEL) ++static char const s_platform_path [] = "/freebsd_x86.plt"; ++#elif defined (FREEBSD) && defined (SPARC) ++static char const s_platform_path [] = "/freebsd_sparc.plt"; + #else + #error "unkonwn platform" + insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice-1.0/files/patch-freetype+makefile.mk b/editors/openoffice-1.0/files/patch-freetype+makefile.mk index 9c238f45b04d..802c6b4d1a8b 100644 --- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice-1.0/files/patch-freetype+makefile.mk @@ -1,24 +1,24 @@ ---- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002 -+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002 -@@ -79,7 +79,11 @@ +--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003 +@@ -86,7 +86,11 @@ + .IF "$(GUI)"=="UNX" #relative to CONFIGURE_DIR CONFIGURE_ACTION=$(GNUMAKE) - .IF "$(GUI)"=="UNX" -CONFIGURE_FLAGS=setup +.IF "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O" -+.ELSE # "$(debug)"=="" ++.ELSE # "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb" -+.ENDIF # "$(debug)"=="" - .ELSE # "$(GUI)"=="UNX" - CONFIGURE_FLAGS=setup visualc - .ENDIF # "$(GUI)"=="UNX" -@@ -90,7 +94,7 @@ - .IF "$(GUI)"=="UNX" - OUT2LIB= \ - objs$/.libs$/libfreetype.a \ -- objs$/.libs$/libfreetype.so.6* -+ objs$/.libs$/libfreetype.so.7 - - .ENDIF # "$(GUI)"=="UNX" ++.ENDIF + BUILD_DIR=$(CONFIGURE_DIR) + BUILD_ACTION=$(GNUMAKE) +@@ -95,6 +99,8 @@ + objs$/.libs$/libfreetype.a + .IF "$(OS)"=="MACOSX" + OUT2LIB+=objs$/.libs$/libfreetype.*.dylib ++.ELIF "$(OS)"=="FREEBSD" ++OUT2LIB+=objs$/.libs$/libfreetype.so.7* + .ELSE + OUT2LIB+=objs$/.libs$/libfreetype.so.6* + .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice-1.0/files/patch-idl+util+makefile.mk b/editors/openoffice-1.0/files/patch-idl+util+makefile.mk deleted file mode 100644 index 2543593dd210..000000000000 --- a/editors/openoffice-1.0/files/patch-idl+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002 -+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002 -@@ -110,7 +110,7 @@ - .ENDIF - .ENDIF - --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - APP1STDLIBS+=-lcrypt - .ENDIF - diff --git a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch index cde27322f62f..5432812bb50c 100644 --- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch +++ b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch @@ -1,11 +1,41 @@ ---- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001 -+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002 -@@ -120,26 +120,157 @@ +--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 ++++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 +@@ -1,5 +1,5 @@ +-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 +---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000 ++--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001 + *************** + *** 166,171 **** + --- 166,177 ---- +@@ -15,8 +15,8 @@ + INCLUDESRC = $(TOP)/include + INCDIR = $(INCROOT)/audio + WIDGET_DIR = $(TOP)/clients/audio/widgets +-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999 +---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999 ++--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001 + *************** + *** 1336,1348 **** + static char *_SysErrorMsg (n) +@@ -40,8 +40,8 @@ + } + + #endif /* USL sharedlibs in don't define for AUD3.2 */ +-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999 +---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999 ++--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001 + *************** + *** 51,59 **** + #include <errno.h> +@@ -120,59 +120,157 @@ return(-1); } --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001 +-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000 +---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003 -*************** -*** 25,30 **** ---- 25,32 ---- @@ -27,6 +57,39 @@ - InstallMultiple($(HEADERS),$(INCDIR)) - #if ProjectX >= 5 - InstallNonExecFile(AuErrorDB,$(LIBDIR)) +-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000 +---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003 +-*************** +-*** 119,132 **** +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! } +- number : NUMBER { $$ = $1; } +- ; +- +---- 119,132 ---- +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } ; +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! }; +- number : NUMBER { $$ = $1; } +- ; +- +--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 ++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 +@@ -42,6 +42,8 @@ diff --git a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp index 7b55cc064156..0f59b9ebee9b 100644 --- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,5 +1,5 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 -+++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 ++++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 @@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment @@ -8,11 +8,11 @@ #if ( defined( _gcc3 ) && defined( C300 ) ) File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); - Styles = (NETWORK,RELATIVE); +@@ -34,6 +35,7 @@ End + + +#endif #endif - #endif + File gid_File_Lib_Sal diff --git a/editors/openoffice-1.0/files/patch-product+settings+linux_gcc_settings.mk b/editors/openoffice-1.0/files/patch-product+settings+linux_gcc_settings.mk deleted file mode 100644 index 4210b5f03f33..000000000000 --- a/editors/openoffice-1.0/files/patch-product+settings+linux_gcc_settings.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002 -+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002 -@@ -3,9 +3,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk index 9773406f4ed2..3dae50f091a3 100644 --- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk +++ b/editors/openoffice-1.0/files/patch-product+settings+settings.mk @@ -1,26 +1,75 @@ ---- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002 -+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002 -@@ -83,9 +83,8 @@ +--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 ++++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003 +@@ -225,3 +226,72 @@ - OS=SOLARIS - PS=/ --CC=CC --LINK=CC --LIB=CC -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat -@@ -136,9 +135,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc + endif + ++ifeq "$(PLATFORM)" "FreeBSD" ++# Settings for Linux using gcc compiler ++ ++OS=LINUX ++PLATFORM=linux ++PS=/ +LINK=$(CC) +LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat ++ECHO=@echo ++MKDIR=mkdir -p ++CAT=cat ++OBJ_EXT=o ++SHAREDLIB_EXT=so ++SHAREDLIB_PRE=lib ++SHAREDLIB_OUT=$(OUT_LIB) ++PACKAGE_LIB_DIR=linux_x86.plt ++ ++GCC_VERSION=$(shell $(CC) -dumpversion) ++ ++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" ++COMID=gcc3 ++CPPU_ENV=gcc3 ++else ++COMID=GCC ++CPPU_ENV=gcc2 ++endif ++ ++OSEP=\< ++CSEP=\> ++ ++DEL=rm -f ++DELRECURSIVE=rm -rf ++COPY=cp ++URLPREFIX=file:// ++ ++# Include UDK version numbers ++include $(PRJ)/include/udkversion.mk ++ ++SALLIB=-lsal ++CPPULIB=-lcppu ++CPPUHELPERLIB=-lcppuhelper$(COMID) ++SALHELPERLIB=-lsalhelper$(COMID) ++STLPORTLIB=-lstlport_gcc ++ ++EMPTYSTRING= ++PATH_SEPARATOR=: ++ ++# -O is necessary for inlining (see gcc documentation) ++ifeq "$(DEBUG)" "yes" ++CC_FLAGS=-c -g ++else ++CC_FLAGS=-c -O ++endif ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux ++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include ++STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport ++CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) ++ ++# define for used compiler necessary for UNO ++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 ++#-DCPPU_ENV=gcc3 -- gcc3 3.0 ++ ++CC_OUTPUT_SWITCH=-o ++ ++LIBRARY_LINK_FLAGS=-shared ++EXE_LINK_FLAGS=-Wl -export-dynamic ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) ++ ++endif diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk index e52b0a4ea6ef..6e72982a23bf 100644 --- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk @@ -1,34 +1,32 @@ ---- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 -+++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 -@@ -137,13 +137,6 @@ +--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 ++++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003 +@@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno -.IF "$(COMID)"=="gcc3" -ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.3 \ -- $(DESTDIRDLL)$/libstdc++.so.3.0.1 +- $(DESTDIRDLL)$/libgcc_s.so.1 \ +- $(DESTDIRDLL)$/libgcc_s.so \ +- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ +- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) -.ENDIF .ELIF "$(OS)"=="NETBSD" ########### -@@ -498,6 +491,7 @@ - #--------------------------------------------------------- - # special targets for linux gcc3 +@@ -491,6 +484,7 @@ + # special targets for linux gcc3 + .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"=="LINUX" - .IF "$(CCNUMVER)">="000300010000" ++.IF "$(OS)"!="FREEBSD" + $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) - $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -@@ -526,6 +520,9 @@ +@@ -514,6 +508,7 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ +ln -s libgcc_s.so.1 $@ -+ +.ENDIF -+ #------------------------------------------------------------- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch index 61f12e5bfe7c..c3a0ffc47e73 100644 --- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch @@ -1,25 +1,20 @@ ---- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002 -+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002 +--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 ++++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ----- 1,151 ---- -+--- 1,156 ---- +---- 1,159 ---- ++--- 1,161 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ -@@ -90,8 +90,13 @@ - ! .ENDIF - ! +@@ -96,6 +96,8 @@ ! .IF "$(GUI)"=="UNX" -+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ! .IF "$(OS)"=="NETBSD" ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF -+! .IF "$(OS)"=="FREEBSD" ++! .ELIF "$(OS)"=="FREEBSD" +! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF ! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE - ! .ENDIF + ! .IF "$(OS)"=="MACOSX" + ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx deleted file mode 100644 index 61a769b34585..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002 -+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002 -@@ -117,7 +117,9 @@ - - /* some platforms have no hotspot yet even under jdk 1.3 */ - /* so treat them like classic in JDK 1.2.x */ --#if defined(POWERPC) && defined(LINUX) -+#if defined(POWERPC) && defined(LINUX) || \ -+ defined(INTEL) && defined(FREEBSD) -+ - #define NO_HOTSPOT_USE_CLASSIC 1 - #else - #undef NO_HOTSPOT_USE_CLASSIC diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+build.pl b/editors/openoffice-1.0/files/patch-solenv+bin+build.pl new file mode 100644 index 000000000000..923b99e5d065 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-solenv+bin+build.pl @@ -0,0 +1,10 @@ +--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003 ++++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003 +@@ -292,7 +292,6 @@ + cwd(); + $! = 0; + system ("$dmake"); +- &print_error("dmake - " . lc($!)) if ($!); + if ($? && ($? != -1) && (!$child)) { + &print_error("Error $? occurred while making $BuildDir"); + }; diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+getcompver.awk b/editors/openoffice-1.0/files/patch-solenv+bin+getcompver.awk deleted file mode 100644 index 62786af61ad5..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+bin+getcompver.awk +++ /dev/null @@ -1,44 +0,0 @@ ---- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002 -+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002 -@@ -61,9 +61,11 @@ - #************************************************************************* - BEGIN { - CCversion = 0 -+ compiler_matched = 0 - } - # Sun c++ compiler - /Sun WorkShop/ { -+ compiler_matched = 1 - # version number right after "C++" - x = match( $0, /C\+\+ .*/ ) - btwn = substr( $0, RSTART, RLENGTH) -@@ -73,12 +75,28 @@ - } - # Microsoft c++ compiler - /Microsoft.*..\...\...../ { -+ compiler_matched = 1 - # match on the format of the ms versions ( dd.dd.dddd ) - x = match( $0, /..\...\...../ ) - CCversion = substr( $0, RSTART, RLENGTH) - } -+# Java -+/java version/ { -+ compiler_matched = 1 -+ # match on the format of the java versions ( d[d].d[d].d[d] ) -+ x = match( $0, /".*\..*\..*"/ ) -+ CCversion = substr( $0, RSTART+1, RLENGTH-2) -+} -+/^[0-9]*[.][0-9]*$/ { -+ if ( compiler_matched == 0 ) { -+# need to blow to x.xx.xx for comparing -+ CCversion = $0 ".0" -+ } -+} - /^[0-9]*[.][0-9]*[.][0-9]*$/ { -- CCversion = $0 -+ if ( compiler_matched == 0 ) { -+ CCversion = $0 -+ } - } - END { - if ( num == "true" ) { diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+_tg_shl.mk b/editors/openoffice-1.0/files/patch-solenv+inc+_tg_shl.mk deleted file mode 100644 index 7a5af08c2811..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+_tg_shl.mk +++ /dev/null @@ -1,282 +0,0 @@ ---- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002 -+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002 -@@ -345,22 +345,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -770,22 +770,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1195,22 +1195,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1620,22 +1620,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2045,22 +2045,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2470,22 +2470,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2895,22 +2895,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3320,22 +3320,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3745,22 +3745,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -4170,22 +4170,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+pstrules.mk b/editors/openoffice-1.0/files/patch-solenv+inc+pstrules.mk deleted file mode 100644 index 6c8e958c188a..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+pstrules.mk +++ /dev/null @@ -1,141 +0,0 @@ ---- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002 -+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002 -@@ -80,15 +80,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -108,15 +108,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -142,15 +142,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -159,23 +159,23 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -195,15 +195,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -212,19 +212,19 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c - .ELSE - +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - .ENDIF - .ENDIF -@@ -246,7 +246,7 @@ - @echo Making: $@ - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) - .IF "$(GUI)"=="OS2" -- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre - .ENDIF - .IF "$(GUI)"=="WNT" - cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+rules.mk b/editors/openoffice-1.0/files/patch-solenv+inc+rules.mk deleted file mode 100644 index 181a71307149..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+rules.mk +++ /dev/null @@ -1,212 +0,0 @@ ---- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002 -+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002 -@@ -78,16 +78,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF - .ENDIF - -@@ -98,16 +98,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - .ENDIF - -@@ -122,17 +122,17 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE # "$(GUI)"=="UNX" - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF # "$(GUI)"=="UNX" - - $(SLO)$/%.obj : %.cpp -@@ -140,17 +140,17 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - - $(SLO)$/%.obj : $(MISC)$/%.cxx -@@ -158,16 +158,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : $(MISC)$/%.cxx -@@ -175,16 +175,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : %.c -@@ -192,20 +192,20 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c - .ELSE - +-@echo Cflags: $(CFLAGS) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -215,13 +215,13 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - $(SEMADEBUG) - .ENDIF - -@@ -230,16 +230,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -249,14 +249,14 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) - .ENDIF - .ENDIF - diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+settings.mk b/editors/openoffice-1.0/files/patch-solenv+inc+settings.mk deleted file mode 100644 index ea6a898a9a6d..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002 -+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002 -@@ -166,7 +166,6 @@ - CDEFSOPT= - HDEFS= - --CC= - .IF "$(add_cflags)"!="" - ENVCFLAGS+=$(add_cflags) - .ENDIF -@@ -264,8 +263,6 @@ - AS= - BC= - COBOL= --CPP= --CXX= - FOR= - PASCAL= - diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+target.mk b/editors/openoffice-1.0/files/patch-solenv+inc+target.mk deleted file mode 100644 index 2379b8bb3189..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+target.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002 -+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002 -@@ -2139,7 +2139,7 @@ - - .IF "$(COMPVERMK)"!="" - .IF "$(UPDATER)"!="" --"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+"$(COMPVERMK)" : - @echo COMNAME:=$(COMNAME) > $@ - @echo COMID:=$(COMID) >> $@ - @echo CCNUMVER:=$(CCNUMVER) >> $@ -@@ -2778,7 +2778,7 @@ - $(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) - .ENDIF - --$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+$(INCCOM)$/_version.h : - .IF "$(GUI)"=="UNX" - @+echo "#define" _BUILD \"$(BUILD)\" > $@ - @+echo "#define" _UPD \"$(UPD)\" >> $@ diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk index 958b4abba555..2a9d4ba1b65c 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk @@ -1,14 +1,11 @@ ---- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002 -+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002 -@@ -319,9 +319,9 @@ +--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 ++++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 +@@ -319,7 +319,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx +- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c ++ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ELSE -- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx + $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" - .ENDIF # "$(UPDATER)"=="YES" - .IF "$(SHL$(TNR)DEFAULTRES)"!="" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk index b189474e5f82..4c2fd26f5c2c 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -1,5 +1,5 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002 +--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003 ++++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003 @@ -1,84 +1,139 @@ - # mak file fuer unxfbsdi @@ -56,8 +56,8 @@ +# environment with graphical user interface +CFLAGSOBJGUIMT=-fPIC --cc= gcc --CC= g++ +-CC= gcc +-CXX= g++ -CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -CFLAGS+= -w -c $(INCLUDE) diff --git a/editors/openoffice-1.0/files/patch-stlport+makefile.mk b/editors/openoffice-1.0/files/patch-stlport+makefile.mk index c55d863b689f..70ec58c3428e 100644 --- a/editors/openoffice-1.0/files/patch-stlport+makefile.mk +++ b/editors/openoffice-1.0/files/patch-stlport+makefile.mk @@ -1,32 +1,36 @@ ---- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 -+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 -@@ -106,11 +106,29 @@ +--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 ++++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003 +@@ -98,16 +98,28 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-3.0-freebsd.mak +-BUILD_FLAGS=-f gcc-3.0.mak ++.IF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc-3.0.mak ++ BUILD_FLAGS=-f gcc-3.0.mak +.ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-freebsd.mak +-# MacOS X/Darwin need a special makefile ++# FreeBSD / MacOS X/Darwin need a special makefile + .IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak +-.ELSE # "$(OS)"=="MACOSX" ++.ELSIF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc.mak -+.ENDIF -+ + BUILD_FLAGS=-f gcc.mak +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" .ENDIF # "$(COMID)"=="gcc3" +-BUILD_ACTION=make + +.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=gmake ++ BUILD_ACTION=gmake +.ELSE - BUILD_ACTION=make ++ BUILD_ACTION=make +.ENDIF + + # build in parallel + BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF - - .IF "$(COM)"=="C52" diff --git a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx index ce51a0e98880..ec91def86fe6 100644 --- a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002 -@@ -62,7 +62,9 @@ +--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 ++++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !(defined NETBSD || defined FREEBSD) +-#ifndef MACOSX ++#if !(defined NETBSD || defined FREEBSD || defined MACOSX) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice-1.0/files/patch-translation-ru b/editors/openoffice-1.0/files/patch-translation-ru deleted file mode 100644 index 316c93a6bfbe..000000000000 --- a/editors/openoffice-1.0/files/patch-translation-ru +++ /dev/null @@ -1,2490 +0,0 @@ -diff -ur ../desktop/source/app/desktop.src ../desktop/source/app/desktop.src ---- ../desktop/source/app/desktop.src Wed Apr 3 16:10:19 2002 -+++ ../desktop/source/app/desktop.src Fri Apr 5 19:05:56 2002 -@@ -206,7 +206,7 @@ - Text [ ENGLISH ] = "The installation path is invalid." ; - Text[ english_us ] = "The installation path is invalid."; - Text[ portuguese ] = "O caminho de instalao no vlido."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is invalid."; - Text[ dutch ] = "Het installatiepad is ongeldig."; - Text[ french ] = "Le chemin d'installation n'est pas valide."; -@@ -232,7 +232,7 @@ - Text [ ENGLISH ] = "The installation path is not available." ; - Text[ english_us ] = "The installation path is not available."; - Text[ portuguese ] = "Foi impossvel determinar o caminho de instalao."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is not available."; - Text[ dutch ] = "Geen installatiepad beschikbaar."; - Text[ french ] = "Impossible de dterminer le chemin d'installation !"; -@@ -414,7 +414,7 @@ - Text [ ENGLISH ] = "Start setup application to repair installation?" ; - Text[ english_us ] = "Do you want to start the setup application to repair your installation?"; - Text[ portuguese ] = "Iniciar a aplicao Setup para reparar a instalao?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to repair installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te repareren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de rparer l'installation ?"; -@@ -440,7 +440,7 @@ - Text [ ENGLISH ] = "Start setup application to check installation?" ; - Text[ english_us ] = "Do you want to start the setup application to check your installation?"; - Text[ portuguese ] = "Start setup application to check installation?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to check installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te controleren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de vrifier l'installation ?"; -diff -ur ../extensions/source/abpilot/abspilot.src ../extensions/source/abpilot/abspilot.src ---- ../extensions/source/abpilot/abspilot.src Wed Apr 3 16:13:42 2002 -+++ ../extensions/source/abpilot/abspilot.src Fri Apr 5 17:43:26 2002 -@@ -809,7 +809,7 @@ - "Do you want to install it as address data source, anyway?"; - Message [ english_us ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; - Message[ portuguese ] = "A fonte de dados no contm nenhuma tabela.\nMesmo assim, configur-la como fonte de dados dos endereos?"; -- Message[ russian ] = " .\n ?"; -+ Message[ russian ] = " .\n ?"; - Message[ greek ] = "The data source does not contain any tables.\nDo you want to install it as address data source, anyway?"; - Message[ dutch ] = "De gegevensbron bevat geen tabel.\nWilt u deze toch als adresgegevensbron inrichten?"; - Message[ french ] = "La source de donnes ne contient aucune table.\nVoulez-vous tout de mme la paramtrer comme source de donnes des adresses ?"; -diff -ur ../extensions/source/dbimport/importdialog.src ../extensions/source/dbimport/importdialog.src ---- ../extensions/source/dbimport/importdialog.src Wed Apr 3 16:13:45 2002 -+++ ../extensions/source/dbimport/importdialog.src Fri Apr 5 17:42:35 2002 -@@ -599,7 +599,7 @@ - "which could not be resolved automatically."; - Text [ english_us ] = "The database file you are about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ portuguese ] = "O ficheiro da base de dados que pretende importar contm uma referncia a uma instalao antiga do StarOffice que no pode ser resolvida automaticamente."; -- Text[ russian ] = " StarOffice, ."; -+ Text[ russian ] = " StarOffice, ."; - Text[ greek ] = "The database file you're about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ dutch ] = "Het te importeren database-bestand bevat een verbinding met een oudere StarOffice-installatie die niet automatisch kon worden verwijderd."; - Text[ french ] = "Le fichier de base de donnes importer contient une rfrence une installation antrieure de StarOffice qui n'a pas pu tre rsolue."; -@@ -728,7 +728,7 @@ - "you would need to substitute $(USER) with $substpath$."; - Text [ english_us ] = "For instance:\nIf you installed StarOffice 5.2 in $defaultpath$, and you are importing your old address book, you would need to substitute $(USER) with $substpath$."; - Text[ portuguese ] = "Por exemplo:\nse instalou o StarOffice 5.2 em $defaultpath$ e desejar importar o seu livro de endereos antigo, ter que substituir $(USER) por $substpath$."; -- Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; -+ Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; - Text[ greek ] = "For instance:\nIf you installed your StarOffice 5.2 in $defaultpath$, and you're importing your old Address Book database file, you would need to substitute $(USER) with $substpath$."; - Text[ dutch ] = "Bijvoorbeeld:\nAls u StarOffice 5.2 in $defaultpath$ heeft genstalleerd en u uw oude adresboek wilt importeren moet u $(USER) vervangen door $substpath$."; - Text[ french ] = "Exemple :\nStarOffice 5.2 est install dans $defaultpath$ et vous voulez importer votre ancien carnet d'adresses : remplacez $(USER) par $substpath$."; -diff -ur ../extensions/source/installation/office/instchk/instdlg.src ../extensions/source/installation/office/instchk/instdlg.src ---- ../extensions/source/installation/office/instchk/instdlg.src Wed Apr 3 16:13:47 2002 -+++ ../extensions/source/installation/office/instchk/instdlg.src Fri Apr 5 17:41:08 2002 -@@ -265,7 +265,7 @@ - }; - Text[ english_us ] = "The %PRODUCTNAME installation is incomplete"; - Text[ portuguese ] = "A instalao do %PRODUCTNAME est incompleta"; -- Text[ russian ] = " %PRODUCTNAME ."; -+ Text[ russian ] = "%PRODUCTNAME ."; - Text[ dutch ] = "De installatie van %PRODUCTNAME is niet compleet"; - Text[ french ] = "L'installation de %PRODUCTNAME est incomplte"; - Text[ spanish ] = "La instalacin de %PRODUCTNAME no est completa"; -diff -ur ../extensions/source/preload/preload.src ../extensions/source/preload/preload.src ---- ../extensions/source/preload/preload.src Wed Apr 3 16:13:51 2002 -+++ ../extensions/source/preload/preload.src Fri Apr 5 17:40:30 2002 -@@ -344,7 +344,7 @@ - Text [ french ] = "Si vous acceptez tous les termes du contrat de licence, cliquez sur '%1'. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击 %1 。如果不同意许可证协议中的条款，则按击 %2 ，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所有的使用許可協定的全部條款，按一下[%1]。若不想接受全部條款，就按一下[%2]，取消安裝。"; -Only in ..: openoffice-641d-cyr_letter.patch -diff -ur ../padmin/source/padialog.src ../padmin/source/padialog.src ---- ../padmin/source/padialog.src Wed Apr 3 16:15:12 2002 -+++ ../padmin/source/padialog.src Fri Apr 5 17:38:14 2002 -@@ -319,7 +319,7 @@ - Text [ English ] = "Noo format file ( with .afm extension ) for font\n%s\n was found, hence the font will not be installed. Format files can be made e.g. with ghostscript and have to reside in the same directory as the font file or in its afm subdir ectory." ; - Text[ english_us ] = "A format file (with an .afm extension) has not been found for the font\n%s\ntherefore, the font cannot be installed. Format files can be created with ghostscript, for example, and have to be located in the same directory as the font files or its afm subdirectory."; - Text[ portuguese ] = "Foi impossvel encontrar o ficheiro de formato (com extenso .afm) para o ficheiro do tipo de letra\n%s\n. Por esta razo no foi possvel instal-lo. Os ficheiros de formato podem ser criados com ghostscript (por exemplo), devendo ser guardados no directrio contendo os ficheiros dos tipos de letra ou num dos respectivos subdirectrios afm."; -- Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; -+ Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; - Text[ greek ] = " \n%s\n ( .afm ). .. ghostscript 'afm'."; - Text[ dutch ] = "Lettertypenbestand\n%s\n kan niet worden genstalleerd daar geen bijbehorend formaatbestand (met extensie .afm) werd gevonden. Formaatbestanden kunnen worden gemaakt met bijv. ghostscript en moeten worden opgeslagen in de directory waarin de lettertypenbestanden staan of in een subdirectory daarvan."; - Text[ french ] = "Aucun fichier de format (d'extension .afm) n'a t dtect pour le fichier de police\n%s\n ; la police ne peut donc pas tre installe. Les fichiers de format peuvent par ex. tre cr avec ghostscript et doivent tre placs dans le mme rpertoire que celui des fichiers de police ou dans le sous-rpertoire afm."; -@@ -344,7 +344,7 @@ - Text [ English ] = "The metric file for font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The metric file for the font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro mtrico para o ficheiro do tipo de letra\n...%s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n . ."; -+ Text[ russian ] = " \n %s\n . ."; - Text[ greek ] = " \n %s\n. ."; - Text[ dutch ] = "Het lettertype werd niet genstalleerd daar het metrische bestand voor lettertypenbestand\n %s\nniet kon worden gekopieerd. "; - Text[ french ] = "Copie du fichier mtrique pour le fichier\n %s\nimpossible, donc impossibilit d'installer la police !"; -@@ -369,7 +369,7 @@ - Text [ English ] = "The font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro dos tipos de letra\n %s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n. ."; -+ Text[ russian ] = " \n %s\n. ."; - Text[ greek ] = " \n %s\n ."; - Text[ dutch ] = "Het lettertype wordt niet genstalleerd daar het lettertypenbestand \n %s\n niet kon worden gekopieerd."; - Text[ french ] = "Copie du fichier de police\n %s\n impossible, donc impossibilit d'installer la police !"; -@@ -394,7 +394,7 @@ - Text[ English ] = "In the fontpath there is no directory containing a writeable fonts.dir file. Therefore no fonts can be installed."; - Text[ english_us ] = "A directory containing a writable fonts.dir file is not located in the Fontpath. Therefore, fonts cannot be installed."; - Text[ portuguese ] = "Foi impossvel encontrar o directrio no \"fontpath\", contendo um ficheiro de escrita fonts.dir. impossvel instalar os tipos de letra."; -- Text[ russian ] = ", fonts.dir, , Fontpath . ."; -+ Text[ russian ] = ", fonts.dir, , Fontpath . ."; - Text[ greek ] = " Fontpath, fonts.dir. ."; - Text[ dutch ] = "Er konden geen lettertypen worden genstalleerd daar er in het pad voor de lettertypen geen directory werd aangetroffen met een beschrijfbaar bestand fonts.dir."; - Text[ french ] = "Aucun rpertoire contenant un fichier d'criture fonts.dir ne se trouve dans le chemin de police (fontpath). Impossible d'installer des polices !"; -@@ -513,7 +513,7 @@ - Text [ english ] = "Installed printers"; - Text[ english_us ] = "Installed ~printers"; - Text[ portuguese ] = "~Impressoras instaladas"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "~Genstalleerde printers"; - Text[ french ] = "Imprimantes installes"; -@@ -2097,7 +2097,7 @@ - - Text[ english_us ] = "Driver Installation"; - Text[ portuguese ] = "Instalao de controlador"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Driver installatie"; - Text[ french ] = "Installation du pilote"; -@@ -2331,7 +2331,7 @@ - Text [ English ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ english_us ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ portuguese ] = "O controlador para a impressora \"%s1\" (%s2) no est instalado, sendo portanto impossvel importar a impressora."; -- Text[ russian ] = " \"%s1\" (%s2) . ."; -+ Text[ russian ] = " \"%s1\" (%s2) . ."; - Text[ greek ] = " \"%s1\" (%s2) . ."; - Text[ dutch ] = "Printer \"%s1\" (%s2) kon niet worden gemporteerd daar er geen driver voor deze printer is genstalleerd."; - Text[ french ] = "Le pilote pour l'imprimante \"%s1\" (%s2) n'est pas install. Impossible d'importer l'imprimante !"; -@@ -2776,7 +2776,7 @@ - Text [english] = "~import printers from a StarOffice installation"; - Text[ english_us ] = "~Import printers from a StarOffice installation"; - Text[ portuguese ] = "~Importar impressoras de uma instalao do StarOffice"; -- Text[ russian ] = "~ StarOffice"; -+ Text[ russian ] = "~ StarOffice"; - Text[ greek ] = "~import printers from a StarOffice installation"; - Text[ dutch ] = "~printers uit een StarOffice installatie importeren"; - Text[ french ] = "~Importer une ou des imprimantes depuis une installation StarOffice"; -diff -ur ../sc/source/ui/src/globstr.src ../sc/source/ui/src/globstr.src ---- ../sc/source/ui/src/globstr.src Wed Apr 3 16:12:05 2002 -+++ ../sc/source/ui/src/globstr.src Fri Apr 5 17:47:28 2002 -@@ -7200,7 +7200,7 @@ - Text [ portuguese ] = "no est disponvel para a verificao ortogrfica. \nControle a sua instalao e, se necessrio,\ninstale a lngua desejada" ; - Text [ portuguese_brazilian ] = "ist f? die Pr?ung nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "没有检查拼写的功能。\n请检查您的安装，如有必要请安装所要使用的语言版本"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla sprawdzania pisowni. \nSprawd prosz instalacj i zainstaluj \newentualnie potrzebny jzyk."; - Text[ japanese ] = "スペル チェック機能はありません。\nインストールされているかチェックして \n必要な場合は該当する言語をインストールしてください。"; - Text[ chinese_traditional ] = " 沒有拼寫檢查的功能。\n請檢查安裝，若有必要請安裝所要使用的語言版本"; -@@ -7281,7 +7281,7 @@ - Text [ portuguese ] = "no est disponvel para o dicionrio de sinnimos. \nControle a sua instalao e, se necessrio, instale \na lngua desejada." ; - Text [ portuguese_brazilian ] = "ist f? den Thesaurus nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "同义词词典不能使用。\n请检查您的安装程序，在必要时请安装要使用的语言版本。"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla Tezaurusa. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - Text[ japanese ] = "これは類義語辞典に使えません。\nインストールをチェックして、\n必要な場合は該当の言語をインストールしてください。"; - Text[ chinese_traditional ] = "同義詞詞典無法使用。\n請檢查您的安裝程序，若有必要，請安裝要使用的語言版本。"; -diff -ur ../scp/source/calc/profile_calc.lng ../scp/source/calc/profile_calc.lng ---- ../scp/source/calc/profile_calc.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/calc/profile_calc.lng Fri Apr 5 19:38:53 2002 -@@ -403,7 +403,7 @@ - 33 = "~Classeur" - 96 = "~Spreadsheet" - 01 = "~Spreadsheet" --07 = "Документ электронной таблицы" -+07 = "~ " - 86 = "工作表文档(~S)" - 31 = "~Werkbladdocument" - 46 = "Tab~elldokument" -@@ -426,7 +426,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -diff -ur ../scp/source/draw/profile_draw.lng ../scp/source/draw/profile_draw.lng ---- ../scp/source/draw/profile_draw.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/draw/profile_draw.lng Fri Apr 5 19:38:17 2002 -@@ -288,7 +288,7 @@ - 33 = "D~essin" - 96 = "~Drawing" - 01 = "~Drawing" --07 = "~Рисунок" -+07 = "~" - 86 = "绘图(~D)" - 31 = "T~ekening" - 46 = "Te~ckning" -diff -ur ../scp/source/impress/profile_impress.lng ../scp/source/impress/profile_impress.lng ---- ../scp/source/impress/profile_impress.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/impress/profile_impress.lng Fri Apr 5 19:38:05 2002 -@@ -431,7 +431,7 @@ - 33 = "~Prsentation" - 96 = "~Presentation" - 01 = "~Presentation" --07 = "Пре~зентация" -+07 = "~" - 86 = "演示文稿(~P)" - 31 = "~Presentatie" - 46 = "~Presentation" -@@ -454,7 +454,7 @@ - 33 = "~Prsentation..." - 96 = "~Presentation..." - 01 = "~Presentation..." --07 = "~Презентация..." -+07 = "~..." - 86 = "演示文稿(~P)..." - 31 = "~Presentatie..." - 46 = "~Presentation..." -diff -ur ../scp/source/lingu/module_lingu.lng ../scp/source/lingu/module_lingu.lng ---- ../scp/source/lingu/module_lingu.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/lingu/module_lingu.lng Fri Apr 5 18:01:56 2002 -@@ -23,9 +23,9 @@ - - [STR_DESC_MODULE_OPTIONAL_OO_ENGLISH] - 49 = "Whlen Sie diese Option, um das englische (US) Sprachmodul zu installieren." --01 = "Select this option to install the English (US) language module." -+01 = "Select this option to install the language module." - 03 = "Seleccione esta opo para instalar o mdulo da lngua inglesa (E.U.A.)." --07 = " () ." -+07 = " ." - 30 = " (..) ." - 31 = "Kies deze optie als u de taalmodule Engels (VS) wilt installeren." - 33 = "Slectionnez cette option pour installer le module de langue anglaise (U.S.A.)" -diff -ur ../scp/source/math/profile_math.lng ../scp/source/math/profile_math.lng ---- ../scp/source/math/profile_math.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/math/profile_math.lng Fri Apr 5 19:37:20 2002 -@@ -58,7 +58,7 @@ - 33 = "F~ormule" - 96 = "F~ormula" - 01 = "F~ormula" --07 = "Формула" -+07 = "~" - 86 = "公式(~O)" - 31 = "F~ormule" - 46 = "F~ormel" -diff -ur ../scp/source/office/basic.lng ../scp/source/office/basic.lng ---- ../scp/source/office/basic.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/office/basic.lng Fri Apr 5 17:51:20 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_PILOTINST1] - 01 = "%PRODUCTNAME %PRODUCTVERSION Setup also installs the module for data matching with PalmPilot organizers. Please note that the PalmPilot synchronization function in your previous %PRODUCTNAME version will be deactivated." - 49 = "%PRODUCTNAME %PRODUCTVERSION Setup installiert auch das Modul fr den Datenabgleich mit PalmPilot-Organizern. Bitte beachten Sie, dass die Funktion zur PalmPilot-Synchronisation in Ihrer lteren %PRODUCTNAME-Version deaktiviert wird." --07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." -+07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." - 55 = "Wenn Sie die PalmPilot-Unterst?zung installieren, verliert Ihre bestehende Installation die PalmPilot-Unterst?zung. M?hten Sie fortfahren ?" - 00 = "-" - 37 = "El programa d'installaci de %PRODUCTNAME %PRODUCTVERSION installar tamb el mdul per a la sincronitzaci de dades amb la PalmPilot. S'ha de tenir en compte que la funci de sincronitzaci amb la PalmPilot es desactivar en la seva versi antiga de %PRODUCTNAME." -@@ -48,7 +48,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -71,7 +71,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about Adabas integration can be found in the %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aquest motiu no s'installar la versi subministrada amb aquest %PRODUCTNAME. A l'Ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci d'Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -94,7 +94,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 00 = " " - 37 = "%PRODUCTNAME no ha pogut trobar els fitxers per a la installaci de la base de dades Adabas. Si vols utilitzar la integraci d'Adabas en %PRODUCTNAME, s'ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar el %PRODUCTNAME. El programa d'installaci d'Adabas es pot descarregar des d'Internet." -@@ -118,7 +118,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -@@ -142,7 +142,7 @@ - [STR_BASIC_PILOTTITEL] - 01 = "PalmPilot Installation" - 49 = "PalmPilot Installation" --07 = " PalmPilot" -+07 = " PalmPilot" - 55 = "PalmPilot installation" - 00 = " " - 37 = "Installaci de PalmPilot" -diff -ur ../scp/source/office/config.lng ../scp/source/office/config.lng ---- ../scp/source/office/config.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/config.lng Fri Apr 5 19:25:36 2002 -@@ -125,7 +125,7 @@ - [STR_SLIDE_6_OPEN] - 49 = "Vielen Dank, dass Sie %PRODUCTNAME %PRODUCTVERSION gewhlt haben!\nWir sind sicher, dass Ihnen Ihre tgliche Arbeit nun noch einfacher und schneller von der Hand geht und mehr Spa bringt. Wir freuen uns, dass Sie sich fr %PRODUCTNAME %PRODUCTVERSION entschieden haben." - 01 = "Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!\nWe hope your everyday work is easier, faster and a lot more fun. Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!" --07 = " Sie %PRODUCTNAME %PRODUCTVERSION\n , , . Sie %PRODUCTNAME %PRODUCTVERSION." -+07 = " %PRODUCTNAME %PRODUCTVERSION\n , , . %PRODUCTNAME %PRODUCTVERSION." - 55 = "Make YOUR Ideas Work!\nKennen Sie schon die tollen Service-Angebote von Star Division, z.B. die ma?geschneiderten und kosteng?stigen Abo-Angebote, mit denen Sie Ihr %PRODUCTNAME noch effizienter einsetzen k?nen? Informieren Sie sich aktuell und bequem im Internet! Wir w?schen Ihnen viel Spa? und Erfolg mit %PRODUCTNAME 5.1." - 37 = "Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!\nEsperem que faci que la vostra feina diria sigui ms fcil, ms rpida i ms amena. Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!." - 03 = "Resta-nos agradecer a sua preferncia!\nDesejamos-lhe um ptimo trabalho com o %PRODUCTNAME %PRODUCTVERSION. O seu trabalho dirio ir ser mais fcil, mais rpido e mais divertido. Parabns pela sua deciso!" -diff -ur ../scp/source/office/module.lng ../scp/source/office/module.lng ---- ../scp/source/office/module.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/module.lng Fri Apr 5 17:52:27 2002 -@@ -23,7 +23,7 @@ - [STR_DESC_MODULE_PRG] - 49 = "In diesem Bereich knnen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 01 = "This is where you decide which %PRODUCTNAME modules are to be installed." --07 = " %PRODUCTNAME." -+07 = " %PRODUCTNAME." - 55 = "In diesem Bereich k?nen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 37 = "Decidiu quins mduls del %PRODUCTNAME s'han d'installar en aquesta secci." - 03 = "Especifique aqui os mdulos do %PRODUCTNAME que deseja instalar." -@@ -159,7 +159,7 @@ - [STR_DESC_MODULE_PRG_WRT] - 49 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processing functions of %PRODUCTNAME provide you with powerful tools for creating your own documents. This program cannot be deselected when installing" --07 = " %PRODUCTNAME , . !" -+07 = " %PRODUCTNAME , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "Les funcions de processament de textos del %PRODUCTNAME us donen potents eines per crear els vostres propis documents. Aquest programa no es pot desseleccionar mentre s'installa" -@@ -206,7 +206,7 @@ - [STR_DESC_MODULE_PRG_WRT_LOCALLY_CACHED] - 49 = "Die Textverarbeitung bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processor provides you with powerful tools for creating text documents. This program cannot be deselected during installion." --07 = " , . !" -+07 = " , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "El processador de textos inclou potents eines per a la creaci de documents de text. Aquest programa no es pot desseleccionar mentre s'installa." -@@ -298,7 +298,7 @@ - [STR_DESC_MODULE_PRG_WRT_FLT] - 49 = "Optional installierbare Im- und Exportfilter fr verschiedene Textverarbeitungen." - 01 = "Optional import and export filters for different word processing programs." --07 = " , , ." -+07 = " , , ." - 55 = "Optional installierbare Im- und Exportfilter f? verschiedene Textverarbeitungen." - 37 = "Filtres opcionals d'importaci i exportaci per a diferents programes de processament de textos." - 03 = "Filtros de importao opcionais para vrios programas de tratamento de texto" -@@ -1606,7 +1606,7 @@ - [STR_NAME_MODULE_OPTIONAL_JAVA] - 49 = "Java Environment Installation" - 01 = "Java Environment Installation" --07 = " Java" -+07 = " Java" - 55 = "Java Environment Installation" - 00 = " " - 37 = "Installaci de l'entorn Java" -@@ -1676,7 +1676,7 @@ - [STR_DESC_MODULE_OPTIONAL_ADABAS] - 49 = "Komponente zur Installation der Adabas-Datenbank." - 01 = "Component for installing the Adabas database" --07 = " Adabas" -+07 = " Adabas" - 55 = "Nicht zu sehen vom User" - 37 = "Component per installar la base de dades Adabas" - 03 = "Componente para a instalao da base de dados Adabas." -diff -ur ../scp/source/office/profile.lng ../scp/source/office/profile.lng ---- ../scp/source/office/profile.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/profile.lng Fri Apr 5 19:36:15 2002 -@@ -589,7 +589,7 @@ - 33 = "~Texte" - 96 = "~Text Document" - 01 = "~Text Document" --07 = "Текстовый документ" -+07 = "~ " - 86 = "文本文档(~T)" - 31 = "~Tekstdocument" - 46 = "~Textdokument" -@@ -612,7 +612,7 @@ - 33 = "Document ~HTML" - 96 = "~HTML Document" - 01 = "~HTML Document" --07 = "Документ ~HTML" -+07 = " ~HTML" - 86 = "~HTML 文档" - 31 = "~HTML-Document" - 46 = "~HTML-dokument" -@@ -635,7 +635,7 @@ - 33 = "~Document matre" - 96 = "to be translated" - 01 = "M~aster Document" --07 = "Главный документ" -+07 = "~ " - 86 = "主控文档(~A)" - 31 = "~Basisdocument" - 46 = "~Samlingsdokument" -@@ -658,7 +658,7 @@ - 33 = "ti~quettes" - 96 = "~Labels" - 01 = "~Labels" --07 = "Наклейки" -+07 = "~" - 86 = "标签(~L)" - 31 = "Et~iketten" - 46 = "Et~iketter" -@@ -681,7 +681,7 @@ - 33 = "Cartes de ~visite" - 96 = "B~usiness Cards" - 01 = "B~usiness Cards" --07 = "Визитные карточки" -+07 = "~" - 86 = "名片(~U)" - 31 = "~Visitekaartjes" - 46 = "~Visitkort" -@@ -704,7 +704,7 @@ - 33 = "Mod~les et documents" - 96 = "F~rom Template..." - 01 = "Templates a~nd Documents" --07 = "Шаблоны и документы" -+07 = "~ " - 86 = "样式和文挡(~N)" - 31 = "~Sjablonen en documenten" - 46 = "M~allar och dokument" -@@ -727,7 +727,7 @@ - 33 = "~Lettre..." - 96 = "~Letter..." - 01 = "~Letter..." --07 = "~Письмо..." -+07 = "~..." - 86 = "信函(~L)..." - 31 = "~Brief..." - 46 = "~Brev..." -@@ -750,7 +750,7 @@ - 33 = "~Fax..." - 96 = "~Fax..." - 01 = "~Fax..." --07 = "~Факс..." -+07 = "~..." - 86 = "传真(~F)..." - 31 = "~Fax..." - 46 = "~Fax..." -@@ -773,7 +773,7 @@ - 33 = "~Agenda..." - 96 = "~Agenda..." - 01 = "~Agenda..." --07 = "~Повестка дня..." -+07 = "~ ..." - 86 = "会议议程(~A)..." - 31 = "~Agenda..." - 46 = "~Agenda..." -@@ -796,7 +796,7 @@ - 33 = "~Mmo..." - 96 = "~Memo..." - 01 = "~Memo..." --07 = "~Памятка..." -+07 = "~..." - 86 = "备忘录(~M)..." - 31 = "~Memo..." - 46 = "P~M..." -@@ -819,7 +819,7 @@ - 33 = "Page ~Web..." - 96 = "~Web Page..." - 01 = "~Web Page..." --07 = "~Web-страница..." -+07 = "~Web-..." - 86 = "网页(~W)..." - 31 = "~Webpagina..." - 46 = "~Webbsida..." -@@ -842,7 +842,7 @@ - 33 = "Form~ulaire..." - 96 = "Form..." - 01 = "Fo~rm..." --07 = "Формуляр..." -+07 = "~..." - 86 = "表单(~R)..." - 31 = "F~ormulier..." - 46 = "F~ormulr..." -@@ -865,7 +865,7 @@ - 33 = "Converti~sseur de documents..." - 96 = "StarOffice 5.2 Database Import..." - 01 = "Document ~Converter..." --07 = "Преобразователь документов..." -+07 = " ~..." - 86 = "文档转换器(~C)..." - 31 = "Documenten-~converter..." - 46 = "Dokument~konverterare..." -@@ -888,7 +888,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -@@ -911,7 +911,7 @@ - 33 = "Import de BD StarOffice 5.2..." - 96 = "~Euro Converter..." - 01 = "StarOffice 5.2 Database Import..." --07 = "Импорт базы данных StarOffice 5.2..." -+07 = " StarOffice 5.2..." - 86 = "输入 StarOffice 5.2 数据库..." - 31 = "StarOffice 5.2 database-import..." - 46 = "StarOffice 5.2 databasimport..." -@@ -926,7 +926,7 @@ - 44 = "Address Data Source..." - 49 = "Adress-Datenquelle..." - 03 = "Fonte de dados de endereços..." --07 = "Исходные данные адресов..." -+07 = " ..." - 30 = "Address Data Source..." - 31 = "Bron addresgegevens..." - 33 = "Source de donnes des adresses..." -@@ -953,7 +953,7 @@ - 86 = "%PRODUCTNAME %PRODUCTVERSION 文本文档" - 88 = "%PRODUCTNAME %PRODUCTVERSION 文字" - 03 = "StarOffice 6.0 Texto" --07 = "StarOffice 6.0 - Текст" -+07 = "%PRODUCTNAME %PRODUCTVERSION " - 30 = "StarOffice 6.0 - Κείμενο" - 31 = "StarOffice 6.0 Tekst" - 33 = "%PRODUCTNAME %PRODUCTVERSION Texte" -diff -ur ../scp/source/office/setuphelp.lng ../scp/source/office/setuphelp.lng ---- ../scp/source/office/setuphelp.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/setuphelp.lng Fri Apr 5 17:59:30 2002 -@@ -30,7 +30,7 @@ - [STR_HELP_INSTALLMODE] - 01 = "The Standard installation is recommended for normal users. It generally installs all components together with a selection of filters.\n\nThe Custom installation shows a dialog in which you can select the individual components to be installed.\n\nThe Minimum installation only installs those components needed to run the application. This option does not install the Help or most of the sample documents and templates." - 49 = "Die Standard Installation wird fr den normalen Anwender empfohlen. Im Allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter.\n\nDie Benutzergesteuerte Installation zeigt Ihnen einen Dialog, in dem Sie die einzeln installierbaren Komponenten anwhlen knnen.\n\nDie Minimale Installation installiert nur die minimal ntigen Komponenten. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen mssen Sie verzichten." --07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." -+07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." - 55 = "Die Standard Installation wird f? den normalen Anwender empfohlen. Im allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter. Wenn Sie diese Option w?hlen, werden Sie im Anschlu? nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll.\n\nDie Benutzergesteuerte Installation zeigt Ihnen ebenfalls zuerst einen Dialog zur Auswahl des Installationsverzeichnisses. Anschlie?end wird ein Dialog gezeigt, in dem Sie die einzeln installierbaren Komponenten anw?hlen k?nen. (Haben Sie das %PRODUCTNAME bereits installiert, k?nen Sie hier einzelne installierte Komponenten wieder abw?hlen, die dann aus der Installation entfernt werden.)\n\nDie Minimale Installation installiert nur die Komponenten, die mindestens n?ig sind, um das %PRODUCTNAME auszuf?ren. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen m?sen Sie verzichten. Wenn Sie diese Option w?hlen, werden Sie nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll." - 37 = "La installaci estndard s la recomanada per a usuaris normals; per regla general installa tots els components juntament amb una selecci de filtres.\n\nLa installaci personalitzada mostra un dileg en qu podeu seleccionar els components individuals que voleu installar.\n\nLa installaci mnima noms installa els components necessaris per executar l'aplicaci. Aquesta opci no installa l'Ajuda ni tampoc la majoria dels documents de mostra ni les plantilles." - 03 = "Para utilizadores comuns, recomenda-se a instalao padro. Esta instalar de forma geral todos os componentes juntamente com uma seleco de filtros.\n\nA instalao personalizada mostra-lhe uma caixa de dilogo para seleco dos componentes que deseja instalar.\n\nNa instalao mnima, sero instalados apenas os componentes mnimos necessrios. Com esta opo, a Ajuda e muitos dos exemplos e modelos de documentos no sero instalados." -@@ -53,7 +53,7 @@ - [STR_HELP_INSTPATH] - 01 = "Specify the directory where this product is to be installed. This folder will then be used to create several files and sub-folders." - 49 = "Geben Sie hier das Verzeichnis ein, in das dieses Produkt installiert werden soll. Einige Dateien werden in diesem Ordner angelegt und es werden weitere Unterordner unter diesem Ordner erstellt." --07 = ", , , . , ." -+07 = ", , , . , ." - 55 = "Geben Sie hier das Verzeichnis ein, in das %PRODUCTNAME Scheduleserver installiert werden soll. In der Vorgabe hei?t dieser Ordner SdlSrv51. Viele Dateien werden in diesem Ordner angelegt, und es werden weitere Unterordner unter diesem Ordner erstellt." - 37 = "Indiqueu el directori on s'ha d'installar aquest producte. Aquesta carpeta s'utilitzar per crear-hi diversos fitxers i subcarpetes." - 03 = "Indique o directrio para a instalao do produto. Nesse directrio sero criados vrios ficheiros e subpastas." -@@ -76,7 +76,7 @@ - [STR_HELP_REINSTALLATION] - 01 = "Modify Installation:\nUse this procedure to either delete individual components that have already been installed or to install additional ones.\n\nDeinstallation:\nThis procedure will delete the files and folders created by the setup program during installation. Files and folders created by the user after installation will not be deleted.\n\nRepair:\nThis option re-enters the application into your operating system's registry. An attempt will be made to restore inadvertently deleted program files." - 49 = "Installation ndern:\nHier knnen Sie die installierten Komponenten einzeln lschen oder weitere Komponenten nachtrglich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner lschen, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. \n\nReparatur:\nDiese Funktion trgt die Anwendung erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gelschte Programmdateien wiederherzustellen." --07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." -+07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." - 55 = "Installation ?ndern:\nHier k?nen Sie die installierten Komponenten einzeln l?chen oder weitere Komponenten nachtr?glich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren.\n\nReparatur:\nDiese Option tr?gt %PRODUCTNAME Scheduleserver erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gel?chte Programmdateien wiederherzustellen." - 37 = "Modifica la installaci:\nUtilitzeu aquest procediment tant per suprimir components individuals que ja s'han installat com per installar-ne d'addicionals.\n\nDesinstallaci:\nAquest procediment suprimeix els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers ni les carpetes que l'usuari ha creat desprs de la installaci.\n\nReparaci:\nAquesta opci torna a introduir l'aplicaci en el registre del sistema operatiu. S'intentar restaurar els fitxers de programa que s'han suprimit inadvertidament." - 03 = "Modificar instalao:\ninstala ou elimina os componentes seleccionados.\n\nDesinstalao:\nelimina os ficheiros e as pastas criados pelo programa setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Se desejar poder tambm eliminar todos os ficheiros.\n\n\nReparao:\nesta opo regista novamente a aplicao no seu sistema operativo e tenta restaurar os ficheiros do programa que tenham sido eliminados involuntariamente." -@@ -99,7 +99,7 @@ - [STR_HELP_UNINSTALL] - 01 = "The files and folders created by the setup program during installation will be deleted. Files and folders created by the user after installation will not be deleted. All of the files needed to run the setup program will not be deleted either. If you want you can have all the files deleted." - 49 = "Es werden die Dateien und Ordner gelscht, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausfhren des Setup Programms bentigt werden, bleiben ebenfalls bestehen. Sie knnen auf Wunsch auch alle Dateien lschen lassen." --07 = " , . , , . , , . ." -+07 = " , . , , . , , . ." - 55 = "Wird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren." - 37 = "Se suprimiran els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers i les carpetes creats per l'usuari desprs de la installaci. Tampoc no se suprimiran tots els fitxers necessaris per executar el programa d'installaci. Si voleu, podeu suprimir tots els fitxers." - 03 = "Sero eliminados os ficheiros e as pastas criados pelo programa Setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Os ficheiros necessrios execuo do programa de instalao (setup) mantm-se intactos. Se desejar poder tambm eliminar todos os ficheiros." -@@ -122,7 +122,7 @@ - [STR_HELP_USERDEFINED] - 01 = "This is where you select the components to be installed. Note that you can select or deselect individual text filters, graphic filters, dictionaries, etc.\n\nThe Default button will reset your changes to the default settings.\n\nIf you want to add or delete components in an existing installation at a later date, call the Setup program again and select the desired components.\n\nBy default, all components marked by a colored box next to the name are installed. If you do not want to install a component, click the respective box. A colorless box indicates the components which will not be installed or are to be deleted from an existing installation. Each click on a box changes it from colored to colorless and vice versa and the component will be installed or deinstalled/not installed.\n\nIf you click the plus sign next to a component, a list of related components is displayed. These can also be installed or deinstalled as described above. A gray box indicates that some components in that group are to be installed and some are to be deinstalled/not installed." - 49 = "Whlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, dass Sie Textfilter, Grafikfilter, Wrterbcher usw. einzeln anwhlen und abwhlen knnen.\n\nDie Schaltflche Standard setzt die Auswahl auf die Standardvorgabe zurck.\n\nWenn Sie nach der Installation Komponenten hinzufgen oder lschen wollen, rufen Sie das Setup Programm erneut auf und whlen Sie hier aus.\n\nStandardmig werden alle Komponenten installiert, deren Kstchen neben den Komponentennamen vollfarbig gefllt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das Kstchen neben dem Namen. Das Kstchen wird farblos, was Ihnen anzeigt, dass diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein Kstchen wechselt es von vollfarbig nach farblos oder umgekehrt und die zugehrige Komponente wird installiert oder nicht installiert.\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ffnen Sie die Liste der untergeordneten Komponenten. Auch diese knnen Sie durch Anklicken installieren oder aus der Installation entfernen. Enthlt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das Kstchen grau." --07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." -+07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." - 55 = "W?hlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, da? Sie Textfilter, Grafikfilter, W?terb?her usw. einzeln anw?hlen und abw?hlen k?nen.\n\nDie Schaltfl?che Standard setzt die Auswahl auf die Standardvorgabe zur?k.\n\nWenn Sie nach der Installation Komponenten hinzuf?en oder l?chen wollen, rufen Sie das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm erneut auf und w?hlen Sie hier aus. In der Netzwerk-Installation sollten Sie alle Komponenten anw?hlen.\n\nStandardm??ig werden alle Komponenten installiert, deren K?stchen neben den Komponentennamen blau gef?lt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das blaue K?stchen neben dem Namen. Das K?stchen wird wei?, was Ihnen anzeigt, da? diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein K?stchen wechselt es von blau nach wei? oder umgekehrt, und die zugeh?ige Komponente wird entweder installiert (blau) oder nicht installiert (wei?).\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ?fnen Sie die Liste der untergeordneten Komponenten. Auch diese k?nen Sie durch Anklicken installieren oder aus der Installation entfernen. Enth?lt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das K?stchen grau." - 37 = "Seleccioneu els components que s'han d'installar aqu. Observeu que podeu seleccionar o desseleccionar filtres de text, filtres grfics, diccionaris, etc. individuals.\n\nEl bot Valors per defecte anullar els canvis i deixar els parmetres per defecte.\n\nSi ms endavant voleu afegir o suprimir components d'una installaci existent, torneu a executar el programa d'installaci i seleccioneu els components desitjats.\n\nPer defecte, s'installaran tots els components marcats amb un quadre blau al costat del nom. Si no voleu installar un component, feu clic al quadre corresponent. Un quadre en blanc indica els components que no s'installaran, o els que se suprimiran d'una installaci existent. Cada clic en un quadre el canvia de blau a blanc i viceversa i el component s'installar (blau) o es desinstallar/no s'installar (blanc).\n\nSi feu clic sobre el signe " - 03 = "Seleccione aqui os componentes que deseja instalar. No esquea que poder seleccionar ou desseleccionar individualmente filtros de texto, filtros grficos, dicionrios, etc.\n\nO boto 'Padro' restaura as predefinies anteriores.\n\nSe, posteriormente, desejar adicionar ou eliminar componentes numa instalao existente, active novamente o programa de instalao (setup) e seleccione os componentes desejados.\n\nAs casas preenchidas a cor indicam que os respectivos componentes sero instaladas de forma padronizada. Se no pretender instalar um desses componentes, clique na respectiva casa. Essa casa deixar de ter cor, indicando que os componentes no sero instalados ou que sero eliminados de uma instalao existente. Com cada clique mudar a cor da casa correspondente: a cor indica que os componentes sero instalados; uma casa sem cor indica que os componentes no sero instalados.\n\nSe fizer clique no sinal de adio que se encontra ao lado de cada um dos componentes, ver uma lista de componentes subordinados. Estes podero tambm ser instalados ou eliminados como acima descrito. Uma casa de cor cinzenta indica que sero instalados somente alguns dos respectivos componentes." -@@ -145,7 +145,7 @@ - [STR_HELP_WELCOME] - 01 = "Welcome to the installation.\n\nFor a detailed description of the installation procedure refer to the Setup Guide.\n\nIn several of the Setup program dialogs there are also Help buttons which access specific information about the settings." - 49 = "Willkommen bei der Installation.\n\nBitte schauen Sie fr eine genaue Anleitung in Ihr Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltflchen. Mit einem Klick erhalten Sie Untersttzung zu den jeweiligen Einstellungen." --07 = " .\n\n .\n\n , ." -+07 = " .\n\n .\n\n , ." - 55 = "Willkommen bei der Installation von %PRODUCTNAME Scheduleserver\n\nBitte schauen Sie f? eine genaue Anleitung in Ihr %PRODUCTNAME Scheduleserver Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltfl?chen. Mit einem Klick erhalten Sie Unterst?zung zu den jeweilligen Einstellungen." - 37 = "Benvingut a la installaci.\n\nPer a una descripci detallada del procediment d'installaci, consulteu la Guia d'installaci.\n\nEn diversos dilegs del programa de configuraci tamb hi ha botons d'ajuda que permeten accedir a la informaci especfica sobre els parmetres." - 03 = "Bem-vindo ao programa de instalao!\n\nPara instrues mais detalhadas, queira consultar o Manual de Instalao.\n\nAo longo da instalao encontrar botes nas diversas caixas de dilogo que lhe do acesso a uma ajuda especfica. Bastar um clique para receber mais informaes sobre os parmetros da caixa de dilogo activa." -@@ -191,7 +191,7 @@ - [STR_HELP_MIGRATION] - 01 = "%PRODUCTNAME can adopt personal data and configuration settings from a previous %PRODUCTNAME installation. To take advantage of this, activate the 'Import personal data' field. The path to the directory in the previous installation appears. If you do not want to accept data and settings from a previous version, unmark the 'Import personal data' check box." - 49 = "%PRODUCTNAME kann persnliche Daten und Konfigurationseinstellungen aus einer frheren %PRODUCTNAME-Installation bernehmen. Wenn Sie dieses wnschen, aktivieren Sie das Feld 'persnliche Daten importieren'. Sie sehen den Pfad zum Verzeichnis der frheren Installation. Wnschen Sie keine bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'persnliche Daten importieren' auf." --07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." -+07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." - 55 = "%PRODUCTNAME kann pers?liche Daten und Konfigurationseinstellungen aus einer fr?eren %PRODUCTNAME-Installation ?ernehmen. Wenn Sie dieses w?schen, aktivieren Sie das Feld 'pers?liche Daten importieren' und geben Sie den vollst?ndigen Pfad zum Verzeichnis der fr?eren Installation ein. Mit der Schaltfl?che Durchsuchen k?nen Sie das Verzeichnis w?hlen. W?schen Sie keine ?bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'pers?liche Daten importieren' auf." - 00 = " " - 37 = "El %PRODUCTNAME pot acceptar les dades personals i els parmetres de configuraci d'una versi anterior. Si voleu fer-ho aix, activeu el camp 'Importa les dades personals' i introduu el cam complet al directori de la versi anterior. Tamb podeu seleccionar el directori utilitzant el bot Navega. Si no voleu acceptar les dades i els parmetres d'una versi anterior, desactiveu el camp 'Importa les dades personals'." -diff -ur ../scp/source/office/unxbasic.lng ../scp/source/office/unxbasic.lng ---- ../scp/source/office/unxbasic.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/unxbasic.lng Fri Apr 5 18:01:11 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -24,7 +24,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about integrating Adabas can be found in %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aix no s'installar la versi subministrada amb aquest %PRODUCTNAME. En l'ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci de Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -47,7 +47,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 37 = "%PRODUCTNAME no ha pogut trobar fitxers per a la installaci de la base de dades Adabas. Si vol utilitzar la integraci de Adabas en %PRODUCTNAME, ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar %PRODUCTNAME. El programa d'installaci d'Adabas el pot descarregar d'Internet." - 03 = "No foi possvel ao %PRODUCTNAME encontrar os ficheiros para a instalao da base de dados Adabas. Para utilizar a integrao Adabas no %PRODUCTNAME ter que iniciar o programa de instalao do Adabas (Setup) manualmente, aps concluir a instalao do %PRODUCTNAME. Carregue os ficheiros de instalao do Adabas via Internet." -@@ -70,7 +70,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -diff -ur ../setup2/source/custom/jvmsetup/jvmdlg.src ../setup2/source/custom/jvmsetup/jvmdlg.src ---- ../setup2/source/custom/jvmsetup/jvmdlg.src Wed Apr 3 16:11:09 2002 -+++ ../setup2/source/custom/jvmsetup/jvmdlg.src Fri Apr 5 19:01:36 2002 -@@ -77,7 +77,7 @@ - Text[ ENGLISH ] = "Java Setup" ; - Text[ english_us ] = "Java Setup"; - Text[ portuguese ] = "Java Setup"; -- Text[ russian ] = " Java"; -+ Text[ russian ] = " Java"; - Text[ dutch ] = "Java Setup"; - Text[ french ] = "Programme d'installation de Java (Setup)"; - Text[ spanish ] = "Java Setup"; -@@ -305,7 +305,7 @@ - Text[ENGLISH] = "~Install..."; - Text[ english_us ] = "~Install..."; - Text[ portuguese ] = "~Instalar..."; -- Text[ russian ] = "..."; -+ Text[ russian ] = "..."; - Text[ dutch ] = "~Installeren..."; - Text[ french ] = "~Installer..."; - Text[ spanish ] = "I~nstalar..."; -@@ -337,7 +337,7 @@ - Message = "Es wurde keine Java Untersttzung ausgewhlt.\nDies ist jedoch fr PGP erforderlich. Wollen Sie PGP dennoch installieren?\nMit Abbruch kommen Sie zurck zum Dialog." ; - Message [ english_us ] = "No Java support is selected.\nFor PGP you need Java. Do you want to install PGP anyway?\nCancel will bring you back to the dialog." ; - Message[ portuguese ] = "No foi seleccionado o suporte Java.\nO PGP no funciona sem este suporte. Mesmo assim, instalar o PGP?\nPara voltar caixa de dilogo, clique em Cancelar."; -- Message[ russian ] = " Java .\n PGP. PGP ?\n ."; -+ Message[ russian ] = " Java .\n PGP. PGP ?\n ."; - Message[ greek ] = " Java.\n PGP. PGP ;\n? "; - Message[ dutch ] = "Er werd geen Java support geselecteerd.\nDaardoor kan PGPniet functioneren. Wilt u PGP toch installeren?\nMet Annuleren komt u terug naar de dialoog."; - Message[ french ] = "Aucun support Java n'a t slectionn.\nCelui-ci est indispensable pour que PGP fonctionne. Voulez-vous quand mme installer PGP ?\nAnnuler vous permet de retourner la bote de dialogue."; -@@ -354,7 +354,7 @@ - Message[ turkish ] = "Java destei seilmedi.\nPGP, Java destei olmadan alamaz. PGP'yi yine de kurmak istiyor \n musunuz?ptal seerseniz pencereye geri dneceksiniz."; - Message[ arabic ] = " .\n PGP. PGP ߿\n ѡ "; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; -@@ -385,7 +385,7 @@ - Message = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?" ; - Message [ english_us ] = "Some program functions require Java to be supported. Please note: %PRODUCTNAME Help requires a Java Runtime Environment of 1.2 or higher to be supported by your system.\n\nAre you sure you want to continue with installation?" ; - Message[ portuguese ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; -- Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; -+ Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; - Message[ greek ] = " Java. %PRODUCTNAME Java ( 1.2 ) .\n\n ;"; - Message[ dutch ] = "Bepaalde programmafuncties zijn alleen uitvoerbaar met ondersteuning van Java. Wij maken u erop attent dat voor %PRODUCTNAME-Help een Java Runtime Environment vanaf versie 1.2 op uw systeem wordt benodigd.\n\nWilt u toch doorgaan met de installatie?"; - Message[ french ] = "Certaines fonctions du programme exigent un support Java. Veuillez noter que l'aide de %PRODUCTNAME ncessite un environnement Java Runtime version 1.2 ou plus.\n\ntes-vous sr de vouloir poursuivre l'installation ?"; -@@ -402,7 +402,7 @@ - Message[ turkish ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; - Message[ arabic ] = " . %PRODUCTNAME Java Runtime Environment 1.2 .\n\n ?"; - Title[ portuguese ] = "Para algumas das funes do programa necessrio um suporte Java. No esquea que a Ajuda do %PRODUCTNAME precisa de um ambiente Java Runtime a partir da verso 1.2 no seu sistema.\n\nProsseguir com a instalao?"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installatie"; - Title[ french ] = "Installation"; -@@ -440,14 +440,14 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt, wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt onderbreken?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您就无法使用这个程序！\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu,nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "ここでインストールを中止すると、インストールは不完全のまま終了し、プログラムの実行はできません。\nインストールを中止してかまいませんか。"; - Message[ chinese_traditional ] = "如果您現在取消安裝，安裝的程式就不會完整，也可能無法啟動！\n您真要取消安裝？"; - Message[ arabic ] = " !\n ʿ"; - Title[ english_us ] = "Installation"; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; - Title[ spanish ] = "Installation"; -@@ -679,7 +679,7 @@ - TEXT [ ENGLISH ] = "Java Environment Installation" ; - TEXT[ english_us ] = "Java Environment Installation"; - TEXT[ portuguese ] = "Instalao do Java Environment"; -- TEXT[ russian ] = " Java Environment "; -+ TEXT[ russian ] = " Java Environment "; - TEXT[ dutch ] = "Installatie van Java- environment"; - TEXT[ french ] = "Installation de l'environnement Java"; - TEXT[ spanish ] = "Instalacin de Java Environment"; -diff -ur ../setup2/source/service/progressdlg.src ../setup2/source/service/progressdlg.src ---- ../setup2/source/service/progressdlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/service/progressdlg.src Fri Apr 5 18:57:00 2002 -@@ -91,7 +91,7 @@ - Text = "Ihre Installation wird jetzt vervollstndigt!\nBitte haben Sie einen Moment Geduld." ; - Text [ english_us ] = "Installation is now being completed\nPlease wait a moment." ; - Text[ portuguese ] = "A sua instalao ser agora concluda!\nQueira aguardar alguns instantes."; -- Text[ russian ] = " .\n, ."; -+ Text[ russian ] = " .\n, ."; - Text[ greek ] = " !\n ."; - Text[ dutch ] = "Uw installatie wordt nu voltooid!\nEen ogenblik geduld a.u.b."; - Text[ french ] = "Achvement de l'installation...\nVeuillez patienter."; -diff -ur ../setup2/source/ui/app.src ../setup2/source/ui/app.src ---- ../setup2/source/ui/app.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/app.src Fri Apr 5 18:20:27 2002 -@@ -167,7 +167,7 @@ - Text [ dutch ] = "De installatie wordt voorbereid" ; - Text [ portuguese ] = "A preparar a instalao" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowanie instalacji"; - Text[ japanese ] = "インストールの準備"; - Text[ chinese_traditional ] = "準備安裝程式"; -@@ -504,7 +504,7 @@ - Text [ french ] = "Installation de l'utilisateur %1 en cours" ; - Text [ dutch ] = "Gebruiker %1 wordt genstalleerd" ; - Text[ chinese_simplified ] = "建立使用者 %1 。"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Instalacja uytkownika %1"; - Text[ japanese ] = "ユーザー %1 がインストールされます"; - Text[ chinese_traditional ] = "建立使用者 %1 。"; -@@ -636,7 +636,7 @@ - Text [ portuguese ] = "Foram instalados novos conjuntos de caracteres. Para que estes estejam disponveis para todos os programas necessrio reiniciar o sistema." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; - Text[ chinese_simplified ] = "在安装过程中，已经安装了新的字体。为了让所有的应用程序能够使用这些字体，您必须重新启动重新您的系统。"; -- Text[ russian ] = " . , ."; -+ Text[ russian ] = " . , ."; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, wymagane jest ponowne rozpoczcie."; - Text[ japanese ] = "新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するためには、コンピュータを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝軟體時加入了一些新的字型。為了讓所有的應用程式能夠使用這些字型，請重新啟動電腦。"; -@@ -767,7 +767,7 @@ - Text [ portuguese ] = "A instalao est a ser preparada." ; - Text [ portuguese_brazilian ] = "Installation wird vorbereitet" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowywanie instalacji"; - Text[ japanese ] = "インストールの準備をしています。"; - Text[ chinese_traditional ] = "正在準備安裝"; -@@ -793,7 +793,7 @@ - Text [ portuguese ] = "Os dados da instalao esto a ser guardados." ; - Text [ portuguese_brazilian ] = "Installationsdaten werden gesichert." ; - Text[ chinese_simplified ] = "存盘安装数据。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dane instalacji bd zapisane."; - Text[ japanese ] = "インストールデータを保存しています。"; - Text[ chinese_traditional ] = "正在儲存安裝數據"; -@@ -819,7 +819,7 @@ - Text [ portuguese ] = "O programa %1 no foi encontrado. A verso actualizada no pode ser instalada." ; - Text [ portuguese_brazilian ] = "Das Programm %1 wurde nicht gefunden. Das Update kann nicht installiert werden." ; - Text[ chinese_simplified ] = "没有找到程序 %1 。无法安装升级服务包。"; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ polish ] = "Nie znaleziono programu %1. Nie mona zainstalowa aktualizacji."; - Text[ japanese ] = "プログラム %1 は見つかりません。更新インストールはできません。"; - Text[ chinese_traditional ] = "沒有找到程式 %1 。無法安裝升級軟體。"; -@@ -935,7 +935,7 @@ - Text [ french ] = "Vous n'tes pas autoris installer ce ServicePack sur une version de dmonstration (Try&Buy)." ; - Text [ dutch ] = "Met een Try&Buy-Version bestaat geen recht op het installeren van dit ServicePack." ; - Text[ chinese_simplified ] = "您使用的是'先用后买'版本，因此您不能安装这个服务包。"; -- Text[ russian ] = " Try&Buy ServicePack."; -+ Text[ russian ] = " Try&Buy ServicePack."; - Text[ polish ] = "Wersja Try&Buy nie upowania do instalacji ServicePack."; - Text[ japanese ] = "Try＆Buy バージョンで、この ServicePack をインストールできません。"; - Text[ chinese_traditional ] = "您使用的是'先用後買'版本﹐因此您無法安裝這個升級軟體。"; -@@ -960,7 +960,7 @@ - Text [ french ] = "L'installation du ServicePack a chou." ; - Text [ dutch ] = "De server kon niet worden genstalleerd." ; - Text[ chinese_simplified ] = "无法安装这个服务包。"; -- Text[ russian ] = " ServicePack ."; -+ Text[ russian ] = " ServicePack ."; - Text[ polish ] = "Instalacja ServicePack nie moga zosta przeprowadzona."; - Text[ japanese ] = "ServicePack のインストールは実行できませんでした｡"; - Text[ chinese_traditional ] = "無法安裝這個升級軟體。"; -@@ -985,7 +985,7 @@ - Text [ french ] = "Aucun kit d'installation n'a t trouv sur le chemin indiqu." ; - Text [ dutch ] = "In het aangegeven pad werd geen installatiebestand gevonden." ; - Text[ chinese_simplified ] = "在您给定的路径内无法找到任何安装文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "W podanej ciece nie znaleziono plikw instalacyjnych."; - Text[ japanese ] = "指定したパスに、インストールファイルは見つかりませんでした。"; - Text[ chinese_traditional ] = "在您輸入的路徑內無法找到任何安裝檔案。"; -@@ -1011,7 +1011,7 @@ - Text [ portuguese ] = "Esta verso \"Try & Buy\" no pode ser instalada novamente neste computador." ; - Text [ portuguese_brazilian ] = "Diese Try&Buy-Version kann nicht erneut auf diesem Computer installiert werden." ; - Text[ chinese_simplified ] = "无法在您的计算机上重新安装这个'先用后买'版本。"; -- Text[ russian ] = " Try&Buy ."; -+ Text[ russian ] = " Try&Buy ."; - Text[ polish ] = "Wersja Try&Buy nie moe by ponownie zainstalowana na tym komputerze."; - Text[ japanese ] = "この Try＆Buy バージョンは、このコンピュータに再インストールできません。"; - Text[ chinese_traditional ] = "無法在您的電腦上重新安裝這個'先用後買'版本。"; -@@ -1095,7 +1095,7 @@ - Message = "Soll die Installation auf '%s' jetzt komplett gelscht werden?\n\nBitte beachten Sie, dass Sie in ein Wurzelverzeichnis installiert haben, dabei wird der komplette Datentrger gelscht!" ; - Message [ english_us ] = "Do you want to delete the installation on '%s' completely?\n\nPlease note that if you have installed the program in a root directory the entire drive content will be deleted." ; - Message[ portuguese ] = "Eliminar agora a instalao em '%s'?\n\nNo esquea que fez a instalao num directrio-raz e desta forma eliminar todo o contedo do disco."; -- Message[ russian ] = " '%s'?\n\n, , ; ."; -+ Message[ russian ] = " '%s'?\n\n, , ; ."; - Message[ dutch ] = "Wilt u dat de installatie op '%s' nu compleet wordt gewist?\n\nWij wijzen u erop dat deze zich bevindt in een root-directory, zodat dan de complete inhoud van de drive wordt gewist!"; - Message[ french ] = "Voulez-vous vraiment supprimer l'installation sur '%s' dans sa totalit ?\n\nNotez que vous supprimerez dans ce cas tout le contenu du mdia, tant donn que vous y avez effectu l'installation dans un rpertoire racine."; - Message[ spanish ] = "Desea eliminar completamente la instalacin en '%s'?\n\nTenga en cuenta que ha hecho la instalacin en un directorio raz, con lo que se eliminar la totalidad del disco."; -@@ -1165,7 +1165,7 @@ - Message [ portuguese ] = "A verso instalada do ficheiro %1 melhor do que aquela que deseja instalar agora. Deseja continuar com a instalao?" ; - Message [ portuguese_brazilian ] = "Die installierte Version der Datei %1 ist h?erwertig, als die die Sie jetzt installieren wollen. Soll die Installation fortgesetzt werden?" ; - Message[ chinese_simplified ] = "这个安装的文件 %1 版本比您现在想要安装的要新。要继续安装？"; -- Message[ russian ] = " %1 , , . ?"; -+ Message[ russian ] = " %1 , , . ?"; - Message[ polish ] = "Zainstalowana wersja pliku %1 jest bardziej wartociowa, ni ta, ktr chcesz zainstalowa. Czy kontynuowa instalacj?"; - Message[ japanese ] = "ファイル %1 にインストールされたバージョンは、今インストールしようとしているものよりアップグレードされています。インストールを続行しますか。"; - Message[ chinese_traditional ] = "這個安裝的檔案 %1 版本比現在要安裝的要新。要繼續安裝？"; -@@ -1199,7 +1199,7 @@ - Message [ spanish ] = "Desea realmente eliminar la instalacin actual?" ; - Message [ english_us ] = "Are you sure you want to delete the current installation?" ; - Message[ chinese_simplified ] = "您真的要删除现存的安装程序吗？"; -- Message[ russian ] = " , ?"; -+ Message[ russian ] = " , ?"; - Message[ polish ] = "Czy na pewno usun aktualn instalacj?"; - Message[ japanese ] = "既存のインストールを本当に削除しますか。"; - Message[ chinese_traditional ] = "您真要移除現存的安裝程式？"; -@@ -1230,7 +1230,7 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt stoppen?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您也就无法使用这个程序。\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu, nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "インストールをここで中止すると、インストールが不完全のまま終了し、プログラムの実行はできません。\n中止してもかまいませんか。"; - Message[ chinese_traditional ] = "若現在中斷安裝，程式安裝就會不完全。您也就無法使用這個軟件。\n您真要取消安裝？"; -@@ -1260,7 +1260,7 @@ - Message [ dutch ] = "De geselecteerde modules en componenten zijn\nnu op uw harde schijf genstalleerd/gedenstalleerd.\n" ; - Message [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido.\n" ; - Message[ chinese_simplified ] = "在硬盘上已经安装或删除\n您选择的模块和组件。\n"; -- Message[ russian ] = " / \n .\n"; -+ Message[ russian ] = " / \n .\n"; - Message[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay\nzainstalowane / zdeinstalowane na / z dysku twardym/twardego.\n"; - Message[ japanese ] = "選択したモジュールとコンポーネントが、\nハードディスク上にインストールされました / 削除されました。\n"; - Message[ chinese_traditional ] = "在您的磁碟上已經安裝/ 移除了\n您選擇的模塊和元件。\n"; -@@ -1291,7 +1291,7 @@ - Message [ portuguese ] = "Instalao reparada.\n" ; - Message [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Message[ chinese_simplified ] = "已经修补了安装。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Instalacja zostaa naprawiona.\n"; - Message[ japanese ] = "インストールは修復されました。\n"; - Message[ chinese_traditional ] = "已經修補了安裝。\n"; -@@ -1322,7 +1322,7 @@ - Message [ portuguese ] = "A desinstalao foi terminada.\n" ; - Message [ portuguese_brazilian ] = "Die Deinstallation ist beendet.\n" ; - Message[ chinese_simplified ] = "已经完成撤除程序。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Deinstalacja zakoczona.\n"; - Message[ japanese ] = "インストールの削除が完了しました。\n"; - Message[ chinese_traditional ] = "已經完成移除程式。\n"; -@@ -1357,7 +1357,7 @@ - Message [ portuguese ] = "Deseja que o programa de instalao modifique o ficheiro 'CONFIG.SYS' para registar o atalho do programa em LIBPATH?\n 'CONFIG.SYS' ser guardado como 'CONFIG.SET'." ; - Message [ portuguese_brazilian ] = "Soll das Installationsprogramm f? Sie die Datei 'CONFIG.SYS' ?ndern, um den Programm-Pfad in LIBPATH einzutragen?\nDie alte 'CONFIG.SYS' wird als 'CONFIG.SET' gesichert." ; - Message[ chinese_simplified ] = "您允许安装助理程序修改 'CONFIG.SYS' 文件并在 LIBPATH 处加入程序路径吗？\n旧的 'CONFIG.SYS' 文件会被保存并命名为 'CONFIG.SET' 。"; -- Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; -+ Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; - Message[ polish ] = "Czy program instalacyjny ma zmieni plik 'CONFIG.SYS', aby wpisa ciek programu do LIBPATH?\nStary plik 'CONFIG.SYS' zostanie zapisany jako 'CONFIG.SET'."; - Message[ japanese ] = "プログラムパスを LIBPATH に追加するため、インストールプログラムが 「CONFIG.SYS」ファイルを変更してもかまいませんか。\n旧「CONFIG.SYS」は「CONFIG.SET」として保存されます。"; - Message[ chinese_traditional ] = "您允許安裝助理程式修改 CONFIG.SYS 檔案並在 LIBPATH 處加入程式路徑？\n舊的 CONFIG.SYS 檔案會被儲存並命名為 CONFIG.SET 。"; -diff -ur ../setup2/source/ui/dialog/dialog.src ../setup2/source/ui/dialog/dialog.src ---- ../setup2/source/ui/dialog/dialog.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/dialog.src Fri Apr 5 18:56:15 2002 -@@ -722,7 +722,7 @@ - Text [ spanish ] = "en la unidad de instalacin." ; - Text [ english_us ] = "into the installation drive." ; - Text[ chinese_simplified ] = "到安装驱动盘内。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "do napdu instalacyjnego."; - Text[ japanese ] = "インストールドライブへ挿入してください。"; - Text[ chinese_traditional ] = "到安裝驅動器內。"; -@@ -778,7 +778,7 @@ - Text [ french ] = "L'installation prcdente du" ; - Text [ dutch ] = "Uw oude installatie van" ; - Text[ chinese_simplified ] = "您以前的安装版本"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Twojej starej instalacji"; - Text[ japanese ] = "ユーザーの旧インストール"; - Text[ chinese_traditional ] = "舊的安裝版本"; -@@ -826,7 +826,7 @@ - Text [ french ] = "Pour installer la mise jour de %1, vous avez besoin de vos anciens fichiers d'installation. Veuillez indiquer le chemin du rpertoire dans lequel ils se trouvent." ; - Text [ dutch ] = "Om de upgrade voor %1 te kunnen installeren heeft u uw oude installatiebestanden nodig. Geef hier het pad aan naar de map waarin deze zich bevinden." ; - Text[ chinese_simplified ] = "安装升级软件 %1 需要旧的安装文件。请输入搜寻安装文件的目录路径："; -- Text[ russian ] = " %1, . , , , :"; -+ Text[ russian ] = " %1, . , , , :"; - Text[ polish ] = "Aby zainstalowa aktualizacj dla %1, wymagane s stare pliki instalacyjne. Prosz podaj tutaj katalog, w ktrym mona odnale pliki instalacyjne."; - Text[ japanese ] = "%1 の更新をインストールするには、旧インストールファイルが必要です。インストールファイルを見つけるディレクトリパスを入力してください:"; - Text[ chinese_traditional ] = "安裝升級軟體 %1 需要舊的安裝檔案。請輸入搜尋安裝檔案的目錄路徑："; -@@ -909,7 +909,7 @@ - PosSize = MAP_APPFONT ( 40 , 12 , 268 , 16 ) ; - WordBreak = TRUE ; - Text[ chinese_simplified ] = "这段文字含有附加的安装程序的重要信息。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Tutaj znajduj si dodatkowe informacje o zainstalowanym programie."; - Text[ japanese ] = "このテキストはインストールされたプログラムに対する追加および重要な情報を含んでいます。"; - Text[ chinese_traditional ] = "這段文字含有附加的關於安裝程式的重要訊息。"; -@@ -1186,7 +1186,7 @@ - Text [ english_us ] = "Continue the installation anyway?" ; - Left = TRUE ; - Text[ chinese_simplified ] = "您还是要继续执行安装？"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ polish ] = "Czy chcesz mimo to kontynuowa instalacj?"; - Text[ japanese ] = "それでもインストールを続行しますか?"; - Text[ chinese_traditional ] = "還是要繼續執行安裝？"; -diff -ur ../setup2/source/ui/dialog/strings.src ../setup2/source/ui/dialog/strings.src ---- ../setup2/source/ui/dialog/strings.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/strings.src Fri Apr 5 18:56:39 2002 -@@ -77,7 +77,7 @@ - Text [ spanish ] = "Instalacin" ; - Text [ english_us ] = "Installation" ; - Text[ chinese_simplified ] = "安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Instalacja"; - Text[ japanese ] = "インストール"; - Text[ chinese_traditional ] = "安裝"; -@@ -120,7 +120,7 @@ - Text = "Mchten Sie das %1 Installationsprogramm wirklich beenden?" ; - Text [ english_us ] = "Do you really want to exit the %1 installation program?" ; - Text[ portuguese ] = "Deseja realmente terminar o programa de instalao %1?"; -- Text[ russian ] = " %1?"; -+ Text[ russian ] = " %1?"; - Text[ greek ] = " %1;"; - Text[ dutch ] = "Wilt u het installatieprogramma %1 werkelijk bendigen?"; - Text[ french ] = "Voulez-vous vraiment quitter l'installation de %1 ?"; -diff -ur ../setup2/source/ui/error.src ../setup2/source/ui/error.src ---- ../setup2/source/ui/error.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/error.src Fri Apr 5 18:23:51 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Error al instalar la clase WPStarWriter!" ; - Text [ english_us ] = "Error installing the class WPStarWriter!" ; - Text[ chinese_simplified ] = "在安装 WPStarWriter 程序类时发生错误！"; -- Text[ russian ] = " WPStarWriter!"; -+ Text[ russian ] = " WPStarWriter!"; - Text[ polish ] = "Bd podczas instalacji klasy WPStarWriter!"; - Text[ japanese ] = "WP%PRODUCTNAME Writer クラスをインストールするときのエラー。"; - Text[ chinese_traditional ] = "安裝 WPStarWriter 程式類時發生錯誤！"; -@@ -374,7 +374,7 @@ - Text [ french ] = "Impossible d'installer le fichier de police %1.\nIl se peut qu'il soit utilis par un autre programme. Une fois l'installation termine, quittez tous les programmes et ressayer d'installer cette police." ; - Text [ dutch ] = "Lettertypenbestand %1 kon niet worden genstalleerd.\nEventueel wordt dit bestand nog gebruikt door een ander programma. Beindig na de installatie alle programmas en installeer Font eventueel opnieuw." ; - Text[ chinese_simplified ] = "无法装入字体文件 %1 。\n可能是有一个程序还在使用这个字体文件。请您在安装结束之后关闭所有的应用程序，如有必要请您重新安装这个字体。"; -- Text[ russian ] = " %1.\n, . ."; -+ Text[ russian ] = " %1.\n, . ."; - Text[ polish ] = "Pliku czcionek %1 nie mona byo zainstalowa.\nPrawdopodobnie ten plik uywany jest przez inne programy. Zakocz po instalacji wszystkie programy i sprbuj zainstalowa plik czcionek jeszcze raz."; - Text[ japanese ] = "フォントファイル %1 をインストールできませんでした。\nまだほかのプログラムでこのファイルが使用されているのかもしれません。インストール後すべてのプログラムを終了して、必要ならもう一度フォントをインストールします。"; - Text[ chinese_traditional ] = "無法裝載字型檔案 %1 。\n可能是有一個程式還在使用這個字型檔案。請您在安裝結束之後關閉所有的應用程式，若有必要請重新安裝這個字型。"; -@@ -400,7 +400,7 @@ - Text [ french ] = "Impossible d'installer le fichier %1.\nUn autre programme ou le systme d'exploitation utilise probablement ce fichier." ; - Text [ dutch ] = "Het bestand %1 kon niet worden genstalleerd.\nEventueel wordt dit nog door een ander programma of door het besturingssysteem gebruikt." ; - Text[ chinese_simplified ] = "无法安装文件 %1 。\n可能是有一个程序或操作平台正在使用这个文件。"; -- Text[ russian ] = " %1.\n, ."; -+ Text[ russian ] = " %1.\n, ."; - Text[ polish ] = "Pliku %1 nie mona byo zainstalowa.\nPrawdopodobnie jest on uywany przez inny program lub przez inny system operacyjny."; - Text[ japanese ] = "ファイル %1 をインストールできませんでした。\nほかのプログラム、またはオペレーティングシステムでこのファイルがまだ使用されているのかもしれません。"; - Text[ chinese_traditional ] = "無法安裝檔案 %1 。\n可能是有一個程式或操作系統正在使用這個檔案。"; -@@ -457,7 +457,7 @@ - Text [ spanish ] = "\nEl programa ya est instalado en el directorio. " ; - Text [ english_us ] = "\nThe program is already installed in the directory " ; - Text[ chinese_simplified ] = "\n程序已经安装在目录内 "; -- Text[ russian ] = "\n "; -+ Text[ russian ] = "\n "; - Text[ polish ] = "\nProgram jest ju w katalogu "; - Text[ japanese ] = "\nプログラムはすでにディレクトリにあります。 "; - Text[ chinese_traditional ] = "\n程式已經安裝在目錄內 "; -@@ -510,7 +510,7 @@ - Text [ spanish ] = "\n\nContinuar la instalacin? " ; - Text [ english_us ] = "\n\nDo you want to continue the installation? " ; - Text[ chinese_simplified ] = "\n\n继续安装？ "; -- Text[ russian ] = "\n\n ? "; -+ Text[ russian ] = "\n\n ? "; - Text[ polish ] = "\n\nKontynuowa instalacj? "; - Text[ japanese ] = "\n\nインストールを続けますか。 "; - Text[ chinese_traditional ] = "\n\n繼續安裝？ "; -@@ -537,7 +537,7 @@ - Text [ spanish ] = "An est abierta una aplicacin instalada!\nSe cancelar la desinstalacin.\n\nAplicacin: " ; - Text [ english_us ] = "An installed application is still open!\nDeinstallation aborted.\n\nApplication: " ; - Text[ chinese_simplified ] = "一个已经安装好的程序组件还处于运行状态！\n现在中断执行撤除程序。\n\n程序: "; -- Text[ russian ] = " !\n .\n\n: "; -+ Text[ russian ] = " !\n .\n\n: "; - Text[ polish ] = "Zainstalowana aplikacja jest jeszcze otwarta!\nDeinstalacja zostanie przerwana.\n\nAplikacja: "; - Text[ japanese ] = "インストールしたアプリケーションは、まだ開いたままです。\nインストールの削除を中止します。\n\nアプリケーション: "; - Text[ chinese_traditional ] = "一個已經安裝好的程式還處於運行狀態！\n現在中斷移除程式。\n\n程式： "; -@@ -562,7 +562,7 @@ - Text [ portuguese ] = "Impossvel copiar o ficheiro %1.\nCdigo de erro: %2\nProvavelmente a disquete est danificada.\nA instalao ser cancelada." ; - Text [ portuguese_brazilian ] = "Die Datei %1 konnte nicht kopiert werden.\nFehlercode: %2\nWahrscheinlich ist die Diskette defekt.\nDie Installation wird abgebrochen." ; - Text[ chinese_simplified ] = "无法复制文件 %1 。\n错误码: %2\n可能是软盘已损坏了。 \n现在中断安装。"; -- Text[ russian ] = " %1 .\n : %2\n .\n ."; -+ Text[ russian ] = " %1 .\n : %2\n .\n ."; - Text[ polish ] = "Plik %1 nie mg zosta skopiowany.\nBdny kod: %2\nPrawdopodobnie nastpio uszkodzenie dyskietki.\nInstalacja przerwana."; - Text[ japanese ] = "ファイル %1 をコピーできませんでした。\nエラーコード: %2\nフロッピーディスクの不良かもしれません。\nインストールを中止します。"; - Text[ chinese_traditional ] = "無法複製檔案 %1 。\n錯誤碼：%2\n可能是磁片已損壞了。 \n現在中斷安裝。"; -@@ -588,7 +588,7 @@ - Text [ portuguese ] = "O programa de instalao encontrou uma verso instalada no diretrio %1. Desinstale primeiro esta verso antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm hat eine installierte Version im Verzeichnis %1 gefunden. Bitte erst diese Version deinstallieren, bevor Sie diese Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序发现在目录 %1 有一个程序版本。请您先撤除这个程序，然后再重新启动安装。"; -- Text[ russian ] = " %1. , , , ."; -+ Text[ russian ] = " %1. , , , ."; - Text[ polish ] = "Program instalacyjny znalaz zainstalowan wersj w katalogu %1. Prosz odinstalowa najpierw t wersj, zanim rozpoczniesz instalacj ponownie."; - Text[ japanese ] = "ディレクトリ %1 にインストールされたバージョンを、インストールプログラムが見つけました。セットアップを再開始するまえに、まずこのバージョンのインストールの削除をします。"; - Text[ chinese_traditional ] = "安裝程式發現在目錄 %1 有一個程式版本。請您先移除這個程式，然後再重新啟動安裝。"; -@@ -642,7 +642,7 @@ - Text [ portuguese ] = "O ficheiro %1, a ser instalado no foi encontrado.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Datei %1, die neu installiert werden soll, wurde nicht gefunden.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "没有找到新安装所需的文件 %1 。\n现在中断程序。"; -- Text[ russian ] = " %1, , .\n ."; -+ Text[ russian ] = " %1, , .\n ."; - Text[ polish ] = "Pliku %1, ktry mia zosta na nowo zainstalowany, nie znaleziono.\nProgram zostanie przerwany."; - Text[ japanese ] = "新しくインストールするファイル %1 が見つかりません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "沒有找到新安裝所需的檔案 %1 。\n現在中斷程序。"; -@@ -668,7 +668,7 @@ - Text [ portuguese ] = "A verso do ficheiro %1 no permite uma nova instalao.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Version der Datei %1 erlaubt keine Neuinstallation.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "这个文件 %1 的版本不允许重新安装。\n现在中断程序。"; -- Text[ russian ] = " %1 .\n ."; -+ Text[ russian ] = " %1 .\n ."; - Text[ polish ] = "Wersja pliku %1 nie zezwala na now instalacj.\nProgram zostanie zakoczony."; - Text[ japanese ] = "ファイル %1 のバージョンが新しいインストールを実行させません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "這個檔案 %1 的版本不允許重新安裝。\n現在中斷程式。"; -@@ -694,7 +694,7 @@ - Text [ portuguese ] = "A instalao da verso actualizada foi cancelada." ; - Text [ portuguese_brazilian ] = "Die Upgrade-Installation wurde abgebrochen." ; - Text[ chinese_simplified ] = "已经中断安装升级版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Instalacja aktualizacji zostaa przerwana."; - Text[ japanese ] = "更新インストールは中止されました。"; - Text[ chinese_traditional ] = "已經中斷安裝升級軟體。"; -@@ -722,7 +722,7 @@ - Text [ portuguese_brazilian ] = "Es sind noch eine oder mehrere %PRODUCTNAME-Applikationen gestartet.\nSchlie?en Sie diese Applikationen, bevor Sie erneut die Nach- oder Deinstallation starten." ; - Text [ portuguese ] = "Encontram-se ainda abertas uma ou mais aplicaes do %PRODUCTNAME.\nFeche essas aplicaes antes de iniciar novamente a reinstalao ou desinstalao." ; - Text[ chinese_simplified ] = "还有一些 %PRODUCTNAME 的程序组件处于运行状态。\n请在增加或撤除程序之前关闭所有运行的程序组件。"; -- Text[ russian ] = " %PRODUCTNAME.\n , ."; -+ Text[ russian ] = " %PRODUCTNAME.\n , ."; - Text[ polish ] = "Jedna lub kilka aplikacji %PRODUCTNAME s jeszcze otwarte.\nZamknij te aplikacje, zanim uruchomisz aktualizacj lub deinstalacj."; - Text[ japanese ] = "1つまたは複数の %PRODUCTNAME アプリケーションがまだ起動中です。\nインストールの追加または削除を開始するまえに、まずこれらのアプリケーションを閉じてください。"; - Text[ chinese_traditional ] = "還有一些 %PRODUCTNAME 的程式元件處於運行狀態。\n請在新增或移除程式之前關閉所有運行的程式元件。"; -@@ -750,7 +750,7 @@ - Text [ portuguese ] = "O programa de instalao no pode actualizar ficheiros comuns quando estes se encontram abertos.\nFeche por favor todas as aplicaes antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchlie?en Sie bitte alle ge?fneten Anwendungen, bevor Sie die Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序无法更新共享的文件，因为这些文件已经被占用。\n请您在重新启动安装之前关闭所有的应用程序。"; -- Text[ russian ] = " , , .\n, , "; -+ Text[ russian ] = " , , .\n, , "; - Text[ polish ] = "Program instalacyjny nie moe aktualizowa wsplnie uywanych danych, jeli s one aktualnie w uyciu.\nZamknij wszystkie otwarte aplikacje, zanim ponownie rozpoczniesz instalacj."; - Text[ japanese ] = "インストールプログラムは、共有使用のファイルを更新できません。\nインストールを再開始するまえに、開いているすべてのプログラムを閉じてください。"; - Text[ chinese_traditional ] = "安裝程序無法更新共享的檔案，因為這些檔案已經被佔用。\n請在重新啟動安裝之前關閉所有的應用程序。"; -@@ -778,7 +778,7 @@ - Text [ portuguese ] = "A instalao da verso de actualizao no possvel, porque no foi encontrada nenhuma verso instalada!" ; - Text [ portuguese_brazilian ] = "Es wurde keine installierte Version gefunden.\nEine Upgrade-Installation ist deshalb nicht m?lich!" ; - Text[ chinese_simplified ] = "没有找到已安装的版本。\n因此无法安装升级版本！"; -- Text[ russian ] = " .\n !"; -+ Text[ russian ] = " .\n !"; - Text[ polish ] = "Nie znaleziono zainstalowanej wersji.\nInstalacja aktualizacji jest z tego powodu niemoliwa!"; - Text[ japanese ] = "インストールしたバージョンが見つかりません。\n更新インストールは不可能です。"; - Text[ chinese_traditional ] = "沒有找到已安裝的版本。\n因此無法安裝升級軟體！"; -@@ -961,7 +961,7 @@ - Text = "%PRODUCTNAME %PRODUCTVERSION lsst sich nur im Responsefilemodus installieren.\nLesen Sie hierfr bitte den Installation Guide."; - Text [ english_us ] = "%PRODUCTNAME %PRODUCTVERSION can only be installed in the Response File mode.\nRefer to the Installation Guide for more information." ; - Text[ portuguese ] = " apenas possvel instalar o %PRODUCTNAME %PRODUCTVERSION no modo Response File.\nQueira consultar o manual de instalao para informaes mais detalhadas."; -- Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; -+ Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION Responsefile.\n "; - Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan alleen in responsefile-modus worden genstalleerd.\nMeer informatie hierover vindt u in de installatiehandleiding."; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION ne peut tre install qu'en mode Response File.\nConsultez le guide d'installation ce sujet."; -diff -ur ../setup2/source/ui/pages/maindlg.src ../setup2/source/ui/pages/maindlg.src ---- ../setup2/source/ui/pages/maindlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/pages/maindlg.src Fri Apr 5 18:24:54 2002 -@@ -88,7 +88,7 @@ - Text = "Bitte geben Sie ein gltiges Installationsverzeichnis an." ; - Text [ english_us ] = "Please specify a valid directory name for the installation." ; - Text[ portuguese ] = "Indique um directrio de instalao vlido."; -- Text[ russian ] = ", , ."; -+ Text[ russian ] = ", , ."; - Text[ dutch ] = "Geef een geldige installatiedirectory aan."; - Text[ french ] = "Veuillez indiquer un rpertoire d'installation valide."; - Text[ spanish ] = "Indique por favor un directorio de instalacin vlido."; -@@ -125,7 +125,7 @@ - Text [ portuguese ] = "Tem a certeza que deseja fazer a instalao no directrio-raz?" ; - Text [ portuguese_brazilian ] = "Sind Sie sicher, da? Sie in das Wurzelverzeichnis installieren wollen?" ; - Text[ chinese_simplified ] = "您真的要将程序安装在根目录内？"; -- Text[ russian ] = " , ?"; -+ Text[ russian ] = " , ?"; - Text[ polish ] = "Czy na pewno zainstalowa w katalogu root?"; - Text[ japanese ] = "ルートディレクトリにインストールしてもかまいませんか。"; - Text[ chinese_traditional ] = "真要將程式安裝在根目錄內﹖"; -@@ -228,7 +228,7 @@ - Text = "Sie haben einen Installationspfad angegeben, in dem sich bereits Komponenten einer %PRODUCTNAME-Installation befinden. Bitte geben Sie ein anderes Verzeichnis an." ; - Text [ english_us ] = "You have entered an installation path which already contains %PRODUCTNAME components. Please enter a different directory." ; - Text[ portuguese ] = "Indicou um atalho de instalao onde j existem componentes de uma anterior instalao do %PRODUCTNAME. Indique outro directrio."; -- Text[ russian ] = " , %PRODUCTNAME. , , ."; -+ Text[ russian ] = " , %PRODUCTNAME. , , ."; - Text[ greek ] = " %PRODUCTNAME. "; - Text[ dutch ] = "U heeft een installatiepad aangegeven waarin zich reeds componenten van een %PRODUCTNAME-installatie bevinden. Geef een nadere directory aan."; - Text[ french ] = "Le rpertoire slectionn pour l'installation contient dors et dj certains composants d'une installation antrieure de %PRODUCTNAME. Veuillez indiquer un autre chemin."; -diff -ur ../setup2/source/ui/pages/pasexist.src ../setup2/source/ui/pages/pasexist.src ---- ../setup2/source/ui/pages/pasexist.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasexist.src Fri Apr 5 18:25:23 2002 -@@ -143,7 +143,7 @@ - Text [ french ] = "a t dtecte une installation de serveur %1 antrieure." ; - Text [ dutch ] = "werd een oude %1 serverinstallatie gevonden." ; - Text[ chinese_simplified ] = "找到一个旧的 %1 服务器版本。"; -- Text[ russian ] = " %1."; -+ Text[ russian ] = " %1."; - Text[ polish ] = "znaleziono star instalacj serwera %1"; - Text[ japanese ] = "旧 %1 サーバーインストールが見つかりました。"; - Text[ chinese_traditional ] = "找到一個舊的 %1 伺服器版本。"; -@@ -171,7 +171,7 @@ - Text [ french ] = "Vous avez la possibilit de rutiliser les configurations d'utilisateurs de l'installation de serveur antrieure." ; - Text [ dutch ] = "U heeft de mogelijkheid de gebruikersconfiguraties uit deze oude serverinstallatie over te nemen." ; - Text[ chinese_simplified ] = "您能采用这个旧的服务器版本的使用者配置文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Masz moliwo przej konfiguracj uytkownika ze starej instalacji serwera."; - Text[ japanese ] = "この旧サーバーインストールからユーザー設定を適用することができます｡"; - Text[ chinese_traditional ] = "您能夠採用這個舊的伺服器版本的使用者配置檔案。"; -diff -ur ../setup2/source/ui/pages/pasreins.src ../setup2/source/ui/pages/pasreins.src ---- ../setup2/source/ui/pages/pasreins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasreins.src Fri Apr 5 18:26:54 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installationsprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -99,7 +99,7 @@ - Text = "Der %1 ist bereits auf Ihrem Computer installiert. Sie knnen jetzt die Installation lschen." ; - Text [ english_us ] = "The %1 Server is already installed on your computer. You can now delete the installation." ; - Text[ portuguese ] = "O %1 j est instalado no seu computador. J possvel eliminar a instalao."; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ dutch ] = "%1 is reeds genstalleerd op uw computer. U kunt nu de installatie wissen."; - Text[ french ] = "%1 est dj install sur votre ordinateur. Vous pouvez prsent supprimer cette installation."; - Text[ spanish ] = "El %1 ya est instalado en su ordenador. Ahora puede eliminar la instalacin."; -@@ -162,7 +162,7 @@ - Text [ dutch ] = "Voegt n of meer gebruikers toe aan uw serverinstallatie of verwijdert deze." ; - Text [ portuguese ] = "Adiciona ou remove um ou mais utilizadores na instalao do servidor existente." ; - Text[ chinese_simplified ] = "增加或者删除一个或多个使用者的服务器安装版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje jednego lub wicej uytkownikw do instalacji serwera lub ich usuwa."; - Text[ japanese ] = "現在のサーバーインストールに、1人または複数のユーザーを追加または削除。"; - Text[ chinese_traditional ] = "新增或者移除一個或多個使用者伺服器安裝版本。"; -@@ -192,7 +192,7 @@ - Text [ spanish ] = "Modificacin" ; - Text [ english_us ] = "Modify installation" ; - Text[ chinese_simplified ] = "修改安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Modyfikacja instalacji"; - Text[ japanese ] = "インストールの変更"; - Text[ chinese_traditional ] = "修改安裝"; -@@ -219,7 +219,7 @@ - Text [ french ] = "Ajoute des composants ou modules une version dj installe ou les supprime." ; - Text [ dutch ] = "Voegt verdere componenten of modules toe aan de reeds genstalleerde versie of verwijdert deze." ; - Text[ chinese_simplified ] = "为已经安装的版本增加或者删除其他的程序组件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje do wczeniej zainstalowanej wersji dodatkowe komponenty lub moduy lub je usuwa."; - Text[ japanese ] = "すでにインストールしたバージョンに、それ以外のコンポーネントまたはモジュールを追加または削除。"; - Text[ chinese_traditional ] = "為已經安裝的版本新增或者移除其它的程式元件。"; -@@ -249,7 +249,7 @@ - Text [ spanish ] = "Desinstalacin" ; - Text [ english_us ] = "Deinstall" ; - Text[ chinese_simplified ] = "撤除安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Deinstalacja"; - Text[ japanese ] = "インストールの削除"; - Text[ chinese_traditional ] = "移除安裝"; -@@ -279,7 +279,7 @@ - Text [ spanish ] = "Elimina la instalacin actual de su disco duro." ; - Text [ english_us ] = "Deletes the existing version from your hard disk" ; - Text[ chinese_simplified ] = "从您的计算机上删除已经安装的程序版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usuwa zainstalowan wersj z dysku twardego."; - Text[ japanese ] = "既存のバージョンをユーザーのハードディスクから削除します。"; - Text[ chinese_traditional ] = "從您的電腦上刪除已經安裝的程式版本。"; -diff -ur ../setup2/source/ui/pages/pasremem.src ../setup2/source/ui/pages/pasremem.src ---- ../setup2/source/ui/pages/pasremem.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasremem.src Fri Apr 5 18:27:07 2002 -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u op een later tijdstip nog eens handmatig een aangepaste installatie wilt uitvoeren. dan moet u ook het pad naar de basisdirectory van de gebruikers in het configuratiebestand SODAEMON aanpassen.\n" ; - Text [ portuguese ] = "Se preferir instalar os diferentes utilizadores manualmente, ter que adaptar tambm o atalho ao directrio- raz no ficheiro de configurao SODAEMON.\n" ; - Text[ chinese_simplified ] = "如果以后要执行单个使用者安装，您必须在 SODAEMON 的配置文件内修改用户的根目录路径。\n"; -- Text[ russian ] = " , SODAEMON.\n"; -+ Text[ russian ] = " , SODAEMON.\n"; - Text[ polish ] = "Aby przeprowadzi pniej instalacje indywidualne rcznie, naley dostosowa ciek do rdowego katalogu root uytkownikw w pliku konfiguracyjnym SODAEMON.\n"; - Text[ japanese ] = "あとから各自ユーザーインストールを手動で実行するときに、SODAEMON 設定ファイルのユーザーのルートディレクトリ上のパスに適合させる必要があります。\n"; - Text[ chinese_traditional ] = "果以後要執行單個使用者安裝版本﹐您必須在SODAEMON 的配置檔案內修改使用者的根目錄路徑。\n"; -diff -ur ../setup2/source/ui/pages/passtart.src ../setup2/source/ui/pages/passtart.src ---- ../setup2/source/ui/pages/passtart.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/passtart.src Fri Apr 5 18:27:19 2002 -@@ -107,7 +107,7 @@ - Text [ french ] = "Vous pouvez prsent dfinir les paramtres pour les divers utilisateurs du serveur. Le programme Setup prpare alors une installation rseau spcifique de %PRODUCTNAME dans chacun des rpertoires d'utilisateur.\n" ; - Text [ dutch ] = "U heeft nu de mogelijkheid de gebruikers voor de server in te richten. Het setup-programma voert dan voor iedere gebruiker een specifieke netinstallatie van %PRODUCTNAME in zijn gebruikersdirectory uit.\n" ; - Text[ chinese_simplified ] = "您现在能够为服务器设立各个使用者。安装程序为每个使用者的各自目录内安装一个 %PRODUCTNAME 的网络版本。\n"; -- Text[ russian ] = " . %PRODUCTNAME.\n"; -+ Text[ russian ] = " . %PRODUCTNAME.\n"; - Text[ polish ] = "Istnieje teraz moliwo konfiguracji poszczeglnych uytkownikw serwera. Program instalacyjny przeprowadzi dla kadego uytkownika specyficzn instalacj sieciow %PRODUCTNAME w odpowiednim katalogu danego uytkownika.\n"; - Text[ japanese ] = "いますぐ、個々のユーザーをサーバーに設定することが可能です。セットアッププログラムが、各ユーザーに %PRODUCTNAME から指定されたネットワークインストールをそれぞれのユーザーディレクトリにインストールします。\n"; - Text[ chinese_traditional ] = "您現在能夠為伺服器配置各個使用者。安裝程式為每個使用者在各自的使用者目錄內安裝一個%PRODUCTNAME的網路版本。\n"; -diff -ur ../setup2/source/ui/pages/pasuinst.src ../setup2/source/ui/pages/pasuinst.src ---- ../setup2/source/ui/pages/pasuinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuinst.src Fri Apr 5 18:28:09 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 インストールの削除"; - Text[ chinese_traditional ] = "移除%1"; -@@ -120,7 +120,7 @@ - Text [ french ] = "Si vous tes sr de vouloir supprimer l'installation existante du serveur dans le rpertoire '%1', cliquez sur '%2'." ; - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande serverinstallatie uit de map '%1' wilt verwijderen, drukt u dan op '%2'." ; - Text[ chinese_simplified ] = "如果您真的要删除目录 '%1' 内当前服务器的安装版本，那么请按击 '%2' 。"; -- Text[ russian ] = " '%1', '%2'."; -+ Text[ russian ] = " '%1', '%2'."; - Text[ polish ] = "Jeeli zainstalowany w katalogu '%1' serwer ma zosta na pewno usunity, naley klikn '%2'."; - Text[ japanese ] = "ディレクトリ「%1」にあるサーバーインストールを削除するときは、「%2」をクリックします。"; - Text[ chinese_traditional ] = "如果真要刪除目錄<%1>內目前的伺服器版本﹐就按一下<%2>。"; -@@ -148,7 +148,7 @@ - Text [ french ] = "Vous avez galement la possibilit de dsinstaller toutes les installations d'utilisateur prsentes sur ce serveur." ; - Text [ dutch ] = "Bovendien heeft u de mogelijkheid alle met de server ingerichte gebruikersinstallaties te denstalleren." ; - Text[ chinese_simplified ] = "另外，您还能够移除所有通过服务器建立的使用者。"; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ polish ] = "Dodatkowo mona zdeinstalowa wszystkie skonfigurowane za pomoc serwera instalacje indywidualne."; - Text[ japanese ] = "そのほかに、サーバーでインストールしたユーザーインストールのすべても削除できます。"; - Text[ chinese_traditional ] = "另外您還能夠移除所有透過伺服器配置的使用者。"; -@@ -175,7 +175,7 @@ - Text [ dutch ] = "Gebruikersinstallaties verwijderen" ; - Text [ portuguese ] = "Remover instalao personalizada." ; - Text[ chinese_simplified ] = "撤除使用者的安装。"; -- Text[ russian ] = " () ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usu instalacj indywidualn."; - Text[ japanese ] = "ユーザーインストールの削除。"; - Text[ chinese_traditional ] = "移除使用者的安裝。"; -diff -ur ../setup2/source/ui/pages/pasuname.src ../setup2/source/ui/pages/pasuname.src ---- ../setup2/source/ui/pages/pasuname.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuname.src Fri Apr 5 18:28:27 2002 -@@ -135,7 +135,7 @@ - Text [ french ] = "En tant qu'administrateur du systme, vous avez la possibilit de faire insrer automatiquement le propritaire des rpertoires de chaque installation d'utilisateur.." ; - Text [ dutch ] = "Als systeembeheerder kunt u voor de mappen van de aangepaste installaties automatisch de juiste eigenaar definiren." ; - Text[ chinese_simplified ] = "作为系统管理员您能够自动地为使用者目录设定正确的拥有者。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Jako administrator systemu masz moliwo automatycznego okrelenia uytkownikw katalogw pojedynczych instalacji indywidualnych."; - Text[ japanese ] = "システム管理者として、それぞれユーザー定義されたインストール項目に正しい所有者を自動設定できます。"; - Text[ chinese_traditional ] = "作為系統管理員您能夠自動地為使用者目錄設定正確的擁有者。"; -diff -ur ../setup2/source/ui/pages/pasupath.src ../setup2/source/ui/pages/pasupath.src ---- ../setup2/source/ui/pages/pasupath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasupath.src Fri Apr 5 18:29:23 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Veuillez dfinir le rpertoire racine dans lequel les installations des diffrents utilisateurs seront cres." ; - Text [ dutch ] = "Bepaalt u de basisdirectory waarin de gebruikersinstallaties moeten worden aangelegd." ; - Text[ chinese_simplified ] = "请您确定设立使用所需的根目录。"; -- Text[ russian ] = ", , , ."; -+ Text[ russian ] = ", , , ."; - Text[ polish ] = "Zdefiniuj katalog gwny, w ktrym zostan utworzone pojedyncze instalacje indywidualne."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定してください。"; - Text[ chinese_traditional ] = "請您確定設立使用者所需的根目錄。"; -@@ -137,7 +137,7 @@ - Text [ dutch ] = "Bepaal de basismap waarin de aangepaste installaties moeten worden ondergebracht of kopieer deze in de home-directory's van de in het systeem geregistreerde gebruikers." ; - Text [ portuguese ] = "Especifique o directrio-raz em que deseja criar a instalao de utilizador individual; poder tambm copiar a instalao para o directrio inicial de um utilizador definido na administrao do sistema." ; - Text[ chinese_simplified ] = "请您确定设立用户所需的根目录，或者请您复制使用名到这个管理系统的Home目录内。"; -- Text[ russian ] = ", , , , ."; -+ Text[ russian ] = ", , , , ."; - Text[ polish ] = "Zdefiniuj katalog rdowy, w ktrym zostan utworzone pojedyncze instalacje indywidualne lub przekopiuj instalacj do katalogu macierzystego uytkownikw zarzdzanych przez ten system."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定するか、あるいはインストールをシステム上の管理ユーザーのホームディレクトリにコピーするかを定義してください。"; - Text[ chinese_traditional ] = "請您確定配置使用者所需的根目錄﹐或請您將使用者名稱複製到這個管理系統的Home目錄內。"; -@@ -275,7 +275,7 @@ - #if !defined(UNX) - Pos = MAP_APPFONT ( 0 , 80 ) ; - Size = MAP_APPFONT ( 205 , 30 ) ; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodatkowo mona poda ostatni komponent cieki instalacji indywidualnej."; - Text[ japanese ] = "そのほか、ユーザーインストールのパスコンポーネントも指定できます。"; - #else -@@ -397,7 +397,7 @@ - Text [ french ] = "Vous ne disposez pas de droits d'criture dans le rpertoire principal\n'%1'\nde l'utilisateur\n%2\n. Veuillez vous procurer les droits correspondants ou slectionner votre rpertoire racine pour les installations d'utilisateurs !" ; - Text [ dutch ] = "U heeft in de home-directory\n'%1'\nvan gebruiker\n%2\ngeen schrijfrechten.\nVerandert u dit of selecteer uw eigen basisdirectory voor de aangepaste installatie." ; - Text[ chinese_simplified ] = "您无权改写使用者\n%2\n的Home目录\n'%1'\n上的文件。\n请修改目录的文件读取权利或选择一个自己的根目录来安装程序！"; -- Text[ russian ] = " \n'%1'\n\n%2\n ."; -+ Text[ russian ] = " \n'%1'\n\n%2\n ."; - Text[ polish ] = "Brak praw zapisu\nw katalogu macierzystym\n'%'\\uytkownika\n%2.\nNaley naby prawa lub okreli wasny katalog podstawowy na instalacj indywidualn!"; - Text[ japanese ] = "ユーザーのホームディレクトリ\n%2\nに、\n「%1」\nの書き込み権がありません。\n変更するか、ユーザーインストールのルートディレクトリを選択してください。"; - Text[ chinese_traditional ] = "您無權覆寫使用者\n%2\n的Home目錄\n<%1>\n上的檔案。\n請修改目錄的檔案覆寫權利或者選擇一個自己的根目錄來安裝程式！"; -diff -ur ../setup2/source/ui/pages/pcfgserver.src ../setup2/source/ui/pages/pcfgserver.src ---- ../setup2/source/ui/pages/pcfgserver.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcfgserver.src Fri Apr 5 18:29:32 2002 -@@ -100,7 +100,7 @@ - Text = "Die %1 Installation enthlt Konfigurationen die auf einen Konfigurationsserver geschrieben werden mssen.\n \nBitte geben Sie den Servernamen und Port Ihres Konfigurationsservers an."; - Text [ english_us ] = "The %1 installation contains configuration information that has to be written on a configuration server.\n \nPlease enter the name and port of the configuration server."; - Text[ portuguese ] = "A instalao %1 contm configuraes que devem ser escritas num servidor de configurao.\n \nIndique o nome e a porta do seu servidor de configurao."; -- Text[ russian ] = " %1 , .\n \n, , ."; -+ Text[ russian ] = " %1 , .\n \n, , ."; - Text[ greek ] = " %1 .\n \n ? "; - Text[ dutch ] = "De %1 installatie bevat configuraties die op een configuratieserver moeten worden geschreven.\n \nGeef de servernaam en de poort van deze configuratieserver aan."; - Text[ french ] = "L'installation %1 contient des configurations qui doivent tre crites sur un serveur de configuration.\n \nIndiquez le nom du serveur et le port du serveur de configuration."; -diff -ur ../setup2/source/ui/pages/pcrc.src ../setup2/source/ui/pages/pcrc.src ---- ../setup2/source/ui/pages/pcrc.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcrc.src Fri Apr 5 18:29:56 2002 -@@ -106,7 +106,7 @@ - Text [ dutch ] = "Het installatieprogramma in" ; - Text [ portuguese ] = "Os ficheiros de instalao em" ; - Text[ chinese_simplified ] = "程序安装文件在"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Pliki instalacyjne w"; - Text[ japanese ] = "インストールファイルの"; - Text[ chinese_traditional ] = "程式安裝檔案在"; -diff -ur ../setup2/source/ui/pages/phavefun.src ../setup2/source/ui/pages/phavefun.src ---- ../setup2/source/ui/pages/phavefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/phavefun.src Fri Apr 5 18:32:17 2002 -@@ -97,7 +97,7 @@ - Text = "Installation" ; - Text [ english_us ] = "Installation" ; - Text[ portuguese ] = "Instalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installatie"; - Text[ french ] = "Installation"; -@@ -147,7 +147,7 @@ - Text = "Deinstallation" ; - Text [ english_us ] = "Deinstallation" ; - Text[ portuguese ] = "Desinstalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = " "; - Text[ dutch ] = "Denstallatie"; - Text[ french ] = "Dsinstallation"; -@@ -311,7 +311,7 @@ - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; - Text[ chinese_simplified ] = "衷心祝贺！程序安装已经顺利完成。Sun Microsystems 祝您使用 %1 得心应手！"; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でのさらに充実したお仕事を Sun Microsystems は心から願っております。"; - Text[ chinese_traditional ] = "已經順利完成安裝程式。\nSun Microsystems 祝您使用 %1 得心應手！"; -@@ -339,7 +339,7 @@ - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido." ; - Text[ chinese_simplified ] = "已经安装或删除您选择的模块和组件。"; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay zainstalowane / zdeinstalowane."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; - Text[ chinese_traditional ] = "已經安裝或移除選擇的模塊和程式元件。"; -@@ -368,7 +368,7 @@ - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Text[ chinese_simplified ] = "修复安装程序已经完成。\n"; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; - Text[ chinese_traditional ] = "修復程式已經完成。\n"; -@@ -396,7 +396,7 @@ - TEXT[ dutch ] = "De denstallatie ist beindigd."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente."; - TEXT[ chinese_simplified ] = "撤除程序已经顺利完成。"; -- TEXT[ russian ] = " ." ; -+ TEXT[ russian ] = " ." ; - TEXT[ polish ] = "Deinstalacja zostaa zakoczona." ; - TEXT[ japanese ] = "インストールの削除は、正常に終了しました。" ; - TEXT[ chinese_traditional ] = "現在已經完成移除程式。"; -@@ -446,7 +446,7 @@ - Text = "Bitte beachten Sie, dass das Installationsprogramm nicht alle Dateien gelscht hat. %1 Konfigurationsdateien und von Ihnen erstellte Dokumente wurden nicht gelscht. Sofern Sie diese nicht weiter bentigen, knnen Sie das %1-Verzeichnis manuell lschen."; - Text [ english_us ] = "Please note that the installation program has not deleted all files. %1 configuration files and your own documents were not deleted. If you no longer need these files, you can manually delete the %1 directory."; - Text[ portuguese ] = "No esquea que o programa de instalao no eliminou todos os ficheiros. Os ficheiros de configurao %1 e os documentos criados por si no foram eliminados. Se no os necessitar, poder eliminar o directrio %1 manualmente."; -- Text[ russian ] = ", . %1 , . , %1 ."; -+ Text[ russian ] = ", . %1 , . , %1 ."; - Text[ greek ] = " . %1 . , %1 ."; - Text[ dutch ] = "Wij maken u erop attent dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - Text[ french ] = "Le programme d'installation n'a pas supprim tous les fichiers : c'est le cas des fichiers de configuration %1 et des documents que vous avez crs. Si vous n'en avez plus l'utilit, vous pouvez supprimer manuellement le rpertoire %1."; -@@ -512,7 +512,7 @@ - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; - Text[ chinese_simplified ] = "请点击\"%1\"，结束安装程序。"; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; - Text[ chinese_traditional ] = "請按一下<%1>，結束安裝程式。"; -@@ -541,7 +541,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; - Text[ chinese_simplified ] = "在安装过程中，系统文件被更改。为了让更改内容整合到%1的使用界面上，您必须重新启动操作系统。"; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、システムファイルに変更がありました。それをアクティブにし、%1 のインターフェイスを統一するために､システムを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝過程中，系統檔案已經變更。為了能夠正常使用 %1 的桌面整合設定﹐現在必須重新啟動系統。"; -@@ -568,7 +568,7 @@ - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; - Text[ chinese_simplified ] = "如果您要重新启动计算机，请按击\"%1\"。如果您要结束安装程序，则按击\"%2\"。"; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "今すぐ再起動するためには、[%1] をクリックしてください。[%2] をクリックすると、セットアッププログラムを終了します。"; - Text[ chinese_traditional ] = "要重新啟動電腦﹐請按一下<%1>。如果要結束安裝程式﹐就按一下<%2>。"; -@@ -589,7 +589,7 @@ - Text = "Whrend der Installation wurden nderungen an den Systemdateien vorgenommen. Damit diese aktiv werden und eine Oberflchenintegration von %1 gewhrleistet ist, mssen sie sich erneut an Ihrem System anmelden." ; - Text [ english_us ] = "System files have been modified during the installation. You must restart your system to activate these modifications and to ensure that %1 are integrated into the interface." ; - Text[ portuguese ] = "Durante a instalao foram efectuadas modificaes nos ficheiros do sistema. Para poder activar e garantir a integrao do %1 na interface, dever reiniciar o seu sistema."; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart."; - Text[ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur."; -@@ -616,7 +616,7 @@ - Text = "Um sich jetzt erneut an ihrem System anzumelden klicken Sie auf '%1'. Klicken Sie dagegen auf '%2', wird das Installationsprogramm beendet." ; - Text [ english_us ] = "To login to your system again click on '%1'. If you click on '%2' the installation program will be ended." ; - Text[ portuguese ] = "Para entrar novamente no sistema, clique em '%1'. Para cancelar o programa de instalao, clique em '%2'."; -- Text[ russian ] = " , , '%1'. '%2', ."; -+ Text[ russian ] = " , , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ dutch ] = "Om u nu opnieuw aan te melden bij uw systeem klikt u op '%1'. Klikt u echter op '%2', dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour redmarrer tout de suite votre ordinateur ou sur '%2' pour quitter le programme d'installation."; -diff -ur ../setup2/source/ui/pages/pimode.src ../setup2/source/ui/pages/pimode.src ---- ../setup2/source/ui/pages/pimode.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pimode.src Fri Apr 5 18:39:45 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Slection du type d'installation" ; - Text [ dutch ] = "Installatietype selecteren" ; - Text[ chinese_simplified ] = "选择安装方式"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz typ instalacji"; - Text[ japanese ] = "インストールの種類を選択"; - Text[ chinese_traditional ] = "選擇安裝方式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Elija el tipo de instalacin." ; - Text [ english_us ] = "Choose the type of installation." ; - Text[ chinese_simplified ] = "请您选择安装的方式。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz rodzaj instalacji."; - Text[ japanese ] = "インストールの種類を選択してください。"; - Text[ chinese_traditional ] = "請選擇安裝的方式。"; -@@ -143,7 +143,7 @@ - Text [ spanish ] = "Instalacin predeterminada" ; - Text [ english_us ] = "Standard Installation" ; - Text[ chinese_simplified ] = "标准安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja standardowa"; - Text[ japanese ] = "標準インストール"; - Text[ chinese_traditional ] = "標準安裝"; -@@ -170,7 +170,7 @@ - Text [ french ] = "Installe les composants %s de faon optimale. Cette installation ncessite %1 Mo d'espace mmoire." ; - Text [ dutch ] = "De %s componenten worden compleet genstalleerd. Benodigd geheugen: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "最优化安装 %s 程序组件。这种安装方式需要 %1 兆字节的可用空间。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje dane komponenty pakietu %s. Instalacja ta wymaga %1 MB wolnej pamici, tymczasowo %2 MB."; - Text[ japanese ] = "%s コンポーネントを最適にインストールします。このインストールには %1 MB のディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "最合適地安裝 %s 程式元件。這個方式需要 %1 MB的可用空間。"; -@@ -200,7 +200,7 @@ - Text [ spanish ] = "Instalacin personalizada" ; - Text [ english_us ] = "Custom Installation" ; - Text[ chinese_simplified ] = "使用者自定安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja niestandardowa"; - Text[ japanese ] = "ユーザー操作のインストール"; - Text[ chinese_traditional ] = "自訂安裝"; -@@ -227,7 +227,7 @@ - Text [ french ] = "Permet la slection des composants de %s installer." ; - Text [ dutch ] = "Selectie van de te installeren %s componenten is mogelijk." ; - Text[ chinese_simplified ] = "能够选择安装 %s 程序组件。"; -- Text[ russian ] = " %s."; -+ Text[ russian ] = " %s."; - Text[ polish ] = "Umoliwia wybr komponentw pakietu %s, ktre zostan zainstalowane."; - Text[ japanese ] = "インストールする %s コンポーネントの選択ができます。"; - Text[ chinese_traditional ] = "可選擇安裝 %s 程式元件。"; -@@ -257,7 +257,7 @@ - Text [ spanish ] = "Instalacin mnima" ; - Text [ english_us ] = "Minimum Installation" ; - Text[ chinese_simplified ] = "基本安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja minimalna"; - Text[ japanese ] = "最小インストール"; - Text[ chinese_traditional ] = "基本安裝"; -@@ -284,7 +284,7 @@ - Text [ french ] = "Installe uniquement les composants absolument ncessaires l'excution du programme. Cette installation requiert seulement 1% Mo d'espace mmoire." ; - Text [ dutch ] = "Installatie van de voor de uitvoering van het programma minimaal noodzakelijke componenten. Benodigde vrije ruimte: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "只安装运行程序所需的基本组件。这个安装只需要 %1 兆字节。"; -- Text[ russian ] = " , . %1 \n ( %2 )."; -+ Text[ russian ] = " , . %1 \n ( %2 )."; - Text[ polish ] = "Instaluje komponenty niezbdne do uruchomienia programu. Instalacja ta wymaga tylko %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "プログラムの実行に必要最小限のコンポーネントをインストールします。このインストールでは %1 MB ディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "只安裝執行程式所需的基本元件。這個安裝只需要 %1 MB 。"; -@@ -306,7 +306,7 @@ - Text = "Workstation Installation" ; - Text [ english_us ] = "Workstation Installation" ; - Text[ portuguese ] = "Instalao estao de trabalho"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatie werkstation"; - Text[ french ] = "Installation de station de travail"; -@@ -343,7 +343,7 @@ - Text [ french ] = "L'installation est ralise de faon ce que les programmes soient lancs directement partir du rseau. Une mmoire de %1 Mo seulement est requise par les fichiers locaux." ; - Text [ dutch ] = "De installatie wordt zo uitgevoerd, dat de programma's direct van het net worden opgestart. Voor lokale bestanden worden %1 MB benodigd.." ; - Text[ chinese_simplified ] = "采用网络安装方式。安装本机文件需要可用空间 %1 兆字节。"; -- Text[ russian ] = " , . %1 ."; -+ Text[ russian ] = " , . %1 ."; - Text[ polish ] = "Instalacja zostanie tak przeprowadzona, e programy bd uruchamiane bezporednio z sieci. Dla plikw lokalnych wymagany jest %1 MB."; - Text[ japanese ] = "プログラムが直接ネットワークで起動するように、インストールを実行します。ローカルファイルには %1 MBが必要です。"; - Text[ chinese_traditional ] = "採用網路安裝方式。安裝本機檔案需要可用空間 %1 MB。"; -@@ -360,7 +360,7 @@ - Text = "Installation lokal" ; - Text [ english_us ] = "Local Installation" ; - Text[ portuguese ] = "Instalao local"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ()"; - Text[ dutch ] = "Lokale installatie"; - Text[ french ] = "Installation locale"; -@@ -394,7 +394,7 @@ - Text [ french ] = "Installe tous les composants de %s en local sur la station de travail. Cette installation ncessite %1 Mo de mmoire et %2 Mo de mmoire temporaire." ; - Text [ dutch ] = "Installeert alle %s componenten lokaal op het werkstation. Voor deze installatie wordt een vrije ruimte van %1 MB benodigd, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "安装所有的 %s 组件到本机工作站上。这个安装需要可用空间 %1 兆字节，暂时可用空间 %2 兆字节。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje wszystkie %s komponenty lokalnie na stacji roboczej. Instalacja ta wymaga %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "すべての %s コンポーネントをワークステーション上のローカルにインストールします。このインストールには %1 MB ディスク空き容量（一時的に %2 MB）が必要です。"; - Text[ chinese_traditional ] = "安裝所有的 %s 程式元件到本機工作站上。這個安裝需要可用空間 %1 MB，暫時可用空間 %2 MB。"; -diff -ur ../setup2/source/ui/pages/pipath.src ../setup2/source/ui/pages/pipath.src ---- ../setup2/source/ui/pages/pipath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pipath.src Fri Apr 5 18:40:34 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Slection du rpertoire d'installation" ; - Text [ dutch ] = "Installatiedirectory selecteren" ; - Text[ chinese_simplified ] = "选择安装目录"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz katalog instalacyjny"; - Text[ japanese ] = "インストールディレクトリの選択"; - Text[ chinese_traditional ] = "選擇安裝目錄"; -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Geef de directory aan waarin de componenten van %1 genstalleerd moeten worden. Typ een nieuwe naam voor een directory, of selecteer met '%2' een passende directory." ; - Text [ portuguese ] = "Especifique o directrio no qual deseja instalar os componentes do %1. Indique um novo nome para o directrio ou seleccione um directrio apropriado com o boto '%2' ." ; - Text[ chinese_simplified ] = "请指定安装 %PRODUCTNAME 程序组件的目录。您可以直接输入一个新目录，也可以通过点击 %2 选择一个合适的安装目录。"; -- Text[ russian ] = ", , , %1. '%2' ."; -+ Text[ russian ] = ", , , %1. '%2' ."; - Text[ polish ] = "Tutaj naley poda katalog, w ktrym zostan zainstalowane komponenty pakietu %1. Naley poda now nazw katalogu lub klikn przycisk '%2', aby wybra odpowiedni katalog."; - Text[ japanese ] = "%PRODUCTNAME のコンポーネントをインストールするディレクトリを入力してください。新しいディレクトリ名を入力するか［%2］で適切なディレクトリを選択します。"; - Text[ chinese_traditional ] = "請確定安裝 %PRODUCTNAME 元件的目錄。您能夠直接輸入一個新目錄名稱﹐或按一下<%2>，選擇一個合適的目錄。"; -@@ -127,7 +127,7 @@ - Text = "Bitte geben Sie das Verzeichnis ein, in dem die Komponenten von %PRODUCTNAME installiert werden sollen." ; - Text [ english_us ] = "Specify the directory in which the %PRODUCTNAME components are to be installed." ; - Text[ portuguese ] = "Indique o directrio para a instalao dos componentes do %1."; -- Text[ russian ] = ", , , %1."; -+ Text[ russian ] = ", , , %1."; - Text[ greek ] = " %1."; - Text[ dutch ] = "Geef de directory aan waarin de componenten van %1 moeten worden genstalleerd."; - Text[ french ] = "Spcifiez le rpertoire dans lequel installer les composants de %PRODUCTNAME."; -@@ -267,7 +267,7 @@ - Text = "Installationsverzeichnis" ; - Text [ english_us ] = "Installation directory" ; - Text[ portuguese ] = "Directrio de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatiedirectory"; - Text[ french ] = "Rpertoire d'installation"; -diff -ur ../setup2/source/ui/pages/plang.src ../setup2/source/ui/pages/plang.src ---- ../setup2/source/ui/pages/plang.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plang.src Fri Apr 5 18:41:08 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen %PRODUCTNAME in einer der folgenden Sprachen auf ihrem System installieren. Bitte whlen Sie die Sprache aus, die Sie nutzen wollen." ; - Text[english_us] = "You can install %PRODUCTNAME on your system in one of the following languages. Please select the language you would like to use." ; - Text[ portuguese ] = "Poder instalar o %1 em vrias lnguas no seu sistema. Seleccione uma ou as vrias lnguas que deseje utilizar."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ greek ] = " %1 . ? "; - Text[ dutch ] = "U kunt %1 in diverse talen installeren in uw systeem. Kies de taof talen die u wilt gebruiken."; - Text[ french ] = "Vous avez la possibilit d'installer %PRODUCTNAME sur votre systme dans l'une des langues mentionnes ci-aprs. Slectionnez la langue que vous souhaitez utiliser."; -@@ -164,7 +164,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "installeren"; - Text[ french ] = "installer"; -diff -ur ../setup2/source/ui/pages/plicense.src ../setup2/source/ui/pages/plicense.src ---- ../setup2/source/ui/pages/plicense.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plicense.src Fri Apr 5 18:41:19 2002 -@@ -150,7 +150,7 @@ - Text [ french ] = "Une fois votre lecture termine, cliquez sur '%1' si vous acceptez tous les termes du contrat. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击\"%1\"。如果不同意许可证协议中的条款，则按击\"%2\"，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所提的許可證協議的全部條款，按一下<%1>。若不接受全部條款，就按一下<%2>，取消安裝。"; -diff -ur ../setup2/source/ui/pages/pmigrate.src ../setup2/source/ui/pages/pmigrate.src ---- ../setup2/source/ui/pages/pmigrate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmigrate.src Fri Apr 5 18:41:30 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen persnliche Daten aus einer %PRODUCTNAME 5.2 Installation bernehmen.\n\nIhre Benutzerdaten wie Vorlagen, Wrterbcher und Gallery-Themen werden in das %PRODUCTNAME 6.0 Verzeichnis kopiert. Zur vollstndigen Migration Ihrer Daten beachten Sie bitte auch die Hinweise auf weitere Dokumentation in der Readme-Datei.\n\nIhre Daten werden von dem unten angegebenen Verzeichnis kopiert." ; - Text [ english_us ] = "Personal data from a %PRODUCTNAME 5.2 installation can be used in the new version.\n\nYour user data such as templates, dictionaries and Gallery themes will be copied into the %PRODUCTNAME 6.0 directory. Concerning the complete migration of your data, please follow the guidelines in the Readme file.\n\nThe data will be copied from the directory given below." ; - Text[ portuguese ] = "Poder importar os seus dados pessoais e os parmetros de configurao da verso do %PRODUCTNAME 5.2.\n\nOs seus dados de utilizador tais como modelos, dicionrios e temas da Gallery sero copiados para o directrio %PRODUCTNAME 6.0. Para a migrao completa dos seus dados, tenha em considerao a documentao referida no ficheiro Readme.\n\nOs dados sero copiados a partir do directrio abaixo indicado."; -- Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; -+ Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; - Text[ greek ] = " %PRODUCTNAME .\n\n .\n\n :"; - Text[ dutch ] = "U kunt persoonlijke gegevens uit een %PRODUCTNAME 5.2-installatie overnemen.\n\nNaast uw gebruikersgegevens worden sjablonen, woordenboeken en gallery-onderwerpen gekopieerd naar de %PRODUCTNAME 6.0-directory.\n\nRaadpleeg het Readme-bestand voor een volledige migratie van uw gegevens.\n\nUw gegevens worden ontnomen aan de hieronder aangegeven directory."; - Text[ french ] = "Vous avez la possibilit de reprendre certaines donnes personnelles provenant d'une installation de %PRODUCTNAME 5.2.\n\nVos donnes d'utilisateur (tels que les modles, dictionnaires, thmes de la Gallery) seront alors copies dans le rpertoire %PRODUCTNAME 6.0. Le fichier Readme comporte des indications importantes pour la migration des donnes.\n\nCelles-ci seront copies depuis le rpertoire spcifi ci-dessous."; -diff -ur ../setup2/source/ui/pages/pmodules.src ../setup2/source/ui/pages/pmodules.src ---- ../setup2/source/ui/pages/pmodules.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmodules.src Fri Apr 5 18:41:44 2002 -@@ -100,7 +100,7 @@ - Text = "Bitte whlen sie ein Modulset aus, welches sie installieren wollen." ; - Text[english_us] = "Please select one module set to install." ; - Text[ portuguese ] = "Please select one module set to be installed."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = "Please select one module set to be installed."; - Text[ dutch ] = "Kies een set met modules die u wilt installeren."; - Text[ french ] = "Slectionnez un jeu de modules installer."; -diff -ur ../setup2/source/ui/pages/pprofile.src ../setup2/source/ui/pages/pprofile.src ---- ../setup2/source/ui/pages/pprofile.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pprofile.src Fri Apr 5 18:42:50 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprofile zusammenstellen" ; - Text [ english_us ] = "Compile Installation Profiles" ; - Text[ portuguese ] = "Compilar perfis de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprofielen samenstellen"; - Text[ french ] = "Compilation des profils d'installation"; -@@ -100,7 +100,7 @@ - Text = "Stellen Sie sich hier Ihre verschiedenen Installationsprofile zusammen, die Sie spter mit dem Responsefile installieren mchten." ; - Text [ english_us ] = "Compile different installation profiles that are to be installed later using response file." ; - Text[ portuguese ] = "Compile os diferentes perfis de instalao que deseje instalar posteriormente com o Response File."; -- Text[ russian ] = " , Response File."; -+ Text[ russian ] = " , Response File."; - Text[ greek ] = " , Responsefile."; - Text[ dutch ] = "Kies hier de installatieprofielen die u later met de responsefile wilt installeren."; - Text[ french ] = "Compilez les diffrents profils d'installation installer avec le Response File."; -@@ -128,7 +128,7 @@ - Text = "Installationsprofile:" ; - Text [ english_us ] = "Installation profiles:" ; - Text[ portuguese ] = "Perfis de instalao:"; -- Text[ russian ] = " :"; -+ Text[ russian ] = " :"; - Text[ greek ] = " :"; - Text[ dutch ] = "Installatieprofielen:"; - Text[ french ] = "Profils d'installation :"; -diff -ur ../setup2/source/ui/pages/preadygo.src ../setup2/source/ui/pages/preadygo.src ---- ../setup2/source/ui/pages/preadygo.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preadygo.src Fri Apr 5 19:12:09 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Het systeem heeft nu alle noodzakelijke gegevens voor het kopiren van de programmabestanden. Klik nu op '%1' als u deze gegevens wilt zien of veranderen. Bent u het er mee eens, klik dan op '%2' om de installatie te starten." ; - Text [ portuguese ] = "Os parmetros necessrios para copiar os ficheiros do programa esto completos. Clique em '%1' para ver as modificaes que fez. Aceite ou modifique as entradas e continue com a instalao em '%2'." ; - Text[ chinese_simplified ] = "复制程序文件的设定已经完成。\n如果要查看或更改这些设定，请按击\"%1\"。\n如果要使用这些设定，按击\"%2\"执行安装。"; -- Text[ russian ] = " , , . '%1', . "; -+ Text[ russian ] = " , , . '%1', \n. , '%2'."; - Text[ polish ] = "Podane zostay wszystkie dane potrzebne do skopiowania plikw programu. Aby je przejrze lub zmodyfikowa, naley klikn przycisk '%1'. Jeeli wszystkie dane si zgadzaj, naley klikn przycisk '%2', aby rozpocz instalacj programu."; - Text[ japanese ] = "プログラムファイルのコピーに必要なすべての設定は終了しました｡ 設定を確認、変更する場合は、［%1］をクリックします。設定が正しければ、［%2］をクリックしてインストールを続行します。"; - Text[ chinese_traditional ] = "複製所有程式檔案的設定已經完成。要查看或變更這個設定﹐請按一下<%1>。\n要確定這個設定﹐按一下<%2>，啟動安裝。"; -diff -ur ../setup2/source/ui/pages/precover.src ../setup2/source/ui/pages/precover.src ---- ../setup2/source/ui/pages/precover.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/precover.src Fri Apr 5 18:43:23 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Rparation de l'installation" ; - Text [ dutch ] = "Installatie repareren" ; - Text[ chinese_simplified ] = "修补安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Naprawa instalacji"; - Text[ japanese ] = "インストールの修復"; - Text[ chinese_traditional ] = "修補安裝"; -@@ -108,7 +108,7 @@ - Text [ dutch ] = "Als u op '%1' klikt, wordt getracht de eventueel beschadigde installatie in de directory" ; - Text [ portuguese ] = "Clique em '%1' para que o programa restaure a instalao danificada no" ; - Text[ chinese_simplified ] = "按击 \"%1\"，安装程序就会修复目录之内已损坏的 %2 组件："; -- Text[ russian ] = " '%1', , "; -+ Text[ russian ] = " '%1', , "; - Text[ polish ] = "Jeli klikniesz '%1', nastpi prba ewentualnej naprawy uszkodzonej instalacji w katalogu."; - Text[ japanese ] = "[%1]をクリックすると、自動的に次のディレクトリにインストールされている %2 の修復が行われます。"; - Text[ chinese_traditional ] = "如果按一下<%1>，安裝程式就會修復安裝目錄內已損壞的 %2 ："; -@@ -144,7 +144,7 @@ - Text [ french ] = "Le processus de rparation rinstalle les composants manquants ou dfectueux." ; - Text [ dutch ] = "te herstellen. Daarbij worden gewiste programmabestanden en belangrijke programmaregistreringen opnieuw genstalleerd." ; - Text[ chinese_simplified ] = "安装程序会重新安装程序文件，并在系统内重新登记程序组件。"; -- Text[ russian ] = ". ."; -+ Text[ russian ] = ". ."; - Text[ polish ] = "Usunite pliki programowe i rejestracje programw zostan ponownie zainstalowane."; - Text[ japanese ] = "修復中に、不足または不良のコンポーネントがインストールしなおされます。"; - Text[ chinese_traditional ] = "安裝程式會重新安裝程式檔案和在操作系統內登記程式元件。"; -diff -ur ../setup2/source/ui/pages/preguser.src ../setup2/source/ui/pages/preguser.src ---- ../setup2/source/ui/pages/preguser.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preguser.src Fri Apr 5 19:23:57 2002 -@@ -80,7 +80,7 @@ - Text = "Herzlich willkommen zu %PRODUCTNAME %PRODUCTVERSION OEM\n\nUm %PRODUCTNAME %PRODUCTVERSION OEM starten zu knnen, geben Sie bitte auf der dem Lizenztext folgenden Dialogseite Ihre Benutzerdaten ein.\n\nIn der Readme-Datei im %PRODUCTNAME-Produktverzeichnis finden Sie wichtige Hinweise zum Programm. Bitte lesen Sie diese Hinweise aufmerksam durch.\n\nDes weiteren finden Sie ausfhrliche Informationen auf der Internetseite von Sun unter\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWir wnschen Ihnen viel Spa und Erfolg mit Ihrem neuen %PRODUCTNAME.\n\nIhr %PRODUCTNAME Team."; - Text [ english_us ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start %PRODUCTNAME %PRODUCTVERSION OEM, please enter your personal data in the dialog following the license text.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWe hope you enjoy working with %PRODUCTNAME."; - Text[ portuguese ] = "Bem-vindo ao %PRODUCTNAME %PRODUCTVERSION OEM!\n\nPara poder iniciar o %PRODUCTNAME %PRODUCTVERSION OEM, indique os seus dados de utilizador na pgina que se segue ao contrato de licena.\n\nO ficheiro Readme, que se encontra no directrio de produtos %PRODUCTNAME, contm informaes importantes sobre este programa. Leia-as atentamente!\n\nPara mais informaes, consulte a pgina da Internet da Sun em\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nResta-nos desejar-lhe um ptimo trabalho com o novo %PRODUCTNAME.\n\nA sua Equipa %PRODUCTNAME."; -- Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; -+ Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION OEM\n\n %PRODUCTNAME %PRODUCTVERSION OEM \" \".\n\n ( Readme) %PRODUCTNAME . .\n\n Internet Sun\n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME .\n\n %PRODUCTNAME."; - Text[ dutch ] = "Hartelijk welkom bij %PRODUCTNAME %PRODUCTVERSION OEM\n\nOm %PRODUCTNAME %PRODUCTVERSION OEM te kunnen starten moet u uw gegevens invullen in de dialoog die volgt op de licentietekst.\n\nIn het Readme-bestand in de %PRODUCTNAME-productdirectory vindt u belangrijke aanwijzingen bij het programma. Leest u deze zorgdvuldig door.\n\nUitvoerige informatie vindt u verder op de Internet-pagina van Sun onder\n\nhttp:www.sun.com/%PRODUCTNAME.\n\nWij wensen u veel plezier en succes met uw nieuwe %PRODUCTNAME.\n\nUw %PRODUCTNAME-team. "; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION OEM vous souhaite la bienvenue !\n\nAfin de pouvoir dmarrer le programme, vous devez saisir vos donnes d'identit dans la bote de dialogue qui fait suite celle vous affichant la licence.\n\nLe fichier Readme, que vous trouverez dans le rpertoire de %PRODUCTNAME, contient des informations importantes sur le programme. Veuillez les lire attentivement.\n\nDe plus, vous trouverez des informations dtailles sur le site de Sun l'adresse\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nL'quipe de %PRODUCTNAME espre que cette nouvelle version rpondra vos attentes et vous souhaite un agrable travail !"; -diff -ur ../setup2/source/ui/pages/preins.src ../setup2/source/ui/pages/preins.src ---- ../setup2/source/ui/pages/preins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preins.src Fri Apr 5 18:44:39 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1安裝程式"; -@@ -102,7 +102,7 @@ - Text [ english_us ] = "Welcome to the %1 repair mode. This program lets you modify the current %1 installation. The current installation is in the folder:"; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Bem-vindo ao programa de instalao/manuteno %1! Este programa permite modificar a instalao actual. A instalao actual encontra-se na pasta:"; -- Text[ russian ] = " %1. , :"; -+ Text[ russian ] = " %1. , :"; - Text[ greek ] = " %1 :"; - Text[ dutch ] = "Welkom bij %1 installatie-onderhoudsprogramma. Met dit programma kunt u de actuele installatie modificeren. De actuele installatie bevindt zich in de volgende directory:"; - Text[ french ] = "Vous avez activ le mode de maintenance de %1. Ce mode permet de modifier l'installation actuelle de %1 qui se trouve dans le dossier :"; -@@ -164,7 +164,7 @@ - Text [ english_us ] = "New %1 components can be added or installed ones removed." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Adiciona ou remove componentes ou mdulos verso j instalada."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = " ( ) ."; - Text[ dutch ] = "Nieuwe programmamodules kunnen worden toegevoegd, reeds genstalleerde kunnen worden verwijderd."; - Text[ french ] = "Ajout ou suppression de composants de %1."; -@@ -221,7 +221,7 @@ - Text [ english_us ] = "Removes the %1 installation." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Elimina a instalao actual."; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ."; - Text[ dutch ] = "Verwijdert de genstalleerde versie."; - Text[ french ] = "Suppression de l'installation de %1."; -@@ -276,7 +276,7 @@ - Text [ english_us ] = "Restores your %1 installation to its original state." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Reinstala todos os mdulos do programa instalados na verso anterior."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = " ."; - Text[ dutch ] = "Renstalleert alle programmamodulen die bij de vorige installatie werden genstalleerd."; - Text[ french ] = "Restauration de l'tat d'origine de votre installation de %1."; -@@ -302,7 +302,7 @@ - Text [ english_us ] = "You must exit %1 and the %1 Quickstarter before you can continue." ; - Text[ language_user1 ] = "LLA: 8.1.02, Text wasn't changed."; - Text[ portuguese ] = "Ter que sair do %1 e do incio rpido %1 antes de prosseguir com a desinstalao."; -- Text[ russian ] = " %1 %1, ."; -+ Text[ russian ] = " %1 %1, ."; - Text[ greek ] = "Sie mssen %1 und den %1 Schnellstarter beenden bevor Sie mit der Deinstallation fortfahren knnen."; - Text[ dutch ] = "U moet %1 en de %1 snelstarter beindigen voordat u kunt doorgaan."; - Text[ french ] = "Quittez %1 et le dmarrage rapide de %1 afin de pouvoir poursuivre."; -@@ -334,7 +334,7 @@ - Text [ french ] = "Quittez %1 afin de pouvoir procder la dsinstallation." ; - Text [ dutch ] = "U moet %1 beindigen voordat u met de denstallatie kunt doorgaan." ; - Text[ chinese_simplified ] = "在撤除程序之前，您必须先关闭 %1 。"; -- Text[ russian ] = " %1, ."; -+ Text[ russian ] = " %1, ."; - Text[ polish ] = "Musisz zakoczy %1, by mc kontynuowa dezinstalacj."; - Text[ japanese ] = "インストールの削除を続行する前に、%1 を終了させる必要があります。"; - Text[ chinese_traditional ] = "在移除程式之前﹐您必須先關閉 %1 。"; -diff -ur ../setup2/source/ui/pages/prepair.src ../setup2/source/ui/pages/prepair.src ---- ../setup2/source/ui/pages/prepair.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prepair.src Fri Apr 5 18:45:48 2002 -@@ -142,7 +142,7 @@ - Text = "In Ihrer %1 Installation kann die folgende Datei nicht gefunden werden!" ; - Text[english_us] = "In the %1 installation, the following file could not be found!" ; - Text[ portuguese ] = "Impossvel localizar o seguinte ficheiro na sua instalao %1!"; -- Text[ russian ] = " %1!"; -+ Text[ russian ] = " %1!"; - Text[ dutch ] = "In uw %1 installatie is het volgende bestand niet te vinden!"; - Text[ french ] = "Le fichier suivant est introuvable dans l'installation de %1 !"; - Text[ spanish ] = "En su instalacin %1 no se puede encontrar el siguiente archivo!"; -@@ -178,7 +178,7 @@ - Text = "%1 bentigt diese Datei um fehlerfrei ausgefhrt werden zu knnen. Das Installationsprogramm kann versuchen diese Datei wieder herzustellen." ; - Text[english_us] = "%1 requires this file to be executed correctly. With the aid of the setup program it may be restored." ; - Text[ portuguese ] = "%1 necessita este ficheiro para poder ser devidamente executado. O programa de instalao poder tentar restaurar este ficheiro."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ dutch ] = "%1 benodigt dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld."; - Text[ french ] = "%1 ne peut pas tre excut correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer."; - Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con xito. El programa de instalacin puede intentar restaurar este archivo."; -@@ -207,7 +207,7 @@ - Text = "Wenn Sie auf '%1' klicken wird versucht Ihre %2 Installation zu reparieren. Klicken Sie dagegen auf '%3' um das Installationprogramm jetzt zu beenden." ; - Text[english_us] = "Click '%1' to have the setup program repair your '%2' installation. Click '%3' to exit the installation." ; - Text[ portuguese ] = "Clique em '%1' para tentar reparar a instalao %2. Clique em '%3' para terminar agora o programa de instalao."; -- Text[ russian ] = " '%1', %2. '%3', ."; -+ Text[ russian ] = " '%1', %2. '%3', ."; - Text[ dutch ] = "Als u op '%1' klikt wordt getracht uw %2 installatie te repareren. Klikt u daarentegen op '%3' dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour essayer de rparer l'installation de %2. ou sur '%3' si vous prfrez quitter le programme d'installation."; - Text[ spanish ] = "Si pulsa sobre '%1' se intentar reparar su instalacin %2. Pero si pulsa sobre '%3' se cerrar el programa de instalacin."; -diff -ur ../setup2/source/ui/pages/prspwizard.src ../setup2/source/ui/pages/prspwizard.src ---- ../setup2/source/ui/pages/prspwizard.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prspwizard.src Fri Apr 5 18:46:09 2002 -@@ -129,7 +129,7 @@ - Text = "Der Responsefile AutoPilot hilft Ihnen bei der Erstellung eines Responsefiles mit dem sie danach mehrere Installationsprofile automatisiert installieren knnen." ; - Text [ english_us ] = "The response file autopilot helps you to create a response file. These are then used to automatically install several installation profiles." ; - Text[ portuguese ] = "O AutoPiloto Response File ajuda-o a criar um Response File que lhe permite instalar automaticamente diversos perfis de instalao."; -- Text[ russian ] = " Response File (Response file), ."; -+ Text[ russian ] = " Response File (Response file), ."; - Text[ greek ] = " Responsefile Responsefile ? "; - Text[ dutch ] = "Responsefile AutoPilot helpt u bij het maken van een response-bestand waarmee u automatisch meerdere installatieprofielen kunt installeren."; - Text[ french ] = "L'AutoPilote Response File vous assiste lors de la cration d'un Response File grce auquel l'installation automatise des profils d'installation sera possible."; -diff -ur ../setup2/source/ui/pages/pscript.src ../setup2/source/ui/pages/pscript.src ---- ../setup2/source/ui/pages/pscript.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pscript.src Fri Apr 5 18:46:57 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprogramm" ; - Text [ english_us ] = "Installation program" ; - Text[ portuguese ] = "Programa de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprogramma"; - Text[ french ] = "Programme d'installation"; -@@ -114,7 +114,7 @@ - Text = "Das Installationsprogramm kann die Skriptdatei nicht finden, in der alle zur Installation notwendigen Anweisungen gespeichert sind." ; - Text [ english_us ] = "The installation program cannot find the script file in which all of the instructions required for installation have been saved." ; - Text[ portuguese ] = "O programa de instalao no encontra o ficheiro script com todas as instrues necessrias instalao."; -- Text[ russian ] = " , , ."; -+ Text[ russian ] = " , , ."; - Text[ greek ] = " "; - Text[ dutch ] = "Het installatieprogramma kan het scriptbestand met alle voor de installatie benodigde aanwijzingen niet vinden."; - Text[ french ] = "Le programme d'installation n'arrive pas trouver le fichier script contenant toutes les instructions ncessaires l'installation."; -@@ -178,7 +178,7 @@ - Text = "Ohne diese Datei kann das Installationsprogramm nicht ausgefhrt werden, es wird jetzt beendet." ; - Text [ english_us ] = "The installation program cannot be executed without this file, it will now be terminated." ; - Text[ portuguese ] = "Sem este ficheiro, impossvel executar o programa de instalao. Este ser cancelado agora."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ greek ] = " , ."; - Text[ dutch ] = "Zonder dit bestand kan het installatieprogramma niet worden uitgevoerd, het wordt nu gestopt."; - Text[ french ] = "Sans ce fichier, il est impossible de lancer le programme d'installation. Celui-ci va tre interrompu."; -diff -ur ../setup2/source/ui/pages/ptoplvl.src ../setup2/source/ui/pages/ptoplvl.src ---- ../setup2/source/ui/pages/ptoplvl.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/ptoplvl.src Fri Apr 5 18:47:10 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Selecteer de producten die u wilt installeren.\n" ; - Text [ portuguese ] = "Escolha os produtos que deseja instalar.\n" ; - Text[ chinese_simplified ] = "请选择要安装的软件。\n"; -- Text[ russian ] = ", , , .\n"; -+ Text[ russian ] = ", , , .\n"; - Text[ polish ] = "Wybierz produkty, ktre chcesz zainstalowa.\n"; - Text[ japanese ] = "インストールする製品を選択してください。\n"; - Text[ chinese_traditional ] = "請選擇要安裝的軟體。\n"; -diff -ur ../setup2/source/ui/pages/puninst.src ../setup2/source/ui/pages/puninst.src ---- ../setup2/source/ui/pages/puninst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/puninst.src Fri Apr 5 18:47:49 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 のインストールの削除"; - Text[ chinese_traditional ] = "移除 %1"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande %1 installatie uit map '%2' wilt verwijderen, druk dan op '%3'." ; - Text [ portuguese ] = "Se tiver a certeza de que deseja eliminar a instalao %1 existente no directrio '%2', clique em '%3'." ; - Text[ chinese_simplified ] = "如果真要删除目录\"%2\"中的安装程序%1，请按击\"%3\"。"; -- Text[ russian ] = " %1 '%2', '%3'."; -+ Text[ russian ] = " %1 '%2', '%3'."; - Text[ polish ] = "Jeli zainstalowany program %1 ma na pewno zosta usunity z katalogu '%2', naley klikn przycisk '%3'."; - Text[ japanese ] = "ディレクトリ「%2」にある %1 のインストールの削除をするときは、［%3］をクリックします。"; - Text[ chinese_traditional ] = "如果真要移除現存目錄<%2>內的 %1 ，就按一下<%3>。"; -@@ -142,7 +142,7 @@ - Text = "Die Deinstallation lscht keine %1 Konfigurationsdateien oder von Ihnen erstellte Dokumente. Sie knnen jetzt einstellen, dass auch diese Dateien von der Deinstallation gelscht werden." ; - Text [ english_us ] = "Deinstallation does not delete any %1 configuration files or documents created by the user. You can now determine if these files are also to be deleted by deinstallation." ; - Text[ portuguese ] = "A desinstalao no elimina os ficheiros de configurao %1 dos documentos que criou. Poder indicar agora se deseja que esses ficheiros sejam eliminados ao efectuar a desinstalao."; -- Text[ russian ] = " %1 . , ."; -+ Text[ russian ] = " %1 . , ."; - Text[ greek ] = " %1, "; - Text[ dutch ] = "Met de denstallatie worden geen %1 configuratiebestanden of door u gemaakte documenten gewist. U kunt hier kiezen of ook deze bestanden bij de denstallatie worden gewist."; - Text[ french ] = "La dsinstallation ne supprime ni les fichiers de configuration de %1, ni les documents que vous avez crs. Vous pouvez maintenant dcider de la suppression de ces fichiers par la dsinstallation."; -diff -ur ../setup2/source/ui/pages/pupdate.src ../setup2/source/ui/pages/pupdate.src ---- ../setup2/source/ui/pages/pupdate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pupdate.src Fri Apr 5 18:49:58 2002 -@@ -79,7 +79,7 @@ - Text[ swedish ] = "Installationsprogram fr %1"; - Text[ dutch ] = "Installatioeprogramma voor %1"; - Text[ spanish ] = "Programa de instalacin para %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_simplified ] = "%1 安装程序"; -@@ -109,7 +109,7 @@ - Text[ swedish ] = "Vlkommen till installationsprogrammet"; - Text[ dutch ] = "Welkom bij het installatieprogramma"; - Text[ spanish ] = "Bienvenida al programa de instalacin"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "インストールプログラムへようこそ"; - Text[ chinese_simplified ] = "欢迎安装！"; -@@ -138,7 +138,7 @@ - Text[ swedish ] = "Det finns redan en %1 installation i fljande mapp"; - Text[ dutch ] = "Er bestaat reeds een %1 installatie in de volgende directory"; - Text[ spanish ] = "Ya existe una instalacin %1 en el siguiente directorio"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Istnieje ju instalacja %1 w nastpujcym katalogu"; - Text[ japanese ] = "%1 インストールはすでに次のディレクトリにあります。"; - Text[ chinese_simplified ] = "在下列目录内已经存在一个%1程序"; -@@ -169,7 +169,7 @@ - Text = "Wenn Sie auf '%1' klicken, wird die vorhandene Installation aktualisiert. Klicken Sie auf '%2', wird das Installationsprogramm abgebrochen.\n\nBeachten Sie bitte, dass die Edition Ihrer vorhandenen Installation durch das Update bernommen wird." ; - Text [ english_us ] = "If you click '%1', the existing installation will be updated. Click '%2' to abort the installation.\n\nMake sure that the Edition type of your existing installation is adopted by the update." ; - Text[ portuguese ] = "Clique em '%1', para actualizar a instalao existente. Clique em '%2' para cancelar o programa de instalao.\n\nNote que o tipo de edio da verso instalada ser o mesmo aps a actualizao (update)."; -- Text[ russian ] = " '%1', . '%2', .\n\n , , ."; -+ Text[ russian ] = " '%1', . '%2', .\n\n , , ."; - Text[ dutch ] = "Als u op '%1' klikt dan wordt de bestaande installatie geactualiseerd. Klikt u op '%2', dan wordt het installatieprogramma gestopt.\n\nWij wijzen u erop, dat de editie van de bestaande installatie wordt overgenomen door de update-editie."; - Text[ french ] = "Cliquez sur '%1' pour actualiser l'installation existante ou sur '%2', pour quitter le programme d'installation.\n\nVeuillez noter que la mise jour reprendra le type d'dition de votre version d'origine."; - Text[ spanish ] = "Si pulsa sobre '%1', la instalacin existente se actualizar. Para cancelar el programa de instalacin, pulse sobre '%2'.\n\nTenga en cuenta que la actualizacin respetar la edicin de su instalacin existente."; -@@ -241,7 +241,7 @@ - Text = "Hierbei handelt es sich um eine Netzinstallation. Sie haben jedoch keine Schreibrechte in dem genannten Verzeichnis. Um diese Installation aktualisieren zu knnen verschaffen Sie sich Schreibrechte und starten das Installationsprogramm erneut." ; - Text [ english_us ] = "The program you want to run represents a network installation for which you must have the appropriate (write) access for the above-mentioned directory. Prior to running the installation again, you must have write access for this directory." ; - Text[ portuguese ] = "Esta uma instalao de rede. No entanto, no possui direitos de acesso no directrio mencionado. Para poder actualizar esta instalao ter que adquirir os direitos de acesso apropriados e reiniciar o programa de instalao."; -- Text[ russian ] = " . . , ."; -+ Text[ russian ] = " . . , ."; - Text[ dutch ] = "Het betreft hier een netinstallatie. U heeft echter geen schrijfrechten in de genoemde directory. Om deze installatie te kunnen actualiseren moet u zich schrijfrechten verschaffen en het installatieprogramma opnieuw starten."; - Text[ french ] = "Vous utilisez une installation en rseau pour laquelle vous ne possdez pas de droits d'criture dans le rpertoire cit. Pour pouvoir actualiser cette installation, vous devez vous procurer les droits d'criture ncessaires avant de relancer le programme d'installation."; - Text[ spanish ] = "Esta es una instalacin de red. Sin embargo, usted no posee derechos de escritura en el directorio nombrado. Para poder actualizar esta instalacin, obtenga los derechos de escritura y ejecute de nuevo el programa de instalacin."; -@@ -270,7 +270,7 @@ - Text = "Sie knnen eine Aktualisierung von %1 jedoch nicht durchfhren, da die Sprache der vorhandenen Installation nicht mit der Sprache dieses Installationsatzes bereinstimmt." ; - Text [ english_us ] = "The language of the installation files does not correspond to the language of the installed version %1. Thus, an upgrade is not possible." ; - Text[ portuguese ] = " impossvel efectuar a actualizao de %1, porque a lngua da instalao existente no combina com a lngua dos ficheiros de instalao."; -- Text[ russian ] = " %1 , .. ."; -+ Text[ russian ] = " %1 , .. ."; - Text[ dutch ] = "U kunt een actualiseren van %1 echter niet uitvoeren daar de taal van deze installatie niet overeenkomt met die van de reeds bestaande versie."; - Text[ french ] = "Impossible de procder une actualisation de %1 : la langue de l'installation existante ne correspond pas celle des prsents fichiers dl'installation."; - Text[ spanish ] = "No es posible efectuar una actualizacin de %1 dado que el idioma de la instalacin existente no coincide con el de estos archivos de instalacin."; -@@ -299,7 +299,7 @@ - Text = "Dies ist eine Updateinstallation fr %1.\n\nAuf Ihrem Rechner konnte jedoch keine %2 Installation gefunden werden. Das Installationsprogramm wird jetzt abgebrochen." ; - Text [ english_us ] = "This is an update installation for %1.\n\nNo %2 installation has been found. Installation program will be aborted." ; - Text[ portuguese ] = "Este um programa de actualizao (update) de %1.\n\nNo entanto, foi impossvel encontrar no seu computador a instalao de %2. O programa ser cancelado agora."; -- Text[ russian ] = " %1.\n\n %2 . ."; -+ Text[ russian ] = " %1.\n\n %2 . ."; - Text[ dutch ] = "Dit is een update-installatie voor %1.\n\nOp uw computer werdechter geen %2 installatie gevonden. Het installatiesprogramma wordt nu gestopt."; - Text[ french ] = "Le prsent programme est destin installer une mise jour (update) de %1.\n\nLe programme de mise jour n'a cependant dtect aucune installation de %2 et va donc tre interrompu."; - Text[ spanish ] = "Esta instalacin actualizar %1.\n\nSin embargo, no se ha encontrado en su ordenador una instalacin %2. El programa de instalacin se cancelar ahora."; -diff -ur ../setup2/source/ui/pages/pusrinst.src ../setup2/source/ui/pages/pusrinst.src ---- ../setup2/source/ui/pages/pusrinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pusrinst.src Fri Apr 5 18:50:14 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Slectionnez les modules que vous souhaitez installer." ; - Text [ dutch ] = "Selecteer de te installeren modules." ; - Text[ chinese_simplified ] = "请您选择要安装的模块。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz moduy dla instalacji."; - Text[ japanese ] = "インストールするモジュールを選択します。"; - Text[ chinese_traditional ] = "請您選擇要安裝的模塊。"; -diff -ur ../setup2/source/ui/pages/pwaddr.src ../setup2/source/ui/pages/pwaddr.src ---- ../setup2/source/ui/pages/pwaddr.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwaddr.src Fri Apr 5 18:50:25 2002 -@@ -143,7 +143,7 @@ - Text = "In der Zeit zwischen Installation und Registrierung knnen die Benutzerdaten nicht mehr gendert werden. Bitte kontrollieren Sie jetzt Ihre Benutzerdaten und klicken Sie auf '%1' wenn Sie die Daten noch ndern wollen."; - Text[english_us] = "During the period between installation and registration, the personal data specified cannot be changed. Check now the user data and click '%1' if you want to modify the data."; - Text[ portuguese ] = "No possvel modificar os dados de utilizador no perodo compreendido entre a instalao e o registo. Queira verificar agora os seus dados de utilizador e se pretender modific-los, clique em '%1'."; -- Text[ russian ] = " . , , '%1', ."; -+ Text[ russian ] = " . , , '%1', ."; - Text[ dutch ] = "In de tijd tussen installatie en registratie kunnen gebruikersgegevens niet meer worden veranderd. Controleer nu uw gebruikersgegevens. Als u nog iets wilt veranderen, klikt u dan op '%1'."; - Text[ french ] = "Vous ne pourrez plus modifier vos donnes d'identit durant la priode comprise entre l'installation et l'enregistrement. Veuillez vrifier vos donnes d'identit et cliquer sur '%1' si vous souhaitez les modifier."; - Text[ spanish ] = "En el periodo entre la instalacin y el registro no se pueden modificar los datos de usuario. Compruebe por favor ahora sus datos de usuario y pulse sobre '%1' si an desea modificar los datos."; -diff -ur ../setup2/source/ui/pages/pwelcome.src ../setup2/source/ui/pages/pwelcome.src ---- ../setup2/source/ui/pages/pwelcome.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwelcome.src Fri Apr 5 18:51:41 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のセットアッププログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Bienvenido al programa de instalacin" ; - Text [ english_us ] = "Welcome to the Installation Program" ; - Text[ chinese_simplified ] = "欢迎安装！"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "セットアッププログラムへようこそ"; - Text[ chinese_traditional ] = "歡迎安裝"; -@@ -138,7 +138,7 @@ - Text [ french ] = "Le programme d'installation va installer les composants de %1 sur votre disque dur. Pour quitter le programme d'installation, utilisez le bouton '%2'." ; - Text [ dutch ] = "Het installatieprogramma richt de %1 componenten in op uw vaste schijf. Om het installatieprogramma te beindigen staat u te allen tijde de knop '%2' ter beschikking." ; - Text[ chinese_simplified ] = "安装程序在硬盘上安装 %1 组件。\n您可以通过单击按钮 '%2' 来结束安装程序。"; -- Text[ russian ] = " %1. '%2'."; -+ Text[ russian ] = " \n%1. \n '%2'."; - Text[ polish ] = "Program instalacyjny instaluje komponenty pakietu %1 na dysku twardym. Aby zakoczy program instalacyjny, mona w kadej chwili klikn przycisk '%2'."; - Text[ japanese ] = "セットアッププログラムは、%1 コンポーネントをハードディスク上にインストールします。セットアッププログラムを中断するには、［%2］をクリックします。"; - Text[ chinese_traditional ] = "安裝程式在磁碟上安裝 %1 元件。\n可以按一下 %2 ，結束安裝程式。"; -@@ -166,7 +166,7 @@ - Text [ french ] = "Avant de procder l'installation, vous devez fermer tous les programmes en cours. Cliquez sur '%1' pour quitter le programme d'installation et fermer tous les programmes en cours. Cliquez sur '%2' pour poursuivre l'installation." ; - Text [ dutch ] = "Pas op: Beindig voor de installatie alle geopende programma's. Met '%1' verlaat u het installatieprogramma en kunt u geopende programma's afsluiten. Klikt u echter op '%2', dan wordt de installatie voortgezet." ; - Text[ chinese_simplified ] = "请在安装程序之前关闭所有正在运行的其他程序。\n点击 '%1' 就能够退出和关闭安装程序。\n点击 '%2'，就会继续执行安装。"; -- Text[ russian ] = " . '%1' "; -+ Text[ russian ] = " . '%1' "; - Text[ polish ] = "Przed rozpoczciem instalacji naley zakoczy wszystkie pracujce programy. Aby opuci program instalacyjny i zamkn wszystkie aktywne programy, naley klikn przycisk '%1'. Po klikniciu przycisku '%2' nastpi kontynuacja instalacji."; - Text[ japanese ] = "インストールを開始する前に、開いているアプリケーションをすべて終了してください。アプリケーションの終了は、［%1］でセットアッププログラムを閉じた上で行います。［%2］をクリックすると、このままインストールを続行します。"; - Text[ chinese_traditional ] = "請在安裝之前關閉正在運行的其他程式。\n按一下 %1 就能夠退出和關閉安裝程式。\n按一下 %2 ﹐就會繼續執行安裝。"; -diff -ur ../setup2/source/ui/pages/pwsetup.src ../setup2/source/ui/pages/pwsetup.src ---- ../setup2/source/ui/pages/pwsetup.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwsetup.src Fri Apr 5 18:52:50 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "%1 bevindt zich reeds in de directory" ; - Text [ portuguese ] = "%1 j se encontra no directrio." ; - Text[ chinese_simplified ] = "%1 已经安装"; -- Text[ russian ] = "%1 "; -+ Text[ russian ] = "%1 "; - Text[ polish ] = "%1 zainstalowano ju w katalogu"; - Text[ japanese ] = "%1 はすでにディレクトリに"; - Text[ chinese_traditional ] = "%1已經安裝"; -@@ -182,7 +182,7 @@ - Text [ french ] = "Pour procder la dsinstallation, vous devez utiliser le programme d'installation (setup) de la version que vous voulez dsinstaller. Ceci fait, vous pourrez utiliser le prsent programme d'installation pour installer %1." ; - Text [ dutch ] = "Gebruikt u het zich daar bevindende setup-programma voor de denstallatie. Wilt u %1 opnieuw installeren, dan kunt u weer dit setup-programma starten." ; - Text[ chinese_simplified ] = "请您使用目录内的安装程序来撤除软件。如果您要重新安装\"%1\"，请您重新启动这个安装程序。"; -- Text[ russian ] = " , , . %1 ."; -+ Text[ russian ] = " , , . %1 ."; - Text[ polish ] = "Prosz uy tamtejszego programu instalacyjnego do deinstalacji. Dla ponownej instalacji %1 uruchom ponownie program instalacyjny."; - Text[ japanese ] = "インストールの削除は、インストールされた場所のセットアッププログラムで実行してください。%1 を再インストールする場合は、そこのセットアッププログラムを再開始します。"; - Text[ chinese_traditional ] = "請使用目錄內的安裝程式來移除軟體。如果要重新安裝<%1>。請重新啟動這個安裝程式。"; -@@ -203,7 +203,7 @@ - Text = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text [ english_us ] = "If the installation above is not working properly anymore, you can have it repaired."; - Text[ portuguese ] = "Se a instalao acima mencionada no estiver a funcionar devidamente, poder repar-la agora."; -- Text[ russian ] = " , , , ."; -+ Text[ russian ] = " , , , ."; - Text[ greek ] = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text[ dutch ] = "Mocht de bovenvermelde installatie niet meer naar wens functioneren dan kunt u deze hier laten repareren."; - Text[ french ] = "Si l'installation spcifie ci-dessus ne fonctionne plus correctement, vous avez la possibilit de la rparer."; -diff -ur ../setup2/source/ui/pages/vefun.src ../setup2/source/ui/pages/vefun.src ---- ../setup2/source/ui/pages/vefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/vefun.src Fri Apr 5 18:54:44 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Instalacin finalizada" ; - Text [ french ] = "L'installation est termine." ; - Text [ dutch ] = "Installatie beindigd" ; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ polish ] = "Instalacja zakoczona"; - Text[ japanese ] = "インストールの完了"; -@@ -158,7 +158,7 @@ - Text [ spanish ] = "La instalacin ha finalizado con xito.\nSun Microsystems le desea que disfrute trabajando con %1!" ; - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ greek ] = " .\n Sun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でさらに充実したお仕事を Sun Microsystems は心から願っております。"; -@@ -186,7 +186,7 @@ - Text [ french ] = "Les modules et composants slectionns ont t installs / dsinstalls." ; - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e componentes seleccionados esto agora instalados/desinstalados no seu disco rgido." ; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ greek ] = " / ."; - Text[ polish ] = "Wybrane moduy i komponenty zostay zainstalowane / zdeinstalowane na twardym dysku."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; -@@ -215,7 +215,7 @@ - Text [ danish ] = "Installationen er blevet repareret.\n" ; - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ greek ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; -@@ -244,7 +244,7 @@ - TEXT[ swedish ] = "Avinstallationen r avslutad.\n\nVar vnlig och observera att installationsprogrammet inte har raderat alla filerna. %1 konfigurationsfiler och dokument som du sjlv har skapat har inte raderats. Om du inte behver de hr filerna mer kan du radera %1-mappen manuellt."; - TEXT[ dutch ] = "De denstallatie ist beindigd.\n\nWij maken u erop attent, dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente.\n\nTenga en cuenta que el programa de instalacin no ha eliminado la totalidad de los archivos. Los archivos de configuracin %1 as como sus documentos personales no han sido eliminados. Si no los necesita ms, puede eliminar manualmente el directorio %1."; -- TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; -+ TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; - TEXT[ polish ] = "Deinstalacja zostaa pomylnie zakoczona.\n\nNaley uwzgldni, e program instalacyjny nie usun wszystkich plikw. Pliki konfiguracyjne %1 i wasne dokumenty nie zostay usunite.Jeli nie s one ju potrzebne, mona usun katalog %1 rcznie."; - TEXT[ japanese ] = "インストールプログラムは正常に完了しました。\n\nインストールプログラムがすべてのファイルを削除していないことに、注意してください。%1 設定ファイルやユーザーが作成したドキュメントは削除されていません。これらも必要でなければ %1 ディレクトリを手動で削除します。"; - TEXT[ chinese_simplified ] = "现在已经完成撤除程序。\n\n请注意：安装程序并没有删除所有的文件。%1 配置文件和上次安装程序之后您建立的文档没有被删除。如果不再需要这些文件，请您自己删除 %1 目录。"; -@@ -303,7 +303,7 @@ - Text [ spanish ] = "Pulse '%1' para finalizar la instalacin del programa." ; - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ greek ] = " '%1' ."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; -@@ -332,7 +332,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes au fichier config.sys. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre systme." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de config.sys. Om deze te activeren en om een integratie van %1 te garanderen moet uw systeem opnieuw worden opgestart." ; - Text [ portuguese ] = "Durante a instalao foram feitas modificaes no config.sys.Ter que reiniciar o computador para que estas sejam activadas e para assegurar a integrao do %1 na interface." ; -- Text[ russian ] = " config.sys. , %1, ."; -+ Text[ russian ] = " config.sys. , %1, ."; - Text[ greek ] = " CONFIG.SYS . "; - Text[ polish ] = "Podczas instalacji nastpiy zmiany w pliku config.sys. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、config.sys に変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -362,7 +362,7 @@ - Text [ danish ] = "Der er blevet installeret nye tegnst under installationen. Det er ndvendigt at genstarte computeren, for at gre dem tilgngelige for alle programmer." ; - Text [ portuguese ] = "Foram instalados novos caracteres. Ter que reiniciar o seu computador para que estes estejam disponveis para todos os programas." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; -- Text[ russian ] = " . , , ."; -+ Text[ russian ] = " . , , ."; - Text[ greek ] = " . "; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, konieczne jest ponowne uruchomienie."; - Text[ japanese ] = "インストール中に、新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するには、コンピュータを再起動させる必要があります。"; -@@ -391,7 +391,7 @@ - Text [ spanish ] = "Durante la instalacin se efectuaron modificaciones en los archivos del sistema. Para que estas puedan activarse y para garantizar la integracin de %1 en la interfaz, debe reiniciar su sistema." ; - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1, moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中にシステムファイルに変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -420,7 +420,7 @@ - Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalacin." ; - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "いますぐ再起動するには [%1] をクリックします。［%2］をクリックすると、インストールプログラムを終了します。"; -diff -ur ../setup2/source/uibase/agentdlg.src ../setup2/source/uibase/agentdlg.src ---- ../setup2/source/uibase/agentdlg.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/uibase/agentdlg.src Fri Apr 5 18:04:26 2002 -@@ -171,7 +171,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "Install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installeren"; - Text[ french ] = "Installer"; -diff -ur ../sfx2/source/view/view.src ../sfx2/source/view/view.src ---- ../sfx2/source/view/view.src Wed Apr 3 16:09:43 2002 -+++ ../sfx2/source/view/view.src Fri Apr 5 19:06:40 2002 -@@ -745,7 +745,7 @@ - MESSAGE [ spanish ] = "Error al enviar el mensaje. La razn puede ser una cuenta de usuario o una instalacin defectuosa.\nCompruebe la configuracin de %PRODUCTNAME o la de su programa de correo electrnico." ; - MESSAGE [ english_us ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; - MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生一个错误。可能缺少一个用户帐号或者安装程序有错误。\n请您检查 %PRODUCTNAME 的设定或者您的电子邮件程序的设定。"; -- MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; -+ MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; - MESSAGE[ polish ] = "Bd w przesyaniu wiadomoci: brak konta uytkownika lub nieprawidowa instalacja.\nNaley sprawdzi ustawienia programu %PRODUCTNAME lub programu poczty elektronicznej."; - MESSAGE[ japanese ] = "メッセージ送信時のエラー。エラーの原因としては、ユーザーアカウントがないか、あるいはセットアップが正しくないかが考えられます。\n%PRODUCTNAME、またはお使いの E-mail プログラムの設定を確認してください。"; - MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。可能缺少一個使用者賬號或安裝有問題。\n請您檢查 %PRODUCTNAME 的設定和您的電子郵件程式的設定。"; -diff -ur ../starmath/source/smres.src ../starmath/source/smres.src ---- ../starmath/source/smres.src Wed Apr 3 16:12:34 2002 -+++ ../starmath/source/smres.src Fri Apr 5 17:46:21 2002 -@@ -3533,7 +3533,7 @@ - Message [ spanish ] = "La fuente \"StarMath\" no est instalada!\nSin esta fuente StarMath no funcionar correctamente...\nInstale la fuente y reinicie StarMath." ; - Message [ english_us ] = "The \"StarMath\" font has not been installed.\nWithout this font %PRODUCTNAME Math cannot function correctly.\nPlease install this font and restart %PRODUCTNAME Math." ; - Message[ chinese_simplified ] = "没有安装 StarMath 字体！\n没有这个 StarMath字体程序会无法正常运作。\n请在安装这个字体后重新启动 StarMath 。"; -- Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; -+ Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; - Message[ polish ] = "Czcionka \"StarMath\" nie jest zainstalowana!\nBez tej czcionki %PRODUCTNAME Math nie moe poprawnie pracowa...\nZainstaluj t czcionk i uruchom %PRODUCTNAME Math ponownie."; - Message[ japanese ] = "\"StarMath\" フォントがインストールされていません｡\nこのフォントなしでは %PRODUCTNAME Math がうまく機能しません...\nまずフォントをインストールして %PRODUCTNAME Math を再起動してください。"; - Message[ chinese_traditional ] = "沒有安裝 StarMath 字型\n而無法正常運行！\n請安裝 StarMath 字型，然后再重新開啟 StaMath。"; -diff -ur ../svtools/source/control/ctrltool.src ../svtools/source/control/ctrltool.src ---- ../svtools/source/control/ctrltool.src Wed Apr 3 16:13:31 2002 -+++ ../svtools/source/control/ctrltool.src Fri Apr 5 17:44:53 2002 -@@ -376,7 +376,7 @@ - TEXT [ English ] = "This font size is not installed. The closest available size will be used." ; - TEXT[ english_us ] = "This font size has not been installed. The closest available size will be used."; - TEXT[ portuguese ] = "Este tamanho de letra no est instalado. Ser utilizado o tamanho disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ."; - TEXT[ dutch ] = "Deze schriftgrootte is niet genstalleerd. De meest passende voorhanden zijnde grootte wordt toegepast."; - TEXT[ french ] = "Cette taille de police n'a pas t installe. La taille disponible la plus approprie va tre utilise."; -@@ -429,7 +429,7 @@ - TEXT [ English ] = "This font is not installed. The closest available font will be used." ; - TEXT[ english_us ] = "This font has not been installed. The closest available font will be used."; - TEXT[ portuguese ] = "Este tipo de letra no est instalado. Ser utilizado o tipo de letra disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ( ) ."; - TEXT[ dutch ] = "Dit lettertype is niet genstalleerd. Het meest overeenkomende voorhanden zijnde type wordt gebruikt."; - TEXT[ french ] = "Ce type de police n'a pas t install. Le type de police le plus appropri va tre utilis."; -diff -ur ../svtools/source/misc/errtxt.src ../svtools/source/misc/errtxt.src ---- ../svtools/source/misc/errtxt.src Wed Apr 3 16:13:33 2002 -+++ ../svtools/source/misc/errtxt.src Fri Apr 5 17:44:20 2002 -@@ -2836,7 +2836,7 @@ - Text [ dutch ] = "Om een channel te installeren heeft u een abonnementenmap nodig."; - Text [ spanish ] = "Para instalar un canal necesita una carpeta de suscripciones."; - Text[ chinese_simplified ] = "如果要安装频道，您就需要先创建一个订阅文件夹。"; -- Text[ russian ] = " Channel ."; -+ Text[ russian ] = " Channel ."; - Text[ polish ] = "Instalacja kanau wymaga utworzenia folderu subkrypcji."; - Text[ japanese ] = "チャンネルをインストールするには購読フォルダが必要です。"; - Text[ chinese_traditional ] = "如果要安裝頻道﹐您就需要建立一個訂閱資料夾"; -diff -ur ../svx/source/dialog/lingu.src ../svx/source/dialog/lingu.src ---- ../svx/source/dialog/lingu.src Wed Apr 3 16:10:44 2002 -+++ ../svx/source/dialog/lingu.src Fri Apr 5 19:04:25 2002 -@@ -402,7 +402,7 @@ - TEXT [ spanish ] = "no est disponible para la revisin ortogrfica.\nRevise su instalacin e instale,\nsi es necesario, el idioma deseado" ; - TEXT [ english_us ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = " 无法提供拼写检查功能。请检查安装的程序，如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "jest niedostpne do sprawdzania. \nProsz sprawdzi instalacj i zainstalowa \n ewentualnie potrzebny jzyk."; - TEXT[ japanese ] = "はスペルチェックに使用できません。\nプログラムのインストールをチェックして\n必要ならばその言語をインストールしてください。"; - TEXT[ chinese_traditional ] = " 無法提供拼寫檢查功能。\n請檢查安裝的程式﹐若有必要﹐\n請您安裝要使用的語言版本。"; -@@ -489,7 +489,7 @@ - TEXT [ spanish ] = "No existe un diccionario de sinnimos para el idioma seleccionado. \nCompruebe por favor su instalacin\n e instale, si es necesario, el idioma deseado" ; - TEXT [ english_us ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = "您设定的语言没有附加同义词词典功能。\n请您检查的安装程序。\n如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - TEXT[ japanese ] = "選択した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、\n必要ならば、希望の言語をインストールしてください。"; - TEXT[ chinese_traditional ] = "您設定的語言版本沒有附加同義詞詞典功能。\n請您檢查安裝的程式。\n若有必要﹐請您安裝要使用的語言版本。"; -diff -ur ../svx/source/items/svxerr.src ../svx/source/items/svxerr.src ---- ../svx/source/items/svxerr.src Wed Apr 3 16:10:47 2002 -+++ ../svx/source/items/svxerr.src Fri Apr 5 19:03:00 2002 -@@ -263,7 +263,7 @@ - Text [ portuguese ] = "O dicionrio de sinnimos no se encontra disponvel para a lngua especificada.\nConfira a sua instalao e, se necessrio, instale a lngua desejada." ; - Text [ portuguese_brazilian ] = "Ein Thesaurus f? die eingestellte Sprache ist nicht verf?bar.\n?berpr?en Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "您所设定的语言没有相应的同义词词典。\n请您检查安装，如有必要，请您安装所要使用的语言版本。"; -- Text[ russian ] = " .\n, . , , "; -+ Text[ russian ] = " .\n, . , , "; - Text[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka.\nProsz sprawdzi instalacj i zainstalowa potrzebny jzyk."; - Text[ japanese ] = "設定した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、必要ならば希望の言語をインストールしてください。"; - Text[ chinese_traditional ] = "您所設定的語言沒有相應的同義詞詞典。\n請您檢查安裝﹐若有必要﹐請安裝所要使用的語言版本。"; -@@ -283,7 +283,7 @@ - TEXT [ English ] = "$(ARG1) is not available or is currently not active.\nPlease check your installation and install the desired language\nor activate in 'Tools - Options - Language Settings - Writing Aids' the desired module." ; - TEXT[ english_us ] = "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options - Language Settings - Writing Aids'."; - TEXT[ portuguese ] = "$(ARG1) no tem suporte para verificao ortogrfica ou encontra-se desactivado. \nConfira a sua instalao e, se necessrio, instale o mdulo lingustico desejado\nou ento active-o em 'Ferramentas - Opes - Configurao da lngua - Lingustica'."; -- TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; -+ TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; - TEXT[ greek ] = "$(ARG1) .\n ? "; - TEXT[ dutch ] = "$(ARG1) wordt niet ondersteund door de controle, resp. is momenteel niet geactiveerd. \nControleer uw installatie en installeer eventueel de gewenste taalmodule\nresp. activeer de betreffende taalmodule onder 'Extra - Opties - Taalinstellingen - Lingustiek' "; - TEXT[ french ] = "$(ARG1) n'est pas support par la vrification ou n'est actuellement pas actif.\nVrifiez l'installation et installez le cas chant le module de langue requis, ou activez-le sous 'Outils - Options - Paramtres linguistiques - Linguistique'."; -diff -ur ../sw/source/ui/envelp/envelp.src ../sw/source/ui/envelp/envelp.src ---- ../sw/source/ui/envelp/envelp.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envelp.src Fri Apr 5 17:46:34 2002 -@@ -109,7 +109,7 @@ - Text [ spanish ] = "No se han instalado controladores de bases de datos." ; - Text [ english_us ] = "No database drivers installed." ; - Text[ chinese_simplified ] = "没有安装数据库驱动程序。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Nie zainstalowany sterownik bazy danych."; - Text[ japanese ] = "データベースドラバがインストールされていません。"; - Text[ chinese_traditional ] = "沒有安裝資料庫驅動程式。"; -diff -ur ../sw/source/ui/envelp/envprt.src ../sw/source/ui/envelp/envprt.src ---- ../sw/source/ui/envelp/envprt.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envprt.src Fri Apr 5 17:46:48 2002 -@@ -335,7 +335,7 @@ - Text [ PORTUGUESE ] = "- Nenhuma impressora instalada -" ; - Left = TRUE ; - Text[ chinese_simplified ] = "- 没有安装打印机 -"; -- Text[ russian ] = "- -"; -+ Text[ russian ] = "- -"; - Text[ polish ] = "- Drukarka nie jest zainstalowana -"; - Text[ japanese ] = "- プリンタがインストールされていません -"; - Text[ chinese_traditional ] = "- 沒有安裝印表機 -"; -diff -ur ../sysui/unix/office/cde/group.lng ../sysui/unix/office/cde/group.lng ---- ../sysui/unix/office/cde/group.lng Wed Apr 3 16:15:07 2002 -+++ ../sysui/unix/office/cde/group.lng Fri Apr 5 17:40:12 2002 -@@ -52,7 +52,7 @@ - 01 = "Information and Setup" - 49 = "Information und Setup" - 0 = "Informacja i instalacja" --7 = " " -+7 = " " - 55 = "Information und Setup" - 37 = "Information und Setup" - 03 = "Informao e instalao" -@@ -71,7 +71,7 @@ - 88 = "資訊和安裝程式" - 90 = "Information und Setup" - 96 = "Information und Setup" --07 = " " -+07 = " " - - [<template_control_label>] - 01 = "From Template" -@@ -102,7 +102,7 @@ - 01 = "%PRODUCTNAME Setup" - 49 = "%PRODUCTNAME Setup" - 0 = "Instalacja %PRODUCTNAME" --7 = " %PRODUCTNAME" -+7 = " %PRODUCTNAME" - 55 = "%PRODUCTNAME Setup" - 37 = "%PRODUCTNAME Configuraci" - 03 = "%PRODUCTNAME Setup" -@@ -121,7 +121,7 @@ - 88 = "%PRODUCTNAME 安裝程式" - 90 = "%PRODUCTNAME Setup" - 96 = " %PRODUCTNAME " --07 = " %PRODUCTNAME" -+07 = " %PRODUCTNAME" - - [<printeradmin_action_label>] - 01 = "%PRODUCTNAME Printer Administration" -diff -ur ../uui/source/ids.src ../uui/source/ids.src ---- ../uui/source/ids.src Wed Apr 3 16:12:58 2002 -+++ ../uui/source/ids.src Fri Apr 5 17:45:53 2002 -@@ -1117,7 +1117,7 @@ - Text[english] = "The installed Java version is not supported"; - Text[ english_us ] = "The installed Java version is not supported"; - Text[ portuguese ] = "A verso Java instalada no tem suporte."; -- Text[ russian ] = " Java ."; -+ Text[ russian ] = " Java ."; - Text[ greek ] = "The installed Java version is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund"; - Text[ french ] = "La version de Java installe n'est pas supporte."; -@@ -1143,7 +1143,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte."; -- Text[ russian ] = " Java $(ARG1) ."; -+ Text[ russian ] = " Java $(ARG1) ."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte."; -@@ -1168,7 +1168,7 @@ - Text[english] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ english_us ] = "The installed Java version is not supported, at least version $(ARG1) is required"; - Text[ portuguese ] = "A verso Java instalada no tem suporte. Verso mnima necessria: $(ARG1)"; -- Text[ russian ] = " Java . , $(ARG1)."; -+ Text[ russian ] = " Java . , $(ARG1)."; - Text[ greek ] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund. Minstens versie $(ARG1) wordt benodigd"; - Text[ french ] = "La version de Java installe n'est pas supporte. Version minimum requise : $(ARG1)."; -@@ -1194,7 +1194,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte. Verso mnima necessria: $(ARG2)"; -- Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; -+ Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund. Minstens versie $(ARG2) wordt benodigd"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte. Version minimum requise : $(ARG2)."; -diff -ur ../vcl/source/src/stdtext.src ../vcl/source/src/stdtext.src ---- ../vcl/source/src/stdtext.src Wed Apr 3 16:10:54 2002 -+++ ../vcl/source/src/stdtext.src Fri Apr 5 19:02:38 2002 -@@ -71,7 +71,7 @@ - Text [ English ] = "The component (%s) could not be loaded.\nPlease start setup in repair mode." ; - Text[ english_us ] = "The component (%s) could not be loaded.\nPlease start setup with the repair option."; - Text[ portuguese ] = "Impossvel carregar o componente (%s).\nReinicie o setup com a opo 'Reparao'."; -- Text[ russian ] = " (%s) .\n ."; -+ Text[ russian ] = " (%s) .\n ."; - Text[ dutch ] = "Een component (%s) kon niet worden geladen.\nStart setup opnieuw met de optie Reparatie."; - Text[ french ] = "Impossible de charger l'un des composants (%s).\nVeuillez redmarrer le programme d'installation (Setup) et excuter une rparation."; - Text[ spanish ] = "No se pudo cargar un componente (%s).\nInicie por favor el programa de instalacin y ejecute una Reparacin."; -diff -ur ../wizards/source/formwizard/dbwizres.src ../wizards/source/formwizard/dbwizres.src ---- ../wizards/source/formwizard/dbwizres.src Wed Apr 3 16:11:48 2002 -+++ ../wizards/source/formwizard/dbwizres.src Fri Apr 5 17:48:56 2002 -@@ -283,7 +283,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Formulare starten zu knnen."; - Text [ english_us] = "No database has been installed. At least one database is required before the AutoPilot for forms can be started."; - Text[ portuguese ] = "Nenhuma base de dados instalada. Para poder activar o AutoPiloto de formulrios necessria, pelo menos, uma base de dados."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft minstens n database nodig om de AutoPiloot voor formulieren te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de formulaire."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para formularios."; -@@ -2675,7 +2675,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Abfragen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for queries."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para consultas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor query's te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de requte."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para consultas."; -@@ -3605,7 +3605,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Berichte starten zu knnen."; - Text [ english_us ] = "A database has not been installed. There must be at least one database on the system so that the AutoPilot Report can be started."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para relatrios."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor berichten te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote d'tats."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para informes."; -@@ -4609,7 +4609,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mind. eine Datenbank um den AutoPiloten fr Tabellen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for tables."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para iniciar o AutoPiloto para tabelas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft ten minste n database nodig om de autopiloot voor tabellen te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de table."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para tablas."; diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 697540671fe2..6bd28fccbf48 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.2 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ @@ -31,12 +30,14 @@ GREP?= /usr/bin/grep MOUNT?= /sbin/mount ZIP?= ${PREFIX}/bin/zip UNZIP?= ${PREFIX}/bin/unzip +ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh PASTE?= /usr/bin/paste .include <bsd.port.pre.mk> INSTALLATION_BASEDIR= OpenOffice.org1.0 +BUILD_NR= 641 DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -104,11 +105,12 @@ CXX= g++32 EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -.if !defined(USE_GCC) -BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -.endif +#.if !defined(USE_GCC) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +#.endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) @@ -133,7 +135,7 @@ USE_AUTOCONF= yes WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ - --with-os-version=${OSVERSION} + --with-os-version=${OSVERSION} \ + --with-ant-home=${LOCALBASE}/ -.if !defined(USE_GCC) -CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} -.endif +#.if !defined(USE_GCC) +#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} +#.endif .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 @@ -464,8 +467,8 @@ do-build: .endif @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) - @${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo index 2ed3b84d0aa0..990a3b17fa95 100644 --- a/editors/openoffice.org-1.0/distinfo +++ b/editors/openoffice.org-1.0/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 34f2ca644b7d70573148c82d64eb6064 +MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 diff --git a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch index 97fec46bcef4..9540987d0f65 100644 --- a/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice.org-1.0/files/patch-berkeleydb+db-3.2.9.patch @@ -1,82 +1,132 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002 -+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002 -@@ -47,17 +47,27 @@ - --- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 - *************** - *** 1795,1800 **** ----- 1795,1802 ---- -+--- 1795,1803 ---- - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; - + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; -++ freebsd*) JINCSUBDIRS="freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac - - --- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 - +++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -984,7 +984,7 @@ +--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 ++++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 +@@ -45,52 +45,82 @@ + CCLINK= @MAKEFILE_CCLINK@ + *** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001 + --- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003 +-*************** +-*** 995,1000 **** +---- 995,1001 ---- +- CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" +- LIBS="-lsocket -lsvipc $LIBS";; +-+ netbsd*) optimize_def="-O2";; +- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- *qnx) cat >> confdefs.h <<\EOF +- #define HAVE_QNX 1 +-*************** +-*** 1795,1800 **** +---- 1796,1803 ---- +- case "$host_os" in +- solaris*) JINCSUBDIRS="solaris";; +- linux*) JINCSUBDIRS="linux genunix";; +-+ irix*) JINCSUBDIRS="irix";; +-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +- *) JINCSUBDIRS="genunix";; +- esac +- ++@@ -984,9 +984,9 @@ + optimize_def="-O2" + LIBS="-lipc $LIBS";; + bsdi*) optimize_def="-O2";; +-freebsd*) optimize_def="-O2" ++- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" ++- LIBS="-pthread";; ++freebsd*) optimize_def="-O" -+ CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" -+ LIBS="-pthread";; +++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS" +++ LIBS="$PTHREAD_LIBS";; + hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - @@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -@@ -68,13 +78,22 @@ - #define HAVE_QNX 1 - --- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 - +++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 --@@ -1194,11 +1194,12 @@ -+@@ -1194,11 +1194,23 @@ - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva ++ irix*) optimize_def="-O2" ++ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";; ++@@ -995,6 +995,7 @@ ++ CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" ++ LIBS="-lsocket -lsvipc $LIBS";; +++netbsd*) optimize_def="-O2";; ++ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ *qnx) cat >> confdefs.h <<\EOF ++ #define HAVE_QNX 1 ++@@ -1795,6 +1796,9 @@ ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; +++ irix*) JINCSUBDIRS="irix";; +++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +++ freebsd*) JINCSUBDIRS="freebsd genunix";; ++ *) JINCSUBDIRS="genunix";; ++ esac ++ + *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 + --- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 +-*************** +-*** 1194,1204 **** +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-- else +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +- fi +- ;; +- +---- 1194,1205 ---- +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +-+ else +-+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-+ need_version=no +- fi +- ;; +- ++@@ -1194,11 +1194,12 @@ ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ++- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva ++ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - else +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ need_version=no -++ fi -++ ;; -++ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - + else -@@ -84,3 +103,24 @@ - fi - ;; - -+@@ -2019,6 +2031,20 @@ -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' ++ fi ++ ;; ++ ++@@ -1365,10 +1366,13 @@ ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd*) ++- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \ +++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no +++ need_version=no ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++@@ -2020,6 +2024,14 @@ + soname_spec='${libname}${release}.so$major' + dynamic_linker='NetBSD ld.elf_so' -++ fi ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd*) ++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -+ fi +++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' +++ soname_spec='${libname}${release}.so$major' +++ dynamic_linker='FreeBSD ld.elf_so' + shlibpath_var=LD_LIBRARY_PATH + ;; ++ diff --git a/editors/openoffice.org-1.0/files/patch-config_office+configure.in b/editors/openoffice.org-1.0/files/patch-config_office+configure.in index 2957c2be79d2..f98720a8c3ae 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.0/files/patch-config_office+configure.in @@ -1,187 +1,46 @@ ---- configure.in.orig Sat Jun 8 02:49:26 2002 -+++ configure.in Mon Jul 15 13:36:23 2002 -@@ -28,6 +28,11 @@ - - Usage: --enable-gcc3 - ],,) -+AC_ARG_ENABLE(debug, -+[ --enable-debug if you like to build with debug symbols -+ -+ Usage: --enable-debug -+],,) - AC_ARG_WITH(stlport4-home, - [ --with-stlport4-home The location that STLport4 is installed in. The STL - header files are assumed to be in stlport4-home/stlport -@@ -103,6 +108,12 @@ - - Usage: --with-asm-home=<path to ml.exe directory> - ],,) -+AC_ARG_WITH(os-version, -+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice -+ with the correct OSVERSION. -+ -+ Usage: --with-os-version=<OSVERSION> -+],,) - AC_ARG_WITH(unzip-home, - [ --with-unzip-home For Windows users, please supply the path for - unzip.exe. -@@ -241,7 +252,7 @@ - if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then - AC_PROG_CC - fi --if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then -+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then - dnl ****************************************** - dnl Testing for GNU compiler and version... - dnl ****************************************** -@@ -366,8 +377,9 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -- _gcc_include_path="/usr/include/g++" -+ if test "$_os" = "NetBSD" ; then -+ _gcc_include_path="/usr" -+ _gxx_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +420,71 @@ - fi +--- configure.in.orig Thu Jan 16 13:42:46 2003 ++++ configure.in Tue Jan 21 23:09:35 2003 +@@ -352,10 +352,7 @@ + if test "$COMPATH" != "NO_GCC"; then + AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi - fi -+if test "$_os" = "FreeBSD"; then -+ dnl ****************************************** -+ dnl Testing for GNU compiler and version... -+ dnl Adapted to the FreeBSD ports system -+ dnl ****************************************** -+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3 -+ if test -n "$enable_gcc3"; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" -+ fi -+ if test -z "$CC"; then -+ CC="cc"; -+ fi -+ if test -z "$CXX"; then -+ CXX="c++"; -+ fi -+ if which $CC; then -+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'` -+ _gcc_version=`$CC -dumpversion` -+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'` -+ _gcc_machine=`$CC -dumpmachine` -+ else -+ COMPATH="NO_GCC" -+ fi -+ if test -n "$enable_gcc3"; then -+ if test "$_gcc_major" != "3"; then -+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested]) -+ COMPATH="NO_GCC" -+ fi -+ else -+ if test "$_gcc_major" != "2"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ if test "$_gcc_middle" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ if test "$_gcc_minor" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ fi -+ fi -+ fi -+ fi -+ if test "$COMPATH" != "NO_GCC"; then -+ if test $CC != "gcc" -o $CC != "cc"; then -+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include" -+ _gxx_include_path="$_gcc_include_path/g++" -+ else -+ _gcc_include_path="$PREFIX" -+ _gxx_include_path="$_gcc_include_path/g++" -+ fi -+ else -+ AC_MSG_WARN([no gcc compiler found]) -+ AC_MSG_WARN([no gcc compiler found]) >> warn -+ fi +- +-dnl Set the include paths +- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +-fi +fi -+ - if test "$_os" = "Darwin"; then - if test "$CC" = "cc"; then - AC_PATH_PROGS(_cc, cc) -@@ -589,6 +666,26 @@ - fi - fi -+dnl ************************************************************* -+dnl Testing for exception handling - dwarf2 or sjlj exceptions... -+dnl ************************************************************* -+AC_MSG_CHECKING([try to compile exception code]) -+AC_LANG_SAVE -+AC_LANG_CPLUSPLUS -+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK( -+ [#include <iostream> -+ -+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__)); -+ -+ ], -+ [__sjthrow() ], -+ [exceptions_type="sjlj"], -+ [exceptions_type="dwarf2"]) -+]) -+ -+AC_MSG_RESULT(Exceptions type: $exceptions_type) -+AC_LANG_RESTORE -+ - dnl ************************************************************** - dnl Testing for required Solaris and workshop compiler patches... - dnl ************************************************************** -@@ -815,6 +912,10 @@ - fi - if test "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1170,6 +1271,12 @@ - USE_GCC3="FALSE" + dnl =================================================================== + dnl Search all the common names for GNU make +@@ -553,14 +550,27 @@ fi -+if test -n "$enable_debug"; then -+ ENABLE_DEBUG="TRUE" + dnl =================================================================== +-dnl Set the gxx include directories ++dnl Set the gcc/gxx include directories + dnl =================================================================== ++if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then + if test "$GXX" = "yes"; then +- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` ++ if test -n "$enable_gcc3"; then ++ _gccincname1="g++-v3" ++ else ++ _gccincname1="g++-3" ++ fi ++ _gcc_include_path=".." ++ _gxx_include_path="$_gcc_include_path/$_gccincname1" ++fi +else -+ ENABLE_DEBUG="FALSE" ++if test "$GXX" = "yes"; then ++ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \ ++ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` + dnl This is the original code... +-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +fi -+ - # Print args passed to set_soenv. - if test 1 = 1; then - echo -@@ -1197,12 +1304,14 @@ - echo "\$MINGWIN32="$WITH_MINGWIN - echo "\$with_use_shell="$with_use_shell - echo "\$USE_GCC3="$USE_GCC3 -+echo "\$EXCEPTIONS="$exceptions_type -+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG - echo fi +- - # Executing the set_soenv script to setup the environment variables. - if test -z "$enable_check_only"; then -- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG - else - echo - echo Test Complete + dnl =================================================================== + dnl Extra checking for the SUN OS compiler diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 deleted file mode 100644 index 0398428dc661..000000000000 --- a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 +++ /dev/null @@ -1,242 +0,0 @@ ---- set_soenv.1.orig Sun Jun 30 21:51:05 2002 -+++ set_soenv.1 Mon Oct 28 15:01:58 2002 -@@ -40,7 +40,7 @@ - # - # Set this value equal to the corresponding amount of - # command line arguments. --my $numArgs = 20; -+my $numArgs = 27; - # Determining the amount of arguments in the call. - my $numEnter = $#ARGV + 1; - if ( $numEnter != $numArgs ) -@@ -66,14 +66,15 @@ - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, - $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -- $TF_CFGDATA, $TF_SVDATA, -+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, - $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, - $USE_XPRINT, $BUILD_SOSL_RELEASE ); - # - # Platform dependent constant values. - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, -- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); -+ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -+ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -96,7 +97,7 @@ - $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, - $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, - $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, -- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); -+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); - # - #------------------------------------------- - # IId. Declaring the aliases. -@@ -145,7 +146,11 @@ - $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 - $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $USE_SHELL = $ARGV [ 18 ]; # preferred shell --$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) -+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) -+$CC = $ARGV [ 23 ]; # get cc from environment -+$CXX = $ARGV [ 24 ]; # use c++ from environment -+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type -+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build - # - #--------------------------------------------------------------- - # IIIb. Initialising the variables for the system commands, etc. -@@ -335,7 +340,14 @@ - $COMPATH = $ARGV[ 0 ]; - $CPU = "I"; - $CPUNAME = "INTEL"; -+if ($USE_GCC3 eq "TRUE") -+ { -+ $CVER = "C300"; -+ } -+else -+ { - $CVER = "C295"; -+} - $DLLSUFFIX = "fi"; - $GUI = "UNX"; - $GUIBASE = "unx"; -@@ -348,6 +360,9 @@ - $PATH_SEPERATOR = $ps; - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; -+ $OSVERSION = $ARGV[ 20 ]; -+ $PTHREAD_CFLAGS = $ARGV[ 21 ]; -+ $PTHREAD_LIBS = $ARGV[ 22 ]; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -@@ -927,7 +942,7 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$USR_LOCAL.$LIB. -@@ -935,6 +950,13 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $LD_LIBRARY_PATH = $cur_dir. -+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -+ $ps.$par_dir.$LIB. -+ $ps_STLPORT_LIB. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -+} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -970,15 +992,16 @@ - $D.$COM. - $D.$CVER. - $D.$GVER. -- $D."_PTHREADS". - $D.$OS. - $D.$CPUNAME; - if ($platform eq "$FreeBSD") --{ $SOLARDEF .= $D."X86"; -+{ $SOLARDEF .= $D."X86". -+ $D."OSVERSION=$OSVERSION". -+ " ".$PTHREAD_CFLAGS; - } - $SOLARDEF .= $D."_REENTRANT". - $D."_POSIX_PTHREAD_SEMANTICS"; --if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64")) -+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" )) - { $SOLARDEF .= $D."GLIBC=".$GLIBC; - } - $SOLARDEF .= $D."SUPD=$UPD". -@@ -995,7 +1018,7 @@ - $L.$USR_DT.$LIB. - $L.$USR_OPENWIN.$LIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. - $L.$LIB. - $L.$USR.$LIB. -@@ -1005,6 +1028,11 @@ - { $SOLAREXTRALIB = '"'.$L.$LIB. - $L.$USR.$LIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ -+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"'; -+} -+ - # Compiler include search directory paths. - if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1076,7 +1104,7 @@ - $ps.$USR.$LIB. - $ps.$USR_LOCAL.$BIN; - } --elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) - { $PATH = $cur_dir. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1095,6 +1123,22 @@ - $ps.$USR.$ds."X11".$BIN. - $ps.$USR.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $PATH = $cur_dir. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. -+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -+ $ps.'$SOLARENV'.$BIN. -+ $ps.'$JAVA_HOME'.$BIN. -+ -+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); -+ -+ $PATH .= $ps.$USR.$ds."sbin". -+ $ps.$USR.$ds."X11R6".$ds."bin". -+ $ps.$USR_LOCAL.$BIN. -+ $ps.$USR_LOCAL.$ds."sbin"; -+ $ps.$USR.$LIB; -+} -+ - elsif ($platform eq "$Winnt") - { - my ( $noldPATH ); -@@ -1195,7 +1239,7 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARLIB = '"'.$L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1210,6 +1254,15 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ $SOLARLIB = '"'.$L.$par_dir.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$JAVA_HOME'.$LIB. -+ $L_STLPORT_LIB. -+ $L.$XLIB.'"'; -+} - elsif ($platform eq "$Winnt") - { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1242,7 +1295,7 @@ - $SOLARINC .= $I.$USR.$INCLUDE; - } - $SOLARINC .= $STLPORT_stlport; --if ($platform eq "$Linux") -+if ($platform eq "$Linux" || $platform eq "$FreeBSD") - { - # This simply adds an include path, so even cases that break the FHS work - $SOLARINC .= $STLPORT_inc_stlport; -@@ -1256,11 +1309,6 @@ - { $SOLARINC .= $I.'$COMPATH'.$ds."include"; - } - --if ($platform eq "$Linux") --{ --# This simply adds an include path, so even cases that break the FHS work --$SOLARINC .= $STLPORT_inc_stlport; --} - $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". - $I.'$JAVA_HOME'.$INCLUDE; - -@@ -1428,6 +1476,9 @@ - ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); - ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); - ToFile( "TF_FILTER", "TRUE", "e" ); -+if ($ENABLE_DEBUG eq "TRUE") { -+ToFile( "debug", "true", "e" ); -+} - if ( $platform ne "$Macosx" ) - { ToFile( "PSPRINT", "TRUE", "e" ); - } elsif ( $GUIBASE eq "unx" ) { -@@ -1453,6 +1504,12 @@ - ToFile( "GUIENV", $GUIENV, "e" ); - ToFile( "GVER", $GVER, "e" ); - ToFile( "OS", $OS, "e" ); -+ToFile( "CC", $CC, "e" ); -+ToFile( "CXX", $CXX, "e" ); -+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" ); -+ToFile( "OSVERSION", $OSVERSION, "e" ); -+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" ); -+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" ); - ToFile( "OUTPATH", $OUTPATH, "e" ); - ToFile( "INPATH", $INPATH, "e" ); - ToFile( "GVERDIR", $GVERDIR, "e" ); diff --git a/editors/openoffice.org-1.0/files/patch-connectivity+source+parse+sqlbison.y b/editors/openoffice.org-1.0/files/patch-connectivity+source+parse+sqlbison.y deleted file mode 100644 index 250c7f7e5b1b..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity+source+parse+sqlbison.y +++ /dev/null @@ -1,98 +0,0 @@ ---- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002 -+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002 -@@ -134,21 +134,6 @@ - %token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM - %token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME - -- /* operators */ --%left <pParseNode> SQL_TOKEN_NAME --%left <pParseNode> SQL_TOKEN_OR --%left <pParseNode> SQL_TOKEN_AND -- --%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ --%left <pParseNode> '+' '-' --%left <pParseNode> '*' '/' --%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT --%left <pParseNode> ')' --%right <pParseNode> '=' --%right <pParseNode> '.' --%right <pParseNode> '(' -- -- - %nonassoc <pParseNode> SQL_TOKEN_UMINUS - - -@@ -157,31 +142,31 @@ - - %token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG - --%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY -+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY - --%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS --%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR -+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS -+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR - - %token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC - %token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP - --%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL -+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL - --%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT -+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT - --%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH -+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER - %token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC - - %token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER - --%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC --%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT -+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC -+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK - --%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM -+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM - - %token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION - %token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW --%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE -+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE - - /* ODBC KEYWORDS */ - %token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ -@@ -204,6 +189,22 @@ - %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND - %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE - -+ -+ /* operators */ -+%left SQL_TOKEN_NAME -+%left <pParseNode> SQL_TOKEN_OR -+%left <pParseNode> SQL_TOKEN_AND -+ -+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ -+%left <pParseNode> '+' '-' -+%left <pParseNode> '*' '/' -+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT -+%left ')' -+%right '=' -+%right '.' -+%right '(' -+ -+ - %token <pParseNode> SQL_TOKEN_INVALIDSYMBOL - - /*%type <pParseNode> sql_single_statement */ -@@ -3019,7 +3020,7 @@ - } - else - YYERROR; -- } -+ }; - %% - - diff --git a/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx deleted file mode 100644 index 8abdf74d97b8..000000000000 --- a/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 -+++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 -@@ -65,7 +65,7 @@ - // NOT FULLY DECLARED SERVICES - #include <string.h> - #include <stdio.h> --#if defined(WNT) || defined(LINUX) -+#if defined(WNT) || defined(LINUX) || defined(FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> diff --git a/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx new file mode 100644 index 000000000000..7b01e4f554b5 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-desktop+source+pkgchk_packages.cxx @@ -0,0 +1,13 @@ +--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 ++++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 +@@ -124,6 +124,10 @@ + static char const s_platform_path [] = "/macosx_powerpc.plt"; + #elif defined (NETBSD) && defined (SPARC) + static char const s_platform_path [] = "/netbsd_sparc.plt"; ++#elif defined (FREEBSD) && defined (INTEL) ++static char const s_platform_path [] = "/freebsd_x86.plt"; ++#elif defined (FREEBSD) && defined (SPARC) ++static char const s_platform_path [] = "/freebsd_sparc.plt"; + #else + #error "unkonwn platform" + insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk index 9c238f45b04d..802c6b4d1a8b 100644 --- a/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-freetype+makefile.mk @@ -1,24 +1,24 @@ ---- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002 -+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002 -@@ -79,7 +79,11 @@ +--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003 +@@ -86,7 +86,11 @@ + .IF "$(GUI)"=="UNX" #relative to CONFIGURE_DIR CONFIGURE_ACTION=$(GNUMAKE) - .IF "$(GUI)"=="UNX" -CONFIGURE_FLAGS=setup +.IF "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O" -+.ELSE # "$(debug)"=="" ++.ELSE # "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb" -+.ENDIF # "$(debug)"=="" - .ELSE # "$(GUI)"=="UNX" - CONFIGURE_FLAGS=setup visualc - .ENDIF # "$(GUI)"=="UNX" -@@ -90,7 +94,7 @@ - .IF "$(GUI)"=="UNX" - OUT2LIB= \ - objs$/.libs$/libfreetype.a \ -- objs$/.libs$/libfreetype.so.6* -+ objs$/.libs$/libfreetype.so.7 - - .ENDIF # "$(GUI)"=="UNX" ++.ENDIF + BUILD_DIR=$(CONFIGURE_DIR) + BUILD_ACTION=$(GNUMAKE) +@@ -95,6 +99,8 @@ + objs$/.libs$/libfreetype.a + .IF "$(OS)"=="MACOSX" + OUT2LIB+=objs$/.libs$/libfreetype.*.dylib ++.ELIF "$(OS)"=="FREEBSD" ++OUT2LIB+=objs$/.libs$/libfreetype.so.7* + .ELSE + OUT2LIB+=objs$/.libs$/libfreetype.so.6* + .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice.org-1.0/files/patch-idl+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-idl+util+makefile.mk deleted file mode 100644 index 2543593dd210..000000000000 --- a/editors/openoffice.org-1.0/files/patch-idl+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002 -+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002 -@@ -110,7 +110,7 @@ - .ENDIF - .ENDIF - --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - APP1STDLIBS+=-lcrypt - .ENDIF - diff --git a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch index cde27322f62f..5432812bb50c 100644 --- a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch +++ b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch @@ -1,11 +1,41 @@ ---- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001 -+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002 -@@ -120,26 +120,157 @@ +--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 ++++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 +@@ -1,5 +1,5 @@ +-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 +---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000 ++--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001 + *************** + *** 166,171 **** + --- 166,177 ---- +@@ -15,8 +15,8 @@ + INCLUDESRC = $(TOP)/include + INCDIR = $(INCROOT)/audio + WIDGET_DIR = $(TOP)/clients/audio/widgets +-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999 +---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999 ++--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001 + *************** + *** 1336,1348 **** + static char *_SysErrorMsg (n) +@@ -40,8 +40,8 @@ + } + + #endif /* USL sharedlibs in don't define for AUD3.2 */ +-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999 +---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999 ++--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001 + *************** + *** 51,59 **** + #include <errno.h> +@@ -120,59 +120,157 @@ return(-1); } --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001 +-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000 +---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003 -*************** -*** 25,30 **** ---- 25,32 ---- @@ -27,6 +57,39 @@ - InstallMultiple($(HEADERS),$(INCDIR)) - #if ProjectX >= 5 - InstallNonExecFile(AuErrorDB,$(LIBDIR)) +-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000 +---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003 +-*************** +-*** 119,132 **** +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! } +- number : NUMBER { $$ = $1; } +- ; +- +---- 119,132 ---- +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } ; +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! }; +- number : NUMBER { $$ = $1; } +- ; +- +--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 ++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 +@@ -42,6 +42,8 @@ diff --git a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp index 7b55cc064156..0f59b9ebee9b 100644 --- a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,5 +1,5 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 -+++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 ++++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 @@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment @@ -8,11 +8,11 @@ #if ( defined( _gcc3 ) && defined( C300 ) ) File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); - Styles = (NETWORK,RELATIVE); +@@ -34,6 +35,7 @@ End + + +#endif #endif - #endif + File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.0/files/patch-product+settings+linux_gcc_settings.mk b/editors/openoffice.org-1.0/files/patch-product+settings+linux_gcc_settings.mk deleted file mode 100644 index 4210b5f03f33..000000000000 --- a/editors/openoffice.org-1.0/files/patch-product+settings+linux_gcc_settings.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002 -+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002 -@@ -3,9 +3,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat diff --git a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk b/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk index 9773406f4ed2..3dae50f091a3 100644 --- a/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk +++ b/editors/openoffice.org-1.0/files/patch-product+settings+settings.mk @@ -1,26 +1,75 @@ ---- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002 -+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002 -@@ -83,9 +83,8 @@ +--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 ++++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003 +@@ -225,3 +226,72 @@ - OS=SOLARIS - PS=/ --CC=CC --LINK=CC --LIB=CC -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat -@@ -136,9 +135,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc + endif + ++ifeq "$(PLATFORM)" "FreeBSD" ++# Settings for Linux using gcc compiler ++ ++OS=LINUX ++PLATFORM=linux ++PS=/ +LINK=$(CC) +LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat ++ECHO=@echo ++MKDIR=mkdir -p ++CAT=cat ++OBJ_EXT=o ++SHAREDLIB_EXT=so ++SHAREDLIB_PRE=lib ++SHAREDLIB_OUT=$(OUT_LIB) ++PACKAGE_LIB_DIR=linux_x86.plt ++ ++GCC_VERSION=$(shell $(CC) -dumpversion) ++ ++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" ++COMID=gcc3 ++CPPU_ENV=gcc3 ++else ++COMID=GCC ++CPPU_ENV=gcc2 ++endif ++ ++OSEP=\< ++CSEP=\> ++ ++DEL=rm -f ++DELRECURSIVE=rm -rf ++COPY=cp ++URLPREFIX=file:// ++ ++# Include UDK version numbers ++include $(PRJ)/include/udkversion.mk ++ ++SALLIB=-lsal ++CPPULIB=-lcppu ++CPPUHELPERLIB=-lcppuhelper$(COMID) ++SALHELPERLIB=-lsalhelper$(COMID) ++STLPORTLIB=-lstlport_gcc ++ ++EMPTYSTRING= ++PATH_SEPARATOR=: ++ ++# -O is necessary for inlining (see gcc documentation) ++ifeq "$(DEBUG)" "yes" ++CC_FLAGS=-c -g ++else ++CC_FLAGS=-c -O ++endif ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux ++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include ++STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport ++CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) ++ ++# define for used compiler necessary for UNO ++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 ++#-DCPPU_ENV=gcc3 -- gcc3 3.0 ++ ++CC_OUTPUT_SWITCH=-o ++ ++LIBRARY_LINK_FLAGS=-shared ++EXE_LINK_FLAGS=-Wl -export-dynamic ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) ++ ++endif diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk index e52b0a4ea6ef..6e72982a23bf 100644 --- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk @@ -1,34 +1,32 @@ ---- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 -+++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 -@@ -137,13 +137,6 @@ +--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 ++++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003 +@@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno -.IF "$(COMID)"=="gcc3" -ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.3 \ -- $(DESTDIRDLL)$/libstdc++.so.3.0.1 +- $(DESTDIRDLL)$/libgcc_s.so.1 \ +- $(DESTDIRDLL)$/libgcc_s.so \ +- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ +- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) -.ENDIF .ELIF "$(OS)"=="NETBSD" ########### -@@ -498,6 +491,7 @@ - #--------------------------------------------------------- - # special targets for linux gcc3 +@@ -491,6 +484,7 @@ + # special targets for linux gcc3 + .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"=="LINUX" - .IF "$(CCNUMVER)">="000300010000" ++.IF "$(OS)"!="FREEBSD" + $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) - $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -@@ -526,6 +520,9 @@ +@@ -514,6 +508,7 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ +ln -s libgcc_s.so.1 $@ -+ +.ENDIF -+ #------------------------------------------------------------- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch index 61f12e5bfe7c..c3a0ffc47e73 100644 --- a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch @@ -1,25 +1,20 @@ ---- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002 -+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002 +--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 ++++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ----- 1,151 ---- -+--- 1,156 ---- +---- 1,159 ---- ++--- 1,161 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ -@@ -90,8 +90,13 @@ - ! .ENDIF - ! +@@ -96,6 +96,8 @@ ! .IF "$(GUI)"=="UNX" -+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ! .IF "$(OS)"=="NETBSD" ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF -+! .IF "$(OS)"=="FREEBSD" ++! .ELIF "$(OS)"=="FREEBSD" +! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF ! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE - ! .ENDIF + ! .IF "$(OS)"=="MACOSX" + ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx b/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx deleted file mode 100644 index 61a769b34585..000000000000 --- a/editors/openoffice.org-1.0/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002 -+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002 -@@ -117,7 +117,9 @@ - - /* some platforms have no hotspot yet even under jdk 1.3 */ - /* so treat them like classic in JDK 1.2.x */ --#if defined(POWERPC) && defined(LINUX) -+#if defined(POWERPC) && defined(LINUX) || \ -+ defined(INTEL) && defined(FREEBSD) -+ - #define NO_HOTSPOT_USE_CLASSIC 1 - #else - #undef NO_HOTSPOT_USE_CLASSIC diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl b/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl new file mode 100644 index 000000000000..923b99e5d065 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-solenv+bin+build.pl @@ -0,0 +1,10 @@ +--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003 ++++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003 +@@ -292,7 +292,6 @@ + cwd(); + $! = 0; + system ("$dmake"); +- &print_error("dmake - " . lc($!)) if ($!); + if ($? && ($? != -1) && (!$child)) { + &print_error("Error $? occurred while making $BuildDir"); + }; diff --git a/editors/openoffice.org-1.0/files/patch-solenv+bin+getcompver.awk b/editors/openoffice.org-1.0/files/patch-solenv+bin+getcompver.awk deleted file mode 100644 index 62786af61ad5..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+bin+getcompver.awk +++ /dev/null @@ -1,44 +0,0 @@ ---- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002 -+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002 -@@ -61,9 +61,11 @@ - #************************************************************************* - BEGIN { - CCversion = 0 -+ compiler_matched = 0 - } - # Sun c++ compiler - /Sun WorkShop/ { -+ compiler_matched = 1 - # version number right after "C++" - x = match( $0, /C\+\+ .*/ ) - btwn = substr( $0, RSTART, RLENGTH) -@@ -73,12 +75,28 @@ - } - # Microsoft c++ compiler - /Microsoft.*..\...\...../ { -+ compiler_matched = 1 - # match on the format of the ms versions ( dd.dd.dddd ) - x = match( $0, /..\...\...../ ) - CCversion = substr( $0, RSTART, RLENGTH) - } -+# Java -+/java version/ { -+ compiler_matched = 1 -+ # match on the format of the java versions ( d[d].d[d].d[d] ) -+ x = match( $0, /".*\..*\..*"/ ) -+ CCversion = substr( $0, RSTART+1, RLENGTH-2) -+} -+/^[0-9]*[.][0-9]*$/ { -+ if ( compiler_matched == 0 ) { -+# need to blow to x.xx.xx for comparing -+ CCversion = $0 ".0" -+ } -+} - /^[0-9]*[.][0-9]*[.][0-9]*$/ { -- CCversion = $0 -+ if ( compiler_matched == 0 ) { -+ CCversion = $0 -+ } - } - END { - if ( num == "true" ) { diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+_tg_shl.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+_tg_shl.mk deleted file mode 100644 index 7a5af08c2811..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+_tg_shl.mk +++ /dev/null @@ -1,282 +0,0 @@ ---- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002 -+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002 -@@ -345,22 +345,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -770,22 +770,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1195,22 +1195,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1620,22 +1620,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2045,22 +2045,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2470,22 +2470,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2895,22 +2895,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3320,22 +3320,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3745,22 +3745,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -4170,22 +4170,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+pstrules.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+pstrules.mk deleted file mode 100644 index 6c8e958c188a..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+pstrules.mk +++ /dev/null @@ -1,141 +0,0 @@ ---- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002 -+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002 -@@ -80,15 +80,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -108,15 +108,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -142,15 +142,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -159,23 +159,23 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -195,15 +195,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -212,19 +212,19 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c - .ELSE - +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - .ENDIF - .ENDIF -@@ -246,7 +246,7 @@ - @echo Making: $@ - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) - .IF "$(GUI)"=="OS2" -- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre - .ENDIF - .IF "$(GUI)"=="WNT" - cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+rules.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+rules.mk deleted file mode 100644 index 181a71307149..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+rules.mk +++ /dev/null @@ -1,212 +0,0 @@ ---- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002 -+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002 -@@ -78,16 +78,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF - .ENDIF - -@@ -98,16 +98,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - .ENDIF - -@@ -122,17 +122,17 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE # "$(GUI)"=="UNX" - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF # "$(GUI)"=="UNX" - - $(SLO)$/%.obj : %.cpp -@@ -140,17 +140,17 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - - $(SLO)$/%.obj : $(MISC)$/%.cxx -@@ -158,16 +158,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : $(MISC)$/%.cxx -@@ -175,16 +175,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : %.c -@@ -192,20 +192,20 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c - .ELSE - +-@echo Cflags: $(CFLAGS) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -215,13 +215,13 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - $(SEMADEBUG) - .ENDIF - -@@ -230,16 +230,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -249,14 +249,14 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) - .ENDIF - .ENDIF - diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+settings.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+settings.mk deleted file mode 100644 index ea6a898a9a6d..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002 -+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002 -@@ -166,7 +166,6 @@ - CDEFSOPT= - HDEFS= - --CC= - .IF "$(add_cflags)"!="" - ENVCFLAGS+=$(add_cflags) - .ENDIF -@@ -264,8 +263,6 @@ - AS= - BC= - COBOL= --CPP= --CXX= - FOR= - PASCAL= - diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+target.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+target.mk deleted file mode 100644 index 2379b8bb3189..000000000000 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+target.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002 -+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002 -@@ -2139,7 +2139,7 @@ - - .IF "$(COMPVERMK)"!="" - .IF "$(UPDATER)"!="" --"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+"$(COMPVERMK)" : - @echo COMNAME:=$(COMNAME) > $@ - @echo COMID:=$(COMID) >> $@ - @echo CCNUMVER:=$(CCNUMVER) >> $@ -@@ -2778,7 +2778,7 @@ - $(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) - .ENDIF - --$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+$(INCCOM)$/_version.h : - .IF "$(GUI)"=="UNX" - @+echo "#define" _BUILD \"$(BUILD)\" > $@ - @+echo "#define" _UPD \"$(UPD)\" >> $@ diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk index 958b4abba555..2a9d4ba1b65c 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_shl.mk @@ -1,14 +1,11 @@ ---- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002 -+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002 -@@ -319,9 +319,9 @@ +--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 ++++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 +@@ -319,7 +319,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx +- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c ++ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ELSE -- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx + $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" - .ENDIF # "$(UPDATER)"=="YES" - .IF "$(SHL$(TNR)DEFAULTRES)"!="" diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk index b189474e5f82..4c2fd26f5c2c 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -1,5 +1,5 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002 +--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003 ++++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003 @@ -1,84 +1,139 @@ - # mak file fuer unxfbsdi @@ -56,8 +56,8 @@ +# environment with graphical user interface +CFLAGSOBJGUIMT=-fPIC --cc= gcc --CC= g++ +-CC= gcc +-CXX= g++ -CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -CFLAGS+= -w -c $(INCLUDE) diff --git a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk b/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk index c55d863b689f..70ec58c3428e 100644 --- a/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-stlport+makefile.mk @@ -1,32 +1,36 @@ ---- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 -+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 -@@ -106,11 +106,29 @@ +--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 ++++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003 +@@ -98,16 +98,28 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-3.0-freebsd.mak +-BUILD_FLAGS=-f gcc-3.0.mak ++.IF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc-3.0.mak ++ BUILD_FLAGS=-f gcc-3.0.mak +.ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-freebsd.mak +-# MacOS X/Darwin need a special makefile ++# FreeBSD / MacOS X/Darwin need a special makefile + .IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak +-.ELSE # "$(OS)"=="MACOSX" ++.ELSIF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc.mak -+.ENDIF -+ + BUILD_FLAGS=-f gcc.mak +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" .ENDIF # "$(COMID)"=="gcc3" +-BUILD_ACTION=make + +.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=gmake ++ BUILD_ACTION=gmake +.ELSE - BUILD_ACTION=make ++ BUILD_ACTION=make +.ENDIF + + # build in parallel + BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF - - .IF "$(COM)"=="C52" diff --git a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx index ce51a0e98880..ec91def86fe6 100644 --- a/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice.org-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002 -@@ -62,7 +62,9 @@ +--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 ++++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !(defined NETBSD || defined FREEBSD) +-#ifndef MACOSX ++#if !(defined NETBSD || defined FREEBSD || defined MACOSX) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice.org-1.0/files/patch-translation-ru b/editors/openoffice.org-1.0/files/patch-translation-ru deleted file mode 100644 index 316c93a6bfbe..000000000000 --- a/editors/openoffice.org-1.0/files/patch-translation-ru +++ /dev/null @@ -1,2490 +0,0 @@ -diff -ur ../desktop/source/app/desktop.src ../desktop/source/app/desktop.src ---- ../desktop/source/app/desktop.src Wed Apr 3 16:10:19 2002 -+++ ../desktop/source/app/desktop.src Fri Apr 5 19:05:56 2002 -@@ -206,7 +206,7 @@ - Text [ ENGLISH ] = "The installation path is invalid." ; - Text[ english_us ] = "The installation path is invalid."; - Text[ portuguese ] = "O caminho de instalao no vlido."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is invalid."; - Text[ dutch ] = "Het installatiepad is ongeldig."; - Text[ french ] = "Le chemin d'installation n'est pas valide."; -@@ -232,7 +232,7 @@ - Text [ ENGLISH ] = "The installation path is not available." ; - Text[ english_us ] = "The installation path is not available."; - Text[ portuguese ] = "Foi impossvel determinar o caminho de instalao."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is not available."; - Text[ dutch ] = "Geen installatiepad beschikbaar."; - Text[ french ] = "Impossible de dterminer le chemin d'installation !"; -@@ -414,7 +414,7 @@ - Text [ ENGLISH ] = "Start setup application to repair installation?" ; - Text[ english_us ] = "Do you want to start the setup application to repair your installation?"; - Text[ portuguese ] = "Iniciar a aplicao Setup para reparar a instalao?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to repair installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te repareren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de rparer l'installation ?"; -@@ -440,7 +440,7 @@ - Text [ ENGLISH ] = "Start setup application to check installation?" ; - Text[ english_us ] = "Do you want to start the setup application to check your installation?"; - Text[ portuguese ] = "Start setup application to check installation?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to check installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te controleren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de vrifier l'installation ?"; -diff -ur ../extensions/source/abpilot/abspilot.src ../extensions/source/abpilot/abspilot.src ---- ../extensions/source/abpilot/abspilot.src Wed Apr 3 16:13:42 2002 -+++ ../extensions/source/abpilot/abspilot.src Fri Apr 5 17:43:26 2002 -@@ -809,7 +809,7 @@ - "Do you want to install it as address data source, anyway?"; - Message [ english_us ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; - Message[ portuguese ] = "A fonte de dados no contm nenhuma tabela.\nMesmo assim, configur-la como fonte de dados dos endereos?"; -- Message[ russian ] = " .\n ?"; -+ Message[ russian ] = " .\n ?"; - Message[ greek ] = "The data source does not contain any tables.\nDo you want to install it as address data source, anyway?"; - Message[ dutch ] = "De gegevensbron bevat geen tabel.\nWilt u deze toch als adresgegevensbron inrichten?"; - Message[ french ] = "La source de donnes ne contient aucune table.\nVoulez-vous tout de mme la paramtrer comme source de donnes des adresses ?"; -diff -ur ../extensions/source/dbimport/importdialog.src ../extensions/source/dbimport/importdialog.src ---- ../extensions/source/dbimport/importdialog.src Wed Apr 3 16:13:45 2002 -+++ ../extensions/source/dbimport/importdialog.src Fri Apr 5 17:42:35 2002 -@@ -599,7 +599,7 @@ - "which could not be resolved automatically."; - Text [ english_us ] = "The database file you are about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ portuguese ] = "O ficheiro da base de dados que pretende importar contm uma referncia a uma instalao antiga do StarOffice que no pode ser resolvida automaticamente."; -- Text[ russian ] = " StarOffice, ."; -+ Text[ russian ] = " StarOffice, ."; - Text[ greek ] = "The database file you're about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ dutch ] = "Het te importeren database-bestand bevat een verbinding met een oudere StarOffice-installatie die niet automatisch kon worden verwijderd."; - Text[ french ] = "Le fichier de base de donnes importer contient une rfrence une installation antrieure de StarOffice qui n'a pas pu tre rsolue."; -@@ -728,7 +728,7 @@ - "you would need to substitute $(USER) with $substpath$."; - Text [ english_us ] = "For instance:\nIf you installed StarOffice 5.2 in $defaultpath$, and you are importing your old address book, you would need to substitute $(USER) with $substpath$."; - Text[ portuguese ] = "Por exemplo:\nse instalou o StarOffice 5.2 em $defaultpath$ e desejar importar o seu livro de endereos antigo, ter que substituir $(USER) por $substpath$."; -- Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; -+ Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; - Text[ greek ] = "For instance:\nIf you installed your StarOffice 5.2 in $defaultpath$, and you're importing your old Address Book database file, you would need to substitute $(USER) with $substpath$."; - Text[ dutch ] = "Bijvoorbeeld:\nAls u StarOffice 5.2 in $defaultpath$ heeft genstalleerd en u uw oude adresboek wilt importeren moet u $(USER) vervangen door $substpath$."; - Text[ french ] = "Exemple :\nStarOffice 5.2 est install dans $defaultpath$ et vous voulez importer votre ancien carnet d'adresses : remplacez $(USER) par $substpath$."; -diff -ur ../extensions/source/installation/office/instchk/instdlg.src ../extensions/source/installation/office/instchk/instdlg.src ---- ../extensions/source/installation/office/instchk/instdlg.src Wed Apr 3 16:13:47 2002 -+++ ../extensions/source/installation/office/instchk/instdlg.src Fri Apr 5 17:41:08 2002 -@@ -265,7 +265,7 @@ - }; - Text[ english_us ] = "The %PRODUCTNAME installation is incomplete"; - Text[ portuguese ] = "A instalao do %PRODUCTNAME est incompleta"; -- Text[ russian ] = " %PRODUCTNAME ."; -+ Text[ russian ] = "%PRODUCTNAME ."; - Text[ dutch ] = "De installatie van %PRODUCTNAME is niet compleet"; - Text[ french ] = "L'installation de %PRODUCTNAME est incomplte"; - Text[ spanish ] = "La instalacin de %PRODUCTNAME no est completa"; -diff -ur ../extensions/source/preload/preload.src ../extensions/source/preload/preload.src ---- ../extensions/source/preload/preload.src Wed Apr 3 16:13:51 2002 -+++ ../extensions/source/preload/preload.src Fri Apr 5 17:40:30 2002 -@@ -344,7 +344,7 @@ - Text [ french ] = "Si vous acceptez tous les termes du contrat de licence, cliquez sur '%1'. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击 %1 。如果不同意许可证协议中的条款，则按击 %2 ，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所有的使用許可協定的全部條款，按一下[%1]。若不想接受全部條款，就按一下[%2]，取消安裝。"; -Only in ..: openoffice-641d-cyr_letter.patch -diff -ur ../padmin/source/padialog.src ../padmin/source/padialog.src ---- ../padmin/source/padialog.src Wed Apr 3 16:15:12 2002 -+++ ../padmin/source/padialog.src Fri Apr 5 17:38:14 2002 -@@ -319,7 +319,7 @@ - Text [ English ] = "Noo format file ( with .afm extension ) for font\n%s\n was found, hence the font will not be installed. Format files can be made e.g. with ghostscript and have to reside in the same directory as the font file or in its afm subdir ectory." ; - Text[ english_us ] = "A format file (with an .afm extension) has not been found for the font\n%s\ntherefore, the font cannot be installed. Format files can be created with ghostscript, for example, and have to be located in the same directory as the font files or its afm subdirectory."; - Text[ portuguese ] = "Foi impossvel encontrar o ficheiro de formato (com extenso .afm) para o ficheiro do tipo de letra\n%s\n. Por esta razo no foi possvel instal-lo. Os ficheiros de formato podem ser criados com ghostscript (por exemplo), devendo ser guardados no directrio contendo os ficheiros dos tipos de letra ou num dos respectivos subdirectrios afm."; -- Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; -+ Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; - Text[ greek ] = " \n%s\n ( .afm ). .. ghostscript 'afm'."; - Text[ dutch ] = "Lettertypenbestand\n%s\n kan niet worden genstalleerd daar geen bijbehorend formaatbestand (met extensie .afm) werd gevonden. Formaatbestanden kunnen worden gemaakt met bijv. ghostscript en moeten worden opgeslagen in de directory waarin de lettertypenbestanden staan of in een subdirectory daarvan."; - Text[ french ] = "Aucun fichier de format (d'extension .afm) n'a t dtect pour le fichier de police\n%s\n ; la police ne peut donc pas tre installe. Les fichiers de format peuvent par ex. tre cr avec ghostscript et doivent tre placs dans le mme rpertoire que celui des fichiers de police ou dans le sous-rpertoire afm."; -@@ -344,7 +344,7 @@ - Text [ English ] = "The metric file for font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The metric file for the font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro mtrico para o ficheiro do tipo de letra\n...%s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n . ."; -+ Text[ russian ] = " \n %s\n . ."; - Text[ greek ] = " \n %s\n. ."; - Text[ dutch ] = "Het lettertype werd niet genstalleerd daar het metrische bestand voor lettertypenbestand\n %s\nniet kon worden gekopieerd. "; - Text[ french ] = "Copie du fichier mtrique pour le fichier\n %s\nimpossible, donc impossibilit d'installer la police !"; -@@ -369,7 +369,7 @@ - Text [ English ] = "The font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro dos tipos de letra\n %s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n. ."; -+ Text[ russian ] = " \n %s\n. ."; - Text[ greek ] = " \n %s\n ."; - Text[ dutch ] = "Het lettertype wordt niet genstalleerd daar het lettertypenbestand \n %s\n niet kon worden gekopieerd."; - Text[ french ] = "Copie du fichier de police\n %s\n impossible, donc impossibilit d'installer la police !"; -@@ -394,7 +394,7 @@ - Text[ English ] = "In the fontpath there is no directory containing a writeable fonts.dir file. Therefore no fonts can be installed."; - Text[ english_us ] = "A directory containing a writable fonts.dir file is not located in the Fontpath. Therefore, fonts cannot be installed."; - Text[ portuguese ] = "Foi impossvel encontrar o directrio no \"fontpath\", contendo um ficheiro de escrita fonts.dir. impossvel instalar os tipos de letra."; -- Text[ russian ] = ", fonts.dir, , Fontpath . ."; -+ Text[ russian ] = ", fonts.dir, , Fontpath . ."; - Text[ greek ] = " Fontpath, fonts.dir. ."; - Text[ dutch ] = "Er konden geen lettertypen worden genstalleerd daar er in het pad voor de lettertypen geen directory werd aangetroffen met een beschrijfbaar bestand fonts.dir."; - Text[ french ] = "Aucun rpertoire contenant un fichier d'criture fonts.dir ne se trouve dans le chemin de police (fontpath). Impossible d'installer des polices !"; -@@ -513,7 +513,7 @@ - Text [ english ] = "Installed printers"; - Text[ english_us ] = "Installed ~printers"; - Text[ portuguese ] = "~Impressoras instaladas"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "~Genstalleerde printers"; - Text[ french ] = "Imprimantes installes"; -@@ -2097,7 +2097,7 @@ - - Text[ english_us ] = "Driver Installation"; - Text[ portuguese ] = "Instalao de controlador"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Driver installatie"; - Text[ french ] = "Installation du pilote"; -@@ -2331,7 +2331,7 @@ - Text [ English ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ english_us ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ portuguese ] = "O controlador para a impressora \"%s1\" (%s2) no est instalado, sendo portanto impossvel importar a impressora."; -- Text[ russian ] = " \"%s1\" (%s2) . ."; -+ Text[ russian ] = " \"%s1\" (%s2) . ."; - Text[ greek ] = " \"%s1\" (%s2) . ."; - Text[ dutch ] = "Printer \"%s1\" (%s2) kon niet worden gemporteerd daar er geen driver voor deze printer is genstalleerd."; - Text[ french ] = "Le pilote pour l'imprimante \"%s1\" (%s2) n'est pas install. Impossible d'importer l'imprimante !"; -@@ -2776,7 +2776,7 @@ - Text [english] = "~import printers from a StarOffice installation"; - Text[ english_us ] = "~Import printers from a StarOffice installation"; - Text[ portuguese ] = "~Importar impressoras de uma instalao do StarOffice"; -- Text[ russian ] = "~ StarOffice"; -+ Text[ russian ] = "~ StarOffice"; - Text[ greek ] = "~import printers from a StarOffice installation"; - Text[ dutch ] = "~printers uit een StarOffice installatie importeren"; - Text[ french ] = "~Importer une ou des imprimantes depuis une installation StarOffice"; -diff -ur ../sc/source/ui/src/globstr.src ../sc/source/ui/src/globstr.src ---- ../sc/source/ui/src/globstr.src Wed Apr 3 16:12:05 2002 -+++ ../sc/source/ui/src/globstr.src Fri Apr 5 17:47:28 2002 -@@ -7200,7 +7200,7 @@ - Text [ portuguese ] = "no est disponvel para a verificao ortogrfica. \nControle a sua instalao e, se necessrio,\ninstale a lngua desejada" ; - Text [ portuguese_brazilian ] = "ist f? die Pr?ung nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "没有检查拼写的功能。\n请检查您的安装，如有必要请安装所要使用的语言版本"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla sprawdzania pisowni. \nSprawd prosz instalacj i zainstaluj \newentualnie potrzebny jzyk."; - Text[ japanese ] = "スペル チェック機能はありません。\nインストールされているかチェックして \n必要な場合は該当する言語をインストールしてください。"; - Text[ chinese_traditional ] = " 沒有拼寫檢查的功能。\n請檢查安裝，若有必要請安裝所要使用的語言版本"; -@@ -7281,7 +7281,7 @@ - Text [ portuguese ] = "no est disponvel para o dicionrio de sinnimos. \nControle a sua instalao e, se necessrio, instale \na lngua desejada." ; - Text [ portuguese_brazilian ] = "ist f? den Thesaurus nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "同义词词典不能使用。\n请检查您的安装程序，在必要时请安装要使用的语言版本。"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla Tezaurusa. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - Text[ japanese ] = "これは類義語辞典に使えません。\nインストールをチェックして、\n必要な場合は該当の言語をインストールしてください。"; - Text[ chinese_traditional ] = "同義詞詞典無法使用。\n請檢查您的安裝程序，若有必要，請安裝要使用的語言版本。"; -diff -ur ../scp/source/calc/profile_calc.lng ../scp/source/calc/profile_calc.lng ---- ../scp/source/calc/profile_calc.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/calc/profile_calc.lng Fri Apr 5 19:38:53 2002 -@@ -403,7 +403,7 @@ - 33 = "~Classeur" - 96 = "~Spreadsheet" - 01 = "~Spreadsheet" --07 = "Документ электронной таблицы" -+07 = "~ " - 86 = "工作表文档(~S)" - 31 = "~Werkbladdocument" - 46 = "Tab~elldokument" -@@ -426,7 +426,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -diff -ur ../scp/source/draw/profile_draw.lng ../scp/source/draw/profile_draw.lng ---- ../scp/source/draw/profile_draw.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/draw/profile_draw.lng Fri Apr 5 19:38:17 2002 -@@ -288,7 +288,7 @@ - 33 = "D~essin" - 96 = "~Drawing" - 01 = "~Drawing" --07 = "~Рисунок" -+07 = "~" - 86 = "绘图(~D)" - 31 = "T~ekening" - 46 = "Te~ckning" -diff -ur ../scp/source/impress/profile_impress.lng ../scp/source/impress/profile_impress.lng ---- ../scp/source/impress/profile_impress.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/impress/profile_impress.lng Fri Apr 5 19:38:05 2002 -@@ -431,7 +431,7 @@ - 33 = "~Prsentation" - 96 = "~Presentation" - 01 = "~Presentation" --07 = "Пре~зентация" -+07 = "~" - 86 = "演示文稿(~P)" - 31 = "~Presentatie" - 46 = "~Presentation" -@@ -454,7 +454,7 @@ - 33 = "~Prsentation..." - 96 = "~Presentation..." - 01 = "~Presentation..." --07 = "~Презентация..." -+07 = "~..." - 86 = "演示文稿(~P)..." - 31 = "~Presentatie..." - 46 = "~Presentation..." -diff -ur ../scp/source/lingu/module_lingu.lng ../scp/source/lingu/module_lingu.lng ---- ../scp/source/lingu/module_lingu.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/lingu/module_lingu.lng Fri Apr 5 18:01:56 2002 -@@ -23,9 +23,9 @@ - - [STR_DESC_MODULE_OPTIONAL_OO_ENGLISH] - 49 = "Whlen Sie diese Option, um das englische (US) Sprachmodul zu installieren." --01 = "Select this option to install the English (US) language module." -+01 = "Select this option to install the language module." - 03 = "Seleccione esta opo para instalar o mdulo da lngua inglesa (E.U.A.)." --07 = " () ." -+07 = " ." - 30 = " (..) ." - 31 = "Kies deze optie als u de taalmodule Engels (VS) wilt installeren." - 33 = "Slectionnez cette option pour installer le module de langue anglaise (U.S.A.)" -diff -ur ../scp/source/math/profile_math.lng ../scp/source/math/profile_math.lng ---- ../scp/source/math/profile_math.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/math/profile_math.lng Fri Apr 5 19:37:20 2002 -@@ -58,7 +58,7 @@ - 33 = "F~ormule" - 96 = "F~ormula" - 01 = "F~ormula" --07 = "Формула" -+07 = "~" - 86 = "公式(~O)" - 31 = "F~ormule" - 46 = "F~ormel" -diff -ur ../scp/source/office/basic.lng ../scp/source/office/basic.lng ---- ../scp/source/office/basic.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/office/basic.lng Fri Apr 5 17:51:20 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_PILOTINST1] - 01 = "%PRODUCTNAME %PRODUCTVERSION Setup also installs the module for data matching with PalmPilot organizers. Please note that the PalmPilot synchronization function in your previous %PRODUCTNAME version will be deactivated." - 49 = "%PRODUCTNAME %PRODUCTVERSION Setup installiert auch das Modul fr den Datenabgleich mit PalmPilot-Organizern. Bitte beachten Sie, dass die Funktion zur PalmPilot-Synchronisation in Ihrer lteren %PRODUCTNAME-Version deaktiviert wird." --07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." -+07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." - 55 = "Wenn Sie die PalmPilot-Unterst?zung installieren, verliert Ihre bestehende Installation die PalmPilot-Unterst?zung. M?hten Sie fortfahren ?" - 00 = "-" - 37 = "El programa d'installaci de %PRODUCTNAME %PRODUCTVERSION installar tamb el mdul per a la sincronitzaci de dades amb la PalmPilot. S'ha de tenir en compte que la funci de sincronitzaci amb la PalmPilot es desactivar en la seva versi antiga de %PRODUCTNAME." -@@ -48,7 +48,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -71,7 +71,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about Adabas integration can be found in the %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aquest motiu no s'installar la versi subministrada amb aquest %PRODUCTNAME. A l'Ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci d'Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -94,7 +94,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 00 = " " - 37 = "%PRODUCTNAME no ha pogut trobar els fitxers per a la installaci de la base de dades Adabas. Si vols utilitzar la integraci d'Adabas en %PRODUCTNAME, s'ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar el %PRODUCTNAME. El programa d'installaci d'Adabas es pot descarregar des d'Internet." -@@ -118,7 +118,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -@@ -142,7 +142,7 @@ - [STR_BASIC_PILOTTITEL] - 01 = "PalmPilot Installation" - 49 = "PalmPilot Installation" --07 = " PalmPilot" -+07 = " PalmPilot" - 55 = "PalmPilot installation" - 00 = " " - 37 = "Installaci de PalmPilot" -diff -ur ../scp/source/office/config.lng ../scp/source/office/config.lng ---- ../scp/source/office/config.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/config.lng Fri Apr 5 19:25:36 2002 -@@ -125,7 +125,7 @@ - [STR_SLIDE_6_OPEN] - 49 = "Vielen Dank, dass Sie %PRODUCTNAME %PRODUCTVERSION gewhlt haben!\nWir sind sicher, dass Ihnen Ihre tgliche Arbeit nun noch einfacher und schneller von der Hand geht und mehr Spa bringt. Wir freuen uns, dass Sie sich fr %PRODUCTNAME %PRODUCTVERSION entschieden haben." - 01 = "Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!\nWe hope your everyday work is easier, faster and a lot more fun. Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!" --07 = " Sie %PRODUCTNAME %PRODUCTVERSION\n , , . Sie %PRODUCTNAME %PRODUCTVERSION." -+07 = " %PRODUCTNAME %PRODUCTVERSION\n , , . %PRODUCTNAME %PRODUCTVERSION." - 55 = "Make YOUR Ideas Work!\nKennen Sie schon die tollen Service-Angebote von Star Division, z.B. die ma?geschneiderten und kosteng?stigen Abo-Angebote, mit denen Sie Ihr %PRODUCTNAME noch effizienter einsetzen k?nen? Informieren Sie sich aktuell und bequem im Internet! Wir w?schen Ihnen viel Spa? und Erfolg mit %PRODUCTNAME 5.1." - 37 = "Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!\nEsperem que faci que la vostra feina diria sigui ms fcil, ms rpida i ms amena. Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!." - 03 = "Resta-nos agradecer a sua preferncia!\nDesejamos-lhe um ptimo trabalho com o %PRODUCTNAME %PRODUCTVERSION. O seu trabalho dirio ir ser mais fcil, mais rpido e mais divertido. Parabns pela sua deciso!" -diff -ur ../scp/source/office/module.lng ../scp/source/office/module.lng ---- ../scp/source/office/module.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/module.lng Fri Apr 5 17:52:27 2002 -@@ -23,7 +23,7 @@ - [STR_DESC_MODULE_PRG] - 49 = "In diesem Bereich knnen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 01 = "This is where you decide which %PRODUCTNAME modules are to be installed." --07 = " %PRODUCTNAME." -+07 = " %PRODUCTNAME." - 55 = "In diesem Bereich k?nen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 37 = "Decidiu quins mduls del %PRODUCTNAME s'han d'installar en aquesta secci." - 03 = "Especifique aqui os mdulos do %PRODUCTNAME que deseja instalar." -@@ -159,7 +159,7 @@ - [STR_DESC_MODULE_PRG_WRT] - 49 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processing functions of %PRODUCTNAME provide you with powerful tools for creating your own documents. This program cannot be deselected when installing" --07 = " %PRODUCTNAME , . !" -+07 = " %PRODUCTNAME , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "Les funcions de processament de textos del %PRODUCTNAME us donen potents eines per crear els vostres propis documents. Aquest programa no es pot desseleccionar mentre s'installa" -@@ -206,7 +206,7 @@ - [STR_DESC_MODULE_PRG_WRT_LOCALLY_CACHED] - 49 = "Die Textverarbeitung bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processor provides you with powerful tools for creating text documents. This program cannot be deselected during installion." --07 = " , . !" -+07 = " , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "El processador de textos inclou potents eines per a la creaci de documents de text. Aquest programa no es pot desseleccionar mentre s'installa." -@@ -298,7 +298,7 @@ - [STR_DESC_MODULE_PRG_WRT_FLT] - 49 = "Optional installierbare Im- und Exportfilter fr verschiedene Textverarbeitungen." - 01 = "Optional import and export filters for different word processing programs." --07 = " , , ." -+07 = " , , ." - 55 = "Optional installierbare Im- und Exportfilter f? verschiedene Textverarbeitungen." - 37 = "Filtres opcionals d'importaci i exportaci per a diferents programes de processament de textos." - 03 = "Filtros de importao opcionais para vrios programas de tratamento de texto" -@@ -1606,7 +1606,7 @@ - [STR_NAME_MODULE_OPTIONAL_JAVA] - 49 = "Java Environment Installation" - 01 = "Java Environment Installation" --07 = " Java" -+07 = " Java" - 55 = "Java Environment Installation" - 00 = " " - 37 = "Installaci de l'entorn Java" -@@ -1676,7 +1676,7 @@ - [STR_DESC_MODULE_OPTIONAL_ADABAS] - 49 = "Komponente zur Installation der Adabas-Datenbank." - 01 = "Component for installing the Adabas database" --07 = " Adabas" -+07 = " Adabas" - 55 = "Nicht zu sehen vom User" - 37 = "Component per installar la base de dades Adabas" - 03 = "Componente para a instalao da base de dados Adabas." -diff -ur ../scp/source/office/profile.lng ../scp/source/office/profile.lng ---- ../scp/source/office/profile.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/profile.lng Fri Apr 5 19:36:15 2002 -@@ -589,7 +589,7 @@ - 33 = "~Texte" - 96 = "~Text Document" - 01 = "~Text Document" --07 = "Текстовый документ" -+07 = "~ " - 86 = "文本文档(~T)" - 31 = "~Tekstdocument" - 46 = "~Textdokument" -@@ -612,7 +612,7 @@ - 33 = "Document ~HTML" - 96 = "~HTML Document" - 01 = "~HTML Document" --07 = "Документ ~HTML" -+07 = " ~HTML" - 86 = "~HTML 文档" - 31 = "~HTML-Document" - 46 = "~HTML-dokument" -@@ -635,7 +635,7 @@ - 33 = "~Document matre" - 96 = "to be translated" - 01 = "M~aster Document" --07 = "Главный документ" -+07 = "~ " - 86 = "主控文档(~A)" - 31 = "~Basisdocument" - 46 = "~Samlingsdokument" -@@ -658,7 +658,7 @@ - 33 = "ti~quettes" - 96 = "~Labels" - 01 = "~Labels" --07 = "Наклейки" -+07 = "~" - 86 = "标签(~L)" - 31 = "Et~iketten" - 46 = "Et~iketter" -@@ -681,7 +681,7 @@ - 33 = "Cartes de ~visite" - 96 = "B~usiness Cards" - 01 = "B~usiness Cards" --07 = "Визитные карточки" -+07 = "~" - 86 = "名片(~U)" - 31 = "~Visitekaartjes" - 46 = "~Visitkort" -@@ -704,7 +704,7 @@ - 33 = "Mod~les et documents" - 96 = "F~rom Template..." - 01 = "Templates a~nd Documents" --07 = "Шаблоны и документы" -+07 = "~ " - 86 = "样式和文挡(~N)" - 31 = "~Sjablonen en documenten" - 46 = "M~allar och dokument" -@@ -727,7 +727,7 @@ - 33 = "~Lettre..." - 96 = "~Letter..." - 01 = "~Letter..." --07 = "~Письмо..." -+07 = "~..." - 86 = "信函(~L)..." - 31 = "~Brief..." - 46 = "~Brev..." -@@ -750,7 +750,7 @@ - 33 = "~Fax..." - 96 = "~Fax..." - 01 = "~Fax..." --07 = "~Факс..." -+07 = "~..." - 86 = "传真(~F)..." - 31 = "~Fax..." - 46 = "~Fax..." -@@ -773,7 +773,7 @@ - 33 = "~Agenda..." - 96 = "~Agenda..." - 01 = "~Agenda..." --07 = "~Повестка дня..." -+07 = "~ ..." - 86 = "会议议程(~A)..." - 31 = "~Agenda..." - 46 = "~Agenda..." -@@ -796,7 +796,7 @@ - 33 = "~Mmo..." - 96 = "~Memo..." - 01 = "~Memo..." --07 = "~Памятка..." -+07 = "~..." - 86 = "备忘录(~M)..." - 31 = "~Memo..." - 46 = "P~M..." -@@ -819,7 +819,7 @@ - 33 = "Page ~Web..." - 96 = "~Web Page..." - 01 = "~Web Page..." --07 = "~Web-страница..." -+07 = "~Web-..." - 86 = "网页(~W)..." - 31 = "~Webpagina..." - 46 = "~Webbsida..." -@@ -842,7 +842,7 @@ - 33 = "Form~ulaire..." - 96 = "Form..." - 01 = "Fo~rm..." --07 = "Формуляр..." -+07 = "~..." - 86 = "表单(~R)..." - 31 = "F~ormulier..." - 46 = "F~ormulr..." -@@ -865,7 +865,7 @@ - 33 = "Converti~sseur de documents..." - 96 = "StarOffice 5.2 Database Import..." - 01 = "Document ~Converter..." --07 = "Преобразователь документов..." -+07 = " ~..." - 86 = "文档转换器(~C)..." - 31 = "Documenten-~converter..." - 46 = "Dokument~konverterare..." -@@ -888,7 +888,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -@@ -911,7 +911,7 @@ - 33 = "Import de BD StarOffice 5.2..." - 96 = "~Euro Converter..." - 01 = "StarOffice 5.2 Database Import..." --07 = "Импорт базы данных StarOffice 5.2..." -+07 = " StarOffice 5.2..." - 86 = "输入 StarOffice 5.2 数据库..." - 31 = "StarOffice 5.2 database-import..." - 46 = "StarOffice 5.2 databasimport..." -@@ -926,7 +926,7 @@ - 44 = "Address Data Source..." - 49 = "Adress-Datenquelle..." - 03 = "Fonte de dados de endereços..." --07 = "Исходные данные адресов..." -+07 = " ..." - 30 = "Address Data Source..." - 31 = "Bron addresgegevens..." - 33 = "Source de donnes des adresses..." -@@ -953,7 +953,7 @@ - 86 = "%PRODUCTNAME %PRODUCTVERSION 文本文档" - 88 = "%PRODUCTNAME %PRODUCTVERSION 文字" - 03 = "StarOffice 6.0 Texto" --07 = "StarOffice 6.0 - Текст" -+07 = "%PRODUCTNAME %PRODUCTVERSION " - 30 = "StarOffice 6.0 - Κείμενο" - 31 = "StarOffice 6.0 Tekst" - 33 = "%PRODUCTNAME %PRODUCTVERSION Texte" -diff -ur ../scp/source/office/setuphelp.lng ../scp/source/office/setuphelp.lng ---- ../scp/source/office/setuphelp.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/setuphelp.lng Fri Apr 5 17:59:30 2002 -@@ -30,7 +30,7 @@ - [STR_HELP_INSTALLMODE] - 01 = "The Standard installation is recommended for normal users. It generally installs all components together with a selection of filters.\n\nThe Custom installation shows a dialog in which you can select the individual components to be installed.\n\nThe Minimum installation only installs those components needed to run the application. This option does not install the Help or most of the sample documents and templates." - 49 = "Die Standard Installation wird fr den normalen Anwender empfohlen. Im Allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter.\n\nDie Benutzergesteuerte Installation zeigt Ihnen einen Dialog, in dem Sie die einzeln installierbaren Komponenten anwhlen knnen.\n\nDie Minimale Installation installiert nur die minimal ntigen Komponenten. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen mssen Sie verzichten." --07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." -+07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." - 55 = "Die Standard Installation wird f? den normalen Anwender empfohlen. Im allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter. Wenn Sie diese Option w?hlen, werden Sie im Anschlu? nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll.\n\nDie Benutzergesteuerte Installation zeigt Ihnen ebenfalls zuerst einen Dialog zur Auswahl des Installationsverzeichnisses. Anschlie?end wird ein Dialog gezeigt, in dem Sie die einzeln installierbaren Komponenten anw?hlen k?nen. (Haben Sie das %PRODUCTNAME bereits installiert, k?nen Sie hier einzelne installierte Komponenten wieder abw?hlen, die dann aus der Installation entfernt werden.)\n\nDie Minimale Installation installiert nur die Komponenten, die mindestens n?ig sind, um das %PRODUCTNAME auszuf?ren. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen m?sen Sie verzichten. Wenn Sie diese Option w?hlen, werden Sie nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll." - 37 = "La installaci estndard s la recomanada per a usuaris normals; per regla general installa tots els components juntament amb una selecci de filtres.\n\nLa installaci personalitzada mostra un dileg en qu podeu seleccionar els components individuals que voleu installar.\n\nLa installaci mnima noms installa els components necessaris per executar l'aplicaci. Aquesta opci no installa l'Ajuda ni tampoc la majoria dels documents de mostra ni les plantilles." - 03 = "Para utilizadores comuns, recomenda-se a instalao padro. Esta instalar de forma geral todos os componentes juntamente com uma seleco de filtros.\n\nA instalao personalizada mostra-lhe uma caixa de dilogo para seleco dos componentes que deseja instalar.\n\nNa instalao mnima, sero instalados apenas os componentes mnimos necessrios. Com esta opo, a Ajuda e muitos dos exemplos e modelos de documentos no sero instalados." -@@ -53,7 +53,7 @@ - [STR_HELP_INSTPATH] - 01 = "Specify the directory where this product is to be installed. This folder will then be used to create several files and sub-folders." - 49 = "Geben Sie hier das Verzeichnis ein, in das dieses Produkt installiert werden soll. Einige Dateien werden in diesem Ordner angelegt und es werden weitere Unterordner unter diesem Ordner erstellt." --07 = ", , , . , ." -+07 = ", , , . , ." - 55 = "Geben Sie hier das Verzeichnis ein, in das %PRODUCTNAME Scheduleserver installiert werden soll. In der Vorgabe hei?t dieser Ordner SdlSrv51. Viele Dateien werden in diesem Ordner angelegt, und es werden weitere Unterordner unter diesem Ordner erstellt." - 37 = "Indiqueu el directori on s'ha d'installar aquest producte. Aquesta carpeta s'utilitzar per crear-hi diversos fitxers i subcarpetes." - 03 = "Indique o directrio para a instalao do produto. Nesse directrio sero criados vrios ficheiros e subpastas." -@@ -76,7 +76,7 @@ - [STR_HELP_REINSTALLATION] - 01 = "Modify Installation:\nUse this procedure to either delete individual components that have already been installed or to install additional ones.\n\nDeinstallation:\nThis procedure will delete the files and folders created by the setup program during installation. Files and folders created by the user after installation will not be deleted.\n\nRepair:\nThis option re-enters the application into your operating system's registry. An attempt will be made to restore inadvertently deleted program files." - 49 = "Installation ndern:\nHier knnen Sie die installierten Komponenten einzeln lschen oder weitere Komponenten nachtrglich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner lschen, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. \n\nReparatur:\nDiese Funktion trgt die Anwendung erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gelschte Programmdateien wiederherzustellen." --07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." -+07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." - 55 = "Installation ?ndern:\nHier k?nen Sie die installierten Komponenten einzeln l?chen oder weitere Komponenten nachtr?glich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren.\n\nReparatur:\nDiese Option tr?gt %PRODUCTNAME Scheduleserver erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gel?chte Programmdateien wiederherzustellen." - 37 = "Modifica la installaci:\nUtilitzeu aquest procediment tant per suprimir components individuals que ja s'han installat com per installar-ne d'addicionals.\n\nDesinstallaci:\nAquest procediment suprimeix els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers ni les carpetes que l'usuari ha creat desprs de la installaci.\n\nReparaci:\nAquesta opci torna a introduir l'aplicaci en el registre del sistema operatiu. S'intentar restaurar els fitxers de programa que s'han suprimit inadvertidament." - 03 = "Modificar instalao:\ninstala ou elimina os componentes seleccionados.\n\nDesinstalao:\nelimina os ficheiros e as pastas criados pelo programa setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Se desejar poder tambm eliminar todos os ficheiros.\n\n\nReparao:\nesta opo regista novamente a aplicao no seu sistema operativo e tenta restaurar os ficheiros do programa que tenham sido eliminados involuntariamente." -@@ -99,7 +99,7 @@ - [STR_HELP_UNINSTALL] - 01 = "The files and folders created by the setup program during installation will be deleted. Files and folders created by the user after installation will not be deleted. All of the files needed to run the setup program will not be deleted either. If you want you can have all the files deleted." - 49 = "Es werden die Dateien und Ordner gelscht, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausfhren des Setup Programms bentigt werden, bleiben ebenfalls bestehen. Sie knnen auf Wunsch auch alle Dateien lschen lassen." --07 = " , . , , . , , . ." -+07 = " , . , , . , , . ." - 55 = "Wird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren." - 37 = "Se suprimiran els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers i les carpetes creats per l'usuari desprs de la installaci. Tampoc no se suprimiran tots els fitxers necessaris per executar el programa d'installaci. Si voleu, podeu suprimir tots els fitxers." - 03 = "Sero eliminados os ficheiros e as pastas criados pelo programa Setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Os ficheiros necessrios execuo do programa de instalao (setup) mantm-se intactos. Se desejar poder tambm eliminar todos os ficheiros." -@@ -122,7 +122,7 @@ - [STR_HELP_USERDEFINED] - 01 = "This is where you select the components to be installed. Note that you can select or deselect individual text filters, graphic filters, dictionaries, etc.\n\nThe Default button will reset your changes to the default settings.\n\nIf you want to add or delete components in an existing installation at a later date, call the Setup program again and select the desired components.\n\nBy default, all components marked by a colored box next to the name are installed. If you do not want to install a component, click the respective box. A colorless box indicates the components which will not be installed or are to be deleted from an existing installation. Each click on a box changes it from colored to colorless and vice versa and the component will be installed or deinstalled/not installed.\n\nIf you click the plus sign next to a component, a list of related components is displayed. These can also be installed or deinstalled as described above. A gray box indicates that some components in that group are to be installed and some are to be deinstalled/not installed." - 49 = "Whlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, dass Sie Textfilter, Grafikfilter, Wrterbcher usw. einzeln anwhlen und abwhlen knnen.\n\nDie Schaltflche Standard setzt die Auswahl auf die Standardvorgabe zurck.\n\nWenn Sie nach der Installation Komponenten hinzufgen oder lschen wollen, rufen Sie das Setup Programm erneut auf und whlen Sie hier aus.\n\nStandardmig werden alle Komponenten installiert, deren Kstchen neben den Komponentennamen vollfarbig gefllt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das Kstchen neben dem Namen. Das Kstchen wird farblos, was Ihnen anzeigt, dass diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein Kstchen wechselt es von vollfarbig nach farblos oder umgekehrt und die zugehrige Komponente wird installiert oder nicht installiert.\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ffnen Sie die Liste der untergeordneten Komponenten. Auch diese knnen Sie durch Anklicken installieren oder aus der Installation entfernen. Enthlt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das Kstchen grau." --07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." -+07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." - 55 = "W?hlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, da? Sie Textfilter, Grafikfilter, W?terb?her usw. einzeln anw?hlen und abw?hlen k?nen.\n\nDie Schaltfl?che Standard setzt die Auswahl auf die Standardvorgabe zur?k.\n\nWenn Sie nach der Installation Komponenten hinzuf?en oder l?chen wollen, rufen Sie das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm erneut auf und w?hlen Sie hier aus. In der Netzwerk-Installation sollten Sie alle Komponenten anw?hlen.\n\nStandardm??ig werden alle Komponenten installiert, deren K?stchen neben den Komponentennamen blau gef?lt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das blaue K?stchen neben dem Namen. Das K?stchen wird wei?, was Ihnen anzeigt, da? diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein K?stchen wechselt es von blau nach wei? oder umgekehrt, und die zugeh?ige Komponente wird entweder installiert (blau) oder nicht installiert (wei?).\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ?fnen Sie die Liste der untergeordneten Komponenten. Auch diese k?nen Sie durch Anklicken installieren oder aus der Installation entfernen. Enth?lt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das K?stchen grau." - 37 = "Seleccioneu els components que s'han d'installar aqu. Observeu que podeu seleccionar o desseleccionar filtres de text, filtres grfics, diccionaris, etc. individuals.\n\nEl bot Valors per defecte anullar els canvis i deixar els parmetres per defecte.\n\nSi ms endavant voleu afegir o suprimir components d'una installaci existent, torneu a executar el programa d'installaci i seleccioneu els components desitjats.\n\nPer defecte, s'installaran tots els components marcats amb un quadre blau al costat del nom. Si no voleu installar un component, feu clic al quadre corresponent. Un quadre en blanc indica els components que no s'installaran, o els que se suprimiran d'una installaci existent. Cada clic en un quadre el canvia de blau a blanc i viceversa i el component s'installar (blau) o es desinstallar/no s'installar (blanc).\n\nSi feu clic sobre el signe " - 03 = "Seleccione aqui os componentes que deseja instalar. No esquea que poder seleccionar ou desseleccionar individualmente filtros de texto, filtros grficos, dicionrios, etc.\n\nO boto 'Padro' restaura as predefinies anteriores.\n\nSe, posteriormente, desejar adicionar ou eliminar componentes numa instalao existente, active novamente o programa de instalao (setup) e seleccione os componentes desejados.\n\nAs casas preenchidas a cor indicam que os respectivos componentes sero instaladas de forma padronizada. Se no pretender instalar um desses componentes, clique na respectiva casa. Essa casa deixar de ter cor, indicando que os componentes no sero instalados ou que sero eliminados de uma instalao existente. Com cada clique mudar a cor da casa correspondente: a cor indica que os componentes sero instalados; uma casa sem cor indica que os componentes no sero instalados.\n\nSe fizer clique no sinal de adio que se encontra ao lado de cada um dos componentes, ver uma lista de componentes subordinados. Estes podero tambm ser instalados ou eliminados como acima descrito. Uma casa de cor cinzenta indica que sero instalados somente alguns dos respectivos componentes." -@@ -145,7 +145,7 @@ - [STR_HELP_WELCOME] - 01 = "Welcome to the installation.\n\nFor a detailed description of the installation procedure refer to the Setup Guide.\n\nIn several of the Setup program dialogs there are also Help buttons which access specific information about the settings." - 49 = "Willkommen bei der Installation.\n\nBitte schauen Sie fr eine genaue Anleitung in Ihr Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltflchen. Mit einem Klick erhalten Sie Untersttzung zu den jeweiligen Einstellungen." --07 = " .\n\n .\n\n , ." -+07 = " .\n\n .\n\n , ." - 55 = "Willkommen bei der Installation von %PRODUCTNAME Scheduleserver\n\nBitte schauen Sie f? eine genaue Anleitung in Ihr %PRODUCTNAME Scheduleserver Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltfl?chen. Mit einem Klick erhalten Sie Unterst?zung zu den jeweilligen Einstellungen." - 37 = "Benvingut a la installaci.\n\nPer a una descripci detallada del procediment d'installaci, consulteu la Guia d'installaci.\n\nEn diversos dilegs del programa de configuraci tamb hi ha botons d'ajuda que permeten accedir a la informaci especfica sobre els parmetres." - 03 = "Bem-vindo ao programa de instalao!\n\nPara instrues mais detalhadas, queira consultar o Manual de Instalao.\n\nAo longo da instalao encontrar botes nas diversas caixas de dilogo que lhe do acesso a uma ajuda especfica. Bastar um clique para receber mais informaes sobre os parmetros da caixa de dilogo activa." -@@ -191,7 +191,7 @@ - [STR_HELP_MIGRATION] - 01 = "%PRODUCTNAME can adopt personal data and configuration settings from a previous %PRODUCTNAME installation. To take advantage of this, activate the 'Import personal data' field. The path to the directory in the previous installation appears. If you do not want to accept data and settings from a previous version, unmark the 'Import personal data' check box." - 49 = "%PRODUCTNAME kann persnliche Daten und Konfigurationseinstellungen aus einer frheren %PRODUCTNAME-Installation bernehmen. Wenn Sie dieses wnschen, aktivieren Sie das Feld 'persnliche Daten importieren'. Sie sehen den Pfad zum Verzeichnis der frheren Installation. Wnschen Sie keine bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'persnliche Daten importieren' auf." --07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." -+07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." - 55 = "%PRODUCTNAME kann pers?liche Daten und Konfigurationseinstellungen aus einer fr?eren %PRODUCTNAME-Installation ?ernehmen. Wenn Sie dieses w?schen, aktivieren Sie das Feld 'pers?liche Daten importieren' und geben Sie den vollst?ndigen Pfad zum Verzeichnis der fr?eren Installation ein. Mit der Schaltfl?che Durchsuchen k?nen Sie das Verzeichnis w?hlen. W?schen Sie keine ?bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'pers?liche Daten importieren' auf." - 00 = " " - 37 = "El %PRODUCTNAME pot acceptar les dades personals i els parmetres de configuraci d'una versi anterior. Si voleu fer-ho aix, activeu el camp 'Importa les dades personals' i introduu el cam complet al directori de la versi anterior. Tamb podeu seleccionar el directori utilitzant el bot Navega. Si no voleu acceptar les dades i els parmetres d'una versi anterior, desactiveu el camp 'Importa les dades personals'." -diff -ur ../scp/source/office/unxbasic.lng ../scp/source/office/unxbasic.lng ---- ../scp/source/office/unxbasic.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/unxbasic.lng Fri Apr 5 18:01:11 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -24,7 +24,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about integrating Adabas can be found in %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aix no s'installar la versi subministrada amb aquest %PRODUCTNAME. En l'ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci de Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -47,7 +47,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 37 = "%PRODUCTNAME no ha pogut trobar fitxers per a la installaci de la base de dades Adabas. Si vol utilitzar la integraci de Adabas en %PRODUCTNAME, ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar %PRODUCTNAME. El programa d'installaci d'Adabas el pot descarregar d'Internet." - 03 = "No foi possvel ao %PRODUCTNAME encontrar os ficheiros para a instalao da base de dados Adabas. Para utilizar a integrao Adabas no %PRODUCTNAME ter que iniciar o programa de instalao do Adabas (Setup) manualmente, aps concluir a instalao do %PRODUCTNAME. Carregue os ficheiros de instalao do Adabas via Internet." -@@ -70,7 +70,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -diff -ur ../setup2/source/custom/jvmsetup/jvmdlg.src ../setup2/source/custom/jvmsetup/jvmdlg.src ---- ../setup2/source/custom/jvmsetup/jvmdlg.src Wed Apr 3 16:11:09 2002 -+++ ../setup2/source/custom/jvmsetup/jvmdlg.src Fri Apr 5 19:01:36 2002 -@@ -77,7 +77,7 @@ - Text[ ENGLISH ] = "Java Setup" ; - Text[ english_us ] = "Java Setup"; - Text[ portuguese ] = "Java Setup"; -- Text[ russian ] = " Java"; -+ Text[ russian ] = " Java"; - Text[ dutch ] = "Java Setup"; - Text[ french ] = "Programme d'installation de Java (Setup)"; - Text[ spanish ] = "Java Setup"; -@@ -305,7 +305,7 @@ - Text[ENGLISH] = "~Install..."; - Text[ english_us ] = "~Install..."; - Text[ portuguese ] = "~Instalar..."; -- Text[ russian ] = "..."; -+ Text[ russian ] = "..."; - Text[ dutch ] = "~Installeren..."; - Text[ french ] = "~Installer..."; - Text[ spanish ] = "I~nstalar..."; -@@ -337,7 +337,7 @@ - Message = "Es wurde keine Java Untersttzung ausgewhlt.\nDies ist jedoch fr PGP erforderlich. Wollen Sie PGP dennoch installieren?\nMit Abbruch kommen Sie zurck zum Dialog." ; - Message [ english_us ] = "No Java support is selected.\nFor PGP you need Java. Do you want to install PGP anyway?\nCancel will bring you back to the dialog." ; - Message[ portuguese ] = "No foi seleccionado o suporte Java.\nO PGP no funciona sem este suporte. Mesmo assim, instalar o PGP?\nPara voltar caixa de dilogo, clique em Cancelar."; -- Message[ russian ] = " Java .\n PGP. PGP ?\n ."; -+ Message[ russian ] = " Java .\n PGP. PGP ?\n ."; - Message[ greek ] = " Java.\n PGP. PGP ;\n? "; - Message[ dutch ] = "Er werd geen Java support geselecteerd.\nDaardoor kan PGPniet functioneren. Wilt u PGP toch installeren?\nMet Annuleren komt u terug naar de dialoog."; - Message[ french ] = "Aucun support Java n'a t slectionn.\nCelui-ci est indispensable pour que PGP fonctionne. Voulez-vous quand mme installer PGP ?\nAnnuler vous permet de retourner la bote de dialogue."; -@@ -354,7 +354,7 @@ - Message[ turkish ] = "Java destei seilmedi.\nPGP, Java destei olmadan alamaz. PGP'yi yine de kurmak istiyor \n musunuz?ptal seerseniz pencereye geri dneceksiniz."; - Message[ arabic ] = " .\n PGP. PGP ߿\n ѡ "; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; -@@ -385,7 +385,7 @@ - Message = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?" ; - Message [ english_us ] = "Some program functions require Java to be supported. Please note: %PRODUCTNAME Help requires a Java Runtime Environment of 1.2 or higher to be supported by your system.\n\nAre you sure you want to continue with installation?" ; - Message[ portuguese ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; -- Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; -+ Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; - Message[ greek ] = " Java. %PRODUCTNAME Java ( 1.2 ) .\n\n ;"; - Message[ dutch ] = "Bepaalde programmafuncties zijn alleen uitvoerbaar met ondersteuning van Java. Wij maken u erop attent dat voor %PRODUCTNAME-Help een Java Runtime Environment vanaf versie 1.2 op uw systeem wordt benodigd.\n\nWilt u toch doorgaan met de installatie?"; - Message[ french ] = "Certaines fonctions du programme exigent un support Java. Veuillez noter que l'aide de %PRODUCTNAME ncessite un environnement Java Runtime version 1.2 ou plus.\n\ntes-vous sr de vouloir poursuivre l'installation ?"; -@@ -402,7 +402,7 @@ - Message[ turkish ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; - Message[ arabic ] = " . %PRODUCTNAME Java Runtime Environment 1.2 .\n\n ?"; - Title[ portuguese ] = "Para algumas das funes do programa necessrio um suporte Java. No esquea que a Ajuda do %PRODUCTNAME precisa de um ambiente Java Runtime a partir da verso 1.2 no seu sistema.\n\nProsseguir com a instalao?"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installatie"; - Title[ french ] = "Installation"; -@@ -440,14 +440,14 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt, wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt onderbreken?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您就无法使用这个程序！\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu,nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "ここでインストールを中止すると、インストールは不完全のまま終了し、プログラムの実行はできません。\nインストールを中止してかまいませんか。"; - Message[ chinese_traditional ] = "如果您現在取消安裝，安裝的程式就不會完整，也可能無法啟動！\n您真要取消安裝？"; - Message[ arabic ] = " !\n ʿ"; - Title[ english_us ] = "Installation"; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; - Title[ spanish ] = "Installation"; -@@ -679,7 +679,7 @@ - TEXT [ ENGLISH ] = "Java Environment Installation" ; - TEXT[ english_us ] = "Java Environment Installation"; - TEXT[ portuguese ] = "Instalao do Java Environment"; -- TEXT[ russian ] = " Java Environment "; -+ TEXT[ russian ] = " Java Environment "; - TEXT[ dutch ] = "Installatie van Java- environment"; - TEXT[ french ] = "Installation de l'environnement Java"; - TEXT[ spanish ] = "Instalacin de Java Environment"; -diff -ur ../setup2/source/service/progressdlg.src ../setup2/source/service/progressdlg.src ---- ../setup2/source/service/progressdlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/service/progressdlg.src Fri Apr 5 18:57:00 2002 -@@ -91,7 +91,7 @@ - Text = "Ihre Installation wird jetzt vervollstndigt!\nBitte haben Sie einen Moment Geduld." ; - Text [ english_us ] = "Installation is now being completed\nPlease wait a moment." ; - Text[ portuguese ] = "A sua instalao ser agora concluda!\nQueira aguardar alguns instantes."; -- Text[ russian ] = " .\n, ."; -+ Text[ russian ] = " .\n, ."; - Text[ greek ] = " !\n ."; - Text[ dutch ] = "Uw installatie wordt nu voltooid!\nEen ogenblik geduld a.u.b."; - Text[ french ] = "Achvement de l'installation...\nVeuillez patienter."; -diff -ur ../setup2/source/ui/app.src ../setup2/source/ui/app.src ---- ../setup2/source/ui/app.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/app.src Fri Apr 5 18:20:27 2002 -@@ -167,7 +167,7 @@ - Text [ dutch ] = "De installatie wordt voorbereid" ; - Text [ portuguese ] = "A preparar a instalao" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowanie instalacji"; - Text[ japanese ] = "インストールの準備"; - Text[ chinese_traditional ] = "準備安裝程式"; -@@ -504,7 +504,7 @@ - Text [ french ] = "Installation de l'utilisateur %1 en cours" ; - Text [ dutch ] = "Gebruiker %1 wordt genstalleerd" ; - Text[ chinese_simplified ] = "建立使用者 %1 。"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Instalacja uytkownika %1"; - Text[ japanese ] = "ユーザー %1 がインストールされます"; - Text[ chinese_traditional ] = "建立使用者 %1 。"; -@@ -636,7 +636,7 @@ - Text [ portuguese ] = "Foram instalados novos conjuntos de caracteres. Para que estes estejam disponveis para todos os programas necessrio reiniciar o sistema." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; - Text[ chinese_simplified ] = "在安装过程中，已经安装了新的字体。为了让所有的应用程序能够使用这些字体，您必须重新启动重新您的系统。"; -- Text[ russian ] = " . , ."; -+ Text[ russian ] = " . , ."; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, wymagane jest ponowne rozpoczcie."; - Text[ japanese ] = "新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するためには、コンピュータを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝軟體時加入了一些新的字型。為了讓所有的應用程式能夠使用這些字型，請重新啟動電腦。"; -@@ -767,7 +767,7 @@ - Text [ portuguese ] = "A instalao est a ser preparada." ; - Text [ portuguese_brazilian ] = "Installation wird vorbereitet" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowywanie instalacji"; - Text[ japanese ] = "インストールの準備をしています。"; - Text[ chinese_traditional ] = "正在準備安裝"; -@@ -793,7 +793,7 @@ - Text [ portuguese ] = "Os dados da instalao esto a ser guardados." ; - Text [ portuguese_brazilian ] = "Installationsdaten werden gesichert." ; - Text[ chinese_simplified ] = "存盘安装数据。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dane instalacji bd zapisane."; - Text[ japanese ] = "インストールデータを保存しています。"; - Text[ chinese_traditional ] = "正在儲存安裝數據"; -@@ -819,7 +819,7 @@ - Text [ portuguese ] = "O programa %1 no foi encontrado. A verso actualizada no pode ser instalada." ; - Text [ portuguese_brazilian ] = "Das Programm %1 wurde nicht gefunden. Das Update kann nicht installiert werden." ; - Text[ chinese_simplified ] = "没有找到程序 %1 。无法安装升级服务包。"; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ polish ] = "Nie znaleziono programu %1. Nie mona zainstalowa aktualizacji."; - Text[ japanese ] = "プログラム %1 は見つかりません。更新インストールはできません。"; - Text[ chinese_traditional ] = "沒有找到程式 %1 。無法安裝升級軟體。"; -@@ -935,7 +935,7 @@ - Text [ french ] = "Vous n'tes pas autoris installer ce ServicePack sur une version de dmonstration (Try&Buy)." ; - Text [ dutch ] = "Met een Try&Buy-Version bestaat geen recht op het installeren van dit ServicePack." ; - Text[ chinese_simplified ] = "您使用的是'先用后买'版本，因此您不能安装这个服务包。"; -- Text[ russian ] = " Try&Buy ServicePack."; -+ Text[ russian ] = " Try&Buy ServicePack."; - Text[ polish ] = "Wersja Try&Buy nie upowania do instalacji ServicePack."; - Text[ japanese ] = "Try＆Buy バージョンで、この ServicePack をインストールできません。"; - Text[ chinese_traditional ] = "您使用的是'先用後買'版本﹐因此您無法安裝這個升級軟體。"; -@@ -960,7 +960,7 @@ - Text [ french ] = "L'installation du ServicePack a chou." ; - Text [ dutch ] = "De server kon niet worden genstalleerd." ; - Text[ chinese_simplified ] = "无法安装这个服务包。"; -- Text[ russian ] = " ServicePack ."; -+ Text[ russian ] = " ServicePack ."; - Text[ polish ] = "Instalacja ServicePack nie moga zosta przeprowadzona."; - Text[ japanese ] = "ServicePack のインストールは実行できませんでした｡"; - Text[ chinese_traditional ] = "無法安裝這個升級軟體。"; -@@ -985,7 +985,7 @@ - Text [ french ] = "Aucun kit d'installation n'a t trouv sur le chemin indiqu." ; - Text [ dutch ] = "In het aangegeven pad werd geen installatiebestand gevonden." ; - Text[ chinese_simplified ] = "在您给定的路径内无法找到任何安装文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "W podanej ciece nie znaleziono plikw instalacyjnych."; - Text[ japanese ] = "指定したパスに、インストールファイルは見つかりませんでした。"; - Text[ chinese_traditional ] = "在您輸入的路徑內無法找到任何安裝檔案。"; -@@ -1011,7 +1011,7 @@ - Text [ portuguese ] = "Esta verso \"Try & Buy\" no pode ser instalada novamente neste computador." ; - Text [ portuguese_brazilian ] = "Diese Try&Buy-Version kann nicht erneut auf diesem Computer installiert werden." ; - Text[ chinese_simplified ] = "无法在您的计算机上重新安装这个'先用后买'版本。"; -- Text[ russian ] = " Try&Buy ."; -+ Text[ russian ] = " Try&Buy ."; - Text[ polish ] = "Wersja Try&Buy nie moe by ponownie zainstalowana na tym komputerze."; - Text[ japanese ] = "この Try＆Buy バージョンは、このコンピュータに再インストールできません。"; - Text[ chinese_traditional ] = "無法在您的電腦上重新安裝這個'先用後買'版本。"; -@@ -1095,7 +1095,7 @@ - Message = "Soll die Installation auf '%s' jetzt komplett gelscht werden?\n\nBitte beachten Sie, dass Sie in ein Wurzelverzeichnis installiert haben, dabei wird der komplette Datentrger gelscht!" ; - Message [ english_us ] = "Do you want to delete the installation on '%s' completely?\n\nPlease note that if you have installed the program in a root directory the entire drive content will be deleted." ; - Message[ portuguese ] = "Eliminar agora a instalao em '%s'?\n\nNo esquea que fez a instalao num directrio-raz e desta forma eliminar todo o contedo do disco."; -- Message[ russian ] = " '%s'?\n\n, , ; ."; -+ Message[ russian ] = " '%s'?\n\n, , ; ."; - Message[ dutch ] = "Wilt u dat de installatie op '%s' nu compleet wordt gewist?\n\nWij wijzen u erop dat deze zich bevindt in een root-directory, zodat dan de complete inhoud van de drive wordt gewist!"; - Message[ french ] = "Voulez-vous vraiment supprimer l'installation sur '%s' dans sa totalit ?\n\nNotez que vous supprimerez dans ce cas tout le contenu du mdia, tant donn que vous y avez effectu l'installation dans un rpertoire racine."; - Message[ spanish ] = "Desea eliminar completamente la instalacin en '%s'?\n\nTenga en cuenta que ha hecho la instalacin en un directorio raz, con lo que se eliminar la totalidad del disco."; -@@ -1165,7 +1165,7 @@ - Message [ portuguese ] = "A verso instalada do ficheiro %1 melhor do que aquela que deseja instalar agora. Deseja continuar com a instalao?" ; - Message [ portuguese_brazilian ] = "Die installierte Version der Datei %1 ist h?erwertig, als die die Sie jetzt installieren wollen. Soll die Installation fortgesetzt werden?" ; - Message[ chinese_simplified ] = "这个安装的文件 %1 版本比您现在想要安装的要新。要继续安装？"; -- Message[ russian ] = " %1 , , . ?"; -+ Message[ russian ] = " %1 , , . ?"; - Message[ polish ] = "Zainstalowana wersja pliku %1 jest bardziej wartociowa, ni ta, ktr chcesz zainstalowa. Czy kontynuowa instalacj?"; - Message[ japanese ] = "ファイル %1 にインストールされたバージョンは、今インストールしようとしているものよりアップグレードされています。インストールを続行しますか。"; - Message[ chinese_traditional ] = "這個安裝的檔案 %1 版本比現在要安裝的要新。要繼續安裝？"; -@@ -1199,7 +1199,7 @@ - Message [ spanish ] = "Desea realmente eliminar la instalacin actual?" ; - Message [ english_us ] = "Are you sure you want to delete the current installation?" ; - Message[ chinese_simplified ] = "您真的要删除现存的安装程序吗？"; -- Message[ russian ] = " , ?"; -+ Message[ russian ] = " , ?"; - Message[ polish ] = "Czy na pewno usun aktualn instalacj?"; - Message[ japanese ] = "既存のインストールを本当に削除しますか。"; - Message[ chinese_traditional ] = "您真要移除現存的安裝程式？"; -@@ -1230,7 +1230,7 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt stoppen?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您也就无法使用这个程序。\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu, nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "インストールをここで中止すると、インストールが不完全のまま終了し、プログラムの実行はできません。\n中止してもかまいませんか。"; - Message[ chinese_traditional ] = "若現在中斷安裝，程式安裝就會不完全。您也就無法使用這個軟件。\n您真要取消安裝？"; -@@ -1260,7 +1260,7 @@ - Message [ dutch ] = "De geselecteerde modules en componenten zijn\nnu op uw harde schijf genstalleerd/gedenstalleerd.\n" ; - Message [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido.\n" ; - Message[ chinese_simplified ] = "在硬盘上已经安装或删除\n您选择的模块和组件。\n"; -- Message[ russian ] = " / \n .\n"; -+ Message[ russian ] = " / \n .\n"; - Message[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay\nzainstalowane / zdeinstalowane na / z dysku twardym/twardego.\n"; - Message[ japanese ] = "選択したモジュールとコンポーネントが、\nハードディスク上にインストールされました / 削除されました。\n"; - Message[ chinese_traditional ] = "在您的磁碟上已經安裝/ 移除了\n您選擇的模塊和元件。\n"; -@@ -1291,7 +1291,7 @@ - Message [ portuguese ] = "Instalao reparada.\n" ; - Message [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Message[ chinese_simplified ] = "已经修补了安装。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Instalacja zostaa naprawiona.\n"; - Message[ japanese ] = "インストールは修復されました。\n"; - Message[ chinese_traditional ] = "已經修補了安裝。\n"; -@@ -1322,7 +1322,7 @@ - Message [ portuguese ] = "A desinstalao foi terminada.\n" ; - Message [ portuguese_brazilian ] = "Die Deinstallation ist beendet.\n" ; - Message[ chinese_simplified ] = "已经完成撤除程序。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Deinstalacja zakoczona.\n"; - Message[ japanese ] = "インストールの削除が完了しました。\n"; - Message[ chinese_traditional ] = "已經完成移除程式。\n"; -@@ -1357,7 +1357,7 @@ - Message [ portuguese ] = "Deseja que o programa de instalao modifique o ficheiro 'CONFIG.SYS' para registar o atalho do programa em LIBPATH?\n 'CONFIG.SYS' ser guardado como 'CONFIG.SET'." ; - Message [ portuguese_brazilian ] = "Soll das Installationsprogramm f? Sie die Datei 'CONFIG.SYS' ?ndern, um den Programm-Pfad in LIBPATH einzutragen?\nDie alte 'CONFIG.SYS' wird als 'CONFIG.SET' gesichert." ; - Message[ chinese_simplified ] = "您允许安装助理程序修改 'CONFIG.SYS' 文件并在 LIBPATH 处加入程序路径吗？\n旧的 'CONFIG.SYS' 文件会被保存并命名为 'CONFIG.SET' 。"; -- Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; -+ Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; - Message[ polish ] = "Czy program instalacyjny ma zmieni plik 'CONFIG.SYS', aby wpisa ciek programu do LIBPATH?\nStary plik 'CONFIG.SYS' zostanie zapisany jako 'CONFIG.SET'."; - Message[ japanese ] = "プログラムパスを LIBPATH に追加するため、インストールプログラムが 「CONFIG.SYS」ファイルを変更してもかまいませんか。\n旧「CONFIG.SYS」は「CONFIG.SET」として保存されます。"; - Message[ chinese_traditional ] = "您允許安裝助理程式修改 CONFIG.SYS 檔案並在 LIBPATH 處加入程式路徑？\n舊的 CONFIG.SYS 檔案會被儲存並命名為 CONFIG.SET 。"; -diff -ur ../setup2/source/ui/dialog/dialog.src ../setup2/source/ui/dialog/dialog.src ---- ../setup2/source/ui/dialog/dialog.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/dialog.src Fri Apr 5 18:56:15 2002 -@@ -722,7 +722,7 @@ - Text [ spanish ] = "en la unidad de instalacin." ; - Text [ english_us ] = "into the installation drive." ; - Text[ chinese_simplified ] = "到安装驱动盘内。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "do napdu instalacyjnego."; - Text[ japanese ] = "インストールドライブへ挿入してください。"; - Text[ chinese_traditional ] = "到安裝驅動器內。"; -@@ -778,7 +778,7 @@ - Text [ french ] = "L'installation prcdente du" ; - Text [ dutch ] = "Uw oude installatie van" ; - Text[ chinese_simplified ] = "您以前的安装版本"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Twojej starej instalacji"; - Text[ japanese ] = "ユーザーの旧インストール"; - Text[ chinese_traditional ] = "舊的安裝版本"; -@@ -826,7 +826,7 @@ - Text [ french ] = "Pour installer la mise jour de %1, vous avez besoin de vos anciens fichiers d'installation. Veuillez indiquer le chemin du rpertoire dans lequel ils se trouvent." ; - Text [ dutch ] = "Om de upgrade voor %1 te kunnen installeren heeft u uw oude installatiebestanden nodig. Geef hier het pad aan naar de map waarin deze zich bevinden." ; - Text[ chinese_simplified ] = "安装升级软件 %1 需要旧的安装文件。请输入搜寻安装文件的目录路径："; -- Text[ russian ] = " %1, . , , , :"; -+ Text[ russian ] = " %1, . , , , :"; - Text[ polish ] = "Aby zainstalowa aktualizacj dla %1, wymagane s stare pliki instalacyjne. Prosz podaj tutaj katalog, w ktrym mona odnale pliki instalacyjne."; - Text[ japanese ] = "%1 の更新をインストールするには、旧インストールファイルが必要です。インストールファイルを見つけるディレクトリパスを入力してください:"; - Text[ chinese_traditional ] = "安裝升級軟體 %1 需要舊的安裝檔案。請輸入搜尋安裝檔案的目錄路徑："; -@@ -909,7 +909,7 @@ - PosSize = MAP_APPFONT ( 40 , 12 , 268 , 16 ) ; - WordBreak = TRUE ; - Text[ chinese_simplified ] = "这段文字含有附加的安装程序的重要信息。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Tutaj znajduj si dodatkowe informacje o zainstalowanym programie."; - Text[ japanese ] = "このテキストはインストールされたプログラムに対する追加および重要な情報を含んでいます。"; - Text[ chinese_traditional ] = "這段文字含有附加的關於安裝程式的重要訊息。"; -@@ -1186,7 +1186,7 @@ - Text [ english_us ] = "Continue the installation anyway?" ; - Left = TRUE ; - Text[ chinese_simplified ] = "您还是要继续执行安装？"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ polish ] = "Czy chcesz mimo to kontynuowa instalacj?"; - Text[ japanese ] = "それでもインストールを続行しますか?"; - Text[ chinese_traditional ] = "還是要繼續執行安裝？"; -diff -ur ../setup2/source/ui/dialog/strings.src ../setup2/source/ui/dialog/strings.src ---- ../setup2/source/ui/dialog/strings.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/strings.src Fri Apr 5 18:56:39 2002 -@@ -77,7 +77,7 @@ - Text [ spanish ] = "Instalacin" ; - Text [ english_us ] = "Installation" ; - Text[ chinese_simplified ] = "安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Instalacja"; - Text[ japanese ] = "インストール"; - Text[ chinese_traditional ] = "安裝"; -@@ -120,7 +120,7 @@ - Text = "Mchten Sie das %1 Installationsprogramm wirklich beenden?" ; - Text [ english_us ] = "Do you really want to exit the %1 installation program?" ; - Text[ portuguese ] = "Deseja realmente terminar o programa de instalao %1?"; -- Text[ russian ] = " %1?"; -+ Text[ russian ] = " %1?"; - Text[ greek ] = " %1;"; - Text[ dutch ] = "Wilt u het installatieprogramma %1 werkelijk bendigen?"; - Text[ french ] = "Voulez-vous vraiment quitter l'installation de %1 ?"; -diff -ur ../setup2/source/ui/error.src ../setup2/source/ui/error.src ---- ../setup2/source/ui/error.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/error.src Fri Apr 5 18:23:51 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Error al instalar la clase WPStarWriter!" ; - Text [ english_us ] = "Error installing the class WPStarWriter!" ; - Text[ chinese_simplified ] = "在安装 WPStarWriter 程序类时发生错误！"; -- Text[ russian ] = " WPStarWriter!"; -+ Text[ russian ] = " WPStarWriter!"; - Text[ polish ] = "Bd podczas instalacji klasy WPStarWriter!"; - Text[ japanese ] = "WP%PRODUCTNAME Writer クラスをインストールするときのエラー。"; - Text[ chinese_traditional ] = "安裝 WPStarWriter 程式類時發生錯誤！"; -@@ -374,7 +374,7 @@ - Text [ french ] = "Impossible d'installer le fichier de police %1.\nIl se peut qu'il soit utilis par un autre programme. Une fois l'installation termine, quittez tous les programmes et ressayer d'installer cette police." ; - Text [ dutch ] = "Lettertypenbestand %1 kon niet worden genstalleerd.\nEventueel wordt dit bestand nog gebruikt door een ander programma. Beindig na de installatie alle programmas en installeer Font eventueel opnieuw." ; - Text[ chinese_simplified ] = "无法装入字体文件 %1 。\n可能是有一个程序还在使用这个字体文件。请您在安装结束之后关闭所有的应用程序，如有必要请您重新安装这个字体。"; -- Text[ russian ] = " %1.\n, . ."; -+ Text[ russian ] = " %1.\n, . ."; - Text[ polish ] = "Pliku czcionek %1 nie mona byo zainstalowa.\nPrawdopodobnie ten plik uywany jest przez inne programy. Zakocz po instalacji wszystkie programy i sprbuj zainstalowa plik czcionek jeszcze raz."; - Text[ japanese ] = "フォントファイル %1 をインストールできませんでした。\nまだほかのプログラムでこのファイルが使用されているのかもしれません。インストール後すべてのプログラムを終了して、必要ならもう一度フォントをインストールします。"; - Text[ chinese_traditional ] = "無法裝載字型檔案 %1 。\n可能是有一個程式還在使用這個字型檔案。請您在安裝結束之後關閉所有的應用程式，若有必要請重新安裝這個字型。"; -@@ -400,7 +400,7 @@ - Text [ french ] = "Impossible d'installer le fichier %1.\nUn autre programme ou le systme d'exploitation utilise probablement ce fichier." ; - Text [ dutch ] = "Het bestand %1 kon niet worden genstalleerd.\nEventueel wordt dit nog door een ander programma of door het besturingssysteem gebruikt." ; - Text[ chinese_simplified ] = "无法安装文件 %1 。\n可能是有一个程序或操作平台正在使用这个文件。"; -- Text[ russian ] = " %1.\n, ."; -+ Text[ russian ] = " %1.\n, ."; - Text[ polish ] = "Pliku %1 nie mona byo zainstalowa.\nPrawdopodobnie jest on uywany przez inny program lub przez inny system operacyjny."; - Text[ japanese ] = "ファイル %1 をインストールできませんでした。\nほかのプログラム、またはオペレーティングシステムでこのファイルがまだ使用されているのかもしれません。"; - Text[ chinese_traditional ] = "無法安裝檔案 %1 。\n可能是有一個程式或操作系統正在使用這個檔案。"; -@@ -457,7 +457,7 @@ - Text [ spanish ] = "\nEl programa ya est instalado en el directorio. " ; - Text [ english_us ] = "\nThe program is already installed in the directory " ; - Text[ chinese_simplified ] = "\n程序已经安装在目录内 "; -- Text[ russian ] = "\n "; -+ Text[ russian ] = "\n "; - Text[ polish ] = "\nProgram jest ju w katalogu "; - Text[ japanese ] = "\nプログラムはすでにディレクトリにあります。 "; - Text[ chinese_traditional ] = "\n程式已經安裝在目錄內 "; -@@ -510,7 +510,7 @@ - Text [ spanish ] = "\n\nContinuar la instalacin? " ; - Text [ english_us ] = "\n\nDo you want to continue the installation? " ; - Text[ chinese_simplified ] = "\n\n继续安装？ "; -- Text[ russian ] = "\n\n ? "; -+ Text[ russian ] = "\n\n ? "; - Text[ polish ] = "\n\nKontynuowa instalacj? "; - Text[ japanese ] = "\n\nインストールを続けますか。 "; - Text[ chinese_traditional ] = "\n\n繼續安裝？ "; -@@ -537,7 +537,7 @@ - Text [ spanish ] = "An est abierta una aplicacin instalada!\nSe cancelar la desinstalacin.\n\nAplicacin: " ; - Text [ english_us ] = "An installed application is still open!\nDeinstallation aborted.\n\nApplication: " ; - Text[ chinese_simplified ] = "一个已经安装好的程序组件还处于运行状态！\n现在中断执行撤除程序。\n\n程序: "; -- Text[ russian ] = " !\n .\n\n: "; -+ Text[ russian ] = " !\n .\n\n: "; - Text[ polish ] = "Zainstalowana aplikacja jest jeszcze otwarta!\nDeinstalacja zostanie przerwana.\n\nAplikacja: "; - Text[ japanese ] = "インストールしたアプリケーションは、まだ開いたままです。\nインストールの削除を中止します。\n\nアプリケーション: "; - Text[ chinese_traditional ] = "一個已經安裝好的程式還處於運行狀態！\n現在中斷移除程式。\n\n程式： "; -@@ -562,7 +562,7 @@ - Text [ portuguese ] = "Impossvel copiar o ficheiro %1.\nCdigo de erro: %2\nProvavelmente a disquete est danificada.\nA instalao ser cancelada." ; - Text [ portuguese_brazilian ] = "Die Datei %1 konnte nicht kopiert werden.\nFehlercode: %2\nWahrscheinlich ist die Diskette defekt.\nDie Installation wird abgebrochen." ; - Text[ chinese_simplified ] = "无法复制文件 %1 。\n错误码: %2\n可能是软盘已损坏了。 \n现在中断安装。"; -- Text[ russian ] = " %1 .\n : %2\n .\n ."; -+ Text[ russian ] = " %1 .\n : %2\n .\n ."; - Text[ polish ] = "Plik %1 nie mg zosta skopiowany.\nBdny kod: %2\nPrawdopodobnie nastpio uszkodzenie dyskietki.\nInstalacja przerwana."; - Text[ japanese ] = "ファイル %1 をコピーできませんでした。\nエラーコード: %2\nフロッピーディスクの不良かもしれません。\nインストールを中止します。"; - Text[ chinese_traditional ] = "無法複製檔案 %1 。\n錯誤碼：%2\n可能是磁片已損壞了。 \n現在中斷安裝。"; -@@ -588,7 +588,7 @@ - Text [ portuguese ] = "O programa de instalao encontrou uma verso instalada no diretrio %1. Desinstale primeiro esta verso antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm hat eine installierte Version im Verzeichnis %1 gefunden. Bitte erst diese Version deinstallieren, bevor Sie diese Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序发现在目录 %1 有一个程序版本。请您先撤除这个程序，然后再重新启动安装。"; -- Text[ russian ] = " %1. , , , ."; -+ Text[ russian ] = " %1. , , , ."; - Text[ polish ] = "Program instalacyjny znalaz zainstalowan wersj w katalogu %1. Prosz odinstalowa najpierw t wersj, zanim rozpoczniesz instalacj ponownie."; - Text[ japanese ] = "ディレクトリ %1 にインストールされたバージョンを、インストールプログラムが見つけました。セットアップを再開始するまえに、まずこのバージョンのインストールの削除をします。"; - Text[ chinese_traditional ] = "安裝程式發現在目錄 %1 有一個程式版本。請您先移除這個程式，然後再重新啟動安裝。"; -@@ -642,7 +642,7 @@ - Text [ portuguese ] = "O ficheiro %1, a ser instalado no foi encontrado.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Datei %1, die neu installiert werden soll, wurde nicht gefunden.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "没有找到新安装所需的文件 %1 。\n现在中断程序。"; -- Text[ russian ] = " %1, , .\n ."; -+ Text[ russian ] = " %1, , .\n ."; - Text[ polish ] = "Pliku %1, ktry mia zosta na nowo zainstalowany, nie znaleziono.\nProgram zostanie przerwany."; - Text[ japanese ] = "新しくインストールするファイル %1 が見つかりません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "沒有找到新安裝所需的檔案 %1 。\n現在中斷程序。"; -@@ -668,7 +668,7 @@ - Text [ portuguese ] = "A verso do ficheiro %1 no permite uma nova instalao.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Version der Datei %1 erlaubt keine Neuinstallation.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "这个文件 %1 的版本不允许重新安装。\n现在中断程序。"; -- Text[ russian ] = " %1 .\n ."; -+ Text[ russian ] = " %1 .\n ."; - Text[ polish ] = "Wersja pliku %1 nie zezwala na now instalacj.\nProgram zostanie zakoczony."; - Text[ japanese ] = "ファイル %1 のバージョンが新しいインストールを実行させません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "這個檔案 %1 的版本不允許重新安裝。\n現在中斷程式。"; -@@ -694,7 +694,7 @@ - Text [ portuguese ] = "A instalao da verso actualizada foi cancelada." ; - Text [ portuguese_brazilian ] = "Die Upgrade-Installation wurde abgebrochen." ; - Text[ chinese_simplified ] = "已经中断安装升级版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Instalacja aktualizacji zostaa przerwana."; - Text[ japanese ] = "更新インストールは中止されました。"; - Text[ chinese_traditional ] = "已經中斷安裝升級軟體。"; -@@ -722,7 +722,7 @@ - Text [ portuguese_brazilian ] = "Es sind noch eine oder mehrere %PRODUCTNAME-Applikationen gestartet.\nSchlie?en Sie diese Applikationen, bevor Sie erneut die Nach- oder Deinstallation starten." ; - Text [ portuguese ] = "Encontram-se ainda abertas uma ou mais aplicaes do %PRODUCTNAME.\nFeche essas aplicaes antes de iniciar novamente a reinstalao ou desinstalao." ; - Text[ chinese_simplified ] = "还有一些 %PRODUCTNAME 的程序组件处于运行状态。\n请在增加或撤除程序之前关闭所有运行的程序组件。"; -- Text[ russian ] = " %PRODUCTNAME.\n , ."; -+ Text[ russian ] = " %PRODUCTNAME.\n , ."; - Text[ polish ] = "Jedna lub kilka aplikacji %PRODUCTNAME s jeszcze otwarte.\nZamknij te aplikacje, zanim uruchomisz aktualizacj lub deinstalacj."; - Text[ japanese ] = "1つまたは複数の %PRODUCTNAME アプリケーションがまだ起動中です。\nインストールの追加または削除を開始するまえに、まずこれらのアプリケーションを閉じてください。"; - Text[ chinese_traditional ] = "還有一些 %PRODUCTNAME 的程式元件處於運行狀態。\n請在新增或移除程式之前關閉所有運行的程式元件。"; -@@ -750,7 +750,7 @@ - Text [ portuguese ] = "O programa de instalao no pode actualizar ficheiros comuns quando estes se encontram abertos.\nFeche por favor todas as aplicaes antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchlie?en Sie bitte alle ge?fneten Anwendungen, bevor Sie die Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序无法更新共享的文件，因为这些文件已经被占用。\n请您在重新启动安装之前关闭所有的应用程序。"; -- Text[ russian ] = " , , .\n, , "; -+ Text[ russian ] = " , , .\n, , "; - Text[ polish ] = "Program instalacyjny nie moe aktualizowa wsplnie uywanych danych, jeli s one aktualnie w uyciu.\nZamknij wszystkie otwarte aplikacje, zanim ponownie rozpoczniesz instalacj."; - Text[ japanese ] = "インストールプログラムは、共有使用のファイルを更新できません。\nインストールを再開始するまえに、開いているすべてのプログラムを閉じてください。"; - Text[ chinese_traditional ] = "安裝程序無法更新共享的檔案，因為這些檔案已經被佔用。\n請在重新啟動安裝之前關閉所有的應用程序。"; -@@ -778,7 +778,7 @@ - Text [ portuguese ] = "A instalao da verso de actualizao no possvel, porque no foi encontrada nenhuma verso instalada!" ; - Text [ portuguese_brazilian ] = "Es wurde keine installierte Version gefunden.\nEine Upgrade-Installation ist deshalb nicht m?lich!" ; - Text[ chinese_simplified ] = "没有找到已安装的版本。\n因此无法安装升级版本！"; -- Text[ russian ] = " .\n !"; -+ Text[ russian ] = " .\n !"; - Text[ polish ] = "Nie znaleziono zainstalowanej wersji.\nInstalacja aktualizacji jest z tego powodu niemoliwa!"; - Text[ japanese ] = "インストールしたバージョンが見つかりません。\n更新インストールは不可能です。"; - Text[ chinese_traditional ] = "沒有找到已安裝的版本。\n因此無法安裝升級軟體！"; -@@ -961,7 +961,7 @@ - Text = "%PRODUCTNAME %PRODUCTVERSION lsst sich nur im Responsefilemodus installieren.\nLesen Sie hierfr bitte den Installation Guide."; - Text [ english_us ] = "%PRODUCTNAME %PRODUCTVERSION can only be installed in the Response File mode.\nRefer to the Installation Guide for more information." ; - Text[ portuguese ] = " apenas possvel instalar o %PRODUCTNAME %PRODUCTVERSION no modo Response File.\nQueira consultar o manual de instalao para informaes mais detalhadas."; -- Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; -+ Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION Responsefile.\n "; - Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan alleen in responsefile-modus worden genstalleerd.\nMeer informatie hierover vindt u in de installatiehandleiding."; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION ne peut tre install qu'en mode Response File.\nConsultez le guide d'installation ce sujet."; -diff -ur ../setup2/source/ui/pages/maindlg.src ../setup2/source/ui/pages/maindlg.src ---- ../setup2/source/ui/pages/maindlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/pages/maindlg.src Fri Apr 5 18:24:54 2002 -@@ -88,7 +88,7 @@ - Text = "Bitte geben Sie ein gltiges Installationsverzeichnis an." ; - Text [ english_us ] = "Please specify a valid directory name for the installation." ; - Text[ portuguese ] = "Indique um directrio de instalao vlido."; -- Text[ russian ] = ", , ."; -+ Text[ russian ] = ", , ."; - Text[ dutch ] = "Geef een geldige installatiedirectory aan."; - Text[ french ] = "Veuillez indiquer un rpertoire d'installation valide."; - Text[ spanish ] = "Indique por favor un directorio de instalacin vlido."; -@@ -125,7 +125,7 @@ - Text [ portuguese ] = "Tem a certeza que deseja fazer a instalao no directrio-raz?" ; - Text [ portuguese_brazilian ] = "Sind Sie sicher, da? Sie in das Wurzelverzeichnis installieren wollen?" ; - Text[ chinese_simplified ] = "您真的要将程序安装在根目录内？"; -- Text[ russian ] = " , ?"; -+ Text[ russian ] = " , ?"; - Text[ polish ] = "Czy na pewno zainstalowa w katalogu root?"; - Text[ japanese ] = "ルートディレクトリにインストールしてもかまいませんか。"; - Text[ chinese_traditional ] = "真要將程式安裝在根目錄內﹖"; -@@ -228,7 +228,7 @@ - Text = "Sie haben einen Installationspfad angegeben, in dem sich bereits Komponenten einer %PRODUCTNAME-Installation befinden. Bitte geben Sie ein anderes Verzeichnis an." ; - Text [ english_us ] = "You have entered an installation path which already contains %PRODUCTNAME components. Please enter a different directory." ; - Text[ portuguese ] = "Indicou um atalho de instalao onde j existem componentes de uma anterior instalao do %PRODUCTNAME. Indique outro directrio."; -- Text[ russian ] = " , %PRODUCTNAME. , , ."; -+ Text[ russian ] = " , %PRODUCTNAME. , , ."; - Text[ greek ] = " %PRODUCTNAME. "; - Text[ dutch ] = "U heeft een installatiepad aangegeven waarin zich reeds componenten van een %PRODUCTNAME-installatie bevinden. Geef een nadere directory aan."; - Text[ french ] = "Le rpertoire slectionn pour l'installation contient dors et dj certains composants d'une installation antrieure de %PRODUCTNAME. Veuillez indiquer un autre chemin."; -diff -ur ../setup2/source/ui/pages/pasexist.src ../setup2/source/ui/pages/pasexist.src ---- ../setup2/source/ui/pages/pasexist.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasexist.src Fri Apr 5 18:25:23 2002 -@@ -143,7 +143,7 @@ - Text [ french ] = "a t dtecte une installation de serveur %1 antrieure." ; - Text [ dutch ] = "werd een oude %1 serverinstallatie gevonden." ; - Text[ chinese_simplified ] = "找到一个旧的 %1 服务器版本。"; -- Text[ russian ] = " %1."; -+ Text[ russian ] = " %1."; - Text[ polish ] = "znaleziono star instalacj serwera %1"; - Text[ japanese ] = "旧 %1 サーバーインストールが見つかりました。"; - Text[ chinese_traditional ] = "找到一個舊的 %1 伺服器版本。"; -@@ -171,7 +171,7 @@ - Text [ french ] = "Vous avez la possibilit de rutiliser les configurations d'utilisateurs de l'installation de serveur antrieure." ; - Text [ dutch ] = "U heeft de mogelijkheid de gebruikersconfiguraties uit deze oude serverinstallatie over te nemen." ; - Text[ chinese_simplified ] = "您能采用这个旧的服务器版本的使用者配置文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Masz moliwo przej konfiguracj uytkownika ze starej instalacji serwera."; - Text[ japanese ] = "この旧サーバーインストールからユーザー設定を適用することができます｡"; - Text[ chinese_traditional ] = "您能夠採用這個舊的伺服器版本的使用者配置檔案。"; -diff -ur ../setup2/source/ui/pages/pasreins.src ../setup2/source/ui/pages/pasreins.src ---- ../setup2/source/ui/pages/pasreins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasreins.src Fri Apr 5 18:26:54 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installationsprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -99,7 +99,7 @@ - Text = "Der %1 ist bereits auf Ihrem Computer installiert. Sie knnen jetzt die Installation lschen." ; - Text [ english_us ] = "The %1 Server is already installed on your computer. You can now delete the installation." ; - Text[ portuguese ] = "O %1 j est instalado no seu computador. J possvel eliminar a instalao."; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ dutch ] = "%1 is reeds genstalleerd op uw computer. U kunt nu de installatie wissen."; - Text[ french ] = "%1 est dj install sur votre ordinateur. Vous pouvez prsent supprimer cette installation."; - Text[ spanish ] = "El %1 ya est instalado en su ordenador. Ahora puede eliminar la instalacin."; -@@ -162,7 +162,7 @@ - Text [ dutch ] = "Voegt n of meer gebruikers toe aan uw serverinstallatie of verwijdert deze." ; - Text [ portuguese ] = "Adiciona ou remove um ou mais utilizadores na instalao do servidor existente." ; - Text[ chinese_simplified ] = "增加或者删除一个或多个使用者的服务器安装版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje jednego lub wicej uytkownikw do instalacji serwera lub ich usuwa."; - Text[ japanese ] = "現在のサーバーインストールに、1人または複数のユーザーを追加または削除。"; - Text[ chinese_traditional ] = "新增或者移除一個或多個使用者伺服器安裝版本。"; -@@ -192,7 +192,7 @@ - Text [ spanish ] = "Modificacin" ; - Text [ english_us ] = "Modify installation" ; - Text[ chinese_simplified ] = "修改安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Modyfikacja instalacji"; - Text[ japanese ] = "インストールの変更"; - Text[ chinese_traditional ] = "修改安裝"; -@@ -219,7 +219,7 @@ - Text [ french ] = "Ajoute des composants ou modules une version dj installe ou les supprime." ; - Text [ dutch ] = "Voegt verdere componenten of modules toe aan de reeds genstalleerde versie of verwijdert deze." ; - Text[ chinese_simplified ] = "为已经安装的版本增加或者删除其他的程序组件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje do wczeniej zainstalowanej wersji dodatkowe komponenty lub moduy lub je usuwa."; - Text[ japanese ] = "すでにインストールしたバージョンに、それ以外のコンポーネントまたはモジュールを追加または削除。"; - Text[ chinese_traditional ] = "為已經安裝的版本新增或者移除其它的程式元件。"; -@@ -249,7 +249,7 @@ - Text [ spanish ] = "Desinstalacin" ; - Text [ english_us ] = "Deinstall" ; - Text[ chinese_simplified ] = "撤除安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Deinstalacja"; - Text[ japanese ] = "インストールの削除"; - Text[ chinese_traditional ] = "移除安裝"; -@@ -279,7 +279,7 @@ - Text [ spanish ] = "Elimina la instalacin actual de su disco duro." ; - Text [ english_us ] = "Deletes the existing version from your hard disk" ; - Text[ chinese_simplified ] = "从您的计算机上删除已经安装的程序版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usuwa zainstalowan wersj z dysku twardego."; - Text[ japanese ] = "既存のバージョンをユーザーのハードディスクから削除します。"; - Text[ chinese_traditional ] = "從您的電腦上刪除已經安裝的程式版本。"; -diff -ur ../setup2/source/ui/pages/pasremem.src ../setup2/source/ui/pages/pasremem.src ---- ../setup2/source/ui/pages/pasremem.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasremem.src Fri Apr 5 18:27:07 2002 -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u op een later tijdstip nog eens handmatig een aangepaste installatie wilt uitvoeren. dan moet u ook het pad naar de basisdirectory van de gebruikers in het configuratiebestand SODAEMON aanpassen.\n" ; - Text [ portuguese ] = "Se preferir instalar os diferentes utilizadores manualmente, ter que adaptar tambm o atalho ao directrio- raz no ficheiro de configurao SODAEMON.\n" ; - Text[ chinese_simplified ] = "如果以后要执行单个使用者安装，您必须在 SODAEMON 的配置文件内修改用户的根目录路径。\n"; -- Text[ russian ] = " , SODAEMON.\n"; -+ Text[ russian ] = " , SODAEMON.\n"; - Text[ polish ] = "Aby przeprowadzi pniej instalacje indywidualne rcznie, naley dostosowa ciek do rdowego katalogu root uytkownikw w pliku konfiguracyjnym SODAEMON.\n"; - Text[ japanese ] = "あとから各自ユーザーインストールを手動で実行するときに、SODAEMON 設定ファイルのユーザーのルートディレクトリ上のパスに適合させる必要があります。\n"; - Text[ chinese_traditional ] = "果以後要執行單個使用者安裝版本﹐您必須在SODAEMON 的配置檔案內修改使用者的根目錄路徑。\n"; -diff -ur ../setup2/source/ui/pages/passtart.src ../setup2/source/ui/pages/passtart.src ---- ../setup2/source/ui/pages/passtart.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/passtart.src Fri Apr 5 18:27:19 2002 -@@ -107,7 +107,7 @@ - Text [ french ] = "Vous pouvez prsent dfinir les paramtres pour les divers utilisateurs du serveur. Le programme Setup prpare alors une installation rseau spcifique de %PRODUCTNAME dans chacun des rpertoires d'utilisateur.\n" ; - Text [ dutch ] = "U heeft nu de mogelijkheid de gebruikers voor de server in te richten. Het setup-programma voert dan voor iedere gebruiker een specifieke netinstallatie van %PRODUCTNAME in zijn gebruikersdirectory uit.\n" ; - Text[ chinese_simplified ] = "您现在能够为服务器设立各个使用者。安装程序为每个使用者的各自目录内安装一个 %PRODUCTNAME 的网络版本。\n"; -- Text[ russian ] = " . %PRODUCTNAME.\n"; -+ Text[ russian ] = " . %PRODUCTNAME.\n"; - Text[ polish ] = "Istnieje teraz moliwo konfiguracji poszczeglnych uytkownikw serwera. Program instalacyjny przeprowadzi dla kadego uytkownika specyficzn instalacj sieciow %PRODUCTNAME w odpowiednim katalogu danego uytkownika.\n"; - Text[ japanese ] = "いますぐ、個々のユーザーをサーバーに設定することが可能です。セットアッププログラムが、各ユーザーに %PRODUCTNAME から指定されたネットワークインストールをそれぞれのユーザーディレクトリにインストールします。\n"; - Text[ chinese_traditional ] = "您現在能夠為伺服器配置各個使用者。安裝程式為每個使用者在各自的使用者目錄內安裝一個%PRODUCTNAME的網路版本。\n"; -diff -ur ../setup2/source/ui/pages/pasuinst.src ../setup2/source/ui/pages/pasuinst.src ---- ../setup2/source/ui/pages/pasuinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuinst.src Fri Apr 5 18:28:09 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 インストールの削除"; - Text[ chinese_traditional ] = "移除%1"; -@@ -120,7 +120,7 @@ - Text [ french ] = "Si vous tes sr de vouloir supprimer l'installation existante du serveur dans le rpertoire '%1', cliquez sur '%2'." ; - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande serverinstallatie uit de map '%1' wilt verwijderen, drukt u dan op '%2'." ; - Text[ chinese_simplified ] = "如果您真的要删除目录 '%1' 内当前服务器的安装版本，那么请按击 '%2' 。"; -- Text[ russian ] = " '%1', '%2'."; -+ Text[ russian ] = " '%1', '%2'."; - Text[ polish ] = "Jeeli zainstalowany w katalogu '%1' serwer ma zosta na pewno usunity, naley klikn '%2'."; - Text[ japanese ] = "ディレクトリ「%1」にあるサーバーインストールを削除するときは、「%2」をクリックします。"; - Text[ chinese_traditional ] = "如果真要刪除目錄<%1>內目前的伺服器版本﹐就按一下<%2>。"; -@@ -148,7 +148,7 @@ - Text [ french ] = "Vous avez galement la possibilit de dsinstaller toutes les installations d'utilisateur prsentes sur ce serveur." ; - Text [ dutch ] = "Bovendien heeft u de mogelijkheid alle met de server ingerichte gebruikersinstallaties te denstalleren." ; - Text[ chinese_simplified ] = "另外，您还能够移除所有通过服务器建立的使用者。"; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ polish ] = "Dodatkowo mona zdeinstalowa wszystkie skonfigurowane za pomoc serwera instalacje indywidualne."; - Text[ japanese ] = "そのほかに、サーバーでインストールしたユーザーインストールのすべても削除できます。"; - Text[ chinese_traditional ] = "另外您還能夠移除所有透過伺服器配置的使用者。"; -@@ -175,7 +175,7 @@ - Text [ dutch ] = "Gebruikersinstallaties verwijderen" ; - Text [ portuguese ] = "Remover instalao personalizada." ; - Text[ chinese_simplified ] = "撤除使用者的安装。"; -- Text[ russian ] = " () ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usu instalacj indywidualn."; - Text[ japanese ] = "ユーザーインストールの削除。"; - Text[ chinese_traditional ] = "移除使用者的安裝。"; -diff -ur ../setup2/source/ui/pages/pasuname.src ../setup2/source/ui/pages/pasuname.src ---- ../setup2/source/ui/pages/pasuname.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuname.src Fri Apr 5 18:28:27 2002 -@@ -135,7 +135,7 @@ - Text [ french ] = "En tant qu'administrateur du systme, vous avez la possibilit de faire insrer automatiquement le propritaire des rpertoires de chaque installation d'utilisateur.." ; - Text [ dutch ] = "Als systeembeheerder kunt u voor de mappen van de aangepaste installaties automatisch de juiste eigenaar definiren." ; - Text[ chinese_simplified ] = "作为系统管理员您能够自动地为使用者目录设定正确的拥有者。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Jako administrator systemu masz moliwo automatycznego okrelenia uytkownikw katalogw pojedynczych instalacji indywidualnych."; - Text[ japanese ] = "システム管理者として、それぞれユーザー定義されたインストール項目に正しい所有者を自動設定できます。"; - Text[ chinese_traditional ] = "作為系統管理員您能夠自動地為使用者目錄設定正確的擁有者。"; -diff -ur ../setup2/source/ui/pages/pasupath.src ../setup2/source/ui/pages/pasupath.src ---- ../setup2/source/ui/pages/pasupath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasupath.src Fri Apr 5 18:29:23 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Veuillez dfinir le rpertoire racine dans lequel les installations des diffrents utilisateurs seront cres." ; - Text [ dutch ] = "Bepaalt u de basisdirectory waarin de gebruikersinstallaties moeten worden aangelegd." ; - Text[ chinese_simplified ] = "请您确定设立使用所需的根目录。"; -- Text[ russian ] = ", , , ."; -+ Text[ russian ] = ", , , ."; - Text[ polish ] = "Zdefiniuj katalog gwny, w ktrym zostan utworzone pojedyncze instalacje indywidualne."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定してください。"; - Text[ chinese_traditional ] = "請您確定設立使用者所需的根目錄。"; -@@ -137,7 +137,7 @@ - Text [ dutch ] = "Bepaal de basismap waarin de aangepaste installaties moeten worden ondergebracht of kopieer deze in de home-directory's van de in het systeem geregistreerde gebruikers." ; - Text [ portuguese ] = "Especifique o directrio-raz em que deseja criar a instalao de utilizador individual; poder tambm copiar a instalao para o directrio inicial de um utilizador definido na administrao do sistema." ; - Text[ chinese_simplified ] = "请您确定设立用户所需的根目录，或者请您复制使用名到这个管理系统的Home目录内。"; -- Text[ russian ] = ", , , , ."; -+ Text[ russian ] = ", , , , ."; - Text[ polish ] = "Zdefiniuj katalog rdowy, w ktrym zostan utworzone pojedyncze instalacje indywidualne lub przekopiuj instalacj do katalogu macierzystego uytkownikw zarzdzanych przez ten system."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定するか、あるいはインストールをシステム上の管理ユーザーのホームディレクトリにコピーするかを定義してください。"; - Text[ chinese_traditional ] = "請您確定配置使用者所需的根目錄﹐或請您將使用者名稱複製到這個管理系統的Home目錄內。"; -@@ -275,7 +275,7 @@ - #if !defined(UNX) - Pos = MAP_APPFONT ( 0 , 80 ) ; - Size = MAP_APPFONT ( 205 , 30 ) ; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodatkowo mona poda ostatni komponent cieki instalacji indywidualnej."; - Text[ japanese ] = "そのほか、ユーザーインストールのパスコンポーネントも指定できます。"; - #else -@@ -397,7 +397,7 @@ - Text [ french ] = "Vous ne disposez pas de droits d'criture dans le rpertoire principal\n'%1'\nde l'utilisateur\n%2\n. Veuillez vous procurer les droits correspondants ou slectionner votre rpertoire racine pour les installations d'utilisateurs !" ; - Text [ dutch ] = "U heeft in de home-directory\n'%1'\nvan gebruiker\n%2\ngeen schrijfrechten.\nVerandert u dit of selecteer uw eigen basisdirectory voor de aangepaste installatie." ; - Text[ chinese_simplified ] = "您无权改写使用者\n%2\n的Home目录\n'%1'\n上的文件。\n请修改目录的文件读取权利或选择一个自己的根目录来安装程序！"; -- Text[ russian ] = " \n'%1'\n\n%2\n ."; -+ Text[ russian ] = " \n'%1'\n\n%2\n ."; - Text[ polish ] = "Brak praw zapisu\nw katalogu macierzystym\n'%'\\uytkownika\n%2.\nNaley naby prawa lub okreli wasny katalog podstawowy na instalacj indywidualn!"; - Text[ japanese ] = "ユーザーのホームディレクトリ\n%2\nに、\n「%1」\nの書き込み権がありません。\n変更するか、ユーザーインストールのルートディレクトリを選択してください。"; - Text[ chinese_traditional ] = "您無權覆寫使用者\n%2\n的Home目錄\n<%1>\n上的檔案。\n請修改目錄的檔案覆寫權利或者選擇一個自己的根目錄來安裝程式！"; -diff -ur ../setup2/source/ui/pages/pcfgserver.src ../setup2/source/ui/pages/pcfgserver.src ---- ../setup2/source/ui/pages/pcfgserver.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcfgserver.src Fri Apr 5 18:29:32 2002 -@@ -100,7 +100,7 @@ - Text = "Die %1 Installation enthlt Konfigurationen die auf einen Konfigurationsserver geschrieben werden mssen.\n \nBitte geben Sie den Servernamen und Port Ihres Konfigurationsservers an."; - Text [ english_us ] = "The %1 installation contains configuration information that has to be written on a configuration server.\n \nPlease enter the name and port of the configuration server."; - Text[ portuguese ] = "A instalao %1 contm configuraes que devem ser escritas num servidor de configurao.\n \nIndique o nome e a porta do seu servidor de configurao."; -- Text[ russian ] = " %1 , .\n \n, , ."; -+ Text[ russian ] = " %1 , .\n \n, , ."; - Text[ greek ] = " %1 .\n \n ? "; - Text[ dutch ] = "De %1 installatie bevat configuraties die op een configuratieserver moeten worden geschreven.\n \nGeef de servernaam en de poort van deze configuratieserver aan."; - Text[ french ] = "L'installation %1 contient des configurations qui doivent tre crites sur un serveur de configuration.\n \nIndiquez le nom du serveur et le port du serveur de configuration."; -diff -ur ../setup2/source/ui/pages/pcrc.src ../setup2/source/ui/pages/pcrc.src ---- ../setup2/source/ui/pages/pcrc.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcrc.src Fri Apr 5 18:29:56 2002 -@@ -106,7 +106,7 @@ - Text [ dutch ] = "Het installatieprogramma in" ; - Text [ portuguese ] = "Os ficheiros de instalao em" ; - Text[ chinese_simplified ] = "程序安装文件在"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Pliki instalacyjne w"; - Text[ japanese ] = "インストールファイルの"; - Text[ chinese_traditional ] = "程式安裝檔案在"; -diff -ur ../setup2/source/ui/pages/phavefun.src ../setup2/source/ui/pages/phavefun.src ---- ../setup2/source/ui/pages/phavefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/phavefun.src Fri Apr 5 18:32:17 2002 -@@ -97,7 +97,7 @@ - Text = "Installation" ; - Text [ english_us ] = "Installation" ; - Text[ portuguese ] = "Instalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installatie"; - Text[ french ] = "Installation"; -@@ -147,7 +147,7 @@ - Text = "Deinstallation" ; - Text [ english_us ] = "Deinstallation" ; - Text[ portuguese ] = "Desinstalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = " "; - Text[ dutch ] = "Denstallatie"; - Text[ french ] = "Dsinstallation"; -@@ -311,7 +311,7 @@ - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; - Text[ chinese_simplified ] = "衷心祝贺！程序安装已经顺利完成。Sun Microsystems 祝您使用 %1 得心应手！"; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でのさらに充実したお仕事を Sun Microsystems は心から願っております。"; - Text[ chinese_traditional ] = "已經順利完成安裝程式。\nSun Microsystems 祝您使用 %1 得心應手！"; -@@ -339,7 +339,7 @@ - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido." ; - Text[ chinese_simplified ] = "已经安装或删除您选择的模块和组件。"; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay zainstalowane / zdeinstalowane."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; - Text[ chinese_traditional ] = "已經安裝或移除選擇的模塊和程式元件。"; -@@ -368,7 +368,7 @@ - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Text[ chinese_simplified ] = "修复安装程序已经完成。\n"; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; - Text[ chinese_traditional ] = "修復程式已經完成。\n"; -@@ -396,7 +396,7 @@ - TEXT[ dutch ] = "De denstallatie ist beindigd."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente."; - TEXT[ chinese_simplified ] = "撤除程序已经顺利完成。"; -- TEXT[ russian ] = " ." ; -+ TEXT[ russian ] = " ." ; - TEXT[ polish ] = "Deinstalacja zostaa zakoczona." ; - TEXT[ japanese ] = "インストールの削除は、正常に終了しました。" ; - TEXT[ chinese_traditional ] = "現在已經完成移除程式。"; -@@ -446,7 +446,7 @@ - Text = "Bitte beachten Sie, dass das Installationsprogramm nicht alle Dateien gelscht hat. %1 Konfigurationsdateien und von Ihnen erstellte Dokumente wurden nicht gelscht. Sofern Sie diese nicht weiter bentigen, knnen Sie das %1-Verzeichnis manuell lschen."; - Text [ english_us ] = "Please note that the installation program has not deleted all files. %1 configuration files and your own documents were not deleted. If you no longer need these files, you can manually delete the %1 directory."; - Text[ portuguese ] = "No esquea que o programa de instalao no eliminou todos os ficheiros. Os ficheiros de configurao %1 e os documentos criados por si no foram eliminados. Se no os necessitar, poder eliminar o directrio %1 manualmente."; -- Text[ russian ] = ", . %1 , . , %1 ."; -+ Text[ russian ] = ", . %1 , . , %1 ."; - Text[ greek ] = " . %1 . , %1 ."; - Text[ dutch ] = "Wij maken u erop attent dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - Text[ french ] = "Le programme d'installation n'a pas supprim tous les fichiers : c'est le cas des fichiers de configuration %1 et des documents que vous avez crs. Si vous n'en avez plus l'utilit, vous pouvez supprimer manuellement le rpertoire %1."; -@@ -512,7 +512,7 @@ - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; - Text[ chinese_simplified ] = "请点击\"%1\"，结束安装程序。"; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; - Text[ chinese_traditional ] = "請按一下<%1>，結束安裝程式。"; -@@ -541,7 +541,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; - Text[ chinese_simplified ] = "在安装过程中，系统文件被更改。为了让更改内容整合到%1的使用界面上，您必须重新启动操作系统。"; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、システムファイルに変更がありました。それをアクティブにし、%1 のインターフェイスを統一するために､システムを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝過程中，系統檔案已經變更。為了能夠正常使用 %1 的桌面整合設定﹐現在必須重新啟動系統。"; -@@ -568,7 +568,7 @@ - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; - Text[ chinese_simplified ] = "如果您要重新启动计算机，请按击\"%1\"。如果您要结束安装程序，则按击\"%2\"。"; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "今すぐ再起動するためには、[%1] をクリックしてください。[%2] をクリックすると、セットアッププログラムを終了します。"; - Text[ chinese_traditional ] = "要重新啟動電腦﹐請按一下<%1>。如果要結束安裝程式﹐就按一下<%2>。"; -@@ -589,7 +589,7 @@ - Text = "Whrend der Installation wurden nderungen an den Systemdateien vorgenommen. Damit diese aktiv werden und eine Oberflchenintegration von %1 gewhrleistet ist, mssen sie sich erneut an Ihrem System anmelden." ; - Text [ english_us ] = "System files have been modified during the installation. You must restart your system to activate these modifications and to ensure that %1 are integrated into the interface." ; - Text[ portuguese ] = "Durante a instalao foram efectuadas modificaes nos ficheiros do sistema. Para poder activar e garantir a integrao do %1 na interface, dever reiniciar o seu sistema."; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart."; - Text[ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur."; -@@ -616,7 +616,7 @@ - Text = "Um sich jetzt erneut an ihrem System anzumelden klicken Sie auf '%1'. Klicken Sie dagegen auf '%2', wird das Installationsprogramm beendet." ; - Text [ english_us ] = "To login to your system again click on '%1'. If you click on '%2' the installation program will be ended." ; - Text[ portuguese ] = "Para entrar novamente no sistema, clique em '%1'. Para cancelar o programa de instalao, clique em '%2'."; -- Text[ russian ] = " , , '%1'. '%2', ."; -+ Text[ russian ] = " , , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ dutch ] = "Om u nu opnieuw aan te melden bij uw systeem klikt u op '%1'. Klikt u echter op '%2', dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour redmarrer tout de suite votre ordinateur ou sur '%2' pour quitter le programme d'installation."; -diff -ur ../setup2/source/ui/pages/pimode.src ../setup2/source/ui/pages/pimode.src ---- ../setup2/source/ui/pages/pimode.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pimode.src Fri Apr 5 18:39:45 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Slection du type d'installation" ; - Text [ dutch ] = "Installatietype selecteren" ; - Text[ chinese_simplified ] = "选择安装方式"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz typ instalacji"; - Text[ japanese ] = "インストールの種類を選択"; - Text[ chinese_traditional ] = "選擇安裝方式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Elija el tipo de instalacin." ; - Text [ english_us ] = "Choose the type of installation." ; - Text[ chinese_simplified ] = "请您选择安装的方式。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz rodzaj instalacji."; - Text[ japanese ] = "インストールの種類を選択してください。"; - Text[ chinese_traditional ] = "請選擇安裝的方式。"; -@@ -143,7 +143,7 @@ - Text [ spanish ] = "Instalacin predeterminada" ; - Text [ english_us ] = "Standard Installation" ; - Text[ chinese_simplified ] = "标准安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja standardowa"; - Text[ japanese ] = "標準インストール"; - Text[ chinese_traditional ] = "標準安裝"; -@@ -170,7 +170,7 @@ - Text [ french ] = "Installe les composants %s de faon optimale. Cette installation ncessite %1 Mo d'espace mmoire." ; - Text [ dutch ] = "De %s componenten worden compleet genstalleerd. Benodigd geheugen: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "最优化安装 %s 程序组件。这种安装方式需要 %1 兆字节的可用空间。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje dane komponenty pakietu %s. Instalacja ta wymaga %1 MB wolnej pamici, tymczasowo %2 MB."; - Text[ japanese ] = "%s コンポーネントを最適にインストールします。このインストールには %1 MB のディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "最合適地安裝 %s 程式元件。這個方式需要 %1 MB的可用空間。"; -@@ -200,7 +200,7 @@ - Text [ spanish ] = "Instalacin personalizada" ; - Text [ english_us ] = "Custom Installation" ; - Text[ chinese_simplified ] = "使用者自定安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja niestandardowa"; - Text[ japanese ] = "ユーザー操作のインストール"; - Text[ chinese_traditional ] = "自訂安裝"; -@@ -227,7 +227,7 @@ - Text [ french ] = "Permet la slection des composants de %s installer." ; - Text [ dutch ] = "Selectie van de te installeren %s componenten is mogelijk." ; - Text[ chinese_simplified ] = "能够选择安装 %s 程序组件。"; -- Text[ russian ] = " %s."; -+ Text[ russian ] = " %s."; - Text[ polish ] = "Umoliwia wybr komponentw pakietu %s, ktre zostan zainstalowane."; - Text[ japanese ] = "インストールする %s コンポーネントの選択ができます。"; - Text[ chinese_traditional ] = "可選擇安裝 %s 程式元件。"; -@@ -257,7 +257,7 @@ - Text [ spanish ] = "Instalacin mnima" ; - Text [ english_us ] = "Minimum Installation" ; - Text[ chinese_simplified ] = "基本安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja minimalna"; - Text[ japanese ] = "最小インストール"; - Text[ chinese_traditional ] = "基本安裝"; -@@ -284,7 +284,7 @@ - Text [ french ] = "Installe uniquement les composants absolument ncessaires l'excution du programme. Cette installation requiert seulement 1% Mo d'espace mmoire." ; - Text [ dutch ] = "Installatie van de voor de uitvoering van het programma minimaal noodzakelijke componenten. Benodigde vrije ruimte: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "只安装运行程序所需的基本组件。这个安装只需要 %1 兆字节。"; -- Text[ russian ] = " , . %1 \n ( %2 )."; -+ Text[ russian ] = " , . %1 \n ( %2 )."; - Text[ polish ] = "Instaluje komponenty niezbdne do uruchomienia programu. Instalacja ta wymaga tylko %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "プログラムの実行に必要最小限のコンポーネントをインストールします。このインストールでは %1 MB ディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "只安裝執行程式所需的基本元件。這個安裝只需要 %1 MB 。"; -@@ -306,7 +306,7 @@ - Text = "Workstation Installation" ; - Text [ english_us ] = "Workstation Installation" ; - Text[ portuguese ] = "Instalao estao de trabalho"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatie werkstation"; - Text[ french ] = "Installation de station de travail"; -@@ -343,7 +343,7 @@ - Text [ french ] = "L'installation est ralise de faon ce que les programmes soient lancs directement partir du rseau. Une mmoire de %1 Mo seulement est requise par les fichiers locaux." ; - Text [ dutch ] = "De installatie wordt zo uitgevoerd, dat de programma's direct van het net worden opgestart. Voor lokale bestanden worden %1 MB benodigd.." ; - Text[ chinese_simplified ] = "采用网络安装方式。安装本机文件需要可用空间 %1 兆字节。"; -- Text[ russian ] = " , . %1 ."; -+ Text[ russian ] = " , . %1 ."; - Text[ polish ] = "Instalacja zostanie tak przeprowadzona, e programy bd uruchamiane bezporednio z sieci. Dla plikw lokalnych wymagany jest %1 MB."; - Text[ japanese ] = "プログラムが直接ネットワークで起動するように、インストールを実行します。ローカルファイルには %1 MBが必要です。"; - Text[ chinese_traditional ] = "採用網路安裝方式。安裝本機檔案需要可用空間 %1 MB。"; -@@ -360,7 +360,7 @@ - Text = "Installation lokal" ; - Text [ english_us ] = "Local Installation" ; - Text[ portuguese ] = "Instalao local"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ()"; - Text[ dutch ] = "Lokale installatie"; - Text[ french ] = "Installation locale"; -@@ -394,7 +394,7 @@ - Text [ french ] = "Installe tous les composants de %s en local sur la station de travail. Cette installation ncessite %1 Mo de mmoire et %2 Mo de mmoire temporaire." ; - Text [ dutch ] = "Installeert alle %s componenten lokaal op het werkstation. Voor deze installatie wordt een vrije ruimte van %1 MB benodigd, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "安装所有的 %s 组件到本机工作站上。这个安装需要可用空间 %1 兆字节，暂时可用空间 %2 兆字节。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje wszystkie %s komponenty lokalnie na stacji roboczej. Instalacja ta wymaga %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "すべての %s コンポーネントをワークステーション上のローカルにインストールします。このインストールには %1 MB ディスク空き容量（一時的に %2 MB）が必要です。"; - Text[ chinese_traditional ] = "安裝所有的 %s 程式元件到本機工作站上。這個安裝需要可用空間 %1 MB，暫時可用空間 %2 MB。"; -diff -ur ../setup2/source/ui/pages/pipath.src ../setup2/source/ui/pages/pipath.src ---- ../setup2/source/ui/pages/pipath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pipath.src Fri Apr 5 18:40:34 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Slection du rpertoire d'installation" ; - Text [ dutch ] = "Installatiedirectory selecteren" ; - Text[ chinese_simplified ] = "选择安装目录"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz katalog instalacyjny"; - Text[ japanese ] = "インストールディレクトリの選択"; - Text[ chinese_traditional ] = "選擇安裝目錄"; -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Geef de directory aan waarin de componenten van %1 genstalleerd moeten worden. Typ een nieuwe naam voor een directory, of selecteer met '%2' een passende directory." ; - Text [ portuguese ] = "Especifique o directrio no qual deseja instalar os componentes do %1. Indique um novo nome para o directrio ou seleccione um directrio apropriado com o boto '%2' ." ; - Text[ chinese_simplified ] = "请指定安装 %PRODUCTNAME 程序组件的目录。您可以直接输入一个新目录，也可以通过点击 %2 选择一个合适的安装目录。"; -- Text[ russian ] = ", , , %1. '%2' ."; -+ Text[ russian ] = ", , , %1. '%2' ."; - Text[ polish ] = "Tutaj naley poda katalog, w ktrym zostan zainstalowane komponenty pakietu %1. Naley poda now nazw katalogu lub klikn przycisk '%2', aby wybra odpowiedni katalog."; - Text[ japanese ] = "%PRODUCTNAME のコンポーネントをインストールするディレクトリを入力してください。新しいディレクトリ名を入力するか［%2］で適切なディレクトリを選択します。"; - Text[ chinese_traditional ] = "請確定安裝 %PRODUCTNAME 元件的目錄。您能夠直接輸入一個新目錄名稱﹐或按一下<%2>，選擇一個合適的目錄。"; -@@ -127,7 +127,7 @@ - Text = "Bitte geben Sie das Verzeichnis ein, in dem die Komponenten von %PRODUCTNAME installiert werden sollen." ; - Text [ english_us ] = "Specify the directory in which the %PRODUCTNAME components are to be installed." ; - Text[ portuguese ] = "Indique o directrio para a instalao dos componentes do %1."; -- Text[ russian ] = ", , , %1."; -+ Text[ russian ] = ", , , %1."; - Text[ greek ] = " %1."; - Text[ dutch ] = "Geef de directory aan waarin de componenten van %1 moeten worden genstalleerd."; - Text[ french ] = "Spcifiez le rpertoire dans lequel installer les composants de %PRODUCTNAME."; -@@ -267,7 +267,7 @@ - Text = "Installationsverzeichnis" ; - Text [ english_us ] = "Installation directory" ; - Text[ portuguese ] = "Directrio de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatiedirectory"; - Text[ french ] = "Rpertoire d'installation"; -diff -ur ../setup2/source/ui/pages/plang.src ../setup2/source/ui/pages/plang.src ---- ../setup2/source/ui/pages/plang.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plang.src Fri Apr 5 18:41:08 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen %PRODUCTNAME in einer der folgenden Sprachen auf ihrem System installieren. Bitte whlen Sie die Sprache aus, die Sie nutzen wollen." ; - Text[english_us] = "You can install %PRODUCTNAME on your system in one of the following languages. Please select the language you would like to use." ; - Text[ portuguese ] = "Poder instalar o %1 em vrias lnguas no seu sistema. Seleccione uma ou as vrias lnguas que deseje utilizar."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ greek ] = " %1 . ? "; - Text[ dutch ] = "U kunt %1 in diverse talen installeren in uw systeem. Kies de taof talen die u wilt gebruiken."; - Text[ french ] = "Vous avez la possibilit d'installer %PRODUCTNAME sur votre systme dans l'une des langues mentionnes ci-aprs. Slectionnez la langue que vous souhaitez utiliser."; -@@ -164,7 +164,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "installeren"; - Text[ french ] = "installer"; -diff -ur ../setup2/source/ui/pages/plicense.src ../setup2/source/ui/pages/plicense.src ---- ../setup2/source/ui/pages/plicense.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plicense.src Fri Apr 5 18:41:19 2002 -@@ -150,7 +150,7 @@ - Text [ french ] = "Une fois votre lecture termine, cliquez sur '%1' si vous acceptez tous les termes du contrat. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击\"%1\"。如果不同意许可证协议中的条款，则按击\"%2\"，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所提的許可證協議的全部條款，按一下<%1>。若不接受全部條款，就按一下<%2>，取消安裝。"; -diff -ur ../setup2/source/ui/pages/pmigrate.src ../setup2/source/ui/pages/pmigrate.src ---- ../setup2/source/ui/pages/pmigrate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmigrate.src Fri Apr 5 18:41:30 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen persnliche Daten aus einer %PRODUCTNAME 5.2 Installation bernehmen.\n\nIhre Benutzerdaten wie Vorlagen, Wrterbcher und Gallery-Themen werden in das %PRODUCTNAME 6.0 Verzeichnis kopiert. Zur vollstndigen Migration Ihrer Daten beachten Sie bitte auch die Hinweise auf weitere Dokumentation in der Readme-Datei.\n\nIhre Daten werden von dem unten angegebenen Verzeichnis kopiert." ; - Text [ english_us ] = "Personal data from a %PRODUCTNAME 5.2 installation can be used in the new version.\n\nYour user data such as templates, dictionaries and Gallery themes will be copied into the %PRODUCTNAME 6.0 directory. Concerning the complete migration of your data, please follow the guidelines in the Readme file.\n\nThe data will be copied from the directory given below." ; - Text[ portuguese ] = "Poder importar os seus dados pessoais e os parmetros de configurao da verso do %PRODUCTNAME 5.2.\n\nOs seus dados de utilizador tais como modelos, dicionrios e temas da Gallery sero copiados para o directrio %PRODUCTNAME 6.0. Para a migrao completa dos seus dados, tenha em considerao a documentao referida no ficheiro Readme.\n\nOs dados sero copiados a partir do directrio abaixo indicado."; -- Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; -+ Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; - Text[ greek ] = " %PRODUCTNAME .\n\n .\n\n :"; - Text[ dutch ] = "U kunt persoonlijke gegevens uit een %PRODUCTNAME 5.2-installatie overnemen.\n\nNaast uw gebruikersgegevens worden sjablonen, woordenboeken en gallery-onderwerpen gekopieerd naar de %PRODUCTNAME 6.0-directory.\n\nRaadpleeg het Readme-bestand voor een volledige migratie van uw gegevens.\n\nUw gegevens worden ontnomen aan de hieronder aangegeven directory."; - Text[ french ] = "Vous avez la possibilit de reprendre certaines donnes personnelles provenant d'une installation de %PRODUCTNAME 5.2.\n\nVos donnes d'utilisateur (tels que les modles, dictionnaires, thmes de la Gallery) seront alors copies dans le rpertoire %PRODUCTNAME 6.0. Le fichier Readme comporte des indications importantes pour la migration des donnes.\n\nCelles-ci seront copies depuis le rpertoire spcifi ci-dessous."; -diff -ur ../setup2/source/ui/pages/pmodules.src ../setup2/source/ui/pages/pmodules.src ---- ../setup2/source/ui/pages/pmodules.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmodules.src Fri Apr 5 18:41:44 2002 -@@ -100,7 +100,7 @@ - Text = "Bitte whlen sie ein Modulset aus, welches sie installieren wollen." ; - Text[english_us] = "Please select one module set to install." ; - Text[ portuguese ] = "Please select one module set to be installed."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = "Please select one module set to be installed."; - Text[ dutch ] = "Kies een set met modules die u wilt installeren."; - Text[ french ] = "Slectionnez un jeu de modules installer."; -diff -ur ../setup2/source/ui/pages/pprofile.src ../setup2/source/ui/pages/pprofile.src ---- ../setup2/source/ui/pages/pprofile.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pprofile.src Fri Apr 5 18:42:50 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprofile zusammenstellen" ; - Text [ english_us ] = "Compile Installation Profiles" ; - Text[ portuguese ] = "Compilar perfis de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprofielen samenstellen"; - Text[ french ] = "Compilation des profils d'installation"; -@@ -100,7 +100,7 @@ - Text = "Stellen Sie sich hier Ihre verschiedenen Installationsprofile zusammen, die Sie spter mit dem Responsefile installieren mchten." ; - Text [ english_us ] = "Compile different installation profiles that are to be installed later using response file." ; - Text[ portuguese ] = "Compile os diferentes perfis de instalao que deseje instalar posteriormente com o Response File."; -- Text[ russian ] = " , Response File."; -+ Text[ russian ] = " , Response File."; - Text[ greek ] = " , Responsefile."; - Text[ dutch ] = "Kies hier de installatieprofielen die u later met de responsefile wilt installeren."; - Text[ french ] = "Compilez les diffrents profils d'installation installer avec le Response File."; -@@ -128,7 +128,7 @@ - Text = "Installationsprofile:" ; - Text [ english_us ] = "Installation profiles:" ; - Text[ portuguese ] = "Perfis de instalao:"; -- Text[ russian ] = " :"; -+ Text[ russian ] = " :"; - Text[ greek ] = " :"; - Text[ dutch ] = "Installatieprofielen:"; - Text[ french ] = "Profils d'installation :"; -diff -ur ../setup2/source/ui/pages/preadygo.src ../setup2/source/ui/pages/preadygo.src ---- ../setup2/source/ui/pages/preadygo.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preadygo.src Fri Apr 5 19:12:09 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Het systeem heeft nu alle noodzakelijke gegevens voor het kopiren van de programmabestanden. Klik nu op '%1' als u deze gegevens wilt zien of veranderen. Bent u het er mee eens, klik dan op '%2' om de installatie te starten." ; - Text [ portuguese ] = "Os parmetros necessrios para copiar os ficheiros do programa esto completos. Clique em '%1' para ver as modificaes que fez. Aceite ou modifique as entradas e continue com a instalao em '%2'." ; - Text[ chinese_simplified ] = "复制程序文件的设定已经完成。\n如果要查看或更改这些设定，请按击\"%1\"。\n如果要使用这些设定，按击\"%2\"执行安装。"; -- Text[ russian ] = " , , . '%1', . "; -+ Text[ russian ] = " , , . '%1', \n. , '%2'."; - Text[ polish ] = "Podane zostay wszystkie dane potrzebne do skopiowania plikw programu. Aby je przejrze lub zmodyfikowa, naley klikn przycisk '%1'. Jeeli wszystkie dane si zgadzaj, naley klikn przycisk '%2', aby rozpocz instalacj programu."; - Text[ japanese ] = "プログラムファイルのコピーに必要なすべての設定は終了しました｡ 設定を確認、変更する場合は、［%1］をクリックします。設定が正しければ、［%2］をクリックしてインストールを続行します。"; - Text[ chinese_traditional ] = "複製所有程式檔案的設定已經完成。要查看或變更這個設定﹐請按一下<%1>。\n要確定這個設定﹐按一下<%2>，啟動安裝。"; -diff -ur ../setup2/source/ui/pages/precover.src ../setup2/source/ui/pages/precover.src ---- ../setup2/source/ui/pages/precover.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/precover.src Fri Apr 5 18:43:23 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Rparation de l'installation" ; - Text [ dutch ] = "Installatie repareren" ; - Text[ chinese_simplified ] = "修补安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Naprawa instalacji"; - Text[ japanese ] = "インストールの修復"; - Text[ chinese_traditional ] = "修補安裝"; -@@ -108,7 +108,7 @@ - Text [ dutch ] = "Als u op '%1' klikt, wordt getracht de eventueel beschadigde installatie in de directory" ; - Text [ portuguese ] = "Clique em '%1' para que o programa restaure a instalao danificada no" ; - Text[ chinese_simplified ] = "按击 \"%1\"，安装程序就会修复目录之内已损坏的 %2 组件："; -- Text[ russian ] = " '%1', , "; -+ Text[ russian ] = " '%1', , "; - Text[ polish ] = "Jeli klikniesz '%1', nastpi prba ewentualnej naprawy uszkodzonej instalacji w katalogu."; - Text[ japanese ] = "[%1]をクリックすると、自動的に次のディレクトリにインストールされている %2 の修復が行われます。"; - Text[ chinese_traditional ] = "如果按一下<%1>，安裝程式就會修復安裝目錄內已損壞的 %2 ："; -@@ -144,7 +144,7 @@ - Text [ french ] = "Le processus de rparation rinstalle les composants manquants ou dfectueux." ; - Text [ dutch ] = "te herstellen. Daarbij worden gewiste programmabestanden en belangrijke programmaregistreringen opnieuw genstalleerd." ; - Text[ chinese_simplified ] = "安装程序会重新安装程序文件，并在系统内重新登记程序组件。"; -- Text[ russian ] = ". ."; -+ Text[ russian ] = ". ."; - Text[ polish ] = "Usunite pliki programowe i rejestracje programw zostan ponownie zainstalowane."; - Text[ japanese ] = "修復中に、不足または不良のコンポーネントがインストールしなおされます。"; - Text[ chinese_traditional ] = "安裝程式會重新安裝程式檔案和在操作系統內登記程式元件。"; -diff -ur ../setup2/source/ui/pages/preguser.src ../setup2/source/ui/pages/preguser.src ---- ../setup2/source/ui/pages/preguser.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preguser.src Fri Apr 5 19:23:57 2002 -@@ -80,7 +80,7 @@ - Text = "Herzlich willkommen zu %PRODUCTNAME %PRODUCTVERSION OEM\n\nUm %PRODUCTNAME %PRODUCTVERSION OEM starten zu knnen, geben Sie bitte auf der dem Lizenztext folgenden Dialogseite Ihre Benutzerdaten ein.\n\nIn der Readme-Datei im %PRODUCTNAME-Produktverzeichnis finden Sie wichtige Hinweise zum Programm. Bitte lesen Sie diese Hinweise aufmerksam durch.\n\nDes weiteren finden Sie ausfhrliche Informationen auf der Internetseite von Sun unter\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWir wnschen Ihnen viel Spa und Erfolg mit Ihrem neuen %PRODUCTNAME.\n\nIhr %PRODUCTNAME Team."; - Text [ english_us ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start %PRODUCTNAME %PRODUCTVERSION OEM, please enter your personal data in the dialog following the license text.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWe hope you enjoy working with %PRODUCTNAME."; - Text[ portuguese ] = "Bem-vindo ao %PRODUCTNAME %PRODUCTVERSION OEM!\n\nPara poder iniciar o %PRODUCTNAME %PRODUCTVERSION OEM, indique os seus dados de utilizador na pgina que se segue ao contrato de licena.\n\nO ficheiro Readme, que se encontra no directrio de produtos %PRODUCTNAME, contm informaes importantes sobre este programa. Leia-as atentamente!\n\nPara mais informaes, consulte a pgina da Internet da Sun em\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nResta-nos desejar-lhe um ptimo trabalho com o novo %PRODUCTNAME.\n\nA sua Equipa %PRODUCTNAME."; -- Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; -+ Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION OEM\n\n %PRODUCTNAME %PRODUCTVERSION OEM \" \".\n\n ( Readme) %PRODUCTNAME . .\n\n Internet Sun\n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME .\n\n %PRODUCTNAME."; - Text[ dutch ] = "Hartelijk welkom bij %PRODUCTNAME %PRODUCTVERSION OEM\n\nOm %PRODUCTNAME %PRODUCTVERSION OEM te kunnen starten moet u uw gegevens invullen in de dialoog die volgt op de licentietekst.\n\nIn het Readme-bestand in de %PRODUCTNAME-productdirectory vindt u belangrijke aanwijzingen bij het programma. Leest u deze zorgdvuldig door.\n\nUitvoerige informatie vindt u verder op de Internet-pagina van Sun onder\n\nhttp:www.sun.com/%PRODUCTNAME.\n\nWij wensen u veel plezier en succes met uw nieuwe %PRODUCTNAME.\n\nUw %PRODUCTNAME-team. "; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION OEM vous souhaite la bienvenue !\n\nAfin de pouvoir dmarrer le programme, vous devez saisir vos donnes d'identit dans la bote de dialogue qui fait suite celle vous affichant la licence.\n\nLe fichier Readme, que vous trouverez dans le rpertoire de %PRODUCTNAME, contient des informations importantes sur le programme. Veuillez les lire attentivement.\n\nDe plus, vous trouverez des informations dtailles sur le site de Sun l'adresse\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nL'quipe de %PRODUCTNAME espre que cette nouvelle version rpondra vos attentes et vous souhaite un agrable travail !"; -diff -ur ../setup2/source/ui/pages/preins.src ../setup2/source/ui/pages/preins.src ---- ../setup2/source/ui/pages/preins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preins.src Fri Apr 5 18:44:39 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1安裝程式"; -@@ -102,7 +102,7 @@ - Text [ english_us ] = "Welcome to the %1 repair mode. This program lets you modify the current %1 installation. The current installation is in the folder:"; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Bem-vindo ao programa de instalao/manuteno %1! Este programa permite modificar a instalao actual. A instalao actual encontra-se na pasta:"; -- Text[ russian ] = " %1. , :"; -+ Text[ russian ] = " %1. , :"; - Text[ greek ] = " %1 :"; - Text[ dutch ] = "Welkom bij %1 installatie-onderhoudsprogramma. Met dit programma kunt u de actuele installatie modificeren. De actuele installatie bevindt zich in de volgende directory:"; - Text[ french ] = "Vous avez activ le mode de maintenance de %1. Ce mode permet de modifier l'installation actuelle de %1 qui se trouve dans le dossier :"; -@@ -164,7 +164,7 @@ - Text [ english_us ] = "New %1 components can be added or installed ones removed." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Adiciona ou remove componentes ou mdulos verso j instalada."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = " ( ) ."; - Text[ dutch ] = "Nieuwe programmamodules kunnen worden toegevoegd, reeds genstalleerde kunnen worden verwijderd."; - Text[ french ] = "Ajout ou suppression de composants de %1."; -@@ -221,7 +221,7 @@ - Text [ english_us ] = "Removes the %1 installation." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Elimina a instalao actual."; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ."; - Text[ dutch ] = "Verwijdert de genstalleerde versie."; - Text[ french ] = "Suppression de l'installation de %1."; -@@ -276,7 +276,7 @@ - Text [ english_us ] = "Restores your %1 installation to its original state." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Reinstala todos os mdulos do programa instalados na verso anterior."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = " ."; - Text[ dutch ] = "Renstalleert alle programmamodulen die bij de vorige installatie werden genstalleerd."; - Text[ french ] = "Restauration de l'tat d'origine de votre installation de %1."; -@@ -302,7 +302,7 @@ - Text [ english_us ] = "You must exit %1 and the %1 Quickstarter before you can continue." ; - Text[ language_user1 ] = "LLA: 8.1.02, Text wasn't changed."; - Text[ portuguese ] = "Ter que sair do %1 e do incio rpido %1 antes de prosseguir com a desinstalao."; -- Text[ russian ] = " %1 %1, ."; -+ Text[ russian ] = " %1 %1, ."; - Text[ greek ] = "Sie mssen %1 und den %1 Schnellstarter beenden bevor Sie mit der Deinstallation fortfahren knnen."; - Text[ dutch ] = "U moet %1 en de %1 snelstarter beindigen voordat u kunt doorgaan."; - Text[ french ] = "Quittez %1 et le dmarrage rapide de %1 afin de pouvoir poursuivre."; -@@ -334,7 +334,7 @@ - Text [ french ] = "Quittez %1 afin de pouvoir procder la dsinstallation." ; - Text [ dutch ] = "U moet %1 beindigen voordat u met de denstallatie kunt doorgaan." ; - Text[ chinese_simplified ] = "在撤除程序之前，您必须先关闭 %1 。"; -- Text[ russian ] = " %1, ."; -+ Text[ russian ] = " %1, ."; - Text[ polish ] = "Musisz zakoczy %1, by mc kontynuowa dezinstalacj."; - Text[ japanese ] = "インストールの削除を続行する前に、%1 を終了させる必要があります。"; - Text[ chinese_traditional ] = "在移除程式之前﹐您必須先關閉 %1 。"; -diff -ur ../setup2/source/ui/pages/prepair.src ../setup2/source/ui/pages/prepair.src ---- ../setup2/source/ui/pages/prepair.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prepair.src Fri Apr 5 18:45:48 2002 -@@ -142,7 +142,7 @@ - Text = "In Ihrer %1 Installation kann die folgende Datei nicht gefunden werden!" ; - Text[english_us] = "In the %1 installation, the following file could not be found!" ; - Text[ portuguese ] = "Impossvel localizar o seguinte ficheiro na sua instalao %1!"; -- Text[ russian ] = " %1!"; -+ Text[ russian ] = " %1!"; - Text[ dutch ] = "In uw %1 installatie is het volgende bestand niet te vinden!"; - Text[ french ] = "Le fichier suivant est introuvable dans l'installation de %1 !"; - Text[ spanish ] = "En su instalacin %1 no se puede encontrar el siguiente archivo!"; -@@ -178,7 +178,7 @@ - Text = "%1 bentigt diese Datei um fehlerfrei ausgefhrt werden zu knnen. Das Installationsprogramm kann versuchen diese Datei wieder herzustellen." ; - Text[english_us] = "%1 requires this file to be executed correctly. With the aid of the setup program it may be restored." ; - Text[ portuguese ] = "%1 necessita este ficheiro para poder ser devidamente executado. O programa de instalao poder tentar restaurar este ficheiro."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ dutch ] = "%1 benodigt dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld."; - Text[ french ] = "%1 ne peut pas tre excut correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer."; - Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con xito. El programa de instalacin puede intentar restaurar este archivo."; -@@ -207,7 +207,7 @@ - Text = "Wenn Sie auf '%1' klicken wird versucht Ihre %2 Installation zu reparieren. Klicken Sie dagegen auf '%3' um das Installationprogramm jetzt zu beenden." ; - Text[english_us] = "Click '%1' to have the setup program repair your '%2' installation. Click '%3' to exit the installation." ; - Text[ portuguese ] = "Clique em '%1' para tentar reparar a instalao %2. Clique em '%3' para terminar agora o programa de instalao."; -- Text[ russian ] = " '%1', %2. '%3', ."; -+ Text[ russian ] = " '%1', %2. '%3', ."; - Text[ dutch ] = "Als u op '%1' klikt wordt getracht uw %2 installatie te repareren. Klikt u daarentegen op '%3' dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour essayer de rparer l'installation de %2. ou sur '%3' si vous prfrez quitter le programme d'installation."; - Text[ spanish ] = "Si pulsa sobre '%1' se intentar reparar su instalacin %2. Pero si pulsa sobre '%3' se cerrar el programa de instalacin."; -diff -ur ../setup2/source/ui/pages/prspwizard.src ../setup2/source/ui/pages/prspwizard.src ---- ../setup2/source/ui/pages/prspwizard.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prspwizard.src Fri Apr 5 18:46:09 2002 -@@ -129,7 +129,7 @@ - Text = "Der Responsefile AutoPilot hilft Ihnen bei der Erstellung eines Responsefiles mit dem sie danach mehrere Installationsprofile automatisiert installieren knnen." ; - Text [ english_us ] = "The response file autopilot helps you to create a response file. These are then used to automatically install several installation profiles." ; - Text[ portuguese ] = "O AutoPiloto Response File ajuda-o a criar um Response File que lhe permite instalar automaticamente diversos perfis de instalao."; -- Text[ russian ] = " Response File (Response file), ."; -+ Text[ russian ] = " Response File (Response file), ."; - Text[ greek ] = " Responsefile Responsefile ? "; - Text[ dutch ] = "Responsefile AutoPilot helpt u bij het maken van een response-bestand waarmee u automatisch meerdere installatieprofielen kunt installeren."; - Text[ french ] = "L'AutoPilote Response File vous assiste lors de la cration d'un Response File grce auquel l'installation automatise des profils d'installation sera possible."; -diff -ur ../setup2/source/ui/pages/pscript.src ../setup2/source/ui/pages/pscript.src ---- ../setup2/source/ui/pages/pscript.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pscript.src Fri Apr 5 18:46:57 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprogramm" ; - Text [ english_us ] = "Installation program" ; - Text[ portuguese ] = "Programa de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprogramma"; - Text[ french ] = "Programme d'installation"; -@@ -114,7 +114,7 @@ - Text = "Das Installationsprogramm kann die Skriptdatei nicht finden, in der alle zur Installation notwendigen Anweisungen gespeichert sind." ; - Text [ english_us ] = "The installation program cannot find the script file in which all of the instructions required for installation have been saved." ; - Text[ portuguese ] = "O programa de instalao no encontra o ficheiro script com todas as instrues necessrias instalao."; -- Text[ russian ] = " , , ."; -+ Text[ russian ] = " , , ."; - Text[ greek ] = " "; - Text[ dutch ] = "Het installatieprogramma kan het scriptbestand met alle voor de installatie benodigde aanwijzingen niet vinden."; - Text[ french ] = "Le programme d'installation n'arrive pas trouver le fichier script contenant toutes les instructions ncessaires l'installation."; -@@ -178,7 +178,7 @@ - Text = "Ohne diese Datei kann das Installationsprogramm nicht ausgefhrt werden, es wird jetzt beendet." ; - Text [ english_us ] = "The installation program cannot be executed without this file, it will now be terminated." ; - Text[ portuguese ] = "Sem este ficheiro, impossvel executar o programa de instalao. Este ser cancelado agora."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ greek ] = " , ."; - Text[ dutch ] = "Zonder dit bestand kan het installatieprogramma niet worden uitgevoerd, het wordt nu gestopt."; - Text[ french ] = "Sans ce fichier, il est impossible de lancer le programme d'installation. Celui-ci va tre interrompu."; -diff -ur ../setup2/source/ui/pages/ptoplvl.src ../setup2/source/ui/pages/ptoplvl.src ---- ../setup2/source/ui/pages/ptoplvl.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/ptoplvl.src Fri Apr 5 18:47:10 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Selecteer de producten die u wilt installeren.\n" ; - Text [ portuguese ] = "Escolha os produtos que deseja instalar.\n" ; - Text[ chinese_simplified ] = "请选择要安装的软件。\n"; -- Text[ russian ] = ", , , .\n"; -+ Text[ russian ] = ", , , .\n"; - Text[ polish ] = "Wybierz produkty, ktre chcesz zainstalowa.\n"; - Text[ japanese ] = "インストールする製品を選択してください。\n"; - Text[ chinese_traditional ] = "請選擇要安裝的軟體。\n"; -diff -ur ../setup2/source/ui/pages/puninst.src ../setup2/source/ui/pages/puninst.src ---- ../setup2/source/ui/pages/puninst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/puninst.src Fri Apr 5 18:47:49 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 のインストールの削除"; - Text[ chinese_traditional ] = "移除 %1"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande %1 installatie uit map '%2' wilt verwijderen, druk dan op '%3'." ; - Text [ portuguese ] = "Se tiver a certeza de que deseja eliminar a instalao %1 existente no directrio '%2', clique em '%3'." ; - Text[ chinese_simplified ] = "如果真要删除目录\"%2\"中的安装程序%1，请按击\"%3\"。"; -- Text[ russian ] = " %1 '%2', '%3'."; -+ Text[ russian ] = " %1 '%2', '%3'."; - Text[ polish ] = "Jeli zainstalowany program %1 ma na pewno zosta usunity z katalogu '%2', naley klikn przycisk '%3'."; - Text[ japanese ] = "ディレクトリ「%2」にある %1 のインストールの削除をするときは、［%3］をクリックします。"; - Text[ chinese_traditional ] = "如果真要移除現存目錄<%2>內的 %1 ，就按一下<%3>。"; -@@ -142,7 +142,7 @@ - Text = "Die Deinstallation lscht keine %1 Konfigurationsdateien oder von Ihnen erstellte Dokumente. Sie knnen jetzt einstellen, dass auch diese Dateien von der Deinstallation gelscht werden." ; - Text [ english_us ] = "Deinstallation does not delete any %1 configuration files or documents created by the user. You can now determine if these files are also to be deleted by deinstallation." ; - Text[ portuguese ] = "A desinstalao no elimina os ficheiros de configurao %1 dos documentos que criou. Poder indicar agora se deseja que esses ficheiros sejam eliminados ao efectuar a desinstalao."; -- Text[ russian ] = " %1 . , ."; -+ Text[ russian ] = " %1 . , ."; - Text[ greek ] = " %1, "; - Text[ dutch ] = "Met de denstallatie worden geen %1 configuratiebestanden of door u gemaakte documenten gewist. U kunt hier kiezen of ook deze bestanden bij de denstallatie worden gewist."; - Text[ french ] = "La dsinstallation ne supprime ni les fichiers de configuration de %1, ni les documents que vous avez crs. Vous pouvez maintenant dcider de la suppression de ces fichiers par la dsinstallation."; -diff -ur ../setup2/source/ui/pages/pupdate.src ../setup2/source/ui/pages/pupdate.src ---- ../setup2/source/ui/pages/pupdate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pupdate.src Fri Apr 5 18:49:58 2002 -@@ -79,7 +79,7 @@ - Text[ swedish ] = "Installationsprogram fr %1"; - Text[ dutch ] = "Installatioeprogramma voor %1"; - Text[ spanish ] = "Programa de instalacin para %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_simplified ] = "%1 安装程序"; -@@ -109,7 +109,7 @@ - Text[ swedish ] = "Vlkommen till installationsprogrammet"; - Text[ dutch ] = "Welkom bij het installatieprogramma"; - Text[ spanish ] = "Bienvenida al programa de instalacin"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "インストールプログラムへようこそ"; - Text[ chinese_simplified ] = "欢迎安装！"; -@@ -138,7 +138,7 @@ - Text[ swedish ] = "Det finns redan en %1 installation i fljande mapp"; - Text[ dutch ] = "Er bestaat reeds een %1 installatie in de volgende directory"; - Text[ spanish ] = "Ya existe una instalacin %1 en el siguiente directorio"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Istnieje ju instalacja %1 w nastpujcym katalogu"; - Text[ japanese ] = "%1 インストールはすでに次のディレクトリにあります。"; - Text[ chinese_simplified ] = "在下列目录内已经存在一个%1程序"; -@@ -169,7 +169,7 @@ - Text = "Wenn Sie auf '%1' klicken, wird die vorhandene Installation aktualisiert. Klicken Sie auf '%2', wird das Installationsprogramm abgebrochen.\n\nBeachten Sie bitte, dass die Edition Ihrer vorhandenen Installation durch das Update bernommen wird." ; - Text [ english_us ] = "If you click '%1', the existing installation will be updated. Click '%2' to abort the installation.\n\nMake sure that the Edition type of your existing installation is adopted by the update." ; - Text[ portuguese ] = "Clique em '%1', para actualizar a instalao existente. Clique em '%2' para cancelar o programa de instalao.\n\nNote que o tipo de edio da verso instalada ser o mesmo aps a actualizao (update)."; -- Text[ russian ] = " '%1', . '%2', .\n\n , , ."; -+ Text[ russian ] = " '%1', . '%2', .\n\n , , ."; - Text[ dutch ] = "Als u op '%1' klikt dan wordt de bestaande installatie geactualiseerd. Klikt u op '%2', dan wordt het installatieprogramma gestopt.\n\nWij wijzen u erop, dat de editie van de bestaande installatie wordt overgenomen door de update-editie."; - Text[ french ] = "Cliquez sur '%1' pour actualiser l'installation existante ou sur '%2', pour quitter le programme d'installation.\n\nVeuillez noter que la mise jour reprendra le type d'dition de votre version d'origine."; - Text[ spanish ] = "Si pulsa sobre '%1', la instalacin existente se actualizar. Para cancelar el programa de instalacin, pulse sobre '%2'.\n\nTenga en cuenta que la actualizacin respetar la edicin de su instalacin existente."; -@@ -241,7 +241,7 @@ - Text = "Hierbei handelt es sich um eine Netzinstallation. Sie haben jedoch keine Schreibrechte in dem genannten Verzeichnis. Um diese Installation aktualisieren zu knnen verschaffen Sie sich Schreibrechte und starten das Installationsprogramm erneut." ; - Text [ english_us ] = "The program you want to run represents a network installation for which you must have the appropriate (write) access for the above-mentioned directory. Prior to running the installation again, you must have write access for this directory." ; - Text[ portuguese ] = "Esta uma instalao de rede. No entanto, no possui direitos de acesso no directrio mencionado. Para poder actualizar esta instalao ter que adquirir os direitos de acesso apropriados e reiniciar o programa de instalao."; -- Text[ russian ] = " . . , ."; -+ Text[ russian ] = " . . , ."; - Text[ dutch ] = "Het betreft hier een netinstallatie. U heeft echter geen schrijfrechten in de genoemde directory. Om deze installatie te kunnen actualiseren moet u zich schrijfrechten verschaffen en het installatieprogramma opnieuw starten."; - Text[ french ] = "Vous utilisez une installation en rseau pour laquelle vous ne possdez pas de droits d'criture dans le rpertoire cit. Pour pouvoir actualiser cette installation, vous devez vous procurer les droits d'criture ncessaires avant de relancer le programme d'installation."; - Text[ spanish ] = "Esta es una instalacin de red. Sin embargo, usted no posee derechos de escritura en el directorio nombrado. Para poder actualizar esta instalacin, obtenga los derechos de escritura y ejecute de nuevo el programa de instalacin."; -@@ -270,7 +270,7 @@ - Text = "Sie knnen eine Aktualisierung von %1 jedoch nicht durchfhren, da die Sprache der vorhandenen Installation nicht mit der Sprache dieses Installationsatzes bereinstimmt." ; - Text [ english_us ] = "The language of the installation files does not correspond to the language of the installed version %1. Thus, an upgrade is not possible." ; - Text[ portuguese ] = " impossvel efectuar a actualizao de %1, porque a lngua da instalao existente no combina com a lngua dos ficheiros de instalao."; -- Text[ russian ] = " %1 , .. ."; -+ Text[ russian ] = " %1 , .. ."; - Text[ dutch ] = "U kunt een actualiseren van %1 echter niet uitvoeren daar de taal van deze installatie niet overeenkomt met die van de reeds bestaande versie."; - Text[ french ] = "Impossible de procder une actualisation de %1 : la langue de l'installation existante ne correspond pas celle des prsents fichiers dl'installation."; - Text[ spanish ] = "No es posible efectuar una actualizacin de %1 dado que el idioma de la instalacin existente no coincide con el de estos archivos de instalacin."; -@@ -299,7 +299,7 @@ - Text = "Dies ist eine Updateinstallation fr %1.\n\nAuf Ihrem Rechner konnte jedoch keine %2 Installation gefunden werden. Das Installationsprogramm wird jetzt abgebrochen." ; - Text [ english_us ] = "This is an update installation for %1.\n\nNo %2 installation has been found. Installation program will be aborted." ; - Text[ portuguese ] = "Este um programa de actualizao (update) de %1.\n\nNo entanto, foi impossvel encontrar no seu computador a instalao de %2. O programa ser cancelado agora."; -- Text[ russian ] = " %1.\n\n %2 . ."; -+ Text[ russian ] = " %1.\n\n %2 . ."; - Text[ dutch ] = "Dit is een update-installatie voor %1.\n\nOp uw computer werdechter geen %2 installatie gevonden. Het installatiesprogramma wordt nu gestopt."; - Text[ french ] = "Le prsent programme est destin installer une mise jour (update) de %1.\n\nLe programme de mise jour n'a cependant dtect aucune installation de %2 et va donc tre interrompu."; - Text[ spanish ] = "Esta instalacin actualizar %1.\n\nSin embargo, no se ha encontrado en su ordenador una instalacin %2. El programa de instalacin se cancelar ahora."; -diff -ur ../setup2/source/ui/pages/pusrinst.src ../setup2/source/ui/pages/pusrinst.src ---- ../setup2/source/ui/pages/pusrinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pusrinst.src Fri Apr 5 18:50:14 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Slectionnez les modules que vous souhaitez installer." ; - Text [ dutch ] = "Selecteer de te installeren modules." ; - Text[ chinese_simplified ] = "请您选择要安装的模块。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz moduy dla instalacji."; - Text[ japanese ] = "インストールするモジュールを選択します。"; - Text[ chinese_traditional ] = "請您選擇要安裝的模塊。"; -diff -ur ../setup2/source/ui/pages/pwaddr.src ../setup2/source/ui/pages/pwaddr.src ---- ../setup2/source/ui/pages/pwaddr.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwaddr.src Fri Apr 5 18:50:25 2002 -@@ -143,7 +143,7 @@ - Text = "In der Zeit zwischen Installation und Registrierung knnen die Benutzerdaten nicht mehr gendert werden. Bitte kontrollieren Sie jetzt Ihre Benutzerdaten und klicken Sie auf '%1' wenn Sie die Daten noch ndern wollen."; - Text[english_us] = "During the period between installation and registration, the personal data specified cannot be changed. Check now the user data and click '%1' if you want to modify the data."; - Text[ portuguese ] = "No possvel modificar os dados de utilizador no perodo compreendido entre a instalao e o registo. Queira verificar agora os seus dados de utilizador e se pretender modific-los, clique em '%1'."; -- Text[ russian ] = " . , , '%1', ."; -+ Text[ russian ] = " . , , '%1', ."; - Text[ dutch ] = "In de tijd tussen installatie en registratie kunnen gebruikersgegevens niet meer worden veranderd. Controleer nu uw gebruikersgegevens. Als u nog iets wilt veranderen, klikt u dan op '%1'."; - Text[ french ] = "Vous ne pourrez plus modifier vos donnes d'identit durant la priode comprise entre l'installation et l'enregistrement. Veuillez vrifier vos donnes d'identit et cliquer sur '%1' si vous souhaitez les modifier."; - Text[ spanish ] = "En el periodo entre la instalacin y el registro no se pueden modificar los datos de usuario. Compruebe por favor ahora sus datos de usuario y pulse sobre '%1' si an desea modificar los datos."; -diff -ur ../setup2/source/ui/pages/pwelcome.src ../setup2/source/ui/pages/pwelcome.src ---- ../setup2/source/ui/pages/pwelcome.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwelcome.src Fri Apr 5 18:51:41 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のセットアッププログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Bienvenido al programa de instalacin" ; - Text [ english_us ] = "Welcome to the Installation Program" ; - Text[ chinese_simplified ] = "欢迎安装！"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "セットアッププログラムへようこそ"; - Text[ chinese_traditional ] = "歡迎安裝"; -@@ -138,7 +138,7 @@ - Text [ french ] = "Le programme d'installation va installer les composants de %1 sur votre disque dur. Pour quitter le programme d'installation, utilisez le bouton '%2'." ; - Text [ dutch ] = "Het installatieprogramma richt de %1 componenten in op uw vaste schijf. Om het installatieprogramma te beindigen staat u te allen tijde de knop '%2' ter beschikking." ; - Text[ chinese_simplified ] = "安装程序在硬盘上安装 %1 组件。\n您可以通过单击按钮 '%2' 来结束安装程序。"; -- Text[ russian ] = " %1. '%2'."; -+ Text[ russian ] = " \n%1. \n '%2'."; - Text[ polish ] = "Program instalacyjny instaluje komponenty pakietu %1 na dysku twardym. Aby zakoczy program instalacyjny, mona w kadej chwili klikn przycisk '%2'."; - Text[ japanese ] = "セットアッププログラムは、%1 コンポーネントをハードディスク上にインストールします。セットアッププログラムを中断するには、［%2］をクリックします。"; - Text[ chinese_traditional ] = "安裝程式在磁碟上安裝 %1 元件。\n可以按一下 %2 ，結束安裝程式。"; -@@ -166,7 +166,7 @@ - Text [ french ] = "Avant de procder l'installation, vous devez fermer tous les programmes en cours. Cliquez sur '%1' pour quitter le programme d'installation et fermer tous les programmes en cours. Cliquez sur '%2' pour poursuivre l'installation." ; - Text [ dutch ] = "Pas op: Beindig voor de installatie alle geopende programma's. Met '%1' verlaat u het installatieprogramma en kunt u geopende programma's afsluiten. Klikt u echter op '%2', dan wordt de installatie voortgezet." ; - Text[ chinese_simplified ] = "请在安装程序之前关闭所有正在运行的其他程序。\n点击 '%1' 就能够退出和关闭安装程序。\n点击 '%2'，就会继续执行安装。"; -- Text[ russian ] = " . '%1' "; -+ Text[ russian ] = " . '%1' "; - Text[ polish ] = "Przed rozpoczciem instalacji naley zakoczy wszystkie pracujce programy. Aby opuci program instalacyjny i zamkn wszystkie aktywne programy, naley klikn przycisk '%1'. Po klikniciu przycisku '%2' nastpi kontynuacja instalacji."; - Text[ japanese ] = "インストールを開始する前に、開いているアプリケーションをすべて終了してください。アプリケーションの終了は、［%1］でセットアッププログラムを閉じた上で行います。［%2］をクリックすると、このままインストールを続行します。"; - Text[ chinese_traditional ] = "請在安裝之前關閉正在運行的其他程式。\n按一下 %1 就能夠退出和關閉安裝程式。\n按一下 %2 ﹐就會繼續執行安裝。"; -diff -ur ../setup2/source/ui/pages/pwsetup.src ../setup2/source/ui/pages/pwsetup.src ---- ../setup2/source/ui/pages/pwsetup.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwsetup.src Fri Apr 5 18:52:50 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "%1 bevindt zich reeds in de directory" ; - Text [ portuguese ] = "%1 j se encontra no directrio." ; - Text[ chinese_simplified ] = "%1 已经安装"; -- Text[ russian ] = "%1 "; -+ Text[ russian ] = "%1 "; - Text[ polish ] = "%1 zainstalowano ju w katalogu"; - Text[ japanese ] = "%1 はすでにディレクトリに"; - Text[ chinese_traditional ] = "%1已經安裝"; -@@ -182,7 +182,7 @@ - Text [ french ] = "Pour procder la dsinstallation, vous devez utiliser le programme d'installation (setup) de la version que vous voulez dsinstaller. Ceci fait, vous pourrez utiliser le prsent programme d'installation pour installer %1." ; - Text [ dutch ] = "Gebruikt u het zich daar bevindende setup-programma voor de denstallatie. Wilt u %1 opnieuw installeren, dan kunt u weer dit setup-programma starten." ; - Text[ chinese_simplified ] = "请您使用目录内的安装程序来撤除软件。如果您要重新安装\"%1\"，请您重新启动这个安装程序。"; -- Text[ russian ] = " , , . %1 ."; -+ Text[ russian ] = " , , . %1 ."; - Text[ polish ] = "Prosz uy tamtejszego programu instalacyjnego do deinstalacji. Dla ponownej instalacji %1 uruchom ponownie program instalacyjny."; - Text[ japanese ] = "インストールの削除は、インストールされた場所のセットアッププログラムで実行してください。%1 を再インストールする場合は、そこのセットアッププログラムを再開始します。"; - Text[ chinese_traditional ] = "請使用目錄內的安裝程式來移除軟體。如果要重新安裝<%1>。請重新啟動這個安裝程式。"; -@@ -203,7 +203,7 @@ - Text = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text [ english_us ] = "If the installation above is not working properly anymore, you can have it repaired."; - Text[ portuguese ] = "Se a instalao acima mencionada no estiver a funcionar devidamente, poder repar-la agora."; -- Text[ russian ] = " , , , ."; -+ Text[ russian ] = " , , , ."; - Text[ greek ] = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text[ dutch ] = "Mocht de bovenvermelde installatie niet meer naar wens functioneren dan kunt u deze hier laten repareren."; - Text[ french ] = "Si l'installation spcifie ci-dessus ne fonctionne plus correctement, vous avez la possibilit de la rparer."; -diff -ur ../setup2/source/ui/pages/vefun.src ../setup2/source/ui/pages/vefun.src ---- ../setup2/source/ui/pages/vefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/vefun.src Fri Apr 5 18:54:44 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Instalacin finalizada" ; - Text [ french ] = "L'installation est termine." ; - Text [ dutch ] = "Installatie beindigd" ; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ polish ] = "Instalacja zakoczona"; - Text[ japanese ] = "インストールの完了"; -@@ -158,7 +158,7 @@ - Text [ spanish ] = "La instalacin ha finalizado con xito.\nSun Microsystems le desea que disfrute trabajando con %1!" ; - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ greek ] = " .\n Sun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でさらに充実したお仕事を Sun Microsystems は心から願っております。"; -@@ -186,7 +186,7 @@ - Text [ french ] = "Les modules et composants slectionns ont t installs / dsinstalls." ; - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e componentes seleccionados esto agora instalados/desinstalados no seu disco rgido." ; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ greek ] = " / ."; - Text[ polish ] = "Wybrane moduy i komponenty zostay zainstalowane / zdeinstalowane na twardym dysku."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; -@@ -215,7 +215,7 @@ - Text [ danish ] = "Installationen er blevet repareret.\n" ; - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ greek ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; -@@ -244,7 +244,7 @@ - TEXT[ swedish ] = "Avinstallationen r avslutad.\n\nVar vnlig och observera att installationsprogrammet inte har raderat alla filerna. %1 konfigurationsfiler och dokument som du sjlv har skapat har inte raderats. Om du inte behver de hr filerna mer kan du radera %1-mappen manuellt."; - TEXT[ dutch ] = "De denstallatie ist beindigd.\n\nWij maken u erop attent, dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente.\n\nTenga en cuenta que el programa de instalacin no ha eliminado la totalidad de los archivos. Los archivos de configuracin %1 as como sus documentos personales no han sido eliminados. Si no los necesita ms, puede eliminar manualmente el directorio %1."; -- TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; -+ TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; - TEXT[ polish ] = "Deinstalacja zostaa pomylnie zakoczona.\n\nNaley uwzgldni, e program instalacyjny nie usun wszystkich plikw. Pliki konfiguracyjne %1 i wasne dokumenty nie zostay usunite.Jeli nie s one ju potrzebne, mona usun katalog %1 rcznie."; - TEXT[ japanese ] = "インストールプログラムは正常に完了しました。\n\nインストールプログラムがすべてのファイルを削除していないことに、注意してください。%1 設定ファイルやユーザーが作成したドキュメントは削除されていません。これらも必要でなければ %1 ディレクトリを手動で削除します。"; - TEXT[ chinese_simplified ] = "现在已经完成撤除程序。\n\n请注意：安装程序并没有删除所有的文件。%1 配置文件和上次安装程序之后您建立的文档没有被删除。如果不再需要这些文件，请您自己删除 %1 目录。"; -@@ -303,7 +303,7 @@ - Text [ spanish ] = "Pulse '%1' para finalizar la instalacin del programa." ; - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ greek ] = " '%1' ."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; -@@ -332,7 +332,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes au fichier config.sys. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre systme." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de config.sys. Om deze te activeren en om een integratie van %1 te garanderen moet uw systeem opnieuw worden opgestart." ; - Text [ portuguese ] = "Durante a instalao foram feitas modificaes no config.sys.Ter que reiniciar o computador para que estas sejam activadas e para assegurar a integrao do %1 na interface." ; -- Text[ russian ] = " config.sys. , %1, ."; -+ Text[ russian ] = " config.sys. , %1, ."; - Text[ greek ] = " CONFIG.SYS . "; - Text[ polish ] = "Podczas instalacji nastpiy zmiany w pliku config.sys. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、config.sys に変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -362,7 +362,7 @@ - Text [ danish ] = "Der er blevet installeret nye tegnst under installationen. Det er ndvendigt at genstarte computeren, for at gre dem tilgngelige for alle programmer." ; - Text [ portuguese ] = "Foram instalados novos caracteres. Ter que reiniciar o seu computador para que estes estejam disponveis para todos os programas." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; -- Text[ russian ] = " . , , ."; -+ Text[ russian ] = " . , , ."; - Text[ greek ] = " . "; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, konieczne jest ponowne uruchomienie."; - Text[ japanese ] = "インストール中に、新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するには、コンピュータを再起動させる必要があります。"; -@@ -391,7 +391,7 @@ - Text [ spanish ] = "Durante la instalacin se efectuaron modificaciones en los archivos del sistema. Para que estas puedan activarse y para garantizar la integracin de %1 en la interfaz, debe reiniciar su sistema." ; - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1, moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中にシステムファイルに変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -420,7 +420,7 @@ - Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalacin." ; - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "いますぐ再起動するには [%1] をクリックします。［%2］をクリックすると、インストールプログラムを終了します。"; -diff -ur ../setup2/source/uibase/agentdlg.src ../setup2/source/uibase/agentdlg.src ---- ../setup2/source/uibase/agentdlg.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/uibase/agentdlg.src Fri Apr 5 18:04:26 2002 -@@ -171,7 +171,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "Install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installeren"; - Text[ french ] = "Installer"; -diff -ur ../sfx2/source/view/view.src ../sfx2/source/view/view.src ---- ../sfx2/source/view/view.src Wed Apr 3 16:09:43 2002 -+++ ../sfx2/source/view/view.src Fri Apr 5 19:06:40 2002 -@@ -745,7 +745,7 @@ - MESSAGE [ spanish ] = "Error al enviar el mensaje. La razn puede ser una cuenta de usuario o una instalacin defectuosa.\nCompruebe la configuracin de %PRODUCTNAME o la de su programa de correo electrnico." ; - MESSAGE [ english_us ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; - MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生一个错误。可能缺少一个用户帐号或者安装程序有错误。\n请您检查 %PRODUCTNAME 的设定或者您的电子邮件程序的设定。"; -- MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; -+ MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; - MESSAGE[ polish ] = "Bd w przesyaniu wiadomoci: brak konta uytkownika lub nieprawidowa instalacja.\nNaley sprawdzi ustawienia programu %PRODUCTNAME lub programu poczty elektronicznej."; - MESSAGE[ japanese ] = "メッセージ送信時のエラー。エラーの原因としては、ユーザーアカウントがないか、あるいはセットアップが正しくないかが考えられます。\n%PRODUCTNAME、またはお使いの E-mail プログラムの設定を確認してください。"; - MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。可能缺少一個使用者賬號或安裝有問題。\n請您檢查 %PRODUCTNAME 的設定和您的電子郵件程式的設定。"; -diff -ur ../starmath/source/smres.src ../starmath/source/smres.src ---- ../starmath/source/smres.src Wed Apr 3 16:12:34 2002 -+++ ../starmath/source/smres.src Fri Apr 5 17:46:21 2002 -@@ -3533,7 +3533,7 @@ - Message [ spanish ] = "La fuente \"StarMath\" no est instalada!\nSin esta fuente StarMath no funcionar correctamente...\nInstale la fuente y reinicie StarMath." ; - Message [ english_us ] = "The \"StarMath\" font has not been installed.\nWithout this font %PRODUCTNAME Math cannot function correctly.\nPlease install this font and restart %PRODUCTNAME Math." ; - Message[ chinese_simplified ] = "没有安装 StarMath 字体！\n没有这个 StarMath字体程序会无法正常运作。\n请在安装这个字体后重新启动 StarMath 。"; -- Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; -+ Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; - Message[ polish ] = "Czcionka \"StarMath\" nie jest zainstalowana!\nBez tej czcionki %PRODUCTNAME Math nie moe poprawnie pracowa...\nZainstaluj t czcionk i uruchom %PRODUCTNAME Math ponownie."; - Message[ japanese ] = "\"StarMath\" フォントがインストールされていません｡\nこのフォントなしでは %PRODUCTNAME Math がうまく機能しません...\nまずフォントをインストールして %PRODUCTNAME Math を再起動してください。"; - Message[ chinese_traditional ] = "沒有安裝 StarMath 字型\n而無法正常運行！\n請安裝 StarMath 字型，然后再重新開啟 StaMath。"; -diff -ur ../svtools/source/control/ctrltool.src ../svtools/source/control/ctrltool.src ---- ../svtools/source/control/ctrltool.src Wed Apr 3 16:13:31 2002 -+++ ../svtools/source/control/ctrltool.src Fri Apr 5 17:44:53 2002 -@@ -376,7 +376,7 @@ - TEXT [ English ] = "This font size is not installed. The closest available size will be used." ; - TEXT[ english_us ] = "This font size has not been installed. The closest available size will be used."; - TEXT[ portuguese ] = "Este tamanho de letra no est instalado. Ser utilizado o tamanho disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ."; - TEXT[ dutch ] = "Deze schriftgrootte is niet genstalleerd. De meest passende voorhanden zijnde grootte wordt toegepast."; - TEXT[ french ] = "Cette taille de police n'a pas t installe. La taille disponible la plus approprie va tre utilise."; -@@ -429,7 +429,7 @@ - TEXT [ English ] = "This font is not installed. The closest available font will be used." ; - TEXT[ english_us ] = "This font has not been installed. The closest available font will be used."; - TEXT[ portuguese ] = "Este tipo de letra no est instalado. Ser utilizado o tipo de letra disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ( ) ."; - TEXT[ dutch ] = "Dit lettertype is niet genstalleerd. Het meest overeenkomende voorhanden zijnde type wordt gebruikt."; - TEXT[ french ] = "Ce type de police n'a pas t install. Le type de police le plus appropri va tre utilis."; -diff -ur ../svtools/source/misc/errtxt.src ../svtools/source/misc/errtxt.src ---- ../svtools/source/misc/errtxt.src Wed Apr 3 16:13:33 2002 -+++ ../svtools/source/misc/errtxt.src Fri Apr 5 17:44:20 2002 -@@ -2836,7 +2836,7 @@ - Text [ dutch ] = "Om een channel te installeren heeft u een abonnementenmap nodig."; - Text [ spanish ] = "Para instalar un canal necesita una carpeta de suscripciones."; - Text[ chinese_simplified ] = "如果要安装频道，您就需要先创建一个订阅文件夹。"; -- Text[ russian ] = " Channel ."; -+ Text[ russian ] = " Channel ."; - Text[ polish ] = "Instalacja kanau wymaga utworzenia folderu subkrypcji."; - Text[ japanese ] = "チャンネルをインストールするには購読フォルダが必要です。"; - Text[ chinese_traditional ] = "如果要安裝頻道﹐您就需要建立一個訂閱資料夾"; -diff -ur ../svx/source/dialog/lingu.src ../svx/source/dialog/lingu.src ---- ../svx/source/dialog/lingu.src Wed Apr 3 16:10:44 2002 -+++ ../svx/source/dialog/lingu.src Fri Apr 5 19:04:25 2002 -@@ -402,7 +402,7 @@ - TEXT [ spanish ] = "no est disponible para la revisin ortogrfica.\nRevise su instalacin e instale,\nsi es necesario, el idioma deseado" ; - TEXT [ english_us ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = " 无法提供拼写检查功能。请检查安装的程序，如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "jest niedostpne do sprawdzania. \nProsz sprawdzi instalacj i zainstalowa \n ewentualnie potrzebny jzyk."; - TEXT[ japanese ] = "はスペルチェックに使用できません。\nプログラムのインストールをチェックして\n必要ならばその言語をインストールしてください。"; - TEXT[ chinese_traditional ] = " 無法提供拼寫檢查功能。\n請檢查安裝的程式﹐若有必要﹐\n請您安裝要使用的語言版本。"; -@@ -489,7 +489,7 @@ - TEXT [ spanish ] = "No existe un diccionario de sinnimos para el idioma seleccionado. \nCompruebe por favor su instalacin\n e instale, si es necesario, el idioma deseado" ; - TEXT [ english_us ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = "您设定的语言没有附加同义词词典功能。\n请您检查的安装程序。\n如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - TEXT[ japanese ] = "選択した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、\n必要ならば、希望の言語をインストールしてください。"; - TEXT[ chinese_traditional ] = "您設定的語言版本沒有附加同義詞詞典功能。\n請您檢查安裝的程式。\n若有必要﹐請您安裝要使用的語言版本。"; -diff -ur ../svx/source/items/svxerr.src ../svx/source/items/svxerr.src ---- ../svx/source/items/svxerr.src Wed Apr 3 16:10:47 2002 -+++ ../svx/source/items/svxerr.src Fri Apr 5 19:03:00 2002 -@@ -263,7 +263,7 @@ - Text [ portuguese ] = "O dicionrio de sinnimos no se encontra disponvel para a lngua especificada.\nConfira a sua instalao e, se necessrio, instale a lngua desejada." ; - Text [ portuguese_brazilian ] = "Ein Thesaurus f? die eingestellte Sprache ist nicht verf?bar.\n?berpr?en Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "您所设定的语言没有相应的同义词词典。\n请您检查安装，如有必要，请您安装所要使用的语言版本。"; -- Text[ russian ] = " .\n, . , , "; -+ Text[ russian ] = " .\n, . , , "; - Text[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka.\nProsz sprawdzi instalacj i zainstalowa potrzebny jzyk."; - Text[ japanese ] = "設定した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、必要ならば希望の言語をインストールしてください。"; - Text[ chinese_traditional ] = "您所設定的語言沒有相應的同義詞詞典。\n請您檢查安裝﹐若有必要﹐請安裝所要使用的語言版本。"; -@@ -283,7 +283,7 @@ - TEXT [ English ] = "$(ARG1) is not available or is currently not active.\nPlease check your installation and install the desired language\nor activate in 'Tools - Options - Language Settings - Writing Aids' the desired module." ; - TEXT[ english_us ] = "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options - Language Settings - Writing Aids'."; - TEXT[ portuguese ] = "$(ARG1) no tem suporte para verificao ortogrfica ou encontra-se desactivado. \nConfira a sua instalao e, se necessrio, instale o mdulo lingustico desejado\nou ento active-o em 'Ferramentas - Opes - Configurao da lngua - Lingustica'."; -- TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; -+ TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; - TEXT[ greek ] = "$(ARG1) .\n ? "; - TEXT[ dutch ] = "$(ARG1) wordt niet ondersteund door de controle, resp. is momenteel niet geactiveerd. \nControleer uw installatie en installeer eventueel de gewenste taalmodule\nresp. activeer de betreffende taalmodule onder 'Extra - Opties - Taalinstellingen - Lingustiek' "; - TEXT[ french ] = "$(ARG1) n'est pas support par la vrification ou n'est actuellement pas actif.\nVrifiez l'installation et installez le cas chant le module de langue requis, ou activez-le sous 'Outils - Options - Paramtres linguistiques - Linguistique'."; -diff -ur ../sw/source/ui/envelp/envelp.src ../sw/source/ui/envelp/envelp.src ---- ../sw/source/ui/envelp/envelp.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envelp.src Fri Apr 5 17:46:34 2002 -@@ -109,7 +109,7 @@ - Text [ spanish ] = "No se han instalado controladores de bases de datos." ; - Text [ english_us ] = "No database drivers installed." ; - Text[ chinese_simplified ] = "没有安装数据库驱动程序。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Nie zainstalowany sterownik bazy danych."; - Text[ japanese ] = "データベースドラバがインストールされていません。"; - Text[ chinese_traditional ] = "沒有安裝資料庫驅動程式。"; -diff -ur ../sw/source/ui/envelp/envprt.src ../sw/source/ui/envelp/envprt.src ---- ../sw/source/ui/envelp/envprt.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envprt.src Fri Apr 5 17:46:48 2002 -@@ -335,7 +335,7 @@ - Text [ PORTUGUESE ] = "- Nenhuma impressora instalada -" ; - Left = TRUE ; - Text[ chinese_simplified ] = "- 没有安装打印机 -"; -- Text[ russian ] = "- -"; -+ Text[ russian ] = "- -"; - Text[ polish ] = "- Drukarka nie jest zainstalowana -"; - Text[ japanese ] = "- プリンタがインストールされていません -"; - Text[ chinese_traditional ] = "- 沒有安裝印表機 -"; -diff -ur ../sysui/unix/office/cde/group.lng ../sysui/unix/office/cde/group.lng ---- ../sysui/unix/office/cde/group.lng Wed Apr 3 16:15:07 2002 -+++ ../sysui/unix/office/cde/group.lng Fri Apr 5 17:40:12 2002 -@@ -52,7 +52,7 @@ - 01 = "Information and Setup" - 49 = "Information und Setup" - 0 = "Informacja i instalacja" --7 = " " -+7 = " " - 55 = "Information und Setup" - 37 = "Information und Setup" - 03 = "Informao e instalao" -@@ -71,7 +71,7 @@ - 88 = "資訊和安裝程式" - 90 = "Information und Setup" - 96 = "Information und Setup" --07 = " " -+07 = " " - - [<template_control_label>] - 01 = "From Template" -@@ -102,7 +102,7 @@ - 01 = "%PRODUCTNAME Setup" - 49 = "%PRODUCTNAME Setup" - 0 = "Instalacja %PRODUCTNAME" --7 = " %PRODUCTNAME" -+7 = " %PRODUCTNAME" - 55 = "%PRODUCTNAME Setup" - 37 = "%PRODUCTNAME Configuraci" - 03 = "%PRODUCTNAME Setup" -@@ -121,7 +121,7 @@ - 88 = "%PRODUCTNAME 安裝程式" - 90 = "%PRODUCTNAME Setup" - 96 = " %PRODUCTNAME " --07 = " %PRODUCTNAME" -+07 = " %PRODUCTNAME" - - [<printeradmin_action_label>] - 01 = "%PRODUCTNAME Printer Administration" -diff -ur ../uui/source/ids.src ../uui/source/ids.src ---- ../uui/source/ids.src Wed Apr 3 16:12:58 2002 -+++ ../uui/source/ids.src Fri Apr 5 17:45:53 2002 -@@ -1117,7 +1117,7 @@ - Text[english] = "The installed Java version is not supported"; - Text[ english_us ] = "The installed Java version is not supported"; - Text[ portuguese ] = "A verso Java instalada no tem suporte."; -- Text[ russian ] = " Java ."; -+ Text[ russian ] = " Java ."; - Text[ greek ] = "The installed Java version is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund"; - Text[ french ] = "La version de Java installe n'est pas supporte."; -@@ -1143,7 +1143,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte."; -- Text[ russian ] = " Java $(ARG1) ."; -+ Text[ russian ] = " Java $(ARG1) ."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte."; -@@ -1168,7 +1168,7 @@ - Text[english] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ english_us ] = "The installed Java version is not supported, at least version $(ARG1) is required"; - Text[ portuguese ] = "A verso Java instalada no tem suporte. Verso mnima necessria: $(ARG1)"; -- Text[ russian ] = " Java . , $(ARG1)."; -+ Text[ russian ] = " Java . , $(ARG1)."; - Text[ greek ] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund. Minstens versie $(ARG1) wordt benodigd"; - Text[ french ] = "La version de Java installe n'est pas supporte. Version minimum requise : $(ARG1)."; -@@ -1194,7 +1194,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte. Verso mnima necessria: $(ARG2)"; -- Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; -+ Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund. Minstens versie $(ARG2) wordt benodigd"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte. Version minimum requise : $(ARG2)."; -diff -ur ../vcl/source/src/stdtext.src ../vcl/source/src/stdtext.src ---- ../vcl/source/src/stdtext.src Wed Apr 3 16:10:54 2002 -+++ ../vcl/source/src/stdtext.src Fri Apr 5 19:02:38 2002 -@@ -71,7 +71,7 @@ - Text [ English ] = "The component (%s) could not be loaded.\nPlease start setup in repair mode." ; - Text[ english_us ] = "The component (%s) could not be loaded.\nPlease start setup with the repair option."; - Text[ portuguese ] = "Impossvel carregar o componente (%s).\nReinicie o setup com a opo 'Reparao'."; -- Text[ russian ] = " (%s) .\n ."; -+ Text[ russian ] = " (%s) .\n ."; - Text[ dutch ] = "Een component (%s) kon niet worden geladen.\nStart setup opnieuw met de optie Reparatie."; - Text[ french ] = "Impossible de charger l'un des composants (%s).\nVeuillez redmarrer le programme d'installation (Setup) et excuter une rparation."; - Text[ spanish ] = "No se pudo cargar un componente (%s).\nInicie por favor el programa de instalacin y ejecute una Reparacin."; -diff -ur ../wizards/source/formwizard/dbwizres.src ../wizards/source/formwizard/dbwizres.src ---- ../wizards/source/formwizard/dbwizres.src Wed Apr 3 16:11:48 2002 -+++ ../wizards/source/formwizard/dbwizres.src Fri Apr 5 17:48:56 2002 -@@ -283,7 +283,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Formulare starten zu knnen."; - Text [ english_us] = "No database has been installed. At least one database is required before the AutoPilot for forms can be started."; - Text[ portuguese ] = "Nenhuma base de dados instalada. Para poder activar o AutoPiloto de formulrios necessria, pelo menos, uma base de dados."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft minstens n database nodig om de AutoPiloot voor formulieren te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de formulaire."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para formularios."; -@@ -2675,7 +2675,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Abfragen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for queries."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para consultas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor query's te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de requte."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para consultas."; -@@ -3605,7 +3605,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Berichte starten zu knnen."; - Text [ english_us ] = "A database has not been installed. There must be at least one database on the system so that the AutoPilot Report can be started."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para relatrios."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor berichten te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote d'tats."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para informes."; -@@ -4609,7 +4609,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mind. eine Datenbank um den AutoPiloten fr Tabellen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for tables."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para iniciar o AutoPiloto para tabelas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft ten minste n database nodig om de autopiloot voor tabellen te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de table."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para tablas."; diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 697540671fe2..6bd28fccbf48 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.0.2 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ @@ -31,12 +30,14 @@ GREP?= /usr/bin/grep MOUNT?= /sbin/mount ZIP?= ${PREFIX}/bin/zip UNZIP?= ${PREFIX}/bin/unzip +ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh PASTE?= /usr/bin/paste .include <bsd.port.pre.mk> INSTALLATION_BASEDIR= OpenOffice.org1.0 +BUILD_NR= 641 DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -104,11 +105,12 @@ CXX= g++32 EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org -.if !defined(USE_GCC) -BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport -.endif +#.if !defined(USE_GCC) +#BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport +#.endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) @@ -133,7 +135,7 @@ USE_AUTOCONF= yes WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -153,11 +155,12 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ - --with-os-version=${OSVERSION} + --with-os-version=${OSVERSION} \ + --with-ant-home=${LOCALBASE}/ -.if !defined(USE_GCC) -CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} -.endif +#.if !defined(USE_GCC) +#CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} +#.endif .if defined(WITH_DEBUG) .if ${WITH_DEBUG} == 2 @@ -464,8 +467,8 @@ do-build: .endif @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) - @${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo index 2ed3b84d0aa0..990a3b17fa95 100644 --- a/editors/openoffice/distinfo +++ b/editors/openoffice/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 34f2ca644b7d70573148c82d64eb6064 +MD5 (openoffice/OOo_1.0.2_source.tar.bz2) = 8a82b4dbdd4e305b6f6db70ea65dce8c MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 diff --git a/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch index 97fec46bcef4..9540987d0f65 100644 --- a/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch +++ b/editors/openoffice/files/patch-berkeleydb+db-3.2.9.patch @@ -1,82 +1,132 @@ ---- ../berkeleydb/db-3.2.9.patch.orig Mon Mar 18 15:53:40 2002 -+++ ../berkeleydb/db-3.2.9.patch Mon Apr 15 18:43:43 2002 -@@ -47,17 +47,27 @@ - --- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 - *************** - *** 1795,1800 **** ----- 1795,1802 ---- -+--- 1795,1803 ---- - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; - + netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; -++ freebsd*) JINCSUBDIRS="freebsd genunix";; - *) JINCSUBDIRS="genunix";; - esac - - --- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 - +++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -+@@ -984,7 +984,7 @@ +--- ../berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 ++++ ../berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 +@@ -45,52 +45,82 @@ + CCLINK= @MAKEFILE_CCLINK@ + *** misc/db-3.2.9/dist/configure Wed Jan 24 10:16:18 2001 + --- misc/build/db-3.2.9/dist/configure Tue Jan 7 11:37:05 2003 +-*************** +-*** 995,1000 **** +---- 995,1001 ---- +- CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" +- LIBS="-lsocket -lsvipc $LIBS";; +-+ netbsd*) optimize_def="-O2";; +- osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; +- *qnx) cat >> confdefs.h <<\EOF +- #define HAVE_QNX 1 +-*************** +-*** 1795,1800 **** +---- 1796,1803 ---- +- case "$host_os" in +- solaris*) JINCSUBDIRS="solaris";; +- linux*) JINCSUBDIRS="linux genunix";; +-+ irix*) JINCSUBDIRS="irix";; +-+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +- *) JINCSUBDIRS="genunix";; +- esac +- ++@@ -984,9 +984,9 @@ + optimize_def="-O2" + LIBS="-lipc $LIBS";; + bsdi*) optimize_def="-O2";; +-freebsd*) optimize_def="-O2" ++- CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" ++- LIBS="-pthread";; ++freebsd*) optimize_def="-O" -+ CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" -+ LIBS="-pthread";; +++ CPPFLAGS="$PTHREAD_CFLAGS $CPPFLAGS" +++ LIBS="$PTHREAD_LIBS";; + hpux*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - @@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" -@@ -68,13 +78,22 @@ - #define HAVE_QNX 1 - --- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 - +++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 --@@ -1194,11 +1194,12 @@ -+@@ -1194,11 +1194,23 @@ - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva ++ irix*) optimize_def="-O2" ++ CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";; ++@@ -995,6 +995,7 @@ ++ CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" ++ LIBS="-lsocket -lsvipc $LIBS";; +++netbsd*) optimize_def="-O2";; ++ osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; ++ *qnx) cat >> confdefs.h <<\EOF ++ #define HAVE_QNX 1 ++@@ -1795,6 +1796,9 @@ ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; +++ irix*) JINCSUBDIRS="irix";; +++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; +++ freebsd*) JINCSUBDIRS="freebsd genunix";; ++ *) JINCSUBDIRS="genunix";; ++ esac ++ + *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 + --- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 +-*************** +-*** 1194,1204 **** +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-- else +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +- fi +- ;; +- +---- 1194,1205 ---- +- +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' +- # can we support soname and/or expsyms with a.out? -oliva +-+ else +-+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +-+ need_version=no +- fi +- ;; +- ++@@ -1194,11 +1194,12 @@ ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ++- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++- else ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva ++ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - else +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ need_version=no -++ fi -++ ;; -++ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - + else -@@ -84,3 +103,24 @@ - fi - ;; - -+@@ -2019,6 +2031,20 @@ -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' ++ fi ++ ;; ++ ++@@ -1365,10 +1366,13 @@ ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd*) ++- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' +++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname \ +++ ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no +++ need_version=no ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++@@ -2020,6 +2024,14 @@ + soname_spec='${libname}${release}.so$major' + dynamic_linker='NetBSD ld.elf_so' -++ fi ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd*) ++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -+ fi +++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' +++ soname_spec='${libname}${release}.so$major' +++ dynamic_linker='FreeBSD ld.elf_so' + shlibpath_var=LD_LIBRARY_PATH + ;; ++ diff --git a/editors/openoffice/files/patch-config_office+configure.in b/editors/openoffice/files/patch-config_office+configure.in index 2957c2be79d2..f98720a8c3ae 100644 --- a/editors/openoffice/files/patch-config_office+configure.in +++ b/editors/openoffice/files/patch-config_office+configure.in @@ -1,187 +1,46 @@ ---- configure.in.orig Sat Jun 8 02:49:26 2002 -+++ configure.in Mon Jul 15 13:36:23 2002 -@@ -28,6 +28,11 @@ - - Usage: --enable-gcc3 - ],,) -+AC_ARG_ENABLE(debug, -+[ --enable-debug if you like to build with debug symbols -+ -+ Usage: --enable-debug -+],,) - AC_ARG_WITH(stlport4-home, - [ --with-stlport4-home The location that STLport4 is installed in. The STL - header files are assumed to be in stlport4-home/stlport -@@ -103,6 +108,12 @@ - - Usage: --with-asm-home=<path to ml.exe directory> - ],,) -+AC_ARG_WITH(os-version, -+[ --with-os-version For FreeBSD users, use this option option to build OpenOffice -+ with the correct OSVERSION. -+ -+ Usage: --with-os-version=<OSVERSION> -+],,) - AC_ARG_WITH(unzip-home, - [ --with-unzip-home For Windows users, please supply the path for - unzip.exe. -@@ -241,7 +252,7 @@ - if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then - AC_PROG_CC - fi --if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then -+if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then - dnl ****************************************** - dnl Testing for GNU compiler and version... - dnl ****************************************** -@@ -366,8 +377,9 @@ - _gcc_include_path="NO_GCC_INCLUDE" - fi - else -- if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then -- _gcc_include_path="/usr/include/g++" -+ if test "$_os" = "NetBSD" ; then -+ _gcc_include_path="/usr" -+ _gxx_include_path="/usr/include/g++" - else - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) - AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn -@@ -408,6 +420,71 @@ - fi +--- configure.in.orig Thu Jan 16 13:42:46 2003 ++++ configure.in Tue Jan 21 23:09:35 2003 +@@ -352,10 +352,7 @@ + if test "$COMPATH" != "NO_GCC"; then + AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi - fi -+if test "$_os" = "FreeBSD"; then -+ dnl ****************************************** -+ dnl Testing for GNU compiler and version... -+ dnl Adapted to the FreeBSD ports system -+ dnl ****************************************** -+ dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3 -+ if test -n "$enable_gcc3"; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" -+ fi -+ if test -z "$CC"; then -+ CC="cc"; -+ fi -+ if test -z "$CXX"; then -+ CXX="c++"; -+ fi -+ if which $CC; then -+ _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'` -+ _gcc_version=`$CC -dumpversion` -+ _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'` -+ _gcc_machine=`$CC -dumpmachine` -+ else -+ COMPATH="NO_GCC" -+ fi -+ if test -n "$enable_gcc3"; then -+ if test "$_gcc_major" != "3"; then -+ AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested]) -+ COMPATH="NO_GCC" -+ fi -+ else -+ if test "$_gcc_major" != "2"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ if test "$_gcc_middle" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ else -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ if test "$_gcc_minor" = "false"; then -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) -+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn -+ COMPATH="NO_GCC" -+ fi -+ fi -+ fi -+ fi -+ if test "$COMPATH" != "NO_GCC"; then -+ if test $CC != "gcc" -o $CC != "cc"; then -+ _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include" -+ _gxx_include_path="$_gcc_include_path/g++" -+ else -+ _gcc_include_path="$PREFIX" -+ _gxx_include_path="$_gcc_include_path/g++" -+ fi -+ else -+ AC_MSG_WARN([no gcc compiler found]) -+ AC_MSG_WARN([no gcc compiler found]) >> warn -+ fi +- +-dnl Set the include paths +- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +-fi +fi -+ - if test "$_os" = "Darwin"; then - if test "$CC" = "cc"; then - AC_PATH_PROGS(_cc, cc) -@@ -589,6 +666,26 @@ - fi - fi -+dnl ************************************************************* -+dnl Testing for exception handling - dwarf2 or sjlj exceptions... -+dnl ************************************************************* -+AC_MSG_CHECKING([try to compile exception code]) -+AC_LANG_SAVE -+AC_LANG_CPLUSPLUS -+AC_CACHE_VAL(exceptions_type, [AC_TRY_LINK( -+ [#include <iostream> -+ -+extern "C" void __sjthrow(void) __attribute__ ((__noreturn__)); -+ -+ ], -+ [__sjthrow() ], -+ [exceptions_type="sjlj"], -+ [exceptions_type="dwarf2"]) -+]) -+ -+AC_MSG_RESULT(Exceptions type: $exceptions_type) -+AC_LANG_RESTORE -+ - dnl ************************************************************** - dnl Testing for required Solaris and workshop compiler patches... - dnl ************************************************************** -@@ -815,6 +912,10 @@ - fi - if test "$_os" = "NetBSD"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` -+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then -+ _jdk_minor="true" -+ fi - fi - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1170,6 +1271,12 @@ - USE_GCC3="FALSE" + dnl =================================================================== + dnl Search all the common names for GNU make +@@ -553,14 +550,27 @@ fi -+if test -n "$enable_debug"; then -+ ENABLE_DEBUG="TRUE" + dnl =================================================================== +-dnl Set the gxx include directories ++dnl Set the gcc/gxx include directories + dnl =================================================================== ++if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then + if test "$GXX" = "yes"; then +- _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` ++ if test -n "$enable_gcc3"; then ++ _gccincname1="g++-v3" ++ else ++ _gccincname1="g++-3" ++ fi ++ _gcc_include_path=".." ++ _gxx_include_path="$_gcc_include_path/$_gccincname1" ++fi +else -+ ENABLE_DEBUG="FALSE" ++if test "$GXX" = "yes"; then ++ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++ _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - \ ++ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` + dnl This is the original code... +-dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include ++dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include +fi -+ - # Print args passed to set_soenv. - if test 1 = 1; then - echo -@@ -1197,12 +1304,14 @@ - echo "\$MINGWIN32="$WITH_MINGWIN - echo "\$with_use_shell="$with_use_shell - echo "\$USE_GCC3="$USE_GCC3 -+echo "\$EXCEPTIONS="$exceptions_type -+echo "\$ENABLE_DEBUG="$ENABLE_DEBUG - echo fi +- - # Executing the set_soenv script to setup the environment variables. - if test -z "$enable_check_only"; then -- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 -+ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS $CC $CXX $exceptions_type $ENABLE_DEBUG - else - echo - echo Test Complete + dnl =================================================================== + dnl Extra checking for the SUN OS compiler diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1 deleted file mode 100644 index 0398428dc661..000000000000 --- a/editors/openoffice/files/patch-config_office+set_soenv.1 +++ /dev/null @@ -1,242 +0,0 @@ ---- set_soenv.1.orig Sun Jun 30 21:51:05 2002 -+++ set_soenv.1 Mon Oct 28 15:01:58 2002 -@@ -40,7 +40,7 @@ - # - # Set this value equal to the corresponding amount of - # command line arguments. --my $numArgs = 20; -+my $numArgs = 27; - # Determining the amount of arguments in the call. - my $numEnter = $#ARGV + 1; - if ( $numEnter != $numArgs ) -@@ -66,14 +66,15 @@ - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, - $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -- $TF_CFGDATA, $TF_SVDATA, -+ $TF_CFGDATA, $TF_SVDATA, $CC, $CXX, - $USE_NAMESPACE, $BUILD_SOSL, $LOCAL_SOLENV, $ENABLEUNICODE, $NEW_JAR_PACK, $NO_BSYMBOLIC, - $USE_XPRINT, $BUILD_SOSL_RELEASE ); - # - # Platform dependent constant values. - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, -- $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); -+ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -+ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -96,7 +97,7 @@ - $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, - $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, - $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, -- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 ); -+ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG); - # - #------------------------------------------- - # IId. Declaring the aliases. -@@ -145,7 +146,11 @@ - $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 - $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $USE_SHELL = $ARGV [ 18 ]; # preferred shell --$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) -+$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) -+$CC = $ARGV [ 23 ]; # get cc from environment -+$CXX = $ARGV [ 24 ]; # use c++ from environment -+$EXCEPTIONS = $ARGV [ 25 ]; # Exception handling type -+$ENABLE_DEBUG = $ARGV [ 26 ]; # Enable a debug build - # - #--------------------------------------------------------------- - # IIIb. Initialising the variables for the system commands, etc. -@@ -335,7 +340,14 @@ - $COMPATH = $ARGV[ 0 ]; - $CPU = "I"; - $CPUNAME = "INTEL"; -+if ($USE_GCC3 eq "TRUE") -+ { -+ $CVER = "C300"; -+ } -+else -+ { - $CVER = "C295"; -+} - $DLLSUFFIX = "fi"; - $GUI = "UNX"; - $GUIBASE = "unx"; -@@ -348,6 +360,9 @@ - $PATH_SEPERATOR = $ps; - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; -+ $OSVERSION = $ARGV[ 20 ]; -+ $PTHREAD_CFLAGS = $ARGV[ 21 ]; -+ $PTHREAD_LIBS = $ARGV[ 22 ]; - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -@@ -927,7 +942,7 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$USR_LOCAL.$LIB. -@@ -935,6 +950,13 @@ - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $LD_LIBRARY_PATH = $cur_dir. -+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -+ $ps.$par_dir.$LIB. -+ $ps_STLPORT_LIB. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; -+} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -970,15 +992,16 @@ - $D.$COM. - $D.$CVER. - $D.$GVER. -- $D."_PTHREADS". - $D.$OS. - $D.$CPUNAME; - if ($platform eq "$FreeBSD") --{ $SOLARDEF .= $D."X86"; -+{ $SOLARDEF .= $D."X86". -+ $D."OSVERSION=$OSVERSION". -+ " ".$PTHREAD_CFLAGS; - } - $SOLARDEF .= $D."_REENTRANT". - $D."_POSIX_PTHREAD_SEMANTICS"; --if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64")) -+if (($platform ne "$Tru64") && ( $platform ne "$Irix") && ( $platform ne "$Irix64") && ( $platform ne "FreeBSD" ) && ( $platform ne "NetBSD" )) - { $SOLARDEF .= $D."GLIBC=".$GLIBC; - } - $SOLARDEF .= $D."SUPD=$UPD". -@@ -995,7 +1018,7 @@ - $L.$USR_DT.$LIB. - $L.$USR_OPENWIN.$LIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. - $L.$LIB. - $L.$USR.$LIB. -@@ -1005,6 +1028,11 @@ - { $SOLAREXTRALIB = '"'.$L.$LIB. - $L.$USR.$LIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ -+ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.'"'; -+} -+ - # Compiler include search directory paths. - if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1076,7 +1104,7 @@ - $ps.$USR.$LIB. - $ps.$USR_LOCAL.$BIN; - } --elsif (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") or ($platform eq "$NetBSD") or ($platform eq "$Tru64") or ($platform eq "$Irix") or ($platform eq "$Irix64")) - { $PATH = $cur_dir. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1095,6 +1123,22 @@ - $ps.$USR.$ds."X11".$BIN. - $ps.$USR.$LIB; - } -+elsif ($platform eq "$FreeBSD") -+{ $PATH = $cur_dir. -+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. -+ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -+ $ps.'$SOLARENV'.$BIN. -+ $ps.'$JAVA_HOME'.$BIN. -+ -+ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler); -+ -+ $PATH .= $ps.$USR.$ds."sbin". -+ $ps.$USR.$ds."X11R6".$ds."bin". -+ $ps.$USR_LOCAL.$BIN. -+ $ps.$USR_LOCAL.$ds."sbin"; -+ $ps.$USR.$LIB; -+} -+ - elsif ($platform eq "$Winnt") - { - my ( $noldPATH ); -@@ -1195,7 +1239,7 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } --elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) - { $SOLARLIB = '"'.$L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1210,6 +1254,15 @@ - $L_STLPORT_LIB. - $L.$XLIB.'"'; - } -+elsif ($platform eq "$FreeBSD") -+{ $SOLARLIB = '"'.$L.$par_dir.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -+ $L.'$JAVA_HOME'.$LIB. -+ $L_STLPORT_LIB. -+ $L.$XLIB.'"'; -+} - elsif ($platform eq "$Winnt") - { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1242,7 +1295,7 @@ - $SOLARINC .= $I.$USR.$INCLUDE; - } - $SOLARINC .= $STLPORT_stlport; --if ($platform eq "$Linux") -+if ($platform eq "$Linux" || $platform eq "$FreeBSD") - { - # This simply adds an include path, so even cases that break the FHS work - $SOLARINC .= $STLPORT_inc_stlport; -@@ -1256,11 +1309,6 @@ - { $SOLARINC .= $I.'$COMPATH'.$ds."include"; - } - --if ($platform eq "$Linux") --{ --# This simply adds an include path, so even cases that break the FHS work --$SOLARINC .= $STLPORT_inc_stlport; --} - $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". - $I.'$JAVA_HOME'.$INCLUDE; - -@@ -1428,6 +1476,9 @@ - ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); - ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); - ToFile( "TF_FILTER", "TRUE", "e" ); -+if ($ENABLE_DEBUG eq "TRUE") { -+ToFile( "debug", "true", "e" ); -+} - if ( $platform ne "$Macosx" ) - { ToFile( "PSPRINT", "TRUE", "e" ); - } elsif ( $GUIBASE eq "unx" ) { -@@ -1453,6 +1504,12 @@ - ToFile( "GUIENV", $GUIENV, "e" ); - ToFile( "GVER", $GVER, "e" ); - ToFile( "OS", $OS, "e" ); -+ToFile( "CC", $CC, "e" ); -+ToFile( "CXX", $CXX, "e" ); -+ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" ); -+ToFile( "OSVERSION", $OSVERSION, "e" ); -+ToFile( "PTHREAD_CFLAGS", $PTHREAD_CFLAGS, "e" ); -+ToFile( "PTHREAD_LIBS", $PTHREAD_LIBS, "e" ); - ToFile( "OUTPATH", $OUTPATH, "e" ); - ToFile( "INPATH", $INPATH, "e" ); - ToFile( "GVERDIR", $GVERDIR, "e" ); diff --git a/editors/openoffice/files/patch-connectivity+source+parse+sqlbison.y b/editors/openoffice/files/patch-connectivity+source+parse+sqlbison.y deleted file mode 100644 index 250c7f7e5b1b..000000000000 --- a/editors/openoffice/files/patch-connectivity+source+parse+sqlbison.y +++ /dev/null @@ -1,98 +0,0 @@ ---- ../connectivity/source/parse/sqlbison.y.orig Fri May 31 15:21:42 2002 -+++ ../connectivity/source/parse/sqlbison.y Thu Nov 7 00:06:38 2002 -@@ -134,21 +134,6 @@ - %token <pParseNode> SQL_TOKEN_STRING SQL_TOKEN_ACCESS_DATE SQL_TOKEN_INT SQL_TOKEN_REAL_NUM - %token <pParseNode> SQL_TOKEN_INTNUM SQL_TOKEN_APPROXNUM SQL_TOKEN_NOT SQL_TOKEN_NAME - -- /* operators */ --%left <pParseNode> SQL_TOKEN_NAME --%left <pParseNode> SQL_TOKEN_OR --%left <pParseNode> SQL_TOKEN_AND -- --%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ --%left <pParseNode> '+' '-' --%left <pParseNode> '*' '/' --%left <pParseNode> SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT --%left <pParseNode> ')' --%right <pParseNode> '=' --%right <pParseNode> '.' --%right <pParseNode> '(' -- -- - %nonassoc <pParseNode> SQL_TOKEN_UMINUS - - -@@ -157,31 +142,31 @@ - - %token <pParseNode> SQL_TOKEN_ALL SQL_TOKEN_ALTER SQL_TOKEN_AMMSC SQL_TOKEN_ANY SQL_TOKEN_AS SQL_TOKEN_ASC SQL_TOKEN_AT SQL_TOKEN_AUTHORIZATION SQL_TOKEN_AVG - --%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BIT_LENGTH SQL_TOKEN_BOTH SQL_TOKEN_BY -+%token <pParseNode> SQL_TOKEN_BETWEEN SQL_TOKEN_BIT SQL_TOKEN_BOTH SQL_TOKEN_BY - --%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHAR_LENGTH SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS --%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURSOR -+%token <pParseNode> SQL_TOKEN_CAST SQL_TOKEN_CHARACTER SQL_TOKEN_CHECK SQL_TOKEN_COLLATE SQL_TOKEN_COMMIT SQL_TOKEN_CONTINUE SQL_TOKEN_CONVERT SQL_TOKEN_COUNT SQL_TOKEN_CREATE SQL_TOKEN_CROSS -+%token <pParseNode> SQL_TOKEN_CURRENT SQL_TOKEN_CURSOR - - %token <pParseNode> SQL_TOKEN_DATE SQL_TOKEN_DAY SQL_TOKEN_DEC SQL_TOKEN_DECIMAL SQL_TOKEN_DECLARE SQL_TOKEN_DEFAULT SQL_TOKEN_DELETE SQL_TOKEN_DESC - %token <pParseNode> SQL_TOKEN_DISTINCT SQL_TOKEN_DOUBLE SQL_TOKEN_DROP - --%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_EXTRACT SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL -+%token <pParseNode> SQL_TOKEN_ESCAPE SQL_TOKEN_EXCEPT SQL_TOKEN_EXISTS SQL_TOKEN_FALSE SQL_TOKEN_FETCH SQL_TOKEN_FLOAT SQL_TOKEN_FOR SQL_TOKEN_FOREIGN SQL_TOKEN_FOUND SQL_TOKEN_FROM SQL_TOKEN_FULL - --%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_HOUR SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INSERT SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT -+%token <pParseNode> SQL_TOKEN_GRANT SQL_TOKEN_GROUP SQL_TOKEN_HAVING SQL_TOKEN_IN SQL_TOKEN_INDICATOR SQL_TOKEN_INNER SQL_TOKEN_INTEGER SQL_TOKEN_INTO SQL_TOKEN_IS SQL_TOKEN_INTERSECT - --%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LEFT SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER SQL_TOKEN_MINUTE SQL_TOKEN_MONTH -+%token <pParseNode> SQL_TOKEN_JOIN SQL_TOKEN_KEY SQL_TOKEN_LEADING SQL_TOKEN_LIKE SQL_TOKEN_LOCAL SQL_TOKEN_LOWER - %token <pParseNode> SQL_TOKEN_MAX SQL_TOKEN_MIN SQL_TOKEN_NATURAL SQL_TOKEN_NCHAR SQL_TOKEN_NULL SQL_TOKEN_NUMERIC - - %token <pParseNode> SQL_TOKEN_OCTECT_LENGTH SQL_TOKEN_OF SQL_TOKEN_ON SQL_TOKEN_OPTION SQL_TOKEN_ORDER SQL_TOKEN_OUTER - --%token <pParseNode> SQL_TOKEN_POSITION SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC --%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK SQL_TOKEN_RIGHT -+%token <pParseNode> SQL_TOKEN_PRECISION SQL_TOKEN_PRIMARY SQL_TOKEN_PRIVILEGES SQL_TOKEN_PROCEDURE SQL_TOKEN_PUBLIC -+%token <pParseNode> SQL_TOKEN_REAL SQL_TOKEN_REFERENCES SQL_TOKEN_ROLLBACK - --%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SECOND SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUBSTRING SQL_TOKEN_SUM -+%token <pParseNode> SQL_TOKEN_SCHEMA SQL_TOKEN_SELECT SQL_TOKEN_SET SQL_TOKEN_SIZE SQL_TOKEN_SMALLINT SQL_TOKEN_SOME SQL_TOKEN_SQLCODE SQL_TOKEN_SQLERROR SQL_TOKEN_SUM - - %token <pParseNode> SQL_TOKEN_TABLE SQL_TOKEN_TIME SQL_TOKEN_TIMESTAMP SQL_TOKEN_TIMEZONE_HOUR SQL_TOKEN_TIMEZONE_MINUTE SQL_TOKEN_TO SQL_TOKEN_TRAILING SQL_TOKEN_TRANSLATE SQL_TOKEN_TRIM SQL_TOKEN_TRUE SQL_TOKEN_UNION - %token <pParseNode> SQL_TOKEN_UNIQUE SQL_TOKEN_UNKNOWN SQL_TOKEN_UPDATE SQL_TOKEN_UPPER SQL_TOKEN_USAGE SQL_TOKEN_USER SQL_TOKEN_USING SQL_TOKEN_VALUES SQL_TOKEN_VIEW --%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_YEAR SQL_TOKEN_ZONE -+%token <pParseNode> SQL_TOKEN_WHERE SQL_TOKEN_WITH SQL_TOKEN_WORK SQL_TOKEN_ZONE - - /* ODBC KEYWORDS */ - %token <pParseNode> SQL_TOKEN_CALL SQL_TOKEN_D SQL_TOKEN_FN SQL_TOKEN_T SQL_TOKEN_TS SQL_TOKEN_OJ -@@ -204,6 +189,22 @@ - %token <pParseNode> SQL_TOKEN_LOG10 SQL_TOKEN_MOD SQL_TOKEN_PI SQL_TOKEN_POWER SQL_TOKEN_RADIANS SQL_TOKEN_RAND - %token <pParseNode> SQL_TOKEN_ROUND SQL_TOKEN_SIGN SQL_TOKEN_SIN SQL_TOKEN_SQRT SQL_TOKEN_TAN SQL_TOKEN_TRUNCATE - -+ -+ /* operators */ -+%left SQL_TOKEN_NAME -+%left <pParseNode> SQL_TOKEN_OR -+%left <pParseNode> SQL_TOKEN_AND -+ -+%left <pParseNode> LESSEQ GREATEQ NOTEQUAL LESS GREAT EQUAL /* '<' '>' = <> < > <= >= != */ -+%left <pParseNode> '+' '-' -+%left <pParseNode> '*' '/' -+%left SQL_TOKEN_NATURAL SQL_TOKEN_CROSS SQL_TOKEN_FULL SQL_TOKEN_LEFT SQL_TOKEN_RIGHT -+%left ')' -+%right '=' -+%right '.' -+%right '(' -+ -+ - %token <pParseNode> SQL_TOKEN_INVALIDSYMBOL - - /*%type <pParseNode> sql_single_statement */ -@@ -3019,7 +3020,7 @@ - } - else - YYERROR; -- } -+ }; - %% - - diff --git a/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx deleted file mode 100644 index 8abdf74d97b8..000000000000 --- a/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 -+++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 -@@ -65,7 +65,7 @@ - // NOT FULLY DECLARED SERVICES - #include <string.h> - #include <stdio.h> --#if defined(WNT) || defined(LINUX) -+#if defined(WNT) || defined(LINUX) || defined(FREEBSD) - #include <stdarg.h> - #else - #include <sys/varargs.h> diff --git a/editors/openoffice/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice/files/patch-desktop+source+pkgchk_packages.cxx new file mode 100644 index 000000000000..7b01e4f554b5 --- /dev/null +++ b/editors/openoffice/files/patch-desktop+source+pkgchk_packages.cxx @@ -0,0 +1,13 @@ +--- ../desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 ++++ ../desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 +@@ -124,6 +124,10 @@ + static char const s_platform_path [] = "/macosx_powerpc.plt"; + #elif defined (NETBSD) && defined (SPARC) + static char const s_platform_path [] = "/netbsd_sparc.plt"; ++#elif defined (FREEBSD) && defined (INTEL) ++static char const s_platform_path [] = "/freebsd_x86.plt"; ++#elif defined (FREEBSD) && defined (SPARC) ++static char const s_platform_path [] = "/freebsd_sparc.plt"; + #else + #error "unkonwn platform" + insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice/files/patch-freetype+makefile.mk b/editors/openoffice/files/patch-freetype+makefile.mk index 9c238f45b04d..802c6b4d1a8b 100644 --- a/editors/openoffice/files/patch-freetype+makefile.mk +++ b/editors/openoffice/files/patch-freetype+makefile.mk @@ -1,24 +1,24 @@ ---- ../freetype/makefile.mk.orig Tue Feb 26 12:21:37 2002 -+++ ../freetype/makefile.mk Thu Aug 1 00:51:46 2002 -@@ -79,7 +79,11 @@ +--- ../freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 ++++ ../freetype/makefile.mk Sat Jan 18 13:39:03 2003 +@@ -86,7 +86,11 @@ + .IF "$(GUI)"=="UNX" #relative to CONFIGURE_DIR CONFIGURE_ACTION=$(GNUMAKE) - .IF "$(GUI)"=="UNX" -CONFIGURE_FLAGS=setup +.IF "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O" -+.ELSE # "$(debug)"=="" ++.ELSE # "$(debug)"=="" +CONFIGURE_FLAGS=setup CFLAGS="-O -g -ggdb" -+.ENDIF # "$(debug)"=="" - .ELSE # "$(GUI)"=="UNX" - CONFIGURE_FLAGS=setup visualc - .ENDIF # "$(GUI)"=="UNX" -@@ -90,7 +94,7 @@ - .IF "$(GUI)"=="UNX" - OUT2LIB= \ - objs$/.libs$/libfreetype.a \ -- objs$/.libs$/libfreetype.so.6* -+ objs$/.libs$/libfreetype.so.7 - - .ENDIF # "$(GUI)"=="UNX" ++.ENDIF + BUILD_DIR=$(CONFIGURE_DIR) + BUILD_ACTION=$(GNUMAKE) +@@ -95,6 +99,8 @@ + objs$/.libs$/libfreetype.a + .IF "$(OS)"=="MACOSX" + OUT2LIB+=objs$/.libs$/libfreetype.*.dylib ++.ELIF "$(OS)"=="FREEBSD" ++OUT2LIB+=objs$/.libs$/libfreetype.so.7* + .ELSE + OUT2LIB+=objs$/.libs$/libfreetype.so.6* + .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice/files/patch-idl+util+makefile.mk b/editors/openoffice/files/patch-idl+util+makefile.mk deleted file mode 100644 index 2543593dd210..000000000000 --- a/editors/openoffice/files/patch-idl+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ../idl/util/makefile.mk.orig Sun Jul 21 00:02:37 2002 -+++ ../idl/util/makefile.mk Sun Jul 21 00:02:39 2002 -@@ -110,7 +110,7 @@ - .ENDIF - .ENDIF - --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - APP1STDLIBS+=-lcrypt - .ENDIF - diff --git a/editors/openoffice/files/patch-nas+nas-1.4.1.patch b/editors/openoffice/files/patch-nas+nas-1.4.1.patch index cde27322f62f..5432812bb50c 100644 --- a/editors/openoffice/files/patch-nas+nas-1.4.1.patch +++ b/editors/openoffice/files/patch-nas+nas-1.4.1.patch @@ -1,11 +1,41 @@ ---- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001 -+++ ../nas/nas-1.4.1.patch Thu Oct 31 10:17:40 2002 -@@ -120,26 +120,157 @@ +--- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 ++++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 +@@ -1,5 +1,5 @@ +-*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 +---- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000 ++--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001 + *************** + *** 166,171 **** + --- 166,177 ---- +@@ -15,8 +15,8 @@ + INCLUDESRC = $(TOP)/include + INCDIR = $(INCROOT)/audio + WIDGET_DIR = $(TOP)/clients/audio/widgets +-*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999 +---- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999 ++--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001 + *************** + *** 1336,1348 **** + static char *_SysErrorMsg (n) +@@ -40,8 +40,8 @@ + } + + #endif /* USL sharedlibs in don't define for AUD3.2 */ +-*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999 +---- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003 ++*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999 ++--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001 + *************** + *** 51,59 **** + #include <errno.h> +@@ -120,59 +120,157 @@ return(-1); } --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 10:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Thu Nov 1 13:12:56 2001 +-*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000 +---- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003 -*************** -*** 25,30 **** ---- 25,32 ---- @@ -27,6 +57,39 @@ - InstallMultiple($(HEADERS),$(INCDIR)) - #if ProjectX >= 5 - InstallNonExecFile(AuErrorDB,$(LIBDIR)) +-*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000 +---- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003 +-*************** +-*** 119,132 **** +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! } +- number : NUMBER { $$ = $1; } +- ; +- +---- 119,132 ---- +- } +- | MAXRATE number +- { ddaSetConfig(MAXRATE, (void *)$2); } +-! | MINRATE number +-! { ddaSetConfig(MINRATE, (void *)$2); } ; +- +- string : STRING { ptr = (char *)malloc(strlen($1)+1); +- strcpy(ptr, $1); +- RemoveDQuote(ptr); +- $$ = ptr; +-! }; +- number : NUMBER { $$ = $1; } +- ; +- +--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 ++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 +@@ -42,6 +42,8 @@ diff --git a/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp index 7b55cc064156..0f59b9ebee9b 100644 --- a/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,5 +1,5 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 -+++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +--- ../product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 ++++ ../product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 @@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment @@ -8,11 +8,11 @@ #if ( defined( _gcc3 ) && defined( C300 ) ) File gid_File_Lib_gcc -@@ -42,6 +43,7 @@ - Name = STRING(libstdc++.so.3); - Styles = (NETWORK,RELATIVE); +@@ -34,6 +35,7 @@ End + + +#endif #endif - #endif + File gid_File_Lib_Sal diff --git a/editors/openoffice/files/patch-product+settings+linux_gcc_settings.mk b/editors/openoffice/files/patch-product+settings+linux_gcc_settings.mk deleted file mode 100644 index 4210b5f03f33..000000000000 --- a/editors/openoffice/files/patch-product+settings+linux_gcc_settings.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- ../product/settings/linux_gcc_settings.mk.orig Wed May 29 00:18:46 2002 -+++ ../product/settings/linux_gcc_settings.mk Wed May 29 00:19:04 2002 -@@ -3,9 +3,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat diff --git a/editors/openoffice/files/patch-product+settings+settings.mk b/editors/openoffice/files/patch-product+settings+settings.mk index 9773406f4ed2..3dae50f091a3 100644 --- a/editors/openoffice/files/patch-product+settings+settings.mk +++ b/editors/openoffice/files/patch-product+settings+settings.mk @@ -1,26 +1,75 @@ ---- ../product/settings/settings.mk.orig Wed May 29 00:16:16 2002 -+++ ../product/settings/settings.mk Wed May 29 00:18:00 2002 -@@ -83,9 +83,8 @@ +--- ../product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 ++++ ../product/settings/settings.mk Sat Jan 18 18:37:12 2003 +@@ -225,3 +226,72 @@ - OS=SOLARIS - PS=/ --CC=CC --LINK=CC --LIB=CC -+LINK=$(CC) -+LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat -@@ -136,9 +135,8 @@ - OS=LINUX - PLATFORM=linux - PS=/ --CC=gcc --LINK=gcc --LIB=gcc + endif + ++ifeq "$(PLATFORM)" "FreeBSD" ++# Settings for Linux using gcc compiler ++ ++OS=LINUX ++PLATFORM=linux ++PS=/ +LINK=$(CC) +LIB=$(CC) - ECHO=@echo - MKDIR=mkdir -p - CAT=cat ++ECHO=@echo ++MKDIR=mkdir -p ++CAT=cat ++OBJ_EXT=o ++SHAREDLIB_EXT=so ++SHAREDLIB_PRE=lib ++SHAREDLIB_OUT=$(OUT_LIB) ++PACKAGE_LIB_DIR=linux_x86.plt ++ ++GCC_VERSION=$(shell $(CC) -dumpversion) ++ ++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" ++COMID=gcc3 ++CPPU_ENV=gcc3 ++else ++COMID=GCC ++CPPU_ENV=gcc2 ++endif ++ ++OSEP=\< ++CSEP=\> ++ ++DEL=rm -f ++DELRECURSIVE=rm -rf ++COPY=cp ++URLPREFIX=file:// ++ ++# Include UDK version numbers ++include $(PRJ)/include/udkversion.mk ++ ++SALLIB=-lsal ++CPPULIB=-lcppu ++CPPUHELPERLIB=-lcppuhelper$(COMID) ++SALHELPERLIB=-lsalhelper$(COMID) ++STLPORTLIB=-lstlport_gcc ++ ++EMPTYSTRING= ++PATH_SEPARATOR=: ++ ++# -O is necessary for inlining (see gcc documentation) ++ifeq "$(DEBUG)" "yes" ++CC_FLAGS=-c -g ++else ++CC_FLAGS=-c -O ++endif ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/linux ++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include ++STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport ++CC_DEFINES=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV) ++ ++# define for used compiler necessary for UNO ++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 ++#-DCPPU_ENV=gcc3 -- gcc3 3.0 ++ ++CC_OUTPUT_SWITCH=-o ++ ++LIBRARY_LINK_FLAGS=-shared ++EXE_LINK_FLAGS=-Wl -export-dynamic ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) ++ ++endif diff --git a/editors/openoffice/files/patch-product+util+makefile.mk b/editors/openoffice/files/patch-product+util+makefile.mk index e52b0a4ea6ef..6e72982a23bf 100644 --- a/editors/openoffice/files/patch-product+util+makefile.mk +++ b/editors/openoffice/files/patch-product+util+makefile.mk @@ -1,34 +1,32 @@ ---- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 -+++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 -@@ -137,13 +137,6 @@ +--- ../product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 ++++ ../product/util/makefile.mk Sat Jan 18 13:30:54 2003 +@@ -131,13 +131,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno -.IF "$(COMID)"=="gcc3" -ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.3 \ -- $(DESTDIRDLL)$/libstdc++.so.3.0.1 +- $(DESTDIRDLL)$/libgcc_s.so.1 \ +- $(DESTDIRDLL)$/libgcc_s.so \ +- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ +- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) -.ENDIF .ELIF "$(OS)"=="NETBSD" ########### -@@ -498,6 +491,7 @@ - #--------------------------------------------------------- - # special targets for linux gcc3 +@@ -491,6 +484,7 @@ + # special targets for linux gcc3 + .IF "$(COMID)"=="gcc3" -+.IF "$(OS)"=="LINUX" - .IF "$(CCNUMVER)">="000300010000" ++.IF "$(OS)"!="FREEBSD" + $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : + $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) - $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -@@ -526,6 +520,9 @@ +@@ -514,6 +508,7 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ +ln -s libgcc_s.so.1 $@ -+ +.ENDIF -+ #------------------------------------------------------------- $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice/files/patch-sablot+Sablot-0.52.patch index 61f12e5bfe7c..c3a0ffc47e73 100644 --- a/editors/openoffice/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice/files/patch-sablot+Sablot-0.52.patch @@ -1,25 +1,20 @@ ---- ../sablot/Sablot-0.52.patch.orig Mon Mar 18 16:03:02 2002 -+++ ../sablot/Sablot-0.52.patch Wed Apr 3 00:52:54 2002 +--- ../sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 ++++ ../sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ----- 1,151 ---- -+--- 1,156 ---- +---- 1,159 ---- ++--- 1,161 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ -@@ -90,8 +90,13 @@ - ! .ENDIF - ! +@@ -96,6 +96,8 @@ ! .IF "$(GUI)"=="UNX" -+! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ! .IF "$(OS)"=="NETBSD" ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF -+! .IF "$(OS)"=="FREEBSD" ++! .ELIF "$(OS)"=="FREEBSD" +! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ENDIF ! .ELSE - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE - ! .ENDIF + ! .IF "$(OS)"=="MACOSX" + ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx b/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx deleted file mode 100644 index 61a769b34585..000000000000 --- a/editors/openoffice/files/patch-setup2+source+custom+jvmsetup+unx+jvmscan.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx.orig Wed Aug 14 00:19:33 2002 -+++ ../setup2/source/custom/jvmsetup/unx/jvmscan.cxx Wed Aug 14 00:20:54 2002 -@@ -117,7 +117,9 @@ - - /* some platforms have no hotspot yet even under jdk 1.3 */ - /* so treat them like classic in JDK 1.2.x */ --#if defined(POWERPC) && defined(LINUX) -+#if defined(POWERPC) && defined(LINUX) || \ -+ defined(INTEL) && defined(FREEBSD) -+ - #define NO_HOTSPOT_USE_CLASSIC 1 - #else - #undef NO_HOTSPOT_USE_CLASSIC diff --git a/editors/openoffice/files/patch-solenv+bin+build.pl b/editors/openoffice/files/patch-solenv+bin+build.pl new file mode 100644 index 000000000000..923b99e5d065 --- /dev/null +++ b/editors/openoffice/files/patch-solenv+bin+build.pl @@ -0,0 +1,10 @@ +--- ../solenv/bin/build.pl.orig Sun Jan 19 00:08:38 2003 ++++ ../solenv/bin/build.pl Sun Jan 19 00:07:25 2003 +@@ -292,7 +292,6 @@ + cwd(); + $! = 0; + system ("$dmake"); +- &print_error("dmake - " . lc($!)) if ($!); + if ($? && ($? != -1) && (!$child)) { + &print_error("Error $? occurred while making $BuildDir"); + }; diff --git a/editors/openoffice/files/patch-solenv+bin+getcompver.awk b/editors/openoffice/files/patch-solenv+bin+getcompver.awk deleted file mode 100644 index 62786af61ad5..000000000000 --- a/editors/openoffice/files/patch-solenv+bin+getcompver.awk +++ /dev/null @@ -1,44 +0,0 @@ ---- ../solenv/bin/getcompver.awk.orig Tue May 28 13:09:01 2002 -+++ ../solenv/bin/getcompver.awk Tue May 28 13:08:14 2002 -@@ -61,9 +61,11 @@ - #************************************************************************* - BEGIN { - CCversion = 0 -+ compiler_matched = 0 - } - # Sun c++ compiler - /Sun WorkShop/ { -+ compiler_matched = 1 - # version number right after "C++" - x = match( $0, /C\+\+ .*/ ) - btwn = substr( $0, RSTART, RLENGTH) -@@ -73,12 +75,28 @@ - } - # Microsoft c++ compiler - /Microsoft.*..\...\...../ { -+ compiler_matched = 1 - # match on the format of the ms versions ( dd.dd.dddd ) - x = match( $0, /..\...\...../ ) - CCversion = substr( $0, RSTART, RLENGTH) - } -+# Java -+/java version/ { -+ compiler_matched = 1 -+ # match on the format of the java versions ( d[d].d[d].d[d] ) -+ x = match( $0, /".*\..*\..*"/ ) -+ CCversion = substr( $0, RSTART+1, RLENGTH-2) -+} -+/^[0-9]*[.][0-9]*$/ { -+ if ( compiler_matched == 0 ) { -+# need to blow to x.xx.xx for comparing -+ CCversion = $0 ".0" -+ } -+} - /^[0-9]*[.][0-9]*[.][0-9]*$/ { -- CCversion = $0 -+ if ( compiler_matched == 0 ) { -+ CCversion = $0 -+ } - } - END { - if ( num == "true" ) { diff --git a/editors/openoffice/files/patch-solenv+inc+_tg_shl.mk b/editors/openoffice/files/patch-solenv+inc+_tg_shl.mk deleted file mode 100644 index 7a5af08c2811..000000000000 --- a/editors/openoffice/files/patch-solenv+inc+_tg_shl.mk +++ /dev/null @@ -1,282 +0,0 @@ ---- ../solenv/inc/_tg_shl.mk.orig Wed Jan 2 12:23:22 2002 -+++ ../solenv/inc/_tg_shl.mk Tue May 28 12:02:12 2002 -@@ -345,22 +345,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -770,22 +770,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1195,22 +1195,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -1620,22 +1620,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2045,22 +2045,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2470,22 +2470,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -2895,22 +2895,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3320,22 +3320,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -3745,22 +3745,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" -@@ -4170,22 +4170,22 @@ - .IF "$(UPDATER)"=="YES" - .IF "$(OS)"=="SOLARIS" - .IF "$(COM)"=="GCC" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ELSE -- $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .ENDIF - .IF "$(OS)"=="MACOSX" -- $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @echo "------------------------------" - @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" - .ENDIF - .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -- $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - .ENDIF - .IF "$(OS)"=="IRIX" -- $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CXX) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx - @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR) - @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations - .ENDIF # "$(OS)"=="IRIX" diff --git a/editors/openoffice/files/patch-solenv+inc+pstrules.mk b/editors/openoffice/files/patch-solenv+inc+pstrules.mk deleted file mode 100644 index 6c8e958c188a..000000000000 --- a/editors/openoffice/files/patch-solenv+inc+pstrules.mk +++ /dev/null @@ -1,141 +0,0 @@ ---- ../solenv/inc/pstrules.mk.orig Thu Mar 14 17:40:59 2002 -+++ ../solenv/inc/pstrules.mk Thu Mar 14 17:41:44 2002 -@@ -80,15 +80,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -108,15 +108,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -142,15 +142,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -159,23 +159,23 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -195,15 +195,15 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(COM)"=="BLC" - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ENDIF - .ENDIF - -@@ -212,19 +212,19 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - .IF "$(GUI)"=="MAC" - @$(RM) $@ -- $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) -+ $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c) - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c - .ELSE - +$(TYPE) $(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -- $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - .ENDIF - .ENDIF - .ENDIF -@@ -246,7 +246,7 @@ - @echo Making: $@ - @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV) - .IF "$(GUI)"=="OS2" -- $(CC) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -+ $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre - .ENDIF - .IF "$(GUI)"=="WNT" - cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre diff --git a/editors/openoffice/files/patch-solenv+inc+rules.mk b/editors/openoffice/files/patch-solenv+inc+rules.mk deleted file mode 100644 index 181a71307149..000000000000 --- a/editors/openoffice/files/patch-solenv+inc+rules.mk +++ /dev/null @@ -1,212 +0,0 @@ ---- ../solenv/inc/rules.mk.orig Thu Mar 14 17:31:43 2002 -+++ ../solenv/inc/rules.mk Thu Mar 14 17:38:38 2002 -@@ -78,16 +78,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF - .ENDIF - -@@ -98,16 +98,16 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - .ENDIF - -@@ -122,17 +122,17 @@ - .ENDIF - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE # "$(GUI)"=="UNX" - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) - .ENDIF # "$(GUI)"=="UNX" - - $(SLO)$/%.obj : %.cpp -@@ -140,17 +140,17 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) - .ENDIF - - $(SLO)$/%.obj : $(MISC)$/%.cxx -@@ -158,16 +158,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : $(MISC)$/%.cxx -@@ -175,16 +175,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx -+ $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) -+ $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) - .ENDIF - - $(OBJ)$/%.obj : %.c -@@ -192,20 +192,20 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - .IF "$(TEST)"!="" -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - .ELSE - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ENDIF - .ELSE -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c - .ELSE - +-@echo Cflags: $(CFLAGS) -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -215,13 +215,13 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - @+echo. -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) - $(SEMADEBUG) - .ENDIF - -@@ -230,16 +230,16 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul -- @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - @+echo. - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) - .ENDIF - $(SEMADEBUG) - .ENDIF -@@ -249,14 +249,14 @@ - @echo Making: $@ - .IF "$(GUI)"=="UNX" - @$(RM) $@ $(@:s/.obj/.o/) -- $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c -+ $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ - .ELSE - @+if exist $@ $(RM) /q $@ >& nul - .IF "$(COM)"=="GCC" -- $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c -+ $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c - .ELSE -- $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) -+ $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) - .ENDIF - .ENDIF - diff --git a/editors/openoffice/files/patch-solenv+inc+settings.mk b/editors/openoffice/files/patch-solenv+inc+settings.mk deleted file mode 100644 index ea6a898a9a6d..000000000000 --- a/editors/openoffice/files/patch-solenv+inc+settings.mk +++ /dev/null @@ -1,19 +0,0 @@ ---- ../solenv/inc/settings.mk.orig Fri Mar 8 10:23:21 2002 -+++ ../solenv/inc/settings.mk Tue May 28 12:56:27 2002 -@@ -166,7 +166,6 @@ - CDEFSOPT= - HDEFS= - --CC= - .IF "$(add_cflags)"!="" - ENVCFLAGS+=$(add_cflags) - .ENDIF -@@ -264,8 +263,6 @@ - AS= - BC= - COBOL= --CPP= --CXX= - FOR= - PASCAL= - diff --git a/editors/openoffice/files/patch-solenv+inc+target.mk b/editors/openoffice/files/patch-solenv+inc+target.mk deleted file mode 100644 index 2379b8bb3189..000000000000 --- a/editors/openoffice/files/patch-solenv+inc+target.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- ../solenv/inc/target.mk.orig Mon Aug 26 01:29:21 2002 -+++ ../solenv/inc/target.mk Mon Aug 26 01:28:23 2002 -@@ -2139,7 +2139,7 @@ - - .IF "$(COMPVERMK)"!="" - .IF "$(UPDATER)"!="" --"$(COMPVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+"$(COMPVERMK)" : - @echo COMNAME:=$(COMNAME) > $@ - @echo COMID:=$(COMID) >> $@ - @echo CCNUMVER:=$(CCNUMVER) >> $@ -@@ -2778,7 +2778,7 @@ - $(MISC)$/$(TARGET).dpz : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) - .ENDIF - --$(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg -+$(INCCOM)$/_version.h : - .IF "$(GUI)"=="UNX" - @+echo "#define" _BUILD \"$(BUILD)\" > $@ - @+echo "#define" _UPD \"$(UPD)\" >> $@ diff --git a/editors/openoffice/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice/files/patch-solenv+inc+tg_shl.mk index 958b4abba555..2a9d4ba1b65c 100644 --- a/editors/openoffice/files/patch-solenv+inc+tg_shl.mk +++ b/editors/openoffice/files/patch-solenv+inc+tg_shl.mk @@ -1,14 +1,11 @@ ---- ../solenv/inc/tg_shl.mk.orig Wed Mar 13 20:40:10 2002 -+++ ../solenv/inc/tg_shl.mk Wed Mar 13 20:41:10 2002 -@@ -319,9 +319,9 @@ +--- ../solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 ++++ ../solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 +@@ -319,7 +319,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx +- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c ++ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ELSE -- cl -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx -+ $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx + $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" - .ENDIF # "$(UPDATER)"=="YES" - .IF "$(SHL$(TNR)DEFAULTRES)"!="" diff --git a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk index b189474e5f82..4c2fd26f5c2c 100644 --- a/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice/files/patch-solenv+inc+unxfbsdi.mk @@ -1,5 +1,5 @@ ---- ../solenv/inc/unxfbsdi.mk.orig Wed Oct 24 19:21:47 2001 -+++ ../solenv/inc/unxfbsdi.mk Sun Jun 2 11:20:10 2002 +--- ../solenv/inc/unxfbsdi.mk.orig Tue Jan 7 16:22:18 2003 ++++ ../solenv/inc/unxfbsdi.mk Sat Jan 18 13:04:17 2003 @@ -1,84 +1,139 @@ - # mak file fuer unxfbsdi @@ -56,8 +56,8 @@ +# environment with graphical user interface +CFLAGSOBJGUIMT=-fPIC --cc= gcc --CC= g++ +-CC= gcc +-CXX= g++ -CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE -CFLAGS+= -w -c $(INCLUDE) diff --git a/editors/openoffice/files/patch-stlport+makefile.mk b/editors/openoffice/files/patch-stlport+makefile.mk index c55d863b689f..70ec58c3428e 100644 --- a/editors/openoffice/files/patch-stlport+makefile.mk +++ b/editors/openoffice/files/patch-stlport+makefile.mk @@ -1,32 +1,36 @@ ---- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 -+++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 -@@ -106,11 +106,29 @@ +--- ../stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 ++++ ../stlport/makefile.mk Sat Jan 18 13:01:53 2003 +@@ -98,16 +98,28 @@ .IF "$(COM)"=="GCC" .IF "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-3.0-freebsd.mak +-BUILD_FLAGS=-f gcc-3.0.mak ++.IF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-3.0-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc-3.0.mak ++ BUILD_FLAGS=-f gcc-3.0.mak +.ENDIF -+ .ELSE # "$(COMID)"=="gcc3" -+ -+.IF "$(OS)"=="FREEBSD" -+BUILD_FLAGS=-f gcc-freebsd.mak +-# MacOS X/Darwin need a special makefile ++# FreeBSD / MacOS X/Darwin need a special makefile + .IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak +-.ELSE # "$(OS)"=="MACOSX" ++.ELSIF # "$(OS)"=="FREEBSD" ++ BUILD_FLAGS=-f gcc-freebsd.mak +.ELSE - BUILD_FLAGS=-f gcc.mak -+.ENDIF -+ + BUILD_FLAGS=-f gcc.mak +-.ENDIF # "$(OS)"=="MACOSX" ++.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" .ENDIF # "$(COMID)"=="gcc3" +-BUILD_ACTION=make + +.IF "$(OS)"=="FREEBSD" -+BUILD_ACTION=gmake ++ BUILD_ACTION=gmake +.ELSE - BUILD_ACTION=make ++ BUILD_ACTION=make +.ENDIF + + # build in parallel + BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF - - .IF "$(COM)"=="C52" diff --git a/editors/openoffice/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx index ce51a0e98880..ec91def86fe6 100644 --- a/editors/openoffice/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ b/editors/openoffice/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx @@ -1,12 +1,11 @@ ---- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Wed May 1 23:45:49 2002 -+++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Wed May 1 23:48:17 2002 -@@ -62,7 +62,9 @@ +--- ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 ++++ ../sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 +@@ -62,7 +62,7 @@ #include <stdlib.h> #include <stdio.h> #include <dlfcn.h> -+#if !(defined NETBSD || defined FREEBSD) +-#ifndef MACOSX ++#if !(defined NETBSD || defined FREEBSD || defined MACOSX) #include <alloca.h> -+#endif + #endif #include <string.h> - - /* diff --git a/editors/openoffice/files/patch-translation-ru b/editors/openoffice/files/patch-translation-ru deleted file mode 100644 index 316c93a6bfbe..000000000000 --- a/editors/openoffice/files/patch-translation-ru +++ /dev/null @@ -1,2490 +0,0 @@ -diff -ur ../desktop/source/app/desktop.src ../desktop/source/app/desktop.src ---- ../desktop/source/app/desktop.src Wed Apr 3 16:10:19 2002 -+++ ../desktop/source/app/desktop.src Fri Apr 5 19:05:56 2002 -@@ -206,7 +206,7 @@ - Text [ ENGLISH ] = "The installation path is invalid." ; - Text[ english_us ] = "The installation path is invalid."; - Text[ portuguese ] = "O caminho de instalao no vlido."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is invalid."; - Text[ dutch ] = "Het installatiepad is ongeldig."; - Text[ french ] = "Le chemin d'installation n'est pas valide."; -@@ -232,7 +232,7 @@ - Text [ ENGLISH ] = "The installation path is not available." ; - Text[ english_us ] = "The installation path is not available."; - Text[ portuguese ] = "Foi impossvel determinar o caminho de instalao."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = "The installation path is not available."; - Text[ dutch ] = "Geen installatiepad beschikbaar."; - Text[ french ] = "Impossible de dterminer le chemin d'installation !"; -@@ -414,7 +414,7 @@ - Text [ ENGLISH ] = "Start setup application to repair installation?" ; - Text[ english_us ] = "Do you want to start the setup application to repair your installation?"; - Text[ portuguese ] = "Iniciar a aplicao Setup para reparar a instalao?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to repair installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te repareren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de rparer l'installation ?"; -@@ -440,7 +440,7 @@ - Text [ ENGLISH ] = "Start setup application to check installation?" ; - Text[ english_us ] = "Do you want to start the setup application to check your installation?"; - Text[ portuguese ] = "Start setup application to check installation?"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ greek ] = "Start setup application to check installation?"; - Text[ dutch ] = "Wilt u de Setup-applicatie starten om uw installatie te controleren?"; - Text[ french ] = "Voulez-vous lancer l'application Setup afin de vrifier l'installation ?"; -diff -ur ../extensions/source/abpilot/abspilot.src ../extensions/source/abpilot/abspilot.src ---- ../extensions/source/abpilot/abspilot.src Wed Apr 3 16:13:42 2002 -+++ ../extensions/source/abpilot/abspilot.src Fri Apr 5 17:43:26 2002 -@@ -809,7 +809,7 @@ - "Do you want to install it as address data source, anyway?"; - Message [ english_us ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; - Message[ portuguese ] = "A fonte de dados no contm nenhuma tabela.\nMesmo assim, configur-la como fonte de dados dos endereos?"; -- Message[ russian ] = " .\n ?"; -+ Message[ russian ] = " .\n ?"; - Message[ greek ] = "The data source does not contain any tables.\nDo you want to install it as address data source, anyway?"; - Message[ dutch ] = "De gegevensbron bevat geen tabel.\nWilt u deze toch als adresgegevensbron inrichten?"; - Message[ french ] = "La source de donnes ne contient aucune table.\nVoulez-vous tout de mme la paramtrer comme source de donnes des adresses ?"; -diff -ur ../extensions/source/dbimport/importdialog.src ../extensions/source/dbimport/importdialog.src ---- ../extensions/source/dbimport/importdialog.src Wed Apr 3 16:13:45 2002 -+++ ../extensions/source/dbimport/importdialog.src Fri Apr 5 17:42:35 2002 -@@ -599,7 +599,7 @@ - "which could not be resolved automatically."; - Text [ english_us ] = "The database file you are about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ portuguese ] = "O ficheiro da base de dados que pretende importar contm uma referncia a uma instalao antiga do StarOffice que no pode ser resolvida automaticamente."; -- Text[ russian ] = " StarOffice, ."; -+ Text[ russian ] = " StarOffice, ."; - Text[ greek ] = "The database file you're about to import contains a reference to an older StarOffice installation which could not be resolved automatically."; - Text[ dutch ] = "Het te importeren database-bestand bevat een verbinding met een oudere StarOffice-installatie die niet automatisch kon worden verwijderd."; - Text[ french ] = "Le fichier de base de donnes importer contient une rfrence une installation antrieure de StarOffice qui n'a pas pu tre rsolue."; -@@ -728,7 +728,7 @@ - "you would need to substitute $(USER) with $substpath$."; - Text [ english_us ] = "For instance:\nIf you installed StarOffice 5.2 in $defaultpath$, and you are importing your old address book, you would need to substitute $(USER) with $substpath$."; - Text[ portuguese ] = "Por exemplo:\nse instalou o StarOffice 5.2 em $defaultpath$ e desejar importar o seu livro de endereos antigo, ter que substituir $(USER) por $substpath$."; -- Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; -+ Text[ russian ] = ":\n StarOffice 5.2 $defaultpath$ , $(USER) $substpath$."; - Text[ greek ] = "For instance:\nIf you installed your StarOffice 5.2 in $defaultpath$, and you're importing your old Address Book database file, you would need to substitute $(USER) with $substpath$."; - Text[ dutch ] = "Bijvoorbeeld:\nAls u StarOffice 5.2 in $defaultpath$ heeft genstalleerd en u uw oude adresboek wilt importeren moet u $(USER) vervangen door $substpath$."; - Text[ french ] = "Exemple :\nStarOffice 5.2 est install dans $defaultpath$ et vous voulez importer votre ancien carnet d'adresses : remplacez $(USER) par $substpath$."; -diff -ur ../extensions/source/installation/office/instchk/instdlg.src ../extensions/source/installation/office/instchk/instdlg.src ---- ../extensions/source/installation/office/instchk/instdlg.src Wed Apr 3 16:13:47 2002 -+++ ../extensions/source/installation/office/instchk/instdlg.src Fri Apr 5 17:41:08 2002 -@@ -265,7 +265,7 @@ - }; - Text[ english_us ] = "The %PRODUCTNAME installation is incomplete"; - Text[ portuguese ] = "A instalao do %PRODUCTNAME est incompleta"; -- Text[ russian ] = " %PRODUCTNAME ."; -+ Text[ russian ] = "%PRODUCTNAME ."; - Text[ dutch ] = "De installatie van %PRODUCTNAME is niet compleet"; - Text[ french ] = "L'installation de %PRODUCTNAME est incomplte"; - Text[ spanish ] = "La instalacin de %PRODUCTNAME no est completa"; -diff -ur ../extensions/source/preload/preload.src ../extensions/source/preload/preload.src ---- ../extensions/source/preload/preload.src Wed Apr 3 16:13:51 2002 -+++ ../extensions/source/preload/preload.src Fri Apr 5 17:40:30 2002 -@@ -344,7 +344,7 @@ - Text [ french ] = "Si vous acceptez tous les termes du contrat de licence, cliquez sur '%1'. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击 %1 。如果不同意许可证协议中的条款，则按击 %2 ，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所有的使用許可協定的全部條款，按一下[%1]。若不想接受全部條款，就按一下[%2]，取消安裝。"; -Only in ..: openoffice-641d-cyr_letter.patch -diff -ur ../padmin/source/padialog.src ../padmin/source/padialog.src ---- ../padmin/source/padialog.src Wed Apr 3 16:15:12 2002 -+++ ../padmin/source/padialog.src Fri Apr 5 17:38:14 2002 -@@ -319,7 +319,7 @@ - Text [ English ] = "Noo format file ( with .afm extension ) for font\n%s\n was found, hence the font will not be installed. Format files can be made e.g. with ghostscript and have to reside in the same directory as the font file or in its afm subdir ectory." ; - Text[ english_us ] = "A format file (with an .afm extension) has not been found for the font\n%s\ntherefore, the font cannot be installed. Format files can be created with ghostscript, for example, and have to be located in the same directory as the font files or its afm subdirectory."; - Text[ portuguese ] = "Foi impossvel encontrar o ficheiro de formato (com extenso .afm) para o ficheiro do tipo de letra\n%s\n. Por esta razo no foi possvel instal-lo. Os ficheiros de formato podem ser criados com ghostscript (por exemplo), devendo ser guardados no directrio contendo os ficheiros dos tipos de letra ou num dos respectivos subdirectrios afm."; -- Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; -+ Text[ russian ] = " \n%s\n ( .afm) . . , , ghostscript , , afm."; - Text[ greek ] = " \n%s\n ( .afm ). .. ghostscript 'afm'."; - Text[ dutch ] = "Lettertypenbestand\n%s\n kan niet worden genstalleerd daar geen bijbehorend formaatbestand (met extensie .afm) werd gevonden. Formaatbestanden kunnen worden gemaakt met bijv. ghostscript en moeten worden opgeslagen in de directory waarin de lettertypenbestanden staan of in een subdirectory daarvan."; - Text[ french ] = "Aucun fichier de format (d'extension .afm) n'a t dtect pour le fichier de police\n%s\n ; la police ne peut donc pas tre installe. Les fichiers de format peuvent par ex. tre cr avec ghostscript et doivent tre placs dans le mme rpertoire que celui des fichiers de police ou dans le sous-rpertoire afm."; -@@ -344,7 +344,7 @@ - Text [ English ] = "The metric file for font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The metric file for the font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro mtrico para o ficheiro do tipo de letra\n...%s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n . ."; -+ Text[ russian ] = " \n %s\n . ."; - Text[ greek ] = " \n %s\n. ."; - Text[ dutch ] = "Het lettertype werd niet genstalleerd daar het metrische bestand voor lettertypenbestand\n %s\nniet kon worden gekopieerd. "; - Text[ french ] = "Copie du fichier mtrique pour le fichier\n %s\nimpossible, donc impossibilit d'installer la police !"; -@@ -369,7 +369,7 @@ - Text [ English ] = "The font file\n %s\ncould not be copied. The font wille not be installed."; - Text[ english_us ] = "The font file\n %s\ncould not be copied. The font will not be installed."; - Text[ portuguese ] = "Foi impossvel copiar o ficheiro dos tipos de letra\n %s\n. O tipo de letra no ser instalado."; -- Text[ russian ] = " \n %s\n. ."; -+ Text[ russian ] = " \n %s\n. ."; - Text[ greek ] = " \n %s\n ."; - Text[ dutch ] = "Het lettertype wordt niet genstalleerd daar het lettertypenbestand \n %s\n niet kon worden gekopieerd."; - Text[ french ] = "Copie du fichier de police\n %s\n impossible, donc impossibilit d'installer la police !"; -@@ -394,7 +394,7 @@ - Text[ English ] = "In the fontpath there is no directory containing a writeable fonts.dir file. Therefore no fonts can be installed."; - Text[ english_us ] = "A directory containing a writable fonts.dir file is not located in the Fontpath. Therefore, fonts cannot be installed."; - Text[ portuguese ] = "Foi impossvel encontrar o directrio no \"fontpath\", contendo um ficheiro de escrita fonts.dir. impossvel instalar os tipos de letra."; -- Text[ russian ] = ", fonts.dir, , Fontpath . ."; -+ Text[ russian ] = ", fonts.dir, , Fontpath . ."; - Text[ greek ] = " Fontpath, fonts.dir. ."; - Text[ dutch ] = "Er konden geen lettertypen worden genstalleerd daar er in het pad voor de lettertypen geen directory werd aangetroffen met een beschrijfbaar bestand fonts.dir."; - Text[ french ] = "Aucun rpertoire contenant un fichier d'criture fonts.dir ne se trouve dans le chemin de police (fontpath). Impossible d'installer des polices !"; -@@ -513,7 +513,7 @@ - Text [ english ] = "Installed printers"; - Text[ english_us ] = "Installed ~printers"; - Text[ portuguese ] = "~Impressoras instaladas"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "~Genstalleerde printers"; - Text[ french ] = "Imprimantes installes"; -@@ -2097,7 +2097,7 @@ - - Text[ english_us ] = "Driver Installation"; - Text[ portuguese ] = "Instalao de controlador"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Driver installatie"; - Text[ french ] = "Installation du pilote"; -@@ -2331,7 +2331,7 @@ - Text [ English ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ english_us ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported."; - Text[ portuguese ] = "O controlador para a impressora \"%s1\" (%s2) no est instalado, sendo portanto impossvel importar a impressora."; -- Text[ russian ] = " \"%s1\" (%s2) . ."; -+ Text[ russian ] = " \"%s1\" (%s2) . ."; - Text[ greek ] = " \"%s1\" (%s2) . ."; - Text[ dutch ] = "Printer \"%s1\" (%s2) kon niet worden gemporteerd daar er geen driver voor deze printer is genstalleerd."; - Text[ french ] = "Le pilote pour l'imprimante \"%s1\" (%s2) n'est pas install. Impossible d'importer l'imprimante !"; -@@ -2776,7 +2776,7 @@ - Text [english] = "~import printers from a StarOffice installation"; - Text[ english_us ] = "~Import printers from a StarOffice installation"; - Text[ portuguese ] = "~Importar impressoras de uma instalao do StarOffice"; -- Text[ russian ] = "~ StarOffice"; -+ Text[ russian ] = "~ StarOffice"; - Text[ greek ] = "~import printers from a StarOffice installation"; - Text[ dutch ] = "~printers uit een StarOffice installatie importeren"; - Text[ french ] = "~Importer une ou des imprimantes depuis une installation StarOffice"; -diff -ur ../sc/source/ui/src/globstr.src ../sc/source/ui/src/globstr.src ---- ../sc/source/ui/src/globstr.src Wed Apr 3 16:12:05 2002 -+++ ../sc/source/ui/src/globstr.src Fri Apr 5 17:47:28 2002 -@@ -7200,7 +7200,7 @@ - Text [ portuguese ] = "no est disponvel para a verificao ortogrfica. \nControle a sua instalao e, se necessrio,\ninstale a lngua desejada" ; - Text [ portuguese_brazilian ] = "ist f? die Pr?ung nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "没有检查拼写的功能。\n请检查您的安装，如有必要请安装所要使用的语言版本"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla sprawdzania pisowni. \nSprawd prosz instalacj i zainstaluj \newentualnie potrzebny jzyk."; - Text[ japanese ] = "スペル チェック機能はありません。\nインストールされているかチェックして \n必要な場合は該当する言語をインストールしてください。"; - Text[ chinese_traditional ] = " 沒有拼寫檢查的功能。\n請檢查安裝，若有必要請安裝所要使用的語言版本"; -@@ -7281,7 +7281,7 @@ - Text [ portuguese ] = "no est disponvel para o dicionrio de sinnimos. \nControle a sua instalao e, se necessrio, instale \na lngua desejada." ; - Text [ portuguese_brazilian ] = "ist f? den Thesaurus nicht verf?bar. \n?berpr?en Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "同义词词典不能使用。\n请检查您的安装程序，在必要时请安装要使用的语言版本。"; -- Text[ russian ] = " . \n, , \n "; -+ Text[ russian ] = " . \n, , \n "; - Text[ polish ] = "jest niedostpny dla Tezaurusa. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - Text[ japanese ] = "これは類義語辞典に使えません。\nインストールをチェックして、\n必要な場合は該当の言語をインストールしてください。"; - Text[ chinese_traditional ] = "同義詞詞典無法使用。\n請檢查您的安裝程序，若有必要，請安裝要使用的語言版本。"; -diff -ur ../scp/source/calc/profile_calc.lng ../scp/source/calc/profile_calc.lng ---- ../scp/source/calc/profile_calc.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/calc/profile_calc.lng Fri Apr 5 19:38:53 2002 -@@ -403,7 +403,7 @@ - 33 = "~Classeur" - 96 = "~Spreadsheet" - 01 = "~Spreadsheet" --07 = "Документ электронной таблицы" -+07 = "~ " - 86 = "工作表文档(~S)" - 31 = "~Werkbladdocument" - 46 = "Tab~elldokument" -@@ -426,7 +426,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -diff -ur ../scp/source/draw/profile_draw.lng ../scp/source/draw/profile_draw.lng ---- ../scp/source/draw/profile_draw.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/draw/profile_draw.lng Fri Apr 5 19:38:17 2002 -@@ -288,7 +288,7 @@ - 33 = "D~essin" - 96 = "~Drawing" - 01 = "~Drawing" --07 = "~Рисунок" -+07 = "~" - 86 = "绘图(~D)" - 31 = "T~ekening" - 46 = "Te~ckning" -diff -ur ../scp/source/impress/profile_impress.lng ../scp/source/impress/profile_impress.lng ---- ../scp/source/impress/profile_impress.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/impress/profile_impress.lng Fri Apr 5 19:38:05 2002 -@@ -431,7 +431,7 @@ - 33 = "~Prsentation" - 96 = "~Presentation" - 01 = "~Presentation" --07 = "Пре~зентация" -+07 = "~" - 86 = "演示文稿(~P)" - 31 = "~Presentatie" - 46 = "~Presentation" -@@ -454,7 +454,7 @@ - 33 = "~Prsentation..." - 96 = "~Presentation..." - 01 = "~Presentation..." --07 = "~Презентация..." -+07 = "~..." - 86 = "演示文稿(~P)..." - 31 = "~Presentatie..." - 46 = "~Presentation..." -diff -ur ../scp/source/lingu/module_lingu.lng ../scp/source/lingu/module_lingu.lng ---- ../scp/source/lingu/module_lingu.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/lingu/module_lingu.lng Fri Apr 5 18:01:56 2002 -@@ -23,9 +23,9 @@ - - [STR_DESC_MODULE_OPTIONAL_OO_ENGLISH] - 49 = "Whlen Sie diese Option, um das englische (US) Sprachmodul zu installieren." --01 = "Select this option to install the English (US) language module." -+01 = "Select this option to install the language module." - 03 = "Seleccione esta opo para instalar o mdulo da lngua inglesa (E.U.A.)." --07 = " () ." -+07 = " ." - 30 = " (..) ." - 31 = "Kies deze optie als u de taalmodule Engels (VS) wilt installeren." - 33 = "Slectionnez cette option pour installer le module de langue anglaise (U.S.A.)" -diff -ur ../scp/source/math/profile_math.lng ../scp/source/math/profile_math.lng ---- ../scp/source/math/profile_math.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/math/profile_math.lng Fri Apr 5 19:37:20 2002 -@@ -58,7 +58,7 @@ - 33 = "F~ormule" - 96 = "F~ormula" - 01 = "F~ormula" --07 = "Формула" -+07 = "~" - 86 = "公式(~O)" - 31 = "F~ormule" - 46 = "F~ormel" -diff -ur ../scp/source/office/basic.lng ../scp/source/office/basic.lng ---- ../scp/source/office/basic.lng Wed Apr 3 16:11:14 2002 -+++ ../scp/source/office/basic.lng Fri Apr 5 17:51:20 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_PILOTINST1] - 01 = "%PRODUCTNAME %PRODUCTVERSION Setup also installs the module for data matching with PalmPilot organizers. Please note that the PalmPilot synchronization function in your previous %PRODUCTNAME version will be deactivated." - 49 = "%PRODUCTNAME %PRODUCTVERSION Setup installiert auch das Modul fr den Datenabgleich mit PalmPilot-Organizern. Bitte beachten Sie, dass die Funktion zur PalmPilot-Synchronisation in Ihrer lteren %PRODUCTNAME-Version deaktiviert wird." --07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." -+07 = " %PRODUCTNAME %PRODUCTVERSION , PalmPilot. , %PRODUCTNAME PalmPilot ." - 55 = "Wenn Sie die PalmPilot-Unterst?zung installieren, verliert Ihre bestehende Installation die PalmPilot-Unterst?zung. M?hten Sie fortfahren ?" - 00 = "-" - 37 = "El programa d'installaci de %PRODUCTNAME %PRODUCTVERSION installar tamb el mdul per a la sincronitzaci de dades amb la PalmPilot. S'ha de tenir en compte que la funci de sincronitzaci amb la PalmPilot es desactivar en la seva versi antiga de %PRODUCTNAME." -@@ -48,7 +48,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -71,7 +71,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about Adabas integration can be found in the %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aquest motiu no s'installar la versi subministrada amb aquest %PRODUCTNAME. A l'Ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci d'Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -94,7 +94,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME Adabas. Adabas %PRODUCTNAME, Adabas %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 00 = " " - 37 = "%PRODUCTNAME no ha pogut trobar els fitxers per a la installaci de la base de dades Adabas. Si vols utilitzar la integraci d'Adabas en %PRODUCTNAME, s'ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar el %PRODUCTNAME. El programa d'installaci d'Adabas es pot descarregar des d'Internet." -@@ -118,7 +118,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -@@ -142,7 +142,7 @@ - [STR_BASIC_PILOTTITEL] - 01 = "PalmPilot Installation" - 49 = "PalmPilot Installation" --07 = " PalmPilot" -+07 = " PalmPilot" - 55 = "PalmPilot installation" - 00 = " " - 37 = "Installaci de PalmPilot" -diff -ur ../scp/source/office/config.lng ../scp/source/office/config.lng ---- ../scp/source/office/config.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/config.lng Fri Apr 5 19:25:36 2002 -@@ -125,7 +125,7 @@ - [STR_SLIDE_6_OPEN] - 49 = "Vielen Dank, dass Sie %PRODUCTNAME %PRODUCTVERSION gewhlt haben!\nWir sind sicher, dass Ihnen Ihre tgliche Arbeit nun noch einfacher und schneller von der Hand geht und mehr Spa bringt. Wir freuen uns, dass Sie sich fr %PRODUCTNAME %PRODUCTVERSION entschieden haben." - 01 = "Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!\nWe hope your everyday work is easier, faster and a lot more fun. Thank you for choosing %PRODUCTNAME %PRODUCTVERSION!" --07 = " Sie %PRODUCTNAME %PRODUCTVERSION\n , , . Sie %PRODUCTNAME %PRODUCTVERSION." -+07 = " %PRODUCTNAME %PRODUCTVERSION\n , , . %PRODUCTNAME %PRODUCTVERSION." - 55 = "Make YOUR Ideas Work!\nKennen Sie schon die tollen Service-Angebote von Star Division, z.B. die ma?geschneiderten und kosteng?stigen Abo-Angebote, mit denen Sie Ihr %PRODUCTNAME noch effizienter einsetzen k?nen? Informieren Sie sich aktuell und bequem im Internet! Wir w?schen Ihnen viel Spa? und Erfolg mit %PRODUCTNAME 5.1." - 37 = "Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!\nEsperem que faci que la vostra feina diria sigui ms fcil, ms rpida i ms amena. Grcies per haver triat el %PRODUCTNAME %PRODUCTVERSION!." - 03 = "Resta-nos agradecer a sua preferncia!\nDesejamos-lhe um ptimo trabalho com o %PRODUCTNAME %PRODUCTVERSION. O seu trabalho dirio ir ser mais fcil, mais rpido e mais divertido. Parabns pela sua deciso!" -diff -ur ../scp/source/office/module.lng ../scp/source/office/module.lng ---- ../scp/source/office/module.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/module.lng Fri Apr 5 17:52:27 2002 -@@ -23,7 +23,7 @@ - [STR_DESC_MODULE_PRG] - 49 = "In diesem Bereich knnen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 01 = "This is where you decide which %PRODUCTNAME modules are to be installed." --07 = " %PRODUCTNAME." -+07 = " %PRODUCTNAME." - 55 = "In diesem Bereich k?nen Sie die zu installierenden %PRODUCTNAME Module bestimmen." - 37 = "Decidiu quins mduls del %PRODUCTNAME s'han d'installar en aquesta secci." - 03 = "Especifique aqui os mdulos do %PRODUCTNAME que deseja instalar." -@@ -159,7 +159,7 @@ - [STR_DESC_MODULE_PRG_WRT] - 49 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processing functions of %PRODUCTNAME provide you with powerful tools for creating your own documents. This program cannot be deselected when installing" --07 = " %PRODUCTNAME , . !" -+07 = " %PRODUCTNAME , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "Les funcions de processament de textos del %PRODUCTNAME us donen potents eines per crear els vostres propis documents. Aquest programa no es pot desseleccionar mentre s'installa" -@@ -206,7 +206,7 @@ - [STR_DESC_MODULE_PRG_WRT_LOCALLY_CACHED] - 49 = "Die Textverarbeitung bietet Ihnen mchtige Funktionen fr die Erstellung Ihrer Schriftstcke. Das Programm kann bei der Installation nicht abgewhlt werden!" - 01 = "The word processor provides you with powerful tools for creating text documents. This program cannot be deselected during installion." --07 = " , . !" -+07 = " , . !" - 55 = "Die Textverarbeitung von %PRODUCTNAME bietet Ihnen m?chtige Funktionen f? die Erstellung Ihrer Schriftst?ke. Das Programm kann bei der Installation nicht abgew?hlt werden" - 00 = " " - 37 = "El processador de textos inclou potents eines per a la creaci de documents de text. Aquest programa no es pot desseleccionar mentre s'installa." -@@ -298,7 +298,7 @@ - [STR_DESC_MODULE_PRG_WRT_FLT] - 49 = "Optional installierbare Im- und Exportfilter fr verschiedene Textverarbeitungen." - 01 = "Optional import and export filters for different word processing programs." --07 = " , , ." -+07 = " , , ." - 55 = "Optional installierbare Im- und Exportfilter f? verschiedene Textverarbeitungen." - 37 = "Filtres opcionals d'importaci i exportaci per a diferents programes de processament de textos." - 03 = "Filtros de importao opcionais para vrios programas de tratamento de texto" -@@ -1606,7 +1606,7 @@ - [STR_NAME_MODULE_OPTIONAL_JAVA] - 49 = "Java Environment Installation" - 01 = "Java Environment Installation" --07 = " Java" -+07 = " Java" - 55 = "Java Environment Installation" - 00 = " " - 37 = "Installaci de l'entorn Java" -@@ -1676,7 +1676,7 @@ - [STR_DESC_MODULE_OPTIONAL_ADABAS] - 49 = "Komponente zur Installation der Adabas-Datenbank." - 01 = "Component for installing the Adabas database" --07 = " Adabas" -+07 = " Adabas" - 55 = "Nicht zu sehen vom User" - 37 = "Component per installar la base de dades Adabas" - 03 = "Componente para a instalao da base de dados Adabas." -diff -ur ../scp/source/office/profile.lng ../scp/source/office/profile.lng ---- ../scp/source/office/profile.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/profile.lng Fri Apr 5 19:36:15 2002 -@@ -589,7 +589,7 @@ - 33 = "~Texte" - 96 = "~Text Document" - 01 = "~Text Document" --07 = "Текстовый документ" -+07 = "~ " - 86 = "文本文档(~T)" - 31 = "~Tekstdocument" - 46 = "~Textdokument" -@@ -612,7 +612,7 @@ - 33 = "Document ~HTML" - 96 = "~HTML Document" - 01 = "~HTML Document" --07 = "Документ ~HTML" -+07 = " ~HTML" - 86 = "~HTML 文档" - 31 = "~HTML-Document" - 46 = "~HTML-dokument" -@@ -635,7 +635,7 @@ - 33 = "~Document matre" - 96 = "to be translated" - 01 = "M~aster Document" --07 = "Главный документ" -+07 = "~ " - 86 = "主控文档(~A)" - 31 = "~Basisdocument" - 46 = "~Samlingsdokument" -@@ -658,7 +658,7 @@ - 33 = "ti~quettes" - 96 = "~Labels" - 01 = "~Labels" --07 = "Наклейки" -+07 = "~" - 86 = "标签(~L)" - 31 = "Et~iketten" - 46 = "Et~iketter" -@@ -681,7 +681,7 @@ - 33 = "Cartes de ~visite" - 96 = "B~usiness Cards" - 01 = "B~usiness Cards" --07 = "Визитные карточки" -+07 = "~" - 86 = "名片(~U)" - 31 = "~Visitekaartjes" - 46 = "~Visitkort" -@@ -704,7 +704,7 @@ - 33 = "Mod~les et documents" - 96 = "F~rom Template..." - 01 = "Templates a~nd Documents" --07 = "Шаблоны и документы" -+07 = "~ " - 86 = "样式和文挡(~N)" - 31 = "~Sjablonen en documenten" - 46 = "M~allar och dokument" -@@ -727,7 +727,7 @@ - 33 = "~Lettre..." - 96 = "~Letter..." - 01 = "~Letter..." --07 = "~Письмо..." -+07 = "~..." - 86 = "信函(~L)..." - 31 = "~Brief..." - 46 = "~Brev..." -@@ -750,7 +750,7 @@ - 33 = "~Fax..." - 96 = "~Fax..." - 01 = "~Fax..." --07 = "~Факс..." -+07 = "~..." - 86 = "传真(~F)..." - 31 = "~Fax..." - 46 = "~Fax..." -@@ -773,7 +773,7 @@ - 33 = "~Agenda..." - 96 = "~Agenda..." - 01 = "~Agenda..." --07 = "~Повестка дня..." -+07 = "~ ..." - 86 = "会议议程(~A)..." - 31 = "~Agenda..." - 46 = "~Agenda..." -@@ -796,7 +796,7 @@ - 33 = "~Mmo..." - 96 = "~Memo..." - 01 = "~Memo..." --07 = "~Памятка..." -+07 = "~..." - 86 = "备忘录(~M)..." - 31 = "~Memo..." - 46 = "P~M..." -@@ -819,7 +819,7 @@ - 33 = "Page ~Web..." - 96 = "~Web Page..." - 01 = "~Web Page..." --07 = "~Web-страница..." -+07 = "~Web-..." - 86 = "网页(~W)..." - 31 = "~Webpagina..." - 46 = "~Webbsida..." -@@ -842,7 +842,7 @@ - 33 = "Form~ulaire..." - 96 = "Form..." - 01 = "Fo~rm..." --07 = "Формуляр..." -+07 = "~..." - 86 = "表单(~R)..." - 31 = "F~ormulier..." - 46 = "F~ormulr..." -@@ -865,7 +865,7 @@ - 33 = "Converti~sseur de documents..." - 96 = "StarOffice 5.2 Database Import..." - 01 = "Document ~Converter..." --07 = "Преобразователь документов..." -+07 = " ~..." - 86 = "文档转换器(~C)..." - 31 = "Documenten-~converter..." - 46 = "Dokument~konverterare..." -@@ -888,7 +888,7 @@ - 33 = "Euro-~Convertisseur..." - 96 = "~Euro Converter..." - 01 = "~Euro Converter..." --07 = "Преобразователь Евро..." -+07 = "~Euro-..." - 86 = "欧元换算器(~E)..." - 31 = "~Euro-converter..." - 46 = "~Eurokonverterare..." -@@ -911,7 +911,7 @@ - 33 = "Import de BD StarOffice 5.2..." - 96 = "~Euro Converter..." - 01 = "StarOffice 5.2 Database Import..." --07 = "Импорт базы данных StarOffice 5.2..." -+07 = " StarOffice 5.2..." - 86 = "输入 StarOffice 5.2 数据库..." - 31 = "StarOffice 5.2 database-import..." - 46 = "StarOffice 5.2 databasimport..." -@@ -926,7 +926,7 @@ - 44 = "Address Data Source..." - 49 = "Adress-Datenquelle..." - 03 = "Fonte de dados de endereços..." --07 = "Исходные данные адресов..." -+07 = " ..." - 30 = "Address Data Source..." - 31 = "Bron addresgegevens..." - 33 = "Source de donnes des adresses..." -@@ -953,7 +953,7 @@ - 86 = "%PRODUCTNAME %PRODUCTVERSION 文本文档" - 88 = "%PRODUCTNAME %PRODUCTVERSION 文字" - 03 = "StarOffice 6.0 Texto" --07 = "StarOffice 6.0 - Текст" -+07 = "%PRODUCTNAME %PRODUCTVERSION " - 30 = "StarOffice 6.0 - Κείμενο" - 31 = "StarOffice 6.0 Tekst" - 33 = "%PRODUCTNAME %PRODUCTVERSION Texte" -diff -ur ../scp/source/office/setuphelp.lng ../scp/source/office/setuphelp.lng ---- ../scp/source/office/setuphelp.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/setuphelp.lng Fri Apr 5 17:59:30 2002 -@@ -30,7 +30,7 @@ - [STR_HELP_INSTALLMODE] - 01 = "The Standard installation is recommended for normal users. It generally installs all components together with a selection of filters.\n\nThe Custom installation shows a dialog in which you can select the individual components to be installed.\n\nThe Minimum installation only installs those components needed to run the application. This option does not install the Help or most of the sample documents and templates." - 49 = "Die Standard Installation wird fr den normalen Anwender empfohlen. Im Allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter.\n\nDie Benutzergesteuerte Installation zeigt Ihnen einen Dialog, in dem Sie die einzeln installierbaren Komponenten anwhlen knnen.\n\nDie Minimale Installation installiert nur die minimal ntigen Komponenten. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen mssen Sie verzichten." --07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." -+07 = " . .\n\n , .\n\n , %PRODUCTNAME . , , ." - 55 = "Die Standard Installation wird f? den normalen Anwender empfohlen. Im allgemeinen wird sie alle Komponenten installieren, mit einer Auswahl der Filter. Wenn Sie diese Option w?hlen, werden Sie im Anschlu? nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll.\n\nDie Benutzergesteuerte Installation zeigt Ihnen ebenfalls zuerst einen Dialog zur Auswahl des Installationsverzeichnisses. Anschlie?end wird ein Dialog gezeigt, in dem Sie die einzeln installierbaren Komponenten anw?hlen k?nen. (Haben Sie das %PRODUCTNAME bereits installiert, k?nen Sie hier einzelne installierte Komponenten wieder abw?hlen, die dann aus der Installation entfernt werden.)\n\nDie Minimale Installation installiert nur die Komponenten, die mindestens n?ig sind, um das %PRODUCTNAME auszuf?ren. Bei dieser Option wird die Hilfe nicht installiert, auch auf die meisten Beispiele und Vorlagen m?sen Sie verzichten. Wenn Sie diese Option w?hlen, werden Sie nur noch um die Angabe eines Verzeichnisses gebeten, in das das %PRODUCTNAME installiert werden soll." - 37 = "La installaci estndard s la recomanada per a usuaris normals; per regla general installa tots els components juntament amb una selecci de filtres.\n\nLa installaci personalitzada mostra un dileg en qu podeu seleccionar els components individuals que voleu installar.\n\nLa installaci mnima noms installa els components necessaris per executar l'aplicaci. Aquesta opci no installa l'Ajuda ni tampoc la majoria dels documents de mostra ni les plantilles." - 03 = "Para utilizadores comuns, recomenda-se a instalao padro. Esta instalar de forma geral todos os componentes juntamente com uma seleco de filtros.\n\nA instalao personalizada mostra-lhe uma caixa de dilogo para seleco dos componentes que deseja instalar.\n\nNa instalao mnima, sero instalados apenas os componentes mnimos necessrios. Com esta opo, a Ajuda e muitos dos exemplos e modelos de documentos no sero instalados." -@@ -53,7 +53,7 @@ - [STR_HELP_INSTPATH] - 01 = "Specify the directory where this product is to be installed. This folder will then be used to create several files and sub-folders." - 49 = "Geben Sie hier das Verzeichnis ein, in das dieses Produkt installiert werden soll. Einige Dateien werden in diesem Ordner angelegt und es werden weitere Unterordner unter diesem Ordner erstellt." --07 = ", , , . , ." -+07 = ", , , . , ." - 55 = "Geben Sie hier das Verzeichnis ein, in das %PRODUCTNAME Scheduleserver installiert werden soll. In der Vorgabe hei?t dieser Ordner SdlSrv51. Viele Dateien werden in diesem Ordner angelegt, und es werden weitere Unterordner unter diesem Ordner erstellt." - 37 = "Indiqueu el directori on s'ha d'installar aquest producte. Aquesta carpeta s'utilitzar per crear-hi diversos fitxers i subcarpetes." - 03 = "Indique o directrio para a instalao do produto. Nesse directrio sero criados vrios ficheiros e subpastas." -@@ -76,7 +76,7 @@ - [STR_HELP_REINSTALLATION] - 01 = "Modify Installation:\nUse this procedure to either delete individual components that have already been installed or to install additional ones.\n\nDeinstallation:\nThis procedure will delete the files and folders created by the setup program during installation. Files and folders created by the user after installation will not be deleted.\n\nRepair:\nThis option re-enters the application into your operating system's registry. An attempt will be made to restore inadvertently deleted program files." - 49 = "Installation ndern:\nHier knnen Sie die installierten Komponenten einzeln lschen oder weitere Komponenten nachtrglich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner lschen, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. \n\nReparatur:\nDiese Funktion trgt die Anwendung erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gelschte Programmdateien wiederherzustellen." --07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." -+07 = " :\n .\n\n:\n , . , , . \n\n :\n %PRODUCTNAME . ." - 55 = "Installation ?ndern:\nHier k?nen Sie die installierten Komponenten einzeln l?chen oder weitere Komponenten nachtr?glich installieren.\n\nDeinstallation:\nWird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren.\n\nReparatur:\nDiese Option tr?gt %PRODUCTNAME Scheduleserver erneut in der Registrierung Ihres Betriebssystems ein. Es wird versucht, versehentlich gel?chte Programmdateien wiederherzustellen." - 37 = "Modifica la installaci:\nUtilitzeu aquest procediment tant per suprimir components individuals que ja s'han installat com per installar-ne d'addicionals.\n\nDesinstallaci:\nAquest procediment suprimeix els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers ni les carpetes que l'usuari ha creat desprs de la installaci.\n\nReparaci:\nAquesta opci torna a introduir l'aplicaci en el registre del sistema operatiu. S'intentar restaurar els fitxers de programa que s'han suprimit inadvertidament." - 03 = "Modificar instalao:\ninstala ou elimina os componentes seleccionados.\n\nDesinstalao:\nelimina os ficheiros e as pastas criados pelo programa setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Se desejar poder tambm eliminar todos os ficheiros.\n\n\nReparao:\nesta opo regista novamente a aplicao no seu sistema operativo e tenta restaurar os ficheiros do programa que tenham sido eliminados involuntariamente." -@@ -99,7 +99,7 @@ - [STR_HELP_UNINSTALL] - 01 = "The files and folders created by the setup program during installation will be deleted. Files and folders created by the user after installation will not be deleted. All of the files needed to run the setup program will not be deleted either. If you want you can have all the files deleted." - 49 = "Es werden die Dateien und Ordner gelscht, die bei der Installation durch das Setup Programm angelegt wurden. Nicht gelscht werden Dateien und Ordner, die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausfhren des Setup Programms bentigt werden, bleiben ebenfalls bestehen. Sie knnen auf Wunsch auch alle Dateien lschen lassen." --07 = " , . , , . , , . ." -+07 = " , . , , . , , . ." - 55 = "Wird die Dateien und Ordner l?chen, die bei der Installation durch das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm angelegt wurden. Nicht gel?cht werden Dateien, Ordner, Verkn?fungen, Bookmarks, Cache und Storage Dateien usw., die Sie nach der Installation selbst neu angelegt haben. Alle Dateien, die zum Ausf?ren des %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programms ben?igt werden, bleiben ebenfalls bestehen. Nach der Deinstallation k?nen Sie den ganzen Ordner SdlSrv51 mit den Mitteln Ihres Betriebssystems l?chen, wenn Sie auf Ihre eigenen Dateien in diesem Ordner und seinen Unterordnern verzichten wollen.\n\nAchtung: Es kann nicht garantiert werden, da? nach der Deinstallation alle Ihre eigenen Daten bestehen bleiben. Wenn Sie z.B. %PRODUCTNAME Basic Makros in der allgemeinen Bibliothek gespeichert haben, die Standarddateien f? Farben, Farbverl?ufe, Linien usw. ver?ndert haben, gehen diese Informationen verloren." - 37 = "Se suprimiran els fitxers i les carpetes creats pel programa d'installaci. No se suprimiran els fitxers i les carpetes creats per l'usuari desprs de la installaci. Tampoc no se suprimiran tots els fitxers necessaris per executar el programa d'installaci. Si voleu, podeu suprimir tots els fitxers." - 03 = "Sero eliminados os ficheiros e as pastas criados pelo programa Setup durante a instalao. Os ficheiros e as pastas criados por si aps a instalao no sero eliminados. Os ficheiros necessrios execuo do programa de instalao (setup) mantm-se intactos. Se desejar poder tambm eliminar todos os ficheiros." -@@ -122,7 +122,7 @@ - [STR_HELP_USERDEFINED] - 01 = "This is where you select the components to be installed. Note that you can select or deselect individual text filters, graphic filters, dictionaries, etc.\n\nThe Default button will reset your changes to the default settings.\n\nIf you want to add or delete components in an existing installation at a later date, call the Setup program again and select the desired components.\n\nBy default, all components marked by a colored box next to the name are installed. If you do not want to install a component, click the respective box. A colorless box indicates the components which will not be installed or are to be deleted from an existing installation. Each click on a box changes it from colored to colorless and vice versa and the component will be installed or deinstalled/not installed.\n\nIf you click the plus sign next to a component, a list of related components is displayed. These can also be installed or deinstalled as described above. A gray box indicates that some components in that group are to be installed and some are to be deinstalled/not installed." - 49 = "Whlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, dass Sie Textfilter, Grafikfilter, Wrterbcher usw. einzeln anwhlen und abwhlen knnen.\n\nDie Schaltflche Standard setzt die Auswahl auf die Standardvorgabe zurck.\n\nWenn Sie nach der Installation Komponenten hinzufgen oder lschen wollen, rufen Sie das Setup Programm erneut auf und whlen Sie hier aus.\n\nStandardmig werden alle Komponenten installiert, deren Kstchen neben den Komponentennamen vollfarbig gefllt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das Kstchen neben dem Namen. Das Kstchen wird farblos, was Ihnen anzeigt, dass diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein Kstchen wechselt es von vollfarbig nach farblos oder umgekehrt und die zugehrige Komponente wird installiert oder nicht installiert.\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ffnen Sie die Liste der untergeordneten Komponenten. Auch diese knnen Sie durch Anklicken installieren oder aus der Installation entfernen. Enthlt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das Kstchen grau." --07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." -+07 = " , . , , , .\n\n "" .\n\n - , . .\n\n , , , . , . , , () () .\n\n , . . , , ." - 55 = "W?hlen Sie hier, welche Komponenten installiert werden sollen. Beachten Sie, da? Sie Textfilter, Grafikfilter, W?terb?her usw. einzeln anw?hlen und abw?hlen k?nen.\n\nDie Schaltfl?che Standard setzt die Auswahl auf die Standardvorgabe zur?k.\n\nWenn Sie nach der Installation Komponenten hinzuf?en oder l?chen wollen, rufen Sie das %PRODUCTNAME %PRODUCTNAME %PRODUCTNAME Setup Programm erneut auf und w?hlen Sie hier aus. In der Netzwerk-Installation sollten Sie alle Komponenten anw?hlen.\n\nStandardm??ig werden alle Komponenten installiert, deren K?stchen neben den Komponentennamen blau gef?lt sind. Wenn Sie eine Komponente nicht installieren wollen, klicken Sie auf das blaue K?stchen neben dem Namen. Das K?stchen wird wei?, was Ihnen anzeigt, da? diese Komponente nicht installiert bzw. aus der Installation entfernt wird. Mit jedem Klick auf ein K?stchen wechselt es von blau nach wei? oder umgekehrt, und die zugeh?ige Komponente wird entweder installiert (blau) oder nicht installiert (wei?).\n\nWenn Sie auf ein Pluszeichen neben dem Namen einer Komponente klicken, ?fnen Sie die Liste der untergeordneten Komponenten. Auch diese k?nen Sie durch Anklicken installieren oder aus der Installation entfernen. Enth?lt ein Eintrag sowohl Komponenten, die installiert werden, als auch solche, die nicht installiert werden, ist das K?stchen grau." - 37 = "Seleccioneu els components que s'han d'installar aqu. Observeu que podeu seleccionar o desseleccionar filtres de text, filtres grfics, diccionaris, etc. individuals.\n\nEl bot Valors per defecte anullar els canvis i deixar els parmetres per defecte.\n\nSi ms endavant voleu afegir o suprimir components d'una installaci existent, torneu a executar el programa d'installaci i seleccioneu els components desitjats.\n\nPer defecte, s'installaran tots els components marcats amb un quadre blau al costat del nom. Si no voleu installar un component, feu clic al quadre corresponent. Un quadre en blanc indica els components que no s'installaran, o els que se suprimiran d'una installaci existent. Cada clic en un quadre el canvia de blau a blanc i viceversa i el component s'installar (blau) o es desinstallar/no s'installar (blanc).\n\nSi feu clic sobre el signe " - 03 = "Seleccione aqui os componentes que deseja instalar. No esquea que poder seleccionar ou desseleccionar individualmente filtros de texto, filtros grficos, dicionrios, etc.\n\nO boto 'Padro' restaura as predefinies anteriores.\n\nSe, posteriormente, desejar adicionar ou eliminar componentes numa instalao existente, active novamente o programa de instalao (setup) e seleccione os componentes desejados.\n\nAs casas preenchidas a cor indicam que os respectivos componentes sero instaladas de forma padronizada. Se no pretender instalar um desses componentes, clique na respectiva casa. Essa casa deixar de ter cor, indicando que os componentes no sero instalados ou que sero eliminados de uma instalao existente. Com cada clique mudar a cor da casa correspondente: a cor indica que os componentes sero instalados; uma casa sem cor indica que os componentes no sero instalados.\n\nSe fizer clique no sinal de adio que se encontra ao lado de cada um dos componentes, ver uma lista de componentes subordinados. Estes podero tambm ser instalados ou eliminados como acima descrito. Uma casa de cor cinzenta indica que sero instalados somente alguns dos respectivos componentes." -@@ -145,7 +145,7 @@ - [STR_HELP_WELCOME] - 01 = "Welcome to the installation.\n\nFor a detailed description of the installation procedure refer to the Setup Guide.\n\nIn several of the Setup program dialogs there are also Help buttons which access specific information about the settings." - 49 = "Willkommen bei der Installation.\n\nBitte schauen Sie fr eine genaue Anleitung in Ihr Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltflchen. Mit einem Klick erhalten Sie Untersttzung zu den jeweiligen Einstellungen." --07 = " .\n\n .\n\n , ." -+07 = " .\n\n .\n\n , ." - 55 = "Willkommen bei der Installation von %PRODUCTNAME Scheduleserver\n\nBitte schauen Sie f? eine genaue Anleitung in Ihr %PRODUCTNAME Scheduleserver Installationshandbuch.\n\nIn verschiedenen Dialogen des Setup-Programms finden Sie weitere Hilfe-Schaltfl?chen. Mit einem Klick erhalten Sie Unterst?zung zu den jeweilligen Einstellungen." - 37 = "Benvingut a la installaci.\n\nPer a una descripci detallada del procediment d'installaci, consulteu la Guia d'installaci.\n\nEn diversos dilegs del programa de configuraci tamb hi ha botons d'ajuda que permeten accedir a la informaci especfica sobre els parmetres." - 03 = "Bem-vindo ao programa de instalao!\n\nPara instrues mais detalhadas, queira consultar o Manual de Instalao.\n\nAo longo da instalao encontrar botes nas diversas caixas de dilogo que lhe do acesso a uma ajuda especfica. Bastar um clique para receber mais informaes sobre os parmetros da caixa de dilogo activa." -@@ -191,7 +191,7 @@ - [STR_HELP_MIGRATION] - 01 = "%PRODUCTNAME can adopt personal data and configuration settings from a previous %PRODUCTNAME installation. To take advantage of this, activate the 'Import personal data' field. The path to the directory in the previous installation appears. If you do not want to accept data and settings from a previous version, unmark the 'Import personal data' check box." - 49 = "%PRODUCTNAME kann persnliche Daten und Konfigurationseinstellungen aus einer frheren %PRODUCTNAME-Installation bernehmen. Wenn Sie dieses wnschen, aktivieren Sie das Feld 'persnliche Daten importieren'. Sie sehen den Pfad zum Verzeichnis der frheren Installation. Wnschen Sie keine bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'persnliche Daten importieren' auf." --07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." -+07 = "%PRODUCTNAME %PRODUCTNAME . , ' ' . , ' '." - 55 = "%PRODUCTNAME kann pers?liche Daten und Konfigurationseinstellungen aus einer fr?eren %PRODUCTNAME-Installation ?ernehmen. Wenn Sie dieses w?schen, aktivieren Sie das Feld 'pers?liche Daten importieren' und geben Sie den vollst?ndigen Pfad zum Verzeichnis der fr?eren Installation ein. Mit der Schaltfl?che Durchsuchen k?nen Sie das Verzeichnis w?hlen. W?schen Sie keine ?bernahme alter Daten und Einstellungen, heben Sie die Markierung des Felds 'pers?liche Daten importieren' auf." - 00 = " " - 37 = "El %PRODUCTNAME pot acceptar les dades personals i els parmetres de configuraci d'una versi anterior. Si voleu fer-ho aix, activeu el camp 'Importa les dades personals' i introduu el cam complet al directori de la versi anterior. Tamb podeu seleccionar el directori utilitzant el bot Navega. Si no voleu acceptar les dades i els parmetres d'una versi anterior, desactiveu el camp 'Importa les dades personals'." -diff -ur ../scp/source/office/unxbasic.lng ../scp/source/office/unxbasic.lng ---- ../scp/source/office/unxbasic.lng Wed Apr 3 16:11:15 2002 -+++ ../scp/source/office/unxbasic.lng Fri Apr 5 18:01:11 2002 -@@ -1,7 +1,7 @@ - [STR_BASIC_ADABASINST1] - 01 = "An Adabas installation has been found in the directory: " - 49 = "Es wurde eine Adabas-Installation gefunden im Verzeichnis: " --07 = " Adabas " -+07 = " Adabas " - 55 = "An Adabas installation has been found in the directory: " - 37 = "S'ha trobat una installaci d'Adabas en el directori: " - 03 = "Foi encontrada uma instalao Adabas no directrio: " -@@ -24,7 +24,7 @@ - [STR_BASIC_ADABASINST2] - 01 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed. Further information about integrating Adabas can be found in %PRODUCTNAME Help." - 49 = "Die mit diesem %PRODUCTNAME mitgelieferte Version wird daher nicht installiert. Weitere Hinweise zur Adabas-Integration erhalten Sie in der %PRODUCTNAME-Hilfe." --07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." -+07 = " , %PRODUCTNAME, . , Adabas, %PRODUCTNAME." - 55 = "The version supplied with this %PRODUCTNAME will, therefore, not be installed." - 37 = "Per aix no s'installar la versi subministrada amb aquest %PRODUCTNAME. En l'ajuda de %PRODUCTNAME disposa d'altres informacions sobre la integraci de Adabas." - 03 = "Por esta razo, a verso fornecida com o %PRODUCTNAME no ser instalada. Consulte a Ajuda do %PRODUCTNAME para mais informaes sobre a integrao do Adabas." -@@ -47,7 +47,7 @@ - [STR_BASIC_ADABASPFAD] - 01 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 49 = "Leider konnte %PRODUCTNAME die Dateien zur Installation der Adabas Datenbank nicht finden. Wenn Sie die Adabas Integration in %PRODUCTNAME nutzen mchten, dann starten Sie das Adabas Setup nach der Installation von %PRODUCTNAME bitte manuell. Der Adabas Installationsatz ist via Download ber das Internet erhltlich." --07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." -+07 = " , %PRODUCTNAME , Adabas. %PRODUCTNAME Adabas, Adabas, %PRODUCTNAME. Adabas ." - 55 = "Unfortunately %PRODUCTNAME could not find the files needed to install the Adabas database. If you want to have Adabas integrated into your %PRODUCTNAME, run the set-up program for Adabas after completing the %PRODUCTNAME installation. The Adabas installation set can be downloaded from the Internet." - 37 = "%PRODUCTNAME no ha pogut trobar fitxers per a la installaci de la base de dades Adabas. Si vol utilitzar la integraci de Adabas en %PRODUCTNAME, ha d'iniciar 'manualment' el programa d'installaci d'Adabas desprs d'installar %PRODUCTNAME. El programa d'installaci d'Adabas el pot descarregar d'Internet." - 03 = "No foi possvel ao %PRODUCTNAME encontrar os ficheiros para a instalao da base de dados Adabas. Para utilizar a integrao Adabas no %PRODUCTNAME ter que iniciar o programa de instalao do Adabas (Setup) manualmente, aps concluir a instalao do %PRODUCTNAME. Carregue os ficheiros de instalao do Adabas via Internet." -@@ -70,7 +70,7 @@ - [STR_BASIC_ADABASTITEL] - 01 = "Adabas Installation" - 49 = "Adabas Installation" --07 = " Adabas" -+07 = " Adabas" - 55 = "Adabas installation" - 00 = " " - 37 = "Installaci d'Adabas" -diff -ur ../setup2/source/custom/jvmsetup/jvmdlg.src ../setup2/source/custom/jvmsetup/jvmdlg.src ---- ../setup2/source/custom/jvmsetup/jvmdlg.src Wed Apr 3 16:11:09 2002 -+++ ../setup2/source/custom/jvmsetup/jvmdlg.src Fri Apr 5 19:01:36 2002 -@@ -77,7 +77,7 @@ - Text[ ENGLISH ] = "Java Setup" ; - Text[ english_us ] = "Java Setup"; - Text[ portuguese ] = "Java Setup"; -- Text[ russian ] = " Java"; -+ Text[ russian ] = " Java"; - Text[ dutch ] = "Java Setup"; - Text[ french ] = "Programme d'installation de Java (Setup)"; - Text[ spanish ] = "Java Setup"; -@@ -305,7 +305,7 @@ - Text[ENGLISH] = "~Install..."; - Text[ english_us ] = "~Install..."; - Text[ portuguese ] = "~Instalar..."; -- Text[ russian ] = "..."; -+ Text[ russian ] = "..."; - Text[ dutch ] = "~Installeren..."; - Text[ french ] = "~Installer..."; - Text[ spanish ] = "I~nstalar..."; -@@ -337,7 +337,7 @@ - Message = "Es wurde keine Java Untersttzung ausgewhlt.\nDies ist jedoch fr PGP erforderlich. Wollen Sie PGP dennoch installieren?\nMit Abbruch kommen Sie zurck zum Dialog." ; - Message [ english_us ] = "No Java support is selected.\nFor PGP you need Java. Do you want to install PGP anyway?\nCancel will bring you back to the dialog." ; - Message[ portuguese ] = "No foi seleccionado o suporte Java.\nO PGP no funciona sem este suporte. Mesmo assim, instalar o PGP?\nPara voltar caixa de dilogo, clique em Cancelar."; -- Message[ russian ] = " Java .\n PGP. PGP ?\n ."; -+ Message[ russian ] = " Java .\n PGP. PGP ?\n ."; - Message[ greek ] = " Java.\n PGP. PGP ;\n? "; - Message[ dutch ] = "Er werd geen Java support geselecteerd.\nDaardoor kan PGPniet functioneren. Wilt u PGP toch installeren?\nMet Annuleren komt u terug naar de dialoog."; - Message[ french ] = "Aucun support Java n'a t slectionn.\nCelui-ci est indispensable pour que PGP fonctionne. Voulez-vous quand mme installer PGP ?\nAnnuler vous permet de retourner la bote de dialogue."; -@@ -354,7 +354,7 @@ - Message[ turkish ] = "Java destei seilmedi.\nPGP, Java destei olmadan alamaz. PGP'yi yine de kurmak istiyor \n musunuz?ptal seerseniz pencereye geri dneceksiniz."; - Message[ arabic ] = " .\n PGP. PGP ߿\n ѡ "; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; -@@ -385,7 +385,7 @@ - Message = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?" ; - Message [ english_us ] = "Some program functions require Java to be supported. Please note: %PRODUCTNAME Help requires a Java Runtime Environment of 1.2 or higher to be supported by your system.\n\nAre you sure you want to continue with installation?" ; - Message[ portuguese ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; -- Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; -+ Message[ russian ] = " Java . , %PRODUCTNAME Java Runtime Environment, 1.2.\n\n , ?"; - Message[ greek ] = " Java. %PRODUCTNAME Java ( 1.2 ) .\n\n ;"; - Message[ dutch ] = "Bepaalde programmafuncties zijn alleen uitvoerbaar met ondersteuning van Java. Wij maken u erop attent dat voor %PRODUCTNAME-Help een Java Runtime Environment vanaf versie 1.2 op uw systeem wordt benodigd.\n\nWilt u toch doorgaan met de installatie?"; - Message[ french ] = "Certaines fonctions du programme exigent un support Java. Veuillez noter que l'aide de %PRODUCTNAME ncessite un environnement Java Runtime version 1.2 ou plus.\n\ntes-vous sr de vouloir poursuivre l'installation ?"; -@@ -402,7 +402,7 @@ - Message[ turkish ] = "Eine Java-Untersttzung ist fr bestimmte Programmfunktionen erforderlich. Bitte beachten Sie, dass die %PRODUCTNAME-Hilfe ein Java Runtime Environment ab Version 1.2 auf Ihrem System bentigt.\n\nSind Sie sicher, dass Sie die Installation fortsetzen wollen?"; - Message[ arabic ] = " . %PRODUCTNAME Java Runtime Environment 1.2 .\n\n ?"; - Title[ portuguese ] = "Para algumas das funes do programa necessrio um suporte Java. No esquea que a Ajuda do %PRODUCTNAME precisa de um ambiente Java Runtime a partir da verso 1.2 no seu sistema.\n\nProsseguir com a instalao?"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ greek ] = ""; - Title[ dutch ] = "Installatie"; - Title[ french ] = "Installation"; -@@ -440,14 +440,14 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt, wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt onderbreken?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您就无法使用这个程序！\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu,nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "ここでインストールを中止すると、インストールは不完全のまま終了し、プログラムの実行はできません。\nインストールを中止してかまいませんか。"; - Message[ chinese_traditional ] = "如果您現在取消安裝，安裝的程式就不會完整，也可能無法啟動！\n您真要取消安裝？"; - Message[ arabic ] = " !\n ʿ"; - Title[ english_us ] = "Installation"; - Title[ portuguese ] = "Installation"; -- Title[ russian ] = ""; -+ Title[ russian ] = ""; - Title[ dutch ] = "Installation"; - Title[ french ] = "Installation"; - Title[ spanish ] = "Installation"; -@@ -679,7 +679,7 @@ - TEXT [ ENGLISH ] = "Java Environment Installation" ; - TEXT[ english_us ] = "Java Environment Installation"; - TEXT[ portuguese ] = "Instalao do Java Environment"; -- TEXT[ russian ] = " Java Environment "; -+ TEXT[ russian ] = " Java Environment "; - TEXT[ dutch ] = "Installatie van Java- environment"; - TEXT[ french ] = "Installation de l'environnement Java"; - TEXT[ spanish ] = "Instalacin de Java Environment"; -diff -ur ../setup2/source/service/progressdlg.src ../setup2/source/service/progressdlg.src ---- ../setup2/source/service/progressdlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/service/progressdlg.src Fri Apr 5 18:57:00 2002 -@@ -91,7 +91,7 @@ - Text = "Ihre Installation wird jetzt vervollstndigt!\nBitte haben Sie einen Moment Geduld." ; - Text [ english_us ] = "Installation is now being completed\nPlease wait a moment." ; - Text[ portuguese ] = "A sua instalao ser agora concluda!\nQueira aguardar alguns instantes."; -- Text[ russian ] = " .\n, ."; -+ Text[ russian ] = " .\n, ."; - Text[ greek ] = " !\n ."; - Text[ dutch ] = "Uw installatie wordt nu voltooid!\nEen ogenblik geduld a.u.b."; - Text[ french ] = "Achvement de l'installation...\nVeuillez patienter."; -diff -ur ../setup2/source/ui/app.src ../setup2/source/ui/app.src ---- ../setup2/source/ui/app.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/app.src Fri Apr 5 18:20:27 2002 -@@ -167,7 +167,7 @@ - Text [ dutch ] = "De installatie wordt voorbereid" ; - Text [ portuguese ] = "A preparar a instalao" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowanie instalacji"; - Text[ japanese ] = "インストールの準備"; - Text[ chinese_traditional ] = "準備安裝程式"; -@@ -504,7 +504,7 @@ - Text [ french ] = "Installation de l'utilisateur %1 en cours" ; - Text [ dutch ] = "Gebruiker %1 wordt genstalleerd" ; - Text[ chinese_simplified ] = "建立使用者 %1 。"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Instalacja uytkownika %1"; - Text[ japanese ] = "ユーザー %1 がインストールされます"; - Text[ chinese_traditional ] = "建立使用者 %1 。"; -@@ -636,7 +636,7 @@ - Text [ portuguese ] = "Foram instalados novos conjuntos de caracteres. Para que estes estejam disponveis para todos os programas necessrio reiniciar o sistema." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; - Text[ chinese_simplified ] = "在安装过程中，已经安装了新的字体。为了让所有的应用程序能够使用这些字体，您必须重新启动重新您的系统。"; -- Text[ russian ] = " . , ."; -+ Text[ russian ] = " . , ."; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, wymagane jest ponowne rozpoczcie."; - Text[ japanese ] = "新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するためには、コンピュータを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝軟體時加入了一些新的字型。為了讓所有的應用程式能夠使用這些字型，請重新啟動電腦。"; -@@ -767,7 +767,7 @@ - Text [ portuguese ] = "A instalao est a ser preparada." ; - Text [ portuguese_brazilian ] = "Installation wird vorbereitet" ; - Text[ chinese_simplified ] = "准备安装程序"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Przygotowywanie instalacji"; - Text[ japanese ] = "インストールの準備をしています。"; - Text[ chinese_traditional ] = "正在準備安裝"; -@@ -793,7 +793,7 @@ - Text [ portuguese ] = "Os dados da instalao esto a ser guardados." ; - Text [ portuguese_brazilian ] = "Installationsdaten werden gesichert." ; - Text[ chinese_simplified ] = "存盘安装数据。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dane instalacji bd zapisane."; - Text[ japanese ] = "インストールデータを保存しています。"; - Text[ chinese_traditional ] = "正在儲存安裝數據"; -@@ -819,7 +819,7 @@ - Text [ portuguese ] = "O programa %1 no foi encontrado. A verso actualizada no pode ser instalada." ; - Text [ portuguese_brazilian ] = "Das Programm %1 wurde nicht gefunden. Das Update kann nicht installiert werden." ; - Text[ chinese_simplified ] = "没有找到程序 %1 。无法安装升级服务包。"; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ polish ] = "Nie znaleziono programu %1. Nie mona zainstalowa aktualizacji."; - Text[ japanese ] = "プログラム %1 は見つかりません。更新インストールはできません。"; - Text[ chinese_traditional ] = "沒有找到程式 %1 。無法安裝升級軟體。"; -@@ -935,7 +935,7 @@ - Text [ french ] = "Vous n'tes pas autoris installer ce ServicePack sur une version de dmonstration (Try&Buy)." ; - Text [ dutch ] = "Met een Try&Buy-Version bestaat geen recht op het installeren van dit ServicePack." ; - Text[ chinese_simplified ] = "您使用的是'先用后买'版本，因此您不能安装这个服务包。"; -- Text[ russian ] = " Try&Buy ServicePack."; -+ Text[ russian ] = " Try&Buy ServicePack."; - Text[ polish ] = "Wersja Try&Buy nie upowania do instalacji ServicePack."; - Text[ japanese ] = "Try＆Buy バージョンで、この ServicePack をインストールできません。"; - Text[ chinese_traditional ] = "您使用的是'先用後買'版本﹐因此您無法安裝這個升級軟體。"; -@@ -960,7 +960,7 @@ - Text [ french ] = "L'installation du ServicePack a chou." ; - Text [ dutch ] = "De server kon niet worden genstalleerd." ; - Text[ chinese_simplified ] = "无法安装这个服务包。"; -- Text[ russian ] = " ServicePack ."; -+ Text[ russian ] = " ServicePack ."; - Text[ polish ] = "Instalacja ServicePack nie moga zosta przeprowadzona."; - Text[ japanese ] = "ServicePack のインストールは実行できませんでした｡"; - Text[ chinese_traditional ] = "無法安裝這個升級軟體。"; -@@ -985,7 +985,7 @@ - Text [ french ] = "Aucun kit d'installation n'a t trouv sur le chemin indiqu." ; - Text [ dutch ] = "In het aangegeven pad werd geen installatiebestand gevonden." ; - Text[ chinese_simplified ] = "在您给定的路径内无法找到任何安装文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "W podanej ciece nie znaleziono plikw instalacyjnych."; - Text[ japanese ] = "指定したパスに、インストールファイルは見つかりませんでした。"; - Text[ chinese_traditional ] = "在您輸入的路徑內無法找到任何安裝檔案。"; -@@ -1011,7 +1011,7 @@ - Text [ portuguese ] = "Esta verso \"Try & Buy\" no pode ser instalada novamente neste computador." ; - Text [ portuguese_brazilian ] = "Diese Try&Buy-Version kann nicht erneut auf diesem Computer installiert werden." ; - Text[ chinese_simplified ] = "无法在您的计算机上重新安装这个'先用后买'版本。"; -- Text[ russian ] = " Try&Buy ."; -+ Text[ russian ] = " Try&Buy ."; - Text[ polish ] = "Wersja Try&Buy nie moe by ponownie zainstalowana na tym komputerze."; - Text[ japanese ] = "この Try＆Buy バージョンは、このコンピュータに再インストールできません。"; - Text[ chinese_traditional ] = "無法在您的電腦上重新安裝這個'先用後買'版本。"; -@@ -1095,7 +1095,7 @@ - Message = "Soll die Installation auf '%s' jetzt komplett gelscht werden?\n\nBitte beachten Sie, dass Sie in ein Wurzelverzeichnis installiert haben, dabei wird der komplette Datentrger gelscht!" ; - Message [ english_us ] = "Do you want to delete the installation on '%s' completely?\n\nPlease note that if you have installed the program in a root directory the entire drive content will be deleted." ; - Message[ portuguese ] = "Eliminar agora a instalao em '%s'?\n\nNo esquea que fez a instalao num directrio-raz e desta forma eliminar todo o contedo do disco."; -- Message[ russian ] = " '%s'?\n\n, , ; ."; -+ Message[ russian ] = " '%s'?\n\n, , ; ."; - Message[ dutch ] = "Wilt u dat de installatie op '%s' nu compleet wordt gewist?\n\nWij wijzen u erop dat deze zich bevindt in een root-directory, zodat dan de complete inhoud van de drive wordt gewist!"; - Message[ french ] = "Voulez-vous vraiment supprimer l'installation sur '%s' dans sa totalit ?\n\nNotez que vous supprimerez dans ce cas tout le contenu du mdia, tant donn que vous y avez effectu l'installation dans un rpertoire racine."; - Message[ spanish ] = "Desea eliminar completamente la instalacin en '%s'?\n\nTenga en cuenta que ha hecho la instalacin en un directorio raz, con lo que se eliminar la totalidad del disco."; -@@ -1165,7 +1165,7 @@ - Message [ portuguese ] = "A verso instalada do ficheiro %1 melhor do que aquela que deseja instalar agora. Deseja continuar com a instalao?" ; - Message [ portuguese_brazilian ] = "Die installierte Version der Datei %1 ist h?erwertig, als die die Sie jetzt installieren wollen. Soll die Installation fortgesetzt werden?" ; - Message[ chinese_simplified ] = "这个安装的文件 %1 版本比您现在想要安装的要新。要继续安装？"; -- Message[ russian ] = " %1 , , . ?"; -+ Message[ russian ] = " %1 , , . ?"; - Message[ polish ] = "Zainstalowana wersja pliku %1 jest bardziej wartociowa, ni ta, ktr chcesz zainstalowa. Czy kontynuowa instalacj?"; - Message[ japanese ] = "ファイル %1 にインストールされたバージョンは、今インストールしようとしているものよりアップグレードされています。インストールを続行しますか。"; - Message[ chinese_traditional ] = "這個安裝的檔案 %1 版本比現在要安裝的要新。要繼續安裝？"; -@@ -1199,7 +1199,7 @@ - Message [ spanish ] = "Desea realmente eliminar la instalacin actual?" ; - Message [ english_us ] = "Are you sure you want to delete the current installation?" ; - Message[ chinese_simplified ] = "您真的要删除现存的安装程序吗？"; -- Message[ russian ] = " , ?"; -+ Message[ russian ] = " , ?"; - Message[ polish ] = "Czy na pewno usun aktualn instalacj?"; - Message[ japanese ] = "既存のインストールを本当に削除しますか。"; - Message[ chinese_traditional ] = "您真要移除現存的安裝程式？"; -@@ -1230,7 +1230,7 @@ - Message [ french ] = "Si vous interrompez l'installation en cours de route, le programme sera inutilisable !\n Voulez-vous vraiment poursuivre ?" ; - Message [ dutch ] = "Indien u de installatie nu stopt wordt het programma niet volledig genstalleerd en functioneert het niet.\nWeet u zeker dat u de installatie wilt stoppen?" ; - Message[ chinese_simplified ] = "如果您现在中断安装，那么安装程序就会不完整，您也就无法使用这个程序。\n您真的要中断安装吗？"; -- Message[ russian ] = " , !\n ?"; -+ Message[ russian ] = " , !\n ?"; - Message[ polish ] = "Jeli instalacja zostanie przerwana w tym miejscu, nie bdzie mona uruchomi programu!\nCzy na pewno przerwa instalacj?"; - Message[ japanese ] = "インストールをここで中止すると、インストールが不完全のまま終了し、プログラムの実行はできません。\n中止してもかまいませんか。"; - Message[ chinese_traditional ] = "若現在中斷安裝，程式安裝就會不完全。您也就無法使用這個軟件。\n您真要取消安裝？"; -@@ -1260,7 +1260,7 @@ - Message [ dutch ] = "De geselecteerde modules en componenten zijn\nnu op uw harde schijf genstalleerd/gedenstalleerd.\n" ; - Message [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido.\n" ; - Message[ chinese_simplified ] = "在硬盘上已经安装或删除\n您选择的模块和组件。\n"; -- Message[ russian ] = " / \n .\n"; -+ Message[ russian ] = " / \n .\n"; - Message[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay\nzainstalowane / zdeinstalowane na / z dysku twardym/twardego.\n"; - Message[ japanese ] = "選択したモジュールとコンポーネントが、\nハードディスク上にインストールされました / 削除されました。\n"; - Message[ chinese_traditional ] = "在您的磁碟上已經安裝/ 移除了\n您選擇的模塊和元件。\n"; -@@ -1291,7 +1291,7 @@ - Message [ portuguese ] = "Instalao reparada.\n" ; - Message [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Message[ chinese_simplified ] = "已经修补了安装。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Instalacja zostaa naprawiona.\n"; - Message[ japanese ] = "インストールは修復されました。\n"; - Message[ chinese_traditional ] = "已經修補了安裝。\n"; -@@ -1322,7 +1322,7 @@ - Message [ portuguese ] = "A desinstalao foi terminada.\n" ; - Message [ portuguese_brazilian ] = "Die Deinstallation ist beendet.\n" ; - Message[ chinese_simplified ] = "已经完成撤除程序。\n"; -- Message[ russian ] = " .\n"; -+ Message[ russian ] = " .\n"; - Message[ polish ] = "Deinstalacja zakoczona.\n"; - Message[ japanese ] = "インストールの削除が完了しました。\n"; - Message[ chinese_traditional ] = "已經完成移除程式。\n"; -@@ -1357,7 +1357,7 @@ - Message [ portuguese ] = "Deseja que o programa de instalao modifique o ficheiro 'CONFIG.SYS' para registar o atalho do programa em LIBPATH?\n 'CONFIG.SYS' ser guardado como 'CONFIG.SET'." ; - Message [ portuguese_brazilian ] = "Soll das Installationsprogramm f? Sie die Datei 'CONFIG.SYS' ?ndern, um den Programm-Pfad in LIBPATH einzutragen?\nDie alte 'CONFIG.SYS' wird als 'CONFIG.SET' gesichert." ; - Message[ chinese_simplified ] = "您允许安装助理程序修改 'CONFIG.SYS' 文件并在 LIBPATH 处加入程序路径吗？\n旧的 'CONFIG.SYS' 文件会被保存并命名为 'CONFIG.SET' 。"; -- Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; -+ Message[ russian ] = " , 'CONFIG.SYS' LIBPATH?\n 'CONFIG.SYS' 'CONFIG.SET'."; - Message[ polish ] = "Czy program instalacyjny ma zmieni plik 'CONFIG.SYS', aby wpisa ciek programu do LIBPATH?\nStary plik 'CONFIG.SYS' zostanie zapisany jako 'CONFIG.SET'."; - Message[ japanese ] = "プログラムパスを LIBPATH に追加するため、インストールプログラムが 「CONFIG.SYS」ファイルを変更してもかまいませんか。\n旧「CONFIG.SYS」は「CONFIG.SET」として保存されます。"; - Message[ chinese_traditional ] = "您允許安裝助理程式修改 CONFIG.SYS 檔案並在 LIBPATH 處加入程式路徑？\n舊的 CONFIG.SYS 檔案會被儲存並命名為 CONFIG.SET 。"; -diff -ur ../setup2/source/ui/dialog/dialog.src ../setup2/source/ui/dialog/dialog.src ---- ../setup2/source/ui/dialog/dialog.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/dialog.src Fri Apr 5 18:56:15 2002 -@@ -722,7 +722,7 @@ - Text [ spanish ] = "en la unidad de instalacin." ; - Text [ english_us ] = "into the installation drive." ; - Text[ chinese_simplified ] = "到安装驱动盘内。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "do napdu instalacyjnego."; - Text[ japanese ] = "インストールドライブへ挿入してください。"; - Text[ chinese_traditional ] = "到安裝驅動器內。"; -@@ -778,7 +778,7 @@ - Text [ french ] = "L'installation prcdente du" ; - Text [ dutch ] = "Uw oude installatie van" ; - Text[ chinese_simplified ] = "您以前的安装版本"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Twojej starej instalacji"; - Text[ japanese ] = "ユーザーの旧インストール"; - Text[ chinese_traditional ] = "舊的安裝版本"; -@@ -826,7 +826,7 @@ - Text [ french ] = "Pour installer la mise jour de %1, vous avez besoin de vos anciens fichiers d'installation. Veuillez indiquer le chemin du rpertoire dans lequel ils se trouvent." ; - Text [ dutch ] = "Om de upgrade voor %1 te kunnen installeren heeft u uw oude installatiebestanden nodig. Geef hier het pad aan naar de map waarin deze zich bevinden." ; - Text[ chinese_simplified ] = "安装升级软件 %1 需要旧的安装文件。请输入搜寻安装文件的目录路径："; -- Text[ russian ] = " %1, . , , , :"; -+ Text[ russian ] = " %1, . , , , :"; - Text[ polish ] = "Aby zainstalowa aktualizacj dla %1, wymagane s stare pliki instalacyjne. Prosz podaj tutaj katalog, w ktrym mona odnale pliki instalacyjne."; - Text[ japanese ] = "%1 の更新をインストールするには、旧インストールファイルが必要です。インストールファイルを見つけるディレクトリパスを入力してください:"; - Text[ chinese_traditional ] = "安裝升級軟體 %1 需要舊的安裝檔案。請輸入搜尋安裝檔案的目錄路徑："; -@@ -909,7 +909,7 @@ - PosSize = MAP_APPFONT ( 40 , 12 , 268 , 16 ) ; - WordBreak = TRUE ; - Text[ chinese_simplified ] = "这段文字含有附加的安装程序的重要信息。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Tutaj znajduj si dodatkowe informacje o zainstalowanym programie."; - Text[ japanese ] = "このテキストはインストールされたプログラムに対する追加および重要な情報を含んでいます。"; - Text[ chinese_traditional ] = "這段文字含有附加的關於安裝程式的重要訊息。"; -@@ -1186,7 +1186,7 @@ - Text [ english_us ] = "Continue the installation anyway?" ; - Left = TRUE ; - Text[ chinese_simplified ] = "您还是要继续执行安装？"; -- Text[ russian ] = " ?"; -+ Text[ russian ] = " ?"; - Text[ polish ] = "Czy chcesz mimo to kontynuowa instalacj?"; - Text[ japanese ] = "それでもインストールを続行しますか?"; - Text[ chinese_traditional ] = "還是要繼續執行安裝？"; -diff -ur ../setup2/source/ui/dialog/strings.src ../setup2/source/ui/dialog/strings.src ---- ../setup2/source/ui/dialog/strings.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/dialog/strings.src Fri Apr 5 18:56:39 2002 -@@ -77,7 +77,7 @@ - Text [ spanish ] = "Instalacin" ; - Text [ english_us ] = "Installation" ; - Text[ chinese_simplified ] = "安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Instalacja"; - Text[ japanese ] = "インストール"; - Text[ chinese_traditional ] = "安裝"; -@@ -120,7 +120,7 @@ - Text = "Mchten Sie das %1 Installationsprogramm wirklich beenden?" ; - Text [ english_us ] = "Do you really want to exit the %1 installation program?" ; - Text[ portuguese ] = "Deseja realmente terminar o programa de instalao %1?"; -- Text[ russian ] = " %1?"; -+ Text[ russian ] = " %1?"; - Text[ greek ] = " %1;"; - Text[ dutch ] = "Wilt u het installatieprogramma %1 werkelijk bendigen?"; - Text[ french ] = "Voulez-vous vraiment quitter l'installation de %1 ?"; -diff -ur ../setup2/source/ui/error.src ../setup2/source/ui/error.src ---- ../setup2/source/ui/error.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/error.src Fri Apr 5 18:23:51 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Error al instalar la clase WPStarWriter!" ; - Text [ english_us ] = "Error installing the class WPStarWriter!" ; - Text[ chinese_simplified ] = "在安装 WPStarWriter 程序类时发生错误！"; -- Text[ russian ] = " WPStarWriter!"; -+ Text[ russian ] = " WPStarWriter!"; - Text[ polish ] = "Bd podczas instalacji klasy WPStarWriter!"; - Text[ japanese ] = "WP%PRODUCTNAME Writer クラスをインストールするときのエラー。"; - Text[ chinese_traditional ] = "安裝 WPStarWriter 程式類時發生錯誤！"; -@@ -374,7 +374,7 @@ - Text [ french ] = "Impossible d'installer le fichier de police %1.\nIl se peut qu'il soit utilis par un autre programme. Une fois l'installation termine, quittez tous les programmes et ressayer d'installer cette police." ; - Text [ dutch ] = "Lettertypenbestand %1 kon niet worden genstalleerd.\nEventueel wordt dit bestand nog gebruikt door een ander programma. Beindig na de installatie alle programmas en installeer Font eventueel opnieuw." ; - Text[ chinese_simplified ] = "无法装入字体文件 %1 。\n可能是有一个程序还在使用这个字体文件。请您在安装结束之后关闭所有的应用程序，如有必要请您重新安装这个字体。"; -- Text[ russian ] = " %1.\n, . ."; -+ Text[ russian ] = " %1.\n, . ."; - Text[ polish ] = "Pliku czcionek %1 nie mona byo zainstalowa.\nPrawdopodobnie ten plik uywany jest przez inne programy. Zakocz po instalacji wszystkie programy i sprbuj zainstalowa plik czcionek jeszcze raz."; - Text[ japanese ] = "フォントファイル %1 をインストールできませんでした。\nまだほかのプログラムでこのファイルが使用されているのかもしれません。インストール後すべてのプログラムを終了して、必要ならもう一度フォントをインストールします。"; - Text[ chinese_traditional ] = "無法裝載字型檔案 %1 。\n可能是有一個程式還在使用這個字型檔案。請您在安裝結束之後關閉所有的應用程式，若有必要請重新安裝這個字型。"; -@@ -400,7 +400,7 @@ - Text [ french ] = "Impossible d'installer le fichier %1.\nUn autre programme ou le systme d'exploitation utilise probablement ce fichier." ; - Text [ dutch ] = "Het bestand %1 kon niet worden genstalleerd.\nEventueel wordt dit nog door een ander programma of door het besturingssysteem gebruikt." ; - Text[ chinese_simplified ] = "无法安装文件 %1 。\n可能是有一个程序或操作平台正在使用这个文件。"; -- Text[ russian ] = " %1.\n, ."; -+ Text[ russian ] = " %1.\n, ."; - Text[ polish ] = "Pliku %1 nie mona byo zainstalowa.\nPrawdopodobnie jest on uywany przez inny program lub przez inny system operacyjny."; - Text[ japanese ] = "ファイル %1 をインストールできませんでした。\nほかのプログラム、またはオペレーティングシステムでこのファイルがまだ使用されているのかもしれません。"; - Text[ chinese_traditional ] = "無法安裝檔案 %1 。\n可能是有一個程式或操作系統正在使用這個檔案。"; -@@ -457,7 +457,7 @@ - Text [ spanish ] = "\nEl programa ya est instalado en el directorio. " ; - Text [ english_us ] = "\nThe program is already installed in the directory " ; - Text[ chinese_simplified ] = "\n程序已经安装在目录内 "; -- Text[ russian ] = "\n "; -+ Text[ russian ] = "\n "; - Text[ polish ] = "\nProgram jest ju w katalogu "; - Text[ japanese ] = "\nプログラムはすでにディレクトリにあります。 "; - Text[ chinese_traditional ] = "\n程式已經安裝在目錄內 "; -@@ -510,7 +510,7 @@ - Text [ spanish ] = "\n\nContinuar la instalacin? " ; - Text [ english_us ] = "\n\nDo you want to continue the installation? " ; - Text[ chinese_simplified ] = "\n\n继续安装？ "; -- Text[ russian ] = "\n\n ? "; -+ Text[ russian ] = "\n\n ? "; - Text[ polish ] = "\n\nKontynuowa instalacj? "; - Text[ japanese ] = "\n\nインストールを続けますか。 "; - Text[ chinese_traditional ] = "\n\n繼續安裝？ "; -@@ -537,7 +537,7 @@ - Text [ spanish ] = "An est abierta una aplicacin instalada!\nSe cancelar la desinstalacin.\n\nAplicacin: " ; - Text [ english_us ] = "An installed application is still open!\nDeinstallation aborted.\n\nApplication: " ; - Text[ chinese_simplified ] = "一个已经安装好的程序组件还处于运行状态！\n现在中断执行撤除程序。\n\n程序: "; -- Text[ russian ] = " !\n .\n\n: "; -+ Text[ russian ] = " !\n .\n\n: "; - Text[ polish ] = "Zainstalowana aplikacja jest jeszcze otwarta!\nDeinstalacja zostanie przerwana.\n\nAplikacja: "; - Text[ japanese ] = "インストールしたアプリケーションは、まだ開いたままです。\nインストールの削除を中止します。\n\nアプリケーション: "; - Text[ chinese_traditional ] = "一個已經安裝好的程式還處於運行狀態！\n現在中斷移除程式。\n\n程式： "; -@@ -562,7 +562,7 @@ - Text [ portuguese ] = "Impossvel copiar o ficheiro %1.\nCdigo de erro: %2\nProvavelmente a disquete est danificada.\nA instalao ser cancelada." ; - Text [ portuguese_brazilian ] = "Die Datei %1 konnte nicht kopiert werden.\nFehlercode: %2\nWahrscheinlich ist die Diskette defekt.\nDie Installation wird abgebrochen." ; - Text[ chinese_simplified ] = "无法复制文件 %1 。\n错误码: %2\n可能是软盘已损坏了。 \n现在中断安装。"; -- Text[ russian ] = " %1 .\n : %2\n .\n ."; -+ Text[ russian ] = " %1 .\n : %2\n .\n ."; - Text[ polish ] = "Plik %1 nie mg zosta skopiowany.\nBdny kod: %2\nPrawdopodobnie nastpio uszkodzenie dyskietki.\nInstalacja przerwana."; - Text[ japanese ] = "ファイル %1 をコピーできませんでした。\nエラーコード: %2\nフロッピーディスクの不良かもしれません。\nインストールを中止します。"; - Text[ chinese_traditional ] = "無法複製檔案 %1 。\n錯誤碼：%2\n可能是磁片已損壞了。 \n現在中斷安裝。"; -@@ -588,7 +588,7 @@ - Text [ portuguese ] = "O programa de instalao encontrou uma verso instalada no diretrio %1. Desinstale primeiro esta verso antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm hat eine installierte Version im Verzeichnis %1 gefunden. Bitte erst diese Version deinstallieren, bevor Sie diese Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序发现在目录 %1 有一个程序版本。请您先撤除这个程序，然后再重新启动安装。"; -- Text[ russian ] = " %1. , , , ."; -+ Text[ russian ] = " %1. , , , ."; - Text[ polish ] = "Program instalacyjny znalaz zainstalowan wersj w katalogu %1. Prosz odinstalowa najpierw t wersj, zanim rozpoczniesz instalacj ponownie."; - Text[ japanese ] = "ディレクトリ %1 にインストールされたバージョンを、インストールプログラムが見つけました。セットアップを再開始するまえに、まずこのバージョンのインストールの削除をします。"; - Text[ chinese_traditional ] = "安裝程式發現在目錄 %1 有一個程式版本。請您先移除這個程式，然後再重新啟動安裝。"; -@@ -642,7 +642,7 @@ - Text [ portuguese ] = "O ficheiro %1, a ser instalado no foi encontrado.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Datei %1, die neu installiert werden soll, wurde nicht gefunden.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "没有找到新安装所需的文件 %1 。\n现在中断程序。"; -- Text[ russian ] = " %1, , .\n ."; -+ Text[ russian ] = " %1, , .\n ."; - Text[ polish ] = "Pliku %1, ktry mia zosta na nowo zainstalowany, nie znaleziono.\nProgram zostanie przerwany."; - Text[ japanese ] = "新しくインストールするファイル %1 が見つかりません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "沒有找到新安裝所需的檔案 %1 。\n現在中斷程序。"; -@@ -668,7 +668,7 @@ - Text [ portuguese ] = "A verso do ficheiro %1 no permite uma nova instalao.\nO programa ser cancelado." ; - Text [ portuguese_brazilian ] = "Die Version der Datei %1 erlaubt keine Neuinstallation.\nDas Programm wird abgebrochen." ; - Text[ chinese_simplified ] = "这个文件 %1 的版本不允许重新安装。\n现在中断程序。"; -- Text[ russian ] = " %1 .\n ."; -+ Text[ russian ] = " %1 .\n ."; - Text[ polish ] = "Wersja pliku %1 nie zezwala na now instalacj.\nProgram zostanie zakoczony."; - Text[ japanese ] = "ファイル %1 のバージョンが新しいインストールを実行させません。\nプログラムを中止します。"; - Text[ chinese_traditional ] = "這個檔案 %1 的版本不允許重新安裝。\n現在中斷程式。"; -@@ -694,7 +694,7 @@ - Text [ portuguese ] = "A instalao da verso actualizada foi cancelada." ; - Text [ portuguese_brazilian ] = "Die Upgrade-Installation wurde abgebrochen." ; - Text[ chinese_simplified ] = "已经中断安装升级版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Instalacja aktualizacji zostaa przerwana."; - Text[ japanese ] = "更新インストールは中止されました。"; - Text[ chinese_traditional ] = "已經中斷安裝升級軟體。"; -@@ -722,7 +722,7 @@ - Text [ portuguese_brazilian ] = "Es sind noch eine oder mehrere %PRODUCTNAME-Applikationen gestartet.\nSchlie?en Sie diese Applikationen, bevor Sie erneut die Nach- oder Deinstallation starten." ; - Text [ portuguese ] = "Encontram-se ainda abertas uma ou mais aplicaes do %PRODUCTNAME.\nFeche essas aplicaes antes de iniciar novamente a reinstalao ou desinstalao." ; - Text[ chinese_simplified ] = "还有一些 %PRODUCTNAME 的程序组件处于运行状态。\n请在增加或撤除程序之前关闭所有运行的程序组件。"; -- Text[ russian ] = " %PRODUCTNAME.\n , ."; -+ Text[ russian ] = " %PRODUCTNAME.\n , ."; - Text[ polish ] = "Jedna lub kilka aplikacji %PRODUCTNAME s jeszcze otwarte.\nZamknij te aplikacje, zanim uruchomisz aktualizacj lub deinstalacj."; - Text[ japanese ] = "1つまたは複数の %PRODUCTNAME アプリケーションがまだ起動中です。\nインストールの追加または削除を開始するまえに、まずこれらのアプリケーションを閉じてください。"; - Text[ chinese_traditional ] = "還有一些 %PRODUCTNAME 的程式元件處於運行狀態。\n請在新增或移除程式之前關閉所有運行的程式元件。"; -@@ -750,7 +750,7 @@ - Text [ portuguese ] = "O programa de instalao no pode actualizar ficheiros comuns quando estes se encontram abertos.\nFeche por favor todas as aplicaes antes de reiniciar a instalao." ; - Text [ portuguese_brazilian ] = "Das Installationsprogramm kann keine gemeinsam genutzten Dateien aktualisieren, wenn diese gerade verwendet werden.\nSchlie?en Sie bitte alle ge?fneten Anwendungen, bevor Sie die Installation erneut starten." ; - Text[ chinese_simplified ] = "安装程序无法更新共享的文件，因为这些文件已经被占用。\n请您在重新启动安装之前关闭所有的应用程序。"; -- Text[ russian ] = " , , .\n, , "; -+ Text[ russian ] = " , , .\n, , "; - Text[ polish ] = "Program instalacyjny nie moe aktualizowa wsplnie uywanych danych, jeli s one aktualnie w uyciu.\nZamknij wszystkie otwarte aplikacje, zanim ponownie rozpoczniesz instalacj."; - Text[ japanese ] = "インストールプログラムは、共有使用のファイルを更新できません。\nインストールを再開始するまえに、開いているすべてのプログラムを閉じてください。"; - Text[ chinese_traditional ] = "安裝程序無法更新共享的檔案，因為這些檔案已經被佔用。\n請在重新啟動安裝之前關閉所有的應用程序。"; -@@ -778,7 +778,7 @@ - Text [ portuguese ] = "A instalao da verso de actualizao no possvel, porque no foi encontrada nenhuma verso instalada!" ; - Text [ portuguese_brazilian ] = "Es wurde keine installierte Version gefunden.\nEine Upgrade-Installation ist deshalb nicht m?lich!" ; - Text[ chinese_simplified ] = "没有找到已安装的版本。\n因此无法安装升级版本！"; -- Text[ russian ] = " .\n !"; -+ Text[ russian ] = " .\n !"; - Text[ polish ] = "Nie znaleziono zainstalowanej wersji.\nInstalacja aktualizacji jest z tego powodu niemoliwa!"; - Text[ japanese ] = "インストールしたバージョンが見つかりません。\n更新インストールは不可能です。"; - Text[ chinese_traditional ] = "沒有找到已安裝的版本。\n因此無法安裝升級軟體！"; -@@ -961,7 +961,7 @@ - Text = "%PRODUCTNAME %PRODUCTVERSION lsst sich nur im Responsefilemodus installieren.\nLesen Sie hierfr bitte den Installation Guide."; - Text [ english_us ] = "%PRODUCTNAME %PRODUCTVERSION can only be installed in the Response File mode.\nRefer to the Installation Guide for more information." ; - Text[ portuguese ] = " apenas possvel instalar o %PRODUCTNAME %PRODUCTVERSION no modo Response File.\nQueira consultar o manual de instalao para informaes mais detalhadas."; -- Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; -+ Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION Response.\n , , ."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION Responsefile.\n "; - Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION kan alleen in responsefile-modus worden genstalleerd.\nMeer informatie hierover vindt u in de installatiehandleiding."; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION ne peut tre install qu'en mode Response File.\nConsultez le guide d'installation ce sujet."; -diff -ur ../setup2/source/ui/pages/maindlg.src ../setup2/source/ui/pages/maindlg.src ---- ../setup2/source/ui/pages/maindlg.src Wed Apr 3 16:11:10 2002 -+++ ../setup2/source/ui/pages/maindlg.src Fri Apr 5 18:24:54 2002 -@@ -88,7 +88,7 @@ - Text = "Bitte geben Sie ein gltiges Installationsverzeichnis an." ; - Text [ english_us ] = "Please specify a valid directory name for the installation." ; - Text[ portuguese ] = "Indique um directrio de instalao vlido."; -- Text[ russian ] = ", , ."; -+ Text[ russian ] = ", , ."; - Text[ dutch ] = "Geef een geldige installatiedirectory aan."; - Text[ french ] = "Veuillez indiquer un rpertoire d'installation valide."; - Text[ spanish ] = "Indique por favor un directorio de instalacin vlido."; -@@ -125,7 +125,7 @@ - Text [ portuguese ] = "Tem a certeza que deseja fazer a instalao no directrio-raz?" ; - Text [ portuguese_brazilian ] = "Sind Sie sicher, da? Sie in das Wurzelverzeichnis installieren wollen?" ; - Text[ chinese_simplified ] = "您真的要将程序安装在根目录内？"; -- Text[ russian ] = " , ?"; -+ Text[ russian ] = " , ?"; - Text[ polish ] = "Czy na pewno zainstalowa w katalogu root?"; - Text[ japanese ] = "ルートディレクトリにインストールしてもかまいませんか。"; - Text[ chinese_traditional ] = "真要將程式安裝在根目錄內﹖"; -@@ -228,7 +228,7 @@ - Text = "Sie haben einen Installationspfad angegeben, in dem sich bereits Komponenten einer %PRODUCTNAME-Installation befinden. Bitte geben Sie ein anderes Verzeichnis an." ; - Text [ english_us ] = "You have entered an installation path which already contains %PRODUCTNAME components. Please enter a different directory." ; - Text[ portuguese ] = "Indicou um atalho de instalao onde j existem componentes de uma anterior instalao do %PRODUCTNAME. Indique outro directrio."; -- Text[ russian ] = " , %PRODUCTNAME. , , ."; -+ Text[ russian ] = " , %PRODUCTNAME. , , ."; - Text[ greek ] = " %PRODUCTNAME. "; - Text[ dutch ] = "U heeft een installatiepad aangegeven waarin zich reeds componenten van een %PRODUCTNAME-installatie bevinden. Geef een nadere directory aan."; - Text[ french ] = "Le rpertoire slectionn pour l'installation contient dors et dj certains composants d'une installation antrieure de %PRODUCTNAME. Veuillez indiquer un autre chemin."; -diff -ur ../setup2/source/ui/pages/pasexist.src ../setup2/source/ui/pages/pasexist.src ---- ../setup2/source/ui/pages/pasexist.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasexist.src Fri Apr 5 18:25:23 2002 -@@ -143,7 +143,7 @@ - Text [ french ] = "a t dtecte une installation de serveur %1 antrieure." ; - Text [ dutch ] = "werd een oude %1 serverinstallatie gevonden." ; - Text[ chinese_simplified ] = "找到一个旧的 %1 服务器版本。"; -- Text[ russian ] = " %1."; -+ Text[ russian ] = " %1."; - Text[ polish ] = "znaleziono star instalacj serwera %1"; - Text[ japanese ] = "旧 %1 サーバーインストールが見つかりました。"; - Text[ chinese_traditional ] = "找到一個舊的 %1 伺服器版本。"; -@@ -171,7 +171,7 @@ - Text [ french ] = "Vous avez la possibilit de rutiliser les configurations d'utilisateurs de l'installation de serveur antrieure." ; - Text [ dutch ] = "U heeft de mogelijkheid de gebruikersconfiguraties uit deze oude serverinstallatie over te nemen." ; - Text[ chinese_simplified ] = "您能采用这个旧的服务器版本的使用者配置文件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Masz moliwo przej konfiguracj uytkownika ze starej instalacji serwera."; - Text[ japanese ] = "この旧サーバーインストールからユーザー設定を適用することができます｡"; - Text[ chinese_traditional ] = "您能夠採用這個舊的伺服器版本的使用者配置檔案。"; -diff -ur ../setup2/source/ui/pages/pasreins.src ../setup2/source/ui/pages/pasreins.src ---- ../setup2/source/ui/pages/pasreins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasreins.src Fri Apr 5 18:26:54 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installationsprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -99,7 +99,7 @@ - Text = "Der %1 ist bereits auf Ihrem Computer installiert. Sie knnen jetzt die Installation lschen." ; - Text [ english_us ] = "The %1 Server is already installed on your computer. You can now delete the installation." ; - Text[ portuguese ] = "O %1 j est instalado no seu computador. J possvel eliminar a instalao."; -- Text[ russian ] = " %1 . ."; -+ Text[ russian ] = " %1 . ."; - Text[ dutch ] = "%1 is reeds genstalleerd op uw computer. U kunt nu de installatie wissen."; - Text[ french ] = "%1 est dj install sur votre ordinateur. Vous pouvez prsent supprimer cette installation."; - Text[ spanish ] = "El %1 ya est instalado en su ordenador. Ahora puede eliminar la instalacin."; -@@ -162,7 +162,7 @@ - Text [ dutch ] = "Voegt n of meer gebruikers toe aan uw serverinstallatie of verwijdert deze." ; - Text [ portuguese ] = "Adiciona ou remove um ou mais utilizadores na instalao do servidor existente." ; - Text[ chinese_simplified ] = "增加或者删除一个或多个使用者的服务器安装版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje jednego lub wicej uytkownikw do instalacji serwera lub ich usuwa."; - Text[ japanese ] = "現在のサーバーインストールに、1人または複数のユーザーを追加または削除。"; - Text[ chinese_traditional ] = "新增或者移除一個或多個使用者伺服器安裝版本。"; -@@ -192,7 +192,7 @@ - Text [ spanish ] = "Modificacin" ; - Text [ english_us ] = "Modify installation" ; - Text[ chinese_simplified ] = "修改安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Modyfikacja instalacji"; - Text[ japanese ] = "インストールの変更"; - Text[ chinese_traditional ] = "修改安裝"; -@@ -219,7 +219,7 @@ - Text [ french ] = "Ajoute des composants ou modules une version dj installe ou les supprime." ; - Text [ dutch ] = "Voegt verdere componenten of modules toe aan de reeds genstalleerde versie of verwijdert deze." ; - Text[ chinese_simplified ] = "为已经安装的版本增加或者删除其他的程序组件。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodaje do wczeniej zainstalowanej wersji dodatkowe komponenty lub moduy lub je usuwa."; - Text[ japanese ] = "すでにインストールしたバージョンに、それ以外のコンポーネントまたはモジュールを追加または削除。"; - Text[ chinese_traditional ] = "為已經安裝的版本新增或者移除其它的程式元件。"; -@@ -249,7 +249,7 @@ - Text [ spanish ] = "Desinstalacin" ; - Text [ english_us ] = "Deinstall" ; - Text[ chinese_simplified ] = "撤除安装"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ polish ] = "Deinstalacja"; - Text[ japanese ] = "インストールの削除"; - Text[ chinese_traditional ] = "移除安裝"; -@@ -279,7 +279,7 @@ - Text [ spanish ] = "Elimina la instalacin actual de su disco duro." ; - Text [ english_us ] = "Deletes the existing version from your hard disk" ; - Text[ chinese_simplified ] = "从您的计算机上删除已经安装的程序版本。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usuwa zainstalowan wersj z dysku twardego."; - Text[ japanese ] = "既存のバージョンをユーザーのハードディスクから削除します。"; - Text[ chinese_traditional ] = "從您的電腦上刪除已經安裝的程式版本。"; -diff -ur ../setup2/source/ui/pages/pasremem.src ../setup2/source/ui/pages/pasremem.src ---- ../setup2/source/ui/pages/pasremem.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasremem.src Fri Apr 5 18:27:07 2002 -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u op een later tijdstip nog eens handmatig een aangepaste installatie wilt uitvoeren. dan moet u ook het pad naar de basisdirectory van de gebruikers in het configuratiebestand SODAEMON aanpassen.\n" ; - Text [ portuguese ] = "Se preferir instalar os diferentes utilizadores manualmente, ter que adaptar tambm o atalho ao directrio- raz no ficheiro de configurao SODAEMON.\n" ; - Text[ chinese_simplified ] = "如果以后要执行单个使用者安装，您必须在 SODAEMON 的配置文件内修改用户的根目录路径。\n"; -- Text[ russian ] = " , SODAEMON.\n"; -+ Text[ russian ] = " , SODAEMON.\n"; - Text[ polish ] = "Aby przeprowadzi pniej instalacje indywidualne rcznie, naley dostosowa ciek do rdowego katalogu root uytkownikw w pliku konfiguracyjnym SODAEMON.\n"; - Text[ japanese ] = "あとから各自ユーザーインストールを手動で実行するときに、SODAEMON 設定ファイルのユーザーのルートディレクトリ上のパスに適合させる必要があります。\n"; - Text[ chinese_traditional ] = "果以後要執行單個使用者安裝版本﹐您必須在SODAEMON 的配置檔案內修改使用者的根目錄路徑。\n"; -diff -ur ../setup2/source/ui/pages/passtart.src ../setup2/source/ui/pages/passtart.src ---- ../setup2/source/ui/pages/passtart.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/passtart.src Fri Apr 5 18:27:19 2002 -@@ -107,7 +107,7 @@ - Text [ french ] = "Vous pouvez prsent dfinir les paramtres pour les divers utilisateurs du serveur. Le programme Setup prpare alors une installation rseau spcifique de %PRODUCTNAME dans chacun des rpertoires d'utilisateur.\n" ; - Text [ dutch ] = "U heeft nu de mogelijkheid de gebruikers voor de server in te richten. Het setup-programma voert dan voor iedere gebruiker een specifieke netinstallatie van %PRODUCTNAME in zijn gebruikersdirectory uit.\n" ; - Text[ chinese_simplified ] = "您现在能够为服务器设立各个使用者。安装程序为每个使用者的各自目录内安装一个 %PRODUCTNAME 的网络版本。\n"; -- Text[ russian ] = " . %PRODUCTNAME.\n"; -+ Text[ russian ] = " . %PRODUCTNAME.\n"; - Text[ polish ] = "Istnieje teraz moliwo konfiguracji poszczeglnych uytkownikw serwera. Program instalacyjny przeprowadzi dla kadego uytkownika specyficzn instalacj sieciow %PRODUCTNAME w odpowiednim katalogu danego uytkownika.\n"; - Text[ japanese ] = "いますぐ、個々のユーザーをサーバーに設定することが可能です。セットアッププログラムが、各ユーザーに %PRODUCTNAME から指定されたネットワークインストールをそれぞれのユーザーディレクトリにインストールします。\n"; - Text[ chinese_traditional ] = "您現在能夠為伺服器配置各個使用者。安裝程式為每個使用者在各自的使用者目錄內安裝一個%PRODUCTNAME的網路版本。\n"; -diff -ur ../setup2/source/ui/pages/pasuinst.src ../setup2/source/ui/pages/pasuinst.src ---- ../setup2/source/ui/pages/pasuinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuinst.src Fri Apr 5 18:28:09 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 インストールの削除"; - Text[ chinese_traditional ] = "移除%1"; -@@ -120,7 +120,7 @@ - Text [ french ] = "Si vous tes sr de vouloir supprimer l'installation existante du serveur dans le rpertoire '%1', cliquez sur '%2'." ; - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande serverinstallatie uit de map '%1' wilt verwijderen, drukt u dan op '%2'." ; - Text[ chinese_simplified ] = "如果您真的要删除目录 '%1' 内当前服务器的安装版本，那么请按击 '%2' 。"; -- Text[ russian ] = " '%1', '%2'."; -+ Text[ russian ] = " '%1', '%2'."; - Text[ polish ] = "Jeeli zainstalowany w katalogu '%1' serwer ma zosta na pewno usunity, naley klikn '%2'."; - Text[ japanese ] = "ディレクトリ「%1」にあるサーバーインストールを削除するときは、「%2」をクリックします。"; - Text[ chinese_traditional ] = "如果真要刪除目錄<%1>內目前的伺服器版本﹐就按一下<%2>。"; -@@ -148,7 +148,7 @@ - Text [ french ] = "Vous avez galement la possibilit de dsinstaller toutes les installations d'utilisateur prsentes sur ce serveur." ; - Text [ dutch ] = "Bovendien heeft u de mogelijkheid alle met de server ingerichte gebruikersinstallaties te denstalleren." ; - Text[ chinese_simplified ] = "另外，您还能够移除所有通过服务器建立的使用者。"; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ polish ] = "Dodatkowo mona zdeinstalowa wszystkie skonfigurowane za pomoc serwera instalacje indywidualne."; - Text[ japanese ] = "そのほかに、サーバーでインストールしたユーザーインストールのすべても削除できます。"; - Text[ chinese_traditional ] = "另外您還能夠移除所有透過伺服器配置的使用者。"; -@@ -175,7 +175,7 @@ - Text [ dutch ] = "Gebruikersinstallaties verwijderen" ; - Text [ portuguese ] = "Remover instalao personalizada." ; - Text[ chinese_simplified ] = "撤除使用者的安装。"; -- Text[ russian ] = " () ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Usu instalacj indywidualn."; - Text[ japanese ] = "ユーザーインストールの削除。"; - Text[ chinese_traditional ] = "移除使用者的安裝。"; -diff -ur ../setup2/source/ui/pages/pasuname.src ../setup2/source/ui/pages/pasuname.src ---- ../setup2/source/ui/pages/pasuname.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasuname.src Fri Apr 5 18:28:27 2002 -@@ -135,7 +135,7 @@ - Text [ french ] = "En tant qu'administrateur du systme, vous avez la possibilit de faire insrer automatiquement le propritaire des rpertoires de chaque installation d'utilisateur.." ; - Text [ dutch ] = "Als systeembeheerder kunt u voor de mappen van de aangepaste installaties automatisch de juiste eigenaar definiren." ; - Text[ chinese_simplified ] = "作为系统管理员您能够自动地为使用者目录设定正确的拥有者。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Jako administrator systemu masz moliwo automatycznego okrelenia uytkownikw katalogw pojedynczych instalacji indywidualnych."; - Text[ japanese ] = "システム管理者として、それぞれユーザー定義されたインストール項目に正しい所有者を自動設定できます。"; - Text[ chinese_traditional ] = "作為系統管理員您能夠自動地為使用者目錄設定正確的擁有者。"; -diff -ur ../setup2/source/ui/pages/pasupath.src ../setup2/source/ui/pages/pasupath.src ---- ../setup2/source/ui/pages/pasupath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pasupath.src Fri Apr 5 18:29:23 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Veuillez dfinir le rpertoire racine dans lequel les installations des diffrents utilisateurs seront cres." ; - Text [ dutch ] = "Bepaalt u de basisdirectory waarin de gebruikersinstallaties moeten worden aangelegd." ; - Text[ chinese_simplified ] = "请您确定设立使用所需的根目录。"; -- Text[ russian ] = ", , , ."; -+ Text[ russian ] = ", , , ."; - Text[ polish ] = "Zdefiniuj katalog gwny, w ktrym zostan utworzone pojedyncze instalacje indywidualne."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定してください。"; - Text[ chinese_traditional ] = "請您確定設立使用者所需的根目錄。"; -@@ -137,7 +137,7 @@ - Text [ dutch ] = "Bepaal de basismap waarin de aangepaste installaties moeten worden ondergebracht of kopieer deze in de home-directory's van de in het systeem geregistreerde gebruikers." ; - Text [ portuguese ] = "Especifique o directrio-raz em que deseja criar a instalao de utilizador individual; poder tambm copiar a instalao para o directrio inicial de um utilizador definido na administrao do sistema." ; - Text[ chinese_simplified ] = "请您确定设立用户所需的根目录，或者请您复制使用名到这个管理系统的Home目录内。"; -- Text[ russian ] = ", , , , ."; -+ Text[ russian ] = ", , , , ."; - Text[ polish ] = "Zdefiniuj katalog rdowy, w ktrym zostan utworzone pojedyncze instalacje indywidualne lub przekopiuj instalacj do katalogu macierzystego uytkownikw zarzdzanych przez ten system."; - Text[ japanese ] = "それぞれのユーザーインストールを作成するルートディレクトリを指定するか、あるいはインストールをシステム上の管理ユーザーのホームディレクトリにコピーするかを定義してください。"; - Text[ chinese_traditional ] = "請您確定配置使用者所需的根目錄﹐或請您將使用者名稱複製到這個管理系統的Home目錄內。"; -@@ -275,7 +275,7 @@ - #if !defined(UNX) - Pos = MAP_APPFONT ( 0 , 80 ) ; - Size = MAP_APPFONT ( 205 , 30 ) ; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Dodatkowo mona poda ostatni komponent cieki instalacji indywidualnej."; - Text[ japanese ] = "そのほか、ユーザーインストールのパスコンポーネントも指定できます。"; - #else -@@ -397,7 +397,7 @@ - Text [ french ] = "Vous ne disposez pas de droits d'criture dans le rpertoire principal\n'%1'\nde l'utilisateur\n%2\n. Veuillez vous procurer les droits correspondants ou slectionner votre rpertoire racine pour les installations d'utilisateurs !" ; - Text [ dutch ] = "U heeft in de home-directory\n'%1'\nvan gebruiker\n%2\ngeen schrijfrechten.\nVerandert u dit of selecteer uw eigen basisdirectory voor de aangepaste installatie." ; - Text[ chinese_simplified ] = "您无权改写使用者\n%2\n的Home目录\n'%1'\n上的文件。\n请修改目录的文件读取权利或选择一个自己的根目录来安装程序！"; -- Text[ russian ] = " \n'%1'\n\n%2\n ."; -+ Text[ russian ] = " \n'%1'\n\n%2\n ."; - Text[ polish ] = "Brak praw zapisu\nw katalogu macierzystym\n'%'\\uytkownika\n%2.\nNaley naby prawa lub okreli wasny katalog podstawowy na instalacj indywidualn!"; - Text[ japanese ] = "ユーザーのホームディレクトリ\n%2\nに、\n「%1」\nの書き込み権がありません。\n変更するか、ユーザーインストールのルートディレクトリを選択してください。"; - Text[ chinese_traditional ] = "您無權覆寫使用者\n%2\n的Home目錄\n<%1>\n上的檔案。\n請修改目錄的檔案覆寫權利或者選擇一個自己的根目錄來安裝程式！"; -diff -ur ../setup2/source/ui/pages/pcfgserver.src ../setup2/source/ui/pages/pcfgserver.src ---- ../setup2/source/ui/pages/pcfgserver.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcfgserver.src Fri Apr 5 18:29:32 2002 -@@ -100,7 +100,7 @@ - Text = "Die %1 Installation enthlt Konfigurationen die auf einen Konfigurationsserver geschrieben werden mssen.\n \nBitte geben Sie den Servernamen und Port Ihres Konfigurationsservers an."; - Text [ english_us ] = "The %1 installation contains configuration information that has to be written on a configuration server.\n \nPlease enter the name and port of the configuration server."; - Text[ portuguese ] = "A instalao %1 contm configuraes que devem ser escritas num servidor de configurao.\n \nIndique o nome e a porta do seu servidor de configurao."; -- Text[ russian ] = " %1 , .\n \n, , ."; -+ Text[ russian ] = " %1 , .\n \n, , ."; - Text[ greek ] = " %1 .\n \n ? "; - Text[ dutch ] = "De %1 installatie bevat configuraties die op een configuratieserver moeten worden geschreven.\n \nGeef de servernaam en de poort van deze configuratieserver aan."; - Text[ french ] = "L'installation %1 contient des configurations qui doivent tre crites sur un serveur de configuration.\n \nIndiquez le nom du serveur et le port du serveur de configuration."; -diff -ur ../setup2/source/ui/pages/pcrc.src ../setup2/source/ui/pages/pcrc.src ---- ../setup2/source/ui/pages/pcrc.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pcrc.src Fri Apr 5 18:29:56 2002 -@@ -106,7 +106,7 @@ - Text [ dutch ] = "Het installatieprogramma in" ; - Text [ portuguese ] = "Os ficheiros de instalao em" ; - Text[ chinese_simplified ] = "程序安装文件在"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Pliki instalacyjne w"; - Text[ japanese ] = "インストールファイルの"; - Text[ chinese_traditional ] = "程式安裝檔案在"; -diff -ur ../setup2/source/ui/pages/phavefun.src ../setup2/source/ui/pages/phavefun.src ---- ../setup2/source/ui/pages/phavefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/phavefun.src Fri Apr 5 18:32:17 2002 -@@ -97,7 +97,7 @@ - Text = "Installation" ; - Text [ english_us ] = "Installation" ; - Text[ portuguese ] = "Instalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installatie"; - Text[ french ] = "Installation"; -@@ -147,7 +147,7 @@ - Text = "Deinstallation" ; - Text [ english_us ] = "Deinstallation" ; - Text[ portuguese ] = "Desinstalao"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = " "; - Text[ dutch ] = "Denstallatie"; - Text[ french ] = "Dsinstallation"; -@@ -311,7 +311,7 @@ - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; - Text[ chinese_simplified ] = "衷心祝贺！程序安装已经顺利完成。Sun Microsystems 祝您使用 %1 得心应手！"; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でのさらに充実したお仕事を Sun Microsystems は心から願っております。"; - Text[ chinese_traditional ] = "已經順利完成安裝程式。\nSun Microsystems 祝您使用 %1 得心應手！"; -@@ -339,7 +339,7 @@ - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e as opes que seleccionou esto agora instalados/desinstalados no seu disco rgido." ; - Text[ chinese_simplified ] = "已经安装或删除您选择的模块和组件。"; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ polish ] = "Wybrane przez uytkownika moduy i komponenty zostay zainstalowane / zdeinstalowane."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; - Text[ chinese_traditional ] = "已經安裝或移除選擇的模塊和程式元件。"; -@@ -368,7 +368,7 @@ - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; - Text[ chinese_simplified ] = "修复安装程序已经完成。\n"; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; - Text[ chinese_traditional ] = "修復程式已經完成。\n"; -@@ -396,7 +396,7 @@ - TEXT[ dutch ] = "De denstallatie ist beindigd."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente."; - TEXT[ chinese_simplified ] = "撤除程序已经顺利完成。"; -- TEXT[ russian ] = " ." ; -+ TEXT[ russian ] = " ." ; - TEXT[ polish ] = "Deinstalacja zostaa zakoczona." ; - TEXT[ japanese ] = "インストールの削除は、正常に終了しました。" ; - TEXT[ chinese_traditional ] = "現在已經完成移除程式。"; -@@ -446,7 +446,7 @@ - Text = "Bitte beachten Sie, dass das Installationsprogramm nicht alle Dateien gelscht hat. %1 Konfigurationsdateien und von Ihnen erstellte Dokumente wurden nicht gelscht. Sofern Sie diese nicht weiter bentigen, knnen Sie das %1-Verzeichnis manuell lschen."; - Text [ english_us ] = "Please note that the installation program has not deleted all files. %1 configuration files and your own documents were not deleted. If you no longer need these files, you can manually delete the %1 directory."; - Text[ portuguese ] = "No esquea que o programa de instalao no eliminou todos os ficheiros. Os ficheiros de configurao %1 e os documentos criados por si no foram eliminados. Se no os necessitar, poder eliminar o directrio %1 manualmente."; -- Text[ russian ] = ", . %1 , . , %1 ."; -+ Text[ russian ] = ", . %1 , . , %1 ."; - Text[ greek ] = " . %1 . , %1 ."; - Text[ dutch ] = "Wij maken u erop attent dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - Text[ french ] = "Le programme d'installation n'a pas supprim tous les fichiers : c'est le cas des fichiers de configuration %1 et des documents que vous avez crs. Si vous n'en avez plus l'utilit, vous pouvez supprimer manuellement le rpertoire %1."; -@@ -512,7 +512,7 @@ - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; - Text[ chinese_simplified ] = "请点击\"%1\"，结束安装程序。"; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; - Text[ chinese_traditional ] = "請按一下<%1>，結束安裝程式。"; -@@ -541,7 +541,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; - Text[ chinese_simplified ] = "在安装过程中，系统文件被更改。为了让更改内容整合到%1的使用界面上，您必须重新启动操作系统。"; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、システムファイルに変更がありました。それをアクティブにし、%1 のインターフェイスを統一するために､システムを再起動する必要があります。"; - Text[ chinese_traditional ] = "在安裝過程中，系統檔案已經變更。為了能夠正常使用 %1 的桌面整合設定﹐現在必須重新啟動系統。"; -@@ -568,7 +568,7 @@ - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; - Text[ chinese_simplified ] = "如果您要重新启动计算机，请按击\"%1\"。如果您要结束安装程序，则按击\"%2\"。"; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "今すぐ再起動するためには、[%1] をクリックしてください。[%2] をクリックすると、セットアッププログラムを終了します。"; - Text[ chinese_traditional ] = "要重新啟動電腦﹐請按一下<%1>。如果要結束安裝程式﹐就按一下<%2>。"; -@@ -589,7 +589,7 @@ - Text = "Whrend der Installation wurden nderungen an den Systemdateien vorgenommen. Damit diese aktiv werden und eine Oberflchenintegration von %1 gewhrleistet ist, mssen sie sich erneut an Ihrem System anmelden." ; - Text [ english_us ] = "System files have been modified during the installation. You must restart your system to activate these modifications and to ensure that %1 are integrated into the interface." ; - Text[ portuguese ] = "Durante a instalao foram efectuadas modificaes nos ficheiros do sistema. Para poder activar e garantir a integrao do %1 na interface, dever reiniciar o seu sistema."; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart."; - Text[ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur."; -@@ -616,7 +616,7 @@ - Text = "Um sich jetzt erneut an ihrem System anzumelden klicken Sie auf '%1'. Klicken Sie dagegen auf '%2', wird das Installationsprogramm beendet." ; - Text [ english_us ] = "To login to your system again click on '%1'. If you click on '%2' the installation program will be ended." ; - Text[ portuguese ] = "Para entrar novamente no sistema, clique em '%1'. Para cancelar o programa de instalao, clique em '%2'."; -- Text[ russian ] = " , , '%1'. '%2', ."; -+ Text[ russian ] = " , , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ dutch ] = "Om u nu opnieuw aan te melden bij uw systeem klikt u op '%1'. Klikt u echter op '%2', dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour redmarrer tout de suite votre ordinateur ou sur '%2' pour quitter le programme d'installation."; -diff -ur ../setup2/source/ui/pages/pimode.src ../setup2/source/ui/pages/pimode.src ---- ../setup2/source/ui/pages/pimode.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pimode.src Fri Apr 5 18:39:45 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Slection du type d'installation" ; - Text [ dutch ] = "Installatietype selecteren" ; - Text[ chinese_simplified ] = "选择安装方式"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz typ instalacji"; - Text[ japanese ] = "インストールの種類を選択"; - Text[ chinese_traditional ] = "選擇安裝方式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Elija el tipo de instalacin." ; - Text [ english_us ] = "Choose the type of installation." ; - Text[ chinese_simplified ] = "请您选择安装的方式。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz rodzaj instalacji."; - Text[ japanese ] = "インストールの種類を選択してください。"; - Text[ chinese_traditional ] = "請選擇安裝的方式。"; -@@ -143,7 +143,7 @@ - Text [ spanish ] = "Instalacin predeterminada" ; - Text [ english_us ] = "Standard Installation" ; - Text[ chinese_simplified ] = "标准安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja standardowa"; - Text[ japanese ] = "標準インストール"; - Text[ chinese_traditional ] = "標準安裝"; -@@ -170,7 +170,7 @@ - Text [ french ] = "Installe les composants %s de faon optimale. Cette installation ncessite %1 Mo d'espace mmoire." ; - Text [ dutch ] = "De %s componenten worden compleet genstalleerd. Benodigd geheugen: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "最优化安装 %s 程序组件。这种安装方式需要 %1 兆字节的可用空间。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje dane komponenty pakietu %s. Instalacja ta wymaga %1 MB wolnej pamici, tymczasowo %2 MB."; - Text[ japanese ] = "%s コンポーネントを最適にインストールします。このインストールには %1 MB のディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "最合適地安裝 %s 程式元件。這個方式需要 %1 MB的可用空間。"; -@@ -200,7 +200,7 @@ - Text [ spanish ] = "Instalacin personalizada" ; - Text [ english_us ] = "Custom Installation" ; - Text[ chinese_simplified ] = "使用者自定安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja niestandardowa"; - Text[ japanese ] = "ユーザー操作のインストール"; - Text[ chinese_traditional ] = "自訂安裝"; -@@ -227,7 +227,7 @@ - Text [ french ] = "Permet la slection des composants de %s installer." ; - Text [ dutch ] = "Selectie van de te installeren %s componenten is mogelijk." ; - Text[ chinese_simplified ] = "能够选择安装 %s 程序组件。"; -- Text[ russian ] = " %s."; -+ Text[ russian ] = " %s."; - Text[ polish ] = "Umoliwia wybr komponentw pakietu %s, ktre zostan zainstalowane."; - Text[ japanese ] = "インストールする %s コンポーネントの選択ができます。"; - Text[ chinese_traditional ] = "可選擇安裝 %s 程式元件。"; -@@ -257,7 +257,7 @@ - Text [ spanish ] = "Instalacin mnima" ; - Text [ english_us ] = "Minimum Installation" ; - Text[ chinese_simplified ] = "基本安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Instalacja minimalna"; - Text[ japanese ] = "最小インストール"; - Text[ chinese_traditional ] = "基本安裝"; -@@ -284,7 +284,7 @@ - Text [ french ] = "Installe uniquement les composants absolument ncessaires l'excution du programme. Cette installation requiert seulement 1% Mo d'espace mmoire." ; - Text [ dutch ] = "Installatie van de voor de uitvoering van het programma minimaal noodzakelijke componenten. Benodigde vrije ruimte: %1 MB, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "只安装运行程序所需的基本组件。这个安装只需要 %1 兆字节。"; -- Text[ russian ] = " , . %1 \n ( %2 )."; -+ Text[ russian ] = " , . %1 \n ( %2 )."; - Text[ polish ] = "Instaluje komponenty niezbdne do uruchomienia programu. Instalacja ta wymaga tylko %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "プログラムの実行に必要最小限のコンポーネントをインストールします。このインストールでは %1 MB ディスク空き容量が必要です。"; - Text[ chinese_traditional ] = "只安裝執行程式所需的基本元件。這個安裝只需要 %1 MB 。"; -@@ -306,7 +306,7 @@ - Text = "Workstation Installation" ; - Text [ english_us ] = "Workstation Installation" ; - Text[ portuguese ] = "Instalao estao de trabalho"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatie werkstation"; - Text[ french ] = "Installation de station de travail"; -@@ -343,7 +343,7 @@ - Text [ french ] = "L'installation est ralise de faon ce que les programmes soient lancs directement partir du rseau. Une mmoire de %1 Mo seulement est requise par les fichiers locaux." ; - Text [ dutch ] = "De installatie wordt zo uitgevoerd, dat de programma's direct van het net worden opgestart. Voor lokale bestanden worden %1 MB benodigd.." ; - Text[ chinese_simplified ] = "采用网络安装方式。安装本机文件需要可用空间 %1 兆字节。"; -- Text[ russian ] = " , . %1 ."; -+ Text[ russian ] = " , . %1 ."; - Text[ polish ] = "Instalacja zostanie tak przeprowadzona, e programy bd uruchamiane bezporednio z sieci. Dla plikw lokalnych wymagany jest %1 MB."; - Text[ japanese ] = "プログラムが直接ネットワークで起動するように、インストールを実行します。ローカルファイルには %1 MBが必要です。"; - Text[ chinese_traditional ] = "採用網路安裝方式。安裝本機檔案需要可用空間 %1 MB。"; -@@ -360,7 +360,7 @@ - Text = "Installation lokal" ; - Text [ english_us ] = "Local Installation" ; - Text[ portuguese ] = "Instalao local"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ()"; - Text[ dutch ] = "Lokale installatie"; - Text[ french ] = "Installation locale"; -@@ -394,7 +394,7 @@ - Text [ french ] = "Installe tous les composants de %s en local sur la station de travail. Cette installation ncessite %1 Mo de mmoire et %2 Mo de mmoire temporaire." ; - Text [ dutch ] = "Installeert alle %s componenten lokaal op het werkstation. Voor deze installatie wordt een vrije ruimte van %1 MB benodigd, tijdelijk %2 MB." ; - Text[ chinese_simplified ] = "安装所有的 %s 组件到本机工作站上。这个安装需要可用空间 %1 兆字节，暂时可用空间 %2 兆字节。"; -- Text[ russian ] = " %s . %1 ( %2 )."; -+ Text[ russian ] = " %s . %1 ( %2 )."; - Text[ polish ] = "Instaluje wszystkie %s komponenty lokalnie na stacji roboczej. Instalacja ta wymaga %1 MB pamici, tymczasowo %2 MB."; - Text[ japanese ] = "すべての %s コンポーネントをワークステーション上のローカルにインストールします。このインストールには %1 MB ディスク空き容量（一時的に %2 MB）が必要です。"; - Text[ chinese_traditional ] = "安裝所有的 %s 程式元件到本機工作站上。這個安裝需要可用空間 %1 MB，暫時可用空間 %2 MB。"; -diff -ur ../setup2/source/ui/pages/pipath.src ../setup2/source/ui/pages/pipath.src ---- ../setup2/source/ui/pages/pipath.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pipath.src Fri Apr 5 18:40:34 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Slection du rpertoire d'installation" ; - Text [ dutch ] = "Installatiedirectory selecteren" ; - Text[ chinese_simplified ] = "选择安装目录"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Wybierz katalog instalacyjny"; - Text[ japanese ] = "インストールディレクトリの選択"; - Text[ chinese_traditional ] = "選擇安裝目錄"; -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Geef de directory aan waarin de componenten van %1 genstalleerd moeten worden. Typ een nieuwe naam voor een directory, of selecteer met '%2' een passende directory." ; - Text [ portuguese ] = "Especifique o directrio no qual deseja instalar os componentes do %1. Indique um novo nome para o directrio ou seleccione um directrio apropriado com o boto '%2' ." ; - Text[ chinese_simplified ] = "请指定安装 %PRODUCTNAME 程序组件的目录。您可以直接输入一个新目录，也可以通过点击 %2 选择一个合适的安装目录。"; -- Text[ russian ] = ", , , %1. '%2' ."; -+ Text[ russian ] = ", , , %1. '%2' ."; - Text[ polish ] = "Tutaj naley poda katalog, w ktrym zostan zainstalowane komponenty pakietu %1. Naley poda now nazw katalogu lub klikn przycisk '%2', aby wybra odpowiedni katalog."; - Text[ japanese ] = "%PRODUCTNAME のコンポーネントをインストールするディレクトリを入力してください。新しいディレクトリ名を入力するか［%2］で適切なディレクトリを選択します。"; - Text[ chinese_traditional ] = "請確定安裝 %PRODUCTNAME 元件的目錄。您能夠直接輸入一個新目錄名稱﹐或按一下<%2>，選擇一個合適的目錄。"; -@@ -127,7 +127,7 @@ - Text = "Bitte geben Sie das Verzeichnis ein, in dem die Komponenten von %PRODUCTNAME installiert werden sollen." ; - Text [ english_us ] = "Specify the directory in which the %PRODUCTNAME components are to be installed." ; - Text[ portuguese ] = "Indique o directrio para a instalao dos componentes do %1."; -- Text[ russian ] = ", , , %1."; -+ Text[ russian ] = ", , , %1."; - Text[ greek ] = " %1."; - Text[ dutch ] = "Geef de directory aan waarin de componenten van %1 moeten worden genstalleerd."; - Text[ french ] = "Spcifiez le rpertoire dans lequel installer les composants de %PRODUCTNAME."; -@@ -267,7 +267,7 @@ - Text = "Installationsverzeichnis" ; - Text [ english_us ] = "Installation directory" ; - Text[ portuguese ] = "Directrio de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatiedirectory"; - Text[ french ] = "Rpertoire d'installation"; -diff -ur ../setup2/source/ui/pages/plang.src ../setup2/source/ui/pages/plang.src ---- ../setup2/source/ui/pages/plang.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plang.src Fri Apr 5 18:41:08 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen %PRODUCTNAME in einer der folgenden Sprachen auf ihrem System installieren. Bitte whlen Sie die Sprache aus, die Sie nutzen wollen." ; - Text[english_us] = "You can install %PRODUCTNAME on your system in one of the following languages. Please select the language you would like to use." ; - Text[ portuguese ] = "Poder instalar o %1 em vrias lnguas no seu sistema. Seleccione uma ou as vrias lnguas que deseje utilizar."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ greek ] = " %1 . ? "; - Text[ dutch ] = "U kunt %1 in diverse talen installeren in uw systeem. Kies de taof talen die u wilt gebruiken."; - Text[ french ] = "Vous avez la possibilit d'installer %PRODUCTNAME sur votre systme dans l'une des langues mentionnes ci-aprs. Slectionnez la langue que vous souhaitez utiliser."; -@@ -164,7 +164,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "installeren"; - Text[ french ] = "installer"; -diff -ur ../setup2/source/ui/pages/plicense.src ../setup2/source/ui/pages/plicense.src ---- ../setup2/source/ui/pages/plicense.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/plicense.src Fri Apr 5 18:41:19 2002 -@@ -150,7 +150,7 @@ - Text [ french ] = "Une fois votre lecture termine, cliquez sur '%1' si vous acceptez tous les termes du contrat. Dans le cas contraire, cliquez sur '%2' pour interrompre l'installation." ; - Text [ dutch ] = "Accepteert u alle voorwaarden in deze licentieovereenkomst, klik dan op de knop '%1'. Gaat u niet accoord met de voorwaarden, klik dan op '%2', de installatie wordt dan gestopt." ; - Text[ chinese_simplified ] = "如果您同意接受许可证协议中的全部条款，请按击\"%1\"。如果不同意许可证协议中的条款，则按击\"%2\"，中断安装。"; -- Text[ russian ] = " , '%1'. , '%2', ."; -+ Text[ russian ] = " , '%1'. , '%2', ."; - Text[ polish ] = "Jeeli warunki niniejszej umowy licencyjnej zostan zaakceptowane, naley klikn przycisk '%1'. W razie niezaakceptowania ich naley klikn przycisk '%2'. Instalacja zostanie wwczas przerwana."; - Text[ japanese ] = "以上の認可協定のすべての条件に同意する場合は、［%1］をクリックします。条件に同意しない場合は、［%2］をクリックしてインストールを中止します。"; - Text[ chinese_traditional ] = "要接受所提的許可證協議的全部條款，按一下<%1>。若不接受全部條款，就按一下<%2>，取消安裝。"; -diff -ur ../setup2/source/ui/pages/pmigrate.src ../setup2/source/ui/pages/pmigrate.src ---- ../setup2/source/ui/pages/pmigrate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmigrate.src Fri Apr 5 18:41:30 2002 -@@ -101,7 +101,7 @@ - Text = "Sie knnen persnliche Daten aus einer %PRODUCTNAME 5.2 Installation bernehmen.\n\nIhre Benutzerdaten wie Vorlagen, Wrterbcher und Gallery-Themen werden in das %PRODUCTNAME 6.0 Verzeichnis kopiert. Zur vollstndigen Migration Ihrer Daten beachten Sie bitte auch die Hinweise auf weitere Dokumentation in der Readme-Datei.\n\nIhre Daten werden von dem unten angegebenen Verzeichnis kopiert." ; - Text [ english_us ] = "Personal data from a %PRODUCTNAME 5.2 installation can be used in the new version.\n\nYour user data such as templates, dictionaries and Gallery themes will be copied into the %PRODUCTNAME 6.0 directory. Concerning the complete migration of your data, please follow the guidelines in the Readme file.\n\nThe data will be copied from the directory given below." ; - Text[ portuguese ] = "Poder importar os seus dados pessoais e os parmetros de configurao da verso do %PRODUCTNAME 5.2.\n\nOs seus dados de utilizador tais como modelos, dicionrios e temas da Gallery sero copiados para o directrio %PRODUCTNAME 6.0. Para a migrao completa dos seus dados, tenha em considerao a documentao referida no ficheiro Readme.\n\nOs dados sero copiados a partir do directrio abaixo indicado."; -- Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; -+ Text[ russian ] = " %PRODUCTNAME 5.2.\n\n , , , %PRODUCTNAME 6.0. , , Readme.\n\n , ."; - Text[ greek ] = " %PRODUCTNAME .\n\n .\n\n :"; - Text[ dutch ] = "U kunt persoonlijke gegevens uit een %PRODUCTNAME 5.2-installatie overnemen.\n\nNaast uw gebruikersgegevens worden sjablonen, woordenboeken en gallery-onderwerpen gekopieerd naar de %PRODUCTNAME 6.0-directory.\n\nRaadpleeg het Readme-bestand voor een volledige migratie van uw gegevens.\n\nUw gegevens worden ontnomen aan de hieronder aangegeven directory."; - Text[ french ] = "Vous avez la possibilit de reprendre certaines donnes personnelles provenant d'une installation de %PRODUCTNAME 5.2.\n\nVos donnes d'utilisateur (tels que les modles, dictionnaires, thmes de la Gallery) seront alors copies dans le rpertoire %PRODUCTNAME 6.0. Le fichier Readme comporte des indications importantes pour la migration des donnes.\n\nCelles-ci seront copies depuis le rpertoire spcifi ci-dessous."; -diff -ur ../setup2/source/ui/pages/pmodules.src ../setup2/source/ui/pages/pmodules.src ---- ../setup2/source/ui/pages/pmodules.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pmodules.src Fri Apr 5 18:41:44 2002 -@@ -100,7 +100,7 @@ - Text = "Bitte whlen sie ein Modulset aus, welches sie installieren wollen." ; - Text[english_us] = "Please select one module set to install." ; - Text[ portuguese ] = "Please select one module set to be installed."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = "Please select one module set to be installed."; - Text[ dutch ] = "Kies een set met modules die u wilt installeren."; - Text[ french ] = "Slectionnez un jeu de modules installer."; -diff -ur ../setup2/source/ui/pages/pprofile.src ../setup2/source/ui/pages/pprofile.src ---- ../setup2/source/ui/pages/pprofile.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pprofile.src Fri Apr 5 18:42:50 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprofile zusammenstellen" ; - Text [ english_us ] = "Compile Installation Profiles" ; - Text[ portuguese ] = "Compilar perfis de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprofielen samenstellen"; - Text[ french ] = "Compilation des profils d'installation"; -@@ -100,7 +100,7 @@ - Text = "Stellen Sie sich hier Ihre verschiedenen Installationsprofile zusammen, die Sie spter mit dem Responsefile installieren mchten." ; - Text [ english_us ] = "Compile different installation profiles that are to be installed later using response file." ; - Text[ portuguese ] = "Compile os diferentes perfis de instalao que deseje instalar posteriormente com o Response File."; -- Text[ russian ] = " , Response File."; -+ Text[ russian ] = " , Response File."; - Text[ greek ] = " , Responsefile."; - Text[ dutch ] = "Kies hier de installatieprofielen die u later met de responsefile wilt installeren."; - Text[ french ] = "Compilez les diffrents profils d'installation installer avec le Response File."; -@@ -128,7 +128,7 @@ - Text = "Installationsprofile:" ; - Text [ english_us ] = "Installation profiles:" ; - Text[ portuguese ] = "Perfis de instalao:"; -- Text[ russian ] = " :"; -+ Text[ russian ] = " :"; - Text[ greek ] = " :"; - Text[ dutch ] = "Installatieprofielen:"; - Text[ french ] = "Profils d'installation :"; -diff -ur ../setup2/source/ui/pages/preadygo.src ../setup2/source/ui/pages/preadygo.src ---- ../setup2/source/ui/pages/preadygo.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preadygo.src Fri Apr 5 19:12:09 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Het systeem heeft nu alle noodzakelijke gegevens voor het kopiren van de programmabestanden. Klik nu op '%1' als u deze gegevens wilt zien of veranderen. Bent u het er mee eens, klik dan op '%2' om de installatie te starten." ; - Text [ portuguese ] = "Os parmetros necessrios para copiar os ficheiros do programa esto completos. Clique em '%1' para ver as modificaes que fez. Aceite ou modifique as entradas e continue com a instalao em '%2'." ; - Text[ chinese_simplified ] = "复制程序文件的设定已经完成。\n如果要查看或更改这些设定，请按击\"%1\"。\n如果要使用这些设定，按击\"%2\"执行安装。"; -- Text[ russian ] = " , , . '%1', . "; -+ Text[ russian ] = " , , . '%1', \n. , '%2'."; - Text[ polish ] = "Podane zostay wszystkie dane potrzebne do skopiowania plikw programu. Aby je przejrze lub zmodyfikowa, naley klikn przycisk '%1'. Jeeli wszystkie dane si zgadzaj, naley klikn przycisk '%2', aby rozpocz instalacj programu."; - Text[ japanese ] = "プログラムファイルのコピーに必要なすべての設定は終了しました｡ 設定を確認、変更する場合は、［%1］をクリックします。設定が正しければ、［%2］をクリックしてインストールを続行します。"; - Text[ chinese_traditional ] = "複製所有程式檔案的設定已經完成。要查看或變更這個設定﹐請按一下<%1>。\n要確定這個設定﹐按一下<%2>，啟動安裝。"; -diff -ur ../setup2/source/ui/pages/precover.src ../setup2/source/ui/pages/precover.src ---- ../setup2/source/ui/pages/precover.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/precover.src Fri Apr 5 18:43:23 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Rparation de l'installation" ; - Text [ dutch ] = "Installatie repareren" ; - Text[ chinese_simplified ] = "修补安装"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Naprawa instalacji"; - Text[ japanese ] = "インストールの修復"; - Text[ chinese_traditional ] = "修補安裝"; -@@ -108,7 +108,7 @@ - Text [ dutch ] = "Als u op '%1' klikt, wordt getracht de eventueel beschadigde installatie in de directory" ; - Text [ portuguese ] = "Clique em '%1' para que o programa restaure a instalao danificada no" ; - Text[ chinese_simplified ] = "按击 \"%1\"，安装程序就会修复目录之内已损坏的 %2 组件："; -- Text[ russian ] = " '%1', , "; -+ Text[ russian ] = " '%1', , "; - Text[ polish ] = "Jeli klikniesz '%1', nastpi prba ewentualnej naprawy uszkodzonej instalacji w katalogu."; - Text[ japanese ] = "[%1]をクリックすると、自動的に次のディレクトリにインストールされている %2 の修復が行われます。"; - Text[ chinese_traditional ] = "如果按一下<%1>，安裝程式就會修復安裝目錄內已損壞的 %2 ："; -@@ -144,7 +144,7 @@ - Text [ french ] = "Le processus de rparation rinstalle les composants manquants ou dfectueux." ; - Text [ dutch ] = "te herstellen. Daarbij worden gewiste programmabestanden en belangrijke programmaregistreringen opnieuw genstalleerd." ; - Text[ chinese_simplified ] = "安装程序会重新安装程序文件，并在系统内重新登记程序组件。"; -- Text[ russian ] = ". ."; -+ Text[ russian ] = ". ."; - Text[ polish ] = "Usunite pliki programowe i rejestracje programw zostan ponownie zainstalowane."; - Text[ japanese ] = "修復中に、不足または不良のコンポーネントがインストールしなおされます。"; - Text[ chinese_traditional ] = "安裝程式會重新安裝程式檔案和在操作系統內登記程式元件。"; -diff -ur ../setup2/source/ui/pages/preguser.src ../setup2/source/ui/pages/preguser.src ---- ../setup2/source/ui/pages/preguser.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preguser.src Fri Apr 5 19:23:57 2002 -@@ -80,7 +80,7 @@ - Text = "Herzlich willkommen zu %PRODUCTNAME %PRODUCTVERSION OEM\n\nUm %PRODUCTNAME %PRODUCTVERSION OEM starten zu knnen, geben Sie bitte auf der dem Lizenztext folgenden Dialogseite Ihre Benutzerdaten ein.\n\nIn der Readme-Datei im %PRODUCTNAME-Produktverzeichnis finden Sie wichtige Hinweise zum Programm. Bitte lesen Sie diese Hinweise aufmerksam durch.\n\nDes weiteren finden Sie ausfhrliche Informationen auf der Internetseite von Sun unter\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWir wnschen Ihnen viel Spa und Erfolg mit Ihrem neuen %PRODUCTNAME.\n\nIhr %PRODUCTNAME Team."; - Text [ english_us ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start %PRODUCTNAME %PRODUCTVERSION OEM, please enter your personal data in the dialog following the license text.\n\nImportant information is contained in the readme file which is located in the %PRODUCTNAME product directory. Please read this file carefully.\n\nYou can also find detailed information on the Sun Internet pages at\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nWe hope you enjoy working with %PRODUCTNAME."; - Text[ portuguese ] = "Bem-vindo ao %PRODUCTNAME %PRODUCTVERSION OEM!\n\nPara poder iniciar o %PRODUCTNAME %PRODUCTVERSION OEM, indique os seus dados de utilizador na pgina que se segue ao contrato de licena.\n\nO ficheiro Readme, que se encontra no directrio de produtos %PRODUCTNAME, contm informaes importantes sobre este programa. Leia-as atentamente!\n\nPara mais informaes, consulte a pgina da Internet da Sun em\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nResta-nos desejar-lhe um ptimo trabalho com o novo %PRODUCTNAME.\n\nA sua Equipa %PRODUCTNAME."; -- Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; -+ Text[ russian ] = " %PRODUCTNAME %PRODUCTVERSION OEM!\n\n %PRODUCTNAME %PRODUCTVERSION OEM , , , , .\n\n Readme, %PRODUCTNAME, . .\n\n , Sun \n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME.\n\n %PRODUCTNAME."; - Text[ greek ] = " %PRODUCTNAME %PRODUCTVERSION OEM\n\n %PRODUCTNAME %PRODUCTVERSION OEM \" \".\n\n ( Readme) %PRODUCTNAME . .\n\n Internet Sun\n\nhttp://www.sun.com/%PRODUCTNAME.\n\n %PRODUCTNAME .\n\n %PRODUCTNAME."; - Text[ dutch ] = "Hartelijk welkom bij %PRODUCTNAME %PRODUCTVERSION OEM\n\nOm %PRODUCTNAME %PRODUCTVERSION OEM te kunnen starten moet u uw gegevens invullen in de dialoog die volgt op de licentietekst.\n\nIn het Readme-bestand in de %PRODUCTNAME-productdirectory vindt u belangrijke aanwijzingen bij het programma. Leest u deze zorgdvuldig door.\n\nUitvoerige informatie vindt u verder op de Internet-pagina van Sun onder\n\nhttp:www.sun.com/%PRODUCTNAME.\n\nWij wensen u veel plezier en succes met uw nieuwe %PRODUCTNAME.\n\nUw %PRODUCTNAME-team. "; - Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION OEM vous souhaite la bienvenue !\n\nAfin de pouvoir dmarrer le programme, vous devez saisir vos donnes d'identit dans la bote de dialogue qui fait suite celle vous affichant la licence.\n\nLe fichier Readme, que vous trouverez dans le rpertoire de %PRODUCTNAME, contient des informations importantes sur le programme. Veuillez les lire attentivement.\n\nDe plus, vous trouverez des informations dtailles sur le site de Sun l'adresse\n\nhttp://www.sun.com/%PRODUCTNAME.\n\nL'quipe de %PRODUCTNAME espre que cette nouvelle version rpondra vos attentes et vous souhaite un agrable travail !"; -diff -ur ../setup2/source/ui/pages/preins.src ../setup2/source/ui/pages/preins.src ---- ../setup2/source/ui/pages/preins.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/preins.src Fri Apr 5 18:44:39 2002 -@@ -80,7 +80,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1安裝程式"; -@@ -102,7 +102,7 @@ - Text [ english_us ] = "Welcome to the %1 repair mode. This program lets you modify the current %1 installation. The current installation is in the folder:"; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Bem-vindo ao programa de instalao/manuteno %1! Este programa permite modificar a instalao actual. A instalao actual encontra-se na pasta:"; -- Text[ russian ] = " %1. , :"; -+ Text[ russian ] = " %1. , :"; - Text[ greek ] = " %1 :"; - Text[ dutch ] = "Welkom bij %1 installatie-onderhoudsprogramma. Met dit programma kunt u de actuele installatie modificeren. De actuele installatie bevindt zich in de volgende directory:"; - Text[ french ] = "Vous avez activ le mode de maintenance de %1. Ce mode permet de modifier l'installation actuelle de %1 qui se trouve dans le dossier :"; -@@ -164,7 +164,7 @@ - Text [ english_us ] = "New %1 components can be added or installed ones removed." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Adiciona ou remove componentes ou mdulos verso j instalada."; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ greek ] = " ( ) ."; - Text[ dutch ] = "Nieuwe programmamodules kunnen worden toegevoegd, reeds genstalleerde kunnen worden verwijderd."; - Text[ french ] = "Ajout ou suppression de composants de %1."; -@@ -221,7 +221,7 @@ - Text [ english_us ] = "Removes the %1 installation." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Elimina a instalao actual."; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " ."; - Text[ dutch ] = "Verwijdert de genstalleerde versie."; - Text[ french ] = "Suppression de l'installation de %1."; -@@ -276,7 +276,7 @@ - Text [ english_us ] = "Restores your %1 installation to its original state." ; - Text[ language_user1 ] = " "; - Text[ portuguese ] = "Reinstala todos os mdulos do programa instalados na verso anterior."; -- Text[ russian ] = " , ."; -+ Text[ russian ] = " , ."; - Text[ greek ] = " ."; - Text[ dutch ] = "Renstalleert alle programmamodulen die bij de vorige installatie werden genstalleerd."; - Text[ french ] = "Restauration de l'tat d'origine de votre installation de %1."; -@@ -302,7 +302,7 @@ - Text [ english_us ] = "You must exit %1 and the %1 Quickstarter before you can continue." ; - Text[ language_user1 ] = "LLA: 8.1.02, Text wasn't changed."; - Text[ portuguese ] = "Ter que sair do %1 e do incio rpido %1 antes de prosseguir com a desinstalao."; -- Text[ russian ] = " %1 %1, ."; -+ Text[ russian ] = " %1 %1, ."; - Text[ greek ] = "Sie mssen %1 und den %1 Schnellstarter beenden bevor Sie mit der Deinstallation fortfahren knnen."; - Text[ dutch ] = "U moet %1 en de %1 snelstarter beindigen voordat u kunt doorgaan."; - Text[ french ] = "Quittez %1 et le dmarrage rapide de %1 afin de pouvoir poursuivre."; -@@ -334,7 +334,7 @@ - Text [ french ] = "Quittez %1 afin de pouvoir procder la dsinstallation." ; - Text [ dutch ] = "U moet %1 beindigen voordat u met de denstallatie kunt doorgaan." ; - Text[ chinese_simplified ] = "在撤除程序之前，您必须先关闭 %1 。"; -- Text[ russian ] = " %1, ."; -+ Text[ russian ] = " %1, ."; - Text[ polish ] = "Musisz zakoczy %1, by mc kontynuowa dezinstalacj."; - Text[ japanese ] = "インストールの削除を続行する前に、%1 を終了させる必要があります。"; - Text[ chinese_traditional ] = "在移除程式之前﹐您必須先關閉 %1 。"; -diff -ur ../setup2/source/ui/pages/prepair.src ../setup2/source/ui/pages/prepair.src ---- ../setup2/source/ui/pages/prepair.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prepair.src Fri Apr 5 18:45:48 2002 -@@ -142,7 +142,7 @@ - Text = "In Ihrer %1 Installation kann die folgende Datei nicht gefunden werden!" ; - Text[english_us] = "In the %1 installation, the following file could not be found!" ; - Text[ portuguese ] = "Impossvel localizar o seguinte ficheiro na sua instalao %1!"; -- Text[ russian ] = " %1!"; -+ Text[ russian ] = " %1!"; - Text[ dutch ] = "In uw %1 installatie is het volgende bestand niet te vinden!"; - Text[ french ] = "Le fichier suivant est introuvable dans l'installation de %1 !"; - Text[ spanish ] = "En su instalacin %1 no se puede encontrar el siguiente archivo!"; -@@ -178,7 +178,7 @@ - Text = "%1 bentigt diese Datei um fehlerfrei ausgefhrt werden zu knnen. Das Installationsprogramm kann versuchen diese Datei wieder herzustellen." ; - Text[english_us] = "%1 requires this file to be executed correctly. With the aid of the setup program it may be restored." ; - Text[ portuguese ] = "%1 necessita este ficheiro para poder ser devidamente executado. O programa de instalao poder tentar restaurar este ficheiro."; -- Text[ russian ] = "%1 . ."; -+ Text[ russian ] = "%1 . ."; - Text[ dutch ] = "%1 benodigt dit bestand om correct te kunnen worden uitgevoerd. Met het installatieprogramma kan dit bestand eventueel weer worden hersteld."; - Text[ french ] = "%1 ne peut pas tre excut correctement sans ce fichier. Le programme d'installation peut essayer de le restaurer."; - Text[ spanish ] = "%1 necesita este archivo para poder ser ejecutado con xito. El programa de instalacin puede intentar restaurar este archivo."; -@@ -207,7 +207,7 @@ - Text = "Wenn Sie auf '%1' klicken wird versucht Ihre %2 Installation zu reparieren. Klicken Sie dagegen auf '%3' um das Installationprogramm jetzt zu beenden." ; - Text[english_us] = "Click '%1' to have the setup program repair your '%2' installation. Click '%3' to exit the installation." ; - Text[ portuguese ] = "Clique em '%1' para tentar reparar a instalao %2. Clique em '%3' para terminar agora o programa de instalao."; -- Text[ russian ] = " '%1', %2. '%3', ."; -+ Text[ russian ] = " '%1', %2. '%3', ."; - Text[ dutch ] = "Als u op '%1' klikt wordt getracht uw %2 installatie te repareren. Klikt u daarentegen op '%3' dan wordt het installatieprogramma beindigd."; - Text[ french ] = "Cliquez sur '%1' pour essayer de rparer l'installation de %2. ou sur '%3' si vous prfrez quitter le programme d'installation."; - Text[ spanish ] = "Si pulsa sobre '%1' se intentar reparar su instalacin %2. Pero si pulsa sobre '%3' se cerrar el programa de instalacin."; -diff -ur ../setup2/source/ui/pages/prspwizard.src ../setup2/source/ui/pages/prspwizard.src ---- ../setup2/source/ui/pages/prspwizard.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/prspwizard.src Fri Apr 5 18:46:09 2002 -@@ -129,7 +129,7 @@ - Text = "Der Responsefile AutoPilot hilft Ihnen bei der Erstellung eines Responsefiles mit dem sie danach mehrere Installationsprofile automatisiert installieren knnen." ; - Text [ english_us ] = "The response file autopilot helps you to create a response file. These are then used to automatically install several installation profiles." ; - Text[ portuguese ] = "O AutoPiloto Response File ajuda-o a criar um Response File que lhe permite instalar automaticamente diversos perfis de instalao."; -- Text[ russian ] = " Response File (Response file), ."; -+ Text[ russian ] = " Response File (Response file), ."; - Text[ greek ] = " Responsefile Responsefile ? "; - Text[ dutch ] = "Responsefile AutoPilot helpt u bij het maken van een response-bestand waarmee u automatisch meerdere installatieprofielen kunt installeren."; - Text[ french ] = "L'AutoPilote Response File vous assiste lors de la cration d'un Response File grce auquel l'installation automatise des profils d'installation sera possible."; -diff -ur ../setup2/source/ui/pages/pscript.src ../setup2/source/ui/pages/pscript.src ---- ../setup2/source/ui/pages/pscript.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pscript.src Fri Apr 5 18:46:57 2002 -@@ -72,7 +72,7 @@ - Text = "Installationsprogramm" ; - Text [ english_us ] = "Installation program" ; - Text[ portuguese ] = "Programa de instalao"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ dutch ] = "Installatieprogramma"; - Text[ french ] = "Programme d'installation"; -@@ -114,7 +114,7 @@ - Text = "Das Installationsprogramm kann die Skriptdatei nicht finden, in der alle zur Installation notwendigen Anweisungen gespeichert sind." ; - Text [ english_us ] = "The installation program cannot find the script file in which all of the instructions required for installation have been saved." ; - Text[ portuguese ] = "O programa de instalao no encontra o ficheiro script com todas as instrues necessrias instalao."; -- Text[ russian ] = " , , ."; -+ Text[ russian ] = " , , ."; - Text[ greek ] = " "; - Text[ dutch ] = "Het installatieprogramma kan het scriptbestand met alle voor de installatie benodigde aanwijzingen niet vinden."; - Text[ french ] = "Le programme d'installation n'arrive pas trouver le fichier script contenant toutes les instructions ncessaires l'installation."; -@@ -178,7 +178,7 @@ - Text = "Ohne diese Datei kann das Installationsprogramm nicht ausgefhrt werden, es wird jetzt beendet." ; - Text [ english_us ] = "The installation program cannot be executed without this file, it will now be terminated." ; - Text[ portuguese ] = "Sem este ficheiro, impossvel executar o programa de instalao. Este ser cancelado agora."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ greek ] = " , ."; - Text[ dutch ] = "Zonder dit bestand kan het installatieprogramma niet worden uitgevoerd, het wordt nu gestopt."; - Text[ french ] = "Sans ce fichier, il est impossible de lancer le programme d'installation. Celui-ci va tre interrompu."; -diff -ur ../setup2/source/ui/pages/ptoplvl.src ../setup2/source/ui/pages/ptoplvl.src ---- ../setup2/source/ui/pages/ptoplvl.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/ptoplvl.src Fri Apr 5 18:47:10 2002 -@@ -107,7 +107,7 @@ - Text [ dutch ] = "Selecteer de producten die u wilt installeren.\n" ; - Text [ portuguese ] = "Escolha os produtos que deseja instalar.\n" ; - Text[ chinese_simplified ] = "请选择要安装的软件。\n"; -- Text[ russian ] = ", , , .\n"; -+ Text[ russian ] = ", , , .\n"; - Text[ polish ] = "Wybierz produkty, ktre chcesz zainstalowa.\n"; - Text[ japanese ] = "インストールする製品を選択してください。\n"; - Text[ chinese_traditional ] = "請選擇要安裝的軟體。\n"; -diff -ur ../setup2/source/ui/pages/puninst.src ../setup2/source/ui/pages/puninst.src ---- ../setup2/source/ui/pages/puninst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/puninst.src Fri Apr 5 18:47:49 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Dsinstallation de %1" ; - Text [ dutch ] = "%1 denstalleren" ; - Text[ chinese_simplified ] = "撤除 %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Deinstaluj %1"; - Text[ japanese ] = "%1 のインストールの削除"; - Text[ chinese_traditional ] = "移除 %1"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "Als u er zeker van bent dat u de bestaande %1 installatie uit map '%2' wilt verwijderen, druk dan op '%3'." ; - Text [ portuguese ] = "Se tiver a certeza de que deseja eliminar a instalao %1 existente no directrio '%2', clique em '%3'." ; - Text[ chinese_simplified ] = "如果真要删除目录\"%2\"中的安装程序%1，请按击\"%3\"。"; -- Text[ russian ] = " %1 '%2', '%3'."; -+ Text[ russian ] = " %1 '%2', '%3'."; - Text[ polish ] = "Jeli zainstalowany program %1 ma na pewno zosta usunity z katalogu '%2', naley klikn przycisk '%3'."; - Text[ japanese ] = "ディレクトリ「%2」にある %1 のインストールの削除をするときは、［%3］をクリックします。"; - Text[ chinese_traditional ] = "如果真要移除現存目錄<%2>內的 %1 ，就按一下<%3>。"; -@@ -142,7 +142,7 @@ - Text = "Die Deinstallation lscht keine %1 Konfigurationsdateien oder von Ihnen erstellte Dokumente. Sie knnen jetzt einstellen, dass auch diese Dateien von der Deinstallation gelscht werden." ; - Text [ english_us ] = "Deinstallation does not delete any %1 configuration files or documents created by the user. You can now determine if these files are also to be deleted by deinstallation." ; - Text[ portuguese ] = "A desinstalao no elimina os ficheiros de configurao %1 dos documentos que criou. Poder indicar agora se deseja que esses ficheiros sejam eliminados ao efectuar a desinstalao."; -- Text[ russian ] = " %1 . , ."; -+ Text[ russian ] = " %1 . , ."; - Text[ greek ] = " %1, "; - Text[ dutch ] = "Met de denstallatie worden geen %1 configuratiebestanden of door u gemaakte documenten gewist. U kunt hier kiezen of ook deze bestanden bij de denstallatie worden gewist."; - Text[ french ] = "La dsinstallation ne supprime ni les fichiers de configuration de %1, ni les documents que vous avez crs. Vous pouvez maintenant dcider de la suppression de ces fichiers par la dsinstallation."; -diff -ur ../setup2/source/ui/pages/pupdate.src ../setup2/source/ui/pages/pupdate.src ---- ../setup2/source/ui/pages/pupdate.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pupdate.src Fri Apr 5 18:49:58 2002 -@@ -79,7 +79,7 @@ - Text[ swedish ] = "Installationsprogram fr %1"; - Text[ dutch ] = "Installatioeprogramma voor %1"; - Text[ spanish ] = "Programa de instalacin para %1"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_simplified ] = "%1 安装程序"; -@@ -109,7 +109,7 @@ - Text[ swedish ] = "Vlkommen till installationsprogrammet"; - Text[ dutch ] = "Welkom bij het installatieprogramma"; - Text[ spanish ] = "Bienvenida al programa de instalacin"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "インストールプログラムへようこそ"; - Text[ chinese_simplified ] = "欢迎安装！"; -@@ -138,7 +138,7 @@ - Text[ swedish ] = "Det finns redan en %1 installation i fljande mapp"; - Text[ dutch ] = "Er bestaat reeds een %1 installatie in de volgende directory"; - Text[ spanish ] = "Ya existe una instalacin %1 en el siguiente directorio"; -- Text[ russian ] = " %1 "; -+ Text[ russian ] = " %1 "; - Text[ polish ] = "Istnieje ju instalacja %1 w nastpujcym katalogu"; - Text[ japanese ] = "%1 インストールはすでに次のディレクトリにあります。"; - Text[ chinese_simplified ] = "在下列目录内已经存在一个%1程序"; -@@ -169,7 +169,7 @@ - Text = "Wenn Sie auf '%1' klicken, wird die vorhandene Installation aktualisiert. Klicken Sie auf '%2', wird das Installationsprogramm abgebrochen.\n\nBeachten Sie bitte, dass die Edition Ihrer vorhandenen Installation durch das Update bernommen wird." ; - Text [ english_us ] = "If you click '%1', the existing installation will be updated. Click '%2' to abort the installation.\n\nMake sure that the Edition type of your existing installation is adopted by the update." ; - Text[ portuguese ] = "Clique em '%1', para actualizar a instalao existente. Clique em '%2' para cancelar o programa de instalao.\n\nNote que o tipo de edio da verso instalada ser o mesmo aps a actualizao (update)."; -- Text[ russian ] = " '%1', . '%2', .\n\n , , ."; -+ Text[ russian ] = " '%1', . '%2', .\n\n , , ."; - Text[ dutch ] = "Als u op '%1' klikt dan wordt de bestaande installatie geactualiseerd. Klikt u op '%2', dan wordt het installatieprogramma gestopt.\n\nWij wijzen u erop, dat de editie van de bestaande installatie wordt overgenomen door de update-editie."; - Text[ french ] = "Cliquez sur '%1' pour actualiser l'installation existante ou sur '%2', pour quitter le programme d'installation.\n\nVeuillez noter que la mise jour reprendra le type d'dition de votre version d'origine."; - Text[ spanish ] = "Si pulsa sobre '%1', la instalacin existente se actualizar. Para cancelar el programa de instalacin, pulse sobre '%2'.\n\nTenga en cuenta que la actualizacin respetar la edicin de su instalacin existente."; -@@ -241,7 +241,7 @@ - Text = "Hierbei handelt es sich um eine Netzinstallation. Sie haben jedoch keine Schreibrechte in dem genannten Verzeichnis. Um diese Installation aktualisieren zu knnen verschaffen Sie sich Schreibrechte und starten das Installationsprogramm erneut." ; - Text [ english_us ] = "The program you want to run represents a network installation for which you must have the appropriate (write) access for the above-mentioned directory. Prior to running the installation again, you must have write access for this directory." ; - Text[ portuguese ] = "Esta uma instalao de rede. No entanto, no possui direitos de acesso no directrio mencionado. Para poder actualizar esta instalao ter que adquirir os direitos de acesso apropriados e reiniciar o programa de instalao."; -- Text[ russian ] = " . . , ."; -+ Text[ russian ] = " . . , ."; - Text[ dutch ] = "Het betreft hier een netinstallatie. U heeft echter geen schrijfrechten in de genoemde directory. Om deze installatie te kunnen actualiseren moet u zich schrijfrechten verschaffen en het installatieprogramma opnieuw starten."; - Text[ french ] = "Vous utilisez une installation en rseau pour laquelle vous ne possdez pas de droits d'criture dans le rpertoire cit. Pour pouvoir actualiser cette installation, vous devez vous procurer les droits d'criture ncessaires avant de relancer le programme d'installation."; - Text[ spanish ] = "Esta es una instalacin de red. Sin embargo, usted no posee derechos de escritura en el directorio nombrado. Para poder actualizar esta instalacin, obtenga los derechos de escritura y ejecute de nuevo el programa de instalacin."; -@@ -270,7 +270,7 @@ - Text = "Sie knnen eine Aktualisierung von %1 jedoch nicht durchfhren, da die Sprache der vorhandenen Installation nicht mit der Sprache dieses Installationsatzes bereinstimmt." ; - Text [ english_us ] = "The language of the installation files does not correspond to the language of the installed version %1. Thus, an upgrade is not possible." ; - Text[ portuguese ] = " impossvel efectuar a actualizao de %1, porque a lngua da instalao existente no combina com a lngua dos ficheiros de instalao."; -- Text[ russian ] = " %1 , .. ."; -+ Text[ russian ] = " %1 , .. ."; - Text[ dutch ] = "U kunt een actualiseren van %1 echter niet uitvoeren daar de taal van deze installatie niet overeenkomt met die van de reeds bestaande versie."; - Text[ french ] = "Impossible de procder une actualisation de %1 : la langue de l'installation existante ne correspond pas celle des prsents fichiers dl'installation."; - Text[ spanish ] = "No es posible efectuar una actualizacin de %1 dado que el idioma de la instalacin existente no coincide con el de estos archivos de instalacin."; -@@ -299,7 +299,7 @@ - Text = "Dies ist eine Updateinstallation fr %1.\n\nAuf Ihrem Rechner konnte jedoch keine %2 Installation gefunden werden. Das Installationsprogramm wird jetzt abgebrochen." ; - Text [ english_us ] = "This is an update installation for %1.\n\nNo %2 installation has been found. Installation program will be aborted." ; - Text[ portuguese ] = "Este um programa de actualizao (update) de %1.\n\nNo entanto, foi impossvel encontrar no seu computador a instalao de %2. O programa ser cancelado agora."; -- Text[ russian ] = " %1.\n\n %2 . ."; -+ Text[ russian ] = " %1.\n\n %2 . ."; - Text[ dutch ] = "Dit is een update-installatie voor %1.\n\nOp uw computer werdechter geen %2 installatie gevonden. Het installatiesprogramma wordt nu gestopt."; - Text[ french ] = "Le prsent programme est destin installer une mise jour (update) de %1.\n\nLe programme de mise jour n'a cependant dtect aucune installation de %2 et va donc tre interrompu."; - Text[ spanish ] = "Esta instalacin actualizar %1.\n\nSin embargo, no se ha encontrado en su ordenador una instalacin %2. El programa de instalacin se cancelar ahora."; -diff -ur ../setup2/source/ui/pages/pusrinst.src ../setup2/source/ui/pages/pusrinst.src ---- ../setup2/source/ui/pages/pusrinst.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pusrinst.src Fri Apr 5 18:50:14 2002 -@@ -108,7 +108,7 @@ - Text [ french ] = "Slectionnez les modules que vous souhaitez installer." ; - Text [ dutch ] = "Selecteer de te installeren modules." ; - Text[ chinese_simplified ] = "请您选择要安装的模块。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Wybierz moduy dla instalacji."; - Text[ japanese ] = "インストールするモジュールを選択します。"; - Text[ chinese_traditional ] = "請您選擇要安裝的模塊。"; -diff -ur ../setup2/source/ui/pages/pwaddr.src ../setup2/source/ui/pages/pwaddr.src ---- ../setup2/source/ui/pages/pwaddr.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwaddr.src Fri Apr 5 18:50:25 2002 -@@ -143,7 +143,7 @@ - Text = "In der Zeit zwischen Installation und Registrierung knnen die Benutzerdaten nicht mehr gendert werden. Bitte kontrollieren Sie jetzt Ihre Benutzerdaten und klicken Sie auf '%1' wenn Sie die Daten noch ndern wollen."; - Text[english_us] = "During the period between installation and registration, the personal data specified cannot be changed. Check now the user data and click '%1' if you want to modify the data."; - Text[ portuguese ] = "No possvel modificar os dados de utilizador no perodo compreendido entre a instalao e o registo. Queira verificar agora os seus dados de utilizador e se pretender modific-los, clique em '%1'."; -- Text[ russian ] = " . , , '%1', ."; -+ Text[ russian ] = " . , , '%1', ."; - Text[ dutch ] = "In de tijd tussen installatie en registratie kunnen gebruikersgegevens niet meer worden veranderd. Controleer nu uw gebruikersgegevens. Als u nog iets wilt veranderen, klikt u dan op '%1'."; - Text[ french ] = "Vous ne pourrez plus modifier vos donnes d'identit durant la priode comprise entre l'installation et l'enregistrement. Veuillez vrifier vos donnes d'identit et cliquer sur '%1' si vous souhaitez les modifier."; - Text[ spanish ] = "En el periodo entre la instalacin y el registro no se pueden modificar los datos de usuario. Compruebe por favor ahora sus datos de usuario y pulse sobre '%1' si an desea modificar los datos."; -diff -ur ../setup2/source/ui/pages/pwelcome.src ../setup2/source/ui/pages/pwelcome.src ---- ../setup2/source/ui/pages/pwelcome.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwelcome.src Fri Apr 5 18:51:41 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のセットアッププログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -111,7 +111,7 @@ - Text [ spanish ] = "Bienvenido al programa de instalacin" ; - Text [ english_us ] = "Welcome to the Installation Program" ; - Text[ chinese_simplified ] = "欢迎安装！"; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ polish ] = "Witamy w programie instalacyjnym"; - Text[ japanese ] = "セットアッププログラムへようこそ"; - Text[ chinese_traditional ] = "歡迎安裝"; -@@ -138,7 +138,7 @@ - Text [ french ] = "Le programme d'installation va installer les composants de %1 sur votre disque dur. Pour quitter le programme d'installation, utilisez le bouton '%2'." ; - Text [ dutch ] = "Het installatieprogramma richt de %1 componenten in op uw vaste schijf. Om het installatieprogramma te beindigen staat u te allen tijde de knop '%2' ter beschikking." ; - Text[ chinese_simplified ] = "安装程序在硬盘上安装 %1 组件。\n您可以通过单击按钮 '%2' 来结束安装程序。"; -- Text[ russian ] = " %1. '%2'."; -+ Text[ russian ] = " \n%1. \n '%2'."; - Text[ polish ] = "Program instalacyjny instaluje komponenty pakietu %1 na dysku twardym. Aby zakoczy program instalacyjny, mona w kadej chwili klikn przycisk '%2'."; - Text[ japanese ] = "セットアッププログラムは、%1 コンポーネントをハードディスク上にインストールします。セットアッププログラムを中断するには、［%2］をクリックします。"; - Text[ chinese_traditional ] = "安裝程式在磁碟上安裝 %1 元件。\n可以按一下 %2 ，結束安裝程式。"; -@@ -166,7 +166,7 @@ - Text [ french ] = "Avant de procder l'installation, vous devez fermer tous les programmes en cours. Cliquez sur '%1' pour quitter le programme d'installation et fermer tous les programmes en cours. Cliquez sur '%2' pour poursuivre l'installation." ; - Text [ dutch ] = "Pas op: Beindig voor de installatie alle geopende programma's. Met '%1' verlaat u het installatieprogramma en kunt u geopende programma's afsluiten. Klikt u echter op '%2', dan wordt de installatie voortgezet." ; - Text[ chinese_simplified ] = "请在安装程序之前关闭所有正在运行的其他程序。\n点击 '%1' 就能够退出和关闭安装程序。\n点击 '%2'，就会继续执行安装。"; -- Text[ russian ] = " . '%1' "; -+ Text[ russian ] = " . '%1' "; - Text[ polish ] = "Przed rozpoczciem instalacji naley zakoczy wszystkie pracujce programy. Aby opuci program instalacyjny i zamkn wszystkie aktywne programy, naley klikn przycisk '%1'. Po klikniciu przycisku '%2' nastpi kontynuacja instalacji."; - Text[ japanese ] = "インストールを開始する前に、開いているアプリケーションをすべて終了してください。アプリケーションの終了は、［%1］でセットアッププログラムを閉じた上で行います。［%2］をクリックすると、このままインストールを続行します。"; - Text[ chinese_traditional ] = "請在安裝之前關閉正在運行的其他程式。\n按一下 %1 就能夠退出和關閉安裝程式。\n按一下 %2 ﹐就會繼續執行安裝。"; -diff -ur ../setup2/source/ui/pages/pwsetup.src ../setup2/source/ui/pages/pwsetup.src ---- ../setup2/source/ui/pages/pwsetup.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/pwsetup.src Fri Apr 5 18:52:50 2002 -@@ -79,7 +79,7 @@ - Text [ french ] = "Programme d'installation de %1" ; - Text [ dutch ] = "Installatieprogramma voor %1" ; - Text[ chinese_simplified ] = "%1 安装程序"; -- Text[ russian ] = " %1"; -+ Text[ russian ] = " %1"; - Text[ polish ] = "Program instalacyjny pakietu %1"; - Text[ japanese ] = "%1 のインストールプログラム"; - Text[ chinese_traditional ] = "%1 安裝程式"; -@@ -120,7 +120,7 @@ - Text [ dutch ] = "%1 bevindt zich reeds in de directory" ; - Text [ portuguese ] = "%1 j se encontra no directrio." ; - Text[ chinese_simplified ] = "%1 已经安装"; -- Text[ russian ] = "%1 "; -+ Text[ russian ] = "%1 "; - Text[ polish ] = "%1 zainstalowano ju w katalogu"; - Text[ japanese ] = "%1 はすでにディレクトリに"; - Text[ chinese_traditional ] = "%1已經安裝"; -@@ -182,7 +182,7 @@ - Text [ french ] = "Pour procder la dsinstallation, vous devez utiliser le programme d'installation (setup) de la version que vous voulez dsinstaller. Ceci fait, vous pourrez utiliser le prsent programme d'installation pour installer %1." ; - Text [ dutch ] = "Gebruikt u het zich daar bevindende setup-programma voor de denstallatie. Wilt u %1 opnieuw installeren, dan kunt u weer dit setup-programma starten." ; - Text[ chinese_simplified ] = "请您使用目录内的安装程序来撤除软件。如果您要重新安装\"%1\"，请您重新启动这个安装程序。"; -- Text[ russian ] = " , , . %1 ."; -+ Text[ russian ] = " , , . %1 ."; - Text[ polish ] = "Prosz uy tamtejszego programu instalacyjnego do deinstalacji. Dla ponownej instalacji %1 uruchom ponownie program instalacyjny."; - Text[ japanese ] = "インストールの削除は、インストールされた場所のセットアッププログラムで実行してください。%1 を再インストールする場合は、そこのセットアッププログラムを再開始します。"; - Text[ chinese_traditional ] = "請使用目錄內的安裝程式來移除軟體。如果要重新安裝<%1>。請重新啟動這個安裝程式。"; -@@ -203,7 +203,7 @@ - Text = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text [ english_us ] = "If the installation above is not working properly anymore, you can have it repaired."; - Text[ portuguese ] = "Se a instalao acima mencionada no estiver a funcionar devidamente, poder repar-la agora."; -- Text[ russian ] = " , , , ."; -+ Text[ russian ] = " , , , ."; - Text[ greek ] = "Falls Ihre oben angegebene Installation nicht mehr richtig funktioniert haben Sie nun Mglichkeit diese reparieren zu lassen."; - Text[ dutch ] = "Mocht de bovenvermelde installatie niet meer naar wens functioneren dan kunt u deze hier laten repareren."; - Text[ french ] = "Si l'installation spcifie ci-dessus ne fonctionne plus correctement, vous avez la possibilit de la rparer."; -diff -ur ../setup2/source/ui/pages/vefun.src ../setup2/source/ui/pages/vefun.src ---- ../setup2/source/ui/pages/vefun.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/ui/pages/vefun.src Fri Apr 5 18:54:44 2002 -@@ -78,7 +78,7 @@ - Text [ spanish ] = "Instalacin finalizada" ; - Text [ french ] = "L'installation est termine." ; - Text [ dutch ] = "Installatie beindigd" ; -- Text[ russian ] = " "; -+ Text[ russian ] = " "; - Text[ greek ] = " "; - Text[ polish ] = "Instalacja zakoczona"; - Text[ japanese ] = "インストールの完了"; -@@ -158,7 +158,7 @@ - Text [ spanish ] = "La instalacin ha finalizado con xito.\nSun Microsystems le desea que disfrute trabajando con %1!" ; - Text [ french ] = "L'installation est termine.\nSun Microsystems vous souhaite un agrable travail avec %1 !" ; - Text [ dutch ] = "De installatie werd correct uitgevoerd.\nSun Microsystems wenst u veel plezier bij het werken met %1!" ; -- Text[ russian ] = " .\nSun Microsystems %1!"; -+ Text[ russian ] = " .\nSun Microsystems %1!"; - Text[ greek ] = " .\n Sun Microsystems %1!"; - Text[ polish ] = "Instalacja zostaa pomylnie zakoczona.\nSun Microsystems yczy przyjemnej pracy w programie %1!"; - Text[ japanese ] = "インストールは正常に完了しました。\n%1 でさらに充実したお仕事を Sun Microsystems は心から願っております。"; -@@ -186,7 +186,7 @@ - Text [ french ] = "Les modules et composants slectionns ont t installs / dsinstalls." ; - Text [ dutch ] = "De geselecteerde modules en componenten zijn nu op uw harde schijf genstalleerd/gedenstalleerd." ; - Text [ portuguese ] = "Os mdulos e componentes seleccionados esto agora instalados/desinstalados no seu disco rgido." ; -- Text[ russian ] = " / ."; -+ Text[ russian ] = " / ."; - Text[ greek ] = " / ."; - Text[ polish ] = "Wybrane moduy i komponenty zostay zainstalowane / zdeinstalowane na twardym dysku."; - Text[ japanese ] = "選択したモジュールとコンポーネントを、いまハードディスク上にインストールまたはインストールの削除します。"; -@@ -215,7 +215,7 @@ - Text [ danish ] = "Installationen er blevet repareret.\n" ; - Text [ portuguese ] = "Instalao reparada.\n" ; - Text [ portuguese_brazilian ] = "Die Installation wurde repariert.\n" ; -- Text[ russian ] = " .\n"; -+ Text[ russian ] = " .\n"; - Text[ greek ] = " .\n"; - Text[ polish ] = "Instalacja zostaa naprawiona.\n"; - Text[ japanese ] = "インストールは修復されました。\n"; -@@ -244,7 +244,7 @@ - TEXT[ swedish ] = "Avinstallationen r avslutad.\n\nVar vnlig och observera att installationsprogrammet inte har raderat alla filerna. %1 konfigurationsfiler och dokument som du sjlv har skapat har inte raderats. Om du inte behver de hr filerna mer kan du radera %1-mappen manuellt."; - TEXT[ dutch ] = "De denstallatie ist beindigd.\n\nWij maken u erop attent, dat het installatieprogramma niet alle bestanden heeft verwijderd. %1 configuratiebestanden en de door u zelf gemaakte documenten werden niet verwijderd. Als u deze niet verder nodig heeft dan kunt u directory %1 handmatig wissen."; - TEXT[ spanish ] = "La desinstalacin ha terminado satisfactoriamente.\n\nTenga en cuenta que el programa de instalacin no ha eliminado la totalidad de los archivos. Los archivos de configuracin %1 as como sus documentos personales no han sido eliminados. Si no los necesita ms, puede eliminar manualmente el directorio %1."; -- TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; -+ TEXT[ russian ] = " .\n\n, , . %1 . , %1 ."; - TEXT[ polish ] = "Deinstalacja zostaa pomylnie zakoczona.\n\nNaley uwzgldni, e program instalacyjny nie usun wszystkich plikw. Pliki konfiguracyjne %1 i wasne dokumenty nie zostay usunite.Jeli nie s one ju potrzebne, mona usun katalog %1 rcznie."; - TEXT[ japanese ] = "インストールプログラムは正常に完了しました。\n\nインストールプログラムがすべてのファイルを削除していないことに、注意してください。%1 設定ファイルやユーザーが作成したドキュメントは削除されていません。これらも必要でなければ %1 ディレクトリを手動で削除します。"; - TEXT[ chinese_simplified ] = "现在已经完成撤除程序。\n\n请注意：安装程序并没有删除所有的文件。%1 配置文件和上次安装程序之后您建立的文档没有被删除。如果不再需要这些文件，请您自己删除 %1 目录。"; -@@ -303,7 +303,7 @@ - Text [ spanish ] = "Pulse '%1' para finalizar la instalacin del programa." ; - Text [ french ] = "Cliquez sur '%1' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het installatieprogramma te beindigen." ; -- Text[ russian ] = " '%1'."; -+ Text[ russian ] = " '%1'."; - Text[ greek ] = " '%1' ."; - Text[ polish ] = "W celu zakoczenia programu instalacyjnego naley klikn przycisk '%1'."; - Text[ japanese ] = "［%1］をクリックするとインストールプログラムが終了します。"; -@@ -332,7 +332,7 @@ - Text [ french ] = "Lors de l'installation, des modifications ont t apportes au fichier config.sys. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre systme." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de config.sys. Om deze te activeren en om een integratie van %1 te garanderen moet uw systeem opnieuw worden opgestart." ; - Text [ portuguese ] = "Durante a instalao foram feitas modificaes no config.sys.Ter que reiniciar o computador para que estas sejam activadas e para assegurar a integrao do %1 na interface." ; -- Text[ russian ] = " config.sys. , %1, ."; -+ Text[ russian ] = " config.sys. , %1, ."; - Text[ greek ] = " CONFIG.SYS . "; - Text[ polish ] = "Podczas instalacji nastpiy zmiany w pliku config.sys. Aktywacja i integracja interfejsw ze %1 moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中、config.sys に変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -362,7 +362,7 @@ - Text [ danish ] = "Der er blevet installeret nye tegnst under installationen. Det er ndvendigt at genstarte computeren, for at gre dem tilgngelige for alle programmer." ; - Text [ portuguese ] = "Foram instalados novos caracteres. Ter que reiniciar o seu computador para que estes estejam disponveis para todos os programas." ; - Text [ portuguese_brazilian ] = "W?hrend der Installation wurden neue Zeichens?tze installiert. Damit diese allen Programmen zur Verf?ung stehen, ist ein Neustart erforderlich." ; -- Text[ russian ] = " . , , ."; -+ Text[ russian ] = " . , , ."; - Text[ greek ] = " . "; - Text[ polish ] = "Przy instalacji zostay zainstalowane nowe czcionki. Aby byy one dostpne dla wszystkich programw, konieczne jest ponowne uruchomienie."; - Text[ japanese ] = "インストール中に、新しいフォントがインストールされました。このフォントをすべてのアプリケーションで使用するには、コンピュータを再起動させる必要があります。"; -@@ -391,7 +391,7 @@ - Text [ spanish ] = "Durante la instalacin se efectuaron modificaciones en los archivos del sistema. Para que estas puedan activarse y para garantizar la integracin de %1 en la interfaz, debe reiniciar su sistema." ; - Text [ french ] = "Lors de l'installation, des modifications ont t apportes aux fichiers systme. Afin que ces modifications soient prises en compte et pour garantir une intgration de l'interface de %1, vous devez redmarrer votre ordinateur." ; - Text [ dutch ] = "Tijdens de installatie werden veranderingen aangebracht in de systeembestanden. Om deze te activeren en een integratie van %1 te garanderen, moet uw systeem opnieuw worden opgestart." ; -- Text[ russian ] = " . , %1, ."; -+ Text[ russian ] = " . , %1, ."; - Text[ greek ] = " . "; - Text[ polish ] = "Podczas instalacji zaszy zmiany w plikach systemowych. Aktywacja i integracja interfejsw ze %1, moliwa bdzie dopiero po ponownym uruchomieniu systemu."; - Text[ japanese ] = "インストール中にシステムファイルに変更がありました。この変更を有効にし、デスクトップ %1 に統一させるには、システムを再起動する必要があります。"; -@@ -420,7 +420,7 @@ - Text [ spanish ] = "Pulse sobre '%1' para reiniciar el sistema. Pulse '%2' para terminar el programa de instalacin." ; - Text [ french ] = "Cliquez sur '%1' pour redmarrer immdiatement votre ordinateur ou sur '%2' pour quitter le programme d'installation." ; - Text [ dutch ] = "Klik op '%1' om het het systeem opnieuw op te starten. Klikt u daarentegen op '%2', dan wordt het installeren beindigd zonder opnieuw op te starten." ; -- Text[ russian ] = " , '%1'. '%2', ."; -+ Text[ russian ] = " , '%1'. '%2', ."; - Text[ greek ] = " '%1'. '%2'."; - Text[ polish ] = "Aby ponownie uruchomi, kliknij '%1'. Jeli klikniesz '%2', program instalacyjny zostanie zakoczony."; - Text[ japanese ] = "いますぐ再起動するには [%1] をクリックします。［%2］をクリックすると、インストールプログラムを終了します。"; -diff -ur ../setup2/source/uibase/agentdlg.src ../setup2/source/uibase/agentdlg.src ---- ../setup2/source/uibase/agentdlg.src Wed Apr 3 16:11:11 2002 -+++ ../setup2/source/uibase/agentdlg.src Fri Apr 5 18:04:26 2002 -@@ -171,7 +171,7 @@ - Text = "Installieren" ; - Text [ english_us ] = "Install" ; - Text[ portuguese ] = "Instalar"; -- Text[ russian ] = ""; -+ Text[ russian ] = ""; - Text[ greek ] = ""; - Text[ dutch ] = "Installeren"; - Text[ french ] = "Installer"; -diff -ur ../sfx2/source/view/view.src ../sfx2/source/view/view.src ---- ../sfx2/source/view/view.src Wed Apr 3 16:09:43 2002 -+++ ../sfx2/source/view/view.src Fri Apr 5 19:06:40 2002 -@@ -745,7 +745,7 @@ - MESSAGE [ spanish ] = "Error al enviar el mensaje. La razn puede ser una cuenta de usuario o una instalacin defectuosa.\nCompruebe la configuracin de %PRODUCTNAME o la de su programa de correo electrnico." ; - MESSAGE [ english_us ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; - MESSAGE[ chinese_simplified ] = "在寄发电子邮件时发生一个错误。可能缺少一个用户帐号或者安装程序有错误。\n请您检查 %PRODUCTNAME 的设定或者您的电子邮件程序的设定。"; -- MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; -+ MESSAGE[ russian ] = " . , - .\n %PRODUCTNAME ."; - MESSAGE[ polish ] = "Bd w przesyaniu wiadomoci: brak konta uytkownika lub nieprawidowa instalacja.\nNaley sprawdzi ustawienia programu %PRODUCTNAME lub programu poczty elektronicznej."; - MESSAGE[ japanese ] = "メッセージ送信時のエラー。エラーの原因としては、ユーザーアカウントがないか、あるいはセットアップが正しくないかが考えられます。\n%PRODUCTNAME、またはお使いの E-mail プログラムの設定を確認してください。"; - MESSAGE[ chinese_traditional ] = "在傳送這個文件時發生一個錯誤。可能缺少一個使用者賬號或安裝有問題。\n請您檢查 %PRODUCTNAME 的設定和您的電子郵件程式的設定。"; -diff -ur ../starmath/source/smres.src ../starmath/source/smres.src ---- ../starmath/source/smres.src Wed Apr 3 16:12:34 2002 -+++ ../starmath/source/smres.src Fri Apr 5 17:46:21 2002 -@@ -3533,7 +3533,7 @@ - Message [ spanish ] = "La fuente \"StarMath\" no est instalada!\nSin esta fuente StarMath no funcionar correctamente...\nInstale la fuente y reinicie StarMath." ; - Message [ english_us ] = "The \"StarMath\" font has not been installed.\nWithout this font %PRODUCTNAME Math cannot function correctly.\nPlease install this font and restart %PRODUCTNAME Math." ; - Message[ chinese_simplified ] = "没有安装 StarMath 字体！\n没有这个 StarMath字体程序会无法正常运作。\n请在安装这个字体后重新启动 StarMath 。"; -- Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; -+ Message[ russian ] = " \"StarMath\" !\n %PRODUCTNAME Math ...\n %PRODUCTNAME Math."; - Message[ polish ] = "Czcionka \"StarMath\" nie jest zainstalowana!\nBez tej czcionki %PRODUCTNAME Math nie moe poprawnie pracowa...\nZainstaluj t czcionk i uruchom %PRODUCTNAME Math ponownie."; - Message[ japanese ] = "\"StarMath\" フォントがインストールされていません｡\nこのフォントなしでは %PRODUCTNAME Math がうまく機能しません...\nまずフォントをインストールして %PRODUCTNAME Math を再起動してください。"; - Message[ chinese_traditional ] = "沒有安裝 StarMath 字型\n而無法正常運行！\n請安裝 StarMath 字型，然后再重新開啟 StaMath。"; -diff -ur ../svtools/source/control/ctrltool.src ../svtools/source/control/ctrltool.src ---- ../svtools/source/control/ctrltool.src Wed Apr 3 16:13:31 2002 -+++ ../svtools/source/control/ctrltool.src Fri Apr 5 17:44:53 2002 -@@ -376,7 +376,7 @@ - TEXT [ English ] = "This font size is not installed. The closest available size will be used." ; - TEXT[ english_us ] = "This font size has not been installed. The closest available size will be used."; - TEXT[ portuguese ] = "Este tamanho de letra no est instalado. Ser utilizado o tamanho disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ."; - TEXT[ dutch ] = "Deze schriftgrootte is niet genstalleerd. De meest passende voorhanden zijnde grootte wordt toegepast."; - TEXT[ french ] = "Cette taille de police n'a pas t installe. La taille disponible la plus approprie va tre utilise."; -@@ -429,7 +429,7 @@ - TEXT [ English ] = "This font is not installed. The closest available font will be used." ; - TEXT[ english_us ] = "This font has not been installed. The closest available font will be used."; - TEXT[ portuguese ] = "Este tipo de letra no est instalado. Ser utilizado o tipo de letra disponvel mais adequado."; -- TEXT[ russian ] = " . ."; -+ TEXT[ russian ] = " . ."; - TEXT[ greek ] = " . ( ) ."; - TEXT[ dutch ] = "Dit lettertype is niet genstalleerd. Het meest overeenkomende voorhanden zijnde type wordt gebruikt."; - TEXT[ french ] = "Ce type de police n'a pas t install. Le type de police le plus appropri va tre utilis."; -diff -ur ../svtools/source/misc/errtxt.src ../svtools/source/misc/errtxt.src ---- ../svtools/source/misc/errtxt.src Wed Apr 3 16:13:33 2002 -+++ ../svtools/source/misc/errtxt.src Fri Apr 5 17:44:20 2002 -@@ -2836,7 +2836,7 @@ - Text [ dutch ] = "Om een channel te installeren heeft u een abonnementenmap nodig."; - Text [ spanish ] = "Para instalar un canal necesita una carpeta de suscripciones."; - Text[ chinese_simplified ] = "如果要安装频道，您就需要先创建一个订阅文件夹。"; -- Text[ russian ] = " Channel ."; -+ Text[ russian ] = " Channel ."; - Text[ polish ] = "Instalacja kanau wymaga utworzenia folderu subkrypcji."; - Text[ japanese ] = "チャンネルをインストールするには購読フォルダが必要です。"; - Text[ chinese_traditional ] = "如果要安裝頻道﹐您就需要建立一個訂閱資料夾"; -diff -ur ../svx/source/dialog/lingu.src ../svx/source/dialog/lingu.src ---- ../svx/source/dialog/lingu.src Wed Apr 3 16:10:44 2002 -+++ ../svx/source/dialog/lingu.src Fri Apr 5 19:04:25 2002 -@@ -402,7 +402,7 @@ - TEXT [ spanish ] = "no est disponible para la revisin ortogrfica.\nRevise su instalacin e instale,\nsi es necesario, el idioma deseado" ; - TEXT [ english_us ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = " 无法提供拼写检查功能。请检查安装的程序，如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "jest niedostpne do sprawdzania. \nProsz sprawdzi instalacj i zainstalowa \n ewentualnie potrzebny jzyk."; - TEXT[ japanese ] = "はスペルチェックに使用できません。\nプログラムのインストールをチェックして\n必要ならばその言語をインストールしてください。"; - TEXT[ chinese_traditional ] = " 無法提供拼寫檢查功能。\n請檢查安裝的程式﹐若有必要﹐\n請您安裝要使用的語言版本。"; -@@ -489,7 +489,7 @@ - TEXT [ spanish ] = "No existe un diccionario de sinnimos para el idioma seleccionado. \nCompruebe por favor su instalacin\n e instale, si es necesario, el idioma deseado" ; - TEXT [ english_us ] = "No thesaurus is available for the selected language. \nPlease check your installation and install the desired language\n" ; - TEXT[ chinese_simplified ] = "您设定的语言没有附加同义词词典功能。\n请您检查的安装程序。\n如有必要，请您安装要使用的语言版本。"; -- TEXT[ russian ] = " . \n, , \n "; -+ TEXT[ russian ] = " . \n, , \n "; - TEXT[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka. \nProsz sprawdzi instalacj i zainstalowa \newentualnie potrzebny jzyk."; - TEXT[ japanese ] = "選択した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、\n必要ならば、希望の言語をインストールしてください。"; - TEXT[ chinese_traditional ] = "您設定的語言版本沒有附加同義詞詞典功能。\n請您檢查安裝的程式。\n若有必要﹐請您安裝要使用的語言版本。"; -diff -ur ../svx/source/items/svxerr.src ../svx/source/items/svxerr.src ---- ../svx/source/items/svxerr.src Wed Apr 3 16:10:47 2002 -+++ ../svx/source/items/svxerr.src Fri Apr 5 19:03:00 2002 -@@ -263,7 +263,7 @@ - Text [ portuguese ] = "O dicionrio de sinnimos no se encontra disponvel para a lngua especificada.\nConfira a sua instalao e, se necessrio, instale a lngua desejada." ; - Text [ portuguese_brazilian ] = "Ein Thesaurus f? die eingestellte Sprache ist nicht verf?bar.\n?berpr?en Sie bitte Ihre Installation und installieren Sie gegebenenfalls die gew?schte Sprache" ; - Text[ chinese_simplified ] = "您所设定的语言没有相应的同义词词典。\n请您检查安装，如有必要，请您安装所要使用的语言版本。"; -- Text[ russian ] = " .\n, . , , "; -+ Text[ russian ] = " .\n, . , , "; - Text[ polish ] = "Tezaurus jest niedostpny dla wybranego jzyka.\nProsz sprawdzi instalacj i zainstalowa potrzebny jzyk."; - Text[ japanese ] = "設定した言語で類語辞典は使用できません。\nプログラムのインストールをチェックして、必要ならば希望の言語をインストールしてください。"; - Text[ chinese_traditional ] = "您所設定的語言沒有相應的同義詞詞典。\n請您檢查安裝﹐若有必要﹐請安裝所要使用的語言版本。"; -@@ -283,7 +283,7 @@ - TEXT [ English ] = "$(ARG1) is not available or is currently not active.\nPlease check your installation and install the desired language\nor activate in 'Tools - Options - Language Settings - Writing Aids' the desired module." ; - TEXT[ english_us ] = "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options - Language Settings - Writing Aids'."; - TEXT[ portuguese ] = "$(ARG1) no tem suporte para verificao ortogrfica ou encontra-se desactivado. \nConfira a sua instalao e, se necessrio, instale o mdulo lingustico desejado\nou ento active-o em 'Ferramentas - Opes - Configurao da lngua - Lingustica'."; -- TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; -+ TEXT[ russian ] = "$(ARG1) .\n , , \n ' - - - '."; - TEXT[ greek ] = "$(ARG1) .\n ? "; - TEXT[ dutch ] = "$(ARG1) wordt niet ondersteund door de controle, resp. is momenteel niet geactiveerd. \nControleer uw installatie en installeer eventueel de gewenste taalmodule\nresp. activeer de betreffende taalmodule onder 'Extra - Opties - Taalinstellingen - Lingustiek' "; - TEXT[ french ] = "$(ARG1) n'est pas support par la vrification ou n'est actuellement pas actif.\nVrifiez l'installation et installez le cas chant le module de langue requis, ou activez-le sous 'Outils - Options - Paramtres linguistiques - Linguistique'."; -diff -ur ../sw/source/ui/envelp/envelp.src ../sw/source/ui/envelp/envelp.src ---- ../sw/source/ui/envelp/envelp.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envelp.src Fri Apr 5 17:46:34 2002 -@@ -109,7 +109,7 @@ - Text [ spanish ] = "No se han instalado controladores de bases de datos." ; - Text [ english_us ] = "No database drivers installed." ; - Text[ chinese_simplified ] = "没有安装数据库驱动程序。"; -- Text[ russian ] = " ."; -+ Text[ russian ] = " ."; - Text[ polish ] = "Nie zainstalowany sterownik bazy danych."; - Text[ japanese ] = "データベースドラバがインストールされていません。"; - Text[ chinese_traditional ] = "沒有安裝資料庫驅動程式。"; -diff -ur ../sw/source/ui/envelp/envprt.src ../sw/source/ui/envelp/envprt.src ---- ../sw/source/ui/envelp/envprt.src Wed Apr 3 16:12:26 2002 -+++ ../sw/source/ui/envelp/envprt.src Fri Apr 5 17:46:48 2002 -@@ -335,7 +335,7 @@ - Text [ PORTUGUESE ] = "- Nenhuma impressora instalada -" ; - Left = TRUE ; - Text[ chinese_simplified ] = "- 没有安装打印机 -"; -- Text[ russian ] = "- -"; -+ Text[ russian ] = "- -"; - Text[ polish ] = "- Drukarka nie jest zainstalowana -"; - Text[ japanese ] = "- プリンタがインストールされていません -"; - Text[ chinese_traditional ] = "- 沒有安裝印表機 -"; -diff -ur ../sysui/unix/office/cde/group.lng ../sysui/unix/office/cde/group.lng ---- ../sysui/unix/office/cde/group.lng Wed Apr 3 16:15:07 2002 -+++ ../sysui/unix/office/cde/group.lng Fri Apr 5 17:40:12 2002 -@@ -52,7 +52,7 @@ - 01 = "Information and Setup" - 49 = "Information und Setup" - 0 = "Informacja i instalacja" --7 = " " -+7 = " " - 55 = "Information und Setup" - 37 = "Information und Setup" - 03 = "Informao e instalao" -@@ -71,7 +71,7 @@ - 88 = "資訊和安裝程式" - 90 = "Information und Setup" - 96 = "Information und Setup" --07 = " " -+07 = " " - - [<template_control_label>] - 01 = "From Template" -@@ -102,7 +102,7 @@ - 01 = "%PRODUCTNAME Setup" - 49 = "%PRODUCTNAME Setup" - 0 = "Instalacja %PRODUCTNAME" --7 = " %PRODUCTNAME" -+7 = " %PRODUCTNAME" - 55 = "%PRODUCTNAME Setup" - 37 = "%PRODUCTNAME Configuraci" - 03 = "%PRODUCTNAME Setup" -@@ -121,7 +121,7 @@ - 88 = "%PRODUCTNAME 安裝程式" - 90 = "%PRODUCTNAME Setup" - 96 = " %PRODUCTNAME " --07 = " %PRODUCTNAME" -+07 = " %PRODUCTNAME" - - [<printeradmin_action_label>] - 01 = "%PRODUCTNAME Printer Administration" -diff -ur ../uui/source/ids.src ../uui/source/ids.src ---- ../uui/source/ids.src Wed Apr 3 16:12:58 2002 -+++ ../uui/source/ids.src Fri Apr 5 17:45:53 2002 -@@ -1117,7 +1117,7 @@ - Text[english] = "The installed Java version is not supported"; - Text[ english_us ] = "The installed Java version is not supported"; - Text[ portuguese ] = "A verso Java instalada no tem suporte."; -- Text[ russian ] = " Java ."; -+ Text[ russian ] = " Java ."; - Text[ greek ] = "The installed Java version is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund"; - Text[ french ] = "La version de Java installe n'est pas supporte."; -@@ -1143,7 +1143,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte."; -- Text[ russian ] = " Java $(ARG1) ."; -+ Text[ russian ] = " Java $(ARG1) ."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte."; -@@ -1168,7 +1168,7 @@ - Text[english] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ english_us ] = "The installed Java version is not supported, at least version $(ARG1) is required"; - Text[ portuguese ] = "A verso Java instalada no tem suporte. Verso mnima necessria: $(ARG1)"; -- Text[ russian ] = " Java . , $(ARG1)."; -+ Text[ russian ] = " Java . , $(ARG1)."; - Text[ greek ] = "The installed Java version is not supported, at least versin $(ARG1) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie wordt niet ondersteund. Minstens versie $(ARG1) wordt benodigd"; - Text[ french ] = "La version de Java installe n'est pas supporte. Version minimum requise : $(ARG1)."; -@@ -1194,7 +1194,7 @@ - Text[english] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ english_us ] = "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required"; - Text[ portuguese ] = "A verso Java instalada $(ARG1) no tem suporte. Verso mnima necessria: $(ARG2)"; -- Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; -+ Text[ russian ] = " Java $(ARG1) . , $(ARG2)."; - Text[ greek ] = "The installed Java version $(ARG1) is not supported, at least versin $(ARG2) is required"; - Text[ dutch ] = "De voorhanden zijnde Java versie $(ARG1) wordt niet ondersteund. Minstens versie $(ARG2) wordt benodigd"; - Text[ french ] = "La version Java $(ARG1) installe n'est pas supporte. Version minimum requise : $(ARG2)."; -diff -ur ../vcl/source/src/stdtext.src ../vcl/source/src/stdtext.src ---- ../vcl/source/src/stdtext.src Wed Apr 3 16:10:54 2002 -+++ ../vcl/source/src/stdtext.src Fri Apr 5 19:02:38 2002 -@@ -71,7 +71,7 @@ - Text [ English ] = "The component (%s) could not be loaded.\nPlease start setup in repair mode." ; - Text[ english_us ] = "The component (%s) could not be loaded.\nPlease start setup with the repair option."; - Text[ portuguese ] = "Impossvel carregar o componente (%s).\nReinicie o setup com a opo 'Reparao'."; -- Text[ russian ] = " (%s) .\n ."; -+ Text[ russian ] = " (%s) .\n ."; - Text[ dutch ] = "Een component (%s) kon niet worden geladen.\nStart setup opnieuw met de optie Reparatie."; - Text[ french ] = "Impossible de charger l'un des composants (%s).\nVeuillez redmarrer le programme d'installation (Setup) et excuter une rparation."; - Text[ spanish ] = "No se pudo cargar un componente (%s).\nInicie por favor el programa de instalacin y ejecute una Reparacin."; -diff -ur ../wizards/source/formwizard/dbwizres.src ../wizards/source/formwizard/dbwizres.src ---- ../wizards/source/formwizard/dbwizres.src Wed Apr 3 16:11:48 2002 -+++ ../wizards/source/formwizard/dbwizres.src Fri Apr 5 17:48:56 2002 -@@ -283,7 +283,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Formulare starten zu knnen."; - Text [ english_us] = "No database has been installed. At least one database is required before the AutoPilot for forms can be started."; - Text[ portuguese ] = "Nenhuma base de dados instalada. Para poder activar o AutoPiloto de formulrios necessria, pelo menos, uma base de dados."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft minstens n database nodig om de AutoPiloot voor formulieren te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de formulaire."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para formularios."; -@@ -2675,7 +2675,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Abfragen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for queries."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para consultas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor query's te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de requte."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para consultas."; -@@ -3605,7 +3605,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mindestens eine Datenbank um den AutoPiloten fr Berichte starten zu knnen."; - Text [ english_us ] = "A database has not been installed. There must be at least one database on the system so that the AutoPilot Report can be started."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para poder iniciar o AutoPiloto para relatrios."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft tenminste n database nodig om de autopiloot voor berichten te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote d'tats."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para informes."; -@@ -4609,7 +4609,7 @@ - Text = "Es ist keine Datenbank installiert. Sie bentigen mind. eine Datenbank um den AutoPiloten fr Tabellen starten zu knnen."; - Text [ english_us ] = "There is no database installed. You need at least one database to start the AutoPilot for tables."; - Text[ portuguese ] = "No existe nenhuma base de dados instalada. necessria pelo menos uma base de dados para iniciar o AutoPiloto para tabelas."; -- Text[ russian ] = " . ."; -+ Text[ russian ] = " . ."; - Text[ dutch ] = "Er is geen database genstalleerd. U heeft ten minste n database nodig om de autopiloot voor tabellen te kunnen starten."; - Text[ french ] = "Aucune base de donnes n'est installe. Vous avez besoin d'au moins une base de donnes afin de pouvoir lancer l'AutoPilote de table."; - Text[ spanish ] = "No hay ninguna base de datos instalada. Necesita al menos una base de datos para poder iniciar el AutoPiloto para tablas."; |