Merge remote-tracking branch 'origin/master'

2024-02-22 17:59:25 +08:00
parent ff04f40bbc 407c8b5152
commit 6c42abffde
38 changed files with 406 additions and 405 deletions
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device.properties
@@ -0,0 +1,29 @@
+universal_off-line=\u8131\u673A
+universal_stand-alone=\u5355\u673A
+universal_standby=\u5F85\u673A
+universal_operation=\u8FD0\u884C\u4E2D
+universal_no=\u65E0\u8D27
+universal_yes=\u6709\u8D27
+universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27
+universal_delivery=\u53D6\u8D27\u4E2D
+universal_completed=\u53D6\u8D27\u5B8C\u6210
+universal_releasing=\u653E\u8D27\u4E2D
+universal_releasing_completed=\u653E\u8D27\u5B8C\u6210
+universal_remark1=\u672A\u67E5\u627E\u4EFB\u52A1\u539F\u56E0\u4E3A\uFF1A
+universal_remark2=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u662F\u5F85\u673A\u72B6\u6001
+universal_remark3=\u5149\u7535\u4FE1\u53F7(move)\u4E3A\u6709\u8D27\u72B6\u6001
+universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u4E3A0
+universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
+universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
+universal_message1=\u653E\u8D27\u5B8C\u6210
+universal_message2=\u653E\u8D27\u5931\u8D25
+universal_message3=\u6709\u62A5\u8B66
+universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
+universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
+universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001
+universal_feedMessage4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u4E0D\u5E94\u8BE5\u4E3A0
+universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B
+
+
+
+
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_en_US.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_en_US.properties
@@ -0,0 +1,25 @@
+universal_off-line=off-line
+universal_stand-alone=stand-alone
+universal_standby=standby
+universal_operation=operation
+universal_no=Out of stock
+universal_yes=In stock
+universal_two_yes=There are pallets and goods
+universal_delivery=Taking delivery
+universal_completed=Pick-up completed
+universal_releasing=Releasing goods
+universal_releasing_completed=Release completed
+universal_remark1=The task is not found because
+universal_remark2=Working mode (mode) is not standby
+universal_remark3=Photoelectric signal (move) is in stock status
+universal_remark4=The current report task ID should be 0
+universal_remark5=Right-click the icon and change the Request task reset flag (requireSucess) to No
+universal_notCreateInstMessage=Instructions cannot be created because the task for the associated device is not found
+universal_message1=Release completed
+universal_message2=Delivery failure
+universal_message3=Have an alarm
+universal_feedMessage1=mode is not in the running state
+universal_feedMessage2=action signal (action signal) is not a release completed status
+universal_feedMessage3=Photoelectric signal (move) is not out of stock
+universal_feedMessage4=The current report task number (task) should not be 0
+universal_feedMessage5=Gantry manipulator
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_in_ID.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_in_ID.properties
@@ -0,0 +1,25 @@
+universal_off-line=Akses internet
+universal_stand-alone=(s) single-player
+universal_standby=siaga
+universal_operation=operasi
+universal_no=bayar
+universal_yes=Yang aku mau
+universal_two_yes=Ada nampan dengan barang
+universal_delivery=Mengambil barang
+universal_completed=Pengambilan barang selesai
+universal_releasing=Letakkan barang
+universal_releasing_completed=Pengiriman selesai
+universal_remark1=Alasan tugas yang tidak dicari adalah
+universal_remark2=Mode tidak dalam mode siaga
+universal_remark3=Sinyal fotolistrik untuk kondisi pengiriman
+universal_remark4=Kita tugaskan tugaskan task
+universal_remark5=Klik kanan pada ikon dan ubah not (requicess) untuk penugasan ulang
+universal_notCreateInstMessage=Misi untuk divais yang diasosiasikan tidak ditemukan, perintah tidak dapat dibuat
+universal_message1=Pengiriman selesai
+universal_message2=Gagal memasukkan barang
+universal_message3=Alarm berbunyi
+universal_feedMessage1=Mode kerja tidak untuk mode dalam mode
+universal_feedMessage2=Sinyal aksi tidak lengkap untuk penempatan
+universal_feedMessage3=tidak ada status pengiriman
+universal_feedMessage4=Tugaskan tugaskan tugaskan bukan hanya 0
+universal_feedMessage5=Pengemudi-mekanik line
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_zh_CN.properties
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/two_device/two_device_zh_CN.properties
@@ -0,0 +1,25 @@
+universal_off-line=\u8131\u673A
+universal_stand-alone=\u5355\u673A
+universal_standby=\u5F85\u673A
+universal_operation=\u8FD0\u884C\u4E2D
+universal_no=\u65E0\u8D27
+universal_yes=\u6709\u8D27
+universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27
+universal_delivery=\u53D6\u8D27\u4E2D
+universal_completed=\u53D6\u8D27\u5B8C\u6210
+universal_releasing=\u653E\u8D27\u4E2D
+universal_releasing_completed=\u653E\u8D27\u5B8C\u6210
+universal_remark1=\u672A\u67E5\u627E\u4EFB\u52A1\u539F\u56E0\u4E3A\uFF1A
+universal_remark2=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u662F\u5F85\u673A\u72B6\u6001
+universal_remark3=\u5149\u7535\u4FE1\u53F7(move)\u4E3A\u6709\u8D27\u72B6\u6001
+universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u4E3A0
+universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
+universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
+universal_message1=\u653E\u8D27\u5B8C\u6210
+universal_message2=\u653E\u8D27\u5931\u8D25
+universal_message3=\u6709\u62A5\u8B66
+universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
+universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
+universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001
+universal_feedMessage4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u4E0D\u5E94\u8BE5\u4E3A0
+universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B