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

[Alexander Wolf]

Complete l10n support for descriptions for plugins. Full l10n support for plugins may create by authors of each plugins.

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

4794. By Matthew Gates on 2010-11-15

de-selection isolated constellation selections now clears isolated selection (fix for bug 600889)

4795. By Matthew Gates on 2010-11-15

merge various Satellites plugin improvements from Matthew's branch

4796. By Fabien Chéreau on 2010-11-15

Fixed bad constellation art distortion

4797. By Bogdan Marinov on 2010-11-16

propagated changes in normalSyle.css to nightStyle.css

4798. By Fabien Chéreau on 2010-11-17

Added new plugin icon from Johan

4799. By Fabien Chéreau on 2010-11-17

Merged impressive Solar System Editor fom Bogdan.

[Fabien Chéreau (xalioth)]

Please don't translate Authors names.
We should find a way to avoid translating 110 times the same strings: "Move telescope #4 to selected object" and "Move telescope #5 to the point currently in the center of the screen"

review: Needs Fixing

[Alexander Wolf (alexwolf)]

Why does not need to translate the names of the authors?

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

4800. By Fabien Chéreau on 2010-11-17

Merged fix to nebula translations.

[treaves (treaves)]

Authors names are a bit hard, as some people will want them left as their
alphabet depicts them. It may be good to have them be links for e-mail
addresses, but, in general, I'd say to leave them as-is.

On Wed, Nov 17, 2010 at 6:03 AM, Alexander Wolf <email address hidden>wrote:

> Why does not need to translate the names of the authors?
> --
> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812<https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812>
> You are subscribed to branch lp:stellarium.
>

[Matthew Gates (matthew-porpoisehead)]

There was a discussion about this in IRC a few days ago. There is a
difference between translation and transliteration - a case could be
made for the latter. However, I'm interested in there being
consistency. So: no translations for author names?

On 17 November 2010 14:02, treaves <email address hidden> wrote:
> Authors names are a bit hard, as some people will want them left as their
> alphabet depicts them.  It may be good to have them be links for e-mail
> addresses, but, in general, I'd say to leave them as-is.
>
>
>
>
> On Wed, Nov 17, 2010 at 6:03 AM, Alexander Wolf <email address hidden>wrote:
>
>> Why does not need to translate the names of the authors?
>> --
>> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812<https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812>
>> You are subscribed to branch lp:stellarium.
>>
>
> --
> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812
> You are subscribed to branch lp:stellarium.
>

[Froenchenko Leonid (lfroen)]

Generally accepted practice is transliterate names from non-latin languages
(Russian, Chinese) and leave as-is names from languages with Latin script
(German, French, etc).

On Wed, Nov 17, 2010 at 4:37 PM, Matthew Gates <email address hidden> wrote:

> There was a discussion about this in IRC a few days ago. There is a
> difference between translation and transliteration - a case could be
> made for the latter. However, I'm interested in there being
> consistency. So: no translations for author names?
>
> On 17 November 2010 14:02, treaves <email address hidden> wrote:
> > Authors names are a bit hard, as some people will want them left as their
> > alphabet depicts them. It may be good to have them be links for e-mail
> > addresses, but, in general, I'd say to leave them as-is.
> >
> >
> >
> >
> > On Wed, Nov 17, 2010 at 6:03 AM, Alexander Wolf <<email address hidden>
> >wrote:
> >
> >> Why does not need to translate the names of the authors?
> >> --
> >>
> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812<https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812>
> <
> https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812
> >
> >> You are subscribed to branch lp:stellarium.
> >>
> >
> > --
> >
> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812<https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812>
> > You are subscribed to branch lp:stellarium.
> >
> --
> https://code.launchpad.net/~alexwolf/stellarium/plugins-l10n/+merge/40812<https://code.launchpad.net/%7Ealexwolf/stellarium/plugins-l10n/+merge/40812>
> You are subscribed to branch lp:stellarium.
>

[Bogdan Marinov (daggerstab)]

I hope that all of you realize that you are posting-by-email to the merge proposal comments in Launchpad. :)

Gettext's manual suggests that proper names should be marked for translation, with appropriate instructions on how the name is pronounced and with the original form of the name in brackets.
http://www.gnu.org/software/gettext/manual/gettext.html#Names

For example:
Матю Гейтс (Matthew Gates)

With Qt, this can be enforced in the code, e.g.:
info.authors = QString("%1 (%2)").arg(q_("Matthew Gates")).arg("Matthew Gates");
Though it will look quite awkward when the language is set to English, so another solution is possible. :)

Anyway, I am not sure how the q_ macro in getPluginInfo() interacts with the same macro in ConfigurationDialog::pluginsSelectionChanged() (note my comments there). I haven't tested this branch.

[Alexander Wolf (alexwolf)]

>So: no translations for author names?

Yes, currently, but "tomorrow" we maybe enable translations for authors names. After detailed discussion via maillist.

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

4801. By Bogdan Marinov on 2010-11-17

+ adding GridLinesMgr.cpp for translation (thanks to Alexander Wolf for noticing this);
updating translation template

4802. By Fabien Chéreau on 2010-11-18

Merged patch by Alex wolf allowing plugin translation.

