Localised Status Bar strings
Localised Screenshot strings
Localised Homeport strings
Enable auto-clrf
Normalise line endings
Localised Expedition strings
Localised ViewModel name strings
Localised Repairyard strings
スクリーンショットの設定でpngとjpgを選べるように変更。 #7
Refined some translations
UI 微調整・ReSharper 警告の解除
Localised Dockyard strings
Merge remote-tracking branch 'upstream/master' into original

Conflicts:
	Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
	Grabacr07.KanColleViewer/Properties/Resources.ja-JP.resx
	Grabacr07.KanColleViewer/Properties/Resources.resx
	Grabacr07.KanColleViewer/ViewModels/SettingsViewModel.cs
	Grabacr07.KanColleViewer/Views/Behaviors/ScreenshotAction.cs
	Grabacr07.KanColleViewer/Views/Settings/Settings.xaml
Normalise line endings
多言語リソースの ID を修正
update .gitattributes
Merge branch 'master' of https://github.com/Grabacr07/KanColleViewer
Merge branch 'master' into notifyicon

Conflicts:
	Grabacr07.KanColleViewer/ViewModels/Contents/Docks/BuildingDockViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Docks/RepairingDockViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/ExpeditionViewModel.cs
	Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/ReSortieBarViewModel.cs
	Grabacr07.KanColleViewer/Views/Contents/Dockyard.xaml
	Grabacr07.KanColleViewer/Views/Contents/Expeditions.xaml
	Grabacr07.KanColleViewer/Views/Contents/Repairyard.xaml
通知領域対応に伴うリソースの修正
コーディングルールに則りフィールド名を修正