diff --git a/bureau/admin/adm_var_edit.php b/bureau/admin/adm_var_edit.php
deleted file mode 100644
index 54f1c991..00000000
--- a/bureau/admin/adm_var_edit.php
+++ /dev/null
@@ -1,341 +0,0 @@
- array ("get", "string", null),
- "var_id" => array ("post", "integer", null),
- "var_value" => array ("post", "string", null),
- "var_value_arr" => array ("post", "array", null),
- "var_name" => array ("post", "string", null),
- "strata" => array ("post", "string", null),
- "strata_id" => array ("post", "integer", null),
- "delete" => array ("post", "boolean", false),
-);
-getFields($fields);
-
-/* * /
-// Variable pour test
-variable_get("aaa_test3",
-array(
- "ns1"=>
- array(
- "ns"=>"ns1.%%FQDN%%",
- "ip"=>"%%PUBLIC_IP%%",
- "enabled"=>"%%ENABLED%%"),
- "ns2"=>
- array(
- "ns"=>"fdsffsd",
- "ip"=>"fdsfdfds",
- "enabled"=>"fds"),
- 'ns55'=> 'arf'
-),
-"This is a test!",
-array(
- "ns1"=>
- array(
- "ns"=>
- array(
- 'desc'=>"ns name",
- 'type'=>'string'),
- "ip"=>
- array(
- 'desc'=>"ip address",
- 'type'=>'ip'),
- "enabled"=>
- array(
- 'desc'=>"enabled",
- 'type'=>"boolean"),
- ),
- "ns2"=>array(
- "ns"=>
- array(
- 'desc'=>"ns name",
- 'type'=>'string'),
- "ip"=>
- array(
- 'desc'=>"ip address",
- 'type'=>'ip'),
- "enabled"=>
- array(
- 'desc'=>"enabled",
- 'type'=>"boolean"),
- ),
- "ns3"=>array(
- "desc"=>"here another",
- "type"=>"integer",
- ),
-)
-);
-/* */
-
-
-if (empty($var)) {
- echo "
";__("Missing var name");echo "
";
- include_once("foot.php");
- die();
-}
-
-// Which one between var_value and var_value_arr ?
-$var_v = null;
-if (!is_null($var_value)) $var_v = $var_value;
-if (!is_null($var_value_arr)) $var_v = $var_value_arr;
-
-
-if ( $var_id && $delete ) {
- $variables->del($var_id);
-} else if ( $strata && $var_name && $var_v ) {
- $variables->variable_update_or_create($var_name, $var_v, $strata, $strata_id);
-} else if ( $var_id && $var_v ) {
- $variables->variable_update_or_create($var_name, $var_v, null, null, $var_id);
-}
-
-echo "";echo sprintf(_("Edition of var %s"), $var); echo "
";
-
-$members = $admin->get_list();
-$panel_url = $fqdn=$dom->get_panel_url_list();
-
-$allvars = $variables->variables_list();
-
-$members_list=array();
-foreach($admin->get_list() as $mid=>$mlogin) {
- $members_list[$mid] = $mlogin['login'];
-}
-
-$creators_list=array();
-foreach($admin->get_creator_list() as $mid=>$mlogin) {
- $creators_list[$mid] = $mlogin['login'];
-}
-$variablesList = $variables->variables_list_name();
-echo "";
-
-echo "
";
-
-function var_input($infotype, $name, $value='') {
- $id = rand();
- echo "";
- switch(strtolower($infotype['type'])) {
- case "string":
- echo " ";
- echo ""._("Value expected: string")."";
- break;
- case "integer":
- echo " ";
- echo ""._("Value expected: integer")."";
- break;
- case "ip":
- echo " ";
- echo ""._("Value expected: IP address")."";
- break;
- case "boolean":
- echo ""; // This way, there is allways something send, even if checkbox is unchecked
- echo "";
- break;
- default:
- echo "WTF ? Dunno what to do with a ".$infotype['type'];
- break;
- }
-}
-
-function edit_var($var_arr) {
- global $allvars;
- echo "";
- echo "";
-
-}
-
-function add_var($stratatata, $stratatata_arr=null) {
- global $var, $allvars;
- echo "";
- echo "";
-
-}
-
-echo "";
-
-foreach ( $variables->strata_order as $strata) {
- echo "";
- echo ""; __($strata); echo " | ";
- switch($strata) {
- case 'DEFAULT':
- echo ""; $variables->display_value_html($allvars, 'DEFAULT', null, $var); echo " | ";
- break;
- case 'GLOBAL':
- echo "";
- if ( isset($allvars['GLOBAL'][null][$var]) && is_array($allvars['GLOBAL'][null][$var])){
- echo ""; $variables->display_value_html($allvars, 'GLOBAL', null, $var); echo "";
- edit_var($allvars['GLOBAL'][null][$var]);
- } else {
- echo ""._("Add")."";
- add_var($strata);
- }
- echo " | ";
- break;
- case 'FQDN_CREATOR':
- echo "";
- if (isset($allvars['FQDN_CREATOR']) && is_array($allvars['FQDN_CREATOR'])) {
- foreach ($allvars['FQDN_CREATOR'] as $ttk => $ttv ) {
- if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
- echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." → ";
- echo ""; $variables->display_valueraw_html($ttv[$var]['value'], $var);echo "";
- edit_var($ttv[$var]);
- }
- echo " ";
- }
- } // isset
- echo ""._("Add")."";
- add_var($strata, $members_list);
- echo " | ";
- break;
- case 'FQDN':
- echo "";
- if ( isset($allvars['FQDN']) && is_array($allvars['FQDN'])) {
- foreach ($allvars['FQDN'] as $ttk => $ttv ) {
- if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
- echo sprintf(_("Overwritted by %s"), $panel_url[$ttk])." → ";
- echo ""; $variables->display_valueraw_html($ttv[$var]['value'], $var);echo "";
- edit_var($ttv[$var]);
- }
- echo " ";
- }
- } //isset
- echo ""._("Add")."";
- add_var($strata, $panel_url);
- echo " | ";
- break;
- case 'CREATOR':
- echo "";
- if (isset($allvars['CREATOR']) && is_array($allvars['CREATOR'])) {
- foreach ($allvars['CREATOR'] as $ttk => $ttv ) {
- if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
- echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." → ";
- echo ""; $variables->display_valueraw_html($ttv[$var]['value'], $var);echo "";
- edit_var($ttv[$var]);
- }
- echo " ";
- }
- } //isset
- echo ""._("Add")."";
- add_var($strata, $creators_list );
- echo " | ";
- break;
- case 'MEMBER':
- echo "";
- if (isset($allvars['MEMBER']) && is_array($allvars['MEMBER'])) {
- foreach ($allvars['MEMBER'] as $ttk => $ttv ) {
- if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
- echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." → ";
- echo ""; $variables->display_valueraw_html($ttv[$var]['value'], $var);echo "";
- edit_var($ttv[$var]);
- }
- echo " ";
- }
- } //isset
- echo ""._("Add")."";
- add_var($strata, $members_list);
- echo " | ";
- break;
- case 'DOMAIN':
- //FIXME TODO
- echo "Todo. | ";
- break;
- } //switch
-
- echo "
";
-} //foreach
-echo "
";
-
-?>
-
-
-
-
-
diff --git a/bureau/locales/de_DE/LC_MESSAGES/messages.po b/bureau/locales/de_DE/LC_MESSAGES/messages.po
index 716f5ae0..52072ca2 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2004-02-14 19:53-0400\n"
"Last-Translator: Bruno Marmier \n"
"Language-Team: Espagnol \n"
@@ -229,8 +229,7 @@ msgstr ""
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -308,13 +307,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr ""
@@ -490,7 +488,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1429,53 +1427,6 @@ msgstr ""
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-#, fuzzy
-msgid "Missing var name"
-msgstr "Passwört"
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr ""
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr ""
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -3794,6 +3745,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4214,15 +4169,15 @@ msgstr "Miglied '%s' existiert nicht"
msgid "This directory is not readable."
msgstr "Miglied '%s' existiert nicht"
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4265,15 +4220,15 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr ""
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
@@ -5221,6 +5176,10 @@ msgstr ""
msgid "Real Media File"
msgstr ""
+#, fuzzy
+#~ msgid "Missing var name"
+#~ msgstr "Passwört"
+
#, fuzzy
#~ msgid "The database user was not found"
#~ msgstr "Miglied '%s' existiert nicht"
diff --git a/bureau/locales/en_US/LC_MESSAGES/messages.po b/bureau/locales/en_US/LC_MESSAGES/messages.po
index 17c2e82c..7d702e09 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2002-06-16 13:50CEST\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: French \n"
@@ -224,8 +224,7 @@ msgstr ""
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -303,13 +302,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr ""
@@ -482,7 +480,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1417,52 +1415,6 @@ msgstr ""
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-msgid "Missing var name"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr ""
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr ""
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -3763,6 +3715,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4178,15 +4134,15 @@ msgstr ""
msgid "This directory is not readable."
msgstr ""
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4229,15 +4185,15 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr ""
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
diff --git a/bureau/locales/es_ES/LC_MESSAGES/messages.po b/bureau/locales/es_ES/LC_MESSAGES/messages.po
index e92a974c..548dd459 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2008-09-05 16:50+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -246,8 +246,7 @@ msgstr "Crear la cuenta FTP."
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -328,13 +327,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr "Borrar"
@@ -524,7 +522,7 @@ msgid "Value"
msgstr "Valor"
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1544,56 +1542,6 @@ msgstr "Modificar este TLD"
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-#, fuzzy
-msgid "Missing var name"
-msgstr "Modificar dominio %s"
-
-#: ../admin/adm_var_edit.php:100
-#, fuzzy, php-format
-msgid "Edition of var %s"
-msgstr "Modificar dominio %s"
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ../admin/adm_var_edit.php:184
-#, fuzzy
-msgid "Are you sure you want to delete it."
-msgstr "Elige el archivo que contiene los datos SQL por restaurar en la base."
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-#, fuzzy
-msgid "Add"
-msgstr "Dirección IP"
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-#, fuzzy
-msgid "Back to the var list"
-msgstr "Regresar a la lista de cuentas"
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr "He aquí las variables internas confirgurables de AlternC."
@@ -4092,6 +4040,10 @@ msgstr "Derechos MySQL para %s"
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr "Aplicar"
+
#: ../admin/stats_members.php:32
#, fuzzy
msgid ""
@@ -4534,15 +4486,15 @@ msgstr "El usuario no existe"
msgid "This directory is not readable."
msgstr "El usuario no existe"
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4585,16 +4537,16 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
#, fuzzy
msgid "File not in authorized directory"
msgstr "Ningún usuario autorizado en %s"
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
@@ -5581,6 +5533,27 @@ msgstr "Animación Flash"
msgid "Real Media File"
msgstr "Archivo Real Media"
+#, fuzzy
+#~ msgid "Missing var name"
+#~ msgstr "Modificar dominio %s"
+
+#, fuzzy
+#~ msgid "Edition of var %s"
+#~ msgstr "Modificar dominio %s"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete it."
+#~ msgstr ""
+#~ "Elige el archivo que contiene los datos SQL por restaurar en la base."
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Dirección IP"
+
+#, fuzzy
+#~ msgid "Back to the var list"
+#~ msgstr "Regresar a la lista de cuentas"
+
#, fuzzy
#~ msgid "Default value"
#~ msgstr "Valores por omisión"
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 936b2b26..d79013db 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -9,7 +9,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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2015-04-27 09:01+0200\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: français \n"
@@ -242,8 +242,7 @@ msgstr "Créer ce compte AlternC"
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -325,13 +324,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr "Effacer"
@@ -518,7 +516,7 @@ msgid "Value"
msgstr "Valeur"
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr "Description"
@@ -1530,52 +1528,6 @@ msgstr ""
"Il manque la variable INOTIFY_UPDATE_DOMAIN dans /etc/alternc/local.sh . "
"Ajoutez-la !"
-#: ../admin/adm_var_edit.php:81
-msgid "Missing var name"
-msgstr "Nom de variable manquant"
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr "Modification de la variable %s"
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr "Valeur attendue : chaîne "
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr "Valeur attendue : nombre entier"
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr "Valeur attendue : Adresse IP"
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr "Appliquer"
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr "Voulez-vous vraiment le supprimer ?"
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr "Écrasé par %s"
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr "Retour à la liste des variables"
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr "Voici les variables internes de configurables dans AlternC."
@@ -4013,6 +3965,10 @@ msgstr "Droits MySQL pour %s"
msgid "Reverse selection"
msgstr "Inverse la sélection"
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr "Appliquer"
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4453,15 +4409,15 @@ msgstr "Le dossier n'existe pas"
msgid "This directory is not readable."
msgstr "Le dossier n'existe pas"
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr "Impossible de créer le dossier demandé, vérifiez les droits d'accès"
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr "Nom de fichier ou de dossier incorrect"
@@ -4506,15 +4462,15 @@ msgstr ""
"Je ne trouve pas de moyen d'extraire le fichiers %s, il semble être dans un "
"format de compression non géré"
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr "Impossible de lire le fichier demandé. Vérifiez les droits d'accès"
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr "Le fichier n'est pas dans un dossier autorisé"
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr "Impossible de modifier le fichier demandé. Vérifiez les droits d'accès"
@@ -5528,6 +5484,33 @@ msgstr "Animation Flash"
msgid "Real Media File"
msgstr "Fichier Real Media"
+#~ msgid "Missing var name"
+#~ msgstr "Nom de variable manquant"
+
+#~ msgid "Edition of var %s"
+#~ msgstr "Modification de la variable %s"
+
+#~ msgid "Value expected: string"
+#~ msgstr "Valeur attendue : chaîne "
+
+#~ msgid "Value expected: integer"
+#~ msgstr "Valeur attendue : nombre entier"
+
+#~ msgid "Value expected: IP address"
+#~ msgstr "Valeur attendue : Adresse IP"
+
+#~ msgid "Are you sure you want to delete it."
+#~ msgstr "Voulez-vous vraiment le supprimer ?"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Overwritted by %s"
+#~ msgstr "Écrasé par %s"
+
+#~ msgid "Back to the var list"
+#~ msgstr "Retour à la liste des variables"
+
#~ msgid "Default value"
#~ msgstr "Valeur par défaut"
diff --git a/bureau/locales/it_IT/LC_MESSAGES/messages.po b/bureau/locales/it_IT/LC_MESSAGES/messages.po
index 546ce9b4..63b58646 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -224,8 +224,7 @@ msgstr ""
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -303,13 +302,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr ""
@@ -482,7 +480,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1417,52 +1415,6 @@ msgstr ""
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-msgid "Missing var name"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr ""
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr ""
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -3763,6 +3715,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4178,15 +4134,15 @@ msgstr ""
msgid "This directory is not readable."
msgstr ""
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4229,15 +4185,15 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr ""
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
diff --git a/bureau/locales/messages.pot b/bureau/locales/messages.pot
index 16aac866..acc9c185 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -224,8 +224,7 @@ msgstr ""
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -303,13 +302,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr ""
@@ -482,7 +480,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1417,52 +1415,6 @@ msgstr ""
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-msgid "Missing var name"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr ""
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr ""
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -3763,6 +3715,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4178,15 +4134,15 @@ msgstr ""
msgid "This directory is not readable."
msgstr ""
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4229,15 +4185,15 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr ""
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
diff --git a/bureau/locales/nl_NL/LC_MESSAGES/messages.po b/bureau/locales/nl_NL/LC_MESSAGES/messages.po
index e67311ee..ebfd7f55 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2012-10-17 09:52+0200\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: Dutch \n"
@@ -224,8 +224,7 @@ msgstr ""
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -303,13 +302,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr ""
@@ -482,7 +480,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr ""
@@ -1417,52 +1415,6 @@ msgstr ""
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-msgid "Missing var name"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:100
-#, php-format
-msgid "Edition of var %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-msgid "Are you sure you want to delete it."
-msgstr ""
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-msgid "Add"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-msgid "Back to the var list"
-msgstr ""
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -3763,6 +3715,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4178,15 +4134,15 @@ msgstr ""
msgid "This directory is not readable."
msgstr ""
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4229,15 +4185,15 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
msgid "File not in authorized directory"
msgstr ""
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
diff --git a/bureau/locales/pt_BR/LC_MESSAGES/messages.po b/bureau/locales/pt_BR/LC_MESSAGES/messages.po
index da978a2e..44905407 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-04-27 09:02+0200\n"
+"POT-Creation-Date: 2015-04-29 14:23+0200\n"
"PO-Revision-Date: 2007-10-25 23:50-0400\n"
"Last-Translator: Benjamin Sonntag \n"
"Language-Team: English \n"
@@ -238,8 +238,7 @@ msgstr "Criar está nova conta FTP."
#: ../admin/adm_add.php:141 ../admin/adm_deactivate.php:75
#: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
#: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
-#: ../admin/adm_tldedit.php:70 ../admin/adm_var_edit.php:182
-#: ../admin/adm_var_edit.php:226 ../admin/bro_pref.php:150
+#: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
#: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
#: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
@@ -319,13 +318,12 @@ 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/adm_var_edit.php:184
-#: ../admin/bro_main.php:283 ../admin/cron.php:54 ../admin/dom_edit.php:127
-#: ../admin/dom_edit.php:168 ../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 ../admin/piwik_user_dodel.php:68
-#: ../admin/piwik_userlist.php:87
+#: ../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/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
+#: ../admin/piwik_user_dodel.php:68 ../admin/piwik_userlist.php:87
msgid "Delete"
msgstr "Suprimir"
@@ -509,7 +507,7 @@ msgid "Value"
msgstr ""
#: ../admin/adm_dnsweberror.php:58 ../admin/adm_domstype.php:60
-#: ../admin/adm_domstypeedit.php:78 ../admin/adm_var_edit.php:117
+#: ../admin/adm_domstypeedit.php:78
msgid "Description"
msgstr "Descição"
@@ -1516,58 +1514,6 @@ msgstr "Editar este TLD"
msgid "Missing INOTIFY_UPDATE_DOMAIN var in /etc/alternc/local.sh . Fix it!"
msgstr ""
-#: ../admin/adm_var_edit.php:81
-#, fuzzy
-msgid "Missing var name"
-msgstr "Editando o domínio %s"
-
-#: ../admin/adm_var_edit.php:100
-#, fuzzy, php-format
-msgid "Edition of var %s"
-msgstr "Editando o domínio %s"
-
-#: ../admin/adm_var_edit.php:129
-msgid "Value expected: string"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:133
-msgid "Value expected: integer"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:137
-msgid "Value expected: IP address"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:183 ../admin/adm_var_edit.php:227
-#: ../admin/sql_users_rights.php:103
-msgid "Apply"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:184
-#, fuzzy
-msgid "Are you sure you want to delete it."
-msgstr ""
-"Por favor entrar o nome de arquivo que contem os dados do SQL que precisam "
-"restaurar."
-
-#: ../admin/adm_var_edit.php:248 ../admin/adm_var_edit.php:265
-#: ../admin/adm_var_edit.php:281 ../admin/adm_var_edit.php:297
-#: ../admin/adm_var_edit.php:313
-#, fuzzy
-msgid "Add"
-msgstr "Endereço email"
-
-#: ../admin/adm_var_edit.php:258 ../admin/adm_var_edit.php:274
-#: ../admin/adm_var_edit.php:290 ../admin/adm_var_edit.php:306
-#, php-format
-msgid "Overwritted by %s"
-msgstr ""
-
-#: ../admin/adm_var_edit.php:329
-#, fuzzy
-msgid "Back to the var list"
-msgstr "Lista de contas FTP"
-
#: ../admin/adm_variables.php:52
msgid "Here are the internal AlternC variables that are currently being used."
msgstr ""
@@ -4063,6 +4009,10 @@ msgstr ""
msgid "Reverse selection"
msgstr ""
+#: ../admin/sql_users_rights.php:103
+msgid "Apply"
+msgstr ""
+
#: ../admin/stats_members.php:32
msgid ""
"Image_Graph not installed. use 'aptitude install php-pear' then 'pear "
@@ -4501,15 +4451,15 @@ msgstr "Membro '%s' não existe"
msgid "This directory is not readable."
msgstr "Membro '%s' não existe"
-#: ../class/m_bro.php:406 ../class/m_bro.php:1170
+#: ../class/m_bro.php:406 ../class/m_bro.php:1168
msgid "Cannot create the requested directory. Please check the permissions"
msgstr ""
#: ../class/m_bro.php:412 ../class/m_bro.php:433 ../class/m_bro.php:461
#: ../class/m_bro.php:487 ../class/m_bro.php:521 ../class/m_bro.php:531
#: ../class/m_bro.php:562 ../class/m_bro.php:605 ../class/m_bro.php:666
-#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:811
-#: ../class/m_bro.php:977 ../class/m_bro.php:1007
+#: ../class/m_bro.php:709 ../class/m_bro.php:714 ../class/m_bro.php:809
+#: ../class/m_bro.php:975 ../class/m_bro.php:1005
msgid "File or folder name is incorrect"
msgstr ""
@@ -4552,16 +4502,16 @@ msgid ""
"format"
msgstr ""
-#: ../class/m_bro.php:807
+#: ../class/m_bro.php:805
msgid "Cannot read the requested file. Please check the permissions"
msgstr ""
-#: ../class/m_bro.php:885
+#: ../class/m_bro.php:883
#, fuzzy
msgid "File not in authorized directory"
msgstr "No authorized user in %s"
-#: ../class/m_bro.php:1002
+#: ../class/m_bro.php:1000
msgid "Cannot edit the requested file. Please check the permissions"
msgstr ""
@@ -5549,6 +5499,28 @@ msgstr ""
msgid "Real Media File"
msgstr ""
+#, fuzzy
+#~ msgid "Missing var name"
+#~ msgstr "Editando o domínio %s"
+
+#, fuzzy
+#~ msgid "Edition of var %s"
+#~ msgstr "Editando o domínio %s"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete it."
+#~ msgstr ""
+#~ "Por favor entrar o nome de arquivo que contem os dados do SQL que "
+#~ "precisam restaurar."
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "Endereço email"
+
+#, fuzzy
+#~ msgid "Back to the var list"
+#~ msgstr "Lista de contas FTP"
+
#, fuzzy
#~ msgid "See the vars for the account"
#~ msgstr "Mudar o email da sua conta"
diff --git a/install/mysql.sql b/install/mysql.sql
index 4d30ae8b..41344c0f 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -390,12 +390,9 @@ CREATE TABLE `variable` (
`name` varchar(48) NOT NULL DEFAULT '',
`value` longtext NOT NULL,
`comment` mediumtext,
- `strata` enum('DEFAULT','GLOBAL','FQDN','FQDN_CREATOR','CREATOR','MEMBER','DOMAIN') NOT NULL DEFAULT 'DEFAULT',
- `strata_id` bigint(20) DEFAULT NULL,
`type` text,
PRIMARY KEY (`id`),
- UNIQUE KEY `name_2` (`name`,`strata`,`strata_id`),
- KEY `name` (`name`)
+ UNIQUE KEY `name` (`name`),
) ENGINE=MyISAM;
--