[Pkg-tcltk-commits] r1044 - in openacs/trunk/debian: . patches po
geox-guest at alioth.debian.org
geox-guest at alioth.debian.org
Wed May 19 11:26:09 UTC 2010
Author: geox-guest
Date: 2010-05-19 11:26:01 +0000 (Wed, 19 May 2010)
New Revision: 1044
Added:
openacs/trunk/debian/patches/interpreters-bashisms.dpatch
Modified:
openacs/trunk/debian/changelog
openacs/trunk/debian/patches/00list
openacs/trunk/debian/po/es.po
Log:
- Fixed bashisms
- Updated translations
Modified: openacs/trunk/debian/changelog
===================================================================
--- openacs/trunk/debian/changelog 2010-05-19 11:25:40 UTC (rev 1043)
+++ openacs/trunk/debian/changelog 2010-05-19 11:26:01 UTC (rev 1044)
@@ -1,3 +1,11 @@
+openacs (5.5.1-4) unstable; urgency=low
+
+ * Updated translations:
+ - Spanish. Closes: #579512
+ * Fixed bashisms. Closes: #581133
+
+ -- Hector Romojaro <hromojaro at dia.uned.es> Tue, 11 May 2010 09:57:30 +0200
+
openacs (5.5.1-3) unstable; urgency=low
* Updated standards to 3.8.4 (no changes required)
Modified: openacs/trunk/debian/patches/00list
===================================================================
--- openacs/trunk/debian/patches/00list 2010-05-19 11:25:40 UTC (rev 1043)
+++ openacs/trunk/debian/patches/00list 2010-05-19 11:26:01 UTC (rev 1044)
@@ -1,4 +1,5 @@
config.dpatch
interpreters-path.dpatch
+interpreters-bashisms.dpatch
install.dpatch
xinha-iconset.dpatch
Added: openacs/trunk/debian/patches/interpreters-bashisms.dpatch
===================================================================
--- openacs/trunk/debian/patches/interpreters-bashisms.dpatch (rev 0)
+++ openacs/trunk/debian/patches/interpreters-bashisms.dpatch 2010-05-19 11:26:01 UTC (rev 1044)
@@ -0,0 +1,133 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## interpreters-bashisms.dpatch by Hector Romojaro <hromojaro at dia.uned.es>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/functions.sh trunk/etc/install/functions.sh
+--- trunk~/etc/install/functions.sh 2004-04-25 11:32:27.000000000 +0200
++++ trunk/etc/install/functions.sh 2010-05-19 13:03:51.000000000 +0200
+@@ -23,10 +23,10 @@
+
+ interactive=$1
+
+- if [ "$interactive" == "yes" ]; then
++ if [ "$interactive" = "yes" ]; then
+ echo "Continue? (y/n)"
+ read continue
+- if [ "$continue" == "n" ]; then
++ if [ "$continue" = "n" ]; then
+ echo "$0: exiting on users request"
+ exit
+ fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/install-and-alert.sh trunk/etc/install/install-and-alert.sh
+--- trunk~/etc/install/install-and-alert.sh 2003-11-04 15:39:04.000000000 +0100
++++ trunk/etc/install/install-and-alert.sh 2010-05-19 13:13:13.000000000 +0200
+@@ -12,11 +12,11 @@
+ script_path=$(dirname $(which $0))
+ cd $script_path
+
+-source ./functions.sh
++. ./functions.sh
+
+ # Get a proper environment set up
+ if [ -f ~/.bashrc ]; then
+- source ~/.bashrc
++ . ~/.bashrc
+ fi
+
+ # Look for two-part command line arguments
+@@ -28,20 +28,20 @@
+ server_overridden="no"
+ for arg in "$@"
+ do
+- if [ $config_val_next == "1" ]; then
++ if [ $config_val_next = "1" ]; then
+ export config_file=$arg
+ config_val_next=0
+ fi
+- if [ $server_next == "1" ]; then
++ if [ $server_next = "1" ]; then
+ # Overrides server setting in config file
+ export server=$arg
+ server_next=0
+ server_overridden="yes"
+ fi
+- if [ $arg == "--config-file" ]; then
++ if [ $arg = "--config-file" ]; then
+ config_val_next=1
+ fi
+- if [ $arg == "--server" ]; then
++ if [ $arg = "--server" ]; then
+ server_next=1
+ fi
+ done
+@@ -62,7 +62,7 @@
+ mkdir -p $output_dir
+ fi
+ installation_output_file="${output_dir}/installation-output"
+-./install.sh $@ &> $installation_output_file
++./install.sh $@ >$installation_output_file 2>&1
+
+ # Get lines with alert keywords or lines with failed TclWebtest tests
+ error_lines=$(egrep -i "(FAILED: .+\.test)|($alert_keyword)" $installation_output_file)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/server-output/service0/installation-output trunk/etc/install/server-output/service0/installation-output
+--- trunk~/etc/install/server-output/service0/installation-output 1970-01-01 01:00:00.000000000 +0100
++++ trunk/etc/install/server-output/service0/installation-output 2010-05-19 13:13:22.000000000 +0200
+@@ -0,0 +1 @@
++mié may 19 13:13:22 CEST 2010: You must execute this script as root; exiting
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/etc/install/warn-if-installation-errors.sh trunk/etc/install/warn-if-installation-errors.sh
+--- trunk~/etc/install/warn-if-installation-errors.sh 2003-11-04 15:39:04.000000000 +0100
++++ trunk/etc/install/warn-if-installation-errors.sh 2010-05-19 12:59:40.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ file_name=$1
+
+-source ./functions.sh
++. ./functions.sh
+
+ alert_keyword=`get_config_param alert_keyword`
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/check-catalog.sh trunk/packages/acs-lang/bin/check-catalog.sh
+--- trunk~/packages/acs-lang/bin/check-catalog.sh 2003-10-30 14:10:53.000000000 +0100
++++ trunk/packages/acs-lang/bin/check-catalog.sh 2010-05-19 12:57:02.000000000 +0200
+@@ -34,7 +34,7 @@
+ export script_path=$(dirname $(which $0))
+
+ ### Functions start
+-source ${script_path}/functions.sh
++. ${script_path}/functions.sh
+
+ get_date_time_key() {
+ message_key=$1
+@@ -72,7 +72,7 @@
+ do
+ catalog_package_version=$(cat $catalog_file | ${script_path}/mygrep '<message_catalog .*package_version="([^"]+)"')
+
+- if [ ! "$info_file_package_version" == "$catalog_package_version" ]; then
++ if [ ! "$info_file_package_version" = "$catalog_package_version" ]; then
+ echo "$0: $package_key - Warning: package version $catalog_package_version in file $catalog_file does not equal version $info_file_package_version in info file."
+ fi
+ done
+@@ -152,7 +152,7 @@
+ find_dirs="$packages_dir ${packages_dir}../www"
+
+ # Process arguments
+-if [ "$#" == "0" ]; then
++if [ "$#" = "0" ]; then
+ # No package provided - check all packages
+ for catalog_dir in $(find $package_dir -iname catalog -type d)
+ do
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/packages/acs-lang/bin/list-keys.sh trunk/packages/acs-lang/bin/list-keys.sh
+--- trunk~/packages/acs-lang/bin/list-keys.sh 2003-10-31 13:58:29.000000000 +0100
++++ trunk/packages/acs-lang/bin/list-keys.sh 2010-05-19 12:58:25.000000000 +0200
+@@ -5,7 +5,7 @@
+ # @author Peter Marklund
+
+ export script_path=$(dirname $(which $0))
+-source ${script_path}/functions.sh
++. ${script_path}/functions.sh
+
+ for en_us_file in $(find_en_us_files)
+ do
Property changes on: openacs/trunk/debian/patches/interpreters-bashisms.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: openacs/trunk/debian/po/es.po
===================================================================
--- openacs/trunk/debian/po/es.po 2010-05-19 11:25:40 UTC (rev 1043)
+++ openacs/trunk/debian/po/es.po 2010-05-19 11:26:01 UTC (rev 1044)
@@ -1,208 +1,164 @@
+# openacs po-debconf translation to Spanish
+# Copyright (C) 2005, 206, 2010 Software in the Public Interest
+# This file is distributed under the same license as the openacs package.
#
-# dbconfig-common translation to spanish
-# Copyright (C) 2005 Software in the Public Interest, SPI Inc.
-# This file is distributed under the same license as the dbconfig-common
-# package.
-#
# Changes:
-# - Initial translation
-# Javier Fernández-Sanguino, 2005
-# - Revision
-# Javier Fernandez-Sanguino, 2006
+# - Initial translation
+# Javier Fernández-Sanguino <jfs at debian.org>, 2005, 2006
#
+# - Updates
+# Francisco Javier Cuadrado <fcocuadrado at gmail.com>, 2010
#
-# Traductores, si no conoce el formato PO, merece la pena leer la
-# documentación de gettext, especialmente las secciones dedicadas a este
-# formato, por ejemplo ejecutando:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
#
-# Equipo de traducción al español, por favor lean antes de traducir
+# Equipo de traducción al español, por favor lean antes de traducir
# los siguientes documentos:
#
-# - El proyecto de traducción de Debian al español
-# http://www.debian.org/intl/spanish/coordinacion
-# especialmente las notas y normas de traducción en
-# http://www.debian.org/intl/spanish/notas
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
#
-# - La guía de traducción de po's de debconf:
-# /usr/share/doc/po-debconf/README-trans
-# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+# - La guÃa de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
#
-# Si tiene dudas o consultas sobre esta traducción consulte con el último
-# traductor (campo Last-Translator) y ponga en copia a la lista de
-# traducción de Debian al español (<debian-l10n-spanish at lists.debian.org>)
-#
msgid ""
msgstr ""
-"Project-Id-Version: dbconfig-common\n"
+"Project-Id-Version: openacs 5.5.1-2\n"
"Report-Msgid-Bugs-To: openacs @packages.debian.org\n"
"POT-Creation-Date: 2010-01-07 17:01+0100\n"
-"PO-Revision-Date: 2006-10-07 10:21+0200\n"
-"Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
-"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"PO-Revision-Date: 2010-04-14 09:50+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: string
#. Description
#: ../templates:1001
-#, fuzzy
#| msgid "Host running the PostgreSQL server for ${pkg}:"
msgid "Host running the PostgreSQL server for OpenACS:"
-msgstr "Servidor dónde se ejecuta el servidor PostgreSQL para ${pkg}:"
+msgstr "Máquina que ejecuta el servidor de PostgreSQL para OpenACS:"
#. Type: string
#. Description
#: ../templates:1001
-#, fuzzy
#| msgid "Please provide the hostname of remote PostgreSQL server."
msgid "Please provide the hostname of a remote PostgreSQL server."
-msgstr ""
-"Por favor, indique el nombre del servidor que tiene el servidor remoto "
-"PostgreSQL."
+msgstr "Introduzca el nombre de la máquina del servidor remoto de PostgreSQL."
#. Type: string
#. Description
#: ../templates:1001
-#, fuzzy
#| msgid ""
#| "Note: you must have already arranged for the administrative account to be "
#| "able to remotely create databases and grant privileges."
-msgid ""
-"You must have already arranged for the administrative account to be able to "
-"remotely create databases and grant privileges."
-msgstr ""
-"Nota: Debe haber configurado la cuenta de administración de forma que pueda "
-"crear de forma remota base de datos y asignar privilegios."
+msgid "You must have already arranged for the administrative account to be able to remotely create databases and grant privileges."
+msgstr "Debe haber configurado la cuenta de administración de forma que pueda crear de forma remota bases de datos y asignar privilegios."
#. Type: string
#. Description
#: ../templates:2001
-#, fuzzy
#| msgid "Name of your database's administrative user:"
msgid "Database administrator username:"
-msgstr "Nombre del usuario de administración de base de datos:"
+msgstr "Nombre del usuario del administrador de la base de datos:"
#. Type: string
#. Description
#: ../templates:2001
-msgid ""
-"Please enter the PostgreSQL administrator username, needed for the database "
-"creation."
-msgstr ""
+msgid "Please enter the PostgreSQL administrator username, needed for the database creation."
+msgstr "Introduzca el nombre del usuario del administrador de PostgreSQL, necesario para la creación de la base de datos."
#. Type: password
#. Description
#: ../templates:3001
-#, fuzzy
#| msgid "Name of your database's administrative user:"
msgid "Database administrator password:"
-msgstr "Nombre del usuario de administración de base de datos:"
+msgstr "Contraseña del administrador de la base de datos:"
#. Type: password
#. Description
#: ../templates:3001
-msgid ""
-"Please enter the PostgreSQL administrator password, needed for the database "
-"creation."
-msgstr ""
+msgid "Please enter the PostgreSQL administrator password, needed for the database creation."
+msgstr "Introduzca la contraseña del administrador de PostgreSQL, necesaria para la creación de la base de datos."
#. Type: note
#. Description
#: ../templates:4001
-#, fuzzy
#| msgid "Passwords do not match."
msgid "Password mismatch"
-msgstr "Las contraseñas no coinciden."
+msgstr "Las contraseñas no coinciden."
#. Type: note
#. Description
#: ../templates:4001
-#, fuzzy
#| msgid "The passwords you supplied do not match. Please try again."
-msgid ""
-"The two passwords you entered were not the same. Please enter a password "
-"again."
-msgstr ""
-"Las contraseñas que ha proporcionado no coinciden. Por favor, inténtelo de "
-"nuevo."
+msgid "The two passwords you entered were not the same. Please enter a password again."
+msgstr "Las contraseñas que ha introducido no coinciden. Por favor, inténtelo de nuevo."
#. Type: string
#. Description
#: ../templates:5001
-#, fuzzy
#| msgid "MySQL database name for ${pkg}:"
msgid "Database username for OpenACS:"
-msgstr "Nombre de la base de datos MySQL para ${pkg}:"
+msgstr "Nombre del usuario de la base de datos para OpenACS:"
#. Type: string
#. Description
#: ../templates:5001
-#, fuzzy
#| msgid ""
#| "Please provide a MySQL username for ${pkg} to register with the database "
#| "server. A MySQL user is not necessarily the same as a system login, "
#| "especially if the database is on a remote server."
-msgid ""
-"Please provide a PostgreSQL username for OpenACS to register with the "
-"database server. A PostgreSQL user is not necessarily the same as a system "
-"login, especially if the database is on a remote server."
-msgstr ""
-"Por favor, indique el nombre de un usuario de MySQL para que ${pkg} se "
-"registre con el servidor de base de datos. El usuario MySQL no tiene por qué "
-"coincidir con un usuario local, en especial si la base de datos está en un "
-"servidor remoto."
+msgid "Please provide a PostgreSQL username for OpenACS to register with the database server. A PostgreSQL user is not necessarily the same as a system login, especially if the database is on a remote server."
+msgstr "Introduzca el nombre de un usuario de PostgreSQL para que OpenACS se registre con el servidor de la base de datos. El usuario de PostgreSQL no tiene por qué coincidir con un usuario local, en especial si la base de datos está en un servidor remoto."
#. Type: string
#. Description
#: ../templates:5001
-msgid ""
-"This is the user which will own the database, tables and other objects to be "
-"created by this installation. This user will have complete freedom to "
-"insert, change or delete data in the database."
-msgstr ""
-"Éste será el usuario al que pertenecerán la base de datos, las tablas y "
-"otros objetos que cree esta instalación. Este usuario debe tener permisos "
-"para insertar, crear y borrar datos en la base de datos."
+msgid "This is the user which will own the database, tables and other objects to be created by this installation. This user will have complete freedom to insert, change or delete data in the database."
+msgstr "Éste será el usuario al que pertenecerán la base de datos, las tablas y otros objetos que cree esta instalación. Este usuario debe tener permisos para insertar, cambiar y borrar datos en la base de datos."
#. Type: password
#. Description
#: ../templates:6001
msgid "Database owner password:"
-msgstr ""
+msgstr "Contraseña del dueño de la base de datos:"
#. Type: password
#. Description
#: ../templates:6001
msgid "Please enter the password of the OpenACS database owner."
-msgstr ""
+msgstr "Introduzca la contraseña del dueño de la base de datos de OpenACS."
#. Type: password
#. Description
#: ../templates:7001
-#, fuzzy
#| msgid "Password confirmation:"
msgid "Database owner password confirmation:"
-msgstr "Confirmación de contraseña:"
+msgstr "Confirmación de la contraseña del dueño de la base de datos:"
#. Type: password
#. Description
#: ../templates:7001
msgid "Please confirm the password of the OpenACS database owner."
-msgstr ""
+msgstr "Confirme la contraseña del dueño de la base de datos de OpenACS."
#. Type: boolean
#. Description
#: ../templates:8001
msgid "Grant PostgreSQL access to the OpenACS user?"
-msgstr ""
+msgstr "¿Desea conceder a PostgreSQL acceso al usuario de OpenACS?"
#. Type: boolean
#. Description
#: ../templates:8001
-msgid ""
-"Please specify whether /etc/postgresql/.../pg_hba.conf should allow the "
-"OpenACS user to access the database."
-msgstr ""
+msgid "Please specify whether /etc/postgresql/.../pg_hba.conf should allow the OpenACS user to access the database."
+msgstr "Especifique si «/etc/postgresql/.../pg_hba.conf» deberÃa permitir al usuario de OpenACS acceder a la base de datos."
+
More information about the Pkg-tcltk-commits
mailing list