diff --git a/.gitattributes b/.gitattributes
index f85e7c6624dc78ec1bbfa7f4a92649607e69f131..12e61ddace7cf3b2f4997035d1662782b90d2de2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -136,9 +136,7 @@ ecrire/exec/charger_plugin_descr.php -text
ecrire/exec/config_contenu.php -text
ecrire/exec/config_fonctions.php -text
ecrire/exec/config_lang.php -text
-ecrire/exec/config_langage.php -text
ecrire/exec/config_multilang.php -text
-ecrire/exec/config_preferences.php -text
ecrire/exec/configuration.php -text
ecrire/exec/configurer.php -text
ecrire/exec/configurer_moderniseur_html.php -text
@@ -437,8 +435,6 @@ prive/aide_menu.html -text
prive/box.css -text
prive/box_skins.css.html -text
prive/cfg.html -text
-prive/configurer/langage.html -text
-prive/configurer/preferences.html -text
prive/contenu/article.html -text
prive/contenu/breve.html -text
prive/contenu/item_rss_plugin.html -text
@@ -782,11 +778,15 @@ prive/spip_pass.html -text
prive/spip_style.css -text
prive/squelettes/body.html -text
prive/squelettes/contenu/page-configurer_identite.html -text
+prive/squelettes/contenu/page-configurer_langage.html -text
+prive/squelettes/contenu/page-configurer_preferences.html -text
prive/squelettes/contenu/page-typo.html -text
prive/squelettes/extra/dist.html -text
prive/squelettes/head/dist.html -text
prive/squelettes/hierarchie/dist.html -text
prive/squelettes/hierarchie/page-configurer_identite.html -text
+prive/squelettes/hierarchie/page-configurer_langage.html -text
+prive/squelettes/hierarchie/page-configurer_preferences.html -text
prive/squelettes/hierarchie/page-typo.html -text
prive/squelettes/inclure/barre-nav.html -text
prive/squelettes/inclure/head.html -text
diff --git a/ecrire/exec/config_langage.php b/ecrire/exec/config_langage.php
deleted file mode 100644
index e3d953fe481f0f6867a59881f2a64a5d10fb78d4..0000000000000000000000000000000000000000
--- a/ecrire/exec/config_langage.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2010 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-function exec_config_langage(){
-
- $commencer_page = charger_fonction('commencer_page','inc');
- echo $commencer_page(_T('titre_config_langage'));
-
- echo barre_onglets('infos_perso', 'config_langage');
-
- echo debut_gauche("configurer_langage",true);
- echo debut_droite("configurer_langage",true);
-
- echo recuperer_fond('prive/configurer/langage',$_GET);
- echo fin_gauche(),fin_page();
-}
-
-?>
\ No newline at end of file
diff --git a/ecrire/exec/config_preferences.php b/ecrire/exec/config_preferences.php
deleted file mode 100644
index 03d236883ada536d7c9d1eb799662df4d86e50c0..0000000000000000000000000000000000000000
--- a/ecrire/exec/config_preferences.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2010 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-function exec_config_preferences(){
- $commencer_page = charger_fonction('commencer_page','inc');
- echo $commencer_page(_T('titre_configurer_preferences'));
-
- echo barre_onglets('infos_perso', 'config_preferences');
-
- echo debut_gauche("configurer_preferences",true);
-
- echo debut_droite("configurer_preferences",true);
-
- echo recuperer_fond('prive/configurer/preferences',$_GET);
- echo fin_gauche(),fin_page();
-}
-
-?>
\ No newline at end of file
diff --git a/ecrire/inc/bandeau.php b/ecrire/inc/bandeau.php
index 363e1efe08d579d48920d09d8e0cf4b0f10f6d0f..35d549f1603c4ecec136eadaca71b24fb9c542f9 100644
--- a/ecrire/inc/bandeau.php
+++ b/ecrire/inc/bandeau.php
@@ -224,7 +224,7 @@ function bando_identite(){
$moi = typo($GLOBALS['visiteur_session']['nom']);
$img_langue = find_in_theme('images/langues.png');
$url_aide = generer_url_ecrire('aide_index',"var_lang=".$GLOBALS['spip_lang']);
- $url_lang = generer_url_ecrire('config_langage');
+ $url_lang = generer_url_ecrire('configurer_langage');
$res .= "<p class='session'>"
. "<a title='"._T('icone_informations_personnelles')."' href='".
diff --git a/prive/navigation.xml b/prive/navigation.xml
index 050f18a2daecd9fc9319cab5deb9991befb62964..aa7acc34a3dd40b7b572417b037645bbea4c9320 100644
--- a/prive/navigation.xml
+++ b/prive/navigation.xml
@@ -195,11 +195,11 @@
<icone>images/infos_perso-24.png</icone>
<titre>icone_mes_infos</titre>
</onglet>
- <onglet id='config_langage' parent="infos_perso">
+ <onglet id='configurer_langage' parent="infos_perso">
<icone>images/ma_langue-24.png</icone>
<titre>icone_ma_langue</titre>
</onglet>
- <onglet id='config_preferences' parent="infos_perso">
+ <onglet id='configurer_preferences' parent="infos_perso">
<icone>images/mes_preferences-24.png</icone>
<titre>icone_mes_preferences</titre>
</onglet>
diff --git a/prive/configurer/langage.html b/prive/squelettes/contenu/page-configurer_langage.html
similarity index 100%
rename from prive/configurer/langage.html
rename to prive/squelettes/contenu/page-configurer_langage.html
diff --git a/prive/configurer/preferences.html b/prive/squelettes/contenu/page-configurer_preferences.html
similarity index 100%
rename from prive/configurer/preferences.html
rename to prive/squelettes/contenu/page-configurer_preferences.html
diff --git a/prive/squelettes/hierarchie/page-configurer_langage.html b/prive/squelettes/hierarchie/page-configurer_langage.html
new file mode 100644
index 0000000000000000000000000000000000000000..092a476d4fd2392cf6a17bf116db1edca0573283
--- /dev/null
+++ b/prive/squelettes/hierarchie/page-configurer_langage.html
@@ -0,0 +1 @@
+[(#VAL{infos_perso}|barre_onglets{configurer_langage})]
\ No newline at end of file
diff --git a/prive/squelettes/hierarchie/page-configurer_preferences.html b/prive/squelettes/hierarchie/page-configurer_preferences.html
new file mode 100644
index 0000000000000000000000000000000000000000..519121e1a6de8e6995694c644ba4ed51191a3d94
--- /dev/null
+++ b/prive/squelettes/hierarchie/page-configurer_preferences.html
@@ -0,0 +1 @@
+[(#VAL{infos_perso}|barre_onglets{configurer_preferences})]
\ No newline at end of file