Resolve merge conflicts

Author: Gizmoobs

data/base_locations.bin.gz

@@ -33144,7 +33144,7 @@ Bisdee Tier Optical Astronomy Observatory	Tasmania	21	O	0	42.425833S	147.288611E
 Bordeaux Observatory		20	O	0	44.8349N	0.526W	0	1	Europe/Paris
 Bosscha Observatory	West Java	14	O	0	6.824444S	107.615556E	1310	1	Asia/Jakarta
 Bowman Observatory	Connecticut	09	O	0	41.032389N	73.621111W	0	1	America/New_York
-Boyden Observatory	Bloemfontein	04	O	0	29.038831S	E26.404722	1372	1	Africa/Johannesburg
+Boyden Observatory	Bloemfontein	04	O	0	29.038831S	26.404722E	1372	1	Africa/Johannesburg
 Bradstreet Observatory	Pennsylvania	09	O	0	40.050278N	75.368889W	0	1	America/New_York
 Bradley Observatory	Georgia	09	O	0	33.765233N	84.294161W	315	1	America/New_York
 Braeside Observatory	Arizona	09	O	0	35.191667N	111.748333W	2274	1	America/Phoenix

data/base_locations.txt

@@ -27828,6 +27828,8 @@ Titan	15360	_("Aura Undae","unda")	UN	13.790000	133.140000	490	_("Greek Titanis
 Titan	14898	_("Boreas Undae","unda")	UN	-6.000000	145.000000	260	_("Greek god of the north wind.","origin")
 # TRANSLATORS: (Titan); Greek personification of the gentle west wind.
 Titan	14900	_("Zephyrus Undae","unda")	UN	-8.500000	142.900000	130	_("Greek personification of the gentle west wind.","origin")
+# TRANSLATORS: (Titan); Mayan deity who locks up the crop-destroying winds.
+Titan	16446	_("Ahmakiq Undae","unda")	UN	2.220000	157.300000	812	_("Mayan deity who locks up the crop-destroying winds.","origin")
 # TRANSLATORS: (Titan); Greek god of the south or southwest wind.
 Titan	14901	_("Notus Undae","unda")	UN	-10.000000	148.900000	530	_("Greek god of the south or southwest wind.","origin")
 # TRANSLATORS: (Titan); Greek personification of the east wind.

data/nomenclature.dat

@@ -1350,6 +1350,18 @@ \subsection{The Ephemeris Tab}
 	\label{fig:gui:AstroCalc:Ephemeris:Asteroids}
 \end{figure}
 
+\begin{figure}[p]
+	\centering\includegraphics[width=0.95\textwidth]{astrocalc_dialog_ephemeris_sun_at_altitude.png}
+	\caption{Astronomical Calculations (AstroCalc): Venus when Sun is at the end of civil twilight (-6°)}
+	\label{fig:gui:AstroCalc:Ephemeris:SunAtAltitude}
+\end{figure}
+
+\begin{figure}[p]
+	\centering\includegraphics[width=0.95\textwidth]{astrocalc_dialog_ephemeris_planet_opposition.png}
+	\caption{Astronomical Calculations (AstroCalc): Points of Saturn's oppositions during a few decades}
+	\label{fig:gui:AstroCalc:Ephemeris:PlanetOpposition}
+\end{figure}
+
 Another interesting option in this tool: using horizontal coordinates for plotting traces of the Solar system objects. 
 In this mode, the circle marks are not linked to the sky, but to the horizontal coordinate system.
 For example, you can get an analemma of the Sun for any location (Fig.~\ref{fig:gui:AstroCalc:Ephemeris:Analemma}
@@ -1364,6 +1376,22 @@ \subsection{The Ephemeris Tab}
 In consequence, e.g.\ magnitudes may be affected by atmospheric absorption and may show unexpected values. 
 Remember to switch off atmosphere etc.\ to create extinction free geocentric mean positions as found in almanachs.
 
+Two time steps \newFeature{26.2} require a bit of care to display well. The \emph{Sun at preset altitude} displays
+an object's position when the Sun is at a specific altitude relative to the horizon. Once selected from the list of time steps, 
+the \guibutton[0.6]{0.1}{uibtTime.png}~\emph{Custom interval} window is enabled, and a preset solar altitude can be selected 
+(only values $ \le 0^\circ$ are valid), and the ephemeris is computed accordingly. If the Sun never reaches the altitude selected,
+during the specified interval, e.g. $ -12^\circ$ during Scandinavian summer solstice, no marker is drawn. 
+(Fig.~\ref{fig:gui:AstroCalc:Ephemeris:SunAtAltitude}).
+Using it as intended requires the ephemeris to be drawn in horizontal coordinates!
+
+The other time step that requires some care is the \emph{Opposition of planet}. This is useful for displaying where
+and when a planet will be at its opposition for a given year in relation to background stars. For it to make sense, 
+the planet in question needs to be selected both in the ephemeris list and in the \emph{Custom interval} window 
+Fig.~\ref{fig:gui:AstroCalc:Ephemeris:PlanetOpposition}.
+
+It is only applicable for the outer planets, i.e. Mars through Neptune. The computation is quite intense, so showing 
+e.g. Neptune oppositions throughout its 165 year orbit might take a while if you're on a weak system.
+
 \subsection{The ``Risings, Transits, and Settings'' (RTS) Tab}
 \label{sec:gui:AstroCalc:RTS}
 

data/nomenclature.fab

@@ -199,10 +199,13 @@ \section{Time Navigator Plugin}
 \label{sec:plugins:TimeNavigator}
 
 \begin{figure}[th]\centering
-\includegraphics[width=.45\textwidth]{TimeNavigatorplugin_tab1.jpg}
-\hfill
-\includegraphics[width=.45\textwidth]{TimeNavigatorplugin_tab2.jpg}
-\caption{Interface of Time Navigator plugin: Time Steps tab (left) and Specific Time tab (right)}
+\includegraphics[height=74mm]{TimeNavigatorplugin_tab1.jpg}
+%\hfill
+\includegraphics[height=74mm]{TimeNavigatorplugin_tab2.jpg}
+%\hfill
+\includegraphics[height=74mm]{TimeNavigatorplugin_tab3.jpg}
+
+\caption{Interface of Time Navigator plugin: Time Steps tab (left), Specific Time tab (center), and Planetary Events (right)}
 \label{fig:TimeNavigator}
 \end{figure}
 
@@ -220,19 +223,19 @@ \section{Time Navigator Plugin}
 its meridian transit, as well as buttons for specific twilight moments.
 
 
-\newpage
+%\newpage
 
 The third tab \menu{Planetary Events} shows step buttons for some interesting
 planetary events, such as oppositions for outer planets and greatest elongations
 for inner planets. For the Moon, the four phases (new, first quarter, full, last quarter)
 and times for apogee and perigee are shown, as well as times for Earth aphelion 
 and perihelion. Clicking any of these buttons sets the time to that of the event.
 
-\begin{figure}[th]\centering
-\includegraphics[width=.6\textwidth]{TimeNavigatorplugin_tab3.jpg}
-\caption{The Planetary Events tab}
-\label{fig:TimeNavigator}
-\end{figure}
+%\begin{figure}[th]\centering
+%\includegraphics[width=.6\textwidth]{TimeNavigatorplugin_tab3.jpg}
+%\caption{The Planetary Events tab}
+%\label{fig:TimeNavigator:PEvents}
+%\end{figure}
 
 \newpage
 
@@ -245,9 +248,6 @@ \section{Text User Interface Plugin}
 Stellarium, an unobtrusive menu used primarily by planetarium system
 operators to change settings, run scripts and so on.
 
-A full list of the commands for the TUI plugin is
-given in section~\ref{sec:plugins:TUI:commands}. 
-
 \subsection{Using the Text User Interface}
 \label{sec:plugins:TUI:using}
 

guide/Images/astrocalc_dialog_ephemeris_planet_opposition.png

@@ -595,7 +595,7 @@ Vec3f Exoplanet::getInfoColor(void) const
 float Exoplanet::getVMagnitude(const StelCore* core) const
 {
 	Q_UNUSED(core)
-	return (distributionMode ? 4.f : (isVMagnitudeDefined() ? static_cast<float>(Vmag) : 6.f));
+	return (isVMagnitudeDefined() ? static_cast<float>(Vmag) : 6.f);
 }
 
 bool Exoplanet::isVMagnitudeDefined() const
@@ -641,7 +641,7 @@ void Exoplanet::draw(StelCore* core, StelPainter *painter)
 
 	StelSkyDrawer* sd = core->getSkyDrawer();
 	const float mlimit = sd->getLimitMagnitude();
-	const float mag = getVMagnitudeWithExtinction(core);
+	const float mag = (distributionMode ? 4.f : getVMagnitudeWithExtinction(core));
 	const float shift = 8.f;
 
 	if (mag <= mlimit)