gpredict-svn Mailing List for Gpredict (Page 31)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
You can subscribe to this list here.
2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
From: <cs...@us...> - 2009-03-29 21:35:03
|
Revision: 216 http://gpredict.svn.sourceforge.net/gpredict/?rev=216&view=rev Author: csete Date: 2009-03-29 21:34:58 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Implemented new controller (RX and TX). Pending transponder management. Modified Paths: -------------- trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rig-ctrl.h Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-03-29 21:33:48 UTC (rev 215) +++ trunk/src/gtk-rig-ctrl.c 2009-03-29 21:34:58 UTC (rev 216) @@ -74,21 +74,29 @@ static GtkWidget *create_conf_widgets (GtkRigCtrl *ctrl); static GtkWidget *create_count_down_widgets (GtkRigCtrl *ctrl); - -static void store_sats (gpointer key, gpointer value, gpointer user_data); - +/* callback functions */ static void sat_selected_cb (GtkComboBox *satsel, gpointer data); static void track_toggle_cb (GtkToggleButton *button, gpointer data); static void delay_changed_cb (GtkSpinButton *spin, gpointer data); static void rig_selected_cb (GtkComboBox *box, gpointer data); static void rig_locked_cb (GtkToggleButton *button, gpointer data); static gboolean rig_ctrl_timeout_cb (gpointer data); + +/* radio control functions */ +static void exec_rx_cycle (GtkRigCtrl *ctrl); +static void exec_tx_cycle (GtkRigCtrl *ctrl); +static void exec_trx_cycle (GtkRigCtrl *ctrl); +static void exec_duplex_cycle (GtkRigCtrl *ctrl); static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gdouble freq); static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gdouble *freq); +static gboolean get_ptt (GtkRigCtrl *ctrl); static void update_count_down (GtkRigCtrl *ctrl, gdouble t); +/* misc utility functions */ +static void store_sats (gpointer key, gpointer value, gpointer user_data); static gboolean have_conf (void); + static GtkVBoxClass *parent_class = NULL; static GdkColor ColBlack = { 0, 0, 0, 0}; @@ -161,6 +169,8 @@ ctrl->delay = 1000; ctrl->timerid = 0; ctrl->errcnt = 0; + ctrl->lastrxf = 0.0; + ctrl->lasttxf = 0.0; } static void @@ -805,6 +815,8 @@ /* close socket */ gtk_widget_set_sensitive (ctrl->DevSel, TRUE); ctrl->engaged = FALSE; + ctrl->lasttxf = 0.0; + ctrl->lastrxf = 0.0; } else { if (ctrl->conf == NULL) { @@ -818,6 +830,36 @@ gtk_widget_set_sensitive (ctrl->DevSel, FALSE); ctrl->engaged = TRUE; ctrl->wrops = 0; + + /* set initial frequency */ + + switch (ctrl->conf->type) { + case RIG_TYPE_RX: + ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)); + set_freq_simplex (ctrl, ctrl->lastrxf); + break; + case RIG_TYPE_TX: + ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp)); + set_freq_simplex (ctrl, ctrl->lasttxf); + break; + case RIG_TYPE_TRX: + case RIG_TYPE_DUPLEX: + if (get_ptt (ctrl)) { + ctrl->lasttxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqUp)); + set_freq_simplex (ctrl, ctrl->lasttxf); + } + else { + ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)); + set_freq_simplex (ctrl, ctrl->lastrxf); + } + break; + default: + /* this is an error! */ + ctrl->conf->type = RIG_TYPE_RX; + ctrl->lastrxf = gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)); + set_freq_simplex (ctrl, ctrl->lastrxf); + break; + } } } @@ -830,7 +872,6 @@ rig_ctrl_timeout_cb (gpointer data) { GtkRigCtrl *ctrl = GTK_RIG_CTRL (data); - gdouble satfreq,doppler,lof,readfreq=0,lastfreq; if (ctrl->busy) { @@ -840,92 +881,395 @@ ctrl->busy = TRUE; + /* Execute controller cycle depending on radio type */ + switch (ctrl->conf->type) { + + case RIG_TYPE_RX: + exec_rx_cycle (ctrl); + break; + + case RIG_TYPE_TX: + exec_tx_cycle (ctrl); + break; + + case RIG_TYPE_TRX: + exec_trx_cycle (ctrl); + break; + + case RIG_TYPE_DUPLEX: + exec_duplex_cycle (ctrl); + break; + + default: + /* invalid mode */ + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Invalid radio type %d. Setting type to RIG_TYPE_RX"), + __FUNCTION__, ctrl->conf->type); + ctrl->conf->type = RIG_TYPE_RX; + + } + //g_print (" WROPS = %d\n", ctrl->wrops); - // TODO - lof = 0.0; //1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO)); + ctrl->busy = FALSE; + + return TRUE; +} + +/** \brief Execute RX mode cycle. + * \param ctrl Pointer to the GtkRigCtrl widget. + * + * This function executes a controller cycle when the device is of RIG_TYPE_RX. + */ +static void exec_rx_cycle (GtkRigCtrl *ctrl) +{ + gdouble readfreq=0.0, tmpfreq, satfreqd, satfrequ, doppler; + gboolean ptt = FALSE; + gboolean dialchanged = FALSE; + + /* Dial feedback: If radio device is engaged read frequency from radio and compare it to the last set frequency. If different, it means that user has changed frequency on the radio dial => update transponder knob */ if (ctrl->engaged) { - lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); + // This is no good because it gets out of sync while PTT = ON + //lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); - /* get current frequency from rig */ - if (!get_freq_simplex (ctrl, &readfreq)) { - /* error => use a passive value */ - readfreq = lastfreq; + /* check whether PTT is ON */ + ptt = ctrl->conf->ptt ? get_ptt (ctrl) : FALSE; + + if (ptt == FALSE) { + if (!get_freq_simplex (ctrl, &readfreq)) { + /* error => use a passive value */ + readfreq = ctrl->lastrxf; + ctrl->errcnt++; + } } + else { + readfreq = ctrl->lastrxf; + } - if (fabs (readfreq - lastfreq) > 0.99) { + if (fabs (readfreq - ctrl->lastrxf) > 0.99) { + dialchanged = TRUE; + /* user might have altered radio frequency => update transponder knob */ gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), readfreq); /* doppler shift; only if we are tracking */ if (ctrl->tracking) { - satfreq = (readfreq+lof) / (1 - (ctrl->target->range_rate/299792.4580)); + satfreqd = (readfreq + ctrl->conf->lo) / + (1 - (ctrl->target->range_rate/299792.4580)); } else { - satfreq = readfreq + lof; + satfreqd = readfreq + ctrl->conf->lo; } - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreqDown), satfreq); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreqDown), satfreqd); + + /* TODO Update uplink if locked to downlink */ } } - + + /* TODO: Follow with uplink if transponder is locked */ + /* now, forward tracking */ + if (dialchanged) { + /* no need to forward track */ + return; + } /* If we are tracking, calculate the radio freq by applying both dopper shift - and tranverter LO frequency. - If we are not tracking, apply only LO frequency. + and tranverter LO frequency. If we are not tracking, apply only LO frequency. */ + satfreqd = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); + satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp)); if (ctrl->tracking) { - satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); - doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), satfreq+doppler-lof); + /* downlink */ + doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), + satfreqd + doppler - ctrl->conf->lo); + /* uplink */ + doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp), + satfrequ + doppler - ctrl->conf->lo); } else { - satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), satfreq-lof); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), + satfreqd - ctrl->conf->lo); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp), + satfrequ - ctrl->conf->lo); } - + tmpfreq = gtk_freq_knob_get_value(GTK_FREQ_KNOB(ctrl->RigFreqDown)); + /* if device is engaged, send freq command to radio */ - if ((ctrl->engaged) && - (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown))) > 0.99)) { - if (set_freq_simplex (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)))) { + if ((ctrl->engaged) && (ptt == FALSE) && (fabs(ctrl->lastrxf - tmpfreq) > 0.99)) { + if (set_freq_simplex (ctrl, tmpfreq)) { /* reset error counter */ ctrl->errcnt = 0; + ctrl->lastrxf = tmpfreq; } else { - if (ctrl->errcnt >= MAX_ERROR_COUNT) { - /* disengage device */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE); - ctrl->engaged = FALSE; - ctrl->errcnt = 0; - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"), - __FUNCTION__, MAX_ERROR_COUNT); - - //g_print ("ERROR. WROPS = %d\n", ctrl->wrops); + ctrl->errcnt++; + } + } + + if (ctrl->errcnt >= MAX_ERROR_COUNT) { + /* disengage device */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE); + ctrl->engaged = FALSE; + ctrl->errcnt = 0; + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"), + __FUNCTION__, MAX_ERROR_COUNT); + + //g_print ("ERROR. WROPS = %d\n", ctrl->wrops); + } +} + + +/** \brief Execute TX mode cycle. + * \param ctrl Pointer to the GtkRigCtrl widget. + * + * This function executes a controller cycle when the device is of RIG_TYPE_TX. + */ +static void exec_tx_cycle (GtkRigCtrl *ctrl) +{ + gdouble readfreq=0.0, tmpfreq, satfreqd, satfrequ, doppler; + gboolean ptt = FALSE; + gboolean dialchanged = FALSE; + + + /* Dial feedback: + If radio device is engaged read frequency from radio and compare it to the + last set frequency. If different, it means that user has changed frequency + on the radio dial => update transponder knob + */ + if (ctrl->engaged) { + // This is no good because it gets out of sync while PTT = ON + //lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); + + /* check whether PTT is ON */ + ptt = ctrl->conf->ptt ? get_ptt (ctrl) : FALSE; + + if (ptt == TRUE) { + if (!get_freq_simplex (ctrl, &readfreq)) { + /* error => use a passive value */ + readfreq = ctrl->lasttxf; + ctrl->errcnt++; } + } + else { + readfreq = ctrl->lasttxf; + } + + if (fabs (readfreq - ctrl->lasttxf) > 0.99) { + dialchanged = TRUE; + + /* user might have altered radio frequency => update transponder knob */ + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp), readfreq); + + /* doppler shift; only if we are tracking */ + if (ctrl->tracking) { + satfrequ = (readfreq + ctrl->conf->loup) / + (1 - (ctrl->target->range_rate/299792.4580)); + } else { - /* increment error counter */ - ctrl->errcnt++; + satfrequ = readfreq + ctrl->conf->loup; } + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreqUp), satfrequ); + + /* TODO Update downlink if locked to uplink */ } } + + /* TODO: Follow with downlink if transponder is locked */ + + /* now, forward tracking */ + if (dialchanged) { + /* no need to forward track */ + return; + } - //g_print (" WROPS = %d\n", ctrl->wrops); + /* If we are tracking, calculate the radio freq by applying both dopper shift + and tranverter LO frequency. If we are not tracking, apply only LO frequency. + */ + satfreqd = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); + satfrequ = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp)); + if (ctrl->tracking) { + /* downlink */ + doppler = -satfreqd * (ctrl->target->range_rate / 299792.4580); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), + satfreqd + doppler - ctrl->conf->lo); + /* uplink */ + doppler = -satfrequ * (ctrl->target->range_rate / 299792.4580); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp), + satfrequ + doppler - ctrl->conf->lo); + } + else { + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), + satfreqd - ctrl->conf->lo); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqUp), + satfrequ - ctrl->conf->lo); + } + + tmpfreq = gtk_freq_knob_get_value(GTK_FREQ_KNOB(ctrl->RigFreqUp)); + + /* if device is engaged, send freq command to radio */ + if ((ctrl->engaged) && (ptt == TRUE) && (fabs(ctrl->lasttxf - tmpfreq) > 0.99)) { + if (set_freq_simplex (ctrl, tmpfreq)) { + /* reset error counter */ + ctrl->errcnt = 0; + ctrl->lasttxf = tmpfreq; + } + else { + ctrl->errcnt++; + } + } - ctrl->busy = FALSE; + if (ctrl->errcnt >= MAX_ERROR_COUNT) { + /* disengage device */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE); + ctrl->engaged = FALSE; + ctrl->errcnt = 0; + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"), + __FUNCTION__, MAX_ERROR_COUNT); + + //g_print ("ERROR. WROPS = %d\n", ctrl->wrops); + } + +} + + +/** \brief Execute simplex mode cycle. + * \param ctrl Pointer to the GtkRigCtrl widget. + * + * This function executes a controller cycle when the device is of RIG_TYPE_TRX (simplex). + */ +static void exec_trx_cycle (GtkRigCtrl *ctrl) +{ + +} + + +/** \brief Execute duplex mode cycle. + * \param ctrl Pointer to the GtkRigCtrl widget. + * + * This function executes a controller cycle when the device is of RIG_TYPE_DUPLEX. + */ +static void exec_duplex_cycle (GtkRigCtrl *ctrl) +{ + //FIXME implement + exec_trx_cycle (ctrl); +} + + +/** \brief Get PTT status + * \param ctrl Pointer to the GtkRigVtrl widget. + * \return TRUE if PTT is ON, FALSE if PTT is OFF or an error occurred. + * + */ +static gboolean get_ptt (GtkRigCtrl *ctrl) +{ + gchar *buff,**vbuff; + gint written,size; + gint status; + struct hostent *h; + struct sockaddr_in ServAddr; + gint sock; /*!< Network socket */ + guint64 pttstat = 0; + - return TRUE; + /* create socket */ + sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sock < 0) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%d: Failed to create socket"), + __FILE__, __LINE__); + return FALSE; + } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s:%d Network socket created successfully"), + __FILE__, __LINE__); + } + + memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */ + ServAddr.sin_family = AF_INET; /* Internet address family */ + h = gethostbyname(ctrl->conf->host); + memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length); + ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */ + + /* establish connection */ + status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr)); + if (status < 0) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%d: Failed to connect to %s:%d"), + __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port); + return FALSE; + } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s:%d: Connection opened to %s:%d"), + __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port); + } + + /* send command (get_ptt: t) */ + buff = g_strdup_printf ("t"); + + size = 1; + written = send(sock, buff, size, 0); + if (written != size) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%d: SIZE ERROR %d / %d"), + __FILE__, __LINE__, written, size); + } + g_free (buff); + + + /* try to read answer */ + buff = g_try_malloc (128); + if (buff == NULL) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"), + __FILE__, __FUNCTION__); + shutdown (sock, SHUT_RDWR); + close (sock); + return FALSE; + } + + size = read (sock, buff, 127); + if (size == 0) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s:%s: Got 0 bytes from rigctld"), + __FILE__, __FUNCTION__); + } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s:%s: Read %d bytes from rigctld"), + __FILE__, __FUNCTION__, size); + + buff[size] = 0; + vbuff = g_strsplit (buff, "\n", 3); + pttstat = g_ascii_strtoull (vbuff[0], NULL, 0); //FIXME base = 0 ok? + + g_free (buff); + g_strfreev (vbuff); + } + + shutdown (sock, SHUT_RDWR); + close (sock); + + + return (pttstat == 1) ? TRUE : FALSE; + } -/** \brief Set frequency in +/** \brief Set frequency in simplex mode * \param ctrl Pointer to the GtkRigCtrl structure. * \param freq The new frequency. * \return TRUE if the operation was successful, FALSE if a connection error Modified: trunk/src/gtk-rig-ctrl.h =================================================================== --- trunk/src/gtk-rig-ctrl.h 2009-03-29 21:33:48 UTC (rev 215) +++ trunk/src/gtk-rig-ctrl.h 2009-03-29 21:34:58 UTC (rev 216) @@ -94,7 +94,10 @@ gboolean busy; /*!< Flag set when control algorithm is busy. */ gboolean engaged; /*!< Flag indicating that rig device is engaged. */ gint errcnt; /*!< Error counter. */ - + + gdouble lastrxf; /*!< Last frequency sent to receiver. */ + gdouble lasttxf; /*!< Last frequency sent to tranmitter. */ + /* debug related */ guint wrops; guint rdops; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-29 21:33:52
|
Revision: 215 http://gpredict.svn.sourceforge.net/gpredict/?rev=215&view=rev Author: csete Date: 2009-03-29 21:33:48 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Added more code to transponder file reader. Modified Paths: -------------- trunk/src/trsp-conf.c Modified: trunk/src/trsp-conf.c =================================================================== --- trunk/src/trsp-conf.c 2009-03-29 20:00:44 UTC (rev 214) +++ trunk/src/trsp-conf.c 2009-03-29 21:33:48 UTC (rev 215) @@ -40,12 +40,18 @@ #define KEY_DOWN_HIGH "DOWN_HIGH" #define KEY_INV "INVERT" - +/** \brief Read transponder data file. + * \param catnum The catalog number of the satellite to read transponders for. + * \return A newly allocated GSList containing trsp_t structures. + */ GSList *read_tranponders (guint catnum) { + GSList *trsp = NULL; GKeyFile *cfg = NULL; GError *error = NULL; - gchar *name,*fname,*confdir; + gchar *name,*fname,*confdir; + gchar **groups; + gsize numgrp,i; name = g_strdup_printf ("%d.tsrp", catnum); confdir = get_conf_dir(); @@ -59,9 +65,29 @@ _("%s: Error reading %s: %s"), __FILE__, fname, error->message); g_clear_error (&error); + g_key_file_free (cfg); + + return NULL; } + /* get list of transponders */ + groups = g_key_file_get_groups (cfg, &numgrp); + + /* load each transponder */ + if (numgrp == 0) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: %s contains 0 transponders"), + __FUNCTION__, fname); + } + else { + for (i = 0; i < numgrp; i++) { + + + } + } + + g_strfreev (groups); g_key_file_free (cfg); g_free (name); g_free (confdir); @@ -71,8 +97,14 @@ return NULL; } + +/** \brief Write transponder list for satellite. + * \param catnum The catlog number of the satellite. + * \param transp Pointer to a GSList of trsp_t structures. + */ void write_transponders (guint catnum, GSList *transp) { - + // FIXME + sat_log_log (SAT_LOG_LEVEL_BUG, _("%s: Not implemented!"), __FUNCTION__); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-29 20:00:50
|
Revision: 214 http://gpredict.svn.sourceforge.net/gpredict/?rev=214&view=rev Author: csete Date: 2009-03-29 20:00:44 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Added files for transpoder data file I/O. Modified Paths: -------------- trunk/po/POTFILES.in trunk/src/Makefile.am Added Paths: ----------- trunk/src/trsp-conf.c trunk/src/trsp-conf.h Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2009-03-22 11:48:22 UTC (rev 213) +++ trunk/po/POTFILES.in 2009-03-29 20:00:44 UTC (rev 214) @@ -103,3 +103,4 @@ src/save-pass.c src/tle-tools.c src/tle-update.c +src/trsp-conf.c Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-03-22 11:48:22 UTC (rev 213) +++ trunk/src/Makefile.am 2009-03-29 20:00:44 UTC (rev 214) @@ -71,6 +71,7 @@ qth-editor.c qth-editor.h \ radio-conf.c radio-conf.h \ rotor-conf.c rotor-conf.h \ + trsp-conf.c trsp-conf.h \ sat-cfg.c sat-cfg.h \ sat-info.c sat-info.h \ sat-log.c sat-log.h \ Added: trunk/src/trsp-conf.c =================================================================== --- trunk/src/trsp-conf.c (rev 0) +++ trunk/src/trsp-conf.c 2009-03-29 20:00:44 UTC (rev 214) @@ -0,0 +1,78 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2008 Alexandru Csete. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/gpredict/ + More details can be found at the project home page: + + http://gpredict.oz9aec.net/ + + 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, visit http://www.fsf.org/ + +*/ + +#include <gtk/gtk.h> +#include <glib/gi18n.h> +#include "sat-log.h" +#include "compat.h" + +#include "trsp-conf.h" + +#define KEY_UP_LOW "UP_LOW" +#define KEY_UP_HIGH "UP_HIGH" +#define KEY_DOWN_LOW "DOWN_LOW" +#define KEY_DOWN_HIGH "DOWN_HIGH" +#define KEY_INV "INVERT" + + +GSList *read_tranponders (guint catnum) +{ + GKeyFile *cfg = NULL; + GError *error = NULL; + gchar *name,*fname,*confdir; + + name = g_strdup_printf ("%d.tsrp", catnum); + confdir = get_conf_dir(); + fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, + "trsp", G_DIR_SEPARATOR_S, + name, NULL); + + cfg = g_key_file_new (); + if (!g_key_file_load_from_file (cfg, fname, G_KEY_FILE_KEEP_COMMENTS, &error)) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Error reading %s: %s"), + __FILE__, fname, error->message); + g_clear_error (&error); + g_key_file_free (cfg); + } + + g_key_file_free (cfg); + g_free (name); + g_free (confdir); + g_free (fname); + + + return NULL; +} + +void write_transponders (guint catnum, GSList *transp) +{ + +} + Added: trunk/src/trsp-conf.h =================================================================== --- trunk/src/trsp-conf.h (rev 0) +++ trunk/src/trsp-conf.h 2009-03-29 20:00:44 UTC (rev 214) @@ -0,0 +1,52 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2008 Alexandru Csete. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/gpredict/ + More details can be found at the project home page: + + http://gpredict.oz9aec.net/ + + 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, visit http://www.fsf.org/ + + +*/ +#ifndef TRSP_CONF_H +#define TRSP_CONF_H 1 + +#include <glib.h> + +/* NOTE For beacons uplow=uphigh=0 and downlow=downhigh */ +typedef struct { + gchar *name; /*!< The name of the transponder (same as config group) */ + gdouble uplow; /*!< Lower limit of uplink. */ + gdouble uphigh; /*!< Upper limit of uplink. */ + gdouble downlow; /*!< Lower limit of downlink. */ + gdouble downhigh; /*!< Upper limit of donlink. */ + gboolean invert; /*!< Flag indicating whether transponder is inverting. */ +} trsp_t; + +/* The actual data would then be a singly linked list with pointers to transponder_t structures */ + +GSList *read_tranponders (guint catnum); +void write_transponders (guint catnum, GSList *transp); + + + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-22 11:48:40
|
Revision: 213 http://gpredict.svn.sourceforge.net/gpredict/?rev=213&view=rev Author: csete Date: 2009-03-22 11:48:22 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Fixed a few spelling errors. Modified Paths: -------------- trunk/src/gtk-rig-ctrl.c trunk/src/gtk-sat-module-popup.c Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-03-22 11:46:57 UTC (rev 212) +++ trunk/src/gtk-rig-ctrl.c 2009-03-22 11:48:22 UTC (rev 213) @@ -1082,12 +1082,12 @@ size = read (sock, buff, 127); if (size == 0) { sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s:%s: Got 0 bytes from rotctld"), + _("%s:%s: Got 0 bytes from rigctld"), __FILE__, __FUNCTION__); } else { sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s:%s: Read %d bytes from rotctld"), + _("%s:%s: Read %d bytes from rigctld"), __FILE__, __FUNCTION__, size); buff[size] = 0; Modified: trunk/src/gtk-sat-module-popup.c =================================================================== --- trunk/src/gtk-sat-module-popup.c 2009-03-22 11:46:57 UTC (rev 212) +++ trunk/src/gtk-sat-module-popup.c 2009-03-22 11:48:22 UTC (rev 213) @@ -886,7 +886,7 @@ module->rigctrl = gtk_rig_ctrl_new (module); if (module->rigctrl == NULL) { - /* gtk_rot_ctrl_new returned NULL becasue no rotators are configured */ + /* gtk_rot_ctrl_new returned NULL becasue no radios are configured */ GtkWidget *dialog; dialog = gtk_message_dialog_new (GTK_WINDOW (app), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-22 11:47:06
|
Revision: 212 http://gpredict.svn.sourceforge.net/gpredict/?rev=212&view=rev Author: csete Date: 2009-03-22 11:46:57 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Removed conf == NULL checking in controller callback since it is already done during creation of the widget. Modified Paths: -------------- trunk/src/gtk-rig-ctrl.c Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-03-22 11:17:51 UTC (rev 211) +++ trunk/src/gtk-rig-ctrl.c 2009-03-22 11:46:57 UTC (rev 212) @@ -195,7 +195,7 @@ GtkWidget *widget; GtkWidget *table; - /* check that we have rot conf */ + /* check that we have rig conf */ if (!have_conf()) { return NULL; } @@ -850,7 +850,7 @@ last set frequency. If different, it means that user has changed frequency on the radio dial => update transponder knob */ - if ((ctrl->engaged) && (ctrl->conf != NULL)) { + if (ctrl->engaged) { lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); /* get current frequency from rig */ @@ -892,7 +892,7 @@ /* if device is engaged, send freq command to radio */ - if ((ctrl->engaged) && (ctrl->conf != NULL) && + if ((ctrl->engaged) && (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown))) > 0.99)) { if (set_freq_simplex (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)))) { /* reset error counter */ @@ -925,7 +925,7 @@ } -/** \brief Set frequency +/** \brief Set frequency in * \param ctrl Pointer to the GtkRigCtrl structure. * \param freq The new frequency. * \return TRUE if the operation was successful, FALSE if a connection error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-22 11:18:00
|
Revision: 211 http://gpredict.svn.sourceforge.net/gpredict/?rev=211&view=rev Author: csete Date: 2009-03-22 11:17:51 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Changed set/get_freq to set/get_freq_simplex. Modified Paths: -------------- trunk/src/gtk-rig-ctrl.c Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-03-22 00:32:00 UTC (rev 210) +++ trunk/src/gtk-rig-ctrl.c 2009-03-22 11:17:51 UTC (rev 211) @@ -83,8 +83,8 @@ static void rig_selected_cb (GtkComboBox *box, gpointer data); static void rig_locked_cb (GtkToggleButton *button, gpointer data); static gboolean rig_ctrl_timeout_cb (gpointer data); -static gboolean set_freq (GtkRigCtrl *ctrl, gdouble freq); -static gboolean get_freq (GtkRigCtrl *ctrl, gdouble *freq); +static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gdouble freq); +static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gdouble *freq); static void update_count_down (GtkRigCtrl *ctrl, gdouble t); static gboolean have_conf (void); @@ -854,7 +854,7 @@ lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); /* get current frequency from rig */ - if (!get_freq (ctrl, &readfreq)) { + if (!get_freq_simplex (ctrl, &readfreq)) { /* error => use a passive value */ readfreq = lastfreq; } @@ -894,7 +894,7 @@ /* if device is engaged, send freq command to radio */ if ((ctrl->engaged) && (ctrl->conf != NULL) && (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown))) > 0.99)) { - if (set_freq (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)))) { + if (set_freq_simplex (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)))) { /* reset error counter */ ctrl->errcnt = 0; } @@ -935,7 +935,7 @@ * gotten the current frequency from the ctrl; however, the param * might become useful in the future. */ -static gboolean set_freq (GtkRigCtrl *ctrl, gdouble freq) +static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gdouble freq) { gchar *buff; gint written,size; @@ -1004,7 +1004,7 @@ * \return TRUE if the operation was successful, FALSE if a connection error * occurred. */ -static gboolean get_freq (GtkRigCtrl *ctrl, gdouble *freq) +static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gdouble *freq) { gchar *buff,**vbuff; gint written,size; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-22 00:32:05
|
Revision: 210 http://gpredict.svn.sourceforge.net/gpredict/?rev=210&view=rev Author: csete Date: 2009-03-22 00:32:00 +0000 (Sun, 22 Mar 2009) Log Message: ----------- Begun implementation of new controller. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-freq-knob.c trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rig-ctrl.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-21 13:09:10 UTC (rev 209) +++ trunk/ChangeLog 2009-03-22 00:32:00 UTC (rev 210) @@ -8,6 +8,9 @@ * src/sat-pref-rig-editor.c: Update code to include upconverter LO frequency. + * src/rig-ctrl.[ch]: + Begun implementation of new controller. + 2009-03-21 Stephane Fillod <fi...@us...> Modified: trunk/src/gtk-freq-knob.c =================================================================== --- trunk/src/gtk-freq-knob.c 2009-03-21 13:09:10 UTC (rev 209) +++ trunk/src/gtk-freq-knob.c 2009-03-22 00:32:00 UTC (rev 210) @@ -204,7 +204,12 @@ gtk_table_attach (GTK_TABLE (table), label, 5, 6, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), "<span size='xx-large'> MHz</span>"); + gtk_label_set_markup (GTK_LABEL (label), "<span size='xx-large'>.</span>"); + gtk_table_attach (GTK_TABLE (table), label, 9, 10, 1, 2, + GTK_SHRINK, GTK_SHRINK, 0, 0); + + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), "<span size='xx-large'> Hz</span>"); gtk_table_attach (GTK_TABLE (table), label, 13, 14, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0); Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-03-21 13:09:10 UTC (rev 209) +++ trunk/src/gtk-rig-ctrl.c 2009-03-22 00:32:00 UTC (rev 210) @@ -68,11 +68,13 @@ static void gtk_rig_ctrl_destroy (GtkObject *object); -static GtkWidget *create_sat_widgets (GtkRigCtrl *ctrl); -static GtkWidget *create_rig_widgets (GtkRigCtrl *ctrl); +static GtkWidget *create_downlink_widgets (GtkRigCtrl *ctrl); +static GtkWidget *create_uplink_widgets (GtkRigCtrl *ctrl); static GtkWidget *create_target_widgets (GtkRigCtrl *ctrl); static GtkWidget *create_conf_widgets (GtkRigCtrl *ctrl); +static GtkWidget *create_count_down_widgets (GtkRigCtrl *ctrl); + static void store_sats (gpointer key, gpointer value, gpointer user_data); static void sat_selected_cb (GtkComboBox *satsel, gpointer data); @@ -220,18 +222,20 @@ gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColGreen); /* create contents */ - table = gtk_table_new (2, 2, FALSE); + table = gtk_table_new (3, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); gtk_container_set_border_width (GTK_CONTAINER (table), 10); - gtk_table_attach (GTK_TABLE (table), create_sat_widgets (GTK_RIG_CTRL (widget)), + gtk_table_attach (GTK_TABLE (table), create_downlink_widgets (GTK_RIG_CTRL (widget)), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach (GTK_TABLE (table), create_rig_widgets (GTK_RIG_CTRL (widget)), + gtk_table_attach (GTK_TABLE (table), create_uplink_widgets (GTK_RIG_CTRL (widget)), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (GTK_TABLE (table), create_target_widgets (GTK_RIG_CTRL (widget)), 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (GTK_TABLE (table), create_conf_widgets (GTK_RIG_CTRL (widget)), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach (GTK_TABLE (table), create_count_down_widgets (GTK_RIG_CTRL (widget)), + 0, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0); gtk_container_add (GTK_CONTAINER (widget), table); @@ -288,12 +292,19 @@ gtk_label_set_text (GTK_LABEL (ctrl->SatRngRate), buff); g_free (buff); - /* doppler shift */ - satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreq)); + /* Doppler shift down */ + satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz buff = g_strdup_printf ("%.0f Hz", doppler); - gtk_label_set_text (GTK_LABEL (ctrl->SatDop), buff); + gtk_label_set_text (GTK_LABEL (ctrl->SatDopDown), buff); g_free (buff); + + /* Doppler shift up */ + satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp)); + doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz + buff = g_strdup_printf ("%.0f Hz", doppler); + gtk_label_set_text (GTK_LABEL (ctrl->SatDopUp), buff); + g_free (buff); /* update next pass if necessary */ if (ctrl->pass != NULL) { @@ -311,53 +322,127 @@ } -/** \brief Create Satellite freq control widgets. +/** \brief Create freq control widgets for downlink. * \param ctrl Pointer to the GtkRigCtrl widget. * * This function creates and initialises the widgets for controlling the - * satellite frequency. + * downlink frequency. It consists of a controller widget showing the + * satellite frequency with the radio frequency below it. * */ static -GtkWidget *create_sat_widgets (GtkRigCtrl *ctrl) +GtkWidget *create_downlink_widgets (GtkRigCtrl *ctrl) { GtkWidget *frame; + GtkWidget *vbox; + GtkWidget *hbox1,*hbox2; GtkWidget *label; label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Satellite</b>")); + gtk_label_set_markup (GTK_LABEL (label), _("<b> Downlink </b>")); frame = gtk_frame_new (NULL); gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5); gtk_frame_set_label_widget (GTK_FRAME (frame), label); - ctrl->SatFreq = gtk_freq_knob_new (145890000.0, TRUE); - gtk_container_add (GTK_CONTAINER (frame), ctrl->SatFreq); + vbox = gtk_vbox_new (FALSE, 5); + hbox1 = gtk_hbox_new (FALSE, 5); + hbox2 = gtk_hbox_new (FALSE, 5); + /* satellite downlink frequency */ + ctrl->SatFreqDown = gtk_freq_knob_new (145890000.0, TRUE); + gtk_box_pack_start_defaults (GTK_BOX (vbox), ctrl->SatFreqDown); + + /* Downlink doppler */ + label = gtk_label_new (_("Doppler:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + ctrl->SatDopDown = gtk_label_new ("---- Hz"); + gtk_misc_set_alignment (GTK_MISC (ctrl->SatDopDown), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox1), ctrl->SatDopDown, FALSE, TRUE, 0); + + /* Downconverter LO */ + ctrl->LoDown = gtk_label_new ("0 MHz"); + gtk_misc_set_alignment (GTK_MISC (ctrl->LoDown), 1.0, 0.5); + gtk_box_pack_end (GTK_BOX (hbox1), ctrl->LoDown, FALSE, FALSE, 2); + label = gtk_label_new (_("LO:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + + /* Radio downlink frequency */ + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label),"<span size='large'><b>Radio:</b></span>"); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_start_defaults (GTK_BOX (hbox2), label); + ctrl->RigFreqDown = gtk_freq_knob_new (145890000.0, FALSE); + gtk_box_pack_start_defaults (GTK_BOX (hbox2), ctrl->RigFreqDown); + + /* finish packing ... */ + gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox1); + gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox2); + gtk_container_add (GTK_CONTAINER (frame), vbox); + return frame; } -/** \brief Create radio freq display widgets. +/** \brief Create uplink frequency display widgets. * \param ctrl Pointer to the GtkRigCtrl widget. * * This function creates and initialises the widgets for displaying the - * frequency of the radio. + * uplink frequency of the satellite and the radio. */ static -GtkWidget *create_rig_widgets (GtkRigCtrl *ctrl) +GtkWidget *create_uplink_widgets (GtkRigCtrl *ctrl) { GtkWidget *frame; + GtkWidget *vbox; + GtkWidget *hbox1,*hbox2; GtkWidget *label; label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), _("<b>Radio</b>")); + gtk_label_set_markup (GTK_LABEL (label), _("<b> Uplink </b>")); frame = gtk_frame_new (NULL); gtk_frame_set_label_align (GTK_FRAME (frame), 0.5, 0.5); gtk_frame_set_label_widget (GTK_FRAME (frame), label); - ctrl->RigFreq = gtk_freq_knob_new (145890000.0, FALSE); - gtk_container_add (GTK_CONTAINER (frame), ctrl->RigFreq); + vbox = gtk_vbox_new (FALSE, 5); + hbox1 = gtk_hbox_new (FALSE, 5); + hbox2 = gtk_hbox_new (FALSE, 5); + + /* satellite uplink frequency */ + ctrl->SatFreqUp = gtk_freq_knob_new (145890000.0, TRUE); + gtk_box_pack_start_defaults (GTK_BOX (vbox), ctrl->SatFreqUp); + + /* Uplink doppler */ + label = gtk_label_new (_("Doppler:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + ctrl->SatDopUp = gtk_label_new ("---- Hz"); + gtk_misc_set_alignment (GTK_MISC (ctrl->SatDopUp), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (hbox1), ctrl->SatDopUp, FALSE, TRUE, 0); + + /* Upconverter LO */ + ctrl->LoUp = gtk_label_new ("0 MHz"); + gtk_misc_set_alignment (GTK_MISC (ctrl->LoUp), 1.0, 0.5); + gtk_box_pack_end (GTK_BOX (hbox1), ctrl->LoUp, FALSE, FALSE, 2); + label = gtk_label_new (_("LO:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0); + + /* Radio uplink frequency */ + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label),"<span size='large'><b>Radio:</b></span>"); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_box_pack_start_defaults (GTK_BOX (hbox2), label); + ctrl->RigFreqUp = gtk_freq_knob_new (145890000.0, FALSE); + gtk_box_pack_start_defaults (GTK_BOX (hbox2), ctrl->RigFreqUp); + + + gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox1); + gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox2); + gtk_container_add (GTK_CONTAINER (frame), vbox); + return frame; } @@ -416,14 +501,6 @@ gtk_misc_set_alignment (GTK_MISC (ctrl->SatEl), 1.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatEl, 1, 2, 2, 3); - /* count down */ - label = gtk_label_new (_("\316\224T:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); - ctrl->SatCnt = gtk_label_new ("00:00:00"); - gtk_misc_set_alignment (GTK_MISC (ctrl->SatCnt), 0.5, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatCnt, 1, 2, 3, 4); - /* Range */ label = gtk_label_new (_(" Range:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); @@ -440,14 +517,6 @@ gtk_misc_set_alignment (GTK_MISC (ctrl->SatRngRate), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatRngRate, 3, 4, 2, 3); - /* Doppler shift */ - label = gtk_label_new (_(" Doppler:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4); - ctrl->SatDop = gtk_label_new ("0 Hz"); - gtk_misc_set_alignment (GTK_MISC (ctrl->SatDop), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), ctrl->SatDop, 3, 4, 3, 4); - frame = gtk_frame_new (_("Target")); gtk_container_add (GTK_CONTAINER (frame), table); @@ -524,29 +593,13 @@ g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rig_locked_cb), ctrl); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1); - /* Local oscillator value */ - label = gtk_label_new (_("Local Osc:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); - - ctrl->LO = gtk_spin_button_new_with_range (-10000, 10000, 1); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (ctrl->LO), 0); - gtk_spin_button_set_digits (GTK_SPIN_BUTTON (ctrl->LO), 0); - gtk_widget_set_tooltip_text (ctrl->LO, - _("Enter the frequency of the local oscillator, if any.")); - gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LO, 1, 2, 1, 2); - - label = gtk_label_new (_("MHz")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2); - /* Now, load config*/ rig_selected_cb (GTK_COMBO_BOX (ctrl->DevSel), ctrl); /* Timeout */ label = gtk_label_new (_("Cycle:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); timer = gtk_spin_button_new_with_range (100, 5000, 10); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (timer), 0); @@ -555,12 +608,12 @@ "commands sent to the rigator.")); gtk_spin_button_set_value (GTK_SPIN_BUTTON (timer), ctrl->delay); g_signal_connect (timer, "value-changed", G_CALLBACK (delay_changed_cb), ctrl); - gtk_table_attach (GTK_TABLE (table), timer, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table), timer, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); label = gtk_label_new (_("msec")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2); frame = gtk_frame_new (_("Settings")); @@ -570,8 +623,26 @@ } +/** \brief Create count down widget */ +static GtkWidget * +create_count_down_widgets (GtkRigCtrl *ctrl) +{ + GtkWidget *frame; + + /* create delta-t label */ + ctrl->SatCnt = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (ctrl->SatCnt), 0.5, 0.5); + gtk_label_set_markup (GTK_LABEL (ctrl->SatCnt), + _("<span size='large'><b>\316\224T: 00:00:00</b></span>")); + + frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (frame), ctrl->SatCnt); + + return frame; +} + /** \brief Copy satellite from hash table to singly linked list. */ static void @@ -657,7 +728,7 @@ -/** \brief New rigor device selected. +/** \brief New rig device selected. * \param box Pointer to the rigor selector combo box. * \param data Pointer to the GtkRigCtrl widget. * @@ -668,6 +739,7 @@ rig_selected_cb (GtkComboBox *box, gpointer data) { GtkRigCtrl *ctrl = GTK_RIG_CTRL (data); + gchar *buff; /* free previous configuration */ @@ -691,8 +763,15 @@ sat_log_log (SAT_LOG_LEVEL_MSG, _("Loaded new radio configuration %s"), ctrl->conf->name); - /* update LO widget */ - gtk_spin_button_set_value (GTK_SPIN_BUTTON (ctrl->LO), ctrl->conf->lo/1.0e6); + /* update LO widgets */ + buff = g_strdup_printf (_("%.0f MHz"), ctrl->conf->lo/1.0e6); + gtk_label_set_text (GTK_LABEL (ctrl->LoDown), buff); + g_free (buff); + buff = g_strdup_printf (_("%.0f MHz"), ctrl->conf->loup/1.0e6); + gtk_label_set_text (GTK_LABEL (ctrl->LoUp), buff); + g_free (buff); + + //gtk_spin_button_set_value (GTK_SPIN_BUTTON (ctrl->LO), ctrl->conf->lo/1.0e6); } else { sat_log_log (SAT_LOG_LEVEL_ERROR, @@ -761,7 +840,10 @@ ctrl->busy = TRUE; - lof = 1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO)); + + + // TODO + lof = 0.0; //1.0e6*gtk_spin_button_get_value (GTK_SPIN_BUTTON (ctrl->LO)); /* Dial feedback: If radio device is engaged read frequency from radio and compare it to the @@ -769,7 +851,7 @@ on the radio dial => update transponder knob */ if ((ctrl->engaged) && (ctrl->conf != NULL)) { - lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreq)); + lastfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->RigFreqDown)); /* get current frequency from rig */ if (!get_freq (ctrl, &readfreq)) { @@ -779,7 +861,7 @@ if (fabs (readfreq - lastfreq) > 0.99) { /* user might have altered radio frequency => update transponder knob */ - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), readfreq); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), readfreq); /* doppler shift; only if we are tracking */ if (ctrl->tracking) { @@ -788,7 +870,7 @@ else { satfreq = readfreq + lof; } - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreq), satfreq); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->SatFreqDown), satfreq); } } @@ -799,20 +881,20 @@ If we are not tracking, apply only LO frequency. */ if (ctrl->tracking) { - satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreq)); + satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); doppler = -satfreq * (ctrl->target->range_rate / 299792.4580); - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq+doppler-lof); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), satfreq+doppler-lof); } else { - satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreq)); - gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreq), satfreq-lof); + satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqDown)); + gtk_freq_knob_set_value (GTK_FREQ_KNOB (ctrl->RigFreqDown), satfreq-lof); } /* if device is engaged, send freq command to radio */ if ((ctrl->engaged) && (ctrl->conf != NULL) && - (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreq))) > 0.99)) { - if (set_freq (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreq)))) { + (fabs (readfreq-gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown))) > 0.99)) { + if (set_freq (ctrl, gtk_freq_knob_get_value (GTK_FREQ_KNOB(ctrl->RigFreqDown)))) { /* reset error counter */ ctrl->errcnt = 0; } @@ -1038,13 +1120,18 @@ gchar *buff; guint h,m,s; gchar *ch,*cm,*cs; + gchar *aoslos; /* select AOS or LOS time depending on target elevation */ - if (ctrl->target->el < 0.0) + if (ctrl->target->el < 0.0) { targettime = ctrl->target->aos; - else + aoslos = g_strdup_printf (_("AOS in")); + } + else { targettime = ctrl->target->los; + aoslos = g_strdup_printf (_("LOS in")); + } delta = targettime - t; @@ -1078,13 +1165,16 @@ cs = g_strdup (":"); if (h > 0) - buff = g_strdup_printf ("%s%d:%s%d%s%d", ch, h, cm, m, cs, s); + buff = g_strdup_printf ("<span size='xx-large'><b>%s %s%d:%s%d%s%d</b></span>", + aoslos, ch, h, cm, m, cs, s); else - buff = g_strdup_printf ("%s%d%s%d", cm, m, cs, s); + buff = g_strdup_printf ("<span size='xx-large'><b>%s %s%d%s%d</b></span>", + aoslos, cm, m, cs, s); - gtk_label_set_text (GTK_LABEL (ctrl->SatCnt), buff); + gtk_label_set_markup (GTK_LABEL (ctrl->SatCnt), buff); g_free (buff); + g_free (aoslos); g_free (ch); g_free (cm); g_free (cs); Modified: trunk/src/gtk-rig-ctrl.h =================================================================== --- trunk/src/gtk-rig-ctrl.h 2009-03-21 13:09:10 UTC (rev 209) +++ trunk/src/gtk-rig-ctrl.h 2009-03-22 00:32:00 UTC (rev 210) @@ -63,8 +63,14 @@ { GtkVBox vbox; - GtkWidget *SatFreq; - GtkWidget *RigFreq; + GtkWidget *SatFreqDown; + GtkWidget *RigFreqDown; + GtkWidget *SatFreqUp; + GtkWidget *RigFreqUp; + GtkWidget *SatDopDown; /*!< Doppler shift down */ + GtkWidget *SatDopUp; /*!< Doppler shift up */ + GtkWidget *LoDown; /*!< LO of downconverter */ + GtkWidget *LoUp; /*!z LO of upconverter */ /* target status labels*/ GtkWidget *SatAz,*SatEl,*SatCnt; @@ -72,7 +78,6 @@ /* other widgets */ GtkWidget *DevSel; /*!< Device selector */ - GtkWidget *LO; /*!< Local oscillator */ GtkWidget *LockBut; radio_conf_t *conf; /*!< Radio configuration */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-21 13:09:27
|
Revision: 209 http://gpredict.svn.sourceforge.net/gpredict/?rev=209&view=rev Author: csete Date: 2009-03-21 13:09:10 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Update code to include upconverter LO frequency. Modified Paths: -------------- trunk/ChangeLog trunk/src/sat-pref-rig-data.h trunk/src/sat-pref-rig-editor.c trunk/src/sat-pref-rig.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-21 12:51:22 UTC (rev 208) +++ trunk/ChangeLog 2009-03-21 13:09:10 UTC (rev 209) @@ -3,6 +3,11 @@ * src/radio-conf.[ch]: Added config field for uplink transverter LO. LO values are now optional. + * src/sat-pref-rig-data.h: + * src/sat-pref-rig.c: + * src/sat-pref-rig-editor.c: + Update code to include upconverter LO frequency. + 2009-03-21 Stephane Fillod <fi...@us...> Modified: trunk/src/sat-pref-rig-data.h =================================================================== --- trunk/src/sat-pref-rig-data.h 2009-03-21 12:51:22 UTC (rev 208) +++ trunk/src/sat-pref-rig-data.h 2009-03-21 13:09:10 UTC (rev 209) @@ -35,7 +35,8 @@ RIG_LIST_COL_PORT, /*!< Port number */ RIG_LIST_COL_TYPE, /*!< Radio type */ RIG_LIST_COL_PTT, /*!< PTT */ - RIG_LIST_COL_LO, /*!< Local oscillator freq */ + RIG_LIST_COL_LO, /*!< Local oscillator freq (downlink) */ + RIG_LIST_COL_LOUP, /*!< Local oscillato freq (uplink) */ RIG_LIST_COL_NUM /*!< The number of fields in the list. */ } rig_list_col_t; Modified: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c 2009-03-21 12:51:22 UTC (rev 208) +++ trunk/src/sat-pref-rig-editor.c 2009-03-21 13:09:10 UTC (rev 209) @@ -56,7 +56,8 @@ static GtkWidget *port; /* port number */ static GtkWidget *type; /* rig type */ static GtkWidget *ptt; /* PTT */ -static GtkWidget *lo; /* local oscillator */ +static GtkWidget *lo; /* local oscillator of downconverter */ +static GtkWidget *loup; /* local oscillator of upconverter */ static GtkWidget *create_editor_widgets (radio_conf_t *conf); @@ -144,7 +145,7 @@ - table = gtk_table_new (6, 4, FALSE); + table = gtk_table_new (7, 4, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); gtk_table_set_row_spacings (GTK_TABLE (table), 5); @@ -212,7 +213,7 @@ "<b>TX only:</b> The radio shall only be used for uplink. "\ "If <i>Monitor PTT status</i> is checked the doppler tuning "\ "will be suspended while PTT is OFF (manual RX).\n"\ - "<b>RX/TX:</b> The radio should be used for both up- and downlink "\ + "<b>Simplex TRX:</b> The radio should be used for both up- and downlink "\ "but in simplex mode only. This option requires that the PTT status "\ "is monitored (otherwise gpredict cannot know whether to tune the "\ "RX or the TX).\n"\ @@ -232,8 +233,8 @@ gtk_table_attach_defaults (GTK_TABLE (table), ptt, 1, 4, 4, 5); - /* LO frequency */ - label = gtk_label_new (_("LO")); + /* Downconverter LO frequency */ + label = gtk_label_new (_("LO Down:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6); @@ -241,13 +242,32 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (lo), 0); gtk_widget_set_tooltip_text (lo, - _("Enter the frequency of the local oscillator, if any.")); + _("Enter the frequency of the local oscillator "\ + " of the downconverter, if any.")); gtk_table_attach_defaults (GTK_TABLE (table), lo, 1, 3, 5, 6); label = gtk_label_new (_("MHz")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 5, 6); + /* Upconverter LO frequency */ + label = gtk_label_new (_("LO Up:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 6, 7); + + loup = gtk_spin_button_new_with_range (-10000, 10000, 1); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), 0); + gtk_spin_button_set_digits (GTK_SPIN_BUTTON (loup), 0); + gtk_widget_set_tooltip_text (loup, + _("Enter the frequency of the local oscillator "\ + "of the upconverter, if any.")); + gtk_table_attach_defaults (GTK_TABLE (table), loup, 1, 3, 6, 7); + + label = gtk_label_new (_("MHz")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 6, 7); + + if (conf->name != NULL) update_widgets (conf); @@ -310,8 +330,12 @@ } - /* lo in MHz */ + /* lo down in MHz */ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000.0); + + /* lo up in MHz */ + gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), conf->loup / 1000000.0); + } @@ -328,6 +352,7 @@ gtk_entry_set_text (GTK_ENTRY (host), ""); gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (loup), 0); gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), FALSE); } @@ -358,9 +383,12 @@ /* port */ conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port)); - /* lo freq */ + /* lo down freq */ conf->lo = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo)); + /* lo up freq */ + conf->loup = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (loup)); + /* rig type */ conf->type = gtk_combo_box_get_active (GTK_COMBO_BOX (type)); Modified: trunk/src/sat-pref-rig.c =================================================================== --- trunk/src/sat-pref-rig.c 2009-03-21 12:51:22 UTC (rev 208) +++ trunk/src/sat-pref-rig.c 2009-03-21 13:09:10 UTC (rev 209) @@ -168,9 +168,9 @@ NULL); gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); - /* lo */ + /* transverter down */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("LO Freq. (MHz)"), renderer, + column = gtk_tree_view_column_new_with_attributes (_("Downconverter LO"), renderer, "text", RIG_LIST_COL_LO, NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, @@ -179,6 +179,17 @@ NULL); gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); + /* transverter up */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Upconverter LO"), renderer, + "text", RIG_LIST_COL_LOUP, + NULL); + gtk_tree_view_column_set_cell_data_func (column, renderer, + render_lo, + GUINT_TO_POINTER(RIG_LIST_COL_LOUP), + NULL); + gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); + } @@ -202,7 +213,8 @@ G_TYPE_INT, // port G_TYPE_INT, // type G_TYPE_BOOLEAN, // PTT - G_TYPE_DOUBLE // LO + G_TYPE_DOUBLE, // LO DOWN + G_TYPE_DOUBLE // LO UO ); /* open configuration directory */ @@ -231,6 +243,7 @@ RIG_LIST_COL_TYPE, conf.type, RIG_LIST_COL_PTT, conf.ptt, RIG_LIST_COL_LO, conf.lo, + RIG_LIST_COL_LOUP, conf.loup, -1); sat_log_log (SAT_LOG_LEVEL_DEBUG, @@ -342,6 +355,7 @@ .type = RIG_TYPE_RX, .ptt = FALSE, .lo = 0.0, + .loup = 0.0, }; @@ -384,6 +398,7 @@ RIG_LIST_COL_TYPE, &conf.type, RIG_LIST_COL_PTT, &conf.ptt, RIG_LIST_COL_LO, &conf.lo, + RIG_LIST_COL_LOUP, &conf.loup, -1); radio_conf_save (&conf); @@ -424,6 +439,7 @@ .type = RIG_TYPE_RX, .ptt = FALSE, .lo = 0.0, + .loup = 0.0, }; /* run rig conf editor */ @@ -440,6 +456,7 @@ RIG_LIST_COL_TYPE, conf.type, RIG_LIST_COL_PTT, conf.ptt, RIG_LIST_COL_LO, conf.lo, + RIG_LIST_COL_LOUP, conf.loup, -1); g_free (conf.name); @@ -472,6 +489,7 @@ .type = RIG_TYPE_RX, .ptt = FALSE, .lo = 0.0, + .loup = 0.0, }; @@ -499,6 +517,7 @@ RIG_LIST_COL_TYPE, &conf.type, RIG_LIST_COL_PTT, &conf.ptt, RIG_LIST_COL_LO, &conf.lo, + RIG_LIST_COL_LOUP, &conf.loup, -1); } @@ -529,6 +548,7 @@ RIG_LIST_COL_TYPE, conf.type, RIG_LIST_COL_PTT, conf.ptt, RIG_LIST_COL_LO, conf.lo, + RIG_LIST_COL_LOUP, conf.loup, -1); } @@ -717,7 +737,7 @@ /* convert to MHz */ number /= 1000000.0; - buff = g_strdup_printf ("%.0f", number); + buff = g_strdup_printf ("%.0f MHz", number); g_object_set (renderer, "text", buff, NULL); g_free (buff); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-21 12:51:25
|
Revision: 208 http://gpredict.svn.sourceforge.net/gpredict/?rev=208&view=rev Author: csete Date: 2009-03-21 12:51:22 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Make LO values optional. Modified Paths: -------------- trunk/ChangeLog trunk/src/radio-conf.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-21 11:47:36 UTC (rev 207) +++ trunk/ChangeLog 2009-03-21 12:51:22 UTC (rev 208) @@ -1,7 +1,7 @@ 2009-03-21 Alexandru Csete <oz...@gm...> * src/radio-conf.[ch]: - Added config field for uplink transverter LO. + Added config field for uplink transverter LO. LO values are now optional. 2009-03-21 Stephane Fillod <fi...@us...> Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2009-03-21 11:47:36 UTC (rev 207) +++ trunk/src/radio-conf.c 2009-03-21 12:51:22 UTC (rev 208) @@ -110,25 +110,37 @@ return FALSE; } - conf->lo = g_key_file_get_double (cfg, GROUP, KEY_LO, &error); - if (error != NULL) { - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Error reading radio conf from %s (%s)."), - __FUNCTION__, conf->name, error->message); - g_clear_error (&error); - g_key_file_free (cfg); - return FALSE; + /* KEY_LO is optional */ + if (g_key_file_has_key (cfg, GROUP, KEY_LO, NULL)) { + conf->lo = g_key_file_get_double (cfg, GROUP, KEY_LO, &error); + if (error != NULL) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Error reading radio conf from %s (%s)."), + __FUNCTION__, conf->name, error->message); + g_clear_error (&error); + g_key_file_free (cfg); + return FALSE; + } } + else { + conf->lo = 0.0; + } - conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error); - if (error != NULL) { - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Error reading radio conf from %s (%s)."), - __FUNCTION__, conf->name, error->message); - g_clear_error (&error); - g_key_file_free (cfg); - return FALSE; + /* KEY_LOUP is optional */ + if (g_key_file_has_key (cfg, GROUP, KEY_LOUP, NULL)) { + conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error); + if (error != NULL) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Error reading radio conf from %s (%s)."), + __FUNCTION__, conf->name, error->message); + g_clear_error (&error); + g_key_file_free (cfg); + return FALSE; + } } + else { + conf->loup = 0.0; + } conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, &error); if (error != NULL) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-21 11:47:39
|
Revision: 207 http://gpredict.svn.sourceforge.net/gpredict/?rev=207&view=rev Author: csete Date: 2009-03-21 11:47:36 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Merged changes in repository with local copy. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-21 10:08:44 UTC (rev 206) +++ trunk/ChangeLog 2009-03-21 11:47:36 UTC (rev 207) @@ -1,24 +1,42 @@ +2009-03-21 Alexandru Csete <oz...@gm...> + + * src/radio-conf.[ch]: + Added config field for uplink transverter LO. + + 2009-03-21 Stephane Fillod <fi...@us...> - * src/about.c: - * src/gtk-polar-view.c: - * src/gtk-sat-list.c: - * src/gtk-sat-map.c: - * src/gtk-single-sat.c: - * src/menubar.c: - * src/pass-to-txt.c: - * src/sat-log-browser.c: - * src/sat-pass-dialogs.c: - * src/sat-pref-formats.c: - * src/sat-pref-list-view.c: - * src/sat-pref.c: - * src/sat-vis.c: - * src/tle-update.c: - Make gettext() do its job on static strings at runtime. + * src/about.c: + * src/gtk-polar-view.c: + * src/gtk-sat-list.c: + * src/gtk-sat-map.c: + * src/gtk-single-sat.c: + * src/menubar.c: + * src/pass-to-txt.c: + * src/sat-log-browser.c: + * src/sat-pass-dialogs.c: + * src/sat-pref-formats.c: + * src/sat-pref-list-view.c: + * src/sat-pref.c: + * src/sat-vis.c: + * src/tle-update.c: + Make gettext() do its job on static strings at runtime. - * po/fr.po: update + * po/fr.po: update +2009-03-20 Alexandru Csete <oz...@gm...> + + * src/sat-pref-rig-editor.c: + Changed radio type labels. + + +2009-03-20 Stephane Fillod <fi...@us...> + + * src/tle-update.c: + Added Gio error checking and reporting. + + 2009-03-18 Alexandru Csete <oz...@gm...> * src/sat-pref-qth.c: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-21 10:08:45
|
Revision: 206 http://gpredict.svn.sourceforge.net/gpredict/?rev=206&view=rev Author: csete Date: 2009-03-21 10:08:44 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Changed radio typoe labels. Modified Paths: -------------- trunk/src/sat-pref-rig-editor.c Modified: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c 2009-03-21 10:06:23 UTC (rev 205) +++ trunk/src/sat-pref-rig-editor.c 2009-03-21 10:08:44 UTC (rev 206) @@ -199,8 +199,8 @@ type = gtk_combo_box_new_text (); gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX only")); gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("TX only")); - gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX/TX")); - gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Duplex")); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Simplex TRX")); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Duplex TRX")); gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX); g_signal_connect (type, "changed", G_CALLBACK (type_changed), NULL); gtk_widget_set_tooltip_markup (type, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-21 10:06:24
|
Revision: 205 http://gpredict.svn.sourceforge.net/gpredict/?rev=205&view=rev Author: csete Date: 2009-03-21 10:06:23 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Added config field for uplink transverterf LO. Modified Paths: -------------- trunk/src/radio-conf.c trunk/src/radio-conf.h Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2009-03-21 10:03:32 UTC (rev 204) +++ trunk/src/radio-conf.c 2009-03-21 10:06:23 UTC (rev 205) @@ -38,6 +38,7 @@ #define KEY_HOST "Host" #define KEY_PORT "Port" #define KEY_LO "LO" +#define KEY_LOUP "LO_UP" #define KEY_TYPE "Type" #define KEY_PTT "READ_PTT" @@ -118,6 +119,16 @@ g_key_file_free (cfg); return FALSE; } + + conf->loup = g_key_file_get_double (cfg, GROUP, KEY_LOUP, &error); + if (error != NULL) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Error reading radio conf from %s (%s)."), + __FUNCTION__, conf->name, error->message); + g_clear_error (&error); + g_key_file_free (cfg); + return FALSE; + } conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, &error); if (error != NULL) { @@ -177,6 +188,7 @@ g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host); g_key_file_set_integer (cfg, GROUP, KEY_PORT, conf->port); g_key_file_set_double (cfg, GROUP, KEY_LO, conf->lo); + g_key_file_set_double (cfg, GROUP, KEY_LO, conf->loup); g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type); g_key_file_set_boolean (cfg, GROUP, KEY_PTT, conf->ptt); Modified: trunk/src/radio-conf.h =================================================================== --- trunk/src/radio-conf.h 2009-03-21 10:03:32 UTC (rev 204) +++ trunk/src/radio-conf.h 2009-03-21 10:06:23 UTC (rev 205) @@ -48,7 +48,8 @@ gchar *host; /*!< hostname or IP */ gint port; /*!< port number */ gdouble lo; /*!< local oscillator freq in Hz (using double for - compatibility with rest of code) */ + compatibility with rest of code). Downlink. */ + gdouble loup; /*!< local oscillator freq in Hz for uplink. */ rig_type_t type; /*!< Radio type */ gboolean ptt; /*!< Flag indicating that we should read PTT status (needed for RX, TX, and TRX) */ } radio_conf_t; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fi...@us...> - 2009-03-21 10:03:34
|
Revision: 204 http://gpredict.svn.sourceforge.net/gpredict/?rev=204&view=rev Author: fillods Date: 2009-03-21 10:03:32 +0000 (Sat, 21 Mar 2009) Log Message: ----------- update Modified Paths: -------------- trunk/po/fr.po Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2009-03-21 10:02:54 UTC (rev 203) +++ trunk/po/fr.po 2009-03-21 10:03:32 UTC (rev 204) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: gpredict\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-19 21:32+0100\n" -"PO-Revision-Date: 2009-02-19 21:56+0200\n" +"POT-Creation-Date: 2009-03-21 10:53+0100\n" +"PO-Revision-Date: 2009-03-17 22:56+0200\n" "Last-Translator: Stéphane Fillod <fi...@us...>\n" "Language-Team: French <deb...@li...>\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../src/about.c:56 +#: ../src/about.c:57 msgid "" "Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" "Contact: oz9aec at googlemail.com\n" @@ -46,19 +46,19 @@ #. window title #. icon file name #. create window title and file name for window icon -#: ../src/about.c:88 ../src/main.c:177 ../src/sat-log.c:57 +#: ../src/about.c:89 ../src/main.c:177 ../src/sat-log.c:57 #: ../src/sat-log-browser.c:457 msgid "GPREDICT" msgstr "GPREDICT" -#: ../src/about.c:91 +#: ../src/about.c:92 msgid "" "Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" "\n" "Gpredict is available free of charge from:" msgstr "" -#: ../src/about.c:108 +#: ../src/about.c:109 msgid "translator-credits" msgstr "" @@ -203,7 +203,7 @@ #: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108 #: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:849 msgid "Future passes" -msgstr "Passages futures" +msgstr "Passages futurs" #. show track #: ../src/gtk-polar-view-popup.c:134 @@ -247,6 +247,24 @@ "the current ground station!" msgstr "" +#: ../src/gtk-polar-view.c:719 +#, c-format +msgid "" +"Next: %s\n" +"in %s%d:%s%d%s%d" +msgstr "" +"Prochain: %s\n" +"dans %s%d:%s%d%s%d" + +#: ../src/gtk-polar-view.c:722 +#, c-format +msgid "" +"Next: %s\n" +"in %s%d%s%d" +msgstr "" +"Prochain: %s\n" +"dans %s%d%s%d" + #: ../src/gtk-polar-view.c:737 ../src/gtk-sat-map.c:694 #, c-format msgid "%s: Can not find NEXT satellite." @@ -254,11 +272,11 @@ #: ../src/gtk-polar-view.c:740 ../src/gtk-sat-map.c:697 msgid "Next: ERR" -msgstr "" +msgstr "Prochain: ERR" #: ../src/gtk-polar-view.c:746 ../src/gtk-sat-map.c:703 msgid "Next: N/A" -msgstr "" +msgstr "Prochain: N/A" #: ../src/gtk-polar-view.c:902 #, c-format @@ -670,7 +688,7 @@ msgid "%s: Error writing QTH data (%s)." msgstr "" -#: ../src/gtk-sat-data.c:342 ../src/mod-cfg.c:408 ../src/sat-cfg.c:352 +#: ../src/gtk-sat-data.c:342 ../src/mod-cfg.c:408 ../src/sat-cfg.c:350 #, c-format msgid "%s: Wrote only %d out of %d chars." msgstr "" @@ -700,7 +718,7 @@ msgid "%s: Good data for #%d" msgstr "" -#: ../src/gtk-sat-data.c:528 ../src/tle-update.c:912 +#: ../src/gtk-sat-data.c:528 ../src/tle-update.c:863 #, c-format msgid "%s: Failed to open %s" msgstr "" @@ -739,7 +757,7 @@ #: ../src/sat-pref-map-view.c:241 ../src/sat-pref-polar-view.c:272 #: ../src/gtk-single-sat.c:91 msgid "Next Event" -msgstr "Prochain événemnt" +msgstr "Prochain événement" #: ../src/gtk-sat-list.c:63 ../src/gtk-sat-list.c:93 #: ../src/gtk-single-sat.c:92 @@ -1004,6 +1022,16 @@ msgid "Set Target" msgstr "" +#: ../src/gtk-sat-map.c:671 +#, c-format +msgid "<span background=\"#%s\"> Next: %s in %s%d:%s%d%s%d </span>" +msgstr "<span background=\"#%s\"> Prochain: %s dans %s%d:%s%d%s%d </span>" + +#: ../src/gtk-sat-map.c:677 +#, c-format +msgid "<span background=\"#%s\"> Next: %s in %s%d%s%d </span>" +msgstr "<span background=\"#%s\"> Prochain: %s dans %s%d%s%d </span>" + #: ../src/gtk-sat-map.c:1048 #, c-format msgid "%s:%d: Loading map file %s" @@ -1176,60 +1204,60 @@ #: ../src/gtk-sat-module-popup.c:100 msgid "Detach module" -msgstr "" +msgstr "Détache module" #: ../src/gtk-sat-module-popup.c:111 msgid "Attach module" -msgstr "" +msgstr "Attache module" #: ../src/gtk-sat-module-popup.c:124 msgid "Leave fullscreen" -msgstr "" +msgstr "Quitte plein écran" #: ../src/gtk-sat-module-popup.c:133 msgid "Fullscreen" -msgstr "" +msgstr "Plein écran" #. sky at a glance #: ../src/gtk-sat-module-popup.c:147 msgid "Sky at a glance" -msgstr "" +msgstr "Ciel d'un coup d'œil" #. time manager #: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:261 msgid "Time Controller" -msgstr "" +msgstr "Contrôleur de Temps" #. Radio Control #: ../src/gtk-sat-module-popup.c:170 msgid "Radio Control" -msgstr "" +msgstr "Contrôle Radio" #. Antenna Control #: ../src/gtk-sat-module-popup.c:179 msgid "Antenna Control" -msgstr "" +msgstr "Contrôle Antenne" #. configure #: ../src/gtk-sat-module-popup.c:192 msgid "Configure" -msgstr "" +msgstr "Configuration" #. clone #: ../src/gtk-sat-module-popup.c:201 msgid "Clone..." -msgstr "" +msgstr "Clonage..." #. delete module #: ../src/gtk-sat-module-popup.c:214 ../src/sat-pref-qth.c:490 #: ../src/sat-pref-rig.c:298 ../src/sat-pref-rot.c:307 msgid "Delete" -msgstr "" +msgstr "Suppression" #. close #: ../src/gtk-sat-module-popup.c:223 msgid "Close" -msgstr "" +msgstr "Fermeture" #: ../src/gtk-sat-module-popup.c:257 msgid "" @@ -1304,7 +1332,7 @@ #: ../src/gtk-sat-module-popup.c:828 #, c-format msgid "The sky at a glance (%s)" -msgstr "" +msgstr "Le ciel d'un coup d'œil (%s)" #: ../src/gtk-sat-module-popup.c:894 msgid "" @@ -1372,7 +1400,7 @@ #: ../src/sat-pref-list-view.c:253 ../src/sat-pref-map-view.c:644 #: ../src/sat-pref-multi-pass.c:190 ../src/sat-pref-polar-view.c:577 #: ../src/sat-pref-refresh.c:419 ../src/sat-pref-single-pass.c:184 -#: ../src/sat-pref-sky-at-glance.c:491 ../src/sat-pref-tle.c:350 +#: ../src/sat-pref-sky-at-glance.c:491 ../src/sat-pref-tle.c:328 msgid "Reset" msgstr "" @@ -1387,7 +1415,7 @@ #. hour #: ../src/gtk-sat-module-tmg.c:149 msgid " Hour:" -msgstr "" +msgstr " Heure:" #: ../src/gtk-sat-module-tmg.c:161 msgid "Use this control to set the hour" @@ -1782,134 +1810,126 @@ msgid "Show about dialog" msgstr "Montre le dialogue à propos" -#: ../src/menubar.c:221 +#: ../src/menubar.c:230 #, c-format msgid "Failed to build menubar: %s" msgstr "" -#: ../src/menubar.c:258 +#: ../src/menubar.c:267 #, c-format msgid "%s: Starting new module configurator..." msgstr "" -#: ../src/menubar.c:265 +#: ../src/menubar.c:274 #, c-format msgid "%s: New module name is %s." msgstr "" -#: ../src/menubar.c:286 ../src/menubar.c:354 +#: ../src/menubar.c:295 ../src/menubar.c:363 #, c-format msgid "Could not open %s. Please examine the log messages for details." msgstr "" -#: ../src/menubar.c:310 +#: ../src/menubar.c:319 #, c-format msgid "%s: New module config cancelled." msgstr "" -#: ../src/menubar.c:326 +#: ../src/menubar.c:335 #, c-format msgid "%s: Open existing module..." msgstr "" -#: ../src/menubar.c:333 +#: ../src/menubar.c:342 #, c-format msgid "%s: Open module %s." msgstr "" -#: ../src/menubar.c:392 +#: ../src/menubar.c:401 #, c-format msgid "%s: Open module cancelled." msgstr "" #. create new dialog with progress indicator -#: ../src/menubar.c:448 ../src/menubar.c:636 ../src/sat-pref-general.c:61 +#: ../src/menubar.c:456 ../src/menubar.c:626 ../src/sat-pref-general.c:61 msgid "TLE Update" msgstr "" -#: ../src/menubar.c:469 +#: ../src/menubar.c:477 msgid "<b>Updating TLE files from network</b>" msgstr "" #. statistics -#: ../src/menubar.c:482 ../src/menubar.c:670 +#: ../src/menubar.c:490 ../src/menubar.c:660 msgid "" "Satellites updated:\t 0\n" "Satellites skipped:\t 0\n" "Missing Satellites:\t 0\n" msgstr "" -#: ../src/menubar.c:508 ../src/menubar.c:696 +#: ../src/menubar.c:516 ../src/menubar.c:686 msgid "Finished" msgstr "" -#: ../src/menubar.c:525 -msgid "" -"This version of gpredict has been compiled without network support. " -"Therefore, TLE update from network is not available.\n" -"\n" -"Consult the user manual for details." -msgstr "" - #. create file chooser -#: ../src/menubar.c:579 +#: ../src/menubar.c:569 msgid "Select directory" msgstr "" #. create label -#: ../src/menubar.c:585 +#: ../src/menubar.c:575 msgid "Select TLE directory:" msgstr "" #. create the dalog -#: ../src/menubar.c:594 +#: ../src/menubar.c:584 msgid "Update TLE from files" msgstr "" -#: ../src/menubar.c:629 +#: ../src/menubar.c:619 #, c-format msgid "%s: Running TLE update from %s" msgstr "" -#: ../src/menubar.c:656 +#: ../src/menubar.c:646 msgid "<b>Updating TLE files from files</b>" msgstr "" -#: ../src/menubar.c:724 ../src/menubar.c:748 ../src/menubar.c:769 +#: ../src/menubar.c:714 ../src/menubar.c:738 ../src/menubar.c:759 msgid "This function is still under development." msgstr "" -#: ../src/menubar.c:855 +#: ../src/menubar.c:845 #, c-format msgid "%s:%s: Scanning directory %s for modules." msgstr "" -#: ../src/menubar.c:878 +#: ../src/menubar.c:868 #, c-format msgid "%s:%d: Failed to open module dir %s (%s)" msgstr "" -#: ../src/menubar.c:893 +#: ../src/menubar.c:883 msgid "" "You do not have any modules set up yet. Please use File->New in order to " "create a module." msgstr "" -#: ../src/menubar.c:911 +#: ../src/menubar.c:901 msgid "Module" msgstr "" #. create dialog -#: ../src/menubar.c:919 +#: ../src/menubar.c:909 msgid "Select a module" msgstr "" -#: ../src/menubar.c:946 +#: ../src/menubar.c:936 #, c-format msgid "%s:%s: Selected module is: %s" msgstr "" -#: ../src/menubar.c:951 +#: ../src/menubar.c:941 #, c-format msgid "%s:%s: No selection is list of modules." msgstr "" @@ -1950,17 +1970,17 @@ msgid "%s: Attempt to save NULL data." msgstr "" -#: ../src/mod-cfg.c:362 ../src/sat-cfg.c:305 +#: ../src/mod-cfg.c:362 ../src/sat-cfg.c:303 #, c-format msgid "%s: Could not create config data (%s)." msgstr "" -#: ../src/mod-cfg.c:380 ../src/sat-cfg.c:324 +#: ../src/mod-cfg.c:380 ../src/sat-cfg.c:322 #, c-format msgid "%s: Could not create config file (%s)." msgstr "" -#: ../src/mod-cfg.c:399 ../src/sat-cfg.c:343 +#: ../src/mod-cfg.c:399 ../src/sat-cfg.c:341 #, c-format msgid "%s: Error writing config data (%s)." msgstr "" @@ -2317,59 +2337,59 @@ msgid "%s: MaxEl not defined for %s. Assuming 90°." msgstr "" -#: ../src/sat-cfg.c:263 +#: ../src/sat-cfg.c:261 #, c-format msgid "%s: Error reading config file (%s)" msgstr "" -#: ../src/sat-cfg.c:267 +#: ../src/sat-cfg.c:265 #, c-format msgid "%s: Using built-in defaults" msgstr "" -#: ../src/sat-cfg.c:276 +#: ../src/sat-cfg.c:274 #, c-format msgid "%s: Everything OK." msgstr "" -#: ../src/sat-cfg.c:359 +#: ../src/sat-cfg.c:357 #, c-format msgid "%s: Configuration saved." msgstr "" -#: ../src/sat-cfg.c:402 ../src/sat-cfg.c:466 ../src/sat-cfg.c:492 -#: ../src/sat-cfg.c:525 ../src/sat-cfg.c:591 ../src/sat-cfg.c:627 -#: ../src/sat-cfg.c:655 ../src/sat-cfg.c:711 ../src/sat-cfg.c:737 +#: ../src/sat-cfg.c:400 ../src/sat-cfg.c:464 ../src/sat-cfg.c:490 +#: ../src/sat-cfg.c:523 ../src/sat-cfg.c:589 ../src/sat-cfg.c:625 +#: ../src/sat-cfg.c:653 ../src/sat-cfg.c:709 ../src/sat-cfg.c:735 #, c-format msgid "%s: Module not initialised\n" msgstr "" -#: ../src/sat-cfg.c:425 ../src/sat-cfg.c:443 ../src/sat-cfg.c:479 -#: ../src/sat-cfg.c:505 +#: ../src/sat-cfg.c:423 ../src/sat-cfg.c:441 ../src/sat-cfg.c:477 +#: ../src/sat-cfg.c:503 #, c-format msgid "%s: Unknown BOOL param index (%d)\n" msgstr "" -#: ../src/sat-cfg.c:548 ../src/sat-cfg.c:571 ../src/sat-cfg.c:613 -#: ../src/sat-cfg.c:640 +#: ../src/sat-cfg.c:546 ../src/sat-cfg.c:569 ../src/sat-cfg.c:611 +#: ../src/sat-cfg.c:638 #, c-format msgid "%s: Unknown STR param index (%d)\n" msgstr "" -#: ../src/sat-cfg.c:678 ../src/sat-cfg.c:696 ../src/sat-cfg.c:724 -#: ../src/sat-cfg.c:750 +#: ../src/sat-cfg.c:676 ../src/sat-cfg.c:694 ../src/sat-cfg.c:722 +#: ../src/sat-cfg.c:748 #, c-format msgid "%s: Unknown INT param index (%d)\n" msgstr "" #: ../src/sat-info.c:85 msgid "<b>Satellite name:</b>" -msgstr "" +msgstr "<b>Nom du satellite:</b>" #: ../src/sat-info.c:90 #, c-format msgid "<b>%s</b>" -msgstr "" +msgstr "<b>%s</b>" #. operational status #: ../src/sat-info.c:97 @@ -2378,11 +2398,11 @@ #: ../src/sat-info.c:104 msgid "Operational" -msgstr "" +msgstr "Opérationel" #: ../src/sat-info.c:108 msgid "Non-operational" -msgstr "" +msgstr "Non-opérationel" #: ../src/sat-info.c:112 msgid "Partially operational" @@ -2402,12 +2422,12 @@ #: ../src/sat-info.c:128 ../src/sat-vis.c:40 msgid "Unknown" -msgstr "" +msgstr "Inconnu" #. Catnum #: ../src/sat-info.c:137 msgid "Catalogue number:" -msgstr "" +msgstr "Numéro catalogue:" #. international designator #: ../src/sat-info.c:148 @@ -2803,7 +2823,7 @@ #: ../src/sat-pref-list-view.c:260 ../src/sat-pref-map-view.c:651 #: ../src/sat-pref-multi-pass.c:196 ../src/sat-pref-polar-view.c:584 #: ../src/sat-pref-refresh.c:426 ../src/sat-pref-single-pass.c:190 -#: ../src/sat-pref-sky-at-glance.c:497 ../src/sat-pref-tle.c:356 +#: ../src/sat-pref-sky-at-glance.c:497 ../src/sat-pref-tle.c:334 msgid "Reset settings to the default values." msgstr "" @@ -3551,7 +3571,7 @@ "Can not delete ground station!\n" "\n" "You need to have at least one ground\n" -"statiob set up, otherwise gpredict may\n" +"station set up, otherwise gpredict may\n" "not work properly." msgstr "" @@ -4016,74 +4036,63 @@ msgid "Select colour 10" msgstr "" -#: ../src/sat-pref-tle.c:176 +#: ../src/sat-pref-tle.c:171 msgid "<b>Auto-Update:</b>" msgstr "" -#: ../src/sat-pref-tle.c:190 +#: ../src/sat-pref-tle.c:185 msgid "Check the age of TLE data:" msgstr "" #. radio buttons selecting action -#: ../src/sat-pref-tle.c:199 +#: ../src/sat-pref-tle.c:194 msgid "If TLEs are too old:" msgstr "" -#: ../src/sat-pref-tle.c:203 +#: ../src/sat-pref-tle.c:198 msgid "Notify me" msgstr "" -#: ../src/sat-pref-tle.c:206 +#: ../src/sat-pref-tle.c:201 msgid "Perform automatic update in the background" msgstr "" -#: ../src/sat-pref-tle.c:232 +#: ../src/sat-pref-tle.c:227 msgid "<b>Update from the Internet:</b>" msgstr "" #. server -#: ../src/sat-pref-tle.c:242 +#: ../src/sat-pref-tle.c:237 msgid "Remote server:" msgstr "" -#: ../src/sat-pref-tle.c:251 +#: ../src/sat-pref-tle.c:246 msgid "" "Enter URL for remote server including directory, i.e.\n" "protocol://servername/directory\n" "Protocol can be both http and ftp." msgstr "" -#. proxy -#: ../src/sat-pref-tle.c:260 -msgid "Proxy server:" -msgstr "" - -#: ../src/sat-pref-tle.c:269 -msgid "" -"Enter URL for local proxy server. e.g.\n" -"http://my.proxy.com" -msgstr "" - #. Files -#: ../src/sat-pref-tle.c:277 +#: ../src/sat-pref-tle.c:255 msgid "Files to fetch:" msgstr "" -#: ../src/sat-pref-tle.c:286 +#: ../src/sat-pref-tle.c:264 msgid "" "Enter list of files to fetch from remote server.\n" "The files should be separated with ; (semicolon)" msgstr "" -#: ../src/sat-pref-tle.c:306 +#: ../src/sat-pref-tle.c:284 msgid "Add new satellites to local database" msgstr "" -#: ../src/sat-pref-tle.c:308 +#: ../src/sat-pref-tle.c:286 msgid "Note that new satellites will be added to a group called Other" msgstr "" -#: ../src/sat-pref-tle.c:328 +#: ../src/sat-pref-tle.c:306 msgid "<b>Update from Local Files:</b>" msgstr "" @@ -4272,38 +4281,38 @@ msgid "%s: NULL output storage!" msgstr "" -#: ../src/tle-update.c:142 ../src/tle-update.c:215 +#: ../src/tle-update.c:139 ../src/tle-update.c:212 #, c-format msgid "%s: Error opening directory %s (%s)" msgstr "" -#: ../src/tle-update.c:147 ../src/tle-update.c:220 +#: ../src/tle-update.c:144 ../src/tle-update.c:217 #, c-format msgid "" "<b>ERROR</b> opening directory %s\n" "%s" msgstr "" -#: ../src/tle-update.c:165 +#: ../src/tle-update.c:162 #, c-format msgid "Reading data from %s" msgstr "" -#: ../src/tle-update.c:185 +#: ../src/tle-update.c:182 #, c-format msgid "%s: No valid TLE data found in %s" msgstr "" -#: ../src/tle-update.c:190 +#: ../src/tle-update.c:187 #, c-format msgid "%s: Read %d sats from %s into memory" msgstr "" -#: ../src/tle-update.c:271 +#: ../src/tle-update.c:268 msgid "Updating data..." msgstr "" -#: ../src/tle-update.c:275 +#: ../src/tle-update.c:272 #, c-format msgid "" "Satellites updated:\t %d\n" @@ -4311,7 +4320,7 @@ "Missing Satellites:\t %d\n" msgstr "" -#: ../src/tle-update.c:320 +#: ../src/tle-update.c:317 #, c-format msgid "" "Satellites updated:\t %d\n" @@ -4320,101 +4329,93 @@ "New Satellites:\t\t %d" msgstr "" -#: ../src/tle-update.c:331 +#: ../src/tle-update.c:328 #, c-format msgid "%s: Added %d new satellites to local database" msgstr "" -#: ../src/tle-update.c:348 +#: ../src/tle-update.c:345 #, c-format msgid "%s: TLE elements updated." msgstr "" -#: ../src/tle-update.c:455 +#: ../src/tle-update.c:446 #, c-format msgid "%s: No files to fetch from network." msgstr "" -#: ../src/tle-update.c:461 +#: ../src/tle-update.c:452 msgid "No files to fetch from network" msgstr "" -#: ../src/tle-update.c:488 +#: ../src/tle-update.c:472 #, c-format msgid "Fetching %s" msgstr "" -#: ../src/tle-update.c:514 +#: ../src/tle-update.c:495 #, c-format msgid "%s: Error fetching %s (%s)" msgstr "" -#: ../src/tle-update.c:520 +#: ../src/tle-update.c:502 #, c-format msgid "%s: Successfully fetched %s" msgstr "" -#: ../src/tle-update.c:577 +#: ../src/tle-update.c:554 #, c-format msgid "%s: Error opening %s (%s)" msgstr "" -#: ../src/tle-update.c:602 +#: ../src/tle-update.c:623 #, c-format -msgid "" -"%s: This version of gpredict has been compiled without network support.\n" -"To update TLE data, download NASA 2-line files manually, then run Update " -"from files." -msgstr "" - -#: ../src/tle-update.c:672 -#, c-format msgid "%s:%s: Invalid data for %d" msgstr "" -#: ../src/tle-update.c:715 +#: ../src/tle-update.c:666 #, c-format msgid "%s:%s: Failed to open %s" msgstr "" -#: ../src/tle-update.c:801 +#: ../src/tle-update.c:752 #, c-format msgid "%s:%s: Original data for %d seems to be bad" msgstr "" -#: ../src/tle-update.c:866 +#: ../src/tle-update.c:817 #, c-format msgid "%s: Could not remove %s (file open?)" msgstr "" -#: ../src/tle-update.c:876 +#: ../src/tle-update.c:827 #, c-format msgid "%s: Could not rename %s to %s" msgstr "" -#: ../src/tle-update.c:889 +#: ../src/tle-update.c:840 #, c-format msgid "%s: Failed to open temp file %s" msgstr "" -#: ../src/tle-update.c:904 +#: ../src/tle-update.c:855 #, c-format msgid "%s: Update statistics for %s (U/O/N/T): %d/%d/%d/%d" msgstr "" -#: ../src/tle-update.c:1007 +#: ../src/tle-update.c:958 msgid "Never" msgstr "" -#: ../src/tle-update.c:1008 +#: ../src/tle-update.c:959 msgid "Monthly" msgstr "" -#: ../src/tle-update.c:1009 +#: ../src/tle-update.c:960 msgid "Weekly" msgstr "" -#: ../src/tle-update.c:1010 +#: ../src/tle-update.c:961 msgid "Daily" msgstr "" @@ -4486,7 +4487,7 @@ #: ../src/gtk-single-sat.c:63 msgid "Next Event :" -msgstr "Prochain Evénemnt :" +msgstr "Prochain Evénement :" #: ../src/gtk-single-sat.c:64 msgid "Next AOS :" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fi...@us...> - 2009-03-21 10:02:57
|
Revision: 203 http://gpredict.svn.sourceforge.net/gpredict/?rev=203&view=rev Author: fillods Date: 2009-03-21 10:02:54 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Make gettext() do its job on static strings at runtime Modified Paths: -------------- trunk/ChangeLog trunk/src/about.c trunk/src/gtk-polar-view.c trunk/src/gtk-sat-list.c trunk/src/gtk-sat-map.c trunk/src/gtk-single-sat.c trunk/src/menubar.c trunk/src/pass-to-txt.c trunk/src/sat-log-browser.c trunk/src/sat-pass-dialogs.c trunk/src/sat-pref-formats.c trunk/src/sat-pref-list-view.c trunk/src/sat-pref.c trunk/src/sat-vis.c trunk/src/tle-update.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/ChangeLog 2009-03-21 10:02:54 UTC (rev 203) @@ -1,3 +1,24 @@ +2009-03-21 Stephane Fillod <fi...@us...> + + * src/about.c: + * src/gtk-polar-view.c: + * src/gtk-sat-list.c: + * src/gtk-sat-map.c: + * src/gtk-single-sat.c: + * src/menubar.c: + * src/pass-to-txt.c: + * src/sat-log-browser.c: + * src/sat-pass-dialogs.c: + * src/sat-pref-formats.c: + * src/sat-pref-list-view.c: + * src/sat-pref.c: + * src/sat-vis.c: + * src/tle-update.c: + Make gettext() do its job on static strings at runtime. + + * po/fr.po: update + + 2009-03-18 Alexandru Csete <oz...@gm...> * src/sat-pref-qth.c: @@ -32,7 +53,7 @@ 2009-03-01 Alexandru Csete <oz...@gm...> * configure.ac: - Changed required GooCanvas version from 0.10 to 0.9 to be vompatible + Changed required GooCanvas version from 0.10 to 0.9 to be compatible with older linux distributions, too (e.g. Ubuntu 8.04). Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/about.c 2009-03-21 10:02:54 UTC (rev 203) @@ -96,7 +96,7 @@ "http://gpredict.oz9aec.net/"); /* gtk_about_dialog_set_website_label (GTK_ABOUT_DIALOG (dialog), */ /* _("Gpredict Website")); */ - gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog), license); + gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog), _(license)); gtk_about_dialog_set_wrap_license (GTK_ABOUT_DIALOG (dialog), TRUE); iconfile = icon_file_name ("gpredict-icon.png"); icon = gdk_pixbuf_new_from_file (iconfile, NULL); Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/gtk-polar-view.c 2009-03-21 10:02:54 UTC (rev 203) @@ -716,10 +716,10 @@ cs = g_strdup (":"); if (h > 0) - buff = g_strdup_printf ("Next: %s\nin %s%d:%s%d%s%d", + buff = g_strdup_printf (_("Next: %s\nin %s%d:%s%d%s%d"), sat->tle.sat_name, ch, h, cm, m, cs, s); else - buff = g_strdup_printf ("Next: %s\nin %s%d%s%d", + buff = g_strdup_printf (_("Next: %s\nin %s%d%s%d"), sat->tle.sat_name, cm, m, cs, s); Modified: trunk/src/gtk-sat-list.c =================================================================== --- trunk/src/gtk-sat-list.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/gtk-sat-list.c 2009-03-21 10:02:54 UTC (rev 203) @@ -355,7 +355,7 @@ NULL); #endif - column = gtk_tree_view_column_new_with_attributes (SAT_LIST_COL_TITLE[i], + column = gtk_tree_view_column_new_with_attributes (_(SAT_LIST_COL_TITLE[i]), renderer, "text", i, NULL); Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/gtk-sat-map.c 2009-03-21 10:02:54 UTC (rev 203) @@ -668,14 +668,14 @@ cs = g_strdup (":"); if (h > 0) - buff = g_strdup_printf ("<span background=\"#%s\"> "\ - "Next: %s in %s%d:%s%d%s%d </span>", + buff = g_strdup_printf (_("<span background=\"#%s\"> "\ + "Next: %s in %s%d:%s%d%s%d </span>"), satmap->infobgd, sat->tle.sat_name, ch, h, cm, m, cs, s); else - buff = g_strdup_printf ("<span background=\"#%s\"> " \ - "Next: %s in %s%d%s%d </span>", + buff = g_strdup_printf (_("<span background=\"#%s\"> " \ + "Next: %s in %s%d%s%d </span>"), satmap->infobgd, sat->tle.sat_name, cm, m, cs, s); Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/gtk-single-sat.c 2009-03-21 10:02:54 UTC (rev 203) @@ -280,7 +280,7 @@ if (GTK_SINGLE_SAT (widget)->flags & (1 << i)) { - label1 = gtk_label_new (SINGLE_SAT_FIELD_TITLE[i]); + label1 = gtk_label_new (_(SINGLE_SAT_FIELD_TITLE[i])); gtk_misc_set_alignment (GTK_MISC (label1), 1.0, 0.5); gtk_table_attach (GTK_TABLE (GTK_SINGLE_SAT (widget)->table), label1, 0, 1, i, i+1, @@ -294,8 +294,8 @@ GTK_FILL, GTK_SHRINK, 0, 0); /* add tooltips */ - gtk_widget_set_tooltip_text (label1, SINGLE_SAT_FIELD_HINT[i]); - gtk_widget_set_tooltip_text (label2, SINGLE_SAT_FIELD_HINT[i]); + gtk_widget_set_tooltip_text (label1, _(SINGLE_SAT_FIELD_HINT[i])); + gtk_widget_set_tooltip_text (label2, _(SINGLE_SAT_FIELD_HINT[i])); /* store reference */ GTK_SINGLE_SAT (widget)->labels[i] = label2; Modified: trunk/src/menubar.c =================================================================== --- trunk/src/menubar.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/menubar.c 2009-03-21 10:02:54 UTC (rev 203) @@ -202,10 +202,19 @@ GtkWidget *menuitem; GtkWidget *image; gchar *icon; + gint i; /* create action group */ actgrp = gtk_action_group_new ("MenuActions"); + /* i18n */ + for (i=0; i<G_N_ELEMENTS (entries); i++) { + if (entries[i].label) + entries[i].label = _(entries[i].label); + if (entries[i].tooltip) + entries[i].tooltip = _(entries[i].tooltip); + } + gtk_action_group_add_actions (actgrp, entries, G_N_ELEMENTS (entries), NULL); /* create UI manager */ Modified: trunk/src/pass-to-txt.c =================================================================== --- trunk/src/pass-to-txt.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/pass-to-txt.c 2009-03-21 10:02:54 UTC (rev 203) @@ -218,7 +218,7 @@ /* add time column */ buff = g_strnfill (size - 4, ' '); - line = g_strconcat (SPCT[0], buff, NULL); + line = g_strconcat (_(SPCT[0]), buff, NULL); linelength = size + 1; g_free (buff); @@ -228,7 +228,7 @@ if (fields & (1 << i)) { /* add column to line */ - buff = g_strconcat (line, " ", SPCT[i], NULL); + buff = g_strconcat (line, " ", _(SPCT[i]), NULL); g_free (line); line = g_strdup (buff); g_free (buff); @@ -519,7 +519,7 @@ /* add AOS, TCA, and LOS columns */ buff = g_strnfill (size - 3, ' '); - line = g_strconcat (MPCT[0], buff, MPCT[1], buff, MPCT[2], buff, NULL); + line = g_strconcat (_(MPCT[0]), buff, _(MPCT[1]), buff, _(MPCT[2]), buff, NULL); linelength = 3 * (size + 2); g_free (buff); @@ -529,7 +529,7 @@ if (fields & (1 << i)) { /* add column to line */ - buff = g_strconcat (line, " ", MPCT[i], NULL); + buff = g_strconcat (line, " ", _(MPCT[i]), NULL); g_free (line); line = g_strdup (buff); g_free (buff); Modified: trunk/src/sat-log-browser.c =================================================================== --- trunk/src/sat-log-browser.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-log-browser.c 2009-03-21 10:02:54 UTC (rev 203) @@ -233,7 +233,7 @@ gtk_list_store_set (GTK_LIST_STORE (model), &item, MSG_LIST_COL_TIME, datetime, MSG_LIST_COL_SOURCE, str, - MSG_LIST_COL_LEVEL, DEBUG_STR[debug_level], + MSG_LIST_COL_LEVEL, _(DEBUG_STR[debug_level]), MSG_LIST_COL_MSG, message, -1); @@ -554,7 +554,7 @@ for (i = 0; i < MSG_LIST_COL_NUMBER; i++) { renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (MSG_LIST_COL_TITLE[i], + column = gtk_tree_view_column_new_with_attributes (_(MSG_LIST_COL_TITLE[i]), renderer, "text", i, NULL); Modified: trunk/src/sat-pass-dialogs.c =================================================================== --- trunk/src/sat-pass-dialogs.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-pass-dialogs.c 2009-03-21 10:02:54 UTC (rev 203) @@ -302,7 +302,7 @@ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "xalign", SINGLE_PASS_COL_XALIGN[i], NULL); - column = gtk_tree_view_column_new_with_attributes (SINGLE_PASS_COL_TITLE[i], + column = gtk_tree_view_column_new_with_attributes (_(SINGLE_PASS_COL_TITLE[i]), renderer, "text", i, NULL); @@ -1001,7 +1001,7 @@ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "xalign", MULTI_PASS_COL_XALIGN[i], NULL); - column = gtk_tree_view_column_new_with_attributes (MULTI_PASS_COL_TITLE[i], + column = gtk_tree_view_column_new_with_attributes (_(MULTI_PASS_COL_TITLE[i]), renderer, "text", i, NULL); Modified: trunk/src/sat-pref-formats.c =================================================================== --- trunk/src/sat-pref-formats.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-pref-formats.c 2009-03-21 10:02:54 UTC (rev 203) @@ -97,13 +97,13 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzcheck), sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)); tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, tzcheck, tztips, NULL); + gtk_tooltips_set_tip (tips, tzcheck, _(tztips), NULL); /* time format */ tfentry = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY (tfentry), TIME_FORMAT_MAX_LENGTH); tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, tfentry, tftips, NULL); + gtk_tooltips_set_tip (tips, tfentry, _(tftips), NULL); text = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT); gtk_entry_set_text (GTK_ENTRY (tfentry), text); @@ -132,14 +132,14 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nsewcheck), sat_cfg_get_bool (SAT_CFG_BOOL_USE_NSEW)); tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, nsewcheck, nsewtips, NULL); + gtk_tooltips_set_tip (tips, nsewcheck, _(nsewtips), NULL); /* unit */ useimporg = sat_cfg_get_bool (SAT_CFG_BOOL_USE_IMPERIAL); impcheck = gtk_check_button_new_with_label (_("Use Imperial units instead of Metric.")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impcheck), useimporg); tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, impcheck, imptips, NULL); + gtk_tooltips_set_tip (tips, impcheck, _(imptips), NULL); /* connect sat-pref-qth hook */ g_signal_connect (impcheck, "toggled", G_CALLBACK (systog_cb), NULL); Modified: trunk/src/sat-pref-list-view.c =================================================================== --- trunk/src/sat-pref-list-view.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-pref-list-view.c 2009-03-21 10:02:54 UTC (rev 203) @@ -130,7 +130,7 @@ gtk_container_add (GTK_CONTAINER (frame1), colsel); /* Colours */ - frame2 = gtk_frame_new (_("")); + frame2 = gtk_frame_new (""); gtk_frame_set_label_align (GTK_FRAME (frame2), 0.5, 0.5); hbox = gtk_hbox_new (FALSE, 5); Modified: trunk/src/sat-pref.c =================================================================== --- trunk/src/sat-pref.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-pref.c 2009-03-21 10:02:54 UTC (rev 203) @@ -220,6 +220,6 @@ gtk_notebook_set_current_page (GTK_NOTEBOOK (nbook), page); - gtk_window_set_title (GTK_WINDOW (window), WINDOW_TITLE[page]); + gtk_window_set_title (GTK_WINDOW (window), _(WINDOW_TITLE[page])); } Modified: trunk/src/sat-vis.c =================================================================== --- trunk/src/sat-vis.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/sat-vis.c 2009-03-21 10:02:54 UTC (rev 203) @@ -123,6 +123,6 @@ gchar * vis_to_str (sat_vis_t vis) { - return g_strdup (VIS2STR[vis]); + return g_strdup (_(VIS2STR[vis])); } Modified: trunk/src/tle-update.c =================================================================== --- trunk/src/tle-update.c 2009-03-20 14:06:21 UTC (rev 202) +++ trunk/src/tle-update.c 2009-03-21 10:02:54 UTC (rev 203) @@ -971,5 +971,5 @@ } - return freq_to_str[freq]; + return _(freq_to_str[freq]); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fi...@us...> - 2009-03-20 14:06:32
|
Revision: 202 http://gpredict.svn.sourceforge.net/gpredict/?rev=202&view=rev Author: fillods Date: 2009-03-20 14:06:21 +0000 (Fri, 20 Mar 2009) Log Message: ----------- proper error checking when downloading tle files Modified Paths: -------------- trunk/src/tle-update.c Modified: trunk/src/tle-update.c =================================================================== --- trunk/src/tle-update.c 2009-03-18 10:05:03 UTC (rev 201) +++ trunk/src/tle-update.c 2009-03-20 14:06:21 UTC (rev 202) @@ -418,7 +418,6 @@ gchar *curfile; gchar *locfile; GFile *file; - gboolean error = FALSE; gdouble fraction,start=0; GFile *outfile; GDir *dir; @@ -491,11 +490,12 @@ g_file_copy (file, outfile, G_FILE_COPY_NONE, NULL, NULL, NULL, &err); - if (error) { + if (err != NULL) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Error fetching %s (%s)"), __FUNCTION__, curfile, err->message); - g_clear_error (&err); + g_clear_error (&err); + err = NULL; } else { sat_log_log (SAT_LOG_LEVEL_MSG, @@ -552,8 +552,9 @@ /* send an error message */ sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Error opening %s (%s)"), - __FUNCTION__, dir, err->message); + __FUNCTION__, cache, err->message); g_clear_error (&err); + err = NULL; } else { /* delete files in cache one by one */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-18 10:05:20
|
Revision: 201 http://gpredict.svn.sourceforge.net/gpredict/?rev=201&view=rev Author: csete Date: 2009-03-18 10:05:03 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Fixed typo (Debian bug #520203). Modified Paths: -------------- trunk/ChangeLog trunk/src/sat-pref-qth.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-17 21:41:06 UTC (rev 200) +++ trunk/ChangeLog 2009-03-18 10:05:03 UTC (rev 201) @@ -1,3 +1,9 @@ +2009-03-18 Alexandru Csete <oz...@gm...> + + * src/sat-pref-qth.c: + Fixed typo (Debian bug #520203). + + 2009-03-16 Bruce Cowan <bc...@fa...> * src/sat-cfg.[ch]: @@ -23,14 +29,14 @@ Updated. -2009-03-01; Alexandru Csete <oz...@gm...> +2009-03-01 Alexandru Csete <oz...@gm...> * configure.ac: Changed required GooCanvas version from 0.10 to 0.9 to be vompatible with older linux distributions, too (e.g. Ubuntu 8.04). -2009-02-19; Stephane Fillod <fi...@us...> +2009-02-19 Stephane Fillod <fi...@us...> * po/POTFILES.in: Remove goocanv8 files. Update list of C files. @@ -42,7 +48,7 @@ * src/Makefile.am: Fixed a typo. -2008-12-28; Alexandru Csete <oz...@gm...> +2008-12-28 Alexandru Csete <oz...@gm...> * src/sat-pref-rig-editor.c: Added widgets for editing radio type and ptt. Modified: trunk/src/sat-pref-qth.c =================================================================== --- trunk/src/sat-pref-qth.c 2009-03-17 21:41:06 UTC (rev 200) +++ trunk/src/sat-pref-qth.c 2009-03-18 10:05:03 UTC (rev 201) @@ -558,7 +558,7 @@ GTK_BUTTONS_OK, _("Can not delete ground station!\n\n"\ "You need to have at least one ground\n"\ - "statiob set up, otherwise gpredict may\n"\ + "station set up, otherwise gpredict may\n"\ "not work properly.")); gtk_dialog_run (GTK_DIALOG (dialog)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-17 21:41:17
|
Revision: 200 http://gpredict.svn.sourceforge.net/gpredict/?rev=200&view=rev Author: csete Date: 2009-03-17 21:41:06 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Applied new patch removing proxy configuration. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/sat-cfg.c trunk/src/sat-cfg.h trunk/src/sat-pref-tle.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-16 20:32:52 UTC (rev 199) +++ trunk/ChangeLog 2009-03-17 21:41:06 UTC (rev 200) @@ -1,5 +1,12 @@ 2009-03-16 Bruce Cowan <bc...@fa...> + * src/sat-cfg.[ch]: + * src/sat-pref-tle.c: + Remove proxy configuration item, taken care by GVFS. + + +2009-03-16 Bruce Cowan <bc...@fa...> + * src/menubar.c: * src/tle-update.c: Port TLE download to GIO. @@ -15,6 +22,7 @@ * NEWS: Updated. + 2009-03-01; Alexandru Csete <oz...@gm...> * configure.ac: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-03-16 20:32:52 UTC (rev 199) +++ trunk/NEWS 2009-03-17 21:41:06 UTC (rev 200) @@ -18,6 +18,7 @@ - Fixed bug 2130912: Crash when no rig or no rotator are defined. - Fixed bug 2170642: Small error in user manual. - Applied patch 2688135: Use GIO instead of libcurl for TLE download. + Note: This removes proxy management from gpredict. x Windows: New installer instead of ZIP distribution. - Updated PDF user manual. - French translation. Modified: trunk/src/sat-cfg.c =================================================================== --- trunk/src/sat-cfg.c 2009-03-16 20:32:52 UTC (rev 199) +++ trunk/src/sat-cfg.c 2009-03-17 21:41:06 UTC (rev 200) @@ -130,7 +130,6 @@ { "MODULES", "POLAR_CURSOR_TRACK", TRUE}, { "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE}, { "TLE", "SERVER_AUTH", FALSE}, - { "TLE", "PROXY_AUTH", FALSE}, { "TLE", "ADD_NEW_SATS", TRUE}, { "LOG", "KEEP_LOG_FILES", FALSE}, { "PREDICT", "USE_REAL_T0", FALSE} @@ -215,7 +214,6 @@ { "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"}, { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\ "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"}, - { "TLE", "PROXY", NULL}, { "TLE", "FILE_DIR", NULL}, { "TLE", "EXTENSION", "*.*"}, { "PREDICT", "SAVE_DIR", NULL} Modified: trunk/src/sat-cfg.h =================================================================== --- trunk/src/sat-cfg.h 2009-03-16 20:32:52 UTC (rev 199) +++ trunk/src/sat-cfg.h 2009-03-17 21:41:06 UTC (rev 200) @@ -52,7 +52,6 @@ SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */ SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */ SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */ - SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */ SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */ SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */ SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */ @@ -139,7 +138,6 @@ SAT_CFG_STR_POL_FONT, /*!< Polar view font. */ SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */ SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */ - SAT_CFG_STR_TLE_PROXY, /*!< Proxy server. */ SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */ SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */ SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */ Modified: trunk/src/sat-pref-tle.c =================================================================== --- trunk/src/sat-pref-tle.c 2009-03-16 20:32:52 UTC (rev 199) +++ trunk/src/sat-pref-tle.c 2009-03-17 21:41:06 UTC (rev 200) @@ -42,7 +42,7 @@ static GtkWidget *warn,*autom; /* internet updates */ -static GtkWidget *server,*proxy,*files; +static GtkWidget *server,*files; /* add new sats */ static GtkWidget *addnew; @@ -134,10 +134,6 @@ sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER, gtk_entry_get_text (GTK_ENTRY (server))); - /* proxy */ - sat_cfg_set_str (SAT_CFG_STR_TLE_PROXY, - gtk_entry_get_text (GTK_ENTRY (proxy))); - /* files */ sat_cfg_set_str (SAT_CFG_STR_TLE_FILES, gtk_entry_get_text (GTK_ENTRY (files))); @@ -154,7 +150,6 @@ sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ); sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION); sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER); - sat_cfg_reset_str (SAT_CFG_STR_TLE_PROXY); sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES); sat_cfg_reset_bool (SAT_CFG_BOOL_TLE_ADD_NEW); @@ -255,24 +250,7 @@ g_signal_connect (server, "changed", G_CALLBACK (value_changed_cb), NULL); gtk_table_attach (GTK_TABLE (table), server, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - - /* proxy */ - label = gtk_label_new (_("Proxy server:")); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); - proxy = gtk_entry_new (); - if (sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY)) - gtk_entry_set_text (GTK_ENTRY (proxy), sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY)); - tips = gtk_tooltips_new (); - gtk_tooltips_set_tip (tips, proxy, - _("Enter URL for local proxy server. e.g.\n"\ - "http://my.proxy.com"), - NULL); - g_signal_connect (proxy, "changed", G_CALLBACK (value_changed_cb), NULL); - gtk_table_attach (GTK_TABLE (table), proxy, 1, 2, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - /* Files */ label = gtk_label_new (_("Files to fetch:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); @@ -396,9 +374,6 @@ /* server */ gtk_entry_set_text (GTK_ENTRY (server), sat_cfg_get_str_def (SAT_CFG_STR_TLE_SERVER)); - /* proxy */ - gtk_entry_set_text (GTK_ENTRY (proxy), ""); - /* files */ gtk_entry_set_text (GTK_ENTRY (files), sat_cfg_get_str_def (SAT_CFG_STR_TLE_FILES)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-16 20:33:19
|
Revision: 199 http://gpredict.svn.sourceforge.net/gpredict/?rev=199&view=rev Author: csete Date: 2009-03-16 20:32:52 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Applied patch 2688135: Gio port of TLE updater (thanks Bruce Cowan). Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/README trunk/configure.ac trunk/src/about.c trunk/src/menubar.c trunk/src/tle-update.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/ChangeLog 2009-03-16 20:32:52 UTC (rev 199) @@ -1,3 +1,20 @@ +2009-03-16 Bruce Cowan <bc...@fa...> + + * src/menubar.c: + * src/tle-update.c: + Port TLE download to GIO. + + * configure.ac: + * README: + Remove references to libcurl, add GIO dependency, and bump GLib + requirement. + + * src/about.c: + Updated credits. + + * NEWS: + Updated. + 2009-03-01; Alexandru Csete <oz...@gm...> * configure.ac: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/NEWS 2009-03-16 20:32:52 UTC (rev 199) @@ -17,6 +17,7 @@ - Fixed bug 2139102: rigctld port. - Fixed bug 2130912: Crash when no rig or no rotator are defined. - Fixed bug 2170642: Small error in user manual. +- Applied patch 2688135: Use GIO instead of libcurl for TLE download. x Windows: New installer instead of ZIP distribution. - Updated PDF user manual. - French translation. Modified: trunk/README =================================================================== --- trunk/README 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/README 2009-03-16 20:32:52 UTC (rev 199) @@ -49,7 +49,6 @@ for successful compilation of Gpredict: - Gtk+ 2.12 or later -- Curl and libcurl (optional but highly recommended) - Hamlib (runtime only, not required for build) If you compile Gpredict from source you will also need the development parts Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/configure.ac 2009-03-16 20:32:52 UTC (rev 199) @@ -21,24 +21,11 @@ fi dnl check for glib, gtk, and goocanvas libraries -pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9" +pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.16.0 gio-2.0 >= 2.16.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) - -dnl check for libcurl -PKG_CHECK_MODULES(LIBCURL, libcurl, [ - CFLAGS="$CFLAGS $LIBCURL_CFLAGS"; - LIBS="$LIBS $LIBCURL_LIBS"; - havecurl=true; - AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available]) - ], [ - havecurl=false; - AC_DEFINE(HAVE_LIBCURL, 0, [Define if libcurl is unvailable]) - -]) - dnl Hamlib not needed if we go for the TCP based I/F dnl check for hamlib dnl PKG_CHECK_MODULES(HAMLIB, hamlib, [ @@ -73,14 +60,12 @@ GLIB_V=`pkg-config --modversion glib-2.0` +GIO_V=`pkg-config --modversion gio-2.0` GTHR_V=`pkg-config --modversion gthread-2.0` GDK_V=`pkg-config --modversion gdk-2.0` GTK_V=`pkg-config --modversion gtk+-2.0` GOOC_V=`pkg-config --modversion goocanvas` dnl SQL_V=`pkg-config --modversion sqlite3` -if test "$havecurl" = true ; then - CURL_V=`pkg-config --modversion libcurl` -fi dnl if test "$havehamlib" = true ; then dnl HAML_V=`pkg-config --modversion hamlib` dnl fi @@ -110,16 +95,12 @@ echo echo Gpredict version... : $VERSION echo Glib version....... : $GLIB_V +echo Gio version........ : $GIO_V echo Gthread version.... : $GTHR_V echo Gdk version........ : $GDK_V echo Gtk+ version....... : $GTK_V echo GooCanvas version.. : $GOOC_V dnl echo SQLite version..... : $SQL_V -if test "$havecurl" = true ; then -echo Curl version....... : $CURL_V -else -echo Curl version....... : none -fi dnl if test "$havehamlib" = true ; then dnl echo Hamlib version..... : $HAML_V dnl else Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/src/about.c 2009-03-16 20:32:52 UTC (rev 199) @@ -36,20 +36,21 @@ const gchar *authors[] = { - "Alexandru Csete, OZ9AEC (design and development)", - "", - "Contributors:", - "Damon Chaplin (GooCanvas)", - "Dr. T.S. Kelso (SGP4/SDP4 algorithms)", - "John A. Magliacane, KD2BD (prediction code)", - "Neoklis Kyriazis, 5B4AZ (SGP4/SDP4 in C)", - "William J Beksi, KC2EXL (GtkSatMap)", - "Stephane Fillod (locator.c)", - "Nate Bargmann (locator.c)", - "Dave Hines (locator.c)", - "Mirko Caserta (locator.c)", - "S. R. Sampson (locator.c)", - NULL + "Alexandru Csete, OZ9AEC (design and development)", + "", + "Contributors:", + "Bruce Cowan (Gio port of TLE updater)", + "Damon Chaplin (GooCanvas)", + "Dr. T.S. Kelso (SGP4/SDP4 algorithms)", + "John A. Magliacane, KD2BD (prediction code)", + "Neoklis Kyriazis, 5B4AZ (SGP4/SDP4 in C)", + "William J Beksi, KC2EXL (GtkSatMap)", + "Stephane Fillod (locator.c)", + "Nate Bargmann (locator.c)", + "Dave Hines (locator.c)", + "Mirko Caserta (locator.c)", + "S. R. Sampson (locator.c)", + NULL }; Modified: trunk/src/menubar.c =================================================================== --- trunk/src/menubar.c 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/src/menubar.c 2009-03-16 20:32:52 UTC (rev 199) @@ -436,7 +436,6 @@ menubar_tle_net_cb (GtkWidget *widget, gpointer data) { GtkWidget *dialog; /* dialog window */ -#if HAVE_LIBCURL GtkWidget *label; /* misc labels */ GtkWidget *progress; /* progress indicator */ GtkWidget *label1,*label2; /* activitity and stats labels */ @@ -514,24 +513,6 @@ /* reload satellites */ mod_mgr_reload_sats (); - -#else - - dialog = gtk_message_dialog_new (GTK_WINDOW (app), - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("This version of gpredict has been compiled "\ - "without network support. Therefore, TLE update "\ - "from network is not available.\n\n"\ - "Consult the user manual for details.")); - - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - -#endif - } Modified: trunk/src/tle-update.c =================================================================== --- trunk/src/tle-update.c 2009-03-01 11:09:38 UTC (rev 198) +++ trunk/src/tle-update.c 2009-03-16 20:32:52 UTC (rev 199) @@ -32,9 +32,7 @@ #ifdef HAVE_CONFIG_H # include <build-config.h> #endif -#if HAVE_LIBCURL -# include <curl/curl.h> -#endif +#include <gio/gio.h> #include "sgpsdp/sgp4sdp4.h" #include "sat-log.h" #include "sat-cfg.h" @@ -58,7 +56,6 @@ static gchar *tle_to_gchar (tle_type_t type, tle_t *tle); #endif -static size_t my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream); static gint read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data); static void update_tle_in_file (const gchar *ldname, @@ -414,20 +411,16 @@ GtkWidget *label1, GtkWidget *label2) { - -#if HAVE_LIBCURL gchar *server; - gchar *proxy = NULL; gchar *files_tmp; gchar **files; guint numfiles,i; gchar *curfile; gchar *locfile; - CURL *curl; - CURLcode res; + GFile *file; gboolean error = FALSE; gdouble fraction,start=0; - FILE *outfile; + GFile *outfile; GDir *dir; gchar *cache; const gchar *fname; @@ -443,9 +436,8 @@ tle_in_progress = TRUE; - /* get server, proxy, and list of files */ + /* get server and list of files */ server = sat_cfg_get_str (SAT_CFG_STR_TLE_SERVER); - proxy = sat_cfg_get_str (SAT_CFG_STR_TLE_PROXY); files_tmp = sat_cfg_get_str (SAT_CFG_STR_TLE_FILES); files = g_strsplit (files_tmp, ";", 0); numfiles = g_strv_length (files); @@ -467,20 +459,13 @@ if (!silent && (progress != NULL)) start = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress)); - /* initialise curl */ - curl = curl_easy_init(); - if (proxy != NULL) - curl_easy_setopt (curl, CURLOPT_PROXY, proxy); - curl_easy_setopt (curl, CURLOPT_USERAGENT, "gpredict/curl"); - curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 10); - /* get files */ for (i = 0; i < numfiles; i++) { /* set URL */ curfile = g_strconcat (server, files[i], NULL); - curl_easy_setopt (curl, CURLOPT_URL, curfile); + file = g_file_new_for_uri (curfile); /* set activity message */ if (!silent && (label1 != NULL)) { @@ -502,18 +487,15 @@ "tle", G_DIR_SEPARATOR_S, "cache", G_DIR_SEPARATOR_S, files[i], NULL); - outfile = g_fopen (locfile, "wb"); - curl_easy_setopt (curl, CURLOPT_WRITEDATA, outfile); - curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, my_write_func); + outfile = g_file_new_for_path (locfile); - /* get file */ - res = curl_easy_perform (curl); + g_file_copy (file, outfile, G_FILE_COPY_NONE, NULL, NULL, NULL, &err); - if (res != CURLE_OK) { + if (error) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Error fetching %s (%s)"), - __FUNCTION__, curfile, curl_easy_strerror (res)); - error = TRUE; + __FUNCTION__, curfile, err->message); + g_clear_error (&err); } else { sat_log_log (SAT_LOG_LEVEL_MSG, @@ -539,11 +521,8 @@ g_free (curfile); g_free (locfile); - fclose (outfile); } - curl_easy_cleanup (curl); - /* continue update if we have fetched at least one file */ if (success > 0) { /* call update_from_files */ @@ -561,8 +540,6 @@ g_free (server); g_strfreev (files); g_free (files_tmp); - if (proxy != NULL) - g_free (proxy); /* open cache */ cache = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, @@ -596,36 +573,9 @@ /* clear busy flag */ tle_in_progress = FALSE; - -#else - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: This version of gpredict has been compiled without network support.\n" - "To update TLE data, download NASA 2-line files manually, then run Update from files."), - __FUNCTION__); -#endif - } -/** \brief Write TLE data block to file. - * \param ptr Pointer to the data block to be written. - * \param size Size of data block. - * \param nmemb Size multiplier? - * \param stream Pointer to the file handle. - * \return The number of bytes actually written. - * - * This function writes the received data to the file pointed to by stream. - * It is used as write callback by to curl exec function. - */ -static size_t -my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream) -{ - /*** FIXME: TBC whether this works in wintendo */ - return fwrite (ptr, size, nmemb, stream); -} - - - /** \brief Read fresh TLE data into hash table. * \param dir The directory to read from. * \param fnam The name of the file to read from. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-01 11:09:44
|
Revision: 198 http://gpredict.svn.sourceforge.net/gpredict/?rev=198&view=rev Author: csete Date: 2009-03-01 11:09:38 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-01 10:34:33 UTC (rev 197) +++ trunk/ChangeLog 2009-03-01 11:09:38 UTC (rev 198) @@ -1,3 +1,10 @@ +2009-03-01; Alexandru Csete <oz...@gm...> + + * configure.ac: + Changed required GooCanvas version from 0.10 to 0.9 to be vompatible + with older linux distributions, too (e.g. Ubuntu 8.04). + + 2009-02-19; Stephane Fillod <fi...@us...> * po/POTFILES.in: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-03-01 10:34:33 UTC (rev 197) +++ trunk/NEWS 2009-03-01 11:09:38 UTC (rev 198) @@ -19,6 +19,7 @@ - Fixed bug 2170642: Small error in user manual. x Windows: New installer instead of ZIP distribution. - Updated PDF user manual. +- French translation. Changes in version 0.9.0 (2007-09-29): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-01 10:34:35
|
Revision: 197 http://gpredict.svn.sourceforge.net/gpredict/?rev=197&view=rev Author: csete Date: 2009-03-01 10:34:33 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Changed required GooCanvas version from 0.10 to 0.9 to be vompatible with older linux distributions, too (e.g. Ubuntu 8.04). Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-03-01 10:26:49 UTC (rev 196) +++ trunk/configure.ac 2009-03-01 10:34:33 UTC (rev 197) @@ -21,7 +21,7 @@ fi dnl check for glib, gtk, and goocanvas libraries -pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.10" +pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-03-01 10:27:13
|
Revision: 196 http://gpredict.svn.sourceforge.net/gpredict/?rev=196&view=rev Author: csete Date: 2009-03-01 10:26:49 +0000 (Sun, 01 Mar 2009) Log Message: ----------- Updated TLE files. Modified Paths: -------------- trunk/data/amateur.tle trunk/data/cubesat.tle trunk/data/galileo.tle trunk/data/geo.tle trunk/data/gps-ops.tle trunk/data/iridium.tle trunk/data/military.tle trunk/data/radar.tle trunk/data/science.tle trunk/data/weather.tle Modified: trunk/data/amateur.tle =================================================================== --- trunk/data/amateur.tle 2009-02-19 21:26:45 UTC (rev 195) +++ trunk/data/amateur.tle 2009-03-01 10:26:49 UTC (rev 196) @@ -1,177 +1,177 @@ OSCAR III [-] -1 01293U 65016F 08362.11586417 -.00000099 00000-0 -28362-4 0 4197 -2 01293 70.0702 183.2826 0016376 33.7096 326.5052 14.04678137235648 +1 01293U 65016F 09059.20711476 -.00000089 00000-0 -21793-4 0 4668 +2 01293 70.0702 46.9383 0019745 307.6207 52.3111 14.04687519244500 AO-5 [-] -1 04321U 70008B 08360.99455234 -.00000031 00000-0 10000-3 0 982 -2 04321 102.1292 2.8286 0027611 307.7944 52.0626 12.52155360779088 +1 04321U 70008B 09058.91122459 -.00000031 00000-0 10000-3 0 1340 +2 04321 102.1332 67.9535 0027740 186.9759 173.0927 12.52155945787082 AO-6 [-] -1 06236U 72082B 08360.10887740 -.00000027 00000-0 10000-3 0 881 -2 06236 101.4033 14.4720 0003716 230.0553 130.0193 12.53076013655601 +1 06236U 72082B 09058.93752120 -.00000027 00000-0 10000-3 0 1230 +2 06236 101.4004 76.7084 0004050 104.2109 255.9413 12.53076615663726 AO-7 [P] -1 07530U 74089B 08361.46749842 -.00000027 00000-0 10000-3 0 3623 -2 07530 101.4466 26.3746 0011810 246.0210 113.9628 12.53574861561074 +1 07530U 74089B 09059.63189567 -.00000027 00000-0 10000-3 0 4147 +2 07530 101.4393 88.2523 0012012 120.6214 239.6046 12.53575372569110 AO-8 [-] -1 10703U 78026B 08361.89142462 -.00000276 00000-0 -16228-3 0 3621 -2 10703 98.8591 47.2100 0006343 288.4730 71.5745 13.98826503571934 +1 10703U 78026B 09059.69408221 -.00000023 00000-0 13143-4 0 4233 +2 10703 98.8448 108.8020 0007588 109.5611 250.6374 13.98828260580854 AO-10 [-] -1 14129U 83058B 08360.44051195 -.00000012 00000-0 10000-3 0 6015 -2 14129 26.0284 179.5072 5960537 184.4027 166.1156 2.05868360164075 +1 14129U 83058B 09058.49128964 .00000015 00000-0 10000-3 0 6274 +2 14129 25.9859 169.3453 5976411 201.6670 115.5759 2.05869272165391 UO-11 [P] -1 14781U 84021B 08361.30466834 .00000141 00000-0 25978-4 0 8459 -2 14781 98.1330 37.9698 0009310 168.4088 191.7315 14.79685781332266 +1 14781U 84021B 09058.86987998 -.00000119 00000-0 -85883-5 0 8980 +2 14781 98.1211 102.2670 0008752 336.6668 23.4186 14.79695680341662 FO-12 [-] -1 16909U 86061B 08361.17434896 -.00000083 00000-0 10000-3 0 4896 -2 16909 50.0180 333.7719 0011467 126.1599 234.0298 12.44452239 17435 +1 16909U 86061B 09058.70032984 -.00000083 00000-0 10000-3 0 5285 +2 16909 50.0129 138.4755 0010763 288.6655 71.3011 12.44452632 25344 UO-14 [-] -1 20437U 90005B 08361.97638086 .00000001 00000-0 16049-4 0 8113 -2 20437 98.3155 321.1133 0010673 325.3652 34.6837 14.31532851988410 +1 20437U 90005B 09058.95208655 -.00000002 00000-0 14680-4 0 8616 +2 20437 98.3251 21.4795 0010877 127.9146 232.3020 14.31537718997420 UO-15 [-] -1 20438U 90005C 08361.43034774 -.00000005 00000-0 14009-4 0 3056 -2 20438 98.3756 312.8011 0010139 354.3496 5.7571 14.30436489987776 +1 20438U 90005C 09059.43351835 -.00000027 00000-0 57128-5 0 3572 +2 20438 98.3856 14.4814 0009891 153.9778 206.1897 14.30439738996927 AO-16 [P] -1 20439U 90005D 08361.94603762 .00000030 00000-0 26584-4 0 4961 -2 20439 98.2553 332.4071 0010510 328.0390 32.0152 14.31812175988500 +1 20439U 90005D 09058.56012628 -.00000025 00000-0 58291-5 0 5448 +2 20439 98.2651 32.0237 0011494 132.9671 227.2474 14.31816715997466 DO-17 [-] -1 20440U 90005E 08361.63387606 .00000023 00000-0 23759-4 0 2056 -2 20440 98.2315 337.2342 0010550 324.6199 35.4282 14.32115056988590 +1 20440U 90005E 09059.70195447 -.00000017 00000-0 88479-5 0 2571 +2 20440 98.2415 38.0910 0011725 125.7924 234.4348 14.32120067997760 WO-18 [-] -1 20441U 90005F 08361.04974247 .00000028 00000-0 25655-4 0 7119 -2 20441 98.2387 335.2668 0011315 329.9500 30.1035 14.31880174988444 +1 20441U 90005F 09059.47772258 -.00000021 00000-0 75003-5 0 7633 +2 20441 98.2485 36.4914 0012182 129.6755 230.5500 14.31884633997668 LO-19 [P] -1 20442U 90005G 08361.96145277 .00000023 00000-0 23665-4 0 4205 -2 20442 98.2208 340.3275 0011400 324.4304 35.6123 14.32049239988667 +1 20442U 90005G 09058.49535888 -.00000025 00000-0 57015-5 0 4668 +2 20442 98.2300 39.6404 0012658 131.1330 229.0928 14.32053506997619 FO-20 [-] -1 20480U 90013C 08361.89383708 -.00000036 00000-0 -64467-5 0 210 -2 20480 99.0566 308.6523 0540066 200.2831 157.6055 12.83359328884806 +1 20480U 90013C 09058.88603252 -.00000021 00000-0 19908-4 0 742 +2 20480 99.0672 359.8845 0540703 57.7895 307.4452 12.83360446892888 AO-21 [-] -1 21087U 91006A 08361.86136936 .00000052 00000-0 38373-4 0 1531 -2 21087 82.9404 173.6628 0036471 46.4316 313.9860 13.75039147898730 +1 21087U 91006A 09059.24061037 .00000045 00000-0 30829-4 0 2066 +2 21087 82.9437 126.7397 0033795 226.7659 133.0674 13.75040017907448 RS-12 & RS-13 [-] -1 21089U 91007A 08361.66417545 -.00000004 00000-0 -20432-4 0 333 -2 21089 82.9213 34.6839 0030902 89.7533 270.7173 13.74483828897491 +1 21089U 91007A 09058.85055972 .00000010 00000-0 -54333-5 0 873 +2 21089 82.9256 347.7852 0027672 275.1112 84.6882 13.74485070906171 UO-22 [-] -1 21575U 91050B 08361.89146604 .00000027 00000-0 22578-4 0 4454 -2 21575 98.4240 307.4309 0007495 169.2961 190.8399 14.39659986915918 +1 21575U 91050B 09058.85928059 -.00000014 00000-0 93657-5 0 4922 +2 21575 98.4347 9.3793 0007154 354.4348 5.6760 14.39665591924970 KO-23 [-] -1 22077U 92052B 08362.09926653 -.00000037 00000-0 10000-3 0 6245 -2 22077 66.0873 327.0670 0009344 320.4967 39.5365 12.86446441769380 +1 22077U 92052B 09059.14742673 -.00000037 00000-0 10000-3 0 6793 +2 22077 66.0831 195.0181 0012173 306.1049 53.8842 12.86447676777491 AO-24 [-] -1 22654U 93031B 08360.06727683 -.00000119 00000-0 10000-3 0 2192 -2 22654 5.2113 340.7059 2882725 150.5942 229.3837 1.42205280 76642 +1 22654U 93031B 09055.93977195 -.00000111 00000-0 10000-3 0 2401 +2 22654 5.1580 339.5676 2878999 154.1683 223.7411 1.42205158 77528 AO-27 [+] -1 22825U 93061C 08361.86008356 -.00000078 00000-0 -14227-4 0 1384 -2 22825 98.4122 314.9312 0009218 55.3134 304.8911 14.29254767795296 +1 22825U 93061C 09058.51589111 .00000001 00000-0 16896-4 0 1875 +2 22825 98.4229 15.4669 0007699 223.7875 136.2698 14.29259362804247 IO-26 [P] -1 22826U 93061D 08361.18058500 .00000019 00000-0 23891-4 0 8552 -2 22826 98.4066 315.1001 0009752 54.1789 306.0304 14.29505488795297 +1 22826U 93061D 09059.50528290 -.00000012 00000-0 11971-4 0 9079 +2 22826 98.4162 17.2199 0008271 217.1427 142.9182 14.29510334804486 KO-25 [-] -1 22828U 93061F 08361.95101114 -.00000003 00000-0 15170-4 0 747 -2 22828 98.3997 315.7883 0010294 27.7953 332.3770 14.29807313763675 +1 22828U 93061F 09058.93256160 -.00000007 00000-0 13793-4 0 1217 +2 22828 98.4105 16.5972 0009786 191.6509 168.4445 14.29811503772677 PO-28 [+] -1 22829U 93061G 08360.93325031 .00000011 00000-0 20373-4 0 1112 -2 22829 98.3959 315.9303 0010102 27.8612 332.3111 14.30205229795533 +1 22829U 93061G 09058.73682296 -.00000040 00000-0 66876-6 0 1588 +2 22829 98.4056 17.5348 0009804 188.2948 171.8133 14.30209273804654 RS-15 [P] -1 23439U 94085A 08359.08001997 -.00000039 00000-0 10000-3 0 1681 -2 23439 64.8128 187.9769 0145902 85.8529 275.9055 11.27553426576374 +1 23439U 94085A 09058.53438714 -.00000039 00000-0 10000-3 0 1971 +2 23439 64.8140 82.1356 0146115 72.8596 288.8269 11.27553125583759 FO-29 [P] -1 24278U 96046B 08361.54695846 .00000040 00000-0 73917-4 0 9358 -2 24278 98.5776 252.5509 0351300 77.6171 286.4046 13.52941068610406 +1 24278U 96046B 09059.29221602 -.00000017 00000-0 21608-4 0 9827 +2 24278 98.5709 307.8739 0349806 272.5325 83.5822 13.52942555619023 MO-30 [-] -1 24305U 96052B 08361.75443527 .00000028 00000-0 14150-4 0 9963 -2 24305 82.9353 121.5803 0030613 17.1144 343.1039 13.73565518617008 +1 24305U 96052B 09059.56587211 .00000046 00000-0 32817-4 0 518 +2 24305 82.9312 74.3819 0029408 193.9062 166.1290 13.73567741625761 TO-31 [-] -1 25396U 98043C 08361.61144190 .00000069 00000-0 48117-4 0 2907 -2 25396 98.3537 32.3932 0002991 36.0188 324.1192 14.23769413543746 +1 25396U 98043C 09058.64915261 -.00000071 00000-0 -12964-4 0 3412 +2 25396 98.3435 92.2575 0002649 173.2504 186.8716 14.23772364552718 GO-32 [P] -1 25397U 98043D 08361.18892246 .00000065 00000-0 47063-4 0 7812 -2 25397 98.3451 26.6574 0001989 58.5758 301.5622 14.23153045543529 +1 25397U 98043D 09059.23822634 .00000054 00000-0 41765-4 0 8325 +2 25397 98.3361 87.3624 0000958 161.6987 198.4220 14.23155921552638 SO-33 [P] -1 25509U 98061B 08361.96828443 -.00000041 00000-0 -22433-4 0 3547 -2 25509 31.4357 306.3036 0355143 272.6983 83.3062 14.28233798531193 +1 25509U 98061B 09059.71627921 .00000049 00000-0 -13410-5 0 3973 +2 25509 31.4311 305.8458 0354190 110.1182 253.7910 14.28242582540313 PO-34 [-] -1 25520U 98064B 08361.20280632 .00000424 00000-0 11047-4 0 1508 -2 25520 28.4609 333.1758 0005503 216.9645 143.0571 15.17275846562359 +1 25520U 98064B 09058.93947650 .00000359 00000-0 78450-5 0 1949 +2 25520 28.4606 266.4105 0005589 190.9193 169.1278 15.17301492572040 ARISS [+] -1 25544U 98067A 08361.52062318 .00011219 00000-0 89152-4 0 9369 -2 25544 51.6417 110.7667 0007680 130.3323 334.0421 15.71790900578792 +1 25544U 98067A 09059.52201389 .00012647 00000-0 10235-3 0 3632 +2 25544 51.6403 143.5254 0009605 72.9181 113.4289 15.71184241588859 SO-35 [-] -1 25636U 99008C 08361.65504669 .00000025 00000-0 14153-4 0 1927 -2 25636 96.4590 221.2480 0149399 48.6050 312.7898 14.43451075518213 +1 25636U 99008C 09059.49884334 .00000028 00000-0 15438-4 0 2442 +2 25636 96.4538 269.7615 0147205 205.7000 153.6826 14.43456516527428 UO-36 [-] -1 25693U 99021A 08361.34635567 -.00000146 00000-0 -44203-6 0 8039 -2 25693 64.5581 286.8330 0024498 212.9969 146.9626 14.78732698522289 +1 25693U 99021A 09059.59380794 .00000048 00000-0 25729-4 0 8567 +2 25693 64.5558 89.4586 0017619 206.4069 153.6142 14.78740505531788 OO-38 [-] -1 26063U 00004C 08361.19960998 -.00000025 00000-0 11605-4 0 3933 -2 26063 100.1895 110.4038 0037097 28.9612 331.3616 14.35852044467123 +1 26063U 00004C 09058.82002430 -.00000027 00000-0 10951-4 0 4447 +2 26063 100.1908 185.5009 0036798 208.7953 151.1205 14.35856581476258 SO-41 [-] -1 26545U 00057A 08361.91118035 -.00000062 00000-0 11320-4 0 1453 -2 26545 64.5597 288.4043 0048286 305.0659 54.5946 14.80552657445699 +1 26545U 00057A 09059.53914598 -.00000082 00000-0 87585-5 0 1958 +2 26545 64.5562 92.3541 0052702 295.0129 64.5505 14.80565619455116 MO-46 [-] -1 26548U 00057D 08361.92360001 -.00000084 00000-0 83681-5 0 2803 -2 26548 64.5594 253.8589 0045947 297.3405 62.3010 14.83327134446405 +1 26548U 00057D 09059.43251554 -.00000021 00000-0 15869-4 0 3327 +2 26548 64.5566 57.3181 0049379 288.5659 71.0049 14.83342712455829 SO-42 [-] -1 26549U 00057E 08361.06446086 -.00000065 00000-0 11053-4 0 2203 -2 26549 64.5594 306.7007 0050763 310.4693 49.2009 14.79409198445257 +1 26549U 00057E 09059.82315889 .00000045 00000-0 25402-4 0 2736 +2 26549 64.5569 107.5249 0055560 299.6400 59.9214 14.79422633454837 AO-40 [-] -1 26609U 00072B 08357.37598698 -.00000023 00000-0 10000-3 0 1701 -2 26609 8.3411 42.1271 7939549 157.7677 278.7401 1.25584862 37409 +1 26609U 00072B 09058.05171133 -.00000191 00000-0 10000-3 0 1971 +2 26609 8.8054 30.8732 7951995 179.6287 182.5183 1.25585123 38245 NO-44 [P] -1 26931U 01043C 08361.61599318 -.00000077 00000-0 21329-5 0 593 -2 26931 67.0499 148.9270 0005969 258.5675 101.4719 14.29542988377918 +1 26931U 01043C 09059.28244749 .00000137 00000-0 85689-4 0 1096 +2 26931 67.0549 344.9105 0005329 264.2804 95.7688 14.29549362387012 NO-45 [-] -1 26932U 01043D 08361.86581924 -.00000061 00000-0 84699-5 0 609 -2 26932 67.0536 148.1907 0008089 254.2554 105.7655 14.29599140377991 +1 26932U 01043D 09058.90016922 -.00000071 00000-0 44388-5 0 1118 +2 26932 67.0512 345.8193 0006821 241.5045 118.5369 14.29602539387008 BO-47 & BO-48 [-] -1 27422U 02021B 08362.21248291 -.00000015 00000-0 11096-4 0 9336 -2 27422 98.5379 79.3400 0012697 12.1725 347.9761 14.28474297344855 +1 27422U 02021B 09058.76223340 .00000063 00000-0 42172-4 0 9844 +2 27422 98.5295 140.5202 0012327 181.0510 179.0648 14.28482462353784 AO-49 [-] -1 27605U 02058A 08361.48540940 .00000020 00000-0 24820-4 0 8033 -2 27605 64.5570 177.5079 0081776 242.7789 116.4986 14.72379578323515 +1 27605U 02058A 09058.31204499 -.00000036 00000-0 16429-4 0 8501 +2 27605 64.5608 346.3978 0077730 230.1401 129.2845 14.72387742332763 SO-50 [+] -1 27607U 02058C 08361.01297002 .00000048 00000-0 29530-4 0 7742 -2 27607 64.5553 191.0458 0082486 242.0927 117.1824 14.71403859323198 +1 27607U 02058C 09059.30842900 -.00000027 00000-0 17932-4 0 8250 +2 27607 64.5605 355.7705 0078025 229.0062 130.4273 14.71416888332652 DTUSAT [-] -1 27842U 03031C 08361.87436362 .00000020 00000-0 29550-4 0 4517 -2 27842 98.7085 8.4560 0008803 262.6453 97.3720 14.20960409284874 +1 27842U 03031C 09059.52904301 .00000025 00000-0 31633-4 0 4988 +2 27842 98.7089 71.2071 0010184 77.0388 283.1918 14.20968749293917 CO-55 [+] -1 27844U 03031E 08361.50639644 .00000026 00000-0 32673-4 0 4737 -2 27844 98.7157 7.1015 0009101 283.6790 76.3378 14.20613972284748 +1 27844U 03031E 09058.96523695 .00000065 00000-0 50512-4 0 5218 +2 27844 98.7153 69.6623 0010607 96.7368 263.5011 14.20624713293759 AAU CUBESAT [-] -1 27846U 03031G 08360.95861735 .00000025 00000-0 31888-4 0 3897 -2 27846 98.7081 7.5474 0008844 264.5051 95.5115 14.20960998284745 +1 27846U 03031G 09058.96535269 .00000049 00000-0 42558-4 0 4357 +2 27846 98.7090 70.6453 0010134 78.9737 281.2573 14.20969283293834 CANX-1 [-] -1 27847U 03031H 08360.54265265 .00000031 00000-0 34593-4 0 4028 -2 27847 98.7086 7.1314 0008702 265.4670 94.5523 14.20945127284637 +1 27847U 03031H 09058.97261069 .00000059 00000-0 47258-4 0 4480 +2 27847 98.7088 70.6451 0010194 79.2894 280.9428 14.20952910293782 CO-57 [+] -1 27848U 03031J 08361.95315242 .00000036 00000-0 37187-4 0 4225 -2 27848 98.7163 6.6092 0009249 287.1132 72.9029 14.20419878284777 +1 27848U 03031J 09058.99805735 .00000021 00000-0 30133-4 0 4682 +2 27848 98.7172 68.7585 0010547 101.3181 258.9188 14.20428338293725 RS-22 [+] -1 27939U 03042A 08361.54029891 .00000008 00000-0 10431-4 0 6768 -2 27939 97.9684 236.4251 0013169 321.6046 38.4224 14.63282914280328 +1 27939U 03042A 09059.33893769 .00000113 00000-0 30637-4 0 7277 +2 27939 97.9614 298.0699 0014550 114.0860 246.1865 14.63297542289651 AO-51 [+] -1 28375U 04025K 08361.92570859 .00000005 00000-0 14350-4 0 2769 -2 28375 98.0575 15.5276 0083553 288.7832 70.4304 14.40628718236155 +1 28375U 04025K 09058.57414592 .00000005 00000-0 13888-4 0 3277 +2 28375 98.0564 74.5486 0084791 97.3829 263.7009 14.40634171245177 VO-52 [+] -1 28650U 05017B 08361.96374925 .00000405 00000-0 57996-4 0 1145 -2 28650 97.7679 63.0374 0026279 230.6096 129.2772 14.81538111197148 +1 28650U 05017B 09058.36923773 .00000130 00000-0 23023-4 0 1659 +2 28650 97.7554 123.5165 0027722 30.5565 329.7234 14.81557152206385 UWE-1 [-] -1 28892U 05043C 08360.95471021 .00000212 00000-0 53911-4 0 2246 -2 28892 98.0766 249.7607 0017602 166.4442 193.7255 14.59692426168572 +1 28892U 05043C 09059.38974777 .00000072 00000-0 24621-4 0 2762 +2 28892 98.0696 312.4956 0016923 331.7424 28.2830 14.59710053177973 XO-53 [-] -1 28894U 05043E 08361.66418709 .00000012 00000-0 12138-4 0 3471 -2 28894 98.0770 250.7046 0017678 166.5732 193.5943 14.59648330168683 +1 28894U 05043E 09058.73038748 .00000026 00000-0 15001-4 0 4001 +2 28894 98.0712 312.1049 0017355 335.9117 24.1275 14.59656147177880 CO-58 [+] -1 28895U 05043F 08357.69608648 .00000096 00000-0 29631-4 0 1952 -2 28895 98.0826 247.0326 0018215 176.7596 183.3728 14.59726383167980 +1 28895U 05043F 09059.21418591 .00000088 00000-0 27930-4 0 2431 +2 28895 98.0732 312.8018 0017429 332.1097 27.9171 14.59745195177837 NCUBE-2 [-] -1 28897U 05043H 08361.68210475 .00000116 00000-0 33622-4 0 7331 -2 28897 98.0770 250.8333 0017263 165.7114 194.4566 14.59902801160859 +1 28897U 05043H 09059.28537858 .00000087 00000-0 27625-4 0 7860 +2 28897 98.0720 312.7864 0017003 333.4736 26.5663 14.59921525170136 CO-56 [P] -1 28941U 06005C 08362.04508670 .00025005 26621-5 14111-3 0 6727 -2 28941 98.1232 140.9131 0130705 55.4465 305.8846 15.68311654160141 +1 28941U 06005C 09059.83502255 .00062597 37380-5 30678-3 0 8595 +2 28941 98.1287 215.0246 0116678 178.9557 181.2077 15.72844404170151 PEHUENSAT 1 [+] -1 29712U 07001D 08362.14335373 .00000612 00000-0 86809-4 0 936 -2 29712 97.8540 56.4786 0015227 113.3642 246.9184 14.80389766106013 +1 29712U 07001D 09059.67738821 .00000456 00000-0 66372-4 0 2743 +2 29712 97.8423 118.6202 0013019 268.7328 91.2388 14.80455267115411 DO-64 [+] -1 32789U 08021G 08362.21833081 .00000689 00000-0 94511-4 0 2490 -2 32789 97.9709 61.4076 0015059 227.9273 132.0655 14.81572680 35987 +1 32789U 08021G 09059.22921931 .00000530 00000-0 74137-4 0 3024 +2 32789 97.9609 124.0575 0016214 29.8570 330.3556 14.81625660 45317 Modified: trunk/data/cubesat.tle =================================================================== --- trunk/data/cubesat.tle 2009-02-19 21:26:45 UTC (rev 195) +++ trunk/data/cubesat.tle 2009-03-01 10:26:49 UTC (rev 196) @@ -1,75 +1,75 @@ DTUSAT -1 27842U 03031C 08361.87436362 .00000020 00000-0 29550-4 0 4517 -2 27842 98.7085 8.4560 0008803 262.6453 97.3720 14.20960409284874 +1 27842U 03031C 09059.52904301 .00000025 00000-0 31633-4 0 4988 +2 27842 98.7089 71.2071 0010184 77.0388 283.1918 14.20968749293917 CUTE-1 (CO-55) -1 27844U 03031E 08361.50639644 .00000026 00000-0 32673-4 0 4737 -2 27844 98.7157 7.1015 0009101 283.6790 76.3378 14.20613972284748 +1 27844U 03031E 09058.96523695 .00000065 00000-0 50512-4 0 5218 +2 27844 98.7153 69.6623 0010607 96.7368 263.5011 14.20624713293759 QUAKESAT -1 27845U 03031F 08361.97453628 .00000075 00000-0 55797-4 0 4517 -2 27845 98.7210 6.9486 0008635 301.8934 58.1402 14.20239902284723 +1 27845U 03031F 09059.66137778 .00000053 00000-0 45087-4 0 4981 +2 27845 98.7216 69.7430 0009705 111.9078 248.3119 14.20252278293766 AAU CUBESAT -1 27846U 03031G 08360.95861735 .00000025 00000-0 31888-4 0 3897 -2 27846 98.7081 7.5474 0008844 264.5051 95.5115 14.20960998284745 +1 27846U 03031G 09058.96535269 .00000049 00000-0 42558-4 0 4357 +2 27846 98.7090 70.6453 0010134 78.9737 281.2573 14.20969283293834 CANX-1 -1 27847U 03031H 08360.54265265 .00000031 00000-0 34593-4 0 4028 -2 27847 98.7086 7.1314 0008702 265.4670 94.5523 14.20945127284637 +1 27847U 03031H 09058.97261069 .00000059 00000-0 47258-4 0 4480 +2 27847 98.7088 70.6451 0010194 79.2894 280.9428 14.20952910293782 CUBESAT XI-IV (CO-57) -1 27848U 03031J 08361.95315242 .00000036 00000-0 37187-4 0 4225 -2 27848 98.7163 6.6092 0009249 287.1132 72.9029 14.20419878284777 +1 27848U 03031J 09058.99805735 .00000021 00000-0 30133-4 0 4682 +2 27848 98.7172 68.7585 0010547 101.3181 258.9188 14.20428338293725 UWE-1 -1 28892U 05043C 08360.95471021 .00000212 00000-0 53911-4 0 2246 -2 28892 98.0766 249.7607 0017602 166.4442 193.7255 14.59692426168572 +1 28892U 05043C 09059.38974777 .00000072 00000-0 24621-4 0 2762 +2 28892 98.0696 312.4956 0016923 331.7424 28.2830 14.59710053177973 CUBESAT XI-V (CO-58) -1 28895U 05043F 08357.69608648 .00000096 00000-0 29631-4 0 1952 -2 28895 98.0826 247.0326 0018215 176.7596 183.3728 14.59726383167980 +1 28895U 05043F 09059.21418591 .00000088 00000-0 27930-4 0 2431 +2 28895 98.0732 312.8018 0017429 332.1097 27.9171 14.59745195177837 NCUBE-2 -1 28897U 05043H 08361.68210475 .00000116 00000-0 33622-4 0 7331 -2 28897 98.0770 250.8333 0017263 165.7114 194.4566 14.59902801160859 +1 28897U 05043H 09059.28537858 .00000087 00000-0 27625-4 0 7860 +2 28897 98.0720 312.7864 0017003 333.4736 26.5663 14.59921525170136 CUTE-1.7+APD (CO-56) -1 28941U 06005C 08362.04508670 .00025005 26621-5 14111-3 0 6727 -2 28941 98.1232 140.9131 0130705 55.4465 305.8846 15.68311654160141 +1 28941U 06005C 09059.83502255 .00062597 37380-5 30678-3 0 8595 +2 28941 98.1287 215.0246 0116678 178.9557 181.2077 15.72844404170151 GENESAT-1 -1 29655U 06058C 08361.88740499 .00009432 00000-0 10827-3 0 5954 -2 29655 40.0246 179.8937 0000993 133.2191 226.8707 15.61925028115491 +1 29655U 06058C 09059.54091038 .00010514 00000-0 11468-3 0 6462 +2 29655 40.0243 142.8724 0002257 281.0282 79.0277 15.63158070125454 CSTB1 -1 31122U 07012F 08361.83277050 .00000554 00000-0 13192-3 0 5190 -2 31122 98.0208 60.0431 0086915 90.0872 271.0263 14.55195550 90096 +1 31122U 07012F 09059.16006545 .00000551 00000-0 13192-3 0 5726 +2 31122 98.0073 120.8103 0084727 252.6547 106.5321 14.55215860 99308 MAST -1 31126U 07012K 08361.45044109 .00000116 00000-0 36590-4 0 4897 -2 31126 98.0170 57.9483 0095923 96.0388 265.1792 14.53467753 89945 +1 31126U 07012K 09058.78419059 -.00000014 00000-0 77439-5 0 5377 +2 31126 98.0022 118.5270 0093710 259.4397 99.6211 14.53479613 99143 LIBERTAD-1 -1 31128U 07012M 08361.11848356 -.00000046 00000-0 00000+0 0 5153 -2 31128 98.0167 56.1909 0103953 101.1793 260.1128 14.52003877 89780 +1 31128U 07012M 09059.06713269 -.00000048 00000-0 00000+0 0 5675 +2 31128 98.0016 117.2109 0101918 263.2601 95.7006 14.52021088 99064 POLYSAT CP3 -1 31129U 07012N 08362.11461613 .00000110 00000-0 35847-4 0 5807 -2 31129 98.0168 57.2173 0103655 97.9825 263.3167 14.52093134 89912 +1 31129U 07012N 09059.16361003 .00000084 00000-0 30513-4 0 7502 +2 31129 98.0045 117.3895 0101290 262.8538 96.1130 14.52109282 99063 CAPE1 -1 31130U 07012P 08361.45571293 .00000138 00000-0 42397-4 0 4875 -2 31130 98.0184 56.5249 0104045 100.0774 261.2180 14.52020087 89628 +1 31130U 07012P 09059.12805425 .00000076 00000-0 28597-4 0 5385 +2 31130 98.0053 117.2836 0101678 263.0964 95.8653 14.52036608 98868 POLYSAT CP4 -1 31132U 07012Q 08362.10821739 .00000259 00000-0 67195-4 0 4937 -2 31132 98.0207 60.2640 0086981 89.1672 271.9495 14.55171086 90005 +1 31132U 07012Q 09059.16158137 .00000073 00000-0 26629-4 0 5451 +2 31132 98.0085 120.7538 0084660 252.9467 106.2442 14.55186194 99176 NTS (CANX-6) -1 32784U 08021B 08362.23251555 .00000268 00000-0 41447-4 0 2467 -2 32784 97.9726 61.3106 0015129 221.7930 138.2127 14.81002066 35971 +1 32784U 08021B 09059.87647027 .00000199 00000-0 32531-4 0 3024 +2 32784 97.9607 124.5370 0016396 21.8626 338.3289 14.81019794 45397 CUTE-1.7+APD II -1 32785U 08021C 08361.89276266 .00000135 00000-0 24153-4 0 2474 -2 32785 97.9710 61.0809 0014084 228.1801 131.8208 14.81431216 35937 +1 32785U 08021C 09058.70768523 -.00000058 00000-0 -52805-6 0 3014 +2 32785 97.9601 123.5150 0015647 30.8997 329.3116 14.81451872 45235 COMPASS-1 -1 32787U 08021E 08362.21962157 .00000445 00000-0 63538-4 0 2377 -2 32787 97.9676 61.3071 0014932 228.5257 131.4673 14.81522480 35986 +1 32787U 08021E 09059.23308950 .00000125 00000-0 22701-4 0 2921 +2 32787 97.9562 123.9192 0016602 30.2180 329.9985 14.81553912 45310 AAUSAT-II -1 32788U 08021F 08361.45857142 .00000124 00000-0 22557-4 0 2370 -2 32788 97.9671 60.5801 0014502 231.9106 128.0805 14.81636497 35879 +1 32788U 08021F 09059.14236931 -.00000071 00000-0 -21203-5 0 2920 +2 32788 97.9573 123.8735 0016173 31.9553 328.2638 14.81671712 45305 DELFI-C3 -1 32789U 08021G 08362.21833081 .00000689 00000-0 94511-4 0 2490 -2 32789 97.9709 61.4076 0015059 227.9273 132.0655 14.81572680 35987 +1 32789U 08021G 09059.22921931 .00000530 00000-0 74137-4 0 3024 +2 32789 97.9609 124.0575 0016214 29.8570 330.3556 14.81625660 45317 CANX-2 -1 32790U 08021H 08361.82633071 .00000163 00000-0 27692-4 0 2342 -2 32790 97.9709 61.0017 0014508 228.1500 131.8470 14.81419853 35900 +1 32790U 08021H 09058.84439228 -.00000191 00000-0 -17548-4 0 2876 +2 32790 97.9591 123.6306 0016040 31.6578 328.5585 14.81438729 45232 SEEDS II -1 32791U 08021J 08362.17596438 .00000116 00000-0 21766-4 0 2307 -2 32791 97.9700 61.2900 0015286 226.7454 133.2481 14.81365187 35943 +1 32791U 08021J 09058.72336772 -.00000060 00000-0 -74859-6 0 2846 +2 32791 97.9587 123.4423 0016851 29.5843 330.6311 14.81391624 45207 PSLV DEB -1 32797U 08021L 08353.58596765 .00000187 00000-0 23883-4 0 1221 -2 32797 97.9710 52.8070 0014401 258.6058 101.4030 14.81416884 33391 +1 32797U 08021L 09057.62862811 .00000205 00000-0 26126-4 0 1400 +2 32797 97.9558 122.4198 0016226 34.4501 325.8264 14.81440627 43772 Modified: trunk/data/galileo.tle =================================================================== --- trunk/data/galileo.tle 2009-02-19 21:26:45 UTC (rev 195) +++ trunk/data/galileo.tle 2009-03-01 10:26:49 UTC (rev 196) @@ -1,6 +1,6 @@ GIOVE-A -1 28922U 05051A 08360.79339189 .00000071 00000-0 10000-3 0 4313 -2 28922 56.0611 161.9370 0006208 344.4102 15.5504 1.70197027 18615 +1 28922U 05051A 09059.42380005 .00000024 00000-0 10000-3 0 4567 +2 28922 56.0639 160.2352 0006899 336.3673 23.6236 1.70191062 19713 GIOVE-B -1 32781U 08020A 08361.40630860 .00000095 00000-0 10000-3 0 1110 -2 32781 55.9625 196.8832 0016847 204.4933 155.4871 1.70950216 4177 +1 32781U 08020A 09057.99574195 .00000031 00000-0 10000-3 0 1384 +2 32781 55.9596 195.2065 0017770 205.8383 154.0221 1.70950538 5245 Modified: trunk/data/geo.tle =================================================================== --- trunk/data/geo.tle 2009-02-19 21:26:45 UTC (rev 195) +++ trunk/data/geo.tle 2009-03-01 10:26:49 UTC (rev 196) @@ -1,1128 +1,1149 @@ LES 9 -1 08747U 76023B 08361.49101189 -.00000068 00000-0 10000-3 0 1963 -2 08747 10.7508 153.3577 0022425 317.5126 58.2734 1.00268614 65693 +1 08747U 76023B 09058.55968701 -.00000068 00000-0 10000-3 0 2393 +2 08747 10.8021 151.5511 0022856 318.0246 145.5845 1.00267418 66324 MARISAT 2 -1 09478U 76101A 08357.24818028 -.00000282 00000-0 10000-3 0 953 -2 09478 13.2111 357.0195 0101031 196.5973 163.0580 0.97592087 61169 +1 09478U 76101A 09057.85097516 -.00000048 00000-0 10000-3 0 1185 +2 09478 13.2201 356.6065 0099808 198.4451 161.2254 0.97589808 61817 GOES 3 -1 10953U 78062A 08361.02237431 -.00000128 00000-0 10000-3 0 3463 -2 10953 14.2996 1.4776 0003099 280.8612 79.1114 1.00273292 64935 +1 10953U 78062A 09058.84694555 -.00000125 00000-0 10000-3 0 4144 +2 10953 14.3223 0.9697 0003941 326.2007 33.7934 1.00270304 65572 ESIAFI 1 (COMSTAR 4) -1 12309U 81018A 08357.55364171 -.00000160 00000-0 10000-3 0 1824 -2 12309 13.7880 11.6351 0007681 262.4454 97.4620 1.00272147103422 +1 12309U 81018A 09058.37166847 -.00000144 00000-0 10000-3 0 2051 +2 12309 13.8434 11.0951 0006568 272.3773 87.5716 1.00265885104096 SATCOM C5 -1 13631U 82105A 08360.12300012 -.00000098 00000-0 10000-3 0 5725 -2 13631 12.2403 33.1486 0008694 235.4839 124.4164 1.00272996 62370 +1 13631U 82105A 09057.94646688 -.00000096 00000-0 10000-3 0 5954 +2 13631 12.3487 32.5674 0007898 261.6482 98.3184 1.00273015 63011 TDRS 1 -1 13969U 83026B 08361.37317464 -.00000290 00000-0 10000-3 0 7792 -2 13969 13.2064 10.5893 0026185 234.4374 295.6683 1.00276741 67269 +1 13969U 83026B 09058.32518331 -.00000290 00000-0 10000-3 0 8237 +2 13969 13.2556 10.1079 0023329 239.5958 335.6958 1.00267063 67894 GSTAR 1 -1 15677U 85035A 08359.18026433 -.00000089 00000-0 10000-3 0 903 -2 15677 10.2988 52.7769 0008718 238.1026 121.7439 1.00272428 61222 +1 15677U 85035A 09058.99828286 -.00000088 00000-0 10000-3 0 1129 +2 15677 10.4452 52.0429 0009561 258.0324 101.9555 1.00272535 61885 INTELSAT 511 -1 15873U 85055A 08359.30800663 .00000102 00000-0 10000-3 0 3359 -2 15873 11.6775 40.8826 0015154 263.2679 96.5262 1.00106672 60630 +1 15873U 85055A 09058.22950266 -.00000142 00000-0 10000-3 0 3593 +2 15873 11.8040 40.2418 0016880 275.9342 83.9442 1.00122206 61285 GOES 7 -1 17561U 87022A 08358.33212012 .00000061 00000-0 10000-3 0 7525 -2 17561 11.7833 38.9925 0002503 196.3434 159.6218 1.00276917 63140 +1 17561U 87022A 09059.28552561 .00000072 00000-0 10000-3 0 8426 +2 17561 11.9051 38.3142 0002701 182.2494 225.1250 1.00274324 63829 GSTAR 3 -1 19483U 88081A 08359.09739897 -.00000103 00000-0 10000-3 0 1606 -2 19483 14.0910 22.6104 0005466 305.6454 54.2994 1.00272350 70601 +1 19483U 88081A 09057.91837698 -.00000098 00000-0 10000-3 0 1840 +2 19483 14.1762 22.0185 0006945 321.8121 38.1700 1.00272708 71259 TDRS 3 -1 19548U 88091B 08361.86416029 -.00000185 00000-0 10000-3 0 1729 -2 19548 11.5071 41.6288 0021925 298.9692 151.0113 1.00275994 61418 +1 19548U 88091B 09059.83285306 -.00000185 00000-0 10000-3 0 2083 +2 19548 11.6320 40.9949 0024053 308.8499 193.6250 1.00270115 62058 ASTRA 1A -1 19688U 88109B 08359.56139553 -.00000161 00000-0 10000-3 0 5191 -2 19688 7.1856 66.4193 0013450 287.6229 72.0690 0.98337488 53337 +1 19688U 88109B 09056.60792721 .00000000 00000-0 10000-3 0 5385 +2 19688 7.3415 65.6702 0017218 297.8596 62.1638 0.98331951 53952 TDRS 4 -1 19883U 89021B 08360.36684622 -.00000273 00000-0 10000-3 0 4883 -2 19883 10.1182 53.7927 0004021 227.5126 259.1862 1.00269186244971 +1 19883U 89021B 09059.24764793 -.00000273 00000-0 10000-3 0 5302 +2 19883 10.2628 53.0489 0003390 276.0136 232.2958 1.00265843245628 INTELSAT 602 (IS-602) -1 20315U 89087A 08359.25462608 .00000045 00000-0 10000-3 0 8140 -2 20315 6.4803 68.3613 0002085 208.4148 85.8578 1.00272682 67960 +1 20315U 89087A 09057.54115274 .00000042 00000-0 10000-3 0 8464 +2 20315 6.6403 67.5542 0001045 284.4352 177.1640 1.00271457 68613 LEASAT 5 -1 20410U 90002B 08361.99928302 -.00000302 00000-0 10000-3 0 405 -2 20410 8.0117 36.2827 0000492 303.0515 216.2913 1.00270781 54713 +1 20410U 90002B 09059.88722693 -.00000306 00000-0 10000-3 0 711 +2 20410 8.1266 35.9387 0000570 343.4045 198.9088 1.00270613 55353 INTELSAT 603 (IS-603) -1 20523U 90021A 08360.89377355 -.00000145 00000-0 10000-3 0 3920 -2 20523 5.9596 69.9095 0002872 252.4039 74.2213 1.00272628 61734 +1 20523U 90021A 09056.09835524 -.00000151 00000-0 10000-3 0 4212 +2 20523 6.1105 69.1001 0001251 280.9227 180.5108 1.00271414 62352 ASIASAT 1 -1 20558U 90030A 08357.56604356 -.00000271 00000-0 10000-3 0 6419 -2 20558 8.6289 62.4276 0006331 198.4236 161.4416 0.99244807 68323 +1 20558U 90030A 09059.07443094 .00000086 00000-0 10000-3 0 6654 +2 20558 8.7929 61.6193 0005855 217.8005 142.2942 0.99241257 68994 INSAT-1D -1 20643U 90051A 08360.70810103 -.00000026 00000-0 10000-3 0 878 -2 20643 9.3970 58.3382 0011941 39.0095 320.9931 1.00275907 54755 +1 20643U 90051A 09059.52433377 -.00000045 00000-0 10000-3 0 1623 +2 20643 9.5478 57.5676 0014418 20.9658 339.2021 1.00282797 55404 COSMOS 2085 -1 20693U 90061A 08361.61708946 -.00000139 00000-0 10000-3 0 8891 -2 20693 11.8280 37.3955 0005230 244.8197 115.1159 1.00276423 67516 +1 20693U 90061A 09058.44305986 -.00000138 00000-0 10000-3 0 9095 +2 20693 11.9420 36.8054 0004793 254.6237 105.3835 1.00270504 68140 SKYNET 4C -1 20776U 90079A 08357.91100881 .00000037 00000-0 10000-3 0 8665 -2 20776 9.4756 49.0772 0003480 210.5155 166.1492 1.00273426 66925 +1 20776U 90079A 09059.79240006 .00000085 00000-0 00000+0 0 8955 +2 20776 9.6192 48.3911 0002935 272.2791 136.6992 1.00271011 67604 EUTELSAT 2-F1 -1 20777U 90079B 08360.97098691 -.00000237 00000-0 10000-3 0 8327 -2 20777 8.8338 61.4412 0005930 159.0440 200.8837 0.99349711 47364 +1 20777U 90079B 09059.38896404 -.00000268 00000-0 10000-3 0 8599 +2 20777 8.9874 60.6765 0004106 173.1644 186.9694 0.99347212 48000 SBS-6 -1 20872U 90091A 08361.49434190 -.00000210 00000-0 10000-3 0 9954 -2 20872 1.3589 81.4334 0002039 173.5093 297.4530 1.00269532 55066 +1 20872U 90091A 09059.13223427 .00000076 00000-0 10000-3 0 320 +2 20872 1.5025 82.4616 0006847 296.1435 64.6207 0.98990463 55706 GALAXY 6 -1 20873U 90091B 08360.23273060 .00000007 00000-0 10000-3 0 2195 -2 20873 5.7447 70.7910 0001812 152.6655 207.1227 0.99756031 61115 +1 20873U 90091B 09059.38378433 -.00000336 00000-0 10000-3 0 2441 +2 20873 5.9063 69.9714 0001571 170.5654 189.6568 0.99766660 61765 INMARSAT 2-F1 -1 20918U 90093A 08361.44585200 .00000120 00000-0 10000-3 0 1952 -2 20918 6.2135 56.6697 0003377 223.6008 193.5343 1.00270898 62943 +1 20918U 90093A 09058.66094050 .00000116 00000-0 10000-3 0 2932 +2 20918 6.3572 56.1550 0003338 287.6429 269.6999 1.00271880 63570 GSTAR 4 -1 20946U 90100B 08357.51603534 -.00000273 00000-0 10000-3 0 2294 -2 20946 5.9283 70.6617 0007169 173.6805 186.1279 0.99146247 60989 +1 20946U 90100B 09059.09301926 .00000083 00000-0 10000-3 0 2497 +2 20946 6.0974 69.8164 0005454 201.2847 158.9073 0.99140673 61655 COSMOS 2133 -1 21111U 91010A 08358.66797580 -.00000050 00000-0 10000-3 0 945 -2 21111 10.9132 43.6121 0003054 282.0254 77.8944 1.00279379 65420 +1 21111U 91010A 09059.47711204 -.00000072 00000-0 10000-3 0 1183 +2 21111 11.0484 42.9616 0003958 303.7306 56.3002 1.00284093 66095 INMARSAT 2-F2 -1 21149U 91018A 08361.24043550 -.00000126 00000-0 10000-3 0 3120 -2 21149 5.5282 56.8167 0004137 213.2713 173.5557 1.00271460 65238 +1 21149U 91018A 09059.19551190 -.00000131 00000-0 10000-3 0 4030 +2 21149 5.6731 56.3862 0003948 282.5982 151.5563 1.00272339 65870 TDRS 5 -1 21639U 91054B 08358.55281638 .00000112 00000-0 10000-3 0 3657 -2 21639 9.4559 57.6806 0004295 259.3718 166.7556 1.00267127 63700 +1 21639U 91054B 09058.63758954 .00000113 00000-0 10000-3 0 4049 +2 21639 9.6074 56.8986 0007448 299.0227 223.3872 1.00273924 64369 INTELSAT 605 (IS-605) -1 21653U 91055A 08358.26512959 .00000021 00000-0 10000-3 0 7197 -2 21653 3.9940 74.7612 0001375 203.7470 83.0769 1.00272136 63543 +1 21653U 91055A 09059.66804527 .00000070 00000-0 00000+0 0 7486 +2 21653 4.1687 74.8254 0004898 206.5819 153.6996 0.99324385 64221 ANIK E1 -1 21726U 91067A 08360.07576447 -.00000212 00000-0 10000-3 0 944 -2 21726 5.3284 72.8218 0008711 180.7707 178.9796 0.99170575 53971 +1 21726U 91067A 09058.60963368 .00000101 00000-0 10000-3 0 1217 +2 21726 5.4897 71.9932 0007781 208.0280 152.1769 0.99167169 54612 INTELSAT 601 (IS-601) -1 21765U 91075A 08360.91402975 .00000138 00000-0 10000-3 0 6978 -2 21765 4.0533 74.5060 0000156 269.3615 127.4587 1.00273216 62682 +1 21765U 91075A 09058.61724409 .00000131 00000-0 10000-3 0 7333 +2 21765 4.2109 73.7007 0000455 332.2204 21.3393 1.00273859 63312 EUTELSAT 2-F3 -1 21803U 91083A 08361.11403189 -.00000166 00000-0 10000-3 0 6366 -2 21803 8.0012 64.5633 0004969 199.2434 165.9566 0.99296127 58291 +1 21803U 91083A 09059.67484920 .00000091 00000-0 10000-3 0 6764 +2 21803 8.1566 63.7653 0003458 241.3600 163.3844 0.99292919 58932 GALAXY 5 -1 21906U 92013A 08360.39323571 .00000016 00000-0 10000-3 0 8498 -2 21906 3.7953 75.7315 0014323 264.6666 94.8011 0.99289663 53030 +1 21906U 92013A 09056.83569975 -.00000235 00000-0 10000-3 0 8731 +2 21906 3.9544 74.9408 0015325 266.8700 93.3064 0.99291575 53653 INMARSAT 2-F4 -1 21940U 92021B 08359.87161684 -.00000338 00000-0 10000-3 0 244 -2 21940 4.1677 50.2964 0001886 234.1852 231.9577 1.00266746 61101 +1 21940U 92021B 09059.74708444 -.00000345 00000-0 10000-3 0 1181 +2 21940 4.3054 50.3144 0001599 272.2044 214.1029 1.00276020 61763 EUTELSAT 2-F4 -1 22028U 92041B 08357.39086573 -.00000047 00000-0 10000-3 0 1149 -2 22028 7.1824 67.8599 0006477 127.9654 231.9379 0.99080117 52961 +1 22028U 92041B 09059.01090890 -.00000001 00000-0 10000-3 0 1358 +2 22028 7.3507 67.0165 0004285 124.6952 235.5216 0.99076420 53639 SATCOM C3 -1 22117U 92060B 08361.05106403 -.00000221 00000-0 10000-3 0 448 -2 22117 3.9549 74.6648 0001838 242.2881 77.2838 1.00271278 59633 +1 22117U 92060B 09059.43116784 -.00000228 00000-0 10000-3 0 827 +2 22117 4.1129 73.8654 0001570 290.7161 229.9783 1.00271509 60285 HELLAS SAT 1 (DFS 3) -1 22175U 92066A 08357.39020069 .00000071 00000-0 10000-3 0 3189 -2 22175 6.4729 68.6687 0004928 215.7346 144.0583 0.99733765 56914 +1 22175U 92066A 09057.56494155 .00000000 00000-0 10000-3 0 3369 +2 22175 6.6367 67.8416 0006166 262.4840 97.6607 0.99719939 57579 GORIZONT 27 -1 22245U 92082A 08356.37905428 .00000033 00000-0 10000-3 0 4069 -2 22245 10.8989 46.7429 0016916 215.7490 144.0867 1.00214588 63160 +1 22245U 92082A 09058.22567279 -.00000054 00000-0 10000-3 0 4256 +2 22245 11.0417 46.0420 0016214 222.8104 137.1496 1.00227488 63844 SUPERBIRD A1 -1 22253U 92084A 08350.40461251 -.00000128 00000-0 10000-3 0 7787 -2 22253 3.0343 76.6053 0005117 191.3218 120.1347 1.00270012 58447 +1 22253U 92084A 09058.15401257 .00000052 00000-0 10000-3 0 8039 +2 22253 2.7485 66.5882 0011682 337.2839 23.1584 0.99118141 59180 COSMOS 2224 -1 22269U 92088A 08360.87727299 -.00000018 00000-0 10000-3 0 5334 -2 22269 10.0428 49.4287 0003713 156.7859 203.1771 1.00251263 58179 +1 22269U 92088A 09055.71950872 -.00000046 00000-0 10000-3 0 5414 +2 22269 10.1720 48.8091 0001980 178.5041 181.6152 1.00259150 58783 TDRS 6 -1 22314U 93003B 08357.41869032 .00000100 00000-0 10000-3 0 4016 -2 22314 8.7920 60.8265 0001107 160.1758 209.6460 1.00273947 58412 +1 22314U 93003B 09059.50857326 .00000101 00000-0 10000-3 0 4335 +2 22314 8.9533 59.9955 0004218 306.7963 163.3820 1.00277275 59090 ASTRA 1C -1 22653U 93031A 08360.19946076 .00000026 00000-0 10000-3 0 3540 -2 22653 2.1472 80.1753 0004083 191.7032 255.9670 1.00271716 52318 +1 22653U 93031A 09056.11818741 .00000014 00000-0 10000-3 0 3831 +2 22653 2.3035 79.2757 0003968 262.8990 217.4454 1.00272568 52939 INSAT-2B -1 22724U 93048B 08361.07007155 -.00000270 00000-0 10000-3 0 1619 -2 22724 7.5044 65.6797 0011149 46.5498 313.4097 0.99972158 56784 +1 22724U 93048B 09059.09066088 .00000076 00000-0 10000-3 0 1934 +2 22724 7.6584 64.8853 0011771 39.2589 320.9900 0.99962955 57421 ACTS -1 22796U 93058B 08359.20145761 -.00000082 00000-0 10000-3 0 5971 -2 22796 9.0188 59.9019 0001726 211.6850 148.2021 1.00272000 62891 +1 22796U 93058B 09059.01957650 -.00000082 00000-0 10000-3 0 6214 +2 22796 9.1739 59.1142 0003250 308.3436 51.7523 1.00272609 63555 INTELSAT 701 (IS-701) -1 22871U 93066A 08358.65043944 .00000069 00000-0 10000-3 0 3019 -2 22871 0.0117 27.5241 0003101 255.9728 223.1962 1.00272127 55440 +1 22871U 93066A 09058.58177874 .00000058 00000-0 10000-3 0 3309 +2 22871 0.0398 234.8326 0002653 114.9310 197.1966 1.00272621 56107 GORIZONT 28 -1 22880U 93069A 08360.90768042 -.00000335 00000-0 10000-3 0 515 -2 22880 10.4173 50.0379 0004167 261.6015 218.0379 1.00220774 55532 +1 22880U 93069A 09058.63498595 .00000098 00000-0 00000+0 0 1064 +2 22880 10.5551 49.3539 0031604 352.6571 46.9703 0.99646735 56172 GORIZONT 29 -1 22907U 93072A 08361.28920523 .00000129 00000-0 10000-3 0 6162 -2 22907 10.3948 50.1632 0015223 199.3631 160.5323 1.00135206 55298 +1 22907U 93072A 09059.19127998 .00000048 00000-0 10000-3 0 6375 +2 22907 10.5336 49.4759 0014375 206.8327 153.1819 1.00161499 55937 SOLIDARIDAD 1 -1 22911U 93073A 08360.20643425 -.00000098 00000-0 10000-3 0 1310 -2 22911 7.4826 65.6807 0004415 149.9609 209.9172 1.00278117 53913 +1 22911U 93073A 09059.02440331 -.00000107 00000-0 10000-3 0 1554 +2 22911 7.6398 64.8761 0001111 181.8985 178.2645 1.00275614 54565 METEOSAT-6 (MOP-3) -1 22912U 93073B 08361.97947449 -.00000009 00000-0 10000-3 0 8509 -2 22912 7.9647 61.9110 0001976 229.0016 224.9425 1.00273355 53745 +1 22912U 93073B 09059.74086516 -.00000013 00000-0 10000-3 0 9481 +2 22912 8.1164 61.1634 0002054 276.9389 154.7114 1.00274017 54389 NATO 4B -1 22921U 93076A 08361.78752373 .00000158 00000-0 10000-3 0 1092 -2 22921 7.3921 54.2123 0002775 212.3699 147.5163 1.00273886 55169 +1 22921U 93076A 09057.61827872 .00000000 00000-0 10000-3 0 1304 +2 22921 7.5311 53.6675 0005076 330.6538 29.4859 1.00268573 55798 DIRECTV 1 (DBS 1) -1 22930U 93078A 08359.42759455 -.00000157 00000-0 00000+0 0 5415 -2 22930 0.1317 89.5458 0003014 182.0020 244.5526 1.00271465 62866 +1 22930U 93078A 09058.99073282 -.00000006 00000-0 10000-3 0 5891 +2 22930 0.2933 85.8940 0005296 10.7975 263.3528 0.98986478 63524 THAICOM 1 -1 22931U 93078B 08360.93130736 -.00000346 00000-0 10000-3 0 2826 -2 22931 0.1267 57.4465 0001841 202.9205 289.7419 1.00273072 54584 +1 22931U 93078B 09059.63698990 -.00000357 00000-0 10000-3 0 3249 +2 22931 0.0834 48.6574 0001806 211.7742 247.4372 1.00274465 55230 GOES 8 -1 23051U 94022A 08361.66716296 -.00000055 00000-0 10000-3 0 6159 -2 23051 5.3131 76.1044 0010031 166.6023 193.1739 0.98903727 61013 +1 23051U 94022A 09059.36193150 -.00000264 00000-0 10000-3 0 6937 +2 23051 5.4750 75.1900 0008834 183.9925 176.2435 0.98907979 61649 +INTELSAT 702 (IS-702) +1 23124U 94034A 09056.85244155 .00000089 00000-0 10000-3 0 1674 +2 23124 0.0001 189.2591 0002399 151.9163 176.3735 1.00271875 68006 INTELSAT 2 (IS-2) -1 23175U 94040A 08358.27524991 -.00000015 00000-0 10000-3 0 3364 -2 23175 0.0330 129.6134 0002646 154.1766 76.4639 1.00271903 52274 +1 23175U 94040A 09058.34609936 -.00000025 00000-0 10000-3 0 3858 +2 23175 0.1835 90.4249 0003810 274.3736 86.0890 1.00272666 52939 BS-3N -1 23176U 94040B 08360.92467159 -.00000333 00000-0 10000-3 0 9710 -2 23176 0.0110 231.8904 0000265 307.2541 358.4082 1.00269317 52797 +1 23176U 94040B 09056.98416910 .00000000 00000-0 10000-3 0 9864 +2 23176 0.0579 282.4231 0004190 119.4852 218.1447 1.00264348 53416 APSTAR 1 -1 23185U 94043A 08362.13745282 -.00000253 00000-0 10000-3 0 828 -2 23185 3.9924 74.7829 0000891 187.6027 25.0945 1.00272466 52857 +1 23185U 94043A 09058.66419791 -.00000260 00000-0 10000-3 0 1281 +2 23185 4.1464 73.8362 0001171 292.8978 172.0147 1.00270973 53485 DIRECTV 2 (DBS 2) -1 23192U 94047A 08361.14624483 -.00000185 00000-0 10000-3 0 3882 -2 23192 1.9477 79.8218 0016548 181.4382 237.3329 0.98636696 62722 +1 23192U 94047A 09057.83684202 -.00000206 00000-0 10000-3 0 4184 +2 23192 2.1092 79.0026 0013749 195.3820 165.2133 0.98637058 63342 BRASILSAT B1 -1 23199U 94049A 08360.38479750 -.00000255 00000-0 10000-3 0 2013 -2 23199 1.7240 80.8520 0001804 183.7854 260.2069 1.00269523 63532 +1 23199U 94049A 09059.41009063 -.00000265 00000-0 10000-3 0 2379 +2 23199 1.8851 79.9427 0002090 261.3011 256.7408 1.00273435 64188 OPTUS B3 -1 23227U 94055A 08358.65463267 -.00000060 00000-0 10000-3 0 2705 -2 23227 1.0084 81.9249 0004480 172.4360 237.8282 1.00271180 52440 +1 23227U 94055A 09058.62512730 -.00000069 00000-0 10000-3 0 3047 +2 23227 1.1733 81.1011 0004473 246.6561 218.8636 1.00272785 53108 NSS-703 -1 23305U 94064A 08359.78480998 .00000088 00000-0 10000-3 0 8678 -2 23305 0.0270 195.7068 0003158 87.8822 149.6081 1.00273324 52189 +1 23305U 94064A 09059.68301816 .00000077 00000-0 10000-3 0 9002 +2 23305 0.0311 215.7491 0002983 135.0394 110.6977 1.00272874 52847 SOLIDARIDAD 2 -1 23313U 94065A 08360.42292944 -.00000009 00000-0 10000-3 0 2558 -2 23313 0.7997 82.5437 0002364 186.8731 222.2307 1.00272504 52055 +1 23313U 94065A 09059.51431287 -.00000020 00000-0 10000-3 0 2956 +2 23313 0.9629 81.6837 0002159 258.8806 248.1169 1.00272274 52707 THAICOM 2 -1 23314U 94065B 08360.94164941 -.00000105 00000-0 10000-3 0 1715 -2 23314 0.0937 41.8504 0006723 221.1830 249.2711 1.00270685 52036 +1 23314U 94065B 09059.61011589 -.00000116 00000-0 10000-3 0 2087 +2 23314 0.0760 33.3937 0005862 246.1516 177.1265 1.00271297 52681 EXPRESS 1 -1 23319U 94067A 08361.57919037 -.00000329 00000-0 10000-3 0 6382 -2 23319 7.6858 64.9803 0003081 154.1279 205.7633 0.99827186 51894 +1 23319U 94067A 09057.68793906 .00000063 00000-0 10000-3 0 6667 +2 23319 7.8374 64.2255 0001500 138.1895 221.9967 0.99828721 52519 ASTRA 1D -1 23331U 94070A 08360.00776090 .00000170 00000-0 00000+0 0 8523 -2 23331 1.2160 79.8203 0003182 198.3525 209.7668 1.00272577 52297 +1 23331U 94070A 09053.91802256 .00000153 00000-0 00000+0 0 8809 +2 23331 1.3670 79.2243 0002741 258.9078 176.5444 1.00273717 52894 RADUGA 32 -1 23448U 94087A 08361.68947904 -.00000044 00000-0 10000-3 0 943 -2 23448 9.8430 54.3220 0006319 149.6303 210.3482 1.00277285 68958 +1 23448U 94087A 09058.51125241 -.00000061 00000-0 10000-3 0 1187 +2 23448 9.9849 53.6245 0004917 148.3600 211.7792 1.00281964 69588 INTELSAT 704 (IS-704) -1 23461U 95001A 08361.90298574 .00000015 00000-0 10000-3 0 8633 -2 23461 0.0337 248.3168 0003756 28.9017 209.6187 1.00273192 51173 +1 23461U 95001A 09058.80774044 .00000003 00000-0 10000-3 0 9006 +2 23461 0.0529 262.0606 0004220 79.8969 172.5836 1.00273123 51807 INTELSAT 705 (IS-705) -1 23528U 95013A 08360.91687163 -.00000265 00000-0 10000-3 0 8038 -2 23528 0.0105 300.3842 0002794 349.1655 85.3164 1.00271673 50349 +1 23528U 95013A 09058.21450978 -.00000277 00000-0 10000-3 0 8266 +2 23528 0.0071 118.5271 0001323 185.8630 239.9881 1.00269735 50979 BRASILSAT B2 -1 23536U 95016A 08360.06147841 -.00000152 00000-0 00000+0 0 9446 -2 23536 0.8982 85.2108 0002611 175.8676 122.9525 1.00269592 50401 +1 23536U 95016A 09059.34379306 -.00000163 00000-0 00000+0 0 9774 +2 23536 1.0604 83.8434 0002576 263.9843 202.1622 1.00270366 51058 AMSC 1 -1 23553U 95019A 08359.34566931 -.00000101 00000-0 10000-3 0 712 -2 23553 4.0777 74.6864 0002521 211.0422 190.6465 1.00271479 50201 +1 23553U 95019A 09059.42633699 -.00000107 00000-0 10000-3 0 946 +2 23553 4.2391 73.8419 0002678 280.7438 215.9544 1.00272019 50867 INTELSAT 706 (IS-706) -1 23571U 95023A 08361.95041874 .00000130 00000-0 10000-3 0 8484 -2 23571 0.0089 318.7728 0002665 315.9871 213.4333 1.00271006 49847 +1 23571U 95023A 09057.65849731 .00000118 00000-0 10000-3 0 8792 +2 23571 0.0122 113.1504 0002879 240.6281 90.1491 1.00274986 50465 DIRECTV 3 (DBS 3) -1 23598U 95029A 08359.21731701 -.00000204 00000-0 10000-3 0 9811 -2 23598 0.0338 268.6739 0003744 50.4578 130.1901 1.00272574 49546 +1 23598U 95029A 09059.51057819 -.00000215 00000-0 00000+0 0 169 +2 23598 0.0248 35.4466 0002953 309.7523 275.0307 1.00270799 50205 TDRS 7 -1 23613U 95035B 08361.20657076 .00000129 00000-0 10000-3 0 4359 -2 23613 10.6665 50.0915 0003790 208.7725 119.7982 1.00267903 49256 +1 23613U 95035B 09059.45210553 .00000128 00000-0 10000-3 0 4692 +2 23613 10.8043 49.3846 0003790 287.6232 193.3776 1.00276167 49904 INTELSAT 4 (IS-4) -1 23636U 95040A 08361.90781882 -.00000041 00000-0 10000-3 0 9001 -2 23636 0.0224 256.5988 0003165 12.4939 225.4903 1.00272706 49043 +1 23636U 95040A 09059.82087535 -.00000053 00000-0 10000-3 0 9318 +2 23636 0.0410 269.8212 0002760 71.1546 185.2836 1.00272507 49680 COSMOS 2319 -1 23653U 95045A 08357.38823156 .00000079 00000-0 10000-3 0 9610 -2 23653 9.4479 56.6559 0003223 97.7292 262.2197 1.00241665 48754 +1 23653U 95045A 09058.21658267 .00000057 00000-0 10000-3 0 9829 +2 23653 9.6024 55.8894 0002127 66.1080 294.0376 1.00263057 49428 TELSTAR 4 (TELSTAR 402R) -1 23670U 95049A 08359.19436681 -.00000161 00000-0 10000-3 0 8732 -2 23670 4.9120 72.2005 0007106 184.5646 175.1612 1.00257212 48533 +1 23670U 95049A 09058.02905408 -.00000137 00000-0 10000-3 0 8978 +2 23670 5.0736 71.3969 0005694 219.9185 140.3099 1.00247396 49185 LUCH 1 -1 23680U 95054A 08359.71055866 -.00000093 00000-0 10000-3 0 7068 -2 23680 8.5520 65.6679 0004996 286.6107 73.2112 1.00277442 48395 +1 23680U 95054A 09057.53150547 .00000000 00000-0 10000-3 0 7300 +2 23680 8.7077 64.8377 0006863 297.1283 62.9631 1.00271782 49031 ASTRA 1E -1 23686U 95055A 08360.93841389 .00000154 00000-0 00000+0 0 9608 -2 23686 0.0701 174.1488 0005510 134.5558 147.3810 1.00274495 48378 +1 23686U 95055A 09056.94477524 .00000000 00000-0 10000-3 0 9805 +2 23686 0.0679 167.8024 0001558 125.6829 226.0493 1.00272483 48981 ASIASAT 2 -1 23723U 95064A 08361.86158498 -.00000291 00000-0 10000-3 0 8286 -2 23723 0.0103 321.8462 0001855 302.5358 242.0297 1.00271416 47913 +1 23723U 95064A 09059.54367309 -.00000301 00000-0 10000-3 0 8742 +2 23723 0.0325 291.9416 0002088 49.3781 113.3293 1.00268488 48552 TELECOM 2C -1 23730U 95067A 08360.19904359 .00000030 00000-0 10000-3 0 414 -2 23730 4.7437 72.9361 0005644 194.0425 261.7719 1.00272006 47927 +1 23730U 95067A 09059.09673870 .00000024 00000-0 10000-3 0 671 +2 23730 4.9053 72.0965 0004165 257.1952 226.6072 1.00272405 48574 ECHOSTAR 1 -1 23754U 95073A 08361.51654981 .00000146 00000-0 10000-3 0 189 -2 23754 0.0324 279.5851 0002271 337.6230 236.0346 1.00270376 47455 +1 23754U 95073A 09059.52095486 .00000135 00000-0 10000-3 0 496 +2 23754 0.0598 266.8502 0002129 68.1220 222.9473 1.00271104 48093 INTELSAT 3R (IS-3R) -1 23764U 96002A 08359.48497764 -.00000252 00000-0 00000+0 0 5875 -2 23764 0.0243 88.3435 0001541 193.9368 302.6880 1.00270789 47433 +1 23764U 96002A 09059.75575205 -.00000263 00000-0 10000-3 0 6092 +2 23764 0.0152 196.4796 0001888 145.1300 46.1368 1.00270432 48103 AFRICASAT-1 (MEASAT-1) -1 23765U 96002B 08361.89149035 .00000148 00000-0 10000-3 0 7622 -2 23765 1.1816 81.4106 0000209 310.5095 70.7374 1.00272976 47447 +1 23765U 96002B 09058.98808429 .00000138 00000-0 10000-3 0 7972 +2 23765 1.3385 80.5205 0001403 315.3284 163.7986 1.00274650 48073 KOREASAT 2 -1 23768U 96003A 08359.92010286 -.00000347 00000-0 10000-3 0 6791 -2 23768 1.9252 79.6482 0000606 241.2205 220.6389 1.00273487 47408 +1 23768U 96003A 09059.81145370 -.00000357 00000-0 10000-3 0 7129 +2 23768 2.0884 78.8247 0002034 26.0014 102.5676 1.00271262 48064 HGS-3 -1 23779U 96006A 08361.94504722 .00000170 00000-0 10000-3 0 1231 -2 23779 0.0341 170.0278 0003197 58.6118 245.3860 1.00272385 47201 +1 23779U 96006A 09057.65491343 .00000158 00000-0 10000-3 0 1535 +2 23779 0.0749 249.2718 0000799 108.7160 72.4408 1.00275337 47825 INTELSAT 707 (IS-707) -1 23816U 96015A 08356.93458083 -.00000272 00000-0 10000-3 0 7920 -2 23816 0.0005 349.3090 0003033 293.0379 91.9531 1.00270079 46809 +1 23816U 96015A 09059.65950156 -.00000280 00000-0 10000-3 0 8197 +2 23816 0.0127 223.5727 0002931 128.4353 351.0026 1.00271900 47481 INMARSAT 3-F1 -1 23839U 96020A 08361.98494723 .00000028 00000-0 10000-3 0 5244 -2 23839 0.0945 15.3802 0005793 254.5825 244.9413 1.00272839 46648 +1 23839U 96020A 09058.81240144 .00000017 00000-0 10000-3 0 6199 +2 23839 0.1564 45.9630 0005304 286.8576 181.8889 1.00273390 47272 ASTRA 1F -1 23842U 96021A 08360.79181089 .00000137 00000-0 00000+0 0 9560 -2 23842 0.0347 215.4147 0002646 99.4305 84.0474 1.00272979 46540 +1 23842U 96021A 09051.00000000 .00000118 00000-0 00000+0 0 9643 +2 23842 0.0170 162.5540 0005059 189.2980 177.3930 1.00273287 47100 MSAT M1 -1 23846U 96022A 08360.32458586 -.00000064 00000-0 10000-3 0 3797 -2 23846 1.4273 80.4934 0005821 191.5918 192.4465 1.00271692 46458 +1 23846U 96022A 09058.54980927 -.00000074 00000-0 10000-3 0 4236 +2 23846 1.5847 79.7277 0005472 258.6063 270.5810 1.00272578 47092 PALAPA C2 -1 23864U 96030A 08357.90817273 -.00000343 00000-0 10000-3 0 7972 -2 23864 0.0115 1.0918 0001919 171.2662 359.3389 1.00266437 46151 +1 23864U 96030A 09057.78990594 -.00000353 00000-0 10000-3 0 8279 +2 23864 0.0155 268.0175 0001709 20.3660 265.6780 1.00268709 46815 AMOS 1 -1 23865U 96030B 08359.63651145 .00000003 00000-0 10000-3 0 165 -2 23865 0.4626 88.8266 0004376 162.7719 69.6783 1.00275030 46169 +1 23865U 96030B 09058.16612530 -.00000010 00000-0 10000-3 0 412 +2 23865 0.6193 86.7914 0003792 238.7901 249.7806 1.00272830 46819 GALAXY 9 (G-9) -1 23877U 96033A 08359.13151399 -.00000209 00000-0 10000-3 0 82 -2 23877 0.3359 80.3479 0001418 183.5261 155.4522 1.00268942 46118 +1 23877U 96033A 09058.46857774 -.00000220 00000-0 10000-3 0 437 +2 23877 0.5042 81.4702 0001226 277.2368 246.4066 1.00272483 46766 GORIZONT 32 -1 23880U 96034A 08361.12006074 -.00000113 00000-0 10000-3 0 1016 -2 23880 9.0291 58.5048 0003741 207.8740 217.1956 1.00268628 46102 +1 23880U 96034A 09058.16433272 -.00000106 00000-0 10000-3 0 1492 +2 23880 9.1750 57.7694 0002880 257.2351 247.5103 1.00274522 46731 INTELSAT 709 (IS-709) -1 23915U 96035A 08361.89825019 -.00000169 00000-0 10000-3 0 8612 -2 23915 0.0095 14.3410 0002574 265.8400 224.0880 1.00271145 45938 +1 23915U 96035A 09057.99478493 -.00000180 00000-0 10000-3 0 8956 +2 23915 0.0152 130.6453 0002744 232.7476 236.8034 1.00270774 46554 APSTAR 1A -1 23943U 96039A 08361.29282295 -.00000324 00000-0 10000-3 0 9225 -2 23943 3.2964 76.2265 0001091 181.9095 72.4243 1.00267821 45737 +1 23943U 96039A 09059.61548006 -.00000331 00000-0 10000-3 0 9724 +2 23943 3.4538 75.5178 0000701 25.1664 49.4005 1.00273000 46387 TURKSAT 1C -1 23949U 96040B 08359.87363212 .00000170 00000-0 10000-3 0 9311 -2 23949 0.7278 80.2252 0001427 169.9728 189.0655 1.00274922 45659 +1 23949U 96040B 09057.03035706 .00000158 00000-0 10000-3 0 9708 +2 23949 0.8880 79.9149 0003618 263.2946 214.7206 1.00275758 46289 TELECOM 2D -1 24209U 96044B 08360.73664692 -.00000051 00000-0 10000-3 0 8260 -2 24209 2.4690 78.0350 0006142 192.7047 81.1740 1.00271690 45473 +1 24209U 96044B 09058.53273137 -.00000059 00000-0 10000-3 0 8542 +2 24209 2.6281 77.3182 0005276 254.6641 9.4032 1.00272828 46114 INMARSAT 3-F2 -1 24307U 96053A 08361.76889204 -.00000106 00000-0 10000-3 0 6215 -2 24307 0.0830 319.6708 0005874 315.9284 81.3018 1.00271341 45053 +1 24307U 96053A 09056.87315016 -.00000120 00000-0 10000-3 0 7165 +2 24307 0.1139 306.3191 0006226 36.3789 111.9705 1.00272634 45678 ECHOSTAR 2 -1 24313U 96055A 08361.38839189 .00000044 00000-0 10000-3 0 9021 -2 24313 0.4445 82.1072 0003641 185.8057 202.0646 1.00340620 45083 +1 24313U 96055A 09059.20915164 -.00000076 00000-0 10000-3 0 9526 +2 24313 0.6028 81.5558 0003107 221.3120 182.6236 1.00350027 45729 AMC-1 (GE-1) -1 24315U 96054A 08357.19437360 -.00000088 00000-0 10000-3 0 582 -2 24315 0.0195 248.6462 0003582 20.0677 149.3671 1.00271131 45000 +1 24315U 96054A 09059.20785196 -.00000096 00000-0 10000-3 0 890 +2 24315 0.0258 245.1297 0003410 86.8012 158.0238 1.00271850 45689 ARABSAT-2B -1 24652U 96063A 08359.78239450 .00000170 00000-0 10000-3 0 9156 -2 24652 0.0274 165.4121 0001745 104.9381 135.4254 1.00268825 44865 +1 24652U 96063A 09058.78144272 .00000159 00000-0 10000-3 0 9494 +2 24652 0.0461 125.0434 0002524 222.4434 122.0153 1.00271950 45519 MEASAT-2 -1 24653U 96063B 08358.63237529 -.00000203 00000-0 10000-3 0 8668 -2 24653 1.1375 81.7985 0001520 198.7952 187.5726 1.00271284 44410 +1 24653U 96063B 09057.40332382 -.00000214 00000-0 10000-3 0 9059 +2 24653 1.2946 80.7850 0001034 256.7522 111.9853 1.00270099 45060 EUROBIRD 9 -1 24665U 96067A 08360.88814691 .00000079 00000-0 00000+0 0 7840 -2 24665 0.0550 88.0694 0007572 204.8113 130.5908 1.00273674 44699 +1 24665U 96067A 09057.30000000 .00000089 00000-0 00000+0 0 8091 +2 24665 0.0620 108.4900 0004849 259.5150 265.7520 1.00405733 45310 INMARSAT 3-F3 -1 24674U 96070A 08360.15792706 .00000057 00000-0 10000-3 0 5913 -2 24674 0.0679 338.6850 0006864 287.2938 62.9942 1.00273592 43999 +1 24674U 96070A 09059.25872618 .00000046 00000-0 10000-3 0 6819 +2 24674 0.1251 37.3904 0003609 296.3550 95.7232 1.00275324 44659 AMC-2 (GE-2) -1 24713U 97002A 08359.38117848 -.00000098 00000-0 00000+0 0 8345 -2 24713 0.0132 43.8631 0002749 214.1759 231.4449 1.00271574 43596 +1 24713U 97002A 09057.51856648 -.00000110 00000-0 10000-3 0 8625 +2 24713 0.0110 233.0512 0002585 100.5641 268.5386 1.00272317 44238 NAHUEL 1A -1 24714U 97002B 08360.06269571 -.00000244 00000-0 10000-3 0 8140 -2 24714 1.3257 81.2045 0004583 191.1318 132.3762 1.00270563 43591 +1 24714U 97002B 09058... [truncated message content] |
From: <fi...@us...> - 2009-02-19 21:26:54
|
Revision: 195 http://gpredict.svn.sourceforge.net/gpredict/?rev=195&view=rev Author: fillods Date: 2009-02-19 21:26:45 +0000 (Thu, 19 Feb 2009) Log Message: ----------- POTFILES list update, new french l10n. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/po/POTFILES.in Added Paths: ----------- trunk/po/fr.po Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-19 21:24:18 UTC (rev 194) +++ trunk/ChangeLog 2009-02-19 21:26:45 UTC (rev 195) @@ -1,3 +1,15 @@ +2009-02-19; Stephane Fillod <fi...@us...> + + * po/POTFILES.in: + Remove goocanv8 files. Update list of C files. + + * po/fr.po: + * configure.ac: + New file, french l10n + + * src/Makefile.am: + Fixed a typo. + 2008-12-28; Alexandru Csete <oz...@gm...> * src/sat-pref-rig-editor.c: Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-02-19 21:24:18 UTC (rev 194) +++ trunk/configure.ac 2009-02-19 21:26:45 UTC (rev 195) @@ -54,7 +54,7 @@ dnl Add the languages which your application supports here. dnl Note that other progs only have ALL_LINGUAS and AM_GLIB_GNU_GETTEXT -ALL_LINGUAS= +ALL_LINGUAS=fr GETTEXT_PACKAGE=gpredict AC_SUBST(GETTEXT_PACKAGE) AM_GLIB_GNU_GETTEXT Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2009-02-19 21:24:18 UTC (rev 194) +++ trunk/po/POTFILES.in 2009-02-19 21:26:45 UTC (rev 195) @@ -4,13 +4,15 @@ src/first-time.c src/gpredict-utils.c src/gtk-azel-plot.c -src/gtk-met.c src/gtk-polar-plot.c src/gtk-polar-view-popup.c src/gtk-polar-view.c +src/gtk-rig-ctrl.c +src/gtk-rot-ctrl.c src/gtk-sat-data.c src/gtk-sat-list.c src/gtk-sat-list-col-sel.c +src/gtk-sat-list-popup.c src/gtk-sat-map-ground-track.c src/gtk-sat-map-popup.c src/gtk-sat-map.c @@ -29,16 +31,13 @@ src/pass-to-txt.c src/predict-tools.c src/radio-conf.c -src/rdv.c -src/rig-io.c -src/rot-ctrl-window.c src/rotor-conf.c src/sat-cfg.c +src/sat-info.c src/sat-log.c src/sat-log-browser.c src/sat-monitor.c src/sat-pass-dialogs.c -src/sat-popup-menu.c src/sat-pref-conditions.c src/sat-pref-help.c src/sat-pref-rig-editor.c @@ -77,7 +76,6 @@ src/qth-editor.c src/gpredict-help.c src/gtk-azel-plot.c -src/gtk-met.c src/gtk-polar-plot.c src/gtk-polar-view-popup.c src/gtk-polar-view.c @@ -93,11 +91,9 @@ src/pass-to-txt.c src/qth-editor.c src/radio-conf.c -src/rdv.c src/rotor-conf.c src/sat-log-browser.c src/sat-pass-dialogs.c -src/sat-popup-menu.c src/sat-pref-conditions.c src/sat-pref-help.c src/sat-pref-rig-editor.c @@ -107,27 +103,3 @@ src/save-pass.c src/tle-tools.c src/tle-update.c -goocanv8/src/goocanvas.c -goocanv8/src/goocanvasellipse.c -goocanv8/src/goocanvasimage.c -goocanv8/src/goocanvasitem.c -goocanv8/src/goocanvasitemmodel.c -goocanv8/src/goocanvasitemsimple.c -goocanv8/src/goocanvaspath.c -goocanv8/src/goocanvaspolyline.c -goocanv8/src/goocanvasrect.c -goocanv8/src/goocanvastable.c -goocanv8/src/goocanvastext.c -goocanv8/src/goocanvaswidget.c -goocanv8/src/goocanvas.c -goocanv8/src/goocanvasellipse.c -goocanv8/src/goocanvasimage.c -goocanv8/src/goocanvasitem.c -goocanv8/src/goocanvasitemmodel.c -goocanv8/src/goocanvasitemsimple.c -goocanv8/src/goocanvaspath.c -goocanv8/src/goocanvaspolyline.c -goocanv8/src/goocanvasrect.c -goocanv8/src/goocanvastable.c -goocanv8/src/goocanvastext.c -goocanv8/src/goocanvaswidget.c Added: trunk/po/fr.po =================================================================== --- trunk/po/fr.po (rev 0) +++ trunk/po/fr.po 2009-02-19 21:26:45 UTC (rev 195) @@ -0,0 +1,4657 @@ +# translation of fr.po to French +# Copyright (C) 2001-2008 Alexandru Csete OZ9AEC +# This file is distributed under the same license as the Gpredict package. +# Stéphane Fillod <fi...@us...>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: gpredict\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-02-19 21:32+0100\n" +"PO-Revision-Date: 2009-02-19 21:56+0200\n" +"Last-Translator: Stéphane Fillod <fi...@us...>\n" +"Language-Team: French <deb...@li...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: ../src/about.c:56 +msgid "" +"Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" +"Contact: oz9aec at googlemail.com\n" +"\n" +"Gpredict is free software; you can redistribute it and mofdify 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.\n" +"\n" +"This program is distributed free of charge 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 Library " +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"this program (see Help->License). Otherwise you can find a copy on the FSF " +"website http://www.fsf.org/licensing/licenses/gpl.html or you can write to " +"the\n" +"\n" +"Free Software Foundation, Inc.\n" +"59 Temple Place - Suite 330\n" +"Boston\n" +"MA 02111-1307\n" +"USA.\n" +msgstr "" + +#. window title +#. icon file name +#. create window title and file name for window icon +#: ../src/about.c:88 ../src/main.c:177 ../src/sat-log.c:57 +#: ../src/sat-log-browser.c:457 +msgid "GPREDICT" +msgstr "GPREDICT" + +#: ../src/about.c:91 +msgid "" +"Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" +"\n" +"Gpredict is available free of charge from:" +msgstr "" + +#: ../src/about.c:108 +msgid "translator-credits" +msgstr "" + +#: ../src/first-time.c:126 ../src/first-time.c:261 ../src/first-time.c:332 +#: ../src/first-time.c:486 ../src/first-time.c:532 +#, c-format +msgid "%s: Check successful." +msgstr "" + +#: ../src/first-time.c:131 ../src/first-time.c:267 ../src/first-time.c:337 +#: ../src/first-time.c:491 ../src/first-time.c:537 +#, c-format +msgid "%s: Check failed. Creating %s" +msgstr "" + +#: ../src/first-time.c:142 ../src/first-time.c:278 ../src/first-time.c:346 +#: ../src/first-time.c:500 ../src/first-time.c:546 +#, c-format +msgid "%s: Failed to create %s" +msgstr "" + +#: ../src/first-time.c:147 ../src/first-time.c:283 ../src/first-time.c:351 +#: ../src/first-time.c:505 ../src/first-time.c:551 +#, c-format +msgid "%s: Created %s." +msgstr "" + +#: ../src/first-time.c:183 ../src/first-time.c:389 +#, c-format +msgid "%s: Could not open %s." +msgstr "" + +#: ../src/first-time.c:207 +#, c-format +msgid "%s: Found at least one .qth file." +msgstr "" + +#: ../src/first-time.c:218 +#, c-format +msgid "%s: Failed to copy sample.qth" +msgstr "" + +#: ../src/first-time.c:225 +#, c-format +msgid "%s: Copied sample.qth to %s/" +msgstr "" + +#: ../src/first-time.c:293 +#, c-format +msgid "%s: Failed to copy Amateur.mod" +msgstr "" + +#: ../src/first-time.c:300 +#, c-format +msgid "%s: Copied amateur.mod to %s/" +msgstr "" + +#: ../src/first-time.c:413 +#, c-format +msgid "%s: Found at least one .tle file." +msgstr "" + +#: ../src/first-time.c:441 +#, c-format +msgid "%s: Failed to copy %s" +msgstr "" + +#: ../src/first-time.c:448 +#, c-format +msgid "%s: Successfully copied %s" +msgstr "" + +#: ../src/gpredict-utils.c:293 ../src/gpredict-utils.c:332 +#: ../src/gpredict-utils.c:379 ../src/gpredict-utils.c:421 +#, c-format +msgid "%s:%s: %s called with color = NULL" +msgstr "" + +#: ../src/gpredict-utils.c:338 +#, c-format +msgid "%s:%s: %s called with alpha = NULL" +msgstr "" + +#: ../src/gpredict-utils.c:385 +#, c-format +msgid "%s:%s: %s called with rgb = NULL" +msgstr "" + +#: ../src/gpredict-utils.c:427 +#, c-format +msgid "%s:%s: %s called with rgba = NULL" +msgstr "" + +#: ../src/gtk-azel-plot.c:373 +msgid "Local Time" +msgstr "" + +#: ../src/gtk-azel-plot.c:383 ../src/pass-to-txt.c:160 +#: ../src/gtk-sky-glance.c:339 +msgid "UTC" +msgstr "" + +#. Az legend +#: ../src/gtk-azel-plot.c:404 ../src/gtk-sat-list.c:55 +#: ../src/sat-pass-dialogs.c:101 +msgid "Az" +msgstr "Az" + +#. El legend +#: ../src/gtk-azel-plot.c:414 ../src/gtk-sat-list.c:56 +#: ../src/sat-pass-dialogs.c:102 +msgid "El" +msgstr "El" + +#: ../src/gtk-polar-plot.c:616 ../src/gtk-polar-view.c:331 +msgid "N" +msgstr "N" + +#: ../src/gtk-polar-plot.c:627 ../src/gtk-polar-view.c:342 +msgid "S" +msgstr "S" + +#: ../src/gtk-polar-plot.c:638 ../src/gtk-polar-view.c:353 +msgid "E" +msgstr "E" + +#: ../src/gtk-polar-plot.c:649 ../src/gtk-polar-view.c:364 +msgid "W" +msgstr "O" + +#: ../src/gtk-polar-plot.c:752 +#, c-format +msgid "%s:%d: Incorrect polar plot orientation." +msgstr "" + +#. next pass and predict passes +#: ../src/gtk-polar-view-popup.c:107 ../src/gtk-sat-list-popup.c:97 +#: ../src/gtk-sat-map-popup.c:106 ../src/gtk-single-sat.c:835 +msgid "Show next pass" +msgstr "Montre prochain passage" + +#: ../src/gtk-polar-view-popup.c:115 ../src/gtk-sat-list-popup.c:108 +#: ../src/gtk-sat-map-popup.c:114 ../src/gtk-single-sat.c:849 +msgid "Future passes" +msgstr "Passages futures" + +#. show track +#: ../src/gtk-polar-view-popup.c:134 +msgid "Sky track" +msgstr "" + +#: ../src/gtk-polar-view-popup.c:197 ../src/gtk-polar-view-popup.c:304 +#: ../src/gtk-sat-map-popup.c:195 ../src/gtk-sat-map-popup.c:248 +#: ../src/gtk-sat-map-popup.c:425 +#, c-format +msgid "%s:%d: Failed to get satellite object." +msgstr "" + +#: ../src/gtk-polar-view-popup.c:404 ../src/gtk-polar-view-popup.c:474 +#: ../src/gtk-sat-list-popup.c:176 ../src/gtk-sat-list-popup.c:246 +#: ../src/gtk-sat-map-popup.c:306 ../src/gtk-sat-map-popup.c:376 +#: ../src/gtk-single-sat.c:1052 ../src/gtk-single-sat.c:1123 +#, c-format +msgid "" +"Satellite %s has no passes\n" +"within the next %d days" +msgstr "" + +#: ../src/gtk-polar-view-popup.c:420 ../src/gtk-sat-list-popup.c:192 +#: ../src/gtk-sat-map-popup.c:322 ../src/gtk-single-sat.c:1068 +#, c-format +msgid "" +"Satellite %s has no passes for\n" +"the current ground station!\n" +"\n" +"This can be because the satellite\n" +"is geostationary, decayed or simply\n" +"never comes above the horizon" +msgstr "" + +#: ../src/gtk-polar-view-popup.c:493 ../src/gtk-sat-list-popup.c:265 +#: ../src/gtk-sat-map-popup.c:395 ../src/gtk-single-sat.c:1142 +#, c-format +msgid "" +"Satellite %s has no passes for\n" +"the current ground station!" +msgstr "" + +#: ../src/gtk-polar-view.c:737 ../src/gtk-sat-map.c:694 +#, c-format +msgid "%s: Can not find NEXT satellite." +msgstr "" + +#: ../src/gtk-polar-view.c:740 ../src/gtk-sat-map.c:697 +msgid "Next: ERR" +msgstr "" + +#: ../src/gtk-polar-view.c:746 ../src/gtk-sat-map.c:703 +msgid "Next: N/A" +msgstr "" + +#: ../src/gtk-polar-view.c:902 +#, c-format +msgid "" +"%s\n" +"LOS in %s%d:%s%d%s%d" +msgstr "" + +#: ../src/gtk-polar-view.c:906 +#, c-format +msgid "" +"%s\n" +"LOS in %s%d%s%d" +msgstr "" + +#: ../src/gtk-polar-view.c:914 +#, c-format +msgid "" +"%s\n" +"Always in range" +msgstr "" + +#: ../src/gtk-polar-view.c:1223 +#, c-format +msgid "%s:%d: Could not find satellite (%d) in hash table" +msgstr "" + +#: ../src/gtk-polar-view.c:1271 ../src/gtk-sat-map.c:903 +#, c-format +msgid "%s:%d: Can not find clicked object (%d) in hash table" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:338 +msgid "<b>Satellite</b>" +msgstr "<b>Satellite</b>" + +#: ../src/gtk-rig-ctrl.c:349 +msgid "Downlink" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:362 ../src/gtk-rig-ctrl.c:428 +msgid "Radio:" +msgstr "Radio:" + +#: ../src/gtk-rig-ctrl.c:389 +msgid "<b>Radio</b>" +msgstr "<b>Radio</b>" + +#: ../src/gtk-rig-ctrl.c:415 +msgid "Uplink" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:468 ../src/gtk-rot-ctrl.c:420 +msgid "Select target object" +msgstr "" + +#. tracking button +#: ../src/gtk-rig-ctrl.c:473 ../src/gtk-rot-ctrl.c:425 +msgid "Track" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:474 ../src/gtk-rot-ctrl.c:426 +msgid "Track the satellite when it is within range" +msgstr "" + +#. Azimuth +#: ../src/gtk-rig-ctrl.c:479 ../src/gtk-rot-ctrl.c:431 +msgid "Az:" +msgstr "Az:" + +#. Elevation +#: ../src/gtk-rig-ctrl.c:487 ../src/gtk-rot-ctrl.c:441 +msgid "El:" +msgstr "El:" + +#. count down +#: ../src/gtk-rig-ctrl.c:495 ../src/gtk-rot-ctrl.c:450 +msgid "ΔT:" +msgstr "ΔT:" + +#. Range +#: ../src/gtk-rig-ctrl.c:503 +msgid " Range:" +msgstr "" + +#. Range rate +#: ../src/gtk-rig-ctrl.c:511 +msgid " Rate:" +msgstr "" + +#. Doppler shift +#: ../src/gtk-rig-ctrl.c:519 +msgid " Doppler:" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:526 ../src/gtk-rot-ctrl.c:457 +msgid "Target" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:555 ../src/gtk-rot-ctrl.c:485 +msgid "Device:" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:560 +msgid "Select radio device" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:583 ../src/gtk-rig-ctrl.c:1256 +#: ../src/gtk-rot-ctrl.c:513 ../src/gtk-rot-ctrl.c:1229 +#: ../src/sat-pref-rig.c:260 ../src/sat-pref-rot.c:270 +#, c-format +msgid "%s:%d: Failed to open hwconf dir (%s)" +msgstr "" + +#. config will be force-loaded after LO spin is created +#. Engage button +#: ../src/gtk-rig-ctrl.c:597 ../src/gtk-rot-ctrl.c:526 +msgid "Engage" +msgstr "Engage" + +#: ../src/gtk-rig-ctrl.c:598 +msgid "Engage the selcted radio device" +msgstr "" + +#. Local oscillator value +#: ../src/gtk-rig-ctrl.c:603 +msgid "Local Osc:" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:611 ../src/sat-pref-rig-editor.c:244 +msgid "Enter the frequency of the local oscillator, if any." +msgstr "" + +#: ../src/gtk-rig-ctrl.c:614 ../src/sat-pref-rig-editor.c:247 +msgid "MHz" +msgstr "MHZ" + +#. Timeout +#: ../src/gtk-rig-ctrl.c:622 ../src/gtk-rot-ctrl.c:532 +msgid "Cycle:" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:629 +msgid "This parameter controls the delay between commands sent to the rigator." +msgstr "" + +#: ../src/gtk-rig-ctrl.c:636 ../src/gtk-rot-ctrl.c:546 +msgid "msec" +msgstr "msec" + +#: ../src/gtk-rig-ctrl.c:641 ../src/gtk-rot-ctrl.c:575 +msgid "Settings" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:685 ../src/gtk-rot-ctrl.c:638 +#, c-format +msgid "%s:%s: Invalid satellite selection: %d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:758 +#, c-format +msgid "%s:%d: Failed to allocate memory for radio config" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:767 +#, c-format +msgid "Loaded new radio configuration %s" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:774 +#, c-format +msgid "%s:%d: Failed to load radio configuration %s" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:811 ../src/gtk-rot-ctrl.c:780 +#, c-format +msgid "%s: Controller does not have a valid configuration" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:836 ../src/gtk-rot-ctrl.c:808 +#, c-format +msgid "%s missed the deadline" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:855 ../src/gtk-rig-ctrl.c:884 +#: ../src/gtk-rot-ctrl.c:868 ../src/gtk-rot-ctrl.c:869 +#: ../src/gtk-sat-data.c:95 ../src/gtk-sat-module-popup.c:899 +#: ../src/gtk-sat-module-popup.c:972 ../src/sat-log-browser.c:71 +#: ../src/sat-pref-rig.c:660 +msgid "ERROR" +msgstr "ERREUR" + +#: ../src/gtk-rig-ctrl.c:957 ../src/gtk-rot-ctrl.c:897 +#, c-format +msgid "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1001 +#, c-format +msgid "%s: Failed to create socket" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1007 +#, c-format +msgid "%s: Network socket created successfully" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1021 +#, c-format +msgid "%s: Failed to connect to %s:%d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1027 +#, c-format +msgid "%s: Connection opened to %s:%d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1038 +#, c-format +msgid "%s: SIZE ERROR %d / %d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1069 ../src/gtk-rot-ctrl.c:956 +#, c-format +msgid "%s:%d: NULL storage." +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1078 ../src/gtk-rot-ctrl.c:965 +#: ../src/gtk-rot-ctrl.c:1074 +#, c-format +msgid "%s:%d: Failed to create socket" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1084 ../src/gtk-rot-ctrl.c:971 +#: ../src/gtk-rot-ctrl.c:1080 +#, c-format +msgid "%s:%d Network socket created successfully" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1098 ../src/gtk-rot-ctrl.c:985 +#: ../src/gtk-rot-ctrl.c:1094 +#, c-format +msgid "%s:%d: Failed to connect to %s:%d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1104 ../src/gtk-rot-ctrl.c:991 +#: ../src/gtk-rot-ctrl.c:1100 +#, c-format +msgid "%s:%d: Connection opened to %s:%d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1115 ../src/gtk-rot-ctrl.c:1002 +#: ../src/gtk-rot-ctrl.c:1113 +#, c-format +msgid "%s:%d: SIZE ERROR %d / %d" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1125 ../src/gtk-rot-ctrl.c:1012 +#, c-format +msgid "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1135 +#, c-format +msgid "%s:%s: Got 0 bytes from rigctld" +msgstr "" + +#: ../src/gtk-rig-ctrl.c:1140 +#, c-format +msgid "%s:%s: Read %d bytes from rigctld" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:328 ../src/gtk-sat-list.c:85 +#: ../src/sat-pass-dialogs.c:125 ../src/gtk-single-sat.c:84 +msgid "Azimuth" +msgstr "Azimuth" + +#: ../src/gtk-rot-ctrl.c:340 +msgid "Read:" +msgstr "Lecture:" + +#: ../src/gtk-rot-ctrl.c:367 ../src/gtk-sat-list.c:86 +#: ../src/sat-pass-dialogs.c:126 ../src/gtk-single-sat.c:85 +msgid "Elevation" +msgstr "Elévation" + +#: ../src/gtk-rot-ctrl.c:379 +msgid "Read: " +msgstr "Lecture: " + +#: ../src/gtk-rot-ctrl.c:490 +msgid "Select antenna rotator device" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:527 +msgid "Engage the selcted rotor device" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:539 +msgid "This parameter controls the delay between commands sent to the rotator." +msgstr "" + +#. Tolerance +#: ../src/gtk-rot-ctrl.c:551 +msgid "Tolerance:" +msgstr "Tolérance:" + +#: ../src/gtk-rot-ctrl.c:558 +msgid "" +"This parameter controls the tolerance between the target and rotator values " +"for the rotator.\n" +"If the difference between the target and rotator values is smaller than the " +"tolerance, no new commands are sent" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:568 +msgid "deg" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:729 +#, c-format +msgid "%s:%d: Failed to allocate memory for rotator config" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:738 +#, c-format +msgid "Loaded new rotator configuration %s" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:747 +#, c-format +msgid "%s:%d: Failed to load rotator configuration %s" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:1022 +#, c-format +msgid "%s:%s: Got 0 bytes from rotctld" +msgstr "" + +#: ../src/gtk-rot-ctrl.c:1027 +#, c-format +msgid "%s:%s: Read %d bytes from rotctld" +msgstr "" + +#: ../src/gtk-sat-data.c:67 +#, c-format +msgid "%s: Could not load data from %s (%s)" +msgstr "" + +#: ../src/gtk-sat-data.c:75 +#, c-format +msgid "%s: QTH data: %s" +msgstr "" + +#: ../src/gtk-sat-data.c:92 +#, c-format +msgid "%s: Error reading QTH name (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:106 +#, c-format +msgid "%s: QTH has no location (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:120 +#, c-format +msgid "%s: QTH has no description." +msgstr "" + +#: ../src/gtk-sat-data.c:134 +#, c-format +msgid "%s: QTH has no weather station." +msgstr "" + +#: ../src/gtk-sat-data.c:148 +#, c-format +msgid "%s: Error reading QTH latitude (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:170 +#, c-format +msgid "%s: Error reading QTH longitude (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:192 +#, c-format +msgid "%s: Error reading QTH altitude (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:207 +#, c-format +msgid "%s: QTH data: %s, %.4f, %.4f, %d" +msgstr "" + +#: ../src/gtk-sat-data.c:301 +#, c-format +msgid "%s: Could not create QTH data (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:314 +#, c-format +msgid "" +"%s: Could not create QTH file %s\n" +"%s." +msgstr "" + +#: ../src/gtk-sat-data.c:333 +#, c-format +msgid "%s: Error writing QTH data (%s)." +msgstr "" + +#: ../src/gtk-sat-data.c:342 ../src/mod-cfg.c:408 ../src/sat-cfg.c:352 +#, c-format +msgid "%s: Wrote only %d out of %d chars." +msgstr "" + +#: ../src/gtk-sat-data.c:349 +#, c-format +msgid "%s: QTH data saved." +msgstr "" + +#: ../src/gtk-sat-data.c:429 +#, c-format +msgid "%s: Can not find #%d in any .tle file." +msgstr "" + +#: ../src/gtk-sat-data.c:463 +#, c-format +msgid "%s: Found #%d in %s" +msgstr "" + +#: ../src/gtk-sat-data.c:473 +#, c-format +msgid "%s: Invalid data for #%d" +msgstr "" + +#: ../src/gtk-sat-data.c:482 +#, c-format +msgid "%s: Good data for #%d" +msgstr "" + +#: ../src/gtk-sat-data.c:528 ../src/tle-update.c:912 +#, c-format +msgid "%s: Failed to open %s" +msgstr "" + +#: ../src/gtk-sat-list.c:53 ../src/gtk-sat-tree.c:212 +msgid "Satellite" +msgstr "Satellite" + +#: ../src/gtk-sat-list.c:54 ../src/gtk-sat-tree.c:221 +msgid "Catnum" +msgstr "" + +#: ../src/gtk-sat-list.c:57 +msgid "Dir" +msgstr "Dir" + +#: ../src/gtk-sat-list.c:58 ../src/sat-pass-dialogs.c:103 +msgid "Ra" +msgstr "" + +#: ../src/gtk-sat-list.c:59 ../src/sat-pass-dialogs.c:104 +msgid "Dec" +msgstr "" + +#: ../src/gtk-sat-list.c:60 ../src/pass-to-txt.c:52 +#: ../src/sat-pass-dialogs.c:105 +msgid "Range" +msgstr "" + +#: ../src/gtk-sat-list.c:61 ../src/sat-pass-dialogs.c:106 +msgid "Rate" +msgstr "" + +#. Next Event +#: ../src/gtk-sat-list.c:62 ../src/gtk-sat-list.c:92 +#: ../src/sat-pref-map-view.c:241 ../src/sat-pref-polar-view.c:272 +#: ../src/gtk-single-sat.c:91 +msgid "Next Event" +msgstr "Prochain événemnt" + +#: ../src/gtk-sat-list.c:63 ../src/gtk-sat-list.c:93 +#: ../src/gtk-single-sat.c:92 +msgid "Next AOS" +msgstr "Prochain AOS" + +#: ../src/gtk-sat-list.c:64 ../src/gtk-sat-list.c:94 +#: ../src/gtk-single-sat.c:93 +msgid "Next LOS" +msgstr "Prochain LOS" + +#: ../src/gtk-sat-list.c:65 ../src/loc-tree.c:146 +#: ../src/sat-pass-dialogs.c:107 ../src/sat-pref-qth.c:195 +msgid "Lat" +msgstr "Lat" + +#: ../src/gtk-sat-list.c:66 ../src/loc-tree.c:166 +#: ../src/sat-pass-dialogs.c:108 ../src/sat-pref-qth.c:208 +msgid "Lon" +msgstr "Lon" + +#: ../src/gtk-sat-list.c:67 ../src/sat-pass-dialogs.c:109 +msgid "SSP" +msgstr "" + +#: ../src/gtk-sat-list.c:68 ../src/pass-to-txt.c:57 +#: ../src/sat-pass-dialogs.c:110 +msgid "Footp" +msgstr "" + +#: ../src/gtk-sat-list.c:69 ../src/loc-tree.c:186 +#: ../src/sat-pass-dialogs.c:111 +msgid "Alt" +msgstr "Alt" + +#: ../src/gtk-sat-list.c:70 ../src/sat-pass-dialogs.c:112 +msgid "Vel" +msgstr "Vel" + +#: ../src/gtk-sat-list.c:71 ../src/sat-pass-dialogs.c:113 +msgid "Dop" +msgstr "Dop" + +#: ../src/gtk-sat-list.c:72 ../src/sat-pass-dialogs.c:114 +msgid "Loss" +msgstr "Perte" + +#: ../src/gtk-sat-list.c:73 ../src/sat-pass-dialogs.c:115 +msgid "Del" +msgstr "" + +#: ../src/gtk-sat-list.c:74 ../src/sat-pass-dialogs.c:116 +msgid "MA" +msgstr "" + +#: ../src/gtk-sat-list.c:75 ../src/sat-pass-dialogs.c:117 +msgid "Phase" +msgstr "Phase" + +#: ../src/gtk-sat-list.c:76 ../src/pass-to-txt.c:101 +#: ../src/sat-pass-dialogs.c:66 +msgid "Orbit" +msgstr "Orbite" + +#: ../src/gtk-sat-list.c:77 ../src/pass-to-txt.c:65 ../src/pass-to-txt.c:102 +#: ../src/sat-pass-dialogs.c:67 ../src/sat-pass-dialogs.c:118 +msgid "Vis" +msgstr "" + +#: ../src/gtk-sat-list.c:83 +msgid "Satellite Name" +msgstr "Nom Satellite" + +#: ../src/gtk-sat-list.c:84 +msgid "Catalogue Number" +msgstr "" + +#: ../src/gtk-sat-list.c:87 ../src/gtk-single-sat.c:86 +msgid "Direction" +msgstr "Direction" + +#: ../src/gtk-sat-list.c:88 ../src/sat-pass-dialogs.c:127 +#: ../src/gtk-single-sat.c:87 +msgid "Right Ascension" +msgstr "" + +#: ../src/gtk-sat-list.c:89 ../src/sat-pass-dialogs.c:128 +#: ../src/gtk-single-sat.c:88 +msgid "Declination" +msgstr "" + +#: ../src/gtk-sat-list.c:90 ../src/sat-pass-dialogs.c:129 +#: ../src/gtk-single-sat.c:89 +msgid "Slant Range" +msgstr "" + +#: ../src/gtk-sat-list.c:91 ../src/sat-pass-dialogs.c:130 +#: ../src/gtk-single-sat.c:90 +msgid "Range Rate" +msgstr "" + +#: ../src/gtk-sat-list.c:95 ../src/sat-pass-dialogs.c:131 +#: ../src/gtk-single-sat.c:94 +msgid "Latitude" +msgstr "Latitude" + +#: ../src/gtk-sat-list.c:96 ../src/sat-pass-dialogs.c:132 +#: ../src/gtk-single-sat.c:95 +msgid "Longitude" +msgstr "Longitude" + +#: ../src/gtk-sat-list.c:97 ../src/sat-pass-dialogs.c:133 +#: ../src/gtk-single-sat.c:96 +msgid "Sub-Satellite Point" +msgstr "" + +#: ../src/gtk-sat-list.c:98 ../src/sat-pass-dialogs.c:134 +#: ../src/gtk-single-sat.c:97 +msgid "Footprint" +msgstr "" + +#. altitude +#: ../src/gtk-sat-list.c:99 ../src/sat-pass-dialogs.c:135 +#: ../src/sat-pref-qth-editor.c:318 ../src/gtk-single-sat.c:98 +#: ../src/qth-editor.c:333 +msgid "Altitude" +msgstr "Altitude" + +#: ../src/gtk-sat-list.c:100 ../src/sat-pass-dialogs.c:136 +#: ../src/gtk-single-sat.c:99 +msgid "Velocity" +msgstr "Vélocité" + +#: ../src/gtk-sat-list.c:101 ../src/sat-pass-dialogs.c:137 +#: ../src/gtk-single-sat.c:100 +msgid "Doppler Shift @ 100MHz" +msgstr "" + +#: ../src/gtk-sat-list.c:102 ../src/sat-pass-dialogs.c:138 +msgid "Signal Loss @ 100MHz" +msgstr "" + +#: ../src/gtk-sat-list.c:103 ../src/sat-pass-dialogs.c:139 +#: ../src/gtk-single-sat.c:102 +msgid "Signal Delay" +msgstr "" + +#: ../src/gtk-sat-list.c:104 ../src/sat-pass-dialogs.c:140 +#: ../src/gtk-single-sat.c:103 +msgid "Mean Anomaly" +msgstr "" + +#: ../src/gtk-sat-list.c:105 ../src/sat-pass-dialogs.c:141 +#: ../src/gtk-single-sat.c:104 +msgid "Orbit Phase" +msgstr "Phase Orbite" + +#: ../src/gtk-sat-list.c:106 ../src/gtk-single-sat.c:105 +msgid "Orbit Number" +msgstr "Num Orbite" + +#: ../src/gtk-sat-list.c:107 ../src/sat-pass-dialogs.c:142 +#: ../src/gtk-single-sat.c:106 +msgid "Visibility" +msgstr "Visibilité" + +#: ../src/gtk-sat-list.c:512 +#, c-format +msgid "%s: Invalid GtkSatList!" +msgstr "" + +#: ../src/gtk-sat-list.c:575 +#, c-format +msgid "%s: Failed to get data for #%d." +msgstr "" + +#: ../src/gtk-sat-list.c:581 +#, c-format +msgid "%s: Satellite #%d removed from list." +msgstr "" + +#: ../src/gtk-sat-list.c:935 ../src/sat-pass-dialogs.c:700 +#: ../src/sat-pref-qth.c:769 +#, c-format +msgid "%s:%d: Invalid column: %d" +msgstr "" + +#: ../src/gtk-sat-list.c:1228 +#, c-format +msgid "%s:%d Failed to get data for %d." +msgstr "" + +#: ../src/gtk-sat-list.c:1241 ../src/sat-pass-dialogs.c:1409 +#, c-format +msgid "%s:%d: There is no selection; skip popup." +msgstr "" + +#: ../src/gtk-sat-list-col-sel.c:153 +msgid "Column Name" +msgstr "" + +#: ../src/gtk-sat-list-col-sel.c:162 ../src/sat-vis.c:41 +msgid "Visible" +msgstr "Visible" + +#: ../src/gtk-sat-list-col-sel.c:169 +msgid "Row" +msgstr "Ligne" + +#: ../src/gtk-sat-map-ground-track.c:82 +#, c-format +msgid "%s: Creating ground track for %s" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:97 +#, c-format +msgid "%s: Start orbit: %d" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:100 +#, c-format +msgid "%s: End orbit %d" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:121 +#, c-format +msgid "%s: T0: %f (%d)" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:144 +#, c-format +msgid "%s: MAYDAY: Insufficient memory for ground track!" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:191 +#, c-format +msgid "%s: Updating ground track for %s" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:221 +#, c-format +msgid "%s: Deleting ground track for %s" +msgstr "" + +#: ../src/gtk-sat-map-ground-track.c:239 +#, c-format +msgid "%s: Could not find part %d of ground track" +msgstr "" + +#. highlight cov. area +#: ../src/gtk-sat-map-popup.c:133 +msgid "Highlight footprint" +msgstr "" + +#. show track +#: ../src/gtk-sat-map-popup.c:142 +msgid "Ground Track" +msgstr "" + +#. target +#: ../src/gtk-sat-map-popup.c:154 +msgid "Set Target" +msgstr "" + +#: ../src/gtk-sat-map.c:1048 +#, c-format +msgid "%s:%d: Loading map file %s" +msgstr "" + +#: ../src/gtk-sat-map.c:1054 +#, c-format +msgid "%s:%d: Map file found" +msgstr "" + +#: ../src/gtk-sat-map.c:1059 +#, c-format +msgid "%s:%d: Could not find map file %s" +msgstr "" + +#: ../src/gtk-sat-map.c:1067 +#, c-format +msgid "%s:%d: Using default map: %s" +msgstr "" + +#: ../src/gtk-sat-map.c:1076 +#, c-format +msgid "%s:%d: Error loading map file (%s)" +msgstr "" + +#: ../src/gtk-sat-module.c:267 +#, c-format +msgid "%s: Module %s is not valid." +msgstr "" + +#: ../src/gtk-sat-module.c:310 +msgid "Module options / shortcuts" +msgstr "" + +#: ../src/gtk-sat-module.c:316 +msgid "Close this module." +msgstr "" + +#: ../src/gtk-sat-module.c:450 +#, c-format +msgid "%s:%d: Invalid module layout (%d)" +msgstr "" + +#: ../src/gtk-sat-module.c:477 +#, c-format +msgid "%s:%d: Invalid child number (%d)" +msgstr "" + +#: ../src/gtk-sat-module.c:514 +#, c-format +msgid "" +"%s:%d: Invalid child type (%d)\n" +"Using GtkSatList..." +msgstr "" + +#: ../src/gtk-sat-module.c:553 +#, c-format +msgid "%s: Could not load config data from %s (%s)." +msgstr "" + +#: ../src/gtk-sat-module.c:563 +#, c-format +msgid "%s: Reading configuration from %s" +msgstr "" + +#: ../src/gtk-sat-module.c:607 +#, c-format +msgid "%s: Can not load default QTH file %s; using built-in defaults" +msgstr "" + +#. settings are really screwed up; we need some safe values here +#: ../src/gtk-sat-module.c:611 ../src/gtk-sat-module.c:612 +msgid "Error" +msgstr "" + +#: ../src/gtk-sat-module.c:681 ../src/mod-cfg.c:578 +#, c-format +msgid "%s: Failed to get list of satellites (%s)" +msgstr "" + +#: ../src/gtk-sat-module.c:703 +#, c-format +msgid "%s: Error reading data for #%d" +msgstr "" + +#: ../src/gtk-sat-module.c:727 +#, c-format +msgid "%s: Read data for #%d" +msgstr "" + +#: ../src/gtk-sat-module.c:734 +#, c-format +msgid "%s: Sat #%d already in list" +msgstr "" + +#: ../src/gtk-sat-module.c:745 +#, c-format +msgid "%s: Read %d out of %d satellites" +msgstr "" + +#: ../src/gtk-sat-module.c:783 +#, c-format +msgid "%s: Previous cycle missed it's deadline." +msgstr "" + +#: ../src/gtk-sat-module.c:922 ../src/gtk-sat-module.c:1556 +#, c-format +msgid "%f:%d: Unknown child type" +msgstr "" + +#: ../src/gtk-sat-module.c:1082 +#, c-format +msgid "%s: Module %s recevied CLOSE signal." +msgstr "" + +#: ../src/gtk-sat-module.c:1092 +#, c-format +msgid "%s: Module %s is in DOCKED state." +msgstr "" + +#: ../src/gtk-sat-module.c:1099 ../src/gtk-sat-module.c:1115 +#: ../src/gtk-sat-module.c:1143 +#, c-format +msgid "" +"%s: Module %s was not found in mod-mgr (%d)\n" +"Internal state is corrupt?" +msgstr "" + +#: ../src/gtk-sat-module.c:1108 +#, c-format +msgid "%s: Module %s is in WINDOW state." +msgstr "" + +#: ../src/gtk-sat-module.c:1136 +#, c-format +msgid "%s: Module %s is in FULLSCREEN state." +msgstr "" + +#: ../src/gtk-sat-module.c:1165 ../src/gtk-sat-module.c:1334 +#, c-format +msgid "%s: Module %s has unknown state: %d" +msgstr "" + +#: ../src/gtk-sat-module.c:1174 +#, c-format +msgid "%s: Module %s closed." +msgstr "" + +#: ../src/gtk-sat-module.c:1215 +#, c-format +msgid "%s: Module %s recevied CONFIG signal." +msgstr "" + +#: ../src/gtk-sat-module.c:1224 +#, c-format +msgid "" +"%s: Could not stop timeout callback\n" +"%s: Source ID %d seems invalid." +msgstr "" + +#: ../src/gtk-sat-module.c:1502 +#, c-format +msgid "%s: Reloading satellites for module %s" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:90 +#, c-format +msgid "%s:%d: %s called with NULL parameter!" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:100 +msgid "Detach module" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:111 +msgid "Attach module" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:124 +msgid "Leave fullscreen" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:133 +msgid "Fullscreen" +msgstr "" + +#. sky at a glance +#: ../src/gtk-sat-module-popup.c:147 +msgid "Sky at a glance" +msgstr "" + +#. time manager +#: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:261 +msgid "Time Controller" +msgstr "" + +#. Radio Control +#: ../src/gtk-sat-module-popup.c:170 +msgid "Radio Control" +msgstr "" + +#. Antenna Control +#: ../src/gtk-sat-module-popup.c:179 +msgid "Antenna Control" +msgstr "" + +#. configure +#: ../src/gtk-sat-module-popup.c:192 +msgid "Configure" +msgstr "" + +#. clone +#: ../src/gtk-sat-module-popup.c:201 +msgid "Clone..." +msgstr "" + +#. delete module +#: ../src/gtk-sat-module-popup.c:214 ../src/sat-pref-qth.c:490 +#: ../src/sat-pref-rig.c:298 ../src/sat-pref-rot.c:307 +msgid "Delete" +msgstr "" + +#. close +#: ../src/gtk-sat-module-popup.c:223 +msgid "Close" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:257 +msgid "" +"A module can not be configured while the radio or rotator controller is " +"active.\n" +"\n" +"Please close the radio and rotator controllers and try again." +msgstr "" + +#. icon file name +#. window title +#: ../src/gtk-sat-module-popup.c:298 +msgid "Clone Module" +msgstr "" + +#. label +#: ../src/gtk-sat-module-popup.c:310 +msgid "Name of new module:" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:319 ../src/mod-cfg.c:515 +msgid "" +"Enter a short name for this module.\n" +"Allowed charachters: 0..9, a..z, A..Z, - and _" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:321 ../src/mod-cfg.c:517 +msgid "" +"The name will be used to identify the module and it is also used a file name " +"for saving the data.Max length is 25 charachters." +msgstr "" + +#. check button +#: ../src/gtk-sat-module-popup.c:338 +msgid "Open module when created" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:342 +msgid "If checked, the new module will be opened after it has been created" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:358 +#, c-format +msgid "%s:%d: Cloning %s => %s" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:376 +#, c-format +msgid "%s:%d: Failed to clone %s." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:381 +#, c-format +msgid "%s:%d: Successfully cloned %s." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:466 +#, c-format +msgid "%s:%d: Cloning cancelled by user." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:472 +#, c-format +msgid "%s:%d: Cloning interrupted." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:659 ../src/gtk-sat-module-popup.c:802 +#, c-format +msgid "%s:%d: Unknown module satate: %d" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:828 +#, c-format +msgid "The sky at a glance (%s)" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:894 +msgid "" +"You have no radio configuration!\n" +"Please configure a radio first." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:907 +#, c-format +msgid "Gpredict Radio Control: %s" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:967 +msgid "" +"You have no rotator configuration!\n" +"Please configure an antenna rotator first." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:980 +#, c-format +msgid "Gpredict Rotator Control: %s" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:1066 +#, c-format +msgid "" +"This operation will permanently delete\n" +"<b>%s</b>\n" +"from the disk.\n" +"Do you you want to proceed?" +msgstr "" + +#: ../src/gtk-sat-module-popup.c:1076 +#, c-format +msgid "%s:%d: Failed to delete %s." +msgstr "" + +#: ../src/gtk-sat-module-popup.c:1081 +#, c-format +msgid "%s:%d: %s deleted permanently." +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:70 +#, c-format +msgid "%s: Time Controller for %s is already active" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:94 +msgid "Play forward" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:104 +msgid "Stop" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:115 +msgid "Play backwards" +msgstr "" + +#. reset time +#. reset button +#: ../src/gtk-sat-module-tmg.c:120 ../src/sat-pref-conditions.c:427 +#: ../src/sat-pref-single-sat.c:220 ../src/sat-pref-debug.c:141 +#: ../src/sat-pref-formats.c:118 ../src/sat-pref-layout.c:576 +#: ../src/sat-pref-list-view.c:253 ../src/sat-pref-map-view.c:644 +#: ../src/sat-pref-multi-pass.c:190 ../src/sat-pref-polar-view.c:577 +#: ../src/sat-pref-refresh.c:419 ../src/sat-pref-single-pass.c:184 +#: ../src/sat-pref-sky-at-glance.c:491 ../src/sat-pref-tle.c:350 +msgid "Reset" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:122 +msgid "Reset to current date and time" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:129 ../src/gtk-sat-module-tmg.c:556 +msgid "<b>Real-Time</b>" +msgstr "" + +#. hour +#: ../src/gtk-sat-module-tmg.c:149 +msgid " Hour:" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:161 +msgid "Use this control to set the hour" +msgstr "" + +#. minutes +#: ../src/gtk-sat-module-tmg.c:169 +msgid " Min:" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:181 +msgid "Use this control to set the minutes" +msgstr "" + +#. seconds +#: ../src/gtk-sat-module-tmg.c:189 +msgid " Sec:" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:201 +msgid "Use this control to set the seconds" +msgstr "" + +#. milliseconds +#: ../src/gtk-sat-module-tmg.c:209 +msgid " Msec:" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:221 +msgid "Use this control to set the milliseconds" +msgstr "" + +#. time throttle +#: ../src/gtk-sat-module-tmg.c:229 +msgid "Throttle:" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:241 +msgid "Time throttle / compression factor" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:282 +#, c-format +msgid "%s: Time Controller for %s launched" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:313 +#, c-format +msgid "%s: Time Controller for %s closed. Time reset." +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:474 +#, c-format +msgid "%s: %d/%d/%d %d:%d:%d.%d" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:547 +msgid "<b>Simulated Real-Time</b>" +msgstr "" + +#: ../src/gtk-sat-module-tmg.c:551 +msgid "<b>Manual Control</b>" +msgstr "" + +#: ../src/gtk-sat-tree.c:231 +msgid "Epoch" +msgstr "" + +#: ../src/gtk-sat-tree.c:244 +msgid "Selected" +msgstr "" + +#. expand and collabse buttons +#: ../src/gtk-sat-tree.c:266 +msgid "Expand" +msgstr "" + +#: ../src/gtk-sat-tree.c:269 +msgid "Expand all nodes in the tree to make it searchable" +msgstr "" + +#: ../src/gtk-sat-tree.c:273 +msgid "Collapse" +msgstr "" + +#: ../src/gtk-sat-tree.c:276 +msgid "Collapse all nodes in the tree" +msgstr "" + +#: ../src/gtk-sat-tree.c:332 +#, c-format +msgid "%s:%d: Directory is: %s" +msgstr "" + +#: ../src/gtk-sat-tree.c:340 +#, c-format +msgid "%s:%d: No .tle files found in %s." +msgstr "" + +#: ../src/gtk-sat-tree.c:378 +#, c-format +msgid "%s:%d: Read %d sats from %s " +msgstr "" + +#: ../src/gtk-sat-tree.c:420 +#, c-format +msgid "%s:%d: Failed to open %s (%s)" +msgstr "" + +#: ../src/gtk-sat-tree.c:521 ../src/gtk-sat-tree.c:654 +#, c-format +msgid "%s:%d: Satellite %d selected." +msgstr "" + +#: ../src/gtk-sat-tree.c:537 ../src/gtk-sat-tree.c:659 +#, c-format +msgid "%s:%d: Satellite %d already selected; skip..." +msgstr "" + +#: ../src/gtk-sat-tree.c:545 +#, c-format +msgid "%s:%d: Satellite %d de-selected." +msgstr "" + +#: ../src/gtk-sat-tree.c:581 ../src/gtk-sat-tree.c:734 +#, c-format +msgid "%s: Invalid GtkSatTree!" +msgstr "" + +#: ../src/gtk-sat-tree.c:603 +#, c-format +msgid "%s: Satellite %d already selected; skip..." +msgstr "" + +#: ../src/gtk-sat-tree.c:745 +#, c-format +msgid "%s: There are no satellites selected => NULL." +msgstr "" + +#. location +#: ../src/loc-tree.c:133 ../src/sat-pref-qth.c:188 +#: ../src/sat-pref-qth-editor.c:220 ../src/qth-editor.c:235 +msgid "Location" +msgstr "" + +#: ../src/loc-tree.c:205 +msgid "WX" +msgstr "" + +#: ../src/loc-tree.c:221 +msgid "X" +msgstr "" + +#. dialog window +#: ../src/loc-tree.c:258 +msgid "Select Location" +msgstr "" + +#: ../src/loc-tree.c:293 +#, c-format +msgid "%s: Selected %s" +msgstr "" + +#: ../src/loc-tree.c:304 +#, c-format +msgid "%s: No location selected" +msgstr "" + +#: ../src/loc-tree.c:354 +#, c-format +msgid "%s: %s does not exist!" +msgstr "" + +#: ../src/loc-tree.c:445 +#, c-format +msgid "%s: Read %d cities." +msgstr "" + +#: ../src/loc-tree.c:463 +#, c-format +msgid "%s: Failed to open locfile (%s)" +msgstr "" + +#: ../src/loc-tree.c:522 +#, c-format +msgid "%s: Invalid column: %d" +msgstr "" + +#: ../src/loc-tree.c:670 +#, c-format +msgid "%s: Failed to get parent for %s." +msgstr "" + +#: ../src/loc-tree.c:684 +#, c-format +msgid "%s: No selection found!" +msgstr "" + +#: ../src/main.c:61 +msgid "just to have a pot" +msgstr "" + +#: ../src/main.c:113 +#, c-format +msgid "" +"%s: User config check failed (code %d). This is fatal.\n" +"A possible solution would be to remove the .gpredict2 data dir\n" +"in your home directory" +msgstr "" + +#: ../src/main.c:124 +#, c-format +msgid "%s: TLE check failed! This is fatal." +msgstr "" + +#: ../src/main.c:427 +#, c-format +msgid "%s: Time threshold has been passed." +msgstr "" + +#: ../src/main.c:435 +#, c-format +msgid "%s: Starting new update thread." +msgstr "" + +#: ../src/main.c:445 +#, c-format +msgid "%s: Failed to create TLE update thread (%s)" +msgstr "" + +#: ../src/main.c:455 +msgid "" +"Your TLE files are getting out of date.\n" +"You can update them by selecting\n" +"<b>Edit -> Update TLE</b>\n" +"in the menubar." +msgstr "" + +#: ../src/main.c:486 +#, c-format +msgid "%s: Could not find TLE monitoring task (ID = %d)" +msgstr "" + +#: ../src/menubar.c:88 +msgid "_File" +msgstr "_Fichier" + +#: ../src/menubar.c:89 +msgid "_Edit" +msgstr "_Edition" + +#: ../src/menubar.c:90 +msgid "_Update TLE" +msgstr "_Mise à jour TLE" + +#: ../src/menubar.c:91 +msgid "_Tools" +msgstr "_Outils" + +#: ../src/menubar.c:92 +msgid "_Help" +msgstr "_Aide" + +#. File menu +#: ../src/menubar.c:95 +msgid "_New module" +msgstr "_Nouveau module" + +#: ../src/menubar.c:96 +msgid "Create a new module" +msgstr "Créer un nouveau module" + +#: ../src/menubar.c:97 +msgid "_Open module" +msgstr "_Ouvrir module" + +#: ../src/menubar.c:98 +msgid "Open an existing module" +msgstr "Ouvre un module existant" + +#: ../src/menubar.c:100 +msgid "Open the message log browser" +msgstr "" + +#: ../src/menubar.c:101 +msgid "E_xit" +msgstr "_Quitter" + +#: ../src/menubar.c:102 +msgid "Exit the program" +msgstr "Quitter le programme" + +#. Edit menu +#. { "Tle", GTK_STOCK_REFRESH, N_("Update TLE"), NULL, +#. N_("Update Keplerian elements"), NULL}, +#: ../src/menubar.c:107 +msgid "From _network" +msgstr "Depuis le _réseau" + +#: ../src/menubar.c:108 +msgid "Update Keplerian elements from a network server" +msgstr "Mets à jour les éléments Képlériens depuis un serveur réseau" + +#: ../src/menubar.c:110 +msgid "From l_ocal files" +msgstr "Depuis fichiers _locaux" + +#: ../src/menubar.c:111 +msgid "Update Keplerian elements from local files" +msgstr "Mets à jour les éléments Képlériens depuis des fichiers locaux" + +#: ../src/menubar.c:113 +msgid "Using TLE _editor" +msgstr "Utilisation de l'édit_eur TLE" + +#: ../src/menubar.c:114 +msgid "Add or update Keplerian elements using the TLE editor" +msgstr "" +"Ajoute ou mets à jour les éléments Képlériens en utilisant l'éditeur TLE" + +#: ../src/menubar.c:116 +msgid "_Transponders" +msgstr "_Transpondeurs" + +#: ../src/menubar.c:117 +msgid "Edit satellite transponder frequencies" +msgstr "Edite les fréquences transpondeurs satellite" + +#: ../src/menubar.c:119 +msgid "_Preferences" +msgstr "_Préférences" + +#: ../src/menubar.c:120 +msgid "Edit user preferences" +msgstr "Edite les préférences utilisateur" + +#. Tools menu +#: ../src/menubar.c:123 +msgid "Comm Window" +msgstr "Fenêtre Comm" + +#: ../src/menubar.c:124 +msgid "Predict windows between two observers" +msgstr "" + +#: ../src/menubar.c:126 +msgid "Advanced Predict" +msgstr "" + +#: ../src/menubar.c:127 +msgid "Open advanced pass predictor" +msgstr "" + +#. Help menu +#: ../src/menubar.c:130 +msgid "Getting Started" +msgstr "" + +#: ../src/menubar.c:131 +msgid "Show online user manual, Getting Started Section" +msgstr "" + +#: ../src/menubar.c:133 +msgid "User Manual" +msgstr "" + +#: ../src/menubar.c:134 +msgid "Show online user manual" +msgstr "" + +#: ../src/menubar.c:135 +msgid "_License" +msgstr "_Licence" + +#: ../src/menubar.c:136 +msgid "Show the Gpredict license" +msgstr "Monre la licence Gpredict" + +#: ../src/menubar.c:137 +msgid "_News" +msgstr "_Nouvelles" + +#: ../src/menubar.c:138 +msgid "Show what's new in this release" +msgstr "Montre ce qu'il y a de neuf dans cette version" + +#: ../src/menubar.c:139 +msgid "_About Gpredict" +msgstr "_A propos de Gpredict" + +#: ../src/menubar.c:140 +msgid "Show about dialog" +msgstr "Montre le dialogue à propos" + +#: ../src/menubar.c:221 +#, c-format +msgid "Failed to build menubar: %s" +msgstr "" + +#: ../src/menubar.c:258 +#, c-format +msgid "%s: Starting new module configurator..." +msgstr "" + +#: ../src/menubar.c:265 +#, c-format +msgid "%s: New module name is %s." +msgstr "" + +#: ../src/menubar.c:286 ../src/menubar.c:354 +#, c-format +msgid "Could not open %s. Please examine the log messages for details." +msgstr "" + +#: ../src/menubar.c:310 +#, c-format +msgid "%s: New module config cancelled." +msgstr "" + +#: ../src/menubar.c:326 +#, c-format +msgid "%s: Open existing module..." +msgstr "" + +#: ../src/menubar.c:333 +#, c-format +msgid "%s: Open module %s." +msgstr "" + +#: ../src/menubar.c:392 +#, c-format +msgid "%s: Open module cancelled." +msgstr "" + +#. create new dialog with progress indicator +#: ../src/menubar.c:448 ../src/menubar.c:636 ../src/sat-pref-general.c:61 +msgid "TLE Update" +msgstr "" + +#: ../src/menubar.c:469 +msgid "<b>Updating TLE files from network</b>" +msgstr "" + +#. statistics +#: ../src/menubar.c:482 ../src/menubar.c:670 +msgid "" +"Satellites updated:\t 0\n" +"Satellites skipped:\t 0\n" +"Missing Satellites:\t 0\n" +msgstr "" + +#: ../src/menubar.c:508 ../src/menubar.c:696 +msgid "Finished" +msgstr "" + +#: ../src/menubar.c:525 +msgid "" +"This version of gpredict has been compiled without network support. " +"Therefore, TLE update from network is not available.\n" +"\n" +"Consult the user manual for details." +msgstr "" + +#. create file chooser +#: ../src/menubar.c:579 +msgid "Select directory" +msgstr "" + +#. create label +#: ../src/menubar.c:585 +msgid "Select TLE directory:" +msgstr "" + +#. create the dalog +#: ../src/menubar.c:594 +msgid "Update TLE from files" +msgstr "" + +#: ../src/menubar.c:629 +#, c-format +msgid "%s: Running TLE update from %s" +msgstr "" + +#: ../src/menubar.c:656 +msgid "<b>Updating TLE files from files</b>" +msgstr "" + +#: ../src/menubar.c:724 ../src/menubar.c:748 ../src/menubar.c:769 +msgid "This function is still under development." +msgstr "" + +#: ../src/menubar.c:855 +#, c-format +msgid "%s:%s: Scanning directory %s for modules." +msgstr "" + +#: ../src/menubar.c:878 +#, c-format +msgid "%s:%d: Failed to open module dir %s (%s)" +msgstr "" + +#: ../src/menubar.c:893 +msgid "" +"You do not have any modules set up yet. Please use File->New in order to " +"create a module." +msgstr "" + +#: ../src/menubar.c:911 +msgid "Module" +msgstr "" + +#. create dialog +#: ../src/menubar.c:919 +msgid "Select a module" +msgstr "" + +#: ../src/menubar.c:946 +#, c-format +msgid "%s:%s: Selected module is: %s" +msgstr "" + +#: ../src/menubar.c:951 +#, c-format +msgid "%s:%s: No selection is list of modules." +msgstr "" + +#: ../src/mod-cfg.c:148 +#, c-format +msgid "%s: Already have module %s. Ask user to confirm..." +msgstr "" + +#: ../src/mod-cfg.c:157 +#, c-format +msgid "" +"There is already a module called %s.\n" +"Do you want to overwrite this module?" +msgstr "" + +#: ../src/mod-cfg.c:183 +#, c-format +msgid "%s: Error while saving module data (%d)." +msgstr "" + +#: ../src/mod-cfg.c:194 ../src/mod-cfg.c:283 +#, c-format +msgid "%s: User tried to create module with no sats." +msgstr "" + +#: ../src/mod-cfg.c:206 ../src/mod-cfg.c:294 +msgid "Please select at least one satellite from the list." +msgstr "" + +#: ../src/mod-cfg.c:344 +#, c-format +msgid "%s: Attempt to save data to empty file name." +msgstr "" + +#: ../src/mod-cfg.c:351 +#, c-format +msgid "%s: Attempt to save NULL data." +msgstr "" + +#: ../src/mod-cfg.c:362 ../src/sat-cfg.c:305 +#, c-format +msgid "%s: Could not create config data (%s)." +msgstr "" + +#: ../src/mod-cfg.c:380 ../src/sat-cfg.c:324 +#, c-format +msgid "%s: Could not create config file (%s)." +msgstr "" + +#: ../src/mod-cfg.c:399 ../src/sat-cfg.c:343 +#, c-format +msgid "%s: Error writing config data (%s)." +msgstr "" + +#: ../src/mod-cfg.c:415 +#, c-format +msgid "%s: Configuration saved for module %s." +msgstr "" + +#: ../src/mod-cfg.c:465 +msgid "Create New Module" +msgstr "" + +#: ../src/mod-cfg.c:478 +msgid "Edit Module" +msgstr "" + +#: ../src/mod-cfg.c:539 +msgid "Module Name" +msgstr "" + +#: ../src/mod-cfg.c:543 +msgid "Ground Station" +msgstr "" + +#. add button +#: ../src/mod-cfg.c:549 +msgid "Add new ground station" +msgstr "" + +#: ../src/mod-cfg.c:558 +msgid "<b>Select Satellites:</b>" +msgstr "" + +#: ../src/mod-cfg.c:698 +#, c-format +msgid "%s: Module has no QTH; use default." +msgstr "" + +#. finally, add "** DEFAULT **" string; secting this will +#. clear the MOD_CFG_QTH_FILE_KEY module configuration +#. key ensuring that the module will use the default QTH +#. +#. is buff == "** DEFAULT **" clear the configuration key +#. otherwise store the filename +#. +#: ../src/mod-cfg.c:701 ../src/mod-cfg.c:743 ../src/mod-cfg.c:791 +msgid "** DEFAULT **" +msgstr "" + +#: ../src/mod-cfg.c:734 +#, c-format +msgid "%s:%d: Failed to open user cfg dir %s (%s)" +msgstr "" + +#: ../src/mod-cfg.c:832 +#, c-format +msgid "%s: Applied changes to %s." +msgstr "" + +#. window icon file name +#: ../src/mod-cfg.c:854 +msgid "Module Properties" +msgstr "" + +#: ../src/mod-mgr.c:147 +#, c-format +msgid "%s: Failed to restore %s" +msgstr "" + +#: ../src/mod-mgr.c:169 +#, c-format +msgid "%s: No modules have to be restored." +msgstr "" + +#: ../src/mod-mgr.c:208 +#, c-format +msgid "%s: Added %s to module manger (page %d)." +msgstr "" + +#: ../src/mod-mgr.c:214 +#, c-format +msgid "%s: Added %s to module manger (NOT DOCKED)." +msgstr "" + +#: ../src/mod-mgr.c:221 +#, c-format +msgid "%s: Module %s seems to be NULL" +msgstr "" + +#: ../src/mod-mgr.c:262 +#, c-format +msgid "%s: Could not find child in notebook. This may hurt..." +msgstr "" + +#: ../src/mod-mgr.c:271 +#, c-format +msgid "%s: Removed child from notebook page %d." +msgstr "" + +#: ../src/mod-mgr.c:322 +#, c-format +msgid "%s: Attempt to save state but mod-mgr is NULL?" +msgstr "" + +#: ../src/mod-mgr.c:331 +#, c-format +msgid "%s: No modules need to save state." +msgstr "" + +#: ../src/mod-mgr.c:356 +#, c-format +msgid "%s: Stored %s" +msgstr "" + +#: ../src/mod-mgr.c:361 +#, c-format +msgid "%s: Saved states for %d modules." +msgstr "" + +#: ../src/mod-mgr.c:425 ../src/mod-mgr.c:494 +#, c-format +msgid "%s: Module %s not found in list. Trying to recover." +msgstr "" + +#: ../src/mod-mgr.c:433 +#, c-format +msgid "%s: Module %s already in notebook!" +msgstr "" + +#: ../src/mod-mgr.c:447 +#, c-format +msgid "%s: Docked %s into notebook (page %d)" +msgstr "" + +#: ../src/mod-mgr.c:502 +#, c-format +msgid "%s: Module %s does not seem to be docked!" +msgstr "" + +#: ../src/mod-mgr.c:511 +#, c-format +msgid "%s: Removed %s from notebook page %d." +msgstr "" + +#: ../src/mod-mgr.c:545 +msgid "GPREDICT: (none)" +msgstr "" + +#: ../src/mod-mgr.c:550 ../src/mod-mgr.c:567 +#, c-format +msgid "GPREDICT: %s" +msgstr "" + +#: ../src/mod-mgr.c:585 +#, c-format +msgid "%s: Attempt to reload sats but mod-mgr is NULL?" +msgstr "" + +#: ../src/mod-mgr.c:594 +#, c-format +msgid "%s: No modules need to reload sats." +msgstr "" + +#. pass details +#: ../src/pass-popup-menu.c:72 +msgid "Show details" +msgstr "" + +#. Polar plot pass +#: ../src/pass-popup-menu.c:89 +msgid "Polar plot" +msgstr "" + +#. Az/El plot pass +#: ../src/pass-popup-menu.c:103 +msgid "Az/El plot" +msgstr "" + +#: ../src/pass-to-txt.c:47 +msgid " Time" +msgstr "" + +#: ../src/pass-to-txt.c:48 +msgid " Az " +msgstr "" + +#. 6 +#: ../src/pass-to-txt.c:49 +msgid " El " +msgstr "" + +#: ../src/pass-to-txt.c:50 +msgid " Ra " +msgstr "" + +#: ../src/pass-to-txt.c:51 +msgid " Dec " +msgstr "" + +#: ../src/pass-to-txt.c:53 +msgid " Rate " +msgstr "" + +#: ../src/pass-to-txt.c:54 +msgid " Lat " +msgstr "" + +#: ../src/pass-to-txt.c:55 +msgid " Lon " +msgstr "" + +#: ../src/pass-to-txt.c:56 +msgid " SSP " +msgstr "" + +#: ../src/pass-to-txt.c:58 +msgid " Alt " +msgstr "" + +#: ../src/pass-to-txt.c:59 +msgid " Vel " +msgstr "" + +#: ../src/pass-to-txt.c:60 +msgid " Dop " +msgstr "" + +#: ../src/pass-to-txt.c:61 +msgid " Loss " +msgstr "" + +#: ../src/pass-to-txt.c:62 +msgid " Del " +msgstr "" + +#: ../src/pass-to-txt.c:63 +msgid " MA " +msgstr "" + +#: ../src/pass-to-txt.c:64 +msgid " Pha " +msgstr "" + +#: ../src/pass-to-txt.c:93 +msgid " AOS" +msgstr "" + +#: ../src/pass-to-txt.c:94 +msgid " TCA" +msgstr "" + +#. 6 +#: ../src/pass-to-txt.c:95 +msgid " LOS" +msgstr "" + +#: ../src/pass-to-txt.c:96 ../src/sat-pass-dialogs.c:61 +msgid "Duration" +msgstr "" + +#: ../src/pass-to-txt.c:97 ../src/sat-pass-dialogs.c:62 +#: ../src/sat-pref-rot.c:169 +msgid "Max El" +msgstr "" + +#: ../src/pass-to-txt.c:98 ../src/sat-pass-dialogs.c:63 +msgid "AOS Az" +msgstr "" + +#: ../src/pass-to-txt.c:99 ../src/sat-pass-dialogs.c:64 +msgid "Max El Az" +msgstr "" + +#: ../src/pass-to-txt.c:100 ../src/sat-pass-dialogs.c:65 +msgid "LOS Az" +msgstr "" + +#: ../src/pass-to-txt.c:142 +msgid "Local" +msgstr "" + +#: ../src/pass-to-txt.c:177 +#, c-format +msgid "" +"Pass details for %s (orbit %d)\n" +"Observer: %s, %s\n" +"LAT:%.2f LON:%.2f\n" +"AOS: %s %s\n" +"LOS: %s %s\n" +msgstr "" + +#: ../src/pass-to-txt.c:483 +#, c-format +msgid "" +"Upcoming passes for %s\n" +"Observer: %s, %s\n" +"LAT:%.2f LON:%.2f\n" +msgstr "" + +#: ../src/radio-conf.c:65 ../src/radio-conf.c:169 ../src/rotor-conf.c:65 +#, c-format +msgid "%s: NULL configuration name!" +msgstr "" + +#: ../src/radio-conf.c:82 ../src/rotor-conf.c:82 +#, c-format +msgid "%s: Could not load file %s\n" +msgstr "" + +#: ../src/radio-conf.c:95 ../src/radio-conf.c:105 ../src/radio-conf.c:115 +#: ../src/radio-conf.c:125 ../src/radio-conf.c:135 +#, c-format +msgid "%s: Error reading radio conf from %s (%s)." +msgstr "" + +#: ../src/radio-conf.c:145 +#, c-format +msgid "%s: Read radio configuration %s" +msgstr "" + +#: ../src/radio-conf.c:199 +#, c-format +msgid "%s: Saved radio configuration %s" +msgstr "" + +#: ../src/rotor-conf.c:95 ../src/rotor-conf.c:105 +#, c-format +msgid "%s: Error reading rotor conf from %s (%s)." +msgstr "" + +#: ../src/rotor-conf.c:115 +#, c-format +msgid "%s: Az type not defined for %s. Assuming 0..360°" +msgstr "" + +#: ../src/rotor-conf.c:125 +#, c-format +msgid "%s: MinAz not defined for %s. Assuming 0°." +msgstr "" + +#: ../src/rotor-conf.c:134 +#, c-format +msgid "%s: MaxAz not defined for %s. Assuming 360°." +msgstr "" + +#: ../src/rotor-conf.c:143 +#, c-format +msgid "%s: MinEl not defined for %s. Assuming 0°." +msgstr "" + +#: ../src/rotor-conf.c:152 +#, c-format +msgid "%s: MaxEl not defined for %s. Assuming 90°." +msgstr "" + +#: ../src/sat-cfg.c:263 +#, c-format +msgid "%s: Error reading config file (%s)" +msgstr "" + +#: ../src/sat-cfg.c:267 +#, c-format +msgid "%s: Using built-in defaults" +msgstr "" + +#: ../src/sat-cfg.c:276 +#, c-format +msgid "%s: Everything OK." +msgstr "" + +#: ../src/sat-cfg.c:359 +#, c-format +msgid "%s: Configuration saved." +msgstr "" + +#: ../src/sat-cfg.c:402 ../src/sat-cfg.c:466 ../src/sat-cfg.c:492 +#: ../src/sat-cfg.c:525 ../src/sat-cfg.c:591 ../src/sat-cfg.c:627 +#: ../src/sat-cfg.c:655 ../src/sat-cfg.c:711 ../src/sat-cfg.c:737 +#, c-format +msgid "%s: Module not initialised\n" +msgstr "" + +#: ../src/sat-cfg.c:425 ../src/sat-cfg.c:443 ../src/sat-cfg.c:479 +#: ../src/sat-cfg.c:505 +#, c-format +msgid "%s: Unknown BOOL param index (%d)\n" +msgstr "" + +#: ../src/sat-cfg.c:548 ../src/sat-cfg.c:571 ../src/sat-cfg.c:613 +#: ../src/sat-cfg.c:640 +#, c-format +msgid "%s: Unknown STR param index (%d)\n" +msgstr "" + +#: ../src/sat-cfg.c:678 ../src/sat-cfg.c:696 ../src/sat-cfg.c:724 +#: ../src/sat-cfg.c:750 +#, c-format +msgid "%s: Unknown INT param index (%d)\n" +msgstr "" + +#: ../src/sat-info.c:85 +msgid "<b>Satellite name:</b>" +msgstr "" + +#: ../src/sat-info.c:90 +#, c-format +msgid "<b>%s</b>" +msgstr "" + +#. operational status +#: ../src/sat-info.c:97 +msgid "Operational Status:" +msgstr "" + +#: ../src/sat-info.c:104 +msgid "Operational" +msgstr "" + +#: ../src/sat-info.c:108 +msgid "Non-operational" +msgstr "" + +#: ../src/sat-info.c:112 +msgid "Partially operational" +msgstr "" + +#: ../src/sat-info.c:116 +msgid "Backup/Standby" +msgstr "" + +#: ../src/sat-info.c:120 +msgid "Spare" +msgstr "" + +#: ../src/sat-info.c:124 +msgid "Extended Mission" +msgstr "" + +#: ../src/sat-info.c:128 ../src/sat-vis.c:40 +msgid "Unknown" +msgstr "" + +#. Catnum +#: ../src/sat-info.c:137 +msgid "Catalogue number:" +msgstr "" + +#. international designator +#: ../src/sat-info.c:148 +msgid "Internation designator:" +msgstr "" + +#. elset number +#: ../src/sat-info.c:157 +msgid "Element set number:" +msgstr "" + +#. elset epoch +#: ../src/sat-info.c:168 +msgid "Epoch time:" +msgstr "" + +#. Revolution Number @ Epoch +#: ../src/sat-info.c:179 +msgid "Orbit number @ epoch:" +msgstr "" + +#. Orbit inclination +#: ../src/sat-info.c:197 +msgid "Inclination:" +msgstr "" + +#. RAAN +#: ../src/sat-info.c:208 +msgid "RAAN:" +msgstr "" + +#. Eccentricity +#: ../src/sat-info.c:219 +msgid "Eccentricity:" +msgstr "" + +#. Argument of perigee +#: ../src/sat-info.c:230 +msgid "Arg. of perigee:" +msgstr "" + +#. Mean Anomaly +#: ../src/sat-info.c:241 +msgid "Mean anomaly:" +msgstr "" + +#. Mean Motion +#: ../src/sat-info.c:252 +msgid "Mean motion:" +msgstr "" + +#. one half of the first time derivative of mean motion +#: ../src/sat-info.c:264 +msgid "½ d/dt (mean motion):" +msgstr "" + +#: ../src/sat-info.c:279 +msgid "1/6 d<sup>2</sup>/dt<sup>2</sup> (mean motion):" +msgstr "" + +#. B* drag term +#: ../src/sat-info.c:292 +msgid "B* drag term:" +msgstr "" + +#. create dialog window with NULL parent +#: ../src/sat-info.c:312 +msgid "Satellite Info" +msgstr "Info Satellite" + +#. * WARNING: Used directly in sat-log-browser +#: ../src/sat-log.c:57 ../src/sat-log-browser.c:69 +msgid "NONE" +msgstr "" + +#: ../src/sat-log.c:57 +msgid "HAMLIB" +msgstr "" + +#. print an error message +#: ../src/sat-log.c:101 +#, c-format +msgid "ERROR: Could not create %s\n" +msgstr "" + +#: ../src/sat-log.c:125 +#, c-format +msgid "" +"\n" +"\n" +"ERROR: Failed to create %s\n" +"%s\n" +"\n" +msgstr "" + +#: ../src/sat-log.c:138 +#, c-format +msgid "%s: Session started" +msgstr "" + +#: ../src/sat-log.c:150 +#, c-format +msgid "%s: Session ended" +msgstr "" + +#: ../src/sat-log-browser.c:56 ../src/sat-pass-dialogs.c:100 +#: ../src/sat-pass-dialogs.c:124 +msgid "Time" +msgstr "" + +#: ../src/sat-log-browser.c:57 +msgid "Source" +msgstr "" + +#: ../src/sat-log-browser.c:58 +msgid "Level" +msgstr "" + +#: ../src/sat-log-browser.c:59 +msgid "Message" +msgstr "" + +#: ../src/sat-log-browser.c:70 +msgid "BUG" +msgstr "" + +#: ../src/sat-log-browser.c:72 +msgid "WARNING" +msgstr "" + +#: ../src/sat-log-browser.c:73 +msgid "DEBUG" +msgstr "" + +#: ../src/sat-log-browser.c:74 +msgid "TRACE" +msgstr "" + +#. create dialog window; we use "fake" stock responses to catch user +#. button clicks (save_as and pause) +#. +#: ../src/sat-log-browser.c:152 +msgid "Log Browser" +msgstr "" + +#. create file chooser dialog +#: ../src/sat-log-browser.c:371 +msgid "Select Log File" +msgstr "" + +#: ../src/sat-log-browser.c:447 +msgid "SYS" +msgstr "" + +#: ../src/sat-log-browser.c:458 +msgid "Log file seems corrupt" +msgstr "" + +#: ../src/sat-log-browser.c:480 +#, c-format +msgid "%s:%d: Error open debug log (%s)" +msgstr "" + +#: ../src/sat-log-browser.c:654 +msgid "Hamlib" +msgstr "" + +#: ../src/sat-log-browser.c:660 +msgid "Gpredict" +msgstr "" + +#: ../src/sat-log-browser.c:666 +msgid "Other" +msgstr "" + +#: ../src/sat-log-browser.c:676 +msgid "Bugs" +msgstr "" + +#: ../src/sat-log-browser.c:682 +msgid "Errors" +msgstr "" + +#: ../src/sat-log-browser.c:688 +msgid "Warnings" +msgstr "" + +#: ../src/sat-log-browser.c:694 +msgid "Messages" +msgstr "" + +#: ../src/sat-log-browser.c:700 +msgid "Debug" +msgstr "" + +#: ../src/sat-log-browser.c:713 +msgid "<b>Total</b>" +msgstr "" + +#. frame around the table +#: ../src/sat-log-browser.c:738 +msgid " Summary " +msgstr "" + +#: ../src/sat-pass-dialogs.c:58 +msgid "AOS" +msgstr "" + +#: ../src/sat-pass-dialogs.c:59 +msgid "TCA" +msgstr "" + +#: ../src/sat-pass-dialogs.c:60 +msgid "LOS" +msgstr "" + +#: ../src/sat-pass-dialogs.c:72 +msgid "Aquisition of signal (AOS)" +msgstr "" + +#: ../src/sat-pass-dialogs.c:73 +msgid "Time of Closest Approach (TCA)" +msgstr "" + +#: ../src/sat-pass-dialogs.c:74 +msgid "Loss of signal (LOS)" +msgstr "" + +#: ../src/sat-pass-dialogs.c:75 +msgid "Duration of pass" +msgstr "" + +#: ../src/sat-pass-d... [truncated message content] |
From: <fi...@us...> - 2009-02-19 21:24:22
|
Revision: 194 http://gpredict.svn.sourceforge.net/gpredict/?rev=194&view=rev Author: fillods Date: 2009-02-19 21:24:18 +0000 (Thu, 19 Feb 2009) Log Message: ----------- Fixed a typo for make dist Modified Paths: -------------- trunk/src/Makefile.am Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-12-28 19:44:59 UTC (rev 193) +++ trunk/src/Makefile.am 2009-02-19 21:24:18 UTC (rev 194) @@ -45,7 +45,7 @@ gtk-sat-data.c gtk-sat-data.h \ gtk-sat-list.c gtk-sat-list.h \ gtk-sat-list-col-sel.c gtk-sat-list-col-sel.h \ - gtk-sat-list-popup.c gtk-sat-list-poup.h \ + gtk-sat-list-popup.c gtk-sat-list-popup.h \ gtk-sat-map.c gtk-sat-map.h \ gtk-sat-map-popup.c gtk-sat-map-popup.h \ gtk-sat-map-ground-track.c gtk-sat-map-ground-track.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-12-28 19:45:02
|
Revision: 193 http://gpredict.svn.sourceforge.net/gpredict/?rev=193&view=rev Author: csete Date: 2008-12-28 19:44:59 +0000 (Sun, 28 Dec 2008) Log Message: ----------- Updated with new rig configuration options. Modified Paths: -------------- trunk/doc/um/gpredict-user-manual.odt Modified: trunk/doc/um/gpredict-user-manual.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-12-28 16:18:47
|
Revision: 192 http://gpredict.svn.sourceforge.net/gpredict/?rev=192&view=rev Author: csete Date: 2008-12-28 16:18:41 +0000 (Sun, 28 Dec 2008) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-12-28 16:03:51 UTC (rev 191) +++ trunk/ChangeLog 2008-12-28 16:18:41 UTC (rev 192) @@ -9,6 +9,13 @@ * src/sat-pref-rig.c: Include rig type and ptt fields. + * src/gtk-polar-view.c: + * src/gtk-sat-map.c: + * src/gtk-sky-at-glance.c: + * src/gtk-polar-plot.c: + * src/gtk-azel-plot.c: + Update canvas bounds when resizing the canvas. + 2008-12-27; Alexandru Csete <oz...@gm...> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |