Merge remote-tracking branch 'origin/master'

# Conflicts:
#	INT63DC_2C.suo
#	INT63DC_2C/Forms/FormMainDisplay.cs
#	INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache

INT63DC_2C/Forms/FormMainDisplay.cs

@@ -88,6 +88,7 @@ namespace INT63DC_2C.Forms
         {
             ImageDll images = new ImageDll();
             Font font = new Font("New Gulim", 8F, FontStyle.Regular);
+            Font font1 = new Font("New Gulim", 14F, FontStyle.Bold);
 
             switch (this.ParentForm.SystemConfig.Language)
             {
@@ -485,17 +486,18 @@ namespace INT63DC_2C.Forms
                     this.labelStaticSorter3RunTime.Text = "ソーター3 運転時間";
                     this.labelStaticEntryGateDelayTime.Text = "エントリーゲートの遅延時間";
                     this.labelStaticEntryGateRunTime.Text = "エントリーゲートの運転時間";
+
                     this.labelStaticDischargeStopperDelayTime.Font = font;
-                    this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパーの遅延時間";
+                    this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパㅡの遅延時間";
                     this.labelStaticDischargeStopperRunTime.Font = font;
-                    this.labelStaticDischargeStopperRunTime.Text = "排出ストッパーの運転時間";
+                    this.labelStaticDischargeStopperRunTime.Text = "排出ストッパㅡの運転時間";
 
                     this.groupBoxJudgmentSetting.Text = "判定設定";
-                    this.labelStaticFilter.Text = "フィルター";
+                    this.labelStaticFilter.Text = "フィルタㅡ";
                     this.labelStaticJudgmentDelayTime.Text = "判定の遅れ";
                     this.labelStaticJudgmentCount.Text = "判定番号";
                     this.labelStaticForcedZeroDelayTime.Text = "強制ゼロ遅延時間";
-                    this.labelStaticTurnDelayTime.Text = "ターン遅延";
+                    this.labelStaticTurnDelayTime.Text = "タㅡン遅延";
 
                     this.labelTitleTotalCount.Text = "総カウント";
                     this.labelTitleNG.Text = "合計NG";
@@ -504,13 +506,20 @@ namespace INT63DC_2C.Forms
                     this.labelTitleSampling.Text = "サンプリング";
 
                     this.labelMessage1.Text = "インバーターアラーム";
-                    this.labelMessage3.Text = "ピンチポイントアラーム";
-                    this.labelMessage5.Text = "サーボモータの原点を設定してください";
 
+                    this.labelMessage3.Text = "ピンチポイントアラーム";
+                    this.labelMessage5.Text = "サㅡボモㅡタの原点を設定してください";
+                    this.buttonClose.Text = "クローズ";
+
+                    this.labelTitleTotalCount.Font = font1;
+                    this.labelTitleTotalCount.Text = "総カウント";
+                    this.labelTitleNG.Text = "不良";
+                    this.labelTitleBypass.Text = "バイパスモㅡド";
+                    this.labelTitleScreen.Text = "画面";
                     this.labelStaticSamplingCount.Text = "カウント";
                     this.labelStaticSamplingTime.Text = "時間(分)";
 
-                    this.labelStaticOverRange.Text = "超過";
+                    this.labelStaticOverRange.Text = "上限";
                     this.labelStaticPassRange.Text = "合格";
                     this.labelStaticUnderRange.Text = "不足";
                     this.labelStaticOverRangeLimit.Text = "上限リミット";
@@ -2986,40 +2995,41 @@ namespace INT63DC_2C.Forms
         }
         private void labelTotalCount_Click(object sender, EventArgs e)
         {
-            if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
+            switch (this.ParentForm.SystemConfig.Language)
-            {
-                if (this.labelTitleTotalCount.Text != "计数")
-                    this.labelTitleTotalCount.Text = "计数";
-                else
-                    this.labelTitleTotalCount.Text = "通过";
-            }
-            else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
-            {
-                if (this.labelTitleTotalCount.Text != "Celkem")
-                    this.labelTitleTotalCount.Text = "Celkem";
-                else
-                    this.labelTitleTotalCount.Text = "Váha";
-            }
-            else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
-            {
-                if (this.labelTitleTotalCount.Text != "Insgesamt")
-                    this.labelTitleTotalCount.Text = "Insgesamt";
-                else
-                    this.labelTitleTotalCount.Text = "Bestehen";
-            }
-            else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese)
             {
+                case DataStore.LanguageID.Korean:
+                case DataStore.LanguageID.English:
+                    if (this.labelTitleTotalCount.Text != "Total")
+                        this.labelTitleTotalCount.Text = "Total";
+                    else
+                        this.labelTitleTotalCount.Text = "Pass";
+                    break;
+                case DataStore.LanguageID.Chinese:
+                    if (this.labelTitleTotalCount.Text != "计数")
+                        this.labelTitleTotalCount.Text = "计数";
+                    else
+                        this.labelTitleTotalCount.Text = "通过";
+                    break;
+                case DataStore.LanguageID.Czech:
+                    if (this.labelTitleTotalCount.Text != "Celkem")
+                        this.labelTitleTotalCount.Text = "Celkem";
+                    else
+                        this.labelTitleTotalCount.Text = "Váha";
+                    break;
+                case DataStore.LanguageID.German:
+                    if (this.labelTitleTotalCount.Text != "Insgesamt")
+                        this.labelTitleTotalCount.Text = "Insgesamt";
+                    else
+                        this.labelTitleTotalCount.Text = "Bestehen";
+                    break;
+                case DataStore.LanguageID.Japanese:
                 if (this.labelTitleTotalCount.Text != "総カウント")
                     this.labelTitleTotalCount.Text = "総カウント";
                 else
                     this.labelTitleTotalCount.Text = "合格";
-            }
+                    break;
-            else
+                default:
-            {
+                    break;
-                if (this.labelTitleTotalCount.Text != "Total")
-                    this.labelTitleTotalCount.Text = "Total";
-                else
-                    this.labelTitleTotalCount.Text = "Pass";
             }
 
             this.SetTotalCount();