L10N : fix "Find" instead of "Yes". POT file updated

2 files changed, 167 insertions, 247 deletions

diff --git a/generator/after-bake/src/Locale/default.pot b/generator/after-bake/src/Locale/default.pot
index 22be5fb..1626508 100644
--- a/generator/after-bake/src/Locale/default.pot
+++ b/generator/after-bake/src/Locale/default.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2016-03-13 21:17+0000\n"
+"POT-Creation-Date: 2016-05-22 19:37+0000\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -54,27 +54,19 @@ msgstr ""
 msgid "The equipement could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/InteresseStatutsController.php:52;77
-msgid "The interesse statut has been saved."
-msgstr ""
-
-#: Controller/InteresseStatutsController.php:55;80
-msgid "The interesse statut could not be saved. Please, try again."
-msgstr ""
-
-#: Controller/InteressesController.php:55;83
+#: Controller/InteressesController.php:70;98
 msgid "The interesse has been saved."
 msgstr ""
 
-#: Controller/InteressesController.php:58;86
+#: Controller/InteressesController.php:73;101
 msgid "The interesse could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/InteressesController.php:108
+#: Controller/InteressesController.php:123
 msgid "The interesse has been deleted."
 msgstr ""
 
-#: Controller/InteressesController.php:110
+#: Controller/InteressesController.php:125
 msgid "The interesse could not be deleted. Please, try again."
 msgstr ""
 
@@ -94,11 +86,11 @@ msgstr ""
 msgid "The relais could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServicesController.php:112;162;198;251
+#: Controller/ServicesController.php:112;162;198;212;263;283;306
 msgid "The service has been saved."
 msgstr ""
 
-#: Controller/ServicesController.php:117;165;200;255
+#: Controller/ServicesController.php:117;165;200;214;267;285;308
 msgid "The service could not be saved. Please, try again."
 msgstr ""
 
@@ -106,10 +98,14 @@ msgstr ""
 msgid "Can't find a free IP public address. Please make sure that equipements are associated to the service."
 msgstr ""
 
-#: Controller/ServicesController.php:206
+#: Controller/ServicesController.php:218
 msgid "Can't activate the service. Bad service state."
 msgstr ""
 
+#: Controller/ServicesController.php:288;311
+msgid "Can't terminate the service. Bad service state."
+msgstr ""
+
 #: Controller/VillesController.php:70;95
 msgid "The ville has been saved."
 msgstr ""
@@ -127,22 +123,18 @@ msgstr ""
 #: Template/EquipementModeles/add.ctp:3
 #: Template/EquipementModeles/edit.ctp:3
 #: Template/EquipementModeles/index.ctp:3;18
-#: Template/EquipementModeles/view.ctp:3;52
+#: Template/EquipementModeles/view.ctp:3;53
 #: Template/Equipements/add.ctp:3
 #: Template/Equipements/edit.ctp:3
-#: Template/Equipements/index.ctp:24;72
+#: Template/Equipements/index.ctp:24;69
 #: Template/Equipements/view.ctp:24
-#: Template/InteresseStatuts/add.ctp:3
-#: Template/InteresseStatuts/edit.ctp:3
-#: Template/InteresseStatuts/index.ctp:3;15
-#: Template/InteresseStatuts/view.ctp:3;41
 #: Template/Interesses/add.ctp:3
 #: Template/Interesses/edit.ctp:3
-#: Template/Interesses/index.ctp:3;23
+#: Template/Interesses/index.ctp:3;40
 #: Template/Interesses/view.ctp:3
 #: Template/Ipmgmt/add.ctp:3
-#: Template/Ipmgmt/index.ctp:3;16
-#: Template/Ipmgmt/view.ctp:24;58
+#: Template/Ipmgmt/index.ctp:3;15
+#: Template/Ipmgmt/view.ctp:24;44
 #: Template/Ippubliques/index.ctp:24;58
 #: Template/Ippubliques/view.ctp:24;58
 #: Template/Relais/add.ctp:3
@@ -214,10 +206,10 @@ msgstr ""
 #: Template/Adherents/add.ctp:5
 #: Template/Adherents/edit.ctp:26
 #: Template/Adherents/index.ctp:26
-#: Template/Interesses/add.ctp:7
-#: Template/Interesses/edit.ctp:13
-#: Template/Interesses/index.ctp:7
-#: Template/Interesses/view.ctp:10
+#: Template/Interesses/add.ctp:5
+#: Template/Interesses/edit.ctp:11
+#: Template/Interesses/index.ctp:5
+#: Template/Interesses/view.ctp:8
 #: Template/Relais/add.ctp:5
 #: Template/Relais/edit.ctp:5
 #: Template/Relais/index.ctp:5
@@ -233,10 +225,10 @@ msgstr ""
 #: Template/Adherents/add.ctp:6
 #: Template/Adherents/edit.ctp:27
 #: Template/Adherents/index.ctp:27
-#: Template/Interesses/add.ctp:8
-#: Template/Interesses/edit.ctp:14
-#: Template/Interesses/index.ctp:8
-#: Template/Interesses/view.ctp:11
+#: Template/Interesses/add.ctp:6
+#: Template/Interesses/edit.ctp:12
+#: Template/Interesses/index.ctp:6
+#: Template/Interesses/view.ctp:9
 #: Template/Relais/add.ctp:6
 #: Template/Relais/edit.ctp:6
 #: Template/Relais/index.ctp:6
@@ -254,13 +246,11 @@ msgstr ""
 #: Template/Adherents/edit.ctp:77
 #: Template/EquipementModeles/add.ctp:20
 #: Template/EquipementModeles/edit.ctp:20
-#: Template/Equipements/add.ctp:35
-#: Template/Equipements/edit.ctp:35
-#: Template/InteresseStatuts/add.ctp:17
-#: Template/InteresseStatuts/edit.ctp:17
-#: Template/Interesses/add.ctp:30
-#: Template/Interesses/edit.ctp:36
-#: Template/Ipmgmt/add.ctp:18
+#: Template/Equipements/add.ctp:36
+#: Template/Equipements/edit.ctp:36
+#: Template/Interesses/add.ctp:28
+#: Template/Interesses/edit.ctp:34
+#: Template/Ipmgmt/add.ctp:16
 #: Template/Relais/add.ctp:27
 #: Template/Relais/edit.ctp:27
 #: Template/Services/add.ctp:46
@@ -286,7 +276,7 @@ msgstr ""
 #: Template/AdherentRoles/index.ctp:52
 #: Template/Adherents/view.ctp:141
 #: Template/Interesses/edit.ctp:5
-#: Template/Interesses/index.ctp:39
+#: Template/Interesses/index.ctp:57
 #: Template/Villes/view.ctp:89
 msgid "Delete"
 msgstr ""
@@ -294,7 +284,7 @@ msgstr ""
 #: Template/AdherentRoles/index.ctp:52
 #: Template/Adherents/view.ctp:141
 #: Template/Interesses/edit.ctp:7
-#: Template/Interesses/index.ctp:39
+#: Template/Interesses/index.ctp:57
 #: Template/Interesses/view.ctp:5
 #: Template/Villes/view.ctp:89
 msgid "Are you sure you want to delete # {0}?"
@@ -303,10 +293,9 @@ msgstr ""
 #: Template/AdherentRoles/index.ctp:60
 #: Template/Adherents/index.ctp:96
 #: Template/EquipementModeles/index.ctp:38
-#: Template/Equipements/index.ctp:96
-#: Template/InteresseStatuts/index.ctp:32
-#: Template/Interesses/index.ctp:47
-#: Template/Ipmgmt/index.ctp:33
+#: Template/Equipements/index.ctp:99
+#: Template/Interesses/index.ctp:65
+#: Template/Ipmgmt/index.ctp:31
 #: Template/Ippubliques/index.ctp:78
 #: Template/Relais/index.ctp:46
 #: Template/Services/index.ctp:94
@@ -317,10 +306,9 @@ msgstr ""
 #: Template/AdherentRoles/index.ctp:62
 #: Template/Adherents/index.ctp:98
 #: Template/EquipementModeles/index.ctp:40
