From 780daf9b97e0b566503fa5040f216e9ea2ccefc3 Mon Sep 17 00:00:00 2001 From: Yuubari Date: Wed, 13 Apr 2016 08:44:43 +0300 Subject: [PATCH] Condition filter localisation --- .../Properties/Resources.Designer.cs | 27 +++++++++++++++++++ .../Properties/Resources.en.resx | 9 +++++++ .../Properties/Resources.resx | 9 +++++++ .../Views/Catalogs/ShipCatalogWindow.xaml | 8 +++--- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs index acccb154b..c39e113c0 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs @@ -2995,6 +2995,33 @@ public static string ShipCatalog_Filter_Misc_All { } } + /// + /// Looks up a localized string similar to condition. + /// + public static string ShipCatalog_Filter_Misc_Condition { + get { + return ResourceManager.GetString("ShipCatalog_Filter_Misc_Condition", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 50 以上. + /// + public static string ShipCatalog_Filter_Misc_ConditionAbove50 { + get { + return ResourceManager.GetString("ShipCatalog_Filter_Misc_ConditionAbove50", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 50 未満. + /// + public static string ShipCatalog_Filter_Misc_ConditionBelow50 { + get { + return ResourceManager.GetString("ShipCatalog_Filter_Misc_ConditionBelow50", 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 0c3ec34ec..dfe16c15b 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx @@ -1423,4 +1423,13 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar Fleet composition OK + + Morale + + + Above 50 + + + Below 50 + \ No newline at end of file diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx index c6aa863f8..1ebc248b6 100644 --- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx +++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx @@ -1415,4 +1415,13 @@ HTTP プロトコルの通信は自動構成も含め「インターネット 艦隊編成は正常です + + condition + + + 50 以上 + + + 50 未満 + \ 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 0f84ea62b..fa9e473a8 100644 --- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml +++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml @@ -437,15 +437,15 @@ - + - - -