[ooo-build-commit] Branch 'ooo-build-3-2' - 2 commits - bin/localize-ooo po/es.po

[Petr Mladek]

 bin/localize-ooo |   11 ++++-------
 po/es.po         |    4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 3f9a1cc814ad57733a9948bcc638996ba93393a2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 18 17:53:02 2010 +0100

    Spanish translations fix by Eduardo Moreno
    
    * po/es.po: added changes by Eduardo Moreno <emoreno at tokonhu dot com>

diff --git a/po/es.po b/po/es.po
index 9faed27..6e4e53d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -57,7 +57,7 @@ msgstr "OpenOffice.org Base"
 
 #: ../desktop/web.desktop.in.in.h:1
 msgid "Create and edit Web pages by using Writer."
-msgstr "Creee y edite páginas web usando Writer."
+msgstr "Cree y edite páginas web usando Writer."
 
 #: ../desktop/web.desktop.in.in.h:2
 msgid "OpenOffice.org Writer/Web"
@@ -85,7 +85,7 @@ msgstr "Hoja de cálculo"
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages by using Writer."
-msgstr "Creee y editee texto y gráficos de cartas, informes, documentos y páginas Web con Writer."
+msgstr "Cree y edite texto y gráficos de cartas, informes, documentos y páginas Web con Writer."
 
 #: ../desktop/writer.desktop.in.in.h:2
 msgid "OpenOffice.org Writer"
commit 90213bc89d1ffaa1c2e53a45f77ce26fcadaf44f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 18 17:43:25 2010 +0100

    Better way to ignore extra .sdf files below $SRCDIR/clone
    
    * bin/localize-ooo: use "-path $SRCDIR/clone -prune -o" to do not search the
      huge upstream sources for extra .sdf files at all

diff --git a/bin/localize-ooo b/bin/localize-ooo
index ced9b94..aa4e3c7 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -89,8 +89,9 @@ done
 
 # lang-specific sdf files
 # it looks for files "any-name-<lang>.sdf", e.g. "gallery-hu.sdf"
+# it ignores files below $SRCDIR/clone (upstream sources available when --with-git is used)
 hungarian_updated=
-for sdf_file in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -name "*.sdf"` ; do
+for sdf_file in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -path $SRCDIR/clone -prune -o -name "*.sdf"` ; do
 
     # check if it is lang-specific file
     echo "$sdf_file" | grep -q -f "$all_langs_pattern" || continue;
@@ -155,7 +156,8 @@ fi
 echo "Processing non language specific files:"
 # apply lang-non-specific sdf files
 # the files "any-name-<lang>.sdf" are ignored because they are already processed above
-for fn in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -name "*.sdf"` ; do
+# the files below $SRCDIR/clone are ignored because these is the copy of the upstream sources when --with-git is used
+for fn in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -path $SRCDIR/clone -prune -o -name "*.sdf"` ; do
     [ -f "$fn" ] || continue
     # skip if already processed as lang-specific files
     grep -q "^$fn$" $extra_trans_lang_list 2>/dev/null && continue;
@@ -164,11 +166,6 @@ for fn in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -name "*.sdf"` ;
     # skip sdf-templates
     echo "$fn" | grep -q "^$TOOLSDIR/po/sdf-templates" && continue;
     echo "$fn" | grep -q "^$TOOLSDIR/po/ooo-build.sdf" && continue;
-	# skip transex3/workbench files, they are not real sdf files
-	echo "$fn" | grep -q "^$SRCDIR/clone/libs-gui/transex3/workbench/" && continue;
-	echo "$fn" | grep -q "^$SRCDIR/clone/libs-gui/transex3/layout/" && continue;
-	# skip cloned files
-	echo "$fn" | grep -q "^$SRCDIR/clone/l10n/l10n/source/" && continue;
     # skip exotic localizations that are not in $ALL_LANGS and thus not detected
     echo "$fn" | grep -q "$SRCDIR/GSI" && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'_' -f2)" && continue;
     echo "$fn" | grep -q "$TOOLSDIR/po/ooo-build" && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f3)" && continue;