diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 4a51d7d5792858a11c59810a22391ac0f967cfda..ed0ac4660fe4ea1df20eab685d2fa2439d76ad02 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -14,14 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
*/
/**
\file htdocs/admin/tools/dolibarr_export.php
+ \ingroup core
\brief Page export de la base
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
@@ -182,10 +181,10 @@ function show_checked_option() {
<fieldset id="mysql_options">
- <legend>Parametres de l'export MySQL</legend>
+ <legend><?php echo $langs->trans("MySqlExportParameters"); ?></legend>
<div class="formelementrow">
- Chemin complet de la commande mysqldump:<br />
+ <?php echo $langs->trans("FullPathToMysqldumpCommand"); ?><br />
<input type="text" name="mysqldump" size="80"
value="<?php echo $conf->global->SYSTEMTOOLS_MYSQLDUMP ?>" />
</div>
@@ -195,7 +194,7 @@ function show_checked_option() {
id="checkbox_use_transaction"
/>
<label for="checkbox_use_transaction">
- Utiliser le mode transactionnel</label>
+ <?php echo $langs->trans("UseTransactionnalMode"); ?></label>
</div>
@@ -204,10 +203,10 @@ function show_checked_option() {
id="checkbox_disable_fk" checked="true"
/>
<label for="checkbox_disable_fk">
- Ordre de d�sactivation des cl�s �trang�res � l'import</label>
+ <?php echo $langs->trans("CommandsToDisableForeignKeysForImport"); ?></label>
</div>
<label for="select_sql_compat">
- Compatibilit� de l'exportation:</label>
+ <?php echo $langs->trans("ExportCompatibility"); ?></label>
<select name="sql_compat" id="select_sql_compat">
<option value="NONE" selected="selected">NONE</option>
@@ -221,13 +220,11 @@ function show_checked_option() {
<option value="POSTGRESQL">POSTGRESQL</option>
</select>
<fieldset>
- <legend>Options d'exportation</legend>
+ <legend><?php echo $langs->trans("ExportOptions"); ?></legend>
<input type="checkbox" name="drop_database" value="yes"
id="checkbox_drop_database"
/>
- <label for="checkbox_drop_database">
-
- Ajouter DROP DATABASE</label>
+ <label for="checkbox_drop_database"><?php echo $langs->trans("AddDropDatabase"); ?></label>
</fieldset>
<fieldset>
<legend>
@@ -243,8 +240,7 @@ function show_checked_option() {
<input type="checkbox" name="drop" value="1" id="checkbox_dump_drop"
/>
- <label for="checkbox_dump_drop">
- Inclure des �nonc�s "DROP TABLE"</label><br />
+ <label for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br />
</fieldset>
<fieldset>
@@ -256,26 +252,26 @@ function show_checked_option() {
return false;
else return true;" />
<label for="checkbox_sql_data">
- Donn�es</label>
+ <?php echo $langs->trans("Datas"); ?></label>
</legend>
<input type="checkbox" name="showcolumns" value="yes"
id="checkbox_dump_showcolumns"
/>
<label for="checkbox_dump_showcolumns">
- Nomme les colonnes</label><br />
+ <?php echo $langs->trans("NameColumn"); ?></label><br />
<input type="checkbox" name="extended_ins" value="yes"
id="checkbox_dump_extended_ins"
/>
<label for="checkbox_dump_extended_ins">
- Insertions �tendues</label><br />
+ <?php echo $langs->trans("ExtendedInsert"); ?></label><br />
<input type="checkbox" name="delayed" value="yes"
id="checkbox_dump_delayed"
/>
<label for="checkbox_dump_delayed">
- Insertions avec d�lais (DELAYED)</label><br />
+ <?php echo $langs->trans("DelayedInsert"); ?></label><br />
<input type="checkbox" name="sql_ignore" value="yes"
id="checkbox_dump_ignore"
@@ -287,7 +283,7 @@ function show_checked_option() {
id="checkbox_hexforbinary"
checked="checked" />
<label for="checkbox_hexforbinary">
- Encoder les champs binaires en hexad�cimal</label><br />
+ <?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br />
</fieldset>
</fieldset>
@@ -335,7 +331,7 @@ function show_checked_option() {
</td>
</tr>
<tr><td><label for="latex_structure_label">
- Cl� de l'�tiquette</label></td>
+ Cl� de l'�tiquette</label></td>
<td><input type="text" name="latex_structure_label" size="30"
value="tab:__TABLE__-structure"
id="latex_structure_label" />
@@ -354,7 +350,7 @@ function show_checked_option() {
return false;
else return true;" />
<label for="checkbox_latex_data">
- Donn�es</label>
+ Donn�es</label>
</legend>
<input type="checkbox" name="latex_showcolumns" value="yes"
@@ -380,7 +376,7 @@ function show_checked_option() {
</tr>
<tr><td><label for="latex_data_label">
- Cl� de l'�tiquette</label></td>
+ Cl� de l'�tiquette</label></td>
<td><input type="text" name="latex_data_label" size="30"
value="tab:__TABLE__-data"
id="latex_data_label" />
@@ -407,14 +403,14 @@ function show_checked_option() {
<table>
<tr><td><label for="export_separator">
- Champs termin�s par</label></td>
+ Champs termin�s par</label></td>
<td><input type="text" name="export_separator" size="2"
id="export_separator"
value=";" />
</td>
</tr>
<tr><td><label for="enclosed">
- Champs entour�s par</label></td>
+ Champs entour�s par</label></td>
<td><input type="text" name="enclosed" size="2"
id="enclosed"
value=""" />
@@ -422,7 +418,7 @@ function show_checked_option() {
</td>
</tr>
<tr><td><label for="escaped">
- Caract�re sp�cial</label></td>
+ Caract�re sp�cial</label></td>
<td><input type="text" name="escaped" size="2"
id="escaped"
value="\" />
@@ -430,7 +426,7 @@ function show_checked_option() {
</tr>
<tr><td><label for="add_character">
- Lignes termin�es par</label></td>
+ Lignes termin�es par</label></td>
<td><input type="text" name="add_character" size="2"
id="add_character"
value="\r\n" />
@@ -449,7 +445,7 @@ function show_checked_option() {
id="checkbox_dump_showcsvnames"
/>
<label for="checkbox_dump_showcsvnames">
- Afficher les noms de champ en premi�re ligne</label>
+ Afficher les noms de champ en premi�re ligne</label>
</fieldset>
-->
@@ -492,9 +488,9 @@ function show_checked_option() {
<fieldset>
-
+
<label for="filename_template">
- Nom du fichier � g�n�rer</label> :
+ <?php echo $langs->trans("FileNameToGenerate"); ?></label> :
<input type="text" name="filename_template" size="60" id="filename_template"
value="<?php
$file='mysqldump_'.$dolibarr_main_db_name.'_'.strftime("%Y%m%d%H%M").'.sql';
@@ -523,12 +519,12 @@ foreach($compression as $key => $val)
{
print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"';
print ' onclick="document.getElementById(\'checkbox_dump_asfile\').checked = true;" checked="checked" />';
- print ' <label for="radio_compression_none">'.$val['label'].'</label>';
+ print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
}
else
{
print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled="true">';
- print ' <label for="radio_compression_none">'.$val['label'].'</label>';
+ print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
print ' ('.$langs->trans("NotAvailable").')';
}
print ' ';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index fd29d6de87a591e83a3157d052e56f1aaf42d99c..167522d06ab3c618a479200412103b750192cd4b 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -14,14 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
*/
/**
\file htdocs/admin/tools/export.php
\brief Page export de la base
- \version $Revision$
+ \version $Id$
*/
require("./pre.inc.php");
@@ -164,6 +162,7 @@ if ($what == 'mysql')
}
else
{
+ $langs->load("errors");
dolibarr_syslog("Failed to open file $outputfile",LOG_ERR);
$errormsg=$langs->trans("ErrorFailedToWriteInDir");
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c3a679c4b01a77660bab83a718901b02d100378a..6b5da6cfb15d053fc82eb954293341f39a985bac 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -106,6 +106,20 @@ ImportMethod=Import method
ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
ImportMySqlCommand=%s %s < mybackupfile.sql
+FileNameToGenerate=File name to generate
+CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
+ExportCompatibility=Compatibilit� du fichier export g�n�r�
+MySqlExportParameters=MySql export parameters
+UseTransactionnalMode=Use transactionnal mode
+FullPathToMysqldumpCommand=Full path to mysqldump command
+ExportOptions=Export Options
+AddDropDatabase=Add DROP DATABASE command
+AddDropTable=Add DROP TABLE command
+Datas=Datas
+NameColumn=Name columns
+ExtendedInsert=Extended INSERT
+DelayedInsert=Insert with delays
+EncodeBinariesInHexa=Encode binary datas in hexadecimal
Yes=Yes
No=No
AutoDetectLang=Autodetect (browser language)
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 7d51540f99419d9019b51c605ffa2f460e8449f1..8e6e64858341dc7ff66e88d372227d63b927e885 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -13,6 +13,7 @@ ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
ErrorSupplierCodeRequired=Supplier code required
ErrorSupplierCodeAlreadyUsed=Supplier code already used
ErrorBadParameters=Bad parameters
+ErrorFailedToWriteInDir=Failed to write in directory %s
UserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities.
ErrorFieldsRequired=Some required fields were not filled.
ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 8acedeac8ac6d5ed628f928eead625048818be00..7acdb5e87cc2a842421f350fcc3578038408cd72 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -106,6 +106,20 @@ ImportMethod=M
ToBuildBackupFileClickHere=Pour g�n�rer un fichier de sauvegarde, cliquez <a href="%s">ici</a>.
ImportMySqlDesc=Pour importer une sauvegarde, il faut utiliser la commande mysql en ligne suivante:
ImportMySqlCommand=%s %s < monfichierbackup.sql
+FileNameToGenerate=Nom du fichier � g�n�rer
+CommandsToDisableForeignKeysForImport=Commande pour d�sactiver les cl�s �trang�res � l'import
+ExportCompatibility=Compatibilit� du fichier export g�n�r�
+MySqlExportParameters=Param�tres de l'export MySql
+UseTransactionnalMode=Utiliser le mode transactionnel
+FullPathToMysqldumpCommand=Chemin complet vers la commande mysqldump
+ExportOptions=Options d'exportation
+AddDropDatabase=Ajouter ordres DROP DATABASE
+AddDropTable=Ajouter ordres DROP TABLE
+Datas=Donn�es
+NameColumn=Nomme les colonnes
+ExtendedInsert=Instructions INSERT �tendues
+DelayedInsert=Insertion avec d�lais
+EncodeBinariesInHexa=Encoder les champs binaires en hexad�cimal
Yes=Oui
No=Non
AutoDetectLang=D�tection auto (navigateur)
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 2166c4ed6ecf0ff6ec3b472da28b73efdb5ff947..8c7d95f5f7a1b8a5e2c1aa4612feb16671016ab9 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -13,6 +13,7 @@ ErrorBadSupplierCodeSyntax=La syntaxe du code fournisseur est incorrect
ErrorSupplierCodeRequired=Code fournisseur obligatoire
ErrorSupplierCodeAlreadyUsed=Code fournisseur deja utilise
ErrorBadParameters=Parametres incorrects
+ErrorFailedToWriteInDir=Impossible d'�crire dans le r�pertoire %s
UserCannotBeDelete=L'utilisateur ne peut pas etre supprim�e. Peut-�tre est-il associ� � des �l�ments de Dolibarr.
ErrorFieldsRequired=Des champs obligatoires n'ont pas �t� renseign�s
ErrorFailedToCreateDir=Echec a la creation d'un repertoire. Verifiez que le user du serveur Web a bien les droits d'ecriture dans les repertoires documents de Dolibarr. Si le parametre <b>safe_mode</b> a �t� activ� sur ce PHP, v�rifier que les fichiers php dolibarr appartiennent � l'utilisateur du serveur Web.