Difference between revisions of "Template:CNSA space program"

From blackwiki
Jump to navigation Jump to search
Line 36: Line 36:
 
   |  list1 = * Haiyang ([[Haiyang(Satellite)|1]])
 
   |  list1 = * Haiyang ([[Haiyang(Satellite)|1]])
 
   | group2 = Current
 
   | group2 = Current
   |  list2 = *[[Ziyuan 3]]
+
   |  list2 = * [[Ziyuan 3]]
* Haiyang (*[[Haiyang(Satellite)|1A]] *[[Haiyang(Satellite)|1B]] *[[Haiyang(Satellite)|2A]])
+
* Haiyang ([[Haiyang(Satellite)|1A]]
 +
* [[Haiyang(Satellite)|1B]]
 +
* [[Haiyang(Satellite)|2A]])
 
   | group3 = In development
 
   | group3 = In development
   |  list3 = *[[Haiyang(Satellite)|Haiyang 3]]
+
   |  list3 = * [[Haiyang(Satellite)|Haiyang 3]]
 
      
 
      
 
   }}
 
   }}
Line 61: Line 63:
 
     | group1 = Current
 
     | group1 = Current
 
   |  list1 =
 
   |  list1 =
* [[Tianlian-1]] (*[[Tianlian I-01]] *[[Tianlian-1|02]])
+
* [[Tianlian-1]] ( [[Tianlian I-01]]
 +
* [[Tianlian-1|02]])
 
   | group2 = In development
 
   | group2 = In development
 
   |  list2 =
 
   |  list2 =

Revision as of 04:37, 11 January 2013