Stellarium

Merge lp:~alexwolf/stellarium/nebula-l10n into lp:stellarium

  1. nebula-l10n
  2. Merge into trunk
Proposed by Alexander Wolf
Status: Merged
Merged at revision: 4800
Proposed branch: lp:~alexwolf/stellarium/nebula-l10n
Merge into: lp:stellarium
Diff against target: 214 lines (+36/-49)
3 files modified
nebulae/default/ngc2000names.dat (+16/-16)
po/stellarium-skycultures/CMakeLists.txt (+1/-0)
po/stellarium-skycultures/stellarium-skycultures.pot (+19/-33)
To merge this branch: bzr merge lp:~alexwolf/stellarium/nebula-l10n
Reviewer Review Type Date Requested Status
Fabien Chéreau Approve
Alexander Wolf Abstain
Stellarium Pending
Review via email: mp+40550@code.launchpad.net

This proposal supersedes a proposal from 2010-11-10.

To post a comment you must log in.
Revision history for this message
Fabien Chéreau (xalioth) wrote : Posted in a previous version of this proposal

If you want to fix the progress bar bug, just do tah in the branch. Your branch contains many other unrelated changes.
Fab

review: Needs Fixing
Revision history for this message
Fabien Chéreau (xalioth) wrote : Posted in a previous version of this proposal

I mean you shoud create a new branch.

Revision history for this message
Alexander Wolf (alexwolf) wrote : Posted in a previous version of this proposal

Diego Marcos already fix bug #671633 in commit 4780 (trunk) with include my patch for this bug. Or need create a new branch for Uranus moons?

Revision history for this message
Fabien Chéreau (xalioth) wrote : Posted in a previous version of this proposal

Please avoid translating the comments in the right side if the table, they are unused and just add work for the translators..

review: Needs Fixing
Revision history for this message
Alexander Wolf (alexwolf) wrote : Posted in a previous version of this proposal

> Please avoid translating the comments in the right side if the table, they are
> unused and just add work for the translators..

No problem

review: Needs Resubmitting
Revision history for this message
Alexander Wolf (alexwolf) : Posted in a previous version of this proposal
review: Abstain
Revision history for this message
Alexander Wolf (alexwolf) :
review: Abstain
lp:~alexwolf/stellarium/nebula-l10n updated
4784. By Alexander Wolf

Merged from trunk

4785. By Alexander Wolf

Merged from trunk

Revision history for this message
Fabien Chéreau (xalioth) wrote :

