Merge branch 'ui-localisation' into translation

Yuubari · Feb 8, 2016 · 7318d47 · 7318d47
2 parents d4928c9 + 17b2dd9
commit 7318d47
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 11 deletions.
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -1435,4 +1435,19 @@ Small Radar LoS × (1.00) + Large Radar LoS × (0.99) +
   <data name="ShipCatalog_Filter_Misc_DamageYes" xml:space="preserve">
     <value>Damaged</value>
   </data>
+  <data name="Common_Maximum" xml:space="preserve">
+    <value>max</value>
+  </data>
+  <data name="FleetWindow_AirSuperiority_Max_ToolTip" xml:space="preserve">
+    <value>Maximum skill level for all aircraft.</value>
+  </data>
+  <data name="FleetWindow_AirSuperiority_Min_ToolTip" xml:space="preserve">
+    <value>Minimum skill level; AS is only calculated for carrier-based aircraft.</value>
+  </data>
+  <data name="FleetWindow_Status_Organisation_AR_Flagship" xml:space="preserve">
+    <value>Flagship is a repair ship</value>
+  </data>
+  <data name="FleetWindow_Status_Organisation_Normal" xml:space="preserve">
+    <value>Fleet composition OK</value>
+  </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1439,4 +1439,19 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
   <data name="ShipCatalog_Filter_Misc_DamageYes" xml:space="preserve">
     <value>損傷あり</value>
   </data>
+  <data name="Common_Maximum" xml:space="preserve">
+    <value>最大</value>
+  </data>
+  <data name="FleetWindow_AirSuperiority_Max_ToolTip" xml:space="preserve">
+    <value>全艦載機で、内部熟練度を最大として計算しています。</value>
+  </data>
+  <data name="FleetWindow_AirSuperiority_Min_ToolTip" xml:space="preserve">
+    <value>艦戦のみで、内部熟練度を最小として計算しています。</value>
+  </data>
+  <data name="FleetWindow_Status_Organisation_AR_Flagship" xml:space="preserve">
+    <value>工作艦が旗艦として編成されています</value>
+  </data>
+  <data name="FleetWindow_Status_Organisation_Normal" xml:space="preserve">
+    <value>艦隊編成は正常です</value>
+  </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -425,7 +425,7 @@
 													 IsChecked="{Binding Damaged, Mode=TwoWay}" />
 										<RadioButton Content="{Binding Resources.ShipCatalog_Filter_Misc_DamageNo, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 													 IsChecked="{Binding Undamaged, Mode=TwoWay}" />
-						</WrapPanel>
+									</WrapPanel>
 								</Grid>
 							</StackPanel>
 						</WrapPanel>

diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml
@@ -659,16 +659,15 @@
 									   Margin="1,2">
 							<Run Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_AirSuperiority, StringFormat='{}{0}', Mode=OneWay}" />
 							<Run Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.Common_Minimum, StringFormat='{}({0})', Mode=OneWay}"
-								 Style="{DynamicResource DetailTextElementStyleKey}" />
-							<Run Text=":" />
+								 Style="{DynamicResource DetailTextElementStyleKey}" /><Run Text=":" />
 							</TextBlock>
 							<TextBlock Grid.Row="4"
 									   Grid.Column="1"
 									   Style="{DynamicResource EmphaticTextStyleKey}"
 									   VerticalAlignment="Bottom"
 									   Margin="4,2">
 							<FrameworkElement.ToolTip>
-								<TextBlock Text="艦戦のみで、内部熟練度を最小として計算しています。"
+								<TextBlock Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_AirSuperiority_Min_ToolTip, StringFormat='{}{0}', Mode=OneWay}"
 										   Style="{DynamicResource DefaultTextStyleKey}" />
 							</FrameworkElement.ToolTip>
 								<Run Text="{Binding State.MinAirSuperiorityPotential, Mode=OneWay}" />
@@ -682,18 +681,17 @@
 								   HorizontalAlignment="Right"
 								   VerticalAlignment="Bottom"
 								   Margin="1,2">
-							<Run Text="制空値" />
-							<Run Text="(最大)"
-								 Style="{DynamicResource DetailTextElementStyleKey}" />
-							<Run Text=":" />
+							<Run Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_AirSuperiority, StringFormat='{}{0}', Mode=OneWay}" />
+							<Run Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.Common_Maximum, StringFormat='{}({0})', Mode=OneWay}"
+								 Style="{DynamicResource DetailTextElementStyleKey}" /><Run Text=":" />
 						</TextBlock>
 						<TextBlock Grid.Row="5"
 								   Grid.Column="1"
 								   Style="{DynamicResource EmphaticTextStyleKey}"
 								   VerticalAlignment="Bottom"
 								   Margin="4,2">
 							<FrameworkElement.ToolTip>
-								<TextBlock Text="全艦載機で、内部熟練度を最大として計算しています。"
+								<TextBlock Text="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_AirSuperiority_Max_ToolTip, StringFormat='{}{0}', Mode=OneWay}"
 										   Style="{DynamicResource DefaultTextStyleKey}" />
 							</FrameworkElement.ToolTip>
 								<Run Text="{Binding State.MaxAirSuperiorityPotential, Mode=OneWay}" />
@@ -999,15 +997,15 @@
 									<Style TargetType="{x:Type TextBlock}"
 										   BasedOn="{StaticResource IndicatorTextBlockStyleKey}">
 										<Setter Property="Text"
-												Value="艦隊編成は正常です" />
+												Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_Organisation_Normal, StringFormat='{}{0}', Mode=OneWay}" />
 										<Style.Triggers>
 											<MultiDataTrigger>
 												<MultiDataTrigger.Conditions>
 													<Condition Binding="{Binding Source.State.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=FlagshipIsRepairShip}"
 															   Value="True" />
 												</MultiDataTrigger.Conditions>
 												<Setter Property="Text"
-														Value="工作艦が旗艦として編成されています" />
+														Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_Organisation_AR_Flagship, StringFormat='{}{0}', Mode=OneWay}" />
 												<Setter Property="Foreground"
 														Value="{DynamicResource ActiveForegroundBrushKey}" />
 												<Setter Property="Background"