diff --git a/ecrire/inc_lang.php3 b/ecrire/inc_lang.php3
index 5ae9a8e0d4d6a82c6371872c097d7c1c37393a09..0fc4dda56ae95b79dcdc5ee182999993ea0af723 100644
--- a/ecrire/inc_lang.php3
+++ b/ecrire/inc_lang.php3
@@ -20,7 +20,7 @@ function charger_langue($lang, $module='spip') {
 		// le francais, qui *par definition* doit exister, et on copie le
 		// tableau 'fr' dans la var liee a la langue
 		include_ecrire ("lang/${module}_fr.php3");
-		$GLOBALS["i18n__".$module.'_'.$lang] = $GLOBALS["i18n__".$module.'_'.'fr'];
+		$GLOBALS["i18n_".$module.'_'.$lang] = $GLOBALS["i18n_".$module.'_'.'fr'];
 	}
 
 	// surcharge perso
@@ -85,12 +85,12 @@ function traduire_chaine($code, $args) {
 	if (ereg("^([a-z]+):(.*)$", $code, $regs)) {
 		$module = $regs[1];
 		$code = $regs[2];
-		$var = "i18n__".$module."_".$spip_lang;
-	} else {
+	} else
 		$module = 'spip';
-		$var = "i18n_".$spip_lang;
-	}
+
+	$var = "i18n_".$module."_".$spip_lang;
 	if (!$GLOBALS[$var]) charger_langue($spip_lang, $module);
+
 	$text = $GLOBALS[$var][$code];
 
 	if (!is_array($args)) return $text;
diff --git a/ecrire/lang/spip_ar.php3 b/ecrire/lang/spip_ar.php3
index 34228ad801a4ffc28af7b84fc2dfebf67571073f..2f6415e47f3020c0a164263612d8323099303f44 100644
--- a/ecrire/lang/spip_ar.php3
+++ b/ecrire/lang/spip_ar.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_ar'] = array(
+$GLOBALS['i18n_spip_ar'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_cpf.php3 b/ecrire/lang/spip_cpf.php3
index 25b1f57bf6e1a380e24c4c6c8b7fad54095348ef..6805dcc1ba9c574e33a48a2eac942e022973e405 100644
--- a/ecrire/lang/spip_cpf.php3
+++ b/ecrire/lang/spip_cpf.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_cpf'] = array(
+$GLOBALS['i18n_spip_cpf'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_da.php3 b/ecrire/lang/spip_da.php3
index 56d09d3786d935e3a8be19c6c42e029b939acce3..5f7c49a25999ff09e977363a46573c83709c9514 100644
--- a/ecrire/lang/spip_da.php3
+++ b/ecrire/lang/spip_da.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_da'] = array(
+$GLOBALS['i18n_spip_da'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_de.php3 b/ecrire/lang/spip_de.php3
index 38fa0910b452a292169d14e3047d75ba2b813d72..3a36c8a9489df00e9662181e485df7b3fd22f459 100644
--- a/ecrire/lang/spip_de.php3
+++ b/ecrire/lang/spip_de.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_de'] = array(
+$GLOBALS['i18n_spip_de'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_en.php3 b/ecrire/lang/spip_en.php3
index f52167228c212a9832bdb138f598f29ded7170c0..9ed5040ae43b1bcb3f57f9ad70f85ddc1dab16fd 100644
--- a/ecrire/lang/spip_en.php3
+++ b/ecrire/lang/spip_en.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_en'] = array(
+$GLOBALS['i18n_spip_en'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_eo.php3 b/ecrire/lang/spip_eo.php3
index 3a7670bc468a3cab5c6a70670b0b9478a50dda64..433d0f99fce75fe97b1249556cabd862c1c91bf4 100644
--- a/ecrire/lang/spip_eo.php3
+++ b/ecrire/lang/spip_eo.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_eo'] = array(
+$GLOBALS['i18n_spip_eo'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_es.php3 b/ecrire/lang/spip_es.php3
index 9f705bcaccb1ed1599d5eda338db195be81dab1d..f78e5ea850e6e4a2fe216e95e5db50d1f8871471 100644
--- a/ecrire/lang/spip_es.php3
+++ b/ecrire/lang/spip_es.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_es'] = array(
+$GLOBALS['i18n_spip_es'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_fr.php3 b/ecrire/lang/spip_fr.php3
index 735173c537fa5b0f78752d61078b6e5c7325276b..147ad544c60ee00c1af1759e310d21f6223777fa 100644
--- a/ecrire/lang/spip_fr.php3
+++ b/ecrire/lang/spip_fr.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_fr'] = array(
+$GLOBALS['i18n_spip_fr'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_gl.php3 b/ecrire/lang/spip_gl.php3
index f1a996a7e78e24dadc995ab69e353a7eb420020a..cefccd6bf97738b611e396b6625ded01d72427a3 100644
--- a/ecrire/lang/spip_gl.php3
+++ b/ecrire/lang/spip_gl.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_gl'] = array(
+$GLOBALS['i18n_spip_gl'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_it.php3 b/ecrire/lang/spip_it.php3
index e702c6a24677a41d1106bdc62bc7c33c83fae9d2..e1c9f0797f2c8d9fd787cc3aed1ccdbca53a8f39 100644
--- a/ecrire/lang/spip_it.php3
+++ b/ecrire/lang/spip_it.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_it'] = array(
+$GLOBALS['i18n_spip_it'] = array(
 
 
 // 0
diff --git a/ecrire/lang/spip_vi.php3 b/ecrire/lang/spip_vi.php3
index 419c14638876e1a786573b2e944cb6c7bbba04d6..954f414ac018a5bbcabc97a275437ae0f30f9725 100644
--- a/ecrire/lang/spip_vi.php3
+++ b/ecrire/lang/spip_vi.php3
@@ -2,7 +2,7 @@
 
 // This is a SPIP language file  --  Ceci est un fichier langue de SPIP
 
-$GLOBALS['i18n_vi'] = array(
+$GLOBALS['i18n_spip_vi'] = array(
 
 
 // 0