Localisation update for upstream changes

Yuubari · Apr 15, 2017 · ca492e5 · ca492e5
1 parent 932fc7d
commit ca492e5
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 22 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
@@ -415,7 +415,7 @@
     <value>Browser cache cleared</value>
   </data>
   <data name="StartContent_Introduction1" xml:space="preserve">
-    <value>「提督業も忙しい！」は、艦これを遊びやすくするためのツールです。</value>
+    <value>KanColleViewer! is a tool to make playing Kantai Collection a bit easier.</value>
   </data>
   <data name="StartContent_Welcom" xml:space="preserve">
     <value>Welcome</value>
@@ -478,13 +478,13 @@
     <value>Level</value>
   </data>
   <data name="Fleets_Speed_Fast" xml:space="preserve">
-    <value>Fast Fleet</value>
+    <value>Fast</value>
   </data>
   <data name="Fleets_Speed_Hybrid" xml:space="preserve">
     <value>Hybrid speed fleet</value>
   </data>
   <data name="Fleets_Speed_Slow" xml:space="preserve">
-    <value>Slow Fleet</value>
+    <value>Slow</value>
   </data>
   <data name="Fleets_Total" xml:space="preserve">
     <value>Total</value>
@@ -1444,4 +1444,19 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
   <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
     <value>Includes stat bonuses from the equipment</value>
   </data>
+  <data name="Fleets_Speed_Faster" xml:space="preserve">
+    <value>Faster</value>
+  </data>
+  <data name="Fleets_Speed_Fastest" xml:space="preserve">
+    <value>Fastest</value>
+  </data>
+  <data name="Fleets_Speed_Suffix" xml:space="preserve">
+    <value> fleet</value>
+  </data>
+  <data name="ShipCatalog_Column_Speed" xml:space="preserve">
+    <value>Speed</value>
+  </data>
+  <data name="ShipCatalog_Column_Speed_ToolTip" xml:space="preserve">
+    <value>Includes equipment bonuses</value>
+  </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -430,10 +430,10 @@
     <value>準備完了</value>
   </data>
   <data name="Fleets_Speed_Fast" xml:space="preserve">
-    <value>高速艦隊</value>
+    <value>高速</value>
   </data>
   <data name="Fleets_Speed_Slow" xml:space="preserve">
-    <value>低速艦隊</value>
+    <value>低速</value>
   </data>
   <data name="ZoomAction_OutOfRange" xml:space="preserve">
     <value>ズーム {0} % はサポートされていません。</value>
@@ -1436,4 +1436,19 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
   <data name="ShipCatalog_Column_ASW_Tooltip" xml:space="preserve">
     <value>装備によるステータス上昇を含んだ値です</value>
   </data>
+  <data name="Fleets_Speed_Faster" xml:space="preserve">
+    <value>高速+</value>
+  </data>
+  <data name="Fleets_Speed_Fastest" xml:space="preserve">
+    <value>最速</value>
+  </data>
+  <data name="Fleets_Speed_Suffix" xml:space="preserve">
+    <value>艦隊</value>
+  </data>
+  <data name="ShipCatalog_Column_Speed" xml:space="preserve">
+    <value>速力</value>
+  </data>
+  <data name="ShipCatalog_Column_Speed_ToolTip" xml:space="preserve">
+    <value>装備によるステータス上昇を含んだ値です</value>
+  </data>
 </root>
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Grabacr07.KanColleWrapper.Models;
 using Livet;
 using Livet.EventListeners;
+using Grabacr07.KanColleViewer.Properties;
 
 namespace Grabacr07.KanColleViewer.ViewModels.Contents.Fleets
 {
@@ -22,8 +23,8 @@ public class FleetStateViewModel : ViewModel
 		public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##");
 
 		public string Speed => this.Source.Speed.IsMixed
-			? $"速度混成艦隊 ({this.Source.Speed.Min.ToDisplayString()} ～ {this.Source.Speed.Max.ToDisplayString()})"
-			: $"{this.Source.Speed.Min.ToDisplayString()}艦隊";
+			? $"{Resources.Fleets_Speed_Hybrid} ({this.Source.Speed.Min.ToDisplayString()} ～ {this.Source.Speed.Max.ToDisplayString()})"
+			: $"{this.Source.Speed.Min.ToDisplayString()}{Resources.Fleets_Speed_Suffix}";
 
 		public HomeportViewModel Homeport { get; }
 

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/ShipSpeedExtensions.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Linq;
 using Grabacr07.KanColleWrapper.Models;
+using Grabacr07.KanColleViewer.Properties;
 
 namespace Grabacr07.KanColleViewer.ViewModels.Contents
 {
@@ -13,13 +14,13 @@ public static string ToDisplayString(this ShipSpeed speed)
 			switch (speed)
 			{
 				case ShipSpeed.Fastest:
-					return "最速";
+					return Resources.Fleets_Speed_Fastest;
 				case ShipSpeed.Faster:
-					return "高速+";
+					return Resources.Fleets_Speed_Faster;
 				case ShipSpeed.Fast:
-					return "高速";
+					return Resources.Fleets_Speed_Fast;
 				case ShipSpeed.Slow:
-					return "低速";
+					return Resources.Fleets_Speed_Slow;
 				default:
 					return "";
 			}

diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -1,4 +1,4 @@
-<metro:MetroWindow x:Class="Grabacr07.KanColleViewer.Views.Catalogs.ShipCatalogWindow"
+<metro:MetroWindow x:Class="Grabacr07.KanColleViewer.Views.Catalogs.ShipCatalogWindow"
 				   x:Name="GlowMetroWindow"
 				   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 				   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -351,13 +351,13 @@
 										<Run Text=":" />
 									</TextBlock>
 									<WrapPanel Grid.Column="2">
-										<CheckBox Content="最速"
+										<CheckBox Content="{Binding Resources.Fleets_Speed_Fastest, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 												  IsChecked="{Binding Fastest, Mode=TwoWay}" />
-										<CheckBox Content="高速+"
+										<CheckBox Content="{Binding Resources.Fleets_Speed_Faster, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 												  IsChecked="{Binding Faster, Mode=TwoWay}" />
-										<CheckBox Content="{Binding Resources.ShipCatalog_Filter_Misc_SpeedFast, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
+										<CheckBox Content="{Binding Resources.Fleets_Speed_Fast, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 												  IsChecked="{Binding Fast, Mode=TwoWay}" />
-										<CheckBox Content="{Binding Resources.ShipCatalog_Filter_Misc_SpeedSlow, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
+										<CheckBox Content="{Binding Resources.Fleets_Speed_Slow, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 												  IsChecked="{Binding Slow, Mode=TwoWay}" />
 									</WrapPanel>
 								</Grid>
@@ -860,8 +860,8 @@
 								<GridViewColumn.Header>
 									<metro2:SortButton MethodName="Sort"
 													   MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
-										<TextBlock Text="速力"
-												   ToolTip="装備によるステータス上昇を含んだ値です" />
+										<TextBlock Text="{Binding Resources.ShipCatalog_Column_Speed, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
+												   ToolTip="{Binding Resources.ShipCatalog_Column_Speed_ToolTip, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
 									</metro2:SortButton>
 								</GridViewColumn.Header>
 								<GridViewColumn.CellTemplate>