Difference between revisions of "Template:CNSA space program"

From blackwiki
Jump to navigation Jump to search
imported>Ketiltrout
m (fix name)
imported>Ketiltrout
m (avoid redirects)
Line 12: Line 12:
 
   | list2      = [[Chinese Lunar Exploration Program|Chang'e program]] ([[Chang'e 2]])
 
   | list2      = [[Chinese Lunar Exploration Program|Chang'e program]] ([[Chang'e 2]])
 
   | group3    = In development
 
   | group3    = In development
   | list3      = [[Yinghuo 1]] {{·}} [[Chang'e 3]]
+
   | list3      = [[Yinghuo-1]] {{·}} [[Chang'e 3]]
 
}}
 
}}
  
Line 20: Line 20:
 
| list1= [[Shenzhou program]]  
 
| list1= [[Shenzhou program]]  
 
| group2 = In development
 
| group2 = In development
| list2= [[Chinese Lunar Exploration Program|Chang'e program]] {{·}} [[Project 921-2|Chinese Space Laboratory]] {{·}} [[Shenzhou 8|Shenzhou Cargo]]{{·}} [[Circumlunar Shenzhou]]{{·}} [[Project 921-3|Chinese Space Shuttle]]
+
| list2= [[Chinese Lunar Exploration Program|Chang'e program]] {{·}} [[Tiangong]] {{·}} [[Shenzhou 8|Shenzhou Cargo]]{{·}} [[Circumlunar Shenzhou]]{{·}} [[Project 921-3|Chinese Space Shuttle]]
 
}}
 
}}
  
 
| group3    = Past missions
 
| group3    = Past missions
| list3    = [[Shuguang spacecraft|Shuguang]]{{·}} [[Fanhui Shi Weixing|Piloted FSW]]{{·}} [[Project 863]]
+
| list3    = [[Shuguang (spacecraft)|Shuguang]]{{·}} [[Fanhui Shi Weixing|Piloted FSW]]{{·}} [[Project 863]]
  
 
| group4 = Spaceports
 
| group4 = Spaceports

Revision as of 22:07, 17 October 2011