Update debconf translations and document changes

diff --git a/debian/changelog b/debian/changelog
index 6c38c548191c969f5ce6c3ab8893b6a28a617253..fb95b37aa1c792db0bd29a44aef777b02841235a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 openafs (1.2.10-2) unstable; urgency=low
 
   * New Brazilian Portuguese (pt_BR) translations, Closes: #208035
+  * Don't conflict with ircd, Closes: #204865
+  * Fix wording of question about using dynroot, Closes: #209332
+  * New French debconf translations, sorry about the delay in including these, Closes: #203608
+  * Avoid yes/no construction in openafs-client templates, Closes: #198476
 
  --
 

diff --git a/debian/control b/debian/control
index cf6bb35ce631f9163c31fa3f1f84e4a42c390468..1d8fe0e0a85a92e9cf570f27bcba9dca3d94a44f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,6 @@ Description: The AFS distributed filesystem- old password changing
 Package: openafs-fileserver
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa
 Depends: ${shlibs:Depends}, debconf, openafs-client (= ${Source-Version})
-Conflicts: ircd
 Recommends: ntp
 Description: The AFS distributed filesystem- file server
  AFS is a distributed filesystem allowing cross-platform sharing of

diff --git a/debian/openafs-client.templates b/debian/openafs-client.templates
index 75628789c5e21710342e5bcd130fad8b7c0d93e6..58c81268e39cbbcc9c1b6f743185638a188352dc 100644 (file)
--- a/debian/openafs-client.templates
+++ b/debian/openafs-client.templates
@@ -35,8 +35,9 @@ _Description: Run Openafs client now and at boot?
  Should the Openafs filesystem be started and mounted at boot? Normally,
  most users who install the openafs-client package expect to run it at
  boot.  However, if you are planning on setting up a new cell or are on a
- laptop, you may not want it started at boot time. If you answer no to this
- question, run /etc/init.d/openafs-client force-start to run.
+ laptop, you may not want it started at boot time. If you choose not
+ to start AFS at boot , run /etc/init.d/openafs-client force-start  to
+ start the client when you wish to run it.
 
 Template: openafs-client/afsdb
 Type: boolean
@@ -69,7 +70,7 @@ _Description: Dynamically generate the contents of /afs?
  .
  If you generate /afs dynamically, you may need to create
  /etc/openafs/CellAlias to include aliases for common cells. DO NOT SELECT
- THIS OPTION IF YOU ARE CREATING A NEW CELL.
+ tHIS OPTION if this machine is the first database server in a new cell .
 
 Template: openafs-client/fakestat
 Type: boolean

diff --git a/debian/po/fr.po b/debian/po/fr.po
index a23f20e7c72ffa3a0c572cd62496d8fb32c78716..425102a3fddac056bc627d30099a84b455e7dc74 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openafs 1.2.9-2\n"
 "POT-Creation-Date: 2003-07-26 17:26-0400\n"
-"PO-Revision-Date: 2003-06-24 10:08+0200\n"
+"PO-Revision-Date: 2003-07-31 10:36+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,6 @@ msgstr "
 
 #. Description
 #: ../openafs-client.templates:16
-#, fuzzy
 msgid ""
 "AFS filespace is organized into cells or administrative domains. Each "
 "workstation belongs to one cell.  Usually the cell is the DNS domain name of "
@@ -78,7 +77,6 @@ msgstr "Quelle est la taille de votre cache pour AFS (en kilo-octets)
 
 #. Description
 #: ../openafs-client.templates:24
-#, fuzzy
 msgid ""
 "AFS uses a  area of the disk to cache remote files for faster access.  This "
 "cache will be mounted on /var/cache/openafs.  It is important that the cache "
@@ -135,7 +133,6 @@ msgstr ""
 
 #. Description
 #: ../openafs-client.templates:54
-#, fuzzy
 msgid "Encrypt authenticated traffic with AFS fileserver?"
 msgstr ""
 "Faut-il chiffrer le trafic authentifié avec le serveur de fichiers AFS ?"
@@ -269,6 +266,3 @@ msgstr ""
 "est probable que le serveur refusera tout simplement de démarrer. Cependant, "
 "s'il démarre quand même, des corruptions de données peuvent avoir lieu. Vous "
 "voilà prévenu."
-
-#~ msgid "50000"
-#~ msgstr "50000"