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

[Alexander Wolf]

[Fabien Chéreau (xalioth)]

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

[Fabien Chéreau (xalioth)]

I mean you shoud create a new branch.

[Alexander Wolf (alexwolf)]

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?

[lp:~alexwolf/stellarium/nebula-l10n]

4781. By Alexander Wolf on 2010-11-10

Merged from trunk

4782. By Alexander Wolf on 2010-11-10

Drop support l10n for Uranus moon

4783. By Alexander Wolf on 2010-11-10

Delete comments translations from NGC2000 names

4784. By Alexander Wolf on 2010-11-13

Merged from trunk

4785. By Alexander Wolf on 2010-11-15

Merged from trunk

Unmerged revisions

=== modified file 'nebulae/default/ngc2000names.dat'
--- nebulae/default/ngc2000names.dat	2010-09-30 09:32:38 +0000
+++ nebulae/default/ngc2000names.dat	2010-11-10 15:27:55 +0000
@@ -212,11 +212,11 @@
 _("Whirlpool galaxy")                 5194  NGC 5194-5                  
 _("Wild Duck cluster")                6705                              
 _("Witch Head nebula")               I2118                              
-η Car nebula                          3372                              
-γ Cas nebula                         I  59  IC 59,63                    
-γ Cas nebula                         I  63  IC 59,63                    
-κ Cru cluster                         4755  (_("See Jewel Box"))             
-λ Cen nebula                         I2944                              
-λ Cen nebula                         I2948                              
+_("η Car nebula")                     3372                              
+_("γ Cas nebula")                    I  59  IC 59,63                    
+_("γ Cas nebula")                    I  63  IC 59,63                    
+_("κ Cru cluster")                    4755  (_("See Jewel Box"))             
+_("λ Cen nebula")                    I2944                              
+_("λ Cen nebula")                    I2948                              
 ω Cen                                 5139                              
-ρ Oph nebula                         I4604                              
+_("ρ Oph nebula")                    I4604                              

=== modified file 'po/stellarium-skycultures/CMakeLists.txt'
--- po/stellarium-skycultures/CMakeLists.txt	2010-03-31 19:32:05 +0000
+++ po/stellarium-skycultures/CMakeLists.txt	2010-11-10 15:27:55 +0000
@@ -14,6 +14,7 @@
         --directory=${PROJECT_SOURCE_DIR}
         --files-from=POTFILES.in
         --copyright-holder=Stellarium's\ team
+	--from-code=utf-8
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT "Generating ${skycultures_POT}"
     VERBATIM

=== modified file 'po/stellarium-skycultures/stellarium-skycultures.pot'
--- po/stellarium-skycultures/stellarium-skycultures.pot	2010-09-30 09:32:38 +0000
+++ po/stellarium-skycultures/stellarium-skycultures.pot	2010-11-10 15:27:55 +0000
@@ -8,13 +8,12 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-30 16:29+0700\n"
+"POT-Creation-Date: 2010-10-29 18:50+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: nebulae/default/ngc2000names.dat:111
@@ -373,10 +372,30 @@
 msgid "Witch Head nebula"
 msgstr ""
 
+#: nebulae/default/ngc2000names.dat:215
+msgid "η Car nebula"
+msgstr ""
+
+#: nebulae/default/ngc2000names.dat:216 nebulae/default/ngc2000names.dat:217
+msgid "γ Cas nebula"
+msgstr ""
+
+#: nebulae/default/ngc2000names.dat:218
+msgid "κ Cru cluster"
+msgstr ""
+
 #: nebulae/default/ngc2000names.dat:218
 msgid "See Jewel Box"
 msgstr ""
 
+#: nebulae/default/ngc2000names.dat:219 nebulae/default/ngc2000names.dat:220
+msgid "λ Cen nebula"
+msgstr ""
+
+#: nebulae/default/ngc2000names.dat:222
+msgid "ρ Oph nebula"
+msgstr ""
+
 #: skycultures/aztec/constellation_names.eng.fab:1
 msgid "Mamalhuaztli (The New fire)"
 msgstr ""