diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index 4974ef84..960bc7c9 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -344,6 +344,58 @@
   <modal_confirm_delete_tool_inshank>Sei sicuro di voler scaricare l'utensile dal codolo?</modal_confirm_delete_tool_inshank>
   <siemens_modal_confirm_delete_tool_inshank>Sei sicuro di voler scaricare l'utensile dal multitool?</siemens_modal_confirm_delete_tool_inshank>
   
+  <!-- Maintenance Manager --> 
+  <maintenance_header_title>Gestore delle manutenzioni</maintenance_header_title>
+  <maintenance_card_btn_save_note>Salva</maintenance_card_btn_save_note>
+  <maintenance_card_btn_view_all_attach>Mostra tutti i file</maintenance_card_btn_view_all_attach>
+  <maintenance_card_btn_hide_all_attach>Mostra solo gli ultimi file</maintenance_card_btn_hide_all_attach>
+  <maintenance_card_btn_add_attach>Aggiungi un file</maintenance_card_btn_add_attach>
+  <maintenance_card_btn_view_all_note>Mostra tutte le note</maintenance_card_btn_view_all_note>
+  <maintenance_card_btn_hide_all_note>Mostra solo le ultime le note</maintenance_card_btn_hide_all_note>
+  <maintenance_card_label_btn_footer>Esegui manutenzione</maintenance_card_label_btn_footer>
+  <maintenance_header_label_procedure>Ricerca la manutenzione per nome</maintenance_header_label_procedure>
+  <maintenance_header_label_procedure_placeholder>Nome della manutenzione...</maintenance_header_label_procedure_placeholder>
+  <maintenance_header_label_state>Stato</maintenance_header_label_state>
+  <maintenance_header_option_state_choose>Seleziona uno stato...</maintenance_header_option_state_choose>
+  <maintenance_label_create_intervention>Crea un intervento di manutenzione</maintenance_label_create_intervention>
+  <maintenance_label_disable-maintenance>Seleziona una manutenzione...</maintenance_label_disable-maintenance>
+  <maintenance_state_expired>Scaduta</maintenance_state_expired>
+  <maintenance_state_closed>Chiusa</maintenance_state_closed>
+  <maintenance_state_running>Non Scaduta</maintenance_state_running>
+  <maintenance_state_ending>In Scadenza</maintenance_state_ending>
+  <maintenance_table_header_counter>Contatore</maintenance_table_header_counter>
+  <maintenance_table_header_deadline>Scadenza</maintenance_table_header_deadline>
+  <maintenance_table_header_state>Stato</maintenance_table_header_state>
+  <maintenance_table_header_title>Titolo</maintenance_table_header_title>  
+  <maintenance_card_label_date_timestamp>Aggiunta il %s alle %s</maintenance_card_label_date_timestamp>
+  <maintenance_card_btn_cancel_modify_note>Cancella</maintenance_card_btn_cancel_modify_note>
+  <maintenance_card_btn_save_modify_note>Salva</maintenance_card_btn_save_modify_note>
+  <maintenance_date_neverdone>Nessuna intervento di manutenzione effettuato</maintenance_date_neverdone>
+  <maintenance_date_justdone>Ultimo intervento effettuato pochi minuti fa</maintenance_date_justdone>
+  <maintenance_date_hours>Ultimo intervento effettuato %d ore fa</maintenance_date_hours>
+  <maintenance_date_days>Ultimo intervento effettuato %d giorni fa</maintenance_date_days>
+  <maintenance_date_fixeddate>Ultimo intervento effettuato in data: %s</maintenance_date_fixeddate>
+  <maintenance_card_created_timestamp>Manutenzione creata in data %s alle ore %s</maintenance_card_created_timestamp>
+  <maintenance_card_attachments>Allegati</maintenance_card_attachments>
+  <maintenance_card_notes>Note</maintenance_card_notes>
+  
+  <!-- Maintenance Manager --> 
+  <create_maintenance_lbl_title_window>Creazione intervento di manutenzione</create_maintenance_lbl_title_window> 
+  <create_maintenance_lbl_title>Titolo</create_maintenance_lbl_title> 
+  <create_maintenance_btn_cancel>Annulla</create_maintenance_btn_cancel> 
+  <create_maintenance_btn_confirm>Crea Manutenzione</create_maintenance_btn_confirm> 
+  <create_maintenance_lbl_date>Data</create_maintenance_lbl_date> 
+  <create_maintenance_lbl_description>Descrizione</create_maintenance_lbl_description> 
+  <create_maintenance_lbl_end_time>Ora</create_maintenance_lbl_end_time> 
+  <create_maintenance_lbl_typology>Tipo</create_maintenance_lbl_typology> 
+  <create_maintenance_lbl_repeat>Ripeti ogni</create_maintenance_lbl_repeat> 
+  <create_maintenance_repeat_day>Giorni</create_maintenance_repeat_day> 
+  <create_maintenance_repeat_hour>Ore</create_maintenance_repeat_hour> 
+  <create_maintenance_repeat_minutes>Minuti</create_maintenance_repeat_minutes> 
+  <create_maintenance_repeat_months>Mesi</create_maintenance_repeat_months> 
+  <create_maintenance_lbl_fixeddate>Data Fissa</create_maintenance_lbl_fixeddate>
+  <create_maintenance_lbl_temporal>Temporale</create_maintenance_lbl_temporal>
+  
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
   <footer_tooltip_production>Manager della produzione</footer_tooltip_production>
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index 91a2f784..133ee176 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -348,7 +348,57 @@
   <siemens_modal_confirm_delete_shank>Are you sure to delete this  multitool?</siemens_modal_confirm_delete_shank>
   <modal_confirm_delete_tool_inshank>Are you sure to unload this tool from his shank?</modal_confirm_delete_tool_inshank>
   <siemens_modal_confirm_delete_tool_inshank>Are you sure to unload this tool from his multitool?</siemens_modal_confirm_delete_tool_inshank>
