Difference between revisions of "Template:Japanese space program"

From blackwiki
Jump to navigation Jump to search
Line 85: Line 85:
 
   |group1style = background:#f7f7f7;
 
   |group1style = background:#f7f7f7;
 
   |group1 = Completed
 
   |group1 = Completed
   |list1  = {{nowrap begin}} [[Hinotori (satellite)|Hinotori]]{{·w}} [[Tenma]]{{·w}}[[Ginga (satellite)|Ginga]]{{·w}}[[Advanced Satellite for Cosmology and Astrophysics|ASCA]]{{·w}}[[HALCA]]{{·w}} [[Yohkoh]]{{·w}} [[SRATS|Taiyo]]{{·w}}[[Hakucho]]{{nowrap end}}
+
   |list1  = {{nowrap begin}} [[Hinotori (satellite)|Hinotori]]{{·w}} [[Tenma]]{{·w}}[[Ginga (satellite)|Ginga]]{{·w}}[[Advanced Satellite for Cosmology and Astrophysics|ASCA]]{{·w}}[[HALCA]]{{·w}} [[Yohkoh]]{{·w}} [[SRATS|Taiyo]]{{·w}}[[Hakucho]]{{·w}} [[AKARI|Akari]]{{nowrap end}}
 
   |group2 = In operation
 
   |group2 = In operation
   |list2  = {{nowrap begin}} [[Suzaku (Astro-EII)]]{{·w}} [[AKARI|Akari]]{{·w}} [[Hinode]]{{nowrap end}}
+
   |list2  = {{nowrap begin}} [[Suzaku (Astro-EII)]]{{·w}} [[Hinode]]{{nowrap end}}
 
   |group3 = Planned
 
   |group3 = Planned
 
   |list3  = {{nowrap begin}}  ''[[Astro-H]]''{{·w}}  ''[[Astro-G]]''{{·w}} [[SPICA telescope|SPICA]]{{·w}} ''[[SPRINT-A]]''{{·w}} [[SOLAR-C]]{{·w}} ''[[Nano-JASMINE]]''{{·w}} ERG{{nowrap end}}
 
   |list3  = {{nowrap begin}}  ''[[Astro-H]]''{{·w}}  ''[[Astro-G]]''{{·w}} [[SPICA telescope|SPICA]]{{·w}} ''[[SPRINT-A]]''{{·w}} [[SOLAR-C]]{{·w}} ''[[Nano-JASMINE]]''{{·w}} ERG{{nowrap end}}

Revision as of 12:23, 22 December 2011