4803. By Fabien Chéreau on 2010-11-18

Merged patch by Matthew improving Satellites plugin (a lot)

4804. By Bogdan Marinov on 2010-11-18

fixed a bug in TelescopeClient introduced by Alexander Wolf's translation efforts

4805. By Bogdan Marinov on 2010-11-18

fixed telescope being dropped from the list if it is set to start at startup but fails to do it

4806. By Matthew Gates on 2010-11-18

merge satellites improvements

4807. By Fabien Chéreau on 2010-11-18

Got rid of all the useless -fPIC compilation options (which are a performance penalty), as suggested by RedDwarf in Bug #648071

4808. By Matthew Gates on 2010-11-18

merge various satellite plugin improvements

4809. By Matthew Gates on 2010-11-18

satellites: ^Cx for orbit / icon offset

4810. By Bogdan Marinov on 2010-11-19

fixed Oculars display name; fixed translatable strings in plugins for consistency

4811. By Bogdan Marinov on 2010-11-19

TelescopeControl: removed custom stylesheet, tweaked GUI

4812. By Bogdan Marinov on 2010-11-20

TelescopeControl: code reuse: created the InterpolatedPosition class

4813. By Bogdan Marinov on 2010-11-20

+ manual override for telescope equinox/epoch

4814. By Matthew Gates on 2010-11-20

stop script engine from restoring pre-script time rate

4815. By Matthew Gates on 2010-11-22

clean up newline characters in landscape descriptions

4816. By Fabien Chéreau on 2010-11-22

Use a standard tangential projection for constellation art, and improved accuracy.

4817. By Fabien Chéreau on 2010-11-22

Fixed duplicated display

4818. By Fabien Chéreau on 2010-11-22

Applied small patch from bug #648348 for compilation with KDE

4819. By Fabien Chéreau on 2010-11-22

Hid part of a bug

4820. By Matthew Gates on 2010-11-23

backup change which breached core / non-core linking

4821. By Matthew Gates on 2010-11-23

fix unused variable warning

4822. By Matthew Gates on 2010-11-26

merge from satellites dev branch: orbit line bugfix

4823. By Matthew Gates on 2010-11-26

tui plugin bugfixes

4824. By treaves on 2010-11-27

Corrected an issue when there are no oculars or telescopes; it's crash the app.

4825. By Matthew Gates on 2010-11-28

fix improper permissions (source/data should not be executable)

4826. By Bogdan Marinov on 2010-11-28

fixed landscape reloading bug in ViewDialog (thanks to Matthew Gates for noticing)

4827. By treaves on 2010-11-28

Check every time the Oculars plugin is activiated that there are at least one telescope and one eyepiece.

4828. By treaves on 2010-11-28

Corrected an issue where the count of entities in Oculars was not being saved to the ini file.

4829. By Matthew Gates on 2010-11-29

proper replacement of newline in landscape descriptions

4830. By Bogdan Marinov on 2010-12-03

incomplete update of ChangeLog for version 0.10.6

4831. By Bogdan Marinov on 2010-12-03

TelescopeControl: updated internal help file

4832. By Bogdan Marinov on 2010-12-03

updated the plugins documentation page with my text from the Stellarium Wiki

4833. By Fabien Chéreau on 2010-12-04

Fixed landscapes regressions

4834. By Matthew Gates on 2010-12-04

fix landscape rotation problem

4835. By Fabien Chéreau on 2010-12-04

Fixed font display bug #666837

4836. By Bogdan Marinov on 2010-12-04

TelescopeControl: fixed virtual telescope not starting after revision 4813

4837. By Matthew Gates on 2010-12-04

satellites plugin: change default satellite visibility

4838. By Bogdan Marinov on 2010-12-04

Oculars: the toolbar button should remain unchecked if ocular mode was not enabled

4839. By Matthew Gates on 2010-12-04

changelog update

4840. By Matthew Gates on 2010-12-04

some default plugin loading / no default planet hints (prettier)

4841. By Matthew Gates on 2010-12-05

version number in config file

4842. By Matthew Gates on 2010-12-05

import new translations from launchpad

4843. By Bogdan Marinov on 2010-12-05

prevent warnings if the INT64_MAX macro is already defined

4844. By Matthew Gates on 2010-12-05

fix minor language config dialog issue on first use

4845. By Fabien Chéreau on 2010-12-05

Tune planets hints so that they don't appear in day time

4846. By Matthew Gates on 2010-12-06

prevent .bzrignore from ending up in source package

4847. By Matthew Gates on 2010-12-06

suppress CMakeLists.txt.user in source package

4848. By Fabien Chéreau on 2010-12-06

Attempted to fix text display error

4849. By treaves on 2010-12-09

Corrected the calculation for the X-axis FOV for CCDs.

4850. By Bogdan Marinov on 2010-12-13

the default Inno Setup file should not include a SQLite driver; bzr ignore the auto-generated Inno Setup file

4851. By Matthew Gates on 2010-12-13

fix ugly indentation / a few comments

4852. By Matthew Gates on 2010-12-19

ignore core files

4853. By treaves on 2010-12-20

Corrected the calculation of CCD FOV.
Updated the CCD painting code; will allow for non-ocular use.