-#: Template/Equipements/index.ctp:98
-#: Template/InteresseStatuts/index.ctp:34
-#: Template/Interesses/index.ctp:49
-#: Template/Ipmgmt/index.ctp:35
+#: Template/Equipements/index.ctp:101
+#: Template/Interesses/index.ctp:67
+#: Template/Ipmgmt/index.ctp:33
 #: Template/Ippubliques/index.ctp:80
 #: Template/Relais/index.ctp:48
 #: Template/Services/index.ctp:96
@@ -333,8 +321,6 @@ msgstr ""
 #: Template/Adherents/index.ctp:28
 #: Template/Equipements/add.ctp:7
 #: Template/Equipements/edit.ctp:7
-#: Template/Equipements/index.ctp:26
-#: Template/Equipements/view.ctp:34
 #: Template/Ippubliques/index.ctp:26
 #: Template/Ippubliques/view.ctp:26
 #: Template/Services/add.ctp:25
@@ -350,8 +336,6 @@ msgstr ""
 #: Template/Adherents/view.ctp:28
 #: Template/Equipements/add.ctp:8
 #: Template/Equipements/edit.ctp:8
-#: Template/Equipements/index.ctp:27
-#: Template/Equipements/view.ctp:35
 #: Template/Ippubliques/index.ctp:27
 #: Template/Ippubliques/view.ctp:27
 #: Template/Services/index.ctp:25
@@ -392,9 +376,7 @@ msgstr ""
 #: Template/Adherents/edit.ctp:84
 #: Template/Adherents/view.ctp:157
 #: Template/EquipementModeles/view.ctp:31;40
-#: Template/InteresseStatuts/view.ctp:19;28
-#: Template/Interesses/view.ctp:58
-#: Template/Ipmgmt/view.ctp:44
+#: Template/Interesses/view.ctp:56
 #: Template/Relais/view.ctp:50
 #: Template/Villes/view.ctp:50
 msgid "Id"
@@ -410,8 +392,8 @@ msgid "Service Type"
 msgstr ""
 
 #: Template/Adherents/edit.ctp:86
-#: Template/Equipements/index.ctp:55;56
-#: Template/Equipements/view.ctp:58
+#: Template/Equipements/index.ctp:53;54
+#: Template/Equipements/view.ctp:77
 #: Template/Relais/index.ctp:16
 #: Template/Services/index.ctp:55;56
 msgid "Relais"
@@ -461,8 +443,9 @@ msgid "Adherents"
 msgstr ""
 
 #: Template/Adherents/index.ctp:49;50
+#: Template/Interesses/index.ctp:17;18
 #: Template/Ippubliques/index.ctp:38;39
-msgid "Rechercher..."
+msgid "Find..."
 msgstr ""
 
 #: Template/Adherents/index.ctp:55;56
@@ -473,13 +456,11 @@ msgstr ""
 #: Template/Adherents/index.ctp:87
 #: Template/Adherents/view.ctp:174
 #: Template/EquipementModeles/index.ctp:29
-#: Template/EquipementModeles/view.ctp:71
-#: Template/Equipements/index.ctp:87
-#: Template/InteresseStatuts/index.ctp:23
-#: Template/InteresseStatuts/view.ctp:61
-#: Template/Interesses/index.ctp:37
-#: Template/Ipmgmt/index.ctp:25
-#: Template/Ipmgmt/view.ctp:70
+#: Template/EquipementModeles/view.ctp:73
+#: Template/Equipements/index.ctp:90
+#: Template/Interesses/index.ctp:55
+#: Template/Ipmgmt/index.ctp:23
+#: Template/Ipmgmt/view.ctp:56
 #: Template/Ippubliques/index.ctp:70
 #: Template/Ippubliques/view.ctp:72
 #: Template/Relais/index.ctp:37
@@ -494,12 +475,10 @@ msgstr ""
 #: Template/Adherents/index.ctp:88
 #: Template/Adherents/view.ctp:175
 #: Template/EquipementModeles/index.ctp:30
-#: Template/EquipementModeles/view.ctp:73
-#: Template/Equipements/index.ctp:88
-#: Template/InteresseStatuts/index.ctp:24
-#: Template/InteresseStatuts/view.ctp:63
-#: Template/Interesses/index.ctp:38
-#: Template/Ipmgmt/view.ctp:72
+#: Template/EquipementModeles/view.ctp:75
+#: Template/Equipements/index.ctp:91
+#: Template/Interesses/index.ctp:56
+#: Template/Ipmgmt/view.ctp:58
 #: Template/Relais/index.ctp:38
 #: Template/Relais/view.ctp:83
 #: Template/Services/index.ctp:86
