diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs index afb94bc69..3bbf8c312 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs @@ -627,6 +627,15 @@ public static string FleetWindow_LoS { } } + /// + /// Looks up a localized string similar to ステータス. + /// + public static string FleetWindow_Status { + get { + return ResourceManager.GetString("FleetWindow_Status", 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 9adab9f13..da398b498 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx @@ -1327,4 +1327,7 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar Tool + + Status + \ No newline at end of file diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx index b8240fd83..6072357ec 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx @@ -1331,4 +1331,7 @@ HTTP プロトコルの通信は自動構成も含め「インターネット ツール表示 + + ステータス + \ No newline at end of file diff --git a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml index e9c8a46fb..409cdf95f 100644 --- a/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/FleetWindow.xaml @@ -601,8 +601,7 @@ HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="1,2"> - - + - - + - - + - - + - - + + Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_NotSortied, StringFormat='{}{0}', Mode=OneWay}" /> + Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_Sortied, StringFormat='{}{0}', Mode=OneWay}" /> + Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_SortieNotReady, StringFormat='{}{0}', Mode=OneWay}" /> + Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_SortieReady, StringFormat='{}{0}', Mode=OneWay}" /> + Value="{Binding Source={x:Static models:ResourceService.Current}, Path=Resources.FleetWindow_Status_SortieReady, StringFormat='{}{0}', Mode=OneWay}" /> @@ -792,7 +787,7 @@ @@ -843,7 +839,7 @@