4854. By treaves on 2010-12-21

Corrected the calculation for the aspect of the CCD.
Changed the CCD label on-screen to be the degrees the CCD covers.

4855. By treaves on 2010-12-21

Implemented rotating the CCD bounding box.

4856. By treaves on 2010-12-21

Corrected typo.

4857. By treaves on 2010-12-30

Implemented better binoculars support; the Ocular object now has an attribute that may be set if the eyepiece is a pair of binoculars. This causes the current telescope to be ignored, so users no longer have to worry about how to set this up. Inlcudes UI configuration, and changes to default ini file.

4858. By treaves on 2010-12-30

Put back the line to draw the CCD frame.
Added code to prevent the deletion of the last telescope or ocular from the configurtion dialog.

4859. By treaves on 2011-01-05

This code changes the callback used when an object changes to a SIGNAL/SLOT. This commit changes the base functionalirty in StelObjectMgr, as well as all classes that were using the callback.

This is one step in making the app more fully Qt-like, and hopefully to clean up the design & simplify.

4860. By treaves on 2011-01-10

Overhauled Oculars:
-- removed no longer needed StelDialiog replacemnet
-- removed key bindings
-- added popup menu
-- better binocular support
-- better CCD support

4861. By treaves on 2011-01-11

Remove QtSql from Mac bundle script.

4862. By diego-marcos <email address hidden> on 2011-01-11

Adding exception for libintl.dylib when copying dependencies from /usr/lib

4863. By treaves on 2011-01-12

Trivial code cleanup.

4864. By treaves on 2011-01-13

Made Telrad & CCD mutually exclusive.

4865. By treaves on 2011-01-14

Put the plugins in the cmake file alphabetical order.

4866. By treaves on 2011-01-14

Corrected an issue with switching to an index eyepiece.

4867. By Bogdan Marinov on 2011-01-16

fixed MPES online search (the MPC changed their server address)

4868. By diego-marcos <email address hidden> on 2011-01-24

Adding QtWebKit dependency for SVMT

4869. By Bogdan Marinov on 2011-01-24

fix bug caused by locale settings breaking the rendering of old style landscapes on Ubuntu

4870. By treaves on 2011-01-25

Undo the changes Diego made not related to QtWebKit.
Added some code to the APPLE section, to make it easier for developers to know what options are available.

4871. By treaves on 2011-02-01

Refactoring to use signals/slots for module-related functionality.

4872. By treaves on 2011-02-02

Repaint the stackedWidget after language change.

4873. By treaves on 2011-02-04

Updated the info.plist for Mac to set the minimum OS to 10.5.0.

4874. By treaves on 2011-02-05

Directly setting Oculars config window visible when config button pressed, instead of using an action.

4875. By treaves on 2011-02-07

Corrected a scoping error in two-phase name lookup.

4876. By Bogdan Marinov on 2011-02-22

TimeZone plugin 0.0.2: fixed bugs, implemented missing features

4877. By Bogdan Marinov on 2011-02-28

improved scripting documentation

4878. By FreewareTips <email address hidden> on 2011-03-07

merged two new skyculture descriptions in Norwegian (Bokmål) by "FreewareTips"

4879. By treaves on 2011-03-24

Added a setting to allow enableing of zoom with no object selected.

4880. By treaves on 2011-04-16

This is for the https://blueprints.launchpad.net/stellarium/+spec/search-go-to-redesign blueprint.

4881. By treaves on 2011-04-17

Added label to the search dialog for the Greek keyboard.

4882. By treaves on 2011-04-20

Updated the po files, including removing '\r' that was in three of them.
Adjusted searchDialogGui.ui to be 540 pixels wide, to allow for languages with wide characters (i.e. Russion).
Added searchDialogGui.ui CSS changes to the nightStyle.css file.

4883. By Fabien Chéreau on 2011-05-13

Merged planet satellites patch by Alexwolf.

Unmerged revisions

=== modified file 'plugins/AngleMeasure/src/AngleMeasure.cpp'
--- plugins/AngleMeasure/src/AngleMeasure.cpp	2010-06-01 09:25:33 +0000
+++ plugins/AngleMeasure/src/AngleMeasure.cpp	2010-11-17 14:15:14 +0000
@@ -54,10 +54,10 @@
 
 	StelPluginInfo info;
 	info.id = "AngleMeasure";
-	info.displayedName = "Angle Measure";
+	info.displayedName = q_("Angle Measure");
 	info.authors = "Matthew Gates";
 	info.contact = "http://porpoisehead.net/";
-	info.description = "Provides an angle measurement tool";
+	info.description = q_("Provides an angle measurement tool");
 	return info;
 }
 

=== modified file 'plugins/CompassMarks/src/CompassMarks.cpp'
--- plugins/CompassMarks/src/CompassMarks.cpp	2010-11-10 14:21:45 +0000
+++ plugins/CompassMarks/src/CompassMarks.cpp	2010-11-17 14:15:14 +0000
@@ -54,10 +54,10 @@
 
 	StelPluginInfo info;
 	info.id = "CompassMarks";
