diff -Nru opencpn-plugin-celestial-2.0.0/CelestialNavigation.fbp opencpn-plugin-celestial-2.3.0/CelestialNavigation.fbp --- opencpn-plugin-celestial-2.0.0/CelestialNavigation.fbp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/CelestialNavigation.fbp 2018-03-29 17:18:40.000000000 +0000 @@ -2,7 +2,7 @@ - + ; wxWTranslateCatalog.h C++ 1 source_name @@ -44,7 +44,7 @@ CelestialNavigationDialogBase - 500,250 + 500,294 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Celestial Navigation Sights @@ -159,7 +159,7 @@ 1 - protected + public 1 Resizable @@ -358,7 +358,7 @@ 0 0 wxID_ANY - Edit + Fix 0 @@ -366,7 +366,7 @@ 0 1 - m_bEditSight + m_bFix 1 @@ -387,7 +387,7 @@ - OnEdit + OnFix @@ -413,11 +413,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -446,7 +446,7 @@ 0 0 wxID_ANY - Delete + Duplicate 0 @@ -454,7 +454,7 @@ 0 1 - m_bDeleteSight + m_bDuplicateSight 1 @@ -475,7 +475,7 @@ - OnDelete + OnDuplicate @@ -534,7 +534,7 @@ 0 0 wxID_ANY - Delete All + Clock Offset 0 @@ -542,7 +542,7 @@ 0 1 - m_bDeleteAllSights + m_bClockOffset 1 @@ -563,7 +563,7 @@ - OnDeleteAll + OnClockOffset @@ -622,7 +622,7 @@ 0 0 wxID_ANY - Fix + Edit 0 @@ -630,7 +630,7 @@ 0 1 - m_bFix + m_bEditSight 1 @@ -651,7 +651,7 @@ - OnFix + OnEdit @@ -681,6 +681,93 @@ 5 wxALL|wxEXPAND 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Hide + + 0 + + + 0 + -1,-1 + 1 + m_tbHide + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + OnHide + + + + + 5 + wxALL|wxEXPAND + 0 1 1 @@ -710,7 +797,7 @@ 0 0 wxID_ANY - Clock Offset + Delete 0 @@ -718,7 +805,7 @@ 0 1 - m_bClockOffset + m_bDeleteSight 1 @@ -739,7 +826,7 @@ - OnClockOffset + OnDelete @@ -769,7 +856,7 @@ 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -786,6 +873,7 @@ 1 1 + 0 0 Dock 0 @@ -797,15 +885,15 @@ 0 0 wxID_ANY - Hide + Information 0 0 - -1,-1 + 1 - m_tbHide + m_bInformation 1 @@ -815,6 +903,7 @@ Resizable 1 + 0 @@ -822,10 +911,10 @@ wxFILTER_NONE wxDefaultValidator - 0 + OnInformation @@ -848,7 +937,6 @@ - OnHide @@ -885,7 +973,7 @@ 0 0 wxID_ANY - Information + Delete All 0 @@ -893,7 +981,7 @@ 0 1 - m_bInformation + m_bDeleteAllSights 1 @@ -914,7 +1002,7 @@ - OnInformation + OnDeleteAll @@ -1935,6 +2023,7 @@ sbSizer1 wxVERTICAL + 1 none @@ -2852,7 +2941,7 @@ - Time + Time (UT) 0 1 @@ -3604,6 +3693,7 @@ sbSizer2 wxVERTICAL + 1 none @@ -5236,7 +5326,7 @@ - + Recompute @@ -7287,6 +7377,7 @@ sbSizer6 wxVERTICAL + 1 none @@ -7392,6 +7483,7 @@ sbSizer7 wxVERTICAL + 1 none @@ -7497,13 +7589,14 @@ sbSizer8 wxVERTICAL + 1 none - + 5 wxALL 0 - + 1 1 1 @@ -7531,15 +7624,15 @@ 0 0 wxID_ANY - MyLabel 0 + 0 1 - m_stAltitude + m_tAltitude 1 @@ -7549,14 +7642,18 @@ Resizable 1 - + wxTE_READONLY 0 + + wxFILTER_NONE + wxDefaultValidator + + - -1 @@ -7579,6 +7676,10 @@ + + + + @@ -7594,13 +7695,14 @@ sbSizer9 wxVERTICAL + 1 none - + 5 wxALL 0 - + 1 1 1 @@ -7628,15 +7730,15 @@ 0 0 wxID_ANY - MyLabel 0 + 0 1 - m_stAzimuth + m_tAzimuth 1 @@ -7646,14 +7748,18 @@ Resizable 1 - + wxTE_READONLY 0 + + wxFILTER_NONE + wxDefaultValidator + + - -1 @@ -7676,16 +7782,20 @@ + + + + - + 5 wxALL 0 - + 1 1 1 @@ -7699,10 +7809,10 @@ 1 0 + 1 1 1 - 0 0 Dock 0 @@ -7714,7 +7824,7 @@ 0 0 wxID_ANY - Done + Boat Position 0 @@ -7722,7 +7832,7 @@ 0 1 - m_bDone + m_cbBoatPosition 1 @@ -7743,8 +7853,8 @@ - OnDone + @@ -7857,6 +7967,94 @@ + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Done + + 0 + + + 0 + + 1 + m_bDone + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDone + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8113,6 +8311,7 @@ sbSizer7 wxVERTICAL + 1 none @@ -9129,6 +9328,8 @@ OnUpdate + + @@ -9315,6 +9516,7 @@ sbSizer10 wxVERTICAL + 1 none diff -Nru opencpn-plugin-celestial-2.0.0/cmake/PluginConfigure.cmake opencpn-plugin-celestial-2.3.0/cmake/PluginConfigure.cmake --- opencpn-plugin-celestial-2.0.0/cmake/PluginConfigure.cmake 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/cmake/PluginConfigure.cmake 2018-03-29 17:18:40.000000000 +0000 @@ -16,6 +16,7 @@ MESSAGE (STATUS "*** Staging to build ${PACKAGE_NAME} ***") configure_file(cmake/version.h.in ${PROJECT_SOURCE_DIR}/src/version.h) +configure_file(cmake/wxWTranslateCatalog.h.in ${PROJECT_SOURCE_DIR}/src/wxWTranslateCatalog.h) SET(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" ) #SET(CMAKE_BUILD_TYPE Debug) diff -Nru opencpn-plugin-celestial-2.0.0/cmake/version.h.in opencpn-plugin-celestial-2.3.0/cmake/version.h.in --- opencpn-plugin-celestial-2.0.0/cmake/version.h.in 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/cmake/version.h.in 2018-03-29 17:18:40.000000000 +0000 @@ -1,3 +1,3 @@ -#define PLUGIN_VERSION_MAJOR ${VERSION_MAJOR} -#define PLUGIN_VERSION_MINOR ${VERSION_MINOR} -#define PLUGIN_VERSION_DATE "${VERSION_DATE}" +#define PLUGIN_VERSION_MAJOR ${PLUGIN_VERSION_MAJOR} +#define PLUGIN_VERSION_MINOR ${PLUGIN_VERSION_MINOR} +#define PLUGIN_VERSION_DATE "${PLUGIN_VERSION_DATE}" diff -Nru opencpn-plugin-celestial-2.0.0/cmake/wxWTranslateCatalog.h.in opencpn-plugin-celestial-2.3.0/cmake/wxWTranslateCatalog.h.in --- opencpn-plugin-celestial-2.0.0/cmake/wxWTranslateCatalog.h.in 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/cmake/wxWTranslateCatalog.h.in 2018-03-29 17:18:40.000000000 +0000 @@ -0,0 +1,42 @@ +/****************************************************************************** + * $Id: ocpn_draw_pi.h,v 1.0 2015/01/28 01:54:37 jongough Exp $ + * + * Project: OpenCPN + * Purpose: Redefine _() macro to allow usage of catalog + * Author: Jon Gough + * + *************************************************************************** + * Copyright (C) 2010 by David S. Register * + * $EMAIL$ * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + *************************************************************************** + */ +#ifndef _ODCATTRANS_H_ +#define _ODCATTRANS_H_ + +#ifndef WXINTL_NO_GETTEXT_MACRO +#ifdef _ +#undef _ +#endif // _ +#if wxCHECK_VERSION(3,0,0) +#define _(s) wxGetTranslation((s), wxS("opencpn-${PROJECT_NAME}")) +#else // wxCHECK_VERSION(3,0,0) + #define _(s) wxGetTranslation(wxT(s), wxT("opencpn-${PROJECT_NAME}")) +#endif // wxCHECK_VERSION(3,0,0) +#endif // WXINTL_NO_GETTEXT_MACRO + +#endif diff -Nru opencpn-plugin-celestial-2.0.0/CMakeLists.txt opencpn-plugin-celestial-2.3.0/CMakeLists.txt --- opencpn-plugin-celestial-2.0.0/CMakeLists.txt 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/CMakeLists.txt 2018-03-29 17:18:40.000000000 +0000 @@ -1,67 +1,65 @@ -##--------------------------------------------------------------------------- -## Author: Sean D'Epagnier -## Copyright: -## License: GPLv3 -##--------------------------------------------------------------------------- - - -# define minimum cmake version -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) - -PROJECT(celestial_navigation_pi) - -SET(PACKAGE_NAME celestial_navigation_pi) -SET(VERBOSE_NAME CelestialNavigation) -SET(TITLE_NAME CELESTIALNAVIGATION) -SET(CPACK_PACKAGE_CONTACT "Sean D'Epagnier ") - -MESSAGE (STATUS "*** Building ${PACKAGE_NAME} ***") - -INCLUDE( VERSION.cmake ) -SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" ) - -SET(VERSION_MAJOR ${PLUGIN_VERSION_MAJOR}) -SET(VERSION_MINOR "${PLUGIN_VERSION_MINOR}") -SET(VERSION_DATE ${PLUGIN_VERSION_DATE}) - -INCLUDE("cmake/PluginConfigure.cmake") - -SET(SRC_CELESTIAL_NAVIGATION - src/astrolabe/calendar.cpp - src/astrolabe/dicts.cpp - src/astrolabe/dynamical.cpp - src/astrolabe/elp2000.cpp - src/astrolabe/equinox.cpp - src/astrolabe/globals.cpp - src/astrolabe/nutation.cpp - src/astrolabe/riseset.cpp - src/astrolabe/sun.cpp - src/astrolabe/util.cpp - src/astrolabe/vsop87d.cpp - src/geomag/geomag.c - src/CelestialNavigationDialog.cpp - src/CelestialNavigationUI.cpp - src/SightDialog.cpp - src/Sight.cpp - src/icons.cpp - src/FindBodyDialog.cpp - src/FixDialog.cpp - src/ClockCorrectionDialog.cpp - src/geodesic.c - src/celestial_navigation_pi.cpp - ) - -IF(WIN32) -SET(SRC_TINYXML - src/tinyxml/tinyxml.cpp - src/tinyxml/tinyxmlparser.cpp - src/tinyxml/tinyxmlerror.cpp -) -ENDIF(WIN32) - -ADD_DEFINITIONS(-DTIXML_USE_STL) -ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_CELESTIAL_NAVIGATION} ${SRC_TINYXML}) - -INCLUDE("cmake/PluginInstall.cmake") -INCLUDE("cmake/PluginLocalization.cmake") -INCLUDE("cmake/PluginPackage.cmake") +##--------------------------------------------------------------------------- +## Author: Sean D'Epagnier +## Copyright: +## License: GPLv3 +##--------------------------------------------------------------------------- + + +# define minimum cmake version +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) + +PROJECT(celestial_navigation_pi) + +SET(PACKAGE_NAME celestial_navigation_pi) +SET(VERBOSE_NAME CelestialNavigation) +SET(TITLE_NAME CELESTIALNAVIGATION) +SET(CPACK_PACKAGE_CONTACT "Sean D'Epagnier ") + +MESSAGE (STATUS "*** Building ${PACKAGE_NAME} ***") + +INCLUDE( VERSION.cmake ) +SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" ) + +INCLUDE("cmake/PluginConfigure.cmake") + +SET(SRC_CELESTIAL_NAVIGATION + src/astrolabe/calendar.cpp + src/astrolabe/dicts.cpp + src/astrolabe/dynamical.cpp + src/astrolabe/elp2000.cpp + src/astrolabe/equinox.cpp + src/astrolabe/globals.cpp + src/astrolabe/nutation.cpp + src/astrolabe/riseset.cpp + src/astrolabe/sun.cpp + src/astrolabe/util.cpp + src/astrolabe/vsop87d.cpp + src/geomag/geomag.c + src/CelestialNavigationDialog.cpp + src/CelestialNavigationUI.cpp + src/SightDialog.cpp + src/Sight.cpp + src/icons.cpp + src/FindBodyDialog.cpp + src/FixDialog.cpp + src/ClockCorrectionDialog.cpp + src/geodesic.c + src/transform_star.cpp + src/epv00.cpp + src/celestial_navigation_pi.cpp + ) + +IF(WIN32) +SET(SRC_TINYXML + src/tinyxml/tinyxml.cpp + src/tinyxml/tinyxmlparser.cpp + src/tinyxml/tinyxmlerror.cpp +) +ENDIF(WIN32) + +ADD_DEFINITIONS(-DTIXML_USE_STL) +ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_CELESTIAL_NAVIGATION} ${SRC_TINYXML}) + +INCLUDE("cmake/PluginInstall.cmake") +INCLUDE("cmake/PluginLocalization.cmake") +INCLUDE("cmake/PluginPackage.cmake") diff -Nru opencpn-plugin-celestial-2.0.0/data/Celestial_Navigation_Information.html opencpn-plugin-celestial-2.3.0/data/Celestial_Navigation_Information.html --- opencpn-plugin-celestial-2.0.0/data/Celestial_Navigation_Information.html 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/data/Celestial_Navigation_Information.html 2018-03-29 17:18:40.000000000 +0000 @@ -6,7 +6,7 @@

Celestial Navigation Plugin for OpenCPN

Introduction

-

The plugin is designed to make celestial navigation possible and to provide a visual way to use and verify celestial measurements. Expanding on the concept of line of position, area of position incorporates measurement error. The plugin also displays the true positions (generally a circle, not a line). Also added is the ability to take sights based on bearing instead of altitude. +

The plugin is designed to make celestial navigation possible and to provide a visual way to use and verify celestial measurements. Expanding on the concept of line of position, area of position incorporates measurement error. The plugin also displays the true positions (generally a circle, not a line). An uncommon feature is the ability to take sights based on bearing instead of only altitude.

Taking a Sight

A sight is an angular measurement taken of an astronomical body using (typically) a sextant.

    @@ -37,7 +37,7 @@

Future Improvements

-

In the future I plan to implement lunar angle sights to determine time, show night/day areas, support for moon phases, and both solar and lunar eclipses, and the ability to generate almanacs. +

In the future I plan to implement computing area fixes, show night/day areas, support for moon phases, and both solar and lunar eclipses, alternate computation methods and the ability to generate almanacs.

About the Author diff -Nru opencpn-plugin-celestial-2.0.0/debian/changelog opencpn-plugin-celestial-2.3.0/debian/changelog --- opencpn-plugin-celestial-2.0.0/debian/changelog 2016-02-29 14:59:22.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/debian/changelog 2018-11-07 17:41:05.000000000 +0000 @@ -1,3 +1,33 @@ +opencpn-plugin-celestial (2.3.0-0~trusty1) trusty; urgency=low + + * v2.3 + + -- Pavel Kalian Wed, 07 Nov 2018 14:41:05 -0300 +opencpn-plugin-celestial (2.3.0-0~xenial1) xenial; urgency=low + + * v2.3 + + -- Pavel Kalian Wed, 07 Nov 2018 14:41:05 -0300 +opencpn-plugin-celestial (2.3.0-0~artful1) artful; urgency=low + + * v2.3 + + -- Pavel Kalian Wed, 07 Nov 2018 14:41:05 -0300 +opencpn-plugin-celestial (2.3.0-0~bionic1) bionic; urgency=low + + * v2.3 + + -- Pavel Kalian Wed, 07 Nov 2018 14:41:05 -0300 +opencpn-plugin-celestial (2.3.0-0~cosmic1) cosmic; urgency=low + + * v2.3 + + -- Pavel Kalian Wed, 07 Nov 2018 14:41:05 -0300 +opencpn-plugin-celestial (2.0.0-0~precise1) precise; urgency=low + + * v2.0 + + -- Pavel Kalian Mon, 29 Feb 2016 08:58:04 -0600 opencpn-plugin-celestial (2.0.0-0~trusty1) trusty; urgency=low * v2.0 diff -Nru opencpn-plugin-celestial-2.0.0/po/ca.po opencpn-plugin-celestial-2.3.0/po/ca.po --- opencpn-plugin-celestial-2.0.0/po/ca.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/ca.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-23 05:01-0400\n" "Last-Translator: nohal \n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -16,418 +16,356 @@ "X-Crowdin-Language: ca\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Tipus" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Astre" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Mesura" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Color" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "No s'ha pogut obrir el fitxer." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Fitxer xml no vàlid" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Node xml desconegut" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Weather Routing" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Error al desar fitxer xml: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Navegació astronòmica" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Azimut" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Altura" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Les observacions traslladades no s'utilitzen per calcular una solució, determina-la visualment.\n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Posició calculada" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sol" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Estàs segur que vols esborrar totes les observacions?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Solució per observacions visibles" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Latitud" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Longitud" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Error" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Inicial" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Alg" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Plana" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Esfera" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Con" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Con 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Calcular" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Nou" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Editar" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Esborrar" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Esborrar tot" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Informació" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altura" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimut" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Azimut magnètic" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Astre" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Trobar" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Limbo" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Inferior" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Central" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Superior" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Graus" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minuts" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Graus d'incertesa" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Observació" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Hores" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Segons" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Incertesa" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Traslladar" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Distància" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Nm" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Rumb" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Rumb magnètic" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Data i hora" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Transparència" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Config" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Alçada de l'ull" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Metres" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Temperatura" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celcius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Pressió" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "MiliBars" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Error d'índex" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Posar per defecte" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Paràmetres" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Càlculs" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitud" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitud" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MyLabel" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Fet" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnètic" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Solució per observacions visibles" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Error" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Inicial" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plana" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Esfera" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Con" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Con 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Calcular" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Observacions de navegació astronòmica" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Propietats d'observació" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Troba astre" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab ha fallat, dades no vàlides:\n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Has oblidat d'instalar vsop87d.txt?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "El Connector no treballarà correctament" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Alerta per fallada" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Dades de l'almanac per a " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Posició geogràfica (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Fòrmules utilitzades per calcular l'observació\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "Error de l'índex és %.4f graus\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -436,7 +374,7 @@ "Graus correcció alçada = 1.758*sqrt(%.4f) / 60.0\n" "Graus correcció alçada = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -449,7 +387,7 @@ "AltitudAparent = %.4f - %.4f - %.4f\n" "AltitudAparent = %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -462,7 +400,7 @@ "x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" "x = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -471,7 +409,7 @@ "Correcció per Refracció = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "Correcció per Refracció = %.4f\n" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -480,7 +418,7 @@ "Sol sel·leccionat, Correcció per Limb\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -493,22 +431,22 @@ "lc = 180/Pi * asin(Pi/180*SD)\n" "lc = %.4f\n" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Limb superior" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Limb inferior" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "Correcció per Limb = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -521,7 +459,7 @@ "Altura Corregida = %.4f - %.4f - %.4f\n" "Altura Corregida = %.4f\n" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -530,7 +468,7 @@ "Sol sel·leccionat, Correcció per paralatge\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -539,7 +477,7 @@ "Lluna sel·leccionada, Correcció per paralatge\n" "HP = %.4f\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -548,7 +486,7 @@ "Correcció per paralatge = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "Correcció per paralatge = %.4f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -561,114 +499,41 @@ "Altura Observada = %.4f - %.4f\n" "Altura Observada = %.4f\n" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Dades de l'almanac per a " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" -msgstr "" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" +msgstr "\n" +"Posició geogràfica (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Resolent situació de les observacions" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "S'ha establert una incertesa massa petita, l'observació pot no aparèixer " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Alerta" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "No s'ha pogut carregar el fitxer:\n" @@ -689,20 +554,7 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Les observacions traslladades no s'utilitzen per calcular una solució, determina-la visualment.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Posició calculada" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Connector Navegació Astronòmica per a OpenCPN.\n" +"Instala un calendari nàutic del Sol, Lluna, planetes i varis estels útils per a la navegació. Permet calcular la posició de l'usuari amb medicions astronòmiques." diff -Nru opencpn-plugin-celestial-2.0.0/po/celestial_navigation_pi.pot opencpn-plugin-celestial-2.3.0/po/celestial_navigation_pi.pot --- opencpn-plugin-celestial-2.0.0/po/celestial_navigation_pi.pot 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/celestial_navigation_pi.pot 2018-03-29 17:18:40.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: celestial_navigation_pi 2.0\n" +"Project-Id-Version: celestial_navigation_pi .\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" +"POT-Creation-Date: 2017-10-11 09:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,73 +17,69 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:130 src/CelestialNavigationUI.cpp:137 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:131 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 -msgid "Time (UTC)" +#: src/CelestialNavigationDialog.cpp:132 src/CelestialNavigationUI.cpp:328 +msgid "Time (UT)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:133 src/CelestialNavigationUI.cpp:184 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:134 src/CelestialNavigationUI.cpp:381 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 -msgid "Failed to load file." +#: src/CelestialNavigationDialog.cpp:203 src/celestial_navigation_pi.cpp:160 +msgid "Failed to load file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:208 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:260 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 -msgid "Weather Routing" +#: src/CelestialNavigationDialog.cpp:269 src/CelestialNavigationDialog.cpp:329 +#: src/CelestialNavigationDialog.cpp:469 src/Sight.cpp:1108 +#: src/celestial_navigation_pi.cpp:83 src/celestial_navigation_pi.cpp:136 +msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:328 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 -#: src/celestial_navigation_pi.cpp:152 -msgid "Celestial Navigation" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:351 +#: src/CelestialNavigationDialog.cpp:361 msgid "Time Correction" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:410 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:468 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:511 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 +#: src/CelestialNavigationDialog.cpp:517 msgid "Show" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 +#: src/CelestialNavigationDialog.cpp:517 src/CelestialNavigationUI.cpp:55 msgid "Hide" msgstr "" @@ -91,318 +87,318 @@ msgid "New" msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:43 src/CelestialNavigationUI.h:283 +msgid "Fix" msgstr "" #: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +msgid "Duplicate" msgstr "" #: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +msgid "Clock Offset" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:52 +msgid "Edit" msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:58 +msgid "Delete" msgstr "" #: src/CelestialNavigationUI.cpp:61 msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 +#: src/CelestialNavigationUI.cpp:64 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:141 src/CelestialNavigationUI.cpp:674 #: src/Sight.h:49 msgid "Altitude" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 +#: src/CelestialNavigationUI.cpp:141 src/CelestialNavigationUI.cpp:684 #: src/Sight.h:49 msgid "Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 +#: src/CelestialNavigationUI.cpp:141 src/Sight.h:49 msgid "Lunar" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:147 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:150 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:159 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:162 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:166 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:166 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:166 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:191 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:228 src/CelestialNavigationUI.cpp:235 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:194 src/CelestialNavigationUI.cpp:353 +#: src/CelestialNavigationUI.cpp:605 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:201 src/CelestialNavigationUI.cpp:283 +#: src/CelestialNavigationUI.cpp:444 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 +#: src/CelestialNavigationUI.cpp:205 msgid "10" msgstr "" -#: src/CelestialNavigationUI.cpp:203 +#: src/CelestialNavigationUI.cpp:208 msgid "Minutes Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 +#: src/CelestialNavigationUI.cpp:222 msgid "Lunar Altitude" msgstr "" -#: src/CelestialNavigationUI.cpp:226 +#: src/CelestialNavigationUI.cpp:231 msgid "Body Altitude" msgstr "" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:248 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:276 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:290 src/CelestialNavigationUI.cpp:308 +#: src/CelestialNavigationUI.cpp:867 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:298 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" - -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:335 src/CelestialNavigationUI.cpp:587 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:342 src/CelestialNavigationUI.cpp:594 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:346 src/CelestialNavigationUI.cpp:598 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:357 src/CelestialNavigationUI.cpp:609 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 +#: src/CelestialNavigationUI.cpp:364 msgid "DR Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:371 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:392 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:404 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:408 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:411 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:415 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:422 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:426 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:433 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:437 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:451 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:458 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:474 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 +#: src/CelestialNavigationUI.cpp:578 msgid "Shift all visible Sights" msgstr "" -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 +#: src/CelestialNavigationUI.cpp:656 src/CelestialNavigationUI.cpp:767 msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 +#: src/CelestialNavigationUI.cpp:665 src/CelestialNavigationUI.cpp:775 msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:676 src/CelestialNavigationUI.cpp:686 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:693 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:696 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 +#: src/CelestialNavigationUI.cpp:760 msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationUI.cpp:764 +#: src/CelestialNavigationUI.cpp:771 msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:772 +#: src/CelestialNavigationUI.cpp:779 msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:776 +#: src/CelestialNavigationUI.cpp:783 msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:780 +#: src/CelestialNavigationUI.cpp:787 msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 +#: src/CelestialNavigationUI.cpp:794 src/CelestialNavigationUI.cpp:801 msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:801 +#: src/CelestialNavigationUI.cpp:808 msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:806 +#: src/CelestialNavigationUI.cpp:813 msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:807 +#: src/CelestialNavigationUI.cpp:814 msgid "Sphere" msgstr "" -#: src/CelestialNavigationUI.cpp:808 +#: src/CelestialNavigationUI.cpp:815 msgid "Cone" msgstr "" -#: src/CelestialNavigationUI.cpp:809 +#: src/CelestialNavigationUI.cpp:816 msgid "Cone 2" msgstr "" -#: src/CelestialNavigationUI.cpp:813 +#: src/CelestialNavigationUI.cpp:820 msgid "Go" msgstr "" -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 +#: src/CelestialNavigationUI.cpp:857 src/CelestialNavigationUI.h:305 msgid "Clock Correction" msgstr "" -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:80 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 +#: src/CelestialNavigationUI.h:202 msgid "Dead Reckoning shift" msgstr "" -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:229 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:161 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:162 msgid "" "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:163 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:164 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 +#: src/Sight.cpp:483 #, c-format msgid "" "Applying clock correction of %d seconds\n" "\n" msgstr "" -#: src/Sight.cpp:536 +#: src/Sight.cpp:545 msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:537 +#: src/Sight.cpp:546 #, c-format msgid "" "\n" @@ -416,20 +412,20 @@ "\n" msgstr "" -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:561 src/Sight.cpp:699 msgid "" "Formulas used to calculate sight\n" "\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:565 src/Sight.cpp:703 #, c-format msgid "" "Index Error is %.4f degrees\n" "\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:570 src/Sight.cpp:708 #, c-format msgid "" "Eye Height is %.4f meters\n" @@ -437,7 +433,7 @@ "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:577 src/Sight.cpp:787 #, c-format msgid "" "\n" @@ -447,7 +443,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:595 src/Sight.cpp:798 #, c-format msgid "" "\n" @@ -458,7 +454,7 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:600 src/Sight.cpp:803 #, c-format msgid "" "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" @@ -466,7 +462,7 @@ "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:615 src/Sight.cpp:817 #, c-format msgid "" "\n" @@ -474,7 +470,7 @@ "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:625 src/Sight.cpp:741 #, c-format msgid "" "\n" @@ -484,32 +480,33 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:635 src/Sight.cpp:750 src/Sight.cpp:825 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:638 src/Sight.cpp:753 src/Sight.cpp:828 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:641 src/Sight.cpp:831 #, c-format msgid "" "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:645 src/Sight.cpp:835 #, c-format msgid "" "\n" "Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" +"CorrectedAltitude = ApparentAltitude - RefractionCorrection - " +"LimbCorrection\n" "CorrectedAltitude = %.4f - %.4f - %.4f\n" "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:659 src/Sight.cpp:849 #, c-format msgid "" "\n" @@ -517,7 +514,7 @@ "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:668 src/Sight.cpp:773 #, c-format msgid "" "\n" @@ -525,7 +522,7 @@ "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:674 src/Sight.cpp:855 #, c-format msgid "" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * " @@ -535,7 +532,7 @@ "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:681 #, c-format msgid "" "\n" @@ -545,18 +542,18 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 +#: src/Sight.cpp:715 #, c-format msgid "" "\n" "Apparent Moon Altitude (Ha)\n" "ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - " "EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" +"ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" "ApparentAltitudeMoon = %.4f\n" msgstr "" -#: src/Sight.cpp:717 +#: src/Sight.cpp:726 #, c-format msgid "" "\n" @@ -567,7 +564,7 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:722 +#: src/Sight.cpp:731 #, c-format msgid "" "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / " @@ -576,14 +573,14 @@ "RefractionCorrectionMoon = %.4f\n" msgstr "" -#: src/Sight.cpp:747 src/Sight.cpp:750 +#: src/Sight.cpp:756 src/Sight.cpp:759 #, c-format msgid "" "\n" "LimbCorrectionMoon = %.4f\n" msgstr "" -#: src/Sight.cpp:753 +#: src/Sight.cpp:762 #, c-format msgid "" "\n" @@ -594,27 +591,17 @@ "CorrectedAltitudeMoon = %.4f\n" msgstr "" -#: src/Sight.cpp:768 +#: src/Sight.cpp:777 #, c-format msgid "" "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * " "CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * " +"ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * " "%.4f))\n" "ParallaxCorrectionMoon = %.4f\n" msgstr "" -#: src/Sight.cpp:778 -#, c-format -msgid "" -"\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 +#: src/Sight.cpp:866 #, c-format msgid "" "CorrectionsMoon = %.4f\n" @@ -622,7 +609,7 @@ "Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" msgstr "" -#: src/Sight.cpp:863 +#: src/Sight.cpp:872 #, c-format msgid "" "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" @@ -630,67 +617,53 @@ "CorrectedMeasurement = %.4f\n" msgstr "" -#: src/Sight.cpp:888 +#: src/Sight.cpp:897 msgid "" "\n" "Calculated angle between Moon and " msgstr "" -#: src/Sight.cpp:890 +#: src/Sight.cpp:899 #, c-format msgid "" "\n" "Error from measurement: %.4f" msgstr "" -#: src/Sight.cpp:894 +#: src/Sight.cpp:903 msgid "" "\n" "Moon takes 28 days to orbit, one degree of error takes 6720 seconds" msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:904 #, c-format msgid "" "\n" "Time correction %.4f seconds" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:1108 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:184 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:185 src/SightDialog.cpp:279 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 +#: src/SightDialog.cpp:278 msgid "Lunar shot will be invalid taking distance from moon to itself" msgstr "" -#: src/celestial_navigation_pi.cpp:90 -msgid "Failed to load file:\n" -msgstr "" - -#: src/celestial_navigation_pi.cpp:91 -msgid "" -"\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "" - -#: src/celestial_navigation_pi.cpp:92 -msgid "OpenCPN Alert" -msgstr "" - -#: src/celestial_navigation_pi.cpp:157 +#: src/celestial_navigation_pi.cpp:141 msgid "Celestial Navigation PlugIn for OpenCPN" msgstr "" -#: src/celestial_navigation_pi.cpp:162 +#: src/celestial_navigation_pi.cpp:146 msgid "" "Celestial Navigation PlugIn for OpenCPN.\n" "Implements nautical almanac for sun, moon, planets,\n" @@ -698,16 +671,23 @@ "Compute position fix from celestial measurements." msgstr "" -#: src/FixDialog.cpp:189 -msgid "" -"Shifted sights are not used to compute a fix, determine fix visually " -"instead.\n" +#: src/celestial_navigation_pi.cpp:162 +msgid "open error" msgstr "" -#: src/FixDialog.cpp:190 -msgid "Fix Position" +#: src/celestial_navigation_pi.cpp:163 +msgid "corrupt record" msgstr "" -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +#: src/celestial_navigation_pi.cpp:164 +msgid "too many models" +msgstr "" + +#: src/celestial_navigation_pi.cpp:167 +msgid "" +"Magnetic data will not be available for the celestial navigation plugin." +msgstr "" + +#: src/celestial_navigation_pi.cpp:168 +msgid "OpenCPN Alert" msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/cs.po opencpn-plugin-celestial-2.3.0/po/cs.po --- opencpn-plugin-celestial-2.0.0/po/cs.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/cs.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-23 05:01-0400\n" "Last-Translator: nohal \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -16,417 +16,362 @@ "X-Crowdin-Language: cs\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -435,7 +380,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -444,21 +389,21 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -467,21 +412,21 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -490,28 +435,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -520,114 +465,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" @@ -647,20 +512,6 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/da.po opencpn-plugin-celestial-2.3.0/po/da.po --- opencpn-plugin-celestial-2.0.0/po/da.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/da.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-31 23:22-0400\n" "Last-Translator: nohal \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -16,418 +16,356 @@ "X-Crowdin-Language: da\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Type" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Brødtekst" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Time (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Måling" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Farve" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Kunne ikke indlæse filen." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Ugyldig XML-fil" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Ukendt XML-node" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Vejr Routing" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Kunne ikke gemme XML-filen: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Astronomisk Navigation" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Azimuth" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Højde" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Shifted observationer bruges ikke til at beregne et fix, bestem fix visuelt i stedet. \n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Fix Position" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " Ikke tilgængelig " -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sol" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Er du sikker på du vil slette alle observationer?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Fix fra synlige observationer" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Breddegrad" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " Ikke tilgængelig " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Længdegrad" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " Ikke tilgængelig " -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Fejl" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " Ikke tilgængelig " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Oprindelig" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Alg" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Plane" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Kugle" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Kegle" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Kegle 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "OK" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Ny" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Rediger" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Slet" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Slet alt" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Information" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Højde" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimuth" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Magnetisk azimut" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Himmellegeme" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Find" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Gradbue" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Nedre" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Center" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Øvre" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Grader" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minutter" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Grader sikkerhed" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Observation" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "timer" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Sekunder" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Sikkerhed" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Shift" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Afstand" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Sømil" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Kurs" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Magnetisk kurs" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Dato og tid" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Gennemsigtighed" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Config" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Øjenhøjde" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Meter" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Temperatur" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celcius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Tryk, mBar" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "Millibar" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Index fejl" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Sæt som standard" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parametre" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Beregninger" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Breddegrad" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Længdegrad" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MyLabel" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Udført" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnetisk" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Fix fra synlige observationer" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " Ikke tilgængelig " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " Ikke tilgængelig " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Fejl" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " Ikke tilgængelig " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Oprindelig" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plane" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Kugle" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Kegle" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Kegle 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "OK" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Astronomisk Navigation Observationer" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Egenskaber for observation" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Find himmellegeme" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab mislykkedes, data utilgængelige: \n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Glemte du at installere vsop87d.txt?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Plugin virker ikke korrekt" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Alarm for mislykket funktion" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Almanak Data For " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Geografisk position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Formler, der bruges til at beregne observationer\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "Index fejl er %.4f grader\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -436,7 +374,7 @@ "Højdekorrektion grader = 1.758*sqrt(%.4f) / 60.0\n" "Højdekorrektion grader = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -449,7 +387,7 @@ "Tilsyneladende højde = %.4f - %.4f - %.4f\n" "Tilsyneladende højde= %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -462,7 +400,7 @@ "x = tan (Pi/180 *%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) +.028)) \n" "x = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -471,7 +409,7 @@ "Refraktionskorrektion =.267 * %.4f / (x * (%.4f + 273.15)) / 60.0\n" "Refraktionskorrektion = %.4f\n" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -480,7 +418,7 @@ "Sol valgt, gradbue korrektion\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -493,22 +431,22 @@ "lc = 180/Pi * asin (Pi/180 * SD) \n" "lc = %.4f\n" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Øvre gradbue" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Underste gradbue" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "Gradbue korrektion = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -521,7 +459,7 @@ "korrigeret højde = %.4f - %.4f - %.4f\n" "korrigeret højde = %.4f\n" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -530,7 +468,7 @@ "Sol valgt, parallakse korrektion\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -539,7 +477,7 @@ "Måne valgt, parallakse korrektion\n" "HP = %.4f\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -548,7 +486,7 @@ "Parallaksekorrektion =-180/Pi * asin (synd (Pi/180 * %.4f) * cos (Pi/180 * %.4f)) \n" "Paralaksekorrektion = %.4f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -561,114 +499,41 @@ "Observet højde = %.4f - %.4f\n" "Observet højde = %.4f\n" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Almanak Data For " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" -msgstr "" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" +msgstr "\n" +"Geografisk position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Building bearing Sight Positions" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Målings-sikkerhed sandsynligvis indstillet til lille, observation kan måske ikke vises " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Advarsel" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Kunne ikke indlæse file:\n" @@ -689,20 +554,7 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Shifted observationer bruges ikke til at beregne et fix, bestem fix visuelt i stedet. \n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Fix Position" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " Ikke tilgængelig " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Astronomisk Navigation PlugIn til OpenCPN.\n" +"Implementerer nautisk almanak for solen, månen, planeterne og forskellige stjerner. Beregner positionskorrektion fra astronomiske målinger." diff -Nru opencpn-plugin-celestial-2.0.0/po/de.po opencpn-plugin-celestial-2.3.0/po/de.po --- opencpn-plugin-celestial-2.0.0/po/de.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/de.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-19 07:21-0400\n" "Last-Translator: nohal \n" "Language-Team: German\n" "Language: de_DE\n" @@ -16,418 +16,356 @@ "X-Crowdin-Language: de\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Typ" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Hauptteil" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Zeit (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Messung" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Farbe" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Fehler b. Datei Laden." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Ungültige xml Datei" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" -msgstr "Nicht erkannter XML Knoten" +msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" -msgstr "Wetter-Routenplanung" +msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Fehler b. xml Speichern." -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Astronom. Navigation" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Höhe" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Verschobene Sichten werden zur Fix-Berechnung nicht benutzt, bestimmen Sie stattdessen den Fix visuell.\n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Position korrigieren" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/V " + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sonne" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Sollen alle Sichten gelöscht werden?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Astronom. Navigation" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Höhe" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Fehler" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Los" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Neu" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Bearbeiten" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Löschen" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Alles löschen" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Information" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Höhe" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimut" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Azimuth" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Astronomisch" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Finden" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" -msgstr "Kante" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Unterer Rand" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" -msgstr "Mittelpunkt" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Oberer Rand" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" -msgstr "0" +msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" -msgstr "Grad" +msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minuten" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" -msgstr "Sichtung" +msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Stunden" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Sekunden" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" -msgstr "Gewissheit" +msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" -msgstr "Abstand" +msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" -msgstr "sm" +msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" -msgstr "Peilung" +msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" -msgstr "Magnetische Peilung" +msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" -msgstr "Transparenz" +msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" -msgstr "Einstellungen" +msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" -msgstr "Augenhöhe" +msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" -msgstr "2" +msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" -msgstr "Meter" +msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" -msgstr "Temperatur" +msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" -msgstr "Celsius" +msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" -msgstr "Luftdruck" +msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" -msgstr "Millibar" +msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" -msgstr "Index-Fehler" +msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" -msgstr "Als Standard festlegen" +msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" -msgstr "Parameter" +msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" -msgstr "Berechnungen" - -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" msgstr "" -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Höhe" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Längengrad (Lon)" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" -msgstr "MyLabel" +msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" -msgstr "Ausgeführt" +msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" -msgstr "Magnetisch" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Fix über Sichtungen" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Fehler" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Start" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Ebene" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Kugel" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Kegel" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Kegel 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Los" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" msgstr "" -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Astronom. Navigation" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" -msgstr "Eigenschaft Sichtung" - -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" msgstr "" -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" -msgstr "Finde Himmelskörper" +msgstr "Astronomisch" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab fehlgeschlagen, Daten nicht verfügbar:\n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Wurde Installation von vsop87d.txt vergessen?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Das Plugin wird nicht korrekt arbeiten" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Fehler-Alarm" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Almanach Daten für " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Geografische Position (lat, lon) = %.3f %.3f\n" -"GHAAST = %.0f %.3f'\n" -"SHA = %.0f %.3f'\n" -"GHA = %.0f %.3f'\n" -"Dec = %c %.0f %.3f'\n" -"SD = %.3f'\n" -"HP = %.3f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Verwendete Formeln zur Sicht-Berechnung\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" -msgstr "Index Fehler beträgt %.4f Grad\n\n" +msgstr "Index Fehler ist %.4f Grad\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -436,7 +374,7 @@ "Höhenkorrektur Grad = 1.753*sqrt(%.3f) / 60.0\n" "Höhenkorrektur Grad = %.3f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -445,11 +383,11 @@ "ApparentAltitude = %.4f\n" msgstr "\n" "Beobachtete Höhe\n" -"BeobachteteHöhe = Messung - IndexKorrektur - AugenHöheKorrektur\n" +"BeobachteteHöhe = Messung - IndexKorrektur - AugenHöheKorrektur - BrechungsKorrektur - RandKorrektur\n" "BeobachteteHöhe = %.4f - %.4f - %.4f\n" "BeobachteteHöhe = %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -459,10 +397,10 @@ msgstr "\n" "Brechungskorrektur\n" "x = tan(Pi/180*Messung + 4.848e-2*(Pi/180) / (tan(Pi/180*Messung) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +"x = tan(Pi/180*%.3f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.3f) + .028))\n" +"x = %.3f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -471,7 +409,7 @@ "Brechungskorrektur = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "Brechungskorrektur = %.4f\n" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -480,7 +418,7 @@ "Sonne gewählt, Rand Korrektur\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -493,31 +431,35 @@ "lc = 180/Pi * asin(Pi/180*SD)\n" "lc = %.4f\n" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Oberer Rand" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Unterer Rand" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "RandKorrektur = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" "CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" "CorrectedAltitude = %.4f - %.4f - %.4f\n" "CorrectedAltitude = %.4f\n" -msgstr "" +msgstr "\n" +"Korrigierte Höhe\n" +"Korrigierte Höhe = BeobachteteHöhe - ParallaxKorrektur\n" +"Korrigierte Höhe = %.4f - %.4f - %.4f\n" +"Korrigierte Höhe = %.4f\n" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -526,7 +468,7 @@ "Sonne gewählt, Parallax Korrektur\n" "rad = %.3f, HP = 0.002442/rad = %.3f\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -535,7 +477,7 @@ "Mond gewählt, parallaxe Korrektur\n" "HP = %.3f\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -544,7 +486,7 @@ "ParallaxKorrektur = -180/Pi * asin( sin(Pi/180 * %.3f ) * cos(Pi/180 * %.3f))\n" "ParallaxKorrektur = %.5f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -557,114 +499,41 @@ "Korrigierte Höhe = %.3f - %.3f\n" "Korrigierte Höhe = %.5f\n" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Almanach Daten für " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" -msgstr "" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" +msgstr "\n" +"Geografische Position (lat, lon) = %.3f %.3f\n" +"GHAAST = %.0f %.3f'\n" +"SHA = %.0f %.3f'\n" +"GHA = %.0f %.3f'\n" +"Dec = %c %.0f %.3f'\n" +"SD = %.3f'\n" +"HP = %.3f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Erzeuge Peilung Sicht Positionen" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Messung sicherlich zu niedrig, Sicht wird nicht erscheinen" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Warnung" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Fehler b. Laden von:\n" @@ -685,20 +554,8 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Verschobene Sichten werden zur Fix-Berechnung nicht benutzt, bestimmen Sie stattdessen den Fix visuell.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Position korrigieren" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/V " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Astronomisches Navigation PlugIn für OpenCPN.\n" +"Implementiert nautischen Almanach für Sonne, Mond, Planeten und verschiedene navigatorische Sterne.\n" +"Befähigt den Anwender zur Berechnung eines Positions-Fixes aus astronomischen Messungen." diff -Nru opencpn-plugin-celestial-2.0.0/po/el.po opencpn-plugin-celestial-2.3.0/po/el.po --- opencpn-plugin-celestial-2.0.0/po/el.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/el.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-04-07 11:22-0400\n" "Last-Translator: nohal \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -16,664 +16,449 @@ "X-Crowdin-Language: el\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Τύπος" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Ουράνιο σώμα" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Ώρα (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Μέτρηση" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Χρώμα" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." -msgstr "Η φόρτωση του αρχείου απέτυχε." +msgstr "Απέτυχε η φόρτωση του αρχείου." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Μη έγκυρο αρχείο xml" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Άγνωστος κόμβος xml" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Δρομολόγιο βάσει του καιρού" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Απέτυχε η αποθήκευση του αρχείου xml: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Αστρονομική ναυσιπλοΐα" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Αζιμούθιο" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Υψόμετρο" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Δεν χρησιμοποιούνται μετατοπισμένες θεάσεις για τον προσδιορισμό. Προσδιορισμός θέσης οπτικά.\n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Καθορισμός θέσης" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " Δ/Υ " + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Ήλιος" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Σίγουρα θέλετε να διαγράψετε όλες τις θεάσεις;" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Καθορισμός από ορατά σημάδια" + +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Γεωγραφικό πλάτος" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " Δ/Υ " -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Γεωγραφικό μήκος" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " Δ/Υ " + +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Σφάλμα" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " Δ/Υ " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Αρχική" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Επίπεδο" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Σφαίρα" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Κώνος" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Κώνος 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Πήγαινε" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Νέο" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Επεξεργασία" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Διαγραφή" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Διαγραφή όλων" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" -msgstr "Πληροφορίες" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Υψόμετρο" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Αζιμούθιο" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" +msgstr "Πληροφοριες" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Μαγνητικό αζιμούθιο" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Ουράνιο σώμα" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Αναζήτηση" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" -msgstr "Μέλος" +msgstr "Άκρο" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Κατώτερο" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Κέντρο" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Ανώτερο" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" -msgstr "0" +msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Μοίρες" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Λεπτά" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Βεβαιότητα °" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Θέαση" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Ώρες" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Δευτερόλεπτα" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Βεβαιότητα" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Μετατόπιση" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Απόσταση" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "ν.μ." -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" -msgstr "Κατεύθυνση" +msgstr "Κατεύθυνση πυξίδας" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Μαγνητική κατεύθυνση" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Ημερομηνία και ώρα" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Διαφάνεια" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Διαμόρφωση" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Ύψος ματιού" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" -msgstr "2" +msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "μέτρα" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Θερμοκρασία" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Κελσίου" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Πίεση" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "μιλιμπαρ" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" -msgstr "Λάθος δείκτη εξάντα" +msgstr "Λάθος δεικτών" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Ορισμός ως προεπιλογή" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Παράμετροι" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Υπολογισμοί" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Γεωγραφικό πλάτος" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Γεωγραφικό μήκος" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MyLabel" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Έγινε" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Μαγνητική" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Καθορισμός από θεάσεις" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " Δ/Υ " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " Δ/Υ " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Σφάλμα" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " Δ/Υ " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Αρχική" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Αλγ." - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Επίπεδο" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Σφαίρα" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Κώνος" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Κώνος 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Εμπρός" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" -msgstr "Θεάσεις για την αστρονομική ναυσιπλοΐα" +msgstr "Θεάσεις για την ουράνια ναυσιπλοΐα" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Ιδιότητες θέασης" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" -msgstr "Βρες ουράνιο σώμα" +msgstr "Βρες το ουράνιο σώμα" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" -msgstr "Ο αστρολάβος απέτυχε, δεν υπάρχουν δεδομένα:\n" +msgstr "Ο αστρολάβος απέτυψε, δεν υπάρχουν δεδομένα:\n" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" -msgstr "\n" -"Μήπως ξεχάσατε να εγκαταστήσετε το vsop87d.txt;\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" +msgstr "\nΜήπως ξεχάσετε να εγκαταστήσετε το vsop87d.txt;\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Το πρόσθετο δεν θα λειτουργήσει σωστά" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" -msgstr "Ειδοποίηση αποτυχίας" - -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Δεδομένα αλμανάκ για " +msgstr "Συναγερμός αποτυχίας" -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Γεωγραφική θέση (πλάτος, μήκος) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Οι τύποι που χρησιμοποιούνται για τον υπολογισμό της θέασης\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" -msgstr "Το σφάλμα του δείκτη είναι %.4f °\n\n" +msgstr "Το σφάλαμ του δείκτη είναι %.4f °\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" -msgstr "Το ύψος ματιού είναι %.4f m\n" -"Διόρθωση του ύψους = 1.758*sqrt(%.4f) / 60.0 °= %.4f °\n" - -#: src/Sight.cpp:568 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Φαινόμενο υψόμετρο (Ha)\n" -"ΦαινΥψόμετρο = μέτρηση - ΔιόρθωσηΔείκτη - ΔιόρθωσηΥψουςΜατιού\n" -"ΦαινΥψόμετρο = %.4f - %.4f - %.4f = %.4f\n" - -#: src/Sight.cpp:586 src/Sight.cpp:789 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Διόρθωση διάθλασης\n" -"x = tan(π/180*ΦαινΥψόμετρο + 0.04848*(π/180) / (tan(π/180*ΦαινΥψόμετρο) + .028))\n" -"x = tan(Pi/180*%.4f + 0.04848*(π/180) / (tan(π/180*%.4f) + .028))\n" -"x = %.4f\n" - -#: src/Sight.cpp:591 src/Sight.cpp:794 -#, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" -msgstr "Διόρθωση διάθλασης = 0.267 * Πίεση / (x*(Θερμοκρασία + 273.15)) / 60.0\n" -"Διόρθωση διάθλασης = 0.267 * %.4f / (x*(%.4f + 273.15)) / 60.0 = %.4f\n" - -#: src/Sight.cpp:606 src/Sight.cpp:808 -#, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" -msgstr "\n" -"Επιλογή του ήλιου, Διόρθωση μέλους\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" - -#: src/Sight.cpp:616 src/Sight.cpp:732 -#, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" -msgstr "\n" -"Επιλογή σελήνης, Διόρθωση μέλους\n" -"SD = %.4f\n" -"lc = 180/π * asin(π/180*SD)\n" -"lc = %.4f\n" - -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 -msgid "Upper Limb" -msgstr "Άνω μέλος" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "Κάτω μέλος" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" +msgstr "Το υψόμετρο ματιού είναι %.4f m\nΗ διόρθωση του ύψους = 1.758*sqrt(%.4f) / 60.0 °\nΔιόρθωση ύψους = %.4f °\n" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "\n" -"Διόρθωση μέλους = %.4f\n" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "\n" -"Διορθωμένο υψόμετρο\n" -"ΔιορθΥψόμετρο = ΦαινΥψόμετρο - ΔιόρθωσηΔιάθλασης - ΔιορθωσηΆκρου\n" -"ΔιορθΥψόμετρο = %.4f - %.4f - %.4f\n" -"ΔιορθΥψόμετρο = %.4f\n" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "\n" -"SΕπιλογή ηλίου, διόρθωση παράλλαξης\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "\n" -"Επιλογή σελήνης, διόρθωση παράλλαξης\n" -"HP = %.4f\n" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "ΔιόρθωσηΠαράλλαξης = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * ΔιορθωμένοΥψόμετρο))\n" -"ΔιόρθωσηΠαράλλαξης = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f)) = %.4f\n" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" -msgstr "\n" -"Παρατήρηση Υψομέτρου (Ho)\n" -"ΠαρατήρησηΥψομέτρου = ΔιορθωμένοΥψόμετρο - ΔιόρθωσηΠαράλλαξης\n" -"ΠαρατήρησηΥψομέτρου = %.4f - %.4f\n" -"ΠαρατήρησηΥψομέτρου = %.4f\n" - -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" +msgstr "\nΦαινόμενο υψόμετρο (Ha)\nΦαινΥψόμετρο = μέτρηση -ΔιόρθωσηΔείκτη - ΔιόρθωσηΥψΜατιού\nΦαινΥψόμετρο = %.4f - %.4f - %.4f\nΦαινΥψόμετρο = %.4f\n" -#: src/Sight.cpp:717 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" +msgstr "\nΔιόρθωση διάθλασης\nx = tan(π/180*ΦαινΥψόμετρο + 0.04848*(π/180) / (tan(π/180*ΦαινΥψόμετρο) + .028))\nx = tan(Pi/180*%.4f + 0.04848*(π/180) / (tan(π/180*%.4f) + .028))\nx = %.4f\n" -#: src/Sight.cpp:722 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" +msgstr "Διόρθωση διάθλασης = 0.267 * Πίεση / (x*(Θερμοκρασία + 273.15)) / 60.0\nΔιόρθωση διάθλασης = 0.267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nΔιόρθωση διάθλασης = %.4f\n" -#: src/Sight.cpp:747 src/Sight.cpp:750 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" +msgstr "\nΕπιλογή του ήλιου, Διόρθωση άκρου\nra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:753 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" +msgstr "\nΕπιλογή σελήνης, Διόρθωση άκρου\nSD = %.4f\nlc = 180/π * asin(π/180*SD)\nlc = %.4f\n" -#: src/Sight.cpp:768 +#: src/Sight.cpp:582 +msgid "Upper Limb" +msgstr "Άνω άκρο" + +#: src/Sight.cpp:585 +msgid "Lower Limb" +msgstr "Κάτω άκρο" + +#: src/Sight.cpp:588 #, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" +msgid "\nLimbCorrection = %.4f\n" +msgstr "\nΔιόρθωση άκρου = %.4f\n" -#: src/Sight.cpp:778 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" +msgstr "\nΔιορθωμένο υψόμετρο\nΔιορθΥψόμετρο = ΦαινΥψόμετρο - ΔιόρθωσηΔιάθλασης - ΔιορθωσηΆκρου\nΔιορθΥψόμετρο = %.4f - %.4f - %.4f\nΔιορθΥψόμετρο = %.4f\n" -#: src/Sight.cpp:857 +#: src/Sight.cpp:607 #, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" +msgstr "\nSΕπιλογή ηλίου, διόρθωση παράλλαξης\nrad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:863 +#: src/Sight.cpp:616 #, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" +msgstr "\nΕπιλογή σελήνης, διόρθωση παράλλαξης\nHP = %.4f\n" -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" +#: src/Sight.cpp:622 +#, c-format +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" +msgstr "ΔιόρθωσηΠαράλλαξης = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * ΔιορθωμένοΥψόμετρο))\nΔιόρθωσηΠαράλλαξης = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nΔιόρθωσηΠαράλλαξης = %.4f\n" -#: src/Sight.cpp:890 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" +msgstr "\nΠαρατήρηση Υψομέτρου (Ho)\nΠαρατήρησηΥψομέτρου = ΔιορθωμένοΥψόμετρο - ΔιόρθωσηΠαράλλαξης\nΠαρατήρησηΥψομέτρου = %.4f - %.4f\nΠαρατήρησηΥψομέτρου = %.4f\n" -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Δεδομένα αλμανάκ για " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" -msgstr "" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" +msgstr "\nΓεωγραφική θέση (πλάτος, μήκος) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Υπολογισμός κατεύθυνσης θέσεων θέασης" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Η βεβαιότητα της μέτρησης είναι μικρή, η θέαση μπορεί να μην εμφανιστεί " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Προσοχή" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Απέτυχε η φόρτωση του αρχείου:\n" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "\n" -"Μαγνητικά δεδομένα δεν θα είναι διαθέσιμα για το πρόσθετο της αστρονομικής ναυσιπλοΐας." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." +msgstr "\nΜαγνητικά δεδομένα δεν θα είναι διαθέσιμα για το πρόσθετο της ουράνιας ναυσιπλοΐας." #: src/celestial_navigation_pi.cpp:92 msgid "OpenCPN Alert" @@ -684,21 +469,6 @@ msgstr "Πρόσθετο αστρονομικής ναυσιπλοΐας για το OpenCPN" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Δεν χρησιμοποιούνται μετατοπισμένες θεάσεις για τον προσδιορισμό. Προσδιόρισε τη θέση οπτικά.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Καθορισμός θέσης" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " Δ/Υ " +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Πρόσθετο του OpenCPN για αστρονομική ναυσιπλοΐα .\nΕφαρμόζει τα ναυτικά αλμανάκ για τον ήλιο, τη σελήνη, πλανήτες, και διάφορα άστρα πλοήγησης. Υπολογίζει τη θέση από ουράνιες μετρήσεις." diff -Nru opencpn-plugin-celestial-2.0.0/po/es.po opencpn-plugin-celestial-2.3.0/po/es.po --- opencpn-plugin-celestial-2.0.0/po/es.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/es.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:39-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-04-21 14:53-0400\n" "Last-Translator: nohal \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -16,677 +16,456 @@ "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Tipo" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Astro" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Medida" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Color" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Error al cargar archivo." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Archivo xml no válido" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Nodo xml no reconocido" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Weather Routing" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Error al guardar archivo xml:" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Navegación astronómica" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Acimut" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Altura" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Las observaciones trasladadas no se emplean para calcular una solución, determínela visualmente en su lugar.\n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Posición calculada" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/D " + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sol" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "¿Está seguro que quiere borrar todas las observaciones?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Solución por Observaciones Visibles" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Latitud" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/D " -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Longitud" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " N/D " + +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Error" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/D " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Inicial" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Alg" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Plana" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Esfera" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Cónica" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Cónica 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Calcular" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Nuevo" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Editar" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Borrar" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Borrar todo" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Información" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altura" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Acimut" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Acimut magnético" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Astro" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Encontrar" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Limbo" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Inferior" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Central" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Superior" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Grados" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minutos" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Grados de incertidumbre" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Observación" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Horas" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Segundos" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Incertidumbre" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Trasladar" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Distancia" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Nm" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Rumbo" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Rumbo magético" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Fecha y hora" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Transparencia" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Config" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Altura del ojo" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Metros" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Temperatura" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celsius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Presión" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "Milibares" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Error de índice" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Ponerlos por defecto" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parámetros" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Cálculos" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitud" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitud" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MyLabel" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Hecho" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnético" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Solución por Observaciones Visibles" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Error" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Inicial" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plana" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Esfera" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Cónica" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Cónica 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Calcular" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Observaciones Navegación Astronómica" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Propiedades Observación" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Encuentra astro" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Fallo en Astrolab, datos no válidos:\n" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" -msgstr "\n" -"¿Olvidó instalar vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" +msgstr "\n¿Olvidó instalar vsop87d.txt?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "El plugin no trabaja correctamente" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Alerta por fallo" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Datos Almanaque para " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Posición Geográfica (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" -msgstr "Formulas utilizadas para calcular observación\n" -"\n" +msgstr "Formulas utilizadas para calcular observación\n\n" "\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" -msgstr "Error de índice es %.4f grados\n" -"\n" +msgstr "Error de índice es %.4f grados\n\n" "\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" -msgstr "Altura del ojo %.4f metros\n" -"\n" -"Grados corrección altura = 1.758*sqrt(%.4f) / 60.0\n" -"\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" +msgstr "Altura del ojo %.4f metros\n\n" +"Grados corrección altura = 1.758*sqrt(%.4f) / 60.0\n\n" "Grados corrección altura = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Altura Aparente (Ha)\n" -"Altura Aparente = Medida - Corrección de Índice - Corrección Altura de Ojo\n" -"Altura Aparente = %.4f - %.4f - %.4f\n" -"Altura Aparente = %.4f\n" - -#: src/Sight.cpp:586 src/Sight.cpp:789 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Corrección por Refracción\n" -"\n" -"x = tan(Pi/180*Altura Aparente + 4.848e-2*(Pi/180) / (tan(Pi/180*Altura Aparente) + .028))\n" -"\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"\n" -"x = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" +msgstr "\nAltura Aparente (Ha)\nAltura Aparente = Medida - Corrección de Índice - Corrección Altura de Ojo\nAltura Aparente = %.4f - %.4f - %.4f\nAltura Aparente = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:542 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" -msgstr "Corrección por Refracción = .267 * Presión / (x*(Temperatura + 273.15)) / 60.0\n" -"Corrección por Refracción = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"Corrección por Refracción = %.4f\n" - -#: src/Sight.cpp:606 src/Sight.cpp:808 -#, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" -msgstr "\n" -"Sol seleccionado, Corrección por Limbo\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" - -#: src/Sight.cpp:616 src/Sight.cpp:732 -#, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" -msgstr "\n" -"Luna seleccionada, Corrección por Limbo\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" - -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 -msgid "Upper Limb" -msgstr "Limbo Superior" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "Limbo inferior" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" +msgstr "\nCorrección por Refracción\n\n" +"x = tan(Pi/180*Altura Aparente + 4.848e-2*(Pi/180) / (tan(Pi/180*Altura Aparente) + .028))\n\n" +"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n\n" +"x = %.4f\n" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:547 #, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "\n" -"Corrección por Limbo = %.4f\n" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "\n" -"Altura Corregida\n" -"Altura Corregida =Altura Aparente - Corrección por Refracción - Corrección por Limbo\n" -"Altura Corregida = %.4f - %.4f - %.4f\n" -"Altura Corregida = %.4f\n" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "\n" -"Sol seleccionado, Corrección por paralaje\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "\n" -"Luna seleccionada, Corrección por paralaje\n" -"HP = %.4f\n" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "Corrección por paralaje = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Altura corregida))\n" -"Corrección por paralaje = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"Corrección por paralaje = %.4f\n" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" -msgstr "\n" -"Altura Observada (Ho)\n" -"Altura Observada = Altura Corregida - Corrección por paralaje\n" -"Altura Observada = %.4f - %.4f\n" -"Altura Observada = %.4f\n" - -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" +msgstr "Corrección por Refracción = .267 * Presión / (x*(Temperatura + 273.15)) / 60.0\nCorrección por Refracción = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nCorrección por Refracción = %.4f\n" -#: src/Sight.cpp:717 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" +msgstr "\nSol seleccionado, Corrección por Limbo\nra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:722 +#: src/Sight.cpp:572 #, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" +msgstr "\nLuna seleccionada, Corrección por Limbo\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" +#: src/Sight.cpp:582 +msgid "Upper Limb" +msgstr "Limbo Superior" -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" +#: src/Sight.cpp:585 +msgid "Lower Limb" +msgstr "Limbo inferior" -#: src/Sight.cpp:768 +#: src/Sight.cpp:588 #, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" +msgid "\nLimbCorrection = %.4f\n" +msgstr "\nCorrección por Limbo = %.4f\n" -#: src/Sight.cpp:778 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" +msgstr "\nAltura Corregida\nAltura Corregida =Altura Aparente - Corrección por Refracción - Corrección por Limbo\nAltura Corregida = %.4f - %.4f - %.4f\nAltura Corregida = %.4f\n" -#: src/Sight.cpp:857 +#: src/Sight.cpp:607 #, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" +msgstr "\nSol seleccionado, Corrección por paralaje\nrad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:863 +#: src/Sight.cpp:616 #, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" +msgstr "\nLuna seleccionada, Corrección por paralaje\nHP = %.4f\n" -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" +#: src/Sight.cpp:622 +#, c-format +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" +msgstr "Corrección por paralaje = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Altura corregida))\nCorrección por paralaje = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nCorrección por paralaje = %.4f\n" -#: src/Sight.cpp:890 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" +msgstr "\nAltura Observada (Ho)\nAltura Observada = Altura Corregida - Corrección por paralaje\nAltura Observada = %.4f - %.4f\nAltura Observada = %.4f\n" -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Datos Almanaque para " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" -msgstr "" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" +msgstr "\nPosición Geográfica (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Resolviendo situación de las observaciones" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Establecida Incertidumbre de la medición muy pequeña, la observación puede no aparecer " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Alerta" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Error al cargar file:\n" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "\n" -"\n" +msgid "\nMagnetic data will not be available for the celestial navigation plugin." +msgstr "\n\n" "Datos de magnetismo no disponibles para el plugin Celestial Navigation." #: src/celestial_navigation_pi.cpp:92 @@ -698,21 +477,7 @@ msgstr "PlugIn de Navegación Astronómica para OpenCPN" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Las observaciones trasladadas no se emplean para calcular una solución, determínela visualmente en su lugar.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Posición calculada" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/D " +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "PlugIn Navegación Astronómica para OpenCPN.\n\n" +"Instala un almanaque náutico del Sol, Luna, planetas y varias estrellas útiles en la navegación. Permite calcular la posición del usuario con mediciones astronómicas." diff -Nru opencpn-plugin-celestial-2.0.0/po/et.po opencpn-plugin-celestial-2.3.0/po/et.po --- opencpn-plugin-celestial-2.0.0/po/et.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/et.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-29 08:54-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-06-02 20:34-0400\n" "Last-Translator: nohal \n" "Language-Team: Estonian\n" "Language: et_EE\n" @@ -16,417 +16,362 @@ "X-Crowdin-Language: et\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -435,7 +380,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -444,21 +389,21 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -467,21 +412,21 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -490,28 +435,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -520,114 +465,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" @@ -647,20 +512,6 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/fi.po opencpn-plugin-celestial-2.3.0/po/fi.po --- opencpn-plugin-celestial-2.0.0/po/fi.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/fi.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-06-02 20:34-0400\n" "Last-Translator: nohal \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -16,418 +16,356 @@ "X-Crowdin-Language: fi\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Tyyppi" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Runko" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Aika (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Mittaus" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Väri" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Tiedoston lataus epäonnistui." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Virheellinen xml-tiedosto" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Tuntematon xml-haara" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Sää reititys" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Tiedostoa ei voi tallentaa xml-muodossa: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Tähtiteteellinen navigointi" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "Ajan korjaus" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Suuntakulma" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Korkeus" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Siirrettyjä näkymiä ei käytetä fix:in laskentaan, sensijaan määritä fix näkemäsi mukaan.\n" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Fix sijainti" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Aurinko" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Oletko varma, että haluat poistaa kaikki suuntimat?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Tähtitieteellisen_Navigoinin_Informaatio.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Fix näkyvissä olevista suuntimista" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Leveyspiiri" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Pituuspiiri" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Virhe" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Alustava" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Alg" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Taso" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "sfääri" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Kartio" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Kartio 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Aloita" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Uusi" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Muokkaa" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Poista" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Poista kaikki" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Informaatiota" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Korkeus" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Suuntakulma" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "Kuun" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Magneettinen suuntakulma" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Taivaankappale" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Etsi" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Astekaari" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Alempi" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Keskitetty" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Ylempi" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Astetta" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minuuttia" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Asteen tarkkuudella" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "Kuun korkeus" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "Runkokorkeus" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Suunta" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Tunnit" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Sekunnit" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Tarkkuus" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Siirto" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Etäisyys" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Nm" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Suuntima" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Mangneettinen suuntima" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Päivämäärä ja kellonaika" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Läpinäkyvyys" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Kokoonpano" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Silmän korkeus" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Metriä" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Lämpötila" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celsius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Paine" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "Millibaaria" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Indeksivirhe" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Aseta oletuksiksi" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parametrit" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Laskelmat" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Leveyspiiri" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Pituuspiiri" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "OmaOtsake" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Tehty" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magneettinen" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Fix näkyvissä olevista suuntimista" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Virhe" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Alustava" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Taso" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "sfääri" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Kartio" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Kartio 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Aloita" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "Kellon korjaus" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Tähtitieteelliset navigointi suunnat" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Suuntien ominaisuudet" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Etsi taivaankappale" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab epäonnistui, tietoja ei ole käytettävissä:\n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Unohditko asentaa vsop87d.txt?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Lisäosa ei toimi oikein" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Vika hälytys" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "Käännetään kelloa %d sekunttia\n\n" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Almanakka tiedot " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Maantiteellinen sijainti (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Kaavoja käytetään laskettaessa suuntimia\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "Indeksivirhe on %.4f astetta\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -436,7 +374,7 @@ "Korkeus korjaus asteina = 1.758*sqrt(%.4f) / 60.0\n" "Korkeus korjaus asteina = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -449,7 +387,7 @@ "Suhteellinen korkeus = %.4f - %.4f - %.4f\n" "Suhteellinen korkeus = %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -462,7 +400,7 @@ "x = tan (pii/180 *%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) +.028))\n" "x = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -471,7 +409,7 @@ "Taittokorjaus = .267 * %.4f / (x * (%.4f + 273.15)) / 60.0\n" "Taittokorjaus = %.4f\n" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -480,7 +418,7 @@ "Aurinko valittu, astekaaren korjaus\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -493,22 +431,22 @@ "lc = 180/pii * asin (pii/180 * SD)\n" "lc = %.4f\n" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Yläreuna" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Alareuna" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "Reunakorjaus = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -521,7 +459,7 @@ "Korjattukorkeus = %.4f - %.4f - %.4f\n" "Korjattukorkeus = %.4f\n" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -530,7 +468,7 @@ "Aurinko on valittu, parallaksi korjausn\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -539,7 +477,7 @@ "Kuu on valittu, parallaksi korjaus\n" "HP = %.4f\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -548,7 +486,7 @@ "Parallaksikorjaus = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "Parallaksikorjaus = %.4f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -561,143 +499,41 @@ "Havaintokorkeus = %.4f - %.4f\n" "Havaintokorkeus = %.4f\n" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "\n" -"Näennäinen kuun korkeus (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Taittokorjaus\n" -"x = tan (pii/180 * Suhteellinen korkeus + 4.848e-2*(Pi/180) / (tan(Pi/180*Suhteellinen korkeus) +.028))\n" -"x = tan (pii/180 *%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) +.028))\n" -"x = %.4f\n" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "Taittokorjaus =.267 * paine / (x * (lämpötila + 273.15)) / 60.0\n" -"Taittokorjaus = .267 * %.4f / (x * (%.4f + 273.15)) / 60.0\n" -"Taittokorjaus = %.4f\n" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "\n" -"LimbCorrectionMoon = %.4f\n" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Suhteellinen korkeus (Ha) \n" -"Suhteellinen korkeus = mittaus - Indeksikorjaus - Silmänkorkeuskorjaus\n" -"Suhteellinen korkeus = %.4f - %.4f - %.4f\n" -"Suhteellinen korkeus = %.4f\n" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "\n" -"Laskennallinen kulma kuusta ja " - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "\n" -"Virhe mittauksessa: %.4f" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "\n" -"Kuun kierros kestää 28 päivää, yhden asteen virhe on 6720 sekunttia" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Almanakka tiedot " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "\n" -"Ajan korjaus %.4f sekuntia" +"Maantiteellinen sijainti (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Muodostetaan suuntimalinjojen sijainnit" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Mitta on luultavasti asetettu liian pieneksi, kohde ei tulle näkyviin " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Varoitus" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "Kuunmittaus on virheellinen, jos otetaann etäisyys kuusta siihen itseensä" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Tiedoston lataus epäonnistui :\n" @@ -718,23 +554,7 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "OpenCPN:n tähtitieteelisen navigoinin lisäosa.\n" -"Toteuttaa merenkulkualmanakan aurinkoa, kuuta, planeettoja \n" -"ja tähtiä varten.\n" -"Laskee sijainnin fix:n tähtimittausten perusteella." - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Siirrettyjä näkymiä ei käytetä fix:in laskentaan, sensijaan määritä fix näkemäsi mukaan.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Fix sijainti" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " +"Toteuttaa merenkulkualmanakan aurinkoa, kuuta, planeettoja ja tähtiä varten. Laskee sijainnin fix:n tähtimittausten perusteella." diff -Nru opencpn-plugin-celestial-2.0.0/po/fr.po opencpn-plugin-celestial-2.3.0/po/fr.po --- opencpn-plugin-celestial-2.0.0/po/fr.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/fr.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-29 08:54-0500\n" +"POT-Creation-Date: 2017-10-11 09:16+0200\n" +"PO-Revision-Date: 2015-06-04 16:22-0400\n" "Last-Translator: nohal \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -15,694 +15,782 @@ "X-Crowdin-Project: opencpn\n" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" - -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 -msgid "Type" -msgstr "Type" - -#: src/CelestialNavigationDialog.cpp:124 -msgid "Body" -msgstr "Corps" - -#: src/CelestialNavigationDialog.cpp:125 -msgid "Time (UTC)" -msgstr "Heure (UTC)" - -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 -msgid "Measurement" -msgstr "Measures" - -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 -msgid "Color" -msgstr "Couleur" - -#: src/CelestialNavigationDialog.cpp:193 -msgid "Failed to load file." -msgstr "Echec du chargement du fichier." - -#: src/CelestialNavigationDialog.cpp:198 -msgid "Invalid xml file" -msgstr "Fichier xml invalide" - -#: src/CelestialNavigationDialog.cpp:250 -msgid "Unrecognized xml node" -msgstr "Noeud xml non reconnu" - -#: src/CelestialNavigationDialog.cpp:260 -msgid "Weather Routing" -msgstr "Routage météorologique" - -#: src/CelestialNavigationDialog.cpp:320 -msgid "Failed to save xml file: " -msgstr "Echec du chargement du fichier : " - -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 -#: src/celestial_navigation_pi.cpp:152 -msgid "Celestial Navigation" -msgstr "Navigation stellaire" - -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:409 -msgid "Sun" -msgstr "Soleil" - -#: src/CelestialNavigationDialog.cpp:465 -msgid "Are you sure you want to delete all sights?" -msgstr "Etes vous certain de vouloir détruire tous les vues ?" - -#: src/CelestialNavigationDialog.cpp:510 -msgid "Celestial_Navigation_Information.html" -msgstr "Navigation stellaire" - -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" - -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "Nouveau" - -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "Editer" - -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "Supprimer" - -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "Supprimer tout" - -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "Information" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altitude" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimut" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 -msgid "Magnetic Azimuth" -msgstr "Azimut magnétique" - -#: src/CelestialNavigationUI.cpp:145 -msgid "Celestial Body" -msgstr "Corps céleste" - -#: src/CelestialNavigationUI.cpp:154 -msgid "Find" -msgstr "Chercher" - -#: src/CelestialNavigationUI.cpp:157 -msgid "Limb" -msgstr "Membre" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Lower" -msgstr "Bas" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Center" -msgstr "Centre" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Upper" -msgstr "Upper Limb" - -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 -msgid "0" -msgstr "0" - -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 -msgid "Degrees" -msgstr "Degrés" - -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 -msgid "Minutes" -msgstr "Minutes" - -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 -msgid "Sight" -msgstr "Vue" - -#: src/CelestialNavigationUI.cpp:271 -msgid "Hours" -msgstr "Heures" - -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 -msgid "Seconds" -msgstr "Secondes" - -#: src/CelestialNavigationUI.cpp:293 -msgid "Certainty" -msgstr "Certitude" - -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +# +# File: src/Sight.cpp, line: 577 +# File: src/Sight.cpp, line: 787 +msgid "" +"\n" +"Apparent Altitude (Ha)\n" +"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" +"ApparentAltitude = %.4f - %.4f - %.4f\n" +"ApparentAltitude = %.4f\n" msgstr "" - -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 -msgid "Distance" -msgstr "Distance" - -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 -msgid "Nm" -msgstr "Cap" - -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 -msgid "Bearing" -msgstr "Cap" - -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 -msgid "Magnetic Bearing" -msgstr "Cap magnétique" - -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +"\n" +"Hauteur apparente (Ha)\n" +"Hauteur apparente = Mesure - Collimation - Correction de la hauteur de l'oeil\n" +"Hauteur apparente = %.4f - %.4f - %.4f\n" +"Hauteur apparente = %.4f\n" +# +# File: src/Sight.cpp, line: 715 +msgid "" +"\n" +"Apparent Moon Altitude (Ha)\n" +"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" +"ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" +"ApparentAltitudeMoon = %.4f\n" msgstr "" - -#: src/CelestialNavigationUI.cpp:366 -msgid "Transparency" -msgstr "Transparence" - -#: src/CelestialNavigationUI.cpp:387 -msgid "Config" -msgstr "Configuration" - -#: src/CelestialNavigationUI.cpp:399 -msgid "Eye Height" -msgstr "Hauteur des yeux" - -#: src/CelestialNavigationUI.cpp:403 -msgid "2" -msgstr "2" - -#: src/CelestialNavigationUI.cpp:406 -msgid "Meters" -msgstr "Mètres" - -#: src/CelestialNavigationUI.cpp:410 -msgid "Temperature" -msgstr "Température" - -#: src/CelestialNavigationUI.cpp:417 -msgid "Celcius" -msgstr "Celsius" - -#: src/CelestialNavigationUI.cpp:421 -msgid "Pressure" -msgstr "Pression" - -#: src/CelestialNavigationUI.cpp:428 -msgid "MilliBars" -msgstr "hPa (Millibars)" - -#: src/CelestialNavigationUI.cpp:432 -msgid "Index Error" -msgstr "Erreur d'index" - -#: src/CelestialNavigationUI.cpp:446 -msgid "Set As Defaults" -msgstr "Définir comme valeurs par défaut" - -#: src/CelestialNavigationUI.cpp:453 -msgid "Parameters" -msgstr "Paramètres" - -#: src/CelestialNavigationUI.cpp:469 -msgid "Calculations" -msgstr "Calculs" - -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" +"\n" +"Hauteur apparente de la lune (Ha)\n" +"Hauteur apparente de la lune = Measure de la lune - Collimation - Correction de la hauteur de l'oeil\n" +"Hauteur apparente de la lune = %.4f - %.4f - %.4f\n" +"Hauteur apparente de la lune = %.4f\n" +# +# File: src/Sight.cpp, line: 897 +msgid "" +"\n" +"Calculated angle between Moon and " msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Altitude" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitude" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 -msgid "MyLabel" -msgstr "MonEtiquette" - -#: src/CelestialNavigationUI.cpp:686 -msgid "Done" -msgstr "Effectué" - -#: src/CelestialNavigationUI.cpp:689 -msgid "Magnetic" -msgstr "Magnétique" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Fixer les curiosités visibles" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Erreur" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Initial" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Planification" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Sphère" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Cône" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Cône 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Aller" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" +"\n" +"Angle calculé entre la lune et " +# +# File: src/Sight.cpp, line: 645 +# File: src/Sight.cpp, line: 835 +msgid "" +"\n" +"Corrected Altitude\n" +"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" +"CorrectedAltitude = %.4f - %.4f - %.4f\n" +"CorrectedAltitude = %.4f\n" msgstr "" - -#: src/CelestialNavigationUI.h:78 -msgid "Celestial Navigation Sights" -msgstr "Vues de navigation stellaire" - -#: src/CelestialNavigationUI.h:169 -msgid "Sight Properties" -msgstr "Propriétés de la vue" - -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" +"\n" +"Hauteur corrigée\n" +"Hauteur corrigée = Hauteur apparente - Correction de la réfraction - Correction du bord\n" +"Hauteur corrigée = %.4f - %.4f - %.4f\n" +"Hauteur corrigée = %.4f\n" +# +# File: src/Sight.cpp, line: 762 +msgid "" +"\n" +"Corrected Altitude\n" +"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" +"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" +"CorrectedAltitudeMoon = %.4f\n" msgstr "" - -#: src/CelestialNavigationUI.h:227 -msgid "Find Celestial Body" -msgstr "Trouver le corps céleste" - -#: src/Sight.cpp:160 -msgid "Astrolab failed, data unavailable:\n" -msgstr "L'astrolabe échoue. Donnée indisponible : \n" - -#: src/Sight.cpp:161 -msgid "\n" +"\n" +"Hauteur corrigée\n" +"Hauteur corrigée = Hauteur apparente de la lune - Correction de la réfraction de la lune - Correction du bord de la lune\n" +"Hauteur corrigée = %.4f - %.4f - %.4f\n" +"Hauteur corrigée = %.4f\n" +# +# File: src/Sight.cpp, line: 162 +msgid "" +"\n" "Did you forget to install vsop87d.txt?\n" -msgstr "\n" +msgstr "" +"\n" "Avez vous oubliez d'installer vsop87d.txt ?\n" - -#: src/Sight.cpp:162 -msgid "The plugin will not work correctly" -msgstr "Le complément ne fonctionnera pas correctement" - -#: src/Sight.cpp:163 -msgid "Failure Alert" -msgstr "Echec" - -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" +# +# File: src/Sight.cpp, line: 899 +msgid "" +"\n" +"Error from measurement: %.4f" msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Données de l'almanach pour " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" +"\n" +"Error de measure: %.4f" +# +# File: src/Sight.cpp, line: 546 +msgid "" +"\n" "Geographical Position (lat, lon) = %.4f %.4f\n" "GHAAST = %.0f %.1f'\n" "SHA = %.0f %.1f'\n" "GHA = %.0f %.1f'\n" "Dec = %c %.0f %.1f'\n" "SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" +"HP = %.1f'\n" +"\n" +msgstr "" +"\n" "Position géographique (lat, lon) = %.4f %.4f\n" "GHAAST = %.0f %.1f'\n" "SHA = %.0f %.1f'\n" "GHA = %.0f %.1f'\n" "Dec = %c %.0f %.1f'\n" "SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 -msgid "Formulas used to calculate sight\n\n" -msgstr "Formules utilisées pour calculer la vue \n\n" - -#: src/Sight.cpp:556 src/Sight.cpp:694 -#, c-format -msgid "Index Error is %.4f degrees\n\n" -msgstr "L'Index d'erreur est %.4f degrés\n\n" - -#: src/Sight.cpp:561 src/Sight.cpp:699 -#, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" -msgstr "La hauteur de l'oeil est %.4f mètres\n" -"La correction de la hauteur en degrés = 1.758*sqrt(%.4f) / 60.0\n" -"La correction de la hauteur en degré = %.4f\n" - -#: src/Sight.cpp:568 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Altitude observée (Ha)\n" -"Altitude observée = Measurement - IndexCorrection - EyeHeightCorrection - RefractionCorrection - LimbCorrection\n" -"Altitude observée = %.4f - %.4f - %.4f\n" -"Altitude observée = %.4f\n" - -#: src/Sight.cpp:586 src/Sight.cpp:789 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Correction de la réfraction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" - -#: src/Sight.cpp:591 src/Sight.cpp:794 -#, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" -msgstr "Correction de la réfraction = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" - -#: src/Sight.cpp:606 src/Sight.cpp:808 -#, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" -msgstr "\n" -"Soleil sélectionné, Correction du membre\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" - -#: src/Sight.cpp:616 src/Sight.cpp:732 -#, c-format -msgid "\n" +"HP = %.1f'\n" +"\n" +# +# File: src/Sight.cpp, line: 641 +# File: src/Sight.cpp, line: 831 +msgid "" +"\n" +"LimbCorrection = %.4f\n" +msgstr "" +"\n" +"Correction du bord = %.4f\n" +# +# File: src/Sight.cpp, line: 756 +# File: src/Sight.cpp, line: 759 +msgid "" +"\n" +"LimbCorrectionMoon = %.4f\n" +msgstr "" +"\n" +"Correction du bord de la lune = %.4f\n" +# +# File: src/Sight.cpp, line: 625 +# File: src/Sight.cpp, line: 741 +msgid "" +"\n" "Moon selected, Limb Correction\n" "SD = %.4f\n" "lc = 180/Pi * asin(Pi/180*SD)\n" "lc = %.4f\n" -msgstr "\n" -"Lune sélectionnée, Correction du membre\n" +msgstr "" +"\n" +"Lune sélectionnée, Correction du bord\n" "SD = %.4f\n" "lc = 180/Pi * asin(Pi/180*SD)\n" "lc = %.4f\n" - -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 -msgid "Upper Limb" -msgstr "Membre supérieur" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "Membre inférieur" - -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "\n" -"LimbCorrection = %.4f\n" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "\n" -"Altitude corrigée\n" -"Altitude corrigée = Altitude observée - Correction du parallaxe\n" -"Altitude corrigée = %.4f - %.4f - %.4f\n" -"Altitude corrigée = %.4f\n" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "\n" -"Le soleil est sélectionné, correction du parallaxe\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" +# +# File: src/Sight.cpp, line: 668 +# File: src/Sight.cpp, line: 773 +msgid "" +"\n" "Moon selected, parallax correction\n" "HP = %.4f\n" -msgstr "\n" -"La lune est sélectionnée, correction du parallaxe\n" +msgstr "" +"\n" +"Lune sélectionnée, correction du parallaxe\n" "HP = %.4f\n" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "Correction du parallaxe = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * ObservedAltitude))\n" -"Correction du parallaxe = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"Correction du parallaxe = %.4f\n" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" +# +# File: src/Sight.cpp, line: 903 +msgid "" +"\n" +"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +msgstr "" +"\n" +"L'orbite de la lune dure 28 jours, un degré d'erreur vaut 6720 secondes" +# +# File: src/Sight.cpp, line: 681 +msgid "" +"\n" "Observed Altitude (Ho)\n" "ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" "ObservedAltitude = %.4f - %.4f\n" "ObservedAltitude = %.4f\n" -msgstr "\n" -"Altitude corrigée (Ho)\n" -"Altitude corrigée = Altitude observée - Correction du parallaxe\n" -"Altitude corrigée = %.4f - %.4f\n" -"altitude corrigée = %.4f\n" - -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" +"\n" +"Hauteur observée (Ho)\n" +"Hauteur observée = Hauteur corrigée - Correction du parallaxe\n" +"Hauteur observée = %.4f - %.4f\n" +"Hauteur observée = %.4f\n" +# +# File: src/Sight.cpp, line: 595 +# File: src/Sight.cpp, line: 798 +msgid "" +"\n" +"Refraction Correction\n" +"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" +"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" +"x = %.4f\n" +msgstr "" +"\n" +"Correction de la réfraction\n" +"x = tan(Pi/180*Hauteur apparente + 4.848e-2*(Pi/180) / (tan(Pi/180*Hauteur apparente) + .028))\n" +"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" +"x = %.4f\n" +# +# File: src/Sight.cpp, line: 726 +msgid "" +"\n" "Refraction Correction\n" "x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" "x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" "x = %.4f\n" msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" +"\n" +"Correction de la réfraction\n" +"x = tan(Pi/180*Hauteur apparente de la lune + 4.848e-2*(Pi/180) / (tan(Pi/180*Hauteur apparente de la lune) + .028))\n" +"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" +"x = %.4f\n" +# +# File: src/Sight.cpp, line: 615 +# File: src/Sight.cpp, line: 817 +msgid "" +"\n" +"Sun selected, Limb Correction\n" +"ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" +"\n" +"Soleil sélectionné, Correction du bord\n" +"ra = %.4f, lc = 0.266564/ra = %.4f\n" +# +# File: src/Sight.cpp, line: 659 +# File: src/Sight.cpp, line: 849 +msgid "" +"\n" +"Sun selected, parallax correction\n" +"rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" +"\n" +"Soleil est sélectionné, Correction du parallaxe\n" +"rad = %.4f, HP = 0.002442/rad = %.4f\n" +# +# File: src/Sight.cpp, line: 904 +msgid "" +"\n" +"Time correction %.4f seconds" msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" +"\n" +"Correction de l'heure %.4f secondes" +# +# File: src/CelestialNavigationUI.cpp, line: 774 +msgid " N/A " +msgstr " N/A " +# +# File: src/CelestialNavigationUI.cpp, line: 766 +msgid " N/A " +msgstr " N/A " +# +# File: src/CelestialNavigationUI.cpp, line: 782 +msgid " N/A " +msgstr " N/A " +# +# File: src/CelestialNavigationUI.cpp, line: 193 +# File: src/CelestialNavigationUI.cpp, line: 223 +# File: src/CelestialNavigationUI.cpp, line: 230 +msgid "0" +msgstr "0" +# +# File: src/CelestialNavigationUI.cpp, line: 200 +msgid "10" +msgstr "10" +# +# File: src/CelestialNavigationUI.cpp, line: 403 +msgid "2" +msgstr "2" +# +# File: src/CelestialNavigationUI.cpp, line: 803 +msgid "Alg" +msgstr "Alg" +# +# File: src/Sight.cpp, line: 545 +msgid "Almanac Data For " +msgstr "Données de l'almanach pour " +# +# File: src/CelestialNavigationUI.cpp, line: 136 +# File: src/CelestialNavigationUI.cpp, line: 669 +# File: src/Sight.h, line: 49 +msgid "Altitude" +msgstr "Hauteur" +# +# File: src/Sight.cpp, line: 483 +msgid "" +"Applying clock correction of %d seconds\n" +"\n" +msgstr "" +"Correction du temps: %d seconds\n" +"\n" +# +# File: src/CelestialNavigationDialog.cpp, line: 444 +msgid "Are you sure you want to delete all sights?" +msgstr "Etes vous certain de vouloir supprimer tous les vues ?" +# +# File: src/Sight.cpp, line: 161 +msgid "Astrolab failed, data unavailable:\n" +msgstr "Astrolab a échoué. Données indisponibles : \n" +# +# File: src/CelestialNavigationUI.cpp, line: 136 +# File: src/CelestialNavigationUI.cpp, line: 679 +# File: src/Sight.h, line: 49 +msgid "Azimuth" +msgstr "Azimut" +# +# File: src/CelestialNavigationUI.cpp, line: 341 +# File: src/CelestialNavigationUI.cpp, line: 593 +msgid "Bearing" +msgstr "Cap" +# +# File: src/CelestialNavigationDialog.cpp, line: 122 +msgid "Body" +msgstr "Corps" +# +# File: src/CelestialNavigationUI.cpp, line: 226 +msgid "Body Altitude" +msgstr "Hauteur du corps" +# +# File: src/Sight.cpp, line: 1108 +msgid "Building bearing Sight Positions" +msgstr "Construction du cap vers les positions de la vue" +# +# File: src/CelestialNavigationUI.cpp, line: 469 +msgid "Calculations" +msgstr "Calculs" +# +# File: src/CelestialNavigationUI.cpp, line: 417 +msgid "Celcius" +msgstr "Celsius" +# +# File: src/CelestialNavigationUI.cpp, line: 145 +msgid "Celestial Body" +msgstr "Corps céleste" +# +# File: src/CelestialNavigationDialog.cpp, line: 317 +# File: src/CelestialNavigationDialog.cpp, line: 445 +# File: src/Sight.cpp, line: 1108 +# File: src/celestial_navigation_pi.cpp, line: 83 +# File: src/celestial_navigation_pi.cpp, line: 136 +msgid "Celestial Navigation" +msgstr "Navigation astronomique" +# +# File: src/celestial_navigation_pi.cpp, line: 141 +msgid "Celestial Navigation PlugIn for OpenCPN" +msgstr "Complément \"Navigation astronomique\" pour OpenCPN" +# +# File: src/celestial_navigation_pi.cpp, line: 146 +msgid "" +"Celestial Navigation PlugIn for OpenCPN.\n" +"Implements nautical almanac for sun, moon, planets,\n" +"and various navigational stars.\n" +"Compute position fix from celestial measurements." msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +"Complément pour la navigation astronomique pour OpenCPN.\n" +"Implémente un almanach céleste pour le soleil, la lune, les planètes,\n" +"et diverses étoiles.\n" +"Calcule la position en fonction des mesures astronomiques effectuées." +# +# File: src/CelestialNavigationUI.h, line: 78 +msgid "Celestial Navigation Sights" +msgstr "Vues de navigation astronomique" +# +# File: src/CelestialNavigationDialog.cpp, line: 487 +msgid "Celestial_Navigation_Information.html" +msgstr "Celestial_Navigation_Information.html" +# +# File: src/CelestialNavigationUI.cpp, line: 161 +msgid "Center" +msgstr "Centre" +# +# File: src/CelestialNavigationUI.cpp, line: 293 +msgid "Certainty" +msgstr "Certitude" +# +# File: src/CelestialNavigationUI.cpp, line: 852 +# File: src/CelestialNavigationUI.h, line: 303 +msgid "Clock Correction" +msgstr "Correction du temps" +# +# File: src/CelestialNavigationUI.cpp, line: 55 +msgid "Clock Offset" +msgstr "Décalage du temps" +# +# File: src/CelestialNavigationDialog.cpp, line: 125 +# File: src/CelestialNavigationUI.cpp, line: 376 +msgid "Color" +msgstr "Couleur" +# +# File: src/CelestialNavigationUI.cpp, line: 810 +msgid "Cone" +msgstr "Cône" +# +# File: src/CelestialNavigationUI.cpp, line: 811 +msgid "Cone 2" +msgstr "Cône 2" +# +# File: src/CelestialNavigationUI.cpp, line: 387 +msgid "Config" +msgstr "Configuration" +# +# File: src/Sight.cpp, line: 872 +msgid "" +"CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" +"CorrectedMeasurement = %.4f - %.4f - %.4f\n" +"CorrectedMeasurement = %.4f\n" msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" +"Mesure corrigée = Mesure - Corrections - Collimation\n" +"Mesure corrigée = %.4f - %.4f - %.4f\n" +"Mesure corrigée = %.4f\n" +# +# File: src/Sight.cpp, line: 866 +msgid "" +"CorrectionsMoon = %.4f\n" "CorrectionsBody = %.4f\n" "Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" +"Correction de la lune = %.4f\n" +"Correction du corps = %.4f\n" +"Corrections = abs(Corrections de la lune - Corrections du corps) = %.4f\n" +# +# File: src/CelestialNavigationUI.cpp, line: 359 +msgid "DR Shift" +msgstr "Décalage de l'estime" +# +# File: src/CelestialNavigationUI.h, line: 200 +msgid "Dead Reckoning shift" +msgstr "Décalage de l'estime" +# +# File: src/CelestialNavigationUI.cpp, line: 189 +# File: src/CelestialNavigationUI.cpp, line: 348 +# File: src/CelestialNavigationUI.cpp, line: 600 +msgid "Degrees" +msgstr "Degrés" +# +# File: src/CelestialNavigationUI.cpp, line: 46 +msgid "Delete" +msgstr "Supprimer" +# +# File: src/CelestialNavigationUI.cpp, line: 49 +msgid "Delete All" +msgstr "Supprimer tout" +# +# File: src/CelestialNavigationUI.cpp, line: 330 +# File: src/CelestialNavigationUI.cpp, line: 582 +msgid "Distance" +msgstr "Distance" +# +# File: src/CelestialNavigationUI.cpp, line: 688 +msgid "Done" +msgstr "Effectué" +# +msgid "Duplicate" +msgstr "Dupliquer" +# +# File: src/CelestialNavigationUI.cpp, line: 43 +msgid "Edit" +msgstr "Modifier" +# +# File: src/CelestialNavigationUI.cpp, line: 778 +msgid "Error" +msgstr "Erreur" +# +# File: src/CelestialNavigationUI.cpp, line: 399 +msgid "Eye Height" +msgstr "Hauteur des yeux" +# +# File: src/Sight.cpp, line: 570 +# File: src/Sight.cpp, line: 708 +msgid "" +"Eye Height is %.4f meters\n" +"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" +"Height Correction Degrees = %.4f\n" msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " +"Hauteur de l'oeil = %.4f mètres\n" +"Correction de la hauteur de l'oeil en degrés = 1.758*sqrt(%.4f) / 60.0\n" +"Correction de la hauteur de l'oeil en degrés = %.4f\n" +# +msgid "Failed to load file: " +msgstr "Impossible de charger le fichier: " +# +# File: src/CelestialNavigationDialog.cpp, line: 316 +msgid "Failed to save xml file: " +msgstr "Impossible de sauvegarder le fichier : " +# +# File: src/Sight.cpp, line: 164 +msgid "Failure Alert" +msgstr "Echec" +# +# File: src/CelestialNavigationUI.cpp, line: 154 +msgid "Find" +msgstr "Chercher" +# +# File: src/CelestialNavigationUI.h, line: 227 +msgid "Find Celestial Body" +msgstr "Trouver le corps céleste" +# +# File: src/CelestialNavigationUI.cpp, line: 52 +# File: src/CelestialNavigationUI.h, line: 281 +msgid "Fix" +msgstr "Point" +# +# File: src/CelestialNavigationUI.cpp, line: 755 +msgid "Fix From Visible Sights" +msgstr "Faire le point à partir depuis les vues visibles" +# +# File: src/Sight.cpp, line: 561 +# File: src/Sight.cpp, line: 699 +msgid "" +"Formulas used to calculate sight\n" +"\n" +msgstr "" +"Formules utilisées pour calculer la vue\n" +"\n" +# +# File: src/CelestialNavigationUI.cpp, line: 815 +msgid "Go" +msgstr "Aller" +# +# File: src/CelestialNavigationDialog.cpp, line: 493 +# File: src/CelestialNavigationUI.cpp, line: 58 +msgid "Hide" +msgstr "Cacher" +# +# File: src/CelestialNavigationUI.cpp, line: 271 +msgid "Hours" +msgstr "Heures" +# +# File: src/CelestialNavigationUI.cpp, line: 432 +msgid "Index Error" +msgstr "Collimation" +# +# File: src/Sight.cpp, line: 565 +# File: src/Sight.cpp, line: 703 +msgid "" +"Index Error is %.4f degrees\n" +"\n" +msgstr "" +"La collimation est de %.4f degrés\n" +"\n" +# +# File: src/CelestialNavigationUI.cpp, line: 61 +msgid "Information" +msgstr "Information" +# +# File: src/CelestialNavigationUI.cpp, line: 789 +# File: src/CelestialNavigationUI.cpp, line: 796 +msgid "Initial" +msgstr "Initial" +# +# File: src/CelestialNavigationDialog.cpp, line: 196 +msgid "Invalid xml file" +msgstr "Fichier xml invalide" +# +# File: src/CelestialNavigationUI.cpp, line: 651 +# File: src/CelestialNavigationUI.cpp, line: 762 +msgid "Latitude" +msgstr "Latitude" +# +# File: src/CelestialNavigationUI.cpp, line: 157 +msgid "Limb" +msgstr "Bord" +# +# File: src/CelestialNavigationUI.cpp, line: 660 +# File: src/CelestialNavigationUI.cpp, line: 770 +msgid "Longitude" +msgstr "Longitude" +# +# File: src/CelestialNavigationUI.cpp, line: 161 +msgid "Lower" +msgstr "Inférieur" +# +# File: src/Sight.cpp, line: 638 +# File: src/Sight.cpp, line: 753 +# File: src/Sight.cpp, line: 828 +msgid "Lower Limb" +msgstr "Bord inférieur" +# +# File: src/CelestialNavigationUI.cpp, line: 136 +# File: src/Sight.h, line: 49 +msgid "Lunar" +msgstr "Lune" +# +# File: src/CelestialNavigationUI.cpp, line: 217 +msgid "Lunar Altitude" +msgstr "Hauteur de la lune" +# +# File: src/SightDialog.cpp, line: 255 +msgid "Lunar shot will be invalid taking distance from moon to itself" +msgstr "La vue de la lune sera invalide, utilisation de la distance depuis la lune vers elle-même" +# +# File: src/CelestialNavigationUI.cpp, line: 691 +msgid "Magnetic" +msgstr "Magnétique" +# +# File: src/CelestialNavigationUI.cpp, line: 142 +msgid "Magnetic Azimuth" +msgstr "Azimut magnétique" +# +# File: src/CelestialNavigationUI.cpp, line: 352 +# File: src/CelestialNavigationUI.cpp, line: 604 +msgid "Magnetic Bearing" +msgstr "Cap magnétique" +# +# File: src/celestial_navigation_pi.cpp, line: 167 +msgid "Magnetic data will not be available for the celestial navigation plugin." +msgstr "Les données magnétiques ne sont pas disponibles pour le complément de navigation astronomique." +# +# File: src/CelestialNavigationDialog.cpp, line: 124 +# File: src/CelestialNavigationUI.cpp, line: 179 +msgid "Measurement" +msgstr "Mesure" +# +# File: src/SightDialog.cpp, line: 172 +msgid "Measurement certainty likely set to small, sight may not appear " +msgstr "Certaines mesures sont trop faibles. La vue peut ne pas apparaitre " +# +# File: src/CelestialNavigationUI.cpp, line: 406 +msgid "Meters" +msgstr "Mètres" +# +# File: src/CelestialNavigationUI.cpp, line: 428 +msgid "MilliBars" +msgstr "Millibars" +# +# File: src/CelestialNavigationUI.cpp, line: 196 +# File: src/CelestialNavigationUI.cpp, line: 278 +# File: src/CelestialNavigationUI.cpp, line: 439 +msgid "Minutes" +msgstr "Minutes" +# +# File: src/CelestialNavigationUI.cpp, line: 203 +msgid "Minutes Certainty" +msgstr "Minutes de certitude" +# +# File: src/CelestialNavigationUI.cpp, line: 671 +# File: src/CelestialNavigationUI.cpp, line: 681 +msgid "MyLabel" +msgstr "MonEtiquette" +# +# File: src/CelestialNavigationUI.cpp, line: 40 +msgid "New" +msgstr "Nouveau" +# +# File: src/CelestialNavigationUI.cpp, line: 337 +# File: src/CelestialNavigationUI.cpp, line: 589 +msgid "Nm" +msgstr "MN" +# +# File: src/celestial_navigation_pi.cpp, line: 161 +msgid "OpenCPN Alert" +msgstr "Message d'alerte d'OpenCPN" +# +# File: src/Sight.cpp, line: 674 +# File: src/Sight.cpp, line: 855 +msgid "" +"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" +"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" +"ParallaxCorrection = %.4f\n" msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" +"Correction du parallaxe = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Hauteur corrigée))\n" +"Correction du parallaxe = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" +"Correction du parallaxe = %.4f\n" +# +# File: src/Sight.cpp, line: 777 +msgid "" +"ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" +"ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" +"ParallaxCorrectionMoon = %.4f\n" msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +"Correction du parallaxe de la lune = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Hauteur corrigée))\n" +"Correction du parallaxe de la lune = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" +"Correction du parallaxe de la lune = %.4f\n" +# +# File: src/CelestialNavigationUI.cpp, line: 453 +msgid "Parameters" +msgstr "Paramètres" +# +# File: src/CelestialNavigationUI.cpp, line: 808 +msgid "Plane" +msgstr "Plan" +# +# File: src/CelestialNavigationUI.cpp, line: 421 +msgid "Pressure" +msgstr "Pression" +# +# File: src/Sight.cpp, line: 600 +# File: src/Sight.cpp, line: 803 +msgid "" +"RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" +"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" +"RefractionCorrection = %.4f\n" msgstr "" - -#: src/Sight.cpp:895 -#, c-format -msgid "\n" -"Time correction %.4f seconds" +"Correction de la réfraction = .267 * Pression / (x*(Température + 273.15)) / 60.0\n" +"Correction de la réfraction = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" +"Correction de la réfraction = %.4f\n" +# +# File: src/Sight.cpp, line: 731 +msgid "" +"RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" +"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" +"RefractionCorrectionMoon = %.4f\n" msgstr "" - -#: src/Sight.cpp:1099 -msgid "Building bearing Sight Positions" -msgstr "Construction du cap vers les positions de la vue" - -#: src/SightDialog.cpp:172 -msgid "Measurement certainty likely set to small, sight may not appear " -msgstr "Certaines mesures sont trop faibles. La vue ne peut apparaitre " - -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +"Correction de la réfraction de la lune = .267 * Pression / (x*(Température + 273.15)) / 60.0\n" +"Correction de la réfraction de la lune = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" +"Correction de la réfraction de la lune = %.4f\n" +# +# File: src/CelestialNavigationUI.cpp, line: 285 +# File: src/CelestialNavigationUI.cpp, line: 303 +# File: src/CelestialNavigationUI.cpp, line: 862 +msgid "Seconds" +msgstr "Secondes" +# +# File: src/CelestialNavigationUI.cpp, line: 446 +msgid "Set As Defaults" +msgstr "Définir comme valeurs par défaut" +# +# File: src/CelestialNavigationUI.cpp, line: 573 +msgid "Shift all visible Sights" +msgstr "Décaler toutes les vues visibles" +# +# File: src/CelestialNavigationDialog.cpp, line: 493 +msgid "Show" +msgstr "Montrer" +# +# File: src/CelestialNavigationUI.cpp, line: 243 +msgid "Sight" +msgstr "Vue" +# +# File: src/CelestialNavigationUI.h, line: 169 +msgid "Sight Properties" +msgstr "Propriétés de la vue" +# +# File: src/CelestialNavigationUI.cpp, line: 809 +msgid "Sphere" +msgstr "Sphère" +# +# File: src/CelestialNavigationDialog.cpp, line: 398 +msgid "Sun" +msgstr "Soleil" +# +# File: src/CelestialNavigationUI.cpp, line: 410 +msgid "Temperature" +msgstr "Température" +# +# File: src/Sight.cpp, line: 163 +msgid "The plugin will not work correctly" +msgstr "Le complément ne fonctionnera pas correctement" +# +# File: src/CelestialNavigationDialog.cpp, line: 123 +msgid "Time (UT)" +msgstr "Heure (TU)" +# +# File: src/CelestialNavigationDialog.cpp, line: 349 +msgid "Time Correction" +msgstr "Correction de l'heure" +# +# File: src/CelestialNavigationUI.cpp, line: 366 +msgid "Transparency" +msgstr "Transparence" +# +# File: src/CelestialNavigationDialog.cpp, line: 121 +# File: src/CelestialNavigationUI.cpp, line: 132 +msgid "Type" +msgstr "Type" +# +# File: src/CelestialNavigationDialog.cpp, line: 248 +msgid "Unrecognized xml node" +msgstr "Noeud xml non reconnu" +# +# File: src/CelestialNavigationUI.cpp, line: 161 +msgid "Upper" +msgstr "Supérieur" +# +# File: src/Sight.cpp, line: 635 +# File: src/Sight.cpp, line: 750 +# File: src/Sight.cpp, line: 825 +msgid "Upper Limb" +msgstr "Bord supérieur" +# +# File: src/SightDialog.cpp, line: 173 +# File: src/SightDialog.cpp, line: 256 msgid "Warning" msgstr "Avertissement" - -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - -#: src/celestial_navigation_pi.cpp:90 -msgid "Failed to load file:\n" -msgstr "Echec du chargement du fichier :\n" - -#: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "\n" -"Les données magnétiques ne sont pas disponibles pour le complément de navigation céleste." - -#: src/celestial_navigation_pi.cpp:92 -msgid "OpenCPN Alert" -msgstr "Message d'alerte d'OpenCPN" - -#: src/celestial_navigation_pi.cpp:157 -msgid "Celestial Navigation PlugIn for OpenCPN" -msgstr "Complément \"Navigation stellaire\" pour OpenCPN" - -#: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Les vues décalées ne sont pas utilisables pour calculer une solution, déterminer et fixer visuellement l'emplacement. \n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Position" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " - +# +msgid "corrupt record" +msgstr "enregistrement corrompu" +# +msgid "open error" +msgstr "erreur d'ouverture" +# +msgid "too many models" +msgstr "trop de modèles" diff -Nru opencpn-plugin-celestial-2.0.0/po/gl.po opencpn-plugin-celestial-2.3.0/po/gl.po --- opencpn-plugin-celestial-2.0.0/po/gl.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/gl.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:41-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-02-03 17:08-0500\n" "Last-Translator: nohal \n" "Language-Team: Galician\n" "Language: gl_ES\n" @@ -13,696 +13,461 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: crowdin.com\n" "X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: gl\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" -msgstr "Tipo" +msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" -msgstr "Astro" +msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" -msgstr "Hora (UTC)" +msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" -msgstr "Medición" +msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" -msgstr "Cor" +msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." -msgstr "Erro ó cargar o ficheiro." +msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" -msgstr "Ficheiro xml inválido" +msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" -msgstr "Nodo xml non recoñecido" +msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" -msgstr "Ruta meteorolóxica" +msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " -msgstr "Erro ó gardar o ficheiro xml: " +msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" -msgstr "Navegación astronómica" +msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" -msgstr "Sol" +msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" -msgstr "Está seguro de que quere borrar todas as observacións?" +msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" -msgstr "Celestial_Navigation_Information.html" +msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "Novo" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "Editar" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "Borrar" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "Borrar todo" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "Información" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altura" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Acimut" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" -msgstr "Acimut magnético" +msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" -msgstr "Corpo celeste" +msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" -msgstr "Procurar" +msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" -msgstr "Limbo" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" -msgstr "Inferior" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" -msgstr "Central" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" -msgstr "Superior" +msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" -msgstr "0" +msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" -msgstr "Graos" - -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 -msgid "Minutes" -msgstr "Minutos" - -#: src/CelestialNavigationUI.cpp:200 -msgid "10" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 +msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" -msgstr "Observación" +msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" -msgstr "Horas" +msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" -msgstr "Segundos" +msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" -msgstr "Certeza" +msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" -msgstr "Distancia" +msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" -msgstr "Nm" +msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" -msgstr "Rumbo" +msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" -msgstr "Rumbo magético" +msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" -msgstr "Transparencia" +msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" -msgstr "Configuración" +msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" -msgstr "Altura do ollo" +msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" -msgstr "2" +msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" -msgstr "Metros" +msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" -msgstr "Temperatura" +msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" -msgstr "Celsius" +msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" -msgstr "Presión" +msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" -msgstr "Milibares" +msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" -msgstr "Error de índice" +msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" -msgstr "Establecer como predeterminado" +msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" -msgstr "Parámetros" +msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" -msgstr "Cálculos" - -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" msgstr "" -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitude" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Lonxitude" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" -msgstr "MyLabel" +msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" -msgstr "Feito" +msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" -msgstr "Magnético" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Solución por observacións visibles" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Erro" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Inicial" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plana" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Esfera" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Cónica" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Cónica 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Calcular" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" msgstr "" -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" -msgstr "Observacións de navegación astronómica" +msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" -msgstr "Propiedades da observación" - -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" msgstr "" -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" -msgstr "Procurar corpo celeste" +msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" -msgstr "Astrolab fallor, datos non dispoñibles:\n" +msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" -msgstr "\n" -"Esquenceu instalar vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" +msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" -msgstr "O complemento non traballa correctamente" +msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" -msgstr "Alerta de fallo" - -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" msgstr "" -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Datos do almanaque para " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Posición Xeográfica (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" -msgstr "Fórmulas utilizadas para calcular a observación\n\n" +msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" -msgstr "O erro de índice é %.4f graos\n\n" - -#: src/Sight.cpp:561 src/Sight.cpp:699 -#, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" -msgstr "A altura do ollo é %.4f metros\n" -"Corrección da altura en graos= 1.758*sqrt(%.4f) / 60.0\n" -"Graos de correción da altura = %.4f\n" - -#: src/Sight.cpp:568 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Altura Aparente (Ha)\n" -"Altura Aparente = Medición - Corrección de Índice - Corrección da altura do ollo\n" -"Altura Aparente = %.4f - %.4f - %.4f\n" -"Altura Aparente = %.4f\n" - -#: src/Sight.cpp:586 src/Sight.cpp:789 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Corrección por refracción\n" -"x = tan(Pi/180*Altura aparente + 4.848e-2*(Pi/180) / (tan(Pi/180*Altura aparente) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" - -#: src/Sight.cpp:591 src/Sight.cpp:794 -#, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" -msgstr "Corrección por refracción = .267 * Presión / (x*(Temperatura + 273.15)) / 60.0\n" -"Corrección por Refracción = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"Corrección por Refracción = %.4f\n" - -#: src/Sight.cpp:606 src/Sight.cpp:808 -#, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" -msgstr "\n" -"Sol seleccionado, Corrección por limbo\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" - -#: src/Sight.cpp:616 src/Sight.cpp:732 -#, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" -msgstr "\n" -"Lúa seleccionada, Corrección por limbo\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" - -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 -msgid "Upper Limb" -msgstr "Limbo superior" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "Limbo inferior" - -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "\n" -"Corrección por limbo = %.4f\n" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "\n" -"Altura Corrixida\n" -"Altura Corrixida =Altura Aparente - Corrección por Refracción - Corrección por Limbo\n" -"Altura Corrixida = %.4f - %.4f - %.4f\n" -"Altura Corrixida = %.4f\n" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "\n" -"Sol seleccionado, Corrección por paralaxe\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" +msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:517 #, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "\n" -"Lúa seleccionada, Corrección por paralaxe\n" -"HP = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" +msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:524 #, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "Corrección por paralaxe = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Altura corrixida))\n" -"Corrección por paralaxe = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"Corrección por paralaxe = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" +msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" -msgstr "\n" -"Altura Observada (Ho)\n" -"Altura Observada = Altura Corrixida - Corrección por paralaxe\n" -"Altura Observada = %.4f - %.4f\n" -"Altura Observada = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" +msgstr "" -#: src/Sight.cpp:706 +#: src/Sight.cpp:547 #, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:717 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:722 +#: src/Sight.cpp:572 #, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" +#: src/Sight.cpp:582 +msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" +#: src/Sight.cpp:585 +msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:768 +#: src/Sight.cpp:588 #, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:778 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:857 +#: src/Sight.cpp:607 #, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:863 +#: src/Sight.cpp:616 #, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " +#: src/Sight.cpp:622 +#, c-format +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:890 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Error from measurement: %.4f" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" -msgstr "Resolvendo situación das observacións" +msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " -msgstr "Estableceuse unha certeza de medición moi pequena, a observación pode non aparecer " +msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" -msgstr "Aviso" - -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" msgstr "" #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" -msgstr "Erro ó cargar o ficheiro:\n" +msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "\n" -"Os datos magnéticos non están dispoñibles para o complemento de navegación astronómica." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." +msgstr "" #: src/celestial_navigation_pi.cpp:92 msgid "OpenCPN Alert" -msgstr "Aviso OpenCPN" +msgstr "" #: src/celestial_navigation_pi.cpp:157 msgid "Celestial Navigation PlugIn for OpenCPN" -msgstr "Complemento de Navegación Astronómica para OpenCPN" +msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "As observacións trasladadas non se usan para calcular unha solución, determínea visualmente no seu lugar.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Posición calculada" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " - diff -Nru opencpn-plugin-celestial-2.0.0/po/hu.po opencpn-plugin-celestial-2.3.0/po/hu.po --- opencpn-plugin-celestial-2.0.0/po/hu.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/hu.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,639 +2,460 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2014-12-02 08:46-0500\n" "Last-Translator: nohal \n" "Language-Team: Hungarian\n" "Language: hu_HU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: crowdin.com\n" -"X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: hu\n" -"X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:588 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:607 #, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:616 #, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:622 #, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:706 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." msgstr "" #: src/celestial_navigation_pi.cpp:92 @@ -646,21 +467,6 @@ msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/it.po opencpn-plugin-celestial-2.3.0/po/it.po --- opencpn-plugin-celestial-2.0.0/po/it.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/it.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-04-23 13:12-0400\n" "Last-Translator: nohal \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -16,632 +16,448 @@ "X-Crowdin-Language: it\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" -msgstr "Tipo" +msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" -msgstr "Corpo" +msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" -msgstr "Ora (UTC)" +msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" -msgstr "Misura" +msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" -msgstr "Colore" +msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." -msgstr "Impossibile caricare il file." +msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" -msgstr "File xml non valido" +msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" -msgstr "Nodo xml non riconosciuto" +msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" -msgstr "Pianificazione con meteo" +msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " -msgstr "Impossibile salvare il file xml: " +msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" -msgstr "Navigazione Astronomica" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" -msgstr "Sole" +msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" -msgstr "Sei sicuro di voler eliminare tutte le viste?" +msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" -msgstr "Celestial_Navigation_Information.html" +msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "Nuovo" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "Modifica" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "Elimina" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "Elimina Tutto" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "Informazioni" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altezza" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimut" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" -msgstr "Azimut magnetico" +msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" -msgstr "Corpo celeste" +msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" -msgstr "Trova" +msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" -msgstr "Lembo" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" -msgstr "Inferiore" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" -msgstr "Centrale" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" -msgstr "Superiore" +msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" -msgstr "0" +msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" -msgstr "Gradi" - -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 -msgid "Minutes" -msgstr "Minuti" - -#: src/CelestialNavigationUI.cpp:200 -msgid "10" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 +msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" -msgstr "Vista" +msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitudine" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitudine" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" -msgstr "MyLabel" +msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Punto da viste visibili" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Errore" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/D " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Iniziale" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Piano" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Sfera" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Cono" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Cono 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Vai" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Posizione geografica (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" -msgstr "Lembo superiore" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "" - -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" +#: src/Sight.cpp:585 +msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:753 +#: src/Sight.cpp:588 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:768 +#: src/Sight.cpp:593 #, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:778 +#: src/Sight.cpp:607 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:857 +#: src/Sight.cpp:616 #, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:863 +#: src/Sight.cpp:622 #, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Error from measurement: %.4f" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." msgstr "" #: src/celestial_navigation_pi.cpp:92 @@ -653,21 +469,6 @@ msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Le letture spostate non sono usate per calcolare il punto. Determinare il punto visivamente.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Posizione Punto nave" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/D " - diff -Nru opencpn-plugin-celestial-2.0.0/po/ja.po opencpn-plugin-celestial-2.3.0/po/ja.po --- opencpn-plugin-celestial-2.0.0/po/ja.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/ja.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,666 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: opencpn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" -"Last-Translator: nohal \n" -"Language-Team: Japanese\n" -"Language: ja_JP\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" -"X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: ja\n" -"X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" - -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 -msgid "Type" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:124 -msgid "Body" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:125 -msgid "Time (UTC)" -msgstr "時刻 (UTC)" - -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 -msgid "Measurement" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 -msgid "Color" -msgstr "色" - -#: src/CelestialNavigationDialog.cpp:193 -msgid "Failed to load file." -msgstr "" - -#: src/CelestialNavigationDialog.cpp:198 -msgid "Invalid xml file" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:250 -msgid "Unrecognized xml node" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:260 -msgid "Weather Routing" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:320 -msgid "Failed to save xml file: " -msgstr "" - -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 -#: src/celestial_navigation_pi.cpp:152 -msgid "Celestial Navigation" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:409 -msgid "Sun" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:465 -msgid "Are you sure you want to delete all sights?" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:510 -msgid "Celestial_Navigation_Information.html" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" - -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" - -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "" - -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "" - -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "削除" - -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "すべて削除" - -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "情報" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 -msgid "Magnetic Azimuth" -msgstr "" - -#: src/CelestialNavigationUI.cpp:145 -msgid "Celestial Body" -msgstr "" - -#: src/CelestialNavigationUI.cpp:154 -msgid "Find" -msgstr "" - -#: src/CelestialNavigationUI.cpp:157 -msgid "Limb" -msgstr "" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Lower" -msgstr "" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Center" -msgstr "" - -#: src/CelestialNavigationUI.cpp:161 -msgid "Upper" -msgstr "" - -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 -msgid "0" -msgstr "0" - -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 -msgid "Degrees" -msgstr "" - -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 -msgid "Minutes" -msgstr "" - -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 -msgid "Sight" -msgstr "" - -#: src/CelestialNavigationUI.cpp:271 -msgid "Hours" -msgstr "時間" - -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 -msgid "Seconds" -msgstr "" - -#: src/CelestialNavigationUI.cpp:293 -msgid "Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" - -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 -msgid "Distance" -msgstr "" - -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 -msgid "Nm" -msgstr "" - -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 -msgid "Bearing" -msgstr "" - -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 -msgid "Magnetic Bearing" -msgstr "" - -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" - -#: src/CelestialNavigationUI.cpp:366 -msgid "Transparency" -msgstr "" - -#: src/CelestialNavigationUI.cpp:387 -msgid "Config" -msgstr "" - -#: src/CelestialNavigationUI.cpp:399 -msgid "Eye Height" -msgstr "" - -#: src/CelestialNavigationUI.cpp:403 -msgid "2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:406 -msgid "Meters" -msgstr "メートル" - -#: src/CelestialNavigationUI.cpp:410 -msgid "Temperature" -msgstr "" - -#: src/CelestialNavigationUI.cpp:417 -msgid "Celcius" -msgstr "" - -#: src/CelestialNavigationUI.cpp:421 -msgid "Pressure" -msgstr "" - -#: src/CelestialNavigationUI.cpp:428 -msgid "MilliBars" -msgstr "" - -#: src/CelestialNavigationUI.cpp:432 -msgid "Index Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:446 -msgid "Set As Defaults" -msgstr "" - -#: src/CelestialNavigationUI.cpp:453 -msgid "Parameters" -msgstr "" - -#: src/CelestialNavigationUI.cpp:469 -msgid "Calculations" -msgstr "" - -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "経度" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 -msgid "MyLabel" -msgstr "" - -#: src/CelestialNavigationUI.cpp:686 -msgid "Done" -msgstr "" - -#: src/CelestialNavigationUI.cpp:689 -msgid "Magnetic" -msgstr "" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " なし " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " なし " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "エラー" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " なし " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 -msgid "Celestial Navigation Sights" -msgstr "" - -#: src/CelestialNavigationUI.h:169 -msgid "Sight Properties" -msgstr "" - -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 -msgid "Find Celestial Body" -msgstr "" - -#: src/Sight.cpp:160 -msgid "Astrolab failed, data unavailable:\n" -msgstr "" - -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" -msgstr "" - -#: src/Sight.cpp:162 -msgid "The plugin will not work correctly" -msgstr "" - -#: src/Sight.cpp:163 -msgid "Failure Alert" -msgstr "" - -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 -msgid "Formulas used to calculate sight\n\n" -msgstr "" - -#: src/Sight.cpp:556 src/Sight.cpp:694 -#, c-format -msgid "Index Error is %.4f degrees\n\n" -msgstr "" - -#: src/Sight.cpp:561 src/Sight.cpp:699 -#, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" -msgstr "" - -#: src/Sight.cpp:568 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:586 src/Sight.cpp:789 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:591 src/Sight.cpp:794 -#, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:606 src/Sight.cpp:808 -#, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" -msgstr "" - -#: src/Sight.cpp:616 src/Sight.cpp:732 -#, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" -msgstr "" - -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 -msgid "Upper Limb" -msgstr "" - -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 -msgid "Lower Limb" -msgstr "" - -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" - -#: src/Sight.cpp:895 -#, c-format -msgid "\n" -"Time correction %.4f seconds" -msgstr "" - -#: src/Sight.cpp:1099 -msgid "Building bearing Sight Positions" -msgstr "" - -#: src/SightDialog.cpp:172 -msgid "Measurement certainty likely set to small, sight may not appear " -msgstr "" - -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 -msgid "Warning" -msgstr "" - -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - -#: src/celestial_navigation_pi.cpp:90 -msgid "Failed to load file:\n" -msgstr "" - -#: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." -msgstr "" - -#: src/celestial_navigation_pi.cpp:92 -msgid "OpenCPN Alert" -msgstr "" - -#: src/celestial_navigation_pi.cpp:157 -msgid "Celestial Navigation PlugIn for OpenCPN" -msgstr "" - -#: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " なし " - diff -Nru opencpn-plugin-celestial-2.0.0/po/nb.po opencpn-plugin-celestial-2.3.0/po/nb.po --- opencpn-plugin-celestial-2.0.0/po/nb.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/nb.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:41-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-29 14:06-0400\n" "Last-Translator: nohal \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -16,411 +16,356 @@ "X-Crowdin-Language: nb\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Type" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Kropp" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Tid (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Måling" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Farge" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Kunne ikke laste fil." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Feil xml fil" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Ukjent xml node" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Værnavigasjon" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Kunne ikke lagre xml fil: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Astronomisk Navigasjon" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Azimuth" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Høyde" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Forskyvde legemer brukes ikke til å beregne posisjon, beregn posisjon visuelt i stedet.\n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Satt posisjon" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sol" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Er du sikker på at du vil slette alle lagrede legemer?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Posisjon fra synlige landmerker" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Breddegrad" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Lengdegrad" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Feil" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Første" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Alg" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Plan" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Sfære" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Kon" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Kon 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Gå" -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Ny" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Endre" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Slett" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Slett alle" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Informasjon" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Høyde" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimuth" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Magnetisk azimuth" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Himmellegeme" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Finn" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Ytterkant" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Senk" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Senter" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Øvre" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Grader" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minutter" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Grader sikkerhet" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Legeme" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Timer" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Sekunder" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Sikkerhet" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Forskyvd" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Distanse" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Nm" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Kurs" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Magnetisk kurs" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Dato og tid" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Gjennomsiktighet" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Konfigurasjon" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Øyehøyde" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Meter" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Temperatur" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celcius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Trykk" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "Millibar" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Indeks feil" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Sett som standard" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parametre" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Kalkulasjoner" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Breddegrad" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Lengdegrad" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MinMerkelapp" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Ferdig" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnetisk" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Posisjon fra synlige landmerker" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Feil" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Første" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Alg" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plan" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Sfære" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Kon" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Kon 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Gå" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Astronomiske Navigasjons punkter" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Egenskaper for punkt" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Lokaliser himmellegeme" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab feilet, data utilgjengelig:\n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Glemte du å installere vsop87d.txt\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Utvidelsen vil ikke virke skikkelig" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Feilalarm" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Almanakk data for " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Formler brukt til beregning av punkt\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "Indeks feil er %.4f grader\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -429,7 +374,7 @@ "Høyde korreksjon i grader = 1.758*kv.rot(%.4f) / 60.0\n" "Høyde korreksjon i grader = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -442,7 +387,7 @@ "TilsynelatendeHøyde = %.4f - %.4f - %.4f\n" "TilsynelatendeHøyde = %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -455,21 +400,21 @@ "x =tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" "x = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -478,22 +423,22 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Øvre kant" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Nedre kant" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "Korreksjon av kant = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -502,28 +447,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -532,114 +477,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Almanakk data for " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Retning til observert bygning" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Målingen er sikkert satt for lavt, sikt kan kanskje ikke oppnås " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Advarsel" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Kunne ikke laste fil:\n" @@ -660,20 +525,7 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Forskyvde legemer brukes ikke til å beregne posisjon, beregn posisjon visuelt i stedet.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Satt posisjon" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Astronomisk Navigasjons utvidelse for OpenCPN\n" +"Integrerer nautisk almanakk for sol, måne, planeter og diverse navigasjons stjerner. Beregner posisjon ut fra målinger av himmellegemer." diff -Nru opencpn-plugin-celestial-2.0.0/po/nl.po opencpn-plugin-celestial-2.3.0/po/nl.po --- opencpn-plugin-celestial-2.0.0/po/nl.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/nl.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-06-02 20:34-0400\n" "Last-Translator: nohal \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -16,425 +16,358 @@ "X-Crowdin-Language: nl\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Type" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Hemellichaam" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Tijd (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Observatie" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Kleur" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Kon bestand niet laden." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Ongeldige XML-bestand" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "Niet-herkend XML-knooppunt" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Weerroutering" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Kon XML-bestand niet opslaan: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Astronomische navigatie" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "Tijdcorrectie" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "azimuth" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "hoogte" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Verzeilde positielijnen kunnen niet worden gebruikt voor een bestek, beoordeel uw geografische positie visueel op de kaart.\n" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Bestek" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " n.v.t." + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Zon" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Weet u zeker dat u alle observaties wilt verwijderen?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Astronomisch bestek" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Breedte" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " niet beschikbaar" + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Lengte" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " niet beschikbaar " + +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Fout" -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " niet beschikbaar " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Startwaarde" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "Basis" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "platte vlak" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "bol" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "kegel" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "kegel 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Start" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Nieuwe meting" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Bewerken" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Verwijderen" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Alles verwijderen" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Informatie" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "hoogte" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "azimuth" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "Maansafstand" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "magnetisch azimuth" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Hemellichaam" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Zoeken" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Meetpunt" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "onderrand" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "middelpunt" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "bovenrand" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "graden" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "minuten" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "Maan's hoogte" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "Hoogte 2e hemellichaam" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ".01" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "meetonzekerheid in graden" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Meting" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "uren (tijd in UT!)" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "seconden" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Meetonzekerheid" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Verzeiling" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Afstand" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "NM" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Richting" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Richting t.o.v. magnetische noorden" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Datum en tijd" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Transparantie" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Schermweergave" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Ooghoogte" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "meter" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Luchttemperatuur" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celsius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Luchtdruk" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "hPa" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Indexfout sextant" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Instellen als standaard" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parameters" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Berekeningen" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Breedte" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Lengte" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "MijnLabel" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Klaar" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnetisch" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Astronomisch bestek" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " niet beschikbaar" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " niet beschikbaar " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Fout" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " niet beschikbaar " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Startwaarde" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "Basis" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "platte vlak" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "bol" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "kegel" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "kegel 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Start" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "Klokcorrectie" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Astronomische positiebepaling" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Meetgegevens" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Zoek hemellichaam" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Almanakfout, gegevens niet beschikbaar:\n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Hebt u vergeten om 'vsop87d.txt' te installeren?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "Zonder dit almanakbestand zal de plugin niet functioneren." -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Foutmelding" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "Toepassen klokcorrectie van %d seconds\n\n" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Almanakgegevens voor: " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"\n" -" Aardse Projectie (B=Dec, WL=GHA, OL=360-GHA) = %.4f %.4f\n" -"\n" -" Aries GHA = %.0f° %.1f'\n" -"\n" -" Aries SHA = %.0f° %.1f'\n" -"\n" -" GHA = %.0f° %.1f'\n" -"\n" -" Dec = %c %.0f° %.1f'\n" -"\n" -" SD = %.1f'\n" -"\n" -" HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Gegevens en formules gebruikt voor hoogtecorrecties en bestekberekening\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr " Indexfout sextant is: %.4f °\n" +"\n" +"" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -443,7 +376,7 @@ " Correctie voor Schijnbare Kimduiking (dip) in ° = 1.753*sqrt(%.3f) / 60.0\n" " Correctie voor Schijnbare Kimduiking (dip) in ° = %.3f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -459,8 +392,10 @@ " Ha = %.4f - %.4f - %.4f\n" "\n" " Ha = %.4f\n" +"\n" +"" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -481,7 +416,7 @@ "\n" "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -494,7 +429,7 @@ "\n" "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -506,8 +441,10 @@ " Afstand = %.4f\n" "\n" " Halve Middellijn Zon = 0.266564/Afstand = %.4f\n" +"\n" +"" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -523,16 +460,18 @@ " Halve Middellijn Maan = 180/Pi * asin(Pi/180*SD)\n" "\n" " Halve Middellijn Maan = %.4f\n" +"\n" +"" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr " Bovenrand" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr " Onderrand" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" @@ -540,7 +479,7 @@ "\n" " Correctie Halve Middellijn = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -556,8 +495,10 @@ " Hx = %.4f - %.4f - %.4f\n" "\n" " Hx = %.4f\n" +"\n" +"" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -567,7 +508,7 @@ " Straal = %.4f\n" " HP = 0.002442/Straal = %.4f\n\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -576,9 +517,11 @@ "\n" " Horizontale Parallax (HP) en Parallax In Hoogte (PA) Maan\n" "\n" -" HP = %.4f\n\n" +" HP = %.4f\n" +"\n" +"\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -587,7 +530,7 @@ " Correctie voor HP en Parallax In Hoogte in ° = -180/Pi * asin(sin(Pi/180 * %.3f ) * cos(Pi/180 * %.3f))\n" " Correctie voor HP en Parallax In Hoogte in ° = %.5f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -603,142 +546,61 @@ " Ho = %.4f - %.4f\n" "\n" " Ho = %.4f\n" +"\n" +"" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "\n" -"Maan's schijnbare hoogte (Ha)\n" -"Maan's schijnbare hoogte = Maan's gemeten hoogte - Indexcorrectie - Ooghoogtecorrectie\n" -" Maan's schijnbare hoogte = %.4f - %.4f - %.4f\n" -"Maan's schijnbare hoogte = %.4f\n" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "\n" -"Refractiecorrectie\n" -"x = tan(Pi/180*Maan's schijnbare hoogte + 4.848e-2*(Pi/180) / (tan(Pi/180*Maan's schijnbare hoogte) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "Maan's refractiecorrectie = .267 * Luchtdruk / (x*(Temperatuur + 273.15)) / 60.0\n" -"Maan's refractiecorrectie = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"Maan's refractiecorrectie = %.4f\n" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "\n" -"Maan's randcorrectie = %.4f\n" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "\n" -"Verbeterde hoogte\n" -"Maan's verbeterde hoogte = Maan's schijnbare hoogte - Maan's refractiecorrectie - Maan's randcorrectie\n" -"Maan's verbeterde hoogte = %.4f - %.4f - %.4f\n" -"Maan's verbeterde hoogte = %.4f\n" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "Parallaxcorrectie maan = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * Verbeterde hoogte))\n" -" Parallaxcorrectie maan = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"Parallaxcorrectie maan = %.4f\n" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "\n" -"Schijnbare hoogte (Ha)\n" -"Schijnbare hoogte = Meting - Indexcorrectie - Ooghoogtecorrectie\n" -" Schijnbare hoogte = %.4f - %.4f - %.4f\n" -"Schijnbare hoogte = %.4f\n" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "Maancorrecties = %.4f\n" -"Correcties 2e hemellichaam = %.4f\n" -"Correcties = abs(Maancorrecties - Correcties 2e hemellichaam) = %.4f\n" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "Verbeterde meting = Meting - Correcties - Indexcorrectie\n" -"Verbeterde meting = %.4f - %.4f - %.4f\n" -"Verbeterde meting = %.4f\n" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "\nBerekende hoek tussen maan en " - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "\n" -"Fout uit meting: %.4f" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "\nOmlooptijd van de maan is 28 dagen; 6720 seconden (112 minuten) gaan voorbij voor een verschil van 1 graad" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Almanakgegevens voor: " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "\n" -"Tiidcorrectie %.4f seconden" +"\n" +" Aardse Projectie (B=Dec, WL=GHA, OL=360-GHA) = %.4f %.4f\n" +"\n" +"\n" +"\n" +" Aries GHA = %.0f° %.1f'\n" +"\n" +" SHA = %.0f° %.1f'\n" +"\n" +"\n" +"\n" +" GHA = %.0f° %.1f'\n" +"\n" +" Dec = %c %.0f° %.1f'\n" +"\n" +" SD = %.1f'\n" +"\n" +" HP = %.1f'\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Berekenen ..." -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Waarde voor 'meetonzekerheid' is waarschijnlijk zo laag ingesteld, dat de hoogtekromme niet zichtbaar is bij een kleine kaartschaal. " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Waarschuwing" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "Maansafstand is ongeldig als alleen de maan gebruikt wordt" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Kon bestand niet laden:\n" @@ -755,31 +617,11 @@ #: src/celestial_navigation_pi.cpp:157 msgid "Celestial Navigation PlugIn for OpenCPN" -msgstr "Astronomische Navigatie PlugIn voor OpenCPN" +msgstr "Astronomische navigatie plugin voor OpenCPN" #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "PlugIn voor astronomische navigatie binnen OpenCPN\n" -"\n" -"De PlugIn bevat astronomische gegevens voor zon, maan, planeten en de belangrijkste\n" -"sterren en berekent astrobestekken. De lange termijn astronomische gegevens zijn die van\n" -" VSOP87 (voor planeten, en indirect voor de zon) en ELP2000-82 (voor de maan). De Astrolabe\n" -"software routines (gebaseerd op Meeus 1998) worden gebruikt voor de berekeningen. De PlugIn\n" -"\n" -"berekent de positie van de waarnemer op een geheel innovatieve wijze." - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Verzeilde positielijnen kunnen niet worden gebruikt voor een bestek, beoordeel uw geografische positie visueel op de kaart.\n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Bestek" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " n.v.t." +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "Plugin voor astronomische navigatie binnen OpenCPN\n" +"De plugin bevat astronomische gegevens voor zon, maan, planeten en de belangrijkste sterren en berekent astrobestekken. De lange termijn astronomische gegevens zijn die van VSOP87 (voor planeten, en indirect voor de zon) en ELP2000-82 (voor de maan). De Astrolabe software routines (gebaseerd op Meeus 1998) worden gebruikt voor de berekeningen. De plugin berekent de positie van de waarnemer op een geheel innovatieve wijze. " diff -Nru opencpn-plugin-celestial-2.0.0/po/pl.po opencpn-plugin-celestial-2.3.0/po/pl.po --- opencpn-plugin-celestial-2.0.0/po/pl.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/pl.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-29 14:05-0400\n" "Last-Translator: nohal \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -16,417 +16,362 @@ "X-Crowdin-Language: pl\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Nie udało się załadować pliku." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -435,7 +380,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -444,21 +389,21 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -467,21 +412,21 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -490,28 +435,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -520,114 +465,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" @@ -647,20 +512,6 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/POTFILES.in opencpn-plugin-celestial-2.3.0/po/POTFILES.in --- opencpn-plugin-celestial-2.0.0/po/POTFILES.in 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/POTFILES.in 2018-03-29 17:18:40.000000000 +0000 @@ -10,7 +10,3 @@ src/SightDialog.h src/celestial_navigation_pi.cpp src/celestial_navigation_pi.h -src/ClockCorrectionDialog.cpp -src/ClockCorrectionDialog.h -src/FixDialog.cpp -src/FixDialog.h diff -Nru opencpn-plugin-celestial-2.0.0/po/pt.po opencpn-plugin-celestial-2.3.0/po/pt.po --- opencpn-plugin-celestial-2.0.0/po/pt.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/pt.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:41-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-23 05:02-0400\n" "Last-Translator: nohal \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -16,418 +16,356 @@ "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Tipo" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "Corpo" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "Medição" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Cor" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Falha ao carregar arquivo." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Arquivo xml inválido" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "não reconhecido xml node" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "Roteamento de tempo" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Falha ao salvar arquivo xml: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "Navegação astronomica" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" -msgstr "" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "Azimute" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Altitude" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "Posições deslocados não são usadas para calcular uma correção, determinar correção visualmente em vez disso. \n" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "Posição fixa" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "Sol" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "Tem certeza que deseja excluir todas posições?" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "Celestial_Navigation_Information.html" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" -msgstr "" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" +msgstr "Posição atravé de visível avistamento" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" -msgstr "" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Latitude" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Longitude" + +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr " N/A " -#: src/CelestialNavigationUI.cpp:40 +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Erro" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr " N/A " + +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" +msgstr "Inicial" + +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" +msgstr "ALG" + +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "Plano" + +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "Esfera" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "Cone" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "Cone 2" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "Ir" + +#: src/CelestialNavigationUI.cpp:111 msgid "New" msgstr "Novo" -#: src/CelestialNavigationUI.cpp:43 +#: src/CelestialNavigationUI.cpp:114 msgid "Edit" msgstr "Editar" -#: src/CelestialNavigationUI.cpp:46 +#: src/CelestialNavigationUI.cpp:117 msgid "Delete" msgstr "Apagar" -#: src/CelestialNavigationUI.cpp:49 +#: src/CelestialNavigationUI.cpp:120 msgid "Delete All" msgstr "Apagar tudo" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" -msgstr "" - -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" -msgstr "" - -#: src/CelestialNavigationUI.cpp:61 +#: src/CelestialNavigationUI.cpp:123 msgid "Information" msgstr "Informação" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Altitude" - -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" -msgstr "Azimute" - -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" -msgstr "" - -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "Azimute magnético" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "Corpo celeste" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Encontrar" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "Limbo" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Inferior" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Centro" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Superior" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "0" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Graus" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minutos" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" -msgstr "" - -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" -msgstr "" - -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" +msgstr ",25" + +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" +msgstr "Graus de certeza" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "Posição" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "Horas" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "Segundos" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "Certeza" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" -msgstr "" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" +msgstr "Shift" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "Distância" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "Nm" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "Rumo" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "Rumo magnético" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" -msgstr "" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" +msgstr "Data e hora" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "Transparência" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "Configuração" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "Altura dos olhos" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "2" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "Metros" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "Temperatura" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "Celcius" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "Pressão" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "Milibares" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "Erro de índice" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "Ajustar como padrões" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "Parâmetros" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "Cálculos" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitude" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitude" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "Minha Label" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "Feito" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "Magnético" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "Posição atravé de visível avistamento" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Erro" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Inicial" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "ALG" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Plano" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "Esfera" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "Cone" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "Cone 2" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "Ir" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "Navegação Astronomica Posição" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "Propriedades da Posição" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "Encontrar o corpo celeste" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "Astrolab falha, dados indisponíveis: \n" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "\n" "Você esqueceu de instalar vsop87d.txt?\n" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "O plugin não irá funcionar corretamente" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "Alerta de falha" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "Dados do almanaque para " - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "\n" -"Geographical posição (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "Fórmulas utilizadas para calcular visada\n\n" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "Índice de erro é %.4f graus\n\n" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" @@ -436,7 +374,7 @@ "Graus de correção da altura = 1.758*sqrt(%.4f) / 60.0\n" "Graus de correção da altura = %.4f\n" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -449,7 +387,7 @@ "Altitude Aparente = %.4f - %.4f - %.4f\n" "Altitude Aparente = %.4f\n" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -462,7 +400,7 @@ "x = tan (Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) +.028)) \n" "x = %.4f\n" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" @@ -471,7 +409,7 @@ "Correção da Refração =.267 * %.4f / (x * (%.4f + 273.15)) / 60.0\n" "Correção da Refração = %.4f\n" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" @@ -480,7 +418,7 @@ "Selecionado Sol, Limb Correção\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -493,22 +431,22 @@ "lc = 180/Pi * asin (Pi/180 * SD) \n" "lc = %.4f\n" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "Membro superior" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "Membro inferior" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "\n" "LimbCorrection = %.4f\n" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -521,7 +459,7 @@ "Altitude Corrigida = %.4f - %.4f - %.4f\n" "Altitude Corrigida = %.4f\n" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" @@ -530,7 +468,7 @@ "Selecionado Sol, paralaxe correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" @@ -539,7 +477,7 @@ "Selecionado Lua, paralaxe correction\n" "HP = %.4f\n" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" @@ -548,7 +486,7 @@ "ParallaxCorrection = -180/Pi * asin (sin (Pi/180 * %.4f) * cos (Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -561,114 +499,41 @@ "ObservadaAltitude = %.4f - %.4f\n" "ObservadaAltitude = %.4f\n" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" -msgstr "" +#: src/Sight.cpp:656 +msgid "Almanac Data For " +msgstr "Dados do almanaque para " -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" -msgstr "" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" +msgstr "\n" +"Geographical posição (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "Construindo posições de marcação" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "Provavelmente pequena a certeza de medição, posição pode não aparecer " -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "Aviso" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "Falha ao carregar arquivo:\n" @@ -689,20 +554,7 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "Posições deslocados não são usadas para calcular uma correção, determinar correção visualmente em vez disso. \n" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "Posição fixa" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." +msgstr "PlugIn de navegação astronomica para OpenCPN.\n" +"Implementa Almanaque Náutico para o sol, lua, planetas e diversas estrelas navegacionais. Calcula a posição fixa através de medições celestes." diff -Nru opencpn-plugin-celestial-2.0.0/po/ru.po opencpn-plugin-celestial-2.3.0/po/ru.po --- opencpn-plugin-celestial-2.0.0/po/ru.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/ru.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-03-02 22:15-0500\n" "Last-Translator: nohal \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -13,628 +13,450 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: crowdin.com\n" "X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: ru\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:588 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:607 #, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:616 #, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:622 #, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:706 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." msgstr "" #: src/celestial_navigation_pi.cpp:92 @@ -646,21 +468,6 @@ msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/sv.po opencpn-plugin-celestial-2.3.0/po/sv.po --- opencpn-plugin-celestial-2.0.0/po/sv.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/sv.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-05-29 14:06-0400\n" "Last-Translator: nohal \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -16,417 +16,362 @@ "X-Crowdin-Language: sv-SE\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "Typ" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "Tid (UTC)" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" -msgstr "Mätning" +msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "Färg" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "Misslyckades ladda fil." -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "Ogiltig xml fil" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" -msgstr "Okänd Xml-nod" +msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "Det gick inte att spara XML-filen: " -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "Höjd" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" +msgstr "Latitude" + +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "Ny" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "Longitude" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "Redigera" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "Radera" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "Fel" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "Radera allt" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "Information" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" -msgstr "Höjd" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "Ny" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "Redigera" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "Radera" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "Radera alla" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "Information" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "Hitta" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "Lägre" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "Center" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "Övre" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "Grader" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "Minuter" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "Latitude" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "Longitude" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" -msgstr "Färdig" - -#: src/CelestialNavigationUI.cpp:689 -msgid "Magnetic" -msgstr "Magnetisk" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Fel" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "Inledande" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" +#: src/CelestialNavigationUI.cpp:646 +msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -435,7 +380,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -444,21 +389,21 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -467,21 +412,21 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -490,28 +435,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -520,114 +465,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" @@ -639,7 +504,7 @@ #: src/celestial_navigation_pi.cpp:92 msgid "OpenCPN Alert" -msgstr "OpenCPN Varning" +msgstr "" #: src/celestial_navigation_pi.cpp:157 msgid "Celestial Navigation PlugIn for OpenCPN" @@ -647,20 +512,6 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/tr.po opencpn-plugin-celestial-2.3.0/po/tr.po --- opencpn-plugin-celestial-2.0.0/po/tr.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/tr.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-02-03 17:09-0500\n" "Last-Translator: nohal \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -13,628 +13,450 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n\n" "X-Generator: crowdin.com\n" "X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: tr\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" -msgstr "Zaman (UTC)" +msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" -msgstr "Renk" +msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." -msgstr "Dosya yüklerken Hata oluştu." +msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" -msgstr "Geçersiz xml Dosyası" +msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " -msgstr "Xml dosyası kaydedilemedi: " +msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" -msgstr "Güneş" +msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" -msgstr "Yeni" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" -msgstr "Düzenle" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" +msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" -msgstr "Sil" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" -msgstr "Tümünü Sil" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" +msgstr "" + +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " +msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" -msgstr "Bilgilendirme" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" +msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" -msgstr "Bulmak" +msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" -msgstr "Alçak" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" -msgstr "Ortada" +msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" -msgstr "üst" +msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" -msgstr "0" +msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" -msgstr "Derece" - -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 -msgid "Minutes" -msgstr "Dakika" - -#: src/CelestialNavigationUI.cpp:200 -msgid "10" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 +msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" -msgstr "Tamam" - -#: src/CelestialNavigationUI.cpp:689 -msgid "Magnetic" -msgstr "Manyetik" - -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "Hata" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr " N/A " - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "Uçak" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" +#: src/CelestialNavigationUI.cpp:646 +msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" -msgstr "Gökcismi bulmak" +msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:650 src/Sight.cpp:840 -#, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" -msgstr "" - -#: src/Sight.cpp:659 src/Sight.cpp:764 -#, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" -msgstr "" - -#: src/Sight.cpp:665 src/Sight.cpp:846 -#, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:672 -#, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 +#: src/Sight.cpp:588 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:722 +#: src/Sight.cpp:593 #, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:747 src/Sight.cpp:750 +#: src/Sight.cpp:607 #, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:753 +#: src/Sight.cpp:616 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:768 +#: src/Sight.cpp:622 #, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:778 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." msgstr "" #: src/celestial_navigation_pi.cpp:92 @@ -646,21 +468,6 @@ msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " -msgstr " N/A " - diff -Nru opencpn-plugin-celestial-2.0.0/po/vi.po opencpn-plugin-celestial-2.3.0/po/vi.po --- opencpn-plugin-celestial-2.0.0/po/vi.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/vi.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-29 08:54-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-06-04 16:23-0400\n" "Last-Translator: nohal \n" "Language-Team: Vietnamese\n" "Language: vi_VN\n" @@ -16,417 +16,362 @@ "X-Crowdin-Language: vi\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" +msgstr "" + +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" +msgstr "" + +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 +#: src/Sight.cpp:160 msgid "\n" "Did you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format msgid "Eye Height is %.4f meters\n" "Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" "Height Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format msgid "\n" "Apparent Altitude (Ha)\n" @@ -435,7 +380,7 @@ "ApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format msgid "\n" "Refraction Correction\n" @@ -444,21 +389,21 @@ "x = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" "RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" "RefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format msgid "\n" "Sun selected, Limb Correction\n" "ra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format msgid "\n" "Moon selected, Limb Correction\n" @@ -467,21 +412,21 @@ "lc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 +#: src/Sight.cpp:588 #, c-format msgid "\n" "LimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:593 #, c-format msgid "\n" "Corrected Altitude\n" @@ -490,28 +435,28 @@ "CorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:607 #, c-format msgid "\n" "Sun selected, parallax correction\n" "rad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:616 #, c-format msgid "\n" "Moon selected, parallax correction\n" "HP = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:622 #, c-format msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" "ParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:629 #, c-format msgid "\n" "Observed Altitude (Ho)\n" @@ -520,114 +465,34 @@ "ObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:706 -#, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format msgid "\n" -"Time correction %.4f seconds" +"Geographical Position (lat, lon) = %.4f %.4f\n" +"GHAAST = %.0f %.1f'\n" +"SHA = %.0f %.1f'\n" +"GHA = %.0f %.1f'\n" +"Dec = %c %.0f %.1f'\n" +"SD = %.1f'\n" +"HP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" @@ -647,20 +512,6 @@ #: src/celestial_navigation_pi.cpp:162 msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +"Implements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/po/zh.po opencpn-plugin-celestial-2.3.0/po/zh.po --- opencpn-plugin-celestial-2.0.0/po/zh.po 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/po/zh.po 2018-03-29 17:18:40.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-28 14:10-0300\n" -"PO-Revision-Date: 2016-02-28 17:40-0500\n" +"POT-Creation-Date: 2014-06-12 21:57+0800\n" +"PO-Revision-Date: 2015-01-10 13:43-0500\n" "Last-Translator: nohal \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -13,628 +13,450 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: crowdin.com\n" "X-Crowdin-Project: opencpn\n" -"X-Crowdin-Language: zh-TW\n" "X-Crowdin-File: /plugins/celestial_navigation_pi/po/celestial_navigation_pi.pot\n" -#: src/CelestialNavigationDialog.cpp:123 src/CelestialNavigationUI.cpp:132 +#: src/CelestialNavigationDialog.cpp:112 src/CelestialNavigationUI.cpp:194 msgid "Type" msgstr "" -#: src/CelestialNavigationDialog.cpp:124 +#: src/CelestialNavigationDialog.cpp:113 msgid "Body" msgstr "" -#: src/CelestialNavigationDialog.cpp:125 +#: src/CelestialNavigationDialog.cpp:114 msgid "Time (UTC)" msgstr "" -#: src/CelestialNavigationDialog.cpp:126 src/CelestialNavigationUI.cpp:179 +#: src/CelestialNavigationDialog.cpp:115 src/CelestialNavigationUI.cpp:236 msgid "Measurement" msgstr "" -#: src/CelestialNavigationDialog.cpp:127 src/CelestialNavigationUI.cpp:376 +#: src/CelestialNavigationDialog.cpp:116 src/CelestialNavigationUI.cpp:410 msgid "Color" msgstr "" -#: src/CelestialNavigationDialog.cpp:193 +#: src/CelestialNavigationDialog.cpp:174 msgid "Failed to load file." msgstr "" -#: src/CelestialNavigationDialog.cpp:198 +#: src/CelestialNavigationDialog.cpp:179 msgid "Invalid xml file" msgstr "" -#: src/CelestialNavigationDialog.cpp:250 +#: src/CelestialNavigationDialog.cpp:229 msgid "Unrecognized xml node" msgstr "" -#: src/CelestialNavigationDialog.cpp:260 +#: src/CelestialNavigationDialog.cpp:239 msgid "Weather Routing" msgstr "" -#: src/CelestialNavigationDialog.cpp:320 +#: src/CelestialNavigationDialog.cpp:295 msgid "Failed to save xml file: " msgstr "" -#: src/CelestialNavigationDialog.cpp:321 src/CelestialNavigationDialog.cpp:466 -#: src/Sight.cpp:1099 src/celestial_navigation_pi.cpp:99 +#: src/CelestialNavigationDialog.cpp:296 src/CelestialNavigationDialog.cpp:730 +#: src/Sight.cpp:876 src/celestial_navigation_pi.cpp:99 #: src/celestial_navigation_pi.cpp:152 msgid "Celestial Navigation" msgstr "" -#: src/CelestialNavigationDialog.cpp:351 -msgid "Time Correction" +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:634 +msgid "Azimuth" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:324 src/CelestialNavigationUI.cpp:198 +#: src/CelestialNavigationUI.cpp:624 +msgid "Altitude" msgstr "" -#: src/CelestialNavigationDialog.cpp:409 +#: src/CelestialNavigationDialog.cpp:514 +msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:515 +msgid "Fix Position" +msgstr "" + +#: src/CelestialNavigationDialog.cpp:660 src/CelestialNavigationDialog.cpp:661 +#: src/CelestialNavigationDialog.cpp:662 +msgid " N/A " +msgstr "" + +#: src/CelestialNavigationDialog.cpp:673 msgid "Sun" msgstr "" -#: src/CelestialNavigationDialog.cpp:465 +#: src/CelestialNavigationDialog.cpp:729 msgid "Are you sure you want to delete all sights?" msgstr "" -#: src/CelestialNavigationDialog.cpp:510 +#: src/CelestialNavigationDialog.cpp:743 msgid "Celestial_Navigation_Information.html" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 -msgid "Show" +#: src/CelestialNavigationUI.cpp:31 +msgid "Fix From Visible Sights" msgstr "" -#: src/CelestialNavigationDialog.cpp:516 src/CelestialNavigationUI.cpp:58 -msgid "Hide" +#: src/CelestialNavigationUI.cpp:38 src/CelestialNavigationUI.cpp:606 +msgid "Latitude" msgstr "" -#: src/CelestialNavigationUI.cpp:40 -msgid "New" +#: src/CelestialNavigationUI.cpp:42 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:43 -msgid "Edit" +#: src/CelestialNavigationUI.cpp:46 src/CelestialNavigationUI.cpp:615 +msgid "Longitude" msgstr "" -#: src/CelestialNavigationUI.cpp:46 -msgid "Delete" +#: src/CelestialNavigationUI.cpp:50 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:49 -msgid "Delete All" +#: src/CelestialNavigationUI.cpp:54 +msgid "Error" msgstr "" -#: src/CelestialNavigationUI.cpp:52 src/CelestialNavigationUI.h:281 -msgid "Fix" +#: src/CelestialNavigationUI.cpp:58 +msgid " N/A " msgstr "" -#: src/CelestialNavigationUI.cpp:55 -msgid "Clock Offset" +#: src/CelestialNavigationUI.cpp:65 src/CelestialNavigationUI.cpp:72 +msgid "Initial" msgstr "" -#: src/CelestialNavigationUI.cpp:61 -msgid "Information" +#: src/CelestialNavigationUI.cpp:79 +msgid "Alg" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:667 -#: src/Sight.h:49 -msgid "Altitude" +#: src/CelestialNavigationUI.cpp:84 +msgid "Plane" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/CelestialNavigationUI.cpp:677 -#: src/Sight.h:49 -msgid "Azimuth" +#: src/CelestialNavigationUI.cpp:85 +msgid "Sphere" msgstr "" -#: src/CelestialNavigationUI.cpp:136 src/Sight.h:49 -msgid "Lunar" +#: src/CelestialNavigationUI.cpp:86 +msgid "Cone" msgstr "" -#: src/CelestialNavigationUI.cpp:142 +#: src/CelestialNavigationUI.cpp:87 +msgid "Cone 2" +msgstr "" + +#: src/CelestialNavigationUI.cpp:91 +msgid "Go" +msgstr "" + +#: src/CelestialNavigationUI.cpp:111 +msgid "New" +msgstr "" + +#: src/CelestialNavigationUI.cpp:114 +msgid "Edit" +msgstr "" + +#: src/CelestialNavigationUI.cpp:117 +msgid "Delete" +msgstr "" + +#: src/CelestialNavigationUI.cpp:120 +msgid "Delete All" +msgstr "" + +#: src/CelestialNavigationUI.cpp:123 +msgid "Information" +msgstr "" + +#: src/CelestialNavigationUI.cpp:204 msgid "Magnetic Azimuth" msgstr "" -#: src/CelestialNavigationUI.cpp:145 +#: src/CelestialNavigationUI.cpp:207 msgid "Celestial Body" msgstr "" -#: src/CelestialNavigationUI.cpp:154 +#: src/CelestialNavigationUI.cpp:216 msgid "Find" msgstr "" -#: src/CelestialNavigationUI.cpp:157 +#: src/CelestialNavigationUI.cpp:219 msgid "Limb" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Lower" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Center" msgstr "" -#: src/CelestialNavigationUI.cpp:161 +#: src/CelestialNavigationUI.cpp:223 msgid "Upper" msgstr "" -#: src/CelestialNavigationUI.cpp:186 src/CelestialNavigationUI.cpp:193 -#: src/CelestialNavigationUI.cpp:223 src/CelestialNavigationUI.cpp:230 +#: src/CelestialNavigationUI.cpp:243 src/CelestialNavigationUI.cpp:250 msgid "0" msgstr "" -#: src/CelestialNavigationUI.cpp:189 src/CelestialNavigationUI.cpp:348 -#: src/CelestialNavigationUI.cpp:598 +#: src/CelestialNavigationUI.cpp:246 src/CelestialNavigationUI.cpp:376 msgid "Degrees" msgstr "" -#: src/CelestialNavigationUI.cpp:196 src/CelestialNavigationUI.cpp:278 -#: src/CelestialNavigationUI.cpp:439 +#: src/CelestialNavigationUI.cpp:253 src/CelestialNavigationUI.cpp:309 +#: src/CelestialNavigationUI.cpp:473 msgid "Minutes" msgstr "" -#: src/CelestialNavigationUI.cpp:200 -msgid "10" +#: src/CelestialNavigationUI.cpp:257 +msgid ".25" msgstr "" -#: src/CelestialNavigationUI.cpp:203 -msgid "Minutes Certainty" +#: src/CelestialNavigationUI.cpp:260 +msgid "Degrees Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:217 -msgid "Lunar Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:226 -msgid "Body Altitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:243 +#: src/CelestialNavigationUI.cpp:274 msgid "Sight" msgstr "" -#: src/CelestialNavigationUI.cpp:271 +#: src/CelestialNavigationUI.cpp:302 msgid "Hours" msgstr "" -#: src/CelestialNavigationUI.cpp:285 src/CelestialNavigationUI.cpp:303 -#: src/CelestialNavigationUI.cpp:860 +#: src/CelestialNavigationUI.cpp:316 src/CelestialNavigationUI.cpp:334 msgid "Seconds" msgstr "" -#: src/CelestialNavigationUI.cpp:293 +#: src/CelestialNavigationUI.cpp:324 msgid "Certainty" msgstr "" -#: src/CelestialNavigationUI.cpp:323 -msgid "Time" +#: src/CelestialNavigationUI.cpp:351 +msgid "Shift" msgstr "" -#: src/CelestialNavigationUI.cpp:330 src/CelestialNavigationUI.cpp:580 +#: src/CelestialNavigationUI.cpp:358 msgid "Distance" msgstr "" -#: src/CelestialNavigationUI.cpp:337 src/CelestialNavigationUI.cpp:587 +#: src/CelestialNavigationUI.cpp:365 msgid "Nm" msgstr "" -#: src/CelestialNavigationUI.cpp:341 src/CelestialNavigationUI.cpp:591 +#: src/CelestialNavigationUI.cpp:369 msgid "Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:352 src/CelestialNavigationUI.cpp:602 +#: src/CelestialNavigationUI.cpp:380 msgid "Magnetic Bearing" msgstr "" -#: src/CelestialNavigationUI.cpp:359 -msgid "DR Shift" +#: src/CelestialNavigationUI.cpp:393 +msgid "Date and Time" msgstr "" -#: src/CelestialNavigationUI.cpp:366 +#: src/CelestialNavigationUI.cpp:400 msgid "Transparency" msgstr "" -#: src/CelestialNavigationUI.cpp:387 +#: src/CelestialNavigationUI.cpp:421 msgid "Config" msgstr "" -#: src/CelestialNavigationUI.cpp:399 +#: src/CelestialNavigationUI.cpp:433 msgid "Eye Height" msgstr "" -#: src/CelestialNavigationUI.cpp:403 +#: src/CelestialNavigationUI.cpp:437 msgid "2" msgstr "" -#: src/CelestialNavigationUI.cpp:406 +#: src/CelestialNavigationUI.cpp:440 msgid "Meters" msgstr "" -#: src/CelestialNavigationUI.cpp:410 +#: src/CelestialNavigationUI.cpp:444 msgid "Temperature" msgstr "" -#: src/CelestialNavigationUI.cpp:417 +#: src/CelestialNavigationUI.cpp:451 msgid "Celcius" msgstr "" -#: src/CelestialNavigationUI.cpp:421 +#: src/CelestialNavigationUI.cpp:455 msgid "Pressure" msgstr "" -#: src/CelestialNavigationUI.cpp:428 +#: src/CelestialNavigationUI.cpp:462 msgid "MilliBars" msgstr "" -#: src/CelestialNavigationUI.cpp:432 +#: src/CelestialNavigationUI.cpp:466 msgid "Index Error" msgstr "" -#: src/CelestialNavigationUI.cpp:446 +#: src/CelestialNavigationUI.cpp:480 msgid "Set As Defaults" msgstr "" -#: src/CelestialNavigationUI.cpp:453 +#: src/CelestialNavigationUI.cpp:487 msgid "Parameters" msgstr "" -#: src/CelestialNavigationUI.cpp:469 +#: src/CelestialNavigationUI.cpp:503 msgid "Calculations" msgstr "" -#: src/CelestialNavigationUI.cpp:571 -msgid "Shift all visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:649 src/CelestialNavigationUI.cpp:760 -msgid "Latitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:658 src/CelestialNavigationUI.cpp:768 -msgid "Longitude" -msgstr "" - -#: src/CelestialNavigationUI.cpp:669 src/CelestialNavigationUI.cpp:679 +#: src/CelestialNavigationUI.cpp:626 src/CelestialNavigationUI.cpp:636 msgid "MyLabel" msgstr "" -#: src/CelestialNavigationUI.cpp:686 +#: src/CelestialNavigationUI.cpp:643 msgid "Done" msgstr "" -#: src/CelestialNavigationUI.cpp:689 +#: src/CelestialNavigationUI.cpp:646 msgid "Magnetic" msgstr "" -#: src/CelestialNavigationUI.cpp:753 -msgid "Fix From Visible Sights" -msgstr "" - -#: src/CelestialNavigationUI.cpp:764 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:772 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:776 -msgid "Error" -msgstr "" - -#: src/CelestialNavigationUI.cpp:780 -msgid " N/A " -msgstr "" - -#: src/CelestialNavigationUI.cpp:787 src/CelestialNavigationUI.cpp:794 -msgid "Initial" -msgstr "" - -#: src/CelestialNavigationUI.cpp:801 -msgid "Alg" -msgstr "" - -#: src/CelestialNavigationUI.cpp:806 -msgid "Plane" -msgstr "" - -#: src/CelestialNavigationUI.cpp:807 -msgid "Sphere" -msgstr "" - -#: src/CelestialNavigationUI.cpp:808 -msgid "Cone" -msgstr "" - -#: src/CelestialNavigationUI.cpp:809 -msgid "Cone 2" -msgstr "" - -#: src/CelestialNavigationUI.cpp:813 -msgid "Go" -msgstr "" - -#: src/CelestialNavigationUI.cpp:850 src/CelestialNavigationUI.h:303 -msgid "Clock Correction" -msgstr "" - -#: src/CelestialNavigationUI.h:78 +#: src/CelestialNavigationUI.h:87 msgid "Celestial Navigation Sights" msgstr "" -#: src/CelestialNavigationUI.h:169 +#: src/CelestialNavigationUI.h:171 msgid "Sight Properties" msgstr "" -#: src/CelestialNavigationUI.h:200 -msgid "Dead Reckoning shift" -msgstr "" - -#: src/CelestialNavigationUI.h:227 +#: src/CelestialNavigationUI.h:198 msgid "Find Celestial Body" msgstr "" -#: src/Sight.cpp:160 +#: src/Sight.cpp:159 msgid "Astrolab failed, data unavailable:\n" msgstr "" -#: src/Sight.cpp:161 -msgid "\n" -"Did you forget to install vsop87d.txt?\n" +#: src/Sight.cpp:160 +msgid "\nDid you forget to install vsop87d.txt?\n" msgstr "" -#: src/Sight.cpp:162 +#: src/Sight.cpp:161 msgid "The plugin will not work correctly" msgstr "" -#: src/Sight.cpp:163 +#: src/Sight.cpp:162 msgid "Failure Alert" msgstr "" -#: src/Sight.cpp:474 -#, c-format -msgid "Applying clock correction of %d seconds\n\n" -msgstr "" - -#: src/Sight.cpp:536 -msgid "Almanac Data For " -msgstr "" - -#: src/Sight.cpp:537 -#, c-format -msgid "\n" -"Geographical Position (lat, lon) = %.4f %.4f\n" -"GHAAST = %.0f %.1f'\n" -"SHA = %.0f %.1f'\n" -"GHA = %.0f %.1f'\n" -"Dec = %c %.0f %.1f'\n" -"SD = %.1f'\n" -"HP = %.1f'\n\n" -msgstr "" - -#: src/Sight.cpp:552 src/Sight.cpp:690 +#: src/Sight.cpp:508 msgid "Formulas used to calculate sight\n\n" msgstr "" -#: src/Sight.cpp:556 src/Sight.cpp:694 +#: src/Sight.cpp:512 #, c-format msgid "Index Error is %.4f degrees\n\n" msgstr "" -#: src/Sight.cpp:561 src/Sight.cpp:699 +#: src/Sight.cpp:517 #, c-format -msgid "Eye Height is %.4f meters\n" -"Height Correction Degrees = 1.758*sqrt(%.4f) / 60.0\n" -"Height Correction Degrees = %.4f\n" +msgid "Eye Height is %.4f meters\nHeight Correction Degrees = 1.758*sqrt(%.4f) / 60.0\nHeight Correction Degrees = %.4f\n" msgstr "" -#: src/Sight.cpp:568 +#: src/Sight.cpp:524 #, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -"ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" +msgid "\nApparent Altitude (Ha)\nApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\nApparentAltitude = %.4f - %.4f - %.4f\nApparentAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:586 src/Sight.cpp:789 +#: src/Sight.cpp:542 #, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" +msgid "\nRefraction Correction\nx = tan(Pi/180*ApparentAltitude + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitude) + .028))\nx = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\nx = %.4f\n" msgstr "" -#: src/Sight.cpp:591 src/Sight.cpp:794 +#: src/Sight.cpp:547 #, c-format -msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrection = %.4f\n" +msgid "RefractionCorrection = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\nRefractionCorrection = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\nRefractionCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:606 src/Sight.cpp:808 +#: src/Sight.cpp:562 #, c-format -msgid "\n" -"Sun selected, Limb Correction\n" -"ra = %.4f, lc = 0.266564/ra = %.4f\n" +msgid "\nSun selected, Limb Correction\nra = %.4f, lc = 0.266564/ra = %.4f\n" msgstr "" -#: src/Sight.cpp:616 src/Sight.cpp:732 +#: src/Sight.cpp:572 #, c-format -msgid "\n" -"Moon selected, Limb Correction\n" -"SD = %.4f\n" -"lc = 180/Pi * asin(Pi/180*SD)\n" -"lc = %.4f\n" +msgid "\nMoon selected, Limb Correction\nSD = %.4f\nlc = 180/Pi * asin(Pi/180*SD)\nlc = %.4f\n" msgstr "" -#: src/Sight.cpp:626 src/Sight.cpp:741 src/Sight.cpp:816 +#: src/Sight.cpp:582 msgid "Upper Limb" msgstr "" -#: src/Sight.cpp:629 src/Sight.cpp:744 src/Sight.cpp:819 +#: src/Sight.cpp:585 msgid "Lower Limb" msgstr "" -#: src/Sight.cpp:632 src/Sight.cpp:822 -#, c-format -msgid "\n" -"LimbCorrection = %.4f\n" -msgstr "" - -#: src/Sight.cpp:636 src/Sight.cpp:826 +#: src/Sight.cpp:588 #, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\n" -"CorrectedAltitude = %.4f - %.4f - %.4f\n" -"CorrectedAltitude = %.4f\n" +msgid "\nLimbCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:650 src/Sight.cpp:840 +#: src/Sight.cpp:593 #, c-format -msgid "\n" -"Sun selected, parallax correction\n" -"rad = %.4f, HP = 0.002442/rad = %.4f\n" +msgid "\nCorrected Altitude\nCorrectedAltitude = ApparentAltitude - RefractionCorrection - LimbCorrection\nCorrectedAltitude = %.4f - %.4f - %.4f\nCorrectedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:659 src/Sight.cpp:764 +#: src/Sight.cpp:607 #, c-format -msgid "\n" -"Moon selected, parallax correction\n" -"HP = %.4f\n" +msgid "\nSun selected, parallax correction\nrad = %.4f, HP = 0.002442/rad = %.4f\n" msgstr "" -#: src/Sight.cpp:665 src/Sight.cpp:846 +#: src/Sight.cpp:616 #, c-format -msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -"ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrection = %.4f\n" +msgid "\nMoon selected, parallax correction\nHP = %.4f\n" msgstr "" -#: src/Sight.cpp:672 +#: src/Sight.cpp:622 #, c-format -msgid "\n" -"Observed Altitude (Ho)\n" -"ObservedAltitude = CorrectedAltitude - ParallaxCorrection\n" -"ObservedAltitude = %.4f - %.4f\n" -"ObservedAltitude = %.4f\n" +msgid "ParallaxCorrection = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\nParallaxCorrection = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\nParallaxCorrection = %.4f\n" msgstr "" -#: src/Sight.cpp:706 +#: src/Sight.cpp:629 #, c-format -msgid "\n" -"Apparent Moon Altitude (Ha)\n" -"ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitudeMoon = %.4f - %.4f - %.4f\n" -"ApparentAltitudeMoon = %.4f\n" +msgid "\nObserved Altitude (Ho)\nObservedAltitude = CorrectedAltitude - ParallaxCorrection\nObservedAltitude = %.4f - %.4f\nObservedAltitude = %.4f\n" msgstr "" -#: src/Sight.cpp:717 -#, c-format -msgid "\n" -"Refraction Correction\n" -"x = tan(Pi/180*ApparentAltitudeMoon + 4.848e-2*(Pi/180) / (tan(Pi/180*ApparentAltitudeMoon) + .028))\n" -"x = tan(Pi/180*%.4f + 4.848e-2*(Pi/180) / (tan(Pi/180*%.4f) + .028))\n" -"x = %.4f\n" -msgstr "" - -#: src/Sight.cpp:722 -#, c-format -msgid "RefractionCorrectionMoon = .267 * Pressure / (x*(Temperature + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = .267 * %.4f / (x*(%.4f + 273.15)) / 60.0\n" -"RefractionCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:747 src/Sight.cpp:750 -#, c-format -msgid "\n" -"LimbCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:753 -#, c-format -msgid "\n" -"Corrected Altitude\n" -"CorrectedAltitudeMoon = ApparentAltitudeMoon - RefractionCorrectionMoon - LimbCorrectionMoon\n" -"CorrectedAltitudeMoon = %.4f - %.4f - %.4f\n" -"CorrectedAltitudeMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:768 -#, c-format -msgid "ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n" -" ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n" -"ParallaxCorrectionMoon = %.4f\n" -msgstr "" - -#: src/Sight.cpp:778 -#, c-format -msgid "\n" -"Apparent Altitude (Ha)\n" -"ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n" -" ApparentAltitude = %.4f - %.4f - %.4f\n" -"ApparentAltitude = %.4f\n" -msgstr "" - -#: src/Sight.cpp:857 -#, c-format -msgid "CorrectionsMoon = %.4f\n" -"CorrectionsBody = %.4f\n" -"Corrections = abs(CorrectionsMoon - CorrectionsBody) = %.4f\n" -msgstr "" - -#: src/Sight.cpp:863 -#, c-format -msgid "CorrectedMeasurement = Measurement - Corrections - IndexCorrection\n" -"CorrectedMeasurement = %.4f - %.4f - %.4f\n" -"CorrectedMeasurement = %.4f\n" -msgstr "" - -#: src/Sight.cpp:888 -msgid "\n" -"Calculated angle between Moon and " -msgstr "" - -#: src/Sight.cpp:890 -#, c-format -msgid "\n" -"Error from measurement: %.4f" -msgstr "" - -#: src/Sight.cpp:894 -msgid "\n" -"Moon takes 28 days to orbit, one degree of error takes 6720 seconds" +#: src/Sight.cpp:656 +msgid "Almanac Data For " msgstr "" -#: src/Sight.cpp:895 +#: src/Sight.cpp:657 #, c-format -msgid "\n" -"Time correction %.4f seconds" +msgid "\nGeographical Position (lat, lon) = %.4f %.4f\nGHAAST = %.0f %.1f'\nSHA = %.0f %.1f'\nGHA = %.0f %.1f'\nDec = %c %.0f %.1f'\nSD = %.1f'\nHP = %.1f'\n\n" msgstr "" -#: src/Sight.cpp:1099 +#: src/Sight.cpp:876 msgid "Building bearing Sight Positions" msgstr "" -#: src/SightDialog.cpp:172 +#: src/SightDialog.cpp:168 msgid "Measurement certainty likely set to small, sight may not appear " msgstr "" -#: src/SightDialog.cpp:173 src/SightDialog.cpp:256 +#: src/SightDialog.cpp:169 msgid "Warning" msgstr "" -#: src/SightDialog.cpp:255 -msgid "Lunar shot will be invalid taking distance from moon to itself" -msgstr "" - #: src/celestial_navigation_pi.cpp:90 msgid "Failed to load file:\n" msgstr "" #: src/celestial_navigation_pi.cpp:91 -msgid "\n" -"Magnetic data will not be available for the celestial navigation plugin." +msgid "\nMagnetic data will not be available for the celestial navigation plugin." msgstr "" #: src/celestial_navigation_pi.cpp:92 @@ -646,21 +468,6 @@ msgstr "" #: src/celestial_navigation_pi.cpp:162 -msgid "Celestial Navigation PlugIn for OpenCPN.\n" -"Implements nautical almanac for sun, moon, planets,\n" -"and various navigational stars.\n" -"Compute position fix from celestial measurements." -msgstr "" - -#: src/FixDialog.cpp:189 -msgid "Shifted sights are not used to compute a fix, determine fix visually instead.\n" -msgstr "" - -#: src/FixDialog.cpp:190 -msgid "Fix Position" -msgstr "" - -#: src/FixDialog.cpp:335 src/FixDialog.cpp:336 src/FixDialog.cpp:337 -msgid " N/A " +msgid "Celestial Navigation PlugIn for OpenCPN.\nImplements nautical almanac for sun, moon, planets, and various navigational stars. Compute position fix from celestial measurements." msgstr "" diff -Nru opencpn-plugin-celestial-2.0.0/README opencpn-plugin-celestial-2.3.0/README --- opencpn-plugin-celestial-2.0.0/README 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/README 2018-03-29 17:18:40.000000000 +0000 @@ -6,7 +6,7 @@ Compiling ========= -* git clone git://github.com/seandepagnier/climatology_pi.git +* git clone git://github.com/seandepagnier/celestial_navigation_pi.git Under windows, you must find the file "opencpn.lib" (Visual Studio) or "libopencpn.dll.a" (mingw) which is built in the build directory after compiling opencpn. This file must be copied to the plugin directory. diff -Nru opencpn-plugin-celestial-2.0.0/src/astrolabe/dynamical.cpp opencpn-plugin-celestial-2.3.0/src/astrolabe/dynamical.cpp --- opencpn-plugin-celestial-2.0.0/src/astrolabe/dynamical.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/astrolabe/dynamical.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -273,18 +273,22 @@ {cal_to_jd(2000), 63.8}, {cal_to_jd(2002), 64.3}, - {cal_to_jd(2004), 64.4}, + {cal_to_jd(2004), 64.6}, {cal_to_jd(2006), 64.8}, {cal_to_jd(2008), 65.5}, {cal_to_jd(2010), 66.1}, {cal_to_jd(2012), 66.6}, + {cal_to_jd(2014), 67.3}, + {cal_to_jd(2016), 68.1}, // estimated - {cal_to_jd(2014), 67.1}, - {cal_to_jd(2016), 67.6}, - {cal_to_jd(2018), 68.1} + {cal_to_jd(2018), 69.0}, + {cal_to_jd(2020), 69.9}, + {cal_to_jd(2022), 70.0}, + {cal_to_jd(2024), 71.0}, + {cal_to_jd(2026), 72.0} }; diff -Nru opencpn-plugin-celestial-2.0.0/src/CelestialNavigationDialog.cpp opencpn-plugin-celestial-2.3.0/src/CelestialNavigationDialog.cpp --- opencpn-plugin-celestial-2.0.0/src/CelestialNavigationDialog.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/CelestialNavigationDialog.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -105,12 +105,19 @@ pConf->SetPath( _T("/PlugIns/CelestialNavigation") ); -#ifdef __WXGTK__ - Move(0, 0); // workaround for gtk autocentre dialog behavior -#endif - Move(pConf->Read ( _T ( "DialogPosX" ), 20L ), pConf->Read ( _T ( "DialogPosY" ), 20L )); - - SetTransparent(128); +//#ifdef __WXGTK__ +// Move(0, 0); // workaround for gtk autocentre dialog behavior +//#endif +// Move(pConf->Read ( _T ( "DialogPosX" ), 20L ), pConf->Read ( _T ( "DialogPosY" ), 20L )); + wxPoint p = GetPosition(); + pConf->Read ( _T ( "DialogX" ), &p.x, p.x); + pConf->Read ( _T ( "DialogY" ), &p.y, p.y); + SetPosition(p); + + wxSize s = GetSize(); + pConf->Read ( _T ( "DialogWidth" ), &s.x, s.x); + pConf->Read ( _T ( "DialogHeight" ), &s.y, s.y); + SetSize(s); // create a image list for the list with just the eye icon wxImageList *imglist = new wxImageList(20, 20, true, 1); @@ -122,7 +129,7 @@ m_lSights->InsertColumn(rmTYPE, _("Type")); m_lSights->InsertColumn(rmBODY, _("Body")); - m_lSights->InsertColumn(rmTIME, _("Time (UTC)")); + m_lSights->InsertColumn(rmTIME, _("Time (UT)")); m_lSights->InsertColumn(rmMEASUREMENT, _("Measurement")); m_lSights->InsertColumn(rmCOLOR, _("Color")); @@ -145,9 +152,12 @@ pConf->SetPath( _T("/PlugIns/CelestialNavigation") ); wxPoint p = GetPosition(); + pConf->Write ( _T ( "DialogX" ), p.x); + pConf->Write ( _T ( "DialogY" ), p.y); - pConf->Write ( _T ( "DialogPosX" ), p.x ); - pConf->Write ( _T ( "DialogPosY" ), p.y ); + wxSize s = GetSize(); + pConf->Write ( _T ( "DialogWidth" ), s.x); + pConf->Write ( _T ( "DialogHeight" ), s.y); SaveXML(m_sights_path); } @@ -190,14 +200,14 @@ wxFileName fn(filename); if(!doc.LoadFile(filename.mb_str())) - FAIL(_("Failed to load file.")); + FAIL(_("Failed to load file: ") + filename); else { TiXmlHandle root(doc.RootElement()); if(strcmp(root.Element()->Value(), "OpenCPNCelestialNavigation")) FAIL(_("Invalid xml file")); - m_SightList.clear(); + m_lSights->DeleteAllItems(); for(TiXmlElement* e = root.FirstChild().Element(); e; e = e->NextSiblingElement()) { if(!strcmp(e->Value(), "ClockError")) { @@ -208,12 +218,12 @@ s.m_bVisible = AttributeBool(e, "Visible", true); s.m_Type = (Sight::Type)AttributeInt(e, "Type", 0); s.m_Body = wxString::FromUTF8(e->Attribute("Body")); - s.m_BodyLimb = (Sight::BodyLimb)AttributeInt(e, "Limb", 0); + s.m_BodyLimb = (Sight::BodyLimb)AttributeInt(e, "BodyLimb", 0); - s.m_DateTime.ParseDate(wxString::FromUTF8(e->Attribute("Date"))); + s.m_DateTime.ParseISODate(wxString::FromUTF8(e->Attribute("Date"))); wxDateTime time; - time.ParseTime(wxString::FromUTF8(e->Attribute("Time"))); + time.ParseISOTime(wxString::FromUTF8(e->Attribute("Time"))); if(s.m_DateTime.IsValid() && time.IsValid()) { s.m_DateTime.SetHour(time.GetHour()); @@ -245,19 +255,18 @@ ns->Recompute(m_ClockCorrectionDialog.m_sClockCorrection->GetValue()); ns->RebuildPolygons(); - m_SightList.push_back(ns); + InsertSight(ns, false); } else FAIL(_("Unrecognized xml node")); } } - UpdateSights(false); RequestRefresh( GetParent() ); return true; failed: if(reportfailure) { - wxMessageDialog mdlg(this, error, _("Weather Routing"), wxOK | wxICON_ERROR); + wxMessageDialog mdlg(this, error, _("Celestial Navigation"), wxOK | wxICON_ERROR); mdlg.ShowModal(); } return false; @@ -281,19 +290,18 @@ c->SetAttribute("Seconds", m_ClockCorrectionDialog.m_sClockCorrection->GetValue()); root->LinkEndChild(c); - for(std::list::iterator it = m_SightList.begin(); - it != m_SightList.end(); it++) { + for(int i = 0; iGetItemCount(); i++) { TiXmlElement *c = new TiXmlElement( "Sight" ); - Sight *s = *it; + Sight *s = (Sight*)wxUIntToPtr(m_lSights->GetItemData(i)); c->SetAttribute("Visible", s->m_bVisible); c->SetAttribute("Type", s->m_Type); c->SetAttribute("Body", s->m_Body.mb_str()); c->SetAttribute("BodyLimb", s->m_BodyLimb); - c->SetAttribute("Date", s->m_DateTime.FormatDate().mb_str()); - c->SetAttribute("Time", s->m_DateTime.FormatTime().mb_str()); + c->SetAttribute("Date", s->m_DateTime.FormatISODate().mb_str()); + c->SetAttribute("Time", s->m_DateTime.FormatISOTime().mb_str()); c->SetDoubleAttribute("TimeCertainty", s->m_TimeCertainty); @@ -323,41 +331,37 @@ } } -void CelestialNavigationDialog::UpdateSights(bool warnings) +void CelestialNavigationDialog::InsertSight(Sight *s, bool warnings) { - // if an item was selected, make it selected again if it still exist - long selected_index = m_lSights->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - long selected_id = -1; - if (selected_index > -1) - selected_id = m_lSights->GetItemData(selected_index); +#if 1 + wxListItem item; + item.SetId(m_lSights->GetItemCount()); + item.SetData(s); + item.SetMask(item.GetMask() | wxLIST_MASK_TEXT); - // Delete existing items - m_lSights->DeleteAllItems(); + int idx = m_lSights->InsertItem(item); + m_lSights->SetItemImage(idx, s->IsVisible() ? 0 : -1); +#else + idx = m_lSights->InsertItem(idx+1, (*it)->IsVisible() ? 0 : -1); +#endif + UpdateSight(idx, warnings); +} - // then add sights to the listctrl - wxListItem item; - int idx = -1; +void CelestialNavigationDialog::UpdateSight(int idx, bool warnings) +{ + Sight *s = (Sight*)wxUIntToPtr(m_lSights->GetItemData(idx)); - for (std::list::iterator it = m_SightList.begin(); it != m_SightList.end(); ++it) - { - idx = m_lSights->InsertItem(idx+1, (*it)->IsVisible() ? 0 : -1); - m_lSights->SetItemData(idx, selected_index); - m_lSights->SetItem(idx, rmTYPE, SightType[(*it)->m_Type]); - m_lSights->SetItem(idx, rmBODY, (*it)->m_Body); - wxDateTime dt = (*it)->m_DateTime; - m_lSights->SetItem(idx, rmTIME, dt.FormatISODate() + _T(" ") + dt.FormatISOTime()); - m_lSights->SetItem(idx, rmMEASUREMENT, wxString::Format(_T("%.4f"), (*it)->m_Measurement)); - if((*it)->m_Type == Sight::LUNAR) - m_lSights->SetItem(idx, rmCOLOR, _("Time Correction") + - wxString::Format(_T(": %.4f"), (*it)->m_TimeCorrection)); - else - m_lSights->SetItem(idx, rmCOLOR, (*it)->m_ColourName); - -#ifdef __WIN32__ - // for some stupid reason on windows we need this to get the items in the right order - wxTheApp->Yield(); -#endif - } + // then add sights to the listctrl + m_lSights->SetItem(idx, rmTYPE, SightType[s->m_Type]); + m_lSights->SetItem(idx, rmBODY, s->m_Body); + wxDateTime dt = s->m_DateTime; + m_lSights->SetItem(idx, rmTIME, dt.FormatISODate() + _T(" ") + dt.FormatISOTime()); + m_lSights->SetItem(idx, rmMEASUREMENT, wxString::Format(_T("%.4f"), s->m_Measurement)); + if(s->m_Type == Sight::LUNAR) + m_lSights->SetItem(idx, rmCOLOR, _("Time Correction") + + wxString::Format(_T(": %.4f"), s->m_TimeCorrection)); + else + m_lSights->SetItem(idx, rmCOLOR, s->m_ColourName); m_lSights->SetColumnWidth(rmTYPE, wxLIST_AUTOSIZE); m_lSights->SetColumnWidth(rmBODY, wxLIST_AUTOSIZE); @@ -372,19 +376,16 @@ m_lSights->SortItems(SortSights, (long)m_lSights); - // restore selection if possible - // NOTE this will select a different item, if one is deleted - // (the next sight will get that index). - if (selected_id > -1) - { - selected_index = m_lSights->FindItem(-1, selected_id); - m_lSights->SetItemState(selected_index, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - } - UpdateButtons(); UpdateFix(warnings); } +void CelestialNavigationDialog::UpdateSights() +{ + for(int i = 0; iGetItemCount(); i++) + UpdateSight(i); +} + void CelestialNavigationDialog::UpdateButtons() { // enable/disable buttons @@ -393,13 +394,13 @@ m_bEditSight->Enable(enable); m_bDeleteSight->Enable(enable); - m_bDeleteAllSights->Enable(m_SightList.size() > 0); + m_bDeleteAllSights->Enable(m_lSights->GetItemCount() > 0); m_bDeleteSight->Enable(enable); } void CelestialNavigationDialog::UpdateFix(bool warnings) { - m_FixDialog.Update(warnings); + m_FixDialog.Update(m_ClockCorrectionDialog.m_sClockCorrection->GetValue(), warnings); } void CelestialNavigationDialog::OnNew(wxCommandEvent &event) @@ -414,30 +415,38 @@ dialog.Recompute(); ns->RebuildPolygons(); - m_SightList.push_back(ns); - UpdateSights(); + InsertSight(ns); RequestRefresh( GetParent() ); } } -void CelestialNavigationDialog::OnEdit( ) +void CelestialNavigationDialog::OnDuplicate(wxCommandEvent &event) { - // Manipulate selected_index sight/track long selected_index = m_lSights->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (selected_index < 0) return; - std::list::iterator it = m_SightList.begin(); - std::advance( it, selected_index ); + Sight *psight = (Sight*)wxUIntToPtr(m_lSights->GetItemData(selected_index)); + Sight *ns = new Sight(*psight); + ns->RebuildPolygons(); + InsertSight(ns); + RequestRefresh( GetParent() ); +} - Sight *psight = *it; +void CelestialNavigationDialog::OnEdit( ) +{ + // Manipulate selected_index sight/track + long selected_index = m_lSights->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (selected_index < 0) return; + Sight *psight = (Sight*)wxUIntToPtr(m_lSights->GetItemData(selected_index)); Sight originalsight = *psight; /* in case of cancel */ SightDialog dialog(GetParent(), *psight, m_ClockCorrectionDialog.m_sClockCorrection->GetValue()); if( dialog.ShowModal() == wxID_OK ) { + dialog.Recompute(); psight->RebuildPolygons(); - UpdateSights(); + UpdateSight(selected_index); } else *psight = originalsight; @@ -450,13 +459,7 @@ long selected_index = m_lSights->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (selected_index < 0) return; - std::list::iterator it = m_SightList.begin(); - std::advance( it, selected_index ); - - m_SightList.erase(it); - delete *it; - - UpdateSights(); + m_lSights->DeleteItem(selected_index); RequestRefresh( GetParent() ); } @@ -465,9 +468,7 @@ wxMessageDialog mdlg(this, _("Are you sure you want to delete all sights?"), _("Celestial Navigation"), wxYES_NO); if(mdlg.ShowModal() == wxID_YES) { - m_SightList.clear(); - - UpdateSights(); + m_lSights->DeleteAllItems(); RequestRefresh( GetParent() ); } } @@ -527,10 +528,7 @@ if (clicked_index > -1 && event.GetX() < m_lSights->GetColumnWidth(0)) { // Process the clicked item - std::list::iterator it = m_SightList.begin(); - std::advance( it, clicked_index ); - - Sight *sight = *it; + Sight *sight = (Sight*)wxUIntToPtr(m_lSights->GetItemData(clicked_index)); sight->SetVisible(!sight->IsVisible()); m_lSights->SetItemImage(clicked_index, sight->IsVisible() ? 0 : -1); diff -Nru opencpn-plugin-celestial-2.0.0/src/CelestialNavigationDialog.h opencpn-plugin-celestial-2.3.0/src/CelestialNavigationDialog.h --- opencpn-plugin-celestial-2.0.0/src/CelestialNavigationDialog.h 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/CelestialNavigationDialog.h 2018-03-29 17:18:40.000000000 +0000 @@ -5,7 +5,7 @@ * Author: Sean D'Epagnier * *************************************************************************** - * Copyright (C) 2015 by Sean D'Epagnier * + * Copyright (C) 2016 by Sean D'Epagnier * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -40,10 +40,8 @@ public: CelestialNavigationDialog(wxWindow *parent); ~CelestialNavigationDialog(); + void UpdateSights(); - void UpdateSights(bool warnings=true); // Rebuild sight list - - std::list m_SightList; FixDialog m_FixDialog; private: @@ -56,6 +54,7 @@ // event handlers void OnNew(wxCommandEvent &event); + void OnDuplicate(wxCommandEvent &event); void OnEdit( ); void OnEditMouse( wxMouseEvent& event ) { OnEdit(); } void OnEdit(wxCommandEvent &event) { OnEdit(); } @@ -72,6 +71,9 @@ void OnBtnLeftDown(wxMouseEvent &event); // record control key state for some action buttons void OnSightSelected(wxListEvent &event); + void InsertSight(Sight *s, bool warnings=true); + void UpdateSight(int idx, bool warnings=true); + wxString m_sights_path; int clock_correction; diff -Nru opencpn-plugin-celestial-2.0.0/src/celestial_navigation_pi.cpp opencpn-plugin-celestial-2.3.0/src/celestial_navigation_pi.cpp --- opencpn-plugin-celestial-2.0.0/src/celestial_navigation_pi.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/celestial_navigation_pi.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -32,6 +32,7 @@ #include "Sight.h" #include "celestial_navigation_pi.h" #include "icons.h" +using namespace std; // the class factories, used to create and destroy instances of the PlugIn @@ -76,23 +77,6 @@ // Get a pointer to the opencpn display canvas, to use as a parent for windows created m_parent_window = GetOCPNCanvasWindow(); - // Create the Context Menu Items - - // In order to avoid an ASSERT on msw debug builds, - // we need to create a dummy menu to act as a surrogate parent of the created MenuItems - // The Items will be re-parented when added to the real context meenu - wxMenu dummy_menu; - - /* load the geographical magnetic table */ - wxString geomag_text_path = *GetpSharedDataLocation(); - geomag_text_path.Append(_T("plugins/celestial_navigation_pi/data/IGRF11.COF")); - if(geomag_load(geomag_text_path.mb_str()) == -1) { - wxMessageDialog mdlg(m_parent_window, _("Failed to load file:\n") + geomag_text_path - + _("\nMagnetic data will not be available for the celestial navigation plugin."), - wxString(_("OpenCPN Alert"), wxOK | wxICON_ERROR)); - mdlg.ShowModal(); - } - // This PlugIn needs a toolbar icon, so request its insertion m_leftclick_tool_id = InsertPlugInTool(_T(""), _img_celestial_navigation, _img_celestial_navigation, wxITEM_NORMAL, @@ -103,7 +87,8 @@ return (WANTS_OVERLAY_CALLBACK | WANTS_OPENGL_OVERLAY_CALLBACK | - WANTS_CURSOR_LATLON | + WANTS_NMEA_EVENTS | +// WANTS_CURSOR_LATLON | WANTS_TOOLBAR_CALLBACK | INSTALLS_TOOLBAR_TOOL ); @@ -167,8 +152,26 @@ void celestial_navigation_pi::OnToolbarToolCallback(int id) { - if(NULL == m_pCelestialNavigationDialog) + int ret; + if(!m_pCelestialNavigationDialog) { + /* load the geographical magnetic table */ + wxString geomag_text_path = *GetpSharedDataLocation(); + geomag_text_path.Append(_T("plugins/celestial_navigation_pi/data/IGRF11.COF")); + if((ret = geomag_load(geomag_text_path.mb_str())) < 0) { + wxString message = _("Failed to load file: ") + geomag_text_path + "\n"; + switch (ret) { + case -1: message += "(" + _("open error") + ")\n"; break; + case -5: message += "(" + _("corrupt record") + ")\n"; break; + case -6: message += "(" + _("too many models") + ")\n"; break; + } + wxMessageDialog mdlg(m_parent_window, message + + _("Magnetic data will not be available for the celestial navigation plugin."), + wxString(_("OpenCPN Alert"), wxOK | wxICON_ERROR)); + mdlg.ShowModal(); + } + m_pCelestialNavigationDialog = new CelestialNavigationDialog(m_parent_window); + } m_pCelestialNavigationDialog->Show(!m_pCelestialNavigationDialog->IsShown()); } @@ -198,13 +201,15 @@ bool celestial_navigation_pi::RenderOverlayAll(wxDC *dc, PlugIn_ViewPort *vp) { - if(!m_pCelestialNavigationDialog || !m_pCelestialNavigationDialog->IsShown()) - return false; + if(!m_pCelestialNavigationDialog || !m_pCelestialNavigationDialog->IsShown()) + return false; - /* draw sights */ - for (std::list::iterator it = m_pCelestialNavigationDialog->m_SightList.begin(); - it != m_pCelestialNavigationDialog->m_SightList.end(); it++) - (*it)->Render ( dc, *vp ); + /* draw sights */ + wxListCtrl *lSights = m_pCelestialNavigationDialog->m_lSights; + for(int i = 0; iGetItemCount(); i++) { + Sight *s = (Sight*)wxUIntToPtr(lSights->GetItemData(i)); + s->Render ( dc, *vp ); + } /* now render fix */ double lat = m_pCelestialNavigationDialog->m_FixDialog.m_fixlat; @@ -237,14 +242,13 @@ wxString celestial_navigation_pi::StandardPath() { wxStandardPathsBase& std_path = wxStandardPathsBase::Get(); -#ifdef __WXMSW__ + wxString s = wxFileName::GetPathSeparator(); +#if defined(__WXMSW__) wxString stdPath = std_path.GetConfigDir(); -#endif -#ifdef __WXGTK__ +#elif defined(__WXGTK__) || defined(__WXQT__) wxString stdPath = std_path.GetUserDataDir(); -#endif -#ifdef __WXOSX__ - wxString stdPath = std_path.GetUserConfigDir(); // should be ~/Library/Preferences +#elif defined(__WXOSX__) + wxString stdPath = (std_path.GetUserConfigDir() + s + _T("opencpn")); // should be ~/Library/Preferences/opencpn #endif return stdPath + wxFileName::GetPathSeparator() + @@ -252,20 +256,19 @@ _T("celestial_navigation") + wxFileName::GetPathSeparator(); } -static double s_cursor_lat, s_cursor_lon; - -void celestial_navigation_pi::SetCursorLatLon(double lat, double lon) +static double s_boat_lat, s_boat_lon; +void celestial_navigation_pi::SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix) { - s_cursor_lat = lat; - s_cursor_lon = lon; + s_boat_lat = pfix.Lat; + s_boat_lon = pfix.Lon; } -double celestial_navigation_pi_CursorLat() +void celestial_navigation_pi::SetCursorLatLon(double lat, double lon) { - return s_cursor_lat; } -double celestial_navigation_pi_CursorLon() +void celestial_navigation_pi_BoatPos(double &lat, double &lon) { - return s_cursor_lon; + lat = s_boat_lat; + lon = s_boat_lon; } diff -Nru opencpn-plugin-celestial-2.0.0/src/celestial_navigation_pi.h opencpn-plugin-celestial-2.3.0/src/celestial_navigation_pi.h --- opencpn-plugin-celestial-2.0.0/src/celestial_navigation_pi.h 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/celestial_navigation_pi.h 2018-03-29 17:18:40.000000000 +0000 @@ -75,6 +75,7 @@ bool RenderOverlayAll(wxDC *dc, PlugIn_ViewPort *vp); static wxString StandardPath(); + void SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix); void SetCursorLatLon(double lat, double lon); private: @@ -84,7 +85,6 @@ CelestialNavigationDialog *m_pCelestialNavigationDialog; }; -extern double celestial_navigation_pi_CursorLat(); -extern double celestial_navigation_pi_CursorLon(); +extern void celestial_navigation_pi_BoatPos(double &lat, double &lon); #endif diff -Nru opencpn-plugin-celestial-2.0.0/src/CelestialNavigationUI.cpp opencpn-plugin-celestial-2.3.0/src/CelestialNavigationUI.cpp --- opencpn-plugin-celestial-2.0.0/src/CelestialNavigationUI.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/CelestialNavigationUI.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 8 2015) +// C++ code generated with wxFormBuilder (version Dec 20 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "CelestialNavigationUI.h" @@ -40,27 +40,30 @@ m_bNewSight = new wxButton( this, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_bNewSight, 0, wxALL|wxEXPAND, 5 ); - m_bEditSight = new wxButton( this, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer24->Add( m_bEditSight, 0, wxALL|wxEXPAND, 5 ); - - m_bDeleteSight = new wxButton( this, wxID_ANY, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer24->Add( m_bDeleteSight, 0, wxALL|wxEXPAND, 5 ); - - m_bDeleteAllSights = new wxButton( this, wxID_ANY, _("Delete All"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer24->Add( m_bDeleteAllSights, 0, wxALL|wxEXPAND, 5 ); - m_bFix = new wxButton( this, wxID_ANY, _("Fix"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_bFix, 0, wxALL|wxEXPAND, 5 ); + m_bDuplicateSight = new wxButton( this, wxID_ANY, _("Duplicate"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer24->Add( m_bDuplicateSight, 0, wxALL|wxEXPAND, 5 ); + m_bClockOffset = new wxButton( this, wxID_ANY, _("Clock Offset"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_bClockOffset, 0, wxALL|wxEXPAND, 5 ); + m_bEditSight = new wxButton( this, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer24->Add( m_bEditSight, 0, wxALL|wxEXPAND, 5 ); + m_tbHide = new wxToggleButton( this, wxID_ANY, _("Hide"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_tbHide, 0, wxALL|wxEXPAND, 5 ); + m_bDeleteSight = new wxButton( this, wxID_ANY, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer24->Add( m_bDeleteSight, 0, wxALL|wxEXPAND, 5 ); + m_bInformation = new wxButton( this, wxID_ANY, _("Information"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_bInformation, 0, wxALL|wxEXPAND, 5 ); + m_bDeleteAllSights = new wxButton( this, wxID_ANY, _("Delete All"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer24->Add( m_bDeleteAllSights, 0, wxALL|wxEXPAND, 5 ); + fgSizer17->Add( fgSizer24, 1, wxEXPAND, 5 ); @@ -79,13 +82,14 @@ m_lSights->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( CelestialNavigationDialogBase::OnSightSelected ), NULL, this ); m_lSights->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CelestialNavigationDialogBase::OnSightSelected ), NULL, this ); m_bNewSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnNew ), NULL, this ); - m_bEditSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnEdit ), NULL, this ); - m_bDeleteSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDelete ), NULL, this ); - m_bDeleteAllSights->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDeleteAll ), NULL, this ); m_bFix->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnFix ), NULL, this ); + m_bDuplicateSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDuplicate ), NULL, this ); m_bClockOffset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnClockOffset ), NULL, this ); + m_bEditSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnEdit ), NULL, this ); m_tbHide->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnHide ), NULL, this ); + m_bDeleteSight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDelete ), NULL, this ); m_bInformation->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnInformation ), NULL, this ); + m_bDeleteAllSights->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDeleteAll ), NULL, this ); } CelestialNavigationDialogBase::~CelestialNavigationDialogBase() @@ -96,13 +100,14 @@ m_lSights->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( CelestialNavigationDialogBase::OnSightSelected ), NULL, this ); m_lSights->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( CelestialNavigationDialogBase::OnSightSelected ), NULL, this ); m_bNewSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnNew ), NULL, this ); - m_bEditSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnEdit ), NULL, this ); - m_bDeleteSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDelete ), NULL, this ); - m_bDeleteAllSights->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDeleteAll ), NULL, this ); m_bFix->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnFix ), NULL, this ); + m_bDuplicateSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDuplicate ), NULL, this ); m_bClockOffset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnClockOffset ), NULL, this ); + m_bEditSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnEdit ), NULL, this ); m_tbHide->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnHide ), NULL, this ); + m_bDeleteSight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDelete ), NULL, this ); m_bInformation->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnInformation ), NULL, this ); + m_bDeleteAllSights->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CelestialNavigationDialogBase::OnDeleteAll ), NULL, this ); } @@ -183,24 +188,24 @@ fgSizer4->SetFlexibleDirection( wxBOTH ); fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_tMeasurement = new wxTextCtrl( m_panel1, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); + m_tMeasurement = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizer4->Add( m_tMeasurement, 0, wxALL, 5 ); - m_staticText6 = new wxStaticText( m_panel1, wxID_ANY, _("Degrees"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Degrees"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); fgSizer4->Add( m_staticText6, 0, wxALL, 5 ); - m_tMeasurementMinutes = new wxTextCtrl( m_panel1, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); + m_tMeasurementMinutes = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizer4->Add( m_tMeasurementMinutes, 0, wxALL, 5 ); - m_staticText7 = new wxStaticText( m_panel1, wxID_ANY, _("Minutes"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Minutes"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); fgSizer4->Add( m_staticText7, 0, wxALL, 5 ); - m_tMeasurementCertainty = new wxTextCtrl( m_panel1, wxID_ANY, _("10"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); + m_tMeasurementCertainty = new wxTextCtrl( sbSizer1->GetStaticBox(), wxID_ANY, _("10"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); fgSizer4->Add( m_tMeasurementCertainty, 0, wxALL, 5 ); - m_staticText8 = new wxStaticText( m_panel1, wxID_ANY, _("Minutes Certainty"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText8 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Minutes Certainty"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText8->Wrap( -1 ); fgSizer4->Add( m_staticText8, 0, wxALL, 5 ); @@ -297,10 +302,10 @@ fgSizer12->SetFlexibleDirection( wxBOTH ); fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_sCertaintySeconds = new wxSpinCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 3 ); + m_sCertaintySeconds = new wxSpinCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 3 ); fgSizer12->Add( m_sCertaintySeconds, 0, wxALL, 5 ); - m_staticText13 = new wxStaticText( m_panel2, wxID_ANY, _("Seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText13 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Seconds"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13->Wrap( -1 ); fgSizer12->Add( m_staticText13, 0, wxALL, 5 ); @@ -320,7 +325,7 @@ m_panel2->SetSizer( fgSizer8 ); m_panel2->Layout(); fgSizer8->Fit( m_panel2 ); - m_notebook1->AddPage( m_panel2, _("Time"), false ); + m_notebook1->AddPage( m_panel2, _("Time (UT)"), false ); m_panel6 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer18; fgSizer18 = new wxFlexGridSizer( 0, 3, 0, 0 ); @@ -515,6 +520,7 @@ m_sTransparency->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( SightDialogBase::RecomputeScroll ), NULL, this ); m_sTransparency->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SightDialogBase::RecomputeScroll ), NULL, this ); m_ColourPicker->Connect( wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEventHandler( SightDialogBase::RecomputeColor ), NULL, this ); + m_tEyeHeight->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SightDialogBase::Recompute ), NULL, this ); m_sTemperature->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( SightDialogBase::RecomputeSpin ), NULL, this ); m_sPressure->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( SightDialogBase::RecomputeSpin ), NULL, this ); m_tIndexError->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SightDialogBase::Recompute ), NULL, this ); @@ -552,6 +558,7 @@ m_sTransparency->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( SightDialogBase::RecomputeScroll ), NULL, this ); m_sTransparency->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SightDialogBase::RecomputeScroll ), NULL, this ); m_ColourPicker->Disconnect( wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEventHandler( SightDialogBase::RecomputeColor ), NULL, this ); + m_tEyeHeight->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SightDialogBase::Recompute ), NULL, this ); m_sTemperature->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( SightDialogBase::RecomputeSpin ), NULL, this ); m_sPressure->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( SightDialogBase::RecomputeSpin ), NULL, this ); m_tIndexError->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SightDialogBase::Recompute ), NULL, this ); @@ -648,7 +655,7 @@ wxStaticBoxSizer* sbSizer6; sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Latitude") ), wxVERTICAL ); - m_tLatitude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_tLatitude = new wxTextCtrl( sbSizer6->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizer6->Add( m_tLatitude, 0, wxALL, 5 ); @@ -657,7 +664,7 @@ wxStaticBoxSizer* sbSizer7; sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Longitude") ), wxVERTICAL ); - m_tLongitude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_tLongitude = new wxTextCtrl( sbSizer7->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizer7->Add( m_tLongitude, 0, wxALL, 5 ); @@ -666,9 +673,8 @@ wxStaticBoxSizer* sbSizer8; sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Altitude") ), wxVERTICAL ); - m_stAltitude = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stAltitude->Wrap( -1 ); - sbSizer8->Add( m_stAltitude, 0, wxALL, 5 ); + m_tAltitude = new wxTextCtrl( sbSizer8->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + sbSizer8->Add( m_tAltitude, 0, wxALL, 5 ); fgSizer24->Add( sbSizer8, 1, wxEXPAND, 5 ); @@ -676,19 +682,22 @@ wxStaticBoxSizer* sbSizer9; sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Azimuth") ), wxVERTICAL ); - m_stAzimuth = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_stAzimuth->Wrap( -1 ); - sbSizer9->Add( m_stAzimuth, 0, wxALL, 5 ); + m_tAzimuth = new wxTextCtrl( sbSizer9->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + sbSizer9->Add( m_tAzimuth, 0, wxALL, 5 ); fgSizer24->Add( sbSizer9, 1, wxEXPAND, 5 ); - m_bDone = new wxButton( this, wxID_ANY, _("Done"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer24->Add( m_bDone, 0, wxALL, 5 ); + m_cbBoatPosition = new wxCheckBox( this, wxID_ANY, _("Boat Position"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbBoatPosition->SetValue(true); + fgSizer24->Add( m_cbBoatPosition, 0, wxALL, 5 ); m_cbMagneticAzimuth = new wxCheckBox( this, wxID_ANY, _("Magnetic"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer24->Add( m_cbMagneticAzimuth, 0, wxALL, 5 ); + m_bDone = new wxButton( this, wxID_ANY, _("Done"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer24->Add( m_bDone, 0, wxALL, 5 ); + this->SetSizer( fgSizer24 ); this->Layout(); @@ -699,8 +708,8 @@ // Connect Events m_tLatitude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); m_tLongitude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); - m_bDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnDone ), NULL, this ); m_cbMagneticAzimuth->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); + m_bDone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnDone ), NULL, this ); } FindBodyDialogBase::~FindBodyDialogBase() @@ -708,8 +717,8 @@ // Disconnect Events m_tLatitude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); m_tLongitude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); - m_bDone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnDone ), NULL, this ); m_cbMagneticAzimuth->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnUpdate ), NULL, this ); + m_bDone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FindBodyDialogBase::OnDone ), NULL, this ); } @@ -757,52 +766,52 @@ fgSizer16->SetFlexibleDirection( wxBOTH ); fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText26 = new wxStaticText( this, wxID_ANY, _("Latitude"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText26 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Latitude"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText26->Wrap( -1 ); fgSizer16->Add( m_staticText26, 0, wxALL, 5 ); - m_stLatitude = new wxStaticText( this, wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); + m_stLatitude = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); m_stLatitude->Wrap( -1 ); fgSizer16->Add( m_stLatitude, 0, wxALL, 5 ); - m_staticText28 = new wxStaticText( this, wxID_ANY, _("Longitude"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText28 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Longitude"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText28->Wrap( -1 ); fgSizer16->Add( m_staticText28, 0, wxALL, 5 ); - m_stLongitude = new wxStaticText( this, wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); + m_stLongitude = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); m_stLongitude->Wrap( -1 ); fgSizer16->Add( m_stLongitude, 0, wxALL, 5 ); - m_staticText32 = new wxStaticText( this, wxID_ANY, _("Error"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText32 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Error"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText32->Wrap( -1 ); fgSizer16->Add( m_staticText32, 0, wxALL, 5 ); - m_stFixError = new wxStaticText( this, wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); + m_stFixError = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _(" N/A "), wxDefaultPosition, wxDefaultSize, 0 ); m_stFixError->Wrap( -1 ); fgSizer16->Add( m_stFixError, 0, wxALL, 5 ); fgSizer16->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticText34 = new wxStaticText( this, wxID_ANY, _("Initial"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText34 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Initial"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText34->Wrap( -1 ); fgSizer16->Add( m_staticText34, 0, wxALIGN_CENTER|wxALL, 5 ); - m_sInitialLatitude = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); + m_sInitialLatitude = new wxSpinCtrl( sbSizer7->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxSP_ARROW_KEYS, -90, 90, 0 ); fgSizer16->Add( m_sInitialLatitude, 0, wxALL, 5 ); - m_staticText35 = new wxStaticText( this, wxID_ANY, _("Initial"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText35 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Initial"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText35->Wrap( -1 ); fgSizer16->Add( m_staticText35, 0, wxALIGN_CENTER|wxALL, 5 ); - m_sInitialLongitude = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxSP_ARROW_KEYS, -180, 180, 0 ); + m_sInitialLongitude = new wxSpinCtrl( sbSizer7->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxSP_ARROW_KEYS, -180, 180, 0 ); fgSizer16->Add( m_sInitialLongitude, 0, wxALL, 5 ); - m_staticText36 = new wxStaticText( this, wxID_ANY, _("Alg"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText36 = new wxStaticText( sbSizer7->GetStaticBox(), wxID_ANY, _("Alg"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText36->Wrap( -1 ); fgSizer16->Add( m_staticText36, 0, wxALIGN_CENTER|wxALL, 5 ); - m_cbFixAlgorithm = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 90,-1 ), 0, NULL, 0 ); + m_cbFixAlgorithm = new wxComboBox( sbSizer7->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 90,-1 ), 0, NULL, 0 ); m_cbFixAlgorithm->Append( _("Plane") ); m_cbFixAlgorithm->Append( _("Sphere") ); m_cbFixAlgorithm->Append( _("Cone") ); @@ -810,7 +819,7 @@ m_cbFixAlgorithm->SetSelection( 1 ); fgSizer16->Add( m_cbFixAlgorithm, 0, wxALL, 5 ); - m_bGo = new wxButton( this, wxID_ANY, _("Go"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT ); + m_bGo = new wxButton( sbSizer7->GetStaticBox(), wxID_ANY, _("Go"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT ); m_bGo->Enable( false ); fgSizer16->Add( m_bGo, 0, wxALL, 5 ); @@ -854,10 +863,10 @@ fgSizer20->SetFlexibleDirection( wxBOTH ); fgSizer20->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_sClockCorrection = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0 ); + m_sClockCorrection = new wxSpinCtrl( sbSizer10->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -10000, 10000, 0 ); fgSizer20->Add( m_sClockCorrection, 0, wxALL, 5 ); - m_staticText361 = new wxStaticText( this, wxID_ANY, _("Seconds"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText361 = new wxStaticText( sbSizer10->GetStaticBox(), wxID_ANY, _("Seconds"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText361->Wrap( -1 ); fgSizer20->Add( m_staticText361, 0, wxALL, 5 ); diff -Nru opencpn-plugin-celestial-2.0.0/src/CelestialNavigationUI.h opencpn-plugin-celestial-2.3.0/src/CelestialNavigationUI.h --- opencpn-plugin-celestial-2.0.0/src/CelestialNavigationUI.h 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/CelestialNavigationUI.h 2018-03-29 17:18:40.000000000 +0000 @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 8 2015) +// C++ code generated with wxFormBuilder (version Dec 20 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __CELESTIALNAVIGATIONUI_H__ @@ -38,6 +38,8 @@ #include #include +#include "wxWTranslateCatalog.h" + /////////////////////////////////////////////////////////////////////////// @@ -49,33 +51,35 @@ private: protected: - wxListCtrl* m_lSights; wxButton* m_bNewSight; - wxButton* m_bEditSight; - wxButton* m_bDeleteSight; - wxButton* m_bDeleteAllSights; wxButton* m_bFix; + wxButton* m_bDuplicateSight; wxButton* m_bClockOffset; + wxButton* m_bEditSight; wxToggleButton* m_tbHide; + wxButton* m_bDeleteSight; wxButton* m_bInformation; + wxButton* m_bDeleteAllSights; // Virtual event handlers, overide them in your derived class virtual void OnEditMouse( wxMouseEvent& event ) { event.Skip(); } virtual void OnSightListLeftDown( wxMouseEvent& event ) { event.Skip(); } virtual void OnSightSelected( wxListEvent& event ) { event.Skip(); } virtual void OnNew( wxCommandEvent& event ) { event.Skip(); } - virtual void OnEdit( wxCommandEvent& event ) { event.Skip(); } - virtual void OnDelete( wxCommandEvent& event ) { event.Skip(); } - virtual void OnDeleteAll( wxCommandEvent& event ) { event.Skip(); } virtual void OnFix( wxCommandEvent& event ) { event.Skip(); } + virtual void OnDuplicate( wxCommandEvent& event ) { event.Skip(); } virtual void OnClockOffset( wxCommandEvent& event ) { event.Skip(); } + virtual void OnEdit( wxCommandEvent& event ) { event.Skip(); } virtual void OnHide( wxCommandEvent& event ) { event.Skip(); } + virtual void OnDelete( wxCommandEvent& event ) { event.Skip(); } virtual void OnInformation( wxCommandEvent& event ) { event.Skip(); } + virtual void OnDeleteAll( wxCommandEvent& event ) { event.Skip(); } public: + wxListCtrl* m_lSights; - CelestialNavigationDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Celestial Navigation Sights"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + CelestialNavigationDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Celestial Navigation Sights"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,294 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~CelestialNavigationDialogBase(); }; @@ -212,10 +216,11 @@ protected: wxTextCtrl* m_tLatitude; wxTextCtrl* m_tLongitude; - wxStaticText* m_stAltitude; - wxStaticText* m_stAzimuth; - wxButton* m_bDone; + wxTextCtrl* m_tAltitude; + wxTextCtrl* m_tAzimuth; + wxCheckBox* m_cbBoatPosition; wxCheckBox* m_cbMagneticAzimuth; + wxButton* m_bDone; // Virtual event handlers, overide them in your derived class virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); } diff -Nru opencpn-plugin-celestial-2.0.0/src/ClockCorrectionDialog.cpp opencpn-plugin-celestial-2.3.0/src/ClockCorrectionDialog.cpp --- opencpn-plugin-celestial-2.0.0/src/ClockCorrectionDialog.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/ClockCorrectionDialog.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -35,9 +35,12 @@ void ClockCorrectionDialog::OnUpdate( wxSpinEvent& event ) { CelestialNavigationDialog *parent((CelestialNavigationDialog*)GetParent()); - std::list &SightList = parent->m_SightList; - for (std::list::iterator it = SightList.begin(); it != SightList.end(); it++) - (*it)->Recompute(m_sClockCorrection->GetValue()); + wxListCtrl *lSights = parent->m_lSights; + for(int i = 0; iGetItemCount(); i++) { + Sight *s = (Sight*)wxUIntToPtr(lSights->GetItemData(i)); + s->Recompute(m_sClockCorrection->GetValue()); + s->RebuildPolygons(); + } parent->UpdateSights(); RequestRefresh( parent->GetParent() ); diff -Nru opencpn-plugin-celestial-2.0.0/src/epv00.cpp opencpn-plugin-celestial-2.3.0/src/epv00.cpp --- opencpn-plugin-celestial-2.0.0/src/epv00.cpp 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/epv00.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -0,0 +1,2655 @@ +//#include "sofa.h" +#define DJY (365.25) +#define DJ00 (2451545.0) + +#include + +int iauEpv00(double date1, double date2, + double pvh[2][3], double pvb[2][3]); + +int iauEpv00_wrapper(double date, double* pob) { + double pvb[2][3]; + int temp_result = iauEpv00(date,0.,pvb,pvb); + pob[0]=pvb[0][0]; + pob[1]=pvb[0][1]; + pob[2]=pvb[0][2]; + return temp_result; +} + +int iauEpv00(double date1, double date2, + double pvh[2][3], double pvb[2][3]) +/* +** - - - - - - - - - +** i a u E p v 0 0 +** - - - - - - - - - +** +** Earth position and velocity, heliocentric and barycentric, with +** respect to the Barycentric Celestial Reference System. +** +** This function is part of the International Astronomical Union's +** SOFA (Standards Of Fundamental Astronomy) software collection. +** +** Status: support function. +** +** Given: +** date1,date2 double TDB date (Note 1) +** +** Returned: +** pvh double[2][3] heliocentric Earth position/velocity +** pvb double[2][3] barycentric Earth position/velocity +** +** Returned (function value): +** int status: 0 = OK +** +1 = warning: date outside +** the range 1900-2100 AD +** +** Notes: +** +** 1) The TDB date date1+date2 is a Julian Date, apportioned in any +** convenient way between the two arguments. For example, +** JD(TDB)=2450123.7 could be expressed in any of these ways, among +** others: +** +** date1 date2 +** +** 2450123.7 0.0 (JD method) +** 2451545.0 -1421.3 (J2000 method) +** 2400000.5 50123.2 (MJD method) +** 2450123.5 0.2 (date & time method) +** +** The JD method is the most natural and convenient to use in cases +** where the loss of several decimal digits of resolution is +** acceptable. The J2000 method is best matched to the way the +** argument is handled internally and will deliver the optimum +** resolution. The MJD method and the date & time methods are both +** good compromises between resolution and convenience. However, +** the accuracy of the result is more likely to be limited by the +** algorithm itself than the way the date has been expressed. +** +** n.b. TT can be used instead of TDB in most applications. +** +** 2) On return, the arrays pvh and pvb contain the following: +** +** pvh[0][0] x } +** pvh[0][1] y } heliocentric position, AU +** pvh[0][2] z } +** +** pvh[1][0] xdot } +** pvh[1][1] ydot } heliocentric velocity, AU/d +** pvh[1][2] zdot } +** +** pvb[0][0] x } +** pvb[0][1] y } barycentric position, AU +** pvb[0][2] z } +** +** pvb[1][0] xdot } +** pvb[1][1] ydot } barycentric velocity, AU/d +** pvb[1][2] zdot } +** +** The vectors are with respect to the Barycentric Celestial +** Reference System. The time unit is one day in TDB. +** +** 3) The function is a SIMPLIFIED SOLUTION from the planetary theory +** VSOP2000 (X. Moisson, P. Bretagnon, 2001, Celes. Mechanics & +** Dyn. Astron., 80, 3/4, 205-213) and is an adaptation of original +** Fortran code supplied by P. Bretagnon (private comm., 2000). +** +** 4) Comparisons over the time span 1900-2100 with this simplified +** solution and the JPL DE405 ephemeris give the following results: +** +** RMS max +** Heliocentric: +** position error 3.7 11.2 km +** velocity error 1.4 5.0 mm/s +** +** Barycentric: +** position error 4.6 13.4 km +** velocity error 1.4 4.9 mm/s +** +** Comparisons with the JPL DE406 ephemeris show that by 1800 and +** 2200 the position errors are approximately double their 1900-2100 +** size. By 1500 and 2500 the deterioration is a factor of 10 and +** by 1000 and 3000 a factor of 60. The velocity accuracy falls off +** at about half that rate. +** +** 5) It is permissible to use the same array for pvh and pvb, which +** will receive the barycentric values. +** +** This revision: 2013 June 18 +** +** SOFA release 2016-05-03 +** +** Copyright (C) 2016 IAU SOFA Board. See notes at end. +*/ +{ +/* +** Matrix elements for orienting the analytical model to DE405. +** +** The corresponding Euler angles are: +** +** d ' " +** 1st rotation - 23 26 21.4091 about the x-axis (obliquity) +** 2nd rotation + 0.0475 about the z-axis (RA offset) +** +** These were obtained empirically, by comparisons with DE405 over +** 1900-2100. +*/ + static const double am12 = 0.000000211284, + am13 = -0.000000091603, + am21 = -0.000000230286, + am22 = 0.917482137087, + am23 = -0.397776982902, + am32 = 0.397776982902, + am33 = 0.917482137087; + +/* +** ---------------------- +** Ephemeris Coefficients +** ---------------------- +** +** The ephemeris consists of harmonic terms for predicting (i) the Sun +** to Earth vector and (ii) the Solar-System-barycenter to Sun vector +** respectively. The coefficients are stored in arrays which, although +** 1-demensional, contain groups of three. Each triplet of +** coefficients is the amplitude, phase and frequency for one term in +** the model, and each array contains the number of terms called for by +** the model. +** +** There are eighteen such arrays, named as follows: +** +** array model power of T component +** +** e0x Sun-to-Earth 0 x +** e0y Sun-to-Earth 0 y +** e0z Sun-to-Earth 0 z +** +** e1x Sun-to-Earth 1 x +** e1y Sun-to-Earth 1 y +** e1z Sun-to-Earth 1 z +** +** e2x Sun-to-Earth 2 x +** e2y Sun-to-Earth 2 y +** e2z Sun-to-Earth 2 z +** +** s0x SSB-to-Sun 0 x +** s0y SSB-to-Sun 0 y +** s0z SSB-to-Sun 0 z +** +** s1x SSB-to-Sun 1 x +** s1y SSB-to-Sun 1 y +** s1z SSB-to-Sun 1 z +** +** s2x SSB-to-Sun 2 x +** s2y SSB-to-Sun 2 y +** s2z SSB-to-Sun 2 z +*/ + +/* Sun-to-Earth, T^0, X */ + static const double e0x[] = { + 0.9998292878132e+00, 0.1753485171504e+01, 0.6283075850446e+01, + 0.8352579567414e-02, 0.1710344404582e+01, 0.1256615170089e+02, + 0.5611445335148e-02, 0.0000000000000e+00, 0.0000000000000e+00, + 0.1046664295572e-03, 0.1667225416770e+01, 0.1884922755134e+02, + 0.3110842534677e-04, 0.6687513390251e+00, 0.8399684731857e+02, + 0.2552413503550e-04, 0.5830637358413e+00, 0.5296909721118e+00, + 0.2137207845781e-04, 0.1092330954011e+01, 0.1577343543434e+01, + 0.1680240182951e-04, 0.4955366134987e+00, 0.6279552690824e+01, + 0.1679012370795e-04, 0.6153014091901e+01, 0.6286599010068e+01, + 0.1445526946777e-04, 0.3472744100492e+01, 0.2352866153506e+01, + + 0.1091038246184e-04, 0.3689845786119e+01, 0.5223693906222e+01, + 0.9344399733932e-05, 0.6073934645672e+01, 0.1203646072878e+02, + 0.8993182910652e-05, 0.3175705249069e+01, 0.1021328554739e+02, + 0.5665546034116e-05, 0.2152484672246e+01, 0.1059381944224e+01, + 0.6844146703035e-05, 0.1306964099750e+01, 0.5753384878334e+01, + 0.7346610905565e-05, 0.4354980070466e+01, 0.3981490189893e+00, + 0.6815396474414e-05, 0.2218229211267e+01, 0.4705732307012e+01, + 0.6112787253053e-05, 0.5384788425458e+01, 0.6812766822558e+01, + 0.4518120711239e-05, 0.6087604012291e+01, 0.5884926831456e+01, + 0.4521963430706e-05, 0.1279424524906e+01, 0.6256777527156e+01, + + 0.4497426764085e-05, 0.5369129144266e+01, 0.6309374173736e+01, + 0.4062190566959e-05, 0.5436473303367e+00, 0.6681224869435e+01, + 0.5412193480192e-05, 0.7867838528395e+00, 0.7755226100720e+00, + 0.5469839049386e-05, 0.1461440311134e+01, 0.1414349524433e+02, + 0.5205264083477e-05, 0.4432944696116e+01, 0.7860419393880e+01, + 0.2149759935455e-05, 0.4502237496846e+01, 0.1150676975667e+02, + 0.2279109618501e-05, 0.1239441308815e+01, 0.7058598460518e+01, + 0.2259282939683e-05, 0.3272430985331e+01, 0.4694002934110e+01, + 0.2558950271319e-05, 0.2265471086404e+01, 0.1216800268190e+02, + 0.2561581447555e-05, 0.1454740653245e+01, 0.7099330490126e+00, + + 0.1781441115440e-05, 0.2962068630206e+01, 0.7962980379786e+00, + 0.1612005874644e-05, 0.1473255041006e+01, 0.5486777812467e+01, + 0.1818630667105e-05, 0.3743903293447e+00, 0.6283008715021e+01, + 0.1818601377529e-05, 0.6274174354554e+01, 0.6283142985870e+01, + 0.1554475925257e-05, 0.1624110906816e+01, 0.2513230340178e+02, + 0.2090948029241e-05, 0.5852052276256e+01, 0.1179062909082e+02, + 0.2000176345460e-05, 0.4072093298513e+01, 0.1778984560711e+02, + 0.1289535917759e-05, 0.5217019331069e+01, 0.7079373888424e+01, + 0.1281135307881e-05, 0.4802054538934e+01, 0.3738761453707e+01, + 0.1518229005692e-05, 0.8691914742502e+00, 0.2132990797783e+00, + + 0.9450128579027e-06, 0.4601859529950e+01, 0.1097707878456e+02, + 0.7781119494996e-06, 0.1844352816694e+01, 0.8827390247185e+01, + 0.7733407759912e-06, 0.3582790154750e+01, 0.5507553240374e+01, + 0.7350644318120e-06, 0.2695277788230e+01, 0.1589072916335e+01, + 0.6535928827023e-06, 0.3651327986142e+01, 0.1176985366291e+02, + 0.6324624183656e-06, 0.2241302375862e+01, 0.6262300422539e+01, + 0.6298565300557e-06, 0.4407122406081e+01, 0.6303851278352e+01, + 0.8587037089179e-06, 0.3024307223119e+01, 0.1672837615881e+03, + 0.8299954491035e-06, 0.6192539428237e+01, 0.3340612434717e+01, + 0.6311263503401e-06, 0.2014758795416e+01, 0.7113454667900e-02, + + 0.6005646745452e-06, 0.3399500503397e+01, 0.4136910472696e+01, + 0.7917715109929e-06, 0.2493386877837e+01, 0.6069776770667e+01, + 0.7556958099685e-06, 0.4159491740143e+01, 0.6496374930224e+01, + 0.6773228244949e-06, 0.4034162934230e+01, 0.9437762937313e+01, + 0.5370708577847e-06, 0.1562219163734e+01, 0.1194447056968e+01, + 0.5710804266203e-06, 0.2662730803386e+01, 0.6282095334605e+01, + 0.5709824583726e-06, 0.3985828430833e+01, 0.6284056366286e+01, + 0.5143950896447e-06, 0.1308144688689e+01, 0.6290189305114e+01, + 0.5088010604546e-06, 0.5352817214804e+01, 0.6275962395778e+01, + 0.4960369085172e-06, 0.2644267922349e+01, 0.6127655567643e+01, + + 0.4803137891183e-06, 0.4008844192080e+01, 0.6438496133249e+01, + 0.5731747768225e-06, 0.3794550174597e+01, 0.3154687086868e+01, + 0.4735947960579e-06, 0.6107118308982e+01, 0.3128388763578e+01, + 0.4808348796625e-06, 0.4771458618163e+01, 0.8018209333619e+00, + 0.4115073743137e-06, 0.3327111335159e+01, 0.8429241228195e+01, + 0.5230575889287e-06, 0.5305708551694e+01, 0.1336797263425e+02, + 0.5133977889215e-06, 0.5784230738814e+01, 0.1235285262111e+02, + 0.5065815825327e-06, 0.2052064793679e+01, 0.1185621865188e+02, + 0.4339831593868e-06, 0.3644994195830e+01, 0.1726015463500e+02, + 0.3952928638953e-06, 0.4930376436758e+01, 0.5481254917084e+01, + + 0.4898498111942e-06, 0.4542084219731e+00, 0.9225539266174e+01, + 0.4757490209328e-06, 0.3161126388878e+01, 0.5856477690889e+01, + 0.4727701669749e-06, 0.6214993845446e+00, 0.2544314396739e+01, + 0.3800966681863e-06, 0.3040132339297e+01, 0.4265981595566e+00, + 0.3257301077939e-06, 0.8064977360087e+00, 0.3930209696940e+01, + 0.3255810528674e-06, 0.1974147981034e+01, 0.2146165377750e+01, + 0.3252029748187e-06, 0.2845924913135e+01, 0.4164311961999e+01, + 0.3255505635308e-06, 0.3017900824120e+01, 0.5088628793478e+01, + 0.2801345211990e-06, 0.6109717793179e+01, 0.1256967486051e+02, + 0.3688987740970e-06, 0.2911550235289e+01, 0.1807370494127e+02, + + 0.2475153429458e-06, 0.2179146025856e+01, 0.2629832328990e-01, + 0.3033457749150e-06, 0.1994161050744e+01, 0.4535059491685e+01, + 0.2186743763110e-06, 0.5125687237936e+01, 0.1137170464392e+02, + 0.2764777032774e-06, 0.4822646860252e+00, 0.1256262854127e+02, + 0.2199028768592e-06, 0.4637633293831e+01, 0.1255903824622e+02, + 0.2046482824760e-06, 0.1467038733093e+01, 0.7084896783808e+01, + 0.2611209147507e-06, 0.3044718783485e+00, 0.7143069561767e+02, + 0.2286079656818e-06, 0.4764220356805e+01, 0.8031092209206e+01, + 0.1855071202587e-06, 0.3383637774428e+01, 0.1748016358760e+01, + 0.2324669506784e-06, 0.6189088449251e+01, 0.1831953657923e+02, + + 0.1709528015688e-06, 0.5874966729774e+00, 0.4933208510675e+01, + 0.2168156875828e-06, 0.4302994009132e+01, 0.1044738781244e+02, + 0.2106675556535e-06, 0.3800475419891e+01, 0.7477522907414e+01, + 0.1430213830465e-06, 0.1294660846502e+01, 0.2942463415728e+01, + 0.1388396901944e-06, 0.4594797202114e+01, 0.8635942003952e+01, + 0.1922258844190e-06, 0.4943044543591e+00, 0.1729818233119e+02, + 0.1888460058292e-06, 0.2426943912028e+01, 0.1561374759853e+03, + 0.1789449386107e-06, 0.1582973303499e+00, 0.1592596075957e+01, + 0.1360803685374e-06, 0.5197240440504e+01, 0.1309584267300e+02, + 0.1504038014709e-06, 0.3120360916217e+01, 0.1649636139783e+02, + + 0.1382769533389e-06, 0.6164702888205e+01, 0.7632943190217e+01, + 0.1438059769079e-06, 0.1437423770979e+01, 0.2042657109477e+02, + 0.1326303260037e-06, 0.3609688799679e+01, 0.1213955354133e+02, + 0.1159244950540e-06, 0.5463018167225e+01, 0.5331357529664e+01, + 0.1433118149136e-06, 0.6028909912097e+01, 0.7342457794669e+01, + 0.1234623148594e-06, 0.3109645574997e+01, 0.6279485555400e+01, + 0.1233949875344e-06, 0.3539359332866e+01, 0.6286666145492e+01, + 0.9927196061299e-07, 0.1259321569772e+01, 0.7234794171227e+01, + 0.1242302191316e-06, 0.1065949392609e+01, 0.1511046609763e+02, + 0.1098402195201e-06, 0.2192508743837e+01, 0.1098880815746e+02, + + 0.1158191395315e-06, 0.4054411278650e+01, 0.5729506548653e+01, + 0.9048475596241e-07, 0.5429764748518e+01, 0.9623688285163e+01, + 0.8889853269023e-07, 0.5046586206575e+01, 0.6148010737701e+01, + 0.1048694242164e-06, 0.2628858030806e+01, 0.6836645152238e+01, + 0.1112308378646e-06, 0.4177292719907e+01, 0.1572083878776e+02, + 0.8631729709901e-07, 0.1601345232557e+01, 0.6418140963190e+01, + 0.8527816951664e-07, 0.2463888997513e+01, 0.1471231707864e+02, + 0.7892139456991e-07, 0.3154022088718e+01, 0.2118763888447e+01, + 0.1051782905236e-06, 0.4795035816088e+01, 0.1349867339771e+01, + 0.1048219943164e-06, 0.2952983395230e+01, 0.5999216516294e+01, + + 0.7435760775143e-07, 0.5420547991464e+01, 0.6040347114260e+01, + 0.9869574106949e-07, 0.3695646753667e+01, 0.6566935184597e+01, + 0.9156886364226e-07, 0.3922675306609e+01, 0.5643178611111e+01, + 0.7006834356188e-07, 0.1233968624861e+01, 0.6525804586632e+01, + 0.9806170182601e-07, 0.1919542280684e+01, 0.2122839202813e+02, + 0.9052289673607e-07, 0.4615902724369e+01, 0.4690479774488e+01, + 0.7554200867893e-07, 0.1236863719072e+01, 0.1253985337760e+02, + 0.8215741286498e-07, 0.3286800101559e+00, 0.1097355562493e+02, + 0.7185178575397e-07, 0.5880942158367e+01, 0.6245048154254e+01, + 0.7130726476180e-07, 0.7674871987661e+00, 0.6321103546637e+01, + + 0.6650894461162e-07, 0.6987129150116e+00, 0.5327476111629e+01, + 0.7396888823688e-07, 0.3576824794443e+01, 0.5368044267797e+00, + 0.7420588884775e-07, 0.5033615245369e+01, 0.2354323048545e+02, + 0.6141181642908e-07, 0.9449927045673e+00, 0.1296430071988e+02, + 0.6373557924058e-07, 0.6206342280341e+01, 0.9517183207817e+00, + 0.6359474329261e-07, 0.5036079095757e+01, 0.1990745094947e+01, + 0.5740173582646e-07, 0.6105106371350e+01, 0.9555997388169e+00, + 0.7019864084602e-07, 0.7237747359018e+00, 0.5225775174439e+00, + 0.6398054487042e-07, 0.3976367969666e+01, 0.2407292145756e+02, + 0.7797092650498e-07, 0.4305423910623e+01, 0.2200391463820e+02, + + 0.6466760000900e-07, 0.3500136825200e+01, 0.5230807360890e+01, + 0.7529417043890e-07, 0.3514779246100e+01, 0.1842262939178e+02, + 0.6924571140892e-07, 0.2743457928679e+01, 0.1554202828031e+00, + 0.6220798650222e-07, 0.2242598118209e+01, 0.1845107853235e+02, + 0.5870209391853e-07, 0.2332832707527e+01, 0.6398972393349e+00, + 0.6263953473888e-07, 0.2191105358956e+01, 0.6277552955062e+01, + 0.6257781390012e-07, 0.4457559396698e+01, 0.6288598745829e+01, + 0.5697304945123e-07, 0.3499234761404e+01, 0.1551045220144e+01, + 0.6335438746791e-07, 0.6441691079251e+00, 0.5216580451554e+01, + 0.6377258441152e-07, 0.2252599151092e+01, 0.5650292065779e+01, + + 0.6484841818165e-07, 0.1992812417646e+01, 0.1030928125552e+00, + 0.4735551485250e-07, 0.3744672082942e+01, 0.1431416805965e+02, + 0.4628595996170e-07, 0.1334226211745e+01, 0.5535693017924e+00, + 0.6258152336933e-07, 0.4395836159154e+01, 0.2608790314060e+02, + 0.6196171366594e-07, 0.2587043007997e+01, 0.8467247584405e+02, + 0.6159556952126e-07, 0.4782499769128e+01, 0.2394243902548e+03, + 0.4987741172394e-07, 0.7312257619924e+00, 0.7771377146812e+02, + 0.5459280703142e-07, 0.3001376372532e+01, 0.6179983037890e+01, + 0.4863461189999e-07, 0.3767222128541e+01, 0.9027992316901e+02, + 0.5349912093158e-07, 0.3663594450273e+01, 0.6386168663001e+01, + + 0.5673725607806e-07, 0.4331187919049e+01, 0.6915859635113e+01, + 0.4745485060512e-07, 0.5816195745518e+01, 0.6282970628506e+01, + 0.4745379005326e-07, 0.8323672435672e+00, 0.6283181072386e+01, + 0.4049002796321e-07, 0.3785023976293e+01, 0.6254626709878e+01, + 0.4247084014515e-07, 0.2378220728783e+01, 0.7875671926403e+01, + 0.4026912363055e-07, 0.2864103423269e+01, 0.6311524991013e+01, + 0.4062935011774e-07, 0.2415408595975e+01, 0.3634620989887e+01, + 0.5347771048509e-07, 0.3343479309801e+01, 0.2515860172507e+02, + 0.4829494136505e-07, 0.2821742398262e+01, 0.5760498333002e+01, + 0.4342554404599e-07, 0.5624662458712e+01, 0.7238675589263e+01, + + 0.4021599184361e-07, 0.5557250275009e+00, 0.1101510648075e+02, + 0.4104900474558e-07, 0.3296691780005e+01, 0.6709674010002e+01, + 0.4376532905131e-07, 0.3814443999443e+01, 0.6805653367890e+01, + 0.3314590480650e-07, 0.3560229189250e+01, 0.1259245002418e+02, + 0.3232421839643e-07, 0.5185389180568e+01, 0.1066495398892e+01, + 0.3541176318876e-07, 0.3921381909679e+01, 0.9917696840332e+01, + 0.3689831242681e-07, 0.4190658955386e+01, 0.1192625446156e+02, + 0.3890605376774e-07, 0.5546023371097e+01, 0.7478166569050e-01, + 0.3038559339780e-07, 0.6231032794494e+01, 0.1256621883632e+02, + 0.3137083969782e-07, 0.6207063419190e+01, 0.4292330755499e+01, + + 0.4024004081854e-07, 0.1195257375713e+01, 0.1334167431096e+02, + 0.3300234879283e-07, 0.1804694240998e+01, 0.1057540660594e+02, + 0.3635399155575e-07, 0.5597811343500e+01, 0.6208294184755e+01, + 0.3032668691356e-07, 0.3191059366530e+01, 0.1805292951336e+02, + 0.2809652069058e-07, 0.4094348032570e+01, 0.3523159621801e-02, + 0.3696955383823e-07, 0.5219282738794e+01, 0.5966683958112e+01, + 0.3562894142503e-07, 0.1037247544554e+01, 0.6357857516136e+01, + 0.3510598524148e-07, 0.1430020816116e+01, 0.6599467742779e+01, + 0.3617736142953e-07, 0.3002911403677e+01, 0.6019991944201e+01, + 0.2624524910730e-07, 0.2437046757292e+01, 0.6702560555334e+01, + + 0.2535824204490e-07, 0.1581594689647e+01, 0.3141537925223e+02, + 0.3519787226257e-07, 0.5379863121521e+01, 0.2505706758577e+03, + 0.2578406709982e-07, 0.4904222639329e+01, 0.1673046366289e+02, + 0.3423887981473e-07, 0.3646448997315e+01, 0.6546159756691e+01, + 0.2776083886467e-07, 0.3307829300144e+01, 0.1272157198369e+02, + 0.3379592818379e-07, 0.1747541251125e+01, 0.1494531617769e+02, + 0.3050255426284e-07, 0.1784689432607e-01, 0.4732030630302e+01, + 0.2652378350236e-07, 0.4420055276260e+01, 0.5863591145557e+01, + 0.2374498173768e-07, 0.3629773929208e+01, 0.2388894113936e+01, + 0.2716451255140e-07, 0.3079623706780e+01, 0.1202934727411e+02, + + 0.3038583699229e-07, 0.3312487903507e+00, 0.1256608456547e+02, + 0.2220681228760e-07, 0.5265520401774e+01, 0.1336244973887e+02, + 0.3044156540912e-07, 0.4766664081250e+01, 0.2908881142201e+02, + 0.2731859923561e-07, 0.5069146530691e+01, 0.1391601904066e+02, + 0.2285603018171e-07, 0.5954935112271e+01, 0.6076890225335e+01, + 0.2025006454555e-07, 0.4061789589267e+01, 0.4701116388778e+01, + 0.2012597519804e-07, 0.2485047705241e+01, 0.6262720680387e+01, + 0.2003406962258e-07, 0.4163779209320e+01, 0.6303431020504e+01, + 0.2207863441371e-07, 0.6923839133828e+00, 0.6489261475556e+01, + 0.2481374305624e-07, 0.5944173595676e+01, 0.1204357418345e+02, + + 0.2130923288870e-07, 0.4641013671967e+01, 0.5746271423666e+01, + 0.2446370543391e-07, 0.6125796518757e+01, 0.1495633313810e+00, + 0.1932492759052e-07, 0.2234572324504e+00, 0.1352175143971e+02, + 0.2600122568049e-07, 0.4281012405440e+01, 0.4590910121555e+01, + 0.2431754047488e-07, 0.1429943874870e+00, 0.1162474756779e+01, + 0.1875902869209e-07, 0.9781803816948e+00, 0.6279194432410e+01, + 0.1874381139426e-07, 0.5670368130173e+01, 0.6286957268481e+01, + 0.2156696047173e-07, 0.2008985006833e+01, 0.1813929450232e+02, + 0.1965076182484e-07, 0.2566186202453e+00, 0.4686889479442e+01, + 0.2334816372359e-07, 0.4408121891493e+01, 0.1002183730415e+02, + + 0.1869937408802e-07, 0.5272745038656e+01, 0.2427287361862e+00, + 0.2436236460883e-07, 0.4407720479029e+01, 0.9514313292143e+02, + 0.1761365216611e-07, 0.1943892315074e+00, 0.1351787002167e+02, + 0.2156289480503e-07, 0.1418570924545e+01, 0.6037244212485e+01, + 0.2164748979255e-07, 0.4724603439430e+01, 0.2301353951334e+02, + 0.2222286670853e-07, 0.2400266874598e+01, 0.1266924451345e+02, + 0.2070901414929e-07, 0.5230348028732e+01, 0.6528907488406e+01, + 0.1792745177020e-07, 0.2099190328945e+01, 0.6819880277225e+01, + 0.1841802068445e-07, 0.3467527844848e+00, 0.6514761976723e+02, + 0.1578401631718e-07, 0.7098642356340e+00, 0.2077542790660e-01, + + 0.1561690152531e-07, 0.5943349620372e+01, 0.6272439236156e+01, + 0.1558591045463e-07, 0.7040653478980e+00, 0.6293712464735e+01, + 0.1737356469576e-07, 0.4487064760345e+01, 0.1765478049437e+02, + 0.1434755619991e-07, 0.2993391570995e+01, 0.1102062672231e+00, + 0.1482187806654e-07, 0.2278049198251e+01, 0.1052268489556e+01, + 0.1424812827089e-07, 0.1682114725827e+01, 0.1311972100268e+02, + 0.1380282448623e-07, 0.3262668602579e+01, 0.1017725758696e+02, + 0.1811481244566e-07, 0.3187771221777e+01, 0.1887552587463e+02, + 0.1504446185696e-07, 0.5650162308647e+01, 0.7626583626240e-01, + 0.1740776154137e-07, 0.5487068607507e+01, 0.1965104848470e+02, + + 0.1374339536251e-07, 0.5745688172201e+01, 0.6016468784579e+01, + 0.1761377477704e-07, 0.5748060203659e+01, 0.2593412433514e+02, + 0.1535138225795e-07, 0.6226848505790e+01, 0.9411464614024e+01, + 0.1788140543676e-07, 0.6189318878563e+01, 0.3301902111895e+02, + 0.1375002807996e-07, 0.5371812884394e+01, 0.6327837846670e+00, + 0.1242115758632e-07, 0.1471687569712e+01, 0.3894181736510e+01, + 0.1450977333938e-07, 0.4143836662127e+01, 0.1277945078067e+02, + 0.1297579575023e-07, 0.9003477661957e+00, 0.6549682916313e+01, + 0.1462667934821e-07, 0.5760505536428e+01, 0.1863592847156e+02, + 0.1381774374799e-07, 0.1085471729463e+01, 0.2379164476796e+01, + + 0.1682333169307e-07, 0.5409870870133e+01, 0.1620077269078e+02, + 0.1190812918837e-07, 0.1397205174601e+01, 0.1149965630200e+02, + 0.1221434762106e-07, 0.9001804809095e+00, 0.1257326515556e+02, + 0.1549934644860e-07, 0.4262528275544e+01, 0.1820933031200e+02, + 0.1252138953050e-07, 0.1411642012027e+01, 0.6993008899458e+01, + 0.1237078905387e-07, 0.2844472403615e+01, 0.2435678079171e+02, + 0.1446953389615e-07, 0.5295835522223e+01, 0.3813291813120e-01, + 0.1388446457170e-07, 0.4969428135497e+01, 0.2458316379602e+00, + 0.1019339179228e-07, 0.2491369561806e+01, 0.6112403035119e+01, + 0.1258880815343e-07, 0.4679426248976e+01, 0.5429879531333e+01, + + 0.1297768238261e-07, 0.1074509953328e+01, 0.1249137003520e+02, + 0.9913505718094e-08, 0.4735097918224e+01, 0.6247047890016e+01, + 0.9830453155969e-08, 0.4158649187338e+01, 0.6453748665772e+01, + 0.1192615865309e-07, 0.3438208613699e+01, 0.6290122169689e+01, + 0.9835874798277e-08, 0.1913300781229e+01, 0.6319103810876e+01, + 0.9639087569277e-08, 0.9487683644125e+00, 0.8273820945392e+01, + 0.1175716107001e-07, 0.3228141664287e+01, 0.6276029531202e+01, + 0.1018926508678e-07, 0.2216607854300e+01, 0.1254537627298e+02, + 0.9500087869225e-08, 0.2625116459733e+01, 0.1256517118505e+02, + 0.9664192916575e-08, 0.5860562449214e+01, 0.6259197520765e+01, + + 0.9612858712203e-08, 0.7885682917381e+00, 0.6306954180126e+01, + 0.1117645675413e-07, 0.3932148831189e+01, 0.1779695906178e+02, + 0.1158864052160e-07, 0.9995605521691e+00, 0.1778273215245e+02, + 0.9021043467028e-08, 0.5263769742673e+01, 0.6172869583223e+01, + 0.8836134773563e-08, 0.1496843220365e+01, 0.1692165728891e+01, + 0.1045872200691e-07, 0.7009039517214e+00, 0.2204125344462e+00, + 0.1211463487798e-07, 0.4041544938511e+01, 0.8257698122054e+02, + 0.8541990804094e-08, 0.1447586692316e+01, 0.6393282117669e+01, + 0.1038720703636e-07, 0.4594249718112e+00, 0.1550861511662e+02, + 0.1126722351445e-07, 0.3925550579036e+01, 0.2061856251104e+00, + + 0.8697373859631e-08, 0.4411341856037e+01, 0.9491756770005e+00, + 0.8869380028441e-08, 0.2402659724813e+01, 0.3903911373650e+01, + 0.9247014693258e-08, 0.1401579743423e+01, 0.6267823317922e+01, + 0.9205062930950e-08, 0.5245978000814e+01, 0.6298328382969e+01, + 0.8000745038049e-08, 0.3590803356945e+01, 0.2648454860559e+01, + 0.9168973650819e-08, 0.2470150501679e+01, 0.1498544001348e+03, + 0.1075444949238e-07, 0.1328606161230e+01, 0.3694923081589e+02, + 0.7817298525817e-08, 0.6162256225998e+01, 0.4804209201333e+01, + 0.9541469226356e-08, 0.3942568967039e+01, 0.1256713221673e+02, + 0.9821910122027e-08, 0.2360246287233e+00, 0.1140367694411e+02, + + 0.9897822023777e-08, 0.4619805634280e+01, 0.2280573557157e+02, + 0.7737289283765e-08, 0.3784727847451e+01, 0.7834121070590e+01, + 0.9260204034710e-08, 0.2223352487601e+01, 0.2787043132925e+01, + 0.7320252888486e-08, 0.1288694636874e+01, 0.6282655592598e+01, + 0.7319785780946e-08, 0.5359869567774e+01, 0.6283496108294e+01, + 0.7147219933778e-08, 0.5516616675856e+01, 0.1725663147538e+02, + 0.7946502829878e-08, 0.2630459984567e+01, 0.1241073141809e+02, + 0.9001711808932e-08, 0.2849815827227e+01, 0.6281591679874e+01, + 0.8994041507257e-08, 0.3795244450750e+01, 0.6284560021018e+01, + 0.8298582787358e-08, 0.5236413127363e+00, 0.1241658836951e+02, + + 0.8526596520710e-08, 0.4794605424426e+01, 0.1098419223922e+02, + 0.8209822103197e-08, 0.1578752370328e+01, 0.1096996532989e+02, + 0.6357049861094e-08, 0.5708926113761e+01, 0.1596186371003e+01, + 0.7370473179049e-08, 0.3842402530241e+01, 0.4061219149443e+01, + 0.7232154664726e-08, 0.3067548981535e+01, 0.1610006857377e+03, + 0.6328765494903e-08, 0.1313930030069e+01, 0.1193336791622e+02, + 0.8030064908595e-08, 0.3488500408886e+01, 0.8460828644453e+00, + 0.6275464259232e-08, 0.1532061626198e+01, 0.8531963191132e+00, + 0.7051897446325e-08, 0.3285859929993e+01, 0.5849364236221e+01, + 0.6161593705428e-08, 0.1477341999464e+01, 0.5573142801433e+01, + + 0.7754683957278e-08, 0.1586118663096e+01, 0.8662240327241e+01, + 0.5889928990701e-08, 0.1304887868803e+01, 0.1232342296471e+02, + 0.5705756047075e-08, 0.4555333589350e+01, 0.1258692712880e+02, + 0.5964178808332e-08, 0.3001762842062e+01, 0.5333900173445e+01, + 0.6712446027467e-08, 0.4886780007595e+01, 0.1171295538178e+02, + 0.5941809275464e-08, 0.4701509603824e+01, 0.9779108567966e+01, + 0.5466993627395e-08, 0.4588357817278e+01, 0.1884211409667e+02, + 0.6340512090980e-08, 0.1164543038893e+01, 0.5217580628120e+02, + 0.6325505710045e-08, 0.3919171259645e+01, 0.1041998632314e+02, + 0.6164789509685e-08, 0.2143828253542e+01, 0.6151533897323e+01, + + 0.5263330812430e-08, 0.6066564434241e+01, 0.1885275071096e+02, + 0.5597087780221e-08, 0.2926316429472e+01, 0.4337116142245e+00, + 0.5396556236817e-08, 0.3244303591505e+01, 0.6286362197481e+01, + 0.5396615148223e-08, 0.3404304703662e+01, 0.6279789503410e+01, + 0.7091832443341e-08, 0.8532377803192e+00, 0.4907302013889e+01, + 0.6572352589782e-08, 0.4901966774419e+01, 0.1176433076753e+02, + 0.5960236060795e-08, 0.1874672315797e+01, 0.1422690933580e-01, + 0.5125480043511e-08, 0.3735726064334e+01, 0.1245594543367e+02, + 0.5928241866410e-08, 0.4502033899935e+01, 0.6414617803568e+01, + 0.5249600357424e-08, 0.4372334799878e+01, 0.1151388321134e+02, + + 0.6059171276087e-08, 0.2581617302908e+01, 0.6062663316000e+01, + 0.5295235081662e-08, 0.2974811513158e+01, 0.3496032717521e+01, + 0.5820561875933e-08, 0.1796073748244e+00, 0.2838593341516e+00, + 0.4754696606440e-08, 0.1981998136973e+01, 0.3104930017775e+01, + 0.6385053548955e-08, 0.2559174171605e+00, 0.6133512519065e+01, + 0.6589828273941e-08, 0.2750967106776e+01, 0.4087944051283e+02, + 0.5383376567189e-08, 0.6325947523578e+00, 0.2248384854122e+02, + 0.5928941683538e-08, 0.1672304519067e+01, 0.1581959461667e+01, + 0.4816060709794e-08, 0.3512566172575e+01, 0.9388005868221e+01, + 0.6003381586512e-08, 0.5610932219189e+01, 0.5326786718777e+01, + + 0.5504225393105e-08, 0.4037501131256e+01, 0.6503488384892e+01, + 0.5353772620129e-08, 0.6122774968240e+01, 0.1735668374386e+03, + 0.5786253768544e-08, 0.5527984999515e+01, 0.1350651127443e+00, + 0.5065706702002e-08, 0.9980765573624e+00, 0.1248988586463e+02, + 0.5972838885276e-08, 0.6044489493203e+01, 0.2673594526851e+02, + 0.5323585877961e-08, 0.3924265998147e+01, 0.4171425416666e+01, + 0.5210772682858e-08, 0.6220111376901e+01, 0.2460261242967e+02, + 0.4726549040535e-08, 0.3716043206862e+01, 0.7232251527446e+01, + 0.6029425105059e-08, 0.8548704071116e+00, 0.3227113045244e+03, + 0.4481542826513e-08, 0.1426925072829e+01, 0.5547199253223e+01, + + 0.5836024505068e-08, 0.7135651752625e-01, 0.7285056171570e+02, + 0.4137046613272e-08, 0.5330767643283e+01, 0.1087398597200e+02, + 0.5171977473924e-08, 0.4494262335353e+00, 0.1884570439172e+02, + 0.5694429833732e-08, 0.2952369582215e+01, 0.9723862754494e+02, + 0.4009158925298e-08, 0.3500003416535e+01, 0.6244942932314e+01, + 0.4784939596873e-08, 0.6196709413181e+01, 0.2929661536378e+02, + 0.3983725022610e-08, 0.5103690031897e+01, 0.4274518229222e+01, + 0.3870535232462e-08, 0.3187569587401e+01, 0.6321208768577e+01, + 0.5140501213951e-08, 0.1668924357457e+01, 0.1232032006293e+02, + 0.3849034819355e-08, 0.4445722510309e+01, 0.1726726808967e+02, + + 0.4002383075060e-08, 0.5226224152423e+01, 0.7018952447668e+01, + 0.3890719543549e-08, 0.4371166550274e+01, 0.1491901785440e+02, + 0.4887084607881e-08, 0.5973556689693e+01, 0.1478866649112e+01, + 0.3739939287592e-08, 0.2089084714600e+01, 0.6922973089781e+01, + 0.5031925918209e-08, 0.4658371936827e+01, 0.1715706182245e+02, + 0.4387748764954e-08, 0.4825580552819e+01, 0.2331413144044e+03, + 0.4147398098865e-08, 0.3739003524998e+01, 0.1376059875786e+02, + 0.3719089993586e-08, 0.1148941386536e+01, 0.6297302759782e+01, + 0.3934238461056e-08, 0.1559893008343e+01, 0.7872148766781e+01, + 0.3672471375622e-08, 0.5516145383612e+01, 0.6268848941110e+01, + + 0.3768911277583e-08, 0.6116053700563e+01, 0.4157198507331e+01, + 0.4033388417295e-08, 0.5076821746017e+01, 0.1567108171867e+02, + 0.3764194617832e-08, 0.8164676232075e+00, 0.3185192151914e+01, + 0.4840628226284e-08, 0.1360479453671e+01, 0.1252801878276e+02, + 0.4949443923785e-08, 0.2725622229926e+01, 0.1617106187867e+03, + 0.4117393089971e-08, 0.6054459628492e+00, 0.5642198095270e+01, + 0.3925754020428e-08, 0.8570462135210e+00, 0.2139354194808e+02, + 0.3630551757923e-08, 0.3552067338279e+01, 0.6294805223347e+01, + 0.3627274802357e-08, 0.3096565085313e+01, 0.6271346477544e+01, + 0.3806143885093e-08, 0.6367751709777e+00, 0.1725304118033e+02, + + 0.4433254641565e-08, 0.4848461503937e+01, 0.7445550607224e+01, + 0.3712319846576e-08, 0.1331950643655e+01, 0.4194847048887e+00, + 0.3849847534783e-08, 0.4958368297746e+00, 0.9562891316684e+00, + 0.3483955430165e-08, 0.2237215515707e+01, 0.1161697602389e+02, + 0.3961912730982e-08, 0.3332402188575e+01, 0.2277943724828e+02, + 0.3419978244481e-08, 0.5785600576016e+01, 0.1362553364512e+02, + 0.3329417758177e-08, 0.9812676559709e-01, 0.1685848245639e+02, + 0.4207206893193e-08, 0.9494780468236e+00, 0.2986433403208e+02, + 0.3268548976410e-08, 0.1739332095686e+00, 0.5749861718712e+01, + 0.3321880082685e-08, 0.1423354800666e+01, 0.6279143387820e+01, + + 0.4503173010852e-08, 0.2314972675293e+00, 0.1385561574497e+01, + 0.4316599090954e-08, 0.1012646782616e+00, 0.4176041334900e+01, + 0.3283493323850e-08, 0.5233306881265e+01, 0.6287008313071e+01, + 0.3164033542343e-08, 0.4005597257511e+01, 0.2099539292909e+02, + 0.4159720956725e-08, 0.5365676242020e+01, 0.5905702259363e+01, + 0.3565176892217e-08, 0.4284440620612e+01, 0.3932462625300e-02, + 0.3514440950221e-08, 0.4270562636575e+01, 0.7335344340001e+01, + 0.3540596871909e-08, 0.5953553201060e+01, 0.1234573916645e+02, + 0.2960769905118e-08, 0.1115180417718e+01, 0.2670964694522e+02, + 0.2962213739684e-08, 0.3863811918186e+01, 0.6408777551755e+00, + + 0.3883556700251e-08, 0.1268617928302e+01, 0.6660449441528e+01, + 0.2919225516346e-08, 0.4908605223265e+01, 0.1375773836557e+01, + 0.3115158863370e-08, 0.3744519976885e+01, 0.3802769619140e-01, + 0.4099438144212e-08, 0.4173244670532e+01, 0.4480965020977e+02, + 0.2899531858964e-08, 0.5910601428850e+01, 0.2059724391010e+02, + 0.3289733429855e-08, 0.2488050078239e+01, 0.1081813534213e+02, + 0.3933075612875e-08, 0.1122363652883e+01, 0.3773735910827e+00, + 0.3021403764467e-08, 0.4951973724904e+01, 0.2982630633589e+02, + 0.2798598949757e-08, 0.5117057845513e+01, 0.1937891852345e+02, + 0.3397421302707e-08, 0.6104159180476e+01, 0.6923953605621e+01, + + 0.3720398002179e-08, 0.1184933429829e+01, 0.3066615496545e+02, + 0.3598484186267e-08, 0.3505282086105e+01, 0.6147450479709e+01, + 0.3694594027310e-08, 0.2286651088141e+01, 0.2636725487657e+01, + 0.2680444152969e-08, 0.1871816775482e+00, 0.6816289982179e+01, + 0.3497574865641e-08, 0.3143251755431e+01, 0.6418701221183e+01, + 0.3130274129494e-08, 0.2462167316018e+01, 0.1235996607578e+02, + 0.3241119069551e-08, 0.4256374004686e+01, 0.1652265972112e+02, + 0.2601960842061e-08, 0.4970362941425e+01, 0.1045450126711e+02, + 0.2690601527504e-08, 0.2372657824898e+01, 0.3163918923335e+00, + 0.2908688152664e-08, 0.4232652627721e+01, 0.2828699048865e+02, + + 0.3120456131875e-08, 0.3925747001137e+00, 0.2195415756911e+02, + 0.3148855423384e-08, 0.3093478330445e+01, 0.1172006883645e+02, + 0.3051044261017e-08, 0.5560948248212e+01, 0.6055599646783e+01, + 0.2826006876660e-08, 0.5072790310072e+01, 0.5120601093667e+01, + 0.3100034191711e-08, 0.4998530231096e+01, 0.1799603123222e+02, + 0.2398771640101e-08, 0.2561739802176e+01, 0.6255674361143e+01, + 0.2384002842728e-08, 0.4087420284111e+01, 0.6310477339748e+01, + 0.2842146517568e-08, 0.2515048217955e+01, 0.5469525544182e+01, + 0.2847674371340e-08, 0.5235326497443e+01, 0.1034429499989e+02, + 0.2903722140764e-08, 0.1088200795797e+01, 0.6510552054109e+01, + + 0.3187610710605e-08, 0.4710624424816e+01, 0.1693792562116e+03, + 0.3048869992813e-08, 0.2857975896445e+00, 0.8390110365991e+01, + 0.2860216950984e-08, 0.2241619020815e+01, 0.2243449970715e+00, + 0.2701117683113e-08, 0.6651573305272e-01, 0.6129297044991e+01, + 0.2509891590152e-08, 0.1285135324585e+01, 0.1044027435778e+02, + 0.2623200252223e-08, 0.2981229834530e+00, 0.6436854655901e+01, + 0.2622541669202e-08, 0.6122470726189e+01, 0.9380959548977e+01, + 0.2818435667099e-08, 0.4251087148947e+01, 0.5934151399930e+01, + 0.2365196797465e-08, 0.3465070460790e+01, 0.2470570524223e+02, + 0.2358704646143e-08, 0.5791603815350e+01, 0.8671969964381e+01, + + 0.2388299481390e-08, 0.4142483772941e+01, 0.7096626156709e+01, + 0.1996041217224e-08, 0.2101901889496e+01, 0.1727188400790e+02, + 0.2687593060336e-08, 0.1526689456959e+01, 0.7075506709219e+02, + 0.2618913670810e-08, 0.2397684236095e+01, 0.6632000300961e+01, + 0.2571523050364e-08, 0.5751929456787e+00, 0.6206810014183e+01, + 0.2582135006946e-08, 0.5595464352926e+01, 0.4873985990671e+02, + 0.2372530190361e-08, 0.5092689490655e+01, 0.1590676413561e+02, + 0.2357178484712e-08, 0.4444363527851e+01, 0.3097883698531e+01, + 0.2451590394723e-08, 0.3108251687661e+01, 0.6612329252343e+00, + 0.2370045949608e-08, 0.2608133861079e+01, 0.3459636466239e+02, + + 0.2268997267358e-08, 0.3639717753384e+01, 0.2844914056730e-01, + 0.1731432137906e-08, 0.1741898445707e+00, 0.2019909489111e+02, + 0.1629869741622e-08, 0.3902225646724e+01, 0.3035599730800e+02, + 0.2206215801974e-08, 0.4971131250731e+01, 0.6281667977667e+01, + 0.2205469554680e-08, 0.1677462357110e+01, 0.6284483723224e+01, + 0.2148792362509e-08, 0.4236259604006e+01, 0.1980482729015e+02, + 0.1873733657847e-08, 0.5926814998687e+01, 0.2876692439167e+02, + 0.2026573758959e-08, 0.4349643351962e+01, 0.2449240616245e+02, + 0.1807770325110e-08, 0.5700940482701e+01, 0.2045286941806e+02, + 0.1881174408581e-08, 0.6601286363430e+00, 0.2358125818164e+02, + + 0.1368023671690e-08, 0.2211098592752e+01, 0.2473415438279e+02, + 0.1720017916280e-08, 0.4942488551129e+01, 0.1679593901136e+03, + 0.1702427665131e-08, 0.1452233856386e+01, 0.3338575901272e+03, + 0.1414032510054e-08, 0.5525357721439e+01, 0.1624205518357e+03, + 0.1652626045364e-08, 0.4108794283624e+01, 0.8956999012000e+02, + 0.1642957769686e-08, 0.7344335209984e+00, 0.5267006960365e+02, + 0.1614952403624e-08, 0.3541213951363e+01, 0.3332657872986e+02, + 0.1535988291188e-08, 0.4031094072151e+01, 0.3852657435933e+02, + 0.1593193738177e-08, 0.4185136203609e+01, 0.2282781046519e+03, + 0.1074569126382e-08, 0.1720485636868e+01, 0.8397383534231e+02, + + 0.1074408214509e-08, 0.2758613420318e+01, 0.8401985929482e+02, + 0.9700199670465e-09, 0.4216686842097e+01, 0.7826370942180e+02, + 0.1258433517061e-08, 0.2575068876639e+00, 0.3115650189215e+03, + 0.1240303229539e-08, 0.4800844956756e+00, 0.1784300471910e+03, + 0.9018345948127e-09, 0.3896756361552e+00, 0.5886454391678e+02, + 0.1135301432805e-08, 0.3700805023550e+00, 0.7842370451713e+02, + 0.9215887951370e-09, 0.4364579276638e+01, 0.1014262087719e+03, + 0.1055401054147e-08, 0.2156564222111e+01, 0.5660027930059e+02, + 0.1008725979831e-08, 0.5454015785234e+01, 0.4245678405627e+02, + 0.7217398104321e-09, 0.1597772562175e+01, 0.2457074661053e+03, + + 0.6912033134447e-09, 0.5824090621461e+01, 0.1679936946371e+03, + 0.6833881523549e-09, 0.3578778482835e+01, 0.6053048899753e+02, + 0.4887304205142e-09, 0.3724362812423e+01, 0.9656299901946e+02, + 0.5173709754788e-09, 0.5422427507933e+01, 0.2442876000072e+03, + 0.4671353097145e-09, 0.2396106924439e+01, 0.1435713242844e+03, + 0.5652608439480e-09, 0.2804028838685e+01, 0.8365903305582e+02, + 0.5604061331253e-09, 0.1638816006247e+01, 0.8433466158131e+02, + 0.4712723365400e-09, 0.8979003224474e+00, 0.3164282286739e+03, + 0.4909967465112e-09, 0.3210426725516e+01, 0.4059982187939e+03, + 0.4771358267658e-09, 0.5308027211629e+01, 0.1805255418145e+03, + + 0.3943451445989e-09, 0.2195145341074e+01, 0.2568537517081e+03, + 0.3952109120244e-09, 0.5081189491586e+01, 0.2449975330562e+03, + 0.3788134594789e-09, 0.4345171264441e+01, 0.1568131045107e+03, + 0.3738330190479e-09, 0.2613062847997e+01, 0.3948519331910e+03, + 0.3099866678136e-09, 0.2846760817689e+01, 0.1547176098872e+03, + 0.2002962716768e-09, 0.4921360989412e+01, 0.2268582385539e+03, + 0.2198291338754e-09, 0.1130360117454e+00, 0.1658638954901e+03, + 0.1491958330784e-09, 0.4228195232278e+01, 0.2219950288015e+03, + 0.1475384076173e-09, 0.3005721811604e+00, 0.3052819430710e+03, + 0.1661626624624e-09, 0.7830125621203e+00, 0.2526661704812e+03, + + 0.9015823460025e-10, 0.3807792942715e+01, 0.4171445043968e+03 }; + +/* Sun-to-Earth, T^0, Y */ + static const double e0y[] = { + 0.9998921098898e+00, 0.1826583913846e+00, 0.6283075850446e+01, + -0.2442700893735e-01, 0.0000000000000e+00, 0.0000000000000e+00, + 0.8352929742915e-02, 0.1395277998680e+00, 0.1256615170089e+02, + 0.1046697300177e-03, 0.9641423109763e-01, 0.1884922755134e+02, + 0.3110841876663e-04, 0.5381140401712e+01, 0.8399684731857e+02, + 0.2570269094593e-04, 0.5301016407128e+01, 0.5296909721118e+00, + 0.2147389623610e-04, 0.2662510869850e+01, 0.1577343543434e+01, + 0.1680344384050e-04, 0.5207904119704e+01, 0.6279552690824e+01, + 0.1679117312193e-04, 0.4582187486968e+01, 0.6286599010068e+01, + 0.1440512068440e-04, 0.1900688517726e+01, 0.2352866153506e+01, + + 0.1135139664999e-04, 0.5273108538556e+01, 0.5223693906222e+01, + 0.9345482571018e-05, 0.4503047687738e+01, 0.1203646072878e+02, + 0.9007418719568e-05, 0.1605621059637e+01, 0.1021328554739e+02, + 0.5671536712314e-05, 0.5812849070861e+00, 0.1059381944224e+01, + 0.7451401861666e-05, 0.2807346794836e+01, 0.3981490189893e+00, + 0.6393470057114e-05, 0.6029224133855e+01, 0.5753384878334e+01, + 0.6814275881697e-05, 0.6472990145974e+00, 0.4705732307012e+01, + 0.6113705628887e-05, 0.3813843419700e+01, 0.6812766822558e+01, + 0.4503851367273e-05, 0.4527804370996e+01, 0.5884926831456e+01, + 0.4522249141926e-05, 0.5991783029224e+01, 0.6256777527156e+01, + + 0.4501794307018e-05, 0.3798703844397e+01, 0.6309374173736e+01, + 0.5514927480180e-05, 0.3961257833388e+01, 0.5507553240374e+01, + 0.4062862799995e-05, 0.5256247296369e+01, 0.6681224869435e+01, + 0.5414900429712e-05, 0.5499032014097e+01, 0.7755226100720e+00, + 0.5463153987424e-05, 0.6173092454097e+01, 0.1414349524433e+02, + 0.5071611859329e-05, 0.2870244247651e+01, 0.7860419393880e+01, + 0.2195112094455e-05, 0.2952338617201e+01, 0.1150676975667e+02, + 0.2279139233919e-05, 0.5951775132933e+01, 0.7058598460518e+01, + 0.2278386100876e-05, 0.4845456398785e+01, 0.4694002934110e+01, + 0.2559088003308e-05, 0.6945321117311e+00, 0.1216800268190e+02, + + 0.2561079286856e-05, 0.6167224608301e+01, 0.7099330490126e+00, + 0.1792755796387e-05, 0.1400122509632e+01, 0.7962980379786e+00, + 0.1818715656502e-05, 0.4703347611830e+01, 0.6283142985870e+01, + 0.1818744924791e-05, 0.5086748900237e+01, 0.6283008715021e+01, + 0.1554518791390e-05, 0.5331008042713e-01, 0.2513230340178e+02, + 0.2063265737239e-05, 0.4283680484178e+01, 0.1179062909082e+02, + 0.1497613520041e-05, 0.6074207826073e+01, 0.5486777812467e+01, + 0.2000617940427e-05, 0.2501426281450e+01, 0.1778984560711e+02, + 0.1289731195580e-05, 0.3646340599536e+01, 0.7079373888424e+01, + 0.1282657998934e-05, 0.3232864804902e+01, 0.3738761453707e+01, + + 0.1528915968658e-05, 0.5581433416669e+01, 0.2132990797783e+00, + 0.1187304098432e-05, 0.5453576453694e+01, 0.9437762937313e+01, + 0.7842782928118e-06, 0.2823953922273e+00, 0.8827390247185e+01, + 0.7352892280868e-06, 0.1124369580175e+01, 0.1589072916335e+01, + 0.6570189360797e-06, 0.2089154042840e+01, 0.1176985366291e+02, + 0.6324967590410e-06, 0.6704855581230e+00, 0.6262300422539e+01, + 0.6298289872283e-06, 0.2836414855840e+01, 0.6303851278352e+01, + 0.6476686465855e-06, 0.4852433866467e+00, 0.7113454667900e-02, + 0.8587034651234e-06, 0.1453511005668e+01, 0.1672837615881e+03, + 0.8068948788113e-06, 0.9224087798609e+00, 0.6069776770667e+01, + + 0.8353786011661e-06, 0.4631707184895e+01, 0.3340612434717e+01, + 0.6009324532132e-06, 0.1829498827726e+01, 0.4136910472696e+01, + 0.7558158559566e-06, 0.2588596800317e+01, 0.6496374930224e+01, + 0.5809279504503e-06, 0.5516818853476e+00, 0.1097707878456e+02, + 0.5374131950254e-06, 0.6275674734960e+01, 0.1194447056968e+01, + 0.5711160507326e-06, 0.1091905956872e+01, 0.6282095334605e+01, + 0.5710183170746e-06, 0.2415001635090e+01, 0.6284056366286e+01, + 0.5144373590610e-06, 0.6020336443438e+01, 0.6290189305114e+01, + 0.5103108927267e-06, 0.3775634564605e+01, 0.6275962395778e+01, + 0.4960654697891e-06, 0.1073450946756e+01, 0.6127655567643e+01, + + 0.4786385689280e-06, 0.2431178012310e+01, 0.6438496133249e+01, + 0.6109911263665e-06, 0.5343356157914e+01, 0.3154687086868e+01, + 0.4839898944024e-06, 0.5830833594047e-01, 0.8018209333619e+00, + 0.4734822623919e-06, 0.4536080134821e+01, 0.3128388763578e+01, + 0.4834741473290e-06, 0.2585090489754e+00, 0.7084896783808e+01, + 0.5134858581156e-06, 0.4213317172603e+01, 0.1235285262111e+02, + 0.5064004264978e-06, 0.4814418806478e+00, 0.1185621865188e+02, + 0.3753476772761e-06, 0.1599953399788e+01, 0.8429241228195e+01, + 0.4935264014283e-06, 0.2157417556873e+01, 0.2544314396739e+01, + 0.3950929600897e-06, 0.3359394184254e+01, 0.5481254917084e+01, + + 0.4895849789777e-06, 0.5165704376558e+01, 0.9225539266174e+01, + 0.4215241688886e-06, 0.2065368800993e+01, 0.1726015463500e+02, + 0.3796773731132e-06, 0.1468606346612e+01, 0.4265981595566e+00, + 0.3114178142515e-06, 0.3615638079474e+01, 0.2146165377750e+01, + 0.3260664220838e-06, 0.4417134922435e+01, 0.4164311961999e+01, + 0.3976996123008e-06, 0.4700866883004e+01, 0.5856477690889e+01, + 0.2801459672924e-06, 0.4538902060922e+01, 0.1256967486051e+02, + 0.3638931868861e-06, 0.1334197991475e+01, 0.1807370494127e+02, + 0.2487013269476e-06, 0.3749275558275e+01, 0.2629832328990e-01, + 0.3034165481994e-06, 0.4236622030873e+00, 0.4535059491685e+01, + + 0.2676278825586e-06, 0.5970848007811e+01, 0.3930209696940e+01, + 0.2764903818918e-06, 0.5194636754501e+01, 0.1256262854127e+02, + 0.2485149930507e-06, 0.1002434207846e+01, 0.5088628793478e+01, + 0.2199305540941e-06, 0.3066773098403e+01, 0.1255903824622e+02, + 0.2571106500435e-06, 0.7588312459063e+00, 0.1336797263425e+02, + 0.2049751817158e-06, 0.3444977434856e+01, 0.1137170464392e+02, + 0.2599707296297e-06, 0.1873128542205e+01, 0.7143069561767e+02, + 0.1785018072217e-06, 0.5015891306615e+01, 0.1748016358760e+01, + 0.2324833891115e-06, 0.4618271239730e+01, 0.1831953657923e+02, + 0.1709711119545e-06, 0.5300003455669e+01, 0.4933208510675e+01, + + 0.2107159351716e-06, 0.2229819815115e+01, 0.7477522907414e+01, + 0.1750333080295e-06, 0.6161485880008e+01, 0.1044738781244e+02, + 0.2000598210339e-06, 0.2967357299999e+01, 0.8031092209206e+01, + 0.1380920248681e-06, 0.3027007923917e+01, 0.8635942003952e+01, + 0.1412460470299e-06, 0.6037597163798e+01, 0.2942463415728e+01, + 0.1888459803001e-06, 0.8561476243374e+00, 0.1561374759853e+03, + 0.1788370542585e-06, 0.4869736290209e+01, 0.1592596075957e+01, + 0.1360893296167e-06, 0.3626411886436e+01, 0.1309584267300e+02, + 0.1506846530160e-06, 0.1550975377427e+01, 0.1649636139783e+02, + 0.1800913376176e-06, 0.2075826033190e+01, 0.1729818233119e+02, + + 0.1436261390649e-06, 0.6148876420255e+01, 0.2042657109477e+02, + 0.1220227114151e-06, 0.4382583879906e+01, 0.7632943190217e+01, + 0.1337883603592e-06, 0.2036644327361e+01, 0.1213955354133e+02, + 0.1159326650738e-06, 0.3892276994687e+01, 0.5331357529664e+01, + 0.1352853128569e-06, 0.1447950649744e+01, 0.1673046366289e+02, + 0.1433408296083e-06, 0.4457854692961e+01, 0.7342457794669e+01, + 0.1234701666518e-06, 0.1538818147151e+01, 0.6279485555400e+01, + 0.1234027192007e-06, 0.1968523220760e+01, 0.6286666145492e+01, + 0.1244024091797e-06, 0.5779803499985e+01, 0.1511046609763e+02, + 0.1097934945516e-06, 0.6210975221388e+00, 0.1098880815746e+02, + + 0.1254611329856e-06, 0.2591963807998e+01, 0.1572083878776e+02, + 0.1158247286784e-06, 0.2483612812670e+01, 0.5729506548653e+01, + 0.9039078252960e-07, 0.3857554579796e+01, 0.9623688285163e+01, + 0.9108024978836e-07, 0.5826368512984e+01, 0.7234794171227e+01, + 0.8887068108436e-07, 0.3475694573987e+01, 0.6148010737701e+01, + 0.8632374035438e-07, 0.3059070488983e-01, 0.6418140963190e+01, + 0.7893186992967e-07, 0.1583194837728e+01, 0.2118763888447e+01, + 0.8297650201172e-07, 0.8519770534637e+00, 0.1471231707864e+02, + 0.1019759578988e-06, 0.1319598738732e+00, 0.1349867339771e+01, + 0.1010037696236e-06, 0.9937860115618e+00, 0.6836645152238e+01, + + 0.1047727548266e-06, 0.1382138405399e+01, 0.5999216516294e+01, + 0.7351993881086e-07, 0.3833397851735e+01, 0.6040347114260e+01, + 0.9868771092341e-07, 0.2124913814390e+01, 0.6566935184597e+01, + 0.7007321959390e-07, 0.5946305343763e+01, 0.6525804586632e+01, + 0.6861411679709e-07, 0.4574654977089e+01, 0.7238675589263e+01, + 0.7554519809614e-07, 0.5949232686844e+01, 0.1253985337760e+02, + 0.9541880448335e-07, 0.3495242990564e+01, 0.2122839202813e+02, + 0.7185606722155e-07, 0.4310113471661e+01, 0.6245048154254e+01, + 0.7131360871710e-07, 0.5480309323650e+01, 0.6321103546637e+01, + 0.6651142021039e-07, 0.5411097713654e+01, 0.5327476111629e+01, + + 0.8538618213667e-07, 0.1827849973951e+01, 0.1101510648075e+02, + 0.8634954288044e-07, 0.5443584943349e+01, 0.5643178611111e+01, + 0.7449415051484e-07, 0.2011535459060e+01, 0.5368044267797e+00, + 0.7421047599169e-07, 0.3464562529249e+01, 0.2354323048545e+02, + 0.6140694354424e-07, 0.5657556228815e+01, 0.1296430071988e+02, + 0.6353525143033e-07, 0.3463816593821e+01, 0.1990745094947e+01, + 0.6221964013447e-07, 0.1532259498697e+01, 0.9517183207817e+00, + 0.5852480257244e-07, 0.1375396598875e+01, 0.9555997388169e+00, + 0.6398637498911e-07, 0.2405645801972e+01, 0.2407292145756e+02, + 0.7039744069878e-07, 0.5397541799027e+01, 0.5225775174439e+00, + + 0.6977997694382e-07, 0.4762347105419e+01, 0.1097355562493e+02, + 0.7460629558396e-07, 0.2711944692164e+01, 0.2200391463820e+02, + 0.5376577536101e-07, 0.2352980430239e+01, 0.1431416805965e+02, + 0.7530607893556e-07, 0.1943940180699e+01, 0.1842262939178e+02, + 0.6822928971605e-07, 0.4337651846959e+01, 0.1554202828031e+00, + 0.6220772380094e-07, 0.6716871369278e+00, 0.1845107853235e+02, + 0.6586950799043e-07, 0.2229714460505e+01, 0.5216580451554e+01, + 0.5873800565771e-07, 0.7627013920580e+00, 0.6398972393349e+00, + 0.6264346929745e-07, 0.6202785478961e+00, 0.6277552955062e+01, + 0.6257929115669e-07, 0.2886775596668e+01, 0.6288598745829e+01, + + 0.5343536033409e-07, 0.1977241012051e+01, 0.4690479774488e+01, + 0.5587849781714e-07, 0.1922923484825e+01, 0.1551045220144e+01, + 0.6905100845603e-07, 0.3570757164631e+01, 0.1030928125552e+00, + 0.6178957066649e-07, 0.5197558947765e+01, 0.5230807360890e+01, + 0.6187270224331e-07, 0.8193497368922e+00, 0.5650292065779e+01, + 0.5385664291426e-07, 0.5406336665586e+01, 0.7771377146812e+02, + 0.6329363917926e-07, 0.2837760654536e+01, 0.2608790314060e+02, + 0.4546018761604e-07, 0.2933580297050e+01, 0.5535693017924e+00, + 0.6196091049375e-07, 0.4157871494377e+01, 0.8467247584405e+02, + 0.6159555108218e-07, 0.3211703561703e+01, 0.2394243902548e+03, + + 0.4995340539317e-07, 0.1459098102922e+01, 0.4732030630302e+01, + 0.5457031243572e-07, 0.1430457676136e+01, 0.6179983037890e+01, + 0.4863461418397e-07, 0.2196425916730e+01, 0.9027992316901e+02, + 0.5342947626870e-07, 0.2086612890268e+01, 0.6386168663001e+01, + 0.5674296648439e-07, 0.2760204966535e+01, 0.6915859635113e+01, + 0.4745783120161e-07, 0.4245368971862e+01, 0.6282970628506e+01, + 0.4745676961198e-07, 0.5544725787016e+01, 0.6283181072386e+01, + 0.4049796869973e-07, 0.2213984363586e+01, 0.6254626709878e+01, + 0.4248333596940e-07, 0.8075781952896e+00, 0.7875671926403e+01, + 0.4027178070205e-07, 0.1293268540378e+01, 0.6311524991013e+01, + + 0.4066543943476e-07, 0.3986141175804e+01, 0.3634620989887e+01, + 0.4858863787880e-07, 0.1276112738231e+01, 0.5760498333002e+01, + 0.5277398263530e-07, 0.4916111741527e+01, 0.2515860172507e+02, + 0.4105635656559e-07, 0.1725805864426e+01, 0.6709674010002e+01, + 0.4376781925772e-07, 0.2243642442106e+01, 0.6805653367890e+01, + 0.3235827894693e-07, 0.3614135118271e+01, 0.1066495398892e+01, + 0.3073244740308e-07, 0.2460873393460e+01, 0.5863591145557e+01, + 0.3088609271373e-07, 0.5678431771790e+01, 0.9917696840332e+01, + 0.3393022279836e-07, 0.3814017477291e+01, 0.1391601904066e+02, + 0.3038686508802e-07, 0.4660216229171e+01, 0.1256621883632e+02, + + 0.4019677752497e-07, 0.5906906243735e+01, 0.1334167431096e+02, + 0.3288834998232e-07, 0.9536146445882e+00, 0.1620077269078e+02, + 0.3889973794631e-07, 0.3942205097644e+01, 0.7478166569050e-01, + 0.3050438987141e-07, 0.1624810271286e+01, 0.1805292951336e+02, + 0.3601142564638e-07, 0.4030467142575e+01, 0.6208294184755e+01, + 0.3689015557141e-07, 0.3648878818694e+01, 0.5966683958112e+01, + 0.3563471893565e-07, 0.5749584017096e+01, 0.6357857516136e+01, + 0.2776183170667e-07, 0.2630124187070e+01, 0.3523159621801e-02, + 0.2922350530341e-07, 0.1790346403629e+01, 0.1272157198369e+02, + 0.3511076917302e-07, 0.6142198301611e+01, 0.6599467742779e+01, + + 0.3619351007632e-07, 0.1432421386492e+01, 0.6019991944201e+01, + 0.2561254711098e-07, 0.2302822475792e+01, 0.1259245002418e+02, + 0.2626903942920e-07, 0.8660470994571e+00, 0.6702560555334e+01, + 0.2550187397083e-07, 0.6069721995383e+01, 0.1057540660594e+02, + 0.2535873526138e-07, 0.1079020331795e-01, 0.3141537925223e+02, + 0.3519786153847e-07, 0.3809066902283e+01, 0.2505706758577e+03, + 0.3424651492873e-07, 0.2075435114417e+01, 0.6546159756691e+01, + 0.2372676630861e-07, 0.2057803120154e+01, 0.2388894113936e+01, + 0.2710980779541e-07, 0.1510068488010e+01, 0.1202934727411e+02, + 0.3038710889704e-07, 0.5043617528901e+01, 0.1256608456547e+02, + + 0.2220364130585e-07, 0.3694793218205e+01, 0.1336244973887e+02, + 0.3025880825460e-07, 0.5450618999049e-01, 0.2908881142201e+02, + 0.2784493486864e-07, 0.3381164084502e+01, 0.1494531617769e+02, + 0.2294414142438e-07, 0.4382309025210e+01, 0.6076890225335e+01, + 0.2012723294724e-07, 0.9142212256518e+00, 0.6262720680387e+01, + 0.2036357831958e-07, 0.5676172293154e+01, 0.4701116388778e+01, + 0.2003474823288e-07, 0.2592767977625e+01, 0.6303431020504e+01, + 0.2207144900109e-07, 0.5404976271180e+01, 0.6489261475556e+01, + 0.2481664905135e-07, 0.4373284587027e+01, 0.1204357418345e+02, + 0.2674949182295e-07, 0.5859182188482e+01, 0.4590910121555e+01, + + 0.2450554720322e-07, 0.4555381557451e+01, 0.1495633313810e+00, + 0.2601975986457e-07, 0.3933165584959e+01, 0.1965104848470e+02, + 0.2199860022848e-07, 0.5227977189087e+01, 0.1351787002167e+02, + 0.2448121172316e-07, 0.4858060353949e+01, 0.1162474756779e+01, + 0.1876014864049e-07, 0.5690546553605e+01, 0.6279194432410e+01, + 0.1874513219396e-07, 0.4099539297446e+01, 0.6286957268481e+01, + 0.2156380842559e-07, 0.4382594769913e+00, 0.1813929450232e+02, + 0.1981691240061e-07, 0.1829784152444e+01, 0.4686889479442e+01, + 0.2329992648539e-07, 0.2836254278973e+01, 0.1002183730415e+02, + 0.1765184135302e-07, 0.2803494925833e+01, 0.4292330755499e+01, + + 0.2436368366085e-07, 0.2836897959677e+01, 0.9514313292143e+02, + 0.2164089203889e-07, 0.6127522446024e+01, 0.6037244212485e+01, + 0.1847755034221e-07, 0.3683163635008e+01, 0.2427287361862e+00, + 0.1674798769966e-07, 0.3316993867246e+00, 0.1311972100268e+02, + 0.2222542124356e-07, 0.8294097805480e+00, 0.1266924451345e+02, + 0.2071074505925e-07, 0.3659492220261e+01, 0.6528907488406e+01, + 0.1608224471835e-07, 0.4774492067182e+01, 0.1352175143971e+02, + 0.1857583439071e-07, 0.2873120597682e+01, 0.8662240327241e+01, + 0.1793018836159e-07, 0.5282441177929e+00, 0.6819880277225e+01, + 0.1575391221692e-07, 0.1320789654258e+01, 0.1102062672231e+00, + + 0.1840132009557e-07, 0.1917110916256e+01, 0.6514761976723e+02, + 0.1760917288281e-07, 0.2972635937132e+01, 0.5746271423666e+01, + 0.1561779518516e-07, 0.4372569261981e+01, 0.6272439236156e+01, + 0.1558687885205e-07, 0.5416424926425e+01, 0.6293712464735e+01, + 0.1951359382579e-07, 0.3094448898752e+01, 0.2301353951334e+02, + 0.1569144275614e-07, 0.2802103689808e+01, 0.1765478049437e+02, + 0.1479130389462e-07, 0.2136435020467e+01, 0.2077542790660e-01, + 0.1467828510764e-07, 0.7072627435674e+00, 0.1052268489556e+01, + 0.1627627337440e-07, 0.3947607143237e+01, 0.6327837846670e+00, + 0.1503498479758e-07, 0.4079248909190e+01, 0.7626583626240e-01, + + 0.1297967708237e-07, 0.6269637122840e+01, 0.1149965630200e+02, + 0.1374416896634e-07, 0.4175657970702e+01, 0.6016468784579e+01, + 0.1783812325219e-07, 0.1476540547560e+01, 0.3301902111895e+02, + 0.1525884228756e-07, 0.4653477715241e+01, 0.9411464614024e+01, + 0.1451067396763e-07, 0.2573001128225e+01, 0.1277945078067e+02, + 0.1297713111950e-07, 0.5612799618771e+01, 0.6549682916313e+01, + 0.1462784012820e-07, 0.4189661623870e+01, 0.1863592847156e+02, + 0.1384185980007e-07, 0.2656915472196e+01, 0.2379164476796e+01, + 0.1221497599801e-07, 0.5612515760138e+01, 0.1257326515556e+02, + 0.1560574525896e-07, 0.4783414317919e+01, 0.1887552587463e+02, + + 0.1544598372036e-07, 0.2694431138063e+01, 0.1820933031200e+02, + 0.1531678928696e-07, 0.4105103489666e+01, 0.2593412433514e+02, + 0.1349321503795e-07, 0.3082437194015e+00, 0.5120601093667e+01, + 0.1252030290917e-07, 0.6124072334087e+01, 0.6993008899458e+01, + 0.1459243816687e-07, 0.3733103981697e+01, 0.3813291813120e-01, + 0.1226103625262e-07, 0.1267127706817e+01, 0.2435678079171e+02, + 0.1019449641504e-07, 0.4367790112269e+01, 0.1725663147538e+02, + 0.1380789433607e-07, 0.3387201768700e+01, 0.2458316379602e+00, + 0.1019453421658e-07, 0.9204143073737e+00, 0.6112403035119e+01, + 0.1297929434405e-07, 0.5786874896426e+01, 0.1249137003520e+02, + + 0.9912677786097e-08, 0.3164232870746e+01, 0.6247047890016e+01, + 0.9829386098599e-08, 0.2586762413351e+01, 0.6453748665772e+01, + 0.1226807746104e-07, 0.6239068436607e+01, 0.5429879531333e+01, + 0.1192691755997e-07, 0.1867380051424e+01, 0.6290122169689e+01, + 0.9836499227081e-08, 0.3424716293727e+00, 0.6319103810876e+01, + 0.9642862564285e-08, 0.5661372990657e+01, 0.8273820945392e+01, + 0.1165184404862e-07, 0.5768367239093e+01, 0.1778273215245e+02, + 0.1175794418818e-07, 0.1657351222943e+01, 0.6276029531202e+01, + 0.1018948635601e-07, 0.6458292350865e+00, 0.1254537627298e+02, + 0.9500383606676e-08, 0.1054306140741e+01, 0.1256517118505e+02, + + 0.1227512202906e-07, 0.2505278379114e+01, 0.2248384854122e+02, + 0.9664792009993e-08, 0.4289737277000e+01, 0.6259197520765e+01, + 0.9613285666331e-08, 0.5500597673141e+01, 0.6306954180126e+01, + 0.1117906736211e-07, 0.2361405953468e+01, 0.1779695906178e+02, + 0.9611378640782e-08, 0.2851310576269e+01, 0.2061856251104e+00, + 0.8845354852370e-08, 0.6208777705343e+01, 0.1692165728891e+01, + 0.1054046966600e-07, 0.5413091423934e+01, 0.2204125344462e+00, + 0.1215539124483e-07, 0.5613969479755e+01, 0.8257698122054e+02, + 0.9932460955209e-08, 0.1106124877015e+01, 0.1017725758696e+02, + 0.8785804715043e-08, 0.2869224476477e+01, 0.9491756770005e+00, + + 0.8538084097562e-08, 0.6159640899344e+01, 0.6393282117669e+01, + 0.8648994369529e-08, 0.1374901198784e+01, 0.4804209201333e+01, + 0.1039063219067e-07, 0.5171080641327e+01, 0.1550861511662e+02, + 0.8867983926439e-08, 0.8317320304902e+00, 0.3903911373650e+01, + 0.8327495955244e-08, 0.3605591969180e+01, 0.6172869583223e+01, + 0.9243088356133e-08, 0.6114299196843e+01, 0.6267823317922e+01, + 0.9205657357835e-08, 0.3675153683737e+01, 0.6298328382969e+01, + 0.1033269714606e-07, 0.3313328813024e+01, 0.5573142801433e+01, + 0.8001706275552e-08, 0.2019980960053e+01, 0.2648454860559e+01, + 0.9171858254191e-08, 0.8992015524177e+00, 0.1498544001348e+03, + + 0.1075327150242e-07, 0.2898669963648e+01, 0.3694923081589e+02, + 0.9884866689828e-08, 0.4946715904478e+01, 0.1140367694411e+02, + 0.9541835576677e-08, 0.2371787888469e+01, 0.1256713221673e+02, + 0.7739903376237e-08, 0.2213775190612e+01, 0.7834121070590e+01, + 0.7311962684106e-08, 0.3429378787739e+01, 0.1192625446156e+02, + 0.9724904869624e-08, 0.6195878564404e+01, 0.2280573557157e+02, + 0.9251628983612e-08, 0.6511509527390e+00, 0.2787043132925e+01, + 0.7320763787842e-08, 0.6001083639421e+01, 0.6282655592598e+01, + 0.7320296650962e-08, 0.3789073265087e+01, 0.6283496108294e+01, + 0.7947032271039e-08, 0.1059659582204e+01, 0.1241073141809e+02, + + 0.9005277053115e-08, 0.1280315624361e+01, 0.6281591679874e+01, + 0.8995601652048e-08, 0.2224439106766e+01, 0.6284560021018e+01, + 0.8288040568796e-08, 0.5234914433867e+01, 0.1241658836951e+02, + 0.6359381347255e-08, 0.4137989441490e+01, 0.1596186371003e+01, + 0.8699572228626e-08, 0.1758411009497e+01, 0.6133512519065e+01, + 0.6456797542736e-08, 0.5919285089994e+01, 0.1685848245639e+02, + 0.7424573475452e-08, 0.5414616938827e+01, 0.4061219149443e+01, + 0.7235671196168e-08, 0.1496516557134e+01, 0.1610006857377e+03, + 0.8104015182733e-08, 0.1919918242764e+01, 0.8460828644453e+00, + 0.8098576535937e-08, 0.3819615855458e+01, 0.3894181736510e+01, + + 0.6275292346625e-08, 0.6244264115141e+01, 0.8531963191132e+00, + 0.6052432989112e-08, 0.5037731872610e+00, 0.1567108171867e+02, + 0.5705651535817e-08, 0.2984557271995e+01, 0.1258692712880e+02, + 0.5789650115138e-08, 0.6087038140697e+01, 0.1193336791622e+02, + 0.5512132153377e-08, 0.5855668994076e+01, 0.1232342296471e+02, + 0.7388890819102e-08, 0.2443128574740e+01, 0.4907302013889e+01, + 0.5467593991798e-08, 0.3017561234194e+01, 0.1884211409667e+02, + 0.6388519802999e-08, 0.5887386712935e+01, 0.5217580628120e+02, + 0.6106777149944e-08, 0.3483461059895e+00, 0.1422690933580e-01, + 0.7383420275489e-08, 0.5417387056707e+01, 0.2358125818164e+02, + + 0.5505208141738e-08, 0.2848193644783e+01, 0.1151388321134e+02, + 0.6310757462877e-08, 0.2349882520828e+01, 0.1041998632314e+02, + 0.6166904929691e-08, 0.5728575944077e+00, 0.6151533897323e+01, + 0.5263442042754e-08, 0.4495796125937e+01, 0.1885275071096e+02, + 0.5591828082629e-08, 0.1355441967677e+01, 0.4337116142245e+00, + 0.5397051680497e-08, 0.1673422864307e+01, 0.6286362197481e+01, + 0.5396992745159e-08, 0.1833502206373e+01, 0.6279789503410e+01, + 0.6572913000726e-08, 0.3331122065824e+01, 0.1176433076753e+02, + 0.5123421866413e-08, 0.2165327142679e+01, 0.1245594543367e+02, + 0.5930495725999e-08, 0.2931146089284e+01, 0.6414617803568e+01, + + 0.6431797403933e-08, 0.4134407994088e+01, 0.1350651127443e+00, + 0.5003182207604e-08, 0.3805420303749e+01, 0.1096996532989e+02, + 0.5587731032504e-08, 0.1082469260599e+01, 0.6062663316000e+01, + 0.5935263407816e-08, 0.8384333678401e+00, 0.5326786718777e+01, + 0.4756019827760e-08, 0.3552588749309e+01, 0.3104930017775e+01, + 0.6599951172637e-08, 0.4320826409528e+01, 0.4087944051283e+02, + 0.5902606868464e-08, 0.4811879454445e+01, 0.5849364236221e+01, + 0.5921147809031e-08, 0.9942628922396e-01, 0.1581959461667e+01, + 0.5505382581266e-08, 0.2466557607764e+01, 0.6503488384892e+01, + 0.5353771071862e-08, 0.4551978748683e+01, 0.1735668374386e+03, + + 0.5063282210946e-08, 0.5710812312425e+01, 0.1248988586463e+02, + 0.5926120403383e-08, 0.1333998428358e+01, 0.2673594526851e+02, + 0.5211016176149e-08, 0.4649315360760e+01, 0.2460261242967e+02, + 0.5347075084894e-08, 0.5512754081205e+01, 0.4171425416666e+01, + 0.4872609773574e-08, 0.1308025299938e+01, 0.5333900173445e+01, + 0.4727711321420e-08, 0.2144908368062e+01, 0.7232251527446e+01, + 0.6029426018652e-08, 0.5567259412084e+01, 0.3227113045244e+03, + 0.4321485284369e-08, 0.5230667156451e+01, 0.9388005868221e+01, + 0.4476406760553e-08, 0.6134081115303e+01, 0.5547199253223e+01, + 0.5835268277420e-08, 0.4783808492071e+01, 0.7285056171570e+02, + + 0.5172183602748e-08, 0.5161817911099e+01, 0.1884570439172e+02, + 0.5693571465184e-08, 0.1381646203111e+01, 0.9723862754494e+02, + 0.4060634965349e-08, 0.3876705259495e+00, 0.4274518229222e+01, + 0.3967398770473e-08, 0.5029491776223e+01, 0.3496032717521e+01, + 0.3943754005255e-08, 0.1923162955490e+01, 0.6244942932314e+01, + 0.4781323427824e-08, 0.4633332586423e+01, 0.2929661536378e+02, + 0.3871483781204e-08, 0.1616650009743e+01, 0.6321208768577e+01, + 0.5141741733997e-08, 0.9817316704659e-01, 0.1232032006293e+02, + 0.4002385978497e-08, 0.3656161212139e+01, 0.7018952447668e+01, + 0.4901092604097e-08, 0.4404098713092e+01, 0.1478866649112e+01, + + 0.3740932630345e-08, 0.5181188732639e+00, 0.6922973089781e+01, + 0.4387283718538e-08, 0.3254859566869e+01, 0.2331413144044e+03, + 0.5019197802033e-08, 0.3086773224677e+01, 0.1715706182245e+02, + 0.3834931695175e-08, 0.2797882673542e+01, 0.1491901785440e+02, + 0.3760413942497e-08, 0.2892676280217e+01, 0.1726726808967e+02, + 0.3719717204628e-08, 0.5861046025739e+01, 0.6297302759782e+01, + 0.4145623530149e-08, 0.2168239627033e+01, 0.1376059875786e+02, + 0.3932788425380e-08, 0.6271811124181e+01, 0.7872148766781e+01, + 0.3686377476857e-08, 0.3936853151404e+01, 0.6268848941110e+01, + 0.3779077950339e-08, 0.1404148734043e+01, 0.4157198507331e+01, + + 0.4091334550598e-08, 0.2452436180854e+01, 0.9779108567966e+01, + 0.3926694536146e-08, 0.6102292739040e+01, 0.1098419223922e+02, + 0.4841000253289e-08, 0.6072760457276e+01, 0.1252801878276e+02, + 0.4949340130240e-08, 0.1154832815171e+01, 0.1617106187867e+03, + 0.3761557737360e-08, 0.5527545321897e+01, 0.3185192151914e+01, + 0.3647396268188e-08, 0.1525035688629e+01, 0.6271346477544e+01, + 0.3932405074189e-08, 0.5570681040569e+01, 0.2139354194808e+02, + 0.3631322501141e-08, 0.1981240601160e+01, 0.6294805223347e+01, + 0.4130007425139e-08, 0.2050060880201e+01, 0.2195415756911e+02, + 0.4433905965176e-08, 0.3277477970321e+01, 0.7445550607224e+01, + + 0.3851814176947e-08, 0.5210690074886e+01, 0.9562891316684e+00, + 0.3485807052785e-08, 0.6653274904611e+00, 0.1161697602389e+02, + 0.3979772816991e-08, 0.1767941436148e+01, 0.2277943724828e+02, + 0.3402607460500e-08, 0.3421746306465e+01, 0.1087398597200e+02, + 0.4049993000926e-08, 0.1127144787547e+01, 0.3163918923335e+00, + 0.3420511182382e-08, 0.4214794779161e+01, 0.1362553364512e+02, + 0.3640772365012e-08, 0.5324905497687e+01, 0.1725304118033e+02, + 0.3323037987501e-08, 0.6135761838271e+01, 0.6279143387820e+01, + 0.4503141663637e-08, 0.1802305450666e+01, 0.1385561574497e+01, + 0.4314560055588e-08, 0.4812299731574e+01, 0.4176041334900e+01, + + 0.3294226949110e-08, 0.3657547059723e+01, 0.6287008313071e+01, + 0.3215657197281e-08, 0.4866676894425e+01, 0.5749861718712e+01, + 0.4129362656266e-08, 0.3809342558906e+01, 0.5905702259363e+01, + 0.3137762976388e-08, 0.2494635174443e+01, 0.2099539292909e+02, + 0.3514010952384e-08, 0.2699961831678e+01, 0.7335344340001e+01, + 0.3327607571530e-08, 0.3318457714816e+01, 0.5436992986000e+01, + 0.3541066946675e-08, 0.4382703582466e+01, 0.1234573916645e+02, + 0.3216179847052e-08, 0.5271066317054e+01, 0.3802769619140e-01, + 0.2959045059570e-08, 0.5819591585302e+01, 0.2670964694522e+02, + 0.3884040326665e-08, 0.5980934960428e+01, 0.6660449441528e+01, + + 0.2922027539886e-08, 0.3337290282483e+01, 0.1375773836557e+01, + 0.4110846382042e-08, 0.5742978187327e+01, 0.4480965020977e+02, + 0.2934508411032e-08, 0.2278075804200e+01, 0.6408777551755e+00, + 0.3966896193000e-08, 0.5835747858477e+01, 0.3773735910827e+00, + 0.3286695827610e-08, 0.5838898193902e+01, 0.3932462625300e-02, + 0.3720643094196e-08, 0.1122212337858e+01, 0.1646033343740e+02, + 0.3285508906174e-08, 0.9182250996416e+00, 0.1081813534213e+02, + 0.3753880575973e-08, 0.5174761973266e+01, 0.5642198095270e+01, + 0.3022129385587e-08, 0.3381611020639e+01, 0.2982630633589e+02, + 0.2798569205621e-08, 0.3546193723922e+01, 0.1937891852345e+02, + + 0.3397872070505e-08, 0.4533203197934e+01, 0.6923953605621e+01, + 0.3708099772977e-08, 0.2756168198616e+01, 0.3066615496545e+02, + 0.3599283541510e-08, 0.1934395469918e+01, 0.6147450479709e+01, + 0.3688702753059e-08, 0.7149920971109e+00, 0.2636725487657e+01, + 0.2681084724003e-08, 0.4899819493154e+01, 0.6816289982179e+01, + 0.3495993460759e-08, 0.1572418915115e+01, 0.6418701221183e+01, + 0.3130770324995e-08, 0.8912190180489e+00, 0.1235996607578e+02, + 0.2744353821941e-08, 0.3800821940055e+01, 0.2059724391010e+02, + 0.2842732906341e-08, 0.2644717440029e+01, 0.2828699048865e+02, + 0.3046882682154e-08, 0.3987793020179e+01, 0.6055599646783e+01, + + 0.2399072455143e-08, 0.9908826440764e+00, 0.6255674361143e+01, + 0.2384306274204e-08, 0.2516149752220e+01, 0.6310477339748e+01, + 0.2977324500559e-08, 0.5849195642118e+01, 0.1652265972112e+02, + 0.3062835258972e-08, 0.1681660100162e+01, 0.1172006883645e+02, + 0.3109682589231e-08, 0.5804143987737e+00, 0.2751146787858e+02, + 0.2903920355299e-08, 0.5800768280123e+01, 0.6510552054109e+01, + 0.2823221989212e-08, 0.9241118370216e+00, 0.5469525544182e+01, + 0.3187949696649e-08, 0.3139776445735e+01, 0.1693792562116e+03, + 0.2922559771655e-08, 0.3549440782984e+01, 0.2630839062450e+00, + 0.2436302066603e-08, 0.4735540696319e+01, 0.3946258593675e+00, + + 0.3049473043606e-08, 0.4998289124561e+01, 0.8390110365991e+01, + 0.2863682575784e-08, 0.6709515671102e+00, 0.2243449970715e+00, + 0.2641750517966e-08, 0.5410978257284e+01, 0.2986433403208e+02, + 0.2704093466243e-08, 0.4778317207821e+01, 0.6129297044991e+01, + 0.2445522177011e-08, 0.6009020662222e+01, 0.1171295538178e+02, + 0.2623608810230e-08, 0.5010449777147e+01, 0.6436854655901e+01, + 0.2079259704053e-08, 0.5980943768809e+01, 0.2019909489111e+02, + 0.2820225596771e-08, 0.2679965110468e+01, 0.5934151399930e+01, + 0.2365221950927e-08, 0.1894231148810e+01, 0.2470570524223e+02, + 0.2359682077149e-08, 0.4220752950780e+01, 0.8671969964381e+01, + + 0.2387577137206e-08, 0.2571783940617e+01, 0.7096626156709e+01, + 0.1982102089816e-08, 0.5169765997119e+00, 0.1727188400790e+02, + 0.2687502389925e-08, 0.6239078264579e+01, 0.7075506709219e+02, + 0.2207751669135e-08, 0.2031184412677e+01, 0.4377611041777e+01, + 0.2618370214274e-08, 0.8266079985979e+00, 0.6632000300961e+01, + 0.2591951887361e-08, 0.8819350522008e+00, 0.4873985990671e+02, + 0.2375055656248e-08, 0.3520944177789e+01, 0.1590676413561e+02, + 0.2472019978911e-08, 0.1551431908671e+01, 0.6612329252343e+00, + 0.2368157127199e-08, 0.4178610147412e+01, 0.3459636466239e+02, + 0.1764846605693e-08, 0.1506764000157e+01, 0.1980094587212e+02, + + 0.2291769608798e-08, 0.2118250611782e+01, 0.2844914056730e-01, + 0.2209997316943e-08, 0.3363255261678e+01, 0.2666070658668e+00, + 0.2292699097923e-08, 0.4200423956460e+00, 0.1484170571900e-02, + 0.1629683015329e-08, 0.2331362582487e+01, 0.3035599730800e+02, + 0.2206492862426e-08, 0.3400274026992e+01, 0.6281667977667e+01, + 0.2205746568257e-08, 0.1066051230724e+00, 0.6284483723224e+01, + 0.2026310767991e-08, 0.2779066487979e+01, 0.2449240616245e+02, + 0.1762977622163e-08, 0.9951450691840e+00, 0.2045286941806e+02, + 0.1368535049606e-08, 0.6402447365817e+00, 0.2473415438279e+02, + 0.1720598775450e-08, 0.2303524214705e+00, 0.1679593901136e+03, + + 0.1702429015449e-08, 0.6164622655048e+01, 0.3338575901272e+03, + 0.1414033197685e-08, 0.3954561185580e+01, 0.1624205518357e+03, + 0.1573768958043e-08, 0.2028286308984e+01, 0.3144167757552e+02, + 0.1650705184447e-08, 0.2304040666128e+01, 0.5267006960365e+02, + 0.1651087618855e-08, 0.2538461057280e+01, 0.8956999012000e+02, + 0.1616409518983e-08, 0.5111054348152e+01, 0.3332657872986e+02, + 0.1537175173581e-08, 0.5601130666603e+01, 0.3852657435933e+02, + 0.1593191980553e-08, 0.2614340453411e+01, 0.2282781046519e+03, + 0.1499480170643e-08, 0.3624721577264e+01, 0.2823723341956e+02, + 0.1493807843235e-08, 0.4214569879008e+01, 0.2876692439167e+02, + + 0.1074571199328e-08, 0.1496911744704e+00, 0.8397383534231e+02, + 0.1074406983417e-08, 0.1187817671922e+01, 0.8401985929482e+02, + 0.9757576855851e-09, 0.2655703035858e+01, 0.7826370942180e+02, + 0.1258432887565e-08, 0.4969896184844e+01, 0.3115650189215e+03, + 0.1240336343282e-08, 0.5192460776926e+01, 0.1784300471910e+03, + 0.9016107005164e-09, 0.1960356923057e+01, 0.5886454391678e+02, + 0.1135392360918e-08, 0.5082427809068e+01, 0.7842370451713e+02, + 0.9216046089565e-09, 0.2793775037273e+01, 0.1014262087719e+03, + 0.1061276615030e-08, 0.3726144311409e+01, 0.5660027930059e+02, + 0.1010110596263e-08, 0.7404080708937e+00, 0.4245678405627e+02, + + 0.7217424756199e-09, 0.2697449980577e-01, 0.2457074661053e+03, + 0.6912003846756e-09, 0.4253296276335e+01, 0.1679936946371e+03, + 0.6871814664847e-09, 0.5148072412354e+01, 0.6053048899753e+02, + 0.4887158016343e-09, 0.2153581148294e+01, 0.9656299901946e+02, + 0.5161802866314e-09, 0.3852750634351e+01, 0.2442876000072e+03, + 0.5652599559057e-09, 0.1233233356270e+01, 0.8365903305582e+02, + 0.4710812608586e-09, 0.5610486976767e+01, 0.3164282286739e+03, + 0.4909977500324e-09, 0.1639629524123e+01, 0.4059982187939e+03, + 0.4772641839378e-09, 0.3737100368583e+01, 0.1805255418145e+03, + 0.4487562567153e-09, 0.1158417054478e+00, 0.8433466158131e+02, + + 0.3943441230497e-09, 0.6243502862796e+00, 0.2568537517081e+03, + 0.3952236913598e-09, 0.3510377382385e+01, 0.2449975330562e+03, + 0.3788898363417e-09, 0.5916128302299e+01, 0.1568131045107e+03, + 0.3738329328831e-09, 0.1042266763456e+01, 0.3948519331910e+03, + 0.2451199165151e-09, 0.1166788435700e+01, 0.1435713242844e+03, + 0.2436734402904e-09, 0.3254726114901e+01, 0.2268582385539e+03, + 0.2213605274325e-09, 0.1687210598530e+01, 0.1658638954901e+03, + 0.1491521204829e-09, 0.2657541786794e+01, 0.2219950288015e+03, + 0.1474995329744e-09, 0.5013089805819e+01, 0.3052819430710e+03, + 0.1661939475656e-09, 0.5495315428418e+01, 0.2526661704812e+03, + + 0.9015946748003e-10, 0.2236989966505e+01, 0.4171445043968e+03 }; + +/* Sun-to-Earth, T^0, Z */ + static const double e0z[] = { + 0.2796207639075e-05, 0.3198701560209e+01, 0.8433466158131e+02, + 0.1016042198142e-05, 0.5422360395913e+01, 0.5507553240374e+01, + 0.8044305033647e-06, 0.3880222866652e+01, 0.5223693906222e+01, + 0.4385347909274e-06, 0.3704369937468e+01, 0.2352866153506e+01, + 0.3186156414906e-06, 0.3999639363235e+01, 0.1577343543434e+01, + 0.2272412285792e-06, 0.3984738315952e+01, 0.1047747311755e+01, + 0.1645620103007e-06, 0.3565412516841e+01, 0.5856477690889e+01, + 0.1815836921166e-06, 0.4984507059020e+01, 0.6283075850446e+01, + 0.1447461676364e-06, 0.3702753570108e+01, 0.9437762937313e+01, + 0.1430760876382e-06, 0.3409658712357e+01, 0.1021328554739e+02, + + 0.1120445753226e-06, 0.4829561570246e+01, 0.1414349524433e+02, + 0.1090232840797e-06, 0.2080729178066e+01, 0.6812766822558e+01, + 0.9715727346551e-07, 0.3476295881948e+01, 0.4694002934110e+01, + 0.1036267136217e-06, 0.4056639536648e+01, 0.7109288135493e+02, + 0.8752665271340e-07, 0.4448159519911e+01, 0.5753384878334e+01, + 0.8331864956004e-07, 0.4991704044208e+01, 0.7084896783808e+01, + 0.6901658670245e-07, 0.4325358994219e+01, 0.6275962395778e+01, + 0.9144536848998e-07, 0.1141826375363e+01, 0.6620890113188e+01, + 0.7205085037435e-07, 0.3624344170143e+01, 0.5296909721118e+00, + 0.7697874654176e-07, 0.5554257458998e+01, 0.1676215758509e+03, + + 0.5197545738384e-07, 0.6251760961735e+01, 0.1807370494127e+02, + 0.5031345378608e-07, 0.2497341091913e+01, 0.4705732307012e+01, + 0.4527110205840e-07, 0.2335079920992e+01, 0.6309374173736e+01, + 0.4753355798089e-07, 0.7094148987474e+00, 0.5884926831456e+01, + 0.4296951977516e-07, 0.1101916352091e+01, 0.6681224869435e+01, + 0.3855341568387e-07, 0.1825495405486e+01, 0.5486777812467e+01, + 0.5253930970990e-07, 0.4424740687208e+01, 0.7860419393880e+01, + 0.4024630496471e-07, 0.5120498157053e+01, 0.1336797263425e+02, + 0.4061069791453e-07, 0.6029771435451e+01, 0.3930209696940e+01, + 0.3797883804205e-07, 0.4435193600836e+00, 0.3154687086868e+01, + + 0.2933033225587e-07, 0.5124157356507e+01, 0.1059381944224e+01, + 0.3503000930426e-07, 0.5421830162065e+01, 0.6069776770667e+01, + 0.3670096214050e-07, 0.4582101667297e+01, 0.1219403291462e+02, + 0.2905609437008e-07, 0.1926566420072e+01, 0.1097707878456e+02, + 0.2466827821713e-07, 0.6090174539834e+00, 0.6496374930224e+01, + 0.2691647295332e-07, 0.1393432595077e+01, 0.2200391463820e+02, + 0.2150554667946e-07, 0.4308671715951e+01, 0.5643178611111e+01, + 0.2237481922680e-07, 0.8133968269414e+00, 0.8635942003952e+01, + 0.1817741038157e-07, 0.3755205127454e+01, 0.3340612434717e+01, + 0.2227820762132e-07, 0.2759558596664e+01, 0.1203646072878e+02, + + 0.1944713772307e-07, 0.5699645869121e+01, 0.1179062909082e+02, + 0.1527340520662e-07, 0.1986749091746e+01, 0.3981490189893e+00, + 0.1577282574914e-07, 0.3205017217983e+01, 0.5088628793478e+01, + 0.1424738825424e-07, 0.6256747903666e+01, 0.2544314396739e+01, + 0.1616563121701e-07, 0.2601671259394e+00, 0.1729818233119e+02, + 0.1401210391692e-07, 0.4686939173506e+01, 0.7058598460518e+01, + 0.1488726974214e-07, 0.2815862451372e+01, 0.2593412433514e+02, + 0.1692626442388e-07, 0.4956894109797e+01, 0.1564752902480e+03, + 0.1123571582910e-07, 0.2381192697696e+01, 0.3738761453707e+01, + 0.9903308606317e-08, 0.4294851657684e+01, 0.9225539266174e+01, + + 0.9174533187191e-08, 0.3075171510642e+01, 0.4164311961999e+01, + 0.8645985631457e-08, 0.5477534821633e+00, 0.8429241228195e+01, + -0.1085876492688e-07, 0.0000000000000e+00, 0.0000000000000e+00, + 0.9264309077815e-08, 0.5968571670097e+01, 0.7079373888424e+01, + 0.8243116984954e-08, 0.1489098777643e+01, 0.1044738781244e+02, + 0.8268102113708e-08, 0.3512977691983e+01, 0.1150676975667e+02, + 0.9043613988227e-08, 0.1290704408221e+00, 0.1101510648075e+02, + 0.7432912038789e-08, 0.1991086893337e+01, 0.2608790314060e+02, + 0.8586233727285e-08, 0.4238357924414e+01, 0.2986433403208e+02, + 0.7612230060131e-08, 0.2911090150166e+01, 0.4732030630302e+01, + + 0.7097787751408e-08, 0.1908938392390e+01, 0.8031092209206e+01, + 0.7640237040175e-08, 0.6129219000168e+00, 0.7962980379786e+00, + 0.7070445688081e-08, 0.1380417036651e+01, 0.2146165377750e+01, + 0.7690770957702e-08, 0.1680504249084e+01, 0.2122839202813e+02, + 0.8051292542594e-08, 0.5127423484511e+01, 0.2942463415728e+01, + 0.5902709104515e-08, 0.2020274190917e+01, 0.7755226100720e+00, + 0.5134567496462e-08, 0.2606778676418e+01, 0.1256615170089e+02, + 0.5525802046102e-08, 0.1613011769663e+01, 0.8018209333619e+00, + 0.5880724784221e-08, 0.4604483417236e+01, 0.4690479774488e+01, + 0.5211699081370e-08, 0.5718964114193e+01, 0.8827390247185e+01, + + 0.4891849573562e-08, 0.3689658932196e+01, 0.2132990797783e+00, + 0.5150246069997e-08, 0.4099769855122e+01, 0.6480980550449e+02, + 0.5102434319633e-08, 0.5660834602509e+01, 0.3379454372902e+02, + 0.5083405254252e-08, 0.9842221218974e+00, 0.4136910472696e+01, + 0.4206562585682e-08, 0.1341363634163e+00, 0.3128388763578e+01, + 0.4663249683579e-08, 0.8130132735866e+00, 0.5216580451554e+01, + 0.4099474416530e-08, 0.5791497770644e+01, 0.4265981595566e+00, + 0.4628251220767e-08, 0.1249802769331e+01, 0.1572083878776e+02, + 0.5024068728142e-08, 0.4795684802743e+01, 0.6290189305114e+01, + 0.5120234327758e-08, 0.3810420387208e+01, 0.5230807360890e+01, + + 0.5524029815280e-08, 0.1029264714351e+01, 0.2397622045175e+03, + 0.4757415718860e-08, 0.3528044781779e+01, 0.1649636139783e+02, + 0.3915786131127e-08, 0.5593889282646e+01, 0.1589072916335e+01, + 0.4869053149991e-08, 0.3299636454433e+01, 0.7632943190217e+01, + 0.3649365703729e-08, 0.1286049002584e+01, 0.6206810014183e+01, + 0.3992493949002e-08, 0.3100307589464e+01, 0.2515860172507e+02, + 0.3320247477418e-08, 0.6212683940807e+01, 0.1216800268190e+02, + 0.3287123739696e-08, 0.4699118445928e+01, 0.7234794171227e+01, + 0.3472776811103e-08, 0.2630507142004e+01, 0.7342457794669e+01, + 0.3423253294767e-08, 0.2946432844305e+01, 0.9623688285163e+01, + + 0.3896173898244e-08, 0.1224834179264e+01, 0.6438496133249e+01, + 0.3388455337924e-08, 0.1543807616351e+01, 0.1494531617769e+02, + 0.3062704716523e-08, 0.1191777572310e+01, 0.8662240327241e+01, + 0.3270075600400e-08, 0.5483498767737e+01, 0.1194447056968e+01, + 0.3101209215259e-08, 0.8000833804348e+00, 0.3772475342596e+02, + 0.2780883347311e-08, 0.4077980721888e+00, 0.5863591145557e+01, + 0.2903605931824e-08, 0.2617490302147e+01, 0.1965104848470e+02, + 0.2682014743119e-08, 0.2634703158290e+01, 0.7238675589263e+01, + 0.2534360108492e-08, 0.6102446114873e+01, 0.6836645152238e+01, + 0.2392564882509e-08, 0.3681820208691e+01, 0.5849364236221e+01, + + 0.2656667254856e-08, 0.6216045388886e+01, 0.6133512519065e+01, + 0.2331242096773e-08, 0.5864949777744e+01, 0.4535059491685e+01, + 0.2287898363668e-08, 0.4566628532802e+01, 0.7477522907414e+01, + 0.2336944521306e-08, 0.2442722126930e+01, 0.1137170464392e+02, + 0.3156632236269e-08, 0.1626628050682e+01, 0.2509084901204e+03, + 0.2982612402766e-08, 0.2803604512609e+01, 0.1748016358760e+01, + 0.2774031674807e-08, 0.4654002897158e+01, 0.8223916695780e+02, + 0.2295236548638e-08, 0.4326518333253e+01, 0.3378142627421e+00, + 0.2190714699873e-08, 0.4519614578328e+01, 0.2908881142201e+02, + 0.2191495845045e-08, 0.3012626912549e+01, 0.1673046366289e+02, + + 0.2492901628386e-08, 0.1290101424052e+00, 0.1543797956245e+03, + 0.1993778064319e-08, 0.3864046799414e+01, 0.1778984560711e+02, + 0.1898146479022e-08, 0.5053777235891e+01, 0.2042657109477e+02, + 0.1918280127634e-08, 0.2222470192548e+01, 0.4165496312290e+02, + 0.1916351061607e-08, 0.8719067257774e+00, 0.7737595720538e+02, + 0.1834720181466e-08, 0.4031491098040e+01, 0.2358125818164e+02, + 0.1249201523806e-08, 0.5938379466835e+01, 0.3301902111895e+02, + 0.1477304050539e-08, 0.6544722606797e+00, 0.9548094718417e+02, + 0.1264316431249e-08, 0.2059072853236e+01, 0.8399684731857e+02, + 0.1203526495039e-08, 0.3644813532605e+01, 0.4558517281984e+02, + + 0.9221681059831e-09, 0.3241815055602e+01, 0.7805158573086e+02, + 0.7849278367646e-09, 0.5043812342457e+01, 0.5217580628120e+02, + 0.7983392077387e-09, 0.5000024502753e+01, 0.1501922143975e+03, + 0.7925395431654e-09, 0.1398734871821e-01, 0.9061773743175e+02, + 0.7640473285886e-09, 0.5067111723130e+01, 0.4951538251678e+02, + 0.5398937754482e-09, 0.5597382200075e+01, 0.1613385000004e+03, + 0.5626247550193e-09, 0.2601338209422e+01, 0.7318837597844e+02, + 0.5525197197855e-09, 0.5814832109256e+01, 0.1432335100216e+03, + 0.5407629837898e-09, 0.3384820609076e+01, 0.3230491187871e+03, + 0.3856739119801e-09, 0.1072391840473e+01, 0.2334791286671e+03, + + 0.3856425239987e-09, 0.2369540393327e+01, 0.1739046517013e+03, + 0.4350867755983e-09, 0.5255575751082e+01, 0.1620484330494e+03, + 0.3844113924996e-09, 0.5482356246182e+01, 0.9757644180768e+02, + 0.2854869155431e-09, 0.9573634763143e+00, 0.1697170704744e+03, + 0.1719227671416e-09, 0.1887203025202e+01, 0.2265204242912e+03, + 0.1527846879755e-09, 0.3982183931157e+01, 0.3341954043900e+03, + 0.1128229264847e-09, 0.2787457156298e+01, 0.3119028331842e+03 }; + +/* Sun-to-Earth, T^1, X */ + static const double e1x[] = { + 0.1234046326004e-05, 0.0000000000000e+00, 0.0000000000000e+00, + 0.5150068824701e-06, 0.6002664557501e+01, 0.1256615170089e+02, + 0.1290743923245e-07, 0.5959437664199e+01, 0.1884922755134e+02, + 0.1068615564952e-07, 0.2015529654209e+01, 0.6283075850446e+01, + 0.2079619142538e-08, 0.1732960531432e+01, 0.6279552690824e+01, + 0.2078009243969e-08, 0.4915604476996e+01, 0.6286599010068e+01, + 0.6206330058856e-09, 0.3616457953824e+00, 0.4705732307012e+01, + 0.5989335313746e-09, 0.3802607304474e+01, 0.6256777527156e+01, + 0.5958495663840e-09, 0.2845866560031e+01, 0.6309374173736e+01, + 0.4866923261539e-09, 0.5213203771824e+01, 0.7755226100720e+00, + + 0.4267785823142e-09, 0.4368189727818e+00, 0.1059381944224e+01, + 0.4610675141648e-09, 0.1837249181372e-01, 0.7860419393880e+01, + 0.3626989993973e-09, 0.2161590545326e+01, 0.5753384878334e+01, + 0.3563071194389e-09, 0.1452631954746e+01, 0.5884926831456e+01, + 0.3557015642807e-09, 0.4470593393054e+01, 0.6812766822558e+01, + 0.3210412089122e-09, 0.5195926078314e+01, 0.6681224869435e+01, + 0.2875473577986e-09, 0.5916256610193e+01, 0.2513230340178e+02, + 0.2842913681629e-09, 0.1149902426047e+01, 0.6127655567643e+01, + 0.2751248215916e-09, 0.5502088574662e+01, 0.6438496133249e+01, + 0.2481432881127e-09, 0.2921989846637e+01, 0.5486777812467e+01, + + 0.2059885976560e-09, 0.3718070376585e+01, 0.7079373888424e+01, + 0.2015522342591e-09, 0.5979395259740e+01, 0.6290189305114e+01, + 0.1995364084253e-09, 0.6772087985494e+00, 0.6275962395778e+01, + 0.1957436436943e-09, 0.2899210654665e+01, 0.5507553240374e+01, + 0.1651609818948e-09, 0.6228206482192e+01, 0.1150676975667e+02, + 0.1822980550699e-09, 0.1469348746179e+01, 0.1179062909082e+02, + 0.1675223159760e-09, 0.3813910555688e+01, 0.7058598460518e+01, + 0.1706491764745e-09, 0.3004380506684e+00, 0.7113454667900e-02, + 0.1392952362615e-09, 0.1440393973406e+01, 0.7962980379786e+00, + 0.1209868266342e-09, 0.4150425791727e+01, 0.4694002934110e+01, + + 0.1009827202611e-09, 0.3290040429843e+01, 0.3738761453707e+01, + 0.1047261388602e-09, 0.4229590090227e+01, 0.6282095334605e+01, + 0.1047006652004e-09, 0.2418967680575e+01, 0.6284056366286e+01, + 0.9609993143095e-10, 0.4627943659201e+01, 0.6069776770667e+01, + 0.9590900593873e-10, 0.1894393939924e+01, 0.4136910472696e+01, + 0.9146249188071e-10, 0.2010647519562e+01, 0.6496374930224e+01, + 0.8545274480290e-10, 0.5529846956226e-01, 0.1194447056968e+01, + 0.8224377881194e-10, 0.1254304102174e+01, 0.1589072916335e+01, + 0.6183529510410e-10, 0.3360862168815e+01, 0.8827390247185e+01, + 0.6259255147141e-10, 0.4755628243179e+01, 0.8429241228195e+01, + + 0.5539291694151e-10, 0.5371746955142e+01, 0.4933208510675e+01, + 0.7328259466314e-10, 0.4927699613906e+00, 0.4535059491685e+01, + 0.6017835843560e-10, 0.5776682001734e-01, 0.1255903824622e+02, + 0.7079827775243e-10, 0.4395059432251e+01, 0.5088628793478e+01, + 0.5170358878213e-10, 0.5154062619954e+01, 0.1176985366291e+02, + 0.4872301838682e-10, 0.6289611648973e+00, 0.6040347114260e+01, + 0.5249869411058e-10, 0.5617272046949e+01, 0.3154687086868e+01, + 0.4716172354411e-10, 0.3965901800877e+01, 0.5331357529664e+01, + 0.4871214940964e-10, 0.4627507050093e+01, 0.1256967486051e+02, + 0.4598076850751e-10, 0.6023631226459e+01, 0.6525804586632e+01, + + 0.4562196089485e-10, 0.4138562084068e+01, 0.3930209696940e+01, + 0.4325493872224e-10, 0.1330845906564e+01, 0.7632943190217e+01, + 0.5673781176748e-10, 0.2558752615657e+01, 0.5729506548653e+01, + 0.3961436642503e-10, 0.2728071734630e+01, 0.7234794171227e+01, + 0.5101868209058e-10, 0.4113444965144e+01, 0.6836645152238e+01, + 0.5257043167676e-10, 0.6195089830590e+01, 0.8031092209206e+01, + 0.5076613989393e-10, 0.2305124132918e+01, 0.7477522907414e+01, + 0.3342169352778e-10, 0.5415998155071e+01, 0.1097707878456e+02, + 0.3545881983591e-10, 0.3727160564574e+01, 0.4164311961999e+01, + 0.3364063738599e-10, 0.2901121049204e+00, 0.1137170464392e+02, + + 0.3357039670776e-10, 0.1652229354331e+01, 0.5223693906222e+01, + 0.4307412268687e-10, 0.4938909587445e+01, 0.1592596075957e+01, + 0.3405769115435e-10, 0.2408890766511e+01, 0.3128388763578e+01, + 0.3001926198480e-10, 0.4862239006386e+01, 0.1748016358760e+01, + 0.2778264787325e-10, 0.5241168661353e+01, 0.7342457794669e+01, + 0.2676159480666e-10, 0.3423593942199e+01, 0.2146165377750e+01, + 0.2954273399939e-10, 0.1881721265406e+01, 0.5368044267797e+00, + 0.3309362888795e-10, 0.1931525677349e+01, 0.8018209333619e+00, + 0.2810283608438e-10, 0.2414659495050e+01, 0.5225775174439e+00, + 0.3378045637764e-10, 0.4238019163430e+01, 0.1554202828031e+00, + + 0.2558134979840e-10, 0.1828225235805e+01, 0.5230807360890e+01, + 0.2273755578447e-10, 0.5858184283998e+01, 0.7084896783808e+01, + 0.2294176037690e-10, 0.4514589779057e+01, 0.1726015463500e+02, + 0.2533506099435e-10, 0.2355717851551e+01, 0.5216580451554e+01, + 0.2716685375812e-10, 0.2221003625100e+01, 0.8635942003952e+01, + 0.2419043435198e-10, 0.5955704951635e+01, 0.4690479774488e+01, + 0.2521232544812e-10, 0.1395676848521e+01, 0.5481254917084e+01, + 0.2630195021491e-10, 0.5727468918743e+01, 0.2629832328990e-01, + 0.2548395840944e-10, 0.2628351859400e-03, 0.1349867339771e+01 }; + +/* Sun-to-Earth, T^1, Y */ + static const double e1y[] = { + 0.9304690546528e-06, 0.0000000000000e+00, 0.0000000000000e+00, + 0.5150715570663e-06, 0.4431807116294e+01, 0.1256615170089e+02, + 0.1290825411056e-07, 0.4388610039678e+01, 0.1884922755134e+02, + 0.4645466665386e-08, 0.5827263376034e+01, 0.6283075850446e+01, + 0.2079625310718e-08, 0.1621698662282e+00, 0.6279552690824e+01, + 0.2078189850907e-08, 0.3344713435140e+01, 0.6286599010068e+01, + 0.6207190138027e-09, 0.5074049319576e+01, 0.4705732307012e+01, + 0.5989826532569e-09, 0.2231842216620e+01, 0.6256777527156e+01, + 0.5961360812618e-09, 0.1274975769045e+01, 0.6309374173736e+01, + 0.4874165471016e-09, 0.3642277426779e+01, 0.7755226100720e+00, + + 0.4283834034360e-09, 0.5148765510106e+01, 0.1059381944224e+01, + 0.4652389287529e-09, 0.4715794792175e+01, 0.7860419393880e+01, + 0.3751707476401e-09, 0.6617207370325e+00, 0.5753384878334e+01, + 0.3559998806198e-09, 0.6155548875404e+01, 0.5884926831456e+01, + 0.3558447558857e-09, 0.2898827297664e+01, 0.6812766822558e+01, + 0.3211116927106e-09, 0.3625813502509e+01, 0.6681224869435e+01, + 0.2875609914672e-09, 0.4345435813134e+01, 0.2513230340178e+02, + 0.2843109704069e-09, 0.5862263940038e+01, 0.6127655567643e+01, + 0.2744676468427e-09, 0.3926419475089e+01, 0.6438496133249e+01, + 0.2481285237789e-09, 0.1351976572828e+01, 0.5486777812467e+01, + + 0.2060338481033e-09, 0.2147556998591e+01, 0.7079373888424e+01, + 0.2015822358331e-09, 0.4408358972216e+01, 0.6290189305114e+01, + 0.2001195944195e-09, 0.5385829822531e+01, 0.6275962395778e+01, + 0.1953667642377e-09, 0.1304933746120e+01, 0.5507553240374e+01, + 0.1839744078713e-09, 0.6173567228835e+01, 0.1179062909082e+02, + 0.1643334294845e-09, 0.4635942997523e+01, 0.1150676975667e+02, + 0.1768051018652e-09, 0.5086283558874e+01, 0.7113454667900e-02, + 0.1674874205489e-09, 0.2243332137241e+01, 0.7058598460518e+01, + 0.1421445397609e-09, 0.6186899771515e+01, 0.7962980379786e+00, + 0.1255163958267e-09, 0.5730238465658e+01, 0.4694002934110e+01, + + 0.1013945281961e-09, 0.1726055228402e+01, 0.3738761453707e+01, + 0.1047294335852e-09, 0.2658801228129e+01, 0.6282095334605e+01, + 0.1047103879392e-09, 0.8481047835035e+00, 0.6284056366286e+01, + 0.9530343962826e-10, 0.3079267149859e+01, 0.6069776770667e+01, + 0.9604637611690e-10, 0.3258679792918e+00, 0.4136910472696e+01, + 0.9153518537177e-10, 0.4398599886584e+00, 0.6496374930224e+01, + 0.8562458214922e-10, 0.4772686794145e+01, 0.1194447056968e+01, + 0.8232525360654e-10, 0.5966220721679e+01, 0.1589072916335e+01, + 0.6150223411438e-10, 0.1780985591923e+01, 0.8827390247185e+01, + 0.6272087858000e-10, 0.3184305429012e+01, 0.8429241228195e+01, + + 0.5540476311040e-10, 0.3801260595433e+01, 0.4933208510675e+01, + 0.7331901699361e-10, 0.5205948591865e+01, 0.4535059491685e+01, + 0.6018528702791e-10, 0.4770139083623e+01, 0.1255903824622e+02, + 0.5150530724804e-10, 0.3574796899585e+01, 0.1176985366291e+02, + 0.6471933741811e-10, 0.2679787266521e+01, 0.5088628793478e+01, + 0.5317460644174e-10, 0.9528763345494e+00, 0.3154687086868e+01, + 0.4832187748783e-10, 0.5329322498232e+01, 0.6040347114260e+01, + 0.4716763555110e-10, 0.2395235316466e+01, 0.5331357529664e+01, + 0.4871509139861e-10, 0.3056663648823e+01, 0.1256967486051e+02, + 0.4598417696768e-10, 0.4452762609019e+01, 0.6525804586632e+01, + + 0.5674189533175e-10, 0.9879680872193e+00, 0.5729506548653e+01, + 0.4073560328195e-10, 0.5939127696986e+01, 0.7632943190217e+01, + 0.5040994945359e-10, 0.4549875824510e+01, 0.8031092209206e+01, + 0.5078185134679e-10, 0.7346659893982e+00, 0.7477522907414e+01, + 0.3769343537061e-10, 0.1071317188367e+01, 0.7234794171227e+01, + 0.4980331365299e-10, 0.2500345341784e+01, 0.6836645152238e+01, + 0.3458236594757e-10, 0.3825159450711e+01, 0.1097707878456e+02, + 0.3578859493602e-10, 0.5299664791549e+01, 0.4164311961999e+01, + 0.3370504646419e-10, 0.5002316301593e+01, 0.1137170464392e+02, + 0.3299873338428e-10, 0.2526123275282e+01, 0.3930209696940e+01, + + 0.4304917318409e-10, 0.3368078557132e+01, 0.1592596075957e+01, + 0.3402418753455e-10, 0.8385495425800e+00, 0.3128388763578e+01, + 0.2778460572146e-10, 0.3669905203240e+01, 0.7342457794669e+01, + 0.2782710128902e-10, 0.2691664812170e+00, 0.1748016358760e+01, + 0.2711725179646e-10, 0.4707487217718e+01, 0.5296909721118e+00, + 0.2981760946340e-10, 0.3190260867816e+00, 0.5368044267797e+00, + 0.2811672977772e-10, 0.3196532315372e+01, 0.7084896783808e+01, + 0.2863454474467e-10, 0.2263240324780e+00, 0.5223693906222e+01, + 0.3333464634051e-10, 0.3498451685065e+01, 0.8018209333619e+00, + 0.3312991747609e-10, 0.5839154477412e+01, 0.1554202828031e+00, + + 0.2813255564006e-10, 0.8268044346621e+00, 0.5225775174439e+00, + 0.2665098083966e-10, 0.3934021725360e+01, 0.5216580451554e+01, + 0.2349795705216e-10, 0.5197620913779e+01, 0.2146165377750e+01, + 0.2330352293961e-10, 0.2984999231807e+01, 0.1726015463500e+02, + 0.2728001683419e-10, 0.6521679638544e+00, 0.8635942003952e+01, + 0.2484061007669e-10, 0.3468955561097e+01, 0.5230807360890e+01, + 0.2646328768427e-10, 0.1013724533516e+01, 0.2629832328990e-01, + 0.2518630264831e-10, 0.6108081057122e+01, 0.5481254917084e+01, + 0.2421901455384e-10, 0.1651097776260e+01, 0.1349867339771e+01, + 0.6348533267831e-11, 0.3220226560321e+01, 0.8433466158131e+02 }; + +/* Sun-to-Earth, T^1, Z */ + static const double e1z[] = { + 0.2278290449966e-05, 0.3413716033863e+01, 0.6283075850446e+01, + 0.5429458209830e-07, 0.0000000000000e+00, 0.0000000000000e+00, + 0.1903240492525e-07, 0.3370592358297e+01, 0.1256615170089e+02, + 0.2385409276743e-09, 0.3327914718416e+01, 0.1884922755134e+02, + 0.8676928342573e-10, 0.1824006811264e+01, 0.5223693906222e+01, + 0.7765442593544e-10, 0.3888564279247e+01, 0.5507553240374e+01, + 0.7066158332715e-10, 0.5194267231944e+01, 0.2352866153506e+01, + 0.7092175288657e-10, 0.2333246960021e+01, 0.8399684731857e+02, + 0.5357582213535e-10, 0.2224031176619e+01, 0.5296909721118e+00, + 0.3828035865021e-10, 0.2156710933584e+01, 0.6279552690824e+01, + + 0.3824857220427e-10, 0.1529755219915e+01, 0.6286599010068e+01, + 0.3286995181628e-10, 0.4879512900483e+01, 0.1021328554739e+02 }; + +/* Sun-to-Earth, T^2, X */ + static const double e2x[] = { + -0.4143818297913e-10, 0.0000000000000e+00, 0.0000000000000e+00, + 0.2171497694435e-10, 0.4398225628264e+01, 0.1256615170089e+02, + 0.9845398442516e-11, 0.2079720838384e+00, 0.6283075850446e+01, + 0.9256833552682e-12, 0.4191264694361e+01, 0.1884922755134e+02, + 0.1022049384115e-12, 0.5381133195658e+01, 0.8399684731857e+02 }; + +/* Sun-to-Earth, T^2, Y */ + static const double e2y[] = { + 0.5063375872532e-10, 0.0000000000000e+00, 0.0000000000000e+00, + 0.2173815785980e-10, 0.2827805833053e+01, 0.1256615170089e+02, + 0.1010231999920e-10, 0.4634612377133e+01, 0.6283075850446e+01, + 0.9259745317636e-12, 0.2620612076189e+01, 0.1884922755134e+02, + 0.1022202095812e-12, 0.3809562326066e+01, 0.8399684731857e+02 }; + +/* Sun-to-Earth, T^2, Z */ + static const double e2z[] = { + 0.9722666114891e-10, 0.5152219582658e+01, 0.6283075850446e+01, + -0.3494819171909e-11, 0.0000000000000e+00, 0.0000000000000e+00, + 0.6713034376076e-12, 0.6440188750495e+00, 0.1256615170089e+02 }; + +/* SSB-to-Sun, T^0, X */ + static const double s0x[] = { + 0.4956757536410e-02, 0.3741073751789e+01, 0.5296909721118e+00, + 0.2718490072522e-02, 0.4016011511425e+01, 0.2132990797783e+00, + 0.1546493974344e-02, 0.2170528330642e+01, 0.3813291813120e-01, + 0.8366855276341e-03, 0.2339614075294e+01, 0.7478166569050e-01, + 0.2936777942117e-03, 0.0000000000000e+00, 0.0000000000000e+00, + 0.1201317439469e-03, 0.4090736353305e+01, 0.1059381944224e+01, + 0.7578550887230e-04, 0.3241518088140e+01, 0.4265981595566e+00, + 0.1941787367773e-04, 0.1012202064330e+01, 0.2061856251104e+00, + 0.1889227765991e-04, 0.3892520416440e+01, 0.2204125344462e+00, + 0.1937896968613e-04, 0.4797779441161e+01, 0.1495633313810e+00, + + 0.1434506110873e-04, 0.3868960697933e+01, 0.5225775174439e+00, + 0.1406659911580e-04, 0.4759766557397e+00, 0.5368044267797e+00, + 0.1179022300202e-04, 0.7774961520598e+00, 0.7626583626240e-01, + 0.8085864460959e-05, 0.3254654471465e+01, 0.3664874755930e-01, + 0.7622752967615e-05, 0.4227633103489e+01, 0.3961708870310e-01, + 0.6209171139066e-05, 0.2791828325711e+00, 0.7329749511860e-01, + 0.4366435633970e-05, 0.4440454875925e+01, 0.1589072916335e+01, + 0.3792124889348e-05, 0.5156393842356e+01, 0.7113454667900e-02, + 0.3154548963402e-05, 0.6157005730093e+01, 0.4194847048887e+00, + 0.3088359882942e-05, 0.2494567553163e+01, 0.6398972393349e+00, + + 0.2788440902136e-05, 0.4934318747989e+01, 0.1102062672231e+00, + 0.3039928456376e-05, 0.4895077702640e+01, 0.6283075850446e+01, + 0.2272258457679e-05, 0.5278394064764e+01, 0.1030928125552e+00, + 0.2162007057957e-05, 0.5802978019099e+01, 0.3163918923335e+00, + 0.1767632855737e-05, 0.3415346595193e-01, 0.1021328554739e+02, + 0.1349413459362e-05, 0.2001643230755e+01, 0.1484170571900e-02, + 0.1170141900476e-05, 0.2424750491620e+01, 0.6327837846670e+00, + 0.1054355266820e-05, 0.3123311487576e+01, 0.4337116142245e+00, + 0.9800822461610e-06, 0.3026258088130e+01, 0.1052268489556e+01, + 0.1091203749931e-05, 0.3157811670347e+01, 0.1162474756779e+01, + + 0.6960236715913e-06, 0.8219570542313e+00, 0.1066495398892e+01, + 0.5689257296909e-06, 0.1323052375236e+01, 0.9491756770005e+00, + 0.6613172135802e-06, 0.2765348881598e+00, 0.8460828644453e+00, + 0.6277702517571e-06, 0.5794064466382e+01, 0.1480791608091e+00, + 0.6304884066699e-06, 0.7323555380787e+00, 0.2243449970715e+00, + 0.4897850467382e-06, 0.3062464235399e+01, 0.3340612434717e+01, + 0.3759148598786e-06, 0.4588290469664e+01, 0.3516457698740e-01, + 0.3110520548195e-06, 0.1374299536572e+01, 0.6373574839730e-01, + 0.3064708359780e-06, 0.4222267485047e+01, 0.1104591729320e-01, + 0.2856347168241e-06, 0.3714202944973e+01, 0.1510475019529e+00, + + 0.2840945514288e-06, 0.2847972875882e+01, 0.4110125927500e-01, + 0.2378951599405e-06, 0.3762072563388e+01, 0.2275259891141e+00, + 0.2714229481417e-06, 0.1036049980031e+01, 0.2535050500000e-01, + 0.2323551717307e-06, 0.4682388599076e+00, 0.8582758298370e-01, + 0.1881790512219e-06, 0.4790565425418e+01, 0.2118763888447e+01, + 0.2261353968371e-06, 0.1669144912212e+01, 0.7181332454670e-01, + 0.2214546389848e-06, 0.3937717281614e+01, 0.2968341143800e-02, + 0.2184915594933e-06, 0.1129169845099e+00, 0.7775000683430e-01, + 0.2000164937936e-06, 0.4030009638488e+01, 0.2093666171530e+00, + 0.1966105136719e-06, 0.8745955786834e+00, 0.2172315424036e+00, + + 0.1904742332624e-06, 0.5919743598964e+01, 0.2022531624851e+00, + 0.1657399705031e-06, 0.2549141484884e+01, 0.7358765972222e+00, + 0.1574070533987e-06, 0.5277533020230e+01, 0.7429900518901e+00, + 0.1832261651039e-06, 0.3064688127777e+01, 0.3235053470014e+00, + 0.1733615346569e-06, 0.3011432799094e+01, 0.1385174140878e+00, + 0.1549124014496e-06, 0.4005569132359e+01, 0.5154640627760e+00, + 0.1637044713838e-06, 0.1831375966632e+01, 0.8531963191132e+00, + 0.1123420082383e-06, 0.1180270407578e+01, 0.1990721704425e+00, + 0.1083754165740e-06, 0.3414101320863e+00, 0.5439178814476e+00, + 0.1156638012655e-06, 0.6130479452594e+00, 0.5257585094865e+00, + + 0.1142548785134e-06, 0.3724761948846e+01, 0.5336234347371e+00, + 0.7921463895965e-07, 0.2435425589361e+01, 0.1478866649112e+01, + 0.7428600285231e-07, 0.3542144398753e+01, 0.2164800718209e+00, + 0.8323211246747e-07, 0.3525058072354e+01, 0.1692165728891e+01, + 0.7257595116312e-07, 0.1364299431982e+01, 0.2101180877357e+00, + 0.7111185833236e-07, 0.2460478875808e+01, 0.4155522422634e+00, + 0.6868090383716e-07, 0.4397327670704e+01, 0.1173197218910e+00, + 0.7226419974175e-07, 0.4042647308905e+01, 0.1265567569334e+01, + 0.6955642383177e-07, 0.2865047906085e+01, 0.9562891316684e+00, + 0.7492139296331e-07, 0.5014278994215e+01, 0.1422690933580e-01, + + 0.6598363128857e-07, 0.2376730020492e+01, 0.6470106940028e+00, + 0.7381147293385e-07, 0.3272990384244e+01, 0.1581959461667e+01, + 0.6402909624032e-07, 0.5302290955138e+01, 0.9597935788730e-01, + 0.6237454263857e-07, 0.5444144425332e+01, 0.7084920306520e-01, + 0.5241198544016e-07, 0.4215359579205e+01, 0.5265099800692e+00, + 0.5144463853918e-07, 0.1218916689916e+00, 0.5328719641544e+00, + 0.5868164772299e-07, 0.2369402002213e+01, 0.7871412831580e-01, + 0.6233195669151e-07, 0.1254922242403e+01, 0.2608790314060e+02, + 0.6068463791422e-07, 0.5679713760431e+01, 0.1114304132498e+00, + 0.4359361135065e-07, 0.6097219641646e+00, 0.1375773836557e+01, + + 0.4686510366826e-07, 0.4786231041431e+01, 0.1143987543936e+00, + 0.3758977287225e-07, 0.1167368068139e+01, 0.1596186371003e+01, + 0.4282051974778e-07, 0.1519471064319e+01, 0.2770348281756e+00, + 0.5153765386113e-07, 0.1860532322984e+01, 0.2228608264996e+00, + 0.4575129387188e-07, 0.7632857887158e+00, 0.1465949902372e+00, + 0.3326844933286e-07, 0.1298219485285e+01, 0.5070101000000e-01, + 0.3748617450984e-07, 0.1046510321062e+01, 0.4903339079539e+00, + 0.2816756661499e-07, 0.3434522346190e+01, 0.2991266627620e+00, + 0.3412750405039e-07, 0.2523766270318e+01, 0.3518164938661e+00, + 0.2655796761776e-07, 0.2904422260194e+01, 0.6256703299991e+00, + + 0.2963597929458e-07, 0.5923900431149e+00, 0.1099462426779e+00, + 0.2539523734781e-07, 0.4851947722567e+01, 0.1256615170089e+02, + 0.2283087914139e-07, 0.3400498595496e+01, 0.6681224869435e+01, + 0.2321309799331e-07, 0.5789099148673e+01, 0.3368040641550e-01, + 0.2549657649750e-07, 0.3991856479792e-01, 0.1169588211447e+01, + 0.2290462303977e-07, 0.2788567577052e+01, 0.1045155034888e+01, + 0.1945398522914e-07, 0.3290896998176e+01, 0.1155361302111e+01, + 0.1849171512638e-07, 0.2698060129367e+01, 0.4452511715700e-02, + 0.1647199834254e-07, 0.3016735644085e+01, 0.4408250688924e+00, + 0.1529530765273e-07, 0.5573043116178e+01, 0.6521991896920e-01, + + 0.1433199339978e-07, 0.1481192356147e+01, 0.9420622223326e+00, + 0.1729134193602e-07, 0.1422817538933e+01, 0.2108507877249e+00, + 0.1716463931346e-07, 0.3469468901855e+01, 0.2157473718317e+00, + 0.1391206061378e-07, 0.6122436220547e+01, 0.4123712502208e+00, + 0.1404746661924e-07, 0.1647765641936e+01, 0.4258542984690e-01, + 0.1410452399455e-07, 0.5989729161964e+01, 0.2258291676434e+00, + 0.1089828772168e-07, 0.2833705509371e+01, 0.4226656969313e+00, + 0.1047374564948e-07, 0.5090690007331e+00, 0.3092784376656e+00, + 0.1358279126532e-07, 0.5128990262836e+01, 0.7923417740620e-01, + 0.1020456476148e-07, 0.9632772880808e+00, 0.1456308687557e+00, + + 0.1033428735328e-07, 0.3223779318418e+01, 0.1795258541446e+01, + 0.1412435841540e-07, 0.2410271572721e+01, 0.1525316725248e+00, + 0.9722759371574e-08, 0.2333531395690e+01, 0.8434341241180e-01, + 0.9657334084704e-08, 0.6199270974168e+01, 0.1272681024002e+01, + 0.1083641148690e-07, 0.2864222292929e+01, 0.7032915397480e-01, + 0.1067318403838e-07, 0.5833458866568e+00, 0.2123349582968e+00, + 0.1062366201976e-07, 0.4307753989494e+01, 0.2142632012598e+00, + 0.1236364149266e-07, 0.2873917870593e+01, 0.1847279083684e+00, + 0.1092759489593e-07, 0.2959887266733e+01, 0.1370332435159e+00, + 0.8912069362899e-08, 0.5141213702562e+01, 0.2648454860559e+01, + + 0.9656467707970e-08, 0.4532182462323e+01, 0.4376440768498e+00, + 0.8098386150135e-08, 0.2268906338379e+01, 0.2880807454688e+00, + 0.7857714675000e-08, 0.4055544260745e+01, 0.2037373330570e+00, + 0.7288455940646e-08, 0.5357901655142e+01, 0.1129145838217e+00, + 0.9450595950552e-08, 0.4264926963939e+01, 0.5272426800584e+00, + 0.9381718247537e-08, 0.7489366976576e-01, 0.5321392641652e+00, + 0.7079052646038e-08, 0.1923311052874e+01, 0.6288513220417e+00, + 0.9259004415344e-08, 0.2970256853438e+01, 0.1606092486742e+00, + 0.8259801499742e-08, 0.3327056314697e+01, 0.8389694097774e+00, + 0.6476334355779e-08, 0.2954925505727e+01, 0.2008557621224e+01, + + 0.5984021492007e-08, 0.9138753105829e+00, 0.2042657109477e+02, + 0.5989546863181e-08, 0.3244464082031e+01, 0.2111650433779e+01, + 0.6233108606023e-08, 0.4995232638403e+00, 0.4305306221819e+00, + 0.6877299149965e-08, 0.2834987233449e+01, 0.9561746721300e-02, + 0.8311234227190e-08, 0.2202951835758e+01, 0.3801276407308e+00, + 0.6599472832414e-08, 0.4478581462618e+01, 0.1063314406849e+01, + 0.6160491096549e-08, 0.5145858696411e+01, 0.1368660381889e+01, + 0.6164772043891e-08, 0.3762976697911e+00, 0.4234171675140e+00, + 0.6363248684450e-08, 0.3162246718685e+01, 0.1253008786510e-01, + 0.6448587520999e-08, 0.3442693302119e+01, 0.5287268506303e+00, + + 0.6431662283977e-08, 0.8977549136606e+00, 0.5306550935933e+00, + 0.6351223158474e-08, 0.4306447410369e+01, 0.5217580628120e+02, + 0.5476721393451e-08, 0.3888529177855e+01, 0.2221856701002e+01, + 0.5341772572619e-08, 0.2655560662512e+01, 0.7466759693650e-01, + 0.5337055758302e-08, 0.5164990735946e+01, 0.7489573444450e-01, + 0.5373120816787e-08, 0.6041214553456e+01, 0.1274714967946e+00, + 0.5392351705426e-08, 0.9177763485932e+00, 0.1055449481598e+01, + 0.6688495850205e-08, 0.3089608126937e+01, 0.2213766559277e+00, + 0.5072003660362e-08, 0.4311316541553e+01, 0.2132517061319e+00, + 0.5070726650455e-08, 0.5790675464444e+00, 0.2133464534247e+00, + + 0.5658012950032e-08, 0.2703945510675e+01, 0.7287631425543e+00, + 0.4835509924854e-08, 0.2975422976065e+01, 0.7160067364790e-01, + 0.6479821978012e-08, 0.1324168733114e+01, 0.2209183458640e-01, + 0.6230636494980e-08, 0.2860103632836e+01, 0.3306188016693e+00, + 0.4649239516213e-08, 0.4832259763403e+01, 0.7796265773310e-01, + 0.6487325792700e-08, 0.2726165825042e+01, 0.3884652414254e+00, + 0.4682823682770e-08, 0.6966602455408e+00, 0.1073608853559e+01, + 0.5704230804976e-08, 0.5669634104606e+01, 0.8731175355560e-01, + 0.6125413585489e-08, 0.1513386538915e+01, 0.7605151500000e-01, + 0.6035825038187e-08, 0.1983509168227e+01, 0.9846002785331e+00, + + 0.4331123462303e-08, 0.2782892992807e+01, 0.4297791515992e+00, + 0.4681107685143e-08, 0.5337232886836e+01, 0.2127790306879e+00, + 0.4669105829655e-08, 0.5837133792160e+01, 0.2138191288687e+00, + 0.5138823602365e-08, 0.3080560200507e+01, 0.7233337363710e-01, + 0.4615856664534e-08, 0.1661747897471e+01, 0.8603097737811e+00, + 0.4496916702197e-08, 0.2112508027068e+01, 0.7381754420900e-01, + 0.4278479042945e-08, 0.5716528462627e+01, 0.7574578717200e-01, + 0.3840525503932e-08, 0.6424172726492e+00, 0.3407705765729e+00, + 0.4866636509685e-08, 0.4919244697715e+01, 0.7722995774390e-01, + 0.3526100639296e-08, 0.2550821052734e+01, 0.6225157782540e-01, + + 0.3939558488075e-08, 0.3939331491710e+01, 0.5268983110410e-01, + 0.4041268772576e-08, 0.2275337571218e+01, 0.3503323232942e+00, + 0.3948761842853e-08, 0.1999324200790e+01, 0.1451108196653e+00, + 0.3258394550029e-08, 0.9121001378200e+00, 0.5296435984654e+00, + 0.3257897048761e-08, 0.3428428660869e+01, 0.5297383457582e+00, + 0.3842559031298e-08, 0.6132927720035e+01, 0.9098186128426e+00, + 0.3109920095448e-08, 0.7693650193003e+00, 0.3932462625300e-02, + 0.3132237775119e-08, 0.3621293854908e+01, 0.2346394437820e+00, + 0.3942189421510e-08, 0.4841863659733e+01, 0.3180992042600e-02, + 0.3796972285340e-08, 0.1814174994268e+01, 0.1862120789403e+00, + + 0.3995640233688e-08, 0.1386990406091e+01, 0.4549093064213e+00, + 0.2875013727414e-08, 0.9178318587177e+00, 0.1905464808669e+01, + 0.3073719932844e-08, 0.2688923811835e+01, 0.3628624111593e+00, + 0.2731016580075e-08, 0.1188259127584e+01, 0.2131850110243e+00, + 0.2729549896546e-08, 0.3702160634273e+01, 0.2134131485323e+00, + 0.3339372892449e-08, 0.7199163960331e+00, 0.2007689919132e+00, + 0.2898833764204e-08, 0.1916709364999e+01, 0.5291709230214e+00, + 0.2894536549362e-08, 0.2424043195547e+01, 0.5302110212022e+00, + 0.3096872473843e-08, 0.4445894977497e+01, 0.2976424921901e+00, + 0.2635672326810e-08, 0.3814366984117e+01, 0.1485980103780e+01, + + 0.3649302697001e-08, 0.2924200596084e+01, 0.6044726378023e+00, + 0.3127954585895e-08, 0.1842251648327e+01, 0.1084620721060e+00, + 0.2616040173947e-08, 0.4155841921984e+01, 0.1258454114666e+01, + 0.2597395859860e-08, 0.1158045978874e+00, 0.2103781122809e+00, + 0.2593286172210e-08, 0.4771850408691e+01, 0.2162200472757e+00, + 0.2481823585747e-08, 0.4608842558889e+00, 0.1062562936266e+01, + 0.2742219550725e-08, 0.1538781127028e+01, 0.5651155736444e+00, + 0.3199558469610e-08, 0.3226647822878e+00, 0.7036329877322e+00, + 0.2666088542957e-08, 0.1967991731219e+00, 0.1400015846597e+00, + 0.2397067430580e-08, 0.3707036669873e+01, 0.2125476091956e+00, + + 0.2376570772738e-08, 0.1182086628042e+01, 0.2140505503610e+00, + 0.2547228007887e-08, 0.4906256820629e+01, 0.1534957940063e+00, + 0.2265575594114e-08, 0.3414949866857e+01, 0.2235935264888e+00, + 0.2464381430585e-08, 0.4599122275378e+01, 0.2091065926078e+00, + 0.2433408527044e-08, 0.2830751145445e+00, 0.2174915669488e+00, + 0.2443605509076e-08, 0.4212046432538e+01, 0.1739420156204e+00, + 0.2319779262465e-08, 0.9881978408630e+00, 0.7530171478090e-01, + 0.2284622835465e-08, 0.5565347331588e+00, 0.7426161660010e-01, + 0.2467268750783e-08, 0.5655708150766e+00, 0.2526561439362e+00, + 0.2808513492782e-08, 0.1418405053408e+01, 0.5636314030725e+00, + + 0.2329528932532e-08, 0.4069557545675e+01, 0.1056200952181e+01, + 0.9698639532817e-09, 0.1074134313634e+01, 0.7826370942180e+02 }; + +/* SSB-to-Sun, T^0, Y */ + static const double s0y[] = { + 0.4955392320126e-02, 0.2170467313679e+01, 0.5296909721118e+00, + 0.2722325167392e-02, 0.2444433682196e+01, 0.2132990797783e+00, + 0.1546579925346e-02, 0.5992779281546e+00, 0.3813291813120e-01, + 0.8363140252966e-03, 0.7687356310801e+00, 0.7478166569050e-01, + 0.3385792683603e-03, 0.0000000000000e+00, 0.0000000000000e+00, + 0.1201192221613e-03, 0.2520035601514e+01, 0.1059381944224e+01, + 0.7587125720554e-04, 0.1669954006449e+01, 0.4265981595566e+00, + 0.1964155361250e-04, 0.5707743963343e+01, 0.2061856251104e+00, + 0.1891900364909e-04, 0.2320960679937e+01, 0.2204125344462e+00, + 0.1937373433356e-04, 0.3226940689555e+01, 0.1495633313810e+00, + + 0.1437139941351e-04, 0.2301626908096e+01, 0.5225775174439e+00, + 0.1406267683099e-04, 0.5188579265542e+01, 0.5368044267797e+00, + 0.1178703080346e-04, 0.5489483248476e+01, 0.7626583626240e-01, + 0.8079835186041e-05, 0.1683751835264e+01, 0.3664874755930e-01, + 0.7623253594652e-05, 0.2656400462961e+01, 0.3961708870310e-01, + 0.6248667483971e-05, 0.4992775362055e+01, 0.7329749511860e-01, + 0.4366353695038e-05, 0.2869706279678e+01, 0.1589072916335e+01, + 0.3829101568895e-05, 0.3572131359950e+01, 0.7113454667900e-02, + 0.3175733773908e-05, 0.4535372530045e+01, 0.4194847048887e+00, + 0.3092437902159e-05, 0.9230153317909e+00, 0.6398972393349e+00, + + 0.2874168812154e-05, 0.3363143761101e+01, 0.1102062672231e+00, + 0.3040119321826e-05, 0.3324250895675e+01, 0.6283075850446e+01, + 0.2699723308006e-05, 0.2917882441928e+00, 0.1030928125552e+00, + 0.2134832683534e-05, 0.4220997202487e+01, 0.3163918923335e+00, + 0.1770412139433e-05, 0.4747318496462e+01, 0.1021328554739e+02, + 0.1377264209373e-05, 0.4305058462401e+00, 0.1484170571900e-02, + 0.1127814538960e-05, 0.8538177240740e+00, 0.6327837846670e+00, + 0.1055608090130e-05, 0.1551800742580e+01, 0.4337116142245e+00, + 0.9802673861420e-06, 0.1459646735377e+01, 0.1052268489556e+01, + 0.1090329461951e-05, 0.1587351228711e+01, 0.1162474756779e+01, + + 0.6959590025090e-06, 0.5534442628766e+01, 0.1066495398892e+01, + 0.5664914529542e-06, 0.6030673003297e+01, 0.9491756770005e+00, + 0.6607787763599e-06, 0.4989507233927e+01, 0.8460828644453e+00, + 0.6269725742838e-06, 0.4222951804572e+01, 0.1480791608091e+00, + 0.6301889697863e-06, 0.5444316669126e+01, 0.2243449970715e+00, + 0.4891042662861e-06, 0.1490552839784e+01, 0.3340612434717e+01, + 0.3457083123290e-06, 0.3030475486049e+01, 0.3516457698740e-01, + 0.3032559967314e-06, 0.2652038793632e+01, 0.1104591729320e-01, + 0.2841133988903e-06, 0.1276744786829e+01, 0.4110125927500e-01, + 0.2855564444432e-06, 0.2143368674733e+01, 0.1510475019529e+00, + + 0.2765157135038e-06, 0.5444186109077e+01, 0.6373574839730e-01, + 0.2382312465034e-06, 0.2190521137593e+01, 0.2275259891141e+00, + 0.2808060365077e-06, 0.5735195064841e+01, 0.2535050500000e-01, + 0.2332175234405e-06, 0.9481985524859e-01, 0.7181332454670e-01, + 0.2322488199659e-06, 0.5180499361533e+01, 0.8582758298370e-01, + 0.1881850258423e-06, 0.3219788273885e+01, 0.2118763888447e+01, + 0.2196111392808e-06, 0.2366941159761e+01, 0.2968341143800e-02, + 0.2183810335519e-06, 0.4825445110915e+01, 0.7775000683430e-01, + 0.2002733093326e-06, 0.2457148995307e+01, 0.2093666171530e+00, + 0.1967111767229e-06, 0.5586291545459e+01, 0.2172315424036e+00, + + 0.1568473250543e-06, 0.3708003123320e+01, 0.7429900518901e+00, + 0.1852528314300e-06, 0.4310638151560e+01, 0.2022531624851e+00, + 0.1832111226447e-06, 0.1494665322656e+01, 0.3235053470014e+00, + 0.1746805502310e-06, 0.1451378500784e+01, 0.1385174140878e+00, + 0.1555730966650e-06, 0.1068040418198e+01, 0.7358765972222e+00, + 0.1554883462559e-06, 0.2442579035461e+01, 0.5154640627760e+00, + 0.1638380568746e-06, 0.2597913420625e+00, 0.8531963191132e+00, + 0.1159938593640e-06, 0.5834512021280e+01, 0.1990721704425e+00, + 0.1083427965695e-06, 0.5054033177950e+01, 0.5439178814476e+00, + 0.1156480369431e-06, 0.5325677432457e+01, 0.5257585094865e+00, + + 0.1141308860095e-06, 0.2153403923857e+01, 0.5336234347371e+00, + 0.7913146470946e-07, 0.8642846847027e+00, 0.1478866649112e+01, + 0.7439752463733e-07, 0.1970628496213e+01, 0.2164800718209e+00, + 0.7280277104079e-07, 0.6073307250609e+01, 0.2101180877357e+00, + 0.8319567719136e-07, 0.1954371928334e+01, 0.1692165728891e+01, + 0.7137705549290e-07, 0.8904989440909e+00, 0.4155522422634e+00, + 0.6900825396225e-07, 0.2825717714977e+01, 0.1173197218910e+00, + 0.7245757216635e-07, 0.2481677513331e+01, 0.1265567569334e+01, + 0.6961165696255e-07, 0.1292955312978e+01, 0.9562891316684e+00, + 0.7571804456890e-07, 0.3427517575069e+01, 0.1422690933580e-01, + + 0.6605425721904e-07, 0.8052192701492e+00, 0.6470106940028e+00, + 0.7375477357248e-07, 0.1705076390088e+01, 0.1581959461667e+01, + 0.7041664951470e-07, 0.4848356967891e+00, 0.9597935788730e-01, + 0.6322199535763e-07, 0.3878069473909e+01, 0.7084920306520e-01, + 0.5244380279191e-07, 0.2645560544125e+01, 0.5265099800692e+00, + 0.5143125704988e-07, 0.4834486101370e+01, 0.5328719641544e+00, + 0.5871866319373e-07, 0.7981472548900e+00, 0.7871412831580e-01, + 0.6300822573871e-07, 0.5979398788281e+01, 0.2608790314060e+02, + 0.6062154271548e-07, 0.4108655402756e+01, 0.1114304132498e+00, + 0.4361912339976e-07, 0.5322624319280e+01, 0.1375773836557e+01, + + 0.4417005920067e-07, 0.6240817359284e+01, 0.2770348281756e+00, + 0.4686806749936e-07, 0.3214977301156e+01, 0.1143987543936e+00, + 0.3758892132305e-07, 0.5879809634765e+01, 0.1596186371003e+01, + 0.5151351332319e-07, 0.2893377688007e+00, 0.2228608264996e+00, + 0.4554683578572e-07, 0.5475427144122e+01, 0.1465949902372e+00, + 0.3442381385338e-07, 0.5992034796640e+01, 0.5070101000000e-01, + 0.2831093954933e-07, 0.5367350273914e+01, 0.3092784376656e+00, + 0.3756267090084e-07, 0.5758171285420e+01, 0.4903339079539e+00, + 0.2816374679892e-07, 0.1863718700923e+01, 0.2991266627620e+00, + 0.3419307025569e-07, 0.9524347534130e+00, 0.3518164938661e+00, + + 0.2904250494239e-07, 0.5304471615602e+01, 0.1099462426779e+00, + 0.2471734511206e-07, 0.1297069793530e+01, 0.6256703299991e+00, + 0.2539620831872e-07, 0.3281126083375e+01, 0.1256615170089e+02, + 0.2281017868007e-07, 0.1829122133165e+01, 0.6681224869435e+01, + 0.2275319473335e-07, 0.5797198160181e+01, 0.3932462625300e-02, + 0.2547755368442e-07, 0.4752697708330e+01, 0.1169588211447e+01, + 0.2285979669317e-07, 0.1223205292886e+01, 0.1045155034888e+01, + 0.1913386560994e-07, 0.1757532993389e+01, 0.1155361302111e+01, + 0.1809020525147e-07, 0.4246116108791e+01, 0.3368040641550e-01, + 0.1649213300201e-07, 0.1445162890627e+01, 0.4408250688924e+00, + + 0.1834972793932e-07, 0.1126917567225e+01, 0.4452511715700e-02, + 0.1439550648138e-07, 0.6160756834764e+01, 0.9420622223326e+00, + 0.1487645457041e-07, 0.4358761931792e+01, 0.4123712502208e+00, + 0.1731729516660e-07, 0.6134456753344e+01, 0.2108507877249e+00, + 0.1717747163567e-07, 0.1898186084455e+01, 0.2157473718317e+00, + 0.1418190430374e-07, 0.4180286741266e+01, 0.6521991896920e-01, + 0.1404844134873e-07, 0.7654053565412e-01, 0.4258542984690e-01, + 0.1409842846538e-07, 0.4418612420312e+01, 0.2258291676434e+00, + 0.1090948346291e-07, 0.1260615686131e+01, 0.4226656969313e+00, + 0.1357577323612e-07, 0.3558248818690e+01, 0.7923417740620e-01, + + 0.1018154061960e-07, 0.5676087241256e+01, 0.1456308687557e+00, + 0.1412073972109e-07, 0.8394392632422e+00, 0.1525316725248e+00, + 0.1030938326496e-07, 0.1653593274064e+01, 0.1795258541446e+01, + 0.1180081567104e-07, 0.1285802592036e+01, 0.7032915397480e-01, + 0.9708510575650e-08, 0.7631889488106e+00, 0.8434341241180e-01, + 0.9637689663447e-08, 0.4630642649176e+01, 0.1272681024002e+01, + 0.1068910429389e-07, 0.5294934032165e+01, 0.2123349582968e+00, + 0.1063716179336e-07, 0.2736266800832e+01, 0.2142632012598e+00, + 0.1234858713814e-07, 0.1302891146570e+01, 0.1847279083684e+00, + 0.8912631189738e-08, 0.3570415993621e+01, 0.2648454860559e+01, + + 0.1036378285534e-07, 0.4236693440949e+01, 0.1370332435159e+00, + 0.9667798501561e-08, 0.2960768892398e+01, 0.4376440768498e+00, + 0.8108314201902e-08, 0.6987781646841e+00, 0.2880807454688e+00, + 0.7648364324628e-08, 0.2499017863863e+01, 0.2037373330570e+00, + 0.7286136828406e-08, 0.3787426951665e+01, 0.1129145838217e+00, + 0.9448237743913e-08, 0.2694354332983e+01, 0.5272426800584e+00, + 0.9374276106428e-08, 0.4787121277064e+01, 0.5321392641652e+00, + 0.7100226287462e-08, 0.3530238792101e+00, 0.6288513220417e+00, + 0.9253056659571e-08, 0.1399478925664e+01, 0.1606092486742e+00, + 0.6636432145504e-08, 0.3479575438447e+01, 0.1368660381889e+01, + + 0.6469975312932e-08, 0.1383669964800e+01, 0.2008557621224e+01, + 0.7335849729765e-08, 0.1243698166898e+01, 0.9561746721300e-02, + 0.8743421205855e-08, 0.3776164289301e+01, 0.3801276407308e+00, + 0.5993635744494e-08, 0.5627122113596e+01, 0.2042657109477e+02, + 0.5981008479693e-08, 0.1674336636752e+01, 0.2111650433779e+01, + 0.6188535145838e-08, 0.5214925208672e+01, 0.4305306221819e+00, + 0.6596074017566e-08, 0.2907653268124e+01, 0.1063314406849e+01, + 0.6630815126226e-08, 0.2127643669658e+01, 0.8389694097774e+00, + 0.6156772830040e-08, 0.5082160803295e+01, 0.4234171675140e+00, + 0.6446960563014e-08, 0.1872100916905e+01, 0.5287268506303e+00, + + 0.6429324424668e-08, 0.5610276103577e+01, 0.5306550935933e+00, + 0.6302232396465e-08, 0.1592152049607e+01, 0.1253008786510e-01, + 0.6399244436159e-08, 0.2746214421532e+01, 0.5217580628120e+02, + 0.5474965172558e-08, 0.2317666374383e+01, 0.2221856701002e+01, + 0.5339293190692e-08, 0.1084724961156e+01, 0.7466759693650e-01, + 0.5334733683389e-08, 0.3594106067745e+01, 0.7489573444450e-01, + 0.5392665782110e-08, 0.5630254365606e+01, 0.1055449481598e+01, + 0.6682075673789e-08, 0.1518480041732e+01, 0.2213766559277e+00, + 0.5079130495960e-08, 0.2739765115711e+01, 0.2132517061319e+00, + 0.5077759793261e-08, 0.5290711290094e+01, 0.2133464534247e+00, + + 0.4832037368310e-08, 0.1404473217200e+01, 0.7160067364790e-01, + 0.6463279674802e-08, 0.6038381695210e+01, 0.2209183458640e-01, + 0.6240592771560e-08, 0.1290170653666e+01, 0.3306188016693e+00, + 0.4672013521493e-08, 0.3261895939677e+01, 0.7796265773310e-01, + 0.6500650750348e-08, 0.1154522312095e+01, 0.3884652414254e+00, + 0.6344161389053e-08, 0.6206111545062e+01, 0.7605151500000e-01, + 0.4682518370646e-08, 0.5409118796685e+01, 0.1073608853559e+01, + 0.5329460015591e-08, 0.1202985784864e+01, 0.7287631425543e+00, + 0.5701588675898e-08, 0.4098715257064e+01, 0.8731175355560e-01, + 0.6030690867211e-08, 0.4132033218460e+00, 0.9846002785331e+00, + + 0.4336256312655e-08, 0.1211415991827e+01, 0.4297791515992e+00, + 0.4688498808975e-08, 0.3765479072409e+01, 0.2127790306879e+00, + 0.4675578609335e-08, 0.4265540037226e+01, 0.2138191288687e+00, + 0.4225578112158e-08, 0.5237566010676e+01, 0.3407705765729e+00, + 0.5139422230028e-08, 0.1507173079513e+01, 0.7233337363710e-01, + 0.4619995093571e-08, 0.9023957449848e-01, 0.8603097737811e+00, + 0.4494776255461e-08, 0.5414930552139e+00, 0.7381754420900e-01, + 0.4274026276788e-08, 0.4145735303659e+01, 0.7574578717200e-01, + 0.5018141789353e-08, 0.3344408829055e+01, 0.3180992042600e-02, + 0.4866163952181e-08, 0.3348534657607e+01, 0.7722995774390e-01, + + 0.4111986020501e-08, 0.4198823597220e+00, 0.1451108196653e+00, + 0.3356142784950e-08, 0.5609144747180e+01, 0.1274714967946e+00, + 0.4070575554551e-08, 0.7028411059224e+00, 0.3503323232942e+00, + 0.3257451857278e-08, 0.5624697983086e+01, 0.5296435984654e+00, + 0.3256973703026e-08, 0.1857842076707e+01, 0.5297383457582e+00, + 0.3830771508640e-08, 0.4562887279931e+01, 0.9098186128426e+00, + 0.3725024005962e-08, 0.2358058692652e+00, 0.1084620721060e+00, + 0.3136763921756e-08, 0.2049731526845e+01, 0.2346394437820e+00, + 0.3795147256194e-08, 0.2432356296933e+00, 0.1862120789403e+00, + 0.2877342229911e-08, 0.5631101279387e+01, 0.1905464808669e+01, + + 0.3076931798805e-08, 0.1117615737392e+01, 0.3628624111593e+00, + 0.2734765945273e-08, 0.5899826516955e+01, 0.2131850110243e+00, + 0.2733405296885e-08, 0.2130562964070e+01, 0.2134131485323e+00, + 0.2898552353410e-08, 0.3462387048225e+00, 0.5291709230214e+00, + 0.2893736103681e-08, 0.8534352781543e+00, 0.5302110212022e+00, + 0.3095717734137e-08, 0.2875061429041e+01, 0.2976424921901e+00, + 0.2636190425832e-08, 0.2242512846659e+01, 0.1485980103780e+01, + 0.3645512095537e-08, 0.1354016903958e+01, 0.6044726378023e+00, + 0.2808173547723e-08, 0.6705114365631e-01, 0.6225157782540e-01, + 0.2625012866888e-08, 0.4775705748482e+01, 0.5268983110410e-01, + + 0.2572233995651e-08, 0.2638924216139e+01, 0.1258454114666e+01, + 0.2604238824792e-08, 0.4826358927373e+01, 0.2103781122809e+00, + 0.2596886385239e-08, 0.3200388483118e+01, 0.2162200472757e+00, + 0.3228057304264e-08, 0.5384848409563e+01, 0.2007689919132e+00, + 0.2481601798252e-08, 0.5173373487744e+01, 0.1062562936266e+01, + 0.2745977498864e-08, 0.6250966149853e+01, 0.5651155736444e+00, + 0.2669878833811e-08, 0.4906001352499e+01, 0.1400015846597e+00, + 0.3203986611711e-08, 0.5034333010005e+01, 0.7036329877322e+00, + 0.3354961227212e-08, 0.6108262423137e+01, 0.4549093064213e+00, + 0.2400407324558e-08, 0.2135399294955e+01, 0.2125476091956e+00, + + 0.2379905859802e-08, 0.5893721933961e+01, 0.2140505503610e+00, + 0.2550844302187e-08, 0.3331940762063e+01, 0.1534957940063e+00, + 0.2268824211001e-08, 0.1843418461035e+01, 0.2235935264888e+00, + 0.2464700891204e-08, 0.3029548547230e+01, 0.2091065926078e+00, + 0.2436814726024e-08, 0.4994717970364e+01, 0.2174915669488e+00, + 0.2443623894745e-08, 0.2645102591375e+01, 0.1739420156204e+00, + 0.2318701783838e-08, 0.5700547397897e+01, 0.7530171478090e-01, + 0.2284448700256e-08, 0.5268898905872e+01, 0.7426161660010e-01, + 0.2468848123510e-08, 0.5276280575078e+01, 0.2526561439362e+00, + 0.2814052350303e-08, 0.6130168623475e+01, 0.5636314030725e+00, + + 0.2243662755220e-08, 0.6631692457995e+00, 0.8886590321940e-01, + 0.2330795855941e-08, 0.2499435487702e+01, 0.1056200952181e+01, + 0.9757679038404e-09, 0.5796846023126e+01, 0.7826370942180e+02 }; + +/* SSB-to-Sun, T^0, Z */ + static const double s0z[] = { + 0.1181255122986e-03, 0.4607918989164e+00, 0.2132990797783e+00, + 0.1127777651095e-03, 0.4169146331296e+00, 0.5296909721118e+00, + 0.4777754401806e-04, 0.4582657007130e+01, 0.3813291813120e-01, + 0.1129354285772e-04, 0.5758735142480e+01, 0.7478166569050e-01, + -0.1149543637123e-04, 0.0000000000000e+00, 0.0000000000000e+00, + 0.3298730512306e-05, 0.5978801994625e+01, 0.4265981595566e+00, + 0.2733376706079e-05, 0.7665413691040e+00, 0.1059381944224e+01, + 0.9426389657270e-06, 0.3710201265838e+01, 0.2061856251104e+00, + 0.8187517749552e-06, 0.3390675605802e+00, 0.2204125344462e+00, + 0.4080447871819e-06, 0.4552296640088e+00, 0.5225775174439e+00, + + 0.3169973017028e-06, 0.3445455899321e+01, 0.5368044267797e+00, + 0.2438098615549e-06, 0.5664675150648e+01, 0.3664874755930e-01, + 0.2601897517235e-06, 0.1931894095697e+01, 0.1495633313810e+00, + 0.2314558080079e-06, 0.3666319115574e+00, 0.3961708870310e-01, + 0.1962549548002e-06, 0.3167411699020e+01, 0.7626583626240e-01, + 0.2180518287925e-06, 0.1544420746580e+01, 0.7113454667900e-02, + 0.1451382442868e-06, 0.1583756740070e+01, 0.1102062672231e+00, + 0.1358439007389e-06, 0.5239941758280e+01, 0.6398972393349e+00, + 0.1050585898028e-06, 0.2266958352859e+01, 0.3163918923335e+00, + 0.1050029870186e-06, 0.2711495250354e+01, 0.4194847048887e+00, + + 0.9934920679800e-07, 0.1116208151396e+01, 0.1589072916335e+01, + 0.1048395331560e-06, 0.3408619600206e+01, 0.1021328554739e+02, + 0.8370147196668e-07, 0.3810459401087e+01, 0.2535050500000e-01, + 0.7989856510998e-07, 0.3769910473647e+01, 0.7329749511860e-01, + 0.5441221655233e-07, 0.2416994903374e+01, 0.1030928125552e+00, + 0.4610812906784e-07, 0.5858503336994e+01, 0.4337116142245e+00, + 0.3923022803444e-07, 0.3354170010125e+00, 0.1484170571900e-02, + 0.2610725582128e-07, 0.5410600646324e+01, 0.6327837846670e+00, + 0.2455279767721e-07, 0.6120216681403e+01, 0.1162474756779e+01, + 0.2375530706525e-07, 0.6055443426143e+01, 0.1052268489556e+01, + + 0.1782967577553e-07, 0.3146108708004e+01, 0.8460828644453e+00, + 0.1581687095238e-07, 0.6255496089819e+00, 0.3340612434717e+01, + 0.1594657672461e-07, 0.3782604300261e+01, 0.1066495398892e+01, + 0.1563448615040e-07, 0.1997775733196e+01, 0.2022531624851e+00, + 0.1463624258525e-07, 0.1736316792088e+00, 0.3516457698740e-01, + 0.1331585056673e-07, 0.4331941830747e+01, 0.9491756770005e+00, + 0.1130634557637e-07, 0.6152017751825e+01, 0.2968341143800e-02, + 0.1028949607145e-07, 0.2101792614637e+00, 0.2275259891141e+00, + 0.1024074971618e-07, 0.4071833211074e+01, 0.5070101000000e-01, + 0.8826956060303e-08, 0.4861633688145e+00, 0.2093666171530e+00, + + 0.8572230171541e-08, 0.5268190724302e+01, 0.4110125927500e-01, + 0.7649332643544e-08, 0.5134543417106e+01, 0.2608790314060e+02, + 0.8581673291033e-08, 0.2920218146681e+01, 0.1480791608091e+00, + 0.8430589300938e-08, 0.3604576619108e+01, 0.2172315424036e+00, + 0.7776165501012e-08, 0.3772942249792e+01, 0.6373574839730e-01, + 0.8311070234408e-08, 0.6200412329888e+01, 0.3235053470014e+00, + 0.6927365212582e-08, 0.4543353113437e+01, 0.8531963191132e+00, + 0.6791574208598e-08, 0.2882188406238e+01, 0.7181332454670e-01, + 0.5593100811839e-08, 0.1776646892780e+01, 0.7429900518901e+00, + 0.4553381853021e-08, 0.3949617611240e+01, 0.7775000683430e-01, + + 0.5758000450068e-08, 0.3859251775075e+01, 0.1990721704425e+00, + 0.4281283457133e-08, 0.1466294631206e+01, 0.2118763888447e+01, + 0.4206935661097e-08, 0.5421776011706e+01, 0.1104591729320e-01, + 0.4213751641837e-08, 0.3412048993322e+01, 0.2243449970715e+00, + 0.5310506239878e-08, 0.5421641370995e+00, 0.5154640627760e+00, + 0.3827450341320e-08, 0.8887314524995e+00, 0.1510475019529e+00, + 0.4292435241187e-08, 0.1405043757194e+01, 0.1422690933580e-01, + 0.3189780702289e-08, 0.1060049293445e+01, 0.1173197218910e+00, + 0.3226611928069e-08, 0.6270858897442e+01, 0.2164800718209e+00, + 0.2893897608830e-08, 0.5117563223301e+01, 0.6470106940028e+00, + + 0.3239852024578e-08, 0.4079092237983e+01, 0.2101180877357e+00, + 0.2956892222200e-08, 0.1594917021704e+01, 0.3092784376656e+00, + 0.2980177912437e-08, 0.5258787667564e+01, 0.4155522422634e+00, + 0.3163725690776e-08, 0.3854589225479e+01, 0.8582758298370e-01, + 0.2662262399118e-08, 0.3561326430187e+01, 0.5257585094865e+00, + 0.2766689135729e-08, 0.3180732086830e+00, 0.1385174140878e+00, + 0.2411600278464e-08, 0.3324798335058e+01, 0.5439178814476e+00, + 0.2483527695131e-08, 0.4169069291947e+00, 0.5336234347371e+00, + 0.7788777276590e-09, 0.1900569908215e+01, 0.5217580628120e+02 }; + +/* SSB-to-Sun, T^1, X */ + static const double s1x[] = { + -0.1296310361520e-07, 0.0000000000000e+00, 0.0000000000000e+00, + 0.8975769009438e-08, 0.1128891609250e+01, 0.4265981595566e+00, + 0.7771113441307e-08, 0.2706039877077e+01, 0.2061856251104e+00, + 0.7538303866642e-08, 0.2191281289498e+01, 0.2204125344462e+00, + 0.6061384579336e-08, 0.3248167319958e+01, 0.1059381944224e+01, + 0.5726994235594e-08, 0.5569981398610e+01, 0.5225775174439e+00, + 0.5616492836424e-08, 0.5057386614909e+01, 0.5368044267797e+00, + 0.1010881584769e-08, 0.3473577116095e+01, 0.7113454667900e-02, + 0.7259606157626e-09, 0.3651858593665e+00, 0.6398972393349e+00, + 0.8755095026935e-09, 0.1662835408338e+01, 0.4194847048887e+00, + + 0.5370491182812e-09, 0.1327673878077e+01, 0.4337116142245e+00, + 0.5743773887665e-09, 0.4250200846687e+01, 0.2132990797783e+00, + 0.4408103140300e-09, 0.3598752574277e+01, 0.1589072916335e+01, + 0.3101892374445e-09, 0.4887822983319e+01, 0.1052268489556e+01, + 0.3209453713578e-09, 0.9702272295114e+00, 0.5296909721118e+00, + 0.3017228286064e-09, 0.5484462275949e+01, 0.1066495398892e+01, + 0.3200700038601e-09, 0.2846613338643e+01, 0.1495633313810e+00, + 0.2137637279911e-09, 0.5692163292729e+00, 0.3163918923335e+00, + 0.1899686386727e-09, 0.2061077157189e+01, 0.2275259891141e+00, + 0.1401994545308e-09, 0.4177771136967e+01, 0.1102062672231e+00, + + 0.1578057810499e-09, 0.5782460597335e+01, 0.7626583626240e-01, + 0.1237713253351e-09, 0.5705900866881e+01, 0.5154640627760e+00, + 0.1313076837395e-09, 0.5163438179576e+01, 0.3664874755930e-01, + 0.1184963304860e-09, 0.3054804427242e+01, 0.6327837846670e+00, + 0.1238130878565e-09, 0.2317292575962e+01, 0.3961708870310e-01, + 0.1015959527736e-09, 0.2194643645526e+01, 0.7329749511860e-01, + 0.9017954423714e-10, 0.2868603545435e+01, 0.1990721704425e+00, + 0.8668024955603e-10, 0.4923849675082e+01, 0.5439178814476e+00, + 0.7756083930103e-10, 0.3014334135200e+01, 0.9491756770005e+00, + 0.7536503401741e-10, 0.2704886279769e+01, 0.1030928125552e+00, + + 0.5483308679332e-10, 0.6010983673799e+01, 0.8531963191132e+00, + 0.5184339620428e-10, 0.1952704573291e+01, 0.2093666171530e+00, + 0.5108658712030e-10, 0.2958575786649e+01, 0.2172315424036e+00, + 0.5019424524650e-10, 0.1736317621318e+01, 0.2164800718209e+00, + 0.4909312625978e-10, 0.3167216416257e+01, 0.2101180877357e+00, + 0.4456638901107e-10, 0.7697579923471e+00, 0.3235053470014e+00, + 0.4227030350925e-10, 0.3490910137928e+01, 0.6373574839730e-01, + 0.4095456040093e-10, 0.5178888984491e+00, 0.6470106940028e+00, + 0.4990537041422e-10, 0.3323887668974e+01, 0.1422690933580e-01, + 0.4321170010845e-10, 0.4288484987118e+01, 0.7358765972222e+00, + + 0.3544072091802e-10, 0.6021051579251e+01, 0.5265099800692e+00, + 0.3480198638687e-10, 0.4600027054714e+01, 0.5328719641544e+00, + 0.3440287244435e-10, 0.4349525970742e+01, 0.8582758298370e-01, + 0.3330628322713e-10, 0.2347391505082e+01, 0.1104591729320e-01, + 0.2973060707184e-10, 0.4789409286400e+01, 0.5257585094865e+00, + 0.2932606766089e-10, 0.5831693799927e+01, 0.5336234347371e+00, + 0.2876972310953e-10, 0.2692638514771e+01, 0.1173197218910e+00, + 0.2827488278556e-10, 0.2056052487960e+01, 0.2022531624851e+00, + 0.2515028239756e-10, 0.7411863262449e+00, 0.9597935788730e-01, + 0.2853033744415e-10, 0.3948481024894e+01, 0.2118763888447e+01 }; + +/* SSB-to-Sun, T^1, Y */ + static const double s1y[] = { + 0.8989047573576e-08, 0.5840593672122e+01, 0.4265981595566e+00, + 0.7815938401048e-08, 0.1129664707133e+01, 0.2061856251104e+00, + 0.7550926713280e-08, 0.6196589104845e+00, 0.2204125344462e+00, + 0.6056556925895e-08, 0.1677494667846e+01, 0.1059381944224e+01, + 0.5734142698204e-08, 0.4000920852962e+01, 0.5225775174439e+00, + 0.5614341822459e-08, 0.3486722577328e+01, 0.5368044267797e+00, + 0.1028678147656e-08, 0.1877141024787e+01, 0.7113454667900e-02, + 0.7270792075266e-09, 0.5077167301739e+01, 0.6398972393349e+00, + 0.8734141726040e-09, 0.9069550282609e-01, 0.4194847048887e+00, + 0.5377371402113e-09, 0.6039381844671e+01, 0.4337116142245e+00, + + 0.4729719431571e-09, 0.2153086311760e+01, 0.2132990797783e+00, + 0.4458052820973e-09, 0.5059830025565e+01, 0.5296909721118e+00, + 0.4406855467908e-09, 0.2027971692630e+01, 0.1589072916335e+01, + 0.3101659310977e-09, 0.3317677981860e+01, 0.1052268489556e+01, + 0.3016749232545e-09, 0.3913703482532e+01, 0.1066495398892e+01, + 0.3198541352656e-09, 0.1275513098525e+01, 0.1495633313810e+00, + 0.2142065389871e-09, 0.5301351614597e+01, 0.3163918923335e+00, + 0.1902615247592e-09, 0.4894943352736e+00, 0.2275259891141e+00, + 0.1613410990871e-09, 0.2449891130437e+01, 0.1102062672231e+00, + 0.1576992165097e-09, 0.4211421447633e+01, 0.7626583626240e-01, + + 0.1241637259894e-09, 0.4140803368133e+01, 0.5154640627760e+00, + 0.1313974830355e-09, 0.3591920305503e+01, 0.3664874755930e-01, + 0.1181697118258e-09, 0.1506314382788e+01, 0.6327837846670e+00, + 0.1238239742779e-09, 0.7461405378404e+00, 0.3961708870310e-01, + 0.1010107068241e-09, 0.6271010795475e+00, 0.7329749511860e-01, + 0.9226316616509e-10, 0.1259158839583e+01, 0.1990721704425e+00, + 0.8664946419555e-10, 0.3353244696934e+01, 0.5439178814476e+00, + 0.7757230468978e-10, 0.1447677295196e+01, 0.9491756770005e+00, + 0.7693168628139e-10, 0.1120509896721e+01, 0.1030928125552e+00, + 0.5487897454612e-10, 0.4439380426795e+01, 0.8531963191132e+00, + + 0.5196118677218e-10, 0.3788856619137e+00, 0.2093666171530e+00, + 0.5110853339935e-10, 0.1386879372016e+01, 0.2172315424036e+00, + 0.5027804534813e-10, 0.1647881805466e+00, 0.2164800718209e+00, + 0.4922485922674e-10, 0.1594315079862e+01, 0.2101180877357e+00, + 0.6155599524400e-10, 0.0000000000000e+00, 0.0000000000000e+00, + 0.4447147832161e-10, 0.5480720918976e+01, 0.3235053470014e+00, + 0.4144691276422e-10, 0.1931371033660e+01, 0.6373574839730e-01, + 0.4099950625452e-10, 0.5229611294335e+01, 0.6470106940028e+00, + 0.5060541682953e-10, 0.1731112486298e+01, 0.1422690933580e-01, + 0.4293615946300e-10, 0.2714571038925e+01, 0.7358765972222e+00, + + 0.3545659845763e-10, 0.4451041444634e+01, 0.5265099800692e+00, + 0.3479112041196e-10, 0.3029385448081e+01, 0.5328719641544e+00, + 0.3438516493570e-10, 0.2778507143731e+01, 0.8582758298370e-01, + 0.3297341285033e-10, 0.7898709807584e+00, 0.1104591729320e-01, + 0.2972585818015e-10, 0.3218785316973e+01, 0.5257585094865e+00, + 0.2931707295017e-10, 0.4260731012098e+01, 0.5336234347371e+00, + 0.2897198149403e-10, 0.1120753978101e+01, 0.1173197218910e+00, + 0.2832293240878e-10, 0.4597682717827e+00, 0.2022531624851e+00, + 0.2864348326612e-10, 0.2169939928448e+01, 0.9597935788730e-01, + 0.2852714675471e-10, 0.2377659870578e+01, 0.2118763888447e+01 }; + +/* SSB-to-Sun, T^1, Z */ + static const double s1z[] = { + 0.5444220475678e-08, 0.1803825509310e+01, 0.2132990797783e+00, + 0.3883412695596e-08, 0.4668616389392e+01, 0.5296909721118e+00, + 0.1334341434551e-08, 0.0000000000000e+00, 0.0000000000000e+00, + 0.3730001266883e-09, 0.5401405918943e+01, 0.2061856251104e+00, + 0.2894929197956e-09, 0.4932415609852e+01, 0.2204125344462e+00, + 0.2857950357701e-09, 0.3154625362131e+01, 0.7478166569050e-01, + 0.2499226432292e-09, 0.3657486128988e+01, 0.4265981595566e+00, + 0.1937705443593e-09, 0.5740434679002e+01, 0.1059381944224e+01, + 0.1374894396320e-09, 0.1712857366891e+01, 0.5368044267797e+00, + 0.1217248678408e-09, 0.2312090870932e+01, 0.5225775174439e+00, + + 0.7961052740870e-10, 0.5283368554163e+01, 0.3813291813120e-01, + 0.4979225949689e-10, 0.4298290471860e+01, 0.4194847048887e+00, + 0.4388552286597e-10, 0.6145515047406e+01, 0.7113454667900e-02, + 0.2586835212560e-10, 0.3019448001809e+01, 0.6398972393349e+00 }; + +/* SSB-to-Sun, T^2, X */ + static const double s2x[] = { + 0.1603551636587e-11, 0.4404109410481e+01, 0.2061856251104e+00, + 0.1556935889384e-11, 0.4818040873603e+00, 0.2204125344462e+00, + 0.1182594414915e-11, 0.9935762734472e+00, 0.5225775174439e+00, + 0.1158794583180e-11, 0.3353180966450e+01, 0.5368044267797e+00, + 0.9597358943932e-12, 0.5567045358298e+01, 0.2132990797783e+00, + 0.6511516579605e-12, 0.5630872420788e+01, 0.4265981595566e+00, + 0.7419792747688e-12, 0.2156188581957e+01, 0.5296909721118e+00, + 0.3951972655848e-12, 0.1981022541805e+01, 0.1059381944224e+01, + 0.4478223877045e-12, 0.0000000000000e+00, 0.0000000000000e+00 }; + +/* SSB-to-Sun, T^2, Y */ + static const double s2y[] = { + 0.1609114495091e-11, 0.2831096993481e+01, 0.2061856251104e+00, + 0.1560330784946e-11, 0.5193058213906e+01, 0.2204125344462e+00, + 0.1183535479202e-11, 0.5707003443890e+01, 0.5225775174439e+00, + 0.1158183066182e-11, 0.1782400404928e+01, 0.5368044267797e+00, + 0.1032868027407e-11, 0.4036925452011e+01, 0.2132990797783e+00, + 0.6540142847741e-12, 0.4058241056717e+01, 0.4265981595566e+00, + 0.7305236491596e-12, 0.6175401942957e+00, 0.5296909721118e+00, + -0.5580725052968e-12, 0.0000000000000e+00, 0.0000000000000e+00, + 0.3946122651015e-12, 0.4108265279171e+00, 0.1059381944224e+01 }; + +/* SSB-to-Sun, T^2, Z */ + static const double s2z[] = { + 0.3749920358054e-12, 0.3230285558668e+01, 0.2132990797783e+00, + 0.2735037220939e-12, 0.6154322683046e+01, 0.5296909721118e+00 }; + +/* Pointers to coefficient arrays, in x,y,z sets */ + static const double *ce0[] = { e0x, e0y, e0z }, + *ce1[] = { e1x, e1y, e1z }, + *ce2[] = { e2x, e2y, e2z }, + *cs0[] = { s0x, s0y, s0z }, + *cs1[] = { s1x, s1y, s1z }, + *cs2[] = { s2x, s2y, s2z }; + const double *coeffs; + +/* Numbers of terms for each component of the model, in x,y,z sets */ + static const int ne0[3] = {(int)(sizeof e0x / sizeof (double) / 3), + (int)(sizeof e0y / sizeof (double) / 3), + (int)(sizeof e0z / sizeof (double) / 3) }, + ne1[3] = {(int)(sizeof e1x / sizeof (double) / 3), + (int)(sizeof e1y / sizeof (double) / 3), + (int)(sizeof e1z / sizeof (double) / 3) }, + ne2[3] = {(int)(sizeof e2x / sizeof (double) / 3), + (int)(sizeof e2y / sizeof (double) / 3), + (int)(sizeof e2z / sizeof (double) / 3) }, + ns0[3] = {(int)(sizeof s0x / sizeof (double) / 3), + (int)(sizeof s0y / sizeof (double) / 3), + (int)(sizeof s0z / sizeof (double) / 3) }, + ns1[3] = {(int)(sizeof s1x / sizeof (double) / 3), + (int)(sizeof s1y / sizeof (double) / 3), + (int)(sizeof s1z / sizeof (double) / 3) }, + ns2[3] = {(int)(sizeof s2x / sizeof (double) / 3), + (int)(sizeof s2y / sizeof (double) / 3), + (int)(sizeof s2z / sizeof (double) / 3) }; + int nterms; + +/* Miscellaneous */ + int jstat, i, j; + double t, t2, xyz, xyzd, a, b, c, ct, p, cp, + ph[3], vh[3], pb[3], vb[3], x, y, z; + +/*--------------------------------------------------------------------*/ + +/* Time since reference epoch, Julian years. */ + t = ((date1 - DJ00) + date2) / DJY; + t2 = t*t; + +/* Set status. */ + jstat = fabs(t) <= 100.0 ? 0 : 1; + +/* X then Y then Z. */ + for (i = 0; i < 3; i++) { + + /* Initialize position and velocity component. */ + xyz = 0.0; + xyzd = 0.0; + + /* ------------------------------------------------ */ + /* Obtain component of Sun to Earth ecliptic vector */ + /* ------------------------------------------------ */ + + /* Sun to Earth, T^0 terms. */ + coeffs = ce0[i]; + nterms = ne0[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + p = b + c*t; + xyz += a*cos(p); + xyzd -= a*c*sin(p); + } + + /* Sun to Earth, T^1 terms. */ + coeffs = ce1[i]; + nterms = ne1[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + ct = c*t; + p = b + ct; + cp = cos(p); + xyz += a*t*cp; + xyzd += a*( cp - ct*sin(p) ); + } + + /* Sun to Earth, T^2 terms. */ + coeffs = ce2[i]; + nterms = ne2[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + ct = c*t; + p = b + ct; + cp = cos(p); + xyz += a*t2*cp; + xyzd += a*t*( 2.0*cp - ct*sin(p) ); + } + + /* Heliocentric Earth position and velocity component. */ + ph[i] = xyz; + vh[i] = xyzd / DJY; + + /* ------------------------------------------------ */ + /* Obtain component of SSB to Earth ecliptic vector */ + /* ------------------------------------------------ */ + + /* SSB to Sun, T^0 terms. */ + coeffs = cs0[i]; + nterms = ns0[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + p = b + c*t; + xyz += a*cos(p); + xyzd -= a*c*sin(p); + } + + /* SSB to Sun, T^1 terms. */ + coeffs = cs1[i]; + nterms = ns1[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + ct = c*t; + p = b + ct; + cp = cos(p); + xyz += a*t*cp; + xyzd += a*(cp - ct*sin(p)); + } + + /* SSB to Sun, T^2 terms. */ + coeffs = cs2[i]; + nterms = ns2[i]; + for (j = 0; j < nterms; j++) { + a = *coeffs++; + b = *coeffs++; + c = *coeffs++; + ct = c*t; + p = b + ct; + cp = cos(p); + xyz += a*t2*cp; + xyzd += a*t*(2.0*cp - ct*sin(p)); + } + + /* Barycentric Earth position and velocity component. */ + pb[i] = xyz; + vb[i] = xyzd / DJY; + + /* Next Cartesian component. */ + } + +/* Rotate from ecliptic to BCRS coordinates. */ + + x = ph[0]; + y = ph[1]; + z = ph[2]; + pvh[0][0] = x + am12*y + am13*z; + pvh[0][1] = am21*x + am22*y + am23*z; + pvh[0][2] = am32*y + am33*z; + + x = vh[0]; + y = vh[1]; + z = vh[2]; + pvh[1][0] = x + am12*y + am13*z; + pvh[1][1] = am21*x + am22*y + am23*z; + pvh[1][2] = am32*y + am33*z; + + x = pb[0]; + y = pb[1]; + z = pb[2]; + pvb[0][0] = x + am12*y + am13*z; + pvb[0][1] = am21*x + am22*y + am23*z; + pvb[0][2] = am32*y + am33*z; + + x = vb[0]; + y = vb[1]; + z = vb[2]; + pvb[1][0] = x + am12*y + am13*z; + pvb[1][1] = am21*x + am22*y + am23*z; + pvb[1][2] = am32*y + am33*z; + +/* Return the status. */ + return jstat; + +/*---------------------------------------------------------------------- +** +** Copyright (C) 2016 +** Standards Of Fundamental Astronomy Board +** of the International Astronomical Union. +** +** ===================== +** SOFA Software License +** ===================== +** +** NOTICE TO USER: +** +** BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING SIX TERMS AND +** CONDITIONS WHICH APPLY TO ITS USE. +** +** 1. The Software is owned by the IAU SOFA Board ("SOFA"). +** +** 2. Permission is granted to anyone to use the SOFA software for any +** purpose, including commercial applications, free of charge and +** without payment of royalties, subject to the conditions and +** restrictions listed below. +** +** 3. You (the user) may copy and distribute SOFA source code to others, +** and use and adapt its code and algorithms in your own software, +** on a world-wide, royalty-free basis. That portion of your +** distribution that does not consist of intact and unchanged copies +** of SOFA source code files is a "derived work" that must comply +** with the following requirements: +** +** a) Your work shall be marked or carry a statement that it +** (i) uses routines and computations derived by you from +** software provided by SOFA under license to you; and +** (ii) does not itself constitute software provided by and/or +** endorsed by SOFA. +** +** b) The source code of your derived work must contain descriptions +** of how the derived work is based upon, contains and/or differs +** from the original SOFA software. +** +** c) The names of all routines in your derived work shall not +** include the prefix "iau" or "sofa" or trivial modifications +** thereof such as changes of case. +** +** d) The origin of the SOFA components of your derived work must +** not be misrepresented; you must not claim that you wrote the +** original software, nor file a patent application for SOFA +** software or algorithms embedded in the SOFA software. +** +** e) These requirements must be reproduced intact in any source +** distribution and shall apply to anyone to whom you have +** granted a further right to modify the source code of your +** derived work. +** +** Note that, as originally distributed, the SOFA software is +** intended to be a definitive implementation of the IAU standards, +** and consequently third-party modifications are discouraged. All +** variations, no matter how minor, must be explicitly marked as +** such, as explained above. +** +** 4. You shall not cause the SOFA software to be brought into +** disrepute, either by misuse, or use for inappropriate tasks, or +** by inappropriate modification. +** +** 5. The SOFA software is provided "as is" and SOFA makes no warranty +** as to its use or performance. SOFA does not and cannot warrant +** the performance or results which the user may obtain by using the +** SOFA software. SOFA makes no warranties, express or implied, as +** to non-infringement of third party rights, merchantability, or +** fitness for any particular purpose. In no event will SOFA be +** liable to the user for any consequential, incidental, or special +** damages, including any lost profits or lost savings, even if a +** SOFA representative has been advised of such damages, or for any +** claim by any third party. +** +** 6. The provision of any version of the SOFA software under the terms +** and conditions specified herein does not imply that future +** versions will also be made available under the same terms and +** conditions. +* +** In any published work or commercial product which uses the SOFA +** software directly, acknowledgement (see www.iausofa.org) is +** appreciated. +** +** Correspondence concerning SOFA software should be addressed as +** follows: +** +** By email: sofa@ukho.gov.uk +** By post: IAU SOFA Center +** HM Nautical Almanac Office +** UK Hydrographic Office +** Admiralty Way, Taunton +** Somerset, TA1 2DN +** United Kingdom +** +**--------------------------------------------------------------------*/ +} diff -Nru opencpn-plugin-celestial-2.0.0/src/FindBodyDialog.cpp opencpn-plugin-celestial-2.3.0/src/FindBodyDialog.cpp --- opencpn-plugin-celestial-2.0.0/src/FindBodyDialog.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/FindBodyDialog.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -27,6 +27,7 @@ #include #include // toh, 2009.02.22 +#include #include "FindBodyDialog.h" @@ -36,14 +37,25 @@ #include "celestial_navigation_pi.h" #include "geodesic.h" -double FindBodyDialog::lat = -100, FindBodyDialog::lon; - FindBodyDialog::FindBodyDialog( wxWindow* parent, Sight &sight ) : FindBodyDialogBase(parent), m_Sight(sight) { - if(lat == -100) { - lat = celestial_navigation_pi_CursorLat(); - lon = celestial_navigation_pi_CursorLon(); + double lat, lon; + celestial_navigation_pi_BoatPos(lat, lon); + wxFileConfig *pConf = GetOCPNConfigObject(); + pConf->SetPath( _T("/PlugIns/CelestialNavigation/FindBody") ); + + bool boat_position; + pConf->Read( _T("BoatPosition"), &boat_position, true ); + m_cbBoatPosition->SetValue(boat_position); + + bool magnetic_azimuth; + pConf->Read( _T("MagneticAzimuth"), &magnetic_azimuth, false); + m_cbMagneticAzimuth->SetValue(magnetic_azimuth); + + if(!m_cbBoatPosition->GetValue()) { + pConf->Read( _T("Lat"), &lat, lat ); + pConf->Read( _T("Lon"), &lon, lon ); } m_tLatitude->SetValue(wxString::Format(_T("%.4f"), lat)); @@ -55,6 +67,15 @@ FindBodyDialog::~FindBodyDialog( ) { + wxFileConfig *pConf = GetOCPNConfigObject(); + pConf->SetPath( _T("/PlugIns/CelestialNavigation/FindBody") ); + pConf->Write( _T("BoatPosition"), m_cbBoatPosition->GetValue()); + pConf->Write( _T("MagneticAzimuth"), m_cbMagneticAzimuth->GetValue()); + double lat, lon; + if(m_tLatitude->GetValue().ToDouble(&lat)) + pConf->Write( _T("Lat"), lat ); + if(m_tLatitude->GetValue().ToDouble(&lon)) + pConf->Write( _T("Lon"), lon ); } extern "C" int geomag_calc(double latitude, double longitude, double alt, @@ -92,6 +113,6 @@ bearing -= results[0]; } - m_stAltitude->SetLabel(wxString::Format(_T("%f"), dist)); - m_stAzimuth->SetLabel(wxString::Format(_T("%f"), bearing)); + m_tAltitude->SetValue(wxString::Format(_T("%f"), dist)); + m_tAzimuth->SetValue(wxString::Format(_T("%f"), bearing)); } diff -Nru opencpn-plugin-celestial-2.0.0/src/FindBodyDialog.h opencpn-plugin-celestial-2.3.0/src/FindBodyDialog.h --- opencpn-plugin-celestial-2.0.0/src/FindBodyDialog.h 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/FindBodyDialog.h 2018-03-29 17:18:40.000000000 +0000 @@ -44,8 +44,6 @@ void Update(); Sight& m_Sight; - - static double lat, lon; }; #endif diff -Nru opencpn-plugin-celestial-2.0.0/src/FixDialog.cpp opencpn-plugin-celestial-2.3.0/src/FixDialog.cpp --- opencpn-plugin-celestial-2.0.0/src/FixDialog.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/FixDialog.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -33,6 +33,7 @@ #include "Sight.h" #include +using namespace std; FixDialog::FixDialog(wxWindow *parent) : FixDialogBase(parent), @@ -162,9 +163,8 @@ int day, int month, double year, double results[14]); -void FixDialog::Update(bool warnings) +void FixDialog::Update(int clock_offset, bool warnings) { - std::list &SightList = ((CelestialNavigationDialog*)GetParent())->m_SightList; std::list > J; std::list R; @@ -175,11 +175,12 @@ X[1] = cos(deg2rad(initiallat))*sin(deg2rad(initiallon)); X[2] = sin(deg2rad(initiallat)); + m_clock_offset = clock_offset; int iterations = 0; + wxListCtrl *lSights = ((CelestialNavigationDialog*)GetParent())->m_lSights; again: - - for (std::list::iterator it = SightList.begin(); it != SightList.end(); it++) { - Sight *s = *it; + for(int i = 0; iGetItemCount(); i++) { + Sight *s = (Sight*)wxUIntToPtr(lSights->GetItemData(i)); if(!s->IsVisible() || s->m_Type != Sight::ALTITUDE) continue; @@ -195,7 +196,7 @@ } double lat, lon; - s->BodyLocation(s->m_DateTime, &lat, &lon, 0, 0); + s->BodyLocation(s->m_DateTime + wxTimeSpan::Seconds(clock_offset), &lat, &lon, 0, 0); /* take vector from body location of length equal to normalized measurement (so the plane this vector diff -Nru opencpn-plugin-celestial-2.0.0/src/FixDialog.h opencpn-plugin-celestial-2.3.0/src/FixDialog.h --- opencpn-plugin-celestial-2.0.0/src/FixDialog.h 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/FixDialog.h 2018-03-29 17:18:40.000000000 +0000 @@ -38,13 +38,14 @@ { public: FixDialog(wxWindow *parent); - void Update(bool warnings); + void Update(int clock_offset, bool warnings); + int m_clock_offset; double m_fixlat, m_fixlon, m_fixerror; private: void OnGo( wxCommandEvent& event ); - void OnUpdate( wxCommandEvent& event ) { Update(false); } - void OnUpdateSpin( wxSpinEvent& event ) { Update(false); } + void OnUpdate( wxCommandEvent& event ) { Update(m_clock_offset, false); } + void OnUpdateSpin( wxSpinEvent& event ) { Update(m_clock_offset, false); } }; #endif diff -Nru opencpn-plugin-celestial-2.0.0/src/geomag/geomag.c opencpn-plugin-celestial-2.3.0/src/geomag/geomag.c --- opencpn-plugin-celestial-2.0.0/src/geomag/geomag.c 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/geomag/geomag.c 2018-03-29 17:18:40.000000000 +0000 @@ -130,7 +130,7 @@ #define IEXT 0 #define FALSE 0 #define TRUE 1 /* constants */ -#define RECL 81 +#define RECL 80 #define MAXINBUFF RECL+14 @@ -339,11 +339,12 @@ { fileline++; /* On new line */ + inbuff[strcspn(inbuff, "\r\n")] = 0; /* remove end of line */ if (strlen(inbuff) != RECL) /* IF incorrect record size */ { printf("Corrupt record in file %s on line %d.\n", mdfile, fileline); fclose(stream); - exit(5); + return -5; } /* New statement Dec 1999 changed by wmd required by year 2000 models */ @@ -355,7 +356,7 @@ { printf("Too many models in file %s on line %d.", mdfile, fileline); fclose(stream); - exit(6); + return -6; } irec_pos[modelI]=ftell(stream); diff -Nru opencpn-plugin-celestial-2.0.0/src/.gitignore opencpn-plugin-celestial-2.3.0/src/.gitignore --- opencpn-plugin-celestial-2.0.0/src/.gitignore 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/.gitignore 2018-03-29 17:18:40.000000000 +0000 @@ -1 +1,2 @@ version.h +wxWTranslateCatalog.h diff -Nru opencpn-plugin-celestial-2.0.0/src/Sight.cpp opencpn-plugin-celestial-2.3.0/src/Sight.cpp --- opencpn-plugin-celestial-2.0.0/src/Sight.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/Sight.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -37,6 +37,7 @@ #include "ocpn_plugin.h" #include "Sight.h" +#include "transform_star.hpp" WX_DEFINE_LIST ( wxRealPointList ); @@ -141,7 +142,7 @@ double jdd = ut_to_dt(jdu); double l, b, r; - double ra, dec; + double ra, dec, dra=0., ddec=0., radvel=0., parallax=0.; // nutation in longitude const double deltaPsi = nut_in_lon(jdd); @@ -193,6 +194,7 @@ } else { vPlanets planet; + vPlanets *planetPtr = &planet; if(!m_Body.Cmp(_T("Mercury"))) planet = vMercury; else if(!m_Body.Cmp(_T("Venus"))) @@ -204,73 +206,80 @@ else if(!m_Body.Cmp(_T("Saturn"))) planet = vSaturn; else { /* star maybe */ - if(!m_Body.Cmp(_T("Alpheratz"))) ra = 0.0365979981624047, dec = 0.508585349622516; - else if(!m_Body.Cmp(_T("Ankaa"))) ra = 0.289219237568502, dec = -0.738378993348721; - else if(!m_Body.Cmp(_T("Schedar"))) ra = 0.176746620828405, dec = 0.986762578179113; - else if(!m_Body.Cmp(_T("Diphda"))) ra = 0.190182710825649, dec = -0.284027125450659; - else if(!m_Body.Cmp(_T("Achernar"))) ra = 0.426358483543957, dec = -0.998969740640864; - else if(!m_Body.Cmp(_T("Hamal"))) ra = 0.554898863177301, dec = 0.409496532815273; - else if(!m_Body.Cmp(_T("Polaris"))) ra = 0.662403356568365, dec = 1.55795361238231; - else if(!m_Body.Cmp(_T("Acamar"))) ra = 0.777812962468281, dec = -0.703449961435399; - else if(!m_Body.Cmp(_T("Menkar"))) ra = 0.795346540133816, dec = 0.071379118269757; - else if(!m_Body.Cmp(_T("Mirfak"))) ra = 0.891528726329137, dec = 0.870240557591617; - else if(!m_Body.Cmp(_T("Aldebaran"))) ra = 1.20393095418572, dec = 0.288141690680868; - else if(!m_Body.Cmp(_T("Rigel"))) ra = 1.37243034888306, dec = -0.143145651152089; - else if(!m_Body.Cmp(_T("Capella"))) ra = 1.38181782770328, dec = 0.802816394191974; - else if(!m_Body.Cmp(_T("Bellatrix"))) ra = 1.41865452145751, dec = 0.110823559364829; - else if(!m_Body.Cmp(_T("Elnath"))) ra = 1.42371695076379, dec = 0.499297460743863; - else if(!m_Body.Cmp(_T("Alnilam"))) ra = 1.46700741394297, dec = -0.0209774031679285; - else if(!m_Body.Cmp(_T("Betelgeuse"))) ra = 1.54972913370916, dec = 0.129277633374139; - else if(!m_Body.Cmp(_T("Canopus"))) ra = 1.67530590791159, dec = -0.919712778207749; - else if(!m_Body.Cmp(_T("Sirius"))) ra = 1.76779435200004, dec = -0.291751259436422; - else if(!m_Body.Cmp(_T("Adhara"))) ra = 1.82660341749553, dec = -0.505655821260435; - else if(!m_Body.Cmp(_T("Procyon"))) ra = 2.00406704139727, dec = 0.0911692127326482; - else if(!m_Body.Cmp(_T("Pollux"))) ra = 2.03035606325544, dec = 0.489152763555466; - else if(!m_Body.Cmp(_T("Avior"))) ra = 2.19262805045961, dec = -1.03864058972501; - else if(!m_Body.Cmp(_T("Suhail"))) ra = 2.3910865308218, dec = -0.758040127372437; - else if(!m_Body.Cmp(_T("Miaplacidus"))) ra = 2.41379035550816, dec = -1.21679507312234; - else if(!m_Body.Cmp(_T("Alphard"))) ra = 2.47656717980308, dec = -0.151121122246412; - else if(!m_Body.Cmp(_T("Regulus"))) ra = 2.65435490407471, dec = 0.20886743009561; - else if(!m_Body.Cmp(_T("Dubhe"))) ra = 2.65435490407471, dec = 0.20886743009561; - else if(!m_Body.Cmp(_T("Denebola"))) ra = 3.09385626957378, dec = 0.254330430646302; - else if(!m_Body.Cmp(_T("Gienah"))) ra = 3.21056008074728, dec = -0.306164425958095; - else if(!m_Body.Cmp(_T("Acrux"))) ra = 3.25764947120958, dec = -1.10128690460105; - else if(!m_Body.Cmp(_T("Gacrux"))) ra = 3.2775756189358, dec = -0.996815713455695; - else if(!m_Body.Cmp(_T("Alioth"))) ra = 3.37732845789249, dec = 0.97668334053394; - else if(!m_Body.Cmp(_T("Spica"))) ra = 3.51331719009724, dec = -0.194801816805651; - else if(!m_Body.Cmp(_T("Alkaid"))) ra = 3.61082442298847, dec = 0.860680031800137; - else if(!m_Body.Cmp(_T("Hadar"))) ra = 3.68187386795507, dec = -1.0537085989339; - else if(!m_Body.Cmp(_T("Menkent"))) ra = 3.69437478872248, dec = -0.634753462707325; - else if(!m_Body.Cmp(_T("Arcturus"))) ra = 3.73352834160889, dec = 0.334792935627001; - else if(!m_Body.Cmp(_T("Rigil"))) ra = 3.83801502982356, dec = -1.06175315112964; - else if(!m_Body.Cmp(_T("Zubenelgenubi"))) ra = 3.88635809755977, dec = -0.279201774882576; - else if(!m_Body.Cmp(_T("Kochab"))) ra = 3.88643372849402, dec = 1.29425860309002; - else if(!m_Body.Cmp(_T("Alphecca"))) ra = 4.07834490432777, dec = 0.466259352479109; - else if(!m_Body.Cmp(_T("Antares"))) ra = 4.31707190480797, dec = -0.461324458259779; - else if(!m_Body.Cmp(_T("Atria"))) ra = 4.40113132490715, dec = -1.2047619975572; - else if(!m_Body.Cmp(_T("Sabik"))) ra = 4.49587361446958, dec = -0.274451570435065; - else if(!m_Body.Cmp(_T("Shaula"))) ra = 4.59724088298436, dec = 0.647730470509584; - else if(!m_Body.Cmp(_T("Rasalhague"))) ra = 4.6030222861316, dec = 0.219213354050488; - else if(!m_Body.Cmp(_T("Eltanin"))) ra = 4.6975827705636, dec = 0.898652093745679; - else if(!m_Body.Cmp(_T("Kaus Australis"))) ra = 4.81785922708271, dec = -0.600124675906715; - else if(!m_Body.Cmp(_T("Vega"))) ra = 4.87356551168385, dec = 0.676903120509757; - else if(!m_Body.Cmp(_T("Nunki"))) ra = 4.95353021482492, dec = -0.458964385260138; - else if(!m_Body.Cmp(_T("Altair"))) ra = 5.1957723884129, dec = 0.154781417057421; - else if(!m_Body.Cmp(_T("Peacock"))) ra = 5.34789972206191, dec = -0.964556211114666; - else if(!m_Body.Cmp(_T("Deneb"))) ra = 5.41676750546352, dec = 0.790289933439844; - else if(!m_Body.Cmp(_T("Enif"))) ra = 5.69058479415959, dec = 0.172351457559912; - else if(!m_Body.Cmp(_T("Al Na'ir"))) ra = 5.7955112253515, dec = -0.819623585215376; - else if(!m_Body.Cmp(_T("Fomalhaut"))) ra = 6.01113938223019, dec = -0.517005309535209; - else if(!m_Body.Cmp(_T("Markab"))) ra = 6.04216260968439, dec = 0.265381676088868; + planetPtr = NULL; +/* Numbers from http://simbad.u-strasbg.fr */ +#define IFDEC_STAR(name,rahh,ramm,rass,drax,decdd,decmm,decss,ddecx,radvelx,parallaxx) if(!m_Body.Cmp(_T(name))) ra = (rahh+(ramm+rass/60.)/60.)/12.*pi, dra = drax, dec = (decdd>0?1.:-1.)*(abs(decdd)+(decmm+decss/60.)/60.)/180.*pi, ddec = ddecx, radvel = radvelx, parallax = parallaxx; + IFDEC_STAR("Alpheratz",0,8,23.25988,137.46,29,5,25.5520,-163.44,-10.10,33.62) + else IFDEC_STAR("Ankaa",0,26,17.05140,233.05,-42,18,21.55,-356.30,74.6,38.5) + else IFDEC_STAR("Schedar",0,40,30.44107,50.88,56,32,14.3922,-32.13,-4.31,14.29) + else IFDEC_STAR("Diphda",0,43,35.37090,232.55,-17,59,11.7827,31.99,13.32,33.86) + else IFDEC_STAR("Achernar",1,37,42.84548,87.00,-57,14,12.31,-38.24,18.60,23.39) + else IFDEC_STAR("Hamal",2,7,10.40570,188.55,23,27,44.7032,-148.08,-14.64,49.56) + else IFDEC_STAR("Polaris",2,31,49.09456,44.48,89,15,50.7923,-11.85,-16.42,7.54) + else IFDEC_STAR("Acamar",2,58,15.696,-44.6,-40,18,16.97,19.0,11.9,28.00) + else IFDEC_STAR("Menkar",3,2,16.77307,-10.41,4,5,23.0596,-76.85,-26.08,13.09) + else IFDEC_STAR("Mirfak",3,24,19.37009,23.75,49,51,40.2455,-26.23,-2.04,6.44) + else IFDEC_STAR("Aldebaran",4,35,55.23907,63.45,16,30,33.4885,-188.94,54.26,48.94) + else IFDEC_STAR("Rigel",5,14,32.27210,1.31,-8,12,5.8981,0.50,17.80,3.78) + else IFDEC_STAR("Capella",5,16,41.35871,75.25,45,59,52.7693,-426.89,29.19,76.2) + else IFDEC_STAR("Bellatrix",5,25,7.86325,-8.11,6,20,58.9318,-12.88,18.2,12.92) + else IFDEC_STAR("Elnath",5,26,17.51312,22.76,28,36,26.8262,-173.58,9.2,24.36) + else IFDEC_STAR("Alnilam",5,36,12.81335,1.44,-1,12,6.9089,-0.78,27.30,1.65) + else IFDEC_STAR("Betelgeuse",5,55,10.30536,27.54,7,24,25.4304,11.30,21.91,6.55) + else IFDEC_STAR("Canopus",6,23,57.10988,19.93,-52,41,44.3810,23.24,20.30,10.55) + else IFDEC_STAR("Sirius",6,45,8.91728,-546.01,-16,42,58.0171,-1223.07,-5.50,379.21) + else IFDEC_STAR("Adhara",6,58,37.54876,3.24,-28,58,19.5102,1.33,27.30,8.05) + else IFDEC_STAR("Procyon",7,39,18.11950,-714.59,5,13,29.9552,-1036.80,-3.2,284.56) + else IFDEC_STAR("Pollux",7,45,18.94987,-626.55,28,1,34.3160,-45.80,3.23,96.54) + else IFDEC_STAR("Avior",8,22,30.83526,-25.52,-59,30,34.1431,22.06,11.60,5.39) + else IFDEC_STAR("Suhail",9,7,59.75787,-24.01,-43,25,57.3273,13.52,17.60,5.99) + else IFDEC_STAR("Miaplacidus",9,13,11.97746,-156.47,-69,43,1.9473,108.95,-5.10,28.82) + else IFDEC_STAR("Alphard",9,27,35.24270,-15.23,-8,39,30.9583,34.37,-4.27,18.09) + else IFDEC_STAR("Regulus",10,8,22.31099,-248.73,11,58,1.9516,5.59,5.9,41.13) + else IFDEC_STAR("Dubhe",11,3,43.67152,-134.11,61,45,3.7249,-34.70,-9.40,26.54) + else IFDEC_STAR("Denebola",11,49,3.57834,-497.68,14,34,19.4090,-114.67,-0.20,90.91) + else IFDEC_STAR("Gienah",12,15,48.37081,-158.61,-17,32,30.9496,21.86,-4.2,21.23) + else IFDEC_STAR("Acrux",12,26,35.871,-35.3,-63,5,56.58,-12.0,-11.2,0.0) + else IFDEC_STAR("Gacrux",12,31,9.95961,28.23,-57,6,47.5684,-265.08,21.00,36.83) + else IFDEC_STAR("Alioth",12,54,1.74959,111.91,55,57,35.3627,-8.24,-12.70,39.51) + else IFDEC_STAR("Spica",13,25,11.57937,-42.35,-11,9,40.7501,-30.67,1.0,13.06) + else IFDEC_STAR("Alkaid",13,47,32.43776,-121.17,49,18,47.7602,-14.91,-13.40,31.38) + else IFDEC_STAR("Hadar",14,3,49.40535,-33.27,-60,22,22.9266,-23.16,5.90,8.32) + else IFDEC_STAR("Menkent",14,6,40.94752,-520.53,-36,22,11.8371,-518.06,1.30,55.45) + else IFDEC_STAR("Arcturus",14,15,39.67207,-1093.39,19,10,56.6730,-2000.06,-5.19,88.83) + else IFDEC_STAR("Rigil",14,39,36.49400,-3679.25,-60,50,2.3737,473.67,-21.40,754.81) + else IFDEC_STAR("Zubenelgenubi",14,50,52.71309,-105.68,-16,2,30.3955,-68.40,-10.,43.03) + else IFDEC_STAR("Kochab",14,50,42.32580,-32.61,74,9,19.8142,11.42,16.96,24.91) + else IFDEC_STAR("Alphecca",15,34,41.26800,120.27,26,42,52.8940,-89.58,1.7,43.46) + else IFDEC_STAR("Antares",16,29,24.45970,-12.11,-26,25,55.2094,-23.30,-3.50,5.89) + else IFDEC_STAR("Atria",16,48,39.89508,17.99,-69,01,39.7626,-31.58,-3.00,8.35) + else IFDEC_STAR("Sabik",17,10,22.68689,40.13,-15,43,29.6639,99.17,-2.40,36.91) + else IFDEC_STAR("Shaula",17,33,36.52012,-8.53,-37,6,13.7648,-30.80,-3.00,5.71) + else IFDEC_STAR("Rasalhague",17,34,56.06945,108.07,12,33,36.1346,-221.57,11.70,67.13) + else IFDEC_STAR("Eltanin",17,56,36.36988,-8.48,51,29,20.0242,-22.79,-27.91,21.14) + else IFDEC_STAR("Kaus Australis",18,24,10.31840,-39.42,-34,23,4.6193,-124.20,-15.00,22.76) + else IFDEC_STAR("Vega",18,36,56.33635,200.94,38,47,1.2802,286.23,-20.60,130.23) + else IFDEC_STAR("Nunki",18,55,15.92650,15.14,-26,17,48.2068,-53.43,-11.2,14.32) + else IFDEC_STAR("Altair",19,50,46.99855,536.23,8,52,5.9563,385.29,-26.60,194.95) + else IFDEC_STAR("Peacock",20,25,38.85705,6.90,-56,44,6.3230,-86.02,2.0,18.24) + else IFDEC_STAR("Deneb",20,41,25.91514,2.01,45,16,49.2197,1.85,-4.90,2.31) + else IFDEC_STAR("Enif",21,44,11.15614,26.92,9,52,30.0311,0.44,3.39,4.73) + else IFDEC_STAR("Al Na'ir",22,8,13.98473,126.69,-46,57,39.5078,-147.47,10.90,32.29) + else IFDEC_STAR("Fomalhaut",22,57,39.04625,328.95,-29,37,20.0533,-164.67,6.50,129.81) + else IFDEC_STAR("Scheat",23,3,46.45746,187.65,28,4,58.0336,136.93,7.99,16.64) + else IFDEC_STAR("Markab",23,4,45.65345,60.40,15,12,18.9617,-41.30,-2.70,24.46) else { wxString s; s.Printf ( _T ( "Unknown celestial body: " ) + m_Body); wxLogMessage ( s ); } - goto notplanet; + proper_motion_parallax(jdd,ra,dec,dra,ddec,radvel,parallax); + frame_bias(ra,dec); + precess(jdd,ra,dec); + nutate(jdd,ra,dec); } - geocentric_planet(jdd, planet, deltaPsi, eps, days_per_second, ra, dec); - notplanet:; + if (planetPtr != NULL) + geocentric_planet(jdd, planet, deltaPsi, eps, days_per_second, ra, dec); } // account for earth's hour angle @@ -704,7 +713,7 @@ /* Apparent Altitude Ha */ double ApparentAltitudeMoon = m_LunarMoonAltitude - IndexCorrection - EyeHeightCorrection; m_CalcStr+=wxString::Format(_("\nApparent Moon Altitude (Ha)\n\ -ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n \ +ApparentAltitudeMoon = MeasurementMoon - IndexCorrection - EyeHeightCorrection\n\ ApparentAltitudeMoon = %.4f - %.4f - %.4f\n\ ApparentAltitudeMoon = %.4f\n"), m_LunarMoonAltitude, IndexCorrection, EyeHeightCorrection, ApparentAltitudeMoon); @@ -766,7 +775,7 @@ ParallaxCorrectionMoon = -r_to_d(asin(sin(d_to_r(lunar_HP))*cos(d_to_r(CorrectedAltitudeMoon)))); m_CalcStr+=wxString::Format(_("\ -ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n \ +ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * HP ) * cos(Pi/180 * CorrectedAltitude))\n\ ParallaxCorrectionMoon = -180/Pi * asin( sin(Pi/180 * %.4f ) * cos(Pi/180 * %.4f))\n\ ParallaxCorrectionMoon = %.4f\n"), lunar_HP, CorrectedAltitudeMoon, ParallaxCorrectionMoon); @@ -775,8 +784,8 @@ /* Apparent Altitude Ha */ double ApparentAltitude = m_LunarBodyAltitude - IndexCorrection - EyeHeightCorrection; - m_CalcStr+=wxString::Format(_("\nApparent Altitude (Ha)\n\ -ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n \ + m_CalcStr+=wxString::Format(_("\nApparent Altitude (Ha)\n\ +ApparentAltitude = Measurement - IndexCorrection - EyeHeightCorrection\n\ ApparentAltitude = %.4f - %.4f - %.4f\n\ ApparentAltitude = %.4f\n"), m_LunarBodyAltitude, IndexCorrection, EyeHeightCorrection, ApparentAltitude); diff -Nru opencpn-plugin-celestial-2.0.0/src/SightDialog.cpp opencpn-plugin-celestial-2.3.0/src/SightDialog.cpp --- opencpn-plugin-celestial-2.0.0/src/SightDialog.cpp 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/SightDialog.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -51,62 +51,62 @@ m_cBody->Append(_T("Jupiter")); m_cBody->Append(_T("Saturn")); - m_cBody->Append(_T("Alpheratz")); - m_cBody->Append(_T("Ankaa")); - m_cBody->Append(_T("Achernar")); m_cBody->Append(_T("Acamar")); + m_cBody->Append(_T("Achernar")); m_cBody->Append(_T("Acrux")); + m_cBody->Append(_T("Adhara")); m_cBody->Append(_T("Alioth")); m_cBody->Append(_T("Alkaid")); m_cBody->Append(_T("Aldebaran")); + m_cBody->Append(_T("Al Na'ir")); m_cBody->Append(_T("Alnilam")); - m_cBody->Append(_T("Adhara")); - m_cBody->Append(_T("Avior")); m_cBody->Append(_T("Alphard")); - m_cBody->Append(_T("Arcturus")); m_cBody->Append(_T("Alphecca")); + m_cBody->Append(_T("Alpheratz")); + m_cBody->Append(_T("Altair")); + m_cBody->Append(_T("Ankaa")); m_cBody->Append(_T("Antares")); + m_cBody->Append(_T("Arcturus")); m_cBody->Append(_T("Atria")); - m_cBody->Append(_T("Altair")); - m_cBody->Append(_T("Al Na'ir")); + m_cBody->Append(_T("Avior")); m_cBody->Append(_T("Bellatrix")); m_cBody->Append(_T("Betelgeuse")); m_cBody->Append(_T("Canopus")); m_cBody->Append(_T("Capella")); - m_cBody->Append(_T("Diphda")); m_cBody->Append(_T("Deneb")); - m_cBody->Append(_T("Dubhe")); m_cBody->Append(_T("Denebola")); + m_cBody->Append(_T("Diphda")); + m_cBody->Append(_T("Dubhe")); m_cBody->Append(_T("Eltanin")); - m_cBody->Append(_T("Enif")); m_cBody->Append(_T("Elnath")); + m_cBody->Append(_T("Enif")); m_cBody->Append(_T("Fomalhaut")); - m_cBody->Append(_T("Gienah")); m_cBody->Append(_T("Gacrux")); + m_cBody->Append(_T("Gienah")); + m_cBody->Append(_T("Hadar")); m_cBody->Append(_T("Hamal")); + m_cBody->Append(_T("Kaus Australis")); m_cBody->Append(_T("Kochab")); - m_cBody->Append(_T("Kaus")); - m_cBody->Append(_T("Hadar")); + m_cBody->Append(_T("Markab")); m_cBody->Append(_T("Menkar")); - m_cBody->Append(_T("Mirfak")); m_cBody->Append(_T("Menkent")); - m_cBody->Append(_T("Markab")); m_cBody->Append(_T("Miaplacidus")); + m_cBody->Append(_T("Mirfak")); m_cBody->Append(_T("Nunki")); - m_cBody->Append(_T("Procyon")); - m_cBody->Append(_T("Polaris")); m_cBody->Append(_T("Peacock")); + m_cBody->Append(_T("Polaris")); m_cBody->Append(_T("Pollux")); + m_cBody->Append(_T("Procyon")); + m_cBody->Append(_T("Rasalhague")); m_cBody->Append(_T("Regulus")); - m_cBody->Append(_T("Rigil")); m_cBody->Append(_T("Rigel")); - m_cBody->Append(_T("Rasalhague")); - m_cBody->Append(_T("Sirius")); - m_cBody->Append(_T("Suhail")); - m_cBody->Append(_T("Schedar")); - m_cBody->Append(_T("Spica")); + m_cBody->Append(_T("Rigil")); m_cBody->Append(_T("Sabik")); + m_cBody->Append(_T("Schedar")); m_cBody->Append(_T("Shaula")); + m_cBody->Append(_T("Sirius")); + m_cBody->Append(_T("Spica")); + m_cBody->Append(_T("Suhail")); m_cBody->Append(_T("Vega")); m_cBody->Append(_T("Zubenelgenubi")); @@ -115,7 +115,19 @@ // SetColorScheme((ColorScheme)0); GetSizer()->SetSizeHints(this); - Centre(); + + wxFileConfig *pConf = GetOCPNConfigObject(); + pConf->SetPath( _T("/PlugIns/CelestialNavigation") ); + + wxPoint p = GetPosition(); + pConf->Read ( _T ( "SightsDialogX" ), &p.x, p.x); + pConf->Read ( _T ( "SightsDialogY" ), &p.y, p.y); + SetPosition(p); + + wxSize sz = GetSize(); + pConf->Read ( _T ( "SightsDialogWidth" ), &sz.x, sz.x); + pConf->Read ( _T ( "SightsDialogHeight" ), &sz.y, sz.y); + SetSize(sz); m_cType->SetSelection(m_Sight.m_Type); @@ -173,6 +185,17 @@ _("Warning"), wxOK | wxICON_WARNING ); w.ShowModal(); } + + wxFileConfig *pConf = GetOCPNConfigObject(); + pConf->SetPath( _T("/PlugIns/CelestialNavigation") ); + + wxPoint p = GetPosition(); + pConf->Write ( _T ( "SightsDialogX" ), p.x); + pConf->Write ( _T ( "SightsDialogY" ), p.y); + + wxSize s = GetSize(); + pConf->Write ( _T ( "SightsDialogWidth" ), s.x); + pConf->Write ( _T ( "SightsDialogHeight" ), s.y); } #if 0 @@ -303,8 +326,8 @@ double SightDialog::BodyAltitude(wxString body) { Sight lunar(Sight::ALTITUDE, body, Sight::CENTER, wxDateTime::Now(), 0, 0, 0); - double lat1 = celestial_navigation_pi_CursorLat(), lat2; - double lon1 = celestial_navigation_pi_CursorLon(), lon2; + double lat1, lat2, lon1, lon2; + celestial_navigation_pi_BoatPos(lat1, lon1); lunar.BodyLocation(lunar.m_DateTime, &lat2, &lon2, 0, 0); double bearing, dist; ll_gc_ll_reverse(lat1, lon1, lat2, lon2, &bearing, &dist); diff -Nru opencpn-plugin-celestial-2.0.0/src/transform_star.cpp opencpn-plugin-celestial-2.3.0/src/transform_star.cpp --- opencpn-plugin-celestial-2.0.0/src/transform_star.cpp 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/transform_star.cpp 2018-03-29 17:18:40.000000000 +0000 @@ -0,0 +1,234 @@ +#include "cmath" +#include "astrolabe/astrolabe.hpp" + +using namespace astrolabe; +using namespace astrolabe::calendar; +using namespace astrolabe::nutation; + +/* Equations come from +United States Naval Observatory Circular No. 179: +The IAU Resolutions on Astronomical Reference Systems, Time Scales, and Earth Rotation Models: +Explanation and Implementation +by +George H. Kaplan + +Downloaded from http://aa.usno.navy.mil/publications/docs/Circular_179.pdf */ + + +const double mas_to_rad = 4.8481368110953599359e-9; // radians per milli-arc-second */ +const double as_to_rad = 4.8481368110953599359e-6; // radians per arc second */ +const double J2000 = cal_to_jd(2000,1,1.5,true); // 2000 January 1.5 + + +void frame_bias (double &ra, double &dec) { + +double r[3], x[3], B[3][3]; +int i,j; + +// eq. 5.1 or 3.2 from Circular 179: + +r[0] = cos(ra) * cos(dec); +r[1] = sin(ra) * cos(dec); +r[2] = sin(dec); + +const double deltaAlpha_0 = -14.6 * mas_to_rad; +const double xi_0 = -16.6170 * mas_to_rad; +const double eta_0 = -6.8192 * mas_to_rad; + +// eq. 3.3 from Circular 179: + +B[0][0] = 1.; +B[0][1] = deltaAlpha_0; +B[0][2] = -xi_0; +B[1][0] = -deltaAlpha_0; +B[1][1] = 1.; +B[1][2] = -eta_0; +B[2][0] = xi_0; +B[2][1] = eta_0; +B[2][2] = 1.; + +for(i=0;i<3;++i) { + x[i] = 0.; + for (j=0;j<3;++j) + x[i] += B[i][j] * r[j]; +} + +// eq. 5.2 from Circular 179: + +ra = atan2(x[1], x[0]); +dec = atan2(x[2],sqrt(x[0]*x[0] + x[1]*x[1])); + +} + +void nutate (double jdd, double &ra, double &dec) { + +double r[3], x[3], N[3][3]; +int i,j; + +// eq. 5.1 from Circular 179: + +r[0] = cos(ra) * cos(dec); +r[1] = sin(ra) * cos(dec); +r[2] = sin(dec); + +// nutation in longitude +const double deltaPsi = nut_in_lon(jdd); + +// nutation in obliquity +const double deltaEps = nut_in_obl(jdd); + +// mean obliquity +const double eps = obliquity(jdd); + +// true obliquity +const double epsPrime = eps + deltaEps; + +// eq. 5.20 from Circular 179: + +double S1 = sin(eps), S2 = sin(-deltaPsi), S3 = sin(-epsPrime); +double C1 = cos(eps), C2 = cos(-deltaPsi), C3 = cos(-epsPrime); + +// eq. 5.21 from Circular 179: + +N[0][0] = C2; +N[0][1] = S2*C1; +N[0][2] = S2*S1; +N[1][0] = -S2*C3; +N[1][1] = C3*C2*C1 - S1*S3; +N[1][2] = C3*C2*S1 + C1*S3; +N[2][0] = S2*S3; +N[2][1] = -S3*C2*C1 - S1*C3; +N[2][2] = -S3*C2*S1 + C3*C1; + +for(i=0;i<3;++i) { + x[i] = 0.; + for (j=0;j<3;++j) + x[i] += N[i][j] * r[j]; +} + +// eq. 5.2 from Circular 179: + +ra = atan2(x[1], x[0]); +dec = atan2(x[2],sqrt(x[0]*x[0] + x[1]*x[1])); + +} + +void precess (double jdd, double &ra, double &dec) { + +const double eps_0 = obliquity(J2000)/as_to_rad; //obliquity of the ecliptic at J2000.0 + +double psi_a, om_a, chi_a; +double r[3], x[3], P[3][3]; +int i,j; + +#define sinas(x) sin(as_to_rad * x) +#define cosas(x) cos(as_to_rad * x) + +if( jdd == J2000 ) + return; + +// eq. 5.1 from Circular 179: + +r[0] = cos(ra) * cos(dec); +r[1] = sin(ra) * cos(dec); +r[2] = sin(dec); + +double T = (jdd - J2000)/36525.0; + +// eq. 5.8 from Circular 179: + +psi_a = (((( - 0.0000000951 * T + + 0.000132851 ) * T + - 0.00114045 ) * T + - 1.0790069 ) * T + + 5038.481507 ) * T; + +om_a = (((( + 0.0000003337 * T + - 0.000000467 ) * T + - 0.00772503 ) * T + + 0.0512623 ) * T + - 0.025754 ) * T + eps_0; + +chi_a = (((( - 0.0000000560 * T + + 0.000170663 ) * T + - 0.00121197 ) * T + - 2.3814292 ) * T + + 10.556403 ) * T; + +// eq. 5.9 from Circular 179: + +double S1 = sinas(eps_0), S2 = sinas(-psi_a), S3 = sinas(-om_a), S4 = sinas(chi_a); +double C1 = cosas(eps_0), C2 = cosas(-psi_a), C3 = cosas(-om_a), C4 = cosas(chi_a); + +// eq. 5.10 from Circular 179: + +P[0][0] = C4*C2 - S2*S4*C3; +P[0][1] = C4*S2*C1 + S4*C3*C2*C1 - S1*S4*S3; +P[0][2] = C4*S2*S1 + S4*C3*C2*S1 + C1*S4*S3; +P[1][0] = -S4*C2 - S2*C4*C3; +P[1][1] = -S4*S2*C1 + C4*C3*C2*C1 - S1*C4*S3; +P[1][2] = -S4*S2*S1 + C4*C3*C2*S1 + C1*C4*S3; +P[2][0] = S2*S3; +P[2][1] = -S3*C2*C1 - S1*C3; +P[2][2] = -S3*C2*S1 + C3*C1; + +for(i=0;i<3;++i) { + x[i] = 0.; + for (j=0;j<3;++j) + x[i] += P[i][j] * r[j]; +} + +// eq. 5.2 from Circular 179: + +ra = atan2(x[1], x[0]); +dec = atan2(x[2],sqrt(x[0]*x[0] + x[1]*x[1])); + +} + +int iauEpv00_wrapper(double date, double* pob); + +void proper_motion_parallax (double jdd, double &ra, double &dec, double dra, double ddec, double radvel, double parallax) { + +/* based on function pmpx from the sofa library - http://www.iausofa.org */ + +double pob[3]; + +double r[3], pm[3]; +int i; + +// eq. 5.1 from Circular 179: + +r[0] = cos(ra) * cos(dec); +r[1] = sin(ra) * cos(dec); +r[2] = sin(dec); + +dra = atan2 ( dra * mas_to_rad , cos(dec) ); // convert from milli-arcsec * cos(doc) to radians per year +ddec = ddec * mas_to_rad; // convert from milli-arcsec to radians per year +parallax = parallax * mas_to_rad; // convert from milli-arcsec to radians + +iauEpv00_wrapper(jdd, &pob[0]); //get barycentric Earth position + +//std::cout << "POB vector: " << pob[0] << ", " << pob[1] << ", " << pob[2] << endl; + +double T = (jdd - J2000)/365.25; /* in Julian years - not centuries! */ + +double w = parallax * radvel * 86400.0 * 365250.0 / 1.49597870e11; // parallax in radians * radvel in AU/year +double pdz = ddec * r[2]; + +pm[0] = -dra * r[1] - pdz * cos(ra) + w * r[0]; +pm[1] = dra * r[0] - pdz * sin(ra) + w * r[1]; +pm[2] = ddec * cos(dec) + w * r[2]; + +for(i=0;i<3;++i) { + r[i] += T * pm[i] - parallax * pob[i]; +} +// note: at this stage r is no longer a unit vector - but this doesn't matter + +// eq. 5.2 from Circular 179: + +ra = atan2(r[1], r[0]); +dec = atan2(r[2],sqrt(r[0]*r[0] + r[1]*r[1])); + +} + + diff -Nru opencpn-plugin-celestial-2.0.0/src/transform_star.hpp opencpn-plugin-celestial-2.3.0/src/transform_star.hpp --- opencpn-plugin-celestial-2.0.0/src/transform_star.hpp 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/src/transform_star.hpp 2018-03-29 17:18:40.000000000 +0000 @@ -0,0 +1,4 @@ +void frame_bias ( double &ra, double &dec ); +void precess ( double jdd, double &ra, double &dec ); +void nutate ( double jdd, double &ra, double &dec ); +void proper_motion_parallax (double jdd, double &ra, double &dec, double dra, double ddec, double radvel, double parallax); diff -Nru opencpn-plugin-celestial-2.0.0/VERSION.cmake opencpn-plugin-celestial-2.3.0/VERSION.cmake --- opencpn-plugin-celestial-2.0.0/VERSION.cmake 2016-02-29 14:57:14.000000000 +0000 +++ opencpn-plugin-celestial-2.3.0/VERSION.cmake 2018-03-29 17:18:40.000000000 +0000 @@ -1,4 +1,4 @@ SET(PLUGIN_VERSION_MAJOR "2") -SET(PLUGIN_VERSION_MINOR "0") +SET(PLUGIN_VERSION_MINOR "3") SET(PLUGIN_VERSION_PATCH "") -SET(PLUGIN_VERSION_DATE "2016-2-27") +SET(PLUGIN_VERSION_DATE "2018-3-29")