From 3f67f06c06635f2672a7b60dd62fbe5678733483 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 27 Mar 2011 13:21:09 +0000
Subject: [PATCH] terminologie pour les types de domaine : correction.
 Traduction ok pour les types par defaut ...

---
 bureau/admin/dom_edit.inc.php                |  8 +++++-
 bureau/admin/dom_edit.php                    | 13 +++++++---
 bureau/admin/dom_subedit.php                 |  1 +
 bureau/locales/fr_FR/LC_MESSAGES/manual.po   | 27 ++++++++++++++++++++
 bureau/locales/fr_FR/LC_MESSAGES/messages.po | 24 +++--------------
 install/mysql.sql                            | 16 +++++-------
 install/upgrades/1.0.sql                     | 14 +++++-----
 7 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php
index 605c9d44..2b9b1978 100644
--- a/bureau/admin/dom_edit.inc.php
+++ b/bureau/admin/dom_edit.inc.php
@@ -35,7 +35,13 @@ $dom->unlock();
 			<input type="hidden" name="type_old" value="<?php ehe($type); ?>" />
 			<input type="hidden" name="value_old" value="<?php ehe($value); ?>" />
 			<input type="hidden" name="action" value="add" />
-  <?php __("Create a subdomain:"); ?></td><td>
+  <?php
+   if ($isedit) {
+     __("Create a subdomain:"); 
+   } else {
+     __("Edit a subdomain:"); 
+   }
+?></td><td>
 <input type="text" class="int" name="sub" style="text-align:right" value="<?php ehe($sub); ?>" size="22" id="sub" /><span class="int" id="newsubname">.<?php echo $domain; ?></span></td>
 		</tr>
     <?php 
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 4621df3b..162129db 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -94,7 +94,7 @@ if ($r['dns_action']=='UPDATE') {?>
 		 gestion des sous-domaines
  -->
 <table class="tlist">
-<tr><th colspan="2"> </th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Place"); ?></th><th><?php __("Status")?></th><th><?php __("Pending");?></tr>
+<tr><th colspan="2"> </th><th><?php __("Subdomain"); ?></th><th><?php __("Type");?></th><th><?php __("Status")?></th><th><?php __("Pending");?></tr>
 <?php
 $col=1;
 for($i=0;$i<$r["nsub"];$i++) {
@@ -110,8 +110,14 @@ for($i=0;$i<$r["nsub"];$i++) {
 		</td>
     <?php } // end IF ==DELETE ?>
 		<td><a href="http://<?php ecif($r["sub"][$i]["name"],$r["sub"][$i]["name"]."."); echo $r["name"] ?>" target="_blank"><?php ecif($r["sub"][$i]["name"],$r["sub"][$i]["name"]."."); echo $r["name"] ?></a></td>
-		<td><?php __($r['sub'][$i]['type_desc']);?></td>
-		<td><?php echo $r["sub"][$i]['type'] === 'LOCAL' ? '<a href="bro_main.php?R='.urlencode($r["sub"][$i]["dest"]).'">'.htmlspecialchars($r["sub"][$i]["dest"]).'</a>' : htmlspecialchars($r["sub"][$i]["dest"]); ?>&nbsp;</td>
+		<td><?php __($r['sub'][$i]['type_desc']); ?>
+ <?php 
+ if ($r["sub"][$i]['type'] === 'VHOST') {
+  echo '<br /><a href="bro_main.php?R='.urlencode($r["sub"][$i]["dest"]).'">'.htmlspecialchars($r["sub"][$i]["dest"]).'</a>';
+} else {
+  if ($r["sub"][$i]['type']) echo "<br />".htmlspecialchars($r["sub"][$i]["dest"]);
+}
+?></td>
 		<td><?php 
       if ( $r['sub'][$i]['web_action'] !='DELETE') { 
         switch ($r['sub'][$i]['enable']) {
@@ -151,6 +157,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 <br />
 <hr/>
 <?php
+$isedit=false;
 require_once('dom_edit.inc.php');
 sub_domains_edit($domain);
 ?>
diff --git a/bureau/admin/dom_subedit.php b/bureau/admin/dom_subedit.php
index f7c4c9e6..c533dadc 100644
--- a/bureau/admin/dom_subedit.php
+++ b/bureau/admin/dom_subedit.php
@@ -61,6 +61,7 @@ $dom->unlock();
 <hr id="topbar"/>
 <br />
 <?php 
+  $isedit=true;
 require_once('dom_edit.inc.php');
 sub_domains_edit($domain,$sub,$type,$value);
 
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/manual.po b/bureau/locales/fr_FR/LC_MESSAGES/manual.po
index 7c8a80b7..e60b4be3 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/manual.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/manual.po
@@ -807,3 +807,30 @@ msgstr "Mots de passe des comptes POP/IMAP"
 msgid "Protected folders passwords"
 msgstr "Mots de passe des dossiers protégés"
 
+msgid "AlternC panel access"
+msgstr "Accès au bureau AlternC"
+
+msgid "Locally hosted"
+msgstr "Géré en local"
+
+msgid "URL redirection"
+msgstr "Redirection vers une url"
+
+msgid "IPv4 redirect"
+msgstr "Redirection vers une IPv4"
+
+msgid "Webmail access"
+msgstr "Accès au webmail"
+
+msgid "IPv6 redirect"
+msgstr "Redirection vers une IPv6"
+
+msgid "CNAME DNS entry"
+msgstr "Entrée DNS CNAME"
+
+msgid "TXT DNS entry"
+msgstr "Entrée DNS TXT"
+
+msgid "MX DNS entry"
+msgstr "Entrée DNS MX"
+
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 7a35b7ad..2f1b3427 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -1252,31 +1252,13 @@ msgstr "Sous-domaines"
 msgid "Create a subdomain:"
 msgstr "Création d'un sous-domaine : "
 
+msgid "Edit a subdomain:"
+msgstr "Modification d'un sous-domaine : "
+
 #: ../admin/dom_edit.php:95 ../admin/dom_edit.php:126
 msgid "Add a subdomain"
 msgstr "Ajouter un sous-domaine"
 
-#: ../admin/dom_edit.php:99 ../admin/dom_subedit.php:62
-#: ../admin/dom_subedit.php:67
-msgid "Locally managed"
-msgstr "Géré en local"
-
-#: ../admin/dom_edit.php:110 ../admin/dom_subedit.php:73
-#: ../admin/dom_subedit.php:78
-msgid "URL redirection"
-msgstr "Redirection vers une url"
-
-#: ../admin/dom_edit.php:116 ../admin/dom_subedit.php:78
-#: ../admin/dom_subedit.php:83
-msgid "IP redirection"
-msgstr "Redirection vers une ip"
-
-#: ../admin/dom_edit.php:122 ../admin/dom_subedit.php:83
-#: ../class/m_dom.php:551 ../class/m_dom.php:594 ../class/m_dom.php:559
-#: ../class/m_dom.php:550 ../admin/dom_subedit.php:88 ../class/m_dom.php:574
-msgid "Webmail access"
-msgstr "Accès au webmail"
-
 #: ../admin/dom_edit.php:138 ../admin/dom_edit.php:141
 #: ../admin/dom_edit.php:169
 msgid "DNS parameters"
diff --git a/install/mysql.sql b/install/mysql.sql
index 2d5a27f8..3d2babcb 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -495,15 +495,13 @@ PRIMARY KEY ( `name` )
 ) COMMENT = 'Type of domains allowed';
 
 INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced) values
-('vhost','Locally managed', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
+('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
 ('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false),
-('ip','IP redirection', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt', false, true, true),
+('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt', false, true, false),
 ('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
-('ipv6','IPv6 address', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
-('cname', 'cname entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
-('mx', 'mx entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
-('panel', 'Panel redirection', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, false)
+('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
+('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
+('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
+('mx', 'MX DNS entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
+('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true)
 ;
-
-
diff --git a/install/upgrades/1.0.sql b/install/upgrades/1.0.sql
index 6f63f2df..819188b0 100644
--- a/install/upgrades/1.0.sql
+++ b/install/upgrades/1.0.sql
@@ -20,15 +20,15 @@ PRIMARY KEY ( `name` )
 ) COMMENT = 'Type of domains allowed';
 
 INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced) values
-('vhost','Locally managed', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
+('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
 ('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false),
-('ip','IP redirection', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt', false, true, true),
+('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt', false, true, false),
 ('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
-('ipv6','IPv6 address', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
-('cname', 'cname entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'txt entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
-('mx', 'mx entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
-('panel', 'Panel redirection', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, false)
+('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt',true, true, true ),
+('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
+('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
+('mx', 'MX DNS entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
+('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true)
 ;
 
 -- Changing standby use