diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
index 1e0a076d..0280f746 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
@@ -255,7 +255,7 @@ function MyTourGroupe() {
element: $("#diviconsel"),
title: "Icône du groupe",
placement : "right",
- content: "Choisissez l'icône pour votre groupe en cliquant sur 'Sélectionner un icône'.",
+ content: "Choisissez l'icône pour votre groupe en cliquant sur 'Sélectionner une icône'.",
},
{
element: $("#group_submit"),
@@ -793,7 +793,7 @@ function AdminGroupSubmit() {
element: $("#diviconsel"),
title: "Icône du groupe",
placement : "top",
- content: "Choisissez l'icône pour le groupe en cliquant sur 'Sélectionner un icône'. ",
+ content: "Choisissez l'icône pour le groupe en cliquant sur 'Sélectionner une icône'. ",
},
{
element: $("#group_fgcancreatepage"),
@@ -1876,7 +1876,7 @@ function AdminIcon() {
steps: [
{
element: $(".btn:first"),
- title: "Ajouter une icone",
+ title: "Ajouter une icône",
placement : "top",
content: "Ajoutez une icône en cliquant sur ce bouton - les icônes sont utilisées pour l'identité des items, des widgets et des groupes. En cliquant sur une icône existante, vous pourrez la supprimer ou la modifier. Essayez de choisir des icônes en phase avec les tendances graphiques du portail... ",
},
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
index 13f492b6..6666532f 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
@@ -121,7 +121,7 @@
@@ -219,7 +219,7 @@
}
function selectIcon() {
- $("#mymodal").find(".modal-title").html("SELECTIONNER UN ICONE");
+ $("#mymodal").find(".modal-title").html("SELECTIONNER UNE ICONE");
var url="{{ path('cadoles_portal_user_icon_select') }}";
$("#mymodal").find("#framemodal").attr("src",url);
$("#mymodal").modal("show");
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
index 1b7b1f8d..597d3bd7 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig
@@ -32,7 +32,7 @@
Action |
- Icone |
+ Icône |
Label |
Ouvert |
Filtre |
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
index 6051a8c4..b0f1d0d8 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php
@@ -1328,7 +1328,7 @@ class InitDataCommand extends ContainerAwareCommand
$entityWidget->setOpened(true);
$entityWidget->setAccess(["config","user","group"]);
$entityWidget->setColorbodyback("ffffff");
- $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icone", "value": "0", "mandatory": "true"}]}');
+ $parameter = json_decode('{"fields": [{"id": "seetitle", "loc": "col1", "type": "boolean", "label": "Afficher le titre", "value": "0", "mandatory": "true"},{"id": "seeicon", "loc": "col1", "type": "boolean", "label": "Afficher l\'icône", "value": "0", "mandatory": "true"}]}');
$entityWidget->setParameter($parameter);
$em->persist($entityWidget);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
index 64d8151e..a7a75e53 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Icon.php
@@ -11,7 +11,7 @@ use Symfony\Component\Validator\Constraints as Assert;
* @ORM\Entity
* @ORM\Table(name="icon")
* @ORM\HasLifecycleCallbacks
- * @UniqueEntity(fields="label", message="Un Icone existe déjà avec ce label")
+ * @UniqueEntity(fields="label", message="Une Icône existe déjà avec ce label")
*/
class Icon
{
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
index f74b8bf1..2a2f0045 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
@@ -57,7 +57,7 @@
@@ -68,7 +68,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
index bfdc030e..be282445 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig
@@ -69,7 +69,7 @@
@@ -80,7 +80,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
index e3f0f1d1..29ad6d25 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
@@ -71,7 +71,7 @@
@@ -82,7 +82,7 @@
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
index 7fd234c0..bae13ed4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/edit.html.twig
@@ -61,7 +61,7 @@
@@ -93,7 +93,7 @@