[Dbconfig-common-changes] dbconfig-common/debian changelog, 1.80, 1.81 dbconfig-common.templates, 1.25, 1.26

[bubulle at haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/debian
In directory haydn:/tmp/cvs-serv31853

Modified Files:
	changelog dbconfig-common.templates 
Log Message:
Make Choices translatable. #338342


Index: changelog
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/changelog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- changelog	7 Nov 2005 19:21:25 -0000	1.80
+++ changelog	9 Nov 2005 22:33:05 -0000	1.81
@@ -1,3 +1,10 @@
+dbconfig-common (1.8.8) UNRELEASED; urgency=low
+
+  * Make Choices translatable in debconf templates
+    Closes: #338342
+
+ -- Christian Perrier <bubulle at debian.org>  Wed,  9 Nov 2005 23:17:27 +0100
+
 dbconfig-common (1.8.7) unstable; urgency=low
 
   * Tobias Grimm noticed that internal/mysql/dbc_mysql_exec_file()

Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbconfig-common.templates	7 Nov 2005 19:21:25 -0000	1.25
+++ dbconfig-common.templates	9 Nov 2005 22:33:05 -0000	1.26
@@ -108,7 +108,7 @@
 
 Template: dbconfig-common/upgrade-error
 Type: select
-Choices: abort, retry, retry (skip questions)
+__Choices: abort, retry, retry (skip questions)
 Default: abort
 _Description: Error upgrading database for ${pkg}.  Retry?
  An error seems to have occurred while upgrading the database.
@@ -129,7 +129,7 @@
 
 Template: dbconfig-common/install-error
 Type: select
-Choices: abort, retry, retry (skip questions), ignore
+__Choices: abort, retry, retry (skip questions), ignore
 Default: abort
 _Description: Error installing database for ${pkg}.  Retry?
  An error seems to have occurred while installing the database.
@@ -149,7 +149,7 @@
 
 Template: dbconfig-common/remove-error
 Type: select
-Choices: abort, retry
+__Choices: abort, retry
 Default: abort
 _Description: Error removing database for ${pkg}.  Retry?
  An error seems to have occurred while removing the database.
@@ -213,7 +213,7 @@
 
 Template: dbconfig-common/mysql/method
 Type: select
-Choices: unix socket, tcp/ip
+__Choices: unix socket, tcp/ip
 Default: unix socket
 _Description: Connection method for MySQL database of ${pkg}:
  By default, ${pkg} will be configured to use a MySQL server
@@ -247,7 +247,7 @@
 
 Template: dbconfig-common/pgsql/method
 Type: select
-Choices: unix socket, tcp/ip, tcp/ip + ssl
+__Choices: unix socket, tcp/ip, tcp/ip + ssl
 Default: unix socket
 _Description: Connection method for PostgreSQL database of ${pkg}:
  By default, ${pkg} will be configured to use a PostgreSQL server
@@ -281,7 +281,7 @@
 
 Template: dbconfig-common/pgsql/authmethod-admin
 Type: select
-Choices: ident, password
+__Choices: ident, password
 Default: ident
 _Description: Method for authenticating PostgreSQL administrator:
  PostgreSQL servers provide several different mechanisms for authenticating
@@ -304,7 +304,7 @@
 
 Template: dbconfig-common/pgsql/authmethod-user
 Type: select
-Choices: ident, password
+__Choices: ident, password
 Default: ident
 _Description: Method for authenticating PostgreSQL user:
  PostgreSQL servers provide several different mechanisms for authenticating