From f7fc8a65db6eeafc0b74ec54214e4b18e673006c Mon Sep 17 00:00:00 2001
From: Yuubari <remilia@koumakan.jp>
Date: Wed, 6 Jul 2016 20:10:57 +0300
Subject: [PATCH] Update locstrings

---
 .../Properties/Resources.Designer.cs          | 36 +++++++++++++++++++
 .../Properties/Resources.en.resx              | 14 +++++++-
 .../Properties/Resources.resx                 | 12 +++++++
 .../Views/Catalogs/ShipCatalogWindow.xaml     |  4 +--
 .../Views/Settings/Operation.xaml             |  6 ++--
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
index c39e113c0..8566a69bd 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
@@ -2041,6 +2041,33 @@ public static string Settings_Operation_LoS_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 連合艦隊時、以下の艦隊を索敵値計算の対象として使用する.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 第1艦隊.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets_Fleet1 {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 第2艦隊.
+        /// </summary>
+        public static string Settings_Operation_LoS_UseFleets_Fleet2 {
+            get {
+                return ResourceManager.GetString("Settings_Operation_LoS_UseFleets_Fleet2", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 索敵値計算.
         /// </summary>
@@ -2770,6 +2797,15 @@ public static string ShipCatalog_Column_ASW {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 装備によるステータス上昇を含んだ値です.
+        /// </summary>
+        public static string ShipCatalog_Column_ASW_Tooltip {
+            get {
+                return ResourceManager.GetString("ShipCatalog_Column_ASW_Tooltip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cond..
         /// </summary>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
index 2d52f43fb..612f31173 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -713,7 +713,7 @@ GPU: Slow! GPU optimization for tablets.</value>
     <value>Give a notification for ships in critical condition</value>
   </data>
   <data name="Settings_Operation_LoSCalculation" xml:space="preserve">
-    <value>Settings_Plugins_PluginInfo_Features</value>
+    <value>LoS Calculation</value>
   </data>
   <data name="Settings_Operation_LoS_CarrierBasedRecon" xml:space="preserve">
     <value>Carrier-based Recon Aircraft</value>
@@ -1432,4 +1432,16 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
   <data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
     <value>Below 50</value>
   </data>
+  <data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
+    <value>In a combined fleet setting, use these fleets to calculate LoS:</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
+    <value>Fleet #1</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
+    <value>Fleet #2</value>
+  </data>
+  <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
+    <value>Includes stat bonuses from the equipment</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
index 1ebc248b6..84410eb5e 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1424,4 +1424,16 @@ HTTP プロトコルの通信は自動構成も含め「インターネット 
   <data name="ShipCatalog_Filter_Misc_ConditionBelow50" xml:space="preserve">
     <value>50 未満</value>
   </data>
+  <data name="Settings_Operation_LoS_UseFleets" xml:space="preserve">
+    <value>連合艦隊時、以下の艦隊を索敵値計算の対象として使用する</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet1" xml:space="preserve">
+    <value>第1艦隊</value>
+  </data>
+  <data name="Settings_Operation_LoS_UseFleets_Fleet2" xml:space="preserve">
+    <value>第2艦隊</value>
+  </data>
+  <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
+    <value>装備によるステータス上昇を含んだ値です</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
index 16ebfd761..7970dc8d7 100644
--- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -841,8 +841,8 @@
 								<GridViewColumn.Header>
 									<metro2:SortButton MethodName="Sort"
 													   MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
-										<TextBlock Text="対潜"
-												   ToolTip="装備によるステータス上昇を含んだ値です" />
+										<TextBlock Text="{Binding Resources.ShipCatalog_Column_ASW, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
+												   ToolTip="{Binding Resources.ShipCatalog_Column_ASW_Tooltip, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 									</metro2:SortButton>
 								</GridViewColumn.Header>
 								<GridViewColumn.CellTemplate>
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
index 34da0a244..97937a4b3 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
@@ -79,16 +79,16 @@
 					   Style="{DynamicResource DetailTextStyleKey}"/>
 
 
-			<TextBlock Text="連合艦隊時、以下の艦隊を索敵値計算の対象として使用する"
+			<TextBlock Text="{Binding Resources.Settings_Operation_LoS_UseFleets, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 					   Margin="0,12,0,5"
 					   Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}"/>
 			
 			<StackPanel Orientation="Horizontal"
 						Visibility="{Binding SelectedViewRangeCalcType.HasCombinedSettings, Converter={StaticResource BooleanToVisibilityConverter}}">
-				<CheckBox Content="第1艦隊"
+				<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet1, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 						  IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeFirstFleet}, Path=Value}"
 						  Margin="0,0,20,0"/>
-				<CheckBox Content="第2艦隊"
+				<CheckBox Content="{Binding Resources.Settings_Operation_LoS_UseFleets_Fleet2, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 						  IsChecked="{Binding Source={x:Static ms:KanColleSettings.IsViewRangeCalcIncludeSecondFleet}, Path=Value}"/>
 			</StackPanel>