Accepted lhm commit r14601

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14602 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
index bbbbbadf202cdcdc9b48333d1bf9a35d63c23b9f..bd0dbf2378487cd145e811132d5a08bcccd36a6b 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
+++ b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc
@@ -241,6 +241,7 @@ class debconf
   {
     $post_name= $data['post_name'];
     if (preg_match('/\$\{/', $data['Choices'])){
+       $data['Description'].= '<br><br><b>'._('This debconf question is dynamically generated during package installation and requires choosing between specific options which cannot be presented here. The entered text needs to be one of the valid choices in order to take effect.').'</b>';
       $result= $this->render_string($data);
     } else {
       $choices= "";
@@ -301,37 +302,36 @@ class debconf
     $post_name= $data['post_name'];
 
     if (preg_match('/\$\{/', $data['Choices'])){
-      $choices= array("Need to use some text...");
+      $result = $this->render_multiselect($data);
     } else {
       $choices= "";
       foreach (split(", ", $data['Choices']) as $choice){
         $choices[]= $choice;
       }
-    }
-
 
-    $result="
-      
-      <tr>
-      <td valign='top'>
-      <h2>".$data['Topic']."</h2>".$data['Description']."
-      </td>
-      <td  valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
-      ";
+      $result="
+        
+        <tr>
+        <td valign='top'>
+        <h2>".$data['Topic']."</h2>".$data['Description']."
+        </td>
+        <td  valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
+        ";
 
-    foreach($choices as $value){
-      if($data['Default'] == $value){
-        $result.="\n<input type='radio' name='".$post_name."' value='".htmlentities($value)."' checked >".htmlentities($value)."<br>";
-      }else{
-        $result.="\n<input type='radio' name='".$post_name."' value='".htmlentities($value)."'>".htmlentities($value)."<br>";
+      foreach($choices as $value){
+        if($data['Default'] == $value){
+          $result.="\n<input type='radio' name='".$post_name."' value='".htmlentities($value)."' checked >".htmlentities($value)."<br>";
+        }else{
+          $result.="\n<input type='radio' name='".$post_name."' value='".htmlentities($value)."'>".htmlentities($value)."<br>";
+        }
       }
-    }
 
-    $result.= "
-      
-      </td>
-      </tr>
-      ";
+      $result.= "
+        
+        </td>
+        </tr>
+        ";
+    }
 
     return ($result);
   }

diff --git a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
index 5f27bdb9101f68a93462bb3e16aeba1c04e880b4..2dc41a8da4514cc465cb01d73b1b4a0b3075641b 100644 (file)
--- a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2009-08-04 13:57+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -521,9 +521,9 @@ msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
-"Sie haben mehr als 3 primäre Partitionen bei gleichzeitiger Nutzung "
-"von logischen Partitionen in ihrer Konfiguration. Bitte "
-"prüfen Sie die Konfiguration."
+"Sie haben mehr als 3 primäre Partitionen bei gleichzeitiger Nutzung von "
+"logischen Partitionen in ihrer Konfiguration. Bitte prüfen Sie die "
+"Konfiguration."
 
 #: admin/fai/class_faiDiskEntry.inc:740
 msgid "Disk options"
@@ -1238,7 +1238,8 @@ msgstr "RAID-Arrays müssen mindestens zwei Partitionen enthalten!"
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
-"RAID 0 Arrays können nur in Kombination von zwei Partitionen realisiert werden!"
+"RAID 0 Arrays können nur in Kombination von zwei Partitionen realisiert "
+"werden!"
 
 #: admin/fai/class_faiPartitionTable.inc:781
 msgid "FAI partition table"
@@ -1735,6 +1736,18 @@ msgstr "Volume-Gruppe hinzufügen"
 msgid "This package has no debconf options."
 msgstr "Dieses Paket verfügt über keine debconf-Optionen."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+"Diese Debconf-Frage wird während der Paket-Installation automatisch "
+"generiert und erfordert die Auswahl aus Möglichkeiten, die hier nicht "
+"dargestellt werden können. Der angegebene Wert muss einer dieser gültigen "
+"Auswahlmöglichkeiten entsprechen."
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 msgid "List of configured repositories"
 msgstr "Liste der konfigurierten Repositorien"

diff --git a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
index 9a1a9e22d88ea71a911ff6f610ffcae0dd873478..b5cacb9ebd99a99da73f0c7a5602080ac0adda2f 100644 (file)
--- a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -1832,6 +1832,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "Este cuenta no tiene extensiones unix."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"

diff --git a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
index 9e389284f9fcc14c9abc0098e1723b1fd08fa4f5..f661dc0361ab964ed3322d2bde832c75e9fc6c97 100644 (file)
--- a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2009-10-06 13:05+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -162,7 +162,8 @@ msgstr ""
 
 #: admin/fai/class_faiTemplateEdit.inc:60
 #, php-format
-msgid "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+msgid ""
+"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 "L'encodage du fichier à changé de '%s' vers '%s', voulez vous réellement le "
 "sauver ?"
@@ -482,7 +483,8 @@ msgstr "Taille"
 #: admin/fai/class_faiDiskEntry.inc:428
 #: admin/fai/class_faiPartitionTable.inc:245
 #, php-format
-msgid "The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
 msgstr ""
 "Ce disque ne peut pas être supprimé car il est utilisé par la définition de "
 "disque '%s' !"
@@ -512,8 +514,8 @@ msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
-"Vous ne pouvez pas avoir plus de 3 partitions primaires quand vous utilisez des partitions logiques, veuillez "
-"vérifier votre configuration."
+"Vous ne pouvez pas avoir plus de 3 partitions primaires quand vous utilisez "
+"des partitions logiques, veuillez vérifier votre configuration."
 
 #: admin/fai/class_faiDiskEntry.inc:740
 msgid "Disk options"
@@ -726,7 +728,8 @@ msgstr "Branche verrouillée"
 #: admin/fai/class_faiManagement.inc:413
 #, php-format
 msgid "The following entries are locked, you can't remove them %s."
-msgstr "Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
+msgstr ""
+"Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
 
 #: admin/fai/class_faiManagement.inc:429
 msgid "FAI object"
@@ -868,7 +871,8 @@ msgid "Please enter your search string here"
 msgstr "Veuillez indiquer une chaîne de caractères a rechercher"
 
 #: admin/fai/class_faiPackageEntry.inc:103
-msgid "This list displays all assigned package names for this repository settings."
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr "Cette liste affiche tout les paquets assigné à ce dépôt."
 
 #: admin/fai/paste_generic.tpl:1
@@ -1043,7 +1047,8 @@ msgstr "Traitement en cours"
 
 #: admin/fai/class_FAI.inc:1084
 msgid "Could not create new release, the destination dn is already in use."
-msgstr "Impossible de créer une nouvelle version, le dn de destination existe déjà."
+msgstr ""
+"Impossible de créer une nouvelle version, le dn de destination existe déjà."
 
 #: admin/fai/class_FAI.inc:1097
 msgid "Error while fetching source dn - aborted!"
@@ -1051,7 +1056,8 @@ msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt !"
 
 #: admin/fai/class_FAI.inc:1179
 #, php-format
-msgid "Release creation failed due to ldap errors. Additional informations '%s'."
+msgid ""
+"Release creation failed due to ldap errors. Additional informations '%s'."
 msgstr ""
 "La création de la version à échoué du à des erreurs ldap. Information "
 "additionnelles '%s'."
@@ -1221,7 +1227,8 @@ msgid "Raid arrays must contain at least two partitions!"
 msgstr "Les ensembles RAID doit contenir au moins 2 partitions !"
 
 #: admin/fai/class_faiPartition.inc:406
-msgid "Raid 0 arrays can only be realized with a combination of two partitions!"
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Les ensembles RAID 0 ne peuvent être réalisé qu'avec deux partitions !"
 
 #: admin/fai/class_faiPartitionTable.inc:781
@@ -1605,7 +1612,8 @@ msgid "Please select a least one package!"
 msgstr "Veuillez sélectionner au moins un paquet !"
 
 #: admin/fai/class_faiPackage.inc:522
-msgid "Please choose a valid release/section combination for your repository setup!"
+msgid ""
+"Please choose a valid release/section combination for your repository setup!"
 msgstr ""
 "Veuillez choisir une combinaison valable version/section pour la création de "
 "votre dépôt de paquets !"
@@ -1670,7 +1678,8 @@ msgstr "Source d'information FAI inconnue !"
 #: admin/fai/class_faiSummaryTab.inc:183
 #: admin/systems/services/repository/class_servRepository.inc:93
 msgid "You can't use this plugin until FAI is activated."
-msgstr "Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
 
 #: admin/fai/class_faiSummaryTab.inc:225
 msgid "This object has no FAI classes assigned."
@@ -1716,13 +1725,22 @@ msgstr "Ajouter un groupe de volume"
 msgid "This package has no debconf options."
 msgstr "Ce paquet n'a pas d'options debconf."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 msgid "List of configured repositories"
 msgstr "Liste des dépôts configurés."
 
 #: admin/systems/services/repository/class_divListRepositories.inc:20
 msgid "This menu allows you to create, delete and edit repository settings."
-msgstr "Ce menu vous permet de créer, effacer et éditer les paramètres des dépôts."
+msgstr ""
+"Ce menu vous permet de créer, effacer et éditer les paramètres des dépôts."
 
 #: admin/systems/services/repository/class_divListRepositories.inc:24
 #: admin/systems/services/repository/class_divListRepositories.inc:64
@@ -1760,4 +1778,3 @@ msgstr "Version FAI"
 #: admin/systems/services/repository/class_servRepository.inc:344
 msgid "Services"
 msgstr "Services"
-

diff --git a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
index 7e95eccec92512c9ca1d90a5fce83a514dcf9e06..0107353ffaad2a77874a41540325635e19ede5e2 100644 (file)
--- a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -1858,6 +1858,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "Questa identità non possiede estensioni telefoniche"
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"

diff --git a/gosa-plugins/fai/locale/messages.po b/gosa-plugins/fai/locale/messages.po
index 30d19dea53e7a1c6354f1da9c858d872696c29d6..0a0791421efd1542667e1a50a688ea2fdf4f3283 100644 (file)
--- a/gosa-plugins/fai/locale/messages.po
+++ b/gosa-plugins/fai/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1660,6 +1660,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr ""
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 msgid "List of configured repositories"
 msgstr ""

diff --git a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
index 2efcd46fa01d6b8c8c979b7b52a74cd41073cc80..4ab5844b486338a06a4659a3cce639475ae1c56a 100644 (file)
--- a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -1831,6 +1831,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "Dit pakket heeft geen debconf mogelijkheden."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"

diff --git a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
index d60e417e32a8bf23206b46f20d682e13e0082ff1..bedec209df6ca0a725ebad22bdd0611ccd210699 100644 (file)
--- a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -1798,6 +1798,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "Ten pakiet nie ma opcji debconf."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"

diff --git a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
index 59db30c0a1cb9eea2af6c10ef40c89ab6689f258..ddaf18a279a419fca736c3d25bf8fdca84efdcbc 100644 (file)
--- a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -1889,6 +1889,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "В этой учетной записи нет атрибутов для телефона."
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"

diff --git a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
index 72eaca0abbd741c4e6c7404a647a02236caf0d9f..bd4d7ef5400d236d2218188d1b602f25b1261ece 100644 (file)
--- a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:36+0200\n"
+"POT-Creation-Date: 2009-10-19 14:24+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -1794,6 +1794,14 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr "这个软件包没有 debconf 选项。"
 
+#: admin/fai/class_debconfTemplate.inc:244
+msgid ""
+"This debconf question is dynamically generated during package installation "
+"and requires choosing between specific options which cannot be presented "
+"here. The entered text needs to be one of the valid choices in order to take "
+"effect."
+msgstr ""
+
 #: admin/systems/services/repository/class_divListRepositories.inc:19
 #, fuzzy
 msgid "List of configured repositories"