diff --git a/INT63DC_2C.suo b/INT63DC_2C.suo index 0f8038c..19d90d3 100644 Binary files a/INT63DC_2C.suo and b/INT63DC_2C.suo differ diff --git a/INT63DC_2C.suo~bc2b0123135d6dd81127353a56d6d77288beb9af b/INT63DC_2C.suo~bc2b0123135d6dd81127353a56d6d77288beb9af deleted file mode 100644 index 7422da1..0000000 Binary files a/INT63DC_2C.suo~bc2b0123135d6dd81127353a56d6d77288beb9af and /dev/null differ diff --git a/INT63DC_2C/Forms/FormCalibration.cs b/INT63DC_2C/Forms/FormCalibration.cs index a36c32b..3621681 100644 --- a/INT63DC_2C/Forms/FormCalibration.cs +++ b/INT63DC_2C/Forms/FormCalibration.cs @@ -145,7 +145,7 @@ namespace INT63DC_2C.Forms break; case DataStore.LanguageID.Japanese: #region Japanese - this.labelTitle.Text = "校正"; + this.labelTitle.Text = "キャリブレㅡション"; this.buttonStart.Text = "スタㅡト"; this.buttonBalance.Text = "バランス"; @@ -155,7 +155,7 @@ namespace INT63DC_2C.Forms this.groupBoxHelp.Text = "ヘルプ"; this.labelStaticBalanceWeight.Text = "バランス重量"; this.labelStaticMaxWeight.Text = "最大重量"; - this.labelStaticDigit.Text = "桁"; + this.labelStaticDigit.Text = "目量"; this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDisable)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackDown)); @@ -270,7 +270,7 @@ namespace INT63DC_2C.Forms this.listBoxHelp.Items.Add("Zeile die Taste [Start]."); break; case DataStore.LanguageID.Japanese: - this.listBoxHelp.Items.Add("較正"); + this.listBoxHelp.Items.Add("キャリブレㅡション"); this.listBoxHelp.Items.Add("レㅡンを選択したら、"); this.listBoxHelp.Items.Add("[スタㅡト]ボタンを押します。"); break; @@ -339,7 +339,7 @@ namespace INT63DC_2C.Forms this.listBoxHelp.Items.Add("bitte warten"); break; case DataStore.LanguageID.Japanese: - this.listBoxHelp.Items.Add("校正開始"); + this.listBoxHelp.Items.Add("キャリブレㅡション開始"); this.listBoxHelp.Items.Add("待機する"); break; default: @@ -369,7 +369,7 @@ namespace INT63DC_2C.Forms this.listBoxHelp.Items.Add("Kalibrierung ab"); break; case DataStore.LanguageID.Japanese: - this.listBoxHelp.Items.Add("校正をキャンセルする"); + this.listBoxHelp.Items.Add("キャリブレㅡションをキャンセルする"); break; default: break; @@ -425,7 +425,7 @@ namespace INT63DC_2C.Forms this.listBoxHelp.Items.Add("Die Kalibrierung ist abgeschlossen."); break; case DataStore.LanguageID.Japanese: - this.listBoxHelp.Items.Add("校正終了"); + this.listBoxHelp.Items.Add("キャリブレㅡション終了"); break; default: break; @@ -457,7 +457,7 @@ namespace INT63DC_2C.Forms this.listBoxHelp.Items.Add("Bitte noch einmal versuchen"); break; case DataStore.LanguageID.Japanese: - this.listBoxHelp.Items.Add("校正エラㅡ"); + this.listBoxHelp.Items.Add("キャリブレㅡションエラㅡ"); this.listBoxHelp.Items.Add("もうㅡ度試してください"); break; default: diff --git a/INT63DC_2C/Forms/FormInformation.cs b/INT63DC_2C/Forms/FormInformation.cs index c4e474c..7e8fe72 100644 --- a/INT63DC_2C/Forms/FormInformation.cs +++ b/INT63DC_2C/Forms/FormInformation.cs @@ -98,7 +98,7 @@ namespace INT63DC_2C.Forms break; case DataStore.LanguageID.Japanese: #region Japanese - this.labelTitle.Text = "情報"; + this.labelTitle.Text = "インフォメㅡション"; this.buttonScreen.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDisable)); this.buttonScreen.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnScreenDown)); @@ -153,7 +153,7 @@ namespace INT63DC_2C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "8.4.0"; + this.labelDisplayVer.Text = "8.4.1"; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; this.textBoxSerialNo.Location = new Point(395, 225); this.textBoxSerialNo.Visible = false; diff --git a/INT63DC_2C/Forms/FormProgramUpdate.cs b/INT63DC_2C/Forms/FormProgramUpdate.cs index 96645fc..9372c59 100644 --- a/INT63DC_2C/Forms/FormProgramUpdate.cs +++ b/INT63DC_2C/Forms/FormProgramUpdate.cs @@ -88,9 +88,9 @@ namespace INT63DC_2C.Forms case DataStore.LanguageID.Japanese: #region Japanese this.labelTitle.Text = "更新"; - this.labelUpdateWait.Text = "少し待つ..."; - this.labelUpdateWait2.Text = "USBを本体から抜かないこと"; - this.labelUpdateRestart.Text = "電源をOFFにしてから電源をONにする"; + this.labelUpdateWait.Text = "少しお待ちください..."; + this.labelUpdateWait2.Text = "USBを機器から取り外さないでください。"; + this.labelUpdateRestart.Text = "機器の電源を再起動してください。"; #endregion break; default: diff --git a/INT63DC_2C/Forms/FormUserGroupEditor.cs b/INT63DC_2C/Forms/FormUserGroupEditor.cs index f196674..ec31f18 100644 --- a/INT63DC_2C/Forms/FormUserGroupEditor.cs +++ b/INT63DC_2C/Forms/FormUserGroupEditor.cs @@ -122,7 +122,7 @@ namespace INT63DC_2C.Forms this.labelStaticMenu.Text = "メニュㅡ"; this.labelStaticTimeSetting.Text = "時間設定"; - this.labelStaticInformation.Text = "情報"; + this.labelStaticInformation.Text = "インフォメㅡション"; this.labelStaticDataBackup.Text = "デㅡタバックアップ"; this.labelStaticCalibration.Text = "校正"; this.labelStaticConfiguration.Text = "構成"; diff --git a/INT63DC_2C/INT63DC_2C.csproj b/INT63DC_2C/INT63DC_2C.csproj index 27ec5c7..8b23af0 100644 --- a/INT63DC_2C/INT63DC_2C.csproj +++ b/INT63DC_2C/INT63DC_2C.csproj @@ -49,11 +49,11 @@ False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll diff --git a/INT63DC_2C/Version.txt b/INT63DC_2C/Version.txt index 1bfe133..f353ddb 100644 Binary files a/INT63DC_2C/Version.txt and b/INT63DC_2C/Version.txt differ diff --git a/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache b/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache index 6d79f9a..fc643bb 100644 Binary files a/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache and b/INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache differ diff --git a/INT63DC_ImageDll/INT63DC_ImageDll.csproj b/INT63DC_ImageDll/INT63DC_ImageDll.csproj index 53df6b5..2e10ec1 100644 --- a/INT63DC_ImageDll/INT63DC_ImageDll.csproj +++ b/INT63DC_ImageDll/INT63DC_ImageDll.csproj @@ -663,18 +663,12 @@ - - - - - - @@ -744,6 +738,12 @@ + + + + + + diff --git a/INT63DC_ImageDll/Resources/jpnMenuCalibrationDisable.png b/INT63DC_ImageDll/Resources/jpnMenuCalibrationDisable.png index ca7b4b2..66f88cb 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuCalibrationDisable.png and b/INT63DC_ImageDll/Resources/jpnMenuCalibrationDisable.png differ diff --git a/INT63DC_ImageDll/Resources/jpnMenuCalibrationDown.png b/INT63DC_ImageDll/Resources/jpnMenuCalibrationDown.png index 86c81df..c3c604d 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuCalibrationDown.png and b/INT63DC_ImageDll/Resources/jpnMenuCalibrationDown.png differ diff --git a/INT63DC_ImageDll/Resources/jpnMenuCalibrationUp.png b/INT63DC_ImageDll/Resources/jpnMenuCalibrationUp.png index b6fc1f4..2af1cc7 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuCalibrationUp.png and b/INT63DC_ImageDll/Resources/jpnMenuCalibrationUp.png differ diff --git a/INT63DC_ImageDll/Resources/jpnMenuDataBackupDisable.png b/INT63DC_ImageDll/Resources/jpnMenuDataBackupDisable.png index 6c53c44..928d305 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuDataBackupDisable.png and b/INT63DC_ImageDll/Resources/jpnMenuDataBackupDisable.png differ diff --git a/INT63DC_ImageDll/Resources/jpnMenuDataBackupDown.png b/INT63DC_ImageDll/Resources/jpnMenuDataBackupDown.png index 23be45e..4fdb0de 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuDataBackupDown.png and b/INT63DC_ImageDll/Resources/jpnMenuDataBackupDown.png differ diff --git a/INT63DC_ImageDll/Resources/jpnMenuDataBackupUp.png b/INT63DC_ImageDll/Resources/jpnMenuDataBackupUp.png index e3d0560..7c0dc90 100644 Binary files a/INT63DC_ImageDll/Resources/jpnMenuDataBackupUp.png and b/INT63DC_ImageDll/Resources/jpnMenuDataBackupUp.png differ diff --git a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.Resource.resources b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.Resource.resources index 25c2e90..6c032e2 100644 Binary files a/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.Resource.resources and b/INT63DC_ImageDll/obj/Release/INT63DC_ImageDll.Resource.resources differ