diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 8ace168b..6a2236ca 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -129,7 +129,7 @@ if (! empty($r['dns_result']) && $r['dns_result'] != '0') {
-
+
domains_type_lst();
@@ -146,10 +146,23 @@ if ( ! empty($problems) ) {
| | | | |
---|
+
+
+
+
+
+ | | | | |
+
+
">
"; } else { ?>
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index 649dc7b9..90b1f9eb 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -1172,7 +1172,7 @@ class m_dom {
$r["nsub"] = $db->Record["cnt"];
$db->free();
#$db->query("SELECT sd.*, dt.description AS type_desc, dt.only_dns FROM sub_domaines sd, domaines_type dt WHERE compte='$cuid' AND domaine='$dom' AND UPPER(dt.name)=UPPER(sd.type) ORDER BY sd.sub,sd.type");
- $db->query("SELECT sd.*, dt.description AS type_desc, dt.only_dns FROM sub_domaines sd LEFT JOIN domaines_type dt on UPPER(dt.name)=UPPER(sd.type) WHERE compte='$cuid' AND domaine='$dom' ORDER BY sd.sub,sd.type ;");
+ $db->query("SELECT sd.*, dt.description AS type_desc, dt.only_dns, dt.advanced FROM sub_domaines sd LEFT JOIN domaines_type dt on UPPER(dt.name)=UPPER(sd.type) WHERE compte='$cuid' AND domaine='$dom' ORDER BY dt.advanced,sd.sub,sd.type ;");
// Pas de webmail, on le cochera si on le trouve.
$r["sub"] = array();
for ($i = 0; $i < $r["nsub"]; $i++) {
@@ -1186,6 +1186,7 @@ class m_dom {
$r["sub"][$i]["type_desc"] = $db->Record["type_desc"];
$r["sub"][$i]["only_dns"] = $db->Record["only_dns"];
$r["sub"][$i]["web_action"] = $db->Record["web_action"];
+ $r["sub"][$i]["advanced"] = $db->Record["advanced"];
$r["sub"][$i]["fqdn"] = ((!empty($r["sub"][$i]["name"])) ? $r["sub"][$i]["name"] . "." : "") . $r["name"];
}
$db->free();
@@ -1217,7 +1218,7 @@ class m_dom {
$err->raise("dom", _("--- Program error --- No lock on the domains!"));
return false;
}
- $db->query("select sd.*, dt.description as type_desc, dt.only_dns from sub_domaines sd, domaines_type dt where compte='$cuid' and sd.id='$sub_domain_id' and upper(dt.name)=upper(sd.type);");
+ $db->query("select sd.*, dt.description as type_desc, dt.only_dns, dt.advanced from sub_domaines sd, domaines_type dt where compte='$cuid' and sd.id='$sub_domain_id' and upper(dt.name)=upper(sd.type) ORDER BY dt.advanced, sd.sub;");
if ($db->num_rows() == 0) {
$err->raise("dom", _("The sub-domain does not exist"));
return false;
diff --git a/bureau/locales/de_DE/LC_MESSAGES/messages.po b/bureau/locales/de_DE/LC_MESSAGES/messages.po
index a6aa56fb..664c9d8e 100644
--- a/bureau/locales/de_DE/LC_MESSAGES/messages.po
+++ b/bureau/locales/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alternc\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: 2004-02-14 19:53-0400\n"
"Last-Translator: Bruno Marmier \n"
"Language-Team: Espagnol \n"
@@ -166,7 +166,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -177,7 +177,7 @@ msgstr "Nein"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -291,7 +291,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -299,7 +300,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr ""
@@ -307,7 +308,7 @@ msgstr ""
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -474,7 +475,7 @@ msgid "Account"
msgstr ""
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr ""
@@ -640,6 +641,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -789,7 +791,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1033,7 +1035,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -1974,112 +1976,119 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
+msgid "Main subdomains"
msgstr ""
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr ""
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr ""
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
#, fuzzy
msgid "Directory not found"
msgstr "Miglied '%s' existiert nicht"
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr ""
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr ""
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr ""
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr ""
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr ""
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr ""
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr ""
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr ""
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2087,7 +2096,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4282,24 +4291,24 @@ msgstr ""
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4314,7 +4323,7 @@ msgstr ""
msgid "The domain already exist"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4345,157 +4354,157 @@ msgstr ""
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
#, fuzzy
msgid "The sub-domain does not exist"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
#, fuzzy
msgid "The folder you entered is incorrect or does not exist"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr ""
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
#, fuzzy
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
#, fuzzy
msgid "The TXT value you entered is incorrect"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, fuzzy, php-format
msgid "The domain name %s does not exist"
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr ""
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr ""
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr ""
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr ""
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr ""
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr ""
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr ""
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr ""
diff --git a/bureau/locales/en_US/LC_MESSAGES/messages.po b/bureau/locales/en_US/LC_MESSAGES/messages.po
index aeef1229..49774d5e 100644
--- a/bureau/locales/en_US/LC_MESSAGES/messages.po
+++ b/bureau/locales/en_US/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp "
"$\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: 2002-06-16 13:50CEST\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: French \n"
@@ -162,7 +162,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -173,7 +173,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -286,7 +286,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -294,7 +295,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -466,7 +467,7 @@ msgid "Account"
msgstr ""
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr ""
@@ -632,6 +633,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -781,7 +783,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1024,7 +1026,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -1959,111 +1961,118 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
+msgid "Main subdomains"
msgstr ""
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr ""
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr ""
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
msgid "Directory not found"
msgstr ""
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr ""
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr ""
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr ""
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr ""
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr ""
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr ""
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr ""
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr ""
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2071,7 +2080,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4247,24 +4256,24 @@ msgstr ""
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4278,7 +4287,7 @@ msgstr ""
msgid "The domain already exist"
msgstr ""
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4309,153 +4318,153 @@ msgstr ""
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
msgid "The sub-domain does not exist"
msgstr ""
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
msgid "The folder you entered is incorrect or does not exist"
msgstr ""
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr ""
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr ""
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
msgid "The TXT value you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, php-format
msgid "The domain name %s does not exist"
msgstr ""
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr ""
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr ""
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr ""
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr ""
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr ""
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr ""
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr ""
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr ""
diff --git a/bureau/locales/es_ES/LC_MESSAGES/messages.po b/bureau/locales/es_ES/LC_MESSAGES/messages.po
index fe7027c4..3fe4a47c 100644
--- a/bureau/locales/es_ES/LC_MESSAGES/messages.po
+++ b/bureau/locales/es_ES/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: 2008-09-05 16:50+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -182,7 +182,7 @@ msgstr "¿Puede cambiar su contraseña?"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -193,7 +193,7 @@ msgstr "No"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -311,7 +311,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -319,7 +320,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr "Modificar"
@@ -327,7 +328,7 @@ msgstr "Modificar"
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -508,7 +509,7 @@ msgid "Account"
msgstr "Tipo de cuenta"
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr "Nombre de dominio"
@@ -686,6 +687,7 @@ msgid "OK?"
msgstr "OK"
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -843,7 +845,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1107,7 +1109,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -2122,120 +2124,129 @@ msgid "Settings"
msgstr "Configuración"
#: ../admin/dom_edit.php:132
-#, fuzzy, php-format
-msgid "Editing subdomains of %s"
+#, fuzzy
+msgid "Main subdomains"
msgstr "Modificar dominio %s"
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
#, fuzzy
msgid "Subdomain"
msgstr "Subdominios"
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+#, fuzzy
+msgid "Advanced subdomains"
+msgstr "Añadir un subdominio"
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
#, fuzzy
msgid "Directory not found"
msgstr "Dominio %s borrado"
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
#, fuzzy
msgid "Desactivation pending"
msgstr "Desactivar"
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
#, fuzzy
msgid "Update pending"
msgstr "Volver a cargar esta página"
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
#, fuzzy
msgid "Deletion pending"
msgstr "Suprimir un usuario"
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, fuzzy, php-format
msgid "Add a subdomain to %s"
msgstr "Añadir un subdominio"
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
#, fuzzy
msgid "DNS & Email parameters"
msgstr "Parámetros DNS"
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr "¿Administrar el DNS de este dominio?"
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
#, fuzzy
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr "¿Administrar el DNS de este dominio?"
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr "Validar cambios"
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
#, fuzzy
msgid "Click here to view the dump"
msgstr "Presiona aquí para seguir"
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
#, fuzzy
msgid "Domain removal"
msgstr "Nombre de dominio"
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2243,7 +2254,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4603,24 +4614,24 @@ msgstr "Modificar dominio %s"
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4635,7 +4646,7 @@ msgstr ""
msgid "The domain already exist"
msgstr "Editar archivo"
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4667,165 +4678,165 @@ msgstr "no pudo ser borrado"
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
#, fuzzy
msgid "The sub-domain does not exist"
msgstr "¡El buzón %s no existe!"
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
#, fuzzy
msgid "The folder you entered is incorrect or does not exist"
msgstr "El miembro '%s' no existe"
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
#, fuzzy
msgid "The ip address is invalid"
msgstr "Lista de las buzones de correo del dominio %s"
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
#, fuzzy
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr "El miembro '%s' no existe"
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
#, fuzzy
msgid "The TXT value you entered is incorrect"
msgstr "El miembro '%s' no existe"
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, fuzzy, php-format
msgid "The domain name %s does not exist"
msgstr "¡El buzón %s no existe!"
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
#, fuzzy
msgid "No change has been requested..."
msgstr "Los parámetros de ayuda han sido modificados."
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
#, fuzzy
msgid "This domain is not installed in your account"
msgstr "Esta cuenta es un cuenta de administrador"
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
#, fuzzy
msgid "Locally hosted"
msgstr "Administrar localmente"
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
#, fuzzy
msgid "URL redirection"
msgstr "Dirigir hacia una URL"
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
-msgid "Webmail access"
-msgstr "Acceso Webmail"
-
#: ../class/m_dom.php:2206
-#, fuzzy
-msgid "Squirrelmail Webmail access"
+msgid "Webmail access"
msgstr "Acceso Webmail"
#: ../class/m_dom.php:2207
#, fuzzy
-msgid "Roundcube Webmail access"
+msgid "Squirrelmail Webmail access"
msgstr "Acceso Webmail"
#: ../class/m_dom.php:2208
+#, fuzzy
+msgid "Roundcube Webmail access"
+msgstr "Acceso Webmail"
+
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
#, fuzzy
msgid "Default mail server"
msgstr "Valores por omisión"
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
#, fuzzy
msgid "AlternC panel access"
msgstr "Lista de cuentas FTP"
@@ -5545,6 +5556,10 @@ msgstr "Animación Flash"
msgid "Real Media File"
msgstr "Archivo Real Media"
+#, fuzzy
+#~ msgid "Editing subdomains of %s"
+#~ msgstr "Modificar dominio %s"
+
#, fuzzy
#~ msgid "The name you entered is incorrect"
#~ msgstr "El miembro '%s' no existe"
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index d6665f71..e067bed5 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp "
"$\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
-"PO-Revision-Date: 2015-06-16 14:11+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
+"PO-Revision-Date: 2015-06-17 16:32+0200\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: français \n"
"Language: fr\n"
@@ -180,7 +180,7 @@ msgstr "Peut-il changer son mot de passe ?"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -191,7 +191,7 @@ msgstr "Non"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -308,7 +308,8 @@ msgid "Informations"
msgstr "Informations"
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr "Type"
@@ -316,7 +317,7 @@ msgstr "Type"
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr "Modifier"
@@ -324,7 +325,7 @@ msgstr "Modifier"
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -502,7 +503,7 @@ msgid "Account"
msgstr "Compte"
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr "Nom de domaine"
@@ -680,6 +681,7 @@ msgid "OK?"
msgstr "OK ?"
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr "État"
@@ -835,7 +837,7 @@ msgstr "Type de destination"
msgid "Compatibility"
msgstr "Compatibilité"
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1080,7 +1082,7 @@ msgstr "%1$d/%2$d/%3$d"
msgid "DB:"
msgstr "Base:"
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr "Désactiver"
@@ -2079,69 +2081,78 @@ msgid "Settings"
msgstr "Configuration"
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
-msgstr "Edition des sous-domaines de %s"
+msgid "Main subdomains"
+msgstr "Sous-domaines principaux"
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr "Sous-domaine"
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr "Sous-domaines avancés"
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+"Les entrées ci-dessous sont pour les utilisateurs avancés, modifiez-les à "
+"vos risques et périls."
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr "Interdit"
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr "ERREUR, merci de vérifier la configuration de votre serveur"
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
msgid "Directory not found"
msgstr "Répertoire non trouvé"
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr "Activation en cours"
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr "Désactivé"
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr "Activer"
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr "Désactivation en attente"
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr "Mise à jour en attente"
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr "Suppression en attente"
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr "Ajouter un sous-domaine à %s"
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr "Paramètres DNS & Email"
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr "Gère-t-on le DNS de ce domaine ?"
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr "Choix de la TTL pour les enregistrements de la zone DNS"
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
@@ -2149,15 +2160,15 @@ msgstr ""
"Attention : une TTL trop basse peut poser problème. N'utilisez pas de TTL "
"inférieure à 3600 secondes."
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr "secondes"
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr "Gère-t-on les Adresses Emails de ce domaine sur le serveur ?"
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
@@ -2165,11 +2176,11 @@ msgstr ""
"Attention: Si vous mettez 'non' ici, toutes les adresses emails de ce "
"domaine et les messages qu'elles contiennent seront immédiatement détruits."
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr "Valider les changements"
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
@@ -2177,19 +2188,19 @@ msgstr ""
"Voici la zone telle qu'AlternC la sert. Si vous venez de demander des "
"modifications, attendez avant de les voir ici."
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr "Cliquez ici pour voir le dump"
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr "Actualiser"
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr "Suppression du nom de domaine"
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2200,7 +2211,7 @@ msgstr ""
"Attention : cela détruira aussi les comptes FTP, adresses emails, listes de "
"discussion associées à ce domaine et ses sous-domaines."
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr "Effacer le domaine %s de ce serveur"
@@ -4523,7 +4534,7 @@ msgstr "Nom de domaine manquant"
msgid "The name MUST contain only letter and digits"
msgstr "Le nom ne doit contenir QUE des lettres ou chiffres"
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
@@ -4531,18 +4542,18 @@ msgstr ""
"Les paramètres de ce sous-domaine sont invalides. Vérifiez la compatibilité "
"de vos entrées avec d'autres sous-domaines"
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr "--- Erreur du programme --- Pas de verrou sur le domaine !"
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr "Le nom du domaine est syntaxiquement incorrect"
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4560,7 +4571,7 @@ msgstr ""
msgid "The domain already exist"
msgstr "Ce domaine existe déjà"
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4598,40 +4609,42 @@ msgstr ""
"La base Whois n'est pas disponible pour l'instant. Merci de réessayer "
"ultérieurement"
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr "Le nom de domaine n'a pas été trouvé dans la base whois"
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
msgid "The sub-domain does not exist"
msgstr "Ce sous-domaine n'existe pas"
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr "url invalide"
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
msgid "The folder you entered is incorrect or does not exist"
msgstr "Le dossier que vous avez entré est incorrect ou n'existe pas"
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr "Adresse IP invalide"
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
-msgstr "Le dossier que vous avez entré est incorrect ou non qualifié (doit terminé par un .)"
+msgstr ""
+"Le dossier que vous avez entré est incorrect ou non qualifié (doit terminé "
+"par un .)"
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
msgid "The TXT value you entered is incorrect"
msgstr "La valeur TXT entrée est incorrecte"
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr "Type de domaine invalide, réessayez"
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
@@ -4639,11 +4652,11 @@ msgstr ""
"Vous avez utilisé des caractères interdits pour le sous-domaine. (seuls A-Z "
"0-9 et - sont autorisés)"
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr "Impossible d'écrire dans le dossier cible"
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
@@ -4651,16 +4664,16 @@ msgstr ""
"Les DNS du domaine ne correspondent pas à ceux du serveur. Modifiez les DNS "
"de votre domaine avant de tenter à nouveau"
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, php-format
msgid "The domain name %s does not exist"
msgstr "Le domaine %s n'existe pas"
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr "Aucune modification n'a été demandée"
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
@@ -4670,24 +4683,24 @@ msgstr ""
"demander d'héberger le mail. Assurez-vous que les entrées MX pointent sur ce "
"serveur où vous ne pourrez pas recevoir de mail."
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr "L'adresse IP entrée est incorrecte"
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr "Ce domaine n'est pas installé sur votre compte"
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr "Ce compte DNS secondaire existe déjà"
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
@@ -4695,64 +4708,64 @@ msgid ""
msgstr ""
"Probleme sur %s : il y a plus d'une configuration web pour ce sous-domaine !"
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr "Problème sur %s : type de domaine inconnu %s."
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr "Hébergé localement"
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr "Redirection vers l'URL"
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr "Adresse IPv4"
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr "Accès au webmail"
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr "Accès au webmail Squirrelmail"
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr "Accès au webmail Roundcube"
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr "Adresse IPv6"
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr "Entrée DNS CNAME"
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr "Entrée DNS TXT"
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr "Entrée DNS MX"
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr "Entrée DNS MX Secondaire"
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr "Serveur de mail par défaut"
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr "Serveur de mail de secours par défaut"
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr "Accès au Bureau AlternC"
@@ -5491,5 +5504,8 @@ msgstr "Animation Flash"
msgid "Real Media File"
msgstr "Fichier Real Media"
+#~ msgid "Editing subdomains of %s"
+#~ msgstr "Edition des sous-domaines de %s"
+
#~ msgid "The name you entered is incorrect"
#~ msgstr "Le nom que vous avez entré est incorrect"
diff --git a/bureau/locales/it_IT/LC_MESSAGES/messages.po b/bureau/locales/it_IT/LC_MESSAGES/messages.po
index c7bf78c7..92434731 100644
--- a/bureau/locales/it_IT/LC_MESSAGES/messages.po
+++ b/bureau/locales/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: AlternC 2.0\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -162,7 +162,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -173,7 +173,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -286,7 +286,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -294,7 +295,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -466,7 +467,7 @@ msgid "Account"
msgstr ""
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr ""
@@ -632,6 +633,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -781,7 +783,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1024,7 +1026,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -1959,111 +1961,118 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
+msgid "Main subdomains"
msgstr ""
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr ""
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr ""
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
msgid "Directory not found"
msgstr ""
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr ""
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr ""
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr ""
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr ""
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr ""
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr ""
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr ""
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr ""
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2071,7 +2080,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4247,24 +4256,24 @@ msgstr ""
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4278,7 +4287,7 @@ msgstr ""
msgid "The domain already exist"
msgstr ""
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4309,153 +4318,153 @@ msgstr ""
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
msgid "The sub-domain does not exist"
msgstr ""
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
msgid "The folder you entered is incorrect or does not exist"
msgstr ""
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr ""
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr ""
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
msgid "The TXT value you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, php-format
msgid "The domain name %s does not exist"
msgstr ""
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr ""
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr ""
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr ""
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr ""
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr ""
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr ""
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr ""
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr ""
diff --git a/bureau/locales/messages.pot b/bureau/locales/messages.pot
index 1f47f240..c435f8f4 100644
--- a/bureau/locales/messages.pot
+++ b/bureau/locales/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: AlternC 2.0\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -162,7 +162,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -173,7 +173,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -286,7 +286,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -294,7 +295,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -466,7 +467,7 @@ msgid "Account"
msgstr ""
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr ""
@@ -632,6 +633,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -781,7 +783,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1024,7 +1026,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -1959,111 +1961,118 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
+msgid "Main subdomains"
msgstr ""
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr ""
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr ""
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
msgid "Directory not found"
msgstr ""
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr ""
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr ""
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr ""
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr ""
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr ""
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr ""
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr ""
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr ""
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2071,7 +2080,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4247,24 +4256,24 @@ msgstr ""
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4278,7 +4287,7 @@ msgstr ""
msgid "The domain already exist"
msgstr ""
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4309,153 +4318,153 @@ msgstr ""
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
msgid "The sub-domain does not exist"
msgstr ""
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
msgid "The folder you entered is incorrect or does not exist"
msgstr ""
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr ""
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr ""
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
msgid "The TXT value you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, php-format
msgid "The domain name %s does not exist"
msgstr ""
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr ""
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr ""
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr ""
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr ""
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr ""
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr ""
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr ""
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr ""
diff --git a/bureau/locales/nl_NL/LC_MESSAGES/messages.po b/bureau/locales/nl_NL/LC_MESSAGES/messages.po
index a2d124ea..b2a6ef16 100644
--- a/bureau/locales/nl_NL/LC_MESSAGES/messages.po
+++ b/bureau/locales/nl_NL/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: 2012-10-17 09:52+0200\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: Dutch \n"
@@ -162,7 +162,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -173,7 +173,7 @@ msgstr ""
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -286,7 +286,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -294,7 +295,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -466,7 +467,7 @@ msgid "Account"
msgstr ""
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr ""
@@ -632,6 +633,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -781,7 +783,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1024,7 +1026,7 @@ msgstr ""
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -1959,111 +1961,118 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, php-format
-msgid "Editing subdomains of %s"
+msgid "Main subdomains"
msgstr ""
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
msgid "Subdomain"
msgstr ""
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+msgid "Advanced subdomains"
+msgstr ""
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
msgid "Directory not found"
msgstr ""
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
msgid "Deletion pending"
msgstr ""
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, php-format
msgid "Add a subdomain to %s"
msgstr ""
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
msgid "DNS & Email parameters"
msgstr ""
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr ""
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr ""
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr ""
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
msgid "Click here to view the dump"
msgstr ""
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
msgid "Domain removal"
msgstr ""
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2071,7 +2080,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4247,24 +4256,24 @@ msgstr ""
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4278,7 +4287,7 @@ msgstr ""
msgid "The domain already exist"
msgstr ""
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4309,153 +4318,153 @@ msgstr ""
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
msgid "The sub-domain does not exist"
msgstr ""
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
msgid "The folder you entered is incorrect or does not exist"
msgstr ""
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
msgid "The ip address is invalid"
msgstr ""
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr ""
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
msgid "The TXT value you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, php-format
msgid "The domain name %s does not exist"
msgstr ""
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
msgid "No change has been requested..."
msgstr ""
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
msgid "This domain is not installed in your account"
msgstr ""
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
msgid "Locally hosted"
msgstr ""
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
msgid "URL redirection"
msgstr ""
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
+#: ../class/m_dom.php:2206
msgid "Webmail access"
msgstr ""
-#: ../class/m_dom.php:2206
+#: ../class/m_dom.php:2207
msgid "Squirrelmail Webmail access"
msgstr ""
-#: ../class/m_dom.php:2207
+#: ../class/m_dom.php:2208
msgid "Roundcube Webmail access"
msgstr ""
-#: ../class/m_dom.php:2208
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
msgid "AlternC panel access"
msgstr ""
diff --git a/bureau/locales/pt_BR/LC_MESSAGES/messages.po b/bureau/locales/pt_BR/LC_MESSAGES/messages.po
index 2b691e97..ce96ac22 100644
--- a/bureau/locales/pt_BR/LC_MESSAGES/messages.po
+++ b/bureau/locales/pt_BR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: $Id: admin.po,v 1.2 2003/06/09 14:36:08 root Exp $\n"
"Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-06-16 16:06+0200\n"
+"POT-Creation-Date: 2015-06-17 16:24+0200\n"
"PO-Revision-Date: 2007-10-25 23:50-0400\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: English \n"
@@ -174,7 +174,7 @@ msgstr "Pode mudar a senha"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:78 ../admin/adm_edit.php:95
#: ../admin/adm_passpolicy.php:113 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:257 ../admin/dom_edit.php:280
+#: ../admin/dom_edit.php:270 ../admin/dom_edit.php:293
#: ../admin/dom_subdel.php:80 ../admin/mail_edit.php:90
#: ../admin/mail_list.php:166 ../admin/sql_bck.php:94 ../class/m_bro.php:75
msgid "No"
@@ -185,7 +185,7 @@ msgstr "Não"
#: ../admin/adm_domstype.php:87 ../admin/adm_domstype.php:88
#: ../admin/adm_edit.php:79 ../admin/adm_edit.php:96
#: ../admin/adm_passpolicy.php:114 ../admin/adm_passpolicy.php:157
-#: ../admin/dom_edit.php:256 ../admin/dom_edit.php:279
+#: ../admin/dom_edit.php:269 ../admin/dom_edit.php:292
#: ../admin/dom_subdel.php:79 ../admin/mail_edit.php:91
#: ../admin/mail_list.php:212 ../admin/mail_list.php:225
#: ../admin/mail_list.php:238 ../admin/mail_list.php:257
@@ -302,7 +302,8 @@ msgid "Informations"
msgstr ""
#: ../admin/adm_authip_whitelist.php:64 ../admin/adm_doms_def_type.php:48
-#: ../admin/dom_edit.php:146 ../admin/ip_main.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
+#: ../admin/ip_main.php:146
msgid "Type"
msgstr ""
@@ -310,7 +311,7 @@ msgstr ""
#: ../admin/adm_list.php:199 ../admin/adm_list.php:226
#: ../admin/adm_list.php:258 ../admin/adm_passpolicy.php:151
#: ../admin/adm_tld.php:80 ../admin/bro_editor.php:86
-#: ../admin/dom_edit.php:161 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
+#: ../admin/dom_edit.php:174 ../admin/ftp_list.php:80 ../admin/ip_main.php:166
#: ../admin/mail_list.php:152
msgid "Edit"
msgstr "Editar"
@@ -318,7 +319,7 @@ msgstr "Editar"
#: ../admin/adm_authip_whitelist.php:85 ../admin/adm_doms_def_type.php:60
#: ../admin/adm_mxaccount.php:83 ../admin/adm_slavedns.php:101
#: ../admin/adm_slavedns.php:145 ../admin/bro_main.php:283
-#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:168
+#: ../admin/cron.php:54 ../admin/dom_edit.php:127 ../admin/dom_edit.php:181
#: ../admin/ftp_del.php:82 ../admin/hta_dodeluser.php:64
#: ../admin/ip_main.php:79 ../admin/ip_main.php:167
#: ../admin/piwik_site_dodel.php:70 ../admin/piwik_sitelist.php:128
@@ -493,7 +494,7 @@ msgid "Account"
msgstr "Conta Permitiu ?"
#: ../admin/adm_dnsweberror.php:55 ../admin/adm_dnsweberror.php:85
-#: ../admin/dom_add.php:57 ../class/m_dom.php:1902
+#: ../admin/dom_add.php:57 ../class/m_dom.php:1903
msgid "Domain name"
msgstr "Nome do Domínio"
@@ -674,6 +675,7 @@ msgid "OK?"
msgstr ""
#: ../admin/adm_doms.php:69 ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:159
msgid "Status"
msgstr ""
@@ -832,7 +834,7 @@ msgstr ""
msgid "Compatibility"
msgstr ""
-#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:190
+#: ../admin/adm_domstypeedit.php:100 ../admin/dom_edit.php:203
#: ../admin/ftp_list.php:73 ../admin/ftp_list.php:84
#: ../admin/mail_list.php:127 ../admin/mail_list.php:154
msgid "Enabled"
@@ -1100,7 +1102,7 @@ msgstr "%3$d/%1$d/%2$d %6$d:%5$d %7$s"
msgid "DB:"
msgstr ""
-#: ../admin/adm_list.php:206 ../admin/dom_edit.php:191
+#: ../admin/adm_list.php:206 ../admin/dom_edit.php:204
msgid "Disable"
msgstr ""
@@ -2098,118 +2100,127 @@ msgid "Settings"
msgstr ""
#: ../admin/dom_edit.php:132
-#, fuzzy, php-format
-msgid "Editing subdomains of %s"
+#, fuzzy
+msgid "Main subdomains"
msgstr "Editando o domínio %s"
-#: ../admin/dom_edit.php:146
+#: ../admin/dom_edit.php:146 ../admin/dom_edit.php:159
#, fuzzy
msgid "Subdomain"
msgstr "Secundário-domínios"
-#: ../admin/dom_edit.php:159
+#: ../admin/dom_edit.php:155
+#, fuzzy
+msgid "Advanced subdomains"
+msgstr "Adiçionar um secundário-domínio"
+
+#: ../admin/dom_edit.php:156
+msgid "The following entries are advanced ones, edit them at your own risks."
+msgstr ""
+
+#: ../admin/dom_edit.php:172
msgid "Forbidden"
msgstr ""
-#: ../admin/dom_edit.php:173
+#: ../admin/dom_edit.php:186
msgid "ERROR, please check your server setup"
msgstr ""
-#: ../admin/dom_edit.php:180 ../admin/ftp_list.php:97
+#: ../admin/dom_edit.php:193 ../admin/ftp_list.php:97
#, fuzzy
msgid "Directory not found"
msgstr "Domínio %s suprimido"
-#: ../admin/dom_edit.php:194
+#: ../admin/dom_edit.php:207
msgid "Activation pending"
msgstr ""
-#: ../admin/dom_edit.php:197 ../admin/ftp_list.php:87
+#: ../admin/dom_edit.php:210 ../admin/ftp_list.php:87
#: ../admin/mail_list.php:146 ../admin/mail_list.php:156
msgid "Disabled"
msgstr ""
-#: ../admin/dom_edit.php:198
+#: ../admin/dom_edit.php:211
msgid "Enable"
msgstr ""
-#: ../admin/dom_edit.php:201
+#: ../admin/dom_edit.php:214
msgid "Desactivation pending"
msgstr ""
-#: ../admin/dom_edit.php:209
+#: ../admin/dom_edit.php:222
msgid "Update pending"
msgstr ""
-#: ../admin/dom_edit.php:212
+#: ../admin/dom_edit.php:225
#, fuzzy
msgid "Deletion pending"
msgstr "Suprimando o secundário-domínio %s"
-#: ../admin/dom_edit.php:232
+#: ../admin/dom_edit.php:245
#, fuzzy, php-format
msgid "Add a subdomain to %s"
msgstr "Adiçionar um secundário-domínio"
-#: ../admin/dom_edit.php:249
+#: ../admin/dom_edit.php:262
#, fuzzy
msgid "DNS & Email parameters"
msgstr "Parâmetros DNS"
-#: ../admin/dom_edit.php:254
+#: ../admin/dom_edit.php:267
msgid "Manage the DNS on the server ?"
msgstr "Administrar o DNS neste servidor ?"
-#: ../admin/dom_edit.php:265
+#: ../admin/dom_edit.php:278
msgid "Define TTL for the zone records"
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid ""
"Warning: a low TTL can be problematic. It is recommended not to use a lower "
"TTL than 3600 seconds."
msgstr ""
-#: ../admin/dom_edit.php:267
+#: ../admin/dom_edit.php:280
msgid "seconds"
msgstr ""
-#: ../admin/dom_edit.php:276
+#: ../admin/dom_edit.php:289
#, fuzzy
msgid "Manage the Emails Addresses of this domain on the server?"
msgstr "Administrar o DNS neste servidor ?"
-#: ../admin/dom_edit.php:284
+#: ../admin/dom_edit.php:297
msgid ""
"Warning: If you set this to 'no', all your email accounts and aliases on "
"this domain will be immediately deleted."
msgstr ""
-#: ../admin/dom_edit.php:285
+#: ../admin/dom_edit.php:298
msgid "Submit the changes"
msgstr "Submeter as mudanças"
-#: ../admin/dom_edit.php:293
+#: ../admin/dom_edit.php:306
msgid ""
"Here is the actual DNS zone running on the AlternC server. If you just made "
"some changes, you have to wait for it."
msgstr ""
-#: ../admin/dom_edit.php:297
+#: ../admin/dom_edit.php:310
#, fuzzy
msgid "Click here to view the dump"
msgstr "Clicar aqui para continuar"
-#: ../admin/dom_edit.php:300
+#: ../admin/dom_edit.php:313
msgid "Refresh"
msgstr ""
-#: ../admin/dom_edit.php:306
+#: ../admin/dom_edit.php:319
#, fuzzy
msgid "Domain removal"
msgstr "Nome do Domínio"
-#: ../admin/dom_edit.php:307
+#: ../admin/dom_edit.php:320
#, php-format
msgid ""
"If you want to destroy the domain %s, click on the button below. Warning: "
@@ -2217,7 +2228,7 @@ msgid ""
"domain and subdomains."
msgstr ""
-#: ../admin/dom_edit.php:310
+#: ../admin/dom_edit.php:323
#, php-format
msgid "Delete %s from this server"
msgstr ""
@@ -4568,24 +4579,24 @@ msgstr "Editando o domínio %s"
msgid "The name MUST contain only letter and digits"
msgstr ""
-#: ../class/m_dom.php:578 ../class/m_dom.php:1401
+#: ../class/m_dom.php:578 ../class/m_dom.php:1402
msgid ""
"The parameters for this subdomain and domain type are invalid. Please check "
"for subdomain entries incompatibility"
msgstr ""
-#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1217
-#: ../class/m_dom.php:1372 ../class/m_dom.php:1462 ../class/m_dom.php:1511
-#: ../class/m_dom.php:1855
+#: ../class/m_dom.php:697 ../class/m_dom.php:1146 ../class/m_dom.php:1218
+#: ../class/m_dom.php:1373 ../class/m_dom.php:1463 ../class/m_dom.php:1512
+#: ../class/m_dom.php:1856
msgid "--- Program error --- No lock on the domains!"
msgstr ""
-#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1396
-#: ../class/m_dom.php:1538
+#: ../class/m_dom.php:704 ../class/m_dom.php:1151 ../class/m_dom.php:1397
+#: ../class/m_dom.php:1539
msgid "The domain name is syntaxically incorrect"
msgstr ""
-#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1622
+#: ../class/m_dom.php:710 ../class/m_dom.php:755 ../class/m_dom.php:1623
msgid ""
"The requested domain is forbidden in this server, please contact the "
"administrator"
@@ -4600,7 +4611,7 @@ msgstr ""
msgid "The domain already exist"
msgstr "Edição de arquivo"
-#: ../class/m_dom.php:731 ../class/m_dom.php:1518
+#: ../class/m_dom.php:731 ../class/m_dom.php:1519
msgid ""
"The last member of the domain name is incorrect or cannot be hosted in that "
"server"
@@ -4632,164 +4643,164 @@ msgstr "Algums TLD não pode ser suprimidos..."
msgid "The Whois database is unavailable, please try again later"
msgstr ""
-#: ../class/m_dom.php:1064 ../class/m_dom.php:1522
+#: ../class/m_dom.php:1064 ../class/m_dom.php:1523
msgid "The domain cannot be found in the Whois database"
msgstr ""
-#: ../class/m_dom.php:1222 ../class/m_dom.php:1466
+#: ../class/m_dom.php:1223 ../class/m_dom.php:1467
#, fuzzy
msgid "The sub-domain does not exist"
msgstr "A caixa de email %s não existe!"
-#: ../class/m_dom.php:1261
+#: ../class/m_dom.php:1262
msgid "invalid url"
msgstr ""
-#: ../class/m_dom.php:1271
+#: ../class/m_dom.php:1272
#, fuzzy
msgid "The folder you entered is incorrect or does not exist"
msgstr "Membro '%s' não existe"
-#: ../class/m_dom.php:1280 ../class/m_dom.php:1288
+#: ../class/m_dom.php:1281 ../class/m_dom.php:1289
#, fuzzy
msgid "The ip address is invalid"
msgstr "Lista de caixas de email do domínio %s"
-#: ../class/m_dom.php:1296
+#: ../class/m_dom.php:1297
#, fuzzy
msgid ""
"The name you entered is incorrect or not fully qualified (shall end with a .)"
msgstr "Membro '%s' não existe"
-#: ../class/m_dom.php:1304
+#: ../class/m_dom.php:1305
#, fuzzy
msgid "The TXT value you entered is incorrect"
msgstr "Membro '%s' não existe"
-#: ../class/m_dom.php:1309
+#: ../class/m_dom.php:1310
msgid "Invalid domain type selected, please check"
msgstr ""
-#: ../class/m_dom.php:1384
+#: ../class/m_dom.php:1385
msgid ""
"There is some forbidden characters in the sub domain (only A-Z 0-9 and - are "
"allowed)"
msgstr ""
-#: ../class/m_dom.php:1423 ../class/m_dom.php:1434
+#: ../class/m_dom.php:1424 ../class/m_dom.php:1435
msgid "Cannot write to the destination folder"
msgstr ""
-#: ../class/m_dom.php:1526
+#: ../class/m_dom.php:1527
msgid ""
"The DNS of this domain do not match the server's DNS. Please change your "
"domain's DNS before you install it again"
msgstr ""
-#: ../class/m_dom.php:1543
+#: ../class/m_dom.php:1544
#, fuzzy, php-format
msgid "The domain name %s does not exist"
msgstr "A caixa de email %s não existe!"
-#: ../class/m_dom.php:1550
+#: ../class/m_dom.php:1551
#, fuzzy
msgid "No change has been requested..."
msgstr "Suas preferências foram atualizadas."
-#: ../class/m_dom.php:1558 ../class/m_dom.php:1563
+#: ../class/m_dom.php:1559 ../class/m_dom.php:1564
msgid ""
"There is no MX record pointing to this server, and you are asking us to host "
"the mail here. Make sure to update your MX entries or no mail will be "
"received"
msgstr ""
-#: ../class/m_dom.php:1614 ../class/m_dom.php:1639
+#: ../class/m_dom.php:1615 ../class/m_dom.php:1640
msgid "The IP address you entered is incorrect"
msgstr ""
-#: ../class/m_dom.php:1732 ../class/m_dom.php:1738 ../class/m_dom.php:1756
-#: ../class/m_dom.php:1762
+#: ../class/m_dom.php:1733 ../class/m_dom.php:1739 ../class/m_dom.php:1757
+#: ../class/m_dom.php:1763
#, fuzzy
msgid "This domain is not installed in your account"
msgstr "Esta conta é uma conta super-administrador"
-#: ../class/m_dom.php:1805
+#: ../class/m_dom.php:1806
msgid "The specified slave account already exists"
msgstr ""
-#: ../class/m_dom.php:1836
+#: ../class/m_dom.php:1837
msgid "--- Program error --- Lock already obtained!"
msgstr ""
-#: ../class/m_dom.php:2182
+#: ../class/m_dom.php:2183
#, php-format
msgid ""
"Problem on %s: there is more than 1 web configuration going to be generated "
"for this sub-domain."
msgstr ""
-#: ../class/m_dom.php:2191
+#: ../class/m_dom.php:2192
#, php-format
msgid "Problem on %s: we do not know domain's type %s."
msgstr ""
-#: ../class/m_dom.php:2202
+#: ../class/m_dom.php:2203
#, fuzzy
msgid "Locally hosted"
msgstr "Controlado localemente"
-#: ../class/m_dom.php:2203
+#: ../class/m_dom.php:2204
#, fuzzy
msgid "URL redirection"
msgstr "Redireção URL"
-#: ../class/m_dom.php:2204
+#: ../class/m_dom.php:2205
msgid "IPv4 redirect"
msgstr ""
-#: ../class/m_dom.php:2205
-msgid "Webmail access"
-msgstr "Acesso Webmail"
-
#: ../class/m_dom.php:2206
-#, fuzzy
-msgid "Squirrelmail Webmail access"
+msgid "Webmail access"
msgstr "Acesso Webmail"
#: ../class/m_dom.php:2207
#, fuzzy
-msgid "Roundcube Webmail access"
+msgid "Squirrelmail Webmail access"
msgstr "Acesso Webmail"
#: ../class/m_dom.php:2208
+#, fuzzy
+msgid "Roundcube Webmail access"
+msgstr "Acesso Webmail"
+
+#: ../class/m_dom.php:2209
msgid "IPv6 redirect"
msgstr ""
-#: ../class/m_dom.php:2209
+#: ../class/m_dom.php:2210
msgid "CNAME DNS entry"
msgstr ""
-#: ../class/m_dom.php:2210
+#: ../class/m_dom.php:2211
msgid "TXT DNS entry"
msgstr ""
-#: ../class/m_dom.php:2211
+#: ../class/m_dom.php:2212
msgid "MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2212
+#: ../class/m_dom.php:2213
msgid "secondary MX DNS entry"
msgstr ""
-#: ../class/m_dom.php:2213
+#: ../class/m_dom.php:2214
msgid "Default mail server"
msgstr ""
-#: ../class/m_dom.php:2214
+#: ../class/m_dom.php:2215
msgid "Default backup mail server"
msgstr ""
-#: ../class/m_dom.php:2215
+#: ../class/m_dom.php:2216
#, fuzzy
msgid "AlternC panel access"
msgstr "Lista de contas FTP"
@@ -5511,6 +5522,10 @@ msgstr ""
msgid "Real Media File"
msgstr ""
+#, fuzzy
+#~ msgid "Editing subdomains of %s"
+#~ msgstr "Editando o domínio %s"
+
#, fuzzy
#~ msgid "The name you entered is incorrect"
#~ msgstr "Membro '%s' não existe"
diff --git a/wheezy/changelog.diff b/wheezy/changelog.diff
index b6224871..e248a56c 100644
--- a/wheezy/changelog.diff
+++ b/wheezy/changelog.diff
@@ -1,13 +1,13 @@
--- changelog 2014-06-24 13:42:50.234304438 +0200
+++ changelog.wheezy 2014-06-24 13:43:51.978313552 +0200
@@ -1,3 +1,10 @@
-+alternc (3.2.6) stable; urgency=low
++alternc (3.2.7) oldstable; urgency=low
+
+ * Version identical to 3.1 for Squeeze
+ * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy
+
-+ -- Benjamin Sonntag Thu, 7 May 2015 18:19:00 +0100
++ -- Benjamin Sonntag Thu, 16 Jun 2015 18:19:00 +0100
+
- alternc (3.1.6) oldstable; urgency=low
+ alternc (3.1.7) oldoldstable; urgency=low
- * add SSL and API alternc packages (Beta)
+ * fix added autocomplete="off" to password fields (not login form)