@@ -526,27 +505,24 @@ msgid "Adherent Type"
 msgstr ""
 
 #: Template/Adherents/view.ctp:57
-#: Template/Interesses/view.ctp:22
+#: Template/Interesses/view.ctp:16
 msgid "Civilite"
 msgstr ""
 
 #: Template/Adherents/view.ctp:61
-#: Template/InteresseStatuts/view.ctp:32
-#: Template/Interesses/view.ctp:26
+#: Template/Interesses/view.ctp:20
 #: Template/Villes/view.ctp:102
 msgid "Nom"
 msgstr ""
 
 #: Template/Adherents/view.ctp:65
-#: Template/InteresseStatuts/view.ctp:33
-#: Template/Interesses/view.ctp:30
+#: Template/Interesses/view.ctp:24
 #: Template/Villes/view.ctp:103
 msgid "Prenom"
 msgstr ""
 
 #: Template/Adherents/view.ctp:69
-#: Template/InteresseStatuts/view.ctp:34
-#: Template/Interesses/view.ctp:34
+#: Template/Interesses/view.ctp:28
 #: Template/Villes/view.ctp:104
 msgid "Raison"
 msgstr ""
@@ -560,20 +536,18 @@ msgid "Tel Mobile1"
 msgstr ""
 
 #: Template/Adherents/view.ctp:83
-#: Template/InteresseStatuts/view.ctp:38
-#: Template/Interesses/view.ctp:50
+#: Template/Interesses/view.ctp:48
 #: Template/Villes/view.ctp:107
 msgid "Adresse1"
 msgstr ""
 
 #: Template/Adherents/view.ctp:87
-#: Template/InteresseStatuts/view.ctp:39
-#: Template/Interesses/view.ctp:54
+#: Template/Interesses/view.ctp:52
 msgid "Adresse2"
 msgstr ""
 
 #: Template/Adherents/view.ctp:91
-#: Template/Interesses/view.ctp:38
+#: Template/Interesses/view.ctp:32
 #: Template/Relais/view.ctp:46
 msgid "Ville"
 msgstr ""
@@ -621,10 +595,9 @@ msgid "Role {0}"
 msgstr ""
 
 #: Template/Adherents/view.ctp:149
-#: Template/EquipementModeles/view.ctp:51
-#: Template/Equipements/view.ctp:87
-#: Template/InteresseStatuts/view.ctp:40
-#: Template/Interesses/view.ctp:67
+#: Template/EquipementModeles/view.ctp:52
+#: Template/Equipements/view.ctp:98
+#: Template/Interesses/view.ctp:65
 #: Template/Villes/view.ctp:108
 msgid "Notes"
 msgstr ""
@@ -637,11 +610,11 @@ msgstr ""
 msgid "Are you sure you want to terminate # {0}?"
 msgstr ""
 
-#: Template/Adherents/view.ctp:192
+#: Template/Adherents/view.ctp:192;216
 msgid "Activate"
 msgstr ""
 
-#: Template/Adherents/view.ctp:193
+#: Template/Adherents/view.ctp:193;217
 msgid "Are you sure you want to activate # {0}?"
 msgstr ""
 
@@ -657,20 +630,16 @@ msgstr ""
 msgid "Suspend"
 msgstr ""
 
-#: Template/Adherents/view.ctp:207;217
+#: Template/Adherents/view.ctp:207
 msgid "Are you sure you want to suspend # {0}?"
 msgstr ""
 
-#: Template/Adherents/view.ctp:216
-msgid "Unsuspend"
-msgstr ""
-
 #: Template/EquipementModeles/add.ctp:4
 #: Template/EquipementModeles/edit.ctp:4
 #: Template/EquipementModeles/view.ctp:5
