From de6bd29626c20e6d9f8d9b47c9088152a001353d Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 19 Oct 2009 12:20:13 +0000 Subject: [PATCH] Accepted lhm commit r14601 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14602 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../fai/admin/fai/class_debconfTemplate.inc | 44 +++++++++--------- .../fai/locale/de/LC_MESSAGES/messages.po | 23 +++++++--- .../fai/locale/es/LC_MESSAGES/messages.po | 10 ++++- .../fai/locale/fr/LC_MESSAGES/messages.po | 45 +++++++++++++------ .../fai/locale/it/LC_MESSAGES/messages.po | 10 ++++- gosa-plugins/fai/locale/messages.po | 10 ++++- .../fai/locale/nl/LC_MESSAGES/messages.po | 10 ++++- .../fai/locale/pl/LC_MESSAGES/messages.po | 10 ++++- .../fai/locale/ru/LC_MESSAGES/messages.po | 10 ++++- .../fai/locale/zh/LC_MESSAGES/messages.po | 10 ++++- 10 files changed, 134 insertions(+), 48 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc b/gosa-plugins/fai/admin/fai/class_debconfTemplate.inc index bbbbbadf2..bd0dbf237 100644 --- 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'].= '

'._('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.').''; $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=" - - - -

".$data['Topic']."

".$data['Description']." - - - "; + $result=" + + + +

".$data['Topic']."

".$data['Description']." + + + "; - foreach($choices as $value){ - if($data['Default'] == $value){ - $result.="\n".htmlentities($value)."
"; - }else{ - $result.="\n".htmlentities($value)."
"; + foreach($choices as $value){ + if($data['Default'] == $value){ + $result.="\n".htmlentities($value)."
"; + }else{ + $result.="\n".htmlentities($value)."
"; + } } - } - $result.= " - - - - "; + $result.= " + + + + "; + } 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 5f27bdb91..2dc41a8da 100644 --- 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 \n" "Language-Team: de \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 9a1a9e22d..b5cacb9eb 100644 --- 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: \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 9e389284f..f661dc036 100644 --- 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 \n" "Language-Team: \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 7e95eccec..0107353ff 100644 --- 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 \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 30d19dea5..0a0791421 100644 --- 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 \n" "Language-Team: LANGUAGE \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 2efcd46fa..4ab5844b4 100644 --- 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) \n" "Language-Team: CareWorks ICT Services \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 d60e417e3..bedec209d 100644 --- 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 \n" "Language-Team: Piotr Rybicki \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 59db30c0a..ddaf18a27 100644 --- 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 \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 72eaca0ab..bd4d7ef54 100644 --- 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 \n" "Language-Team: Chinese Simplified \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" -- 2.30.2