[Krusader-commits] krusader_kde3/admin cvs.sh,1.5,1.6

[Dirk E. <des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4247/admin

Modified Files:
	cvs.sh 
Log Message:
Removed the -x option from xgettext-kde call in extract_messages(). Prevents inheritance of probably untranslated or badly translated KDE strings and fixes "[ 1217183 ] Cannot translate 'Delete' in right context menu".

Index: cvs.sh
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/admin/cvs.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cvs.sh	18 Aug 2005 20:00:53 -0000	1.5
--- cvs.sh	23 Aug 2005 11:33:09 -0000	1.6
***************
*** 552,559 ****
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
-    kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
- 
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
! 	XGETTEXT="${XGETTEXT:-xgettext-kde} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
     exit_code=$?
     if test "$exit_code" != 0; then
--- 552,557 ----
     perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
  
     $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
! 	XGETTEXT="${XGETTEXT:-xgettext-kde} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale" messages
     exit_code=$?
     if test "$exit_code" != 0; then