Merge branch 'ui-localisation' into translation

Yuubari · Feb 8, 2016 · d4928c9 · d4928c9
2 parents c1339a7 + 8cba3cc
commit d4928c9
Show file tree

Hide file tree

Showing 7 changed files with 310 additions and 202 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
@@ -1399,8 +1399,29 @@ Small Radar LoS × (1.00) + Large Radar LoS × (0.99) +
   <data name="Settings_Operation_CheckFlagshipIsNotRepairShip" xml:space="preserve">
     <value>Check that the flagship is not a repair ship</value>
   </data>
+  <data name="Settings_Operation_AutomaticFleetSelection" xml:space="preserve">
+    <value>Automatically select fleets</value>
+  </data>
+  <data name="Settings_Operation_AutomaticFleetSelection_OnOrganisation" xml:space="preserve">
+    <value>When fleet composition is changed</value>
+  </data>
+  <data name="Settings_Operation_AutomaticFleetSelection_OnSortie" xml:space="preserve">
+    <value>When a fleet sorties</value>
+  </data>
+  <data name="Settings_Window_Taskbar" xml:space="preserve">
+    <value>Taskbar Button Settings</value>
+  </data>
+  <data name="Settings_Window_Taskbar_IndicatorBehaviour" xml:space="preserve">
+    <value>Indicator behaviour</value>
+  </data>
+  <data name="Settings_Window_Taskbar_IndicatorBehaviour_OnSortie" xml:space="preserve">
+    <value>Indicator behaviour during sortie</value>
+  </data>
+  <data name="TaskbarIndicator_DoNotUse" xml:space="preserve">
+    <value>Disable</value>
+  </data>
   <data name="ShipCatalog_Column_TTR" xml:space="preserve">
-    <value>Repair ETA</value>
+    <value>Repairs</value>
   </data>
   <data name="ShipCatalog_Column_TTR_ToolTip" xml:space="preserve">
     <value>Time until the repairs finish.</value>

diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1403,6 +1403,27 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
   <data name="Settings_Operation_CheckFlagshipIsNotRepairShip" xml:space="preserve">
     <value>旗艦に工作艦が編成されているときは出撃可能と判断しない</value>
   </data>
+  <data name="Settings_Operation_AutomaticFleetSelection" xml:space="preserve">
+    <value>艦隊自動選択</value>
+  </data>
+  <data name="Settings_Operation_AutomaticFleetSelection_OnOrganisation" xml:space="preserve">
+    <value>艦隊の編成を変更したとき、その艦隊を自動的に選択する</value>
+  </data>
+  <data name="Settings_Operation_AutomaticFleetSelection_OnSortie" xml:space="preserve">
+    <value>艦隊が出撃したとき、その艦隊を自動的に選択する</value>
+  </data>
+  <data name="Settings_Window_Taskbar" xml:space="preserve">
+    <value>タスク バー設定</value>
+  </data>
+  <data name="Settings_Window_Taskbar_IndicatorBehaviour" xml:space="preserve">
+    <value>インジケーターの動作</value>
+  </data>
+  <data name="Settings_Window_Taskbar_IndicatorBehaviour_OnSortie" xml:space="preserve">
+    <value>インジケーターの動作 (出撃中)</value>
+  </data>
+  <data name="TaskbarIndicator_DoNotUse" xml:space="preserve">
+    <value>使用しない</value>
+  </data>
   <data name="ShipCatalog_Column_TTR" xml:space="preserve">
     <value>修復時間</value>
   </data>

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Settings/WindowSettingsViewModel.cs
@@ -76,7 +76,7 @@ public WindowSettingsViewModel()
 				DisplayViewModel.Create(ExitConfirmationType.Always, Resources.Settings_Window_ConfirmExit_Always),
 			};
 			this.TaskbarProgressFeatures = EnumerableEx
-				.Return(GeneralSettings.TaskbarProgressSource.ToDefaultDisplay("使用しない"))
+				.Return(GeneralSettings.TaskbarProgressSource.ToDefaultDisplay(Resources.TaskbarIndicator_DoNotUse))
 				.Concat(TaskbarProgress.Features.ToDisplay(x => x.Id, x => x.DisplayName))
 				.ToList();
 		}

diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
@@ -89,15 +89,15 @@
 
 		<Rectangle Style="{DynamicResource SeparatorStyleKey}" />
 
-		<TextBlock Text="艦隊自動選択"
+		<TextBlock Text="{Binding Resources.Settings_Operation_AutomaticFleetSelection, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 				   Style="{DynamicResource SettingsHeaderTextStyleKey}" />
 
 		<StackPanel Margin="20,0,0,0">
-			<CheckBox Content="艦隊が出撃したとき、その艦隊を自動的に選択する "
+			<CheckBox Content="{Binding Resources.Settings_Operation_AutomaticFleetSelection_OnSortie, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 					  IsChecked="{Binding Source={x:Static ms:KanColleSettings.AutoFleetSelectWhenSortie}, Path=Value}" />
 
 			<Border Height="8" />
-			<CheckBox Content="艦隊の編成を変更したとき、その艦隊を自動的に選択する"
+			<CheckBox Content="{Binding Resources.Settings_Operation_AutomaticFleetSelection_OnOrganisation, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 					  IsChecked="{Binding Source={x:Static ms:KanColleSettings.AutoFleetSelectWhenShipsChanged}, Path=Value}" />
 		</StackPanel>
 

diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/VersionInfo.xaml
@@ -92,6 +92,9 @@
 				<metro2:HyperlinkEx Uri="https://twitter.com/veigr">
 					<Run Text="@veigr" />
 				</metro2:HyperlinkEx>
+				<metro2:HyperlinkEx Uri="https://twitter.com/Xiatian">
+					<Run Text="@Xiatian" />
+				</metro2:HyperlinkEx>
 
 				<LineBreak />