-
+  
+  <maintenance_header_title>Maintenance manager</maintenance_header_title>
+  <maintenance_card_btn_save_note>Save</maintenance_card_btn_save_note>
+  <maintenance_card_btn_view_all_attach>Show all files</maintenance_card_btn_view_all_attach>
+  <maintenance_card_btn_hide_all_attach>Show only last files</maintenance_card_btn_hide_all_attach>
+  <maintenance_card_btn_add_attach>Add a file</maintenance_card_btn_add_attach>
+  <maintenance_card_btn_view_all_note>Show all notes</maintenance_card_btn_view_all_note>
+  <maintenance_card_btn_hide_all_note>Show olny last notes</maintenance_card_btn_hide_all_note>
+  <maintenance_card_label_btn_footer>Register maintenance</maintenance_card_label_btn_footer>
+  <maintenance_header_label_procedure>Find a maintenance by name</maintenance_header_label_procedure>
+  <maintenance_header_label_procedure_placeholder>Maintenance name...</maintenance_header_label_procedure_placeholder>
+  <maintenance_header_label_state>State</maintenance_header_label_state>
+  <maintenance_header_option_state_choose>Select a state...</maintenance_header_option_state_choose>
+  <maintenance_label_create_intervention>Create a new maintenance-event</maintenance_label_create_intervention>
+  <maintenance_label_disable-maintenance>Select a maintenance...</maintenance_label_disable-maintenance>
+  <maintenance_state_expired>Expired</maintenance_state_expired>
+  <maintenance_state_closed>Closed</maintenance_state_closed>
+  <maintenance_state_running>Not expired</maintenance_state_running>
+  <maintenance_state_ending>Expiring</maintenance_state_ending>
+  <maintenance_table_header_counter>Counter</maintenance_table_header_counter>
+  <maintenance_table_header_deadline>Expires in</maintenance_table_header_deadline>
+  <maintenance_table_header_state>State</maintenance_table_header_state>
+  <maintenance_table_header_title>Title</maintenance_table_header_title>  
+  <maintenance_card_label_date_timestamp>Added in %s at %s</maintenance_card_label_date_timestamp>
+  <maintenance_card_btn_cancel_modify_note>Cancel</maintenance_card_btn_cancel_modify_note>
+  <maintenance_card_btn_save_modify_note>Save</maintenance_card_btn_save_modify_note>
+  <maintenance_date_neverdone>Maintenance never registered</maintenance_date_neverdone>
+  <maintenance_date_justdone>Last maintenance registered few minutes ago</maintenance_date_justdone>
+  <maintenance_date_hours>Last maintenance registered %d hours ago</maintenance_date_hours>
+  <maintenance_date_days>Last maintenance registered %d days ago</maintenance_date_days>
+  <maintenance_date_fixeddate>Last maintenance registered in: %s</maintenance_date_fixeddate>
+  <maintenance_card_created_timestamp>Maintenance created in %s at %s</maintenance_card_created_timestamp>
+  <maintenance_card_attachments>Attachments</maintenance_card_attachments>
+  <maintenance_card_notes>Notes</maintenance_card_notes>
+  
+  <!-- Maintenance Manager --> 
+  <create_maintenance_lbl_title_window>Maintenance-event creation</create_maintenance_lbl_title_window> 
+  <create_maintenance_lbl_title>Title</create_maintenance_lbl_title> 
+  <create_maintenance_btn_cancel>Cancel</create_maintenance_btn_cancel> 
+  <create_maintenance_btn_confirm>Create Maintenance</create_maintenance_btn_confirm> 
+  <create_maintenance_lbl_date>Date</create_maintenance_lbl_date> 
+  <create_maintenance_lbl_description>Description</create_maintenance_lbl_description> 
+  <create_maintenance_lbl_end_time>Time</create_maintenance_lbl_end_time> 
+  <create_maintenance_lbl_typology>Type</create_maintenance_lbl_typology> 
+  <create_maintenance_lbl_repeat>Repeat every</create_maintenance_lbl_repeat> 
+  <create_maintenance_repeat_day>Days</create_maintenance_repeat_day> 
+  <create_maintenance_repeat_hour>Hours</create_maintenance_repeat_hour> 
+  <create_maintenance_repeat_minutes>Minutes</create_maintenance_repeat_minutes> 
+  <create_maintenance_repeat_months>Months</create_maintenance_repeat_months>
+  <create_maintenance_lbl_fixeddate>Fixed date</create_maintenance_lbl_fixeddate>
+  <create_maintenance_lbl_temporal>Repeating event</create_maintenance_lbl_temporal> 
 
   <!-- /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ Tooltips /\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\ -->
   <!-- Footer -->