-#: Template/Equipements/add.ctp:11
-#: Template/Equipements/edit.ctp:11
-#: Template/Equipements/index.ctp:29
+#: Template/Equipements/add.ctp:9
+#: Template/Equipements/edit.ctp:9
+#: Template/Equipements/index.ctp:27
 #: Template/Equipements/view.ctp:30
 msgid "List Equipement Modeles"
 msgstr ""
@@ -681,7 +650,7 @@ msgstr ""
 #: Template/EquipementModeles/view.ctp:7
 #: Template/Equipements/add.ctp:4;5
 #: Template/Equipements/edit.ctp:4;5
-#: Template/Equipements/view.ctp:26;36
+#: Template/Equipements/view.ctp:26
 #: Template/Ipmgmt/add.ctp:5
 #: Template/Ipmgmt/index.ctp:5
 #: Template/Ipmgmt/view.ctp:28
@@ -704,7 +673,7 @@ msgstr ""
 #: Template/Equipements/add.ctp:6
 #: Template/Equipements/edit.ctp:6
 #: Template/Equipements/index.ctp:25
-#: Template/Equipements/view.ctp:27;37
+#: Template/Equipements/view.ctp:27
 #: Template/Ipmgmt/add.ctp:6
 #: Template/Ipmgmt/index.ctp:6
 #: Template/Ipmgmt/view.ctp:29
@@ -731,15 +700,15 @@ msgstr ""
 
 #: Template/EquipementModeles/index.ctp:4
 #: Template/EquipementModeles/view.ctp:6
-#: Template/Equipements/add.ctp:12
-#: Template/Equipements/edit.ctp:12
-#: Template/Equipements/index.ctp:30
+#: Template/Equipements/add.ctp:10
+#: Template/Equipements/edit.ctp:10
+#: Template/Equipements/index.ctp:28
 #: Template/Equipements/view.ctp:31
 msgid "New Equipement Modele"
 msgstr ""
 
 #: Template/EquipementModeles/index.ctp:10
-#: Template/Equipements/index.ctp:49;50
+#: Template/Equipements/index.ctp:47;48
 msgid "Equipement Modeles"
 msgstr ""
 
@@ -760,31 +729,32 @@ msgid "Revision"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:36
-#: Template/Ipmgmt/view.ctp:49
+#: Template/Ipmgmt/view.ctp:35
 #: Template/Relais/view.ctp:63
 #: Template/Services/view.ctp:88
 msgid "Related Equipements"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:41
-#: Template/Equipements/view.ctp:46
-#: Template/Ipmgmt/view.ctp:53
-#: Template/Relais/view.ctp:67
-#: Template/Services/view.ctp:92
-msgid "Mac"
+msgid "Uplink Id"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:42
-msgid "Uplink Id"
+#: Template/Ippubliques/view.ctp:51
+msgid "Service Id"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:43
-#: Template/Ippubliques/view.ctp:51
-msgid "Service Id"
+#: Template/Equipements/view.ctp:46
+#: Template/Ipmgmt/view.ctp:39
+#: Template/Relais/view.ctp:67
+#: Template/Services/view.ctp:92
+msgid "Mac"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:44
-msgid "Ipmgmt Id"
+#: Template/Equipements/view.ctp:65
+msgid "Hostname"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:45
@@ -792,9 +762,7 @@ msgid "Equipement Modele Id"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:46
-#: Template/Relais/view.ctp:70
-#: Template/Services/view.ctp:95
-msgid "Equipement Mode Id"
+msgid "Ipmgmt Id"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:47
@@ -802,35 +770,41 @@ msgid "Relais Id"
 msgstr ""
 
 #: Template/EquipementModeles/view.ctp:48
-#: Template/Equipements/view.ctp:74
-#: Template/Ipmgmt/view.ctp:56
+#: Template/Relais/view.ctp:70
+#: Template/Services/view.ctp:95
+msgid "Equipement Mode Id"
+msgstr ""
+
+#: Template/EquipementModeles/view.ctp:49
+#: Template/Equipements/view.ctp:85
+#: Template/Ipmgmt/view.ctp:42
 #: Template/Ippubliques/view.ctp:57
 #: Template/Services/view.ctp:55;96
 msgid "Description"
 msgstr ""
 
-#: Template/EquipementModeles/view.ctp:49
-#: Template/Equipements/view.ctp:78
+#: Template/EquipementModeles/view.ctp:50
+#: Template/Equipements/view.ctp:89
 msgid "Date Achat"
 msgstr ""
 
-#: Template/EquipementModeles/view.ctp:50
-#: Template/Equipements/view.ctp:82
-#: Template/Ipmgmt/view.ctp:57
+#: Template/EquipementModeles/view.ctp:51
+#: Template/Equipements/view.ctp:93
+#: Template/Ipmgmt/view.ctp:43
 msgid "Date Hs"
 msgstr ""
 
-#: Template/Equipements/add.ctp:9
-#: Template/Equipements/edit.ctp:9
-#: Template/Equipements/index.ctp:28
+#: Template/Equipements/add.ctp:11
+#: Template/Equipements/edit.ctp:11
+#: Template/Equipements/index.ctp:26
 #: Template/Equipements/view.ctp:28
 #: Template/Ipmgmt/add.ctp:4
 #: Template/Ipmgmt/view.ctp:26
 msgid "List Ipmgmt"
 msgstr ""
 
-#: Template/Equipements/add.ctp:10
-#: Template/Equipements/edit.ctp:10
+#: Template/Equipements/add.ctp:12
+#: Template/Equipements/edit.ctp:12
 #: Template/Equipements/view.ctp:29
 #: Template/Ipmgmt/index.ctp:4
 #: Template/Ipmgmt/view.ctp:27
@@ -839,7 +813,7 @@ msgstr ""
 
 #: Template/Equipements/add.ctp:13
 #: Template/Equipements/edit.ctp:13
-#: Template/Equipements/index.ctp:31
+#: Template/Equipements/index.ctp:29
 #: Template/Equipements/view.ctp:32
 #: Template/Relais/add.ctp:4
 #: Template/Relais/edit.ctp:4
@@ -855,7 +829,7 @@ msgstr ""
 
 #: Template/Equipements/add.ctp:14
 #: Template/Equipements/edit.ctp:14
-#: Template/Equipements/index.ctp:32
+#: Template/Equipements/index.ctp:30
 #: Template/Equipements/view.ctp:33
 #: Template/Relais/index.ctp:4
 #: Template/Relais/view.ctp:27
@@ -877,23 +851,27 @@ msgstr ""
 msgid "Edit Equipement"
 msgstr ""
 
-#: Template/Equipements/index.ctp:36
+#: Template/Equipements/index.ctp:34
 #: Template/Layout/default.ctp:67
 msgid "Equipements"
 msgstr ""
 
-#: Template/Equipements/index.ctp:43;44
-msgid "Adresse MAC..."
+#: Template/Equipements/index.ctp:41;42
+msgid "MAC, IPv4, Hostname..."
 msgstr ""
 
-#: Template/Equipements/view.ctp:38
+#: Template/Equipements/view.ctp:34
 msgid "List Equipement Modes"
 msgstr ""
 
-#: Template/Equipements/view.ctp:39
+#: Template/Equipements/view.ctp:35
 msgid "New Equipement Mode"
 msgstr ""
 
+#: Template/Equipements/view.ctp:42
+msgid "Uplink"
+msgstr ""
+
 #: Template/Equipements/view.ctp:50
 #: Template/Ipmgmt/index.ctp:10
 #: Template/Relais/view.ctp:68
@@ -901,40 +879,26 @@ msgstr ""
 msgid "Ipmgmt"
 msgstr ""
 
-#: Template/Equipements/view.ctp:54
-#: Template/Ipmgmt/view.ctp:54
+#: Template/Equipements/view.ctp:57
+msgid "Access"
+msgstr ""
+
+#: Template/Equipements/view.ctp:69
+#: Template/Ipmgmt/view.ctp:40
 #: Template/Relais/view.ctp:69
 #: Template/Services/view.ctp:94
 msgid "Equipement Modele"
 msgstr ""
 
-#: Template/Equipements/view.ctp:62
+#: Template/Equipements/view.ctp:73
 msgid "Service"
 msgstr ""
 
-#: Template/Equipements/view.ctp:66
-msgid "Uplink"
-msgstr ""
-
-#: Template/Equipements/view.ctp:70
-#: Template/Ipmgmt/view.ctp:55
+#: Template/Equipements/view.ctp:81
+#: Template/Ipmgmt/view.ctp:41
 msgid "Equipement Mode"
 msgstr ""
 
-#: Template/InteresseStatuts/add.ctp:4
-#: Template/InteresseStatuts/edit.ctp:4
-#: Template/InteresseStatuts/view.ctp:5
-#: Template/Interesses/add.ctp:5
-#: Template/Interesses/edit.ctp:11
-#: Template/Interesses/index.ctp:5
-#: Template/Interesses/view.ctp:8
-msgid "List Interesse Statuts"
-msgstr ""
-
-#: Template/InteresseStatuts/add.ctp:5
-#: Template/InteresseStatuts/edit.ctp:5
-#: Template/InteresseStatuts/index.ctp:5
-#: Template/InteresseStatuts/view.ctp:7
 #: Template/Interesses/add.ctp:4
 #: Template/Interesses/edit.ctp:10
 #: Template/Interesses/view.ctp:6
@@ -944,10 +908,15 @@ msgstr ""
 msgid "List Interesses"
 msgstr ""
 
-#: Template/InteresseStatuts/add.ctp:6
-#: Template/InteresseStatuts/edit.ctp:6
-#: Template/InteresseStatuts/index.ctp:6
-#: Template/InteresseStatuts/view.ctp:8
+#: Template/Interesses/add.ctp:12
+msgid "Add Interesse"
+msgstr ""
+
+#: Template/Interesses/edit.ctp:18
+#: Template/Interesses/view.ctp:4
+msgid "Edit Interesse"
+msgstr ""
+
 #: Template/Interesses/index.ctp:4
 #: Template/Interesses/view.ctp:7
 #: Template/Villes/add.ctp:10
@@ -956,89 +925,33 @@ msgstr ""
 msgid "New Interesse"
 msgstr ""
 
-#: Template/InteresseStatuts/add.ctp:12
-msgid "Add Interesse Statut"
-msgstr ""
-
-#: Template/InteresseStatuts/edit.ctp:12
-#: Template/InteresseStatuts/view.ctp:4
-msgid "Edit Interesse Statut"
-msgstr ""
-
-#: Template/InteresseStatuts/index.ctp:4
-#: Template/InteresseStatuts/view.ctp:6
-#: Template/Interesses/add.ctp:6
-#: Template/Interesses/edit.ctp:12
-#: Template/Interesses/index.ctp:6
-#: Template/Interesses/view.ctp:9
-msgid "New Interesse Statut"
-msgstr ""
-
-#: Template/InteresseStatuts/index.ctp:10
-msgid "Interesse Statuts"
-msgstr ""
-
-#: Template/InteresseStatuts/view.ctp:15
-#: Template/Relais/view.ctp:38
-#: Template/Villes/view.ctp:33;51
-msgid "Title"
-msgstr ""
-
-#: Template/InteresseStatuts/view.ctp:24
-msgid "Related Interesses"
-msgstr ""
-
-#: Template/InteresseStatuts/view.ctp:29
-#: Template/Interesses/view.ctp:62
-#: Template/Villes/view.ctp:101
-msgid "Date Demande"
-msgstr ""
-
-#: Template/InteresseStatuts/view.ctp:30
-msgid "Interesse Statut Id"
+#: Template/Interesses/index.ctp:10
+#: Template/Layout/default.ctp:66
+msgid "Interesses"
 msgstr ""
 
-#: Template/InteresseStatuts/view.ctp:31
-msgid "Civilite Id"
+#: Template/Interesses/index.ctp:23;24
+#: Template/Interesses/view.ctp:36
+msgid "Interesse Statut"
 msgstr ""
 
-#: Template/InteresseStatuts/view.ctp:35
-#: Template/Villes/view.ctp:53
-msgid "Ville Id"
+#: Template/Interesses/view.ctp:5
+msgid "Delete Interesse"
 msgstr ""
 
-#: Template/InteresseStatuts/view.ctp:36
-#: Template/Interesses/view.ctp:42
+#: Template/Interesses/view.ctp:40
 #: Template/Villes/view.ctp:105
 msgid "Telephone"
 msgstr ""
 
-#: Template/InteresseStatuts/view.ctp:37
-#: Template/Interesses/view.ctp:46
+#: Template/Interesses/view.ctp:44
 #: Template/Villes/view.ctp:106
 msgid "Mail"
 msgstr ""
 
-#: Template/Interesses/add.ctp:14
-msgid "Add Interesse"
-msgstr ""
-
-#: Template/Interesses/edit.ctp:20
-#: Template/Interesses/view.ctp:4
-msgid "Edit Interesse"
-msgstr ""
-
-#: Template/Interesses/index.ctp:12
-#: Template/Layout/default.ctp:66
-msgid "Interesses"
-msgstr ""
-
-#: Template/Interesses/view.ctp:5
-msgid "Delete Interesse"
-msgstr ""
-
-#: Template/Interesses/view.ctp:18
-msgid "Interesse Statut"
+#: Template/Interesses/view.ctp:60
+#: Template/Villes/view.ctp:101
+msgid "Date Demande"
 msgstr ""
 
 #: Template/Ipmgmt/add.ctp:12
@@ -1049,16 +962,6 @@ msgstr ""
 msgid "Edit Ipmgmt"
 msgstr ""
 
-#: Template/Ipmgmt/view.ctp:36
-#: Template/Ippubliques/view.ctp:34
-msgid "Ip4"
-msgstr ""
-
-#: Template/Ipmgmt/view.ctp:40
-#: Template/Ippubliques/view.ctp:38
-msgid "Ip6"
-msgstr ""
-
 #: Template/Ippubliques/index.ctp:25
 msgid "New Ippublique"
 msgstr ""
@@ -1072,15 +975,15 @@ msgid "Secteurs"
 msgstr ""
 
 #: Template/Ippubliques/index.ctp:57
-msgid "Utilisee"
+msgid "In use"
 msgstr ""
 
 #: Template/Ippubliques/index.ctp:68
-msgid "oui"
+msgid "Yes"
 msgstr ""
 
 #: Template/Ippubliques/index.ctp:68
-msgid "non"
+msgid "No"
 msgstr ""
 
 #: Template/Ippubliques/view.ctp:25
@@ -1092,6 +995,14 @@ msgstr ""
 msgid "List Ippubliques"
 msgstr ""
 
+#: Template/Ippubliques/view.ctp:34
+msgid "Ip4"
+msgstr ""
+
+#: Template/Ippubliques/view.ctp:38
+msgid "Ip6"
+msgstr ""
+
 #: Template/Ippubliques/view.ctp:42
 #: Template/Relais/view.ctp:42
 msgid "Secteur"
@@ -1133,6 +1044,11 @@ msgstr ""
 msgid "Edit Relais"
 msgstr ""
 
+#: Template/Relais/view.ctp:38
+#: Template/Villes/view.ctp:33;51
+msgid "Title"
+msgstr ""
+
 #: Template/Relais/view.ctp:54
 #: Template/Villes/view.ctp:54
 msgid "Gps Long"
@@ -1202,6 +1118,10 @@ msgstr ""
 msgid "Secteur Id"
 msgstr ""
 
+#: Template/Villes/view.ctp:53
+msgid "Ville Id"
+msgstr ""
+
 #: Template/Villes/view.ctp:76
 msgid "Related Adherent Roles"
 msgstr ""
diff --git a/generator/after-bake/src/Template/Ippubliques/index.ctp b/generator/after-bake/src/Template/Ippubliques/index.ctp
index e943811..ef0fb80 100644
--- a/generator/after-bake/src/Template/Ippubliques/index.ctp
+++ b/generator/after-bake/src/Template/Ippubliques/index.ctp
@@ -65,7 +65,7 @@
                 <td><?= h($ippublique->ip4) ?></td>
                 <td><?= h($ippublique->ip6) ?></td>
 				<td><?= $ippublique->has('secteur') ? h($ippublique->secteur->title) : ''  ?></td>
-				<td><?= count($ippublique->services) ? __('Find'): __('non') ?></td>
+				<td><?= count($ippublique->services) ? __('Yes'): __('No') ?></td>
                 <td class="actions">
                     <?= $this->Html->link(__('View'), ['action' => 'view', $ippublique->ip4]) ?>
                 </td>