Fixed Library error + Fixed labels in language files + Default labels in machine-info dialog
This commit is contained in:
CMS3762\carminatini
Binary file not shown.
@@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<ncConfig>
|
||||
<ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
|
||||
<ncVendor>OSAI</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
|
||||
<showNcHMI>true</showNcHMI>
|
||||
<ncIpAddress>localhost</ncIpAddress>
|
||||
<ncIpAddress>192.168.157.2</ncIpAddress>
|
||||
<ncPort>8080</ncPort>
|
||||
<machineModel>Ares</machineModel>
|
||||
<machineModel>Ares 37 OF</machineModel>
|
||||
</ncConfig>
|
||||
<serverConfig>
|
||||
<serverPort>9000</serverPort>
|
||||
@@ -19,7 +19,7 @@
|
||||
<ncNeeded>true</ncNeeded>
|
||||
</production>
|
||||
<tooling>
|
||||
<enabled>false</enabled>
|
||||
<enabled>true</enabled>
|
||||
<allowExternalBrowser>false</allowExternalBrowser>
|
||||
<ncNeeded>true</ncNeeded>
|
||||
</tooling>
|
||||
|
||||
+20
-12
@@ -1,3 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<machineinfo_lbl_title>Informazioni Macchina</machineinfo_lbl_title>
|
||||
<userinfo_lbl_title>Impostazioni Utente</userinfo_lbl_title>
|
||||
@@ -5,30 +6,37 @@
|
||||
<userinfo_lbl_language>Lingua</userinfo_lbl_language>
|
||||
<userinfo_btn_cancel>Annulla</userinfo_btn_cancel>
|
||||
<userinfo_btn_save>Salva</userinfo_btn_save>
|
||||
|
||||
<login_lbl_title>Login utente</login_lbl_title>
|
||||
<login_lbl_username>Nome utente</login_lbl_username>
|
||||
<login_lbl_password>Password</login_lbl_password>
|
||||
<login_btn_login>Log in</login_btn_login>
|
||||
<login_lbl_invalidusername>Nome utente errato</login_lbl_invalidusername>
|
||||
<login_lbl_invalidpassword>Password errata</login_lbl_invalidpassword>
|
||||
|
||||
<alarm_ribbon_title_1_item>Allarme</alarm_ribbon_title_1_item>
|
||||
<alarm_ribbon_title_more_items>Ci sono %d allarmi attivi</alarm_ribbon_title_more_items>
|
||||
|
||||
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
|
||||
<warning_ribbon_title_more_items>Ci sono %d warning attivi</warning_ribbon_title_more_items>
|
||||
|
||||
<header_maintainance_request>Effettuare manutenzione</header_maintainance_request>
|
||||
<header_maintainance_request_explanation>C'è una procedura da effettuare</header_maintainance_request_explanation>
|
||||
|
||||
<alarms_btn_history_show>Vedi storico allarmi</alarms_btn_history_show>
|
||||
<alarms_refresh_all>Refresh tutti</alarms_refresh_all>
|
||||
<alarm_item_btn_show>Vedi</alarm_item_btn_show>
|
||||
|
||||
<alarm_ribbon_title_1_item>Allarme</alarm_ribbon_title_1_item>
|
||||
<alarm_ribbon_title_more_items>Ci sono %d allarmi attivi</alarm_ribbon_title_more_items>
|
||||
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
|
||||
<warning_ribbon_title_more_items>Ci sono %d warning attivi</warning_ribbon_title_more_items>
|
||||
<alarm_detail_lbl_status>Stato</alarm_detail_lbl_status>
|
||||
|
||||
<alarm_manual_lbl_title>Procedura guidata</alarm_manual_lbl_title>
|
||||
<alarm_manual_lbl_description>Risoluzione dell'allarme</alarm_manual_lbl_description>
|
||||
<alarm_manual_btn_start>Avvia</alarm_manual_btn_start>
|
||||
<alarm_manual_btn_start>Avvia</alarm_manual_btn_start>
|
||||
<alarm_detail_btn_show_manual>Vedi Manuale</alarm_detail_btn_show_manual>
|
||||
<alarm_detail_btn_ask_help>Chiedi Aiuto</alarm_detail_btn_ask_help>
|
||||
<alarm_detail_btn_refresh>Refresh</alarm_detail_btn_refresh>
|
||||
<machine_serial_number>Matricola Nr:</machine_serial_number>
|
||||
<machine_installation_date>Data di installazione:</machine_installation_date>
|
||||
<machineinfo_model_nc>Modello Cn:</machineinfo_model_nc>
|
||||
<machineinfo_serial_nc>Num. Seriale Cn:</machineinfo_serial_nc>
|
||||
<machineinfo_firmware_version>Versione firmware Cn:</machineinfo_firmware_version>
|
||||
<machineinfo_plc_version>Versione Plc:</machineinfo_plc_version>
|
||||
<machineinfo_current_language>Lingua selezionata Cn:</machineinfo_current_language>
|
||||
<machineinfo_processes>Numero di processi Cn:</machineinfo_processes>
|
||||
<machineinfo_server_cms_version>Versione Server Step:</machineinfo_server_cms_version>
|
||||
<machineinfo_core_cms_version>Versione Core Step:</machineinfo_core_cms_version>
|
||||
<machineinfo_client_version>Versione Client Step:</machineinfo_client_version>
|
||||
</root>
|
||||
+20
-13
@@ -6,30 +6,37 @@
|
||||
<userinfo_lbl_language>Language</userinfo_lbl_language>
|
||||
<userinfo_btn_cancel>Cancel</userinfo_btn_cancel>
|
||||
<userinfo_btn_save>Save</userinfo_btn_save>
|
||||
|
||||
<login_lbl_title>User login</login_lbl_title>
|
||||
<login_lbl_username>User name</login_lbl_username>
|
||||
<login_lbl_password>Password</login_lbl_password>
|
||||
<login_btn_login>Log in</login_btn_login>
|
||||
<login_lbl_invalidusername>Invalid user name</login_lbl_invalidusername>
|
||||
<login_lbl_invalidpassword>Invalid password</login_lbl_invalidpassword>
|
||||
|
||||
<alarm_ribbon_title_1_item>Alarm</alarm_ribbon_title_1_item>
|
||||
<alarm_ribbon_title_more_items>There are %d active alarms</alarm_ribbon_title_more_items>
|
||||
|
||||
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
|
||||
<warning_ribbon_title_more_items>There are %d active warnings</warning_ribbon_title_more_items>
|
||||
|
||||
<header_maintainance_request>Maintanance request</header_maintainance_request>
|
||||
<header_maintainance_request>Maintenance request</header_maintainance_request>
|
||||
<header_maintainance_request_explanation>There is a procedure to be performed</header_maintainance_request_explanation>
|
||||
|
||||
<alarms_btn_history_show>Show alarms history</alarms_btn_history_show>
|
||||
<alarms_refresh_all>Refresh all</alarms_refresh_all>
|
||||
<alarm_item_btn_show>Show</alarm_item_btn_show>
|
||||
|
||||
<alarm_item_btn_show>Show</alarm_item_btn_show>
|
||||
<alarm_ribbon_title_1_item>Alarm</alarm_ribbon_title_1_item>
|
||||
<alarm_ribbon_title_more_items>There are %d active alarms</alarm_ribbon_title_more_items>
|
||||
<warning_ribbon_title_1_item>Warning</warning_ribbon_title_1_item>
|
||||
<warning_ribbon_title_more_items>There are %d active warnings</warning_ribbon_title_more_items>
|
||||
<alarm_detail_lbl_status>Status</alarm_detail_lbl_status>
|
||||
|
||||
<alarm_manual_lbl_title>Wizard</alarm_manual_lbl_title>
|
||||
<alarm_manual_lbl_description>Alarm resolution</alarm_manual_lbl_description>
|
||||
<alarm_manual_btn_start>Start</alarm_manual_btn_start>
|
||||
<alarm_detail_btn_show_manual>Show Manual</alarm_detail_btn_show_manual>
|
||||
<alarm_detail_btn_ask_help>Ask Help</alarm_detail_btn_ask_help>
|
||||
<alarm_detail_btn_refresh>Refresh</alarm_detail_btn_refresh>
|
||||
<machine_serial_number>Machine Id:</machine_serial_number>
|
||||
<machine_installation_date>Installation date:</machine_installation_date>
|
||||
<machineinfo_model_nc>Nc Model:</machineinfo_model_nc>
|
||||
<machineinfo_serial_nc>Nc Serial Num:</machineinfo_serial_nc>
|
||||
<machineinfo_firmware_version>Nc Firmware Vs:</machineinfo_firmware_version>
|
||||
<machineinfo_plc_version>Plc Version:</machineinfo_plc_version>
|
||||
<machineinfo_current_language>Nc Selected Language:</machineinfo_current_language>
|
||||
<machineinfo_processes>Nc Configured Processes:</machineinfo_processes>
|
||||
<machineinfo_server_cms_version>Step Server Version:</machineinfo_server_cms_version>
|
||||
<machineinfo_core_cms_version>Step Core Version:</machineinfo_core_cms_version>
|
||||
<machineinfo_client_version>Step Client Version:</machineinfo_client_version>
|
||||
</root>
|
||||
@@ -11,4 +11,31 @@
|
||||
<login_btn_login>登錄</login_btn_login>
|
||||
<login_lbl_invalidusername>錯誤的用戶名</login_lbl_invalidusername>
|
||||
<login_lbl_invalidpassword>錯誤的密碼</login_lbl_invalidpassword>
|
||||
<header_maintainance_request>維護請求</header_maintainance_request>
|
||||
<header_maintainance_request_explanation>有一個程序要執行</header_maintainance_request_explanation>
|
||||
<alarms_btn_history_show>顯示警報歷史</alarms_btn_history_show>
|
||||
<alarms_refresh_all>全部刷新</alarms_refresh_all>
|
||||
<alarm_item_btn_show>顯示</alarm_item_btn_show>
|
||||
<alarm_ribbon_title_1_item>報警</alarm_ribbon_title_1_item>
|
||||
<alarm_ribbon_title_more_items>有許多活動的警報</alarm_ribbon_title_more_items>
|
||||
<warning_ribbon_title_1_item>警告</warning_ribbon_title_1_item>
|
||||
<warning_ribbon_title_more_items>有很多積極的警告</warning_ribbon_title_more_items>
|
||||
<alarm_detail_lbl_status>狀態</alarm_detail_lbl_status>
|
||||
<alarm_manual_lbl_title>巫師</alarm_manual_lbl_title>
|
||||
<alarm_manual_lbl_description>報警解決</alarm_manual_lbl_description>
|
||||
<alarm_manual_btn_start>開始</alarm_manual_btn_start>
|
||||
<alarm_detail_btn_show_manual>顯示手冊</alarm_detail_btn_show_manual>
|
||||
<alarm_detail_btn_ask_help>詢問幫助</alarm_detail_btn_ask_help>
|
||||
<alarm_detail_btn_refresh>刷新</alarm_detail_btn_refresh>
|
||||
<machine_serial_number>機器識別:</machine_serial_number>
|
||||
<machine_installation_date>安裝日期:</machine_installation_date>
|
||||
<machineinfo_model_nc>數控模型:</machineinfo_model_nc>
|
||||
<machineinfo_serial_nc>數控系列號:</machineinfo_serial_nc>
|
||||
<machineinfo_firmware_version>數字固件版本:</machineinfo_firmware_version>
|
||||
<machineinfo_plc_version>Plc版本:</machineinfo_plc_version>
|
||||
<machineinfo_current_language>數控選材語言:</machineinfo_current_language>
|
||||
<machineinfo_processes>數控配置的過程:</machineinfo_processes>
|
||||
<machineinfo_server_cms_version>Step 服務器版本:</machineinfo_server_cms_version>
|
||||
<machineinfo_core_cms_version>Step 核心版本:</machineinfo_core_cms_version>
|
||||
<machineinfo_client_version>Step 客戶端版本:</machineinfo_client_version>
|
||||
</root>
|
||||
@@ -7,20 +7,20 @@
|
||||
|
||||
<div class="details">
|
||||
<strong>{{machineInfo.machineName}}</strong>
|
||||
<label>{{'machine_serial_number' | localize('Matricola Nr.')}} <strong>{{machineInfo.machineSerialNumber}}</strong></label>
|
||||
<hr/>
|
||||
<label>{{'machine_serial_number' | localize('Matricola Nr.:')}} <strong>{{machineInfo.machineSerialNumber}}</strong></label>
|
||||
<label>{{'machine_installation_date' | localize('Data di installazione:')}} <strong>{{machineInfo.installationDate | date('DD-MM-YYYY')}}</strong></label>
|
||||
<hr/>
|
||||
|
||||
<label>{{'machineinfo_model_nc' | localize('Modello Nc:')}} <strong>{{machineInfo.ncModel}}</strong></label>
|
||||
<label>{{'machineinfo_serial_nc' | localize('Num. Seriale Nc:')}} <strong>{{machineInfo.ncSerialNumber}}</strong></label>
|
||||
<label>{{'machineinfo_firmware_version' | localize('Versione software HMI:')}} <strong>{{machineInfo.firmwareVersion}}</strong></label>
|
||||
<label>{{'machineinfo_model_nc' | localize('Modello Cn:')}} <strong>{{machineInfo.ncModel}}</strong></label>
|
||||
<label>{{'machineinfo_serial_nc' | localize('Num. Seriale Cn:')}} <strong>{{machineInfo.ncSerialNumber}}</strong></label>
|
||||
<label>{{'machineinfo_firmware_version' | localize('Versione firmware Cn:')}} <strong>{{machineInfo.firmwareVersion}}</strong></label>
|
||||
<label>{{'machineinfo_plc_version' | localize('Versione Plc:')}} <strong>{{machineInfo.plcVersion}}</strong></label>
|
||||
<label>{{'machineinfo_current_language' | localize('Lingua selezionata:')}} <strong>{{machineInfo.defaultLanguage}}</strong></label>
|
||||
<label>{{'machineinfo_processes' | localize('Numero di processi:')}} <strong>{{machineInfo.processes}}</strong></label>
|
||||
<label>{{'machineinfo_current_language' | localize('Lingua selezionata Cn:')}} <strong>{{machineInfo.defaultLanguage}}</strong></label>
|
||||
<label>{{'machineinfo_processes' | localize('Numero di processi Cn:')}} <strong>{{machineInfo.processes}}</strong></label>
|
||||
<hr/>
|
||||
<label>{{'machineinfo_server_cms_version' | localize('Versione Server Cms:')}} <strong>{{machineInfo.cmsServerVersion}}</strong></label>
|
||||
<label>{{'machineinfo_core_cms_version' | localize('Versions Core CMS:')}} <strong>{{machineInfo.cmsCoreVersion}}</strong></label>
|
||||
<label>{{'machineinfo_client_version' | localize('Versione Client di utilizzo:')}} <strong>{{clientVersion}}</strong></label>
|
||||
<label>{{'machineinfo_server_cms_version' | localize('Versione Server Step:')}} <strong>{{machineInfo.cmsServerVersion}}</strong></label>
|
||||
<label>{{'machineinfo_core_cms_version' | localize('Versions Core Step:')}} <strong>{{machineInfo.cmsCoreVersion}}</strong></label>
|
||||
<label>{{'machineinfo_client_version' | localize('Versione Client Step:')}} <strong>{{clientVersion}}</strong></label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user