-	info.displayedName = "Compass Marks";
+	info.displayedName = q_("Compass Marks");
 	info.authors = "Matthew Gates";
 	info.contact = "http://porpoisehead.net/";
-	info.description = "Displays compass bearing marks along the horizon";
+	info.description = q_("Displays compass bearing marks along the horizon");
 	return info;
 }
 

=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2010-10-29 14:07:17 +0000
+++ plugins/Oculars/src/Oculars.cpp	2010-11-17 14:15:14 +0000
@@ -26,6 +26,7 @@
 #include "StelModuleMgr.hpp"
 #include "StelMovementMgr.hpp"
 #include "StelObjectMgr.hpp"
+#include "StelLocaleMgr.hpp"
 #include "StelPainter.hpp"
 #include "StelProjector.hpp"
 #include "StelGui.hpp"
@@ -70,10 +71,10 @@
 
 	StelPluginInfo info;
 	info.id = "Oculars";
-	info.displayedName = "Ocular";
+	info.displayedName = q_("Ocular");
 	info.authors = "Timothy Reaves";
 	info.contact = "[e-mail]";
-	info.description = "Shows the sky as if looking through a telescope eyepiece";
+	info.description = q_("Shows the sky as if looking through a telescope eyepiece");
 	return info;
 }
 

=== modified file 'plugins/Satellites/src/Satellites.cpp'
--- plugins/Satellites/src/Satellites.cpp	2010-11-14 18:23:46 +0000
+++ plugins/Satellites/src/Satellites.cpp	2010-11-17 14:15:14 +0000
@@ -26,6 +26,7 @@
 #include "StelNavigator.hpp"
 #include "StelObjectMgr.hpp"
 #include "StelModuleMgr.hpp"
+#include "StelLocaleMgr.hpp"
 #include "StelFileMgr.hpp"
 #include "StelTextureMgr.hpp"
 #include "StelIniParser.hpp"
@@ -62,10 +63,10 @@
 
 		StelPluginInfo info;
 		info.id = "Satellites";
-		info.displayedName = "Satellites";
+		info.displayedName = q_("Satellites");
 		info.authors = "Matthew Gates, Jose Luis Canales";
 		info.contact = "http://stellarium.org/";
-		info.description = "Prediction of artificial satellite positions in Earth orbit based on NORAD TLE data";
+		info.description = q_("Prediction of artificial satellite positions in Earth orbit based on NORAD TLE data");
 		return info;
 }
 

=== modified file 'plugins/SolarSystemEditor/src/SolarSystemEditor.cpp'
--- plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	2010-11-15 09:15:46 +0000
+++ plugins/SolarSystemEditor/src/SolarSystemEditor.cpp	2010-11-17 14:15:14 +0000
@@ -53,10 +53,10 @@
 	
 	StelPluginInfo info;
 	info.id = "SolarSystemEditor";
-	info.displayedName = "Solar System Editor";
+	info.displayedName = q_("Solar System Editor");
 	info.authors = "Bogdan Marinov";
 	info.contact = "http://stellarium.org";
-	info.description = "An interface for adding asteroids and comets to Stellarium. It can download object lists from the Minor Planet Center's website and perform searches in its online database. Still a work in progress.";
+	info.description = q_("An interface for adding asteroids and comets to Stellarium. It can download object lists from the Minor Planet Center's website and perform searches in its online database. Still a work in progress.");
 	return info;
 }
 

=== modified file 'plugins/TelescopeControl/src/TelescopeControl.cpp'
--- plugins/TelescopeControl/src/TelescopeControl.cpp	2010-07-16 15:39:54 +0000
+++ plugins/TelescopeControl/src/TelescopeControl.cpp	2010-11-17 14:15:14 +0000
@@ -72,10 +72,10 @@
 
 	StelPluginInfo info;
 	info.id = "TelescopeControl";
-	info.displayedName = "Telescope Control";
+	info.displayedName = q_("Telescope Control");
 	info.authors = "Bogdan Marinov, Johannes Gajdosik";
 	info.contact = "http://stellarium.org";
-	info.description = "This plug-in allows Stellarium to send \"slew\" commands to a telescope on a computerized mount (a \"GoTo telescope\").";
+	info.description = q_("This plug-in allows Stellarium to send \"slew\" commands to a telescope on a computerized mount (a \"GoTo telescope\").");
 	return info;
 }
 
@@ -164,48 +164,37 @@
 			revision 6311. Any future backports should account for that. */
 		QString group = N_("Telescope Control");
 
-		// "Slew to object" commands
-		gui->addGuiActions("actionMove_Telescope_To_Selection_1", N_("Move telescope #1 to selected object"), "Ctrl+1", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_2", N_("Move telescope #2 to selected object"), "Ctrl+2", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_3", N_("Move telescope #3 to selected object"), "Ctrl+3", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_4", N_("Move telescope #4 to selected object"), "Ctrl+4", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_5", N_("Move telescope #5 to selected object"), "Ctrl+5", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_6", N_("Move telescope #6 to selected object"), "Ctrl+6", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_7", N_("Move telescope #7 to selected object"), "Ctrl+7", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_8", N_("Move telescope #8 to selected object"), "Ctrl+8", group, false, false);
-		gui->addGuiActions("actionMove_Telescope_To_Selection_9", N_("Move telescope #9 to selected object"), "Ctrl+9", group, false, false);
-
-		// "Slew to the center of the screen" commands
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_1", N_("Move telescope #1 to the point currently in the center of the screen"), "Alt+1", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_2", N_("Move telescope #2 to the point currently in the center of the screen"), "Alt+2", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_3", N_("Move telescope #3 to the point currently in the center of the screen"), "Alt+3", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_4", N_("Move telescope #4 to the point currently in the center of the screen"), "Alt+4", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_5", N_("Move telescope #5 to the point currently in the center of the screen"), "Alt+5", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_6", N_("Move telescope #6 to the point currently in the center of the screen"), "Alt+6", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_7", N_("Move telescope #7 to the point currently in the center of the screen"), "Alt+7", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_8", N_("Move telescope #8 to the point currently in the center of the screen"), "Alt+8", group, false, false);
-		gui->addGuiActions("actionSlew_Telescope_To_Direction_9", N_("Move telescope #9 to the point currently in the center of the screen"), "Alt+9", group, false, false);
-		
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_1"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_2"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_3"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_4"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_5"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_6"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_7"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_8"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-		connect(gui->getGuiActions("actionMove_Telescope_To_Selection_9"), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
-
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_1"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_2"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_3"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_4"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_5"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_6"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_7"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_8"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		connect(gui->getGuiActions("actionSlew_Telescope_To_Direction_9"), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
-		
+		QString STOtext, STCtext, STOaction, STCaction, STOctrl, STCctrl;
+		for (int i=1; i<10; i++)
+		{
+			// "Slew to object" commands
+			STOtext = q_("Move telescope #%1 to selected object").arg(i);
+			STOaction.append(QString("actionMove_Telescope_To_Selection_%1").arg(i));
+			STOctrl.append(QString("Ctrl+%1").arg(i));
+			gui->addGuiActions(STOaction, STOtext, STOctrl, group, false, false);
+		}
+
+		for (int i=1; i<10; i++)
+		{
+			// "Slew to the center of the screen" commands
+			STCtext = q_("Move telescope #%1 to the point currently in the center of the screen").arg(i);
+			STCaction.append(QString("actionSlew_Telescope_To_Direction_%1").arg(i));
+			STCctrl.append(QString("Alt+%1").arg(i));
+			gui->addGuiActions(STCaction, STCtext, STCctrl, group, false, false);
+		}
+
+		for (int i=1; i<10; i++)
+		{
+			STOaction.append(QString("actionMove_Telescope_To_Selection_%1").arg(i));
+			connect(gui->getGuiActions(STOaction), SIGNAL(triggered()), this, SLOT(slewTelescopeToSelectedObject()));
+		}
+
+		for (int i=1; i<10; i++)
+		{
+			STCaction.append(QString("actionSlew_Telescope_To_Direction_%1").arg(i));
+			connect(gui->getGuiActions(STCaction), SIGNAL(triggered()), this, SLOT(slewTelescopeToViewDirection()));
+		}
+	
 		//Create and initialize dialog windows
 		telescopeDialog = new TelescopeDialog();
 		slewDialog = new SlewDialog();

=== modified file 'plugins/TextUserInterface/src/TextUserInterface.cpp'
--- plugins/TextUserInterface/src/TextUserInterface.cpp	2010-05-11 20:23:19 +0000
+++ plugins/TextUserInterface/src/TextUserInterface.cpp	2010-11-17 14:15:14 +0000
@@ -76,10 +76,10 @@
 {
 	StelPluginInfo info;
 	info.id = "TextUserInterface";
-	info.displayedName = "Text User Interface";
+	info.displayedName = q_("Text User Interface");
 	info.authors = "Matthew Gates";
 	info.contact = "http://porpoisehead.net/";
-	info.description = "Plugin implementation of 0.9.x series Text User Interface (TUI), used in planetarium systems";
+	info.description = q_("Plugin implementation of 0.9.x series Text User Interface (TUI), used in planetarium systems");
 	return info;
 }
 

=== modified file 'plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp'
--- plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp	2010-11-08 15:24:12 +0000
+++ plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp	2010-11-17 14:15:14 +0000
@@ -38,10 +38,10 @@
 
 	StelPluginInfo info;
 	info.id = "TimeZoneConfiguration";
-	info.displayedName = "Time Zone";
+	info.displayedName = q_("Time Zone");
 	info.authors = "Bogdan Marinov";
 	info.contact = "http://stellarium.org";
-	info.description = "A convenient interface for some of the more obscure options in Stellarium's configuration file. Allows setting the time zone and changing the way the time and the date are displayed in the bottom bar.";
+	info.description = q_("A convenient interface for some of the more obscure options in Stellarium's configuration file. Allows setting the time zone and changing the way the time and the date are displayed in the bottom bar.");
 	return info;
 }
 

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2010-09-28 16:27:56 +0000
+++ po/stellarium/POTFILES.in	2010-11-17 14:15:14 +0000
@@ -29,4 +29,11 @@
 src/ui_viewDialog.h
 src/ui_configurationDialog.h
 src/ui_addRemoveLandscapesDialog.h
-
+plugins/AngleMeasure/src/AngleMeasure.cpp
+plugins/CompassMarks/src/CompassMarks.cpp
+plugins/Oculars/src/Oculars.cpp
+plugins/Satellites/src/Satellites.cpp
+plugins/TelescopeControl/src/TelescopeControl.cpp
+plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp
+plugins/TextUserInterface/src/TextUserInterface.cpp
+plugins/SolarSystemEditor/src/SolarSystemEditor.cpp

=== modified file 'po/stellarium/stellarium.pot'
--- po/stellarium/stellarium.pot	2010-11-13 09:15:36 +0000
+++ po/stellarium/stellarium.pot	2010-11-17 14:15:14 +0000
@@ -8,11 +8,10 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-11 15:20+0200\n"
+"POT-Creation-Date: 2010-11-17 20:10+0600\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-Transfer-Encoding: 8bit\n"
@@ -980,335 +979,390 @@
 msgid "Solar System Observer"
 msgstr ""
 
+#. TRANSLATORS: Asteroid (5) Astraea
 #: src/translations.h:73
+msgid "Astraea"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (6) Hebe
+#: src/translations.h:75
+msgid "Hebe"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (7) Iris
+#: src/translations.h:77
+msgid "Iris"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (8) Flora
+#: src/translations.h:79
+msgid "Flora"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (9) Metis
+#: src/translations.h:81
+msgid "Metis"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (10) Hygiea
+#: src/translations.h:83
+msgid "Hygiea"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (1221) Amor
+#: src/translations.h:85
+msgid "Amor"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (99942) Apophis
+#: src/translations.h:87
+msgid "Apophis"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (2060) Chiron
+#: src/translations.h:89
+msgid "Chiron"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (433) Eros
+#: src/translations.h:91
+msgid "Eros"
+msgstr ""
+
+#. TRANSLATORS: Asteroid (624) Hektor
+#: src/translations.h:93
+msgid "Hektor"
+msgstr ""
+
+#: src/translations.h:97
 msgid "N"
 msgstr ""
 
-#: src/translations.h:74
+#: src/translations.h:98
 msgid "S"
 msgstr ""
 
-#: src/translations.h:75
+#: src/translations.h:99
 msgid "E"
 msgstr ""
 
-#: src/translations.h:76
+#: src/translations.h:100
 msgid "W"
 msgstr ""
 
-#: src/translations.h:79
+#: src/translations.h:103
 msgid "Aztec"
 msgstr ""
 
-#: src/translations.h:80
+#: src/translations.h:104
 msgid "Chinese"
 msgstr ""
 
-#: src/translations.h:81
+#: src/translations.h:105
 msgid "Egyptian"
 msgstr ""
 
-#: src/translations.h:82
+#: src/translations.h:106
 msgid "Inuit"
 msgstr ""
 
-#: src/translations.h:83
+#: src/translations.h:107
 msgid "Korean"
 msgstr ""
 
-#: src/translations.h:84
+#: src/translations.h:108
 msgid "Lakota"
 msgstr ""
 
-#: src/translations.h:85
+#: src/translations.h:109
 msgid "Maori"
 msgstr ""
 
-#: src/translations.h:86
+#: src/translations.h:110
 msgid "Navajo"
 msgstr ""
 
-#: src/translations.h:87
+#: src/translations.h:111
 msgid "Norse"
 msgstr ""
 
-#: src/translations.h:88
+#: src/translations.h:112
 msgid "Polynesian"
 msgstr ""
 
-#: src/translations.h:89
+#: src/translations.h:113
 msgid "Sami"
 msgstr ""
 
-#: src/translations.h:90
+#: src/translations.h:114
 msgid "Tupi-Guarani"
 msgstr ""
 
-#: src/translations.h:91
+#: src/translations.h:115
 msgid "Western"
 msgstr ""
 
-#: src/translations.h:95
+#: src/translations.h:119
 msgid "Set Location "
 msgstr ""
 
-#: src/translations.h:96
+#: src/translations.h:120
 msgid "Set Time "
 msgstr ""
 
-#: src/translations.h:97
+#: src/translations.h:121
 msgid "General "
 msgstr ""
 
-#: src/translations.h:98
+#: src/translations.h:122
 msgid "Stars "
 msgstr ""
 
-#: src/translations.h:99
+#: src/translations.h:123
 msgid "Colors "
 msgstr ""
 
-#: src/translations.h:100
+#: src/translations.h:124
 msgid "Effects "
 msgstr ""
 
-#: src/translations.h:101
+#: src/translations.h:125
 msgid "Scripts "
 msgstr ""
 
-#: src/translations.h:102
+#: src/translations.h:126
 msgid "Administration "
 msgstr ""
 
-#: src/translations.h:104
+#: src/translations.h:128
 msgid "Latitude: "
 msgstr ""
 
-#: src/translations.h:105
+#: src/translations.h:129
 msgid "Longitude: "
 msgstr ""
 
-#: src/translations.h:106
+#: src/translations.h:130
 msgid "Altitude (m): "
 msgstr ""
 
-#: src/translations.h:107
+#: src/translations.h:131
 msgid "Solar System Body: "
 msgstr ""
 
-#: src/translations.h:109
+#: src/translations.h:133
 msgid "Sky Time: "
 msgstr ""
 
-#: src/translations.h:110
+#: src/translations.h:134
 msgid "Set Time Zone: "
 msgstr ""
 
-#: src/translations.h:111
+#: src/translations.h:135
 msgid "Day keys: "
 msgstr ""
 
-#: src/translations.h:112
+#: src/translations.h:136
 msgid "Calendar"
 msgstr ""
 
-#: src/translations.h:113
+#: src/translations.h:137
 msgid "Sidereal"
 msgstr ""
 
-#: src/translations.h:114
+#: src/translations.h:138
 msgid "Preset Sky Time: "
 msgstr ""
 
-#: src/translations.h:115
+#: src/translations.h:139
 msgid "Sky Time At Start-up: "
 msgstr ""
 
-#: src/translations.h:116
+#: src/translations.h:140
 msgid "Actual Time"
 msgstr ""
 
-#: src/translations.h:117
+#: src/translations.h:141
 msgid "Preset Time"
 msgstr ""
 
-#: src/translations.h:118
+#: src/translations.h:142
 msgid "Time Display Format: "
 msgstr ""
 
-#: src/translations.h:119
+#: src/translations.h:143
 msgid "Date Display Format: "
 msgstr ""
 
-#: src/translations.h:121
+#: src/translations.h:145
 msgid "Sky Culture: "
 msgstr ""
 
-#: src/translations.h:122
+#: src/translations.h:146
 msgid "Sky Language: "
 msgstr ""
 
-#: src/translations.h:124
+#: src/translations.h:148
 msgid "Show: "
 msgstr ""
 
-#: src/translations.h:125
+#: src/translations.h:149
 msgid "Star Value Multiplier: "
 msgstr ""
 
-#: src/translations.h:126
+#: src/translations.h:150
 msgid "Magnitude Sizing Multiplier: "
 msgstr ""
 
-#: src/translations.h:127
+#: src/translations.h:151
 msgid "Maximum Magnitude to Label: "
 msgstr ""
 
-#: src/translations.h:128
+#: src/translations.h:152
 msgid "Twinkling: "
 msgstr ""
 
-#: src/translations.h:129
+#: src/translations.h:153
 msgid "Limiting Magnitude: "
 msgstr ""
 
-#: src/translations.h:131
+#: src/translations.h:155
 msgid "Constellation Lines"
 msgstr ""
 
-#: src/translations.h:132
+#: src/translations.h:156
 msgid "Constellation Names"
 msgstr ""
 
-#: src/translations.h:133
+#: src/translations.h:157
 msgid "Constellation Art Intensity"
 msgstr ""
 
-#: src/translations.h:134
+#: src/translations.h:158
 msgid "Constellation Boundaries"
 msgstr ""
 
-#: src/translations.h:135
+#: src/translations.h:159
 msgid "Cardinal Points"
 msgstr ""
 
-#: src/translations.h:136
+#: src/translations.h:160
 msgid "Planet Names"
 msgstr ""
 
-#: src/translations.h:137
+#: src/translations.h:161
 msgid "Planet Orbits"
 msgstr ""
 
-#: src/translations.h:138
+#: src/translations.h:162
 msgid "Planet Trails"
 msgstr ""
 
-#: src/translations.h:139
+#: src/translations.h:163
 msgid "Meridian Line"
 msgstr ""
 
-#: src/translations.h:140
+#: src/translations.h:164
 msgid "Azimuthal Grid"
 msgstr ""
 
-#: src/translations.h:141
+#: src/translations.h:165
 msgid "Equatorial Grid"
 msgstr ""
 
-#: src/translations.h:142
+#: src/translations.h:166
 msgid "Equator Line"
 msgstr ""
 
-#: src/translations.h:143
+#: src/translations.h:167
 msgid "Ecliptic Line"
 msgstr ""
 
-#: src/translations.h:144
+#: src/translations.h:168
 msgid "Nebula Names"
 msgstr ""
 
-#: src/translations.h:145
+#: src/translations.h:169
 msgid "Nebula Circles"
 msgstr ""
 
-#: src/translations.h:147
+#: src/translations.h:171
 msgid "Light Pollution Luminance: "
 msgstr ""
 
-#: src/translations.h:148
+#: src/translations.h:172
 msgid "Landscape: "
 msgstr ""
 
-#: src/translations.h:149
+#: src/translations.h:173
 msgid "Manual zoom: "
 msgstr ""
 
-#: src/translations.h:150
+#: src/translations.h:174
 msgid "Object Sizing Rule: "
 msgstr ""
 
-#: src/translations.h:151
+#: src/translations.h:175
 msgid "Magnitude Scaling Multiplier: "
 msgstr ""
 
-#: src/translations.h:152
+#: src/translations.h:176
 msgid "Milky Way intensity: "
 msgstr ""
 
-#: src/translations.h:153
+#: src/translations.h:177
 msgid "Maximum Nebula Magnitude to Label: "
 msgstr ""
 
-#: src/translations.h:154
+#: src/translations.h:178
 msgid "Zoom Duration: "
 msgstr ""
 
-#: src/translations.h:155
+#: src/translations.h:179
 msgid "Cursor Timeout: "
 msgstr ""
 
-#: src/translations.h:156
+#: src/translations.h:180
 msgid "Correct for light travel time: "
 msgstr ""
 
-#: src/translations.h:158
+#: src/translations.h:182
 msgid "Local Script: "
 msgstr ""
 
-#: src/translations.h:159
+#: src/translations.h:183
 msgid "CD/DVD Script: "
 msgstr ""
 
-#: src/translations.h:160
+#: src/translations.h:184
 msgid "USB Script: "
 msgstr ""
 
-#: src/translations.h:161
+#: src/translations.h:185
 msgid "Arrow down to load list."
 msgstr ""
 
-#: src/translations.h:162
+#: src/translations.h:186
 msgid "Select and exit to run."
 msgstr ""
 
-#: src/translations.h:164
+#: src/translations.h:188
 msgid "Load Default Configuration: "
 msgstr ""
 
-#: src/translations.h:165
+#: src/translations.h:189
 msgid "Save Current Configuration as Default: "
 msgstr ""
 
-#: src/translations.h:166
+#: src/translations.h:190
 msgid "Shut Down: "
 msgstr ""
 
-#: src/translations.h:167
+#: src/translations.h:191
 msgid "Update me via Internet: "
 msgstr ""
 
-#: src/translations.h:168
+#: src/translations.h:192
 msgid "Set UI Locale: "
 msgstr ""
 
@@ -1895,3 +1949,142 @@
 "WARNING: Removing the selected landscape means deleting its files. This "
 "operation is irreversible."
 msgstr ""
+
+#: plugins/AngleMeasure/src/AngleMeasure.cpp:57
+msgid "Angle Measure"
+msgstr ""
+
+#: plugins/AngleMeasure/src/AngleMeasure.cpp:60
+msgid "Provides an angle measurement tool"
+msgstr ""
+
+#: plugins/AngleMeasure/src/AngleMeasure.cpp:121
+msgid "Angle measure"
+msgstr ""
+
+#: plugins/CompassMarks/src/CompassMarks.cpp:57
+msgid "Compass Marks"
+msgstr ""
+
+#: plugins/CompassMarks/src/CompassMarks.cpp:60
+msgid "Displays compass bearing marks along the horizon"
+msgstr ""
+
+#: plugins/CompassMarks/src/CompassMarks.cpp:121
+msgid "Compass marks"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:74
+msgid "Ocular"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:77
+msgid "Shows the sky as if looking through a telescope eyepiece"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:569
+msgid "Enable ocular"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:576
+msgid "Configuration Window"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:583
+msgid "Display Telrad"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:618
+msgid "Toggle Crosshair"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:623
+msgid "Select next sensor"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:627
+msgid "Select previous sensor"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:631
+msgid "Select next ocular"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:635
+msgid "Select previous ocular"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:639
+msgid "Select next telescope"
+msgstr ""
+
+#: plugins/Oculars/src/Oculars.cpp:643
+msgid "Select previous telescope"
+msgstr ""
+
+#: plugins/Satellites/src/Satellites.cpp:66
+msgid "Satellites"
+msgstr ""
+
+#: plugins/Satellites/src/Satellites.cpp:69
+msgid ""
+"Prediction of artificial satellite positions in Earth orbit based on NORAD "
+"TLE data"
+msgstr ""
+
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:75
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:165
+msgid "Telescope Control"
+msgstr ""
+
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:78
+msgid ""
+"This plug-in allows Stellarium to send \"slew\" commands to a telescope on a "
+"computerized mount (a \"GoTo telescope\")."
+msgstr ""
+
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:171
+#, qt-format
+msgid "Move telescope #%1 to selected object"
+msgstr ""
+
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:180
+#, qt-format
+msgid "Move telescope #%1 to the point currently in the center of the screen"
+msgstr ""
+
+#: plugins/TelescopeControl/src/TelescopeControl.cpp:203
+msgid "Move a telescope to a given set of coordinates"
+msgstr ""
+
+#: plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp:41
+msgid "Time Zone"
+msgstr ""
+
+#: plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp:44
+msgid ""
+"A convenient interface for some of the more obscure options in Stellarium's "
+"configuration file. Allows setting the time zone and changing the way the "
+"time and the date are displayed in the bottom bar."
+msgstr ""
+
+#: plugins/TextUserInterface/src/TextUserInterface.cpp:79
+msgid "Text User Interface"
+msgstr ""
+
+#: plugins/TextUserInterface/src/TextUserInterface.cpp:82
+msgid ""
+"Plugin implementation of 0.9.x series Text User Interface (TUI), used in "
+"planetarium systems"
+msgstr ""
+
+#: plugins/SolarSystemEditor/src/SolarSystemEditor.cpp:56
+msgid "Solar System Editor"
+msgstr ""
+
+#: plugins/SolarSystemEditor/src/SolarSystemEditor.cpp:59
+msgid ""
+"An interface for adding asteroids and comets to Stellarium. It can download "
+"object lists from the Minor Planet Center's website and perform searches in "
+"its online database. Still a work in progress."
+msgstr ""