Difference between revisions of "Template:Argentina space program"

From blackwiki
Jump to navigation Jump to search
blackwiki>Ninney
m (Improving style/layout)
blackwiki>Ninney
m (Updates)
Line 5: Line 5:
 
| state = {{{state<includeonly>|autocollapse</includeonly>}}}
 
| state = {{{state<includeonly>|autocollapse</includeonly>}}}
  
| group1 = Organisation
+
| group1 = Organisations
 
| list1 =
 
| list1 =
: [[Comisión Nacional de Actividades Espaciales|CONAE]]
+
: [[Comisión Nacional de Actividades Espaciales|Comisión Nacional de Actividades Espaciales (CONAE)]]
 
: [[CITEDEF]]
 
: [[CITEDEF]]
  
Line 17: Line 17:
 
: ARSAT ([[ARSAT-1|1]]
 
: ARSAT ([[ARSAT-1|1]]
 
: [[ARSAT-2|2]])
 
: [[ARSAT-2|2]])
 +
: [[BugSat 1]]
 
: [[MuSat]]
 
: [[MuSat]]
 
: [[Pehuensat]]
 
: [[Pehuensat]]
Line 26: Line 27:
 
   | list2 =  
 
   | list2 =  
 
: [[ARSAT-3]]
 
: [[ARSAT-3]]
: SAOCOM ([[SAOCOM|1A]]
+
: [[SAOCOM]] ([[SAOCOM 1A|1A]]
: [[SAOCOM|1B]])
+
: [[SAOCOM 1B|1B]]
: SAC ([[SAC-E|E]]/SABIA
+
: [[SAOCOM 2A|2A]]
 +
: [[SAOCOM 2B|2B]])
 +
: SAC ([[SABIA-Mar|E]]/SABIA-Mar
 
: [[SAC-F|F]]/ALSAT-2)
 
: [[SAC-F|F]]/ALSAT-2)
 
}}
 
}}
Line 49: Line 52:
 
: Orion ([[Orion-1|1]]
 
: Orion ([[Orion-1|1]]
 
: [[Orion-2|2]])
 
: [[Orion-2|2]])
: [[Rigel (rocket)]]
+
: [[Rigel (rocket)|Rigel]]
 
: [[Tronador I]]
 
: [[Tronador I]]
 
   | group2 = Planned
 
   | group2 = Planned
Line 58: Line 61:
 
: [[T4000]]
 
: [[T4000]]
 
: [[Tronador II]]
 
: [[Tronador II]]
 
 
}}
 
}}
  

Revision as of 00:56, 24 October 2015

50px Template documentation[view] [edit] [history] [purge]

Template:Spaceflight navboxes