diff --git a/Step/wwwroot/assets/styles/base/maintenance-card.less b/Step/wwwroot/assets/styles/base/maintenance-card.less
index e75aa9f3..a1d544bd 100644
--- a/Step/wwwroot/assets/styles/base/maintenance-card.less
+++ b/Step/wwwroot/assets/styles/base/maintenance-card.less
@@ -57,6 +57,9 @@
                 font-size: 18px;
                 line-height: 1;
                 color: @color-greyish-brown;
+                &.closed{
+                    text-decoration: none;
+                }
             }
             .info{
                 width: 696px;
diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less
index ef01a81d..77a72b80 100644
--- a/Step/wwwroot/assets/styles/base/maintenance.less
+++ b/Step/wwwroot/assets/styles/base/maintenance.less
@@ -82,7 +82,7 @@
                         }
                     }
                     .multiselect{
-                        width: 100%;
+                        width: 250px;
                     }
                     .selectBox{
                         position: relative;
@@ -149,6 +149,8 @@
                         th:nth-child(1), td:nth-child(1){
                             width:190px;
                             max-width:190px;
+                            text-align: left;
+                            padding-left: 5px;
                         }
 
                         th:nth-child(2), td:nth-child(2){
diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css
index 917288c8..e505528a 100644
--- a/Step/wwwroot/assets/styles/style.css
+++ b/Step/wwwroot/assets/styles/style.css
@@ -8161,7 +8161,7 @@ footer .container button.big:before {
   color: #bbbcbc;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .multiselect {
-  width: 100%;
+  width: 250px;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-head .selectBox {
   position: relative;
@@ -8233,6 +8233,8 @@ footer .container button.big:before {
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(1) {
   width: 190px;
   max-width: 190px;
+  text-align: left;
+  padding-left: 5px;
 }
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th:nth-child(2),
 .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(2) {
@@ -8486,6 +8488,9 @@ footer .container button.big:before {
   line-height: 1;
   color: #4b4b4b;
 }
+.maintenance-card .body .box .subtitle.closed {
+  text-decoration: none;
+}
 .maintenance-card .body .box .info {
   width: 696px;
   height: 135px;
diff --git a/Step/wwwroot/src/components/maintenance.vue b/Step/wwwroot/src/components/maintenance.vue
index cb1c9cdb..ae8826b2 100644
--- a/Step/wwwroot/src/components/maintenance.vue
+++ b/Step/wwwroot/src/components/maintenance.vue
@@ -9,19 +9,19 @@
           <div class="maintenance-body">
             <div class="maintenance-box-left">
               <div class="maintenance-box-left-head">
-                <div>
+                <div v-if="false">
                   <label>{{'maintenance_header_label_date' | localize("Intervallo date")}}</label>
                   <select class="maintenance-select-interval-date"><option>{{'maintenance_header_option_date_lastmonth' | localize("Ultimo mese")}}</option></select>
                 </div>
                 <div>
-                  <label>{{'maintenance_header_label_procedure' | localize("Nome procedura")}}</label>
-                  <input class="custom maintenance-input-procedure" v-model="searchText" type="text" @focus="extendSelectState = false" placeholder="Nome della procedura">
+                  <label>{{'maintenance_header_label_procedure' | localize("Ricerca la manutenzione per nome")}}</label>
+                  <input class="custom maintenance-input-procedure" v-model="searchText" type="text" @focus="extendSelectState = false" :placeholder="'maintenance_header_label_procedure_placeholder' | localize('Nome della manutenzione...')">
                 </div>
                 <div class="multiselect">
                   <label>{{'maintenance_header_label_state' | localize("Stato")}}</label>
                   <div class="selectBox" @click="openSelectState()">
                     <select id="selectListCheckboxes">
-                      <option>{{'maintenance_header_option_state_choose' | localize("Apri e scegli")}}</option>
+                      <option>{{'maintenance_header_option_state_choose' | localize("Seleziona uno stato...")}}</option>
                       <div class="overSelect"></div>
                     </select>
                   </div>
@@ -30,43 +30,39 @@
                     <div>
                       <label>
                       <div class="custom-checkbox">
-                        <input type="checkbox"  v-model="arrayState" :value="'maintenance_header_option_state_notexpired' | localize('Non scaduto')" id="notexpired" />
+                        <input type="checkbox"  v-model="arrayState" value="running" id="notexpired" />
                         <label for="notexpired"></label>
                       </div>
-                      <label class="label-state">{{'maintenance_header_option_state_notexpired' | localize("Non scaduto")}}</label>
+                      <label class="label-state">{{'maintenance_state_running' | localize("Non scaduto")}}</label>
                       </label>
                     </div>
                     <div>
                       <label for="ending">
                       <div class="custom-checkbox">
-                        <input type="checkbox"  v-model="arrayState" :value="'maintenance_header_option_state_ending' | localize('In scadenza')" id="ending" />
+                        <input type="checkbox"  v-model="arrayState" value="ending" id="ending" />
                         <label for="ending"></label>
                       </div>
-                        <label class="label-state">{{'maintenance_header_option_state_ending' | localize("In scadenza")}}</label>
+                        <label class="label-state">{{'maintenance_state_ending' | localize("In scadenza")}}</label>
                       </label>
                     </div>
                     <div>
                       <label for="closed">
                       <div class="custom-checkbox">
-                        <input type="checkbox"  v-model="arrayState" :value="'maintenance_header_option_state_closed' | localize('Chiusa')" id="closed" />
+                        <input type="checkbox"  v-model="arrayState" value="closed" id="closed" />
                         <label for="closed"></label>
                       </div>
-                        <label class="label-state">{{'maintenance_header_option_state_closed' | localize("Chiusa")}}</label>
+                        <label class="label-state">{{'maintenance_state_closed' | localize("Chiusa")}}</label>
                       </label>
                     </div>
                     <div>
                       <label for="expired">
                       <div class="custom-checkbox">
-                        <input type="checkbox" v-model="arrayState" :value="'maintenance_header_option_state_expired' | localize('Scaduto')" id="expired" />
+                        <input type="checkbox" v-model="arrayState" value="expired" id="expired" />
                         <label for="expired"></label>
                       </div>
-                        <label class="label-state">{{'maintenance_header_option_state_closed' | localize("Scaduto")}}</label>
+                        <label class="label-state">{{'maintenance_state_expired' | localize("Scaduto")}}</label>
                       </label>
                     </div>
-                    <!-- <label for="test"><input type="checkbox" id="test" v-model="selected" :value="'maintenance_header_option_state_notexpired' | localize('Non scaduto')"></label>  
-                    <label for="test1"><input type="checkbox" id="test1" v-model="selected" :value="'maintenance_header_option_state_ending' | localize('In scadenza')">{{'maintenance_header_option_state_ending' | localize("In scadenza")}}</label>
-                    <label for="test2"><input type="checkbox" id="test2" v-model="selected" :value="'maintenance_header_option_state_closed' | localize('Chiusa')">{{'maintenance_header_option_state_closed' | localize("Chiusa")}}</label>
-                    <label for="test3"><input type="checkbox" id="test3" v-model="selected" :value="'maintenance_header_option_state_expired' | localize('Scaduto')">{{'maintenance_header_option_state_closed' | localize("Scaduto")}}</label> -->
                   </div>
                 </div>
                 <div>
@@ -81,7 +77,7 @@
                       <th>{{'maintenance_table_header_title' | localize("Titolo")}}</th>
                       <th>{{'maintenance_table_header_counter' | localize("Contatore")}}</th>
                       <th>{{'maintenance_table_header_deadline' | localize("Scadenza")}}</th>
-                      <th>{{'maintenance_table_header_state' | localize("Stato")}}</th>
+                      <th></th>
                       <th>&nbsp;</th>
                     </tr>
                   </thead>
@@ -90,7 +86,7 @@
                       <td colspan="1"><div>{{getTitleMaintenance(m)}}</div></td>
                       <td colspan="1"><maintenance-progress :class="{selected: selectedMaintenance == m}" :progress="m.percentageOfCompletion"></maintenance-progress></td>
                       <td colspan="1"><div>{{expirationDate(m.type, m.missingDays)}}</div></td>
-                      <td colspan="1"><div>{{m.state}}</div></td>
+                      <td colspan="1"><div>{{'maintenance_state_'+m.state | localize("Stato")}}</div></td>
                       <td colspan="1" >
                         <i v-if="m.type == 'EXP_DATE'" class="fa fa-calendar"></i>
                         <i v-if="m.type == 'TIME_INTERVAL'" class="fa fa-clock-o"></i>
@@ -124,7 +120,7 @@
               @click="modifyMaintenance(selectedMaintenance)"
               @clickdelete="deleteMaintenance(selectedMaintenance)"></maintenance-card>
               <div class="message-disable-maintenance" v-if="enableMaintenance">
-                <label>{{'maintenance_label_disable-maintenance' | localize("Devi selezionare una manutenzione")}}</label>
+                <label>{{'maintenance_label_disable-maintenance' | localize("Seleziona una manutenzione...")}}</label>
               </div>
             </div>
           </div>
diff --git a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
index d8d86c9a..1f00c4f2 100644
--- a/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/maintenance-card.vue
@@ -11,18 +11,19 @@
         <div class="body">
             <div class="box scrollable">
                 <div class="title-box">{{selectedMaintenance.description}}</div>
-                <div class="subtitle" v-if="existMantainance()">{{this.getDaysFromLastExpiration(selectedMaintenance)}}</div>
-                <div class="subtitle" v-if="!existMantainance()">Nessuna manutenzione effettuata</div>
+                <div class="subtitle" v-if="existMantainance() && selectedMaintenance.state!='closed'">{{this.getDaysFromLastExpiration(selectedMaintenance)}}</div>
+                <div class="subtitle closed" v-if="existMantainance() && selectedMaintenance.state=='closed'">&nbsp;</div>
+                <div class="subtitle" v-if="!existMantainance()">{{'maintenance_date_neverdone' | localize("Nessuna manutenzione effettuata")}}</div>
                 <div class="info">
                     <!-- <div class="estimated-time">
                         <div class="title">Tempo stimato</div>
                         <div class="time">7 giorni</div>
                     </div> -->
                     <div class="details" v-if="!selectedMaintenance.createdByCms">
-                        Manutenzione creata in data {{convertDate(selectedMaintenance.creationDate)}} alle ore {{convertDateToTime(selectedMaintenance.creationDate)}}
+                        {{'maintenance_card_created_timestamp' | localize("Manutenzione creata in data %s alle ore %s",convertDate(selectedMaintenance.creationDate),convertDateToTime(selectedMaintenance.creationDate))}}
                     </div>
                     <div class="expiring">
-                        <div class="title">{{getState(selectedMaintenance.percentageOfCompletion,selectedMaintenance.type,selectedMaintenance.lastPerformedDate)}}</div>
+                        <div class="title" v-if="selectedMaintenance.state">{{'maintenance_state_'+selectedMaintenance.state | localize("Stato")}}</div>
                         <div class="time">{{expiration}}</div>
                     </div>
                 </div>
@@ -31,7 +32,7 @@
                     <button class="btn pulsante-pdf">Pdf</button>
                     <button class="btn help"><div class="modifytext">Chiedi</div><div>Aiuto</div></button>
                 </div> -->
-                <accordion-maintenance :title="'Allegati'" :counter="attachmentsMaintenance.length">
+                <accordion-maintenance :title="'maintenance_card_attachments' | localize('Allegati')" :counter="attachmentsMaintenance.length">
                     <div class="dropdown">
                         <div class="filename" v-for="a in attachmentsMaintenance" :key="a.id" :class="{selected: selectedAttachMaintenance == a}" @click="onClickSelectAttach(a)">
                             <i class="fa fa-file-text-o"></i> <span>{{a.fileName}}</span>
@@ -40,12 +41,6 @@
                                 <button class="btn-hidden" v-if="selectedAttachMaintenance == a && a.userId == currentUser.id" @click="onClickDeleteAttach(a)"><i class="fa fa-trash" ></i></button>
                             </div>
                         </div>
-                        <!-- <div class="filename">
-                            <i class="fa fa-file-text-o"></i> <span>NomeFile.txt</span>
-                        </div>
-                        <div class="filename">
-                            <i class="fa fa-file-text-o"></i> <span>NomeFile.txt</span>
-                        </div> -->
                         <div class="allattach">
                             <button class="btn-hidden" @click="updateLimitation(limitationList)">
                                 <span v-if="limitationList == attachmentsMaintenance.length">{{'maintenance_card_btn_hide_all_attach' | localize("Nascondi tutti gli allegati")}}</span>
@@ -53,11 +48,11 @@
                             </button>
                         </div>
                         <div class="addattach">
-                            <div class="group-button-add-attach"><label for="input">Aggiungi un allegato<label for="input" class="btn"><i class="fa fa-plus"><input id="input" type="file" accept="application/pdf,image/jpeg,image/png" @change="onChange" style="display: none"/></i></label></label></div>
+                            <div class="group-button-add-attach"><label for="input">{{'maintenance_card_btn_add_attach' | localize("Aggiungi un allegato")}}<label for="input" class="btn"><i class="fa fa-plus"><input id="input" type="file" accept="application/pdf,image/jpeg,image/png" @change="onChange" style="display: none"/></i></label></label></div>
                         </div>
                     </div>
                 </accordion-maintenance>
-                <accordion-maintenance :title="'Note'" :counter="noteMaintenance.length">
+                <accordion-maintenance :title="'maintenance_card_notes' | localize('Note')" :counter="noteMaintenance.length">
                     <div class="dropdown">
                         <div class="all-message-box scrollable_auto">
                             <div class="message-box" v-for="(n, index) in noteMaintenanceReversed" :key="index" v-if="noteMaintenance && noteMaintenance.length > 0 && index < limitationList" :class="{selected: selectedNoteMaintenance == n}" @click="onClickSelectNote(n)">
@@ -67,7 +62,7 @@
                                     <div v-if="currentUser && n.user.username == currentUser.username" :class="{'colorWhite':isDarkColor(getColor(n.user.lastName,n.user.firstName))}" :style="{'background-color':getColor(n.user.lastName,n.user.firstName) }" class="avatar"> {{n.user.firstName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}{{n.user.lastName.split(' ').map(function (s) { return s.charAt(0); }).join('')}}</div>
                                 </div>                                
                                 <div  class="message-box-body" :class="{'my':(currentUser && n.user.username == currentUser.username)}">
-                                    <label class="text-date">{{'maintenance_card_label_date_note_add' | localize("Aggiunta il ")}}{{convertDate(n.dateTime)}}{{'maintenance_card_label_date_note_at_time' | localize(" alle ")}}{{convertDateToTime(n.dateTime)}}</label>
+                                    <label class="text-date">{{'maintenance_card_label_date_timestamp' | localize("Aggiunta il %s alle %s",convertDate(n.dateTime),convertDateToTime(n.dateTime))}}</label>
                                 </div>
                                 <div class="groupbutton" :class="{'enablemodify':!enableModifyNote}">
                                     <button class="btn-hidden" v-if="selectedNoteMaintenance == n && enableModifyNote && currentUser && n.user.username == currentUser.username" @click="onClickModifyNote(n)"><i class="fa fa-pencil-square-o"></i></button>
@@ -239,38 +234,20 @@ export default {
             this.limitationList = this.noteMaintenance.length;
         }
       },     
-      getState(percentage,Type, LastPerfDate){
-        if(percentage < 70 && percentage >= 0){            
-           return this.$options.filters.localize("maintenance_state_running","Non scaduto");
-        }
-        else if(percentage > 70 && percentage < 90){
-           return this.$options.filters.localize("maintenance_state_running","Non scaduto");
-        }
-        else if(percentage > 90 && percentage < 100){
-           return this.$options.filters.localize("maintenance_state_ending","In scadenza");
-        }
-        else if(Type == "EXP_DATE" && LastPerfDate){
-           return this.$options.filters.localize("maintenance_state_closed","Chiusa");
-        }
-        else {
-           return this.$options.filters.localize("maintenance_state_expired","Scaduto");
-        }
-      },
       getDaysFromLastExpiration(m){
           if(m){
               var today = moment(new Date());
               var end = moment(m.lastPerformedDate);
               var days = moment.duration(today.diff(end))._data.days;
-              var hours = moment.duration(today.diff(end))._data.hours;
-              
+              var hours = moment.duration(today.diff(end))._data.hours;                
               if(hours==0)
-                return "Ultimo intervento effettuato pochi minuti fa";
+                return this.$options.filters.localize("maintenance_date_justdone","Ultimo intervento effettuato pochi minuti fa");
               else if(days==0)
-                return "Ultimo intervento effettuato " + hours + " ore fa";
+                return this.$options.filters.localize("maintenance_date_hours","Ultimo intervento effettuato %d ore fa",hours);
               else if(days<=7)
-                return "Ultimo intervento effettuato " + days + " giorni fa";
+                return this.$options.filters.localize("maintenance_date_days","Ultimo intervento effettuato %d giorni fa",days);
               else
-                return "Ultimo intervento effettuato in data: " + moment(m.lastPerformedDate).format('L');
+                return this.$options.filters.localize("maintenance_date_fixeddate","Ultimo intervento effettuato in data: %s",moment(m.lastPerformedDate).format('L'));
           }
           return "";
       },
diff --git a/Step/wwwroot/src/modules/create-maintenance.vue b/Step/wwwroot/src/modules/create-maintenance.vue
index dcdedced..dca45783 100644
--- a/Step/wwwroot/src/modules/create-maintenance.vue
+++ b/Step/wwwroot/src/modules/create-maintenance.vue
@@ -1,11 +1,11 @@
 <template>
-  <modal type="create-maintenance" :title="'create_maintenance_lbl_title' | localize('Creazione intervento di manutenzione')">
+  <modal type="create-maintenance" :title="'create_maintenance_lbl_title_window' | localize('Creazione intervento di manutenzione')">
     <button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
     <div class="typology">
         <label class="typology_lbl">{{'create_maintenance_lbl_typology' | localize("Tipologia")}}</label>
         <div class="radiobutton">
-            <input type="radio" v-validate.initial="'required'" :disabled="!this.isNewMaintenance()" id="datefixed" name="radio-group" v-model="newMaintenance.type" value="EXP_DATE"><label for="datefixed">Data Fissa</label>
-            <input type="radio" v-validate.initial="'required'" :disabled="!this.isNewMaintenance()" id="time" name="radio-group" v-model="newMaintenance.type" value="TIME_INTERVAL"><label for="time">Temporale</label>
+            <input type="radio" v-validate.initial="'required'" :disabled="!this.isNewMaintenance()" id="datefixed" name="radio-group" v-model="newMaintenance.type" value="EXP_DATE"><label for="datefixed">{{'create_maintenance_lbl_fixeddate' | localize("Data Fissa")}}</label>
+            <input type="radio" v-validate.initial="'required'" :disabled="!this.isNewMaintenance()" id="time" name="radio-group" v-model="newMaintenance.type" value="TIME_INTERVAL"><label for="time">{{'create_maintenance_lbl_temporal' | localize("Temporale")}}</label>
         </div>
     </div>
         <div class="title">
diff --git a/Step/wwwroot/src/store/maintenance.store.ts b/Step/wwwroot/src/store/maintenance.store.ts
index eea48f07..88ef2d1d 100644
--- a/Step/wwwroot/src/store/maintenance.store.ts
+++ b/Step/wwwroot/src/store/maintenance.store.ts
@@ -38,19 +38,19 @@ export const maintenanceStore = {
   mutations: {
     UpdateMaintenance(store, model: server.Maintenance) {
       if(model.percentageOfCompletion < 70 && model.percentageOfCompletion >= 0){
-        model.state = localizeString("maintenance_state_running","Non scaduto");
+        model.state = "running";
       }
       else if(model.percentageOfCompletion > 70 && model.percentageOfCompletion < 90){
-        model.state = localizeString("maintenance_state_running","Non scaduto");
+        model.state = "running";
       }
       else if(model.percentageOfCompletion > 90 && model.percentageOfCompletion < 100){
-        model.state = localizeString("maintenance_state_ending","In scadenza");
+        model.state = "ending";
       }
       else if(model.type == "EXP_DATE" && model.lastPerformedDate){
-        model.state = localizeString("maintenance_state_closed","Chiusa");
+        model.state = "closed";
       }
       else {
-        model.state = localizeString("maintenance_state_expired","Scaduto");
+        model.state = "expired";
       }
         store._maintenances.set(model.id, model);
         store.maintenances = Array.from(store._maintenances.values());