gpredict-svn Mailing List for Gpredict (Page 25)
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-08-06 09:44:55
|
Revision: 366 http://gpredict.svn.sourceforge.net/gpredict/?rev=366&view=rev Author: csete Date: 2009-08-06 09:44:45 +0000 (Thu, 06 Aug 2009) Log Message: ----------- Migrated to new user configuration. Modified Paths: -------------- trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rot-ctrl.c trunk/src/radio-conf.c trunk/src/rotor-conf.c trunk/src/sat-pref-rig.c trunk/src/sat-pref-rot.c trunk/src/trsp-conf.c Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/gtk-rig-ctrl.c 2009-08-06 09:44:45 UTC (rev 366) @@ -639,7 +639,6 @@ GtkWidget *frame,*table,*label,*timer; GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ gchar **vbuff; const gchar *filename; /* file name */ @@ -662,10 +661,7 @@ "unless you select a secondary device for uplink")); /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { @@ -2341,17 +2337,13 @@ { GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ const gchar *filename; /* file name */ gint i = 0; /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { Modified: trunk/src/gtk-rot-ctrl.c =================================================================== --- trunk/src/gtk-rot-ctrl.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/gtk-rot-ctrl.c 2009-08-06 09:44:45 UTC (rev 366) @@ -469,7 +469,6 @@ GtkWidget *frame,*table,*label,*timer,*toler; GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ gchar **vbuff; const gchar *filename; /* file name */ @@ -490,10 +489,7 @@ gtk_widget_set_tooltip_text (ctrl->DevSel, _("Select antenna rotator device")); /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { @@ -1202,17 +1198,13 @@ { GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ const gchar *filename; /* file name */ gint i = 0; /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/radio-conf.c 2009-08-06 09:44:45 UTC (rev 366) @@ -70,9 +70,8 @@ return FALSE; } - confdir = get_conf_dir(); + confdir = get_hwconf_dir(); fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, - "hwconf", G_DIR_SEPARATOR_S, conf->name, ".rig", NULL); g_free (confdir); @@ -245,9 +244,8 @@ /* convert to text sdata */ data = g_key_file_to_data (cfg, &len, NULL); - confdir = get_conf_dir(); + confdir = get_hwconf_dir(); fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, - "hwconf", G_DIR_SEPARATOR_S, conf->name, ".rig", NULL); g_free (confdir); Modified: trunk/src/rotor-conf.c =================================================================== --- trunk/src/rotor-conf.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/rotor-conf.c 2009-08-06 09:44:45 UTC (rev 366) @@ -67,9 +67,8 @@ return FALSE; } - confdir = get_conf_dir(); + confdir = get_hwconf_dir(); fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, - "hwconf", G_DIR_SEPARATOR_S, conf->name, ".rot", NULL); g_free (confdir); @@ -193,9 +192,8 @@ /* convert to text sdata */ data = g_key_file_to_data (cfg, &len, NULL); - confdir = get_conf_dir(); + confdir = get_hwconf_dir(); fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, - "hwconf", G_DIR_SEPARATOR_S, conf->name, ".rot", NULL); g_free (confdir); Modified: trunk/src/sat-pref-rig.c =================================================================== --- trunk/src/sat-pref-rig.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/sat-pref-rig.c 2009-08-06 09:44:45 UTC (rev 366) @@ -227,7 +227,6 @@ GtkTreeIter item; /* new item added to the list store */ GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ gchar **vbuff; const gchar *filename; /* file name */ @@ -247,10 +246,7 @@ ); /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { @@ -393,10 +389,7 @@ /* delete all .rig files */ - buff = get_conf_dir (); - dirname = g_strconcat (buff, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (buff); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { Modified: trunk/src/sat-pref-rot.c =================================================================== --- trunk/src/sat-pref-rot.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/sat-pref-rot.c 2009-08-06 09:44:45 UTC (rev 366) @@ -195,7 +195,6 @@ GtkTreeIter item; /* new item added to the list store */ GDir *dir = NULL; /* directory handle */ GError *error = NULL; /* error flag and info */ - gchar *cfgdir; gchar *dirname; /* directory name */ gchar **vbuff; const gchar *filename; /* file name */ @@ -214,10 +213,7 @@ ); /* open configuration directory */ - cfgdir = get_conf_dir (); - dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (cfgdir); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { @@ -357,10 +353,7 @@ /* delete all .rot files */ - buff = get_conf_dir (); - dirname = g_strconcat (buff, G_DIR_SEPARATOR_S, - "hwconf", NULL); - g_free (buff); + dirname = get_hwconf_dir (); dir = g_dir_open (dirname, 0, &error); if (dir) { Modified: trunk/src/trsp-conf.c =================================================================== --- trunk/src/trsp-conf.c 2009-08-05 23:33:52 UTC (rev 365) +++ trunk/src/trsp-conf.c 2009-08-06 09:44:45 UTC (rev 366) @@ -51,16 +51,13 @@ trsp_t *trsp; GKeyFile *cfg = NULL; GError *error = NULL; - gchar *name,*fname,*confdir; + gchar *name,*fname; gchar **groups; gsize numgrp,i; name = g_strdup_printf ("%d.trsp", catnum); - confdir = get_conf_dir(); - fname = g_strconcat (confdir, G_DIR_SEPARATOR_S, - "trsp", G_DIR_SEPARATOR_S, - name, NULL); + fname = trsp_file_name (name); cfg = g_key_file_new (); if (!g_key_file_load_from_file (cfg, fname, G_KEY_FILE_KEEP_COMMENTS, &error)) { @@ -158,7 +155,6 @@ g_strfreev (groups); g_key_file_free (cfg); g_free (name); - g_free (confdir); g_free (fname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 23:34:01
|
Revision: 365 http://gpredict.svn.sourceforge.net/gpredict/?rev=365&view=rev Author: csete Date: 2009-08-05 23:33:52 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-05 23:32:49 UTC (rev 364) +++ trunk/ChangeLog 2009-08-05 23:33:52 UTC (rev 365) @@ -1,3 +1,12 @@ +2009-08-05 alexandru Csete <oz9aec at gmail.com> + + * src/compat.[ch]: + Added more configuration related utility functions. + + * src/first-time.c: + Migrated to new user configuration. + + 2009-08-05 Stephane Fillod <fillods at users.sf.net> * src/sat-pref-rig-editor.c: @@ -5,6 +14,7 @@ Set default host to localhost for rigctld/rotctld, working around a crash when field is left empty. + 2009-08-05 Michael Stephenson <mickstephenson at googlemail.com> * src/gtk-sat-module-popup.c: @@ -24,6 +34,7 @@ * po/en_GB.po: US and British translations. + 2009-08-04 Alexandru Csete <oz9aec at gmail.com> * data/satdata/*.sat: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 23:33:03
|
Revision: 364 http://gpredict.svn.sourceforge.net/gpredict/?rev=364&view=rev Author: csete Date: 2009-08-05 23:32:49 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Migraetd to new user configuration. Modified Paths: -------------- trunk/src/first-time.c Modified: trunk/src/first-time.c =================================================================== --- trunk/src/first-time.c 2009-08-05 23:31:57 UTC (rev 363) +++ trunk/src/first-time.c 2009-08-05 23:32:49 UTC (rev 364) @@ -62,27 +62,33 @@ * * Check logic: * - * 1. Check for $HOME/.gpredict2/ and create dir if it does not exist - * 2. Check for the existence of at least one .qth file in $HOME/.gpredict2/ - * If no such file found, copy PACKAGE_DATA_DIR/data/sample.qth to this + * 1. Check for USER_CONF_DIR (use get_user_conf_dir()) and create dir if it + * does not exist. If we create the directory, check if there is a + * gpredict.cfg in the old configuration directory. + * 2. Check for the existence of at least one .qth file in USER_CONF_DIR + * If no such file found, check if there are any in the pre-1.1 configuration. + * If still none, copy PACKAGE_DATA_DIR/data/sample.qth to this * directory. - * 3. Check for the existence of $HOME/.gpredict2/modules directory and create - * it if it does not exist. Copy PACKAGE_DATA_DIR/data/Amateur.mod to the - * newly created directory. - * 4. Check for the existence of $HOME/.gpredict2/tle directory and create it if + * 3. Check for the existence of USER_CONF_DIR/modules directory and create + * it if it does not exist. Moreover, if this is a new installation, check + * for .mod files in pre-1.1 directory (use get_old_conf_dir()). If no .mod + * files are available copy PACKAGE_DATA_DIR/data/Amateur.mod to + * USER_CONF_DIR/modules/ + * 4. Check for the existence of USER_CONF_DIR/satdata directory and create it if * it does not exist. - * 5. Check for the existence of at least one .tle file in the above mentioned - * directory. If no such file found, copy PACKAGE_DATA_DIR/data/xxx.tle to this - * directory. - * 6. Check for the existence of $HOME/.gpredict2/tle/cache directory. This + * 5. Copy PACKAGE_DATA_DIR/data/satdata/xxx.sat to USER_CONF_DIR/satdata/ if it + * does not already exist. Do the same with .cat files. + * 6. Check for the existence of USER_CONF_DIR/satdata/cache directory. This * directory is used to store temporary TLE files when updating from * network. - * 7. Check for the existence of $HOME/.gpredict2/hwconf directory. This + * 7. Check for the existence of USER_CONF_DIR/hwconf directory. This * directory contains radio and rotator configurations (.rig and .rot files). - * 8. Check for the existence of $HOME/.gpredict2/trsp directory. This + * If the directory is newly created, check if we have any existing configuration + * in the pre-1.1 configuration directory (use get_old_conf_dir()). + * 8. Check for the existence of USER_CONF_DIR/trsp directory. This * directory contains transponder data for satellites. - * 9. Check the .trsp files in $HOME/.gpredict2/trsp/ and compare to the ones - * available in PACKAGE_DATA_DIR/data/xxx.trsp, and update if necessary. + * 9. Check the .trsp files in USER_CONF_DIR/trsp/ and compare to the ones + * available in PACKAGE_DATA_DIR/data/trsp/xxx.trsp, and update if necessary. * * Send both error, warning and verbose debug messages to sat-log during this * process. @@ -115,17 +121,19 @@ /** \brief Execute step 1 of the first time checks. * - * 1. Check for $HOME/.gpredict2/ and create dir if it does not exist + * 1. Check for USER_CONF_DIR (use get_user_conf_dir()) and create dir if it + * does not exist. If we create the directory, check if there is a + * gpredict.cfg in the old configuration directory. * */ static void first_time_check_step_01 (guint *error) { gchar *dir; + gchar *cfgfile; int status; - dir = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", NULL); + dir = get_user_conf_dir (); if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { sat_log_log (SAT_LOG_LEVEL_DEBUG, @@ -138,7 +146,7 @@ __FUNCTION__, dir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (dir, 0755); if (status) { /* set error flag */ @@ -152,6 +160,17 @@ sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Created %s."), __FUNCTION__, dir); + + /* now check if there is a gpredict.cfg in the pre-1.1 config + folder. */ + cfgfile = g_strconcat (dir, G_DIR_SEPARATOR_S, "gpredict.cfg", NULL); + if (g_file_test (cfgfile, G_FILE_TEST_EXISTS)) { + /* copy cfg file to USER_CONF_DIR */ + gchar *target = g_strconcat (dir, G_DIR_SEPARATOR_S, "gpredict.cfg", NULL); + gpredict_file_copy (cfgfile, target); /* FIXME: Error ignored */ + g_free (target); + } + g_free (cfgfile); } } @@ -162,8 +181,9 @@ /** \brief Execute step 2 of the first time checks. * - * 2. Check for the existence of at least one .qth file in $HOME/.gpredict2/ - * If no such file found, copy PACKAGE_DATA_DIR/data/sample.qth to this + * 2. Check for the existence of at least one .qth file in USER_CONF_DIR + * If no such file found, check if there are any in the pre-1.1 configuration. + * If still none, copy PACKAGE_DATA_DIR/data/sample.qth to this * directory. * */ @@ -178,8 +198,7 @@ gboolean foundqth = FALSE; - dirname = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", NULL); + dirname = get_user_conf_dir (); dir = g_dir_open (dirname, 0, NULL); @@ -214,27 +233,55 @@ __FUNCTION__); } else { - /* try to copy sample.qth */ - filename = data_file_name ("sample.qth"); - target = g_strconcat (dirname, G_DIR_SEPARATOR_S, - "sample.qth", NULL); + /* try to see if there are any .qth file in pre-1.1 configuration */ + gchar *olddir = get_old_conf_dir (); - if (gpredict_file_copy (filename, target)) { - sat_log_log (SAT_LOG_LEVEL_ERROR, + dir = g_dir_open (olddir, 0, NULL); + + if (dir) { + /* read files, if any; count number of .qth files */ + while ((datafile = g_dir_read_name (dir))) { + + /* note: filename is not a newly allocated gchar *, + so we must not free it + */ + if (g_strrstr (datafile, ".qth")) { + + /* copy .qth file to USER_CONF_DIR */ + target = g_strconcat (dirname, G_DIR_SEPARATOR_S, datafile, NULL); + if (!gpredict_file_copy (datafile, target)) { + /* success */ + foundqth = TRUE; + } + g_free (target); + } + + } + + g_dir_close (dir); + } + else if (!foundqth) { + /* try to copy sample.qth */ + filename = data_file_name ("sample.qth"); + target = g_strconcat (dirname, G_DIR_SEPARATOR_S, "sample.qth", NULL); + + if (gpredict_file_copy (filename, target)) { + sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Failed to copy sample.qth"), __FUNCTION__); - *error |= FTC_ERROR_STEP_02; - } - else { - sat_log_log (SAT_LOG_LEVEL_DEBUG, + *error |= FTC_ERROR_STEP_02; + } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Copied sample.qth to %s/"), __FUNCTION__, dirname); + } + + g_free (target); + g_free (filename); } - g_free (target); - g_free (filename); - } } @@ -245,24 +292,28 @@ /** \brief Execute step 3 of the first time checks. * - * 3. Check for the existence of $HOME/.gpredict2/modules directory and create - * it if it does not exist. + * 3. Check for the existence of USER_CONF_DIR/modules directory and create + * it if it does not exist. Moreover, if this is a new installation, check + * for .mod files in pre-1.1 directory (use get_old_conf_dir()). If no .mod + * files are available copy PACKAGE_DATA_DIR/data/Amateur.mod to + * USER_CONF_DIR/modules/ * */ static void first_time_check_step_03 (guint *error) { - gchar *dir; + GDir *dir; + gchar *confdir,*olddir,*buff; int status; gchar *target; gchar *filename; + const gchar *datafile; + gboolean foundmod = FALSE; - dir = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "modules", NULL); + confdir = get_modules_dir (); - if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { + if (g_file_test (confdir, G_FILE_TEST_IS_DIR)) { sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Check successful."), __FUNCTION__); @@ -272,9 +323,9 @@ sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Check failed. Creating %s"), __FUNCTION__, - dir); + confdir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (confdir, 0755); if (status) { /* set error flag */ @@ -282,44 +333,77 @@ sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Failed to create %s"), - __FUNCTION__, dir); + __FUNCTION__, confdir); } else { sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Created %s."), - __FUNCTION__, dir); + __FUNCTION__, confdir); - /* copy Amateur.mod to this directory */ - filename = data_file_name ("Amateur.mod"); - target = g_strconcat (dir, G_DIR_SEPARATOR_S, - "Amateur.mod", NULL); - if (gpredict_file_copy (filename, target)) { - sat_log_log (SAT_LOG_LEVEL_ERROR, + /* try to see if there are any .mod file in pre-1.1 configuration */ + buff = get_old_conf_dir (); + olddir = g_strconcat (buff, G_DIR_SEPARATOR_S, "modules", NULL); + + dir = g_dir_open (olddir, 0, NULL); + + g_free (buff); + g_free (olddir); + + if (dir) { + /* read files, if any; count number of .qth files */ + while ((datafile = g_dir_read_name (dir))) { + + /* note: filename is not a newly allocated gchar *, + so we must not free it + */ + if (g_strrstr (datafile, ".mod")) { + + /* copy .qth file to USER_CONF_DIR */ + target = g_strconcat (confdir, G_DIR_SEPARATOR_S, datafile, NULL); + if (!gpredict_file_copy (datafile, target)) { + /* success */ + foundmod = TRUE; + } + g_free (target); + } + + } + + g_dir_close (dir); + } + else if (!foundmod) { + /* copy Amateur.mod to this directory */ + filename = data_file_name ("Amateur.mod"); + target = g_strconcat (confdir, G_DIR_SEPARATOR_S, "Amateur.mod", NULL); + + if (gpredict_file_copy (filename, target)) { + sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Failed to copy Amateur.mod"), __FUNCTION__); - *error |= FTC_ERROR_STEP_02; - } - else { - sat_log_log (SAT_LOG_LEVEL_DEBUG, + *error |= FTC_ERROR_STEP_02; + } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Copied amateur.mod to %s/"), __FUNCTION__, dir); + } + + g_free (target); + g_free (filename); } - - g_free (target); - g_free (filename); } } - g_free (dir); + g_free (confdir); } /** \brief Execute step 4 of the first time checks. * - * 4. Check for the existence of $HOME/.gpredict2/tle directory and create it if + * 4. Check for the existence of USER_CONF_DIR/satdata directory and create it if * it does not exist. * */ @@ -329,9 +413,7 @@ gchar *dir; int status; - dir = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "tle", NULL); + dir = get_satdata_dir (); if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { sat_log_log (SAT_LOG_LEVEL_DEBUG, @@ -343,7 +425,7 @@ _("%s: Check failed. Creating %s"), __FUNCTION__, dir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (dir, 0755); if (status) { /* set error flag */ @@ -366,112 +448,82 @@ /** \brief Execute step 5 of the first time checks. * - * 5. Check for the existence of at least one .tle file in the above mentioned - * directory. If no such file found, copy PACKAGE_DATA_DIR/data/xxx.tle to this - * directory. + * 5. Copy PACKAGE_DATA_DIR/data/satdata/xxx.sat to USER_CONF_DIR/satdata/ if it + * does not already exist. Do the same with .cat files. * */ static void first_time_check_step_05 (guint *error) { - GDir *dir; - gchar *dirname; - gchar *datadir; + GDir *srcdir; + gchar *buff,*srcdirname,*targetdirname; const gchar *filename; - gchar *target; - gchar *tlefile; - gboolean foundtle = FALSE; + guint i = 0; - dirname = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "tle", NULL); + /* source directory */ + buff = get_data_dir (); + srcdirname = g_strconcat (buff, G_DIR_SEPARATOR_S, "satdata", NULL); + g_free (buff); - dir = g_dir_open (dirname, 0, NULL); + /* target directory */ + targetdirname = get_satdata_dir (); - /* directory does not exist, something went wrong in step 1 */ - if (!dir) { + srcdir = g_dir_open (srcdirname, 0, NULL); + + /* directory does not exist, something went wrong in step 4 */ + if (!srcdir) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Could not open %s."), - __FUNCTION__, dirname); + __FUNCTION__, srcdirname); /* no reason to continue */ *error |= FTC_ERROR_STEP_05; } else { - /* read files, if any; count number of .tle files */ - while ((filename = g_dir_read_name (dir))) { - + /* read files one by one, if any; count number of .tle files */ + while ((filename = g_dir_read_name (srcdir))) { /* note: filename is not a newly allocated gchar *, so we must not free it */ - if (g_strrstr (filename, ".tle")) { - foundtle = TRUE; - } + /* check whether .sat or .cat file exisits in user conf */ + gchar *target = sat_file_name (filename); - } - - g_dir_close (dir); - - if (foundtle) { - sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Found at least one .tle file."), - __FUNCTION__); - } - else { - - /* try to copy each tle file from instalation dir */ - datadir = get_data_dir (); - dir = g_dir_open (datadir, 0, NULL); - - /* g_print ("====> %s\n", datadir); */ - - while ((filename = g_dir_read_name (dir))) { - - /* note: filename is not a newly allocated gchar *, - so we must not free it - */ - - if (g_strrstr (filename, ".tle")) { - - tlefile = data_file_name (filename); - - target = g_strconcat (dirname, - G_DIR_SEPARATOR_S, - filename, - NULL); - - if (gpredict_file_copy (tlefile, target)) { - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Failed to copy %s"), - __FUNCTION__, filename); - - *error |= FTC_ERROR_STEP_05; - } - else { - sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Successfully copied %s"), - __FUNCTION__, filename); - } - g_free (tlefile); - g_free (target); + if (!g_file_test (target, G_FILE_TEST_EXISTS)) { + /* copy file to target dir */ + gchar *source = g_strconcat (srcdirname, G_DIR_SEPARATOR_S, filename); + if (gpredict_file_copy (source, target)) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Failed to copy %s"), + __FUNCTION__, filename); } + else { + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Successfully copied %s"), + __FUNCTION__, filename); + } + g_free (source); + i++; + } + g_free (target); - } - g_free (datadir); - g_dir_close (dir); } + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Copied %d files to %s"), + __FUNCTION__, i, targetdirname); + g_dir_close (srcdir); } - g_free (dirname); + g_free (srcdirname); + g_free (targetdirname); } /** \brief Execute step 6 of the first time checks. * - * 6. Check for the existence of $HOME/.gpredict2/tle/cache directory. This + * 6. Check for the existence of USER_CONF_DIR/satdata/cache directory. This * directory is used to store temporary TLE files when updating from * network. * @@ -479,14 +531,14 @@ static void first_time_check_step_06 (guint *error) { - gchar *dir; + gchar *buff,*dir; int status; - dir = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "tle", G_DIR_SEPARATOR_S, - "cache", NULL); + buff = get_satdata_dir (); + dir = g_strconcat (buff, G_DIR_SEPARATOR_S, "cache", NULL); + g_free (buff); + if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Check successful."), __FUNCTION__); @@ -497,7 +549,7 @@ _("%s: Check failed. Creating %s"), __FUNCTION__, dir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (dir, 0755); if (status) { /* set error flag */ @@ -519,64 +571,97 @@ /** \brief Execute step 7 of the first time checks. * - * 7. Check for the existence of $HOME/.gpredict2/hwconf directory. This + * 7. Check for the existence of USER_CONF_DIR/hwconf directory. This * directory contains radio and rotator configurations (.rig and .rot files). + * If the directory is newly created, check if we have any existing configuration + * in the pre-1.1 configuration directory (use get_old_conf_dir()). * */ static void first_time_check_step_07 (guint *error) { - gchar *cfg; - gchar *dir; - int status; + GDir *dir; + gchar *confdir,*olddir,*buff; + int status; + gchar *target; - cfg = get_conf_dir (); - dir = g_strconcat (cfg, G_DIR_SEPARATOR_S, "hwconf", NULL); - g_free (cfg); + const gchar *datafile; - if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { - sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Check successful."), __FUNCTION__); + + + confdir = get_hwconf_dir (); + + if (g_file_test (confdir, G_FILE_TEST_IS_DIR)) { + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Check successful."), + __FUNCTION__); } else { /* try to create directory */ - sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Check failed. Creating %s"), - __FUNCTION__, dir); + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Check failed. Creating %s"), + __FUNCTION__, + confdir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (confdir, 0755); if (status) { /* set error flag */ - *error |= FTC_ERROR_STEP_07; + *error |= FTC_ERROR_STEP_03; - sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Failed to create %s"), - __FUNCTION__, dir); + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Failed to create %s"), + __FUNCTION__, confdir); } else { - sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Created %s."), - __FUNCTION__, dir); + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Created %s."), + __FUNCTION__, confdir); + + + /* try to see if there are any .rig or .rot file in pre-1.1 configuration */ + buff = get_old_conf_dir (); + olddir = g_strconcat (buff, G_DIR_SEPARATOR_S, "hwconf", NULL); + + dir = g_dir_open (olddir, 0, NULL); + + g_free (buff); + g_free (olddir); + + if (dir) { + /* read files, if any; count number of .qth files */ + while ((datafile = g_dir_read_name (dir))) { + + /* note: filename is not a newly allocated gchar *, + so we must not free it + */ + + /* copy file to USER_CONF_DIR */ + target = g_strconcat (confdir, G_DIR_SEPARATOR_S, datafile, NULL); + gpredict_file_copy (datafile, target); + + g_free (target); + } + + } } } - g_free (dir); + g_free (confdir); + } /** \brief Execute step 8 of the first time checks. * - * 8. Check for the existence of $HOME/.gpredict2/trsp directory. This + * 8. Check for the existence of USER_CONF_DIR/trsp directory. This * directory contains transponder data for satellites. * */ static void first_time_check_step_08 (guint *error) { - gchar *cfg; gchar *dir; int status; - cfg = get_conf_dir (); - dir = g_strconcat (cfg, G_DIR_SEPARATOR_S, "trsp", NULL); - g_free (cfg); + dir = get_trsp_dir (); if (g_file_test (dir, G_FILE_TEST_IS_DIR)) { sat_log_log (SAT_LOG_LEVEL_DEBUG, @@ -588,7 +673,7 @@ _("%s: Check failed. Creating %s"), __FUNCTION__, dir); - status = g_mkdir (dir, 0755); + status = g_mkdir_with_parents (dir, 0755); if (status) { /* set error flag */ @@ -609,8 +694,8 @@ /** \brief Execute step 9 of the first time checks. * - * 9. Check the .trsp files in $HOME/.gpredict2/trsp/ and compare to the ones - * available in PACKAGE_DATA_DIR/data/xxx.trsp, and update if necessary. + * 9. Check the .trsp files in USER_CONF_DIR/trsp/ and compare to the ones + * available in PACKAGE_DATA_DIR/data/trsp/xxx.trsp, and update if necessary. * */ static void first_time_check_step_09 (guint *error) @@ -620,16 +705,15 @@ gchar *datadirname; const gchar *filename; gchar *srcfile,*destfile; + gchar *buff; /* open data directory */ - targetdirname = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "trsp", NULL); + targetdirname = get_trsp_dir (); targetdir = g_dir_open (targetdirname, 0, NULL); - /* directory does not exist, something went wrong in step 1 */ + /* directory does not exist, something went wrong in step 8 */ if (!targetdir) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Could not open %s."), @@ -643,7 +727,9 @@ g_dir_close (targetdir); /* open data dir */ - datadirname = get_data_dir (); + buff = get_data_dir (); + datadirname = g_strconcat (buff, G_DIR_SEPARATOR_S, "trsp", NULL); + g_free (buff); dir = g_dir_open (datadirname, 0, NULL); /* for each .trsp file found in data dir */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 23:32:04
|
Revision: 363 http://gpredict.svn.sourceforge.net/gpredict/?rev=363&view=rev Author: csete Date: 2009-08-05 23:31:57 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Added more configuration related utility functions. Modified Paths: -------------- trunk/src/compat.c trunk/src/compat.h Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2009-08-05 12:02:13 UTC (rev 362) +++ trunk/src/compat.c 2009-08-05 23:31:57 UTC (rev 363) @@ -240,7 +240,62 @@ } +/** \brief Get USER_CONF_DIR/modules */ +gchar *get_modules_dir (void) +{ + gchar *confdir; + gchar *dir; + confdir = get_user_conf_dir (); + dir = g_strconcat (confdir, G_DIR_SEPARATOR_S, "modules", NULL); + g_free (confdir); + + return dir; +} + +/** \brief Get USER_CONF_DIR/satdata */ +gchar *get_satdata_dir (void) +{ + gchar *confdir; + gchar *dir; + + confdir = get_user_conf_dir (); + dir = g_strconcat (confdir, G_DIR_SEPARATOR_S, "satdata", NULL); + g_free (confdir); + + return dir; +} + + +/** \brief Get USER_CONF_DIR/trsp */ +gchar *get_trsp_dir (void) +{ + gchar *confdir; + gchar *dir; + + confdir = get_user_conf_dir (); + dir = g_strconcat (confdir, G_DIR_SEPARATOR_S, "trsp", NULL); + g_free (confdir); + + return dir; +} + + +/** \brief Get USER_CONF_DIR/hwconf */ +gchar *get_hwconf_dir (void) +{ + gchar *confdir; + gchar *dir; + + confdir = get_user_conf_dir (); + dir = g_strconcat (confdir, G_DIR_SEPARATOR_S, "hwconf", NULL); + g_free (confdir); + + return dir; +} + + + /** \brief Get full path of a .sat or .cat file * \param satfile The file name for the satellite * \return A newly allocated gchar * that should be freed when no longer needed @@ -250,8 +305,8 @@ gchar *filename = NULL; gchar *buff; - buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "satdata", G_DIR_SEPARATOR_S, satfile, NULL); + buff = get_satdata_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, satfile, NULL); g_free (buff); return filename; @@ -267,8 +322,8 @@ gchar *filename = NULL; gchar *buff; - buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "trsp", G_DIR_SEPARATOR_S, trspfile, NULL); + buff = get_trsp_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, trspfile, NULL); g_free (buff); return filename; @@ -285,8 +340,8 @@ gchar *filename = NULL; gchar *buff; - buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "hwconf", G_DIR_SEPARATOR_S, hwfile, NULL); + buff = get_hwconf_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, hwfile, NULL); g_free (buff); return filename; Modified: trunk/src/compat.h =================================================================== --- trunk/src/compat.h 2009-08-05 12:02:13 UTC (rev 362) +++ trunk/src/compat.h 2009-08-05 23:31:57 UTC (rev 363) @@ -32,7 +32,11 @@ gchar *get_data_dir (void); gchar *get_maps_dir (void); gchar *get_icon_dir (void); -gchar *get_user_conf_dir (void); +gchar *get_user_conf_dir (void); +gchar *get_modules_dir (void); +gchar *get_satdata_dir (void); +gchar *get_trsp_dir (void); +gchar *get_hwconf_dir (void); gchar *get_old_conf_dir (void); gchar *map_file_name (const gchar *map); gchar *icon_file_name (const gchar *icon); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 12:02:25
|
Revision: 362 http://gpredict.svn.sourceforge.net/gpredict/?rev=362&view=rev Author: csete Date: 2009-08-05 12:02:13 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Deleting obsolete TLE files. Removed Paths: ------------- trunk/data/weather.tle Deleted: trunk/data/weather.tle =================================================================== --- trunk/data/weather.tle 2009-08-05 12:01:06 UTC (rev 361) +++ trunk/data/weather.tle 2009-08-05 12:02:13 UTC (rev 362) @@ -1,96 +0,0 @@ -METEOSAT-5 (MOP-2) -1 21140U 91015B 09143.25154922 .00000024 00000-0 10000-3 0 7753 -2 21140 10.8659 49.4005 0003823 145.6906 214.2231 0.98449592 68838 -METEOSAT-6 (MOP-3) -1 22912U 93073B 09141.84667788 -.00000008 00000-0 10000-3 0 755 -2 22912 8.3117 60.2035 0002265 337.8500 213.8895 1.00276001 55200 -HIMAWARI-5 (GMS-5) -1 23522U 95011B 09142.34304361 .00000119 00000-0 10000-3 0 2392 -2 23522 7.4649 63.1821 0007908 329.4501 30.3394 0.99401985 51682 -GOES 10 -1 24786U 97019A 09140.19820457 -.00000269 00000-0 10000-3 0 9232 -2 24786 3.5639 74.9239 0003765 347.9398 186.8003 1.00271798 44226 -ORBVIEW 2 (SEASTAR) -1 24883U 97037A 09143.12757973 -.00000040 00000-0 16511-5 0 8059 -2 24883 98.3387 266.8694 0000785 310.2098 49.9005 14.59988949628783 -METEOSAT-7 -1 24932U 97049B 09143.81716821 .00000078 00000-0 10000-3 0 5771 -2 24932 5.1388 69.9016 0000521 26.6214 136.5870 1.00268801 42942 -NOAA 15 -1 25338U 98030A 09143.26285489 .00000147 00000-0 81683-4 0 9343 -2 25338 98.5816 133.0184 0011603 127.5185 232.7042 14.24761546573229 -GOES 11 -1 26352U 00022A 09142.45176990 .00000104 00000-0 10000-3 0 3273 -2 26352 0.3777 84.6314 0001153 295.3908 247.7622 1.00267284 33147 -FENGYUN 2B -1 26382U 00032A 09142.10712300 -.00000182 00000-0 10000-3 0 1668 -2 26382 4.2745 72.7882 0004119 200.4431 159.3035 1.00109339 32601 -NOAA 16 -1 26536U 00055A 09143.21695664 .00000036 00000-0 44963-4 0 4116 -2 26536 99.1753 146.2796 0010274 356.8784 3.2377 14.12518111446773 -GOES 12 -1 26871U 01031A 09140.37995750 -.00000230 00000-0 10000-3 0 685 -2 26871 0.0513 252.8241 0004912 189.4326 216.9679 1.00258557 28720 -FENGYUN 1D -1 27431U 02024B 09143.43880450 -.00000043 00000-0 -10280-5 0 5669 -2 27431 98.6254 134.1989 0016155 122.8339 237.4391 14.09282517361327 -NOAA 17 -1 27453U 02032A 09143.40906254 .00000232 00000-0 11911-3 0 4218 -2 27453 98.4858 203.3306 0011681 191.1521 168.9420 14.24065444359224 -METEOSAT-8 (MSG-1) -1 27509U 02040B 09143.01898582 .00000076 00000-0 10000-3 0 2784 -2 27509 0.5719 29.4182 0002490 17.4274 209.9549 1.00272114 24746 -KALPANA-1 (METSAT 1) -1 27525U 02043A 09142.86904929 -.00000062 00000-0 10000-3 0 9390 -2 27525 0.0725 92.2997 0008117 342.0218 193.1392 1.00271664 24542 -INSAT-3A -1 27714U 03013A 09141.37915484 .00000000 00000-0 10000-3 0 6175 -2 27714 0.0300 109.4369 0005268 314.4777 45.2461 1.00268135 22420 -FENGYUN 2C -1 28451U 04042A 09143.35486529 -.00000317 00000-0 00000+0 0 5255 -2 28451 1.3364 77.5277 0000950 303.5581 92.4144 1.00273138 16807 -HIMAWARI 6 (MTSAT-1R) -1 28622U 05006A 09141.41194699 -.00000264 00000-0 10000-3 0 1448 -2 28622 0.0624 65.2412 0002284 176.4552 285.8632 1.00270936 15480 -NOAA 18 -1 28654U 05018A 09143.37464487 .00000015 00000-0 32668-4 0 9084 -2 28654 98.9057 86.8076 0015345 73.8928 286.3931 14.11259619206453 -METEOSAT-9 (MSG-2) -1 28912U 05049B 09140.20953674 .00000012 00000-0 00000+0 0 5077 -2 28912 0.5235 266.1560 0001129 143.8115 263.6066 1.00268095 12565 -MTSAT-2 -1 28937U 06004A 09142.62785025 -.00000228 00000-0 10000-3 0 5757 -2 28937 0.0467 271.1674 0002761 121.6344 218.6397 1.00268901 11974 -FORMOSAT 3A -1 29047U 06011A 09143.54505984 -.00000094 00000-0 -21360-4 0 9583 -2 29047 71.9799 71.3964 0052840 187.7823 172.2510 14.27103588164212 -FORMOSAT 3B -1 29048U 06011B 09143.29683274 .00000390 00000-0 17471-3 0 63 -2 29048 71.9710 347.3996 0045054 138.1724 222.2851 14.27118623166656 -FORMOSAT 3C -1 29049U 06011C 09143.17368390 .00000361 00000-0 16364-3 0 9450 -2 29049 72.0188 136.5740 0037044 202.3174 157.6339 14.27122746162419 -FORMOSAT 3D -1 29050U 06011D 09143.43446460 .00001097 00000-0 26646-3 0 2281 -2 29050 72.0084 316.8391 0051579 87.5579 273.1462 14.54030693167642 -FORMOSAT 3E -1 29051U 06011E 09143.83605680 .00000373 00000-0 16522-3 0 81 -2 29051 72.0084 44.2795 0068552 67.8780 292.9566 14.27119391165091 -FORMOSAT 3F -1 29052U 06011F 09143.18298539 .00000360 00000-0 16273-3 0 226 -2 29052 72.0350 107.5437 0041893 172.4499 187.7258 14.27118612163309 -GOES 13 -1 29155U 06018A 09142.54224213 -.00000070 00000-0 10000-3 0 6322 -2 29155 0.2125 246.5125 0001207 285.7011 157.8403 1.00268261 10996 -METOP-A -1 29499U 06044A 09143.05233903 .00000180 00000-0 10202-3 0 8131 -2 29499 98.6887 203.6021 0001019 95.7484 264.3777 14.21500788134441 -FENGYUN 2D -1 29640U 06053A 09143.66516978 -.00000184 00000-0 10000-3 0 6535 -2 29640 0.3498 244.2851 0000419 184.5404 138.5832 1.00269965 9055 -FENGYUN 3A -1 32958U 08026A 09143.59785049 .00000167 00000-0 10000-3 0 3113 -2 32958 98.7690 215.3123 0000722 126.3291 233.7952 14.19588280 51294 -NOAA 19 -1 33591U 09005A 09143.34928454 -.00000004 00000-0 21867-4 0 1121 -2 33591 98.7443 89.7579 0013470 317.4653 42.5492 14.10957951 14932 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 12:01:29
|
Revision: 361 http://gpredict.svn.sourceforge.net/gpredict/?rev=361&view=rev Author: csete Date: 2009-08-05 12:01:06 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Deleting obsolete TLE files. Removed 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/update-tle.sh Deleted: trunk/data/amateur.tle =================================================================== --- trunk/data/amateur.tle 2009-08-05 10:42:43 UTC (rev 360) +++ trunk/data/amateur.tle 2009-08-05 12:01:06 UTC (rev 361) @@ -1,186 +0,0 @@ -OSCAR 3 (OSCAR III) -1 01293U 65016F 09143.23305976 .00000029 00000-0 51675-4 0 5293 -2 01293 70.0689 225.3419 0019527 207.5544 152.4522 14.04707174256306 -OSCAR 5 (AO-5) -1 04321U 70008B 09142.96160697 -.00000031 00000-0 10000-3 0 1660 -2 04321 102.1326 153.6089 0027941 27.8917 332.3643 12.52156437797605 -OSCAR 6 (AO-6) -1 06236U 72082B 09143.88533902 -.00000027 00000-0 10000-3 0 1537 -2 06236 101.3933 158.2462 0003819 302.9432 57.1274 12.53077250674365 -OSCAR 7 (AO-7) -1 07530U 74089B 09142.63050531 -.00000027 00000-0 10000-3 0 4845 -2 07530 101.4284 168.2447 0011635 319.6408 40.3797 12.53575765579519 -OSCAR 8 (AO-8) -1 10703U 78026B 09142.88031921 -.00000261 00000-0 -15185-3 0 4980 -2 10703 98.8288 189.0003 0006204 238.3553 121.7006 13.98837211592486 -PHASE 3B (AO-10) -1 14129U 83058B 09140.03333121 -.00000319 00000-0 10000-3 0 6592 -2 14129 25.9085 156.1282 6000553 223.9357 68.6062 2.05872799167071 -UOSAT 2 (UO-11) -1 14781U 84021B 09142.78882298 -.00000059 00000-0 -61259-6 0 9685 -2 14781 98.1085 187.0394 0009980 62.6870 297.5323 14.79711678354072 -JAS-1 (FO-12) -1 16909U 86061B 09143.42852748 -.00000083 00000-0 10000-3 0 5580 -2 16909 50.0163 238.0036 0011433 142.4103 217.7532 12.44452809 35892 -UOSAT 3 (UO-14) -1 20437U 90005B 09143.17556045 -.00000003 00000-0 14547-4 0 9281 -2 20437 98.3395 102.3460 0009694 244.7078 115.3104 14.31544194 9472 -UOSAT 4 (UO-15) -1 20438U 90005C 09142.95213225 .00000009 00000-0 19631-4 0 4208 -2 20438 98.3981 95.0890 0008959 275.2027 84.8129 14.30444665 8865 -PACSAT (AO-16) -1 20439U 90005D 09142.83712708 .00000028 00000-0 25739-4 0 6104 -2 20439 98.2759 112.3947 0009941 246.5662 113.4479 14.31824577 9528 -DOVE (DO-17) -1 20440U 90005E 09142.98301400 .00000008 00000-0 18055-4 0 3237 -2 20440 98.2511 117.3175 0010037 240.3449 119.6733 14.32127892 9682 -WEBERSAT (WO-18) -1 20441U 90005F 09143.05196497 .00000021 00000-0 23316-4 0 8321 -2 20441 98.2589 116.0344 0010621 243.2315 116.7787 14.31892551 9626 -LUSAT (LO-19) -1 20442U 90005G 09142.40916619 -.00000043 00000-0 -77639-6 0 5306 -2 20442 98.2400 119.3496 0011050 241.2040 118.8045 14.32060005 9625 -JAS-1B (FO-20) -1 20480U 90013C 09142.84530839 -.00000027 00000-0 16628-4 0 1486 -2 20480 99.0692 68.2410 0539913 227.6730 127.7422 12.83360926903657 -INFORMATOR 1 & RS-14 -1 21087U 91006A 09143.28545097 .00000027 00000-0 12630-4 0 2786 -2 21087 82.9419 64.4719 0035499 356.4487 3.6411 13.75043578918995 -COSMOS 2123 & RS-12/13 -1 21089U 91007A 09143.43898673 .00000030 00000-0 15242-4 0 1591 -2 21089 82.9196 285.0005 0030547 40.4192 319.9222 13.74486501917796 -UOSAT 5 (UO-22) -1 21575U 91050B 09143.85849939 -.00000075 00000-0 -10119-4 0 5555 -2 21575 98.4436 93.1177 0008440 91.4942 268.7508 14.39673918937207 -KITSAT 1 (KO-23) -1 22077U 92052B 09143.41891432 -.00000037 00000-0 10000-3 0 7538 -2 22077 66.0868 18.5264 0014739 285.7476 74.1917 12.86448195788339 -ARASENE (AO-24) -1 22654U 93031B 09138.90361133 -.00000086 00000-0 10000-3 0 2635 -2 22654 5.0908 338.0127 2871730 158.9882 215.4931 1.42205571 78700 -EYESAT-1 (AO-27) -1 22825U 93061C 09143.15346326 -.00000004 00000-0 15004-4 0 2481 -2 22825 98.4337 97.3669 0008220 345.0495 15.0441 14.29265947816332 -ITAMSAT (IO-26) -1 22826U 93061D 09142.65811578 .00000006 00000-0 19077-4 0 9754 -2 22826 98.4271 97.6467 0008806 342.0477 18.0391 14.29517699816360 -KITSAT 2 (KO-25) -1 22828U 93061F 09143.18758332 .00000002 00000-0 17224-4 0 1832 -2 22828 98.4195 98.0709 0009302 312.7985 47.2421 14.29817904784714 -POSAT (PO-28) -1 22829U 93061G 09142.82849705 .00000032 00000-0 28632-4 0 2208 -2 22829 98.4143 98.8548 0008958 309.3742 50.6653 14.30216321816670 -RADIO ROSTO (RS-15) -1 23439U 94085A 09142.88004189 -.00000039 00000-0 10000-3 0 2306 -2 23439 64.8177 305.7419 0147781 56.6554 304.8419 11.27553535593265 -JAS-2 (FO-29) -1 24278U 96046B 09142.93374706 -.00000003 00000-0 30889-4 0 484 -2 24278 98.5587 20.3620 0351301 55.9031 307.4929 13.52943828630330 -UNAMSAT-2 (MO-30) -1 24305U 96052B 09143.11796519 .00000026 00000-0 11726-4 0 1229 -2 24305 82.9372 12.5846 0029501 327.3313 32.6025 13.73570287637234 -TMSAT-1 (TO-31) -1 25396U 98043C 09143.68307725 .00000126 00000-0 72866-4 0 4092 -2 25396 98.3334 172.9281 0001939 324.0330 36.0721 14.23778138564811 -TECHSAT 1B (GO-32) -1 25397U 98043D 09143.25446305 .00000014 00000-0 24199-4 0 8999 -2 25397 98.3277 166.9296 0001000 14.1385 345.9825 14.23158848564584 -SEDSAT 1 (SO-33) -1 25509U 98061B 09143.52260629 .00000023 00000-0 -69986-5 0 4594 -2 25509 31.4291 191.9587 0354073 122.9134 240.6026 14.28251539552302 -PAN SAT (PO-34) -1 25520U 98064B 09142.93333765 .00000372 00000-0 85095-5 0 2522 -2 25520 28.4593 63.9704 0005007 29.4250 330.6608 15.17338212584815 -ISS (ZARYA) -1 25544U 98067A 09143.85131362 .00012822 00000-0 96085-4 0 9072 -2 25544 51.6398 71.7474 0009780 36.1921 7.1411 15.73009967602122 -SUNSAT (SO-35) -1 25636U 99008C 09143.09893249 .00000026 00000-0 15171-4 0 3136 -2 25636 96.4487 333.2142 0146979 301.8125 56.8838 14.43463310539482 -UOSAT 12 (UO-36) -1 25693U 99021A 09142.64167470 -.00000187 00000-0 -63097-5 0 9175 -2 25693 64.5574 194.3223 0007739 206.1198 153.9527 14.78748145544065 -OPAL (OO-38) -1 26063U 00004C 09143.41473019 -.00000002 00000-0 19560-4 0 5126 -2 26063 100.2074 285.4476 0036710 331.6979 28.2211 14.35863888488396 -SAUDISAT 1A (SO-41) -1 26545U 00057A 09143.22728239 -.00000134 00000-0 22539-5 0 2567 -2 26545 64.5569 194.4818 0056488 282.5250 76.9540 14.80583999467508 -TIUNGSAT-1 (MO-46) -1 26548U 00057D 09143.50331133 .00000048 00000-0 24109-4 0 3988 -2 26548 64.5546 157.1297 0051856 276.4309 83.0894 14.83363586468293 -SAUDISAT 1B (SO-42) -1 26549U 00057E 09142.76481288 -.00000126 00000-0 33320-5 0 3381 -2 26549 64.5583 212.4113 0059846 286.1607 73.2932 14.79440234467107 -PHASE 3D (AO-40) -1 26609U 00072B 09142.99820223 -.00000286 00000-0 10000-3 0 2313 -2 26609 9.4443 17.8752 7963879 206.7599 66.0714 1.25585727 39318 -PCSAT (NO-44) -1 26931U 01043C 09143.02792391 .00000191 00000-0 10697-3 0 1741 -2 26931 67.0501 129.1609 0005542 270.2780 89.7658 14.29557979398980 -SAPPHIRE (NO-45) -1 26932U 01043D 09143.48205851 -.00000079 00000-0 13071-5 0 1783 -2 26932 67.0520 127.9399 0004280 251.2223 108.8414 14.29608697399093 -IDEFIX & ARIANE 42P R/B -1 27422U 02021B 09143.02525551 .00000098 00000-0 56291-4 0 506 -2 27422 98.5209 222.8569 0011780 300.5969 59.4048 14.28493736365815 -RUBIN-2 & SAFIR-M -1 27605U 02058A 09143.07649797 -.00000162 00000-0 -27526-5 0 9113 -2 27605 64.5575 88.5568 0069926 212.1033 147.5755 14.72400332345246 -SAUDISAT 1C (SO-50) -1 27607U 02058C 09143.24506684 -.00000041 00000-0 15733-4 0 8919 -2 27607 64.5580 100.8410 0069942 211.3724 148.3191 14.71436747345009 -DTUSAT -1 27842U 03031C 09142.96957056 .00000032 00000-0 35006-4 0 5600 -2 27842 98.7051 153.4686 0008819 191.8926 168.2047 14.20979879305765 -CUTE-1 (CO-55) -1 27844U 03031E 09143.05975855 .00000045 00000-0 41013-4 0 5845 -2 27844 98.7120 152.5808 0009107 213.4474 146.6126 14.20638240305694 -AAU CUBESAT -1 27846U 03031G 09142.96918861 .00000032 00000-0 34952-4 0 4951 -2 27846 98.7044 153.4621 0008800 192.3610 167.7347 14.20979865305768 -CANX-1 -1 27847U 03031H 09142.97744572 .00000016 00000-0 27676-4 0 5104 -2 27847 98.7049 153.4608 0008867 192.0203 168.0770 14.20962419305713 -CUBESAT XI-IV (CO-57) -1 27848U 03031J 09143.03378672 .00000036 00000-0 37316-4 0 5314 -2 27848 98.7147 151.6170 0008988 217.4799 142.5743 14.20440264305652 -MOZHAYETS 4 (RS-22) -1 27939U 03042A 09143.58220388 .00000121 00000-0 32229-4 0 7963 -2 27939 97.9498 19.3450 0012702 206.6299 153.4259 14.63317694301979 -ECHO (AO-51) -1 28375U 04025K 09142.68307643 .00000010 00000-0 15777-4 0 3940 -2 28375 98.0530 153.7746 0082934 202.2335 157.5248 14.40642243257284 -HAMSAT (VO-52) -1 28650U 05017B 09142.79086636 -.00000101 00000-0 -61991-5 0 2296 -2 28650 97.7440 205.2098 0028407 111.7829 248.6425 14.81584430218886 -UWE-1 -1 28892U 05043C 09142.74289814 .00000126 00000-0 35902-4 0 3424 -2 28892 98.0585 33.5497 0018423 69.5799 290.7380 14.59736210190131 -SSETI EXPRESS (XO-53) -1 28894U 05043E 09143.32090143 .00000010 00000-0 11597-4 0 4670 -2 28894 98.0607 34.3553 0018672 69.0302 291.2892 14.59668223190223 -CUBESAT XI-V (CO-58) -1 28895U 05043F 09143.18229447 .00000329 00000-0 78348-4 0 3080 -2 28895 98.0623 34.4944 0019046 68.4588 291.8674 14.59770029190088 -NCUBE-2 -1 28897U 05043H 09143.17477864 .00000109 00000-0 32277-4 0 8553 -2 28897 98.0601 34.3982 0018295 68.5657 291.7488 14.59946825182374 -CUTE-1.7+APD (CO-56) -1 28941U 06005C 09143.75706510 .00054108 36251-5 20197-3 0 996 -2 28941 98.1358 313.6635 0092756 223.7387 135.6522 15.81473160183381 -PEHUENSAT 1 -1 29712U 07001D 09143.75431267 .00000506 00000-0 72707-4 0 5052 -2 29712 97.8303 200.7438 0014516 359.9573 0.1628 14.80549054127855 -DELFI-C3 -1 32789U 08021G 09143.71290488 .00000267 00000-0 40602-4 0 3744 -2 32789 97.9487 207.9425 0016768 109.0864 251.2154 14.81701842 57828 -PRISM -1 33493U 09002B 09143.77118633 .00000286 00000-0 44232-4 0 4064 -2 33493 98.0548 255.8770 0019488 324.1913 35.7996 14.80670432 17850 -STARS -1 33498U 09002G 09143.78852674 .00000140 00000-0 30721-4 0 3695 -2 33498 98.0360 253.8396 0014035 46.5966 313.6408 14.71307322 17722 -KKS-1 -1 33499U 09002H 09143.77097716 .00000063 00000-0 18441-4 0 3760 -2 33499 98.0378 253.7210 0011242 44.4230 315.7872 14.70682792 17717 Deleted: trunk/data/cubesat.tle =================================================================== --- trunk/data/cubesat.tle 2009-08-05 10:42:43 UTC (rev 360) +++ trunk/data/cubesat.tle 2009-08-05 12:01:06 UTC (rev 361) @@ -1,75 +0,0 @@ -DTUSAT -1 27842U 03031C 09142.96957056 .00000032 00000-0 35006-4 0 5600 -2 27842 98.7051 153.4686 0008819 191.8926 168.2047 14.20979879305765 -CUTE-1 (CO-55) -1 27844U 03031E 09143.05975855 .00000045 00000-0 41013-4 0 5845 -2 27844 98.7120 152.5808 0009107 213.4474 146.6126 14.20638240305694 -QUAKESAT -1 27845U 03031F 09143.56645822 .00000062 00000-0 49600-4 0 5591 -2 27845 98.7186 152.4863 0008142 229.7557 130.2912 14.20269450305670 -AAU CUBESAT -1 27846U 03031G 09142.96918861 .00000032 00000-0 34952-4 0 4951 -2 27846 98.7044 153.4621 0008800 192.3610 167.7347 14.20979865305768 -CANX-1 -1 27847U 03031H 09142.97744572 .00000016 00000-0 27676-4 0 5104 -2 27847 98.7049 153.4608 0008867 192.0203 168.0770 14.20962419305713 -CUBESAT XI-IV (CO-57) -1 27848U 03031J 09143.03378672 .00000036 00000-0 37316-4 0 5314 -2 27848 98.7147 151.6170 0008988 217.4799 142.5743 14.20440264305652 -UWE-1 -1 28892U 05043C 09142.74289814 .00000126 00000-0 35902-4 0 3424 -2 28892 98.0585 33.5497 0018423 69.5799 290.7380 14.59736210190131 -CUBESAT XI-V (CO-58) -1 28895U 05043F 09143.18229447 .00000329 00000-0 78348-4 0 3080 -2 28895 98.0623 34.4944 0019046 68.4588 291.8674 14.59770029190088 -NCUBE-2 -1 28897U 05043H 09143.17477864 .00000109 00000-0 32277-4 0 8553 -2 28897 98.0601 34.3982 0018295 68.5657 291.7488 14.59946825182374 -CUTE-1.7+APD (CO-56) -1 28941U 06005C 09143.75706510 .00054108 36251-5 20197-3 0 996 -2 28941 98.1358 313.6635 0092756 223.7387 135.6522 15.81473160183381 -GENESAT-1 -1 29655U 06058C 09143.87825626 .00011399 00000-0 11474-3 0 7156 -2 29655 40.0261 335.5842 0003049 296.8682 63.1822 15.65143440138668 -CSTB1 -1 31122U 07012F 09143.18327122 .00000552 00000-0 13192-3 0 6406 -2 31122 97.9947 201.3182 0085502 352.6469 7.3371 14.55241638111528 -MAST -1 31126U 07012K 09142.70136237 -.00000007 00000-0 90459-5 0 6018 -2 31126 97.9892 198.6694 0095102 359.7075 0.4066 14.53495827111338 -LIBERTAD-1 -1 31128U 07012M 09143.34404033 -.00000047 00000-0 00000+0 0 6362 -2 31128 97.9894 197.5057 0103152 3.0642 357.1183 14.52042638111291 -POLYSAT CP3 -1 31129U 07012N 09143.84884422 -.00000014 00000-0 75954-5 0 9455 -2 31129 97.9919 198.0887 0102779 1.3401 358.8039 14.52130550111351 -CAPE1 -1 31130U 07012P 09143.47299705 .00000286 00000-0 76771-4 0 6061 -2 31130 97.9934 197.6480 0102434 2.7378 357.4363 14.52059258111103 -POLYSAT CP4 -1 31132U 07012Q 09143.18655556 -.00000231 00000-0 -40476-4 0 6101 -2 31132 97.9973 201.2422 0085319 352.7051 7.2899 14.55204047111390 -NTS (CANX-6) -1 32784U 08021B 09143.17995508 .00000038 00000-0 11697-4 0 3753 -2 32784 97.9480 207.1702 0017261 106.6652 253.6454 14.81045036 57727 -CUTE-1.7+APD II -1 32785U 08021C 09143.81034364 .00000147 00000-0 25520-4 0 3727 -2 32785 97.9451 207.9754 0016064 108.8566 251.4391 14.81482733 57836 -COMPASS-1 -1 32787U 08021E 09143.72162914 .00000113 00000-0 21106-4 0 3631 -2 32787 97.9425 207.7496 0016989 110.8073 249.4950 14.81600576 57826 -AAUSAT-II -1 32788U 08021F 09143.82659159 .00000365 00000-0 53047-4 0 3655 -2 32788 97.9426 207.9074 0016740 112.2826 248.0134 14.81724995 57842 -DELFI-C3 -1 32789U 08021G 09143.71290488 .00000267 00000-0 40602-4 0 3744 -2 32789 97.9487 207.9425 0016768 109.0864 251.2154 14.81701842 57828 -CANX-2 -1 32790U 08021H 09143.81270047 .00000181 00000-0 29887-4 0 3596 -2 32790 97.9443 207.9505 0016676 109.4510 250.8504 14.81469433 57811 -SEEDS II -1 32791U 08021J 09143.69411544 .00000440 00000-0 62856-4 0 3560 -2 32791 97.9462 207.7561 0017118 107.7574 252.5504 14.81433715 57785 -PSLV DEB -1 32797U 08021L 09136.63537143 .00001843 00000-0 23287-3 0 1623 -2 32797 97.9741 201.9114 0016839 132.0476 228.2126 14.83010648 55485 Deleted: trunk/data/galileo.tle =================================================================== --- trunk/data/galileo.tle 2009-08-05 10:42:43 UTC (rev 360) +++ trunk/data/galileo.tle 2009-08-05 12:01:06 UTC (rev 361) @@ -1,6 +0,0 @@ -GIOVE-A -1 28922U 05051A 09142.27066794 .00000112 00000-0 10000-3 0 4860 -2 28922 56.0702 158.0488 0006157 335.1075 24.9225 1.70183315 21121 -GIOVE-B -1 32781U 08020A 09142.22861607 .00000079 00000-0 10000-3 0 1711 -2 32781 55.9487 192.9517 0020298 216.7016 143.2591 1.70950629 6683 Deleted: trunk/data/geo.tle =================================================================== --- trunk/data/geo.tle 2009-08-05 10:42:43 UTC (rev 360) +++ trunk/data/geo.tle 2009-08-05 12:01:06 UTC (rev 361) @@ -1,1161 +0,0 @@ -LES 9 -1 08747U 76023B 09142.04075009 -.00000035 00000-0 10000-3 0 2856 -2 08747 10.8755 149.1668 0023081 321.1499 38.7617 1.00266407 67160 -MARISAT 2 -1 09478U 76101A 09141.87261875 -.00000182 00000-0 10000-3 0 1473 -2 09478 13.2332 356.0903 0097767 199.5598 160.0131 0.97592342 62632 -GOES 3 -1 10953U 78062A 09139.62732505 -.00000119 00000-0 10000-3 0 5052 -2 10953 14.3516 0.3249 0003807 1.7764 358.1960 1.00267264 66384 -ESIAFI 1 (COMSTAR 4) -1 12309U 81018A 09142.14876909 -.00000116 00000-0 10000-3 0 2326 -2 12309 13.9124 10.4201 0005465 286.4278 73.4743 1.00260393104931 -SATCOM C5 -1 13631U 82105A 09141.71436509 -.00000095 00000-0 10000-3 0 6244 -2 13631 12.4900 31.8004 0004488 293.2060 66.6814 1.00273172 63850 -TDRS 1 -1 13969U 83026B 09143.00831772 -.00000293 00000-0 10000-3 0 8686 -2 13969 13.3193 9.4650 0023200 234.9581 310.4174 1.00267886 68746 -GSTAR 1 -1 15677U 85035A 09141.76835252 -.00000084 00000-0 10000-3 0 1427 -2 15677 10.6296 51.1123 0007887 279.0097 80.7974 1.00272678 62713 -INTELSAT 511 -1 15873U 85055A 09142.13257162 -.00000334 00000-0 10000-3 0 3854 -2 15873 11.9656 39.4031 0014976 293.1924 66.5707 1.00092239 62129 -GOES 7 -1 17561U 87022A 09142.51966235 .00000061 00000-0 10000-3 0 9599 -2 17561 12.0605 37.4739 0002523 195.2114 17.1927 1.00272400 64658 -GSTAR 3 -1 19483U 88081A 09141.68665450 -.00000099 00000-0 10000-3 0 2182 -2 19483 14.2845 21.2496 0007372 345.8562 14.0832 1.00273129 72098 -TDRS 3 -1 19548U 88091B 09143.66830289 -.00000184 00000-0 10000-3 0 2599 -2 19548 11.7940 40.1639 0023650 320.2222 206.2835 1.00276921 62892 -ASTRA 1A -1 19688U 88109B 09142.02325781 -.00000175 00000-0 10000-3 0 5738 -2 19688 7.5544 64.6474 0018004 314.6339 45.0627 0.98339153 54792 -TDRS 4 -1 19883U 89021B 09141.20186436 -.00000268 00000-0 10000-3 0 5856 -2 19883 10.4445 52.1345 0002547 329.9521 243.7344 1.00270260246443 -INTELSAT 602 (IS-602) -1 20315U 89087A 09142.51686604 .00000048 00000-0 10000-3 0 8923 -2 20315 6.8460 66.4773 0001060 347.9424 189.7449 1.00272278 69466 -LEASAT 5 -1 20410U 90002B 09143.84123924 -.00000305 00000-0 10000-3 0 1229 -2 20410 8.2737 35.5198 0000590 169.7134 79.2139 1.00273728 56194 -INTELSAT 603 (IS-603) -1 20523U 90021A 09139.16341251 -.00000142 00000-0 10000-3 0 4659 -2 20523 6.3160 68.0859 0002755 312.5819 255.1891 1.00271642 63186 -ASIASAT 1 -1 20558U 90030A 09139.67904070 -.00000177 00000-0 10000-3 0 6950 -2 20558 8.9870 60.6449 0003380 223.8560 136.0112 0.99243366 69790 -INSAT-1D -1 20643U 90051A 09142.28354675 -.00000079 00000-0 10000-3 0 2541 -2 20643 9.7407 56.5985 0018558 25.8281 334.1413 1.00287379 56237 -COSMOS 2085 -1 20693U 90061A 09142.21595714 -.00000119 00000-0 10000-3 0 9408 -2 20693 12.0951 36.0126 0002929 295.8502 64.0442 1.00263771 68989 -SKYNET 4C -1 20776U 90079A 09141.89130734 .00000090 00000-0 00000+0 0 9399 -2 20776 9.7953 47.5930 0002769 344.7012 181.5040 1.00275000 68424 -EUTELSAT 2-F1 -1 20777U 90079B 09140.91770474 .00000075 00000-0 10000-3 0 8930 -2 20777 9.1843 59.6939 0001726 113.6403 246.2601 0.99346753 48813 -GALAXY 6 -1 20873U 90091B 09140.57252390 .00000000 00000-0 10000-3 0 2746 -2 20873 6.1091 68.9331 0002317 25.4199 334.4433 0.99766218 62574 -INMARSAT 2-F1 -1 20918U 90093A 09142.49984681 .00000121 00000-0 10000-3 0 4225 -2 20918 6.5501 55.4784 0003045 347.4815 235.2087 1.00270767 64418 -GSTAR 4 -1 20946U 90100B 09141.79623482 .00000017 00000-0 10000-3 0 2778 -2 20946 6.3042 68.7656 0002660 204.6485 155.1621 0.99140430 62479 -COSMOS 2133 -1 21111U 91010A 09142.23747558 -.00000105 00000-0 10000-3 0 1469 -2 21111 11.2140 42.1484 0004159 341.5172 18.3770 1.00284951 66921 -INMARSAT 2-F2 -1 21149U 91018A 09142.45631411 -.00000124 00000-0 10000-3 0 5287 -2 21149 5.8629 55.7961 0003871 4.3522 246.3135 1.00272574 66708 -TDRS 5 -1 21639U 91054B 09142.49931216 .00000116 00000-0 10000-3 0 4505 -2 21639 9.8020 55.9120 0011087 330.2431 226.0614 1.00271541 65202 -ANIK E1 -1 21726U 91067A 09143.30662018 .00000051 00000-0 10000-3 0 1569 -2 21726 5.7034 70.8850 0003732 221.8820 137.8649 0.99166532 55453 -INTELSAT 601 (IS-601) -1 21765U 91075A 09141.84965118 .00000140 00000-0 10000-3 0 7773 -2 21765 4.4184 72.6363 0000583 18.8868 141.4752 1.00273924 64154 -EUTELSAT 2-F3 -1 21803U 91083A 09142.12528078 -.00000296 00000-0 10000-3 0 7220 -2 21803 8.3571 62.7587 0002701 264.6700 95.1546 0.99299529 59750 -GALAXY 5 -1 21906U 92013A 09142.43865601 .00000071 00000-0 10000-3 0 9129 -2 21906 4.1703 73.8287 0015533 285.2103 74.3537 0.99288048 54509 -INMARSAT 2-F4 -1 21940U 92021B 09142.86910030 -.00000338 00000-0 10000-3 0 2423 -2 21940 4.4844 50.2607 0001361 50.2474 201.9565 1.00274952 62595 -EUTELSAT 2-F4 -1 22028U 92041B 09139.74957007 -.00000057 00000-0 10000-3 0 1631 -2 22028 7.5502 65.9915 0004109 80.3303 279.5932 0.99077055 54436 -SATCOM C3 -1 22117U 92060B 09142.23649876 -.00000219 00000-0 10000-3 0 1349 -2 22117 4.3210 72.8175 0001407 20.2826 152.9802 1.00269959 61114 -HELLAS SAT 1 (DFS 3) -1 22175U 92066A 09141.78582969 -.00000055 00000-0 10000-3 0 3662 -2 22175 6.8454 66.7897 0005116 296.2839 63.4984 0.99725585 58413 -GORIZONT 27 -1 22245U 92082A 09142.02980334 -.00000169 00000-0 10000-3 0 4492 -2 22245 11.2161 45.1629 0016546 225.9760 133.8013 1.00226300 64686 -COSMOS 2224 -1 22269U 92088A 09138.49768406 -.00000061 00000-0 10000-3 0 5597 -2 22269 10.3503 47.9436 0001756 73.0435 286.8953 1.00265879 59619 -TDRS 6 -1 22314U 93003B 09140.97484014 .00000000 00000-0 10000-3 0 4739 -2 22314 9.1470 59.0001 0010774 339.4199 20.4259 1.00282134 59903 -ASTRA 1C -1 22653U 93031A 09139.88692468 .00000027 00000-0 10000-3 0 4153 -2 22653 2.5148 78.1087 0004234 327.9733 152.8785 1.00272365 53772 -INSAT-2B -1 22724U 93048B 09142.10429448 -.00000266 00000-0 10000-3 0 2294 -2 22724 7.8614 63.8489 0014801 40.6395 319.3186 0.99983291 58255 -ACTS -1 22796U 93058B 09141.78897723 -.00000078 00000-0 10000-3 0 6499 -2 22796 9.3673 58.1286 0005465 354.4135 5.4545 1.00273274 64381 -INTELSAT 701 (IS-701) -1 22871U 93066A 09142.54072178 .00000068 00000-0 10000-3 0 3626 -2 22871 0.0030 243.6614 0002372 173.5412 197.7643 1.00272238 56944 -GORIZONT 29 -1 22907U 93072A 09142.04750062 -.00000203 00000-0 10000-3 0 6639 -2 22907 10.7145 48.5845 0012595 205.3373 154.4977 1.00168102 56769 -SOLIDARIDAD 1 -1 22911U 93073A 09141.79286058 -.00000102 00000-0 10000-3 0 1852 -2 22911 7.8411 63.8367 0002311 36.6182 323.2516 1.00271655 55395 -METEOSAT-6 (MOP-3) -1 22912U 93073B 09141.84667788 -.00000008 00000-0 10000-3 0 755 -2 22912 8.3117 60.2035 0002265 337.8500 213.8895 1.00276001 55200 -NATO 4B -1 22921U 93076A 09142.38328352 .00000160 00000-0 10000-3 0 1613 -2 22921 7.7199 52.8984 0002404 345.4972 14.3420 1.00271091 56636 -THAICOM 1 -1 22931U 93078B 09141.86329468 -.00000346 00000-0 10000-3 0 3830 -2 22931 0.2626 71.7966 0001097 202.6344 35.9791 1.00274393 56058 -GOES 8 -1 23051U 94022A 09141.25220319 -.00000075 00000-0 10000-3 0 7969 -2 23051 5.6837 74.0114 0005992 182.2273 177.5988 0.98904274 62454 -INTELSAT 702 (IS-702) -1 23124U 94034A 09142.59506034 .00000013 00000-0 10000-3 0 2227 -2 23124 0.0538 86.7995 0001638 298.9767 134.8065 1.00272807 68862 -INTELSAT 2 (IS-2) -1 23175U 94040A 09142.54919054 -.00000014 00000-0 10000-3 0 4342 -2 23175 0.3945 84.9965 0002696 329.0288 193.0905 1.00272727 53774 -BS-3N -1 23176U 94040B 09140.84246520 .00000000 00000-0 10000-3 0 110 -2 23176 0.0037 317.9448 0002556 132.1738 201.6442 1.00265558 54257 -APSTAR 1 -1 23185U 94043A 09142.13630626 -.00000251 00000-0 10000-3 0 1919 -2 23185 4.3535 72.6951 0001345 352.0378 6.2769 1.00271927 54314 -DIRECTV 2 (DBS 2) -1 23192U 94047A 09140.96436809 .00000000 00000-0 10000-3 0 4539 -2 23192 2.3230 77.9346 0008876 197.8637 161.7877 0.98633070 64165 -BRASILSAT B1 -1 23199U 94049A 09142.20523027 -.00000254 00000-0 10000-3 0 2817 -2 23199 2.0919 78.8679 0002381 342.9907 183.9048 1.00266932 65014 -OPTUS B3 -1 23227U 94055A 09141.49247554 -.00000058 00000-0 10000-3 0 3468 -2 23227 1.3831 79.9357 0005463 329.5821 171.0492 1.00272504 53937 -NSS-703 -1 23305U 94064A 09141.90653921 .00000087 00000-0 10000-3 0 9412 -2 23305 0.0219 250.3939 0002821 170.8085 201.8434 1.00273756 53663 -SOLIDARIDAD 2 -1 23313U 94065A 09142.45572170 -.00000010 00000-0 10000-3 0 3465 -2 23313 1.1729 80.5258 0002184 336.2015 232.6652 1.00272633 53533 -THAICOM 2 -1 23314U 94065B 09142.96099458 -.00000107 00000-0 10000-3 0 2663 -2 23314 0.1106 53.8057 0002037 251.1678 0.2136 1.00271831 53512 -EXPRESS 1 -1 23319U 94067A 09141.82820332 .00000042 00000-0 10000-3 0 7018 -2 23319 8.0417 63.1852 0002283 56.1121 303.7651 0.99819491 53357 -ASTRA 1D -1 23331U 94070A 09143.00000000 .00000169 00000-0 00000+0 0 9040 -2 23331 1.5740 77.5940 0002185 347.8670 206.5860 1.00275437 53783 -RADUGA 32 -1 23448U 94087A 09142.26926366 -.00000092 00000-0 10000-3 0 1511 -2 23448 10.1746 52.6823 0004562 120.9729 238.9564 1.00284251 70428 -INTELSAT 704 (IS-704) -1 23461U 95001A 09142.59506493 .00000037 00000-0 10000-3 0 9497 -2 23461 0.0651 93.7526 0003457 42.7756 23.6756 1.00169953 52642 -INTELSAT 705 (IS-705) -1 23528U 95013A 09139.92258221 -.00000268 00000-0 10000-3 0 8564 -2 23528 0.0077 340.9451 0002994 90.9948 87.9069 1.00271378 51795 -BRASILSAT B2 -1 23536U 95016A 09140.34591352 -.00000153 00000-0 00000+0 0 233 -2 23536 1.2639 82.4529 0002988 335.8727 212.3348 1.00271139 51861 -AMSC 1 -1 23553U 95019A 09142.75527094 -.00000100 00000-0 00000+0 0 1248 -2 23553 4.4488 72.7796 0002313 351.0073 347.3168 1.00271926 51695 -INTELSAT 706 (IS-706) -1 23571U 95023A 09141.64103275 .00000102 00000-0 10000-3 0 9289 -2 23571 0.0010 318.1674 0003183 100.7200 106.1487 1.00273262 51305 -DIRECTV 3 (DBS 3) -1 23598U 95029A 09142.23248588 -.00000205 00000-0 10000-3 0 643 -2 23598 0.2161 86.4630 0003467 350.1124 165.1508 1.00272404 51037 -TDRS 7 -1 23613U 95035B 09142.53239837 .00000130 00000-0 10000-3 0 5201 -2 23613 10.9829 48.4830 0005270 353.3823 239.3237 1.00269061 50733 -INTELSAT 4 (IS-4) -1 23636U 95040A 09142.74026632 -.00000043 00000-0 10000-3 0 9705 -2 23636 0.0044 257.2038 0002775 166.7951 154.9914 1.00272142 50516 -COSMOS 2319 -1 23653U 95045A 09141.98107430 .00000071 00000-0 10000-3 0 105 -2 23653 9.7957 54.9169 0003919 49.3919 310.5240 1.00287942 50260 -TELSTAR 4 (TELSTAR 402R) -1 23670U 95049A 09141.81906113 -.00000075 00000-0 10000-3 0 9288 -2 23670 5.2823 70.3358 0002679 250.4250 109.3450 1.00241818 50022 -LUCH 1 -1 23680U 95054A 09142.29432828 -.00000102 00000-0 10000-3 0 7666 -2 23680 8.9129 63.7162 0007110 313.8821 45.9208 1.00271636 49883 -ASTRA 1E -1 23686U 95055A 09143.00000000 .00000151 00000-0 00000+0 0 9970 -2 23686 0.0370 148.7860 0003088 313.7020 161.7440 1.00270431 49853 -ASIASAT 2 -1 23723U 95064A 09142.71496654 -.00000292 00000-0 10000-3 0 9481 -2 23723 0.0428 15.4278 0002488 33.7495 189.1534 1.00268731 49386 -TELECOM 2C -1 23730U 95067A 09139.89363516 .00000036 00000-0 10000-3 0 1080 -2 23730 5.1091 71.0768 0003843 334.6509 157.0114 1.00275427 49381 -ECHOSTAR 1 -1 23754U 95073A 09141.52008934 .00000145 00000-0 10000-3 0 862 -2 23754 0.0131 272.3822 0002420 149.5530 216.5241 1.00274127 48916 -INTELSAT 3R (IS-3R) -1 23764U 96002A 09143.72042876 -.00000256 00000-0 10000-3 0 6380 -2 23764 0.0378 131.1665 0002098 280.4404 46.2296 1.00270426 48942 -AFRICASAT-1 (MEASAT-1) -1 23765U 96002B 09143.85946560 .00000145 00000-0 10000-3 0 8465 -2 23765 1.5516 79.4474 0000272 50.3731 107.1629 1.00270164 48928 -KOREASAT 2 -1 23768U 96003A 09141.59412539 -.00000346 00000-0 10000-3 0 7612 -2 23768 2.2953 77.7384 0001703 29.7545 102.1723 1.00266784 48886 -PAKSAT 1 (ANATOLIA 1) -1 23779U 96006A 09142.67090709 .00000169 00000-0 10000-3 0 2053 -2 23779 0.0533 109.7884 0002380 310.0629 100.1227 1.00273308 48674 -INTELSAT 707 (IS-707) -1 23816U 96015A 09140.22294954 -.00000270 00000-0 10000-3 0 8513 -2 23816 0.0218 28.9743 0003260 42.0893 194.2232 1.00272137 48292 -INMARSAT 3-F1 -1 23839U 96020A 09143.81813074 .00000023 00000-0 10000-3 0 7471 -2 23839 0.1785 46.0277 0004879 13.9678 180.5827 1.00272945 48122 -ASTRA 1F -1 23842U 96021A 09143.00000000 .00000134 00000-0 00000+0 0 9812 -2 23842 0.0190 313.6140 0004069 74.1990 232.1180 1.00268058 48029 -MSAT M1 -1 23846U 96022A 09143.55144211 -.00000067 00000-0 10000-3 0 4827 -2 23846 1.7984 78.5858 0005449 338.2076 276.5299 1.00272107 47940 -PALAPA C2 -1 23864U 96030A 09143.63226138 -.00000345 00000-0 10000-3 0 8760 -2 23864 0.0391 42.4688 0002395 91.0044 88.4372 1.00267907 47675 -AMOS 1 -1 23865U 96030B 09140.23544975 .00000000 00000-0 10000-3 0 811 -2 23865 0.8260 84.0952 0003994 323.5594 273.6498 1.00270736 47631 -GALAXY 9 (G-9) -1 23877U 96033A 09142.23667369 -.00000210 00000-0 10000-3 0 850 -2 23877 0.7172 80.8037 0001619 344.0070 179.4103 1.00271987 47604 -GORIZONT 32 -1 23880U 96034A 09143.55929044 -.00000105 00000-0 10000-3 0 2127 -2 23880 9.3790 56.7840 0002105 340.2060 32.0404 1.00271643 47596 -INTELSAT 709 (IS-709) -1 23915U 96035A 09142.85997653 -.00000171 00000-0 10000-3 0 9445 -2 23915 0.0235 30.9976 0003728 43.7675 200.5975 1.00271529 47408 -APSTAR 1A -1 23943U 96039A 09143.20818606 -.00000324 00000-0 10000-3 0 384 -2 23943 3.6604 74.2592 0001092 336.5291 35.1108 1.00273566 47225 -TURKSAT 1C -1 23949U 96040B 09141.46707984 .00000000 00000-0 10000-3 0 115 -2 23949 1.1004 79.0847 0003945 341.8221 17.5013 1.00273547 47122 -TELECOM 2D -1 24209U 96044B 09142.60931659 -.00000050 00000-0 10000-3 0 8916 -2 24209 2.8300 76.2403 0005051 344.2919 31.3368 1.00272860 46962 -INMARSAT 3-F2 -1 24307U 96053A 09139.90384928 -.00000108 00000-0 10000-3 0 8368 -2 24307 0.0810 329.6929 0005319 91.6045 126.3114 1.00272609 46500 -ECHOSTAR 2 -1 24313U 96055A 09142.23283120 -.00000197 00000-0 10000-3 0 167 -2 24313 0.8128 80.5784 0001818 293.9510 223.9559 1.00341635 46551 -AMC-1 (GE-1) -1 24315U 96054A 09141.25194583 -.00000086 00000-0 10000-3 0 1341 -2 24315 0.0147 170.0372 0003440 244.4397 172.2594 1.00272045 46509 -ARABSAT-2B -1 24652U 96063A 09141.84979819 .00000169 00000-0 10000-3 0 9959 -2 24652 0.0775 245.0055 0004119 178.0076 152.9650 1.00271590 46345 -MEASAT-2 -1 24653U 96063B 09142.55996120 -.00000203 00000-0 10000-3 0 9537 -2 24653 1.5080 79.5592 0001296 348.4067 161.9214 1.00270048 45918 -EUROBIRD 9 -1 24665U 96067A 09141.80711998 .00000166 00000-0 10000-3 0 8793 -2 24665 0.2034 83.5103 0007632 14.1287 112.7111 1.00274357 46165 -INMARSAT 3-F3 -1 24674U 96070A 09142.44732306 .00000056 00000-0 10000-3 0 8040 -2 24674 0.1166 22.0647 0004751 36.8047 160.5252 1.00275099 45480 -AMC-2 (GE-2) -1 24713U 97002A 09142.73162094 -.00000100 00000-0 10000-3 0 9203 -2 24713 0.0577 100.9459 0001742 303.4365 358.4801 1.00271774 45090 -NAHUEL 1A -1 24714U 97002B 09143.62257058 -.00000247 00000-0 10000-3 0 8861 -2 24714 1.7031 79.2308 0004859 338.6881 335.8165 1.00272179 45092 -JCSAT 4 -1 24732U 97007A 09141.52420344 -.00000185 00000-0 10000-3 0 6390 -2 24732 0.0455 95.8989 0002466 318.4415 163.6758 1.00271849 44800 -INTELSAT 801 (IS-801) -1 24742U 97009A 09139.08733473 -.00000211 00000-0 10000-3 0 6177 -2 24742 0.6613 83.6155 0005268 331.9437 181.2717 1.00270668 44786 -DIRECTV 6 (TEMPO 2) -1 24748U 97011A 09143.39906603 .00000087 00000-0 10000-3 0 558 -2 24748 3.1378 75.8692 0026291 154.9896 204.7646 0.99030186 44696 -BSAT-1A -1 24769U 97016B 09140.72102307 -.00000335 00000-0 10000-3 0 8981 -2 24769 0.0074 293.5400 0002166 177.0021 137.1810 1.00273587 44324 -GOES 10 -1 24786U 97019A 09140.19820457 -.00000269 00000-0 10000-3 0 9232 -2 24786 3.5639 74.9239 0003765 347.9398 186.8003 1.00271798 44226 -DFH 3-2 -1 24798U 97021A 09142.22702801 -.00000339 00000-0 10000-3 0 7007 -2 24798 5.0092 71.2589 0010594 318.6523 41.0491 1.00343848 44072 -THOR II -1 24808U 97025A 09139.88561356 .00000049 00000-0 10000-3 0 5947 -2 24808 1.1046 77.9370 0002507 293.6742 189.9840 1.00270886 43969 -GALAXY 25 (G-25) -1 24812U 97026A 09140.47115994 -.00000147 00000-0 10000-3 0 9183 -2 24812 0.0034 279.5734 0003305 131.1123 264.0833 1.00271560 43922 -INMARSAT 3-F4 -1 24819U 97027A 09140.22294888 -.00000271 00000-0 10000-3 0 5830 -2 24819 0.1811 60.9191 0005348 347.9048 215.4913 1.00271177 43882 -FENGYUN 2A -1 24834U 97029A 09142.08853417 -.00000130 00000-0 10000-3 0 3735 -2 24834 8.3269 62.9275 0094725 70.8058 290.0642 0.96052184 43518 -INTELSAT 802 (IS-802) -1 24846U 97031A 09142.95666409 .00000170 00000-0 00000+0 0 8182 -2 24846 0.0124 342.8418 0003027 87.0121 188.1656 1.00274159 43667 -SUPERBIRD C -1 24880U 97036A 09141.53893341 -.00000236 00000-0 10000-3 0 5945 -2 24880 0.0094 329.1574 0001366 100.2527 147.8507 1.00269810 43210 -AGILA 2 -1 24901U 97042A 09140.84764727 .00000000 00000-0 10000-3 0 8743 -2 24901 0.0576 344.5593 0004851 93.2542 251.9118 1.00265845 43030 -INTELSAT 5 (IS-5) -1 24916U 97046A 09141.51983030 -.00000014 00000-0 10000-3 0 7709 -2 24916 0.0453 103.2131 0002855 347.0396 145.1873 1.00273482 43103 -EUROBIRD 4 -1 24931U 97049A 09139.88650623 .00000041 00000-0 10000-3 0 9436 -2 24931 0.2656 78.1497 0007862 7.4732 115.1896 1.00274130 42962 -METEOSAT-7 -1 24932U 97049B 09143.81716821 .00000078 00000-0 10000-3 0 5771 -2 24932 5.1388 69.9016 0000521 26.6214 136.5870 1.00268801 42942 -AMC-3 (GE-3) -1 24936U 97050A 09142.20611038 -.00000180 00000-0 10000-3 0 7309 -2 24936 0.0059 285.2981 0002555 122.5370 179.3465 1.00271152 42923 -NSS-5 -1 24957U 97053A 09141.59999657 -.00000304 00000-0 10000-3 0 7726 -2 24957 0.0448 268.8396 0005674 225.1453 78.6401 0.99776272 42710 -ECHOSTAR 3 -1 25004U 97059A 09142.23634359 -.00000267 00000-0 10000-3 0 6630 -2 25004 0.0243 344.1624 0002387 100.0547 179.3675 1.00272328 42620 -TELSTAR 10 (APSTAR 2R) -1 25010U 97062A 09143.66623852 -.00000089 00000-0 10000-3 0 7829 -2 25010 0.0285 238.1379 0003273 178.2739 141.3645 1.00273012 42499 -ASTRA 5A (SIRIUS 2) -1 25049U 97071A 09141.64726794 .00000071 00000-0 10000-3 0 7118 -2 25049 0.4328 84.8521 0004056 272.7347 2.4289 0.99401963 42220 -INDOSTAR 1 -1 25050U 97071B 09143.85299316 -.00000331 00000-0 00000+0 0 466 -2 25050 3.5019 74.5050 0004075 359.2495 222.4888 1.00273135 42255 -ASTRA 1G -1 25071U 97076A 09143.00000000 .00000151 00000-0 00000+0 0 8110 -2 25071 0.0370 34.3570 0003492 22.4540 207.4050 1.00270245 42054 -GALAXY 8 -1 25086U 97078A 09142.21940001 -.00000250 00000-0 10000-3 0 7872 -2 25086 6.1556 68.7339 0007634 256.9063 102.8183 0.99698347 41848 -HGS-1 (ASIASAT 3) -1 25126U 97086A 09142.81511326 -.00000264 00000-0 10000-3 0 2461 -2 25126 1.6857 124.0441 0046040 198.8641 161.0914 1.00216648 42637 -BRASILSAT B3 -1 25152U 98006A 09143.63020358 -.00000236 00000-0 10000-3 0 9831 -2 25152 0.0589 134.3767 0001079 106.1394 152.7662 1.00272843 41462 -INMARSAT 3-F5 -1 25153U 98006B 09142.84790609 .00000154 00000-0 10000-3 0 5707 -2 25153 0.4906 7.5211 0003711 55.8601 147.1750 1.00271155 41417 -ATLANTIC BIRD 4 -1 25237U 98013A 09139.76628316 .00000117 00000-0 10000-3 0 9635 -2 25237 0.0447 54.1383 0003920 12.3195 102.7609 1.00271922 41425 -NSS-806 -1 25239U 98014A 09139.92179694 -.00000247 00000-0 10000-3 0 4142 -2 25239 0.0275 103.0939 0003841 340.5112 85.4519 1.00271581 41185 -NILESAT 101 -1 25311U 98024A 09139.89591691 -.00000044 00000-0 10000-3 0 7200 -2 25311 0.0571 85.2197 0006035 348.4221 119.5775 1.00271331 40789 -COSMOS 2350 -1 25315U 98025A 09142.31469164 -.00000020 00000-0 10000-3 0 3531 -2 25315 7.3147 62.6009 0006025 331.8427 27.9595 1.00271021 40537 -ECHOSTAR 4 -1 25331U 98028A 09143.63460245 -.00000230 00000-0 10000-3 0 9932 -2 25331 1.0617 46.9797 0004484 13.1230 332.6028 1.00270941 40566 -CHINASTAR 1 -1 25354U 98033A 09143.66222800 -.00000194 00000-0 10000-3 0 5181 -2 25354 0.0310 155.5842 0003058 235.1962 176.6121 1.00270542 44787 -THOR III -1 25358U 98035A 09142.51886025 .00000006 00000-0 10000-3 0 4499 -2 25358 0.0157 239.5490 0001941 186.3717 0.3045 1.00273008 40207 -INTELSAT 805 (IS-805) -1 25371U 98037A 09140.23198806 -.00000271 00000-0 10000-3 0 3591 -2 25371 0.0013 335.7867 0003136 89.8896 200.3810 1.00272706 40029 -SINOSAT 1 (XINNUO 1) -1 25404U 98044A 09142.74815169 -.00000337 00000-0 10000-3 0 840 -2 25404 0.0530 278.9111 0005268 153.9269 187.4586 1.00270877 39902 -ST-1 -1 25460U 98049A 09143.66222618 -.00000198 00000-0 10000-3 0 6425 -2 25460 0.0052 2.6996 0003426 63.2848 141.8382 1.00270318 39375 -ASTRA 2A -1 25462U 98050A 09143.00000000 .00000164 00000-0 00000+0 0 674 -2 25462 0.0620 102.2700 0003008 8.0450 158.6030 1.00272636 39359 -INTELSAT 7 (IS-7) -1 25473U 98052A 09143.79787604 -.00000014 00000-0 10000-3 0 7875 -2 25473 0.0228 97.8017 0002793 321.6432 177.9744 1.00271881 39143 -EUTELSAT W2 -1 25491U 98056A 09143.79387941 .00000117 00000-0 10000-3 0 6950 -2 25491 0.0448 25.2758 0004957 34.9733 123.0726 1.00273545 38977 -SIRIUS 3 -1 25492U 98056B 09140.00371571 .00000048 00000-0 10000-3 0 4911 -2 25492 0.4074 84.1135 0001757 331.3330 188.6079 1.00271679 38998 -EUROBIRD 2 -1 25495U 98057A 09140.70953043 .00000159 00000-0 10000-3 0 6670 -2 25495 0.0675 345.9766 0004727 76.4017 97.0562 1.00275059 38919 -AFRISTAR -1 25515U 98063A 09143.80765140 .00000140 00000-0 10000-3 0 5155 -2 25515 0.0394 13.2641 0003943 41.5808 138.4336 1.00272315 38727 -AMC-5 (GE-5) -1 25516U 98063B 09141.77617203 -.00000218 00000-0 10000-3 0 4679 -2 25516 0.0031 203.9120 0002504 219.4951 16.5932 1.00270287 38749 -INTELSAT 8 (IS-8) -1 25522U 98065A 09142.56263900 -.00000041 00000-0 10000-3 0 6415 -2 25522 0.0082 327.6197 0003020 89.9930 191.2486 1.00271613 38706 -BONUM 1 -1 25546U 98068A 09143.66373874 .00000092 00000-0 10000-3 0 3016 -2 25546 0.0405 259.8805 0001983 126.7941 149.6106 1.00272594 38548 -SATMEX 5 -1 25558U 98070A 09142.58761794 .00000002 00000-0 10000-3 0 4791 -2 25558 0.0035 126.3549 0002696 298.9590 269.7794 1.00272445 38527 -GALAXY 26 (G-26) -1 25626U 99005A 09141.03635506 .00000000 00000-0 10000-3 0 4851 -2 25626 0.0081 346.5578 0003074 71.3054 244.8423 1.00274066 37603 -JCSAT 6 -1 25630U 99006A 09141.77550830 -.00000341 00000-0 10000-3 0 5214 -2 25630 0.0266 109.2591 0001046 350.0391 183.4128 1.00270611 37477 -BADR-3 (ARABSAT-3A) -1 25638U 99009A 09141.48098457 .00000000 00000-0 10000-3 0 6273 -2 25638 0.6239 83.6708 0004323 10.9317 348.0657 1.00269825 37535 -SKYNET 4E -1 25639U 99009B 09141.38216067 .00000000 00000-0 10000-3 0 5888 -2 25639 5.3564 52.2098 0002433 359.9951 359.8066 1.00267299 37507 -ASIASAT 3S -1 25657U 99013A 09143.72950779 -.00000321 00000-0 10000-3 0 3232 -2 25657 0.0564 120.8173 0001740 297.2689 191.5352 1.00271019 37310 -INSAT-2E (APR-1) -1 25666U 99016A 09142.57458593 -.00000150 00000-0 10000-3 0 4000 -2 25666 0.0630 77.4616 0004115 357.1389 95.5984 1.00271631 37241 -EUTELSAT W6 -1 25673U 99018A 09142.77902315 .00000145 00000-0 10000-3 0 7970 -2 25673 0.0710 348.6510 0003736 62.8262 131.1034 1.00273332 37076 -NIMIQ 1 -1 25740U 99027A 09140.34591428 -.00000159 00000-0 10000-3 0 6554 -2 25740 0.0118 311.3566 0004812 105.1236 215.0926 1.00272431 36664 -ASTRA 1H -1 25785U 99033A 09143.00000000 .00000134 00000-0 00000+0 0 7791 -2 25785 0.0410 154.9560 0004150 304.9710 160.0230 1.00267408 36412 -TELKOM 1 -1 25880U 99042A 09140.95744793 -.00000328 00000-0 10000-3 0 7276 -2 25880 0.0260 41.7649 0002088 25.5285 264.0834 1.00268143 35852 -KOREASAT 3 -1 25894U 99046A 09141.68717874 -.00000346 00000-0 10000-3 0 3216 -2 25894 0.0023 309.2727 0000343 164.7572 128.9687 1.00269563 34636 -YAMAL 102 -1 25897U 99047B 09143.00138366 -.00000214 00000-0 10000-3 0 1831 -2 25897 5.3614 70.5065 0003818 337.6346 282.8514 1.00269882 35641 -ECHOSTAR 5 -1 25913U 99050A 09141.73773459 .00000145 00000-0 10000-3 0 7366 -2 25913 0.0553 92.7627 0002731 340.7312 286.5557 1.00069866 35384 -GALAXY 27 (G-27) -1 25922U 99052A 09141.82209076 .00000074 00000-0 10000-3 0 4949 -2 25922 0.0064 257.5115 0002985 183.4689 325.5665 1.00273407 35364 -ABS 1 (LMI 1) -1 25924U 99053A 09143.66341457 -.00000073 00000-0 10000-3 0 2461 -2 25924 0.0109 298.3621 0003497 164.8887 91.9434 1.00270092 35403 -DIRECTV 1R -1 25937U 99056A 09142.20372473 -.00000242 00000-0 10000-3 0 6674 -2 25937 0.0296 77.9854 0002339 340.0855 182.7481 1.00271257 35247 -TELSTAR 12 (ORION 2) -1 25949U 99059A 09143.90481375 -.00000107 00000-0 10000-3 0 6759 -2 25949 0.0044 346.8870 0002966 70.7949 134.6922 1.00271527 35138 -AMC-4 (GE-4) -1 25954U 99060A 09140.47398993 -.00000100 00000-0 00000+0 0 7051 -2 25954 0.0085 354.2104 0003155 71.7759 241.9121 1.00271806 34944 -GALAXY 11 (G-11) -1 26038U 99071A 09140.78529279 .00000171 00000-0 00000+0 0 7152 -2 26038 0.0241 107.4956 0000317 50.6197 35.9643 1.00273039 34573 -ZHONGXING-22 -1 26058U 00003A 09141.90368630 -.00000275 00000-0 10000-3 0 1232 -2 26058 1.0303 78.9980 0002274 359.3639 224.4992 1.00274087 34192 -HISPASAT 1C -1 26071U 00007A 09139.97847806 -.00000202 00000-0 10000-3 0 2738 -2 26071 0.0787 43.2814 0005392 11.8088 144.9143 1.00268980 34105 -GARUDA 1 -1 26089U 00011A 09143.76456042 -.00000344 00000-0 10000-3 0 4023 -2 26089 1.4585 255.8947 0003577 195.8321 188.0046 1.00267318 34025 -SUPERBIRD 4 -1 26095U 00012A 09142.56235709 -.00000077 00000-0 10000-3 0 7096 -2 26095 0.0330 85.4300 0001920 336.8951 182.4468 1.00271554 33966 -EXPRESS 2A -1 26098U 00013A 09143.20575544 -.00000307 00000-0 10000-3 0 8442 -2 26098 3.1755 75.6251 0002694 23.3375 318.8322 1.00271924 33670 -ASIASTAR -1 26107U 00016A 09140.92120803 .00000000 00000-0 10000-3 0 6229 -2 26107 0.0189 348.1143 0004128 65.0422 262.1409 1.00265549 33613 -INSAT-3B -1 26108U 00016B 09141.34167241 .00000000 00000-0 10000-3 0 2321 -2 26108 0.0094 173.2420 0004173 284.5069 347.3739 1.00270823 33566 -SESAT 1 -1 26243U 00019A 09141.92940291 .00000171 00000-0 10000-3 0 5537 -2 26243 0.0531 327.3382 0000865 353.5720 289.2898 1.00272862 33303 -GALAXY 4R (G-4R) -1 26298U 00020A 09141.95808279 .00000139 00000-0 10000-3 0 6918 -2 26298 2.6236 76.8809 0002243 21.0075 338.6543 0.99835567 33417 -GOES 11 -1 26352U 00022A 09142.45176990 .00000104 00000-0 10000-3 0 3273 -2 26352 0.3777 84.6314 0001153 295.3908 247.7622 1.00267284 33147 -EUTELSAT W4 -1 26369U 00028A 09143.67840602 .00000168 00000-0 10000-3 0 4552 -2 26369 0.0690 350.7893 0003220 54.7540 116.2089 1.00273807 32976 -EXPRESS A3 -1 26378U 00031A 09142.58692728 -.00000073 00000-0 10000-3 0 203 -2 26378 0.9325 80.0057 0003197 324.5943 36.0553 1.00272704 32636 -TDRS 8 -1 26388U 00034A 09141.96464522 -.00000204 00000-0 10000-3 0 9606 -2 26388 1.3393 110.5646 0005032 315.6429 250.0541 1.00271227 32667 -COSMOS 2371 -1 26394U 00036A 09143.66405953 -.00000102 00000-0 10000-3 0 5802 -2 26394 6.5812 66.7938 0002663 298.6535 192.6185 1.00262557 32535 -ECHOSTAR 6 -1 26402U 00038A 09143.60974686 -.00000244 00000-0 10000-3 0 6721 -2 26402 0.0284 44.0502 0002825 11.0589 333.0443 1.00270007 32457 -INTELSAT 9 (IS-9) -1 26451U 00043A 09142.23602172 -.00000269 00000-0 10000-3 0 2359 -2 26451 0.0074 319.0029 0002105 120.1170 187.8690 1.00271798 32329 -BRASILSAT B4 -1 26469U 00046A 09140.27135613 -.00000196 00000-0 10000-3 0 5143 -2 26469 0.0681 129.7749 0002199 287.1998 194.7926 1.00272614 32093 -NILESAT 102 -1 26470U 00046B 09139.89591691 -.00000043 00000-0 10000-3 0 2534 -2 26470 0.0016 255.7874 0003197 130.2553 167.1846 1.00272972 32092 -RADUGA-1 5 -1 26477U 00049A 09143.66510978 .00000125 00000-0 10000-3 0 5637 -2 26477 6.4449 67.4396 0001457 309.8751 152.1164 1.00307596 31982 -EUTELSAT W1 -1 26487U 00052A 09142.05090856 .00000084 00000-0 10000-3 0 3072 -2 26487 0.0743 1.9549 0006054 50.7967 215.4073 1.00273253 31920 -ASTRA 2B -1 26494U 00054A 09143.00000000 .00000164 00000-0 00000+0 0 7360 -2 26494 0.0690 289.7700 0002692 87.9860 251.1900 1.00268004 31825 -AMC-7 (GE-7) -1 26495U 00054B 09142.51909309 .00000112 00000-0 10000-3 0 4226 -2 26495 0.0158 185.2741 0003340 239.5059 225.3938 1.00274404 31832 -NSS 11 (AAP-1) -1 26554U 00059A 09141.89780657 -.00000329 00000-0 10000-3 0 5570 -2 26554 0.0341 105.3380 0002354 301.0316 264.7145 1.00270543 31678 -NSAT 110 -1 26559U 00060A 09140.80578021 -.00000335 00000-0 10000-3 0 5204 -2 26559 0.0148 229.7813 0000948 237.5015 171.4430 1.00267394 31598 -AMC-6 (GE-6) -1 26580U 00067A 09143.61787438 -.00000246 00000-0 10000-3 0 4212 -2 26580 0.0610 85.8615 0002807 342.0583 323.8883 1.00270886 31488 -INTELSAT 12 (IS-12) -1 26590U 00068A 09143.88213497 .00000149 00000-0 10000-3 0 2839 -2 26590 0.0041 269.0488 0003066 160.9475 174.2048 1.00273457 31406 -BEIDOU 1A -1 26599U 00069A 09143.60747699 -.00000268 00000-0 10000-3 0 3053 -2 26599 0.4898 82.1768 0005691 346.2605 171.4929 1.00269168 31449 -INTELSAT 1R (IS-1R) -1 26608U 00072A 09139.92012715 -.00000259 00000-0 10000-3 0 486 -2 26608 0.0095 187.6956 0000823 192.7294 143.5091 1.00272361 31219 -ANIK F1 -1 26624U 00076A 09142.49733322 -.00000059 00000-0 10000-3 0 4952 -2 26624 0.0108 180.4923 0002851 217.9841 273.5264 1.00272262 31214 -ASTRA 2D -1 26638U 00081A 09143.00000000 .00000164 00000-0 00000+0 0 7281 -2 26638 0.0750 241.5420 0002750 307.6810 79.7110 1.00273849 30930 -AMC-8 (GE-8) -1 26639U 00081B 09142.57856236 .00000119 00000-0 10000-3 0 4106 -2 26639 0.0420 96.5688 0002257 328.6746 244.3868 1.00273116 30894 -BEIDOU 1B -1 26643U 00082A 09142.57245698 -.00000124 00000-0 10000-3 0 3652 -2 26643 1.9517 77.8367 0003011 337.1939 111.7008 1.00270205 30888 -TURKSAT 2A -1 26666U 01002A 09142.92119769 .00000161 00000-0 10000-3 0 4581 -2 26666 0.0402 266.9139 0003265 134.7577 212.6293 1.00271948 30640 -SICRAL 1 -1 26694U 01005A 09139.68412176 .00000120 00000-0 10000-3 0 4543 -2 26694 1.2873 79.0439 0005326 27.9206 33.0024 1.00276495 30373 -SKYNET 4F -1 26695U 01005B 09139.07776453 -.00000225 00000-0 10000-3 0 1979 -2 26695 3.6362 58.2852 0003081 351.0343 181.6209 1.00273119 30331 -EUROBIRD 1 -1 26719U 01011A 09142.64210449 .00000165 00000-0 10000-3 0 5200 -2 26719 0.0685 349.9130 0003491 65.3505 84.7974 1.00273782 30075 -BSAT-2A -1 26720U 01011B 09140.99393281 .00000000 00000-0 10000-3 0 3301 -2 26720 0.0371 17.2174 0003301 34.3122 294.9029 1.00264375 30033 -XM-2 (ROCK) -1 26724U 01012A 09142.23283094 -.00000190 00000-0 10000-3 0 5971 -2 26724 0.0295 276.3492 0000347 123.2269 199.0376 1.00271404 30031 -EKRAN 21 -1 26736U 01014A 09143.59744503 -.00000214 00000-0 10000-3 0 6027 -2 26736 5.8704 77.2699 0031146 252.7204 106.7272 0.99592821 29840 -XM-1 (ROLL) -1 26761U 01018A 09142.23283159 -.00000190 00000-0 10000-3 0 3765 -2 26761 0.0873 271.5793 0000287 139.4522 187.6421 1.00271535 29508 -INTELSAT 10 (IS-10) -1 26766U 01019A 09141.85128615 -.00000009 00000-0 10000-3 0 3751 -2 26766 0.0268 302.3436 0002979 147.4422 164.7884 1.00272557 29409 -INTELSAT 901 (IS-901) -1 26824U 01024A 09142.71380068 -.00000126 00000-0 00000+0 0 4172 -2 26824 0.0058 89.4300 0003116 324.8148 65.1975 1.00270966 29164 -ASTRA 2C -1 26853U 01025A 09143.00000000 .00000169 00000-0 00000+0 0 6676 -2 26853 0.0650 60.2560 0001520 11.3810 200.5860 1.00271887 29105 -ARTEMIS -1 26863U 01029A 09142.94168795 .00000138 00000-0 10000-3 0 6940 -2 26863 7.3881 69.4770 0002960 9.1487 162.4642 1.00268988 29898 -GOES 12 -1 26871U 01031A 09140.37995750 -.00000230 00000-0 10000-3 0 685 -2 26871 0.0513 252.8241 0004912 189.4326 216.9679 1.00258557 28720 -COSMOS 2379 -1 26892U 01037A 09143.79120297 .00000087 00000-0 10000-3 0 3041 -2 26892 4.7880 69.5604 0002024 281.0588 187.4753 1.00263262 28362 -INTELSAT 902 (IS-902) -1 26900U 01039A 09142.78185531 .00000048 00000-0 10000-3 0 4007 -2 26900 0.0321 287.5289 0003063 143.2413 153.2261 1.00271709 28339 -ATLANTIC BIRD 2 -1 26927U 01042A 09142.60514432 -.00000051 00000-0 10000-3 0 2123 -2 26927 0.0572 358.5811 0004784 51.3461 40.2016 1.00272528 28073 -DIRECTV 4S -1 26985U 01052A 09141.52507465 -.00000098 00000-0 00000+0 0 3178 -2 26985 0.0881 82.2576 0002558 332.0339 272.8872 1.00271500 27463 -INSAT-3C -1 27298U 02002A 09142.78157473 -.00000063 00000-0 10000-3 0 614 -2 27298 0.0422 249.7140 0002134 76.8916 269.3443 1.00272187 26852 -ECHOSTAR 7 -1 27378U 02006A 09142.24581882 .00000016 00000-0 10000-3 0 3578 -2 27378 0.0098 328.0387 0001583 134.2717 107.2798 1.00272522 26541 -INTELSAT 904 (IS-904) -1 27380U 02007A 09141.08970639 .00000000 00000-0 10000-3 0 4119 -2 27380 0.0201 20.5179 0002478 34.9327 275.7138 1.00270590 26564 -TDRS 9 -1 27389U 02011A 09140.37796752 -.00000261 00000-0 10000-3 0 3889 -2 27389 2.4083 233.7710 0008903 165.2510 272.9938 1.00267400 27909 -JCSAT 8 -1 27399U 02015A 09142.62480284 -.00000150 00000-0 10000-3 0 2262 -2 27399 0.0118 336.0087 0002020 16.7704 266.5470 1.00271983 26243 -ASTRA 3A -1 27400U 02015B 09143.00000000 .00000151 00000-0 00000+0 0 2278 -2 27400 0.0580 262.1580 0002998 11.9940 350.0630 1.00269496 26253 -INTELSAT 903 (IS-903) -1 27403U 02016A 09139.07737175 -.00000226 00000-0 10000-3 0 2105 -2 27403 0.0075 358.6994 0003583 52.5891 178.9483 1.00270862 26209 -NSS-7 -1 27414U 02019A 09139.94332779 -.00000154 00000-0 10000-3 0 3434 -2 27414 0.0423 91.4406 0003555 315.6826 148.2079 1.00270568 26044 -DIRECTV 5 (TEMPO 1) -1 27426U 02023A 09140.12051715 -.00000041 00000-0 10000-3 0 3246 -2 27426 0.0452 99.3481 0003385 328.2278 103.6065 1.00272254 25796 -INTELSAT 905 (IS-905) -1 27438U 02027A 09139.16306451 -.00000171 00000-0 00000+0 0 690 -2 27438 0.0003 305.0286 0003361 114.7542 211.3983 1.00271758 25522 -EXPRESS 4A -1 27441U 02029A 09143.56339726 -.00000098 00000-0 10000-3 0 2310 -2 27441 0.0265 173.3036 0003407 341.0689 275.7664 1.00271402 25473 -GALAXY 3C (G-3C) -1 27445U 02030A 09142.79052745 -.00000136 00000-0 00000+0 0 296 -2 27445 0.0300 113.8418 0000547 98.7373 217.5347 1.00272826 25448 -ATLANTIC BIRD 3 -1 27460U 02035A 09142.54266870 -.00000027 00000-0 10000-3 0 1281 -2 27460 0.0496 19.8735 0005177 40.8046 9.9812 1.00271495 25235 -N-STAR C -1 27461U 02035B 09141.67981567 .00000000 00000-0 10000-3 0 9549 -2 27461 0.0127 190.3841 0000006 176.0594 253.7306 1.00267676 25239 -HOT BIRD 6 -1 27499U 02038A 09141.82969659 .00000103 00000-0 10000-3 0 5661 -2 27499 0.0462 283.8112 0001896 90.8292 176.6599 1.00271629 24731 -ECHOSTAR 8 -1 27501U 02039A 09143.63923799 -.00000229 00000-0 10000-3 0 3895 -2 27501 0.0154 327.2099 0003467 90.2120 337.1117 1.00272191 24779 -ATLANTIC BIRD 1 -1 27508U 02040A 09142.59586076 -.00000085 00000-0 10000-3 0 2250 -2 27508 0.0672 81.7008 0004931 354.6102 6.0664 1.00272194 24746 -METEOSAT-8 (MSG-1) -1 27509U 02040B 09143.01898582 .00000076 00000-0 10000-3 0 2784 -2 27509 0.5719 29.4182 0002490 17.4274 209.9549 1.00272114 24746 -INTELSAT 906 (IS-906) -1 27513U 02041A 09141.64243211 .00000030 00000-0 10000-3 0 1846 -2 27513 0.0046 329.5243 0002906 97.5519 107.7598 1.00272970 24608 -KODAMA (DRTS) -1 27516U 02042B 09143.82744440 -.00000223 00000-0 10000-3 0 1724 -2 27516 0.0160 296.5001 0002878 137.9384 195.7661 1.00270242 24596 -KALPANA-1 (METSAT 1) -1 27525U 02043A 09142.86904929 -.00000062 00000-0 10000-3 0 9390 -2 27525 0.0725 92.2997 0008117 342.0218 193.1392 1.00271664 24542 -HISPASAT 1D -1 27528U 02044A 09139.95278861 -.00000202 00000-0 10000-3 0 385 -2 27528 0.0593 13.5742 0004170 15.8124 161.3480 1.00269194 24447 -EUTELSAT W5 -1 27554U 02051A 09143.66578808 -.00000031 00000-0 10000-3 0 1009 -2 27554 0.0343 338.5978 0000809 118.1107 94.8721 1.00274224 23877 -TDRS 10 -1 27566U 02055A 09142.40750527 -.00000248 00000-0 00000+0 0 988 -2 27566 1.1596 281.2575 0002608 159.8597 264.9502 1.00268750 23754 -NSS-6 -1 27603U 02057A 09141.87164955 -.00000254 00000-0 10000-3 0 9594 -2 27603 0.0276 116.7316 0002661 324.4563 207.2372 1.00271797 23598 -NIMIQ 2 -1 27632U 02062A 09140.34591242 -.00000159 00000-0 10000-3 0 164 -2 27632 0.0172 243.1874 0004174 213.2688 175.0939 1.00273508 23439 -INTELSAT 907 (IS-907) -1 27683U 03007A 09139.90149874 -.00000188 00000-0 10000-3 0 7798 -2 27683 0.0258 35.0827 0002598 25.1919 114.4803 1.00272399 22940 -INSAT-3A -1 27714U 03013A 09141.37915484 .00000000 00000-0 10000-3 0 6175 -2 27714 0.0300 109.4369 0005268 314.4777 45.2461 1.00268135 22420 -GALAXY 12 (G-12) -1 27715U 03013B 09142.41124208 .00000040 00000-0 00000+0 0 1093 -2 27715 0.0142 321.9272 0002914 147.5717 155.8175 1.00271972 22482 -ASIASAT 4 -1 27718U 03014A 09143.25246416 -.00000346 00000-0 10000-3 0 898 -2 27718 0.0038 353.2967 0000348 55.2118 45.5530 1.00267747 22437 -COSMOS 2397 -1 27775U 03015A 09140.10697818 -.00000100 00000-0 10000-3 0 842 -2 27775 3.3290 72.2174 0045483 202.2140 157.3478 1.00451363 22276 -GSAT-2 -1 27807U 03018A 09142.99787845 .00000139 00000-0 10000-3 0 32 -2 27807 0.1436 86.8289 0003263 328.4634 232.6622 1.00273130 22166 -HELLAS-SAT 2 -1 27811U 03020A 09141.81042720 .00000168 00000-0 10000-3 0 9330 -2 27811 0.0032 269.7024 0003253 150.5083 150.1031 1.00271863 21968 -BEIDOU 1C -1 27813U 03021A 09142.74815147 -.00000336 00000-0 10000-3 0 7883 -2 27813 0.1411 190.1485 0004444 313.5744 116.6242 1.00264862 21993 -AMC-9 (GE-12) -1 27820U 03024A 09139.34189718 -.00000203 00000-0 10000-3 0 9395 -2 27820 0.0064 206.7484 0002841 222.8064 207.6715 1.00271175 21815 -THURAYA-2 -1 27825U 03026A 09141.59708238 .00000144 00000-0 10000-3 0 5261 -2 27825 2.8823 341.7378 0004308 75.6585 80.9532 1.00271869 21838 -BSAT-2C -1 27830U 03028A 09140.78938175 .00000000 00000-0 10000-3 0 46 -2 27830 0.0077 226.5428 0004995 246.2582 159.7823 1.00265628 21807 -OPTUS C1 -1 27831U 03028B 09141.61251347 -.00000131 00000-0 00000+0 0 994 -2 27831 0.0706 90.3552 0003635 338.7375 186.8006 1.00271707 21796 -ECHOSTAR 12 (RAINBOW 1) -1 27852U 03033A 09143.59824991 -.00000269 00000-0 00000+0 0 9613 -2 27852 0.0344 21.6771 0001893 48.2141 325.1852 1.00270235 21483 -GALAXY 23 (G-23) -1 27854U 03034A 09140.54666275 .00000028 00000-0 10000-3 0 9771 -2 27854 0.0067 344.1458 0003188 73.4179 256.5730 1.00272991 21227 -EUROBIRD 3 -1 27948U 03043A 09142.89905314 .00000170 00000-0 00000-0 0 310 -2 27948 0.0875 46.6191 0000360 6.3715 184.4522 1.00272547 20815 -INSAT-3E -1 27951U 03043E 09141.64103286 .00000100 00000-0 10000-3 0 6496 -2 27951 0.1073 82.5065 0004029 342.8576 99.8386 1.00274686 20709 -GALAXY 13 (HORIZONS-1) -1 27954U 03044A 09142.52112978 .00000063 00000-0 10000-3 0 8946 -2 27954 0.0057 344.7461 0002270 96.3021 219.8279 1.00270782 20728 -ZHONGXING-20 -1 28082U 03052A 09141.90368434 -.00000276 00000-0 10000-3 0 7473 -2 28082 0.0807 270.8040 0003820 106.8456 285.4115 1.00269679 20256 -YAMAL 202 -1 28089U 03053A 09143.66464984 .00000133 00000-0 10000-3 0 6440 -2 28089 0.0415 269.4174 0002442 144.2192 115.9941 1.00270975 20190 -YAMAL 201 -1 28094U 03053B 09143.67372257 -.00000217 00000-0 10000-3 0 154 -2 28094 0.0354 270.7893 0003676 140.6735 162.5249 1.00272362 22366 -AMOS 2 -1 28132U 03059A 09141.06500094 -.00000018 00000-0 10000-3 0 8052 -2 28132 0.0319 239.2831 0003498 164.5440 214.4490 1.00272994 19858 -EXPRESS-AM 22 -1 28134U 03060A 09142.92396855 .00000112 00000-0 10000-3 0 7390 -2 28134 0.0389 56.3881 ... [truncated message content] |
From: <fi...@us...> - 2009-08-05 10:42:51
|
Revision: 360 http://gpredict.svn.sourceforge.net/gpredict/?rev=360&view=rev Author: fillods Date: 2009-08-05 10:42:43 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Set default host to localhost for rigctld/rotctld, working around a crash when field is left empty. Modified Paths: -------------- trunk/ChangeLog trunk/src/sat-pref-rig-editor.c trunk/src/sat-pref-rot-editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-05 09:40:34 UTC (rev 359) +++ trunk/ChangeLog 2009-08-05 10:42:43 UTC (rev 360) @@ -1,3 +1,10 @@ +2009-08-05 Stephane Fillod <fillods at users.sf.net> + + * src/sat-pref-rig-editor.c: + * src/sat-pref-rot-editor.c: + Set default host to localhost for rigctld/rotctld, working around + a crash when field is left empty. + 2009-08-05 Michael Stephenson <mickstephenson at googlemail.com> * src/gtk-sat-module-popup.c: @@ -12,6 +19,7 @@ * src/gtk-rot-ctrl.c: Spelling corrections. + * configure.ac: * po/en_US.po: * po/en_GB.po: US and British translations. Modified: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c 2009-08-05 09:40:34 UTC (rev 359) +++ trunk/src/sat-pref-rig-editor.c 2009-08-05 10:42:43 UTC (rev 360) @@ -177,6 +177,7 @@ host = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY (host), 50); + gtk_entry_set_text (GTK_ENTRY (host), "localhost"); gtk_widget_set_tooltip_text (host, _("Enter the host where rigctld is running. "\ "You can use both host name and IP address, "\ @@ -371,7 +372,7 @@ clear_widgets () { gtk_entry_set_text (GTK_ENTRY (name), ""); - gtk_entry_set_text (GTK_ENTRY (host), ""); + gtk_entry_set_text (GTK_ENTRY (host), "localhost"); 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); Modified: trunk/src/sat-pref-rot-editor.c =================================================================== --- trunk/src/sat-pref-rot-editor.c 2009-08-05 09:40:34 UTC (rev 359) +++ trunk/src/sat-pref-rot-editor.c 2009-08-05 10:42:43 UTC (rev 360) @@ -174,9 +174,13 @@ host = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY (host), 50); + gtk_entry_set_text (GTK_ENTRY (host), "localhost"); gtk_widget_set_tooltip_text (host, - _("Enter the host where rogctld is running. You can use both host name "\ - " and IP address, e.g. 192.168.1.100")); + _("Enter the host where rigctld is running. "\ + "You can use both host name and IP address, "\ + "e.g. 192.168.1.100\n\n"\ + "If gpredict and rotctld are running on the "\ + "same computer, use localhost")); gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2); /* port */ @@ -298,7 +302,7 @@ clear_widgets () { gtk_entry_set_text (GTK_ENTRY (name), ""); - gtk_entry_set_text (GTK_ENTRY (host), ""); + gtk_entry_set_text (GTK_ENTRY (host), "localhost"); gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533); /* hamlib default? */ gtk_combo_box_set_active (GTK_COMBO_BOX (aztype), ROT_AZ_TYPE_360); gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 09:40:46
|
Revision: 359 http://gpredict.svn.sourceforge.net/gpredict/?rev=359&view=rev Author: csete Date: 2009-08-05 09:40:34 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Update translator-credits. Modified Paths: -------------- trunk/po/en_GB.po trunk/po/en_US.po Modified: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po 2009-08-05 08:59:13 UTC (rev 358) +++ trunk/po/en_GB.po 2009-08-05 09:40:34 UTC (rev 359) @@ -85,7 +85,7 @@ #: ../src/about.c:110 msgid "translator-credits" -msgstr "translator-credits" +msgstr "Michael Stephenson" #: ../src/first-time.c:132 ../src/first-time.c:267 ../src/first-time.c:338 #: ../src/first-time.c:492 ../src/first-time.c:538 ../src/first-time.c:583 Modified: trunk/po/en_US.po =================================================================== --- trunk/po/en_US.po 2009-08-05 08:59:13 UTC (rev 358) +++ trunk/po/en_US.po 2009-08-05 09:40:34 UTC (rev 359) @@ -85,7 +85,7 @@ #: ../src/about.c:110 msgid "translator-credits" -msgstr "translator-credits" +msgstr "Michael Stephenson" #: ../src/first-time.c:132 ../src/first-time.c:267 ../src/first-time.c:338 #: ../src/first-time.c:492 ../src/first-time.c:538 ../src/first-time.c:583 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fi...@us...> - 2009-08-05 08:59:28
|
Revision: 358 http://gpredict.svn.sourceforge.net/gpredict/?rev=358&view=rev Author: fillods Date: 2009-08-05 08:59:13 +0000 (Wed, 05 Aug 2009) Log Message: ----------- new en_GB and en_US translations Modified Paths: -------------- trunk/configure.ac trunk/po/gpredict.pot Added Paths: ----------- trunk/po/en_GB.po trunk/po/en_US.po Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-08-05 08:53:47 UTC (rev 357) +++ trunk/configure.ac 2009-08-05 08:59:13 UTC (rev 358) @@ -42,7 +42,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=fr +ALL_LINGUAS="en_GB en_US fr" GETTEXT_PACKAGE=gpredict AC_SUBST(GETTEXT_PACKAGE) AM_GLIB_GNU_GETTEXT Added: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po (rev 0) +++ trunk/po/en_GB.po 2009-08-05 08:59:13 UTC (rev 358) @@ -0,0 +1,5207 @@ +# British English Translation for gpredict. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the gpredict package. +# Michael Stephenson <mic...@go...>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: gpredict\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-05 01:49+0100\n" +"PO-Revision-Date: 2009-08-05 00:53+0100\n" +"Last-Translator: Michael Stephenson <mic...@go...>\n" +"Language-Team: British English\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/about.c:58 +msgid "" +"Copyright (C) 2001-2009 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 "" +"Copyright (C) 2001-2009 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" + +#. window title +#. icon file name +#. create window title and file name for window icon +#: ../src/about.c:90 ../src/main.c:177 ../src/sat-log.c:57 +#: ../src/sat-log-browser.c:457 +msgid "GPREDICT" +msgstr "GPREDICT" + +#: ../src/about.c:93 +msgid "" +"Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" +"\n" +"Gpredict is available free of charge from:" +msgstr "" +"Copyright (C) 2001-2008 Alexandru Csete OZ9AEC\n" +"\n" +"Gpredict is available free of charge from:" + +#: ../src/about.c:110 +msgid "translator-credits" +msgstr "translator-credits" + +#: ../src/first-time.c:132 ../src/first-time.c:267 ../src/first-time.c:338 +#: ../src/first-time.c:492 ../src/first-time.c:538 ../src/first-time.c:583 +#, c-format +msgid "%s: Check successful." +msgstr "%s: Check successful." + +#: ../src/first-time.c:137 ../src/first-time.c:273 ../src/first-time.c:343 +#: ../src/first-time.c:497 ../src/first-time.c:543 ../src/first-time.c:588 +#, c-format +msgid "%s: Check failed. Creating %s" +msgstr "%s: Check failed. Creating %s" + +#: ../src/first-time.c:148 ../src/first-time.c:284 ../src/first-time.c:352 +#: ../src/first-time.c:506 ../src/first-time.c:552 ../src/first-time.c:597 +#, c-format +msgid "%s: Failed to create %s" +msgstr "%s: Failed to create %s" + +#: ../src/first-time.c:153 ../src/first-time.c:289 ../src/first-time.c:357 +#: ../src/first-time.c:511 ../src/first-time.c:557 ../src/first-time.c:602 +#, c-format +msgid "%s: Created %s." +msgstr "%s: Created %s." + +#: ../src/first-time.c:189 ../src/first-time.c:395 ../src/first-time.c:635 +#, c-format +msgid "%s: Could not open %s." +msgstr "%s: Could not open %s." + +#: ../src/first-time.c:213 +#, c-format +msgid "%s: Found at least one .qth file." +msgstr "%s: Found at least one .qth file." + +#: ../src/first-time.c:224 +#, c-format +msgid "%s: Failed to copy sample.qth" +msgstr "%s: Failed to copy sample.qth" + +#: ../src/first-time.c:231 +#, c-format +msgid "%s: Copied sample.qth to %s/" +msgstr "%s: Copied sample.qth to %s/" + +#: ../src/first-time.c:299 +#, c-format +msgid "%s: Failed to copy Amateur.mod" +msgstr "%s: Failed to copy Amateur.mod" + +#: ../src/first-time.c:306 +#, c-format +msgid "%s: Copied amateur.mod to %s/" +msgstr "%s: Copied amateur.mod to %s/" + +#: ../src/first-time.c:419 +#, c-format +msgid "%s: Found at least one .tle file." +msgstr "%s: Found at least one .tle file." + +#: ../src/first-time.c:447 ../src/first-time.c:665 +#, c-format +msgid "%s: Failed to copy %s" +msgstr "%s: Failed to copy %s" + +#: ../src/first-time.c:454 +#, c-format +msgid "%s: Successfully copied %s" +msgstr "%s: Successfully copied %s" + +#: ../src/first-time.c:658 +#, c-format +msgid "%s: %s does not appear to be in user conf dir; adding." +msgstr "%s: %s does not appear to be in user conf dir; adding." + +#: ../src/first-time.c:674 +#, c-format +msgid "%s: %s already in user conf dir." +msgstr "%s: %s already in user conf dir." + +#: ../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 "%s:%s: %s called with color = NULL" + +#: ../src/gpredict-utils.c:338 +#, c-format +msgid "%s:%s: %s called with alpha = NULL" +msgstr "%s:%s: %s called with alpha = NULL" + +#: ../src/gpredict-utils.c:385 +#, c-format +msgid "%s:%s: %s called with rgb = NULL" +msgstr "%s:%s: %s called with rgb = NULL" + +#: ../src/gpredict-utils.c:427 +#, c-format +msgid "%s:%s: %s called with rgba = NULL" +msgstr "%s:%s: %s called with rgba = NULL" + +#: ../src/gtk-azel-plot.c:373 +msgid "Local Time" +msgstr "Local Time" + +#: ../src/gtk-azel-plot.c:383 ../src/pass-to-txt.c:158 +#: ../src/gtk-sky-glance.c:339 +msgid "UTC" +msgstr "UTC" + +#. 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:332 +msgid "N" +msgstr "N" + +#: ../src/gtk-polar-plot.c:627 ../src/gtk-polar-view.c:343 +msgid "S" +msgstr "S" + +#: ../src/gtk-polar-plot.c:638 ../src/gtk-polar-view.c:354 +msgid "E" +msgstr "E" + +#: ../src/gtk-polar-plot.c:649 ../src/gtk-polar-view.c:365 +msgid "W" +msgstr "W" + +#: ../src/gtk-polar-plot.c:752 +#, c-format +msgid "%s:%d: Incorrect polar plot orientation." +msgstr "%s:%d: Incorrect polar plot orientation." + +#. 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:837 +msgid "Show next pass" +msgstr "Show next pass" + +#: ../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:851 +msgid "Future passes" +msgstr "Future passes" + +#. show track +#: ../src/gtk-polar-view-popup.c:134 +msgid "Sky track" +msgstr "Sky track" + +#: ../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 "%s:%d: Failed to get satellite object." + +#: ../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:1054 ../src/gtk-single-sat.c:1125 +#, c-format +msgid "" +"Satellite %s has no passes\n" +"within the next %d days" +msgstr "" +"Satellite %s has no passes\n" +"within the next %d days" + +#: ../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:1070 +#, 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 "" +"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" + +#: ../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:1144 +#, c-format +msgid "" +"Satellite %s has no passes for\n" +"the current ground station!" +msgstr "" +"Satellite %s has no passes for\n" +"the current ground station!" + +#: ../src/gtk-polar-view.c:733 +#, c-format +msgid "" +"Next: %s\n" +"in %s%d:%s%d%s%d" +msgstr "" +"Next: %s\n" +"in %s%d:%s%d%s%d" + +#: ../src/gtk-polar-view.c:736 +#, c-format +msgid "" +"Next: %s\n" +"in %s%d%s%d" +msgstr "" +"Next: %s\n" +"in %s%d%s%d" + +#: ../src/gtk-polar-view.c:751 ../src/gtk-sat-map.c:694 +#, c-format +msgid "%s: Can not find NEXT satellite." +msgstr "%s: Can not find NEXT satellite." + +#: ../src/gtk-polar-view.c:754 ../src/gtk-sat-map.c:697 +msgid "Next: ERR" +msgstr "Next: ERR" + +#: ../src/gtk-polar-view.c:760 ../src/gtk-sat-map.c:703 +msgid "Next: N/A" +msgstr "Next: N/A" + +#: ../src/gtk-polar-view.c:916 +#, c-format +msgid "" +"%s\n" +"LOS in %s%d:%s%d%s%d" +msgstr "" +"%s\n" +"LOS in %s%d:%s%d%s%d" + +#: ../src/gtk-polar-view.c:920 +#, c-format +msgid "" +"%s\n" +"LOS in %s%d%s%d" +msgstr "" +"%s\n" +"LOS in %s%d%s%d" + +#: ../src/gtk-polar-view.c:928 +#, c-format +msgid "" +"%s\n" +"Always in range" +msgstr "" +"%s\n" +"Always in range" + +#: ../src/gtk-polar-view.c:1237 +#, c-format +msgid "%s:%d: Could not find satellite (%d) in hash table" +msgstr "%s:%d: Could not find satellite (%d) in hash table" + +#: ../src/gtk-polar-view.c:1285 ../src/gtk-sat-map.c:903 +#, c-format +msgid "%s:%d: Can not find clicked object (%d) in hash table" +msgstr "%s:%d: Can not find clicked object (%d) in hash table" + +#: ../src/gtk-rig-ctrl.c:386 +msgid "<b> Downlink </b>" +msgstr "<b> Downlink </b>" + +#. Downlink doppler +#. Uplink doppler +#: ../src/gtk-rig-ctrl.c:401 ../src/gtk-rig-ctrl.c:466 +msgid "Doppler:" +msgstr "Doppler:" + +#: ../src/gtk-rig-ctrl.c:403 ../src/gtk-rig-ctrl.c:468 +msgid "" +"The Doppler shift according to the range rate and the currently selected " +"downlink frequency" +msgstr "" +"The Doppler shift according to the range rate and the currently selected " +"downlink frequency" + +#: ../src/gtk-rig-ctrl.c:415 ../src/gtk-rig-ctrl.c:480 +msgid "LO:" +msgstr "LO:" + +#: ../src/gtk-rig-ctrl.c:451 +msgid "<b> Uplink </b>" +msgstr "<b> Uplink </b>" + +#: ../src/gtk-rig-ctrl.c:531 ../src/gtk-rot-ctrl.c:420 +msgid "Select target object" +msgstr "Select target object" + +#. tracking button +#: ../src/gtk-rig-ctrl.c:536 ../src/gtk-rot-ctrl.c:425 +msgid "Track" +msgstr "Track" + +#: ../src/gtk-rig-ctrl.c:537 +msgid "" +"Track the satellite transponder.\n" +"Enabling this button will apply Dopper correction to the frequency of the " +"radio." +msgstr "" +"Track the satellite transponder.\n" +"Enabling this button will apply Dopper correction to the frequency of the " +"radio." + +#: ../src/gtk-rig-ctrl.c:545 +msgid "Select a transponder" +msgstr "Select a transponder" + +#. buttons +#: ../src/gtk-rig-ctrl.c:552 +msgid "T" +msgstr "T" + +#: ../src/gtk-rig-ctrl.c:554 +msgid "" +"Tune the radio to this transponder. The uplink and downlink will be set to " +"the center of the transponder passband. In case of beacons, only the " +"downlink will be tuned to the beacon frequency." +msgstr "" +"Tune the radio to this transponder. The uplink and downlink will be set to " +"the center of the transponder passband. In case of beacons, only the " +"downlink will be tuned to the beacon frequency." + +#: ../src/gtk-rig-ctrl.c:560 +msgid "L" +msgstr "L" + +#: ../src/gtk-rig-ctrl.c:562 +msgid "" +"Lock the uplink and the downlink to each other. Whenever you change the " +"downlink (in the controller or on the dial, the uplink will track it " +"according to whether the transponder is inverting or not. Similarly, if you " +"change the uplink the downlink will track it automatically.\n" +"\n" +"If the downlink and uplink are initially out of sync when you enable this " +"function, the current downlink frequency will be used as baseline for " +"setting the new uplink frequency." +msgstr "" +"Lock the uplink and the downlink to each other. Whenever you change the " +"downlink (in the controller or on the dial, the uplink will track it " +"according to whether the transponder is inverting or not. Similarly, if you " +"change the uplink the downlink will track it automatically.\n" +"\n" +"If the downlink and uplink are initially out of sync when you enable this " +"function, the current downlink frequency will be used as baseline for " +"setting the new uplink frequency." + +#. Azimuth +#: ../src/gtk-rig-ctrl.c:581 ../src/gtk-rot-ctrl.c:431 +msgid "Az:" +msgstr "Az:" + +#. Elevation +#: ../src/gtk-rig-ctrl.c:589 ../src/gtk-rot-ctrl.c:441 +msgid "El:" +msgstr "El:" + +#. Range +#: ../src/gtk-rig-ctrl.c:597 +msgid " Range:" +msgstr " Range:" + +#: ../src/gtk-rig-ctrl.c:605 ../src/gtk-rig-ctrl.c:608 +msgid "This is the current distance between the satellite and the observer." +msgstr "This is the current distance between the satellite and the observer." + +#. Range rate +#: ../src/gtk-rig-ctrl.c:612 +msgid " Rate:" +msgstr " Rate:" + +#: ../src/gtk-rig-ctrl.c:620 ../src/gtk-rig-ctrl.c:623 +msgid "" +"The rate of change for the distance between the satellite and the observer." +msgstr "" +"The rate of change for the distance between the satellite and the observer." + +#: ../src/gtk-rig-ctrl.c:626 ../src/gtk-rot-ctrl.c:457 +msgid "Target" +msgstr "Target" + +#. Primary device +#: ../src/gtk-rig-ctrl.c:655 +msgid "1. Device:" +msgstr "1. Device:" + +#: ../src/gtk-rig-ctrl.c:660 +msgid "" +"Select primary radio device.This device will be used for downlink and uplink " +"unless you select a secondary device for uplink" +msgstr "" +"Select primary radio device.This device will be used for downlink and uplink " +"unless you select a secondary device for uplink" + +#: ../src/gtk-rig-ctrl.c:685 ../src/gtk-rig-ctrl.c:728 +#: ../src/gtk-rig-ctrl.c:2368 ../src/gtk-rot-ctrl.c:513 +#: ../src/gtk-rot-ctrl.c:1229 ../src/sat-pref-rig.c:304 +#: ../src/sat-pref-rot.c:270 +#, c-format +msgid "%s:%d: Failed to open hwconf dir (%s)" +msgstr "%s:%d: Failed to open hwconf dir (%s)" + +#. config will be force-loaded after LO spin is created +#. Secondary device +#: ../src/gtk-rig-ctrl.c:698 +msgid "2. Device:" +msgstr "2. Device:" + +#: ../src/gtk-rig-ctrl.c:703 +msgid "" +"Select secondary radio device\n" +"This device will be used for uplink" +msgstr "" +"Select secondary radio device\n" +"This device will be used for uplink" + +#. load config +#: ../src/gtk-rig-ctrl.c:707 ../src/sat-pref-rig-editor.c:236 +#: ../src/sat-pref-rig.c:754 ../src/sat-pref-rig.c:763 +msgid "None" +msgstr "None" + +#. Engage button +#: ../src/gtk-rig-ctrl.c:743 ../src/gtk-rot-ctrl.c:526 +msgid "Engage" +msgstr "Engage" + +#: ../src/gtk-rig-ctrl.c:744 +msgid "Engage the selected radio device" +msgstr "Engage the selected radio device" + +#. Timeout +#: ../src/gtk-rig-ctrl.c:752 ../src/gtk-rot-ctrl.c:532 +msgid "Cycle:" +msgstr "Cycle:" + +#: ../src/gtk-rig-ctrl.c:759 +msgid "This parameter controls the delay between commands sent to the rig." +msgstr "This parameter controls the delay between commands sent to the rig." + +#: ../src/gtk-rig-ctrl.c:766 ../src/gtk-rot-ctrl.c:546 +msgid "msec" +msgstr "msec" + +#: ../src/gtk-rig-ctrl.c:770 ../src/gtk-rot-ctrl.c:575 +msgid "Settings" +msgstr "Settings" + +#: ../src/gtk-rig-ctrl.c:787 +msgid "<span size='large'><b>ΔT: 00:00:00</b></span>" +msgstr "<span size='large'><b>ΔT: 00:00:00</b></span>" + +#: ../src/gtk-rig-ctrl.c:789 +msgid "" +"The time remaining until the next AOS or LOS event, depending on which one " +"comes first." +msgstr "" +"The time remaining until the next AOS or LOS event, depending on which one " +"comes first." + +#: ../src/gtk-rig-ctrl.c:838 ../src/gtk-rot-ctrl.c:638 +#, c-format +msgid "%s:%s: Invalid satellite selection: %d" +msgstr "%s:%s: Invalid satellite selection: %d" + +#: ../src/gtk-rig-ctrl.c:875 +#, c-format +msgid "%s: Inconsistency detected in internal transponder data (%d,%d)" +msgstr "%s: Inconsistency detected in internal transponder data (%d,%d)" + +#: ../src/gtk-rig-ctrl.c:1007 +#, c-format +msgid "%s:%s: Primary device selected: %d" +msgstr "%s:%s: Primary device selected: %d" + +#: ../src/gtk-rig-ctrl.c:1021 ../src/gtk-rig-ctrl.c:2456 +#, c-format +msgid "%s:%d: Failed to allocate memory for radio config" +msgstr "%s:%d: Failed to allocate memory for radio config" + +#: ../src/gtk-rig-ctrl.c:1030 ../src/gtk-rig-ctrl.c:1131 +#, c-format +msgid "%s:%s: Loaded new radio configuration %s" +msgstr "%s:%s: Loaded new radio configuration %s" + +#. update LO widgets +#: ../src/gtk-rig-ctrl.c:1033 ../src/gtk-rig-ctrl.c:1038 +#: ../src/gtk-rig-ctrl.c:1090 ../src/gtk-rig-ctrl.c:1106 +#: ../src/gtk-rig-ctrl.c:1134 +#, c-format +msgid "%.0f MHz" +msgstr "%.0f MHz" + +#: ../src/gtk-rig-ctrl.c:1045 ../src/gtk-rig-ctrl.c:1140 +#, c-format +msgid "%s:%s: Failed to load radio configuration %s" +msgstr "%s:%s: Failed to load radio configuration %s" + +#: ../src/gtk-rig-ctrl.c:1074 +#, c-format +msgid "%s:%s: Secondary device selected: %d" +msgstr "%s:%s: Secondary device selected: %d" + +#: ../src/gtk-rig-ctrl.c:1122 +#, c-format +msgid "%s:%s: Failed to allocate memory for radio config" +msgstr "%s:%s: Failed to allocate memory for radio config" + +#: ../src/gtk-rig-ctrl.c:1178 ../src/gtk-rot-ctrl.c:780 +#, c-format +msgid "%s: Controller does not have a valid configuration" +msgstr "%s: Controller does not have a valid configuration" + +#: ../src/gtk-rig-ctrl.c:1268 ../src/gtk-rot-ctrl.c:808 +#, c-format +msgid "%s missed the deadline" +msgstr "%s missed the deadline" + +#: ../src/gtk-rig-ctrl.c:1300 +#, c-format +msgid "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX" +msgstr "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX" + +#: ../src/gtk-rig-ctrl.c:1314 ../src/gtk-rot-ctrl.c:897 +#, c-format +msgid "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!" +msgstr "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!" + +#: ../src/gtk-rig-ctrl.c:1832 ../src/gtk-rig-ctrl.c:2021 +#: ../src/gtk-rot-ctrl.c:965 ../src/gtk-rot-ctrl.c:1074 +#, c-format +msgid "%s:%d: Failed to create socket" +msgstr "%s:%d: Failed to create socket" + +#: ../src/gtk-rig-ctrl.c:1838 ../src/gtk-rig-ctrl.c:2027 +#: ../src/gtk-rot-ctrl.c:971 ../src/gtk-rot-ctrl.c:1080 +#, c-format +msgid "%s:%d Network socket created successfully" +msgstr "%s:%d Network socket created successfully" + +#: ../src/gtk-rig-ctrl.c:1852 ../src/gtk-rig-ctrl.c:2041 +#: ../src/gtk-rot-ctrl.c:985 ../src/gtk-rot-ctrl.c:1094 +#, c-format +msgid "%s:%d: Failed to connect to %s:%d" +msgstr "%s:%d: Failed to connect to %s:%d" + +#: ../src/gtk-rig-ctrl.c:1858 ../src/gtk-rig-ctrl.c:2047 +#: ../src/gtk-rot-ctrl.c:991 ../src/gtk-rot-ctrl.c:1100 +#, c-format +msgid "%s:%d: Connection opened to %s:%d" +msgstr "%s:%d: Connection opened to %s:%d" + +#: ../src/gtk-rig-ctrl.c:1876 ../src/gtk-rig-ctrl.c:2058 +#: ../src/gtk-rot-ctrl.c:1002 ../src/gtk-rot-ctrl.c:1113 +#, c-format +msgid "%s:%d: SIZE ERROR %d / %d" +msgstr "%s:%d: SIZE ERROR %d / %d" + +#: ../src/gtk-rig-ctrl.c:1886 ../src/gtk-rig-ctrl.c:2068 +#: ../src/gtk-rot-ctrl.c:1012 +#, c-format +msgid "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)" +msgstr "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)" + +#: ../src/gtk-rig-ctrl.c:1896 ../src/gtk-rig-ctrl.c:2078 +#, c-format +msgid "%s:%s: Got 0 bytes from rigctld" +msgstr "%s:%s: Got 0 bytes from rigctld" + +#: ../src/gtk-rig-ctrl.c:1901 ../src/gtk-rig-ctrl.c:2083 +#, c-format +msgid "%s:%s: Read %d bytes from rigctld" +msgstr "%s:%s: Read %d bytes from rigctld" + +#: ../src/gtk-rig-ctrl.c:1944 ../src/gtk-rig-ctrl.c:2121 +#, c-format +msgid "%s: Failed to create socket" +msgstr "%s: Failed to create socket" + +#: ../src/gtk-rig-ctrl.c:1950 ../src/gtk-rig-ctrl.c:2127 +#, c-format +msgid "%s: Network socket created successfully" +msgstr "%s: Network socket created successfully" + +#: ../src/gtk-rig-ctrl.c:1964 ../src/gtk-rig-ctrl.c:2141 +#, c-format +msgid "%s: Failed to connect to %s:%d" +msgstr "%s: Failed to connect to %s:%d" + +#: ../src/gtk-rig-ctrl.c:1970 ../src/gtk-rig-ctrl.c:2147 +#, c-format +msgid "%s: Connection opened to %s:%d" +msgstr "%s: Connection opened to %s:%d" + +#: ../src/gtk-rig-ctrl.c:1981 ../src/gtk-rig-ctrl.c:2186 +#, c-format +msgid "%s: SIZE ERROR %d / %d" +msgstr "%s: SIZE ERROR %d / %d" + +#: ../src/gtk-rig-ctrl.c:2012 ../src/gtk-rot-ctrl.c:956 +#, c-format +msgid "%s:%d: NULL storage." +msgstr "%s:%d: NULL storage." + +#: ../src/gtk-rig-ctrl.c:2175 +#, c-format +msgid "%s: Invalid VFO argument. Using VFOA." +msgstr "%s: Invalid VFO argument. Using VFOA." + +#: ../src/gtk-rig-ctrl.c:2219 +#, c-format +msgid "AOS in" +msgstr "AOS in" + +#: ../src/gtk-rig-ctrl.c:2223 +#, c-format +msgid "LOS in" +msgstr "LOS in" + +#: ../src/gtk-rig-ctrl.c:2306 +#, c-format +msgid "%s:%s: GtkSatModule has no target satellite." +msgstr "%s:%s: GtkSatModule has no target satellite." + +#: ../src/gtk-rig-ctrl.c:2318 +#, c-format +msgid "%s:%s: Satellite %d has %d transponder modes." +msgstr "%s:%s: Satellite %d has %d transponder modes." + +#: ../src/gtk-rig-ctrl.c:2329 +#, c-format +msgid "%s:&s: Read transponder '%s' for satellite %d" +msgstr "%s:&s: Read transponder '%s' for satellite %d" + +#: ../src/gtk-rig-ctrl.c:2468 +#, c-format +msgid "%s:%d: Error reading radio configuration %s" +msgstr "%s:%d: Error reading radio configuration %s" + +#: ../src/gtk-rot-ctrl.c:328 ../src/gtk-sat-list.c:85 +#: ../src/sat-pass-dialogs.c:125 ../src/gtk-single-sat.c:56 +msgid "Azimuth" +msgstr "Azimuth" + +#: ../src/gtk-rot-ctrl.c:340 +msgid "Read:" +msgstr "Read:" + +#: ../src/gtk-rot-ctrl.c:367 ../src/gtk-sat-list.c:86 +#: ../src/sat-pass-dialogs.c:126 ../src/gtk-single-sat.c:57 +msgid "Elevation" +msgstr "Elevation" + +#: ../src/gtk-rot-ctrl.c:379 +msgid "Read: " +msgstr "Read: " + +#: ../src/gtk-rot-ctrl.c:426 +msgid "Track the satellite when it is within range" +msgstr "Track the satellite when it is within range" + +#. count down +#: ../src/gtk-rot-ctrl.c:450 +msgid "ΔT:" +msgstr "ΔT:" + +#: ../src/gtk-rot-ctrl.c:485 +msgid "Device:" +msgstr "Device:" + +#: ../src/gtk-rot-ctrl.c:490 +msgid "Select antenna rotator device" +msgstr "Select antenna rotator device" + +#: ../src/gtk-rot-ctrl.c:527 +msgid "Engage the selected rotor device" +msgstr "Engage the selected rotor device" + +#: ../src/gtk-rot-ctrl.c:539 +msgid "This parameter controls the delay between commands sent to the rotator." +msgstr "" +"This parameter controls the delay between commands sent to the rotator." + +#. Tolerance +#: ../src/gtk-rot-ctrl.c:551 +msgid "Tolerance:" +msgstr "Tolerance:" + +#: ../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 "" +"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" + +#: ../src/gtk-rot-ctrl.c:568 +msgid "deg" +msgstr "deg" + +#: ../src/gtk-rot-ctrl.c:729 +#, c-format +msgid "%s:%d: Failed to allocate memory for rotator config" +msgstr "%s:%d: Failed to allocate memory for rotator config" + +#: ../src/gtk-rot-ctrl.c:738 +#, c-format +msgid "Loaded new rotator configuration %s" +msgstr "Loaded new rotator configuration %s" + +#: ../src/gtk-rot-ctrl.c:747 +#, c-format +msgid "%s:%d: Failed to load rotator configuration %s" +msgstr "%s:%d: Failed to load rotator configuration %s" + +#: ../src/gtk-rot-ctrl.c:868 ../src/gtk-rot-ctrl.c:869 +#: ../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:725 +msgid "ERROR" +msgstr "ERROR" + +#: ../src/gtk-rot-ctrl.c:1022 +#, c-format +msgid "%s:%s: Got 0 bytes from rotctld" +msgstr "%s:%s: Got 0 bytes from rotctld" + +#: ../src/gtk-rot-ctrl.c:1027 +#, c-format +msgid "%s:%s: Read %d bytes from rotctld" +msgstr "%s:%s: Read %d bytes from rotctld" + +#: ../src/gtk-sat-data.c:72 +#, c-format +msgid "%s: Can not find #%d in any .tle file." +msgstr "%s: Can not find #%d in any .tle file." + +#: ../src/gtk-sat-data.c:106 +#, c-format +msgid "%s: Found #%d in %s" +msgstr "%s: Found #%d in %s" + +#: ../src/gtk-sat-data.c:116 +#, c-format +msgid "%s: Invalid data for #%d" +msgstr "%s: Invalid data for #%d" + +#: ../src/gtk-sat-data.c:125 +#, c-format +msgid "%s: Good data for #%d" +msgstr "%s: Good data for #%d" + +#: ../src/gtk-sat-data.c:171 ../src/tle-update.c:903 +#, c-format +msgid "%s: Failed to open %s" +msgstr "%s: Failed to open %s" + +#: ../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 "Catnum" + +#: ../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 "Ra" + +#: ../src/gtk-sat-list.c:59 ../src/sat-pass-dialogs.c:104 +msgid "Dec" +msgstr "Dec" + +#: ../src/gtk-sat-list.c:60 ../src/pass-to-txt.c:52 +#: ../src/sat-pass-dialogs.c:105 +msgid "Range" +msgstr "Range" + +#: ../src/gtk-sat-list.c:61 ../src/sat-pass-dialogs.c:106 +msgid "Rate" +msgstr "Rate" + +#. 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:63 +msgid "Next Event" +msgstr "Next Event" + +#: ../src/gtk-sat-list.c:63 ../src/gtk-sat-list.c:93 +#: ../src/gtk-single-sat.c:64 +msgid "Next AOS" +msgstr "Next AOS" + +#: ../src/gtk-sat-list.c:64 ../src/gtk-sat-list.c:94 +#: ../src/gtk-single-sat.c:65 +msgid "Next LOS" +msgstr "Next 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 "SSP" + +#: ../src/gtk-sat-list.c:68 ../src/pass-to-txt.c:57 +#: ../src/sat-pass-dialogs.c:110 +msgid "Footp" +msgstr "Footp" + +#: ../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 "Loss" + +#: ../src/gtk-sat-list.c:73 ../src/sat-pass-dialogs.c:115 +msgid "Del" +msgstr "Del" + +#: ../src/gtk-sat-list.c:74 ../src/sat-pass-dialogs.c:116 +msgid "MA" +msgstr "MA" + +#: ../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 "Orbit" + +#: ../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 "Vis" + +#: ../src/gtk-sat-list.c:83 +msgid "Satellite Name" +msgstr "Satellite Name" + +#: ../src/gtk-sat-list.c:84 +msgid "Catalogue Number" +msgstr "Catalogue Number" + +#: ../src/gtk-sat-list.c:87 ../src/gtk-single-sat.c:58 +msgid "Direction" +msgstr "Direction" + +#: ../src/gtk-sat-list.c:88 ../src/sat-pass-dialogs.c:127 +msgid "Right Ascension" +msgstr "Right Ascension" + +#: ../src/gtk-sat-list.c:89 ../src/sat-pass-dialogs.c:128 +#: ../src/gtk-single-sat.c:60 +msgid "Declination" +msgstr "Declination" + +#: ../src/gtk-sat-list.c:90 ../src/sat-pass-dialogs.c:129 +#: ../src/gtk-single-sat.c:61 +msgid "Slant Range" +msgstr "Slant Range" + +#: ../src/gtk-sat-list.c:91 ../src/sat-pass-dialogs.c:130 +#: ../src/gtk-single-sat.c:62 +msgid "Range Rate" +msgstr "Range Rate" + +#: ../src/gtk-sat-list.c:95 ../src/sat-pass-dialogs.c:131 +msgid "Latitude" +msgstr "Latitude" + +#: ../src/gtk-sat-list.c:96 ../src/sat-pass-dialogs.c:132 +msgid "Longitude" +msgstr "Longitude" + +#: ../src/gtk-sat-list.c:97 ../src/sat-pass-dialogs.c:133 +msgid "Sub-Satellite Point" +msgstr "Sub-Satellite Point" + +#: ../src/gtk-sat-list.c:98 ../src/sat-pass-dialogs.c:134 +#: ../src/gtk-single-sat.c:69 +msgid "Footprint" +msgstr "Footprint" + +#. 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:70 +#: ../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:71 +msgid "Velocity" +msgstr "Velocity" + +#: ../src/gtk-sat-list.c:101 ../src/sat-pass-dialogs.c:137 +#: ../src/gtk-single-sat.c:100 +msgid "Doppler Shift @ 100MHz" +msgstr "Doppler Shift @ 100MHz" + +#: ../src/gtk-sat-list.c:102 ../src/sat-pass-dialogs.c:138 +msgid "Signal Loss @ 100MHz" +msgstr "Signal Loss @ 100MHz" + +#: ../src/gtk-sat-list.c:103 ../src/sat-pass-dialogs.c:139 +#: ../src/gtk-single-sat.c:102 +msgid "Signal Delay" +msgstr "Signal Delay" + +#: ../src/gtk-sat-list.c:104 ../src/sat-pass-dialogs.c:140 +#: ../src/gtk-single-sat.c:103 +msgid "Mean Anomaly" +msgstr "Mean Anomaly" + +#: ../src/gtk-sat-list.c:105 ../src/sat-pass-dialogs.c:141 +#: ../src/gtk-single-sat.c:76 ../src/gtk-single-sat.c:104 +msgid "Orbit Phase" +msgstr "Orbit Phase" + +#: ../src/gtk-sat-list.c:106 ../src/gtk-single-sat.c:105 +msgid "Orbit Number" +msgstr "Orbit Number" + +#: ../src/gtk-sat-list.c:107 ../src/sat-pass-dialogs.c:142 +#: ../src/gtk-single-sat.c:78 +msgid "Visibility" +msgstr "Visibility" + +#: ../src/gtk-sat-list.c:530 +#, c-format +msgid "%s: Invalid GtkSatList!" +msgstr "%s: Invalid GtkSatList!" + +#: ../src/gtk-sat-list.c:593 +#, c-format +msgid "%s: Failed to get data for #%d." +msgstr "%s: Failed to get data for #%d." + +#: ../src/gtk-sat-list.c:599 +#, c-format +msgid "%s: Satellite #%d removed from list." +msgstr "%s: Satellite #%d removed from list." + +#: ../src/gtk-sat-list.c:952 ../src/sat-pass-dialogs.c:700 +#: ../src/sat-pref-qth.c:769 +#, c-format +msgid "%s:%d: Invalid column: %d" +msgstr "%s:%d: Invalid column: %d" + +#: ../src/gtk-sat-list.c:1196 +#, c-format +msgid "%s: FIXME I am not implemented" +msgstr "%s: FIXME I am not implemented" + +#: ../src/gtk-sat-list.c:1294 +#, c-format +msgid "%s:%d Failed to get data for %d." +msgstr "%s:%d Failed to get data for %d." + +#: ../src/gtk-sat-list.c:1307 ../src/sat-pass-dialogs.c:1413 +#, c-format +msgid "%s:%d: There is no selection; skip popup." +msgstr "%s:%d: There is no selection; skip popup." + +#: ../src/gtk-sat-list-col-sel.c:153 +msgid "Column Name" +msgstr "Column Name" + +#: ../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 "Row" + +#: ../src/gtk-sat-map-ground-track.c:82 +#, c-format +msgid "%s: Creating ground track for %s" +msgstr "%s: Creating ground track for %s" + +#: ../src/gtk-sat-map-ground-track.c:97 +#, c-format +msgid "%s: Start orbit: %d" +msgstr "%s: Start orbit: %d" + +#: ../src/gtk-sat-map-ground-track.c:100 +#, c-format +msgid "%s: End orbit %d" +msgstr "%s: End orbit %d" + +#: ../src/gtk-sat-map-ground-track.c:121 +#, c-format +msgid "%s: T0: %f (%d)" +msgstr "%s: T0: %f (%d)" + +#: ../src/gtk-sat-map-ground-track.c:144 +#, c-format +msgid "%s: MAYDAY: Insufficient memory for ground track!" +msgstr "%s: MAYDAY: Insufficient memory for ground track!" + +#: ../src/gtk-sat-map-ground-track.c:191 +#, c-format +msgid "%s: Updating ground track for %s" +msgstr "%s: Updating ground track for %s" + +#: ../src/gtk-sat-map-ground-track.c:221 +#, c-format +msgid "%s: Deleting ground track for %s" +msgstr "%s: Deleting ground track for %s" + +#: ../src/gtk-sat-map-ground-track.c:239 +#, c-format +msgid "%s: Could not find part %d of ground track" +msgstr "%s: Could not find part %d of ground track" + +#. highlight cov. area +#: ../src/gtk-sat-map-popup.c:133 +msgid "Highlight footprint" +msgstr "Highlight footprint" + +#. show track +#: ../src/gtk-sat-map-popup.c:142 +msgid "Ground Track" +msgstr "Ground Track" + +#. target +#: ../src/gtk-sat-map-popup.c:154 +msgid "Set Target" +msgstr "Set Target" + +#: ../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\"> Next: %s in %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\"> Next: %s in %s%d%s%d </span>" + +#: ../src/gtk-sat-map.c:1048 +#, c-format +msgid "%s:%d: Loading map file %s" +msgstr "%s:%d: Loading map file %s" + +#: ../src/gtk-sat-map.c:1054 +#, c-format +msgid "%s:%d: Map file found" +msgstr "%s:%d: Map file found" + +#: ../src/gtk-sat-map.c:1059 +#, c-format +msgid "%s:%d: Could not find map file %s" +msgstr "%s:%d: Could not find map file %s" + +#: ../src/gtk-sat-map.c:1067 +#, c-format +msgid "%s:%d: Using default map: %s" +msgstr "%s:%d: Using default map: %s" + +#: ../src/gtk-sat-map.c:1076 +#, c-format +msgid "%s:%d: Error loading map file (%s)" +msgstr "%s:%d: Error loading map file (%s)" + +#: ../src/gtk-sat-module.c:267 +#, c-format +msgid "%s: Module %s is not valid." +msgstr "%s: Module %s is not valid." + +#: ../src/gtk-sat-module.c:310 +msgid "Module options / shortcuts" +msgstr "Module options / shortcuts" + +#: ../src/gtk-sat-module.c:316 +msgid "Close this module." +msgstr "Close this module." + +#: ../src/gtk-sat-module.c:450 +#, c-format +msgid "%s:%d: Invalid module layout (%d)" +msgstr "%s:%d: Invalid module layout (%d)" + +#: ../src/gtk-sat-module.c:477 +#, c-format +msgid "%s:%d: Invalid child number (%d)" +msgstr "%s:%d: Invalid child number (%d)" + +#: ../src/gtk-sat-module.c:514 +#, c-format +msgid "" +"%s:%d: Invalid child type (%d)\n" +"Using GtkSatList..." +msgstr "" +"%s:%d: Invalid child type (%d)\n" +"Using GtkSatList..." + +#: ../src/gtk-sat-module.c:553 +#, c-format +msgid "%s: Could not load config data from %s (%s)." +msgstr "%s: Could not load config data from %s (%s)." + +#: ../src/gtk-sat-module.c:563 +#, c-format +msgid "%s: Reading configuration from %s" +msgstr "%s: Reading configuration from %s" + +#: ../src/gtk-sat-module.c:607 +#, c-format +msgid "%s: Can not load default QTH file %s; using built-in defaults" +msgstr "%s: Can not load default QTH file %s; using built-in defaults" + +#. 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 "Error" + +#: ../src/gtk-sat-module.c:681 ../src/mod-cfg.c:578 +#, c-format +msgid "%s: Failed to get list of satellites (%s)" +msgstr "%s: Failed to get list of satellites (%s)" + +#: ../src/gtk-sat-module.c:703 +#, c-format +msgid "%s: Error reading data for #%d" +msgstr "%s: Error reading data for #%d" + +#: ../src/gtk-sat-module.c:727 +#, c-format +msgid "%s: Read data for #%d" +msgstr "%s: Read data for #%d" + +#: ../src/gtk-sat-module.c:734 +#, c-format +msgid "%s: Sat #%d already in list" +msgstr "%s: Sat #%d already in list" + +#: ../src/gtk-sat-module.c:745 +#, c-format +msgid "%s: Read %d out of %d satellites" +msgstr "%s: Read %d out of %d satellites" + +#: ../src/gtk-sat-module.c:783 +#, c-format +msgid "%s: Previous cycle missed it's deadline." +msgstr "%s: Previous cycle missed it's deadline." + +#: ../src/gtk-sat-module.c:927 ../src/gtk-sat-module.c:1564 +#, c-format +msgid "%f:%d: Unknown child type" +msgstr "%f:%d: Unknown child type" + +#: ../src/gtk-sat-module.c:1087 +#, c-format +msgid "%s: Module %s recevied CLOSE signal." +msgstr "%s: Module %s recevied CLOSE signal." + +#: ../src/gtk-sat-module.c:1097 +#, c-format +msgid "%s: Module %s is in DOCKED state." +msgstr "%s: Module %s is in DOCKED state." + +#: ../src/gtk-sat-module.c:1104 ../src/gtk-sat-module.c:1120 +#: ../src/gtk-sat-module.c:1148 +#, c-format +msgid "" +"%s: Module %s was not found in mod-mgr (%d)\n" +"Internal state is corrupt?" +msgstr "" +"%s: Module %s was not found in mod-mgr (%d)\n" +"Internal state is corrupt?" + +#: ../src/gtk-sat-module.c:1113 +#, c-format +msgid "%s: Module %s is in WINDOW state." +msgstr "%s: Module %s is in WINDOW state." + +#: ../src/gtk-sat-module.c:1141 +#, c-format +msgid "%s: Module %s is in FULLSCREEN state." +msgstr "%s: Module %s is in FULLSCREEN state." + +#: ../src/gtk-sat-module.c:1170 ../src/gtk-sat-module.c:1342 +#, c-format +msgid "%s: Module %s has unknown state: %d" +msgstr "%s: Module %s has unknown state: %d" + +#: ../src/gtk-sat-module.c:1179 +#, c-format +msgid "%s: Module %s closed." +msgstr "%s: Module %s closed." + +#: ../src/gtk-sat-module.c:1220 +#, c-format +msgid "%s: Module %s recevied CONFIG signal." +msgstr "%s: Module %s recevied CONFIG signal." + +#: ../src/gtk-sat-module.c:1229 +#, c-format +msgid "" +"%s: Could not stop timeout callback\n" +"%s: Source ID %d seems invalid." +msgstr "" +"%s: Could not stop timeout callback\n" +"%s: Source ID %d seems invalid." + +#: ../src/gtk-sat-module.c:1247 +#, c-format +msgid "%s: Module configuration failed for some reason." +msgstr "%s: Module configuration failed for some reason." + +#: ../src/gtk-sat-module.c:1510 +#, c-format +msgid "%s: Reloading satellites for module %s" +msgstr "%s: Reloading satellites for module %s" + +#: ../src/gtk-sat-module-popup.c:90 +#, c-format +msgid "%s:%d: %s called with NULL parameter!" +msgstr "%s:%d: %s called with NULL parameter!" + +#: ../src/gtk-sat-module-popup.c:100 +msgid "Detach module" +msgstr "Detach module" + +#: ../src/gtk-sat-module-popup.c:111 +msgid "Attach module" +msgstr "Attach module" + +#: ../src/gtk-sat-module-popup.c:124 +msgid "Leave fullscreen" +msgstr "Leave fullscreen" + +#: ../src/gtk-sat-module-popup.c:133 +msgid "Fullscreen" +msgstr "Fullscreen" + +#. sky at a glance +#: ../src/gtk-sat-module-popup.c:147 +msgid "Sky at a glance" +msgstr "Sky at a glance" + +#. time manager +#: ../src/gtk-sat-module-popup.c:157 ../src/gtk-sat-module-tmg.c:261 +msgid "Time Controller" +msgstr "Time Controller" + +#. Radio Control +#: ../src/gtk-sat-module-popup.c:170 +msgid "Radio Control" +msgstr "Radio Control" + +#. Antenna Control +#: ../src/gtk-sat-module-popup.c:179 +msgid "Antenna Control" +msgstr "Antenna Control" + +#. configure +#: ../src/gtk-sat-module-popup.c:192 +msgid "Configure" +msgstr "Configure" + +#. clone +#: ../src/gtk-sat-module-popup.c:201 +msgid "Clone..." +msgstr "Clone..." + +#. delete module +#: ../src/gtk-sat-module-popup.c:214 ../src/sat-pref-qth.c:490 +#: ../src/sat-pref-rig.c:342 ../src/sat-pref-rot.c:307 +msgid "Delete" +msgstr "Delete" + +#. close +#: ../src/gtk-sat-module-popup.c:223 +msgid "Close" +msgstr "Close" + +#: ../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 "" +"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." + +#. icon file name +#. window title +#: ../src/gtk-sat-module-popup.c:298 +msgid "Clone Module" +msgstr "Clone Module" + +#. label +#: ../src/gtk-sat-module-popup.c:310 +msgid "Name of new module:" +msgstr "Name of new module:" + +#: ../src/gtk-sat-module-popup.c:319 ../src/mod-cfg.c:515 +msgid "" +"Enter a short name for this module.\n" +"Allowed characters: 0..9, a..z, A..Z, - and _" +msgstr "" +"Enter a short name for this module.\n" +"Allowed characters: 0..9, a..z, A..Z, - and _" + +#: ../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 characters." +msgstr "" +"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 characters." + +#. check button +#: ../src/gtk-sat-module-popup.c:338 +msgid "Open module when created" +msgstr "Open module when created" + +#: ../src/gtk-sat-module-popup.c:342 +msgid "If checked, the new module will be opened after it has been created" +msgstr "If checked, the new module will be opened after it has been created" + +#: ../src/gtk-sat-module-popup.c:358 +#, c-format +msgid "%s:%d: Cloning %s => %s" +msgstr "%s:%d: Cloning %s => %s" + +#: ../src/gtk-sat-module-popup.c:376 +#, c-format +msgid "%s:%d: Failed to clone %s." +msgstr "%s:%d: Failed to clone %s." + +#: ../src/gtk-sat-module-popup.c:381 +#, c-format +msgid "%s:%d: Successfully cloned %s." +msgstr "%s:%d: Successfully cloned %s." + +#: ../src/gtk-sat-module-popup.c:466 +#, c-format +msgid "%s:%d: Cloning cancelled by user." +msgstr "%s:%d: Cloning cancelled by user." + +#: ../src/gtk-sat-module-popup.c:472 +#, c-format +msgid "%s:%d: Cloning interrupted." +msgstr "%s:%d: Cloning interrupted." + +#: ../src/gtk-sat-module-popup.c:659 ../src/gtk-sat-module-popup.c:802 +#, c-format +msgid "%s:%d: Unknown module state: %d" +msgstr "%s:%d: Unknown module state: %d" + +#: ../src/gtk-sat-module-popup.c:828 +#, c-format +msgid "The sky at a glance (%s)" +msgstr "The sky at a glance (%s)" + +#: ../src/gtk-sat-module-popup.c:894 +msgid "" +"You have no radio configuration!\n" +"Please configure a radio first." +msgstr "" +"You have no radio configuration!\n" +"Please configure a radio first." + +#: ../src/gtk-sat-module-popup.c:907 +#, c-format +msgid "Gpredict Radio Control: %s" +msgstr "Gpredict Radio Control: %s" + +#: ../src/gtk-sat-module-popup.c:967 +msgid "" +"You have no rotator configuration!\n" +"Please configure an antenna rotator first." +msgstr "" +"You have no rotator configuration!\n" +"Please configure an antenna rotator first." + +#: ../src/gtk-sat-module-popup.c:980 +#, c-format +msgid "Gpredict Rotator Control: %s" +msgstr "Gpredict Rotator Control: %s" + +#: ../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 "" +"This operation will permanently delete\n" +"<b>%s</b>\n" +"from the disk.\n" +"Do you you want to proceed?" + +#: ../src/gtk-sat-module-popup.c:1076 +#, c-format +msgid "%s:%d: Failed to delete %s." +msgstr "%s:%d: Failed to delete %s." + +#: ../src/gtk-sat-module-popup.c:1081 +#, c-format +msgid "%s:%d: %s deleted permanently." +msgstr "%s:%d: %s deleted permanently." + +#: ../src/gtk-sat-module-tmg.c:70 +#, c-format +msgid "%s: Time Controller for %s is already active" +msgstr "%s: Time Controller for %s is already active" + +#: ../src/gtk-sat-module-tmg.c:94 +msgid "Play forward" +msgstr "Play forward" + +#: ../src/gtk-sat-module-tmg.c:104 +msgid "Stop" +msgstr "Stop" + +#: ../src/gtk-sat-module-tmg.c:115 +msgid "Play backwards" +msgstr "Play backwards" + +#. reset time +#. reset button +#: ../src/gtk-sat-module-tmg.c:120 ../src/sat-pref-conditions.c:427 +#: ../src/sat-pref-single-sat.c:222 ../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:348 +msgid "Reset" +msgstr "Reset" + +#: ../src/gtk-sat-module-tmg.c:122 +msgid "Reset to current date and time" +msgstr "Reset to current date and time" + +#: ../src/gtk-sat-module-tmg.c:129 ../src/gtk-sat-module-tmg.c:576 +msgid "<b>Real-Time</b>" +msgstr "<b>Real-Time</b>" + +#. hour +#: ../src/gtk-sat-module-tmg.c:149 +msgid " Hour:" +msgstr " Hour:" + +#: ../src/gtk-sat-module-tmg.c:161 +msgid "Use this control to set the hour" +msgstr "Use this control to set the hour" + +#. minutes +#: ../src/gtk-sat-module-tmg.c:169 +msgid " Min:" +msgstr " Min:" + +#: ../src/gtk-sat-module-tmg.c:181 +msgid "Use this control to set the minutes" +msgstr "Use this control to set the minutes" + +#. seconds +#: ../src/gtk-sat-module-tmg.c:189 +msgid " Sec:" +msgstr " Sec:" + +#: ../src/gtk-sat-module-tmg.c:201 +msgid "Use this control to set the seconds" +msgstr "Use this control to set the seconds" + +#. milliseconds +#: ../src/gtk-sat-module-tmg.c:209 +msgid " Msec:" +msgstr " Msec:" + +#: ../src/gtk-sat-module-tmg.c:221 +msgid "Use this control to set the milliseconds" +msgstr "Use this control to set the milliseconds" + +#. time throttle +#: ../src/gtk-sat-module-tmg.c:229 +msgid "Throttle:" +msgstr "Throttle:" + +#: ../src/gtk-sat-module-tmg.c:241 +msgid "Time throttle / compression factor" +msgstr "Time throttle / compression factor" + +#: ../src/gtk-sat-module-tmg.c:282 +#, c-format +msgid "%s: Time Controller for %s launched" +msgstr "%s: Time Controller for %s launched" + +#: ../src/gtk-sat-module-tmg.c:313 +#, c-format +msgid "%s: Time Controller for %s closed. Time reset." +msgstr "%s: Time Controller for %s closed. Time reset." + +#: ../src/gtk-sat-module-tmg.c:483 +#, c-format +msgid "%s: %d/%d/%d %d:%d:%d.%d" +msgstr "%s: %d/%d/%d %d:%d:%d.%d" + +#: ../src/gtk-sat-module-tmg.c:567 +msgid "<b>Simulated Real-Time</b>" +msgstr "<b>Simulated Real-Time</b>" + +#: ../src/gtk-sat-module-tmg.c:571 +msgid "<b>Manual Control</b>" +msgstr "<b>Manual Control</b>" + +#: ../src/gtk-sat-tree.c:231 +msgid "Epoch" +msgstr "Epoch" + +#: ../src/gtk-sat-tree.c:244 +msgid "Selected" +msgstr "Selected" + +#. expand and collabse buttons +#: ../src/gtk-sat-tree.c:266 +msgid "Expand" +msgstr "Expand" + +#: ../src/gtk-sat-tree.c:269 +msgid "Expand all nodes in the tree to make it searchable" +msgstr "Expand all nodes in the tree to make it searchable" + +#: ../src/gtk-sat-tree.c:273 +msgid "Collapse" +msgstr "Collapse" + +#: ../src/gtk-sat-tree.c:276 +msgid "Collapse all nodes in the tree" +msgstr "Collapse all nodes in the tree" + +#: ../src/gtk-sat-tree.c:332 +#, c-format +msgid "%s:%d: Directory is: %s" +msgstr "%s:%d: Directory is: %s" + +#: ../src/gtk-sat-tree.c:340 +#, c-format +msgid "%s:%d: No .tle files found in %s." +msgstr "%s:%d: No .tle files found in %s." + +#: ../src/gtk-sat-tree.c:378 +#, c-format +msgid "%s:%d: Read %d sats from %s " +msgstr "%s:%d: Read %d sats from %s " + +#: ../src/gtk-sat-tree.c:420 +#, c-format +msgid "%s:%d: Failed to open %s (%s)" +msgstr "%s:%d: Failed to open %s (%s)" + +#: ../src/gtk-sat-tree.c:521 ../src/gtk-sat-tree.c:654 +#, c-format +msgid "%s:%d: Satellite %d selected." +msgstr "%s:%d: Satellite %d selected." + +#: ../src/gtk-sat-tree.c:537 ../src/gtk-sat-tree.c:659 +#, c-format +msgid "%s:%d: Satellite %d already selected; skip..." +msgstr "%s:%d: Satellite %d already selected; skip..." + +#: ../src/gtk-sat-tree.c:545 +#, c-format +msgid "%s:%d: Satellite %d de-selected." +msgstr "%s:%d: Satellite %d de-selected." + +#: ../src/gtk-sat-tree.c:581 ../src/gtk-sat-tree.c:734 +#, c-format +msgid "%s: Invalid GtkSatTree!" +msgstr "%s: Invalid GtkSatTree!" + +#: ../src/gtk-sat-tree.c:603 +#, c-format +msgid "%s: Satellite %d already selected; skip..." +msgstr "%s: Satellite %d already selected; skip..." + +#: ../src/gtk-sat-tree.c:745 +#, c-format +msgid "%s: There are no satellites selected => NULL." +msgstr "%s: There are no satellites selected => NULL." + +#. 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 "Location" + +#: ../src/loc-tree.c:205 +msgid "WX" +msgstr "WX" + +#: ../src/loc-tree.c:221 +msgid "X" +msgstr "X" + +#. dialog window +#: ../src/loc-tree.c:258 +msgid "Select Location" +msgstr "Select Location" + +#: ../src/loc-tree.c:293 +#, c-format +msgid "%s: Selected %s" +msgstr "%s: Selected %s" + +#: ../src/loc-tree.c:304 +#, c-format +msgid "%s: No location selected" +msgstr "%s: No location selected" + +#: ../src/loc-tree.c:354 +#, c-format +msgid "%s: %s does not exist!" +msgstr "%s: %s does not exist!" + +#: ../src/loc-tree.c:445 +#, c-format +msgid "%s: Read %d cities." +msgstr "%s: Read %d cities." + +#: ../src/loc-tree.c:463 +#, c-format +msgid "%s: Failed to open locfile (%s)" +msgstr "%s: Failed to open locfile (%s)" + +#: ../src/loc-tree.c:522 +#, c-format +msgid "%s: Invalid column: %d" +msgstr "%s: Invalid column: %d" + +#: ../src/loc-tree.c:670 +#, c-format +msgid "%s: Failed to get parent for %s." +msgstr "%s: Failed to get parent for %s." + +#: ../src/loc-tree.c:684 +#, c-format +msgid "%s: No selection found!" +msgstr "%s: No selection found!" + +#: ../src/main.c:61 +msgid "just to have a pot" +msgstr "just to have a pot" + +#: ../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 "" +"%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" + +#: ../src/main.c:124 +#, c-format +msgid "%s: TLE check failed! This is fatal." +msgstr "%s: TLE check failed! This is fatal." + +#: ../src/main.c:427 +#, c-format +msgid "%s: Time threshold has been passed." +msgstr "%s: Time threshold has been passed." + +#: ../src/main.c:435 +#, c-format +msgid "%s: Starting new update thread." +msgstr "%s: Starting new update thread." + +#: ../src/main.c:445 +#, c-format +msgid "%s: Failed to create TLE update thread (%s)" +msgstr "%s: Failed to create TLE update thread (%s)" + +#: ../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 "" +"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." + +#: ../src/main.c:486 +#, c-format +msgid "%s: Could not find TLE monitoring task (ID = %d)" +msgstr "%s: Could not find TLE monitoring task (ID = %d)" + +#: ../src/menubar.c:88 +msgid "_File" +msgstr "_File" + +#: ../src/menubar.c:89 +msgid "_Edit" +msgstr "_Edit" + +#: ../src/menubar.c:90 +msgid "_Update TLE" +msgstr "_Update TLE" + +#: ../src/menubar.c:91 +msgid "_Tools" +msgstr "_Tools" + +#: ../src/menubar.c:92 +msgid "_Help" +msgstr "_Help" + +#. File menu +#: ../src/menubar.c:95 +msgid "_New module" +msgstr "_New module" + +#: ../src/menubar.c:96 +msgid "Create a new module" +msgstr "Create a new module" + +#: ../src/menubar.c:97 +msgid "_Open module" +msgstr "_Open module" + +#: ../src/menubar.c:98 +msgid "Open an existing module" +msgstr "Open an existing module" + +#: ../src/menubar.c:100 +msgid "Open the message log browser" +msgstr "Open the message log browser" + +#: ../src/menubar.c:101 +msgid "E_xit" +msgstr "E_xit" + +#: ../src/menubar.c:102 +msgid "Exit the program" +msgstr "Exit the program" + +#. Edit menu +#. { "Tle", GTK_STOCK_REFRESH, N_("Update TLE"), NULL, +#. N_("Update Keplerian elements"), NULL}, +#: ../src/menubar.c:107 +msgid "From _network" +msgstr "From _network" + +#: ../src/menubar.c:108 +msgid "Update Keplerian elements from a network server" +msgstr "Update Keplerian elements from a network server" + +#: ../src/menubar.c:110 +msgid "From l_ocal files" +msgstr "From l_ocal files" + +#: ../src/menubar.c:111 +msgid "Update Keplerian elements from local files" +msgstr "Update Keplerian elements from local files" + +#: ../src/menubar.c:113 +msgid "Using TLE _editor" +msgstr "Using TLE _editor" + +#: ../src/menubar.c:114 +msgid "Add or update Keplerian elements using the TLE editor" +msgstr "Add or update Keplerian elements using the TLE editor" + +#: ../src/menubar.c:116 +msgid "_Transponders" +msgstr "_Transponders" + +#: ../src/menubar.c:117 +msgid "Edit satellite transponder frequencies" +msgstr "Edit satellite transponder frequencies" + +#: ../src/menubar.c:119 +msgid "_Preferences" +msgstr "_Preferences" + +#: ../src/menubar.c:120 +msgid "Edit user preferences" +msgstr "Edit user preferences" + +#. Tools menu +#: ../src/menubar.c:123 +msgid "Comm Window" +msgstr "Comm Window" + +#: ../src/menubar.c:124 +msgid "Predict windows between two observers" +msgstr "Predict windows between two observers" + +#: ../src/menubar.c:126 +msgid "Advanced Predict" +msgstr "Advanced Predict" + +#: ../src/menubar.c:127 +msgid "Open advanced pass predictor" +msgstr "Open advanced pass predictor" + +#. Help menu +#: ../src/menubar.c:130 +msgid "Getting Started" +msgstr "Getting Started" + +#: ../src/menubar.c:131 +msgid "Show online user manual, Getting Started Section" +msgstr "Show online user manual, Getting Started Section" + +#: ../src/menubar.c:133 +msgid "User Manual" +msgstr "User Manual" + +#: ../src/menubar.c:134 +msgid "Show online user manual" +msgstr "Show online user manual" + +#: ../src/menubar.c:135 +msgid "_License" +msgstr "_License" + +#: ../src/menubar.c:136 +msgid "Show the Gpredict license" +msgstr "Show the Gpredict license" + +#: ../src/menubar.c:137 +msgid "_News" +msgstr "_News" + +#: ../src/menubar.c:138 +msgid "Show what's new in this release" +msgstr "Show what's new in this release" + +#: ../src/menubar.c:139 +msgid "_About Gpredict" +msgstr "_About Gpredict" + +#: ../src/menubar.c:140 +msgid "Show about dialog" +msgstr "Show about dialog" + +#: ../src/menubar.c:230 +#, c-format +msgid "Failed to build menubar: %s" +msgstr "Failed to build menubar: %s" + +#: ../src/menubar.c:267 +#, c-format +msgid "%s: Starting new module configurator..." +msgstr "%s: Starting new module configurator..." + +#: ../src/menubar.c:274 +#, c-format +msgid "%s: New module name is %s." +msgstr "%s: New module name is %s." + +#: ../src/menubar.c:295 ../src/menubar.c:363 +#, c-format +msgid "Could not open %s. Please examine the log messages for details." +msgstr "Could not open %s. Please examine the log messages for details." + +#: ../src/menubar.c:319 +#, c-format +msgid "%s: New module config cancelled." +msgstr "%s: New module config cancelled." + +#: ../src/menubar.c:335 +#, c-format +msgid "%s: Open existing module..." +msgstr "%s: Open existing module..." + +#: ../src/menubar.c:342 +#, c-format +msgid "%s: Open module %s." +msgstr "%s: Open module %s." + +#: ../src/menubar.c:401 +#, c-format +msgid "%s: Open module cancelled." +msgstr "%s: Open module cancelled." + +#. create new dialog with progress indicator +#: ../src/menubar.c:456 ../src/menubar.c:626 ../src/sat-pref-general.c:61 +msgid "TLE Update" +msgstr "TLE Update" + +#: ../src/menubar.c:477 +msgid "<b>Updating TLE files from network</b>" +msgstr "<b>Updating TLE files from network</b>" + +#. statistics +#: ../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 "" +"Satellites updated:\t 0\n" +"Satellites skipped:\t 0\n" +"Missing Satellites:\t 0\n" + +#: ../src/menubar.c:516 ../src/menubar.c:686 +msgid "Finished" +msgstr "Finished" + +#. create file chooser +#: ../src/menubar.c:569 +msgid "Select directory" +msgstr "Select directory" + +#. create label +#: ../src/menubar.c:575 +msgid "Select TLE directory:" +msgstr "Select TLE directory:" + +#. create the dalog +#: ../src/menubar.c:584 +msgid "Update TLE from files" +msgstr "Update TLE from files" + +#: ../src/menubar.c:619 +#, c-format +msgid "%s: Running TLE update from %s" +msgstr "%s: Running TLE update from %s" + +#: ../src/menubar.c:646 +msgid "<b>Updating TLE files from files</b>" +msgstr "<b>Updating TLE files from files</b>" + +#: ../src/menubar.c:714 ../src/menubar.c:738 ../src/menubar.c:759 +msgid "This function is still under development." +msgstr "This function is still under development." + +#: ../src/menubar.c:845 +#, c-format +msgid "%s:%s: Scanning directory %s for modules." +msgstr "%s:%s: Scanning directory %s for modules." + +#: ../src/menubar.c:868 +#, c-format +msgid "%s:%d: Failed to open module dir %s (%s)" +msgstr "%s:%d: Failed to open module dir %s (%s)" + +#: ../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 "" +"You do not have any modules set up yet. Please use File->New in order to " +"create a module." + +#: ../src/menubar.c:901 +msgid "Module" +msgstr "Module" + +#. create dialog +#: ../src/menubar.c:909 +msgid "Select a module" +msgstr "Select a module" + +#: ../src/menubar.c:936 +#, c-format +msgid "%s:%s: Selected module is: %s" +msgstr "%s:%s: Selected module is: %s" + +#: ../src/menubar.c:941 +#, c-format +msgid "%s:%s: No selection is list of modules." +msgstr "%s:%s: No selection is list of modules." + +#: ../src/mod-cfg.c:148 +#, c-format +msgid "%s: Already have module %s. Ask user to confirm..." +msgstr "%s: Already have module %s. Ask user to confirm..." + +#: ../src/mod-cfg.c:157 +#, c-format +msgid "" +"There is already a module called %s.\n" +"Do you want to overwrite this module?" +msgstr "" +"There is already a module called %s.\n" +"Do you want to overwrite this module?" + +#: ../src/mod-cfg.c:183 +#, c-format +msgid "%s: Error while saving module data (%d)." +msgstr "%s: Error while saving module data (%d)." + +#: ../src/mod-cfg.c:194 ../src/mod-cfg.c:283 +#, c-format +msgid "%s: User tried to create module with no sats." +msgstr "%s: User tried to create module with no sats." + +#: ../src/mod-cfg.c:206 ../src/mod-cfg.c:294 +msgid "Please select at least one satellite from the list." +msgstr "Please select at least one satellite from the list." + +#: ../src/mod-cfg.c:344 +#, c-format +msgid "%s: Attempt to save data to empty file name." +msgstr "%s: Attempt to save data to empty file name." + +#: ../src/mod-cfg.c:351 +#, c-format +msgid "%s: Attempt to save NULL data." +msgstr "%s: Attempt to save NULL data." + +#: ../src/mod-cfg.c:362 ../src/sat-cfg.c:305 +#, c-format +msgid "%s: Could not create config data (%s)." +msgstr "%s: Could not create config data (%s)." + +#: ../src/mod-cfg.c:380 ../src/sat-cfg.c:324 +#, c-format +msgid "%s: Could not create config file (%s)." +msgstr "%s: Could not create config file (%s)." + +#: ../src/mod-cfg.c:399 ../src/sat-cfg.c:343 +#, c-format +msgid "%s: Error writing config data (%s)." +msgstr "%s: Error writing config data (%s)." + +#: ../src/mod-cfg.c:408 ../src/sat-cfg.c:352 +#, c-format +msgid "%s: Wrote only %d out of %d chars." +msgstr "%s: Wrote only %d out of %d chars." + +#: ../src/mod-cfg.c:415 +#, c-format +ms... [truncated message content] |
From: <fi...@us...> - 2009-08-05 08:53:57
|
Revision: 357 http://gpredict.svn.sourceforge.net/gpredict/?rev=357&view=rev Author: fillods Date: 2009-08-05 08:53:47 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Spelling corrections by Michael Stephenson Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rot-ctrl.c trunk/src/gtk-sat-module-popup.c trunk/src/mod-cfg.c trunk/src/qth-editor.c trunk/src/sat-pref-qth-editor.c trunk/src/sat-pref-rig-editor.c trunk/src/sat-pref-rot-editor.c trunk/src/save-pass.c trunk/src/trsp-conf.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/ChangeLog 2009-08-05 08:53:47 UTC (rev 357) @@ -1,3 +1,21 @@ +2009-08-05 Michael Stephenson <mickstephenson at googlemail.com> + + * src/gtk-sat-module-popup.c: + * src/sat-pref-rot-editor.c: + * src/trsp-conf.c: + * src/save-pass.c: + * src/sat-pref-qth-editor.c: + * src/gtk-rig-ctrl.c: + * src/mod-cfg.c: + * src/qth-editor.c: + * src/sat-pref-rig-editor.c: + * src/gtk-rot-ctrl.c: + Spelling corrections. + + * po/en_US.po: + * po/en_GB.po: + US and British translations. + 2009-08-04 Alexandru Csete <oz9aec at gmail.com> * data/satdata/*.sat: Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/gtk-rig-ctrl.c 2009-08-05 08:53:47 UTC (rev 357) @@ -741,7 +741,7 @@ /* Engage button */ ctrl->LockBut = gtk_toggle_button_new_with_label (_("Engage")); - gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selcted radio device")); + gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selected radio device")); g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rig_engaged_cb), ctrl); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1); Modified: trunk/src/gtk-rot-ctrl.c =================================================================== --- trunk/src/gtk-rot-ctrl.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/gtk-rot-ctrl.c 2009-08-05 08:53:47 UTC (rev 357) @@ -524,7 +524,7 @@ /* Engage button */ ctrl->LockBut = gtk_toggle_button_new_with_label (_("Engage")); - gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selcted rotor device")); + gtk_widget_set_tooltip_text (ctrl->LockBut, _("Engage the selected rotor device")); g_signal_connect (ctrl->LockBut, "toggled", G_CALLBACK (rot_locked_cb), ctrl); gtk_table_attach_defaults (GTK_TABLE (table), ctrl->LockBut, 2, 3, 0, 1); Modified: trunk/src/gtk-sat-module-popup.c =================================================================== --- trunk/src/gtk-sat-module-popup.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/gtk-sat-module-popup.c 2009-08-05 08:53:47 UTC (rev 357) @@ -317,10 +317,10 @@ tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, entry, _("Enter a short name for this module.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("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.")); + "Max length is 25 characters.")); /* attach changed signal so that we can enable OK button when a proper name has been entered @@ -656,7 +656,7 @@ default: sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Unknown module satate: %d"), + _("%s:%d: Unknown module state: %d"), __FILE__, __LINE__, GTK_SAT_MODULE (module)->state); break; @@ -799,7 +799,7 @@ default: sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Unknown module satate: %d"), + _("%s:%d: Unknown module state: %d"), __FILE__, __LINE__, GTK_SAT_MODULE (module)->state); break; Modified: trunk/src/mod-cfg.c =================================================================== --- trunk/src/mod-cfg.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/mod-cfg.c 2009-08-05 08:53:47 UTC (rev 357) @@ -513,10 +513,10 @@ tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, namew, _("Enter a short name for this module.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("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.")); + "Max length is 25 characters.")); /* attach changed signal so that we can enable OK button when a proper name has been entered Modified: trunk/src/qth-editor.c =================================================================== --- trunk/src/qth-editor.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/qth-editor.c 2009-08-05 08:53:47 UTC (rev 357) @@ -205,10 +205,10 @@ tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, name, _("Enter a short name for this ground station, e.g. callsign.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the ground station "\ "when it is presented to the user. Maximum allowed length "\ - "is 25 charachters.")); + "is 25 characters.")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when Modified: trunk/src/sat-pref-qth-editor.c =================================================================== --- trunk/src/sat-pref-qth-editor.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/sat-pref-qth-editor.c 2009-08-05 08:53:47 UTC (rev 357) @@ -190,10 +190,10 @@ tooltips = gtk_tooltips_new (); gtk_tooltips_set_tip (tooltips, name, _("Enter a short name for this ground station, e.g. callsign.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _"), + "Allowed characters: 0..9, a..z, A..Z, - and _"), _("The name will be used to identify the ground station when "\ "it is presented to the user. Maximum allowed length "\ - "is 25 charachters.")); + "is 25 characters.")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when Modified: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/sat-pref-rig-editor.c 2009-08-05 08:53:47 UTC (rev 357) @@ -162,7 +162,7 @@ gtk_entry_set_max_length (GTK_ENTRY (name), 25); gtk_widget_set_tooltip_text (name, _("Enter a short name for this configuration, e.g. IC910-1.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _")); + "Allowed characters: 0..9, a..z, A..Z, - and _")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when Modified: trunk/src/sat-pref-rot-editor.c =================================================================== --- trunk/src/sat-pref-rot-editor.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/sat-pref-rot-editor.c 2009-08-05 08:53:47 UTC (rev 357) @@ -159,7 +159,7 @@ gtk_entry_set_max_length (GTK_ENTRY (name), 25); gtk_widget_set_tooltip_text (name, _("Enter a short name for this configuration, e.g. ROTOR-1.\n"\ - "Allowed charachters: 0..9, a..z, A..Z, - and _")); + "Allowed characters: 0..9, a..z, A..Z, - and _")); gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); /* attach changed signal so that we can enable OK button when Modified: trunk/src/save-pass.c =================================================================== --- trunk/src/save-pass.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/save-pass.c 2009-08-05 08:53:47 UTC (rev 357) @@ -688,7 +688,7 @@ g_io_channel_write_chars (chan, data, -1, &count, &err); if (err != NULL) { sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: An error occured while saving data to %s (%s)"), + _("%s: An error occurred while saving data to %s (%s)"), __FUNCTION__, fname, err->message); dialog = gtk_message_dialog_new (GTK_WINDOW (parent), @@ -696,7 +696,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("An error occured while saving data to %s\n\n%s"), + _("An error occurred while saving data to %s\n\n%s"), fname, err->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -704,7 +704,7 @@ } else { sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Written %d charaters to %s"), + _("%s: Written %d characters to %s"), __FUNCTION__, count, fname); } Modified: trunk/src/trsp-conf.c =================================================================== --- trunk/src/trsp-conf.c 2009-08-05 07:20:03 UTC (rev 356) +++ trunk/src/trsp-conf.c 2009-08-05 08:53:47 UTC (rev 357) @@ -98,7 +98,7 @@ trsp->uplow = g_key_file_get_double (cfg, groups[i], KEY_UP_LOW, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_UP_LOW, name); g_clear_error (&error); trsp->uplow = 0.0; @@ -107,7 +107,7 @@ trsp->uphigh = g_key_file_get_double (cfg, groups[i], KEY_UP_HIGH, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_UP_HIGH, name); g_clear_error (&error); trsp->uphigh = trsp->uplow; @@ -116,7 +116,7 @@ trsp->downlow = g_key_file_get_double (cfg, groups[i], KEY_DOWN_LOW, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_DOWN_LOW, name); g_clear_error (&error); trsp->downlow = 0.0; @@ -125,7 +125,7 @@ trsp->downhigh = g_key_file_get_double (cfg, groups[i], KEY_DOWN_HIGH, &error); if (error != NULL) { sat_log_log (SAT_LOG_LEVEL_WARN, - _("%s: Error reading %s:%s from %s. Using defult."), + _("%s: Error reading %s:%s from %s. Using default."), __FUNCTION__, groups[i], KEY_DOWN_HIGH, name); g_clear_error (&error); trsp->downhigh = trsp->downlow; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-05 07:20:15
|
Revision: 356 http://gpredict.svn.sourceforge.net/gpredict/?rev=356&view=rev Author: csete Date: 2009-08-05 07:20:03 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Sync Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-04 23:04:43 UTC (rev 355) +++ trunk/ChangeLog 2009-08-05 07:20:03 UTC (rev 356) @@ -13,7 +13,10 @@ * data/trsp/Makefile.am: Updated to take new data files and organization into account. + * src/compat.[ch]: + Changed functions to transition to new configuration files. + 2009-08-03 Alexandru Csete <oz9aec at gmail.com> * src/Makefile.am: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 23:04:51
|
Revision: 355 http://gpredict.svn.sourceforge.net/gpredict/?rev=355&view=rev Author: csete Date: 2009-08-04 23:04:43 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Fixed some late night typos. Modified Paths: -------------- trunk/src/compat.c Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2009-08-04 22:14:20 UTC (rev 354) +++ trunk/src/compat.c 2009-08-04 23:04:43 UTC (rev 355) @@ -222,7 +222,6 @@ dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, ".config", G_DIR_SEPARATOR_S, "Gpredict", NULL); - "icons", NULL); #endif #ifdef G_OS_WIN32 // FIXME: does this work? @@ -252,7 +251,7 @@ gchar *buff; buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, satdata, G_DIR_SEPARATOR_S, satfile, NULL); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "satdata", G_DIR_SEPARATOR_S, satfile, NULL); g_free (buff); return filename; @@ -269,7 +268,7 @@ gchar *buff; buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, trsp, G_DIR_SEPARATOR_S, trspfile, NULL); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "trsp", G_DIR_SEPARATOR_S, trspfile, NULL); g_free (buff); return filename; @@ -287,7 +286,7 @@ gchar *buff; buff = get_user_conf_dir (); - filename = g_strconcat (buff, G_DIR_SEPARATOR_S, hwconf, G_DIR_SEPARATOR_S, hwfile, NULL); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, "hwconf", G_DIR_SEPARATOR_S, hwfile, NULL); g_free (buff); return filename; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 22:14:31
|
Revision: 354 http://gpredict.svn.sourceforge.net/gpredict/?rev=354&view=rev Author: csete Date: 2009-08-04 22:14:20 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Changed functions to transition to new configuration files. Modified Paths: -------------- trunk/src/compat.c trunk/src/compat.h Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2009-08-04 20:32:35 UTC (rev 353) +++ trunk/src/compat.c 2009-08-04 22:14:20 UTC (rev 354) @@ -190,16 +190,106 @@ } -/** \brief Get user configuration directory. +/** \brief Get the old user configuration directory. * * On linux it corresponds to $HOME/.gpredict2 * The function returns a newly allocated gchar * which must be free when * it is no longer needed. */ -gchar *get_conf_dir (void) +gchar *get_old_conf_dir (void) { gchar *dir; dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, ".gpredict2", NULL); return dir; } + + +/** \brief Get user configuration directory. + * + * Linux: $HOME/.config/Gpredict + * Windows: C:\Documents and Settings\username\Gpredict + * Mac OS X: /home/username/Library/Application Support/Gpredict + * + * The function returns a newly allocated gchar * which must be free when + * it is no longer needed. + */ +gchar *get_user_conf_dir (void) +{ + gchar *dir = NULL; + +#ifdef G_OS_UNIX + dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, + ".config", G_DIR_SEPARATOR_S, + "Gpredict", NULL); + "icons", NULL); +#endif +#ifdef G_OS_WIN32 + // FIXME: does this work? + dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, + "Gpredict", NULL); +#endif +/* see gtk-osx.sourceforge.net -> Integration */ +#ifdef MAC_INTEGRATION + dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, + "Library", G_DIR_SEPARATOR_S, + "Application Support", G_DIR_SEPARATOR_S, + "Gpredict", NULL); +#endif + + return dir; + +} + + +/** \brief Get full path of a .sat or .cat file + * \param satfile The file name for the satellite + * \return A newly allocated gchar * that should be freed when no longer needed + */ +gchar *sat_file_name (const gchar *satfile) +{ + gchar *filename = NULL; + gchar *buff; + + buff = get_user_conf_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, satdata, G_DIR_SEPARATOR_S, satfile, NULL); + g_free (buff); + + return filename; + +} + +/** \brief Get full path of a .trsp file + * \param trspfile The file name for the satellite + * \return A newly allocated gchar * that should be freed when no longer needed + */ +gchar *trsp_file_name (const gchar *trspfile) +{ + gchar *filename = NULL; + gchar *buff; + + buff = get_user_conf_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, trsp, G_DIR_SEPARATOR_S, trspfile, NULL); + g_free (buff); + + return filename; + +} + + +/** \brief Get full path of a .rig or .rot file + * \param hwfile The file name for the configuration + * \return A newly allocated gchar * that should be freed when no longer needed + */ +gchar *hw_file_name (const gchar *hwfile) +{ + gchar *filename = NULL; + gchar *buff; + + buff = get_user_conf_dir (); + filename = g_strconcat (buff, G_DIR_SEPARATOR_S, hwconf, G_DIR_SEPARATOR_S, hwfile, NULL); + g_free (buff); + + return filename; + +} Modified: trunk/src/compat.h =================================================================== --- trunk/src/compat.h 2009-08-04 20:32:35 UTC (rev 353) +++ trunk/src/compat.h 2009-08-04 22:14:20 UTC (rev 354) @@ -32,10 +32,13 @@ gchar *get_data_dir (void); gchar *get_maps_dir (void); gchar *get_icon_dir (void); -gchar *get_conf_dir (void); +gchar *get_user_conf_dir (void); +gchar *get_old_conf_dir (void); gchar *map_file_name (const gchar *map); gchar *icon_file_name (const gchar *icon); gchar *data_file_name (const gchar *data); +gchar *sat_file_name (const gchar *satfile); +gchar *trsp_file_name (const gchar *trspfile); +gchar *hw_file_name (const gchar *hwfile); - #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 20:32:45
|
Revision: 353 http://gpredict.svn.sourceforge.net/gpredict/?rev=353&view=rev Author: csete Date: 2009-08-04 20:32:35 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-04 20:28:56 UTC (rev 352) +++ trunk/ChangeLog 2009-08-04 20:32:35 UTC (rev 353) @@ -1,3 +1,19 @@ +2009-08-04 Alexandru Csete <oz9aec at gmail.com> + + * data/satdata/*.sat: + * data/satdata/*.cat: + New satellite data files. Old TLE files removed. + + * data/trsp/*.trsp: + Moved TRSP files. + + * configure.ac: + * data/Makefile.am + * data/satdata/Makefile.am: + * data/trsp/Makefile.am: + Updated to take new data files and organization into account. + + 2009-08-03 Alexandru Csete <oz9aec at gmail.com> * src/Makefile.am: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 20:29:14
|
Revision: 352 http://gpredict.svn.sourceforge.net/gpredict/?rev=352&view=rev Author: csete Date: 2009-08-04 20:28:56 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Switch to new sat files. Modified Paths: -------------- trunk/configure.ac trunk/data/Makefile.am Added Paths: ----------- trunk/data/satdata/Makefile.am trunk/data/trsp/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-08-04 20:16:12 UTC (rev 351) +++ trunk/configure.ac 2009-08-04 20:28:56 UTC (rev 352) @@ -89,6 +89,8 @@ pixmaps/maps/Makefile pixmaps/icons/Makefile data/Makefile +data/satdata/Makefile +data/trsp/Makefile po/Makefile.in ]) Modified: trunk/data/Makefile.am =================================================================== --- trunk/data/Makefile.am 2009-08-04 20:16:12 UTC (rev 351) +++ trunk/data/Makefile.am 2009-08-04 20:28:56 UTC (rev 352) @@ -1,20 +1,8 @@ +SUBDIRS = satdata trsp gpredict_datdir = $(pkgdatadir)/data -gpredict_dat_DATA = \ - locations.dat sample.qth Amateur.mod \ - amateur.tle cubesat.tle galileo.tle geo.tle \ - gps-ops.tle iridium.tle military.tle \ - radar.tle science.tle weather.tle \ - 7530.trsp 22825.trsp 24278.trsp 25544.trsp \ - 27607.trsp 27848.trsp 28375.trsp 28650.trsp \ - 32785.trsp \ - 24786.trsp 25338.trsp 26352.trsp 26536.trsp \ - 26871.trsp 27453.trsp 28654.trsp \ - 20439.trsp 20442.trsp 22826.trsp 23439.trsp \ - 25397.trsp 26931.trsp 27844.trsp 27939.trsp \ - 28895.trsp 32787.trsp 32789.trsp 32791.trsp \ - 33493.trsp 33498.trsp 33499.trsp +gpredict_dat_DATA = locations.dat sample.qth Amateur.mod EXTRA_DIST = $(gpredict_dat_DATA) Added: trunk/data/satdata/Makefile.am =================================================================== --- trunk/data/satdata/Makefile.am (rev 0) +++ trunk/data/satdata/Makefile.am 2009-08-04 20:28:56 UTC (rev 352) @@ -0,0 +1,7 @@ + +gpredict_satdir = $(pkgdatadir)/data/satdata + +gpredict_sat_DATA = *.sat *.cat + +EXTRA_DIST = $(gpredict_sat_DATA) + Added: trunk/data/trsp/Makefile.am =================================================================== --- trunk/data/trsp/Makefile.am (rev 0) +++ trunk/data/trsp/Makefile.am 2009-08-04 20:28:56 UTC (rev 352) @@ -0,0 +1,7 @@ + +gpredict_trspdir = $(pkgdatadir)/data/trsp + +gpredict_trsp_DATA = *.trsp + +EXTRA_DIST = $(gpredict_trsp_DATA) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 20:16:20
|
Revision: 351 http://gpredict.svn.sourceforge.net/gpredict/?rev=351&view=rev Author: csete Date: 2009-08-04 20:16:12 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Moved TRSP files to separate folder. Added Paths: ----------- trunk/data/trsp/ trunk/data/trsp/20439.trsp trunk/data/trsp/20442.trsp trunk/data/trsp/22825.trsp trunk/data/trsp/22826.trsp trunk/data/trsp/23439.trsp trunk/data/trsp/24278.trsp trunk/data/trsp/24786.trsp trunk/data/trsp/25338.trsp trunk/data/trsp/25397.trsp trunk/data/trsp/25544.trsp trunk/data/trsp/26352.trsp trunk/data/trsp/26536.trsp trunk/data/trsp/26871.trsp trunk/data/trsp/26931.trsp trunk/data/trsp/27453.trsp trunk/data/trsp/27607.trsp trunk/data/trsp/27844.trsp trunk/data/trsp/27848.trsp trunk/data/trsp/27939.trsp trunk/data/trsp/28375.trsp trunk/data/trsp/28650.trsp trunk/data/trsp/28654.trsp trunk/data/trsp/28895.trsp trunk/data/trsp/32785.trsp trunk/data/trsp/32787.trsp trunk/data/trsp/32789.trsp trunk/data/trsp/32791.trsp trunk/data/trsp/33493.trsp trunk/data/trsp/33498.trsp trunk/data/trsp/33499.trsp trunk/data/trsp/7530.trsp Removed Paths: ------------- trunk/data/20439.trsp trunk/data/20442.trsp trunk/data/22825.trsp trunk/data/22826.trsp trunk/data/23439.trsp trunk/data/24278.trsp trunk/data/24786.trsp trunk/data/25338.trsp trunk/data/25397.trsp trunk/data/25544.trsp trunk/data/26352.trsp trunk/data/26536.trsp trunk/data/26871.trsp trunk/data/26931.trsp trunk/data/27453.trsp trunk/data/27607.trsp trunk/data/27844.trsp trunk/data/27848.trsp trunk/data/27939.trsp trunk/data/28375.trsp trunk/data/28650.trsp trunk/data/28654.trsp trunk/data/28895.trsp trunk/data/32785.trsp trunk/data/32787.trsp trunk/data/32789.trsp trunk/data/32791.trsp trunk/data/33493.trsp trunk/data/33498.trsp trunk/data/33499.trsp trunk/data/7530.trsp Deleted: trunk/data/20439.trsp =================================================================== --- trunk/data/20439.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/20439.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode V/U FM/SSB] -UP_LOW=145920000 -DOWN_LOW=437026000 Deleted: trunk/data/20442.trsp =================================================================== --- trunk/data/20442.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/20442.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode U TLM] -DOWN_LOW=437125000 -MODE=CW Deleted: trunk/data/22825.trsp =================================================================== --- trunk/data/22825.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/22825.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode V/U FM] -UP_LOW=145850000 -DOWN_LOW=436795000 Deleted: trunk/data/22826.trsp =================================================================== --- trunk/data/22826.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/22826.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,2 +0,0 @@ -[Mode -/U BPSK] -DOWN_LOW=435790000 Deleted: trunk/data/23439.trsp =================================================================== --- trunk/data/23439.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/23439.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode H TLM] -DOWN_LOW=29352000 -MODE=CARRIER Deleted: trunk/data/24278.trsp =================================================================== --- trunk/data/24278.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/24278.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,9 +0,0 @@ -[Mode V/U Linear] -UP_LOW=145900000 -UP_HIGH=146000000 -DOWN_LOW=435800000 -DOWN_HIGH=435900000 -INVERT=true - -[Mode U CW Beacon] -DOWN_LOW=435795000 Deleted: trunk/data/24786.trsp =================================================================== --- trunk/data/24786.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/24786.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[LRIT] -DOWN_LOW=1691000000 - -[GVAR PDUS] -DOWN_LOW=1685700000 - Deleted: trunk/data/25338.trsp =================================================================== --- trunk/data/25338.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/25338.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[APT] -DOWN_LOW=137500000 - -[HRPT] -DOWN_LOW=1702500000 - Deleted: trunk/data/25397.trsp =================================================================== --- trunk/data/25397.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/25397.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,23 +0,0 @@ -[Mode V/U APRS,BBS 9K6 FSK] -UP_LOW=145930000 -DOWN_LOW=435225000 - -[Mode V/U BBS1 9K6 FSK] -UP_LOW=145850000 -DOWN_LOW=435225000 - -[Mode V/U BBS2 9K6 FSK] -UP_LOW=145890000 -DOWN_LOW=435225000 - -[Mode L/U BBS 9K6 FSK] -UP_LOW=1269700000 -DOWN_LOW=435225000 - -[Mode L/U BBS 9K6 FSK] -UP_LOW=1269800000 -DOWN_LOW=435225000 - -[Mode L/U BBS 9K6 FSK] -UP_LOW=1269900000 -DOWN_LOW=435225000 Deleted: trunk/data/25544.trsp =================================================================== --- trunk/data/25544.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/25544.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,33 +0,0 @@ -[Mode V/V AFSK Packet] -UP_LOW=145990000 -DOWN_LOW=145800000 -MODE=AFSK 1200 bps - -[Mode V/U FM Voice] -UP_LOW=145800000 -DOWN_LOW=437800000 -MODE=FM - -[Mode V APRS] -UP_LOW=145825000 -DOWN_LOW=145825000 -MODE=FM 1200 bps - -[Mode V Imaging] -DOWN_LOW=145800000 -MODE=SSTV in FM carrier - -[Mode U/V FM Voice] -UP_LOW=437800000 -DOWN_LOW=145800000 -MODE=FM - -[Mode V/V FM (crew R2+3)] -UP_LOW=144490000 -DOWN_LOW=145800000 -MODE=FM - -[Mode V/V FM (crew R1)] -UP_LOW=145200000 -DOWN_LOW=145800000 -MODE=FM Deleted: trunk/data/26352.trsp =================================================================== --- trunk/data/26352.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/26352.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[LRIT] -DOWN_LOW=1691000000 - -[GVAR PDUS] -DOWN_LOW=1685700000 - Deleted: trunk/data/26536.trsp =================================================================== --- trunk/data/26536.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/26536.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[HRPT] -DOWN_LOW=1702500000 - Deleted: trunk/data/26871.trsp =================================================================== --- trunk/data/26871.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/26871.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[LRIT] -DOWN_LOW=1691000000 - -[GVAR PDUS] -DOWN_LOW=1685700000 - Deleted: trunk/data/26931.trsp =================================================================== --- trunk/data/26931.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/26931.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode V/V APRS AFSK] -UP_LOW=145825000 -DOWN_LOW=145825000 Deleted: trunk/data/27453.trsp =================================================================== --- trunk/data/27453.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/27453.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[APT] -DOWN_LOW=137620000 - -[HRPT] -DOWN_LOW=1707000000 - Deleted: trunk/data/27607.trsp =================================================================== --- trunk/data/27607.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/27607.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,4 +0,0 @@ -[Mode V/U FM Voice] -DOWN_LOW=436795000 -UP_LOW=145850000 -MODE=FM, PL 67.0 Hz \ No newline at end of file Deleted: trunk/data/27844.trsp =================================================================== --- trunk/data/27844.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/27844.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,4 +0,0 @@ -[Mode U TLM] -DOWN_LOW=436837500 -MODE=CW - Deleted: trunk/data/27848.trsp =================================================================== --- trunk/data/27848.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/27848.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,5 +0,0 @@ -[Mode U CW Beacon] -DOWN_LOW=436847500 - -[Mode U AFSK TLM] -DOWN_LOW=437490000 Deleted: trunk/data/27939.trsp =================================================================== --- trunk/data/27939.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/27939.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,4 +0,0 @@ -[Mode U CW Beacon] -DOWN_LOW=435352000 - - Deleted: trunk/data/28375.trsp =================================================================== --- trunk/data/28375.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/28375.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,23 +0,0 @@ -[Mode V/U FM Voice1] -UP_LOW=145880000 -DOWN_LOW=435150000 - -[Mode V/U FM Voice2] -UP_LOW=145920000 -DOWN_LOW=435300000 - -[Mode V/S FM Voice] -UP_LOW=145880000 -DOWN_LOW=2401200000 - -[Mode L/U FM Voice] -UP_LOW=1268700000 -DOWN_LOW=435300000 - -[Mode L/U BBS AFSK] -UP_LOW=1268700000 -DOWN_LOW=435150000 - -[Mode L/S FM Voice] -UP_LOW=1268700000 -DOWN_LOW=2401200000 Deleted: trunk/data/28650.trsp =================================================================== --- trunk/data/28650.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/28650.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,19 +0,0 @@ -[Indian Beacon] -DOWN_LOW=145936000 - -[Indian U/V Lin] -UP_LOW=435220000 -UP_HIGH=435280000 -DOWN_LOW=145870000 -DOWN_HIGH=145930000 -INVERT=true - -[Dutch Beacon CW] -DOWN_LOW=145860000 - -[Dutch U/V Lin] -UP_LOW=435225000 -UP_HIGH=435275000 -DOWN_LOW=145875000 -DOWN_HIGH=145925000 -INVERT=true Deleted: trunk/data/28654.trsp =================================================================== --- trunk/data/28654.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/28654.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,6 +0,0 @@ -[APT] -DOWN_LOW=137100000 - -[HRPT] -DOWN_LOW=1698000000 - Deleted: trunk/data/28895.trsp =================================================================== --- trunk/data/28895.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/28895.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,4 +0,0 @@ -[Mode U TLM] -DOWN_LOW=437425000 -MODE=CW - Deleted: trunk/data/32785.trsp =================================================================== --- trunk/data/32785.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/32785.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,13 +0,0 @@ -[Mode U TLM 1] -DOWN_LOW=437275000 -MODE=CW - -[Mode U TLM 2] -DOWN_LOW=437475000 -MODE=AX.25 1200 bps - -[Mode L/U Digipeater] -DOWN_LOW=437475000 -UP_LOW=1267600000 -MODE=GMSK 9600 bps - Deleted: trunk/data/32787.trsp =================================================================== --- trunk/data/32787.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/32787.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,4 +0,0 @@ -[Mode V/U TLM] -UP_LOW=145980000 -DOWN_LOW=437275000 -MODE=FM/CW Deleted: trunk/data/32789.trsp =================================================================== --- trunk/data/32789.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/32789.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,7 +0,0 @@ -[Mode V BPSK TLM primary] -DOWN_LOW=145868000 -MODE=SSB - -[Mode V BPSK TLM secondary] -DOWN_LOW=145930000 -MODE=SSB Deleted: trunk/data/32791.trsp =================================================================== --- trunk/data/32791.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/32791.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,2 +0,0 @@ -[Mode U TLM] -DOWN_LOW=437385000 Deleted: trunk/data/33493.trsp =================================================================== --- trunk/data/33493.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/33493.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,7 +0,0 @@ -[Mode U CW] -DOWN_LOW=437250000 -MODE=CW - -[Mode U FM] -DOWN_LOW=437425000 -MODE=1k2 AFSK Deleted: trunk/data/33498.trsp =================================================================== --- trunk/data/33498.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/33498.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,15 +0,0 @@ -[Mode U Mother CW] -DOWN_LOW=437305000 -MODE=CW - -[Mode U Mother FM] -DOWN_LOW=437485000 -MODE=1k2 AFSK - -[Mode U Daughter CW] -DOWN_LOW=437275000 -MODE=CW - -[Mode U Daughter FM] -DOWN_LOW=437465000 -MODE=1k2 AFSK Deleted: trunk/data/33499.trsp =================================================================== --- trunk/data/33499.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/33499.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,3 +0,0 @@ -[Mode U MSG] -DOWN_LOW=437385000 -MODE=CW Deleted: trunk/data/7530.trsp =================================================================== --- trunk/data/7530.trsp 2009-08-04 19:59:15 UTC (rev 350) +++ trunk/data/7530.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -1,24 +0,0 @@ -[Mode U/V Beacon] -DOWN_LOW=145977500 -MODE=CW - -[Mode U Beacon] -DOWN_LOW=435106000 -MODE=CW/RTTY - -[Mode V/A (A) Lin] -UP_LOW=145850000 -UP_HIGH=145950000 -DOWN_LOW=29400000 -DOWN_HIGH=29500000 -INVERT=false -MODE=SSB/CW - -[Mode U/V (B) Lin] -UP_LOW=432125000 -UP_HIGH=432175000 -DOWN_LOW=145925000 -DOWN_HIGH=145975000 -INVERT=true -MODE=SSB/CW - Copied: trunk/data/trsp/20439.trsp (from rev 346, trunk/data/20439.trsp) =================================================================== --- trunk/data/trsp/20439.trsp (rev 0) +++ trunk/data/trsp/20439.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode V/U FM/SSB] +UP_LOW=145920000 +DOWN_LOW=437026000 Property changes on: trunk/data/trsp/20439.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/20442.trsp (from rev 346, trunk/data/20442.trsp) =================================================================== --- trunk/data/trsp/20442.trsp (rev 0) +++ trunk/data/trsp/20442.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode U TLM] +DOWN_LOW=437125000 +MODE=CW Property changes on: trunk/data/trsp/20442.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/22825.trsp (from rev 346, trunk/data/22825.trsp) =================================================================== --- trunk/data/trsp/22825.trsp (rev 0) +++ trunk/data/trsp/22825.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode V/U FM] +UP_LOW=145850000 +DOWN_LOW=436795000 Property changes on: trunk/data/trsp/22825.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/22826.trsp (from rev 346, trunk/data/22826.trsp) =================================================================== --- trunk/data/trsp/22826.trsp (rev 0) +++ trunk/data/trsp/22826.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,2 @@ +[Mode -/U BPSK] +DOWN_LOW=435790000 Property changes on: trunk/data/trsp/22826.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/23439.trsp (from rev 346, trunk/data/23439.trsp) =================================================================== --- trunk/data/trsp/23439.trsp (rev 0) +++ trunk/data/trsp/23439.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode H TLM] +DOWN_LOW=29352000 +MODE=CARRIER Property changes on: trunk/data/trsp/23439.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/24278.trsp (from rev 346, trunk/data/24278.trsp) =================================================================== --- trunk/data/trsp/24278.trsp (rev 0) +++ trunk/data/trsp/24278.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,9 @@ +[Mode V/U Linear] +UP_LOW=145900000 +UP_HIGH=146000000 +DOWN_LOW=435800000 +DOWN_HIGH=435900000 +INVERT=true + +[Mode U CW Beacon] +DOWN_LOW=435795000 Property changes on: trunk/data/trsp/24278.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/24786.trsp (from rev 346, trunk/data/24786.trsp) =================================================================== --- trunk/data/trsp/24786.trsp (rev 0) +++ trunk/data/trsp/24786.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[LRIT] +DOWN_LOW=1691000000 + +[GVAR PDUS] +DOWN_LOW=1685700000 + Property changes on: trunk/data/trsp/24786.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/25338.trsp (from rev 346, trunk/data/25338.trsp) =================================================================== --- trunk/data/trsp/25338.trsp (rev 0) +++ trunk/data/trsp/25338.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[APT] +DOWN_LOW=137500000 + +[HRPT] +DOWN_LOW=1702500000 + Property changes on: trunk/data/trsp/25338.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/25397.trsp (from rev 346, trunk/data/25397.trsp) =================================================================== --- trunk/data/trsp/25397.trsp (rev 0) +++ trunk/data/trsp/25397.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,23 @@ +[Mode V/U APRS,BBS 9K6 FSK] +UP_LOW=145930000 +DOWN_LOW=435225000 + +[Mode V/U BBS1 9K6 FSK] +UP_LOW=145850000 +DOWN_LOW=435225000 + +[Mode V/U BBS2 9K6 FSK] +UP_LOW=145890000 +DOWN_LOW=435225000 + +[Mode L/U BBS 9K6 FSK] +UP_LOW=1269700000 +DOWN_LOW=435225000 + +[Mode L/U BBS 9K6 FSK] +UP_LOW=1269800000 +DOWN_LOW=435225000 + +[Mode L/U BBS 9K6 FSK] +UP_LOW=1269900000 +DOWN_LOW=435225000 Property changes on: trunk/data/trsp/25397.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/25544.trsp (from rev 346, trunk/data/25544.trsp) =================================================================== --- trunk/data/trsp/25544.trsp (rev 0) +++ trunk/data/trsp/25544.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,33 @@ +[Mode V/V AFSK Packet] +UP_LOW=145990000 +DOWN_LOW=145800000 +MODE=AFSK 1200 bps + +[Mode V/U FM Voice] +UP_LOW=145800000 +DOWN_LOW=437800000 +MODE=FM + +[Mode V APRS] +UP_LOW=145825000 +DOWN_LOW=145825000 +MODE=FM 1200 bps + +[Mode V Imaging] +DOWN_LOW=145800000 +MODE=SSTV in FM carrier + +[Mode U/V FM Voice] +UP_LOW=437800000 +DOWN_LOW=145800000 +MODE=FM + +[Mode V/V FM (crew R2+3)] +UP_LOW=144490000 +DOWN_LOW=145800000 +MODE=FM + +[Mode V/V FM (crew R1)] +UP_LOW=145200000 +DOWN_LOW=145800000 +MODE=FM Property changes on: trunk/data/trsp/25544.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/26352.trsp (from rev 346, trunk/data/26352.trsp) =================================================================== --- trunk/data/trsp/26352.trsp (rev 0) +++ trunk/data/trsp/26352.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[LRIT] +DOWN_LOW=1691000000 + +[GVAR PDUS] +DOWN_LOW=1685700000 + Property changes on: trunk/data/trsp/26352.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/26536.trsp (from rev 346, trunk/data/26536.trsp) =================================================================== --- trunk/data/trsp/26536.trsp (rev 0) +++ trunk/data/trsp/26536.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[HRPT] +DOWN_LOW=1702500000 + Property changes on: trunk/data/trsp/26536.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/26871.trsp (from rev 346, trunk/data/26871.trsp) =================================================================== --- trunk/data/trsp/26871.trsp (rev 0) +++ trunk/data/trsp/26871.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[LRIT] +DOWN_LOW=1691000000 + +[GVAR PDUS] +DOWN_LOW=1685700000 + Property changes on: trunk/data/trsp/26871.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/26931.trsp (from rev 346, trunk/data/26931.trsp) =================================================================== --- trunk/data/trsp/26931.trsp (rev 0) +++ trunk/data/trsp/26931.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode V/V APRS AFSK] +UP_LOW=145825000 +DOWN_LOW=145825000 Property changes on: trunk/data/trsp/26931.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/27453.trsp (from rev 346, trunk/data/27453.trsp) =================================================================== --- trunk/data/trsp/27453.trsp (rev 0) +++ trunk/data/trsp/27453.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[APT] +DOWN_LOW=137620000 + +[HRPT] +DOWN_LOW=1707000000 + Property changes on: trunk/data/trsp/27453.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/27607.trsp (from rev 346, trunk/data/27607.trsp) =================================================================== --- trunk/data/trsp/27607.trsp (rev 0) +++ trunk/data/trsp/27607.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,4 @@ +[Mode V/U FM Voice] +DOWN_LOW=436795000 +UP_LOW=145850000 +MODE=FM, PL 67.0 Hz \ No newline at end of file Property changes on: trunk/data/trsp/27607.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/27844.trsp (from rev 346, trunk/data/27844.trsp) =================================================================== --- trunk/data/trsp/27844.trsp (rev 0) +++ trunk/data/trsp/27844.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,4 @@ +[Mode U TLM] +DOWN_LOW=436837500 +MODE=CW + Property changes on: trunk/data/trsp/27844.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/27848.trsp (from rev 346, trunk/data/27848.trsp) =================================================================== --- trunk/data/trsp/27848.trsp (rev 0) +++ trunk/data/trsp/27848.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,5 @@ +[Mode U CW Beacon] +DOWN_LOW=436847500 + +[Mode U AFSK TLM] +DOWN_LOW=437490000 Property changes on: trunk/data/trsp/27848.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/27939.trsp (from rev 346, trunk/data/27939.trsp) =================================================================== --- trunk/data/trsp/27939.trsp (rev 0) +++ trunk/data/trsp/27939.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,4 @@ +[Mode U CW Beacon] +DOWN_LOW=435352000 + + Property changes on: trunk/data/trsp/27939.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/28375.trsp (from rev 346, trunk/data/28375.trsp) =================================================================== --- trunk/data/trsp/28375.trsp (rev 0) +++ trunk/data/trsp/28375.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,23 @@ +[Mode V/U FM Voice1] +UP_LOW=145880000 +DOWN_LOW=435150000 + +[Mode V/U FM Voice2] +UP_LOW=145920000 +DOWN_LOW=435300000 + +[Mode V/S FM Voice] +UP_LOW=145880000 +DOWN_LOW=2401200000 + +[Mode L/U FM Voice] +UP_LOW=1268700000 +DOWN_LOW=435300000 + +[Mode L/U BBS AFSK] +UP_LOW=1268700000 +DOWN_LOW=435150000 + +[Mode L/S FM Voice] +UP_LOW=1268700000 +DOWN_LOW=2401200000 Property changes on: trunk/data/trsp/28375.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/28650.trsp (from rev 346, trunk/data/28650.trsp) =================================================================== --- trunk/data/trsp/28650.trsp (rev 0) +++ trunk/data/trsp/28650.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,19 @@ +[Indian Beacon] +DOWN_LOW=145936000 + +[Indian U/V Lin] +UP_LOW=435220000 +UP_HIGH=435280000 +DOWN_LOW=145870000 +DOWN_HIGH=145930000 +INVERT=true + +[Dutch Beacon CW] +DOWN_LOW=145860000 + +[Dutch U/V Lin] +UP_LOW=435225000 +UP_HIGH=435275000 +DOWN_LOW=145875000 +DOWN_HIGH=145925000 +INVERT=true Property changes on: trunk/data/trsp/28650.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/28654.trsp (from rev 346, trunk/data/28654.trsp) =================================================================== --- trunk/data/trsp/28654.trsp (rev 0) +++ trunk/data/trsp/28654.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,6 @@ +[APT] +DOWN_LOW=137100000 + +[HRPT] +DOWN_LOW=1698000000 + Property changes on: trunk/data/trsp/28654.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/28895.trsp (from rev 346, trunk/data/28895.trsp) =================================================================== --- trunk/data/trsp/28895.trsp (rev 0) +++ trunk/data/trsp/28895.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,4 @@ +[Mode U TLM] +DOWN_LOW=437425000 +MODE=CW + Property changes on: trunk/data/trsp/28895.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/32785.trsp (from rev 346, trunk/data/32785.trsp) =================================================================== --- trunk/data/trsp/32785.trsp (rev 0) +++ trunk/data/trsp/32785.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,13 @@ +[Mode U TLM 1] +DOWN_LOW=437275000 +MODE=CW + +[Mode U TLM 2] +DOWN_LOW=437475000 +MODE=AX.25 1200 bps + +[Mode L/U Digipeater] +DOWN_LOW=437475000 +UP_LOW=1267600000 +MODE=GMSK 9600 bps + Property changes on: trunk/data/trsp/32785.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/32787.trsp (from rev 346, trunk/data/32787.trsp) =================================================================== --- trunk/data/trsp/32787.trsp (rev 0) +++ trunk/data/trsp/32787.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,4 @@ +[Mode V/U TLM] +UP_LOW=145980000 +DOWN_LOW=437275000 +MODE=FM/CW Property changes on: trunk/data/trsp/32787.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/32789.trsp (from rev 346, trunk/data/32789.trsp) =================================================================== --- trunk/data/trsp/32789.trsp (rev 0) +++ trunk/data/trsp/32789.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,7 @@ +[Mode V BPSK TLM primary] +DOWN_LOW=145868000 +MODE=SSB + +[Mode V BPSK TLM secondary] +DOWN_LOW=145930000 +MODE=SSB Property changes on: trunk/data/trsp/32789.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/32791.trsp (from rev 346, trunk/data/32791.trsp) =================================================================== --- trunk/data/trsp/32791.trsp (rev 0) +++ trunk/data/trsp/32791.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,2 @@ +[Mode U TLM] +DOWN_LOW=437385000 Property changes on: trunk/data/trsp/32791.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/33493.trsp (from rev 346, trunk/data/33493.trsp) =================================================================== --- trunk/data/trsp/33493.trsp (rev 0) +++ trunk/data/trsp/33493.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,7 @@ +[Mode U CW] +DOWN_LOW=437250000 +MODE=CW + +[Mode U FM] +DOWN_LOW=437425000 +MODE=1k2 AFSK Property changes on: trunk/data/trsp/33493.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/33498.trsp (from rev 346, trunk/data/33498.trsp) =================================================================== --- trunk/data/trsp/33498.trsp (rev 0) +++ trunk/data/trsp/33498.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,15 @@ +[Mode U Mother CW] +DOWN_LOW=437305000 +MODE=CW + +[Mode U Mother FM] +DOWN_LOW=437485000 +MODE=1k2 AFSK + +[Mode U Daughter CW] +DOWN_LOW=437275000 +MODE=CW + +[Mode U Daughter FM] +DOWN_LOW=437465000 +MODE=1k2 AFSK Property changes on: trunk/data/trsp/33498.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/33499.trsp (from rev 346, trunk/data/33499.trsp) =================================================================== --- trunk/data/trsp/33499.trsp (rev 0) +++ trunk/data/trsp/33499.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,3 @@ +[Mode U MSG] +DOWN_LOW=437385000 +MODE=CW Property changes on: trunk/data/trsp/33499.trsp ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/data/trsp/7530.trsp (from rev 346, trunk/data/7530.trsp) =================================================================== --- trunk/data/trsp/7530.trsp (rev 0) +++ trunk/data/trsp/7530.trsp 2009-08-04 20:16:12 UTC (rev 351) @@ -0,0 +1,24 @@ +[Mode U/V Beacon] +DOWN_LOW=145977500 +MODE=CW + +[Mode U Beacon] +DOWN_LOW=435106000 +MODE=CW/RTTY + +[Mode V/A (A) Lin] +UP_LOW=145850000 +UP_HIGH=145950000 +DOWN_LOW=29400000 +DOWN_HIGH=29500000 +INVERT=false +MODE=SSB/CW + +[Mode U/V (B) Lin] +UP_LOW=432125000 +UP_HIGH=432175000 +DOWN_LOW=145925000 +DOWN_HIGH=145975000 +INVERT=true +MODE=SSB/CW + Property changes on: trunk/data/trsp/7530.trsp ___________________________________________________________________ Added: svn:mergeinfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 19:59:28
|
Revision: 350 http://gpredict.svn.sourceforge.net/gpredict/?rev=350&view=rev Author: csete Date: 2009-08-04 19:59:15 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Added missing sats without leading zero in file name. Added Paths: ----------- trunk/data/satdata/1293.sat trunk/data/satdata/1361.sat trunk/data/satdata/1512.sat trunk/data/satdata/1520.sat trunk/data/satdata/2608.sat trunk/data/satdata/2807.sat trunk/data/satdata/2826.sat trunk/data/satdata/2874.sat trunk/data/satdata/2909.sat trunk/data/satdata/2965.sat trunk/data/satdata/3029.sat trunk/data/satdata/3133.sat trunk/data/satdata/424.sat trunk/data/satdata/4321.sat trunk/data/satdata/4507.sat trunk/data/satdata/4793.sat trunk/data/satdata/5398.sat trunk/data/satdata/6212.sat trunk/data/satdata/6235.sat trunk/data/satdata/6236.sat trunk/data/satdata/6909.sat trunk/data/satdata/6920.sat trunk/data/satdata/7529.sat trunk/data/satdata/7530.sat trunk/data/satdata/7646.sat trunk/data/satdata/8366.sat trunk/data/satdata/8747.sat trunk/data/satdata/8820.sat trunk/data/satdata/900.sat trunk/data/satdata/902.sat trunk/data/satdata/9057.sat trunk/data/satdata/9478.sat Added: trunk/data/satdata/1293.sat =================================================================== --- trunk/data/satdata/1293.sat (rev 0) +++ trunk/data/satdata/1293.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 3 (OSCAR III) +NICKNAME=OSCAR 3 (OSCAR III) +TLE1=1 01293U 65016F 09215.08169401 .00000149 00000-0 12652-3 0 5820 +TLE2=2 01293 70.0702 70.0707 0016693 110.1861 250.1049 14.04721679266395 Added: trunk/data/satdata/1361.sat =================================================================== --- trunk/data/satdata/1361.sat (rev 0) +++ trunk/data/satdata/1361.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=LCS 1 +NICKNAME=LCS 1 +TLE1=1 01361U 65034C 09214.49159214 .00000009 00000-0 10000-3 0 1221 +TLE2=2 01361 32.1407 49.1047 0006447 159.3992 200.6770 9.89276586599942 Added: trunk/data/satdata/1512.sat =================================================================== --- trunk/data/satdata/1512.sat (rev 0) +++ trunk/data/satdata/1512.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TEMPSAT 1 +NICKNAME=TEMPSAT 1 +TLE1=1 01512U 65065E 09214.31251297 .00000058 00000-0 10000-3 0 2021 +TLE2=2 01512 89.8127 299.5396 0067995 271.4801 87.8544 13.33258758138775 Added: trunk/data/satdata/1520.sat =================================================================== --- trunk/data/satdata/1520.sat (rev 0) +++ trunk/data/satdata/1520.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 4(A) +NICKNAME=CALSPHERE 4(A) +TLE1=1 01520U 65065H 09214.67391152 .00000060 00000-0 10000-3 0 3387 +TLE2=2 01520 90.1823 84.1010 0068919 195.3321 164.5729 13.35317794140455 Added: trunk/data/satdata/2608.sat =================================================================== --- trunk/data/satdata/2608.sat (rev 0) +++ trunk/data/satdata/2608.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATS 1 +NICKNAME=ATS 1 +TLE1=1 02608U 66110A 09211.56991053 -.00000139 00000-0 10000-3 0 9876 +TLE2=2 02608 7.8383 310.3982 0004017 194.6556 165.4577 1.00289000 72948 Added: trunk/data/satdata/2807.sat =================================================================== --- trunk/data/satdata/2807.sat (rev 0) +++ trunk/data/satdata/2807.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 16 +NICKNAME=TRANSIT 16 +TLE1=1 02807U 67048A 09214.90970007 .00000074 00000-0 10000-3 0 2707 +TLE2=2 02807 89.6513 202.0354 0022071 100.2985 260.0653 13.49716217 76921 Added: trunk/data/satdata/2826.sat =================================================================== --- trunk/data/satdata/2826.sat (rev 0) +++ trunk/data/satdata/2826.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OPS 5712 (P/L 160) +NICKNAME=OPS 5712 (P/L 160) +TLE1=1 02826U 67053A 09214.92608426 .00000302 00000-0 11870-3 0 7861 +TLE2=2 02826 69.9325 60.6969 0006000 78.0452 282.1345 14.38285624174013 Added: trunk/data/satdata/2874.sat =================================================================== --- trunk/data/satdata/2874.sat (rev 0) +++ trunk/data/satdata/2874.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OPS 5712 (P/L 153) +NICKNAME=OPS 5712 (P/L 153) +TLE1=1 02874U 67053H 09214.50216201 -.00000054 00000-0 -33167-6 0 1770 +TLE2=2 02874 69.9729 352.8387 0009622 270.3272 89.6735 13.95925187147003 Added: trunk/data/satdata/2909.sat =================================================================== --- trunk/data/satdata/2909.sat (rev 0) +++ trunk/data/satdata/2909.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SURCAL 150B +NICKNAME=SURCAL 150B +TLE1=1 02909U 67053J 09215.09557402 .00000289 00000-0 97191-4 0 9620 +TLE2=2 02909 69.9536 233.6655 0006362 266.0399 94.0022 14.46502780179755 Added: trunk/data/satdata/2965.sat =================================================================== --- trunk/data/satdata/2965.sat (rev 0) +++ trunk/data/satdata/2965.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 17 +NICKNAME=TRANSIT 17 +TLE1=1 02965U 67092A 09213.87507702 .00000077 00000-0 10000-3 0 5621 +TLE2=2 02965 89.2595 119.4495 0047094 299.9904 59.6577 13.52426317 63294 Added: trunk/data/satdata/3029.sat =================================================================== --- trunk/data/satdata/3029.sat (rev 0) +++ trunk/data/satdata/3029.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATS 3 +NICKNAME=ATS 3 +TLE1=1 03029U 67111A 09213.31411679 -.00000094 00000-0 10000-3 0 4934 +TLE2=2 03029 9.3687 317.7726 0015102 43.8054 316.4247 1.00272359152830 Added: trunk/data/satdata/3133.sat =================================================================== --- trunk/data/satdata/3133.sat (rev 0) +++ trunk/data/satdata/3133.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 18 +NICKNAME=TRANSIT 18 +TLE1=1 03133U 68012A 09214.68340479 .00000075 00000-0 10000-3 0 3354 +TLE2=2 03133 89.9797 286.6271 0074597 187.5837 172.4192 13.50529018 38836 Added: trunk/data/satdata/424.sat =================================================================== --- trunk/data/satdata/424.sat (rev 0) +++ trunk/data/satdata/424.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ALOUETTE 1 (S-27) +NICKNAME=ALOUETTE 1 (S-27) +TLE1=1 00424U 62049A 09214.88506229 .00000026 00000-0 20088-4 0 1933 +TLE2=2 00424 80.4640 228.9859 0021978 288.8428 71.0335 13.68717444338080 Added: trunk/data/satdata/4321.sat =================================================================== --- trunk/data/satdata/4321.sat (rev 0) +++ trunk/data/satdata/4321.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 5 (AO-5) +NICKNAME=OSCAR 5 (AO-5) +TLE1=1 04321U 70008B 09214.54807798 -.00000032 00000-0 10000-3 0 1946 +TLE2=2 04321 102.1325 226.5515 0027310 251.8233 107.9857 12.52157067806567 Added: trunk/data/satdata/4507.sat =================================================================== --- trunk/data/satdata/4507.sat (rev 0) +++ trunk/data/satdata/4507.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NNSS 19 +NICKNAME=NNSS 19 +TLE1=1 04507U 70067A 09214.45364844 .00000060 00000-0 74460-4 0 9957 +TLE2=2 04507 89.8682 311.0977 0171181 310.6208 48.0178 13.50137831915922 Added: trunk/data/satdata/4793.sat =================================================================== --- trunk/data/satdata/4793.sat (rev 0) +++ trunk/data/satdata/4793.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 1 [-] +NICKNAME=NOAA 1 [-] +TLE1=1 04793U 70106A 09214.76222891 -.00000031 00000-0 10000-3 0 2149 +TLE2=2 04793 102.0754 206.3015 0032260 348.8666 11.1688 12.53930463768759 Added: trunk/data/satdata/5398.sat =================================================================== --- trunk/data/satdata/5398.sat (rev 0) +++ trunk/data/satdata/5398.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=RIGIDSPHERE 2 (LCS 4) +NICKNAME=RIGIDSPHERE 2 (LCS 4) +TLE1=1 05398U 71067E 09214.47954226 .00000145 00000-0 47040-4 0 6256 +TLE2=2 05398 87.6193 236.7181 0066979 25.0759 335.3677 14.31165222991183 Added: trunk/data/satdata/6212.sat =================================================================== --- trunk/data/satdata/6212.sat (rev 0) +++ trunk/data/satdata/6212.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=RADCAT +NICKNAME=RADCAT +TLE1=1 06212U 72076A 09213.84656723 .00001146 00000-0 44165-4 0 7982 +TLE2=2 06212 98.5945 229.0061 0003160 176.6705 183.4527 15.28979996129855 Added: trunk/data/satdata/6235.sat =================================================================== --- trunk/data/satdata/6235.sat (rev 0) +++ trunk/data/satdata/6235.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 2 [-] +NICKNAME=NOAA 2 [-] +TLE1=1 06235U 72082A 09214.70382397 -.00000027 00000-0 10000-3 0 3134 +TLE2=2 06235 101.4018 230.7672 0003648 187.1250 172.9773 12.53003563683297 Added: trunk/data/satdata/6236.sat =================================================================== --- trunk/data/satdata/6236.sat (rev 0) +++ trunk/data/satdata/6236.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 6 (AO-6) +NICKNAME=OSCAR 6 (AO-6) +TLE1=1 06236U 72082B 09214.54211228 -.00000027 00000-0 10000-3 0 1836 +TLE2=2 06236 101.3966 226.0511 0003825 156.2562 203.8685 12.53077922683217 Added: trunk/data/satdata/6909.sat =================================================================== --- trunk/data/satdata/6909.sat (rev 0) +++ trunk/data/satdata/6909.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NNSS O-20 +NICKNAME=NNSS O-20 +TLE1=1 06909U 73081A 09214.89238339 .00000021 00000-0 12178-4 0 4287 +TLE2=2 06909 89.8595 357.3630 0157901 329.1644 30.0322 13.69753789985458 Added: trunk/data/satdata/6920.sat =================================================================== --- trunk/data/satdata/6920.sat (rev 0) +++ trunk/data/satdata/6920.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 3 [-] +NICKNAME=NOAA 3 [-] +TLE1=1 06920U 73086A 09214.63607288 -.00000030 00000-0 10000-3 0 2055 +TLE2=2 06920 101.7203 235.2421 0006584 83.6989 276.4825 12.40298747618034 Added: trunk/data/satdata/7529.sat =================================================================== --- trunk/data/satdata/7529.sat (rev 0) +++ trunk/data/satdata/7529.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 4 [-] +NICKNAME=NOAA 4 [-] +TLE1=1 07529U 74089A 09214.63558192 -.00000027 00000-0 10000-3 0 2162 +TLE2=2 07529 101.4417 237.6675 0008730 225.3433 134.6929 12.53053440587864 Added: trunk/data/satdata/7530.sat =================================================================== --- trunk/data/satdata/7530.sat (rev 0) +++ trunk/data/satdata/7530.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 7 (AO-7) +NICKNAME=OSCAR 7 (AO-7) +TLE1=1 07530U 74089B 09215.09472816 -.00000027 00000-0 10000-3 0 5458 +TLE2=2 07530 101.4243 238.0466 0011716 175.7422 184.3750 12.53576086588591 Added: trunk/data/satdata/7646.sat =================================================================== --- trunk/data/satdata/7646.sat (rev 0) +++ trunk/data/satdata/7646.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=STARLETTE +NICKNAME=STARLETTE +TLE1=1 07646U 75010A 09214.51445681 -.00000161 00000-0 -15604-4 0 144 +TLE2=2 07646 49.8277 308.0627 0206026 225.7583 132.6239 13.82271718742094 Added: trunk/data/satdata/8366.sat =================================================================== --- trunk/data/satdata/8366.sat (rev 0) +++ trunk/data/satdata/8366.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=GOES 1 [-] +NICKNAME=GOES 1 [-] +TLE1=1 08366U 75100A 09214.32579641 -.00000252 00000-0 10000-3 0 8868 +TLE2=2 08366 14.3536 347.4560 0002729 259.9492 100.0649 1.00279500123411 Added: trunk/data/satdata/8747.sat =================================================================== --- trunk/data/satdata/8747.sat (rev 0) +++ trunk/data/satdata/8747.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=LES 9 +NICKNAME=LES 9 +TLE1=1 08747U 76023B 09212.84376233 -.00000075 00000-0 10000-3 0 3074 +TLE2=2 08747 10.9432 147.1584 0023913 326.0013 33.6931 1.00267857 67879 Added: trunk/data/satdata/8820.sat =================================================================== --- trunk/data/satdata/8820.sat (rev 0) +++ trunk/data/satdata/8820.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=LAGEOS 1 +NICKNAME=LAGEOS 1 +TLE1=1 08820U 76039A 09214.74142281 .00000029 00000-0 10000-3 0 8150 +TLE2=2 08820 109.8236 228.3496 0044848 182.0971 177.9613 6.38664562520017 Added: trunk/data/satdata/900.sat =================================================================== --- trunk/data/satdata/900.sat (rev 0) +++ trunk/data/satdata/900.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 1 +NICKNAME=CALSPHERE 1 +TLE1=1 00900U 64063C 09213.85816794 .00000061 00000-0 57517-4 0 8503 +TLE2=2 00900 90.1623 327.8549 0030192 96.0409 264.4185 13.70477833225724 Added: trunk/data/satdata/902.sat =================================================================== --- trunk/data/satdata/902.sat (rev 0) +++ trunk/data/satdata/902.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 2 +NICKNAME=CALSPHERE 2 +TLE1=1 00902U 64063E 09213.88100664 .00000075 00000-0 10000-3 0 1200 +TLE2=2 00902 90.1638 330.8167 0019417 111.5730 248.7493 13.52466142 23543 Added: trunk/data/satdata/9057.sat =================================================================== --- trunk/data/satdata/9057.sat (rev 0) +++ trunk/data/satdata/9057.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 5 [-] +NICKNAME=NOAA 5 [-] +TLE1=1 09057U 76077A 09214.68556738 -.00000031 00000-0 10000-3 0 925 +TLE2=2 09057 101.9139 255.7726 0009335 263.9136 96.0862 12.37833952492235 Added: trunk/data/satdata/9478.sat =================================================================== --- trunk/data/satdata/9478.sat (rev 0) +++ trunk/data/satdata/9478.sat 2009-08-04 19:59:15 UTC (rev 350) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=MARISAT 2 +NICKNAME=MARISAT 2 +TLE1=1 09478U 76101A 09211.54960131 -.00000119 00000-0 10000-3 0 1689 +TLE2=2 09478 13.2433 355.6565 0098548 199.5001 160.1628 0.97591108 63317 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 19:49:56
|
Revision: 349 http://gpredict.svn.sourceforge.net/gpredict/?rev=349&view=rev Author: csete Date: 2009-08-04 19:49:44 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated entries with leading zeros. Modified Paths: -------------- trunk/data/satdata/amateur.cat trunk/data/satdata/engineering.cat trunk/data/satdata/geo.cat trunk/data/satdata/geodetic.cat trunk/data/satdata/goes.cat trunk/data/satdata/nnss.cat trunk/data/satdata/noaa.cat trunk/data/satdata/radar.cat trunk/data/satdata/science.cat trunk/data/satdata/visual.cat Modified: trunk/data/satdata/amateur.cat =================================================================== --- trunk/data/satdata/amateur.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/amateur.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,8 +1,8 @@ Amateur Radio -01293 -04321 -06236 -07530 +1293 +4321 +6236 +7530 10703 14129 14781 Modified: trunk/data/satdata/engineering.cat =================================================================== --- trunk/data/satdata/engineering.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/engineering.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,6 +1,6 @@ Engineering -02608 -03029 +2608 +3029 20479 23711 25023 Modified: trunk/data/satdata/geo.cat =================================================================== --- trunk/data/satdata/geo.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/geo.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,6 +1,6 @@ Geostationary -08747 -09478 +8747 +9478 10953 12309 13631 Modified: trunk/data/satdata/geodetic.cat =================================================================== --- trunk/data/satdata/geodetic.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/geodetic.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,6 +1,6 @@ Geodetic -07646 -08820 +7646 +8820 16908 22195 22824 Modified: trunk/data/satdata/goes.cat =================================================================== --- trunk/data/satdata/goes.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/goes.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,5 +1,5 @@ GOES -08366 +8366 10061 10953 11964 Modified: trunk/data/satdata/nnss.cat =================================================================== --- trunk/data/satdata/nnss.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/nnss.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,9 +1,9 @@ Navy Navigation Satellite System -02807 -02965 -03133 -04507 -06909 +2807 +2965 +3133 +4507 +6909 10457 12458 15362 Modified: trunk/data/satdata/noaa.cat =================================================================== --- trunk/data/satdata/noaa.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/noaa.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,10 +1,10 @@ NOAA Weather 11060 -04793 -06235 -06920 -07529 -09057 +4793 +6235 +6920 +7529 +9057 11416 12553 13923 Modified: trunk/data/satdata/radar.cat =================================================================== --- trunk/data/satdata/radar.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/radar.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,11 +1,11 @@ Radar Calibration -00900 -00902 -01361 -01512 -01520 -02826 -02874 -02909 -05398 -06212 +900 +902 +1361 +1512 +1520 +2826 +2874 +2909 +5398 +6212 Modified: trunk/data/satdata/science.cat =================================================================== --- trunk/data/satdata/science.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/science.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,5 +1,5 @@ Space & Earth Science -00424 +424 10637 13777 19822 Modified: trunk/data/satdata/visual.cat =================================================================== --- trunk/data/satdata/visual.cat 2009-08-04 19:47:24 UTC (rev 348) +++ trunk/data/satdata/visual.cat 2009-08-04 19:49:44 UTC (rev 349) @@ -1,25 +1,25 @@ 100 (or so) Brightest -00694 -00733 -00877 -02802 -03230 -03597 -03669 -03835 -04327 -04814 -05118 -05560 -05730 -06073 -06153 -06155 -06212 -07004 -07338 -08063 -08459 +694 +733 +877 +2802 +3230 +3597 +3669 +3835 +4327 +4814 +5118 +5560 +5730 +6073 +6153 +6155 +6212 +7004 +7338 +8063 +8459 10114 10861 10967 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 19:47:31
|
Revision: 348 http://gpredict.svn.sourceforge.net/gpredict/?rev=348&view=rev Author: csete Date: 2009-08-04 19:47:24 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated script to remove leading zeros. Modified Paths: -------------- trunk/data/satdata/convert.py Modified: trunk/data/satdata/convert.py =================================================================== --- trunk/data/satdata/convert.py 2009-08-04 19:45:05 UTC (rev 347) +++ trunk/data/satdata/convert.py 2009-08-04 19:47:24 UTC (rev 348) @@ -25,8 +25,8 @@ line2 = tlefile.readline().strip() line3 = tlefile.readline().strip() - # catalog number - catnum = line2[2:7] + # catalog number; strip leading zeroes + catnum = line2[2:7].lstrip('0') print " ... "+catnum # add satellite to category This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 19:45:13
|
Revision: 347 http://gpredict.svn.sourceforge.net/gpredict/?rev=347&view=rev Author: csete Date: 2009-08-04 19:45:05 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Deleting sat files with leading zero. Removed Paths: ------------- trunk/data/satdata/00424.sat trunk/data/satdata/00694.sat trunk/data/satdata/00733.sat trunk/data/satdata/00877.sat trunk/data/satdata/00900.sat trunk/data/satdata/00902.sat trunk/data/satdata/01293.sat trunk/data/satdata/01361.sat trunk/data/satdata/01512.sat trunk/data/satdata/01520.sat trunk/data/satdata/02608.sat trunk/data/satdata/02802.sat trunk/data/satdata/02807.sat trunk/data/satdata/02826.sat trunk/data/satdata/02874.sat trunk/data/satdata/02909.sat trunk/data/satdata/02965.sat trunk/data/satdata/03029.sat trunk/data/satdata/03133.sat trunk/data/satdata/03230.sat trunk/data/satdata/03597.sat trunk/data/satdata/03669.sat trunk/data/satdata/03835.sat trunk/data/satdata/04321.sat trunk/data/satdata/04327.sat trunk/data/satdata/04507.sat trunk/data/satdata/04793.sat trunk/data/satdata/04814.sat trunk/data/satdata/05118.sat trunk/data/satdata/05398.sat trunk/data/satdata/05560.sat trunk/data/satdata/05730.sat trunk/data/satdata/06073.sat trunk/data/satdata/06153.sat trunk/data/satdata/06155.sat trunk/data/satdata/06212.sat trunk/data/satdata/06235.sat trunk/data/satdata/06236.sat trunk/data/satdata/06909.sat trunk/data/satdata/06920.sat trunk/data/satdata/07004.sat trunk/data/satdata/07338.sat trunk/data/satdata/07529.sat trunk/data/satdata/07530.sat trunk/data/satdata/07646.sat trunk/data/satdata/08063.sat trunk/data/satdata/08366.sat trunk/data/satdata/08459.sat trunk/data/satdata/08747.sat trunk/data/satdata/08820.sat trunk/data/satdata/09057.sat trunk/data/satdata/09478.sat Deleted: trunk/data/satdata/00424.sat =================================================================== --- trunk/data/satdata/00424.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00424.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ALOUETTE 1 (S-27) -NICKNAME=ALOUETTE 1 (S-27) -TLE1=1 00424U 62049A 09214.95816155 .00000028 00000-0 22319-4 0 1945 -TLE2=2 00424 80.4640 228.9136 0021981 288.6375 71.2387 13.68717468338097 Deleted: trunk/data/satdata/00694.sat =================================================================== --- trunk/data/satdata/00694.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00694.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ATLAS CENTAUR 2 -NICKNAME=ATLAS CENTAUR 2 -TLE1=1 00694U 63047A 09215.74369123 .00000237 00000-0 21703-4 0 249 -TLE2=2 00694 30.3573 45.9123 0616301 80.9961 285.9812 13.95025012280098 Deleted: trunk/data/satdata/00733.sat =================================================================== --- trunk/data/satdata/00733.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00733.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=THOR AGENA D R/B -NICKNAME=THOR AGENA D R/B -TLE1=1 00733U 64002A 09215.57411246 -.00000003 00000-0 17355-4 0 8394 -TLE2=2 00733 99.1171 239.7401 0033514 256.5296 103.2155 14.31264307370985 Deleted: trunk/data/satdata/00877.sat =================================================================== --- trunk/data/satdata/00877.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00877.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-3 R/B -NICKNAME=SL-3 R/B -TLE1=1 00877U 64053B 09214.78062723 -.00000100 00000-0 42585-5 0 1567 -TLE2=2 00877 65.0784 45.1123 0064997 173.4790 186.7158 14.58089120382137 Deleted: trunk/data/satdata/00900.sat =================================================================== --- trunk/data/satdata/00900.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00900.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=CALSPHERE 1 -NICKNAME=CALSPHERE 1 -TLE1=1 00900U 64063C 09215.39141000 .00000092 00000-0 92907-4 0 8512 -TLE2=2 00900 90.1628 327.8813 0030187 91.9022 268.5595 13.70478422225930 Deleted: trunk/data/satdata/00902.sat =================================================================== --- trunk/data/satdata/00902.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/00902.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=CALSPHERE 2 -NICKNAME=CALSPHERE 2 -TLE1=1 00902U 64063E 09215.36067010 .00000075 00000-0 10000-3 0 1213 -TLE2=2 00902 90.1639 330.8414 0019560 107.6238 252.7041 13.52466237 23748 Deleted: trunk/data/satdata/01293.sat =================================================================== --- trunk/data/satdata/01293.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/01293.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OSCAR 3 (OSCAR III) -NICKNAME=OSCAR 3 (OSCAR III) -TLE1=1 01293U 65016F 09215.08169401 .00000149 00000-0 12652-3 0 5820 -TLE2=2 01293 70.0702 70.0707 0016693 110.1861 250.1049 14.04721679266395 Deleted: trunk/data/satdata/01361.sat =================================================================== --- trunk/data/satdata/01361.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/01361.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=LCS 1 -NICKNAME=LCS 1 -TLE1=1 01361U 65034C 09214.89551685 .00000009 00000-0 10000-3 0 1256 -TLE2=2 01361 32.1407 48.1457 0006449 160.4719 199.6021 9.89276578599989 Deleted: trunk/data/satdata/01512.sat =================================================================== --- trunk/data/satdata/01512.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/01512.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=TEMPSAT 1 -NICKNAME=TEMPSAT 1 -TLE1=1 01512U 65065E 09215.73842749 .00000058 00000-0 10000-3 0 2037 -TLE2=2 01512 89.8126 299.5136 0067977 267.3750 91.9605 13.33258774138966 Deleted: trunk/data/satdata/01520.sat =================================================================== --- trunk/data/satdata/01520.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/01520.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=CALSPHERE 4(A) -NICKNAME=CALSPHERE 4(A) -TLE1=1 01520U 65065H 09214.67391152 .00000060 00000-0 10000-3 0 3387 -TLE2=2 01520 90.1823 84.1010 0068919 195.3321 164.5729 13.35317794140455 Deleted: trunk/data/satdata/02608.sat =================================================================== --- trunk/data/satdata/02608.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02608.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ATS 1 -NICKNAME=ATS 1 -TLE1=1 02608U 66110A 09214.56123925 -.00000135 00000-0 10000-3 0 9881 -TLE2=2 02608 7.8332 310.3833 0004026 194.9911 165.1462 1.00288749 72977 Deleted: trunk/data/satdata/02802.sat =================================================================== --- trunk/data/satdata/02802.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02802.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 02802U 67045B 09215.27148569 .00000028 00000-0 16265-4 0 730 -TLE2=2 02802 74.0108 112.8822 0067684 138.7399 221.8896 14.42463531214308 Deleted: trunk/data/satdata/02807.sat =================================================================== --- trunk/data/satdata/02807.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02807.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=TRANSIT 16 -NICKNAME=TRANSIT 16 -TLE1=1 02807U 67048A 09214.98383387 .00000074 00000-0 10000-3 0 2715 -TLE2=2 02807 89.6513 202.0328 0022071 100.0837 260.2805 13.49716226 76938 Deleted: trunk/data/satdata/02826.sat =================================================================== --- trunk/data/satdata/02826.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02826.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OPS 5712 (P/L 160) -NICKNAME=OPS 5712 (P/L 160) -TLE1=1 02826U 67053A 09214.92608426 .00000302 00000-0 11870-3 0 7883 -TLE2=2 02826 69.9325 60.6969 0006000 78.0452 282.1345 14.38285624174013 Deleted: trunk/data/satdata/02874.sat =================================================================== --- trunk/data/satdata/02874.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02874.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OPS 5712 (P/L 153) -NICKNAME=OPS 5712 (P/L 153) -TLE1=1 02874U 67053H 09214.86043976 -.00000053 00000-0 52186-6 0 1787 -TLE2=2 02874 69.9731 352.0720 0009619 270.1737 89.8269 13.95925225147051 Deleted: trunk/data/satdata/02909.sat =================================================================== --- trunk/data/satdata/02909.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02909.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SURCAL 150B -NICKNAME=SURCAL 150B -TLE1=1 02909U 67053J 09215.09557402 .00000289 00000-0 97191-4 0 9620 -TLE2=2 02909 69.9536 233.6655 0006362 266.0399 94.0022 14.46502780179755 Deleted: trunk/data/satdata/02965.sat =================================================================== --- trunk/data/satdata/02965.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/02965.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=TRANSIT 17 -NICKNAME=TRANSIT 17 -TLE1=1 02965U 67092A 09215.57673419 .00000077 00000-0 10000-3 0 5539 -TLE2=2 02965 89.2593 119.3220 0047005 294.9648 64.6623 13.52426426 63524 Deleted: trunk/data/satdata/03029.sat =================================================================== --- trunk/data/satdata/03029.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03029.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ATS 3 -NICKNAME=ATS 3 -TLE1=1 03029U 67111A 09214.31138730 -.00000093 00000-0 10000-3 0 4950 -TLE2=2 03029 9.3673 317.7667 0015092 43.8150 316.4215 1.00272359152840 Deleted: trunk/data/satdata/03133.sat =================================================================== --- trunk/data/satdata/03133.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03133.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=TRANSIT 18 -NICKNAME=TRANSIT 18 -TLE1=1 03133U 68012A 09215.72066227 .00000075 00000-0 10000-3 0 3367 -TLE2=2 03133 89.9796 286.6251 0074741 184.5619 175.4854 13.50529039 38975 Deleted: trunk/data/satdata/03230.sat =================================================================== --- trunk/data/satdata/03230.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03230.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 03230U 68040B 09215.47019951 -.00000009 00000-0 34296-5 0 7143 -TLE2=2 03230 74.0347 206.8669 0034793 202.3521 157.6152 14.84219452208268 Deleted: trunk/data/satdata/03597.sat =================================================================== --- trunk/data/satdata/03597.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03597.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OAO 2 -NICKNAME=OAO 2 -TLE1=1 03597U 68110A 09214.95903253 .00000011 00000-0 85973-5 0 1139 -TLE2=2 03597 34.9937 189.8699 0006185 295.8987 64.1074 14.44868682141727 Deleted: trunk/data/satdata/03669.sat =================================================================== --- trunk/data/satdata/03669.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03669.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ISIS 1 -NICKNAME=ISIS 1 -TLE1=1 03669U 69009A 09214.76929039 .00000049 00000-0 18506-4 0 9266 -TLE2=2 03669 88.4296 106.6935 1715206 68.6747 308.8325 11.28861471664467 Deleted: trunk/data/satdata/03835.sat =================================================================== --- trunk/data/satdata/03835.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/03835.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=METEOR 1-1 -NICKNAME=METEOR 1-1 -TLE1=1 03835U 69029A 09214.93770687 .00002061 00000-0 38459-4 0 1475 -TLE2=2 03835 81.1659 349.1299 0009223 70.0807 290.1429 15.48208372204616 Deleted: trunk/data/satdata/04321.sat =================================================================== --- trunk/data/satdata/04321.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/04321.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OSCAR 5 (AO-5) -NICKNAME=OSCAR 5 (AO-5) -TLE1=1 04321U 70008B 09214.94755686 -.00000031 00000-0 10000-3 0 1970 -TLE2=2 04321 102.1317 226.9606 0027375 250.4902 109.3227 12.52157105806618 Deleted: trunk/data/satdata/04327.sat =================================================================== --- trunk/data/satdata/04327.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/04327.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SERT 2 -NICKNAME=SERT 2 -TLE1=1 04327U 70009A 09214.70067383 .00000032 00000-0 10000-3 0 385 -TLE2=2 04327 99.2079 85.1379 0004193 192.6468 167.4566 13.58228196957113 Deleted: trunk/data/satdata/04507.sat =================================================================== --- trunk/data/satdata/04507.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/04507.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NNSS 19 -NICKNAME=NNSS 19 -TLE1=1 04507U 70067A 09215.78762208 .00000044 00000-0 51111-4 0 9961 -TLE2=2 04507 89.8683 311.0800 0171063 306.7249 51.8289 13.50137805916105 Deleted: trunk/data/satdata/04793.sat =================================================================== --- trunk/data/satdata/04793.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/04793.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NOAA 1 [-] -NICKNAME=NOAA 1 [-] -TLE1=1 04793U 70106A 09215.48027265 -.00000031 00000-0 10000-3 0 2158 -TLE2=2 04793 102.0756 207.0326 0032237 347.5243 12.5026 12.53930472768846 Deleted: trunk/data/satdata/04814.sat =================================================================== --- trunk/data/satdata/04814.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/04814.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-3 R/B -NICKNAME=SL-3 R/B -TLE1=1 04814U 70113B 09215.49694220 -.00000073 00000-0 -54367-5 0 243 -TLE2=2 04814 81.1511 167.8195 0041925 49.8224 310.6690 15.13614664 97393 Deleted: trunk/data/satdata/05118.sat =================================================================== --- trunk/data/satdata/05118.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/05118.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-3 R/B -NICKNAME=SL-3 R/B -TLE1=1 05118U 71028B 09215.16087958 -.00000231 00000-0 -18894-4 0 2056 -TLE2=2 05118 81.2376 183.1961 0050039 61.4327 299.1875 15.02315734 71171 Deleted: trunk/data/satdata/05398.sat =================================================================== --- trunk/data/satdata/05398.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/05398.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=RIGIDSPHERE 2 (LCS 4) -NICKNAME=RIGIDSPHERE 2 (LCS 4) -TLE1=1 05398U 71067E 09215.80796790 .00000140 00000-0 45264-4 0 6266 -TLE2=2 05398 87.6189 236.3532 0066892 20.8020 339.5869 14.31165389991376 Deleted: trunk/data/satdata/05560.sat =================================================================== --- trunk/data/satdata/05560.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/05560.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ASTEX 1 -NICKNAME=ASTEX 1 -TLE1=1 05560U 71089A 09215.78135167 .00000064 00000-0 18144-4 0 8728 -TLE2=2 05560 92.7129 358.8368 0015575 319.5061 40.4985 14.46206422985482 Deleted: trunk/data/satdata/05730.sat =================================================================== --- trunk/data/satdata/05730.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/05730.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 05730U 71119B 09215.41754164 .00000698 00000-0 54417-4 0 2152 -TLE2=2 05730 73.9004 72.2226 0804374 149.9908 214.9983 13.76844208806796 Deleted: trunk/data/satdata/06073.sat =================================================================== --- trunk/data/satdata/06073.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06073.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=COSMOS 482 DESCENT CRAFT -NICKNAME=COSMOS 482 DESCENT CRAFT -TLE1=1 06073U 72023E 09215.70379638 .00010075 28559-5 74788-4 0 1346 -TLE2=2 06073 52.1101 288.2028 2206782 202.0199 146.9309 11.17793170 20661 Deleted: trunk/data/satdata/06153.sat =================================================================== --- trunk/data/satdata/06153.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06153.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OAO 3 (COPERNICUS) -NICKNAME=OAO 3 (COPERNICUS) -TLE1=1 06153U 72065A 09215.12178020 .00000023 00000-0 97192-5 0 2444 -TLE2=2 06153 35.0065 156.5874 0006756 49.5188 310.6105 14.56570933961297 Deleted: trunk/data/satdata/06155.sat =================================================================== --- trunk/data/satdata/06155.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06155.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=ATLAS CENTAUR R/B -NICKNAME=ATLAS CENTAUR R/B -TLE1=1 06155U 72065B 09215.13749586 .00000056 00000-0 13233-4 0 9275 -TLE2=2 06155 35.0046 194.8033 0040990 262.8904 96.7159 14.67979838968808 Deleted: trunk/data/satdata/06212.sat =================================================================== --- trunk/data/satdata/06212.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06212.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OPS 8180 (RADCAT) -NICKNAME=OPS 8180 (RADCAT) -TLE1=1 06212U 72076A 09215.48266188 .00001557 00000-0 58766-4 0 7995 -TLE2=2 06212 98.5941 230.8941 0003265 171.9317 188.2019 15.28986717130109 Deleted: trunk/data/satdata/06235.sat =================================================================== --- trunk/data/satdata/06235.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06235.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NOAA 2 [-] -NICKNAME=NOAA 2 [-] -TLE1=1 06235U 72082A 09215.50225269 -.00000027 00000-0 10000-3 0 3148 -TLE2=2 06235 101.4019 231.5337 0003639 185.4803 174.6232 12.53003584683393 Deleted: trunk/data/satdata/06236.sat =================================================================== --- trunk/data/satdata/06236.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06236.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OSCAR 6 (AO-6) -NICKNAME=OSCAR 6 (AO-6) -TLE1=1 06236U 72082B 09214.94130320 -.00000027 00000-0 10000-3 0 1888 -TLE2=2 06236 101.3966 226.4340 0003801 155.1078 205.0179 12.53077930683261 Deleted: trunk/data/satdata/06909.sat =================================================================== --- trunk/data/satdata/06909.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06909.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NNSS O-20 -NICKNAME=NNSS O-20 -TLE1=1 06909U 73081A 09214.89238339 .00000021 00000-0 12178-4 0 4300 -TLE2=2 06909 89.8595 357.3630 0157901 329.1644 30.0322 13.69753789985458 Deleted: trunk/data/satdata/06920.sat =================================================================== --- trunk/data/satdata/06920.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/06920.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NOAA 3 [-] -NICKNAME=NOAA 3 [-] -TLE1=1 06920U 73086A 09215.52333023 -.00000030 00000-0 10000-3 0 2068 -TLE2=2 06920 101.7204 236.0968 0006603 82.1204 278.0611 12.40298770618145 Deleted: trunk/data/satdata/07004.sat =================================================================== --- trunk/data/satdata/07004.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/07004.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 07004U 73107B 09214.87253692 .00003136 00000-0 12828-3 0 838 -TLE2=2 07004 73.9603 159.0366 0429675 11.6353 349.4388 14.68178125807156 Deleted: trunk/data/satdata/07338.sat =================================================================== --- trunk/data/satdata/07338.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/07338.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 07338U 74044B 09215.09412167 .00002493 00000-0 49338-4 0 9345 -TLE2=2 07338 82.8805 35.6237 0216199 269.8522 87.7946 15.25050035806744 Deleted: trunk/data/satdata/07529.sat =================================================================== --- trunk/data/satdata/07529.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/07529.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NOAA 4 [-] -NICKNAME=NOAA 4 [-] -TLE1=1 07529U 74089A 09215.51381802 -.00000027 00000-0 10000-3 0 2173 -TLE2=2 07529 101.4417 238.5137 0008751 223.3957 136.6430 12.53053459587970 Deleted: trunk/data/satdata/07530.sat =================================================================== --- trunk/data/satdata/07530.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/07530.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=OSCAR 7 (AO-7) -NICKNAME=OSCAR 7 (AO-7) -TLE1=1 07530U 74089B 09215.09472816 -.00000027 00000-0 10000-3 0 5458 -TLE2=2 07530 101.4243 238.0466 0011716 175.7422 184.3750 12.53576086588591 Deleted: trunk/data/satdata/07646.sat =================================================================== --- trunk/data/satdata/07646.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/07646.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=STARLETTE -NICKNAME=STARLETTE -TLE1=1 07646U 75010A 09215.52659274 -.00000191 00000-0 -39118-4 0 151 -TLE2=2 07646 49.8278 304.0687 0205928 229.1142 129.1742 13.82271440742234 Deleted: trunk/data/satdata/08063.sat =================================================================== --- trunk/data/satdata/08063.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/08063.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=DELTA 1 R/B -NICKNAME=DELTA 1 R/B -TLE1=1 08063U 75072B 09214.88143519 .00008164 00000-0 22188-3 0 3103 -TLE2=2 08063 89.1523 333.9013 0947624 119.6588 250.2327 13.69119130475077 Deleted: trunk/data/satdata/08366.sat =================================================================== --- trunk/data/satdata/08366.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/08366.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=GOES 1 [-] -NICKNAME=GOES 1 [-] -TLE1=1 08366U 75100A 09215.32299065 -.00000250 00000-0 10000-3 0 8877 -TLE2=2 08366 14.3533 347.4477 0002727 259.9181 100.1009 1.00279232123422 Deleted: trunk/data/satdata/08459.sat =================================================================== --- trunk/data/satdata/08459.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/08459.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=SL-8 R/B -NICKNAME=SL-8 R/B -TLE1=1 08459U 75112B 09215.00529172 .00000006 00000-0 10871-4 0 7170 -TLE2=2 08459 74.0618 344.2485 0015928 156.7756 203.4125 14.35884557761412 Deleted: trunk/data/satdata/08747.sat =================================================================== --- trunk/data/satdata/08747.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/08747.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=LES 9 -NICKNAME=LES 9 -TLE1=1 08747U 76023B 09213.84097475 -.00000076 00000-0 10000-3 0 3085 -TLE2=2 08747 10.9442 147.1306 0023924 326.0362 33.6525 1.00267879 67885 Deleted: trunk/data/satdata/08820.sat =================================================================== --- trunk/data/satdata/08820.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/08820.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=LAGEOS 1 -NICKNAME=LAGEOS 1 -TLE1=1 08820U 76039A 09214.74142281 .00000029 00000-0 10000-3 0 8150 -TLE2=2 08820 109.8236 228.3496 0044848 182.0971 177.9613 6.38664562520017 Deleted: trunk/data/satdata/09057.sat =================================================================== --- trunk/data/satdata/09057.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/09057.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=NOAA 5 [-] -NICKNAME=NOAA 5 [-] -TLE1=1 09057U 76077A 09215.49376805 -.00000031 00000-0 10000-3 0 931 -TLE2=2 09057 101.9138 256.5601 0009255 261.8241 98.1771 12.37833888492331 Deleted: trunk/data/satdata/09478.sat =================================================================== --- trunk/data/satdata/09478.sat 2009-08-04 16:53:41 UTC (rev 346) +++ trunk/data/satdata/09478.sat 2009-08-04 19:45:05 UTC (rev 347) @@ -1,5 +0,0 @@ -VERSION=1.1 -NAME=MARISAT 2 -NICKNAME=MARISAT 2 -TLE1=1 09478U 76101A 09214.62358843 -.00000175 00000-0 10000-3 0 1684 -TLE2=2 09478 13.2437 355.6368 0098575 199.5745 160.1028 0.97592212 63341 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 16:54:05
|
Revision: 346 http://gpredict.svn.sourceforge.net/gpredict/?rev=346&view=rev Author: csete Date: 2009-08-04 16:53:41 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-08-04 15:34:40 UTC (rev 345) +++ trunk/ChangeLog 2009-08-04 16:53:41 UTC (rev 346) @@ -1,3 +1,16 @@ +2009-08-03 Alexandru Csete <oz9aec at gmail.com> + + * src/Makefile.am: + * src/qth-data.[ch]: + * src/gtk-sat-module.[ch]: + * src/qth-editor.[ch]: + * src/sat-pref-qth.c: + Separate QTH data I/O from SAT data I/O. + + * src/sat-data.[ch]: + New files implementing the new .sat file I/O (replacing gtk-sat-data). + + 2009-07-31 Alexandru Csete <oz9aec at gmail.com> * src/gtk-sat-list.c: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 15:34:48
|
Revision: 345 http://gpredict.svn.sourceforge.net/gpredict/?rev=345&view=rev Author: csete Date: 2009-08-04 15:34:40 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Added description. Modified Paths: -------------- trunk/data/satdata/convert.py Modified: trunk/data/satdata/convert.py =================================================================== --- trunk/data/satdata/convert.py 2009-08-04 10:29:58 UTC (rev 344) +++ trunk/data/satdata/convert.py 2009-08-04 15:34:40 UTC (rev 345) @@ -1,5 +1,7 @@ #!/usr/bin/python - +# +# This script was used to convert Celestrak TLE files into individual .sat and .cat files +# import os import string This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-04 10:30:19
|
Revision: 344 http://gpredict.svn.sourceforge.net/gpredict/?rev=344&view=rev Author: csete Date: 2009-08-04 10:29:58 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Added new satellite data files. Added Paths: ----------- trunk/data/satdata/ trunk/data/satdata/00424.sat trunk/data/satdata/00694.sat trunk/data/satdata/00733.sat trunk/data/satdata/00877.sat trunk/data/satdata/00900.sat trunk/data/satdata/00902.sat trunk/data/satdata/01293.sat trunk/data/satdata/01361.sat trunk/data/satdata/01512.sat trunk/data/satdata/01520.sat trunk/data/satdata/02608.sat trunk/data/satdata/02802.sat trunk/data/satdata/02807.sat trunk/data/satdata/02826.sat trunk/data/satdata/02874.sat trunk/data/satdata/02909.sat trunk/data/satdata/02965.sat trunk/data/satdata/03029.sat trunk/data/satdata/03133.sat trunk/data/satdata/03230.sat trunk/data/satdata/03597.sat trunk/data/satdata/03669.sat trunk/data/satdata/03835.sat trunk/data/satdata/04321.sat trunk/data/satdata/04327.sat trunk/data/satdata/04507.sat trunk/data/satdata/04793.sat trunk/data/satdata/04814.sat trunk/data/satdata/05118.sat trunk/data/satdata/05398.sat trunk/data/satdata/05560.sat trunk/data/satdata/05730.sat trunk/data/satdata/06073.sat trunk/data/satdata/06153.sat trunk/data/satdata/06155.sat trunk/data/satdata/06212.sat trunk/data/satdata/06235.sat trunk/data/satdata/06236.sat trunk/data/satdata/06909.sat trunk/data/satdata/06920.sat trunk/data/satdata/07004.sat trunk/data/satdata/07338.sat trunk/data/satdata/07529.sat trunk/data/satdata/07530.sat trunk/data/satdata/07646.sat trunk/data/satdata/08063.sat trunk/data/satdata/08366.sat trunk/data/satdata/08459.sat trunk/data/satdata/08747.sat trunk/data/satdata/08820.sat trunk/data/satdata/09057.sat trunk/data/satdata/09478.sat trunk/data/satdata/10061.sat trunk/data/satdata/10114.sat trunk/data/satdata/10457.sat trunk/data/satdata/10637.sat trunk/data/satdata/10703.sat trunk/data/satdata/10861.sat trunk/data/satdata/10953.sat trunk/data/satdata/10967.sat trunk/data/satdata/11060.sat trunk/data/satdata/11267.sat trunk/data/satdata/11416.sat trunk/data/satdata/11574.sat trunk/data/satdata/11672.sat trunk/data/satdata/11849.sat trunk/data/satdata/11933.sat trunk/data/satdata/11964.sat trunk/data/satdata/12054.sat trunk/data/satdata/12139.sat trunk/data/satdata/12309.sat trunk/data/satdata/12389.sat trunk/data/satdata/12458.sat trunk/data/satdata/12465.sat trunk/data/satdata/12472.sat trunk/data/satdata/12553.sat trunk/data/satdata/12585.sat trunk/data/satdata/12904.sat trunk/data/satdata/13068.sat trunk/data/satdata/13154.sat trunk/data/satdata/13367.sat trunk/data/satdata/13402.sat trunk/data/satdata/13403.sat trunk/data/satdata/13631.sat trunk/data/satdata/13777.sat trunk/data/satdata/13819.sat trunk/data/satdata/13923.sat trunk/data/satdata/13969.sat trunk/data/satdata/14050.sat trunk/data/satdata/14129.sat trunk/data/satdata/14207.sat trunk/data/satdata/14208.sat trunk/data/satdata/14372.sat trunk/data/satdata/14484.sat trunk/data/satdata/14699.sat trunk/data/satdata/14780.sat trunk/data/satdata/14781.sat trunk/data/satdata/14819.sat trunk/data/satdata/14820.sat trunk/data/satdata/15354.sat trunk/data/satdata/15362.sat trunk/data/satdata/15427.sat trunk/data/satdata/15483.sat trunk/data/satdata/15677.sat trunk/data/satdata/15772.sat trunk/data/satdata/15873.sat trunk/data/satdata/15935.sat trunk/data/satdata/15936.sat trunk/data/satdata/15945.sat trunk/data/satdata/16111.sat trunk/data/satdata/16182.sat trunk/data/satdata/16496.sat trunk/data/satdata/16792.sat trunk/data/satdata/16882.sat trunk/data/satdata/16908.sat trunk/data/satdata/16909.sat trunk/data/satdata/16969.sat trunk/data/satdata/17070.sat trunk/data/satdata/17295.sat trunk/data/satdata/17561.sat trunk/data/satdata/17567.sat trunk/data/satdata/17589.sat trunk/data/satdata/17590.sat trunk/data/satdata/17912.sat trunk/data/satdata/17973.sat trunk/data/satdata/18153.sat trunk/data/satdata/18187.sat trunk/data/satdata/18361.sat trunk/data/satdata/18362.sat trunk/data/satdata/18749.sat trunk/data/satdata/18958.sat trunk/data/satdata/19046.sat trunk/data/satdata/19070.sat trunk/data/satdata/19071.sat trunk/data/satdata/19120.sat trunk/data/satdata/19210.sat trunk/data/satdata/19223.sat trunk/data/satdata/19257.sat trunk/data/satdata/19419.sat trunk/data/satdata/19420.sat trunk/data/satdata/19483.sat trunk/data/satdata/19531.sat trunk/data/satdata/19548.sat trunk/data/satdata/19573.sat trunk/data/satdata/19574.sat trunk/data/satdata/19650.sat trunk/data/satdata/19688.sat trunk/data/satdata/19822.sat trunk/data/satdata/19883.sat trunk/data/satdata/20261.sat trunk/data/satdata/20262.sat trunk/data/satdata/20315.sat trunk/data/satdata/20322.sat trunk/data/satdata/20323.sat trunk/data/satdata/20410.sat trunk/data/satdata/20436.sat trunk/data/satdata/20437.sat trunk/data/satdata/20438.sat trunk/data/satdata/20439.sat trunk/data/satdata/20440.sat trunk/data/satdata/20441.sat trunk/data/satdata/20442.sat trunk/data/satdata/20453.sat trunk/data/satdata/20465.sat trunk/data/satdata/20466.sat trunk/data/satdata/20479.sat trunk/data/satdata/20480.sat trunk/data/satdata/20511.sat trunk/data/satdata/20523.sat trunk/data/satdata/20558.sat trunk/data/satdata/20580.sat trunk/data/satdata/20608.sat trunk/data/satdata/20625.sat trunk/data/satdata/20638.sat trunk/data/satdata/20643.sat trunk/data/satdata/20663.sat trunk/data/satdata/20666.sat trunk/data/satdata/20693.sat trunk/data/satdata/20712.sat trunk/data/satdata/20775.sat trunk/data/satdata/20776.sat trunk/data/satdata/20777.sat trunk/data/satdata/20813.sat trunk/data/satdata/20872.sat trunk/data/satdata/20873.sat trunk/data/satdata/20918.sat trunk/data/satdata/20946.sat trunk/data/satdata/20959.sat trunk/data/satdata/21087.sat trunk/data/satdata/21088.sat trunk/data/satdata/21089.sat trunk/data/satdata/21111.sat trunk/data/satdata/21118.sat trunk/data/satdata/21140.sat trunk/data/satdata/21149.sat trunk/data/satdata/21196.sat trunk/data/satdata/21263.sat trunk/data/satdata/21397.sat trunk/data/satdata/21422.sat trunk/data/satdata/21423.sat trunk/data/satdata/21426.sat trunk/data/satdata/21552.sat trunk/data/satdata/21574.sat trunk/data/satdata/21575.sat trunk/data/satdata/21576.sat trunk/data/satdata/21577.sat trunk/data/satdata/21578.sat trunk/data/satdata/21610.sat trunk/data/satdata/21639.sat trunk/data/satdata/21653.sat trunk/data/satdata/21701.sat trunk/data/satdata/21706.sat trunk/data/satdata/21726.sat trunk/data/satdata/21765.sat trunk/data/satdata/21803.sat trunk/data/satdata/21819.sat trunk/data/satdata/21820.sat trunk/data/satdata/21876.sat trunk/data/satdata/21890.sat trunk/data/satdata/21906.sat trunk/data/satdata/21922.sat trunk/data/satdata/21938.sat trunk/data/satdata/21940.sat trunk/data/satdata/22012.sat trunk/data/satdata/22014.sat trunk/data/satdata/22028.sat trunk/data/satdata/22041.sat trunk/data/satdata/22076.sat trunk/data/satdata/22077.sat trunk/data/satdata/22078.sat trunk/data/satdata/22108.sat trunk/data/satdata/22117.sat trunk/data/satdata/22175.sat trunk/data/satdata/22178.sat trunk/data/satdata/22195.sat trunk/data/satdata/22220.sat trunk/data/satdata/22245.sat trunk/data/satdata/22269.sat trunk/data/satdata/22285.sat trunk/data/satdata/22286.sat trunk/data/satdata/22314.sat trunk/data/satdata/22566.sat trunk/data/satdata/22626.sat trunk/data/satdata/22653.sat trunk/data/satdata/22654.sat trunk/data/satdata/22671.sat trunk/data/satdata/22698.sat trunk/data/satdata/22700.sat trunk/data/satdata/22724.sat trunk/data/satdata/22729.sat trunk/data/satdata/22739.sat trunk/data/satdata/22796.sat trunk/data/satdata/22803.sat trunk/data/satdata/22824.sat trunk/data/satdata/22825.sat trunk/data/satdata/22826.sat trunk/data/satdata/22827.sat trunk/data/satdata/22828.sat trunk/data/satdata/22829.sat trunk/data/satdata/22830.sat trunk/data/satdata/22871.sat trunk/data/satdata/22877.sat trunk/data/satdata/22880.sat trunk/data/satdata/22907.sat trunk/data/satdata/22911.sat trunk/data/satdata/22912.sat trunk/data/satdata/22921.sat trunk/data/satdata/22931.sat trunk/data/satdata/22949.sat trunk/data/satdata/22970.sat trunk/data/satdata/23027.sat trunk/data/satdata/23051.sat trunk/data/satdata/23087.sat trunk/data/satdata/23088.sat trunk/data/satdata/23108.sat trunk/data/satdata/23124.sat trunk/data/satdata/23125.sat trunk/data/satdata/23126.sat trunk/data/satdata/23175.sat trunk/data/satdata/23176.sat trunk/data/satdata/23185.sat trunk/data/satdata/23192.sat trunk/data/satdata/23199.sat trunk/data/satdata/23227.sat trunk/data/satdata/23305.sat trunk/data/satdata/23313.sat trunk/data/satdata/23314.sat trunk/data/satdata/23319.sat trunk/data/satdata/23331.sat trunk/data/satdata/23343.sat trunk/data/satdata/23405.sat trunk/data/satdata/23420.sat trunk/data/satdata/23439.sat trunk/data/satdata/23448.sat trunk/data/satdata/23455.sat trunk/data/satdata/23461.sat trunk/data/satdata/23522.sat trunk/data/satdata/23528.sat trunk/data/satdata/23536.sat trunk/data/satdata/23545.sat trunk/data/satdata/23546.sat trunk/data/satdata/23547.sat trunk/data/satdata/23553.sat trunk/data/satdata/23560.sat trunk/data/satdata/23561.sat trunk/data/satdata/23571.sat trunk/data/satdata/23581.sat trunk/data/satdata/23598.sat trunk/data/satdata/23605.sat trunk/data/satdata/23606.sat trunk/data/satdata/23607.sat trunk/data/satdata/23613.sat trunk/data/satdata/23636.sat trunk/data/satdata/23642.sat trunk/data/satdata/23653.sat trunk/data/satdata/23670.sat trunk/data/satdata/23680.sat trunk/data/satdata/23686.sat trunk/data/satdata/23705.sat trunk/data/satdata/23710.sat trunk/data/satdata/23711.sat trunk/data/satdata/23723.sat trunk/data/satdata/23730.sat trunk/data/satdata/23754.sat trunk/data/satdata/23757.sat trunk/data/satdata/23764.sat trunk/data/satdata/23765.sat trunk/data/satdata/23768.sat trunk/data/satdata/23775.sat trunk/data/satdata/23779.sat trunk/data/satdata/23814.sat trunk/data/satdata/23816.sat trunk/data/satdata/23833.sat trunk/data/satdata/23839.sat trunk/data/satdata/23842.sat trunk/data/satdata/23846.sat trunk/data/satdata/23864.sat trunk/data/satdata/23865.sat trunk/data/satdata/23877.sat trunk/data/satdata/23880.sat trunk/data/satdata/23915.sat trunk/data/satdata/23940.sat trunk/data/satdata/23943.sat trunk/data/satdata/23949.sat trunk/data/satdata/23953.sat trunk/data/satdata/24209.sat trunk/data/satdata/24273.sat trunk/data/satdata/24277.sat trunk/data/satdata/24278.sat trunk/data/satdata/24285.sat trunk/data/satdata/24298.sat trunk/data/satdata/24305.sat trunk/data/satdata/24307.sat trunk/data/satdata/24313.sat trunk/data/satdata/24315.sat trunk/data/satdata/24320.sat trunk/data/satdata/24652.sat trunk/data/satdata/24653.sat trunk/data/satdata/24665.sat trunk/data/satdata/24674.sat trunk/data/satdata/24713.sat trunk/data/satdata/24714.sat trunk/data/satdata/24732.sat trunk/data/satdata/24742.sat trunk/data/satdata/24748.sat trunk/data/satdata/24769.sat trunk/data/satdata/24786.sat trunk/data/satdata/24792.sat trunk/data/satdata/24793.sat trunk/data/satdata/24794.sat trunk/data/satdata/24795.sat trunk/data/satdata/24796.sat trunk/data/satdata/24798.sat trunk/data/satdata/24808.sat trunk/data/satdata/24812.sat trunk/data/satdata/24819.sat trunk/data/satdata/24834.sat trunk/data/satdata/24836.sat trunk/data/satdata/24837.sat trunk/data/satdata/24839.sat trunk/data/satdata/24840.sat trunk/data/satdata/24841.sat trunk/data/satdata/24842.sat trunk/data/satdata/24846.sat trunk/data/satdata/24869.sat trunk/data/satdata/24870.sat trunk/data/satdata/24871.sat trunk/data/satdata/24872.sat trunk/data/satdata/24873.sat trunk/data/satdata/24876.sat trunk/data/satdata/24880.sat trunk/data/satdata/24883.sat trunk/data/satdata/24901.sat trunk/data/satdata/24903.sat trunk/data/satdata/24904.sat trunk/data/satdata/24905.sat trunk/data/satdata/24906.sat trunk/data/satdata/24907.sat trunk/data/satdata/24916.sat trunk/data/satdata/24925.sat trunk/data/satdata/24926.sat trunk/data/satdata/24931.sat trunk/data/satdata/24932.sat trunk/data/satdata/24936.sat trunk/data/satdata/24944.sat trunk/data/satdata/24945.sat trunk/data/satdata/24946.sat trunk/data/satdata/24948.sat trunk/data/satdata/24949.sat trunk/data/satdata/24950.sat trunk/data/satdata/24953.sat trunk/data/satdata/24954.sat trunk/data/satdata/24957.sat trunk/data/satdata/24960.sat trunk/data/satdata/24965.sat trunk/data/satdata/24966.sat trunk/data/satdata/24967.sat trunk/data/satdata/24968.sat trunk/data/satdata/24969.sat trunk/data/satdata/24971.sat trunk/data/satdata/25004.sat trunk/data/satdata/25010.sat trunk/data/satdata/25023.sat trunk/data/satdata/25024.sat trunk/data/satdata/25025.sat trunk/data/satdata/25030.sat trunk/data/satdata/25039.sat trunk/data/satdata/25040.sat trunk/data/satdata/25041.sat trunk/data/satdata/25042.sat trunk/data/satdata/25043.sat trunk/data/satdata/25050.sat trunk/data/satdata/25063.sat trunk/data/satdata/25064.sat trunk/data/satdata/25071.sat trunk/data/satdata/25077.sat trunk/data/satdata/25078.sat trunk/data/satdata/25086.sat trunk/data/satdata/25104.sat trunk/data/satdata/25105.sat trunk/data/satdata/25106.sat trunk/data/satdata/25108.sat trunk/data/satdata/25112.sat trunk/data/satdata/25113.sat trunk/data/satdata/25114.sat trunk/data/satdata/25115.sat trunk/data/satdata/25116.sat trunk/data/satdata/25117.sat trunk/data/satdata/25118.sat trunk/data/satdata/25119.sat trunk/data/satdata/25126.sat trunk/data/satdata/25152.sat trunk/data/satdata/25153.sat trunk/data/satdata/25158.sat trunk/data/satdata/25159.sat trunk/data/satdata/25160.sat trunk/data/satdata/25162.sat trunk/data/satdata/25163.sat trunk/data/satdata/25164.sat trunk/data/satdata/25165.sat trunk/data/satdata/25169.sat trunk/data/satdata/25170.sat trunk/data/satdata/25171.sat trunk/data/satdata/25172.sat trunk/data/satdata/25173.sat trunk/data/satdata/25237.sat trunk/data/satdata/25239.sat trunk/data/satdata/25260.sat trunk/data/satdata/25262.sat trunk/data/satdata/25263.sat trunk/data/satdata/25272.sat trunk/data/satdata/25273.sat trunk/data/satdata/25274.sat trunk/data/satdata/25275.sat trunk/data/satdata/25276.sat trunk/data/satdata/25280.sat trunk/data/satdata/25285.sat trunk/data/satdata/25286.sat trunk/data/satdata/25287.sat trunk/data/satdata/25288.sat trunk/data/satdata/25289.sat trunk/data/satdata/25290.sat trunk/data/satdata/25291.sat trunk/data/satdata/25306.sat trunk/data/satdata/25307.sat trunk/data/satdata/25308.sat trunk/data/satdata/25309.sat trunk/data/satdata/25311.sat trunk/data/satdata/25315.sat trunk/data/satdata/25319.sat trunk/data/satdata/25320.sat trunk/data/satdata/25331.sat trunk/data/satdata/25338.sat trunk/data/satdata/25342.sat trunk/data/satdata/25343.sat trunk/data/satdata/25344.sat trunk/data/satdata/25345.sat trunk/data/satdata/25346.sat trunk/data/satdata/25354.sat trunk/data/satdata/25358.sat trunk/data/satdata/25371.sat trunk/data/satdata/25379.sat trunk/data/satdata/25395.sat trunk/data/satdata/25396.sat trunk/data/satdata/25397.sat trunk/data/satdata/25398.sat trunk/data/satdata/25399.sat trunk/data/satdata/25400.sat trunk/data/satdata/25404.sat trunk/data/satdata/25407.sat trunk/data/satdata/25413.sat trunk/data/satdata/25414.sat trunk/data/satdata/25415.sat trunk/data/satdata/25416.sat trunk/data/satdata/25417.sat trunk/data/satdata/25418.sat trunk/data/satdata/25419.sat trunk/data/satdata/25420.sat trunk/data/satdata/25431.sat trunk/data/satdata/25432.sat trunk/data/satdata/25460.sat trunk/data/satdata/25462.sat trunk/data/satdata/25467.sat trunk/data/satdata/25468.sat trunk/data/satdata/25469.sat trunk/data/satdata/25471.sat trunk/data/satdata/25473.sat trunk/data/satdata/25475.sat trunk/data/satdata/25476.sat trunk/data/satdata/25477.sat trunk/data/satdata/25478.sat trunk/data/satdata/25479.sat trunk/data/satdata/25480.sat trunk/data/satdata/25481.sat trunk/data/satdata/25482.sat trunk/data/satdata/25485.sat trunk/data/satdata/25491.sat trunk/data/satdata/25492.sat trunk/data/satdata/25495.sat trunk/data/satdata/25509.sat trunk/data/satdata/25515.sat trunk/data/satdata/25516.sat trunk/data/satdata/25520.sat trunk/data/satdata/25522.sat trunk/data/satdata/25527.sat trunk/data/satdata/25528.sat trunk/data/satdata/25530.sat trunk/data/satdata/25531.sat trunk/data/satdata/25544.sat trunk/data/satdata/25546.sat trunk/data/satdata/25558.sat trunk/data/satdata/25560.sat trunk/data/satdata/25568.sat trunk/data/satdata/25577.sat trunk/data/satdata/25578.sat trunk/data/satdata/25590.sat trunk/data/satdata/25621.sat trunk/data/satdata/25622.sat trunk/data/satdata/25623.sat trunk/data/satdata/25624.sat trunk/data/satdata/25626.sat trunk/data/satdata/25630.sat trunk/data/satdata/25634.sat trunk/data/satdata/25635.sat trunk/data/satdata/25636.sat trunk/data/satdata/25638.sat trunk/data/satdata/25639.sat trunk/data/satdata/25642.sat trunk/data/satdata/25646.sat trunk/data/satdata/25649.sat trunk/data/satdata/25650.sat trunk/data/satdata/25651.sat trunk/data/satdata/25652.sat trunk/data/satdata/25657.sat trunk/data/satdata/25666.sat trunk/data/satdata/25673.sat trunk/data/satdata/25676.sat trunk/data/satdata/25677.sat trunk/data/satdata/25678.sat trunk/data/satdata/25679.sat trunk/data/satdata/25682.sat trunk/data/satdata/25693.sat trunk/data/satdata/25721.sat trunk/data/satdata/25723.sat trunk/data/satdata/25732.sat trunk/data/satdata/25735.sat trunk/data/satdata/25736.sat trunk/data/satdata/25740.sat trunk/data/satdata/25756.sat trunk/data/satdata/25757.sat trunk/data/satdata/25758.sat trunk/data/satdata/25770.sat trunk/data/satdata/25771.sat trunk/data/satdata/25772.sat trunk/data/satdata/25773.sat trunk/data/satdata/25777.sat trunk/data/satdata/25778.sat trunk/data/satdata/25785.sat trunk/data/satdata/25789.sat trunk/data/satdata/25791.sat trunk/data/satdata/25847.sat trunk/data/satdata/25851.sat trunk/data/satdata/25852.sat trunk/data/satdata/25853.sat trunk/data/satdata/25854.sat trunk/data/satdata/25860.sat trunk/data/satdata/25861.sat trunk/data/satdata/25867.sat trunk/data/satdata/25872.sat trunk/data/satdata/25873.sat trunk/data/satdata/25874.sat trunk/data/satdata/25875.sat trunk/data/satdata/25880.sat trunk/data/satdata/25883.sat trunk/data/satdata/25884.sat trunk/data/satdata/25885.sat trunk/data/satdata/25886.sat trunk/data/satdata/25894.sat trunk/data/satdata/25897.sat trunk/data/satdata/25907.sat trunk/data/satdata/25908.sat trunk/data/satdata/25909.sat trunk/data/satdata/25910.sat trunk/data/satdata/25913.sat trunk/data/satdata/25919.sat trunk/data/satdata/25922.sat trunk/data/satdata/25924.sat trunk/data/satdata/25933.sat trunk/data/satdata/25937.sat trunk/data/satdata/25940.sat trunk/data/satdata/25943.sat trunk/data/satdata/25944.sat trunk/data/satdata/25945.sat trunk/data/satdata/25946.sat trunk/data/satdata/25949.sat trunk/data/satdata/25954.sat trunk/data/satdata/25961.sat trunk/data/satdata/25962.sat trunk/data/satdata/25963.sat trunk/data/satdata/25964.sat trunk/data/satdata/25977.sat trunk/data/satdata/25978.sat trunk/data/satdata/25980.sat trunk/data/satdata/25981.sat trunk/data/satdata/25982.sat trunk/data/satdata/25983.sat trunk/data/satdata/25984.sat trunk/data/satdata/25985.sat trunk/data/satdata/25986.sat trunk/data/satdata/25989.sat trunk/data/satdata/25994.sat trunk/data/satdata/26032.sat trunk/data/satdata/26033.sat trunk/data/satdata/26034.sat trunk/data/satdata/26038.sat trunk/data/satdata/26058.sat trunk/data/satdata/26063.sat trunk/data/satdata/26064.sat trunk/data/satdata/26071.sat trunk/data/satdata/26080.sat trunk/data/satdata/26081.sat trunk/data/satdata/26082.sat trunk/data/satdata/26083.sat trunk/data/satdata/26084.sat trunk/data/satdata/26089.sat trunk/data/satdata/26091.sat trunk/data/satdata/26092.sat trunk/data/satdata/26093.sat trunk/data/satdata/26094.sat trunk/data/satdata/26095.sat trunk/data/satdata/26098.sat trunk/data/satdata/26102.sat trunk/data/satdata/26107.sat trunk/data/satdata/26108.sat trunk/data/satdata/26113.sat trunk/data/satdata/26243.sat trunk/data/satdata/26298.sat trunk/data/satdata/26352.sat trunk/data/satdata/26360.sat trunk/data/satdata/26369.sat trunk/data/satdata/26372.sat trunk/data/satdata/26378.sat trunk/data/satdata/26382.sat trunk/data/satdata/26386.sat trunk/data/satdata/26388.sat trunk/data/satdata/26390.sat trunk/data/satdata/26394.sat trunk/data/satdata/26402.sat trunk/data/satdata/26405.sat trunk/data/satdata/26407.sat trunk/data/satdata/26410.sat trunk/data/satdata/26411.sat trunk/data/satdata/26451.sat trunk/data/satdata/26463.sat trunk/data/satdata/26464.sat trunk/data/satdata/26469.sat trunk/data/satdata/26470.sat trunk/data/satdata/26477.sat trunk/data/satdata/26483.sat trunk/data/satdata/26487.sat trunk/data/satdata/26494.sat trunk/data/satdata/26495.sat trunk/data/satdata/26536.sat trunk/data/satdata/26545.sat trunk/data/satdata/26546.sat trunk/data/satdata/26547.sat trunk/data/satdata/26548.sat trunk/data/satdata/26549.sat trunk/data/satdata/26554.sat trunk/data/satdata/26559.sat trunk/data/satdata/26561.sat trunk/data/satdata/26580.sat trunk/data/satdata/26590.sat trunk/data/satdata/26599.sat trunk/data/satdata/26605.sat trunk/data/satdata/26608.sat trunk/data/satdata/26609.sat trunk/data/satdata/26610.sat trunk/data/satdata/26619.sat trunk/data/satdata/26620.sat trunk/data/satdata/26621.sat trunk/data/satdata/26624.sat trunk/data/satdata/26626.sat trunk/data/satdata/26631.sat trunk/data/satdata/26638.sat trunk/data/satdata/26639.sat trunk/data/satdata/26643.sat trunk/data/satdata/26666.sat trunk/data/satdata/26690.sat trunk/data/satdata/26694.sat trunk/data/satdata/26695.sat trunk/data/satdata/26702.sat trunk/data/satdata/26719.sat trunk/data/satdata/26720.sat trunk/data/satdata/26724.sat trunk/data/satdata/26761.sat trunk/data/satdata/26766.sat trunk/data/satdata/26818.sat trunk/data/satdata/26824.sat trunk/data/satdata/26853.sat trunk/data/satdata/26863.sat trunk/data/satdata/26867.sat trunk/data/satdata/26871.sat trunk/data/satdata/26874.sat trunk/data/satdata/26892.sat trunk/data/satdata/26900.sat trunk/data/satdata/26927.sat trunk/data/satdata/26930.sat trunk/data/satdata/26931.sat trunk/data/satdata/26932.sat trunk/data/satdata/26953.sat trunk/data/satdata/26957.sat trunk/data/satdata/26958.sat trunk/data/satdata/26985.sat trunk/data/satdata/26997.sat trunk/data/satdata/26998.sat trunk/data/satdata/27001.sat trunk/data/satdata/27003.sat trunk/data/satdata/27004.sat trunk/data/satdata/27298.sat trunk/data/satdata/27370.sat trunk/data/satdata/27372.sat trunk/data/satdata/27373.sat trunk/data/satdata/27374.sat trunk/data/satdata/27375.sat trunk/data/satdata/27376.sat trunk/data/satdata/27378.sat trunk/data/satdata/27380.sat trunk/data/satdata/27386.sat trunk/data/satdata/27389.sat trunk/data/satdata/27391.sat trunk/data/satdata/27392.sat trunk/data/satdata/27399.sat trunk/data/satdata/27400.sat trunk/data/satdata/27403.sat trunk/data/satdata/27414.sat trunk/data/satdata/27421.sat trunk/data/satdata/27422.sat trunk/data/satdata/27424.sat trunk/data/satdata/27426.sat trunk/data/satdata/27430.sat trunk/data/satdata/27431.sat trunk/data/satdata/27432.sat trunk/data/satdata/27434.sat trunk/data/satdata/27436.sat trunk/data/satdata/27438.sat trunk/data/satdata/27441.sat trunk/data/satdata/27445.sat trunk/data/satdata/27450.sat trunk/data/satdata/27451.sat trunk/data/satdata/27453.sat trunk/data/satdata/27460.sat trunk/data/satdata/27461.sat trunk/data/satdata/27499.sat trunk/data/satdata/27501.sat trunk/data/satdata/27508.sat trunk/data/satdata/27509.sat trunk/data/satdata/27513.sat trunk/data/satdata/27516.sat trunk/data/satdata/27525.sat trunk/data/satdata/27528.sat trunk/data/satdata/27540.sat trunk/data/satdata/27550.sat trunk/data/satdata/27554.sat trunk/data/satdata/27559.sat trunk/data/satdata/27560.sat trunk/data/satdata/27561.sat trunk/data/satdata/27566.sat trunk/data/satdata/27597.sat trunk/data/satdata/27598.sat trunk/data/satdata/27599.sat trunk/data/satdata/27600.sat trunk/data/satdata/27601.sat trunk/data/satdata/27603.sat trunk/data/satdata/27605.sat trunk/data/satdata/27607.sat trunk/data/satdata/27608.sat trunk/data/satdata/27632.sat trunk/data/satdata/27640.sat trunk/data/satdata/27642.sat trunk/data/satdata/27643.sat trunk/data/satdata/27651.sat trunk/data/satdata/27663.sat trunk/data/satdata/27683.sat trunk/data/satdata/27700.sat trunk/data/satdata/27704.sat trunk/data/satdata/27707.sat trunk/data/satdata/27714.sat trunk/data/satdata/27715.sat trunk/data/satdata/27718.sat trunk/data/satdata/27775.sat trunk/data/satdata/27783.sat trunk/data/satdata/27807.sat trunk/data/satdata/27811.sat trunk/data/satdata/27813.sat trunk/data/satdata/27818.sat trunk/data/satdata/27820.sat trunk/data/satdata/27825.sat trunk/data/satdata/27830.sat trunk/data/satdata/27831.sat trunk/data/satdata/27834.sat trunk/data/satdata/27838.sat trunk/data/satdata/27842.sat trunk/data/satdata/27843.sat trunk/data/satdata/27844.sat trunk/data/satdata/27845.sat trunk/data/satdata/27846.sat trunk/data/satdata/27847.sat trunk/data/satdata/27848.sat trunk/data/satdata/27852.sat trunk/data/satdata/27854.sat trunk/data/satdata/27858.sat trunk/data/satdata/27939.sat trunk/data/satdata/27941.sat trunk/data/satdata/27942.sat trunk/data/satdata/27943.sat trunk/data/satdata/27945.sat trunk/data/satdata/27948.sat trunk/data/satdata/27951.sat trunk/data/satdata/27954.sat trunk/data/satdata/28051.sat trunk/data/satdata/28057.sat trunk/data/satdata/28059.sat trunk/data/satdata/28082.sat trunk/data/satdata/28089.sat trunk/data/satdata/28094.sat trunk/data/satdata/28112.sat trunk/data/satdata/28114.sat trunk/data/satdata/28129.sat trunk/data/satdata/28132.sat trunk/data/satdata/28134.sat trunk/data/satdata/28137.sat trunk/data/satdata/28154.sat trunk/data/satdata/28163.sat trunk/data/satdata/28184.sat trunk/data/satdata/28187.sat trunk/data/satdata/28190.sat trunk/data/satdata/28194.sat trunk/data/satdata/28220.sat trunk/data/satdata/28221.sat trunk/data/satdata/28222.sat trunk/data/satdata/28230.sat trunk/data/satdata/28238.sat trunk/data/satdata/28252.sat trunk/data/satdata/28254.sat trunk/data/satdata/28353.sat trunk/data/satdata/28358.sat trunk/data/satdata/28361.sat trunk/data/satdata/28364.sat trunk/data/satdata/28366.sat trunk/data/satdata/28368.sat trunk/data/satdata/28369.sat trunk/data/satdata/28370.sat trunk/data/satdata/28371.sat trunk/data/satdata/28372.sat trunk/data/satdata/28373.sat trunk/data/satdata/28375.sat trunk/data/satdata/28376.sat trunk/data/satdata/28378.sat trunk/data/satdata/28380.sat trunk/data/satdata/28382.sat trunk/data/satdata/28393.sat trunk/data/satdata/28417.sat trunk/data/satdata/28446.sat trunk/data/satdata/28451.sat trunk/data/satdata/28463.sat trunk/data/satdata/28471.sat trunk/data/satdata/28472.sat trunk/data/satdata/28474.sat trunk/data/satdata/28480.sat trunk/data/satdata/28485.sat trunk/data/satdata/28492.sat trunk/data/satdata/28493.sat trunk/data/satdata/28494.sat trunk/data/satdata/28495.sat trunk/data/satdata/28496.sat trunk/data/satdata/28497.sat trunk/data/satdata/28498.sat trunk/data/satdata/28499.sat trunk/data/satdata/28509.sat trunk/data/satdata/28521.sat trunk/data/satdata/28526.sat trunk/data/satdata/28542.sat trunk/data/satdata/28622.sat trunk/data/satdata/28626.sat trunk/data/satdata/28628.sat trunk/data/satdata/28629.sat trunk/data/satdata/28638.sat trunk/data/satdata/28644.sat trunk/data/satdata/28649.sat trunk/data/satdata/28650.sat trunk/data/satdata/28654.sat trunk/data/satdata/28659.sat trunk/data/satdata/28702.sat trunk/data/satdata/28707.sat trunk/data/satdata/28738.sat trunk/data/satdata/28773.sat trunk/data/satdata/28786.sat trunk/data/satdata/28790.sat trunk/data/satdata/28868.sat trunk/data/satdata/28874.sat trunk/data/satdata/28884.sat trunk/data/satdata/28885.sat trunk/data/satdata/28890.sat trunk/data/satdata/28891.sat trunk/data/satdata/28892.sat trunk/data/satdata/28893.sat trunk/data/satdata/28894.sat trunk/data/satdata/28895.sat trunk/data/satdata/28897.sat trunk/data/satdata/28899.sat trunk/data/satdata/28902.sat trunk/data/satdata/28903.sat trunk/data/satdata/28911.sat trunk/data/satdata/28912.sat trunk/data/satdata/28915.sat trunk/data/satdata/28916.sat trunk/data/satdata/28922.sat trunk/data/satdata/28924.sat trunk/data/satdata/28931.sat trunk/data/satdata/28932.sat trunk/data/satdata/28935.sat trunk/data/satdata/28937.sat trunk/data/satdata/28939.sat trunk/data/satdata/28941.sat trunk/data/satdata/28942.sat trunk/data/satdata/28945.sat trunk/data/satdata/28946.sat trunk/data/satdata/28980.sat trunk/data/satdata/28981.sat trunk/data/satdata/28982.sat trunk/data/satdata/29045.sat trunk/data/satdata/29047.sat trunk/data/satdata/29048.sat trunk/data/satdata/29049.sat trunk/data/satdata/29050.sat trunk/data/satdata/29051.sat trunk/data/satdata/29052.sat trunk/data/satdata/29055.sat trunk/data/satdata/29079.sat trunk/data/satdata/29092.sat trunk/data/satdata/29107.sat trunk/data/satdata/29108.sat trunk/data/satdata/29155.sat trunk/data/satdata/29162.sat trunk/data/satdata/29163.sat trunk/data/satdata/29228.sat trunk/data/satdata/29230.sat trunk/data/satdata/29236.sat trunk/data/satdata/29247.sat trunk/data/satdata/29252.sat trunk/data/satdata/29268.sat trunk/data/satdata/29270.sat trunk/data/satdata/29272.sat trunk/data/satdata/29273.sat trunk/data/satdata/29349.sat trunk/data/satdata/29394.sat trunk/data/satdata/29398.sat trunk/data/satdata/29479.sat trunk/data/satdata/29480.sat trunk/data/satdata/29486.sat trunk/data/satdata/29494.sat trunk/data/satdata/29495.sat trunk/data/satdata/29499.sat trunk/data/satdata/29505.sat trunk/data/satdata/29506.sat trunk/data/satdata/29507.sat trunk/data/satdata/29520.sat trunk/data/satdata/29526.sat trunk/data/satdata/29601.sat trunk/data/satdata/29640.sat trunk/data/satdata/29643.sat trunk/data/satdata/29644.sat trunk/data/satdata/29648.sat trunk/data/satdata/29655.sat trunk/data/satdata/29656.sat trunk/data/satdata/29658.sat trunk/data/satdata/29659.sat trunk/data/satdata/29670.sat trunk/data/satdata/29671.sat trunk/data/satdata/29672.sat trunk/data/satdata/29678.sat trunk/data/satdata/29709.sat trunk/data/satdata/29710.sat trunk/data/satdata/29712.sat trunk/data/satdata/30323.sat trunk/data/satdata/30580.sat trunk/data/satdata/30581.sat trunk/data/satdata/30582.sat trunk/data/satdata/30773.sat trunk/data/satdata/30776.sat trunk/data/satdata/30777.sat trunk/data/satdata/30778.sat trunk/data/satdata/30793.sat trunk/data/satdata/30794.sat trunk/data/satdata/30797.sat trunk/data/satdata/30798.sat trunk/data/satdata/31102.sat trunk/data/satdata/31113.sat trunk/data/satdata/31114.sat trunk/data/satdata/31118.sat trunk/data/satdata/31119.sat trunk/data/satdata/31121.sat trunk/data/satdata/31122.sat trunk/data/satdata/31124.sat trunk/data/satdata/31125.sat trunk/data/satdata/31126.sat trunk/data/satdata/31127.sat trunk/data/satdata/31128.sat trunk/data/satdata/31129.sat trunk/data/satdata/31130.sat trunk/data/satdata/31132.sat trunk/data/satdata/31140.sat trunk/data/satdata/31304.sat trunk/data/satdata/31306.sat trunk/data/satdata/31307.sat trunk/data/satdata/31395.sat trunk/data/satdata/31571.sat trunk/data/satdata/31573.sat trunk/data/satdata/31574.sat trunk/data/satdata/31576.sat trunk/data/satdata/31577.sat trunk/data/satdata/31598.sat trunk/data/satdata/31601.sat trunk/data/satdata/31698.sat trunk/data/satdata/31789.sat trunk/data/satdata/31792.sat trunk/data/satdata/31793.sat trunk/data/satdata/31797.sat trunk/data/satdata/31800.sat trunk/data/satdata/31862.sat trunk/data/satdata/32018.sat trunk/data/satdata/32019.sat trunk/data/satdata/32050.sat trunk/data/satdata/32052.sat trunk/data/satdata/32060.sat trunk/data/satdata/32062.sat trunk/data/satdata/32252.sat trunk/data/satdata/32253.sat trunk/data/satdata/32260.sat trunk/data/satdata/32263.sat trunk/data/satdata/32264.sat trunk/data/satdata/32265.sat trunk/data/satdata/32266.sat trunk/data/satdata/32275.sat trunk/data/satdata/32276.sat trunk/data/satdata/32277.sat trunk/data/satdata/32283.sat trunk/data/satdata/32293.sat trunk/data/satdata/32294.sat trunk/data/satdata/32299.sat trunk/data/satdata/32373.sat trunk/data/satdata/32376.sat trunk/data/satdata/32382.sat trunk/data/satdata/32384.sat trunk/data/satdata/32387.sat trunk/data/satdata/32388.sat trunk/data/satdata/32393.sat trunk/data/satdata/32394.sat trunk/data/satdata/32395.sat trunk/data/satdata/32404.sat trunk/data/satdata/32478.sat trunk/data/satdata/32487.sat trunk/data/satdata/32500.sat trunk/data/satdata/32708.sat trunk/data/satdata/32711.sat trunk/data/satdata/32729.sat trunk/data/satdata/32750.sat trunk/data/satdata/32763.sat trunk/data/satdata/32765.sat trunk/data/satdata/32767.sat trunk/data/satdata/32768.sat trunk/data/satdata/32779.sat trunk/data/satdata/32781.sat trunk/data/satdata/32783.sat trunk/data/satdata/32784.sat trunk/data/satdata/32785.sat trunk/data/satdata/32786.sat trunk/data/satdata/32787.sat trunk/data/satdata/32788.sat trunk/data/satdata/32789.sat trunk/data/satdata/32790.sat trunk/data/satdata/32791.sat trunk/data/satdata/32794.sat trunk/data/satdata/32951.sat trunk/data/satdata/32958.sat trunk/data/satdata/33051.sat trunk/data/satdata/33053.sat trunk/data/satdata/33055.sat trunk/data/satdata/33056.sat trunk/data/satdata/33060.sat trunk/data/satdata/33061.sat trunk/data/satdata/33062.sat trunk/data/satdata/33063.sat trunk/data/satdata/33064.sat trunk/data/satdata/33065.sat trunk/data/satdata/33105.sat trunk/data/satdata/33108.sat trunk/data/satdata/33153.sat trunk/data/satdata/33154.sat trunk/data/satdata/33207.sat trunk/data/satdata/33244.sat trunk/data/satdata/33274.sat trunk/data/satdata/33275.sat trunk/data/satdata/33278.sat trunk/data/satdata/33312.sat trunk/data/satdata/33313.sat trunk/data/satdata/33314.sat trunk/data/satdata/33315.sat trunk/data/satdata/33316.sat trunk/data/satdata/33320.sat trunk/data/satdata/33321.sat trunk/data/satdata/33331.sat trunk/data/satdata/33373.sat trunk/data/satdata/33376.sat trunk/data/satdata/33378.sat trunk/data/satdata/33379.sat trunk/data/satdata/33380.sat trunk/data/satdata/33396.sat trunk/data/satdata/33412.sat trunk/data/satdata/33414.sat trunk/data/satdata/33436.sat trunk/data/satdata/33446.sat trunk/data/satdata/33453.sat trunk/data/satdata/33456.sat trunk/data/satdata/33459.sat trunk/data/satdata/33460.sat trunk/data/satdata/33463.sat trunk/data/satdata/33466.sat trunk/data/satdata/33467.sat trunk/data/satdata/33468.sat trunk/data/satdata/33493.sat trunk/data/satdata/33498.sat trunk/data/satdata/33499.sat trunk/data/satdata/33504.sat trunk/data/satdata/33591.sat trunk/data/satdata/33595.sat trunk/data/satdata/33596.sat trunk/data/satdata/33749.sat trunk/data/satdata/33750.sat trunk/data/satdata/33751.sat trunk/data/satdata/33752.sat trunk/data/satdata/34111.sat trunk/data/satdata/34264.sat trunk/data/satdata/34661.sat trunk/data/satdata/34710.sat trunk/data/satdata/34779.sat trunk/data/satdata/34810.sat trunk/data/satdata/34941.sat trunk/data/satdata/35001.sat trunk/data/satdata/35003.sat trunk/data/satdata/35004.sat trunk/data/satdata/35005.sat trunk/data/satdata/35491.sat trunk/data/satdata/35578.sat trunk/data/satdata/35636.sat trunk/data/satdata/35681.sat trunk/data/satdata/35683.sat trunk/data/satdata/amateur.cat trunk/data/satdata/convert.py trunk/data/satdata/cubesat.cat trunk/data/satdata/dmc.cat trunk/data/satdata/education.cat trunk/data/satdata/engineering.cat trunk/data/satdata/galileo.cat trunk/data/satdata/geo.cat trunk/data/satdata/geodetic.cat trunk/data/satdata/glo-ops.cat trunk/data/satdata/globalstar.cat trunk/data/satdata/goes.cat trunk/data/satdata/gorizont.cat trunk/data/satdata/gps-ops.cat trunk/data/satdata/intelsat.cat trunk/data/satdata/iridium.cat trunk/data/satdata/military.cat trunk/data/satdata/molniya.cat trunk/data/satdata/musson.cat trunk/data/satdata/nnss.cat trunk/data/satdata/noaa.cat trunk/data/satdata/orbcomm.cat trunk/data/satdata/other-comm.cat trunk/data/satdata/other.cat trunk/data/satdata/radar.cat trunk/data/satdata/raduga.cat trunk/data/satdata/resource.cat trunk/data/satdata/sarsat.cat trunk/data/satdata/sbas.cat trunk/data/satdata/science.cat trunk/data/satdata/tdrss.cat trunk/data/satdata/visual.cat trunk/data/satdata/weather.cat trunk/data/satdata/x-comm.cat Added: trunk/data/satdata/00424.sat =================================================================== --- trunk/data/satdata/00424.sat (rev 0) +++ trunk/data/satdata/00424.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ALOUETTE 1 (S-27) +NICKNAME=ALOUETTE 1 (S-27) +TLE1=1 00424U 62049A 09214.95816155 .00000028 00000-0 22319-4 0 1945 +TLE2=2 00424 80.4640 228.9136 0021981 288.6375 71.2387 13.68717468338097 Added: trunk/data/satdata/00694.sat =================================================================== --- trunk/data/satdata/00694.sat (rev 0) +++ trunk/data/satdata/00694.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATLAS CENTAUR 2 +NICKNAME=ATLAS CENTAUR 2 +TLE1=1 00694U 63047A 09215.74369123 .00000237 00000-0 21703-4 0 249 +TLE2=2 00694 30.3573 45.9123 0616301 80.9961 285.9812 13.95025012280098 Added: trunk/data/satdata/00733.sat =================================================================== --- trunk/data/satdata/00733.sat (rev 0) +++ trunk/data/satdata/00733.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=THOR AGENA D R/B +NICKNAME=THOR AGENA D R/B +TLE1=1 00733U 64002A 09215.57411246 -.00000003 00000-0 17355-4 0 8394 +TLE2=2 00733 99.1171 239.7401 0033514 256.5296 103.2155 14.31264307370985 Added: trunk/data/satdata/00877.sat =================================================================== --- trunk/data/satdata/00877.sat (rev 0) +++ trunk/data/satdata/00877.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-3 R/B +NICKNAME=SL-3 R/B +TLE1=1 00877U 64053B 09214.78062723 -.00000100 00000-0 42585-5 0 1567 +TLE2=2 00877 65.0784 45.1123 0064997 173.4790 186.7158 14.58089120382137 Added: trunk/data/satdata/00900.sat =================================================================== --- trunk/data/satdata/00900.sat (rev 0) +++ trunk/data/satdata/00900.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 1 +NICKNAME=CALSPHERE 1 +TLE1=1 00900U 64063C 09215.39141000 .00000092 00000-0 92907-4 0 8512 +TLE2=2 00900 90.1628 327.8813 0030187 91.9022 268.5595 13.70478422225930 Added: trunk/data/satdata/00902.sat =================================================================== --- trunk/data/satdata/00902.sat (rev 0) +++ trunk/data/satdata/00902.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 2 +NICKNAME=CALSPHERE 2 +TLE1=1 00902U 64063E 09215.36067010 .00000075 00000-0 10000-3 0 1213 +TLE2=2 00902 90.1639 330.8414 0019560 107.6238 252.7041 13.52466237 23748 Added: trunk/data/satdata/01293.sat =================================================================== --- trunk/data/satdata/01293.sat (rev 0) +++ trunk/data/satdata/01293.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 3 (OSCAR III) +NICKNAME=OSCAR 3 (OSCAR III) +TLE1=1 01293U 65016F 09215.08169401 .00000149 00000-0 12652-3 0 5820 +TLE2=2 01293 70.0702 70.0707 0016693 110.1861 250.1049 14.04721679266395 Added: trunk/data/satdata/01361.sat =================================================================== --- trunk/data/satdata/01361.sat (rev 0) +++ trunk/data/satdata/01361.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=LCS 1 +NICKNAME=LCS 1 +TLE1=1 01361U 65034C 09214.89551685 .00000009 00000-0 10000-3 0 1256 +TLE2=2 01361 32.1407 48.1457 0006449 160.4719 199.6021 9.89276578599989 Added: trunk/data/satdata/01512.sat =================================================================== --- trunk/data/satdata/01512.sat (rev 0) +++ trunk/data/satdata/01512.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TEMPSAT 1 +NICKNAME=TEMPSAT 1 +TLE1=1 01512U 65065E 09215.73842749 .00000058 00000-0 10000-3 0 2037 +TLE2=2 01512 89.8126 299.5136 0067977 267.3750 91.9605 13.33258774138966 Added: trunk/data/satdata/01520.sat =================================================================== --- trunk/data/satdata/01520.sat (rev 0) +++ trunk/data/satdata/01520.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=CALSPHERE 4(A) +NICKNAME=CALSPHERE 4(A) +TLE1=1 01520U 65065H 09214.67391152 .00000060 00000-0 10000-3 0 3387 +TLE2=2 01520 90.1823 84.1010 0068919 195.3321 164.5729 13.35317794140455 Added: trunk/data/satdata/02608.sat =================================================================== --- trunk/data/satdata/02608.sat (rev 0) +++ trunk/data/satdata/02608.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATS 1 +NICKNAME=ATS 1 +TLE1=1 02608U 66110A 09214.56123925 -.00000135 00000-0 10000-3 0 9881 +TLE2=2 02608 7.8332 310.3833 0004026 194.9911 165.1462 1.00288749 72977 Added: trunk/data/satdata/02802.sat =================================================================== --- trunk/data/satdata/02802.sat (rev 0) +++ trunk/data/satdata/02802.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-8 R/B +NICKNAME=SL-8 R/B +TLE1=1 02802U 67045B 09215.27148569 .00000028 00000-0 16265-4 0 730 +TLE2=2 02802 74.0108 112.8822 0067684 138.7399 221.8896 14.42463531214308 Added: trunk/data/satdata/02807.sat =================================================================== --- trunk/data/satdata/02807.sat (rev 0) +++ trunk/data/satdata/02807.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 16 +NICKNAME=TRANSIT 16 +TLE1=1 02807U 67048A 09214.98383387 .00000074 00000-0 10000-3 0 2715 +TLE2=2 02807 89.6513 202.0328 0022071 100.0837 260.2805 13.49716226 76938 Added: trunk/data/satdata/02826.sat =================================================================== --- trunk/data/satdata/02826.sat (rev 0) +++ trunk/data/satdata/02826.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OPS 5712 (P/L 160) +NICKNAME=OPS 5712 (P/L 160) +TLE1=1 02826U 67053A 09214.92608426 .00000302 00000-0 11870-3 0 7883 +TLE2=2 02826 69.9325 60.6969 0006000 78.0452 282.1345 14.38285624174013 Added: trunk/data/satdata/02874.sat =================================================================== --- trunk/data/satdata/02874.sat (rev 0) +++ trunk/data/satdata/02874.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OPS 5712 (P/L 153) +NICKNAME=OPS 5712 (P/L 153) +TLE1=1 02874U 67053H 09214.86043976 -.00000053 00000-0 52186-6 0 1787 +TLE2=2 02874 69.9731 352.0720 0009619 270.1737 89.8269 13.95925225147051 Added: trunk/data/satdata/02909.sat =================================================================== --- trunk/data/satdata/02909.sat (rev 0) +++ trunk/data/satdata/02909.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SURCAL 150B +NICKNAME=SURCAL 150B +TLE1=1 02909U 67053J 09215.09557402 .00000289 00000-0 97191-4 0 9620 +TLE2=2 02909 69.9536 233.6655 0006362 266.0399 94.0022 14.46502780179755 Added: trunk/data/satdata/02965.sat =================================================================== --- trunk/data/satdata/02965.sat (rev 0) +++ trunk/data/satdata/02965.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 17 +NICKNAME=TRANSIT 17 +TLE1=1 02965U 67092A 09215.57673419 .00000077 00000-0 10000-3 0 5539 +TLE2=2 02965 89.2593 119.3220 0047005 294.9648 64.6623 13.52426426 63524 Added: trunk/data/satdata/03029.sat =================================================================== --- trunk/data/satdata/03029.sat (rev 0) +++ trunk/data/satdata/03029.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATS 3 +NICKNAME=ATS 3 +TLE1=1 03029U 67111A 09214.31138730 -.00000093 00000-0 10000-3 0 4950 +TLE2=2 03029 9.3673 317.7667 0015092 43.8150 316.4215 1.00272359152840 Added: trunk/data/satdata/03133.sat =================================================================== --- trunk/data/satdata/03133.sat (rev 0) +++ trunk/data/satdata/03133.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=TRANSIT 18 +NICKNAME=TRANSIT 18 +TLE1=1 03133U 68012A 09215.72066227 .00000075 00000-0 10000-3 0 3367 +TLE2=2 03133 89.9796 286.6251 0074741 184.5619 175.4854 13.50529039 38975 Added: trunk/data/satdata/03230.sat =================================================================== --- trunk/data/satdata/03230.sat (rev 0) +++ trunk/data/satdata/03230.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-8 R/B +NICKNAME=SL-8 R/B +TLE1=1 03230U 68040B 09215.47019951 -.00000009 00000-0 34296-5 0 7143 +TLE2=2 03230 74.0347 206.8669 0034793 202.3521 157.6152 14.84219452208268 Added: trunk/data/satdata/03597.sat =================================================================== --- trunk/data/satdata/03597.sat (rev 0) +++ trunk/data/satdata/03597.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OAO 2 +NICKNAME=OAO 2 +TLE1=1 03597U 68110A 09214.95903253 .00000011 00000-0 85973-5 0 1139 +TLE2=2 03597 34.9937 189.8699 0006185 295.8987 64.1074 14.44868682141727 Added: trunk/data/satdata/03669.sat =================================================================== --- trunk/data/satdata/03669.sat (rev 0) +++ trunk/data/satdata/03669.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ISIS 1 +NICKNAME=ISIS 1 +TLE1=1 03669U 69009A 09214.76929039 .00000049 00000-0 18506-4 0 9266 +TLE2=2 03669 88.4296 106.6935 1715206 68.6747 308.8325 11.28861471664467 Added: trunk/data/satdata/03835.sat =================================================================== --- trunk/data/satdata/03835.sat (rev 0) +++ trunk/data/satdata/03835.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=METEOR 1-1 +NICKNAME=METEOR 1-1 +TLE1=1 03835U 69029A 09214.93770687 .00002061 00000-0 38459-4 0 1475 +TLE2=2 03835 81.1659 349.1299 0009223 70.0807 290.1429 15.48208372204616 Added: trunk/data/satdata/04321.sat =================================================================== --- trunk/data/satdata/04321.sat (rev 0) +++ trunk/data/satdata/04321.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 5 (AO-5) +NICKNAME=OSCAR 5 (AO-5) +TLE1=1 04321U 70008B 09214.94755686 -.00000031 00000-0 10000-3 0 1970 +TLE2=2 04321 102.1317 226.9606 0027375 250.4902 109.3227 12.52157105806618 Added: trunk/data/satdata/04327.sat =================================================================== --- trunk/data/satdata/04327.sat (rev 0) +++ trunk/data/satdata/04327.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SERT 2 +NICKNAME=SERT 2 +TLE1=1 04327U 70009A 09214.70067383 .00000032 00000-0 10000-3 0 385 +TLE2=2 04327 99.2079 85.1379 0004193 192.6468 167.4566 13.58228196957113 Added: trunk/data/satdata/04507.sat =================================================================== --- trunk/data/satdata/04507.sat (rev 0) +++ trunk/data/satdata/04507.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NNSS 19 +NICKNAME=NNSS 19 +TLE1=1 04507U 70067A 09215.78762208 .00000044 00000-0 51111-4 0 9961 +TLE2=2 04507 89.8683 311.0800 0171063 306.7249 51.8289 13.50137805916105 Added: trunk/data/satdata/04793.sat =================================================================== --- trunk/data/satdata/04793.sat (rev 0) +++ trunk/data/satdata/04793.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 1 [-] +NICKNAME=NOAA 1 [-] +TLE1=1 04793U 70106A 09215.48027265 -.00000031 00000-0 10000-3 0 2158 +TLE2=2 04793 102.0756 207.0326 0032237 347.5243 12.5026 12.53930472768846 Added: trunk/data/satdata/04814.sat =================================================================== --- trunk/data/satdata/04814.sat (rev 0) +++ trunk/data/satdata/04814.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-3 R/B +NICKNAME=SL-3 R/B +TLE1=1 04814U 70113B 09215.49694220 -.00000073 00000-0 -54367-5 0 243 +TLE2=2 04814 81.1511 167.8195 0041925 49.8224 310.6690 15.13614664 97393 Added: trunk/data/satdata/05118.sat =================================================================== --- trunk/data/satdata/05118.sat (rev 0) +++ trunk/data/satdata/05118.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-3 R/B +NICKNAME=SL-3 R/B +TLE1=1 05118U 71028B 09215.16087958 -.00000231 00000-0 -18894-4 0 2056 +TLE2=2 05118 81.2376 183.1961 0050039 61.4327 299.1875 15.02315734 71171 Added: trunk/data/satdata/05398.sat =================================================================== --- trunk/data/satdata/05398.sat (rev 0) +++ trunk/data/satdata/05398.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=RIGIDSPHERE 2 (LCS 4) +NICKNAME=RIGIDSPHERE 2 (LCS 4) +TLE1=1 05398U 71067E 09215.80796790 .00000140 00000-0 45264-4 0 6266 +TLE2=2 05398 87.6189 236.3532 0066892 20.8020 339.5869 14.31165389991376 Added: trunk/data/satdata/05560.sat =================================================================== --- trunk/data/satdata/05560.sat (rev 0) +++ trunk/data/satdata/05560.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ASTEX 1 +NICKNAME=ASTEX 1 +TLE1=1 05560U 71089A 09215.78135167 .00000064 00000-0 18144-4 0 8728 +TLE2=2 05560 92.7129 358.8368 0015575 319.5061 40.4985 14.46206422985482 Added: trunk/data/satdata/05730.sat =================================================================== --- trunk/data/satdata/05730.sat (rev 0) +++ trunk/data/satdata/05730.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-8 R/B +NICKNAME=SL-8 R/B +TLE1=1 05730U 71119B 09215.41754164 .00000698 00000-0 54417-4 0 2152 +TLE2=2 05730 73.9004 72.2226 0804374 149.9908 214.9983 13.76844208806796 Added: trunk/data/satdata/06073.sat =================================================================== --- trunk/data/satdata/06073.sat (rev 0) +++ trunk/data/satdata/06073.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=COSMOS 482 DESCENT CRAFT +NICKNAME=COSMOS 482 DESCENT CRAFT +TLE1=1 06073U 72023E 09215.70379638 .00010075 28559-5 74788-4 0 1346 +TLE2=2 06073 52.1101 288.2028 2206782 202.0199 146.9309 11.17793170 20661 Added: trunk/data/satdata/06153.sat =================================================================== --- trunk/data/satdata/06153.sat (rev 0) +++ trunk/data/satdata/06153.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OAO 3 (COPERNICUS) +NICKNAME=OAO 3 (COPERNICUS) +TLE1=1 06153U 72065A 09215.12178020 .00000023 00000-0 97192-5 0 2444 +TLE2=2 06153 35.0065 156.5874 0006756 49.5188 310.6105 14.56570933961297 Added: trunk/data/satdata/06155.sat =================================================================== --- trunk/data/satdata/06155.sat (rev 0) +++ trunk/data/satdata/06155.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=ATLAS CENTAUR R/B +NICKNAME=ATLAS CENTAUR R/B +TLE1=1 06155U 72065B 09215.13749586 .00000056 00000-0 13233-4 0 9275 +TLE2=2 06155 35.0046 194.8033 0040990 262.8904 96.7159 14.67979838968808 Added: trunk/data/satdata/06212.sat =================================================================== --- trunk/data/satdata/06212.sat (rev 0) +++ trunk/data/satdata/06212.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OPS 8180 (RADCAT) +NICKNAME=OPS 8180 (RADCAT) +TLE1=1 06212U 72076A 09215.48266188 .00001557 00000-0 58766-4 0 7995 +TLE2=2 06212 98.5941 230.8941 0003265 171.9317 188.2019 15.28986717130109 Added: trunk/data/satdata/06235.sat =================================================================== --- trunk/data/satdata/06235.sat (rev 0) +++ trunk/data/satdata/06235.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 2 [-] +NICKNAME=NOAA 2 [-] +TLE1=1 06235U 72082A 09215.50225269 -.00000027 00000-0 10000-3 0 3148 +TLE2=2 06235 101.4019 231.5337 0003639 185.4803 174.6232 12.53003584683393 Added: trunk/data/satdata/06236.sat =================================================================== --- trunk/data/satdata/06236.sat (rev 0) +++ trunk/data/satdata/06236.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=OSCAR 6 (AO-6) +NICKNAME=OSCAR 6 (AO-6) +TLE1=1 06236U 72082B 09214.94130320 -.00000027 00000-0 10000-3 0 1888 +TLE2=2 06236 101.3966 226.4340 0003801 155.1078 205.0179 12.53077930683261 Added: trunk/data/satdata/06909.sat =================================================================== --- trunk/data/satdata/06909.sat (rev 0) +++ trunk/data/satdata/06909.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NNSS O-20 +NICKNAME=NNSS O-20 +TLE1=1 06909U 73081A 09214.89238339 .00000021 00000-0 12178-4 0 4300 +TLE2=2 06909 89.8595 357.3630 0157901 329.1644 30.0322 13.69753789985458 Added: trunk/data/satdata/06920.sat =================================================================== --- trunk/data/satdata/06920.sat (rev 0) +++ trunk/data/satdata/06920.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 3 [-] +NICKNAME=NOAA 3 [-] +TLE1=1 06920U 73086A 09215.52333023 -.00000030 00000-0 10000-3 0 2068 +TLE2=2 06920 101.7204 236.0968 0006603 82.1204 278.0611 12.40298770618145 Added: trunk/data/satdata/07004.sat =================================================================== --- trunk/data/satdata/07004.sat (rev 0) +++ trunk/data/satdata/07004.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-8 R/B +NICKNAME=SL-8 R/B +TLE1=1 07004U 73107B 09214.87253692 .00003136 00000-0 12828-3 0 838 +TLE2=2 07004 73.9603 159.0366 0429675 11.6353 349.4388 14.68178125807156 Added: trunk/data/satdata/07338.sat =================================================================== --- trunk/data/satdata/07338.sat (rev 0) +++ trunk/data/satdata/07338.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=SL-8 R/B +NICKNAME=SL-8 R/B +TLE1=1 07338U 74044B 09215.09412167 .00002493 00000-0 49338-4 0 9345 +TLE2=2 07338 82.8805 35.6237 0216199 269.8522 87.7946 15.25050035806744 Added: trunk/data/satdata/07529.sat =================================================================== --- trunk/data/satdata/07529.sat (rev 0) +++ trunk/data/satdata/07529.sat 2009-08-04 10:29:58 UTC (rev 344) @@ -0,0 +1,5 @@ +VERSION=1.1 +NAME=NOAA 4 [-] +NICKNAME=NOAA 4 [-] +TLE1=1 07529U 74089A 09215.51381802 -.00000027 00000-0 10000-3 0 2173 +TLE2=2 07529 101.4417 238.5137 0008751 223.3957 136.6430 12.53053459587970 Added: trunk/data/satdata/0753... [truncated message content] |
From: <cs...@us...> - 2009-08-03 19:38:47
|
Revision: 343 http://gpredict.svn.sourceforge.net/gpredict/?rev=343&view=rev Author: csete Date: 2009-08-03 19:38:36 +0000 (Mon, 03 Aug 2009) Log Message: ----------- New SAT daat I/O. Modified Paths: -------------- trunk/src/Makefile.am Added Paths: ----------- trunk/src/sat-data.c trunk/src/sat-data.h Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-08-03 19:26:35 UTC (rev 342) +++ trunk/src/Makefile.am 2009-08-03 19:38:36 UTC (rev 343) @@ -74,6 +74,7 @@ rotor-conf.c rotor-conf.h \ trsp-conf.c trsp-conf.h \ sat-cfg.c sat-cfg.h \ + sat-data.c sat-data.h \ sat-info.c sat-info.h \ sat-log.c sat-log.h \ sat-log-browser.c sat-log-browser.h \ Added: trunk/src/sat-data.c =================================================================== --- trunk/src/sat-data.c (rev 0) +++ trunk/src/sat-data.c 2009-08-03 19:38:36 UTC (rev 343) @@ -0,0 +1,328 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + + 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 <glib.h> +#include <glib/gi18n.h> +#include "sgpsdp/sgp4sdp4.h" +#include "sat-data.h" +#include "sat-log.h" +#include "config-keys.h" +#include "tle-lookup.h" +#ifdef HAVE_CONFIG_H +# include <build-config.h> +#endif +#include "orbit-tools.h" +#include "time-tools.h" + + + + +/** \brief Read data for a given satellite into memory. + * \param catnum The catalog number of the satellite. + * \param sat Pointer to a valid sat_t structure. + * \return 0 if successfull, 1 if the satellite could not + * be found in any of the data files, 2 if the tle + * data has wrong checksum and finally 3 if the tle file + * in which the satellite should be, could not be read or opened. + * + * \bug We should use g_io_channel + */ +gint +sat_data_read (gint catnum, sat_t *sat) +{ + FILE *fp; + gchar tle_str[3][80]; + gchar *filename = NULL, *path = NULL; + gchar *b; + gchar catstr[6]; + guint i; + guint catnr; + gboolean found = FALSE; + guint errorcode = 0; + + filename = tle_lookup (catnum); + + if (!filename) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Can not find #%d in any .tle file."), + __FUNCTION__, catnum); + + return 1; + } + + /* create full file path */ + path = g_strdup_printf ("%s%s.gpredict2%stle%s%s", + g_get_home_dir (), + G_DIR_SEPARATOR_S, + G_DIR_SEPARATOR_S, + G_DIR_SEPARATOR_S, + filename); + + fp = fopen (path, "r"); + + if (fp != NULL) { + + while (fgets (tle_str[0], 80, fp) && !found) { + + /* read second and third lines */ + b = fgets (tle_str[1], 80, fp); + b = fgets (tle_str[2], 80, fp); + + /* copy catnum and convert to integer */ + for (i = 2; i < 7; i++) { + catstr[i-2] = tle_str[1][i]; + } + catstr[5] = '\0'; + catnr = (guint) g_ascii_strtod (catstr, NULL); + + if (catnr == catnum) { + + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Found #%d in %s"), + __FUNCTION__, + catnum, + path); + + found = TRUE; + + if (Get_Next_Tle_Set (tle_str, &sat->tle) != 1) { + /* TLE data not good */ + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Invalid data for #%d"), + __FUNCTION__, + catnum); + + errorcode = 2; + } + else { + /* DATA OK, phew... */ + sat_log_log (SAT_LOG_LEVEL_DEBUG, + _("%s: Good data for #%d"), + __FUNCTION__, + catnum); + + /* VERY, VERY important! If not done, some sats + will not get initialised, the first time SGP4/SDP4 + is called. Consequently, the resulting data will + be NAN, INF or similar nonsense. + For some reason, not even using g_new0 seems to + be enough. + */ + sat->flags = 0; + + select_ephemeris (sat); + + /* initialise variable fields */ + sat->jul_utc = 0.0; + sat->tsince = 0.0; + sat->az = 0.0; + sat->el = 0.0; + sat->range = 0.0; + sat->range_rate = 0.0; + sat->ra = 0.0; + sat->dec = 0.0; + sat->ssplat = 0.0; + sat->ssplon = 0.0; + sat->alt = 0.0; + sat->velo = 0.0; + sat->ma = 0.0; + sat->footprint = 0.0; + sat->phase = 0.0; + sat->aos = 0.0; + sat->los = 0.0; + + /* calculate satellite data at epoch */ + sat_data_init (sat, NULL); + + } + } + + } + + fclose (fp); + } + else { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Failed to open %s"), + __FUNCTION__, path); + + errorcode = 3; + } + + g_free (path); + g_free (filename); + + return errorcode; +} + + +/** \brief Initialise satellite data. + * \param sat The satellite to initialise. + * \param qth Optional QTH info, use (0,0) if NULL. + * + * This function calculates the satellite data at t = 0, ie. epoch time + * The function is called automatically by gtk_sat_data_read_sat. + */ +void +sat_data_init (sat_t *sat, qth_t *qth) +{ + geodetic_t obs_geodetic; + obs_set_t obs_set; + geodetic_t sat_geodetic; + double jul_utc, age; + + g_return_if_fail (sat != NULL); + + jul_utc = Julian_Date_of_Epoch (sat->tle.epoch); // => tsince = 0.0 + sat->jul_epoch = jul_utc; + + /* initialise observer location */ + if (qth != NULL) { + obs_geodetic.lon = qth->lon * de2ra; + obs_geodetic.lat = qth->lat * de2ra; + obs_geodetic.alt = qth->alt / 1000.0; + obs_geodetic.theta = 0; + } + else { + obs_geodetic.lon = 0.0; + obs_geodetic.lat = 0.0; + obs_geodetic.alt = 0.0; + obs_geodetic.theta = 0; + } + + /* execute computations */ + if (sat->flags & DEEP_SPACE_EPHEM_FLAG) + SDP4 (sat, 0.0); + else + SGP4 (sat, 0.0); + + /* scale position and velocity to km and km/sec */ + Convert_Sat_State (&sat->pos, &sat->vel); + + /* get the velocity of the satellite */ + Magnitude (&sat->vel); + sat->velo = sat->vel.w; + Calculate_Obs (jul_utc, &sat->pos, &sat->vel, &obs_geodetic, &obs_set); + Calculate_LatLonAlt (jul_utc, &sat->pos, &sat_geodetic); + + while (sat_geodetic.lon < -pi) + sat_geodetic.lon += twopi; + + while (sat_geodetic.lon > (pi)) + sat_geodetic.lon -= twopi; + + sat->az = Degrees (obs_set.az); + sat->el = Degrees (obs_set.el); + sat->range = obs_set.range; + sat->range_rate = obs_set.range_rate; + sat->ssplat = Degrees (sat_geodetic.lat); + sat->ssplon = Degrees (sat_geodetic.lon); + sat->alt = sat_geodetic.alt; + sat->ma = Degrees (sat->phase); + sat->ma *= 256.0/360.0; + sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w); + age = 0.0; + sat->orbit = (long) floor((sat->tle.xno * xmnpda/twopi + + age * sat->tle.bstar * ae) * age + + sat->tle.xmo/twopi) + sat->tle.revnum - 1; + + /* orbit type */ + sat->otype = get_orbit_type (sat); +} + +#if 0 +/** \brief Copy satellite data. + * \param source Pointer to the source satellite to copy data from. + * \param dest Pointer to the destination satellite to copy data into. + * \param qth Pointer to the observer data (needed to initialize sat) + * + * This function copies the satellite data from a source sat_t structure into + * the destination. The function copies the tle_t data and calls gtk_sat_data_inti_sat() + * function for initializing the other fields. + * + */ +void sat_data_copy (const sat_t *source, sat_t *dest, qth_t *qth) +{ + guint i; + + g_return_if_fail ((source != NULL) && (dest != NULL)); + + dest->tle.epoch = source->tle.epoch; + dest->tle.epoch_year = source->tle.epoch_year; + dest->tle.epoch_day = source->tle.epoch_day; + dest->tle.epoch_fod = source->tle.epoch_fod; + dest->tle.xndt2o = source->tle.xndt2o; + dest->tle.xndd6o = source->tle.xndd6o; + dest->tle.bstar = source->tle.bstar; + dest->tle.xincl = source->tle.xincl; + dest->tle.xnodeo = source->tle.xnodeo; + dest->tle.eo = source->tle.eo; + dest->tle.omegao = source->tle.omegao; + dest->tle.xmo = source->tle.xmo; + dest->tle.xno = source->tle.xno; + dest->tle.catnr = source->tle.catnr; + dest->tle.elset = source->tle.elset; + dest->tle.revnum = source->tle.revnum; + + for (i = 0; i < 25; i++) + dest->tle.sat_name[i] = source->tle.sat_name[i]; + for (i = 0; i < 9; i++) + dest->tle.idesg[i] = source->tle.idesg[i]; + + dest->tle.status = source->tle.status; + dest->tle.xincl1 = source->tle.xincl1; + dest->tle.omegao1 = source->tle.omegao1; + + dest->otype = source->otype; + + /* very important */ + dest->flags = 0; + select_ephemeris (dest); + + /* initialise variable fields */ + dest->jul_utc = 0.0; + dest->tsince = 0.0; + dest->az = 0.0; + dest->el = 0.0; + dest->range = 0.0; + dest->range_rate = 0.0; + dest->ra = 0.0; + dest->dec = 0.0; + dest->ssplat = 0.0; + dest->ssplon = 0.0; + dest->alt = 0.0; + dest->velo = 0.0; + dest->ma = 0.0; + dest->footprint = 0.0; + dest->phase = 0.0; + dest->aos = 0.0; + dest->los = 0.0; + + sat_data_init (dest, qth); +} +#endif Added: trunk/src/sat-data.h =================================================================== --- trunk/src/sat-data.h (rev 0) +++ trunk/src/sat-data.h 2009-08-03 19:38:36 UTC (rev 343) @@ -0,0 +1,42 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC. + + 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 __SAT_DATA_H__ +#define __SAT_DATA_H__ 1 + +#include <glib.h> +#include "sgpsdp/sgp4sdp4.h" +#include "qth-data.h" + + +gint sat_data_read (gint catnum, sat_t *sat); +void sat_data_init (sat_t *sat, qth_t *qth); +#if 0 +void sat_data_copy (const sat_t *source, sat_t *dest, qth_t *qth); +#endif + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2009-08-03 19:26:49
|
Revision: 342 http://gpredict.svn.sourceforge.net/gpredict/?rev=342&view=rev Author: csete Date: 2009-08-03 19:26:35 +0000 (Mon, 03 Aug 2009) Log Message: ----------- Minor cosmetic fix. Modified Paths: -------------- trunk/src/compat.c Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2009-08-03 19:17:28 UTC (rev 341) +++ trunk/src/compat.c 2009-08-03 19:26:35 UTC (rev 342) @@ -195,7 +195,8 @@ * On linux it corresponds to $HOME/.gpredict2 * The function returns a newly allocated gchar * which must be free when * it is no longer needed. - */gchar *get_conf_dir (void) + */ +gchar *get_conf_dir (void) { gchar *dir; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |