Merge branch 'develop'

.gitignore

@@ -14,6 +14,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+[Oo]utput/
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "DockPanelSuite"]
 	path = DockPanelSuite
-	url = https://github.com/andanteyk/dockpanelsuite.git
+	url = https://github.com/RadarNyan/dockpanelsuite.git
+	branch = 74eo-rn

Browser/Browser.csproj

@@ -80,6 +80,7 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ToolStripOverride.cs" />
     <EmbeddedResource Include="FormBrowser.resx">
       <DependentUpon>FormBrowser.cs</DependentUpon>
     </EmbeddedResource>

Browser/FormBrowser.cs

@@ -129,7 +129,7 @@ public FormBrowser( string serverUri ) {
 				control.Image = new Bitmap( (int)( KanColleSize.Width * zoomrate ), (int)( KanColleSize.Height * zoomrate ), PixelFormat.Format24bppRgb );
 				using ( var g = Graphics.FromImage( control.Image ) ) {
 					g.Clear( SystemColors.Control );
-					g.DrawString( "スクリーンショットをまだ撮影していません。\r\n", Font, Brushes.Black, new Point( 4, 4 ) );
+					g.DrawString( "还没有截过图。\r\n", Font, Brushes.Black, new Point( 4, 4 ) );
 				}
 
 				var host = new ToolStripControlHost( control, "ToolMenu_Other_LastScreenShot_ImageHost" );
@@ -202,14 +202,16 @@ public void ConfigurationChanged( BrowserLib.BrowserConfiguration conf ) {
 			ToolMenu.Dock = (DockStyle)Configuration.ToolMenuDockStyle;
 			ToolMenu.Visible = Configuration.IsToolMenuVisible;
 
+			this.SizeAdjuster.BackColor = System.Drawing.Color.FromArgb(unchecked((int)Configuration.BackColor));
+			this.ToolMenu.BackColor = System.Drawing.Color.FromArgb(unchecked((int)Configuration.BackColor));
 		}
 
 		private void ConfigurationUpdated() {
 			BrowserHost.AsyncRemoteRun( () => BrowserHost.Proxy.ConfigurationUpdated( Configuration ) );
 		}
 
-		private void AddLog( int priority, string message ) {
-			BrowserHost.AsyncRemoteRun( () => BrowserHost.Proxy.AddLog( priority, message ) );
+		private void AddLog( int priority, string message, string msgchs1="", string msgjap2="", string msgchs2="", string msgjap3="", string msgchs3="" ) {
+			BrowserHost.AsyncRemoteRun( () => BrowserHost.Proxy.AddLog( priority, message, msgchs1, msgjap2, msgchs2, msgjap3, msgchs3 ) );
 		}
 
 
@@ -369,14 +371,14 @@ public void ApplyZoom() {
 				}
 
 				if ( fit ) {
-					ToolMenu_Other_Zoom_Current.Text = string.Format( "現在: ぴったり" );
+					ToolMenu_Other_Zoom_Current.Text = string.Format( "当前 : 自适应" );
 				} else {
-					ToolMenu_Other_Zoom_Current.Text = string.Format( "現在: {0}%", zoomRate );
+					ToolMenu_Other_Zoom_Current.Text = string.Format( "当前: {0}%", zoomRate );
 				}
 
 
 			} catch ( Exception ex ) {
-				AddLog( 3, "ズームの適用に失敗しました。" + ex.Message );
+				AddLog( 3, "", "调整缩放比例失败。" + ex.Message );
 			}
 
 		}
@@ -455,7 +457,7 @@ private void SaveScreenShot( string path, System.Drawing.Imaging.ImageFormat for
 			var wb = Browser;
 
 			if ( !IsKanColleLoaded ) {
-				AddLog( 3, string.Format( "艦これが読み込まれていないため、スクリーンショットを撮ることはできません。" ) );
+				AddLog( 3, "", "因为", "『艦これ』", "还没有载入，无法截图。" );
 				System.Media.SystemSounds.Beep.Play();
 				return;
 			}
@@ -516,7 +518,7 @@ private void SaveScreenShot( string path, System.Drawing.Imaging.ImageFormat for
 				}
 
 				_lastScreenShotPath = path;
-				AddLog( 2, string.Format( "スクリーンショットを {0} に保存しました。", path ) );
+				AddLog( 2, "", "已保存截图到 : " + path );
 
 			} catch ( Exception ex ) {
 
@@ -794,7 +796,7 @@ void ToolMenu_Other_Volume_ValueChanged( object sender, EventArgs e ) {
 		private void ToolMenu_Other_Refresh_Click( object sender, EventArgs e ) {
 
 			if ( !Configuration.ConfirmAtRefresh ||
-				MessageBox.Show( "再読み込みします。\r\nよろしいですか？", "確認",
+				MessageBox.Show( "即将刷新浏览器。\r\n确认刷新吗？", "要求确认",
 				MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button2 )
 				== System.Windows.Forms.DialogResult.OK ) {
 
@@ -804,7 +806,7 @@ private void ToolMenu_Other_Refresh_Click( object sender, EventArgs e ) {
 
 		private void ToolMenu_Other_NavigateToLogInPage_Click( object sender, EventArgs e ) {
 
-			if ( MessageBox.Show( "ログインページへ移動します。\r\nよろしいですか？", "確認",
+			if ( MessageBox.Show( "即将转到登录页。\r\n确认跳转吗？", "要求确认",
 				MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2 )
 				== System.Windows.Forms.DialogResult.OK ) {
 

Browser/ToolStripOverride.cs

@@ -0,0 +1,13 @@
+using System.Windows.Forms;
+
+namespace Browser
+{
+	public class ToolStripOverride : ToolStripProfessionalRenderer
+	{
+		public ToolStripOverride()
+		{
+			this.RoundedEdges = false;
+		}
+		protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e) { }
+	}
+}

BrowserLib/IBrowserHost.cs

@@ -46,7 +46,7 @@ IntPtr HWND {
 		/// ログ追加
 		/// </summary>
 		[OperationContract]
-		void AddLog( int priority, string message );
+		void AddLog( int priority, string message, string msgchs1="", string msgjap2="", string msgchs2="", string msgjap3="", string msgchs3="" );
 
 		[OperationContract]
 		void ConfigurationUpdated( BrowserConfiguration config );
@@ -150,5 +150,7 @@ public class BrowserConfiguration {
 		[DataMember]
 		public bool IsMute { get; set; }
 
+		[DataMember]
+		public int BackColor { get; set; }
 	}
 }

ElectronicObserver.sln

@@ -2,13 +2,22 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElectronicObserver", "ElectronicObserver\ElectronicObserver.csproj", "{A9ABEC50-1BFC-4C69-87AE-C68DB6004F68}"
+	ProjectSection(ProjectDependencies) = postProject
+		{87A2B596-57D0-48BB-B522-895782D7A6FC} = {87A2B596-57D0-48BB-B522-895782D7A6FC}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Browser", "Browser\Browser.csproj", "{87A2B596-57D0-48BB-B522-895782D7A6FC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserLib", "BrowserLib\BrowserLib.csproj", "{8BB3E37D-09FB-40B9-958A-8CDCD18EF1F5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "DockPanelSuite\WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeVS2012Light", "DockPanelSuite\WinFormsUI\ThemeVS2012Light.csproj", "{4ED4FDB5-9FD0-49E6-876D-1635F727C755}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeSolarizedDark", "DockPanelSuite\WinFormsUI\ThemeSolarizedDark.csproj", "{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeSolarizedLight", "DockPanelSuite\WinFormsUI\ThemeSolarizedLight.csproj", "{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -31,6 +40,18 @@ Global
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ElectronicObserver/Assets/Settings/ShipGroups.xml

@@ -16,7 +16,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>218,409,321,39911,347,9,21,1,14,61,14682,164,10,12,2,3104,37066,5,47448,417,211,167,11,45621,1265,110,952,11306,8423,68,41,185,46,1271,30331,208,24435,10744,391,10442,354,48649,40170,40011,29571,46306,64231,12939,29803,47487,37560,7793,14602,30581,44612,15,1415,55958,30409,225,95,5722,63886,63542,16019,16148,43647,66538,60621,56964,56835,56852,64582,64682,68518,65805,66127,68712,68714,68718,68723,68740,6,639,29631,212,15576,22088,363,9705,16732,11072,42,8,48,22846,51924,51737,52010,461,22242,68508,68573,68506,68741,4,234,52,65758,65659,76,41080,39930,265,139,19305,82,43214,319,41596,51741,52291,279,68742,14200,16191,922,16349,8645,214,90,30822,418,410,106,23714,31,349,541,19701,342,309,289,402,55646,55742,20570,25274,2892,273,6354,65728,68743,138,284,235,387,123,880,29823,47592,55615,102,209,4846,68494,68578,1164,47434,55729,1991,3547,4124,8374,8861,9458,19616,12824,9025,9497,8997,10141,14634,8734,16006,14400,15973,15682,15881,10276,9640,11679,9393,16412,18407,32603,20566,27388,32169,16678,26940,18112,40496,38625,35438,27702,40644,59828,38626,32478,38622,38593,36568,33509,67559,42751,33674,39979,35424,34056,34980,35412,38614,34603,68517,68734,518,602,642,2701,626,928,3151,9416,8763,9456,11474,8214,5015,48606,4823,5773,27117,27001,55692,35223,35289,64348,4656,65265,9053,10218,14631,34020,23991,47478,63867</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>全所属艦</Name>
+			<Name>全所属舰</Name>
 			<ScrollLockColumnCount>4</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -494,7 +494,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>409,6,9,14,15576,22088,417,211,11,1265,110,11072,952,42,8,68,41,185,46,1271,48,30331,208,24435,10744,391,10442,22846,354,48649,40170,40011,29571,46306,12939,29803,47487,37560,14602,30581,44612,30409,63886,16019,43647,66538,60621,56964,64582,68508,68573,68518,68506</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>遠征艦隊</Name>
+			<Name>远征舰队</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -960,7 +960,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>9053,273,2892,138,402,234,29631,518,47592,602,5015,928,9416,11474,1164,3151,8214,212,9456,626,8763</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>入渠待ち</Name>
+			<Name>等待入渠</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -1440,7 +1440,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>234,518,1164,9053,11474,29631</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>未補給</Name>
+			<Name>未补给</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage" />
 			<ViewColumnsSerializer>
@@ -1921,7 +1921,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>10218,6354,65728,48649,52010,40170,40011,29571,46306,12939,47487,37560,7793,461,14602,30581,44612,34020,65659,22242,15,1415,55958,30409,225,95,5722,63886,63867,63542,16019,67559,16148,65265,43647,66538,60621,56964,56835,56852,68494,64582,541,68508,64682,68573,68518,68517,68578,65805,68506,66127,68734</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>未改修艦</Name>
+			<Name>未改修舰</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -2375,7 +2375,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>68712,68714,68718,68723,68740,68741,68742,68743</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>非ロック艦</Name>
+			<Name>非锁定舰</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -2839,7 +2839,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>218,409,321,39911,347,9,21,1,14,61,14682,164,10,12,2,3104,37066,5,47448,417,211,167,11,45621,1265,110,952,11306,8423,68,41,185,46,1271,30331,208,24435,10744,391,10442,354,48649,40170,40011,29571,46306,64231,12939,29803,47487,37560,7793,14602,30581,44612,15,1415,55958,30409,225,95,5722,16019,16148,43647,60621,56964,56835,56852,6,639,29631,212,15576,22088,363,9705,16732,11072,42,8,48,22846,51924,51737,52010,461,22242,4,234,52,76,41080,39930,265,139,19305,82,43214,319,41596,51741,52291,279,14200,16191,922,16349,8645,214,90,30822,418,410,106,23714,31,349,19701,342,309,289,402,55646,55742,20570,25274,2892,273,6354,65728,138,284,235,387,123,880,29823,47592,55615,102,209,4846,1164,47434,1991,3547,4124,8374,8861,9458,19616,8997,14634,14400,27388,59828,67559,518,602,642,2701,626,928,3151,9416,8763,9456,11474,8214,5015,55692,4656,65265,9053,14631,34020,47478,63867</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>主力艦隊</Name>
+			<Name>主力舰队</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -3323,7 +3323,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>123,4846,102,880,209,10218,29823,47592,55615,90,30822,68494,68578,106,31,418,410,349,23714,541,9053</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>機動部隊</Name>
+			<Name>机动部队</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -3787,7 +3787,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>518,602,642,1164,2701,47434,55729,626,928,1991,3151,3547,9416,8763,9456,11474,8214,5015,4124,48606,8374,8861,9458,19616,12824,9025,9497,8997,10141,14634,8734,16006,14400,15973,15682,15881,10276,9640,11679,9393,16412,18407,32603,20566,27388,32169,16678,26940,18112,40496,38625,35438,27702,40644,59828,38626,32478,38622,38593,36568,33509,67559,42751,33674,39979,35424,34056,34980,35412,38614,34603,68517,68734,68736</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>潜水艦隊</Name>
+			<Name>潜水舰队</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -4241,7 +4241,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>518,9456,8763,234,29631,9053</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>第一艦隊</Name>
+			<Name>第一舰队</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializableKeyValuePair>
@@ -4761,7 +4761,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>9053,63867,68494,68578</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>ホロ艦載機</Name>
+			<Name>上位舰载机</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage" />
 			<ViewColumnsSerializer>
@@ -5222,7 +5222,7 @@
 			<MembersSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage">
 				<d4p1:SerializedList>518,47434,48606,63886</d4p1:SerializedList>
 			</MembersSerializer>
-			<Name>日独伊三国褐色同盟</Name>
+			<Name>德意日三国褐色同盟</Name>
 			<ScrollLockColumnCount>0</ScrollLockColumnCount>
 			<SortOrderSerializer xmlns:d4p1="http://schemas.datacontract.org/2004/07/ElectronicObserver.Utility.Storage" />
 			<ViewColumnsSerializer>

ElectronicObserver/Data/Battle/BattleAirBattle.cs

@@ -47,13 +47,13 @@ public override string GetBattleDetail( int index ) {
 			string airbattle2 = AirBattle2.GetBattleDetail( index );
 
 			if ( baseair != null )
-				sb.AppendLine( "《基地航空隊攻撃》" ).Append( baseair );
+				sb.AppendLine( "《基地航空队攻击》" ).Append( baseair );
 			if ( airbattle1 != null )
-				sb.AppendLine( "《第一次航空戦》" ).Append( airbattle1 );
+				sb.AppendLine( "《第一次航空战》" ).Append( airbattle1 );
 			if ( support != null )
-				sb.AppendLine( "《支援攻撃》" ).Append( support );
+				sb.AppendLine( "《支援攻击》" ).Append( support );
 			if ( airbattle2 != null )
-				sb.AppendLine( "《第二次航空戦》" ).Append( airbattle2 );
+				sb.AppendLine( "《第二次航空战》" ).Append( airbattle2 );
 
 			return sb.ToString();
 		}

ElectronicObserver/Data/Battle/BattleAirRaid.cs

@@ -38,9 +38,9 @@ public override string GetBattleDetail( int index ) {
 			string airbattle = AirBattle.GetBattleDetail( index );
 
 			if ( baseair != null )
-				sb.AppendLine( "《基地航空隊攻撃》" ).Append( baseair );
+				sb.AppendLine( "《基地航空队攻击》" ).Append( baseair );
 			if ( airbattle != null )
-				sb.AppendLine( "《航空戦》" ).Append( airbattle );
+				sb.AppendLine( "《航空战》" ).Append( airbattle );
 
 			return sb.ToString();
 		}

ElectronicObserver/Data/Battle/BattleCombinedAirBattle.cs

@@ -49,13 +49,13 @@ public override string GetBattleDetail( int index ) {
 			string airbattle2 = AirBattle2.GetBattleDetail( index );
 
 			if ( baseair != null )
-				sb.AppendLine( "《基地航空隊攻撃》" ).Append( baseair );
+				sb.AppendLine( "《基地航空队攻击》" ).Append( baseair );
 			if ( airbattle1 != null )
-				sb.AppendLine( "《第一次航空戦》" ).Append( airbattle1 );
+				sb.AppendLine( "《第一次航空战》" ).Append( airbattle1 );
 			if ( support != null )
-				sb.AppendLine( "《支援攻撃》" ).Append( support );
+				sb.AppendLine( "《支援攻击》" ).Append( support );
 			if ( airbattle2 != null )
-				sb.AppendLine( "《第二次航空戦》" ).Append( airbattle2 );
+				sb.AppendLine( "《第二次航空战》" ).Append( airbattle2 );
 
 			return sb.ToString();
 		}