It fine for me now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nebulae/default/ngc2000names.dat'
2--- nebulae/default/ngc2000names.dat 2010-09-30 09:32:38 +0000
3+++ nebulae/default/ngc2000names.dat 2010-11-15 06:18:13 +0000
4@@ -113,7 +113,7 @@
5 _("Antennae") 4039 4038-9
6 _("Barnard's galaxy") 6822
7 _("Bear Paw galaxy") 2537
8-_("Beehive cluster") 2632 (_("See Praesepe"))
9+_("Beehive cluster") 2632 ("See Praesepe")
10 _("Black-eye galaxy") 4826
11 _("Blinking planetary") 6826
12 _("Blue Snowball") 7662
13@@ -145,12 +145,12 @@
14 _("Double cluster") 869 NGC 869 and 884
15 _("Double cluster") 884 NGC 869 and 884
16 _("Dumbbell nebula") 6853
17-_("Eagle nebula") 6611 (_("but sometimes I2177"))
18+_("Eagle nebula") 6611 ("but sometimes I2177")
19 _("Eight-burst planetary") 3132
20 _("Eskimo nebula") 2392
21 _("The Eyes") 4435 NGC 4435, 38
22 _("The Eyes") 4438 NGC 4435, 38
23-_("Filamentary nebula") 6960 (_("part of the Veil nebula"))=
24+_("Filamentary nebula") 6960 ("part of the Veil nebula")
25 _("Flaming Star nebula") I 405
26 _("Ghost of Jupiter") 3242
27 _("Great Cluster in Hercules") 6205
28@@ -159,11 +159,11 @@
29 _("Helix galaxy") 2685
30 _("Helix nebula") 7293
31 _("Hind's variable nebula") 1555
32-_("Horsehead nebula") I 434 (_("Dark nebula in IC 434"))
33-_("Hourglass nebula") 6523 (_("Brightest part of NGC 6523"))
34+_("Horsehead nebula") I 434 ("Dark nebula in IC 434")
35+_("Hourglass nebula") 6523 ("Brightest part of NGC 6523")
36 _("Hubble's variable neb") 2261
37 _("Jewel Box") 4755
38-_("Lace-work nebula") 6960 (_("see Filamentary"))
39+_("Lace-work nebula") 6960 ("see Filamentary")
40 _("Lagoon nebula") 6523
41 _("Little Dumbbell") 650 NGC 650-1
42 _("Little Dumbbell") 651 NGC 650-1
43@@ -172,8 +172,8 @@
44 _("Pleiades") 1432
45 _("Merope nebula") 1435
46 _("The Mice") 4676
47-_("Network nebula") 6992 (_("part of the Veil nebula"))
48-_("Network nebula") 6995 (_("part of the Veil nebula"))
49+_("Network nebula") 6992 ("part of the Veil nebula")
50+_("Network nebula") 6995 ("part of the Veil nebula")
51 _("North America nebula") 7000
52 _("Omega nebula") 6618
53 _("Owl nebula") 3587
54@@ -193,7 +193,7 @@
55 _("Siamese Twins") 4567 NGC 4567-8
56 _("Siamese Twins") 4568 NGC 4567-8
57 _("Sombrero galaxy") 4594
58-_("Southern Pleiades") I2602 (_("theta Car"))
59+_("Southern Pleiades") I2602 ("theta Car")
60 _("Spindle galaxy") 3115
61 _("Star Queen nebula") I4703
62 _("Stephan's Quintet") 7317 NGC 7317-20
63@@ -212,11 +212,11 @@
64 _("Whirlpool galaxy") 5194 NGC 5194-5
65 _("Wild Duck cluster") 6705
66 _("Witch Head nebula") I2118
67-η Car nebula 3372
68-γ Cas nebula I 59 IC 59,63
69-γ Cas nebula I 63 IC 59,63
70-κ Cru cluster 4755 (_("See Jewel Box"))
71-λ Cen nebula I2944
72-λ Cen nebula I2948
73+_("η Car nebula") 3372
74+_("γ Cas nebula") I 59 IC 59,63
75+_("γ Cas nebula") I 63 IC 59,63
76+_("κ Cru cluster") 4755 ("See Jewel Box")
77+_("λ Cen nebula") I2944
78+_("λ Cen nebula") I2948
79 ω Cen 5139
80-ρ Oph nebula I4604
81+_("ρ Oph nebula") I4604
82
83=== modified file 'po/stellarium-skycultures/CMakeLists.txt'
84--- po/stellarium-skycultures/CMakeLists.txt 2010-03-31 19:32:05 +0000
85+++ po/stellarium-skycultures/CMakeLists.txt 2010-11-15 06:18:13 +0000
86@@ -14,6 +14,7 @@
87 --directory=${PROJECT_SOURCE_DIR}
88 --files-from=POTFILES.in
89 --copyright-holder=Stellarium's\ team
90+ --from-code=utf-8
91 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
92 COMMENT "Generating ${skycultures_POT}"
93 VERBATIM
94
95=== modified file 'po/stellarium-skycultures/stellarium-skycultures.pot'
96--- po/stellarium-skycultures/stellarium-skycultures.pot 2010-09-30 09:32:38 +0000
97+++ po/stellarium-skycultures/stellarium-skycultures.pot 2010-11-15 06:18:13 +0000
98@@ -8,13 +8,12 @@
99 msgstr ""
100 "Project-Id-Version: PACKAGE VERSION\n"
101 "Report-Msgid-Bugs-To: \n"
102-"POT-Creation-Date: 2010-09-30 16:29+0700\n"
103+"POT-Creation-Date: 2010-11-10 22:27+0600\n"
104 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
105 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
106 "Language-Team: LANGUAGE <LL@li.org>\n"
107-"Language: \n"
108 "MIME-Version: 1.0\n"
109-"Content-Type: text/plain; charset=CHARSET\n"
110+"Content-Type: text/plain; charset=UTF-8\n"
111 "Content-Transfer-Encoding: 8bit\n"
112
113 #: nebulae/default/ngc2000names.dat:111
114@@ -37,10 +36,6 @@
115 msgid "Beehive cluster"
116 msgstr ""
117
118-#: nebulae/default/ngc2000names.dat:116
119-msgid "See Praesepe"
120-msgstr ""
121-
122 #: nebulae/default/ngc2000names.dat:117
123 msgid "Black-eye galaxy"
124 msgstr ""
125@@ -129,10 +124,6 @@
126 msgid "Eagle nebula"
127 msgstr ""
128
129-#: nebulae/default/ngc2000names.dat:148
130-msgid "but sometimes I2177"
131-msgstr ""
132-
133 #: nebulae/default/ngc2000names.dat:149
134 msgid "Eight-burst planetary"
135 msgstr ""
136@@ -149,11 +140,6 @@
137 msgid "Filamentary nebula"
138 msgstr ""
139
140-#: nebulae/default/ngc2000names.dat:153 nebulae/default/ngc2000names.dat:175
141-#: nebulae/default/ngc2000names.dat:176
142-msgid "part of the Veil nebula"
143-msgstr ""
144-
145 #: nebulae/default/ngc2000names.dat:154
146 msgid "Flaming Star nebula"
147 msgstr ""
148@@ -190,18 +176,10 @@
149 msgid "Horsehead nebula"
150 msgstr ""
151
152-#: nebulae/default/ngc2000names.dat:162
153-msgid "Dark nebula in IC 434"
154-msgstr ""
155-
156 #: nebulae/default/ngc2000names.dat:163
157 msgid "Hourglass nebula"
158 msgstr ""
159
160-#: nebulae/default/ngc2000names.dat:163
161-msgid "Brightest part of NGC 6523"
162-msgstr ""
163-
164 #: nebulae/default/ngc2000names.dat:164
165 msgid "Hubble's variable neb"
166 msgstr ""
167@@ -214,10 +192,6 @@
168 msgid "Lace-work nebula"
169 msgstr ""
170
171-#: nebulae/default/ngc2000names.dat:166
172-msgid "see Filamentary"
173-msgstr ""
174-
175 #: nebulae/default/ngc2000names.dat:167
176 msgid "Lagoon nebula"
177 msgstr ""
178@@ -315,10 +289,6 @@
179 msgid "Southern Pleiades"
180 msgstr ""
181
182-#: nebulae/default/ngc2000names.dat:196
183-msgid "theta Car"
184-msgstr ""
185-
186 #: nebulae/default/ngc2000names.dat:197
187 msgid "Spindle galaxy"
188 msgstr ""
189@@ -373,8 +343,24 @@
190 msgid "Witch Head nebula"
191 msgstr ""
192
193+#: nebulae/default/ngc2000names.dat:215
194+msgid "η Car nebula"
195+msgstr ""
196+
197+#: nebulae/default/ngc2000names.dat:216 nebulae/default/ngc2000names.dat:217
198+msgid "γ Cas nebula"
199+msgstr ""
200+
201 #: nebulae/default/ngc2000names.dat:218
202-msgid "See Jewel Box"
203+msgid "κ Cru cluster"
204+msgstr ""
205+
206+#: nebulae/default/ngc2000names.dat:219 nebulae/default/ngc2000names.dat:220
207+msgid "λ Cen nebula"
208+msgstr ""
209+
210+#: nebulae/default/ngc2000names.dat:222
211+msgid "ρ Oph nebula"
212 msgstr ""
213
214 #: skycultures/aztec/constellation_names.eng.fab:1