Merge lp:~stellarium/stellarium/star-names-scheme-v2 into lp:stellarium
- star-names-scheme-v2
- Merge into trunk
Proposed by
Alexander Wolf
Status: | Merged |
---|---|
Merged at revision: | 8681 |
Proposed branch: | lp:~stellarium/stellarium/star-names-scheme-v2 |
Merge into: | lp:stellarium |
Diff against target: |
1511 lines (+943/-351) 9 files modified
skycultures/western/CMakeLists.txt (+3/-3) skycultures/western/reference.fab (+14/-0) skycultures/western/star_names.fab (+765/-333) src/core/StelSkyCultureMgr.cpp (+15/-4) src/core/StelSkyCultureMgr.hpp (+1/-1) src/core/modules/StarMgr.cpp (+122/-9) src/core/modules/StarMgr.hpp (+19/-0) src/core/modules/StarWrapper.cpp (+4/-0) stars/default/name.fab (+0/-1) |
To merge this branch: | bzr merge lp:~stellarium/stellarium/star-names-scheme-v2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
gzotti | Pending | ||
Stellarium | Pending | ||
Review via email: mp+305733@code.launchpad.net |
Commit message
Implementation for support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.
Description of the change
Current branch has implementation support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'skycultures/western/CMakeLists.txt' | |||
2 | --- skycultures/western/CMakeLists.txt 2013-04-24 06:43:39 +0000 | |||
3 | +++ skycultures/western/CMakeLists.txt 2016-09-14 16:38:20 +0000 | |||
4 | @@ -1,12 +1,12 @@ | |||
5 | 1 | 1 | ||
6 | 2 | ########### install files ############### | 2 | ########### install files ############### |
7 | 3 | 3 | ||
10 | 4 | # install info.ini and star_names.fab | 4 | # install info.ini |
11 | 5 | INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/western ) | 5 | INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/western ) |
12 | 6 | 6 | ||
13 | 7 | # install constellations data, artwork and descriptions | 7 | # install constellations data, artwork and descriptions |
14 | 8 | INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western | 8 | INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western |
16 | 9 | FILES_MATCHING PATTERN "constellation*" | 9 | FILES_MATCHING PATTERN "*.fab" |
17 | 10 | PATTERN "*.png" | 10 | PATTERN "*.png" |
18 | 11 | PATTERN "description.*.utf8" | 11 | PATTERN "description.*.utf8" |
19 | 12 | PATTERN "CMakeFiles" EXCLUDE ) | 12 | PATTERN "CMakeFiles" EXCLUDE ) |
20 | 13 | 13 | ||
21 | === added file 'skycultures/western/reference.fab' | |||
22 | --- skycultures/western/reference.fab 1970-01-01 00:00:00 +0000 | |||
23 | +++ skycultures/western/reference.fab 2016-09-14 16:38:20 +0000 | |||
24 | @@ -0,0 +1,14 @@ | |||
25 | 1 | # Reference file for Western skyculture | ||
26 | 2 | # Format: | ||
27 | 3 | # Link number | Description (Link name) | URL (if exists) | ||
28 | 4 | 1|Kunitzsch, P.; Smart T. (2006). "A Dictionary of Modern star Names: A Short Guide to 254 Star Names and Their Derivations" (2nd rev. ed.). Cambridge, MA: Sky Pub. ISBN 978-1-931559-44-7.| | ||
29 | 5 | 2|Allen, R. H. (1963). "Star Names: Their Lore and Meaning" (rep. ed.). New York, NY: Dover Publications Inc. ISBN 0-486-21079-0.| | ||
30 | 6 | 3|2000, A&AS, 143, 9, "The SIMBAD astronomical database", Wenger et al.|http://adsabs.harvard.edu/abs/2000A%26AS..143....9W | ||
31 | 7 | 4|Final Results of NameExoWorlds Public Vote Released|http://www.iau.org/news/pressreleases/detail/iau1514/ | ||
32 | 8 | 5|STARS by Jim Kaler, Prof. Emeritus of Astronomy, University of Illinois|http://stars.astro.illinois.edu/sow/sowlist.html | ||
33 | 9 | 6|IAU Catalog of Star Names (IAU-CSN)|http://www.pas.rochester.edu/~emamajek/WGSN/IAU-CSN.txt | ||
34 | 10 | 7|Covington, Michael (2002). Celestial Objects for Modern Telescopes: Practical Amateur Astronomy. Cambridge University Press.|https://books.google.com/books?id=ql7wLq1fP5QC&pg=PA209 | ||
35 | 11 | 8|"61 Cyg (Piazzi's Flying Star)". Science&Space News. Retrieved June 1, 2015.|http://news.sky-map.org/starview?object_type=1&object_id=2282&object_name=HD+201091&locale=EN | ||
36 | 12 | 9|Kruger 60|https://en.wikipedia.org/wiki/Kruger_60 | ||
37 | 13 | 10|List of Named Stars in Alphabetical Order|http://www.astro.wisc.edu/~dolan/constellations/starname_list.html | ||
38 | 14 | 11|Jack W. Rhoads - Technical Memorandum 33-507-A Reduced Star Catalog Containing 537 Named Stars, Jet Propulsion Laboratory, California Institute of Technology; November 15, 1971|http://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19720005197_1972005197.pdf | ||
39 | 0 | 15 | ||
40 | === modified file 'skycultures/western/star_names.fab' | |||
41 | --- skycultures/western/star_names.fab 2016-02-27 05:39:35 +0000 | |||
42 | +++ skycultures/western/star_names.fab 2016-09-14 16:38:20 +0000 | |||
43 | @@ -1,339 +1,771 @@ | |||
49 | 1 | 677|_("Alpheratz") | 1 | # star names by constellation |
50 | 2 | 746|_("Caph") | 2 | # Andromeda (And) |
51 | 3 | 1067|_("Algenib") | 3 | 677|_("Alpheratz") 1,2,5,6,11 |
52 | 4 | 1562|_("Deneb Kaitos Shemali") | 4 | 677|_("Sirrah") |
53 | 5 | 2081|_("Ankaa") | 5 | 5447|_("Mirach") 1,2,5,6,11 |
54 | 6 | 9640|_("Almach") 1,2,5,6,11 | ||
55 | 7 | 9640|_("Almaak") | ||
56 | 8 | 6411|_("Adhil") 1,2,6,11 | ||
57 | 9 | 7607|_("Nembus") 2,11 | ||
58 | 10 | 7513|_("Titawin") 4,6 | ||
59 | 11 | 116076|_("Veritate") 4,6 | ||
60 | 12 | 6999|_("Thail") 11 | ||
61 | 13 | # Aquarius (Aqr) | ||
62 | 14 | 109074|_("Sadalmelik") 1,2,6,11 | ||
63 | 15 | 106278|_("Sadalsuud") 1,2,6,11 | ||
64 | 16 | 110395|_("Sadachbia") 1,2,6,11 | ||
65 | 17 | 113136|_("Skat") 1,2,6,11 | ||
66 | 18 | 102618|_("Albali") 1,2,11 | ||
67 | 19 | 110003|_("Ancha") 1,2,11 | ||
68 | 20 | 111710|_("Situla") 1,2,11 | ||
69 | 21 | 110960|_("Sadaltager") 2,11 | ||
70 | 22 | 110960|_("Alsad") | ||
71 | 23 | 112961|_("Hydor") 5 | ||
72 | 24 | 104459|_("Albulan II") 2,11 | ||
73 | 25 | 104459|_("Albulaan") 2,11 | ||
74 | 26 | 103045|_("Albulan I") 2,11 | ||
75 | 27 | 103045|_("Albulaan") 2,11 | ||
76 | 28 | 106786|_("Bunda") 2 | ||
77 | 29 | 108874|_("Sadalmulk") 2,11 | ||
78 | 30 | 108874|_("Al Sa'd al Mulk") | ||
79 | 31 | 110672|_("Seat") 2,11 | ||
80 | 32 | # Aquila (Aql) | ||
81 | 33 | 97649|_("Altair") 1,2,6,11 | ||
82 | 34 | 98036|_("Alshain") 1,2,6,11 | ||
83 | 35 | 97278|_("Tarazed") 1,2,6,11 | ||
84 | 36 | 97278|_("Reda") | ||
85 | 37 | 97938|_("Libertas") 4,6 | ||
86 | 38 | 93805|_("Al Thalimain Prior") 2,5,11 | ||
87 | 39 | 93805|_("Al Thalimain I") | ||
88 | 40 | 96468|_("Al Thalimain Posterior") 2,5,11 | ||
89 | 41 | 96468|_("Al Thalimain II") | ||
90 | 42 | 93747|_("Deneb al Okab Australis") 5,10 | ||
91 | 43 | 93747|_("Deneb el Okab") | ||
92 | 44 | 93244|_("Deneb al Okab Borealis") 5,10 | ||
93 | 45 | 93244|_("Deneb el Okab") | ||
94 | 46 | 95501|_("Almizan I") 11 | ||
95 | 47 | 97804|_("Almizan II") 11 | ||
96 | 48 | 99473|_("Almizan III") 11 | ||
97 | 49 | # Ara (Ara) | ||
98 | 50 | 86796|_("Cervantes") 4,6 | ||
99 | 51 | # Aries (Ari) | ||
100 | 52 | 9884|_("Hamal") 1,2,6,11 | ||
101 | 53 | 8903|_("Sheratan") 1,2,6,11 | ||
102 | 54 | 8832|_("Mesarthim") 1,2,6,11 | ||
103 | 55 | 14838|_("Botein") 1,2,11 | ||
104 | 56 | 12489|_("Barani I") 11 | ||
105 | 57 | 12719|_("Barani II") 11 | ||
106 | 58 | 13061|_("Barani III") 11 | ||
107 | 59 | 13209|_("Nair al Butain") 11 | ||
108 | 60 | 13914|_("Al Butain III") 11 | ||
109 | 61 | 15110|_("Al Butain IV") 11 | ||
110 | 62 | 12640|_("Koleon") 11 | ||
111 | 63 | 13165|_("Al Butain I") 11 | ||
112 | 64 | 13702|_("Al Butain II") 11 | ||
113 | 65 | # Auriga (Aur) | ||
114 | 66 | 24608|_("Capella") 1,2,6,11 | ||
115 | 67 | 28360|_("Menkalinan") 1,2,6,11 | ||
116 | 68 | 23015|_("Hassaleh") 1,11 | ||
117 | 69 | 23015|_("Kabalinan") | ||
118 | 70 | 23453|_("Haedus") 2,5,11 | ||
119 | 71 | 23453|_("Haedus I") | ||
120 | 72 | 23416|_("Almaaz") 2,3,5,11 | ||
121 | 73 | 23416|_("Al Ma'az") | ||
122 | 74 | 23416|_("Alanz") | ||
123 | 75 | 23767|_("Haedus II") 5,11 | ||
124 | 76 | 28380|_("Mahasim") 11 | ||
125 | 77 | 24813|_("Alhiba II") 11 | ||
126 | 78 | 24340|_("Alhiba I") 11 | ||
127 | 79 | 25292|_("Alhiba III") 11 | ||
128 | 80 | 30520|_("Dolones I") 11 | ||
129 | 81 | 31832|_("Dolones III") 11 | ||
130 | 82 | 31789|_("Dolones II") 11 | ||
131 | 83 | 32173|_("Dolones IV") 11 | ||
132 | 84 | 32480|_("Dolones V") 11 | ||
133 | 85 | 32562|_("Dolones VI") 11 | ||
134 | 86 | 32844|_("Dolones VII") 11 | ||
135 | 87 | 33133|_("Dolones VIII") 11 | ||
136 | 88 | 33377|_("Dolones IX") 11 | ||
137 | 89 | # Bootes (Boo) | ||
138 | 90 | 69673|_("Arcturus") 1,2,6,11 | ||
139 | 91 | 73555|_("Nekkar") 1,2,6,11 | ||
140 | 92 | 71075|_("Seginus") 1,2,5,6,10,11 | ||
141 | 93 | 71075|_("Haris") | ||
142 | 94 | 71075|_("Ceginus") | ||
143 | 95 | 72105|_("Izar") 1,2,6,11 | ||
144 | 96 | 72105|_("Pulcherrima") | ||
145 | 97 | 67927|_("Muphrid") 1,2,11 | ||
146 | 98 | 75411|_("Alkalurops") 1,2,6,11 | ||
147 | 99 | 72487|_("Merga") 1,2,11 | ||
148 | 100 | 70497|_("Asellus Primus") 2,5,11 | ||
149 | 101 | 69713|_("Asellus Secundus") 2,5,11 | ||
150 | 102 | 69483|_("Asellus Tertius") 2,5,11 | ||
151 | 103 | 74666|_("Thiba") 11 | ||
152 | 104 | 69732|_("Aulad Althiba") 11 | ||
153 | 105 | 76534|_("Ceginus") 11 | ||
154 | 106 | 73745|_("Aulad Alnathlat") 11 | ||
155 | 107 | # Camelopardalis (Cam) | ||
156 | 108 | 58952|_("Tonatiuh") 4,6 | ||
157 | 109 | # Cancer (Cnc) | ||
158 | 110 | 44066|_("Acubens") 1,2,6,11 | ||
159 | 111 | 44066|_("Sertan") | ||
160 | 112 | 42806|_("Asellus Borealis") 1,5,11 | ||
161 | 113 | 42806|_("Ascellus Borealis") | ||
162 | 114 | 42911|_("Asellus Australis") 1,5,11 | ||
163 | 115 | 42911|_("Ascellus Australis") | ||
164 | 116 | 40167|_("Tegmine") 1,2,11 | ||
165 | 117 | 40526|_("Al Tarf") 2,3,5,10,11 | ||
166 | 118 | 40526|_("Altarf") | ||
167 | 119 | 43587|_("Copernicus") 4,6 | ||
168 | 120 | 42556|_("Almalaf") 11 | ||
169 | 121 | 43103|_("Zubanah") 11 | ||
170 | 122 | 40881|_("Piautos") 11 | ||
171 | 123 | 44946|_("Nahn") 11 | ||
172 | 124 | # Canes Venatici (CVn) | ||
173 | 125 | 63125|_("Cor Caroli") 1,2,6,11 | ||
174 | 126 | 61317|_("Chara") 1,2,6,11 | ||
175 | 127 | 62223|_("La Superba") 2,11 | ||
176 | 128 | # Canis Major (CMa) | ||
177 | 129 | 32349|_("Sirius") 1,2,6,11 | ||
178 | 130 | 30324|_("Mirzam") 1,2,6,11 | ||
179 | 131 | 34045|_("Muliphein") 1,2,5,6,11 | ||
180 | 132 | 34045|_("Mirza") | ||
181 | 133 | 34444|_("Wezen") 1,2,6,11 | ||
182 | 134 | 33579|_("Adhara") 1,2,6,11 | ||
183 | 135 | 30122|_("Furud") 1,2,6,11 | ||
184 | 136 | 35904|_("Aludra") 1,2,6,11 | ||
185 | 137 | 33345|_("Isis") 2,11 | ||
186 | 138 | 33152|_("Udra") 11 | ||
187 | 139 | 33977|_("Al Zara") 11 | ||
188 | 140 | # Canis Minor (CMi) | ||
189 | 141 | 37279|_("Procyon") 1,2,6,11 | ||
190 | 142 | 36188|_("Gomeisa") 1,2,6,11 | ||
191 | 143 | 36208|_("Luyten's Star") 3 | ||
192 | 144 | # Capricornus (Cap) | ||
193 | 145 | 100027|_("Prima Giedi") 2,11 | ||
194 | 146 | 100064|_("Algedi") 1,2,6,10,11 | ||
195 | 147 | 100064|_("Secunda Giedi") | ||
196 | 148 | 100345|_("Dabih") 1,2,6,11 | ||
197 | 149 | 100345|_("Dabih Major") | ||
198 | 150 | 100325|_("Dabih Minor") 2,11 | ||
199 | 151 | 106985|_("Nashira") 1,2,6,11 | ||
200 | 152 | 107556|_("Deneb Algedi") 1,2,11 | ||
201 | 153 | 100310|_("Al Shat") 2,3,5,10,11 | ||
202 | 154 | 100310|_("Alshat") | ||
203 | 155 | # Carina (Car) | ||
204 | 156 | 30438|_("Canopus") 1,6,11 | ||
205 | 157 | 30438|_("Suhel") | ||
206 | 158 | 45238|_("Miaplacidus") 1,6,11 | ||
207 | 159 | 41037|_("Avior") 1,6,11 | ||
208 | 160 | 45556|_("Aspidiske") 1,6,11 | ||
209 | 161 | 55042|_("Innes' Star") 3 | ||
210 | 162 | # Cassiopeia (Cas) | ||
211 | 163 | 3179|_("Shedar") 1,2,5,6,10,11 | ||
212 | 6 | 3179|_("Shedir") | 164 | 3179|_("Shedir") |
217 | 7 | 3419|_("Diphda") | 165 | 746|_("Caph") 1,2,6,11 |
218 | 8 | 3821|_("Achird") | 166 | 6686|_("Ruchbah") 1,2,6,11 |
219 | 9 | 3829|_("van Maanen 2") | 167 | 6686|_("Ksora") |
220 | 10 | 4427|_("Navi") | 168 | 3821|_("Achird") 1 |
221 | 169 | 8886|_("Segin") 1,11 | ||
222 | 170 | 5542|_("Marfak") 2,5,11 | ||
223 | 171 | 5542|_("Marfak-East") | ||
224 | 172 | 5336|_("Marfak") 2,5,11 | ||
225 | 173 | 5336|_("Marfak-West") | ||
226 | 174 | 5336|_("Al Marfak") | ||
227 | 175 | 4427|_("Navi") 11 | ||
228 | 176 | # Centaurus (Cen) | ||
229 | 177 | 71683|_("Rigil Kentaurus") 1,2,11 | ||
230 | 178 | 71683|_("Toliman") | ||
231 | 179 | 71683|_("Bungula") | ||
232 | 180 | 70890|_("Proxima") 1,6 | ||
233 | 181 | 68702|_("Hadar") 1,2,6,11 | ||
234 | 182 | 68702|_("Agena") | ||
235 | 183 | 61932|_("Muhlifain") 1,11 | ||
236 | 184 | 68002|_("Alnair") 1,11 | ||
237 | 185 | 68002|_("Baten Kentaurus") | ||
238 | 186 | 68933|_("Menkent") 1,6,11 | ||
239 | 187 | 56709|_("Przybylski's Star") 3 | ||
240 | 188 | # Cepheus (Cep) | ||
241 | 189 | 105199|_("Alderamin") 1,2,6,11 | ||
242 | 190 | 106032|_("Alfirk") 1,2,6,11 | ||
243 | 191 | 116727|_("Errai") 1,2,6,11 | ||
244 | 192 | 107259|_("The Garnet Star") 1,2,11 | ||
245 | 193 | 107259|_("Erakis") | ||
246 | 194 | 108917|_("Kurhah") 1,2,5,11 | ||
247 | 195 | 108917|_("Al Kurhah") | ||
248 | 196 | 111056|_("Al Kalb al Rai") 2,11 | ||
249 | 197 | 111056|_("Kalbalrai") | ||
250 | 198 | 107418|_("Castula") 2 | ||
251 | 199 | 110893|_("Kruger 60") 9 | ||
252 | 200 | 102422|_("Kabalfird") 11 | ||
253 | 201 | 101093|_("Al Kidr") 11 | ||
254 | 202 | 99255|_("Al Aghnam I") 11 | ||
255 | 203 | 114222|_("Al Aghnam II") 11 | ||
256 | 204 | # Cetus (Cet) | ||
257 | 205 | 14135|_("Menkar") 1,2,6,11 | ||
258 | 206 | 3419|_("Diphda") 1,2,5,6,11 | ||
259 | 207 | 3419|_("Deneb Kaitos") | ||
260 | 208 | 8645|_("Baten Kaitos") 1,2,11 | ||
261 | 209 | 10826|_("Mira") 1,2,6,11 | ||
262 | 210 | 12706|_("Al Kaff al Jidhmah") 2,5,11 | ||
263 | 211 | 12706|_("Kaffaljidhma") | ||
264 | 212 | 12706|_("Kafalgidma") | ||
265 | 213 | 5364|_("Dheneb") 2,5,11 | ||
266 | 11 | 5364|_("Deneb Algenubi") | 214 | 5364|_("Deneb Algenubi") |
357 | 12 | 5447|_("Mirach") | 215 | 1562|_("Deneb Kaitos Shemali") 2,10,11 |
358 | 13 | 5542|_("Marfark") | 216 | 1562|_("Schemali") |
359 | 14 | 6411|_("Adhil") | 217 | 1562|_("Deneb Kaitos") |
360 | 15 | 6686|_("Ruchbah") | 218 | 13954|_("Menkar") 2,10,11 |
361 | 16 | 7097|_("Kullat Nunu") | 219 | 13954|_("Menkab") |
362 | 17 | 7588|_("Achernar") | 220 | 12387|_("Al Kaff al Jidhmah III") 11 |
363 | 18 | 7607|_("Nembus") | 221 | 12390|_("Sadr al Kaitos III") 11 |
364 | 19 | 8198|_("Torcularis Septentrionalis") | 222 | 6537|_("Al Naymat I") 11 |
365 | 20 | 8645|_("Baten Kaitos") | 223 | 12828|_("Al Kaff al Jidhmah IV") 11 |
366 | 21 | 8796|_("Mothallah") | 224 | 10324|_("Al Kaff al Jidhmah I") 11 |
367 | 22 | 8832|_("Mesarthim") | 225 | 11484|_("Al Kaff al Jidhmah II") 11 |
368 | 23 | 8903|_("Sheratan") | 226 | 12770|_("Sadr al Kaitos IV") 11 |
369 | 24 | 9487|_("Alrischa") | 227 | 11345|_("Sadr al Kaitos I") 11 |
370 | 25 | 9640|_("Almaak") | 228 | 11783|_("Sadr al Kaitos II") 11 |
371 | 26 | 9884|_("Hamal") | 229 | 8102|_("Al Naymat II") 11 |
372 | 27 | 10826|_("Mira") | 230 | 9347|_("Al Naymat III") 11 |
373 | 28 | 11767|_("Polaris") | 231 | 3455|_("Alnitham I") 11 |
374 | 29 | 12706|_("Kaffaljidhma") | 232 | 3909|_("Alnitham II") 11 |
375 | 30 | 13268|_("Miram") | 233 | 4371|_("Alnitham III") 11 |
376 | 31 | 13288|_("Angetenar") | 234 | 4587|_("Alnitham IV") 11 |
377 | 32 | 13701|_("Azha") | 235 | # Columba (Col) |
378 | 33 | 13847|_("Acamar") | 236 | 26634|_("Phact") 1,2,6,11 |
379 | 34 | 13879|_("Gorgonea Secunda") | 237 | 27628|_("Wazn") 1,2,6,11 |
380 | 35 | 14135|_("Menkar") | 238 | 29034|_("Kurud I") 11 |
381 | 36 | 14354|_("Gorgonea Tertia") | 239 | 29807|_("Kurud II") 11 |
382 | 37 | 14576|_("Algol") | 240 | # Coma Berenices (Com) |
383 | 38 | 14668|_("Misam") | 241 | 62763|_("Polaris Galacticum Borealis") 5 |
384 | 39 | 14817|_("Gorgonea Quarta") | 242 | 64241|_("Diadem") 3,5,10,11 |
385 | 40 | 14838|_("Botein") | 243 | 61071|_("Kissin") 11 |
386 | 41 | 15197|_("Zibal") | 244 | 60742|_("Al Dafirah") 11 |
387 | 42 | 15863|_("Mirphak") | 245 | # Corona Australis (CrA) |
388 | 43 | 17378|_("Rana") | 246 | 94114|_("Alfecca Meridiana") 2,5,10,11 |
389 | 44 | 17448|_("Atik") | 247 | # Corona Borealis (CrB) |
390 | 45 | 17489|_("Celaeno") | 248 | 76267|_("Alphecca") 1,2,5,6,10,11 |
391 | 46 | 17499|_("Electra") | 249 | 76267|_("Gemma") |
392 | 47 | 17531|_("Taygeta") | 250 | 76267|_("Alphekka") |
393 | 48 | 17573|_("Maia") | 251 | 76267|_("Gnosia") |
394 | 49 | 17579|_("Asterope") | 252 | 75695|_("Nusakan") 1,2,11 |
395 | 50 | 17608|_("Merope") | 253 | 77442|_("Variablis Coronae") 11 |
396 | 51 | 17702|_("Alcyone") | 254 | 78322|_("Blaze Star") 11 |
397 | 52 | 17847|_("Atlas") | 255 | # Corvus (Crv) |
398 | 53 | 17851|_("Pleione") | 256 | 59199|_("Alchiba") 1,2,11 |
399 | 54 | 18543|_("Zaurak") | 257 | 59199|_("Al Chiba") 1,2 |
400 | 55 | 18614|_("Menkib") | 258 | 59803|_("Gienah Corvi") 1,2,5,10,11 |
401 | 56 | 19587|_("Beid") | 259 | 59803|_("Gienah") |
402 | 57 | 19849|_("Keid") | 260 | 59803|_("Gienah Ghurab") |
403 | 58 | 20205|_("Hyadum I") | 261 | 60965|_("Algorab") 1,2,6,11 |
404 | 59 | 20455|_("Hyadum II") | 262 | 61359|_("Kraz") 1,11 |
405 | 60 | 20648|_("Cleeia") | 263 | 59316|_("Minkar") 3,5,10,11 |
406 | 61 | 20889|_("Ain") | 264 | # Crater (Crt) |
407 | 62 | 21393|_("Theemim") | 265 | 53740|_("Alkes") 1,2,11 |
408 | 63 | 21421|_("Aldebaran") | 266 | 54682|_("Al Sharasif") 2,11 |
409 | 64 | 21594|_("Sceptrum") | 267 | 54682|_("Al Sharasif II") |
410 | 65 | 22449|_("Tabit") | 268 | # Crux (Cru) |
411 | 66 | 23015|_("Hassaleh") | 269 | 60718|_("Acrux") 1,2,6,11 |
412 | 67 | 23203|_("Hind's Crimson Star") | 270 | 62434|_("Mimosa") 1,6,11 |
413 | 68 | 23416|_("Almaaz") | 271 | 61084|_("Gacrux") 1,6,11 |
414 | 69 | 23453|_("Haedus") | 272 | # Cygnus (Cyg) |
415 | 70 | 23767|_("Hoedus II") | 273 | 102098|_("Deneb") 1,2,6,11 |
416 | 71 | 23875|_("Cursa") | 274 | 102098|_("Arided") |
417 | 72 | 24186|_("Kapteyn's Star") | 275 | 102098|_("Aridif") |
418 | 73 | 24436|_("Rigel") | 276 | 95947|_("Albireo") 1,2,6,11 |
419 | 74 | 24608|_("Capella") | 277 | 100453|_("Sadr") 1,2,6,11 |
420 | 75 | 25336|_("Bellatrix") | 278 | 102488|_("Gienah Cygni") 1,2,5,11 |
421 | 76 | 25428|_("Alnath") | 279 | 102488|_("Gienah") |
422 | 77 | 25606|_("Nihal") | 280 | 102488|_("Al Janah") |
423 | 78 | 25923|_("Thabit") | 281 | 107136|_("Azelfafage") 1,2,11 |
424 | 79 | 25930|_("Mintaka") | 282 | 107136|_("Azelfage") |
425 | 80 | 25945|_("Ruby Star") | 283 | 101138|_("Ruchba") 2,11 |
426 | 81 | 25985|_("Arneb") | 284 | 101138|_("Rucba") |
427 | 82 | 26207|_("Meissa") | 285 | 104217|_("Bessel's Star") 7,8 |
428 | 83 | 26241|_("Hatsya") | 286 | 104217|_("Piazzi's Flying Star") |
429 | 84 | 26311|_("Alnilam") | 287 | 96295|_("Campbell's Star") 3 |
430 | 85 | 26634|_("Phact") | 288 | 96295|_("Campbell’s Hydrogen Star") |
431 | 86 | 26727|_("Alnitak") | 289 | 100044|_("Revenate of the Swan") 11 |
432 | 87 | 27366|_("Saiph") | 290 | 97165|_("Fawaris II") 11 |
433 | 88 | 27628|_("Wazn") | 291 | 104732|_("Fawaris III") 11 |
434 | 89 | 27989|_("Betelgeuse") | 292 | 94779|_("Fawaris I") 11 |
435 | 90 | 28360|_("Menkalinan") | 293 | # Delphinus (Del) |
436 | 91 | 29034|_("Al Kurud") | 294 | 101958|_("Sualocin") 1,2,11 |
437 | 92 | 29655|_("Propus") | 295 | 101958|_("Svalocin") |
438 | 93 | 30089|_("Red Rectangle") | 296 | 101769|_("Rotanev") 1,2,11 |
439 | 94 | 30122|_("Furud") | 297 | 103527|_("Musica") 4,6 |
440 | 95 | 30324|_("Mirzam") | 298 | 101421|_("Deneb Dulfim") 5,10,11 |
441 | 96 | 30343|_("Tejat") | 299 | 102532|_("Al Salib") 11 |
442 | 97 | 30438|_("Canopus") | 300 | 102281|_("Al Ukud") 11 |
443 | 98 | 31646|_("Plaskett's star") | 301 | # Draco (Dra) |
444 | 99 | 31681|_("Alhena") | 302 | 68756|_("Thuban") 1,2,5,6,11 |
445 | 100 | 32246|_("Mebsuta") | 303 | 68756|_("Adib") |
446 | 101 | 32349|_("Sirius") | 304 | 68756|_("Al Tinnin") |
447 | 305 | 85670|_("Rastaban") 1,2,6,11 | ||
448 | 306 | 85670|_("Alwaid") | ||
449 | 307 | 87833|_("Eltanin") 1,2,3,5,6,11 | ||
450 | 308 | 87833|_("Etamin") | ||
451 | 309 | 87833|_("Taurt") | ||
452 | 310 | 94376|_("Altais") 1,2,6,11 | ||
453 | 311 | 94376|_("Al Tais") | ||
454 | 312 | 75458|_("Edasich") 1,2,6,11 | ||
455 | 313 | 56211|_("Giausar") 1,2,11 | ||
456 | 314 | 56211|_("Giansar") | ||
457 | 315 | 56211|_("Nodus Secundus") | ||
458 | 316 | 83608|_("Alrakis") 1,2,11 | ||
459 | 317 | 83608|_("Arrakis") | ||
460 | 318 | 83608|_("Errakis") | ||
461 | 319 | 87585|_("Grumium") 1,2,11 | ||
462 | 320 | 85819|_("Kuma") 1 | ||
463 | 321 | 97433|_("Tyl") 1,11 | ||
464 | 322 | 96100|_("Alsafi") 2,11 | ||
465 | 323 | 86614|_("Dziban I") 2,10,11 | ||
466 | 324 | 86614|_("Dsiban") | ||
467 | 325 | 86614|_("Dziban") | ||
468 | 326 | 86620|_("Dziban II") 2,11 | ||
469 | 327 | 86620|_("Dsiban") | ||
470 | 328 | 86201|_("Al Dhih") 2,11 | ||
471 | 329 | 86201|_("Adfar Aldib II") | ||
472 | 330 | 90344|_("Fafnir") 4,6 | ||
473 | 331 | 83895|_("Al Dhibain Posterior") 3,5,10,11 | ||
474 | 332 | 83895|_("Aldhibah") | ||
475 | 333 | 83895|_("Dhibah") | ||
476 | 334 | 80331|_("Al Dhibain Prior") 5,11 | ||
477 | 335 | 80331|_("Dhibain") | ||
478 | 336 | 85805|_("Adfar Aldib I") 11 | ||
479 | 337 | 95081|_("Tais I") 11 | ||
480 | 338 | 98702|_("Tais II") 11 | ||
481 | 339 | 94648|_("Athafi II") 11 | ||
482 | 340 | 92782|_("Athafi I") 11 | ||
483 | 341 | 89908|_("Aldhiba") 11 | ||
484 | 342 | 89937|_("Alahakan") 11 | ||
485 | 343 | # Equuleus (Equ) | ||
486 | 344 | 104987|_("Kitalpha") 1,2,6,11 | ||
487 | 345 | # Eridanus (Eri) | ||
488 | 346 | 7588|_("Achernar") 1,2,6,11 | ||
489 | 347 | 23875|_("Cursa") 1,2,6,11 | ||
490 | 348 | 18543|_("Zaurak") 1,2,6,11 | ||
491 | 349 | 15197|_("Zibal") 1,11 | ||
492 | 350 | 13701|_("Azha") 1,2,11 | ||
493 | 351 | 13847|_("Acamar") 1,2,6,11 | ||
494 | 352 | 13847|_("Dalim") | ||
495 | 353 | 19587|_("Beid") 1,2,11 | ||
496 | 354 | 19849|_("Keid") 1,2,11 | ||
497 | 355 | 20535|_("Theemin") 1,2,11 | ||
498 | 356 | 20535|_("Theemim") | ||
499 | 357 | 20535|_("Beemim II") | ||
500 | 358 | 13288|_("Angetenar") 2,11 | ||
501 | 359 | 21248|_("Beemim") 2,11 | ||
502 | 360 | 21248|_("Beemim III") | ||
503 | 361 | 16537|_("Ran") 4,6 | ||
504 | 362 | 17378|_("Rana") 3,10,11 | ||
505 | 363 | 21594|_("Sceptrum") 3,10,11 | ||
506 | 364 | 23972|_("Kursi al Jauzah II") 11 | ||
507 | 365 | 14060|_("Aludhi I") 11 | ||
508 | 366 | 14168|_("Aludhi II") 11 | ||
509 | 367 | 14293|_("Aludhi III") 11 | ||
510 | 368 | 20042|_("Beemim I") 11 | ||
511 | 369 | 23364|_("Kursi al Jauzah I") 11 | ||
512 | 370 | # Gemini (Gem) | ||
513 | 371 | 36850|_("Castor") 1,2,6,11 | ||
514 | 372 | 37826|_("Pollux") 1,2,6,11 | ||
515 | 373 | 31681|_("Alhena") 1,2,6,11 | ||
516 | 374 | 31681|_("Almeisan") | ||
517 | 375 | 35550|_("Wasat") 1,2,6,11 | ||
518 | 376 | 32246|_("Mebsuta") 1,2,6,11 | ||
519 | 377 | 34088|_("Mekbuda") 1,2,11 | ||
520 | 378 | 29655|_("Propus") 1,2,6,10,11 | ||
521 | 379 | 29655|_("Tejat Prior") | ||
522 | 380 | 29655|_("Praepes") | ||
523 | 381 | 30343|_("Tejat") 1,2,11 | ||
524 | 382 | 30343|_("Tejat Posterior") | ||
525 | 383 | 30343|_("Calx") | ||
526 | 384 | 32362|_("Al Zirr") 2,5,10,11 | ||
527 | 102 | 32362|_("Alzirr") | 385 | 32362|_("Alzirr") |
626 | 103 | 33579|_("Adhara") | 386 | 30883|_("Nucatai") 11 |
627 | 104 | 34045|_("Muliphein") | 387 | # Grus (Gru) |
628 | 105 | 34088|_("Mekbuda") | 388 | 109268|_("Alnair") 1,2,6,11 |
629 | 106 | 34444|_("Wezen") | 389 | 109268|_("Al Na'ir") |
630 | 107 | 35264|_("Tureis") | 390 | 108085|_("Al Dhanab") 2,11 |
631 | 108 | 35488|_("Bernes 135") | 391 | 108085|_("Deneb Hut") |
632 | 109 | 35550|_("Wasat") | 392 | 112122|_("Deneb Alnahr") 11 |
633 | 110 | 35904|_("Aludra") | 393 | # Hercules (Her) |
634 | 111 | 36188|_("Gomeisa") | 394 | 84345|_("Rasalgethi") 1,2,6,11 |
635 | 112 | 36208|_("Luyten's Star") | 395 | 84345|_("Ras Algethi") |
636 | 113 | 36850|_("Castor") | 396 | 80816|_("Kornephoros") 1,2,6,11 |
637 | 114 | 37229|_("Markeb") | 397 | 80816|_("Rutilicus") |
638 | 115 | 37279|_("Procyon") | 398 | 79043|_("Marsic") 1,2,5,11 |
639 | 116 | 37826|_("Pollux") | 399 | 79043|_("Marfik") |
640 | 117 | 38170|_("Asmidiske") | 400 | 85693|_("Maasym") 1,2,11 |
641 | 118 | 39429|_("Naos") | 401 | 85693|_("Masym") |
642 | 119 | 39953|_("Regor") | 402 | 80463|_("Cujam") 1,2,11 |
643 | 120 | 40167|_("Tegmine") | 403 | 84379|_("Sarin") 1,11 |
644 | 121 | 40526|_("Tarf") | 404 | 80838|_("Ogma") 4,6 |
645 | 122 | 41037|_("Avior") | 405 | 80170|_("Nasak Shamiya III") 11 |
646 | 123 | 41075|_("Alsciaukat") | 406 | # Hydra (Hya) |
647 | 124 | 41704|_("Muscida") | 407 | 46390|_("Alphard") 1,2,6,11 |
648 | 125 | 42402|_("Minchir") | 408 | 46982|_("Ukdah III") 11 |
649 | 126 | 42806|_("Asellus Borealis") | 409 | 42313|_("Minazal I") 11 |
650 | 127 | 42911|_("Asellus Australis") | 410 | 43109|_("Minazal III") 11 |
651 | 128 | 43813|_("Hydrobius") | 411 | 43813|_("Minazal V") 11 |
652 | 129 | 44066|_("Acubens") | 412 | 42799|_("Minazal II") 11 |
653 | 130 | 44127|_("Talitha") | 413 | 47431|_("Ukdah IV") 11 |
654 | 131 | 44816|_("Suhail") | 414 | 47452|_("Al Sharasif I") 11 |
655 | 132 | 45238|_("Miaplacidus") | 415 | 43234|_("Minazal IV") 11 |
656 | 133 | 45556|_("Aspidiske") | 416 | 42402|_("Minkalshuja") 11 |
657 | 134 | 46390|_("Alphard") | 417 | 46509|_("Ukdah I") 11 |
658 | 135 | 46750|_("Alterf") | 418 | 46776|_("Ukdah II") 11 |
659 | 136 | 47508|_("Subra") | 419 | # Indus (Ind) |
660 | 137 | 47908|_("Algenubi") | 420 | 101772|_("Persian") 2,5 |
661 | 138 | 48455|_("Rasalas") | 421 | # Lacerta (Lac) |
662 | 139 | 48774|_("Tseen Ke") | 422 | 112247|_("Babcock's Star") 3 |
663 | 140 | 49669|_("Regulus") | 423 | # Leo (Leo) |
664 | 141 | 49583|_("Al'dzhabkhakh") | 424 | 49669|_("Regulus") 1,2,6,11 |
665 | 142 | 50335|_("Adhafera") | 425 | 57632|_("Denebola") 1,2,6,11 |
666 | 143 | 50372|_("Tania Borealis") | 426 | 50583|_("Algieba") 1,2,6,11 |
667 | 144 | 50583|_("Algieba") | 427 | 54872|_("Zosma") 1,2,6,11 |
668 | 145 | 50801|_("Tania Australis") | 428 | 54872|_("Duhr") |
669 | 146 | 53229|_("Praecipua") | 429 | 50335|_("Adhafera") 1,2,6,11 |
670 | 147 | 53740|_("Alkes") | 430 | 54879|_("Chertan") 1,2,6,11 |
671 | 148 | 53910|_("Merak") | 431 | 54879|_("Al Haratan") |
672 | 149 | 54061|_("Dubhe") | 432 | 54879|_("Coxa") |
673 | 150 | 54872|_("Zosma") | 433 | 46750|_("Alterf") 1,2,11 |
674 | 151 | 54879|_("Chertan") | 434 | 48455|_("Rasalas") 1,2,11 |
675 | 152 | 55042|_("Innes' Star") | 435 | 48455|_("Alshemali") |
676 | 153 | 55203|_("Alula Australis") | 436 | 47508|_("Subra") 1,11 |
677 | 154 | 55219|_("Alula Borealis") | 437 | 47908|_("Algenubi") 2,11 |
678 | 155 | 55282|_("Labr") | 438 | 46146|_("Al Minlear al Asad") 5,11 |
679 | 156 | 56211|_("Giausar") | 439 | 46146|_("Minkarasad") |
680 | 157 | 56709|_("Przybylski's Star") | 440 | 54951|_("Zubrah") 11 |
681 | 158 | 57399|_("Alkaphrah") | 441 | 49583|_("Al Jabhah") 11 |
682 | 159 | 57632|_("Denebola") | 442 | # Leo Minor (LMi) |
683 | 160 | 57757|_("Zavijava") | 443 | 53229|_("Praecipua") 5,10 |
684 | 161 | 58001|_("Phad") | 444 | # Lepus (Lep) |
685 | 162 | 59199|_("Alchiba") | 445 | 25985|_("Arneb") 1,2,6,11 |
686 | 163 | 59316|_("Minkar") | 446 | 25606|_("Nihal") 1,2,6,11 |
687 | 164 | 59774|_("Megrez") | 447 | 23203|_("Hind's Crimson Star") 2,5,11 |
688 | 165 | 59803|_("Gienah") | 448 | 27072|_("Kursi al Jabbar") 11 |
689 | 166 | 60129|_("Zaniah") | 449 | 27654|_("Arsh al Jauzah") 11 |
690 | 167 | 60718|_("Acrux") | 450 | # Libra (Lib) |
691 | 168 | 60965|_("Algorab") | 451 | 72603|_("Zubenelgenubi I") 1,2,6,11 |
594 | 169 | 61084|_("Gacrux") | ||
595 | 170 | 61317|_("Chara") | ||
596 | 171 | 61359|_("Kraz") | ||
597 | 172 | 61941|_("Porrima") | ||
598 | 173 | 62223|_("La Superba") | ||
599 | 174 | 62434|_("Mimosa") | ||
600 | 175 | 62956|_("Alioth") | ||
601 | 176 | 63090|_("Auva") | ||
602 | 177 | 63125|_("Cor Caroli") | ||
603 | 178 | 63608|_("Vindemiatrix") | ||
604 | 179 | 64241|_("Diadem") | ||
605 | 180 | 65378|_("Mizar") | ||
606 | 181 | 65474|_("Spica") | ||
607 | 182 | 65477|_("Alcor") | ||
608 | 183 | 66249|_("Heze") | ||
609 | 184 | 67301|_("Alkaid") | ||
610 | 185 | 67927|_("Muphrid") | ||
611 | 186 | 68702|_("Hadar") | ||
612 | 187 | 68756|_("Thuban") | ||
613 | 188 | 68933|_("Menkent") | ||
614 | 189 | 69673|_("Arcturus") | ||
615 | 190 | 69483|_("Asellus Tertius") | ||
616 | 191 | 69701|_("Syrma") | ||
617 | 192 | 69713|_("Asellus Secundus") | ||
618 | 193 | 69974|_("Khambaliya") | ||
619 | 194 | 70497|_("Asellus Primus") | ||
620 | 195 | 70890|_("Proxima") | ||
621 | 196 | 71075|_("Seginus") | ||
622 | 197 | 71683|_("Rigil Kent") | ||
623 | 198 | 71957|_("Rijl al Awwa") | ||
624 | 199 | 72105|_("Izar") | ||
625 | 200 | 72487|_("Merga") | ||
692 | 201 | 72603|_("Zubenelgenubi") | 452 | 72603|_("Zubenelgenubi") |
694 | 202 | 72607|_("Kochab") | 453 | 72622|_("Zubenelgenubi II") 1,2,6,11 |
695 | 203 | 72622|_("Zubenelgenubi") | 454 | 72622|_("Zubenelgenubi") |
719 | 204 | 73473|_("Zuben Elakribi") | 455 | 74785|_("Zubeneschamali") 1,2,6,11 |
720 | 205 | 73555|_("Nekkar") | 456 | 73714|_("Brachium") 3,11 |
721 | 206 | 73714|_("Brachium") | 457 | 73714|_("Zuben Acrabi") |
722 | 207 | 73945|_("Zuben Hakrabi") | 458 | 73473|_("Zuben Elakribi") 10 |
723 | 208 | 74666|_("Printseps") | 459 | 76333|_("Zuben Elakrab") 10 |
724 | 209 | 74785|_("Zubeneschamali") | 460 | 76333|_("Zuben Hakraki") |
725 | 210 | 74793|_("Pherkad Minor") | 461 | 73945|_("Zuben Hakrabi") 11 |
726 | 211 | 75097|_("Pherkad") | 462 | # Lynx (Lyn) |
727 | 212 | 75411|_("Alkalurops") | 463 | 41075|_("Alsciaukat") 3,5,10,11 |
728 | 213 | 75415|_("Inkalunis") | 464 | 41075|_("Mabsuthat") |
729 | 214 | 75458|_("Edasich") | 465 | 41075|_("Shaukah") |
730 | 215 | 75695|_("Nusakan") | 466 | 33485|_("Dolones X") 11 |
731 | 216 | 76267|_("Alphekka") | 467 | # Lyra (Lyr) |
732 | 217 | 76333|_("Zuben Elakrab") | 468 | 91262|_("Vega") 1,2,6,11 |
733 | 218 | 76534|_("Ceginus") | 469 | 92420|_("Sheliak") 1,2,6,11 |
734 | 219 | 77070|_("Unukalhai") | 470 | 93194|_("Sulafat") 1,2,6,11 |
735 | 220 | 78401|_("Dschubba") | 471 | 93194|_("Jugum") |
736 | 221 | 78727|_("Graffias") | 472 | 94481|_("Aladfar") 2,5,11 |
737 | 222 | 78820|_("Acrab") | 473 | 90191|_("Al Athfar") 2,3,5,10,11 |
738 | 223 | 79043|_("Marsik") | 474 | 90191|_("Alathfar") |
739 | 224 | 79374|_("Jabbah") | 475 | 90191|_("Athfar") |
740 | 225 | 79593|_("Yed Prior") | 476 | 91919|_("Double Double I") 10,11 |
741 | 226 | 79882|_("Yed Posterior") | 477 | 91926|_("Double Double II") 10,11 |
742 | 478 | 91971|_("Nasr Alwaki I") 11 | ||
743 | 479 | 91973|_("Nasr Alwaki II") 11 | ||
744 | 480 | # Monoceros (Mon) | ||
745 | 481 | 31646|_("Plaskett's Star") 3,5 | ||
746 | 482 | 30089|_("Red Rectangle") 3 | ||
747 | 483 | # Octanus (Oct) | ||
748 | 484 | 104382|_("Polaris Australis") 5 | ||
749 | 485 | # Ophiuchus (Oph) | ||
750 | 486 | 86032|_("Rasalhague") 1,2,6,11 | ||
751 | 487 | 86742|_("Cebalrai") 1,2,6,11 | ||
752 | 488 | 79593|_("Yed Prior") 1,2,11 | ||
753 | 489 | 79882|_("Yed Posterior") 1,2,11 | ||
754 | 490 | 84012|_("Sabik") 1,2,6,11 | ||
755 | 491 | 80883|_("Marfik") 1,2,5,11 | ||
756 | 492 | 87108|_("Muliphen") 2,5,11 | ||
757 | 493 | 87937|_("Barnard's Star") 3 | ||
758 | 494 | 81377|_("Saik") 11 | ||
759 | 495 | 84970|_("Garafsa") 11 | ||
760 | 496 | 84893|_("Aggia") 11 | ||
761 | 497 | # Orion (Ori) | ||
762 | 498 | 27989|_("Betelgeuse") 1,2,6,11 | ||
763 | 499 | 24436|_("Rigel") 1,2,6,11 | ||
764 | 500 | 25336|_("Bellatrix") 1,2,6,11 | ||
765 | 501 | 25930|_("Mintaka") 1,2,6,11 | ||
766 | 502 | 26311|_("Alnilam") 1,2,6,11 | ||
767 | 503 | 26727|_("Alnitak") 1,2,6,11 | ||
768 | 504 | 27366|_("Saiph") 1,2,6,11 | ||
769 | 505 | 26207|_("Meissa") 1,2,6,11 | ||
770 | 506 | 26207|_("Heka") | ||
771 | 507 | 26241|_("Hatysa") 1,3,11 | ||
772 | 508 | 25923|_("Thabit") 2,10,11 | ||
773 | 509 | 22449|_("Tabit") 3,10,11 | ||
774 | 510 | 26237|_("Mizan Batil I") 11 | ||
775 | 511 | 26563|_("Mizan Batil III") 11 | ||
776 | 512 | 22833|_("Manica") 11 | ||
777 | 513 | 25281|_("Saif al Jabbar") 11 | ||
778 | 514 | 26220|_("Trapezium") 11 | ||
779 | 515 | 26235|_("Mizan Batil II") 11 | ||
780 | 516 | 22667|_("Al Kumm I") 11 | ||
781 | 517 | 22957|_("Al Kumm II") 11 | ||
782 | 518 | 22845|_("Al Taj IV") 11 | ||
783 | 519 | 22509|_("Al Taj I") 11 | ||
784 | 520 | 22549|_("Al Taj II") 11 | ||
785 | 521 | 22797|_("Al Taj III") 11 | ||
786 | 522 | 23123|_("Al Taj V") 11 | ||
787 | 523 | 26176|_("Heka") 11 | ||
788 | 524 | # Pavo (Pav) | ||
789 | 525 | 100751|_("Peacock") 1,6,11 | ||
790 | 526 | # Pegasus (Peg) | ||
791 | 527 | 113963|_("Markab") 1,2,6,11 | ||
792 | 528 | 113963|_("Yed Alpheras") | ||
793 | 529 | 113881|_("Scheat") 1,2,6,11 | ||
794 | 530 | 1067|_("Algenib") 1,2,6,11 | ||
795 | 531 | 107315|_("Enif") 1,2,6,11 | ||
796 | 532 | 112029|_("Homam") 1,2,3,5,6,10,11 | ||
797 | 533 | 112158|_("Matar") 1,2,6,11 | ||
798 | 534 | 109427|_("Biham") 1,2,6,11 | ||
799 | 535 | 112748|_("Sadalbari") 1,2,6,11 | ||
800 | 536 | 112748|_("Sa'd al Bari'") | ||
801 | 537 | 115250|_("Al Karab") 2 | ||
802 | 538 | 115250|_("Salma") | ||
803 | 539 | 113357|_("Helvetios") 4,6 | ||
804 | 540 | 112440|_("Sadalnazi") 11 | ||
805 | 541 | 109068|_("Fum al Faras") 11 | ||
806 | 542 | 112447|_("Suudalnujum") 11 | ||
807 | 543 | 112051|_("Sadalmatar") 11 | ||
808 | 544 | # Perseus (Per) | ||
809 | 545 | 15863|_("Mirfak") 1,2,6,11 | ||
810 | 546 | 15863|_("Algenib") | ||
811 | 547 | 14576|_("Algol") 1,2,6,11 | ||
812 | 548 | 14576|_("Gorgonea Prima") | ||
813 | 549 | 18614|_("Menkib") 1,2,11 | ||
814 | 550 | 17448|_("Ati") 1,2,11 | ||
815 | 551 | 17448|_("Atik") | ||
816 | 552 | 17448|_("Alatik") | ||
817 | 553 | 18246|_("Atik") 1,2,11 | ||
818 | 554 | 13879|_("Gorgonea Secunda") 2,5,11 | ||
819 | 555 | 14354|_("Gorgonea Tertia") 2,5,11 | ||
820 | 556 | 14817|_("Gorgonea Quarta") 2,11 | ||
821 | 557 | 13268|_("Miram") 10,11 | ||
822 | 558 | 14668|_("Misam") 3,11 | ||
823 | 559 | 10729|_("Misam al Thurayya I") 11 | ||
824 | 560 | # Phoenix (Phe) | ||
825 | 561 | 2081|_("Ankaa") 1,6,11 | ||
826 | 562 | 2081|_("Nair al Zaurak") | ||
827 | 563 | 5165|_("Alrial III") 11 | ||
828 | 564 | 6867|_("Alrial V") 11 | ||
829 | 565 | 2071|_("Alrial I") 11 | ||
830 | 566 | 3245|_("Alrial II") 11 | ||
831 | 567 | 5862|_("Alrial IV") 11 | ||
832 | 568 | # Pictor (Pic) | ||
833 | 569 | 24186|_("Kapteyn's Star") 3,11 | ||
834 | 570 | # Pisces (Psc) | ||
835 | 571 | 9487|_("Alrescha") 1,2,5,6,10,11 | ||
836 | 572 | 9487|_("Al Rescha") | ||
837 | 573 | 9487|_("Alrischa") | ||
838 | 574 | 3829|_("van Maanen's Star") 3 | ||
839 | 575 | 3829|_("van Maanen 2") | ||
840 | 576 | 8198|_("Torcularis Septentrionalis") 2,10,11 | ||
841 | 577 | 8198|_("Torcular") | ||
842 | 578 | 7097|_("Kullat Nunu") 2 | ||
843 | 579 | 113889|_("Fum al Samakah") 5,10,11 | ||
844 | 580 | 3786|_("Kuton I") 11 | ||
845 | 581 | 5737|_("Kuton II") 11 | ||
846 | 582 | 5743|_("Kuton III") 11 | ||
847 | 583 | # Piscis Austrinus (PsA) | ||
848 | 584 | 113368|_("Fomalhaut") 1,2,6,11 | ||
849 | 585 | 113368|_("Thalim") | ||
850 | 586 | 111188|_("Fum al Hui") 11 | ||
851 | 587 | # Puppis (Pup) | ||
852 | 588 | 39429|_("Naos") 1,6,11 | ||
853 | 589 | 39757|_("Tureis") 1,5 | ||
854 | 590 | 35488|_("Bernes 135") 3 | ||
855 | 591 | 38170|_("Asmidiske") 3,5,11 | ||
856 | 592 | # Sagitta (Sge) | ||
857 | 593 | 96757|_("Sham") 1,5,11 | ||
858 | 594 | # Sagittarius (Sgr) | ||
859 | 595 | 95347|_("Rukbat") 1,2,6,11 | ||
860 | 596 | 95347|_("Alrami") | ||
861 | 597 | 95241|_("Arkab") 1,2,5,11 | ||
862 | 598 | 95241|_("Arkab Prior") | ||
863 | 599 | 95294|_("Arkab Posterior") 2,5,11 | ||
864 | 600 | 88635|_("Alnasl") 1,2,5,6,10,11 | ||
865 | 601 | 88635|_("Nushaba") | ||
866 | 602 | 88635|_("Al Nasl") | ||
867 | 603 | 88635|_("Nash") | ||
868 | 604 | 89931|_("Kaus Media") 1,2,5,6,11 | ||
869 | 605 | 89931|_("Kaus Meridionalis") | ||
870 | 606 | 90185|_("Kaus Australis") 1,2,5,6,11 | ||
871 | 607 | 93506|_("Ascella") 1,2,11 | ||
872 | 608 | 90496|_("Kaus Borealis") 1,2,5,6,11 | ||
873 | 609 | 90496|_("Al Thalimain") 2 | ||
874 | 610 | 92855|_("Nunki") 1,2,6,11 | ||
875 | 611 | 89341|_("Polis") 2,5,11 | ||
876 | 612 | 89341|_("Al Thalimain") | ||
877 | 613 | 89341|_("Alnam") | ||
878 | 614 | 94141|_("Albaldah") 3,10,11 | ||
879 | 615 | 94141|_("Al Baldah") | ||
880 | 616 | 98066|_("Terebellum I") 10,11 | ||
881 | 617 | 98162|_("Terebellum II") 10,11 | ||
882 | 618 | 98353|_("Terebellum III") 10,11 | ||
883 | 619 | 98688|_("Terebellum IV") 10,11 | ||
884 | 620 | 89642|_("Hamalwarid") 11 | ||
885 | 621 | 92761|_("Ain al Rami I") 11 | ||
886 | 622 | 92845|_("Ain al Rami II") 11 | ||
887 | 623 | 93864|_("Namalsadirah II") 11 | ||
888 | 624 | 92041|_("Namalsadirah I") 11 | ||
889 | 625 | 95477|_("Namalsadirah III") 11 | ||
890 | 626 | 95503|_("Namalsadirah IV") 11 | ||
891 | 627 | 94643|_("Al Kiladah") 11 | ||
892 | 628 | # Scorpius (Sco) | ||
893 | 629 | 80763|_("Antares") 1,2,6,11 | ||
894 | 630 | 78820|_("Acrab") 1,2,5,6,10,11 | ||
895 | 631 | 78820|_("Graffias") | ||
896 | 632 | 78401|_("Dschubba") 1,2,6,11 | ||
897 | 633 | 86228|_("Sargas") 1,6,11 | ||
898 | 634 | 86228|_("Girtab") | ||
899 | 635 | 85927|_("Shaula") 1,2,6,11 | ||
900 | 636 | 80112|_("Alniyat I") 1,2,5,10,11 | ||
901 | 227 | 80112|_("Al Niyat") | 637 | 80112|_("Al Niyat") |
1014 | 228 | 80463|_("Cujam") | 638 | 81266|_("Alniyat II") 2,5,10,11 |
1015 | 229 | 80763|_("Antares") | 639 | 81266|_("Al Niyat") |
1016 | 230 | 80816|_("Kornephoros") | 640 | 85696|_("Lesath") 1,2,6,11 |
1017 | 231 | 80883|_("Marfik") | 641 | 79374|_("Jabbah") 2,11 |
1018 | 232 | 81266|_("Alniyat") | 642 | 78727|_("Grafias") 10,11 |
1019 | 233 | 81377|_("Han") | 643 | 78727|_("Grassias") |
1020 | 234 | 82273|_("Atria") | 644 | 87073|_("Girtab") 11 |
1021 | 235 | 82729|_("Grafias") | 645 | 87294|_("Vanant") 11 |
1022 | 236 | 83608|_("Arrakis") | 646 | 86670|_("Mula") 11 |
1023 | 237 | 83895|_("Aldhibah") | 647 | 82514|_("Tali al Shaulah I") 11 |
1024 | 238 | 84012|_("Sabik") | 648 | 82545|_("Tali al Shaulah II") 11 |
1025 | 239 | 84345|_("Rasalgethi") | 649 | 78265|_("Nur") 11 |
1026 | 240 | 84379|_("Sarin") | 650 | 78104|_("Iolil") 11 |
1027 | 241 | 85670|_("Rastaban") | 651 | 78933|_("Jabhat Acrabi I") 11 |
1028 | 242 | 85693|_("Maasym") | 652 | 78990|_("Jabhat Acrabi II") 11 |
1029 | 243 | 85696|_("Lesath") | 653 | # Serpens (Ser) |
1030 | 244 | 85819|_("Kuma") | 654 | 77070|_("Unukalhai") 1,2,6,11 |
1031 | 245 | 85822|_("Yildun") | 655 | 92946|_("Alya") 1,2,6,11 |
1032 | 246 | 85927|_("Shaula") | 656 | 77233|_("Nasak Shamiya I") 11 |
1033 | 247 | 86032|_("Rasalhague") | 657 | 78072|_("Nasak Shamiya II") 11 |
1034 | 248 | 86228|_("Sargas") | 658 | 76276|_("Nasak Yamani I") 11 |
1035 | 249 | 86614|_("Dziban") | 659 | 77622|_("Nasak Yamani II") 11 |
1036 | 250 | 86742|_("Cebalrai") | 660 | # Taurus (Tau) |
1037 | 251 | 87585|_("Grumium") | 661 | 21421|_("Aldebaran") 1,2,6,11 |
1038 | 252 | 87833|_("Etamin") | 662 | 25428|_("Elnath") 1,2,3,6,11 |
1039 | 253 | 87937|_("Barnard's Star") | 663 | 25428|_("El Nath") |
1040 | 254 | 88048|_("Sinistra") | 664 | 20889|_("Ain") 1,2,6,11 |
1041 | 255 | 88567|_("Nash") | 665 | 20889|_("Oculus Boreus") |
1042 | 256 | 88635|_("Alnasl") | 666 | 17702|_("Alcyone") 1,2,6,11 |
1043 | 257 | 89341|_("Polis") | 667 | 17489|_("Celaeno") 1,2,6,11 |
1044 | 258 | 89931|_("Kaus Media") | 668 | 17499|_("Electra") 1,2,6,11 |
1045 | 259 | 90185|_("Kaus Australis") | 669 | 17531|_("Taygeta") 1,2,6,11 |
1046 | 260 | 90191|_("Alathfar") | 670 | 17573|_("Maia") 1,2,6,11 |
1047 | 261 | 90496|_("Kaus Borealis") | 671 | 17579|_("Asterope") 1,2,6,11 |
1048 | 262 | 91262|_("Vega") | 672 | 17579|_("Sterope I") |
1049 | 263 | 92420|_("Sheliak") | 673 | 17608|_("Merope") 1,2,6,11 |
1050 | 264 | 92855|_("Nunki") | 674 | 17847|_("Atlas") 1,2,6,11 |
1051 | 265 | 92946|_("Alya") | 675 | 17851|_("Pleione") 1,2,6,11 |
1052 | 266 | 93194|_("Sulafat") | 676 | 20205|_("Hyadum I") 2,11 |
1053 | 267 | 93506|_("Ascella") | 677 | 20205|_("Prima Hyadum") |
1054 | 268 | 93683|_("Manubrij") | 678 | 20455|_("Hyadum II") 2,11 |
1055 | 269 | 93747|_("Deneb el Okab") | 679 | 25945|_("The Ruby Star") |
1056 | 270 | 93805|_("Al Thalimain Prior") | 680 | 17588|_("Sterope II") 11 |
1057 | 271 | 94114|_("Alphekka Meridiana") | 681 | 20885|_("Hyadum III") 11 |
1058 | 272 | 94141|_("Albaldah") | 682 | 20894|_("Hyadum IV") 11 |
1059 | 273 | 94376|_("Altais") | 683 | 20635|_("Alkalbain III") 11 |
1060 | 274 | 95241|_("Arkab") | 684 | 20641|_("Alkalbain IV") 11 |
1061 | 275 | 95347|_("Rukbat") | 685 | 20711|_("Alkalbain V") 11 |
1062 | 276 | 95501|_("Deneb Okab") | 686 | 20250|_("Alkalbain I") 11 |
1063 | 277 | 95771|_("Lukida") | 687 | 20430|_("Alkalbain II") 11 |
1064 | 278 | 95947|_("Albireo") | 688 | # Triangulum (Tri) |
1065 | 279 | 96100|_("Alsafi") | 689 | 8796|_("Mothallah") 1,6,11 |
1066 | 280 | 96295|_("Campbell's Star") | 690 | 8796|_("Caput Trianguli") |
1067 | 281 | 96468|_("Al Thalimain") | 691 | 10064|_("Mizan") 11 |
1068 | 282 | 96757|_("Sham") | 692 | # Triangulum Australe (TrA) |
1069 | 283 | 97165|_("Rukh") | 693 | 82273|_("Atria") 1,6,11 |
1070 | 284 | 97278|_("Tarazed") | 694 | # Ursa Major (UMa) |
1071 | 285 | 97433|_("Tyl") | 695 | 54061|_("Dubhe") 1,2,6,11 |
1072 | 286 | 97649|_("Altair") | 696 | 53910|_("Merak") 1,2,6,11 |
1073 | 287 | 98036|_("Alshain") | 697 | 58001|_("Phecda") 1,2,6,11 |
1074 | 288 | 98066|_("Terebellum I") | 698 | 58001|_("Phad") |
1075 | 289 | 98162|_("Terebellum II") | 699 | 59774|_("Megrez") 1,2,6,11 |
1076 | 290 | 98353|_("Terebellum III") | 700 | 59774|_("Kaffa") |
1077 | 291 | 98688|_("Terebellum IV") | 701 | 62956|_("Alioth") 1,2,6,11 |
1078 | 292 | 100027|_("Algedi") | 702 | 65378|_("Mizar") 1,2,6,11 |
1079 | 293 | 100310|_("Alshat") | 703 | 67301|_("Alkaid") 1,2,6,11 |
1080 | 294 | 100345|_("Dabih") | 704 | 67301|_("Benetnasch") |
1081 | 295 | 100453|_("Sadr") | 705 | 44127|_("Talitha") 1,2,6,11 |
1082 | 296 | 100751|_("Peacock") | 706 | 50372|_("Tania Borealis") 1,2,6,11 |
1083 | 297 | 100881|_("Okul") | 707 | 50801|_("Tania Australis") 1,2,6,11 |
1084 | 298 | 101421|_("Deneb Dulfim") | 708 | 55219|_("Alula Borealis") 1,2,6,11 |
1085 | 299 | 101769|_("Rotanev") | 709 | 55203|_("Alula Australis") 1,2,6,11 |
1086 | 300 | 101958|_("Sualocin") | 710 | 41704|_("Muscida") 1,2,6,11 |
1087 | 301 | 102098|_("Deneb") | 711 | 65477|_("Alcor") 1,2,6,11 |
1088 | 302 | 102488|_("Gienah") | 712 | 57939|_("Groombridge 1830") 2,11 |
1089 | 303 | 102618|_("Albali") | 713 | 57939|_("Flying Star") |
1090 | 304 | 104019|_("Armus") | 714 | 57939|_("Runaway Star") |
1091 | 305 | 104214|_("Bessel's Star") | 715 | 46471|_("Intercrus") 4,6 |
1092 | 306 | 104382|_("Polaris Australis") | 716 | 53721|_("Chalawan") 4,6 |
1093 | 307 | 104987|_("Kitalpha") | 717 | 57399|_("Al Kaphrah") 3,5,11 |
1094 | 308 | 105199|_("Alderamin") | 718 | 57399|_("Alkafzah") |
1095 | 309 | 106032|_("Alfirk") | 719 | 14590|_("Althiba I") 11 |
1096 | 310 | 106278|_("Sadalsuud") | 720 | 46977|_("Althiba VII") 11 |
1097 | 311 | 106723|_("Castra") | 721 | 45493|_("Alhaud III") 11 |
1098 | 312 | 106985|_("Nashira") | 722 | 44901|_("Alhaud I") 11 |
1099 | 313 | 107136|_("Azelfafage") | 723 | 46733|_("Alhaud IV") 11 |
1100 | 314 | 107259|_("The Garnet Star") | 724 | 46853|_("Alhaud V") 11 |
1101 | 315 | 107315|_("Enif") | 725 | 44471|_("Kafzatania") 11 |
1102 | 316 | 107354|_("Jih") | 726 | 42438|_("Althiba II") 11 |
1103 | 317 | 107533|_("Pennae Caudalis") | 727 | 42527|_("Althiba III") 11 |
1104 | 318 | 107556|_("Deneb Algedi") | 728 | 44390|_("Althiba IV") 11 |
1105 | 319 | 108085|_("Al Dhanab") | 729 | 44857|_("Althiba V") 11 |
1106 | 320 | 108917|_("Kurhah") | 730 | 45038|_("Althiba VI") 11 |
1107 | 321 | 109074|_("Sadalmelik") | 731 | 45075|_("Alhaud II") 11 |
1108 | 322 | 109268|_("Alnair") | 732 | 48319|_("Alhaud VI") 11 |
1109 | 323 | 109427|_("Biham") | 733 | 48402|_("Alhaud VII") 11 |
1110 | 324 | 110003|_("Ancha") | 734 | # Ursa Minor (UMi) |
1111 | 325 | 110395|_("Sadachbia") | 735 | 11767|_("Polaris") 1,2,6,11 |
1112 | 326 | 110893|_("Kruger 60") | 736 | 11767|_("Alrucaba") |
1113 | 327 | 110960|_("Sadaltager") | 737 | 11767|_("Cinosura") |
1114 | 328 | 111056|_("Al Kalb al Rai") | 738 | 72607|_("Kochab") 1,2,6,11 |
1115 | 329 | 111710|_("Situla") | 739 | 75097|_("Pherkad") 1,2,6,11 |
1116 | 330 | 112029|_("Homan") | 740 | 75097|_("Pherkad Major") |
1117 | 331 | 112158|_("Matar") | 741 | 74793|_("Pherkad Minor") 2,10,11 |
1118 | 332 | 112247|_("Babcock's Star") | 742 | 85822|_("Yildun") 1,2,6,11 |
1119 | 333 | 112748|_("Sadalbari") | 743 | 82080|_("Circitores") 11 |
1120 | 334 | 113136|_("Skat") | 744 | 77055|_("Akfa Farkadain") 11 |
1121 | 335 | 113368|_("Fomalhaut") | 745 | 79822|_("Anwa Farkadain") 11 |
1122 | 336 | 113881|_("Scheat") | 746 | # Vela (Vel) |
1123 | 337 | 113889|_("Fum al Samakah") | 747 | 39953|_("Regor") 1,11 |
1124 | 338 | 113963|_("Markab") | 748 | 45941|_("Markeb") 1,11 |
1125 | 339 | 116727|_("Errai") | 749 | 44816|_("Suhail") 1,6,11 |
1126 | 750 | # Virgo (Vir) | ||
1127 | 751 | 65474|_("Spica") 1,2,6,11 | ||
1128 | 752 | 65474|_("Azimech") | ||
1129 | 753 | 57757|_("Zavijava") 1,2,6,11 | ||
1130 | 754 | 61941|_("Porrima") 1,2,6,11 | ||
1131 | 755 | 61941|_("Antevorta") | ||
1132 | 756 | 63608|_("Vindemiatrix") 1,2,6,11 | ||
1133 | 757 | 63608|_("Almuredin") | ||
1134 | 758 | 60129|_("Zaniah") 1,2,11 | ||
1135 | 759 | 69701|_("Syrma") 1,2,11 | ||
1136 | 760 | 61941|_("Arich") 1 | ||
1137 | 761 | 66249|_("Heze") 1,11 | ||
1138 | 762 | 63090|_("Minelauva") 3,10,11 | ||
1139 | 763 | 63090|_("Auva") | ||
1140 | 764 | 69974|_("Khambaliya") 3,11 | ||
1141 | 765 | 69974|_("Kambalia") | ||
1142 | 766 | 71957|_("Rijl al Awwa") 5,10,11 | ||
1143 | 767 | 71957|_("Rigilawwa") | ||
1144 | 768 | 69427|_("Algafar I") 11 | ||
1145 | 769 | 70755|_("Algafar II") 11 | ||
1146 | 770 | # Vulpecula (Vul) | ||
1147 | 771 | 95771|_("Anser") 3,5,10,11 | ||
1148 | 340 | 772 | ||
1149 | === modified file 'src/core/StelSkyCultureMgr.cpp' | |||
1150 | --- src/core/StelSkyCultureMgr.cpp 2016-06-03 17:40:43 +0000 | |||
1151 | +++ src/core/StelSkyCultureMgr.cpp 2016-09-14 16:38:20 +0000 | |||
1152 | @@ -49,7 +49,7 @@ | |||
1153 | 49 | } | 49 | } |
1154 | 50 | QSettings pd(pdFile, StelIniFormat); | 50 | QSettings pd(pdFile, StelIniFormat); |
1155 | 51 | dirToNameEnglish[dir].englishName = pd.value("info/name").toString(); | 51 | dirToNameEnglish[dir].englishName = pd.value("info/name").toString(); |
1157 | 52 | dirToNameEnglish[dir].author = pd.value("info/author").toString(); | 52 | dirToNameEnglish[dir].author = pd.value("info/author").toString(); |
1158 | 53 | } | 53 | } |
1159 | 54 | } | 54 | } |
1160 | 55 | 55 | ||
1161 | @@ -104,9 +104,20 @@ | |||
1162 | 104 | return true; | 104 | return true; |
1163 | 105 | } | 105 | } |
1164 | 106 | 106 | ||
1168 | 107 | QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const {return q_(currentSkyCulture.englishName);} | 107 | QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const |
1169 | 108 | 108 | { | |
1170 | 109 | QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const {return currentSkyCulture.englishName;} | 109 | return q_(currentSkyCulture.englishName); |
1171 | 110 | } | ||
1172 | 111 | |||
1173 | 112 | QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const | ||
1174 | 113 | { | ||
1175 | 114 | return currentSkyCulture.englishName; | ||
1176 | 115 | } | ||
1177 | 116 | |||
1178 | 117 | bool StelSkyCultureMgr::setCurrentSkyCultureNameI18(const QString& cultureName) | ||
1179 | 118 | { | ||
1180 | 119 | return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName)); | ||
1181 | 120 | } | ||
1182 | 110 | 121 | ||
1183 | 111 | //! returns newline delimited list of human readable culture names in english | 122 | //! returns newline delimited list of human readable culture names in english |
1184 | 112 | QString StelSkyCultureMgr::getSkyCultureListEnglish(void) | 123 | QString StelSkyCultureMgr::getSkyCultureListEnglish(void) |
1185 | 113 | 124 | ||
1186 | === modified file 'src/core/StelSkyCultureMgr.hpp' | |||
1187 | --- src/core/StelSkyCultureMgr.hpp 2016-05-09 16:33:06 +0000 | |||
1188 | +++ src/core/StelSkyCultureMgr.hpp 2016-09-14 16:38:20 +0000 | |||
1189 | @@ -71,7 +71,7 @@ | |||
1190 | 71 | QString getCurrentSkyCultureNameI18() const; | 71 | QString getCurrentSkyCultureNameI18() const; |
1191 | 72 | //! Set the sky culture from i18n name. | 72 | //! Set the sky culture from i18n name. |
1192 | 73 | //! @return true on success; false and doesn't change if skyculture is invalid. | 73 | //! @return true on success; false and doesn't change if skyculture is invalid. |
1194 | 74 | bool setCurrentSkyCultureNameI18(const QString& cultureName) {return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName));} | 74 | bool setCurrentSkyCultureNameI18(const QString& cultureName); |
1195 | 75 | 75 | ||
1196 | 76 | //! Get the current sky culture ID. | 76 | //! Get the current sky culture ID. |
1197 | 77 | QString getCurrentSkyCultureID() const {return currentSkyCultureDir;} | 77 | QString getCurrentSkyCultureID() const {return currentSkyCultureDir;} |
1198 | 78 | 78 | ||
1199 | === modified file 'src/core/modules/StarMgr.cpp' | |||
1200 | --- src/core/modules/StarMgr.cpp 2016-07-11 07:39:54 +0000 | |||
1201 | +++ src/core/modules/StarMgr.cpp 2016-09-14 16:38:20 +0000 | |||
1202 | @@ -71,8 +71,12 @@ | |||
1203 | 71 | bool StarMgr::flagSciNames = true; | 71 | bool StarMgr::flagSciNames = true; |
1204 | 72 | QHash<int,QString> StarMgr::commonNamesMap; | 72 | QHash<int,QString> StarMgr::commonNamesMap; |
1205 | 73 | QHash<int,QString> StarMgr::commonNamesMapI18n; | 73 | QHash<int,QString> StarMgr::commonNamesMapI18n; |
1206 | 74 | QHash<int,QString> StarMgr::additionalNamesMap; | ||
1207 | 75 | QHash<int,QString> StarMgr::additionalNamesMapI18n; | ||
1208 | 74 | QMap<QString,int> StarMgr::commonNamesIndexI18n; | 76 | QMap<QString,int> StarMgr::commonNamesIndexI18n; |
1209 | 75 | QMap<QString,int> StarMgr::commonNamesIndex; | 77 | QMap<QString,int> StarMgr::commonNamesIndex; |
1210 | 78 | QMap<QString,int> StarMgr::additionalNamesIndex; | ||
1211 | 79 | QMap<QString,int> StarMgr::additionalNamesIndexI18n; | ||
1212 | 76 | QHash<int,QString> StarMgr::sciNamesMapI18n; | 80 | QHash<int,QString> StarMgr::sciNamesMapI18n; |
1213 | 77 | QMap<QString,int> StarMgr::sciNamesIndexI18n; | 81 | QMap<QString,int> StarMgr::sciNamesIndexI18n; |
1214 | 78 | QHash<int,QString> StarMgr::sciAdditionalNamesMapI18n; | 82 | QHash<int,QString> StarMgr::sciAdditionalNamesMapI18n; |
1215 | @@ -85,6 +89,7 @@ | |||
1216 | 85 | QMap<int, int> StarMgr::saoStarsIndex; | 89 | QMap<int, int> StarMgr::saoStarsIndex; |
1217 | 86 | QHash<int, int> StarMgr::hdStarsMap; | 90 | QHash<int, int> StarMgr::hdStarsMap; |
1218 | 87 | QMap<int, int> StarMgr::hdStarsIndex; | 91 | QMap<int, int> StarMgr::hdStarsIndex; |
1219 | 92 | QHash<int, QString> StarMgr::referenceMap; | ||
1220 | 88 | 93 | ||
1221 | 89 | QStringList initStringListFromFile(const QString& file_name) | 94 | QStringList initStringListFromFile(const QString& file_name) |
1222 | 90 | { | 95 | { |
1223 | @@ -180,6 +185,22 @@ | |||
1224 | 180 | return QString(); | 185 | return QString(); |
1225 | 181 | } | 186 | } |
1226 | 182 | 187 | ||
1227 | 188 | QString StarMgr::getAdditionalNames(int hip) | ||
1228 | 189 | { | ||
1229 | 190 | QHash<int,QString>::const_iterator it(additionalNamesMapI18n.find(hip)); | ||
1230 | 191 | if (it!=additionalNamesMapI18n.end()) | ||
1231 | 192 | return it.value(); | ||
1232 | 193 | return QString(); | ||
1233 | 194 | } | ||
1234 | 195 | |||
1235 | 196 | QString StarMgr::getAdditionalEnglishNames(int hip) | ||
1236 | 197 | { | ||
1237 | 198 | QHash<int,QString>::const_iterator it(additionalNamesMap.find(hip)); | ||
1238 | 199 | if (it!=additionalNamesMap.end()) | ||
1239 | 200 | return it.value(); | ||
1240 | 201 | return QString(); | ||
1241 | 202 | } | ||
1242 | 203 | |||
1243 | 183 | QString StarMgr::getCommonEnglishName(int hip) | 204 | QString StarMgr::getCommonEnglishName(int hip) |
1244 | 184 | { | 205 | { |
1245 | 185 | QHash<int,QString>::const_iterator it(commonNamesMap.find(hip)); | 206 | QHash<int,QString>::const_iterator it(commonNamesMap.find(hip)); |
1246 | @@ -609,8 +630,12 @@ | |||
1247 | 609 | { | 630 | { |
1248 | 610 | commonNamesMap.clear(); | 631 | commonNamesMap.clear(); |
1249 | 611 | commonNamesMapI18n.clear(); | 632 | commonNamesMapI18n.clear(); |
1250 | 633 | additionalNamesMap.clear(); | ||
1251 | 634 | additionalNamesMapI18n.clear(); | ||
1252 | 612 | commonNamesIndexI18n.clear(); | 635 | commonNamesIndexI18n.clear(); |
1253 | 613 | commonNamesIndex.clear(); | 636 | commonNamesIndex.clear(); |
1254 | 637 | additionalNamesIndex.clear(); | ||
1255 | 638 | additionalNamesIndexI18n.clear(); | ||
1256 | 614 | 639 | ||
1257 | 615 | qDebug() << "Loading star names from" << QDir::toNativeSeparators(commonNameFile); | 640 | qDebug() << "Loading star names from" << QDir::toNativeSeparators(commonNameFile); |
1258 | 616 | QFile cnFile(commonNameFile); | 641 | QFile cnFile(commonNameFile); |
1259 | @@ -632,7 +657,7 @@ | |||
1260 | 632 | // " 677|_("Alpheratz")" | 657 | // " 677|_("Alpheratz")" |
1261 | 633 | // "113368|_("Fomalhaut")" | 658 | // "113368|_("Fomalhaut")" |
1262 | 634 | // Note: Stellarium doesn't support sky cultures made prior version 0.10.6 now! | 659 | // Note: Stellarium doesn't support sky cultures made prior version 0.10.6 now! |
1264 | 635 | QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*\\n"); | 660 | QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*([\\,\\d\\s]*)\\n"); |
1265 | 636 | 661 | ||
1266 | 637 | while(!cnFile.atEnd()) | 662 | while(!cnFile.atEnd()) |
1267 | 638 | { | 663 | { |
1268 | @@ -667,13 +692,45 @@ | |||
1269 | 667 | continue; | 692 | continue; |
1270 | 668 | } | 693 | } |
1271 | 669 | 694 | ||
1279 | 670 | const QString commonNameI18n = englishCommonName; | 695 | const QString englishNameCap = englishCommonName.toUpper(); |
1280 | 671 | QString commonNameI18n_cap = commonNameI18n.toUpper(); | 696 | if (commonNamesMap.find(hip)!=commonNamesMap.end()) |
1281 | 672 | 697 | { | |
1282 | 673 | commonNamesMap[hip] = englishCommonName; | 698 | if (additionalNamesMap.find(hip)!=additionalNamesMap.end()) |
1283 | 674 | commonNamesMapI18n[hip] = commonNameI18n; | 699 | { |
1284 | 675 | commonNamesIndexI18n[commonNameI18n_cap] = hip; | 700 | QString sname = additionalNamesMap[hip].append(" - " + englishCommonName); |
1285 | 676 | commonNamesIndex[englishCommonName.toUpper()] = hip; | 701 | QString snamecap = sname.toUpper(); |
1286 | 702 | additionalNamesMap[hip] = sname; | ||
1287 | 703 | additionalNamesMapI18n[hip] = sname; | ||
1288 | 704 | additionalNamesIndex.remove(englishNameCap); | ||
1289 | 705 | additionalNamesIndexI18n.remove(englishNameCap); | ||
1290 | 706 | additionalNamesIndex[snamecap] = hip; | ||
1291 | 707 | additionalNamesIndexI18n[snamecap] = hip; | ||
1292 | 708 | } | ||
1293 | 709 | else | ||
1294 | 710 | { | ||
1295 | 711 | additionalNamesMap[hip] = englishCommonName; | ||
1296 | 712 | additionalNamesMapI18n[hip] = englishCommonName; | ||
1297 | 713 | additionalNamesIndex[englishNameCap] = hip; | ||
1298 | 714 | additionalNamesIndexI18n[englishNameCap] = hip; | ||
1299 | 715 | } | ||
1300 | 716 | } | ||
1301 | 717 | else | ||
1302 | 718 | { | ||
1303 | 719 | commonNamesMap[hip] = englishCommonName; | ||
1304 | 720 | commonNamesMapI18n[hip] = englishCommonName; | ||
1305 | 721 | commonNamesIndexI18n[englishNameCap] = hip; | ||
1306 | 722 | commonNamesIndex[englishNameCap] = hip; | ||
1307 | 723 | } | ||
1308 | 724 | |||
1309 | 725 | QString reference = recordRx.capturedTexts().at(3).trimmed(); | ||
1310 | 726 | if (!reference.isEmpty()) | ||
1311 | 727 | { | ||
1312 | 728 | if (referenceMap.find(hip)!=referenceMap.end()) | ||
1313 | 729 | referenceMap[hip] = referenceMap[hip].append("," + reference); | ||
1314 | 730 | else | ||
1315 | 731 | referenceMap[hip] = reference; | ||
1316 | 732 | } | ||
1317 | 733 | |||
1318 | 677 | readOk++; | 734 | readOk++; |
1319 | 678 | } | 735 | } |
1320 | 679 | } | 736 | } |
1321 | @@ -1143,6 +1200,8 @@ | |||
1322 | 1143 | const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator(); | 1200 | const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator(); |
1323 | 1144 | commonNamesMapI18n.clear(); | 1201 | commonNamesMapI18n.clear(); |
1324 | 1145 | commonNamesIndexI18n.clear(); | 1202 | commonNamesIndexI18n.clear(); |
1325 | 1203 | additionalNamesMapI18n.clear(); | ||
1326 | 1204 | additionalNamesIndexI18n.clear(); | ||
1327 | 1146 | for (QHash<int,QString>::ConstIterator it(commonNamesMap.constBegin());it!=commonNamesMap.constEnd();it++) | 1205 | for (QHash<int,QString>::ConstIterator it(commonNamesMap.constBegin());it!=commonNamesMap.constEnd();it++) |
1328 | 1147 | { | 1206 | { |
1329 | 1148 | const int i = it.key(); | 1207 | const int i = it.key(); |
1330 | @@ -1150,6 +1209,19 @@ | |||
1331 | 1150 | commonNamesMapI18n[i] = t; | 1209 | commonNamesMapI18n[i] = t; |
1332 | 1151 | commonNamesIndexI18n[t.toUpper()] = i; | 1210 | commonNamesIndexI18n[t.toUpper()] = i; |
1333 | 1152 | } | 1211 | } |
1334 | 1212 | for (QHash<int,QString>::ConstIterator ita(additionalNamesMap.constBegin());ita!=additionalNamesMap.constEnd();ita++) | ||
1335 | 1213 | { | ||
1336 | 1214 | const int i = ita.key(); | ||
1337 | 1215 | QStringList a = ita.value().split(" - "); | ||
1338 | 1216 | QStringList tn; | ||
1339 | 1217 | foreach(const QString &str, a) | ||
1340 | 1218 | { | ||
1341 | 1219 | tn << trans.qtranslate(str); | ||
1342 | 1220 | } | ||
1343 | 1221 | const QString r = tn.join(" - "); | ||
1344 | 1222 | additionalNamesMapI18n[i] = r; | ||
1345 | 1223 | additionalNamesIndexI18n[r.toUpper()] = i; | ||
1346 | 1224 | } | ||
1347 | 1153 | } | 1225 | } |
1348 | 1154 | 1226 | ||
1349 | 1155 | // Search the star by HP number | 1227 | // Search the star by HP number |
1350 | @@ -1208,6 +1280,13 @@ | |||
1351 | 1208 | return searchHP(it.value()); | 1280 | return searchHP(it.value()); |
1352 | 1209 | } | 1281 | } |
1353 | 1210 | 1282 | ||
1354 | 1283 | // Search by I18n additional common names | ||
1355 | 1284 | QMap<QString,int>::const_iterator ita(additionalNamesIndexI18n.find(objw)); | ||
1356 | 1285 | if (ita!=additionalNamesIndexI18n.end()) | ||
1357 | 1286 | { | ||
1358 | 1287 | return searchHP(ita.value()); | ||
1359 | 1288 | } | ||
1360 | 1289 | |||
1361 | 1211 | // Search by sci name | 1290 | // Search by sci name |
1362 | 1212 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); | 1291 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); |
1363 | 1213 | if (it2!=sciNamesIndexI18n.end()) | 1292 | if (it2!=sciNamesIndexI18n.end()) |
1364 | @@ -1274,13 +1353,20 @@ | |||
1365 | 1274 | } | 1353 | } |
1366 | 1275 | } | 1354 | } |
1367 | 1276 | 1355 | ||
1369 | 1277 | // Search by I18n common name | 1356 | // Search by English common name |
1370 | 1278 | QMap<QString,int>::const_iterator it(commonNamesIndex.find(objw)); | 1357 | QMap<QString,int>::const_iterator it(commonNamesIndex.find(objw)); |
1371 | 1279 | if (it!=commonNamesIndex.end()) | 1358 | if (it!=commonNamesIndex.end()) |
1372 | 1280 | { | 1359 | { |
1373 | 1281 | return searchHP(it.value()); | 1360 | return searchHP(it.value()); |
1374 | 1282 | } | 1361 | } |
1375 | 1283 | 1362 | ||
1376 | 1363 | // Search by English additional common names | ||
1377 | 1364 | QMap<QString,int>::const_iterator ita(additionalNamesIndex.find(objw)); | ||
1378 | 1365 | if (ita!=additionalNamesIndex.end()) | ||
1379 | 1366 | { | ||
1380 | 1367 | return searchHP(ita.value()); | ||
1381 | 1368 | } | ||
1382 | 1369 | |||
1383 | 1284 | // Search by sci name | 1370 | // Search by sci name |
1384 | 1285 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); | 1371 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); |
1385 | 1286 | if (it2!=sciNamesIndexI18n.end()) | 1372 | if (it2!=sciNamesIndexI18n.end()) |
1386 | @@ -1310,6 +1396,7 @@ | |||
1387 | 1310 | QString objw = objPrefix.toUpper(); | 1396 | QString objw = objPrefix.toUpper(); |
1388 | 1311 | 1397 | ||
1389 | 1312 | QMap<QString, int> cNamesIdx = inEnglish ? commonNamesIndex : commonNamesIndexI18n; | 1398 | QMap<QString, int> cNamesIdx = inEnglish ? commonNamesIndex : commonNamesIndexI18n; |
1390 | 1399 | QMap<QString, int> aNamesIdx = inEnglish ? additionalNamesIndex : additionalNamesIndexI18n; | ||
1391 | 1313 | 1400 | ||
1392 | 1314 | // Search for common names | 1401 | // Search for common names |
1393 | 1315 | if (useStartOfWords) | 1402 | if (useStartOfWords) |
1394 | @@ -1326,6 +1413,19 @@ | |||
1395 | 1326 | else | 1413 | else |
1396 | 1327 | break; | 1414 | break; |
1397 | 1328 | } | 1415 | } |
1398 | 1416 | for (QMap<QString,int>::const_iterator ita(aNamesIdx.lowerBound(objw)); ita!=aNamesIdx.end(); ++ita) | ||
1399 | 1417 | { | ||
1400 | 1418 | if (ita.key().startsWith(objw)) | ||
1401 | 1419 | { | ||
1402 | 1420 | if (maxNbItem<=0) | ||
1403 | 1421 | break; | ||
1404 | 1422 | result.append(inEnglish ? getAdditionalEnglishNames(ita.value()) : getAdditionalNames(ita.value())); | ||
1405 | 1423 | --maxNbItem; | ||
1406 | 1424 | } | ||
1407 | 1425 | else | ||
1408 | 1426 | break; | ||
1409 | 1427 | } | ||
1410 | 1428 | |||
1411 | 1329 | } | 1429 | } |
1412 | 1330 | else | 1430 | else |
1413 | 1331 | { | 1431 | { |
1414 | @@ -1341,6 +1441,19 @@ | |||
1415 | 1341 | --maxNbItem; | 1441 | --maxNbItem; |
1416 | 1342 | } | 1442 | } |
1417 | 1343 | } | 1443 | } |
1418 | 1444 | QMapIterator<QString, int> j(aNamesIdx); | ||
1419 | 1445 | while (j.hasNext()) | ||
1420 | 1446 | { | ||
1421 | 1447 | j.next(); | ||
1422 | 1448 | if (j.key().contains(objw)) | ||
1423 | 1449 | { | ||
1424 | 1450 | if (maxNbItem<=0) | ||
1425 | 1451 | break; | ||
1426 | 1452 | result.append(inEnglish ? getAdditionalEnglishNames(j.value()) : getAdditionalNames(j.value())); | ||
1427 | 1453 | --maxNbItem; | ||
1428 | 1454 | } | ||
1429 | 1455 | } | ||
1430 | 1456 | |||
1431 | 1344 | } | 1457 | } |
1432 | 1345 | 1458 | ||
1433 | 1346 | // Search for sci names | 1459 | // Search for sci names |
1434 | 1347 | 1460 | ||
1435 | === modified file 'src/core/modules/StarMgr.hpp' | |||
1436 | --- src/core/modules/StarMgr.hpp 2016-07-11 07:39:54 +0000 | |||
1437 | +++ src/core/modules/StarMgr.hpp 2016-09-14 16:38:20 +0000 | |||
1438 | @@ -234,6 +234,18 @@ | |||
1439 | 234 | //! @return common name of star (from skyculture file star_names.fab) | 234 | //! @return common name of star (from skyculture file star_names.fab) |
1440 | 235 | static QString getCommonEnglishName(int hip); | 235 | static QString getCommonEnglishName(int hip); |
1441 | 236 | 236 | ||
1442 | 237 | //! Get the (translated) additional names for a star with a specified | ||
1443 | 238 | //! Hipparcos catalogue number. | ||
1444 | 239 | //! @param hip The Hipparcos number of star | ||
1445 | 240 | //! @return translated additional names of star | ||
1446 | 241 | static QString getAdditionalNames(int hip); | ||
1447 | 242 | |||
1448 | 243 | //! Get the English additional names for a star with a specified | ||
1449 | 244 | //! Hipparcos catalogue number. | ||
1450 | 245 | //! @param hip The Hipparcos number of star | ||
1451 | 246 | //! @return additional names of star | ||
1452 | 247 | static QString getAdditionalEnglishNames(int hip); | ||
1453 | 248 | |||
1454 | 237 | //! Get the cross-identification designations for a star with a specified | 249 | //! Get the cross-identification designations for a star with a specified |
1455 | 238 | //! Hipparcos catalogue number. | 250 | //! Hipparcos catalogue number. |
1456 | 239 | //! @param hip The Hipparcos number of star | 251 | //! @param hip The Hipparcos number of star |
1457 | @@ -403,6 +415,11 @@ | |||
1458 | 403 | static QMap<QString, int> commonNamesIndexI18n; | 415 | static QMap<QString, int> commonNamesIndexI18n; |
1459 | 404 | static QMap<QString, int> commonNamesIndex; | 416 | static QMap<QString, int> commonNamesIndex; |
1460 | 405 | 417 | ||
1461 | 418 | static QHash<int, QString> additionalNamesMap; // additional names | ||
1462 | 419 | static QHash<int, QString> additionalNamesMapI18n; | ||
1463 | 420 | static QMap<QString, int> additionalNamesIndex; | ||
1464 | 421 | static QMap<QString, int> additionalNamesIndexI18n; | ||
1465 | 422 | |||
1466 | 406 | static QHash<int, QString> sciNamesMapI18n; | 423 | static QHash<int, QString> sciNamesMapI18n; |
1467 | 407 | static QMap<QString, int> sciNamesIndexI18n; | 424 | static QMap<QString, int> sciNamesIndexI18n; |
1468 | 408 | 425 | ||
1469 | @@ -420,6 +437,8 @@ | |||
1470 | 420 | static QHash<int, int> hdStarsMap; | 437 | static QHash<int, int> hdStarsMap; |
1471 | 421 | static QMap<int, int> hdStarsIndex; | 438 | static QMap<int, int> hdStarsIndex; |
1472 | 422 | 439 | ||
1473 | 440 | static QHash<int, QString> referenceMap; | ||
1474 | 441 | |||
1475 | 423 | QFont starFont; | 442 | QFont starFont; |
1476 | 424 | static bool flagSciNames; | 443 | static bool flagSciNames; |
1477 | 425 | Vec3f labelColor; | 444 | Vec3f labelColor; |
1478 | 426 | 445 | ||
1479 | === modified file 'src/core/modules/StarWrapper.cpp' | |||
1480 | --- src/core/modules/StarWrapper.cpp 2016-07-11 07:39:54 +0000 | |||
1481 | +++ src/core/modules/StarWrapper.cpp 2016-09-14 16:38:20 +0000 | |||
1482 | @@ -106,6 +106,7 @@ | |||
1483 | 106 | oss << "<h2>"; | 106 | oss << "<h2>"; |
1484 | 107 | 107 | ||
1485 | 108 | const QString commonNameI18 = StarMgr::getCommonName(s->getHip()); | 108 | const QString commonNameI18 = StarMgr::getCommonName(s->getHip()); |
1486 | 109 | const QString additionalNameI18 = StarMgr::getAdditionalNames(s->getHip()); | ||
1487 | 109 | const QString sciName = StarMgr::getSciName(s->getHip()); | 110 | const QString sciName = StarMgr::getSciName(s->getHip()); |
1488 | 110 | const QString addSciName = StarMgr::getSciAdditionalName(s->getHip()); | 111 | const QString addSciName = StarMgr::getSciAdditionalName(s->getHip()); |
1489 | 111 | const QString varSciName = StarMgr::getGcvsName(s->getHip()); | 112 | const QString varSciName = StarMgr::getGcvsName(s->getHip()); |
1490 | @@ -140,6 +141,9 @@ | |||
1491 | 140 | if (!commonNameI18.isEmpty()) | 141 | if (!commonNameI18.isEmpty()) |
1492 | 141 | oss << commonNameI18; | 142 | oss << commonNameI18; |
1493 | 142 | 143 | ||
1494 | 144 | if (!additionalNameI18.isEmpty()) | ||
1495 | 145 | oss << " (" << additionalNameI18 << ")"; | ||
1496 | 146 | |||
1497 | 143 | if (!commonNameI18.isEmpty() && !designationsList.isEmpty() && flags&CatalogNumber) | 147 | if (!commonNameI18.isEmpty() && !designationsList.isEmpty() && flags&CatalogNumber) |
1498 | 144 | oss << "<br>"; | 148 | oss << "<br>"; |
1499 | 145 | } | 149 | } |
1500 | 146 | 150 | ||
1501 | === modified file 'stars/default/name.fab' | |||
1502 | --- stars/default/name.fab 2015-11-21 09:22:55 +0000 | |||
1503 | +++ stars/default/name.fab 2016-09-14 16:38:20 +0000 | |||
1504 | @@ -3692,7 +3692,6 @@ | |||
1505 | 3692 | 80763|α_Sco | 3692 | 80763|α_Sco |
1506 | 3693 | 78820|β1_Sco | 3693 | 78820|β1_Sco |
1507 | 3694 | 78821|β2_Sco | 3694 | 78821|β2_Sco |
1508 | 3695 | 73714|γ_Sco | ||
1509 | 3696 | 78401|δ_Sco | 3695 | 78401|δ_Sco |
1510 | 3697 | 82396|ε_Sco | 3696 | 82396|ε_Sco |
1511 | 3698 | 82671|ζ1_Sco | 3697 | 82671|ζ1_Sco |