diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
index 8566a69bd..f657ea5ca 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
@@ -556,7 +556,7 @@ public static string Fleets_Level {
}
///
- /// Looks up a localized string similar to 高速艦隊.
+ /// Looks up a localized string similar to 高速.
///
public static string Fleets_Speed_Fast {
get {
@@ -564,6 +564,24 @@ public static string Fleets_Speed_Fast {
}
}
+ ///
+ /// Looks up a localized string similar to 高速+.
+ ///
+ public static string Fleets_Speed_Faster {
+ get {
+ return ResourceManager.GetString("Fleets_Speed_Faster", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 最速.
+ ///
+ public static string Fleets_Speed_Fastest {
+ get {
+ return ResourceManager.GetString("Fleets_Speed_Fastest", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 速度混成艦隊.
///
@@ -574,7 +592,7 @@ public static string Fleets_Speed_Hybrid {
}
///
- /// Looks up a localized string similar to 低速艦隊.
+ /// Looks up a localized string similar to 低速.
///
public static string Fleets_Speed_Slow {
get {
@@ -582,6 +600,15 @@ public static string Fleets_Speed_Slow {
}
}
+ ///
+ /// Looks up a localized string similar to 艦隊.
+ ///
+ public static string Fleets_Speed_Suffix {
+ get {
+ return ResourceManager.GetString("Fleets_Speed_Suffix", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 合計.
///
@@ -2887,6 +2914,24 @@ public static string ShipCatalog_Column_ObtainedID {
}
}
+ ///
+ /// Looks up a localized string similar to 速力.
+ ///
+ public static string ShipCatalog_Column_Speed {
+ get {
+ return ResourceManager.GetString("ShipCatalog_Column_Speed", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 装備によるステータス上昇を含んだ値です.
+ ///
+ public static string ShipCatalog_Column_Speed_ToolTip {
+ get {
+ return ResourceManager.GetString("ShipCatalog_Column_Speed_ToolTip", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 雷装.
///
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
index 612f31173..596cb69fe 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -415,7 +415,7 @@
Browser cache cleared
- 「提督業も忙しい！」は、艦これを遊びやすくするためのツールです。
+ KanColleViewer! is a tool to make playing Kantai Collection a bit easier.
Welcome
@@ -478,13 +478,13 @@
Level
- Fast Fleet
+ Fast
Hybrid speed fleet
- Slow Fleet
+ Slow
Total
@@ -1444,4 +1444,19 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
Includes stat bonuses from the equipment
+
+ Faster
+
+
+ Fastest
+
+
+ fleet
+
+
+ Speed
+
+
+ Includes equipment bonuses
+
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
index 84410eb5e..797513518 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -430,10 +430,10 @@
準備完了
- 高速艦隊
+ 高速
- 低速艦隊
+ 低速
ズーム {0} % はサポートされていません。
@@ -1436,4 +1436,19 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
装備によるステータス上昇を含んだ値です
+
+ 高速+
+
+
+ 最速
+
+
+ 艦隊
+
+
+ 速力
+
+
+ 装備によるステータス上昇を含んだ値です
+
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
index 4c97bb380..320987e6a 100644
--- 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
index 9cc6e452a..622f1be13 100644
--- 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
index a56167313..e9c1cd180 100644
--- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -1,4 +1,4 @@
-
-
-
-
-
@@ -860,8 +860,8 @@
-
+