gpredict-svn Mailing List for Gpredict (Page 19)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
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-11-18 16:14:03
|
Revision: 516
http://gpredict.svn.sourceforge.net/gpredict/?rev=516&view=rev
Author: csete
Date: 2009-11-18 16:13:55 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Added config key for new GRID layout.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/config-keys.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-11-10 14:23:54 UTC (rev 515)
+++ trunk/ChangeLog 2009-11-18 16:13:55 UTC (rev 516)
@@ -1,3 +1,9 @@
+2009-11-18 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/config-keys.h:
+ Added config key for new GRID layout.
+
+
2009-11-06 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Modified: trunk/src/config-keys.h
===================================================================
--- trunk/src/config-keys.h 2009-11-10 14:23:54 UTC (rev 515)
+++ trunk/src/config-keys.h 2009-11-18 16:13:55 UTC (rev 516)
@@ -66,10 +66,11 @@
#define MOD_CFG_SATS_KEY "SATELLITES"
#define MOD_CFG_TIMEOUT_KEY "TIMEOUT"
#define MOD_CFG_WARP_KEY "WARP"
-#define MOD_CFG_LAYOUT "LAYOUT"
-#define MOD_CFG_VIEW_1 "VIEW_1"
-#define MOD_CFG_VIEW_2 "VIEW_2"
-#define MOD_CFG_VIEW_3 "VIEW_3"
+#define MOD_CFG_LAYOUT "LAYOUT" /* Old layout before v1.2 */
+#define MOD_CFG_VIEW_1 "VIEW_1" /* Old layout before v1.2 */
+#define MOD_CFG_VIEW_2 "VIEW_2" /* Old layout before v1.2 */
+#define MOD_CFG_VIEW_3 "VIEW_3" /* Old layout before v1.2 */
+#define MOD_CFG_GRID "GRID" /* New grid layout since v1.2 */
#define MOD_CFG_STATE "STATE"
#define MOD_CFG_WIN_POS_X "WIN_POS_X"
#define MOD_CFG_WIN_POS_Y "WIN_POS_Y"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-10 14:24:03
|
Revision: 515
http://gpredict.svn.sourceforge.net/gpredict/?rev=515&view=rev
Author: csete
Date: 2009-11-10 14:23:54 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Added pixmap with leds (to be used for RX/TX indicator).
Modified Paths:
--------------
trunk/pixmaps/icons/Makefile.am
Added Paths:
-----------
trunk/pixmaps/icons/gpredict-leds.png
Modified: trunk/pixmaps/icons/Makefile.am
===================================================================
--- trunk/pixmaps/icons/Makefile.am 2009-11-07 00:01:39 UTC (rev 514)
+++ trunk/pixmaps/icons/Makefile.am 2009-11-10 14:23:54 UTC (rev 515)
@@ -9,6 +9,7 @@
gpredict-clock-small.png \
gpredict-crash.png \
gpredict-icon.png \
+ gpredict-leds.png \
gpredict-mod-attach.png \
gpredict-mod-close.png \
gpredict-mod-config.png \
Added: trunk/pixmaps/icons/gpredict-leds.png
===================================================================
(Binary files differ)
Property changes on: trunk/pixmaps/icons/gpredict-leds.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-07 00:01:49
|
Revision: 514
http://gpredict.svn.sourceforge.net/gpredict/?rev=514&view=rev
Author: csete
Date: 2009-11-07 00:01:39 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-11-06 23:36:37 UTC (rev 513)
+++ trunk/NEWS 2009-11-07 00:01:39 UTC (rev 514)
@@ -12,6 +12,7 @@
- Applied patch 2877878: Change Flag to Lock in tle-update (thanks Charles Suprin AA1VS).
- Applied patch 2877918: Fixes segfault in TLE updater (thanks Charles Suprin AA1VS).
- Applied patch 2881367: Updated Flags to Locks (thanks Charles Suprin AA1VS).
+- Applied patch 2893617: Patches for fixing Windows build (thanks Valentin Yakovenkov).
Changes in version 1.1 (5 Oct 2009)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-06 23:36:45
|
Revision: 513
http://gpredict.svn.sourceforge.net/gpredict/?rev=513&view=rev
Author: csete
Date: 2009-11-06 23:36:37 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/data/satdata/satellites.dat
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-11-06 23:35:24 UTC (rev 512)
+++ trunk/data/satdata/satellites.dat 2009-11-06 23:36:37 UTC (rev 513)
@@ -6561,7 +6561,7 @@
[35870]
VERSION=1.1
NAME=SUMBANDILA
-NICKNAME=SUMBANDILA
+NICKNAME=SO-67
TLE1=1 35870U 09049F 09310.09200600 .00000471 00000-0 23079-4 0 1477
TLE2=2 35870 97.3656 359.2239 0013055 117.5389 327.0950 15.22840030 7516
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-06 23:35:35
|
Revision: 512
http://gpredict.svn.sourceforge.net/gpredict/?rev=512&view=rev
Author: csete
Date: 2009-11-06 23:35:24 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated nickname for SO-67
Modified Paths:
--------------
trunk/data/satdata/scripts/convert.py
Modified: trunk/data/satdata/scripts/convert.py
===================================================================
--- trunk/data/satdata/scripts/convert.py 2009-11-06 23:32:51 UTC (rev 511)
+++ trunk/data/satdata/scripts/convert.py 2009-11-06 23:35:24 UTC (rev 512)
@@ -104,7 +104,8 @@
"28650" : "VO-52",
"28894" : "XO-53",
"28895" : "CO-58",
- "28941" : "CO-56"
+ "28941" : "CO-56",
+ "35870" : "SO-67"
}
urlprefix = "http://celestrak.com/NORAD/elements/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-06 23:33:04
|
Revision: 511
http://gpredict.svn.sourceforge.net/gpredict/?rev=511&view=rev
Author: csete
Date: 2009-11-06 23:32:51 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/data/satdata/engineering.cat
trunk/data/satdata/geo.cat
trunk/data/satdata/resource.cat
trunk/data/satdata/satellites.dat
trunk/data/satdata/tle-new.cat
trunk/data/satdata/x-comm.cat
Modified: trunk/data/satdata/engineering.cat
===================================================================
--- trunk/data/satdata/engineering.cat 2009-11-06 23:29:49 UTC (rev 510)
+++ trunk/data/satdata/engineering.cat 2009-11-06 23:32:51 UTC (rev 511)
@@ -27,3 +27,6 @@
29252
30776
31789
+35684
+35686
+36037
Modified: trunk/data/satdata/geo.cat
===================================================================
--- trunk/data/satdata/geo.cat 2009-11-06 23:29:49 UTC (rev 510)
+++ trunk/data/satdata/geo.cat 2009-11-06 23:32:51 UTC (rev 511)
@@ -384,5 +384,12 @@
35491
35493
35496
+35696
35755
35756
+35812
+35873
+35942
+35943
+36032
+36033
Modified: trunk/data/satdata/resource.cat
===================================================================
--- trunk/data/satdata/resource.cat 2009-11-06 23:29:49 UTC (rev 510)
+++ trunk/data/satdata/resource.cat 2009-11-06 23:32:51 UTC (rev 511)
@@ -79,3 +79,4 @@
35681
35931
35946
+36036
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-11-06 23:29:49 UTC (rev 510)
+++ trunk/data/satdata/satellites.dat 2009-11-06 23:32:51 UTC (rev 511)
@@ -1,8561 +1,8638 @@
-[28082]
+[733]
VERSION=1.1
-NAME=ZHONGXING-20
-NICKNAME=ZHONGXING-20
-TLE1=1 28082U 03052A 09300.60895701 -.00000288 00000-0 10000-3 0 8642
-TLE2=2 28082 0.0668 59.8383 0001848 162.2508 131.3679 1.00271286 21845
+NAME=THOR AGENA D R/B
+NICKNAME=THOR AGENA D R/B
+TLE1=1 00733U 64002A 09309.80936482 .00000018 00000-0 25026-4 0 9163
+TLE2=2 00733 99.1090 338.5787 0034085 344.4342 15.5788 14.31273131384463
-[35004]
+[24960]
VERSION=1.1
-NAME=POLYSAT CP6
-NICKNAME=POLYSAT CP6
-TLE1=1 35004U 09028D 09300.04566117 .00009402 00000-0 22386-3 0 1242
-TLE2=2 35004 40.4585 169.8952 0025957 65.9588 294.3939 15.41199139 24681
+NAME=MOLNIYA 1-90
+NICKNAME=MOLNIYA 1-90
+TLE1=1 24960U 97054A 09309.47318012 .00000207 00000-0 10000-3 0 6285
+TLE2=2 24960 63.7546 67.0026 7342212 253.6285 88.2642 2.00607347 88811
-[24714]
+[25908]
VERSION=1.1
-NAME=NAHUEL 1A
-NICKNAME=NAHUEL 1A
-TLE1=1 24714U 97002B 09300.12022575 -.00000256 00000-0 10000-3 0 9608
-TLE2=2 24714 2.0909 77.2516 0004253 131.2452 158.6406 1.00271151 46660
+NAME=GLOBALSTAR M050
+NICKNAME=GLOBALSTAR M050
+TLE1=1 25908U 99049B 09309.95130218 -.00000079 00000-0 10000-3 0 122
+TLE2=2 25908 52.0007 287.0013 0008362 182.0960 177.9839 12.07309383464134
-[25482]
+[28922]
VERSION=1.1
-NAME=ORBCOMM FM28 [-]
-NICKNAME=ORBCOMM FM28 [-]
-TLE1=1 25482U 98053H 09300.54967690 -.00000195 00000-0 -21212-4 0 7261
-TLE2=2 25482 45.0108 65.4279 0003231 292.0420 68.0080 14.30100525579231
+NAME=GIOVE-A
+NICKNAME=GIOVE-A
+TLE1=1 28922U 05051A 09307.75428185 .00000099 00000-0 10000-3 0 6116
+TLE2=2 28922 56.0742 153.7009 0009222 350.7274 9.3555 1.69483052 23939
-[25732]
+[24932]
VERSION=1.1
-NAME=CZ-4B R/B
-NICKNAME=CZ-4B R/B
-TLE1=1 25732U 99025C 09300.98675799 -.00000025 00000-0 85145-5 0 2333
-TLE2=2 25732 98.6609 272.8806 0037949 138.6506 221.7565 14.17193176541517
+NAME=METEOSAT-7
+NICKNAME=METEOSAT-7
+TLE1=1 24932U 97049B 09308.07012444 .00000079 00000-0 10000-3 0 7663
+TLE2=2 24932 5.5353 67.8731 0000918 230.2563 187.9405 1.00275487 44594
-[28353]
+[27858]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 28353U 04021B 09300.16515039 .00000315 00000-0 19105-3 0 4803
-TLE2=2 28353 70.9993 168.1963 0003760 127.0504 233.0948 14.13923170277768
+NAME=SCISAT 1
+NICKNAME=SCISAT 1
+TLE1=1 27858U 03036A 09307.96934215 -.00000033 00000-0 23083-6 0 8796
+TLE2=2 27858 73.9339 266.9343 0009137 287.0970 72.9202 14.74819934335320
-[28493]
+[25495]
VERSION=1.1
-NAME=NANOSAT-1
-NICKNAME=NANOSAT-1
-TLE1=1 28493U 04049B 09300.82052151 .00000228 00000-0 46219-4 0 4734
-TLE2=2 28493 98.2813 263.9518 0004570 183.1306 176.9882 14.70337012260659
+NAME=EUROBIRD 2
+NICKNAME=EUROBIRD 2
+TLE1=1 25495U 98057A 09305.77625001 .00000159 00000-0 10000-3 0 7402
+TLE2=2 25495 0.0832 26.4359 0003445 207.0414 112.7040 1.00274090 40566
-[24653]
+[24869]
VERSION=1.1
-NAME=MEASAT-2
-NICKNAME=MEASAT-2
-TLE1=1 24653U 96063B 09299.89962624 -.00000253 00000-0 10000-3 0 502
-TLE2=2 24653 1.8876 77.4279 0000721 183.4562 200.8837 0.99908127 47494
+NAME=IRIDIUM 15 [+]
+NICKNAME=IRIDIUM 15 [+]
+TLE1=1 24869U 97034A 09309.53665980 -.00000015 00000-0 -12599-4 0 8598
+TLE2=2 24869 86.3925 104.0064 0002111 80.5957 279.5476 14.34213438645365
-[24871]
+[32404]
VERSION=1.1
-NAME=IRIDIUM 920 [-]
-NICKNAME=IRIDIUM 920 [-]
-TLE1=1 24871U 97034C 09300.48870791 .00000216 00000-0 64771-4 0 4095
-TLE2=2 24871 86.3936 100.4768 0012956 137.5993 222.6203 14.38080010645248
+NAME=THURAYA-3
+NICKNAME=THURAYA-3
+TLE1=1 32404U 08001A 09308.34677801 -.00000298 00000-0 10000-3 0 3334
+TLE2=2 32404 5.5119 331.8528 0005219 244.7090 50.6736 1.00271742 6679
-[27414]
+[28892]
VERSION=1.1
-NAME=NSS-7
-NICKNAME=NSS-7
-TLE1=1 27414U 02019A 09299.90711188 -.00000166 00000-0 10000-3 0 4155
-TLE2=2 27414 0.0235 147.6844 0002490 64.0449 128.2679 1.00273064 27643
+NAME=UWE-1
+NICKNAME=UWE-1
+TLE1=1 28892U 05043C 09309.71912560 .00000078 00000-0 25769-4 0 4727
+TLE2=2 28892 98.0341 195.6070 0016332 265.3167 94.6162 14.59783559214493
-[18362]
+[23319]
VERSION=1.1
-NAME=OSCAR 29
-NICKNAME=OSCAR 29
-TLE1=1 18362U 87080B 09300.84771044 .00000068 00000-0 10000-3 0 7783
-TLE2=2 18362 90.3366 237.9248 0107162 170.7639 189.5513 13.43702723 84213
+NAME=EXPRESS 1
+NICKNAME=EXPRESS 1
+TLE1=1 23319U 94067A 09306.10464947 -.00000186 00000-0 10000-3 0 7579
+TLE2=2 23319 8.4283 61.1524 0003232 91.7148 268.2647 0.99833233 54996
-[25983]
+[25104]
VERSION=1.1
-NAME=ORBCOMM FM33 [-]
-NICKNAME=ORBCOMM FM33 [-]
-TLE1=1 25983U 99065D 09299.99646443 .00000324 00000-0 18261-3 0 6605
-TLE2=2 25983 45.0320 260.7981 0001511 37.7014 322.3919 14.28744920516121
+NAME=IRIDIUM 45 [+]
+NICKNAME=IRIDIUM 45 [+]
+TLE1=1 25104U 97082A 09309.52295456 .00000045 00000-0 89699-5 0 7394
+TLE2=2 25104 86.3970 337.6853 0002486 81.4654 278.6834 14.34220784621811
-[25407]
+[17912]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 25407U 98045B 09300.66222995 .00000245 00000-0 14991-3 0 1706
-TLE2=2 25407 71.0088 142.1831 0007148 149.3465 210.8078 14.15507451581414
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 17912U 87038B 09308.61668340 .00000094 00000-0 89179-5 0 9037
+TLE2=2 17912 82.4984 136.9258 0021831 23.8553 336.3656 14.81489666215713
-[31573]
+[28376]
VERSION=1.1
-NAME=GLOBALSTAR M069
-NICKNAME=GLOBALSTAR M069
-TLE1=1 31573U 07020C 09300.92685392 -.00000086 00000-0 10000-3 0 3852
-TLE2=2 31573 51.9962 291.3233 0000363 157.0006 203.0884 12.62258336113218
+NAME=AURA
+NICKNAME=AURA
+TLE1=1 28376U 04026A 09308.97824545 .00000056 00000-0 22539-4 0 6401
+TLE2=2 28376 98.1913 250.9614 0001508 74.4786 285.6586 14.57128919282319
-[26867]
+[27704]
VERSION=1.1
-NAME=MOLNIYA 3-51
-NICKNAME=MOLNIYA 3-51
-TLE1=1 26867U 01030A 09300.22237147 .00000728 00000-0 00000+0 0 9753
-TLE2=2 26867 64.0811 187.7213 6971419 265.5112 346.9231 2.00566185 60602
+NAME=GPS BIIR-09 (PRN 21)
+NICKNAME=GPS BIIR-09 (PRN 21)
+TLE1=1 27704U 03010A 09308.94039014 .00000031 00000-0 10000-3 0 7721
+TLE2=2 27704 53.4738 213.3375 0158236 214.8477 144.1769 2.00554737 48393
-[23546]
+[25478]
VERSION=1.1
-NAME=ORBCOMM FM02 [+]
-NICKNAME=ORBCOMM FM02 [+]
-TLE1=1 23546U 95017B 09300.89858845 .00000275 00000-0 69368-4 0 3915
-TLE2=2 23546 69.9761 192.3772 0008800 19.2581 340.8887 14.61245226773472
+NAME=ORBCOMM FM24 [+]
+NICKNAME=ORBCOMM FM24 [+]
+TLE1=1 25478U 98053D 09309.26493248 .00000008 00000-0 57603-4 0 7104
+TLE2=2 25478 45.0115 53.5077 0001274 219.8669 140.2091 14.28975732580138
-[25789]
+[26407]
VERSION=1.1
-NAME=QUIKSCAT
-NICKNAME=QUIKSCAT
-TLE1=1 25789U 99034A 09300.56605878 -.00000046 00000-0 -77220-6 0 5579
-TLE2=2 25789 98.6303 127.9635 0000296 88.6647 271.4569 14.26792008539337
+NAME=GPS BIIR-05 (PRN 28)
+NICKNAME=GPS BIIR-05 (PRN 28)
+TLE1=1 26407U 00040A 09308.55532455 .00000039 00000-0 10000-3 0 6147
+TLE2=2 26407 55.4724 94.2899 0154476 245.0606 113.3161 2.00565751 68235
-[9478]
+[33315]
VERSION=1.1
-NAME=MARISAT 2
-NICKNAME=MARISAT 2
-TLE1=1 09478U 76101A 09299.66963772 -.00000064 00000-0 10000-3 0 1962
-TLE2=2 09478 13.2556 355.0921 0100638 202.3289 157.2176 0.97589672 64171
+NAME=RAPIDEYE 3
+NICKNAME=RAPIDEYE 3
+TLE1=1 33315U 08040D 09310.22629037 .00000052 00000-0 13940-4 0 3296
+TLE2=2 33315 97.9672 33.8987 0011613 323.6946 36.3480 14.79903293 64168
-[28902]
+[36037]
VERSION=1.1
-NAME=TELKOM 2
-NICKNAME=TELKOM 2
-TLE1=1 28902U 05046A 09300.65791068 -.00000359 00000-0 10000-3 0 7192
-TLE2=2 28902 0.0309 149.9070 0001362 40.5275 200.5974 1.00269626 14486
+NAME=PROBA-2
+NICKNAME=PROBA-2
+TLE1=1 36037U 09059B 09309.57887889 -.00000045 00000-0 00000+0 0 61
+TLE2=2 36037 98.3076 134.9573 0012256 240.6998 119.2992 14.51961699 509
-[33056]
+[27560]
VERSION=1.1
-NAME=TURKSAT 3A
-NICKNAME=TURKSAT 3A
-TLE1=1 33056U 08030B 09300.84279972 .00000150 00000-0 10000-3 0 2531
-TLE2=2 33056 0.0027 213.8949 0003825 322.0208 205.8211 1.00271395 5157
+NAME=MOZHAYETS
+NICKNAME=MOZHAYETS
+TLE1=1 27560U 02054B 09309.58783119 .00000060 00000-0 23798-4 0 826
+TLE2=2 27560 97.9209 145.2346 0043711 129.8689 230.6367 14.55050903367311
-[29644]
+[20479]
VERSION=1.1
-NAME=AMC-18
-NICKNAME=AMC-18
-TLE1=1 29644U 06054B 09300.54976659 -.00000086 00000-0 10000-3 0 5291
-TLE2=2 29644 0.0636 63.6648 0002766 144.6308 280.7321 1.00272658 10625
+NAME=ORIZURU (DEBUT)
+NICKNAME=ORIZURU (DEBUT)
+TLE1=1 20479U 90013B 09309.36827812 -.00000065 00000-0 -71621-4 0 4127
+TLE2=2 20479 99.0598 205.5420 0539116 205.5383 151.8176 12.83686247925140
-[25113]
+[25262]
VERSION=1.1
-NAME=ORBCOMM FM10 [+]
-NICKNAME=ORBCOMM FM10 [+]
-TLE1=1 25113U 97084B 09300.55966917 -.00000140 00000-0 32371-6 0 898
-TLE2=2 25113 45.0185 94.6609 0005133 16.6359 343.4658 14.34405819619258
+NAME=IRIDIUM 51 [S]
+NICKNAME=IRIDIUM 51 [S]
+TLE1=1 25262U 98018A 09309.31855741 .00000173 00000-0 45637-4 0 8784
+TLE2=2 25262 86.4492 41.1021 0002417 83.6659 276.4805 14.42954760611723
-[24277]
+[29505]
VERSION=1.1
-NAME=MIDORI (ADEOS)
-NICKNAME=MIDORI (ADEOS)
-TLE1=1 24277U 96046A 09300.95567595 -.00000008 00000-0 13442-4 0 1933
-TLE2=2 24277 98.3822 260.2436 0000178 229.0853 131.0314 14.28601983687886
+NAME=SJ-6C
+NICKNAME=SJ-6C
+TLE1=1 29505U 06046A 09310.14733290 -.00000091 00000-0 -37667-5 0 4192
+TLE2=2 29505 97.6906 313.3063 0002803 348.5609 11.5538 14.90678844165238
-[28935]
+[25431]
VERSION=1.1
-NAME=ECHOSTAR 10
-NICKNAME=ECHOSTAR 10
-TLE1=1 28935U 06003A 09300.26464259 -.00000053 00000-0 10000-3 0 7795
-TLE2=2 28935 0.0685 61.7115 0001158 119.1626 199.9628 1.00272318 13585
+NAME=IRIDIUM 3 [+]
+NICKNAME=IRIDIUM 3 [+]
+TLE1=1 25431U 98048A 09309.56101349 .00000026 00000-0 23478-5 0 7124
+TLE2=2 25431 86.3976 337.8019 0002988 81.1860 278.9669 14.34220568587066
-[12054]
+[26081]
VERSION=1.1
-NAME=COSMOS 1220
-NICKNAME=COSMOS 1220
-TLE1=1 12054U 80089A 09300.32308487 .00002828 00000-0 12508-3 0 1164
-TLE2=2 12054 64.9755 233.1115 0035858 110.6322 249.8659 15.23397226488351
+NAME=GLOBALSTAR M063
+NICKNAME=GLOBALSTAR M063
+TLE1=1 26081U 00008A 09309.56785201 -.00000086 00000-0 10000-3 0 967
+TLE2=2 26081 51.9979 174.7404 0001772 89.8782 270.2287 12.62260182457830
-[19688]
+[27600]
VERSION=1.1
-NAME=ASTRA 1A
-NICKNAME=ASTRA 1A
-TLE1=1 19688U 88109B 09298.62030986 -.00000209 00000-0 10000-3 0 6207
-TLE2=2 19688 7.9321 62.7670 0012607 309.6074 50.2684 0.98338830 56333
+NAME=MICRO LABSAT
+NICKNAME=MICRO LABSAT
+TLE1=1 27600U 02056D 09309.22314088 .00000042 00000-0 33001-4 0 8993
+TLE2=2 27600 98.3743 0.6286 0010991 188.4516 171.6470 14.28869982359589
-[733]
+[29480]
VERSION=1.1
-NAME=THOR AGENA D R/B
-NICKNAME=THOR AGENA D R/B
-TLE1=1 00733U 64002A 09300.58164644 -.00000007 00000-0 15582-4 0 9088
-TLE2=2 00733 99.1098 328.9067 0034443 11.1438 349.0500 14.31271824383145
+NAME=M-V-7 R/B
+NICKNAME=M-V-7 R/B
+TLE1=1 29480U 06041B 09292.83767789 .12043556 30710-5 10894-3 0 786
+TLE2=2 29480 98.2372 143.7071 0010206 333.6641 26.5161 16.51401864175082
-[25651]
+[32750]
VERSION=1.1
-NAME=GLOBALSTAR M046
-NICKNAME=GLOBALSTAR M046
-TLE1=1 25651U 99012C 09300.45658635 -.00000086 00000-0 10000-3 0 983
-TLE2=2 25651 52.0050 292.8910 0000612 32.2784 327.8111 12.62266282490035
+NAME=SAR-LUPE 4
+NICKNAME=SAR-LUPE 4
+TLE1=1 32750U 08014A 09310.08084650 .00000878 00000-0 36824-4 0 8094
+TLE2=2 32750 98.1363 63.2602 0020080 300.7235 174.4343 15.26511638 89751
-[27811]
+[20918]
VERSION=1.1
-NAME=HELLAS-SAT 2
-NICKNAME=HELLAS-SAT 2
-TLE1=1 27811U 03020A 09300.89269127 .00000157 00000-0 10000-3 0 88
-TLE2=2 27811 0.0138 281.7233 0002790 285.4920 189.5548 1.00274983 23567
+NAME=INMARSAT 2-F1
+NICKNAME=INMARSAT 2-F1
+TLE1=1 20918U 90093A 09309.57324852 .00000116 00000-0 10000-3 0 6650
+TLE2=2 20918 6.9223 54.0206 0003595 171.7999 243.4976 1.00270393 66097
-[25397]
+[32790]
VERSION=1.1
-NAME=TECHSAT 1B (GO-32)
-NICKNAME=GO-32
-TLE1=1 25397U 98043D 09301.02165618 .00000041 00000-0 36080-4 0 258
-TLE2=2 25397 98.3209 316.2141 0000736 179.1290 180.9930 14.23165610587023
+NAME=CANX-2
+NICKNAME=CANX-2
+TLE1=1 32790U 08021H 09310.23279295 .00000360 00000-0 52630-4 0 5012
+TLE2=2 32790 97.9286 12.8510 0014544 292.4810 67.4857 14.81508301 82452
-[27651]
+[25415]
VERSION=1.1
-NAME=SORCE
-NICKNAME=SORCE
-TLE1=1 27651U 03004A 09300.40220334 .00000128 00000-0 31420-4 0 365
-TLE2=2 27651 39.9975 304.2472 0025818 185.9483 174.0994 14.82219555365919
+NAME=ORBCOMM FM19 [+]
+NICKNAME=ORBCOMM FM19 [+]
+TLE1=1 25415U 98046C 09310.03567091 -.00000137 00000-0 82161-6 0 1367
+TLE2=2 25415 44.9984 320.7691 0003668 302.5530 57.4951 14.27653806586963
-[25946]
+[29155]
VERSION=1.1
-NAME=GLOBALSTAR M031
-NICKNAME=GLOBALSTAR M031
-TLE1=1 25946U 99058D 09300.11511416 -.00000086 00000-0 10000-3 0 304
-TLE2=2 25946 51.9974 203.5225 0002800 129.8394 230.2719 12.62266815463273
+NAME=GOES 13
+NICKNAME=GOES 13
+TLE1=1 29155U 06018A 09309.46387402 -.00000077 00000-0 10000-3 0 8204
+TLE2=2 29155 0.2224 102.0835 0003383 113.9783 250.3048 1.00272275 12676
-[25621]
+[23864]
VERSION=1.1
-NAME=GLOBALSTAR M023
-NICKNAME=GLOBALSTAR M023
-TLE1=1 25621U 99004A 09301.07587190 -.00000086 00000-0 10000-3 0 1405
-TLE2=2 25621 52.0102 158.9189 0010220 109.2881 250.9085 12.62223635494539
+NAME=PALAPA C2
+NICKNAME=PALAPA C2
+TLE1=1 23864U 96030A 09309.77451546 -.00000350 00000-0 10000-3 0 9512
+TLE2=2 23864 0.0409 65.5821 0000972 147.6137 223.6206 1.00268015 49346
-[34264]
+[25937]
VERSION=1.1
-NAME=RADUGA-1 8
-NICKNAME=RADUGA-1 8
-TLE1=1 34264U 09010A 09299.69109450 .00000112 00000-0 00000+0 0 1841
-TLE2=2 34264 1.0488 210.0039 0032403 256.5721 194.3960 1.00271037 2417
+NAME=DIRECTV 1R
+NICKNAME=DIRECTV 1R
+TLE1=1 25937U 99056A 09308.33000791 -.00000245 00000-0 00000+0 0 7368
+TLE2=2 25937 0.0046 181.4539 0001968 19.0246 249.5746 1.00272559 36912
-[26038]
+[25078]
VERSION=1.1
-NAME=GALAXY 11 (G-11)
-NICKNAME=GALAXY 11 (G-11)
-TLE1=1 26038U 99071A 09300.78958870 .00000160 00000-0 00000+0 0 7881
-TLE2=2 26038 0.0201 277.8754 0000244 198.4125 237.0242 1.00271931 36175
+NAME=IRIDIUM 44 [-]
+NICKNAME=IRIDIUM 44 [-]
+TLE1=1 25078U 97077B 09309.46652305 .00000117 00000-0 33199-4 0 2872
+TLE2=2 25078 86.3913 99.4432 0003593 52.1344 308.0168 14.36572944624210
-[25509]
+[1293]
VERSION=1.1
-NAME=SEDSAT 1 (SO-33)
-NICKNAME=SO-33
-TLE1=1 25509U 98061B 09300.30004795 .00000246 00000-0 39023-4 0 5725
-TLE2=2 25509 31.4331 25.4366 0353816 53.6347 309.6406 14.28269924574739
+NAME=OSCAR 3 (OSCAR III)
+NICKNAME=OSCAR 3 (OSCAR III)
+TLE1=1 01293U 65016F 09309.78689641 .00000049 00000-0 63833-4 0 6529
+TLE2=2 01293 70.0753 225.3857 0018820 332.5180 27.4902 14.04737208279695
-[27004]
+[25962]
VERSION=1.1
-NAME=MAROC-TUBSAT
-NICKNAME=MAROC-TUBSAT
-TLE1=1 27004U 01056D 09299.75434091 .00000023 00000-0 74373-4 0 3916
-TLE2=2 27004 99.2258 155.6256 0020546 58.2900 302.0244 13.70029418393949
+NAME=GLOBALSTAR M034
+NICKNAME=GLOBALSTAR M034
+TLE1=1 25962U 99062B 09308.55075055 -.00000086 00000-0 10000-3 0 396
+TLE2=2 25962 52.0001 43.1393 0001096 192.1616 167.9224 12.62264932459173
-[25964]
+[25275]
VERSION=1.1
-NAME=GLOBALSTAR M061
-NICKNAME=GLOBALSTAR M061
-TLE1=1 25964U 99062D 09300.21463091 -.00000074 00000-0 10000-3 0 9930
-TLE2=2 25964 51.9793 206.0829 0006721 32.4762 327.6476 11.76683927449034
+NAME=IRIDIUM 59 [+]
+NICKNAME=IRIDIUM 59 [+]
+TLE1=1 25275U 98019D 09309.48210327 -.00000024 00000-0 -15610-4 0 4075
+TLE2=2 25275 86.3998 9.5379 0002524 72.1314 288.0155 14.34224807607502
-[24968]
+[30773]
VERSION=1.1
-NAME=IRIDIUM 37 [+]
-NICKNAME=IRIDIUM 37 [+]
-TLE1=1 24968U 97056D 09300.34591708 .00000200 00000-0 64492-4 0 7882
-TLE2=2 24968 86.3964 44.7857 0002215 84.9652 275.1788 14.34217820632669
+NAME=MIDSTAR-1
+NICKNAME=MIDSTAR-1
+TLE1=1 30773U 07006B 09309.65015666 -.00000304 00000-0 00000+0 0 7567
+TLE2=2 30773 46.0316 323.8874 0010698 240.5057 119.4789 15.23853420148313
-[24904]
+[27954]
VERSION=1.1
-NAME=IRIDIUM 25 [+]
-NICKNAME=IRIDIUM 25 [+]
-TLE1=1 24904U 97043B 09300.51649248 .00000097 00000-0 27507-4 0 8061
-TLE2=2 24904 86.3985 341.4298 0002400 79.0766 281.0699 14.34219875637973
+NAME=GALAXY 13 (HORIZONS-1)
+NICKNAME=GALAXY 13 (HORIZONS-1)
+TLE1=1 27954U 03044A 09308.87007759 .00000000 00000-0 10000-3 0 9625
+TLE2=2 27954 0.0148 145.9790 0000470 311.6039 132.9758 1.00273475 22403
-[19822]
+[25288]
VERSION=1.1
-NAME=AKEBONO (EXOS-D)
-NICKNAME=AKEBONO (EXOS-D)
-TLE1=1 19822U 89016A 09301.15764960 .00010535 -15163-7 33332-3 0 3637
-TLE2=2 19822 75.0739 167.2781 2692675 158.0838 216.1641 10.01423864608764
+NAME=IRIDIUM 65 [+]
+NICKNAME=IRIDIUM 65 [+]
+TLE1=1 25288U 98021D 09309.53857651 -.00000525 00000-0 -19458-3 0 7460
+TLE2=2 25288 86.3922 306.0654 0002683 75.2161 284.9330 14.34216659606464
-[25112]
+[26063]
VERSION=1.1
-NAME=ORBCOMM FM08 [+]
-NICKNAME=ORBCOMM FM08 [+]
-TLE1=1 25112U 97084A 09300.52511420 .00000385 00000-0 18531-3 0 3587
-TLE2=2 25112 45.0170 94.0262 0008318 45.0021 315.1506 14.34416735619257
+NAME=OPAL (OO-38)
+NICKNAME=OO-38
+TLE1=1 26063U 00004C 09309.11881594 -.00000009 00000-0 17218-4 0 6472
+TLE2=2 26063 100.2247 121.5635 0036641 224.4257 135.3981 14.35876042512170
-[24869]
+[31601]
VERSION=1.1
-NAME=IRIDIUM 15 [+]
-NICKNAME=IRIDIUM 15 [+]
-TLE1=1 24869U 97034A 09300.46673056 .00000005 00000-0 -52374-5 0 8453
-TLE2=2 24869 86.3924 107.7997 0002133 80.1809 279.9625 14.34214374644061
+NAME=OFEQ 7
+NICKNAME=OFEQ 7
+TLE1=1 31601U 07025A 09310.21339115 .00002093 00000-0 69560-4 0 7300
+TLE2=2 31601 141.7471 233.3052 0071299 219.7572 240.5096 15.19940921134046
-[25159]
+[11416]
VERSION=1.1
-NAME=ORBCOMM FM04 [+]
-NICKNAME=ORBCOMM FM04 [+]
-TLE1=1 25159U 98007C 09300.23512613 .00000167 00000-0 12415-3 0 82
-TLE2=2 25159 107.9689 21.9455 0044081 62.0558 298.5025 14.25496423608367
+NAME=NOAA 6 [P]
+NICKNAME=NOAA 6 [P]
+TLE1=1 11416U 79057A 09309.47728862 .00000083 00000-0 46903-4 0 231
+TLE2=2 11416 98.4056 320.0639 0009697 200.4929 159.5876 14.31941857581937
-[13969]
+[23448]
VERSION=1.1
-NAME=TDRS 1
-NICKNAME=TDRS 1
-TLE1=1 13969U 83026B 09300.12411262 -.00000294 00000-0 10000-3 0 9505
-TLE2=2 13969 13.4486 8.2175 0030417 238.1712 142.4392 1.00031055 70320
+NAME=RADUGA 32
+NICKNAME=RADUGA 32
+TLE1=1 23448U 94087A 09307.79860119 .00000000 00000-0 10000-3 0 2031
+TLE2=2 23448 10.5338 50.8090 0005381 127.1760 232.8085 1.00269234 72088
-[23816]
+[28946]
VERSION=1.1
-NAME=INTELSAT 707 (IS-707)
-NICKNAME=INTELSAT 707 (IS-707)
-TLE1=1 23816U 96015A 09300.83811958 -.00000281 00000-0 10000-3 0 9127
-TLE2=2 23816 0.0059 293.3003 0003165 280.5754 71.2008 1.00272130 49908
+NAME=EUROBIRD 9A
+NICKNAME=EUROBIRD 9A
+TLE1=1 28946U 06007B 09308.09298878 .00000076 00000-0 10000-3 0 3983
+TLE2=2 28946 0.0103 7.5569 0011194 241.1274 197.2954 1.00276200 13452
-[24839]
+[22912]
VERSION=1.1
-NAME=IRIDIUM 10 [+]
-NICKNAME=IRIDIUM 10 [+]
-TLE1=1 24839U 97030D 09300.45703437 .00000137 00000-0 41841-4 0 8206
-TLE2=2 24839 86.3920 76.1119 0002186 83.9659 276.1780 14.34213699647109
+NAME=METEOSAT-6 (MOP-3)
+NICKNAME=METEOSAT-6 (MOP-3)
+TLE1=1 22912U 93073B 09305.57693947 -.00000003 00000-0 10000-3 0 3234
+TLE2=2 22912 8.6896 58.2352 0001066 210.6612 47.2198 1.00273506 56849
-[25880]
+[24808]
VERSION=1.1
-NAME=TELKOM 1
-NICKNAME=TELKOM 1
-TLE1=1 25880U 99042A 09298.66938277 -.00000345 00000-0 10000-3 0 8157
-TLE2=2 25880 0.0092 55.5311 0002279 178.7032 148.9102 1.00269974 37445
+NAME=THOR II
+NICKNAME=THOR II
+TLE1=1 24808U 97025A 09308.05303969 .00000049 00000-0 10000-3 0 6679
+TLE2=2 24808 1.4377 79.4828 0001245 121.8480 226.3466 1.00272942 45645
-[22698]
+[6920]
VERSION=1.1
-NAME=RADCAL
-NICKNAME=RADCAL
-TLE1=1 22698U 93041A 09298.73042158 .00000012 00000-0 16176-6 0 4571
-TLE2=2 22698 89.5425 20.2883 0087208 250.9763 108.1973 14.22823242847831
+NAME=NOAA 3 [-]
+NICKNAME=NOAA 3 [-]
+TLE1=1 06920U 73086A 09309.49183171 -.00000030 00000-0 10000-3 0 3033
+TLE2=2 06920 101.7143 326.6049 0006281 266.2278 93.8072 12.40301091629799
-[26643]
+[25622]
VERSION=1.1
-NAME=BEIDOU 1B
-NICKNAME=BEIDOU 1B
-TLE1=1 26643U 00082A 09299.87382119 -.00000137 00000-0 10000-3 0 4675
-TLE2=2 26643 2.3390 75.9306 0003205 140.1619 214.2350 1.00273322 32453
+NAME=GLOBALSTAR M040
+NICKNAME=GLOBALSTAR M040
+TLE1=1 25622U 99004B 09308.88256911 -.00000086 00000-0 10000-3 0 1035
+TLE2=2 25622 51.9956 130.8464 0001636 68.2986 291.8055 12.61708162495535
-[33314]
+[27392]
VERSION=1.1
-NAME=RAPIDEYE 1
-NICKNAME=RAPIDEYE 1
-TLE1=1 33314U 08040C 09301.12671289 -.00000204 00000-0 -19765-4 0 3674
-TLE2=2 33314 97.9681 25.4729 0026047 54.7630 305.5944 14.79901031 62855
+NAME=GRACE 2
+NICKNAME=GRACE 2
+TLE1=1 27392U 02012B 09309.79650906 .00000681 00000-0 19431-4 0 3341
+TLE2=2 27392 89.0159 344.1558 0014133 282.0644 77.9021 15.34339935427021
-[20693]
+[32050]
VERSION=1.1
-NAME=COSMOS 2085
-NICKNAME=COSMOS 2085
-TLE1=1 20693U 90061A 09300.79452999 -.00000061 00000-0 10000-3 0 9893
-TLE2=2 20693 12.3746 34.4800 0002761 260.2886 99.6637 1.00263383 70577
+NAME=INSAT-4CR
+NICKNAME=INSAT-4CR
+TLE1=1 32050U 07037A 09308.90670512 -.00000068 00000-0 10000-3 0 5611
+TLE2=2 32050 0.1155 80.9395 0002897 106.0617 257.7586 1.00273220 8011
-[23051]
+[27830]
VERSION=1.1
-NAME=GOES 8 [-]
-NICKNAME=GOES 8 [-]
-TLE1=1 23051U 94022A 09299.98121118 .00000041 00000-0 10000-3 0 9920
-TLE2=2 23051 6.0741 71.7707 0007989 164.7324 195.3179 0.98904381 64029
+NAME=BSAT-2C
+NICKNAME=BSAT-2C
+TLE1=1 27830U 03028A 09307.33425459 -.00000336 00000-0 10000-3 0 669
+TLE2=2 27830 0.1193 91.9481 0004048 149.1505 31.8567 1.00271457 23461
-[28051]
+[24285]
VERSION=1.1
-NAME=IRS-P6 (RESOURCESAT-1)
-NICKNAME=IRS-P6 (RESOURCESAT-1)
-TLE1=1 28051U 03046A 09301.13325798 .00000012 00000-0 25562-4 0 1012
-TLE2=2 28051 98.7046 15.2460 0002851 107.6229 252.5259 14.21633876313001
+NAME=FAST
+NICKNAME=FAST
+TLE1=1 24285U 96049A 09308.97014863 .00001117 00000-0 10159-3 0 8502
+TLE2=2 24285 82.9803 347.8867 1995787 259.4290 77.7150 11.26479924534388
-[25354]
+[25417]
VERSION=1.1
-NAME=CHINASTAR 1
-NICKNAME=CHINASTAR 1
-TLE1=1 25354U 98033A 09300.83350410 -.00000203 00000-0 10000-3 0 6557
-TLE2=2 25354 0.0130 159.6467 0002406 67.2236 197.0086 1.00272651 46365
+NAME=ORBCOMM FM16 [+]
+NICKNAME=ORBCOMM FM16 [+]
+TLE1=1 25417U 98046E 09310.05578949 .00000261 00000-0 16061-3 0 1792
+TLE2=2 25417 45.0008 321.8078 0001702 294.4825 65.5842 14.27658369586966
-[32958]
+[20436]
VERSION=1.1
-NAME=FENGYUN 3A
-NICKNAME=FENGYUN 3A
-TLE1=1 32958U 08026A 09300.28040264 .00000167 00000-0 10000-3 0 4376
-TLE2=2 32958 98.7574 10.4133 0001345 97.3392 262.7892 14.19597358 73522
+NAME=SPOT 2
+NICKNAME=SPOT 2
+TLE1=1 20436U 90005A 09310.19000549 .00000125 00000-0 31806-4 0 8922
+TLE2=2 20436 98.6527 24.4513 0154865 224.8038 134.0588 14.61908918 26294
-[32711]
+[28939]
VERSION=1.1
-NAME=GPS BIIRM-6 (PRN 07)
-NICKNAME=GPS BIIRM-6 (PRN 07)
-TLE1=1 32711U 08012A 09299.95119801 -.00000076 00000-0 10000-3 0 2843
-TLE2=2 32711 55.5386 32.8686 0031800 175.4625 184.5903 2.00566829 11890
+NAME=AKARI (ASTRO-F)
+NICKNAME=AKARI (ASTRO-F)
+TLE1=1 28939U 06005A 09308.58923336 .00000090 00000-0 29986-4 0 1271
+TLE2=2 28939 98.2498 310.6134 0009196 102.0287 258.1946 14.57573046196548
-[25260]
+[24277]
VERSION=1.1
-NAME=SPOT 4
-NICKNAME=SPOT 4
-TLE1=1 25260U 98017A 09301.15595376 .00000169 00000-0 10000-3 0 6092
-TLE2=2 25260 98.6857 11.6598 0000864 136.6260 308.2355 14.20042710601208
+NAME=MIDORI (ADEOS)
+NICKNAME=MIDORI (ADEOS)
+TLE1=1 24277U 96046A 09309.85058299 .00000002 00000-0 17623-4 0 2004
+TLE2=2 24277 98.3836 268.7942 0000512 157.0905 203.0302 14.28602762689151
-[27941]
+[25897]
VERSION=1.1
-NAME=NIGERIASAT 1
-NICKNAME=NIGERIASAT 1
-TLE1=1 27941U 03042C 09301.10069999 .00000065 00000-0 21395-4 0 9241
-TLE2=2 27941 97.9207 170.7710 0012710 79.5350 280.7280 14.63038354324971
+NAME=YAMAL 102
+NICKNAME=YAMAL 102
+TLE1=1 25897U 99047B 09308.93580178 -.00000218 00000-0 10000-3 0 3250
+TLE2=2 25897 5.7617 68.4194 0003795 166.1887 236.4057 1.00271569 37314
-[22117]
+[25949]
VERSION=1.1
-NAME=SATCOM C3
-NICKNAME=SATCOM C3
-TLE1=1 22117U 92060B 09300.40750201 -.00000228 00000-0 10000-3 0 2272
-TLE2=2 22117 4.7061 70.7847 0001404 129.6391 263.1509 1.00270754 62703
+NAME=TELSTAR 12 (ORION 2)
+NICKNAME=TELSTAR 12 (ORION 2)
+TLE1=1 25949U 99059A 09309.78335133 -.00000111 00000-0 10000-3 0 7508
+TLE2=2 25949 0.0468 99.1497 0003369 123.3992 89.6257 1.00271533 36792
-[25977]
+[26631]
VERSION=1.1
-NAME=HELIOS 1B
-NICKNAME=HELIOS 1B
-TLE1=1 25977U 99064A 09301.08192401 .00000006 00000-0 85483-5 0 7498
-TLE2=2 25977 98.3467 306.5496 0000489 239.9561 120.1608 14.77730664531550
+NAME=EROS A1
+NICKNAME=EROS A1
+TLE1=1 26631U 00079A 09310.17393947 .00001379 00000-0 70568-4 0 3444
+TLE2=2 26631 97.4737 13.8922 0008453 203.3983 234.0849 15.18289440496067
-[27845]
+[28622]
VERSION=1.1
-NAME=QUAKESAT
-NICKNAME=QUAKESAT
-TLE1=1 27845U 03031F 09300.24314429 .00000063 00000-0 50006-4 0 6737
-TLE2=2 27845 98.7207 306.9909 0009462 137.1744 223.0168 14.20299408327918
+NAME=HIMAWARI 6 (MTSAT-1R)
+NICKNAME=HIMAWARI 6 (MTSAT-1R)
+TLE1=1 28622U 05006A 09307.58911491 -.00000266 00000-0 10000-3 0 2866
+TLE2=2 28622 0.0580 52.0371 0002366 354.2887 348.8282 1.00271215 17155
-[33322]
+[26824]
VERSION=1.1
-NAME=CZ-2C R/B
-NICKNAME=CZ-2C R/B
-TLE1=1 33322U 08041C 09301.18511589 .00164060 11141-4 36139-3 0 3995
-TLE2=2 33322 97.9817 67.1812 0150582 110.5314 251.2185 15.81114183 64701
+NAME=INTELSAT 901 (IS-901)
+NICKNAME=INTELSAT 901 (IS-901)
+TLE1=1 26824U 01024A 09308.74551669 .00000000 00000-0 10000-3 0 4856
+TLE2=2 26824 0.0105 13.8125 0003149 203.6951 77.0175 1.00268233 30828
-[23227]
+[26610]
VERSION=1.1
-NAME=OPTUS B3
-NICKNAME=OPTUS B3
-TLE1=1 23227U 94055A 09300.64439547 -.00000069 00000-0 10000-3 0 4303
-TLE2=2 23227 1.7732 77.9543 0003659 128.9884 225.1868 1.00272219 55529
+NAME=STRV 1C
+NICKNAME=STRV 1C
+TLE1=1 26610U 00072C 09308.93623387 -.00000172 00000-0 10000-3 0 9978
+TLE2=2 26610 6.4890 238.3839 7338873 157.9101 265.8515 2.03459243 66683
-[28372]
+[24713]
VERSION=1.1
-NAME=APRIZESAT 1 (LATINSAT C)
-NICKNAME=APRIZESAT 1 (LATINSAT C)
-TLE1=1 28372U 04025G 09299.64850032 .00000050 00000-0 24519-4 0 5053
-TLE2=2 28372 98.0074 323.3938 0047964 25.3782 334.9761 14.48178693281522
+NAME=AMC-2 (GE-2)
+NICKNAME=AMC-2 (GE-2)
+TLE1=1 24713U 97002A 09309.35934712 -.00000106 00000-0 00000+0 0 9773
+TLE2=2 24713 0.0711 95.3887 0002583 95.8942 241.8494 1.00271514 46769
-[25847]
+[21701]
VERSION=1.1
-NAME=MOLNIYA 3-50
-NICKNAME=MOLNIYA 3-50
-TLE1=1 25847U 99036A 09299.92931639 .00000094 00000-0 10000-3 0 7225
-TLE2=2 25847 63.6950 255.0005 6971987 265.9335 18.7542 2.00647631 75495
+NAME=UARS
+NICKNAME=UARS
+TLE1=1 21701U 91063B 09309.79965782 .00007060 00000-0 90979-4 0 8084
+TLE2=2 21701 56.9687 102.8324 0079085 90.4657 270.5452 15.56693858 1264
-[25771]
+[32953]
VERSION=1.1
-NAME=GLOBALSTAR M049
-NICKNAME=GLOBALSTAR M049
-TLE1=1 25771U 99031B 09301.12207444 -.00000086 00000-0 10000-3 0 2410
-TLE2=2 25771 51.9976 334.9358 0000119 326.3952 33.6911 12.62255800478954
+NAME=YUBILEINY (RS-30)
+NICKNAME=YUBILEINY (RS-30)
+TLE1=1 32953U 08025A 09310.09286610 .00000010 00000-0 00000+0 0 4469
+TLE2=2 32953 82.5031 168.3936 0018125 229.0450 130.9068 12.43003136 66022
-[21576]
+[25418]
VERSION=1.1
-NAME=ORBCOMM-X [-]
-NICKNAME=ORBCOMM-X [-]
-TLE1=1 21576U 91050C 09300.42292619 .00000056 00000-0 31834-4 0 1506
-TLE2=2 21576 98.4836 251.3228 0004038 13.6910 346.4383 14.39969414959575
+NAME=ORBCOMM FM15 [+]
+NICKNAME=ORBCOMM FM15 [+]
+TLE1=1 25418U 98046F 09310.06573840 .00000343 00000-0 19374-3 0 2320
+TLE2=2 25418 45.0019 321.9809 0002678 324.5620 35.5041 14.27668379586963
-[24905]
+[27847]
VERSION=1.1
-NAME=IRIDIUM 46 [+]
-NICKNAME=IRIDIUM 46 [+]
-TLE1=1 24905U 97043C 09300.18033404 .00000083 00000-0 22670-4 0 8225
-TLE2=2 24905 86.3990 341.8634 0002373 82.9092 277.2368 14.34219905637932
+NAME=CANX-1
+NICKNAME=CANX-1
+TLE1=1 27847U 03031H 09309.08432028 .00000024 00000-0 31425-4 0 6300
+TLE2=2 27847 98.7061 317.1972 0010172 77.2555 282.9757 14.20981509329309
-[27775]
+[7338]
VERSION=1.1
-NAME=COSMOS 2397
-NICKNAME=COSMOS 2397
-TLE1=1 27775U 03015A 09300.34493532 -.00000203 00000-0 10000-3 0 1354
-TLE2=2 27775 3.7159 70.4816 0045827 203.5948 156.2546 1.00486953 23884
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 07338U 74044B 09309.47976476 .00006549 00000-0 12851-3 0 110
+TLE2=2 07338 82.8803 305.7429 0212239 294.6594 63.2667 15.26245653821134
-[32393]
+[24931]
VERSION=1.1
-NAME=COSMOS 2434 (721)
-NICKNAME=COSMOS 2434 (721)
-TLE1=1 32393U 07065A 09300.24916752 -.00000053 00000-0 00000+0 0 3875
-TLE2=2 32393 65.0834 38.9515 0005824 138.0003 294.0325 2.13103245 14307
+NAME=EUROBIRD 4
+NICKNAME=EUROBIRD 4
+TLE1=1 24931U 97049A 09305.58959260 -.00000080 00000-0 10000-3 0 645
+TLE2=2 24931 0.6840 81.1089 0010936 82.8986 165.1225 1.00272446 44620
-[28376]
+[694]
VERSION=1.1
-NAME=AURA
-NICKNAME=AURA
-TLE1=1 28376U 04026A 09300.94399790 .00000074 00000-0 26452-4 0 6339
-TLE2=2 28376 98.1886 243.0596 0001440 81.7259 278.4117 14.57126832281143
+NAME=ATLAS CENTAUR 2
+NICKNAME=ATLAS CENTAUR 2
+TLE1=1 00694U 63047A 09309.05679560 .00000236 00000-0 17974-4 0 1050
+TLE2=2 00694 30.3570 258.2156 0616677 161.5876 200.8106 13.95067573293136
-[25740]
+[25158]
VERSION=1.1
-NAME=NIMIQ 1
-NICKNAME=NIMIQ 1
-TLE1=1 25740U 99027A 09299.15802686 -.00000174 00000-0 10000-3 0 7018
-TLE2=2 25740 0.0554 64.9688 0003434 157.0400 138.4179 1.00270672 38263
+NAME=ORBCOMM FM03 [-]
+NICKNAME=ORBCOMM FM03 [-]
+TLE1=1 25158U 98007B 09310.19213278 .00000065 00000-0 81733-4 0 180
+TLE2=2 25158 107.9683 42.2913 0048517 42.8853 317.6052 14.25476973609752
-[12585]
+[24842]
VERSION=1.1
-NAME=METEOR PRIRODA
-NICKNAME=METEOR PRIRODA
-TLE1=1 12585U 81065A 09300.66264104 .00000402 00000-0 30545-4 0 4983
-TLE2=2 12585 97.3938 341.7944 0020030 348.3848 11.6922 15.07309241540515
+NAME=IRIDIUM 911 [-]
+NICKNAME=IRIDIUM 911 [-]
+TLE1=1 24842U 97030G 09309.46444660 .00000120 00000-0 29744-4 0 4789
+TLE2=2 24842 86.4429 75.1396 0013770 320.0244 39.9938 14.43194769651662
-[28163]
+[25880]
VERSION=1.1
-NAME=MOLNIYA 1-93
-NICKNAME=MOLNIYA 1-93
-TLE1=1 28163U 04005A 09300.28652604 -.00000405 00000-0 10000-3 0 449
-TLE2=2 28163 64.9020 271.6214 7139852 274.2938 255.5631 2.00622133 41681
+NAME=TELKOM 1
+NICKNAME=TELKOM 1
+TLE1=1 25880U 99042A 09306.26271422 -.00000329 00000-0 10000-3 0 8179
+TLE2=2 25880 0.0115 276.9959 0002177 323.9228 3.3630 1.00274152 37518
-[28230]
+[28981]
VERSION=1.1
-NAME=GP-B
-NICKNAME=GP-B
-TLE1=1 28230U 04014A 09299.56052739 .00000031 00000-0 22061-5 0 6313
-TLE2=2 28230 89.9379 157.0998 0003326 70.9723 289.1870 14.75993462297152
+NAME=ST5-B
+NICKNAME=ST5-B
+TLE1=1 28981U 06008B 09310.20213414 .00009046 15143-5 30576-3 0 1930
+TLE2=2 28981 105.6613 333.3079 2325564 23.4418 345.7385 10.75838861141063
-[28485]
+[24792]
VERSION=1.1
-NAME=SWIFT
-NICKNAME=SWIFT
-TLE1=1 28485U 04047A 09300.49986450 .00000763 00000-0 33828-4 0 4202
-TLE2=2 28485 20.5607 11.6866 0014559 256.0192 103.8625 14.92594553269465
+NAME=IRIDIUM 8 [+]
+NICKNAME=IRIDIUM 8 [+]
+TLE1=1 24792U 97020A 09309.33342186 .00000139 00000-0 42731-4 0 8198
+TLE2=2 24792 86.3972 40.9272 0002298 84.4762 275.6695 14.34219380654614
-[25492]
+[19573]
VERSION=1.1
-NAME=SIRIUS 3
-NICKNAME=SIRIUS 3
-TLE1=1 25492U 98056B 09299.90540234 .00000037 00000-0 10000-3 0 5727
-TLE2=2 25492 0.7971 81.2876 0001645 121.1051 163.9516 1.00274968 40605
+NAME=COSMOS 1975
+NICKNAME=COSMOS 1975
+TLE1=1 19573U 88093A 09309.06145216 .00000111 00000-0 76316-5 0 6931
+TLE2=2 19573 82.5210 135.1535 0017376 344.1063 15.9593 14.95424064143091
-[28089]
+[23185]
VERSION=1.1
-NAME=YAMAL 202
-NICKNAME=YAMAL 202
-TLE1=1 28089U 03053A 09300.89904307 .00000123 00000-0 10000-3 0 7707
-TLE2=2 28089 0.0276 266.5785 0002625 305.1637 197.3509 1.00276322 21777
+NAME=APSTAR 1
+NICKNAME=APSTAR 1
+TLE1=1 23185U 94043A 09310.15357628 -.00000259 00000-0 10000-3 0 3095
+TLE2=2 23185 4.7504 70.6653 0001194 148.3330 23.8242 1.00273019 56000
-[25778]
+[24834]
VERSION=1.1
-NAME=IRIDIUM 21 [+]
-NICKNAME=IRIDIUM 21 [+]
-TLE1=1 25778U 99032B 09300.49405178 -.00000043 00000-0 -22265-4 0 6843
-TLE2=2 25778 86.3940 309.9215 0001748 137.0808 223.0523 14.34220440548263
+NAME=FENGYUN 2A
+NICKNAME=FENGYUN 2A
+TLE1=1 24834U 97029A 09306.57638696 -.00000124 00000-0 10000-3 0 4331
+TLE2=2 24834 8.7297 61.0605 0095405 76.4489 284.5397 0.96052200 45095
-[25954]
+[26410]
VERSION=1.1
-NAME=AMC-4 (GE-4)
-NICKNAME=AMC-4 (GE-4)
-TLE1=1 25954U 99060A 09299.23162186 -.00000115 00000-0 00000+0 0 7576
-TLE2=2 25954 0.0396 64.6432 0002403 150.6759 161.8188 1.00272973 36544
+NAME=CLUSTER II-FM6
+NICKNAME=CLUSTER II-FM6
+TLE1=1 26410U 00041A 09306.58333333 .00000965 00000-0 00000-0 0 4059
+TLE2=2 26410 118.3143 199.9451 8708688 38.1413 2.8194 0.42038007 5181
-[28393]
+[28187]
VERSION=1.1
-NAME=AMAZONAS
-NICKNAME=AMAZONAS
-TLE1=1 28393U 04031A 09298.22184201 -.00000285 00000-0 10000-3 0 6819
-TLE2=2 28393 0.0523 58.1681 0001852 90.3713 264.0720 1.00272329 19170
+NAME=EUTELSAT W3A
+NICKNAME=EUTELSAT W3A
+TLE1=1 28187U 04008A 09307.17524306 .00000063 00000-0 10000-3 0 8616
+TLE2=2 28187 0.0686 0.4911 0003504 245.2348 226.9547 1.00273721 20711
-[25853]
+[30582]
VERSION=1.1
-NAME=GLOBALSTAR M051
-NICKNAME=GLOBALSTAR M051
-TLE1=1 25853U 99037C 09300.59997556 -.00000086 00000-0 10000-3 0 268
-TLE2=2 25853 52.0023 22.1838 0001842 151.0457 209.0505 12.62263333475120
+NAME=THEMIS C
+NICKNAME=THEMIS C
+TLE1=1 30582U 07004C 09309.00000000 -.00000876 00000-0 00000+0 0 4547
+TLE2=2 30582 7.3258 343.7576 9058768 359.0447 160.8340 0.22550607 5504
-[24944]
+[25977]
VERSION=1.1
-NAME=IRIDIUM 29 [+]
-NICKNAME=IRIDIUM 29 [+]
-TLE1=1 24944U 97051A 09300.29811829 .00000215 00000-0 69811-4 0 7699
-TLE2=2 24944 86.3996 13.1247 0002306 83.4431 276.7027 14.34223691634524
+NAME=HELIOS 1B
+NICKNAME=HELIOS 1B
+TLE1=1 25977U 99064A 09310.08760559 -.00000051 00000-0 65859-6 0 7737
+TLE2=2 25977 98.3465 315.8733 0001098 184.7463 175.3755 14.77734006532886
-[33060]
+[25432]
VERSION=1.1
-NAME=ORBCOMM FM38 [S]
-NICKNAME=ORBCOMM FM38 [S]
-TLE1=1 33060U 08031A 09301.12127162 .00000053 00000-0 41962-4 0 4437
-TLE2=2 33060 48.4489 172.7176 0006646 255.2971 104.7203 14.68748604 72874
+NAME=IRIDIUM 76 [+]
+NICKNAME=IRIDIUM 76 [+]
+TLE1=1 25432U 98048B 09309.51027222 .00000057 00000-0 13274-4 0 6391
+TLE2=2 25432 86.3963 337.6662 0002587 95.8386 264.3114 14.34220628587044
-[26463]
+[25758]
VERSION=1.1
-NAME=CLUSTER II-FM5
-NICKNAME=CLUSTER II-FM5
-TLE1=1 26463U 00045A 09299.41666667 .00000509 00000-0 00000-0 0 3999
-TLE2=2 26463 120.2310 201.4943 8558450 36.4666 2.7388 0.42026725 5732
+NAME=IRS-P4 (OCEANSAT 1)
+NICKNAME=IRS-P4 (OCEANSAT 1)
+TLE1=1 25758U 99029C 09309.23621209 .00000106 00000-0 37893-4 0 2918
+TLE2=2 25758 98.2767 41.9373 0000921 118.8526 241.2766 14.50855728553318
-[15945]
+[20261]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 15945U 85069B 09300.84060405 .00000121 00000-0 11971-4 0 2025
-TLE2=2 15945 82.5275 221.9406 0021760 113.2535 247.0992 14.82440902307596
+NAME=INTERCOSMOS 24
+NICKNAME=INTERCOSMOS 24
+TLE1=1 20261U 89080A 09309.71730410 .00000066 00000-0 14152-4 0 114
+TLE2=2 20261 82.5925 7.7895 1216063 15.0894 348.3324 12.53446138917311
-[24834]
+[25163]
VERSION=1.1
-NAME=FENGYUN 2A
-NICKNAME=FENGYUN 2A
-TLE1=1 24834U 97029A 09300.33020160 -.00000056 00000-0 10000-3 0 4299
-TLE2=2 24834 8.7145 61.1312 0095573 76.0591 284.9926 0.96050780 45036
+NAME=GLOBALSTAR M004
+NICKNAME=GLOBALSTAR M004
+TLE1=1 25163U 98008B 09309.75843995 -.00000086 00000-0 10000-3 0 4571
+TLE2=2 25163 51.9986 166.9062 0002012 246.8214 113.2440 12.63155946541073
-[25311]
+[26766]
VERSION=1.1
-NAME=NILESAT 101
-NICKNAME=NILESAT 101
-TLE1=1 25311U 98024A 09297.89193700 -.00000059 00000-0 10000-3 0 7873
-TLE2=2 25311 0.0572 76.0264 0003523 103.8643 167.6536 1.00273920 42364
+NAME=INTELSAT 10 (IS-10)
+NICKNAME=INTELSAT 10 (IS-10)
+TLE1=1 26766U 01019A 09308.94833648 -.00000014 00000-0 10000-3 0 4707
+TLE2=2 26766 0.0127 254.6081 0002080 270.3542 289.2888 1.00271780 31081
-[27374]
+[25978]
VERSION=1.1
-NAME=IRIDIUM 94 [S]
-NICKNAME=IRIDIUM 94 [S]
-TLE1=1 27374U 02005C 09301.20392944 -.00001037 00000-0 -19284-3 0 3394
-TLE2=2 27374 86.5802 12.5592 0002475 78.6465 281.5029 14.66235558412652
+NAME=CLEMENTINE
+NICKNAME=CLEMENTINE
+TLE1=1 25978U 99064B 09309.63028660 -.00000210 00000-0 -17604-4 0 7862
+TLE2=2 25978 98.1316 26.9891 0011264 31.7083 328.4816 14.85538907536918
-[12389]
+[29640]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12389U 81033B 09300.80373797 .00003789 00000-0 12023-3 0 4852
-TLE2=2 12389 82.9180 205.7166 0408980 113.9731 250.4832 14.77808597456582
+NAME=FENGYUN 2D
+NICKNAME=FENGYUN 2D
+TLE1=1 29640U 06053A 09308.90724310 -.00000182 00000-0 10000-3 0 7793
+TLE2=2 29640 0.1511 151.8896 0002475 155.0883 150.0359 1.00265125 10711
-[24901]
+[22931]
VERSION=1.1
-NAME=AGILA 2
-NICKNAME=AGILA 2
-TLE1=1 24901U 97042A 09299.63453252 -.00000233 00000-0 10000-3 0 9215
-TLE2=2 24901 0.0765 84.5059 0003916 125.9815 199.0810 1.00272106 44631
+NAME=THAICOM 1
+NICKNAME=THAICOM 1
+TLE1=1 22931U 93078B 09306.16316270 -.00000346 00000-0 10000-3 0 4801
+TLE2=2 22931 0.6629 76.0278 0002190 181.3365 322.9675 1.00274577 57707
-[26095]
+[30581]
VERSION=1.1
-NAME=SUPERBIRD-B2
-NICKNAME=SUPERBIRD-B2
-TLE1=1 26095U 00012A 09300.45719878 -.00000089 00000-0 10000-3 0 7840
-TLE2=2 26095 0.0622 84.4634 0002147 129.3194 148.7783 1.00272428 35558
+NAME=THEMIS B
+NICKNAME=THEMIS B
+TLE1=1 30581U 07004B 09309.00000000 -.00000941 00000-0 00000+0 0 2772
+TLE2=2 30581 10.4145 29.6504 7969504 306.3412 102.3174 0.09718346 6337
-[20558]
+[28393]
VERSION=1.1
-NAME=ASIASAT 1
-NICKNAME=ASIASAT 1
-TLE1=1 20558U 90030A 09299.88331768 .00000093 00000-0 10000-3 0 7562
-TLE2=2 20558 9.3616 58.6932 0004607 194.7933 165.1844 0.99240073 71385
+NAME=AMAZONAS
+NICKNAME=AMAZONAS
+TLE1=1 28393U 04031A 09308.04261059 -.00000269 00000-0 10000-3 0 6865
+TLE2=2 28393 0.0701 60.1249 0001052 150.5540 147.1133 1.00270776 19263
-[28371]
+[26082]
VERSION=1.1
-NAME=SAUDISAT 2
-NICKNAME=SAUDISAT 2
-TLE1=1 28371U 04025F 09301.12160323 .00000015 00000-0 14136-4 0 281
-TLE2=2 28371 98.0057 340.5346 0026312 358.1003 2.0100 14.52940123282670
+NAME=GLOBALSTAR M062
+NICKNAME=GLOBALSTAR M062
+TLE1=1 26082U 00008B 09308.58295089 -.00000086 00000-0 10000-3 0 9980
+TLE2=2 26082 52.0089 314.3552 0001185 87.3738 272.7255 12.62267311449411
-[25160]
+[26071]
VERSION=1.1
-NAME=CELESTIS-02
-NICKNAME=CELESTIS-02
-TLE1=1 25160U 98007D 09300.68220781 -.00000112 00000-0 75465-5 0 1791
-TLE2=2 25160 107.9812 349.7907 0061022 101.8729 258.9254 14.20849572607260
+NAME=HISPASAT 1C
+NICKNAME=HISPASAT 1C
+TLE1=1 26071U 00007A 09309.22368343 -.00000207 00000-0 10000-3 0 3241
+TLE2=2 26071 0.0716 60.0396 0002775 151.1469 243.9714 1.00270518 35804
-[25104]
+[25039]
VERSION=1.1
-NAME=IRIDIUM 45 [+]
-NICKNAME=IRIDIUM 45 [+]
-TLE1=1 25104U 97082A 09300.52283462 .00000078 00000-0 20653-4 0 7265
-TLE2=2 25104 86.3980 341.4468 0002427 81.0048 279.1422 14.34219813620522
+NAME=IRIDIUM 43 [+]
+NICKNAME=IRIDIUM 43 [+]
+TLE1=1 25039U 97069A 09309.49226785 -.00000062 00000-0 -29362-4 0 7864
+TLE2=2 25039 86.3935 104.1924 0002075 79.8210 280.3218 14.34212799627750
-[33331]
+[27852]
VERSION=1.1
-NAME=GEOEYE 1
-NICKNAME=GEOEYE 1
-TLE1=1 33331U 08042A 09301.13258177 -.00000004 00000-0 82107-5 0 2737
-TLE2=2 33331 98.0890 13.7454 0011275 25.4891 334.6876 14.64452571 60932
+NAME=ECHOSTAR 12 (RAINBOW 1)
+NICKNAME=ECHOSTAR 12 (RAINBOW 1)
+TLE1=1 27852U 03033A 09308.40323186 -.00000270 00000-0 10000-3 0 412
+TLE2=2 27852 0.0610 57.4027 0001497 186.6357 243.3142 1.00271385 23130
-[23027]
+[25491]
VERSION=1.1
-NAME=GPS BIIA-24 (PRN 06)
-NICKNAME=GPS BIIA-24 (PRN 06)
-TLE1=1 23027U 94016A 09299.98614192 .00000053 00000-0 10000-3 0 9412
-TLE2=2 23027 53.5158 150.0497 0060071 288.6930 70.7375 2.00560181114579
+NAME=EUTELSAT W2
+NICKNAME=EUTELSAT W2
+TLE1=1 25491U 98056A 09305.78050550 .00000120 00000-0 10000-3 0 7777
+TLE2=2 25491 0.0829 79.0660 0006948 190.8043 68.2992 1.00273158 40593
-[23915]
+[28378]
VERSION=1.1
-NAME=INTELSAT 709 (IS-709)
-NICKNAME=INTELSAT 709 (IS-709)
-TLE1=1 23915U 96035A 09300.58015644 -.00000182 00000-0 10000-3 0 197
-TLE2=2 23915 0.0041 202.1938 0002849 355.4499 132.4637 1.00271800 48988
+NAME=ANIK F2
+NICKNAME=ANIK F2
+TLE1=1 28378U 04027A 09307.49875905 -.00000036 00000-0 10000-3 0 8710
+TLE2=2 28378 0.0156 301.7431 0001106 283.9347 245.6996 1.00272102 19494
-[26388]
+[31598]
VERSION=1.1
-NAME=TDRS 8
-NICKNAME=TDRS 8
-TLE1=1 26388U 00034A 09300.61415964 -.00000215 00000-0 10000-3 0 547
-TLE2=2 26388 1.6984 101.7786 0004225 98.1878 146.3372 1.00277535 34251
+NAME=COSMO-SKYMED 1
+NICKNAME=COSMO-SKYMED 1
+TLE1=1 31598U 07023A 09310.16980163 .00000017 00000-0 86939-5 0 7081
+TLE2=2 31598 97.8620 136.5120 0001217 82.2884 277.8465 14.82168153130654
-[28946]
+[24798]
VERSION=1.1
-NAME=EUROBIRD 9A
-NICKNAME=EUROBIRD 9A
-TLE1=1 28946U 06007B 09298.80939061 .00000061 00000-0 10000-3 0 3957
-TLE2=2 28946 0.0096 31.0673 0003862 179.7480 123.9162 1.00273919 13359
+NAME=DFH 3-2
+NICKNAME=DFH 3-2
+TLE1=1 24798U 97021A 09307.72384819 -.00000339 00000-0 10000-3 0 7437
+TLE2=2 24798 5.4081 69.1403 0005185 324.6758 35.2003 1.00255181 45732
-[20453]
+[25307]
VERSION=1.1
-NAME=DELTA 2 R/B(1)
-NICKNAME=DELTA 2 R/B(1)
-TLE1=1 20453U 90008B 09300.49979880 .00001235 00000-0 97950-4 0 6179
-TLE2=2 20453 35.6271 102.6977 0375804 96.6659 267.6963 14.59509748 37371
+NAME=GLOBALSTAR M006
+NICKNAME=GLOBALSTAR M006
+TLE1=1 25307U 98023B 09310.12436260 -.00000086 00000-0 10000-3 0 1706
+TLE2=2 25307 51.9981 218.0403 0001480 54.0160 306.0581 12.62263052532146
-[31127]
+[27939]
VERSION=1.1
-NAME=SAUDICOMSAT 4
-NICKNAME=SAUDICOMSAT 4
-TLE1=1 31127U 07012L 09300.18685473 .00000379 00000-0 89803-4 0 7773
-TLE2=2 31127 97.9760 355.4689 0069902 210.1987 149.5147 14.57980614134619
+NAME=MOZHAYETS 4 (RS-22)
+NICKNAME=RS-22
+TLE1=1 27939U 03042A 09309.19386492 .00000171 00000-0 41863-4 0 9302
+TLE2=2 27939 97.9199 178.7538 0014503 49.9649 310.2826 14.63353893326197
-[25416]
+[26390]
VERSION=1.1
-NAME=ORBCOMM FM20 [+]
-NICKNAME=ORBCOMM FM20 [+]
-TLE1=1 25416U 98046D 09300.17865970 .00000002 00000-0 56748-4 0 5677
-TLE2=2 25416 44.9981 6.8992 0003062 251.0771 108.9757 14.27654063585512
+NAME=SIRIUS-1
+NICKNAME=SIRIUS-1
+TLE1=1 26390U 00035A 09308.76546591 -.00000022 00000-0 10000-3 0 5761
+TLE2=2 26390 61.4120 253.8832 2664277 269.8781 59.8962 1.00282973 34257
-[22314]
+[28492]
VERSION=1.1
-NAME=TDRS 6
-NICKNAME=TDRS 6
-TLE1=1 22314U 93003B 09299.64129204 .00000099 00000-0 10000-3 0 5598
-TLE2=2 22314 9.5094 57.0610 0005310 347.6555 49.8638 1.00273154 61507
+NAME=HELIOS-2A
+NICKNAME=HELIOS-2A
+TLE1=1 28492U 04049A 09310.18480512 .00000103 00000-0 28659-4 0 4672
+TLE2=2 28492 98.0983 244.4698 0000528 78.2314 281.8956 14.63848650260913
-[8459]
+[36032]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 08459U 75112B 09300.91009799 .00000034 00000-0 20590-4 0 7881
-TLE2=2 08459 74.0618 186.8296 0016321 333.2837 26.7469 14.35892181773740
+NAME=NSS-12
+NICKNAME=NSS-12
+TLE1=1 36032U 09058A 09309.72113999 .00000077 00000-0 00000+0 0 105
+TLE2=2 36032 0.1200 182.8039 0013462 183.9757 356.3603 1.00222862 106
-[12139]
+[35931]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12139U 81003B 09300.55381789 .00000543 00000-0 31303-4 0 8968
-TLE2=2 12139 82.9583 314.4294 0592343 193.8312 164.6029 14.24430107446034
+NAME=OCEANSAT 2
+NICKNAME=OCEANSAT 2
+TLE1=1 35931U 09051A 09309.82683248 .00006029 00000-0 15388-2 0 847
+TLE2=2 35931 98.3368 44.1256 0002247 53.6318 306.4599 14.50864068 6311
-[28497]
+[13969]
VERSION=1.1
-NAME=ESSAIM-4
-NICKNAME=ESSAIM-4
-TLE1=1 28497U 04049F 09301.10195204 .00000215 00000-0 44323-4 0 5143
-TLE2=2 28497 98.2868 266.4799 0011969 177.2803 182.8474 14.70166492260798
+NAME=TDRS 1
+NICKNAME=TDRS 1
+TLE1=1 13969U 83026B 09309.34332387 -.00000297 00000-0 10000-3 0 9589
+TLE2=2 13969 13.4420 8.1623 0032676 238.4255 225.8843 1.00279946 70419
-[27389]
+[26561]
VERSION=1.1
-NAME=TDRS 9
-NICKNAME=TDRS 9
-TLE1=1 27389U 02011A 09300.37003058 -.00000276 00000-0 10000-3 0 4558
-TLE2=2 27389 2.0799 225.4779 0005381 141.6688 99.8205 1.00270157 29507
+NAME=HETE-2
+NICKNAME=HETE-2
+TLE1=1 26561U 00061A 09305.09188273 .00001188 00000-0 32769-4 0 4839
+TLE2=2 26561 1.9452 287.0224 0023538 223.4010 136.4536 14.96104980495649
-[28369]
+[25126]
VERSION=1.1
-NAME=SAUDICOMSAT 1
-NICKNAME=SAUDICOMSAT 1
-TLE1=1 28369U 04025D 09299.94566069 .00000004 00000-0 11937-4 0 5202
-TLE2=2 28369 98.0076 331.9702 0033946 7.1013 353.0647 14.50654326282053
+NAME=HGS-1 (ASIASAT 3)
+NICKNAME=HGS-1 (ASIASAT 3)
+TLE1=1 25126U 97086A 09308.47312241 -.00000085 00000-0 10000-3 0 2980
+TLE2=2 25126 2.0150 113.3807 0045269 205.9964 154.0846 1.00166042 44297
-[24307]
+[6909]
VERSION=1.1
-NAME=INMARSAT 3-F2
-NICKNAME=INMARSAT 3-F2
-TLE1=1 24307U 96053A 09301.05140209 -.00000118 00000-0 10000-3 0 9684
-TLE2=2 24307 0.0760 319.9210 0005266 252.8454 186.8191 1.00271700 48122
+NAME=NNSS O-20
+NICKNAME=NNSS O-20
+TLE1=1 06909U 73081A 09309.63848701 .00000086 00000-0 78355-4 0 5094
+TLE2=2 06909 89.8613 356.0202 0160304 45.5283 315.8864 13.69764045998422
-[29079]
+[13068]
VERSION=1.1
-NAME=EROS B
-NICKNAME=EROS B
-TLE1=1 29079U 06014A 09301.14659722 .00001694 00000-0 86484-4 0 9698
-TLE2=2 29079 97.4113 59.3683 0009307 315.1345 44.4224 15.18036519194686
+NAME=SL-3 R/B
+NICKNAME=SL-3 R/B
+TLE1=1 13068U 82013B 09309.79007285 -.00000008 00000-0 -24267-5 0 426
+TLE2=2 13068 81.2045 138.6152 0026262 86.0154 274.4018 15.00312818505766
-[28187]
+[26093]
VERSION=1.1
-NAME=EUTELSAT W3A
-NICKNAME=EUTELSAT W3A
-TLE1=1 28187U 04008A 09299.89109046 .00000050 00000-0 10000-3 0 8576
-TLE2=2 28187 0.0777 359.6700 0003507 234.0178 129.5103 1.00274337 20649
+NAME=PICOSAT 5
+NICKNAME=PICOSAT 5
+TLE1=1 26093U 00004L 09310.14256632 .00000168 00000-0 65114-4 0 4920
+TLE2=2 26093 100.2081 166.8491 0033157 110.6835 249.7889 14.45005597512557
-[24903]
+[26095]
VERSION=1.1
-NAME=IRIDIUM 26 [+]
-NICKNAME=IRIDIUM 26 [+]
-TLE1=1 24903U 97043A 09300.48477940 .00000048 00000-0 99105-5 0 9144
-TLE2=2 24903 86.3976 341.4956 0002331 82.0209 278.1251 14.34219673638004
+NAME=SUPERBIRD-B2
+NICKNAME=SUPERBIRD-B2
+TLE1=1 26095U 00012A 09308.61530251 -.00000080 00000-0 10000-3 0 7865
+TLE2=2 26095 0.0409 111.2953 0002261 90.3181 225.9324 1.00271854 35634
-[30777]
+[11060]
VERSION=1.1
-NAME=CFESAT
-NICKNAME=CFESAT
-TLE1=1 30777U 07006F 09300.58129890 .00000588 00000-0 46055-4 0 6926
-TLE2=2 30777 35.4335 20.5433 0004257 310.7393 49.2952 15.02842737144986
+NAME=TIROS N [P]
+NICKNAME=TIROS N [P]
+TLE1=1 11060U 78096A 09309.86630801 .00000005 00000-0 24923-4 0 3264
+TLE2=2 11060 98.9478 281.2088 0010813 336.7900 23.2780 14.17487600819025
-[26605]
+[28899]
VERSION=1.1
-NAME=GPS BIIR-06 (PRN 14)
-NICKNAME=GPS BIIR-06 (PRN 14)
-TLE1=1 26605U 00071A 09300.17595425 -.00000068 00000-0 10000-3 0 6050
-TLE2=2 26605 56.5898 335.1916 0052112 239.0628 120.4771 2.00565983 65664
+NAME=INMARSAT 4-F2
+NICKNAME=INMARSAT 4-F2
+TLE1=1 28899U 05044A 09308.97245703 .00000146 00000-0 10000-3 0 9261
+TLE2=2 28899 2.2396 317.7988 0002994 9.3548 92.3430 1.00264670 14671
-[22269]
+[902]
VERSION=1.1
-NAME=COSMOS 2224
-NICKNAME=COSMOS 2224
-TLE1=1 22269U 92088A 09297.06299115 -.00000083 00000-0 10000-3 0 5866
-TLE2=2 22269 10.6789 46.2688 0003958 133.1826 226.8144 1.00272700 61202
+NAME=CALSPHERE 2
+NICKNAME=CALSPHERE 2
+TLE1=1 00902U 64063E 09309.46707940 .00000075 00000-0 10000-3 0 1985
+TLE2=2 00902 90.1564 332.3882 0016793 193.4825 166.5882 13.52468637 36465
-[25078]
+[16882]
VERSION=1.1
-NAME=IRIDIUM 44 [-]
-NICKNAME=IRIDIUM 44 [-]
-TLE1=1 25078U 97077B 09300.48112570 .00000093 00000-0 25030-4 0 2744
-TLE2=2 25078 86.3908 103.2151 0003921 63.3884 296.7716 14.36570777622924
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 16882U 86055B 09309.98329061 .00000098 00000-0 94977-5 0 177
+TLE2=2 16882 82.5181 312.8250 0019487 193.1125 166.9596 14.81619690256026
-[29640]
+[25492]
VERSION=1.1
-NAME=FENGYUN 2D
-NICKNAME=FENGYUN 2D
-TLE1=1 29640U 06053A 09300.81882883 -.00000190 00000-0 10000-3 0 7750
-TLE2=2 29640 0.1439 157.2148 0002179 144.6637 115.5008 1.00266775 10632
+NAME=SIRIUS 3
+NICKNAME=SIRIUS 3
+TLE1=1 25492U 98056B 09308.05772481 .00000047 00000-0 10000-3 0 5771
+TLE2=2 25492 0.8173 81.1094 0001762 136.3919 211.6919 1.00271274 40685
-[32404]
+[33380]
VERSION=1.1
-NAME=THURAYA-3
-NICKNAME=THURAYA-3
-TLE1=1 32404U 08001A 09300.82983659 -.00000308 00000-0 10000-3 0 3297
-TLE2=2 32404 5.5173 331.8287 0004962 227.3339 234.5486 1.00270803 6603
+NAME=COSMOS 2444 (726)
+NICKNAME=COSMOS 2444 (726)
+TLE1=1 33380U 08046C 09309.26277742 .00000088 00000-0 10000-3 0 3188
+TLE2=2 33380 64.8040 158.5499 0028496 332.0009 143.9682 2.13102823 8641
-[25460]
+[22907]
VERSION=1.1
-NAME=ST-1
-NICKNAME=ST-1
-TLE1=1 25460U 98049A 09300.83350481 -.00000208 00000-0 10000-3 0 7242
-TLE2=2 25460 0.0064 74.1496 0004067 132.9686 217.3098 1.00272019 40952
+NAME=GORIZONT 29
+NICKNAME=GORIZONT 29
+TLE1=1 22907U 93072A 09302.82123546 -.00000026 00000-0 10000-3 0 7043
+TLE2=2 22907 11.0498 46.8254 0013709 202.5313 157.3803 1.00108900 58379
-[25025]
+[24870]
VERSION=1.1
-NAME=TEAMSAT
-NICKNAME=TEAMSAT
-TLE1=1 25025U 97066C 09296.79373046 -.00000030 00000-0 -19714-4 0 7772
-TLE2=2 25025 7.5488 151.9727 6528023 274.7787 18.9476 3.07909874134840
+NAME=IRIDIUM 17 [-]
+NICKNAME=IRIDIUM 17 [-]
+TLE1=1 24870U 97034B 09309.46201140 .00000096 00000-0 27052-4 0 8357
+TLE2=2 24870 86.3911 103.9163 0002397 72.3876 287.7578 14.34452765645378
-[26624]
+[32060]
VERSION=1.1
-NAME=ANIK F1
-NICKNAME=ANIK F1
-TLE1=1 26624U 00076A 09299.51939403 -.00000074 00000-0 10000-3 0 5404
-TLE2=2 26624 0.0123 177.4851 0001013 10.9718 286.2895 1.00272749 32795
+NAME=WORLDVIEW-1 (WV-1)
+NICKNAME=WORLDVIEW-1 (WV-1)
+TLE1=1 32060U 07041A 09310.12987606 .00000689 00000-0 30953-4 0 3907
+TLE2=2 32060 97.4203 26.3206 0001842 61.6690 27.3980 15.24441720118717
-[16182]
+[26998]
VERSION=1.1
-NAME=SL-16 R/B
-NICKNAME=SL-16 R/B
-TLE1=1 16182U 85097B 09300.03273649 .00000023 00000-0 36046-4 0 9878
-TLE2=2 16182 70.9990 117.0402 0007444 350.6830 9.4184 14.15957459241231
+NAME=TIMED
+NICKNAME=TIMED
+TLE1=1 26998U 01055B 09309.90120498 -.00000050 00000-0 -16972-5 0 4272
+TLE2=2 26998 74.0733 69.7455 0001115 170.7725 189.3482 14.84103797428545
-[32765]
+[25693]
VERSION=1.1
-NAME=C/NOFS
-NICKNAME=C/NOFS
-TLE1=1 32765U 08017A 09300.14241439 .00004751 00000-0 19811-3 0 4051
-TLE2=2 32765 13.0086 245.5679 0311702 68.7359 294.5916 14.81762094 82911
+NAME=UOSAT 12 (UO-36)
+NICKNAME=UO-36
+TLE1=1 25693U 99021A 09309.81807429 -.00000030 00000-0 15088-4 0 548
+TLE2=2 25693 64.5591 40.7246 0012983 334.1667 25.8815 14.78765336568786
-[6212]
+[25860]
VERSION=1.1
-NAME=OPS 8180 (RADCAT)
-NICKNAME=OPS 8180 (RADCAT)
-TLE1=1 06212U 72076A 09300.48669804 .00002894 00000-0 10532-3 0 8648
-TLE2=2 06212 98.5893 329.0030 0002161 249.1330 110.9680 15.29282804143097
+NAME=OKEAN-O
+NICKNAME=OKEAN-O
+TLE1=1 25860U 99039A 09309.07007446 .00000051 00000-0 15184-4 0 8280
+TLE2=2 25860 97.8037 284.7870 0001840 76.2973 283.8435 14.73595653553891
-[33320]
+[32729]
VERSION=1.1
-NAME=HJ-1A
-NICKNAME=HJ-1A
-TLE1=1 33320U 08041A 09301.14302619 .00000160 00000-0 31153-4 0 2721
-TLE2=2 33320 97.9710 14.8544 0025230 17.0124 343.1932 14.75183382 61496
+NAME=DIRECTV 11
+NICKNAME=DIRECTV 11
+TLE1=1 32729U 08013A 09309.39003918 -.00000117 00000-0 10000-3 0 3212
+TLE2=2 32729 0.0388 59.1299 0000160 121.0550 265.7738 1.00271166 6097
-[29659]
+[28238]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 29659U 06060B 09300.35474481 .00002155 00000-0 78114-4 0 8369
-TLE2=2 29659 98.0831 50.6571 0038705 138.3566 222.0626 15.28968364159222
+NAME=DIRECTV 7S
+NICKNAME=DIRECTV 7S
+TLE1=1 28238U 04016A 09308.80754370 .00000000 00000-0 10000-3 0 9947
+TLE2=2 28238 0.0198 142.7184 0002482 60.1654 13.0194 1.00271201 20248
-[27378]
+[25050]
VERSION=1.1
-NAME=ECHOSTAR 7
-NICKNAME=ECHOSTAR 7
-TLE1=1 27378U 02006A 09299.45596058 .00000000 00000-0 10000-3 0 4401
-TLE2=2 27378 0.0803 57.7806 0000902 116.5843 265.8532 1.00273036 28128
+NAME=INDOSTAR 1
+NICKNAME=INDOSTAR 1
+TLE1=1 25050U 97071B 09306.26564527 -.00000326 00000-0 10000-3 0 1281
+TLE2=2 25050 3.9102 72.4838 0003757 166.8604 5.6594 1.00273646 43885
-[29398]
+[26930]
VERSION=1.1
-NAME=ZHONGXING-22A
-NICKNAME=ZHONGXING-22A
-TLE1=1 29398U 06038A 09299.85260541 -.00000322 00000-0 10000-3 0 9530
-TLE2=2 29398 0.0828 64.3438 0002714 172.9421 208.2882 1.00275685 11500
+NAME=PICOSAT 9
+NICKNAME=PICOSAT 9
+TLE1=1 26930U 01043B 09309.83063574 -.00000094 00000-0 -39701-5 0 2875
+TLE2=2 26930 67.0030 36.6060 0008141 301.4159 58.6157 14.30054579422992
-[28773]
+[22178]
VERSION=1.1
-NAME=SUZAKU (ASTRO-EII)
-NICKNAME=SUZAKU (ASTRO-EII)
-TLE1=1 28773U 05025A 09300.84764241 .00000506 00000-0 33171-4 0 1102
-TLE2=2 28773 31.4047 148.7910 0006245 80.1801 279.9550 15.00858681236159
+NAME=MOLNIYA 3-42
+NICKNAME=MOLNIYA 3-42
+TLE1=1 22178U 92067A 09309.67673760 .00001403 00000-0 14811+0 0 7481
+TLE2=2 22178 61.9053 173.2699 7237666 265.2722 16.7470 2.00611988125015
-[25315]
+[28368]
VERSION=1.1
-NAME=COSMOS 2350
-NICKNAME=COSMOS 2350
-TLE1=1 25315U 98025A 09299.86748407 -.00000069 00000-0 10000-3 0 4055
-TLE2=2 25315 7.6828 60.7505 0004379 355.8690 4.1198 1.00285501 42114
+NAME=DEMETER
+NICKNAME=DEMETER
+TLE1=1 28368U 04025C 09310.18379047 .00000017 00000-0 10894-4 0 906
+TLE2=2 28368 97.9967 12.5033 0001351 103.5465 256.5917 14.70180762286584
-[21906]
+[25852]
VERSION=1.1
-NAME=GALAXY 5
-NICKNAME=GALAXY 5
-TLE1=1 21906U 92013A 09299.54875991 .00000006 00000-0 10000-3 0 9675
-TLE2=2 21906 4.5581 71.8213 0013399 281.5647 78.3248 0.99289868 56061
+NAME=GLOBALSTAR M032
+NICKNAME=GLOBALSTAR M032
+TLE1=1 25852U 99037B 09309.60526135 -.00000086 00000-0 10000-3 0 225
+TLE2=2 25852 52.0040 354.8538 0000381 198.6498 161.4360 12.62264467476264
-[7004]
+[25469]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 07004U 73107B 09300.65050055 .00004157 00000-0 16729-3 0 1567
-TLE2=2 07004 73.9640 351.8014 0429239 184.3683 175.3692 14.68558146819746
+NAME=IRIDIUM 80 [+]
+NICKNAME=IRIDIUM 80 [+]
+TLE1=1 25469U 98051C 09309.52398269 -.00000112 00000-0 -47021-4 0 7075
+TLE2=2 25469 86.3932 104.1154 0002157 80.7017 279.4419 14.34212420584289
-[19223]
+[31574]
VERSION=1.1
-NAME=NOVA 11
-NICKNAME=NOVA 11
-TLE1=1 19223U 88052A 09300.50993461 .00000051 00000-0 10000-3 0 5579
-TLE2=2 19223 90.0166 90.9266 0032208 42.6091 317.7534 13.22417904 31131
+NAME=GLOBALSTAR M072
+NICKNAME=GLOBALSTAR M072
+TLE1=1 31574U 07020D 09309.66672574 -.00000088 00000-0 85696-4 0 7581
+TLE2=2 31574 52.0127 355.5797 0001219 171.4254 188.6630 12.62266976112820
-[15936]
+[20465]
VERSION=1.1
-NAME=OSCAR 24
-NICKNAME=OSCAR 24
-TLE1=1 15936U 85066B 09300.72925541 .00000065 00000-0 10000-3 0 8372
-TLE2=2 15936 90.0505 20.4444 0171624 134.5360 226.9948 13.35164308180515
+NAME=COSMOS 2058
+NICKNAME=COSMOS 2058
+TLE1=1 20465U 90010A 09309.32283279 .00000541 00000-0 52053-4 0 6204
+TLE2=2 20465 82.4948 26.0984 0016044 247.2271 112.7260 14.91010543 70142
-[26382]
+[31571]
VERSION=1.1
-NAME=FENGYUN 2B
-NICKNAME=FENGYUN 2B
-TLE1=1 26382U 00032A 09297.97179636 .00000139 00000-0 10000-3 0 2126
-TLE2=2 26382 4.6534 70.8289 0003999 188.1332 171.8749 1.00074005 34163
+NAME=GLOBALSTAR M065
+NICKNAME=GLOBALSTAR M065
+TLE1=1 31571U 07020A 09309.96867821 -.00000069 00000-0 19351-3 0 7552
+TLE2=2 31571 51.9936 308.4219 0001348 48.5858 311.5117 12.62260714113626
-[23176]
+[25924]
VERSION=1.1
-NAME=BS-3N
-NICKNAME=BS-3N
-TLE1=1 23176U 94040B 09299.89889351 -.00000349 00000-0 10000-3 0 662
-TLE2=2 23176 0.0966 71.7601 0001378 339.0575 58.1017 1.00270882 55858
+NAME=ABS-1 (LMI 1)
+NICKNAME=ABS-1 (LMI 1)
+TLE1=1 25924U 99053A 09309.05376001 -.00000077 00000-0 10000-3 0 3859
+TLE2=2 25924 0.0285 124.5494 0002353 101.9347 272.2838 1.00272150 37062
-[28790]
+[21922]
VERSION=1.1
-NAME=GALAXY 14 (G-14)
-NICKNAME=GALAXY 14 (G-14)
-TLE1=1 28790U 05030A 09300.47929733 .00000040 00000-0 10000-3 0 8122
-TLE2=2 28790 0.0563 53.8402 0002491 138.6931 250.9994 1.00271777 15388
+NAME=GORIZONT 25
+NICKNAME=GORIZONT 25
+TLE1=1 21922U 92017A 09309.20395593 -.00000193 00000-0 10000-3 0 2757
+TLE2=2 21922 11.7758 40.9285 0026531 302.5164 57.1741 0.99845896 64354
-[32768]
+[28380]
VERSION=1.1
-NAME=STAR ONE C2
-NICKNAME=STAR ONE C2
-TLE1=1 32768U 08018B 09299.40905030 -.00000264 00000-0 10000-3 0 2331
-TLE2=2 32768 0.0193 230.9006 0002310 356.9783 244.3049 1.00270061 5703
+NAME=COSMOS 2407
+NICKNAME=COSMOS 2407
+TLE1=1 28380U 04028A 09309.37974659 .00000004 00000-0 -10800-4 0 5798
+TLE2=2 28380 82.9581 246.3359 0038046 298.3358 61.3961 13.75846565265602
-[21577]
+[26931]
VERSION=1.1
-NAME=TUBSAT A
-NICKNAME=TUBSAT A
-TLE1=1 21577U 91...
[truncated message content] |
|
From: <cs...@us...> - 2009-11-06 23:30:00
|
Revision: 510
http://gpredict.svn.sourceforge.net/gpredict/?rev=510&view=rev
Author: csete
Date: 2009-11-06 23:29:49 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated
Modified Paths:
--------------
trunk/po/en_GB.po
trunk/po/en_US.po
trunk/po/fr.po
trunk/po/gpredict.pot
Modified: trunk/po/en_GB.po
===================================================================
--- trunk/po/en_GB.po 2009-11-06 23:24:00 UTC (rev 509)
+++ trunk/po/en_GB.po 2009-11-06 23:29:49 UTC (rev 510)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-04 14:01+0200\n"
+"POT-Creation-Date: 2009-11-07 00:28+0100\n"
"PO-Revision-Date: 2009-08-05 00:53+0100\n"
"Last-Translator: Michael Stephenson <mic...@go...>\n"
"Language-Team: British English\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/about.c:62
+#: ../src/about.c:64
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
"Contact: oz9aec at googlemail.com\n"
@@ -68,12 +68,12 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:94 ../src/main.c:166 ../src/sat-log-browser.c:462
+#: ../src/about.c:96 ../src/main.c:221 ../src/sat-log-browser.c:462
#: ../src/sat-log.c:58
msgid "GPREDICT"
msgstr "GPREDICT"
-#: ../src/about.c:97
+#: ../src/about.c:99
#, fuzzy
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
@@ -84,7 +84,7 @@
"\n"
"Gpredict is available free of charge from:"
-#: ../src/about.c:114
+#: ../src/about.c:116
msgid "translator-credits"
msgstr "Michael Stephenson"
@@ -157,17 +157,17 @@
msgid "%s: %s.sat already exists. Skipped."
msgstr ""
-#: ../src/first-time.c:529 ../src/tle-update.c:389
+#: ../src/first-time.c:529 ../src/tle-update.c:400
#, fuzzy, c-format
msgid "%s: Could not create satellite file (%s)."
msgstr "%s: Could not create config file (%s)."
-#: ../src/first-time.c:546 ../src/tle-update.c:951
+#: ../src/first-time.c:546 ../src/tle-update.c:995
#, fuzzy, c-format
msgid "%s: Error writing satellite data (%s)."
msgstr "%s: Error writing config data (%s)."
-#: ../src/first-time.c:553 ../src/tle-update.c:958
+#: ../src/first-time.c:553 ../src/tle-update.c:1002
#, fuzzy, c-format
msgid "%s: Wrote only %d out of %d chars for satellite data."
msgstr "%s: Wrote only %d out of %d chars."
@@ -439,17 +439,17 @@
"Satellite %s has no passes for\n"
"the current ground station!"
-#: ../src/gtk-rig-ctrl.c:386
+#: ../src/gtk-rig-ctrl.c:391
msgid "<b> Downlink </b>"
msgstr "<b> Downlink </b>"
#. Downlink doppler
#. Uplink doppler
-#: ../src/gtk-rig-ctrl.c:401 ../src/gtk-rig-ctrl.c:466
+#: ../src/gtk-rig-ctrl.c:406 ../src/gtk-rig-ctrl.c:471
msgid "Doppler:"
msgstr "Doppler:"
-#: ../src/gtk-rig-ctrl.c:403 ../src/gtk-rig-ctrl.c:468
+#: ../src/gtk-rig-ctrl.c:408 ../src/gtk-rig-ctrl.c:473
msgid ""
"The Doppler shift according to the range rate and the currently selected "
"downlink frequency"
@@ -457,24 +457,24 @@
"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
+#: ../src/gtk-rig-ctrl.c:420 ../src/gtk-rig-ctrl.c:485
msgid "LO:"
msgstr "LO:"
-#: ../src/gtk-rig-ctrl.c:451
+#: ../src/gtk-rig-ctrl.c:456
msgid "<b> Uplink </b>"
msgstr "<b> Uplink </b>"
-#: ../src/gtk-rig-ctrl.c:531 ../src/gtk-rot-ctrl.c:420
+#: ../src/gtk-rig-ctrl.c:536 ../src/gtk-rot-ctrl.c:424
msgid "Select target object"
msgstr "Select target object"
#. tracking button
-#: ../src/gtk-rig-ctrl.c:536 ../src/gtk-rot-ctrl.c:425
+#: ../src/gtk-rig-ctrl.c:541 ../src/gtk-rot-ctrl.c:429
msgid "Track"
msgstr "Track"
-#: ../src/gtk-rig-ctrl.c:537
+#: ../src/gtk-rig-ctrl.c:542
msgid ""
"Track the satellite transponder.\n"
"Enabling this button will apply Dopper correction to the frequency of the "
@@ -484,16 +484,16 @@
"Enabling this button will apply Dopper correction to the frequency of the "
"radio."
-#: ../src/gtk-rig-ctrl.c:545
+#: ../src/gtk-rig-ctrl.c:550
msgid "Select a transponder"
msgstr "Select a transponder"
#. buttons
-#: ../src/gtk-rig-ctrl.c:552
+#: ../src/gtk-rig-ctrl.c:557
msgid "T"
msgstr "T"
-#: ../src/gtk-rig-ctrl.c:554
+#: ../src/gtk-rig-ctrl.c:559
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 "
@@ -503,11 +503,11 @@
"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
+#: ../src/gtk-rig-ctrl.c:565
msgid "L"
msgstr "L"
-#: ../src/gtk-rig-ctrl.c:562
+#: ../src/gtk-rig-ctrl.c:567
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 "
@@ -528,45 +528,45 @@
"setting the new uplink frequency."
#. Azimuth
-#: ../src/gtk-rig-ctrl.c:581 ../src/gtk-rot-ctrl.c:431
+#: ../src/gtk-rig-ctrl.c:586 ../src/gtk-rot-ctrl.c:435
msgid "Az:"
msgstr "Az:"
#. Elevation
-#: ../src/gtk-rig-ctrl.c:589 ../src/gtk-rot-ctrl.c:441
+#: ../src/gtk-rig-ctrl.c:594 ../src/gtk-rot-ctrl.c:445
msgid "El:"
msgstr "El:"
#. Range
-#: ../src/gtk-rig-ctrl.c:597
+#: ../src/gtk-rig-ctrl.c:602
msgid " Range:"
msgstr " Range:"
-#: ../src/gtk-rig-ctrl.c:605 ../src/gtk-rig-ctrl.c:608
+#: ../src/gtk-rig-ctrl.c:610 ../src/gtk-rig-ctrl.c:613
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
+#: ../src/gtk-rig-ctrl.c:617
msgid " Rate:"
msgstr " Rate:"
-#: ../src/gtk-rig-ctrl.c:620 ../src/gtk-rig-ctrl.c:623
+#: ../src/gtk-rig-ctrl.c:625 ../src/gtk-rig-ctrl.c:628
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
+#: ../src/gtk-rig-ctrl.c:631 ../src/gtk-rot-ctrl.c:461
msgid "Target"
msgstr "Target"
#. Primary device
-#: ../src/gtk-rig-ctrl.c:654
+#: ../src/gtk-rig-ctrl.c:659
msgid "1. Device:"
msgstr "1. Device:"
-#: ../src/gtk-rig-ctrl.c:659
+#: ../src/gtk-rig-ctrl.c:664
msgid ""
"Select primary radio device.This device will be used for downlink and uplink "
"unless you select a secondary device for uplink"
@@ -574,9 +574,9 @@
"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:681 ../src/gtk-rig-ctrl.c:724
-#: ../src/gtk-rig-ctrl.c:2360 ../src/gtk-rot-ctrl.c:509
-#: ../src/gtk-rot-ctrl.c:1221 ../src/sat-pref-rig.c:300
+#: ../src/gtk-rig-ctrl.c:686 ../src/gtk-rig-ctrl.c:729
+#: ../src/gtk-rig-ctrl.c:2397 ../src/gtk-rot-ctrl.c:513
+#: ../src/gtk-rot-ctrl.c:1240 ../src/sat-pref-rig.c:300
#: ../src/sat-pref-rot.c:266
#, c-format
msgid "%s:%d: Failed to open hwconf dir (%s)"
@@ -584,11 +584,11 @@
#. config will be force-loaded after LO spin is created
#. Secondary device
-#: ../src/gtk-rig-ctrl.c:694
+#: ../src/gtk-rig-ctrl.c:699
msgid "2. Device:"
msgstr "2. Device:"
-#: ../src/gtk-rig-ctrl.c:699
+#: ../src/gtk-rig-ctrl.c:704
msgid ""
"Select secondary radio device\n"
"This device will be used for uplink"
@@ -597,42 +597,42 @@
"This device will be used for uplink"
#. load config
-#: ../src/gtk-rig-ctrl.c:703 ../src/sat-pref-rig.c:747
+#: ../src/gtk-rig-ctrl.c:708 ../src/sat-pref-rig.c:747
#: ../src/sat-pref-rig.c:756 ../src/sat-pref-rig-editor.c:237
msgid "None"
msgstr "None"
#. Engage button
-#: ../src/gtk-rig-ctrl.c:739 ../src/gtk-rot-ctrl.c:522
+#: ../src/gtk-rig-ctrl.c:744 ../src/gtk-rot-ctrl.c:526
msgid "Engage"
msgstr "Engage"
-#: ../src/gtk-rig-ctrl.c:740
+#: ../src/gtk-rig-ctrl.c:745
msgid "Engage the selected radio device"
msgstr "Engage the selected radio device"
#. Timeout
-#: ../src/gtk-rig-ctrl.c:748 ../src/gtk-rot-ctrl.c:528
+#: ../src/gtk-rig-ctrl.c:753 ../src/gtk-rot-ctrl.c:532
msgid "Cycle:"
msgstr "Cycle:"
-#: ../src/gtk-rig-ctrl.c:755
+#: ../src/gtk-rig-ctrl.c:760
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:762 ../src/gtk-rot-ctrl.c:542
+#: ../src/gtk-rig-ctrl.c:767 ../src/gtk-rot-ctrl.c:546
msgid "msec"
msgstr "msec"
-#: ../src/gtk-rig-ctrl.c:766 ../src/gtk-rot-ctrl.c:571
+#: ../src/gtk-rig-ctrl.c:771 ../src/gtk-rot-ctrl.c:575
msgid "Settings"
msgstr "Settings"
-#: ../src/gtk-rig-ctrl.c:783
+#: ../src/gtk-rig-ctrl.c:788
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:785
+#: ../src/gtk-rig-ctrl.c:790
msgid ""
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
@@ -640,235 +640,235 @@
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
-#: ../src/gtk-rig-ctrl.c:834 ../src/gtk-rot-ctrl.c:634
+#: ../src/gtk-rig-ctrl.c:839 ../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:871
+#: ../src/gtk-rig-ctrl.c:876
#, 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:1003
+#: ../src/gtk-rig-ctrl.c:1008
#, c-format
msgid "%s:%s: Primary device selected: %d"
msgstr "%s:%s: Primary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1017 ../src/gtk-rig-ctrl.c:2448
+#: ../src/gtk-rig-ctrl.c:1022 ../src/gtk-rig-ctrl.c:2485
#, 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:1026 ../src/gtk-rig-ctrl.c:1127
+#: ../src/gtk-rig-ctrl.c:1031 ../src/gtk-rig-ctrl.c:1132
#, 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:1029 ../src/gtk-rig-ctrl.c:1034
-#: ../src/gtk-rig-ctrl.c:1086 ../src/gtk-rig-ctrl.c:1102
-#: ../src/gtk-rig-ctrl.c:1130
+#: ../src/gtk-rig-ctrl.c:1034 ../src/gtk-rig-ctrl.c:1039
+#: ../src/gtk-rig-ctrl.c:1091 ../src/gtk-rig-ctrl.c:1107
+#: ../src/gtk-rig-ctrl.c:1135
#, c-format
msgid "%.0f MHz"
msgstr "%.0f MHz"
-#: ../src/gtk-rig-ctrl.c:1041 ../src/gtk-rig-ctrl.c:1136
+#: ../src/gtk-rig-ctrl.c:1046 ../src/gtk-rig-ctrl.c:1141
#, 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:1070
+#: ../src/gtk-rig-ctrl.c:1075
#, c-format
msgid "%s:%s: Secondary device selected: %d"
msgstr "%s:%s: Secondary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1118
+#: ../src/gtk-rig-ctrl.c:1123
#, 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:1174 ../src/gtk-rot-ctrl.c:776
+#: ../src/gtk-rig-ctrl.c:1179 ../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:1264 ../src/gtk-rot-ctrl.c:804
+#: ../src/gtk-rig-ctrl.c:1269 ../src/gtk-rot-ctrl.c:808
#, c-format
msgid "%s missed the deadline"
msgstr "%s missed the deadline"
-#: ../src/gtk-rig-ctrl.c:1296
+#: ../src/gtk-rig-ctrl.c:1299
#, 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:1310 ../src/gtk-rot-ctrl.c:893
+#: ../src/gtk-rig-ctrl.c:1313 ../src/gtk-rot-ctrl.c:895
#, 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:1828 ../src/gtk-rig-ctrl.c:2017
-#: ../src/gtk-rot-ctrl.c:961 ../src/gtk-rot-ctrl.c:1070
+#: ../src/gtk-rig-ctrl.c:1831 ../src/gtk-rig-ctrl.c:2037
+#: ../src/gtk-rot-ctrl.c:963 ../src/gtk-rot-ctrl.c:1084
#, c-format
msgid "%s:%d: Failed to create socket"
msgstr "%s:%d: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1834 ../src/gtk-rig-ctrl.c:2023
-#: ../src/gtk-rot-ctrl.c:967 ../src/gtk-rot-ctrl.c:1076
+#: ../src/gtk-rig-ctrl.c:1837 ../src/gtk-rig-ctrl.c:2043
+#: ../src/gtk-rot-ctrl.c:969 ../src/gtk-rot-ctrl.c:1090
#, c-format
msgid "%s:%d Network socket created successfully"
msgstr "%s:%d Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1848 ../src/gtk-rig-ctrl.c:2037
-#: ../src/gtk-rot-ctrl.c:981 ../src/gtk-rot-ctrl.c:1090
+#: ../src/gtk-rig-ctrl.c:1851 ../src/gtk-rig-ctrl.c:2057
+#: ../src/gtk-rot-ctrl.c:983 ../src/gtk-rot-ctrl.c:1104
#, 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:1854 ../src/gtk-rig-ctrl.c:2043
-#: ../src/gtk-rot-ctrl.c:987 ../src/gtk-rot-ctrl.c:1096
+#: ../src/gtk-rig-ctrl.c:1857 ../src/gtk-rig-ctrl.c:2063
+#: ../src/gtk-rot-ctrl.c:989 ../src/gtk-rot-ctrl.c:1110
#, c-format
msgid "%s:%d: Connection opened to %s:%d"
msgstr "%s:%d: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1872 ../src/gtk-rig-ctrl.c:2054
-#: ../src/gtk-rot-ctrl.c:998 ../src/gtk-rot-ctrl.c:1109
+#: ../src/gtk-rig-ctrl.c:1875 ../src/gtk-rig-ctrl.c:2074
+#: ../src/gtk-rot-ctrl.c:1000 ../src/gtk-rot-ctrl.c:1123
#, c-format
msgid "%s:%d: SIZE ERROR %d / %d"
msgstr "%s:%d: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:1882 ../src/gtk-rig-ctrl.c:2064
-#: ../src/gtk-rot-ctrl.c:1008
+#: ../src/gtk-rig-ctrl.c:1885 ../src/gtk-rig-ctrl.c:2084
+#: ../src/gtk-rot-ctrl.c:1010
#, 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:1892 ../src/gtk-rig-ctrl.c:2074
+#: ../src/gtk-rig-ctrl.c:1901 ../src/gtk-rig-ctrl.c:2100
#, c-format
msgid "%s:%s: Got 0 bytes from rigctld"
msgstr "%s:%s: Got 0 bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1897 ../src/gtk-rig-ctrl.c:2079
+#: ../src/gtk-rig-ctrl.c:1906 ../src/gtk-rig-ctrl.c:2105
#, c-format
msgid "%s:%s: Read %d bytes from rigctld"
msgstr "%s:%s: Read %d bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1940 ../src/gtk-rig-ctrl.c:2117
+#: ../src/gtk-rig-ctrl.c:1954 ../src/gtk-rig-ctrl.c:2148
#, c-format
msgid "%s: Failed to create socket"
msgstr "%s: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1946 ../src/gtk-rig-ctrl.c:2123
+#: ../src/gtk-rig-ctrl.c:1960 ../src/gtk-rig-ctrl.c:2154
#, c-format
msgid "%s: Network socket created successfully"
msgstr "%s: Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1960 ../src/gtk-rig-ctrl.c:2137
+#: ../src/gtk-rig-ctrl.c:1974 ../src/gtk-rig-ctrl.c:2168
#, c-format
msgid "%s: Failed to connect to %s:%d"
msgstr "%s: Failed to connect to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1966 ../src/gtk-rig-ctrl.c:2143
+#: ../src/gtk-rig-ctrl.c:1980 ../src/gtk-rig-ctrl.c:2174
#, c-format
msgid "%s: Connection opened to %s:%d"
msgstr "%s: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1977 ../src/gtk-rig-ctrl.c:2182
+#: ../src/gtk-rig-ctrl.c:1991 ../src/gtk-rig-ctrl.c:2213
#, c-format
msgid "%s: SIZE ERROR %d / %d"
msgstr "%s: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:2008 ../src/gtk-rot-ctrl.c:952
+#: ../src/gtk-rig-ctrl.c:2028 ../src/gtk-rot-ctrl.c:954
#, c-format
msgid "%s:%d: NULL storage."
msgstr "%s:%d: NULL storage."
-#: ../src/gtk-rig-ctrl.c:2171
+#: ../src/gtk-rig-ctrl.c:2202
#, c-format
msgid "%s: Invalid VFO argument. Using VFOA."
msgstr "%s: Invalid VFO argument. Using VFOA."
-#: ../src/gtk-rig-ctrl.c:2215
+#: ../src/gtk-rig-ctrl.c:2252
#, c-format
msgid "AOS in"
msgstr "AOS in"
-#: ../src/gtk-rig-ctrl.c:2219
+#: ../src/gtk-rig-ctrl.c:2256
#, c-format
msgid "LOS in"
msgstr "LOS in"
-#: ../src/gtk-rig-ctrl.c:2302
+#: ../src/gtk-rig-ctrl.c:2339
#, c-format
msgid "%s:%s: GtkSatModule has no target satellite."
msgstr "%s:%s: GtkSatModule has no target satellite."
-#: ../src/gtk-rig-ctrl.c:2314
+#: ../src/gtk-rig-ctrl.c:2351
#, 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:2325
+#: ../src/gtk-rig-ctrl.c:2362
#, 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:2460
+#: ../src/gtk-rig-ctrl.c:2497
#, 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/gtk-rot-ctrl.c:332 ../src/gtk-sat-list.c:85
#: ../src/gtk-single-sat.c:56 ../src/sat-pass-dialogs.c:125
msgid "Azimuth"
msgstr "Azimuth"
-#: ../src/gtk-rot-ctrl.c:340
+#: ../src/gtk-rot-ctrl.c:344
msgid "Read:"
msgstr "Read:"
-#: ../src/gtk-rot-ctrl.c:367 ../src/gtk-sat-list.c:86
+#: ../src/gtk-rot-ctrl.c:371 ../src/gtk-sat-list.c:86
#: ../src/gtk-single-sat.c:57 ../src/sat-pass-dialogs.c:126
msgid "Elevation"
msgstr "Elevation"
-#: ../src/gtk-rot-ctrl.c:379
+#: ../src/gtk-rot-ctrl.c:383
msgid "Read: "
msgstr "Read: "
-#: ../src/gtk-rot-ctrl.c:426
+#: ../src/gtk-rot-ctrl.c:430
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
+#: ../src/gtk-rot-ctrl.c:454
msgid "ΔT:"
msgstr "ΔT:"
-#: ../src/gtk-rot-ctrl.c:484
+#: ../src/gtk-rot-ctrl.c:488
msgid "Device:"
msgstr "Device:"
-#: ../src/gtk-rot-ctrl.c:489
+#: ../src/gtk-rot-ctrl.c:493
msgid "Select antenna rotator device"
msgstr "Select antenna rotator device"
-#: ../src/gtk-rot-ctrl.c:523
+#: ../src/gtk-rot-ctrl.c:527
msgid "Engage the selected rotor device"
msgstr "Engage the selected rotor device"
-#: ../src/gtk-rot-ctrl.c:535
+#: ../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:547
+#: ../src/gtk-rot-ctrl.c:551
msgid "Tolerance:"
msgstr "Tolerance:"
-#: ../src/gtk-rot-ctrl.c:554
+#: ../src/gtk-rot-ctrl.c:558
msgid ""
"This parameter controls the tolerance between the target and rotator values "
"for the rotator.\n"
@@ -880,37 +880,37 @@
"If the difference between the target and rotator values is smaller than the "
"tolerance, no new commands are sent"
-#: ../src/gtk-rot-ctrl.c:564
+#: ../src/gtk-rot-ctrl.c:568
msgid "deg"
msgstr "deg"
-#: ../src/gtk-rot-ctrl.c:725
+#: ../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:734
+#: ../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:743
+#: ../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:864 ../src/gtk-rot-ctrl.c:865
-#: ../src/gtk-sat-module-popup.c:896 ../src/gtk-sat-module-popup.c:969
+#: ../src/gtk-rot-ctrl.c:866 ../src/gtk-rot-ctrl.c:867
+#: ../src/gtk-sat-module-popup.c:894 ../src/gtk-sat-module-popup.c:967
#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERROR"
-#: ../src/gtk-rot-ctrl.c:1018
+#: ../src/gtk-rot-ctrl.c:1026
#, c-format
msgid "%s:%s: Got 0 bytes from rotctld"
msgstr "%s:%s: Got 0 bytes from rotctld"
-#: ../src/gtk-rot-ctrl.c:1023
+#: ../src/gtk-rot-ctrl.c:1031
#, c-format
msgid "%s:%s: Read %d bytes from rotctld"
msgstr "%s:%s: Read %d bytes from rotctld"
@@ -1142,7 +1142,7 @@
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/gtk-sat-list.c:952 ../src/sat-pass-dialogs.c:702
#: ../src/sat-pref-qth.c:769
#, c-format
msgid "%s:%d: Invalid column: %d"
@@ -1158,7 +1158,8 @@
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
+#: ../src/gtk-sat-list.c:1307 ../src/sat-pass-dialogs.c:1421
+#: ../src/sat-pass-dialogs.c:1470
#, c-format
msgid "%s:%d: There is no selection; skip popup."
msgstr "%s:%d: There is no selection; skip popup."
@@ -1342,28 +1343,28 @@
msgid "%s: Read %d out of %d satellites"
msgstr "%s: Read %d out of %d satellites"
-#: ../src/gtk-sat-module.c:772
+#: ../src/gtk-sat-module.c:796
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr "%s: Previous cycle missed it's deadline."
-#: ../src/gtk-sat-module.c:916 ../src/gtk-sat-module.c:1548
+#: ../src/gtk-sat-module.c:910 ../src/gtk-sat-module.c:1541
#, c-format
msgid "%f:%d: Unknown child type"
msgstr "%f:%d: Unknown child type"
-#: ../src/gtk-sat-module.c:1076
+#: ../src/gtk-sat-module.c:1070
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr "%s: Module %s recevied CLOSE signal."
-#: ../src/gtk-sat-module.c:1086
+#: ../src/gtk-sat-module.c:1080
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr "%s: Module %s is in DOCKED state."
-#: ../src/gtk-sat-module.c:1093 ../src/gtk-sat-module.c:1109
-#: ../src/gtk-sat-module.c:1137
+#: ../src/gtk-sat-module.c:1087 ../src/gtk-sat-module.c:1103
+#: ../src/gtk-sat-module.c:1131
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
@@ -1372,32 +1373,32 @@
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
-#: ../src/gtk-sat-module.c:1102
+#: ../src/gtk-sat-module.c:1096
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr "%s: Module %s is in WINDOW state."
-#: ../src/gtk-sat-module.c:1130
+#: ../src/gtk-sat-module.c:1124
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr "%s: Module %s is in FULLSCREEN state."
-#: ../src/gtk-sat-module.c:1159 ../src/gtk-sat-module.c:1326
+#: ../src/gtk-sat-module.c:1153 ../src/gtk-sat-module.c:1320
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr "%s: Module %s has unknown state: %d"
-#: ../src/gtk-sat-module.c:1168
+#: ../src/gtk-sat-module.c:1162
#, c-format
msgid "%s: Module %s closed."
msgstr "%s: Module %s closed."
-#: ../src/gtk-sat-module.c:1209
+#: ../src/gtk-sat-module.c:1203
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr "%s: Module %s recevied CONFIG signal."
-#: ../src/gtk-sat-module.c:1218
+#: ../src/gtk-sat-module.c:1212
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
@@ -1406,12 +1407,12 @@
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
-#: ../src/gtk-sat-module.c:1236
+#: ../src/gtk-sat-module.c:1230
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr "%s: Module configuration failed for some reason."
-#: ../src/gtk-sat-module.c:1494
+#: ../src/gtk-sat-module.c:1488
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr "%s: Reloading satellites for module %s"
@@ -1561,7 +1562,7 @@
msgid "The sky at a glance (%s)"
msgstr "The sky at a glance (%s)"
-#: ../src/gtk-sat-module-popup.c:891
+#: ../src/gtk-sat-module-popup.c:889
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
@@ -1569,12 +1570,12 @@
"You have no radio configuration!\n"
"Please configure a radio first."
-#: ../src/gtk-sat-module-popup.c:904
+#: ../src/gtk-sat-module-popup.c:902
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr "Gpredict Radio Control: %s"
-#: ../src/gtk-sat-module-popup.c:964
+#: ../src/gtk-sat-module-popup.c:962
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
@@ -1582,12 +1583,12 @@
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
-#: ../src/gtk-sat-module-popup.c:977
+#: ../src/gtk-sat-module-popup.c:975
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr "Gpredict Rotator Control: %s"
-#: ../src/gtk-sat-module-popup.c:1062
+#: ../src/gtk-sat-module-popup.c:1060
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1600,12 +1601,12 @@
"from the disk.\n"
"Do you you want to proceed?"
-#: ../src/gtk-sat-module-popup.c:1072
+#: ../src/gtk-sat-module-popup.c:1070
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr "%s:%d: Failed to delete %s."
-#: ../src/gtk-sat-module-popup.c:1077
+#: ../src/gtk-sat-module-popup.c:1075
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr "%s:%d: %s deleted permanently."
@@ -2086,11 +2087,11 @@
msgid "%s: No selection found!"
msgstr "%s: No selection found!"
-#: ../src/main.c:60
+#: ../src/main.c:64
msgid "just to have a pot"
msgstr "just to have a pot"
-#: ../src/main.c:112
+#: ../src/main.c:120
#, fuzzy, c-format
msgid ""
"%s: User config check failed (code %d). This is fatal.\n"
@@ -2101,22 +2102,22 @@
"A possible solution would be to remove the .gpredict2 data dir\n"
"in your home directory"
-#: ../src/main.c:413
+#: ../src/main.c:468
#, c-format
msgid "%s: Time threshold has been passed."
msgstr "%s: Time threshold has been passed."
-#: ../src/main.c:421
+#: ../src/main.c:476
#, c-format
msgid "%s: Starting new update thread."
msgstr "%s: Starting new update thread."
-#: ../src/main.c:431
+#: ../src/main.c:484
#, c-format
msgid "%s: Failed to create TLE update thread (%s)"
msgstr "%s: Failed to create TLE update thread (%s)"
-#: ../src/main.c:441
+#: ../src/main.c:494
msgid ""
"Your TLE files are getting out of date.\n"
"You can update them by selecting\n"
@@ -2128,7 +2129,7 @@
"<b>Edit -> Update TLE</b>\n"
"in the menubar."
-#: ../src/main.c:472
+#: ../src/main.c:525
#, c-format
msgid "%s: Could not find TLE monitoring task (ID = %d)"
msgstr "%s: Could not find TLE monitoring task (ID = %d)"
@@ -2277,8 +2278,8 @@
msgstr "Show online user manual, Getting Started Section"
#: ../src/menubar.c:137
-msgid "User Manual"
-msgstr "User Manual"
+msgid "Online help"
+msgstr ""
#: ../src/menubar.c:138
msgid "Show online user manual"
@@ -2400,17 +2401,24 @@
msgid "This function is still under development."
msgstr "This function is still under development."
-#: ../src/menubar.c:832
+#: ../src/menubar.c:776
+msgid ""
+"A comprehensive PDF user manual and \n"
+"video tutorials are available from the \n"
+"Gpredict website:"
+msgstr ""
+
+#: ../src/menubar.c:850
#, c-format
msgid "%s:%s: Scanning directory %s for modules."
msgstr "%s:%s: Scanning directory %s for modules."
-#: ../src/menubar.c:855
+#: ../src/menubar.c:873
#, 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:870
+#: ../src/menubar.c:888
msgid ""
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
@@ -2418,21 +2426,21 @@
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
-#: ../src/menubar.c:888
+#: ../src/menubar.c:906
msgid "Module"
msgstr "Module"
#. create dialog
-#: ../src/menubar.c:896
+#: ../src/menubar.c:914
msgid "Select a module"
msgstr "Select a module"
-#: ../src/menubar.c:923
+#: ../src/menubar.c:941
#, c-format
msgid "%s:%s: Selected module is: %s"
msgstr "%s:%s: Selected module is: %s"
-#: ../src/menubar.c:928
+#: ../src/menubar.c:946
#, c-format
msgid "%s:%s: No selection is list of modules."
msgstr "%s:%s: No selection is list of modules."
@@ -3545,31 +3553,31 @@
msgid "Visibility during pass"
msgstr "Visibility during pass"
-#: ../src/sat-pass-dialogs.c:456
+#: ../src/sat-pass-dialogs.c:458
msgid "Data"
msgstr "Data"
-#: ../src/sat-pass-dialogs.c:467
+#: ../src/sat-pass-dialogs.c:469
msgid "Polar"
msgstr "Polar"
-#: ../src/sat-pass-dialogs.c:478
+#: ../src/sat-pass-dialogs.c:480
msgid "Az/El"
msgstr "Az/El"
#. create dialog
-#: ../src/sat-pass-dialogs.c:484
+#: ../src/sat-pass-dialogs.c:486
#, c-format
msgid "Pass details for %s (orbit %d)"
msgstr "Pass details for %s (orbit %d)"
-#: ../src/sat-pass-dialogs.c:547 ../src/sat-pass-dialogs.c:1152
+#: ../src/sat-pass-dialogs.c:549 ../src/sat-pass-dialogs.c:1161
#, c-format
msgid "%s: PRINT not implemented"
msgstr "%s: PRINT not implemented"
#. create dialog
-#: ../src/sat-pass-dialogs.c:1091
+#: ../src/sat-pass-dialogs.c:1100
#, c-format
msgid "Upcoming passes for %s"
msgstr "Upcoming passes for %s"
@@ -5224,12 +5232,17 @@
msgid "%s: NULL output storage!"
msgstr "%s: NULL output storage!"
-#: ../src/tle-update.c:134 ../src/tle-update.c:202
+#: ../src/tle-update.c:127 ../src/tle-update.c:527
#, c-format
+msgid "%s: A TLE update process is already running. Aborting."
+msgstr ""
+
+#: ../src/tle-update.c:144 ../src/tle-update.c:212
+#, c-format
msgid "%s: Error opening directory %s (%s)"
msgstr "%s: Error opening directory %s (%s)"
-#: ../src/tle-update.c:139 ../src/tle-update.c:207
+#: ../src/tle-update.c:149 ../src/tle-update.c:217
#, c-format
msgid ""
"<b>ERROR</b> opening directory %s\n"
@@ -5238,26 +5251,26 @@
"<b>ERROR</b> opening directory %s\n"
"%s"
-#: ../src/tle-update.c:157
+#: ../src/tle-update.c:167
#, c-format
msgid "Reading data from %s"
msgstr "Reading data from %s"
-#: ../src/tle-update.c:177
+#: ../src/tle-update.c:187
#, c-format
msgid "%s: No valid TLE data found in %s"
msgstr "%s: No valid TLE data found in %s"
-#: ../src/tle-update.c:182
+#: ../src/tle-update.c:192
#, c-format
msgid "%s: Read %d sats from %s into memory"
msgstr "%s: Read %d sats from %s into memory"
-#: ../src/tle-update.c:268
+#: ../src/tle-update.c:278
msgid "Updating data..."
msgstr "Updating data..."
-#: ../src/tle-update.c:272
+#: ../src/tle-update.c:282
#, c-format
msgid ""
"Satellites updated:\t %d\n"
@@ -5268,7 +5281,7 @@
"Satellites skipped:\t %d\n"
"Missing Satellites:\t %d\n"
-#: ../src/tle-update.c:316
+#: ../src/tle-update.c:326
#, c-format
msgid ""
"Satellites updated:\t %d\n"
@@ -5281,123 +5294,133 @@
"Missing Satellites:\t %d\n"
"New Satellites:\t\t %d"
-#: ../src/tle-update.c:327
+#: ../src/tle-update.c:337
#, c-format
msgid "%s: Added %d new satellites to local database"
msgstr "%s: Added %d new satellites to local database"
-#: ../src/tle-update.c:344
+#: ../src/tle-update.c:354
#, c-format
msgid "%s: TLE elements updated."
msgstr "%s: TLE elements updated."
-#: ../src/tle-update.c:400
+#: ../src/tle-update.c:411
#, fuzzy, c-format
msgid "%s: Error writing satellite data for %d (%s)."
msgstr "%s: Error writing config data (%s)."
-#: ../src/tle-update.c:406
+#: ../src/tle-update.c:417
#, fuzzy, c-format
msgid "%s: Wrote only %d out of %d chars for satellite data %d."
msgstr "%s: Wrote only %d out of %d chars."
-#: ../src/tle-update.c:411
+#: ../src/tle-update.c:422
#, fuzzy, c-format
msgid "%s: Data for new sat %d successfully added."
msgstr "%s: Network socket created successfully"
-#: ../src/tle-update.c:437
+#: ../src/tle-update.c:448
#, fuzzy, c-format
msgid "%s: Could not open category file file %s (%s)."
msgstr "%s: Could not create file %s (%s)"
-#: ../src/tle-update.c:450
+#: ../src/tle-update.c:461
#, fuzzy, c-format
msgid "%s: Error adding %d to %s (%s)."
msgstr "%s: Error reading %s (%s)"
-#: ../src/tle-update.c:456
+#: ../src/tle-update.c:467
#, fuzzy, c-format
msgid "%s: Added satellite %d to %s."
msgstr "%s: Reloading satellites for module %s"
-#: ../src/tle-update.c:529
+#: ../src/tle-update.c:545
#, c-format
msgid "%s: No files to fetch from network."
msgstr "%s: No files to fetch from network."
-#: ../src/tle-update.c:535
+#: ../src/tle-update.c:551
msgid "No files to fetch from network"
msgstr "No files to fetch from network"
-#: ../src/tle-update.c:562
+#: ../src/tle-update.c:578
#, c-format
msgid "Fetching %s"
msgstr "Fetching %s"
-#: ../src/tle-update.c:588
+#: ../src/tle-update.c:604
#, c-format
msgid "%s: Error fetching %s (%s)"
msgstr "%s: Error fetching %s (%s)"
-#: ../src/tle-update.c:594
+#: ../src/tle-update.c:610
#, c-format
msgid "%s: Successfully fetched %s"
msgstr "%s: Successfully fetched %s"
-#: ../src/tle-update.c:646
+#: ../src/tle-update.c:641
+#, fuzzy, c-format
+msgid "%s: Fetched %d files from network; updating..."
+msgstr "%s: Removed %s from notebook page %d."
+
+#: ../src/tle-update.c:651
#, c-format
+msgid "%s: Could not fetch any new TLE files from network; aborting..."
+msgstr ""
+
+#: ../src/tle-update.c:671
+#, c-format
msgid "%s: Error opening %s (%s)"
msgstr "%s: Error opening %s (%s)"
-#: ../src/tle-update.c:762
+#: ../src/tle-update.c:764 ../src/tle-update.c:846 ../src/tle-update.c:859
#, c-format
+msgid "%s:%s: Failed to open %s"
+msgstr "%s:%s: Failed to open %s"
+
+#: ../src/tle-update.c:798
+#, c-format
msgid "%s:%s: Invalid data for %d"
msgstr "%s:%s: Invalid data for %d"
-#: ../src/tle-update.c:815
-#, c-format
-msgid "%s:%s: Failed to open %s"
-msgstr "%s:%s: Failed to open %s"
-
-#: ../src/tle-update.c:874
+#: ../src/tle-update.c:918
#, fuzzy, c-format
msgid "%s: Error loading %s (%s)"
msgstr "%s: Error reading %s (%s)"
-#: ../src/tle-update.c:901
+#: ../src/tle-update.c:945
#, c-format
msgid "%s: No new TLE data found for %d. Satellite might be obsolete."
msgstr ""
-#: ../src/tle-update.c:915
+#: ../src/tle-update.c:959
#, fuzzy, c-format
msgid "%s: Current TLE data for %d appears to be bad"
msgstr "%s:%s: Original data for %d seems to be bad"
-#: ../src/tle-update.c:938
+#: ../src/tle-update.c:982
#, fuzzy, c-format
msgid "%s: Could not create satellite data file (%s)."
msgstr "%s: Could not create config data (%s)."
-#: ../src/tle-update.c:964
+#: ../src/tle-update.c:1008
#, fuzzy, c-format
msgid "%s: Satellite data written for %d."
msgstr "%s: Satellite #%d removed from list."
-#: ../src/tle-update.c:993
+#: ../src/tle-update.c:1037
msgid "Never"
msgstr "Never"
-#: ../src/tle-update.c:994
+#: ../src/tle-update.c:1038
msgid "Monthly"
msgstr "Monthly"
-#: ../src/tle-update.c:995
+#: ../src/tle-update.c:1039
msgid "Weekly"
msgstr "Weekly"
-#: ../src/tle-update.c:996
+#: ../src/tle-update.c:1040
msgid "Daily"
msgstr "Daily"
@@ -5438,6 +5461,9 @@
msgid "%s: Not implemented!"
msgstr "%s: Not implemented!"
+#~ msgid "User Manual"
+#~ msgstr "User Manual"
+
#, fuzzy
#~ msgid "%s: Copied %d files to %s"
#~ msgstr "%s: Copied sample.qth to %s/"
Modified: trunk/po/en_US.po
===================================================================
--- trunk/po/en_US.po 2009-11-06 23:24:00 UTC (rev 509)
+++ trunk/po/en_US.po 2009-11-06 23:29:49 UTC (rev 510)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-04 14:01+0200\n"
+"POT-Creation-Date: 2009-11-07 00:28+0100\n"
"PO-Revision-Date: 2009-08-05 00:53+0100\n"
"Last-Translator: Michael Stephenson <mic...@go...>\n"
"Language-Team: US English\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/about.c:62
+#: ../src/about.c:64
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
"Contact: oz9aec at googlemail.com\n"
@@ -68,12 +68,12 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:94 ../src/main.c:166 ../src/sat-log-browser.c:462
+#: ../src/about.c:96 ../src/main.c:221 ../src/sat-log-browser.c:462
#: ../src/sat-log.c:58
msgid "GPREDICT"
msgstr "GPREDICT"
-#: ../src/about.c:97
+#: ../src/about.c:99
#, fuzzy
msgid ""
"Copyright (C) 2001-2009 Alexandru Csete OZ9AEC\n"
@@ -84,7 +84,7 @@
"\n"
"Gpredict is available free of charge from:"
-#: ../src/about.c:114
+#: ../src/about.c:116
msgid "translator-credits"
msgstr "Michael Stephenson"
@@ -157,17 +157,17 @@
msgid "%s: %s.sat already exists. Skipped."
msgstr ""
-#: ../src/first-time.c:529 ../src/tle-update.c:389
+#: ../src/first-time.c:529 ../src/tle-update.c:400
#, fuzzy, c-format
msgid "%s: Could not create satellite file (%s)."
msgstr "%s: Could not create config file (%s)."
-#: ../src/first-time.c:546 ../src/tle-update.c:951
+#: ../src/first-time.c:546 ../src/tle-update.c:995
#, fuzzy, c-format
msgid "%s: Error writing satellite data (%s)."
msgstr "%s: Error writing config data (%s)."
-#: ../src/first-time.c:553 ../src/tle-update.c:958
+#: ../src/first-time.c:553 ../src/tle-update.c:1002
#, fuzzy, c-format
msgid "%s: Wrote only %d out of %d chars for satellite data."
msgstr "%s: Wrote only %d out of %d chars."
@@ -439,17 +439,17 @@
"Satellite %s has no passes for\n"
"the current ground station!"
-#: ../src/gtk-rig-ctrl.c:386
+#: ../src/gtk-rig-ctrl.c:391
msgid "<b> Downlink </b>"
msgstr "<b> Downlink </b>"
#. Downlink doppler
#. Uplink doppler
-#: ../src/gtk-rig-ctrl.c:401 ../src/gtk-rig-ctrl.c:466
+#: ../src/gtk-rig-ctrl.c:406 ../src/gtk-rig-ctrl.c:471
msgid "Doppler:"
msgstr "Doppler:"
-#: ../src/gtk-rig-ctrl.c:403 ../src/gtk-rig-ctrl.c:468
+#: ../src/gtk-rig-ctrl.c:408 ../src/gtk-rig-ctrl.c:473
msgid ""
"The Doppler shift according to the range rate and the currently selected "
"downlink frequency"
@@ -457,24 +457,24 @@
"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
+#: ../src/gtk-rig-ctrl.c:420 ../src/gtk-rig-ctrl.c:485
msgid "LO:"
msgstr "LO:"
-#: ../src/gtk-rig-ctrl.c:451
+#: ../src/gtk-rig-ctrl.c:456
msgid "<b> Uplink </b>"
msgstr "<b> Uplink </b>"
-#: ../src/gtk-rig-ctrl.c:531 ../src/gtk-rot-ctrl.c:420
+#: ../src/gtk-rig-ctrl.c:536 ../src/gtk-rot-ctrl.c:424
msgid "Select target object"
msgstr "Select target object"
#. tracking button
-#: ../src/gtk-rig-ctrl.c:536 ../src/gtk-rot-ctrl.c:425
+#: ../src/gtk-rig-ctrl.c:541 ../src/gtk-rot-ctrl.c:429
msgid "Track"
msgstr "Track"
-#: ../src/gtk-rig-ctrl.c:537
+#: ../src/gtk-rig-ctrl.c:542
msgid ""
"Track the satellite transponder.\n"
"Enabling this button will apply Dopper correction to the frequency of the "
@@ -484,16 +484,16 @@
"Enabling this button will apply Dopper correction to the frequency of the "
"radio."
-#: ../src/gtk-rig-ctrl.c:545
+#: ../src/gtk-rig-ctrl.c:550
msgid "Select a transponder"
msgstr "Select a transponder"
#. buttons
-#: ../src/gtk-rig-ctrl.c:552
+#: ../src/gtk-rig-ctrl.c:557
msgid "T"
msgstr "T"
-#: ../src/gtk-rig-ctrl.c:554
+#: ../src/gtk-rig-ctrl.c:559
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 "
@@ -503,11 +503,11 @@
"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
+#: ../src/gtk-rig-ctrl.c:565
msgid "L"
msgstr "L"
-#: ../src/gtk-rig-ctrl.c:562
+#: ../src/gtk-rig-ctrl.c:567
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 "
@@ -528,45 +528,45 @@
"setting the new uplink frequency."
#. Azimuth
-#: ../src/gtk-rig-ctrl.c:581 ../src/gtk-rot-ctrl.c:431
+#: ../src/gtk-rig-ctrl.c:586 ../src/gtk-rot-ctrl.c:435
msgid "Az:"
msgstr "Az:"
#. Elevation
-#: ../src/gtk-rig-ctrl.c:589 ../src/gtk-rot-ctrl.c:441
+#: ../src/gtk-rig-ctrl.c:594 ../src/gtk-rot-ctrl.c:445
msgid "El:"
msgstr "El:"
#. Range
-#: ../src/gtk-rig-ctrl.c:597
+#: ../src/gtk-rig-ctrl.c:602
msgid " Range:"
msgstr " Range:"
-#: ../src/gtk-rig-ctrl.c:605 ../src/gtk-rig-ctrl.c:608
+#: ../src/gtk-rig-ctrl.c:610 ../src/gtk-rig-ctrl.c:613
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
+#: ../src/gtk-rig-ctrl.c:617
msgid " Rate:"
msgstr " Rate:"
-#: ../src/gtk-rig-ctrl.c:620 ../src/gtk-rig-ctrl.c:623
+#: ../src/gtk-rig-ctrl.c:625 ../src/gtk-rig-ctrl.c:628
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
+#: ../src/gtk-rig-ctrl.c:631 ../src/gtk-rot-ctrl.c:461
msgid "Target"
msgstr "Target"
#. Primary device
-#: ../src/gtk-rig-ctrl.c:654
+#: ../src/gtk-rig-ctrl.c:659
msgid "1. Device:"
msgstr "1. Device:"
-#: ../src/gtk-rig-ctrl.c:659
+#: ../src/gtk-rig-ctrl.c:664
msgid ""
"Select primary radio device.This device will be used for downlink and uplink "
"unless you select a secondary device for uplink"
@@ -574,9 +574,9 @@
"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:681 ../src/gtk-rig-ctrl.c:724
-#: ../src/gtk-rig-ctrl.c:2360 ../src/gtk-rot-ctrl.c:509
-#: ../src/gtk-rot-ctrl.c:1221 ../src/sat-pref-rig.c:300
+#: ../src/gtk-rig-ctrl.c:686 ../src/gtk-rig-ctrl.c:729
+#: ../src/gtk-rig-ctrl.c:2397 ../src/gtk-rot-ctrl.c:513
+#: ../src/gtk-rot-ctrl.c:1240 ../src/sat-pref-rig.c:300
#: ../src/sat-pref-rot.c:266
#, c-format
msgid "%s:%d: Failed to open hwconf dir (%s)"
@@ -584,11 +584,11 @@
#. config will be force-loaded after LO spin is created
#. Secondary device
-#: ../src/gtk-rig-ctrl.c:694
+#: ../src/gtk-rig-ctrl.c:699
msgid "2. Device:"
msgstr "2. Device:"
-#: ../src/gtk-rig-ctrl.c:699
+#: ../src/gtk-rig-ctrl.c:704
msgid ""
"Select secondary radio device\n"
"This device will be used for uplink"
@@ -597,42 +597,42 @@
"This device will be used for uplink"
#. load config
-#: ../src/gtk-rig-ctrl.c:703 ../src/sat-pref-rig.c:747
+#: ../src/gtk-rig-ctrl.c:708 ../src/sat-pref-rig.c:747
#: ../src/sat-pref-rig.c:756 ../src/sat-pref-rig-editor.c:237
msgid "None"
msgstr "None"
#. Engage button
-#: ../src/gtk-rig-ctrl.c:739 ../src/gtk-rot-ctrl.c:522
+#: ../src/gtk-rig-ctrl.c:744 ../src/gtk-rot-ctrl.c:526
msgid "Engage"
msgstr "Engage"
-#: ../src/gtk-rig-ctrl.c:740
+#: ../src/gtk-rig-ctrl.c:745
msgid "Engage the selected radio device"
msgstr "Engage the selected radio device"
#. Timeout
-#: ../src/gtk-rig-ctrl.c:748 ../src/gtk-rot-ctrl.c:528
+#: ../src/gtk-rig-ctrl.c:753 ../src/gtk-rot-ctrl.c:532
msgid "Cycle:"
msgstr "Cycle:"
-#: ../src/gtk-rig-ctrl.c:755
+#: ../src/gtk-rig-ctrl.c:760
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:762 ../src/gtk-rot-ctrl.c:542
+#: ../src/gtk-rig-ctrl.c:767 ../src/gtk-rot-ctrl.c:546
msgid "msec"
msgstr "msec"
-#: ../src/gtk-rig-ctrl.c:766 ../src/gtk-rot-ctrl.c:571
+#: ../src/gtk-rig-ctrl.c:771 ../src/gtk-rot-ctrl.c:575
msgid "Settings"
msgstr "Settings"
-#: ../src/gtk-rig-ctrl.c:783
+#: ../src/gtk-rig-ctrl.c:788
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:785
+#: ../src/gtk-rig-ctrl.c:790
msgid ""
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
@@ -640,235 +640,235 @@
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
-#: ../src/gtk-rig-ctrl.c:834 ../src/gtk-rot-ctrl.c:634
+#: ../src/gtk-rig-ctrl.c:839 ../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:871
+#: ../src/gtk-rig-ctrl.c:876
#, 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:1003
+#: ../src/gtk-rig-ctrl.c:1008
#, c-format
msgid "%s:%s: Primary device selected: %d"
msgstr "%s:%s: Primary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1017 ../src/gtk-rig-ctrl.c:2448
+#: ../src/gtk-rig-ctrl.c:1022 ../src/gtk-rig-ctrl.c:2485
#, 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:1026 ../src/gtk-rig-ctrl.c:1127
+#: ../src/gtk-rig-ctrl.c:1031 ../src/gtk-rig-ctrl.c:1132
#, 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:1029 ../src/gtk-rig-ctrl.c:1034
-#: ../src/gtk-rig-ctrl.c:1086 ../src/gtk-rig-ctrl.c:1102
-#: ../src/gtk-rig-ctrl.c:1130
+#: ../src/gtk-rig-ctrl.c:1034 ../src/gtk-rig-ctrl.c:1039
+#: ../src/gtk-rig-ctrl.c:1091 ../src/gtk-rig-ctrl.c:1107
+#: ../src/gtk-rig-ctrl.c:1135
#, c-format
msgid "%.0f MHz"
msgstr "%.0f MHz"
-#: ../src/gtk-rig-ctrl.c:1041 ../src/gtk-rig-ctrl.c:1136
+#: ../src/gtk-rig-ctrl.c:1046 ../src/gtk-rig-ctrl.c:1141
#, 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:1070
+#: ../src/gtk-rig-ctrl.c:1075
#, c-format
msgid "%s:%s: Secondary device selected: %d"
msgstr "%s:%s: Secondary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1118
+#: ../src/gtk-rig-ctrl.c:1123
#, 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:1174 ../src/gtk-rot-ctrl.c:776
+#: ../src/gtk-rig-ctrl.c:1179 ../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:1264 ../src/gtk-rot-ctrl.c:804
+#: ../src/gtk-rig-ctrl.c:1269 ../src/gtk-rot-ctrl.c:808
#, c-format
msgid "%s missed the deadline"
msgstr "%s missed the deadline"
-#: ../src/gtk-rig-ctrl.c:1296
+#: ../src/gtk-rig-ctrl.c:1299
#, 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:1310 ../src/gtk-rot-ctrl.c:893
+#: ../src/gtk-rig-ctrl.c:1313 ../src/gtk-rot-ctrl.c:895
#, 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:1828 ../src/gtk-rig-ctrl.c:2017
-#: ../src/gtk-rot-ctrl.c:961 ../src/gtk-rot-ctrl.c:1070
+#: ../src/gtk-rig-ctrl.c:1831 ../src/gtk-rig-ctrl.c:2037
+#: ../src/gtk-rot-ctrl.c:963 ../src/gtk-rot-ctrl.c:1084
#, c-format
msgid "%s:%d: Failed to create socket"
msgstr "%s:%d: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1834 ../src/gtk-rig-ctrl.c:2023
-#: ../src/gtk-rot-ctrl.c:967 ../src/gtk-rot-ctrl.c:1076
+#: ../src/gtk-rig-ctrl.c:1837 ../src/gtk-rig-ctrl.c:2043
+#: ../src/gtk-rot-ctrl.c:969 ../src/gtk-rot-ctrl.c:1090
#, c-format
msgid "%s:%d Network socket created successfully"
msgstr "%s:%d Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1848 ../src/gtk-rig-ctrl.c:2037
-#: ../src/gtk-rot-ctrl.c:981 ../src/gtk-rot-ctrl.c:1090
+#: ../src/gtk-rig-ctrl.c:1851 ../src/gtk-rig-ctrl.c:2057
+#: ../src/gtk-rot-ctrl.c:983 ../src/gtk-rot-ctrl.c:1104
#, 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:1854 ../src/gtk-rig-ctrl.c:2043
-#: ../src/gtk-rot-ctrl.c:987 ../src/gtk-rot-ctrl.c:1096
+#: ../src/gtk-rig-ctrl.c:1857 ../src/gtk-rig-ctrl.c:2063
+#: ../src/gtk-rot-ctrl.c:989 ../src/gtk-rot-ctrl.c:1110
#, c-format
msgid "%s:%d: Connection opened to %s:%d"
msgstr "%s:%d: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1872 ../src/gtk-rig-ctrl.c:2054
-#: ../src/gtk-rot-ctrl.c:998 ../src/gtk-rot-ctrl.c:1109
+#: ../src/gtk-rig-ctrl.c:1875 ../src/gtk-rig-ctrl.c:2074
+#: ../src/gtk-rot-ctrl.c:1000 ../src/gtk-rot-ctrl.c:1123
#, c-format
msgid "%s:%d: SIZE ERROR %d / %d"
msgstr "%s:%d: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:1882 ../src/gtk-rig-ctrl.c:2064
-#: ../src/gtk-rot-ctrl.c:1008
+#: ../src/gtk-rig-ctrl.c:1885 ../src/gtk-rig-ctrl.c:2084
+#: ../src/gtk-rot-ctrl.c:1010
#, 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:1892 ../src/gtk-rig-ctrl.c:2074
+#: ../src/gtk-rig-ctrl.c:1901 ../src/gtk-rig-ctrl.c:2100
#, c-format
msgid "%s:%s: Got 0 bytes from rigctld"
msgstr "%s:%s: Got 0 bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1897 ../src/gtk-rig-ctrl.c:2079
+#: ../src/gtk-rig-ctrl.c:1906 ../src/gtk-rig-ctrl.c:2105
#, c-format
msgid "%s:%s: Read %d bytes from rigctld"
msgstr "%s:%s: Read %d bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1940 ../src/gtk-rig-ctrl.c:2117
+#: ../src/gtk-rig-ctrl.c:1954 ../src/gtk-rig-ctrl.c:2148
#, c-format
msgid "%s: Failed to create socket"
msgstr "%s: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1946 ../src/gtk-rig-ctrl.c:2123
+#: ../src/gtk-rig-ctrl.c:1960 ../src/gtk-rig-ctrl.c:2154
#, c-format
msgid "%s: Network socket created successfully"
msgstr "%s: Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1960 ../src/gtk-rig-ctrl.c:2137
+#: ../src/gtk-rig-ctrl.c:1974 ../src/gtk-rig-ctrl.c:2168
#, c-format
msgid "%s: Failed to connect to %s:%d"
msgstr "%s: Failed to connect to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1966 ../src/gtk-rig-ctrl.c:2143
+#: ../src/gtk-rig-ctrl.c:1980 ../src/gtk-rig-ctrl.c:2174
#, c-format
msgid "%s: Connection opened to %s:%d"
msgstr "%s: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1977 ../src/gtk-rig-ctrl.c:2182
+#: ../src/gtk-rig-ctrl.c:1991 ../src/gtk-rig-ctrl.c:2213
#, c-format
msgid "%s: SIZE ERROR %d / %d"
msgstr "%s: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:2008 ../src/gtk-rot-ctrl.c:952
+#: ../src/gtk-rig-ctrl.c:2028 ../src/gtk-rot-ctrl.c:954
#, c-format
msgid "%s:%d: NULL storage."
msgstr "%s:%d: NULL storage."
-#: ../src/gtk-rig-ctrl.c:2171
+#: ../src/gtk-rig-ctrl.c:2202
#, c-format
msgid "%s: Invalid VFO argument. Using VFOA."
msgstr "%s: Invalid VFO argument. Using VFOA."
-#: ../src/gtk-rig-ctrl.c:2215
+#: ../src/gtk-rig-ctrl.c:2252
#, c-format
msgid "AOS in"
msgstr "AOS in"
-#: ../src/gtk-rig-ctrl.c:2219
+#: ../src/gtk-rig-ctrl.c:2256
#, c-format
msgid "LOS in"
msgstr "LOS in"
-#: ../src/gtk-rig-ctrl.c:2302
+#: ../src/gtk-rig-ctrl.c:2339
#, c-format
msgid "%s:%s: GtkSatModule has no target satellite."
msgstr "%s:%s: GtkSatModule has no target satellite."
-#: ../src/gtk-rig-ctrl.c:2314
+#: ../src/gtk-rig-ctrl.c:2351
#, 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:2325
+#: ../src/gtk-rig-ctrl.c:2362
#, 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:2460
+#: ../src/gtk-rig-ctrl.c:2497
#, 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/gtk-rot-ctrl.c:332 ../src/gtk-sat-list.c:85
#: ../src/gtk-single-sat.c:56 ../src/sat-pass-dialogs.c:125
msgid "Azimuth"
msgstr "Azimuth"
-#: ../src/gtk-rot-ctrl.c:340
+#: ../src/gtk-rot-ctrl.c:344
msgid "Read:"
msgstr "Read:"
-#: ../src/gtk-rot-ctrl.c:367 ../src/gtk-sat-list.c:86
+#: ../src/gtk-rot-ctrl.c:371 ../src/gtk-sat-list.c:86
#: ../src/gtk-single-sat.c:57 ../src/sat-pass-dialogs.c:126
msgid "Elevation"
msgstr "Elevation"
-#: ../src/gtk-rot-ctrl.c:379
+#: ../src/gtk-rot-ctrl.c:383
msgid "Read: "
msgstr "Read: "
-#: ../src/gtk-rot-ctrl.c:426
+#: ../src/gtk-rot-ctrl.c:430
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
+#: ../src/gtk-rot-ctrl.c:454
msgid "ΔT:"
msgstr "ΔT:"
-#: ../src/gtk-rot-ctrl.c:484
+#: ../src/gtk-rot-ctrl.c:488
msgid "Device:"
msgstr "Device:"
-#: ../src/gtk-rot-ctrl.c:489
+#: ../src/gtk-rot-ctrl.c:493
msgid "Select antenna rotator device"
msgstr "Select antenna rotator device"
-#: ../src/gtk-rot-ctrl.c:523
+#: ../src/gtk-rot-ctrl.c:527
msgid "Engage the selected rotor device"
msgstr "Engage the selected rotor device"
-#: ../src/gtk-rot-ctrl.c:535
+#: ../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:547
+#: ../src/gtk-rot-ctrl.c:551
msgid "Tolerance:"
msgstr "Tolerance:"
-#: ../src/gtk-rot-ctrl.c:554
+#: ../src/gtk-rot-ctrl.c:558
msgid ""
"This parameter controls the tolerance between the target and rotator values "
"for the rotator.\n"
@@ -880,37 +880,37 @@
"If the difference between the target and rotator values is smaller than the "
"tolerance, no new commands are sent"
-#: ../src/gtk-rot-ctrl.c:564
+#: ../src/gtk-rot-ctrl.c:568
msgid "deg"
msgstr "deg"
-#: ../src/gtk-rot-ctrl.c:725
+#: ../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:734
+#: ../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:743
+#: ../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:864 ../src/gtk-rot-ctrl.c:865
-#: ../src/gtk-sat-module-popup.c:896 ../src/gtk-sat-module-popup.c:969
+#: ../src/gtk-rot-ctrl.c:866 ../src/gtk-rot-ctrl.c:867
+#: ../src/gtk-sat-module-popup.c:894 ../src/gtk-sat-module-popup.c:967
#: ../src/qth-data.c:94 ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERROR"
-#: ../src/gtk-rot-ctrl.c:1018
+#: ../src/gtk-rot-ctrl.c:1026
#, c-format
msgid "%s:%s: Got 0 bytes from rotctld"
msgstr "%s:%s: Got 0 bytes from rotctld"
-#: ../src/gtk-rot-ctrl.c:1023
+#: ../src/gtk-rot-ctrl.c:1031
#, c-format
msgid "%s:%s: Read %d bytes from rotctld"
msgstr "%s:%s: Read %d bytes from rotctld"
@@ -1142,7 +1142,7 @@
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/gtk-sat-list.c:952 ../src/sat-pass-dialogs.c:702
#: ../src/sat-pref-qth.c:769
#, c-format
msgid "%s:%d: Invalid column: %d"
@@ -1158,7 +1158,8 @@
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
+#: ../src/gtk-sat-list.c:1307 ../src/sat-pass-dialogs.c:1421
+#: ../src/sat-pass-dialogs.c:1470
#, c-format
msgid "%s:%d: There is no selection; skip popup."
msgstr "%s:%d: There is no selection; skip popup."
@@ -1342,28 +1343,28 @@
msgid "%s: Read %d out of %d satellites"
msgstr "%s: Read %d out of %d satellites"
-#: ../src/gtk-sat-module.c:772
+#: ../src/gtk-sat-module.c:796
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr "%s: Previous cycle missed it's deadline."
-#: ../src/gtk-sat-module.c:916 ../src/gtk-sat-module.c:1548
+#: ../src/gtk-sat-module.c:910 ../src/gtk-sat-module.c:1541
#, c-format
msgid "%f:%d: Unknown child type"
msgstr "%f:%d: Unknown child type"
-#: ../src/gtk-sat-module.c:1076
+#: ../src/gtk-sat-module.c:1070
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr "%s: Module %s recevied CLOSE signal."
-#: ../src/gtk-sat-module.c:1086
+#: ../src/gtk-sat-module.c:1080
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr "%s: Module %s is in DOCKED state."
-#: ../src/gtk-sat-module.c:1093 ../src/gtk-sat-module.c:1109
-#: ../src/gtk-sat-module.c:1137
+#: ../src/gtk-sat-module.c:1087 ../src/gtk-sat-module.c:1103
+#: ../src/gtk-sat-module.c:1131
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
@@ -1372,32 +1373,32 @@
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
-#: ../src/gtk-sat-module.c:1102
+#: ../src/gtk-sat-module.c:1096
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr "%s: Module %s is in WINDOW state."
-#: ../src/gtk-sat-module.c:1130
+#: ../src/gtk-sat-module.c:1124
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr "%s: Module %s is in FULLSCREEN state."
-#: ../src/gtk-sat-module.c:1159 ../src/gtk-sat-module.c:1326
+#: ../src/gtk-sat-module.c:1153 ../src/gtk-sat-module.c:1320
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr "%s: Module %s has unknown state: %d"
-#: ../src/gtk-sat-module.c:1168
+#: ../src/gtk-sat-module.c:1162
#, c-format
msgid "%s: Module %s closed."
msgstr "%s: Module %s closed."
-#: ../src/gtk-sat-module.c:1209
+#: ../src/gtk-sat-module.c:1203
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr "%s: Module %s recevied CONFIG signal."
-#: ../src/gtk-sat-module.c:1218
+#: ../src/gtk-sat-module.c:1212
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
@@ -1406,12 +1407,12 @@
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
-#: ../src/gtk-sat-module.c:1236
+#: ../src/gtk-sat-module.c:1230
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr "%s: Module configuration failed for some reason."
-#: ../src/gtk-sat-module.c:1494
+#: ../src/gtk-sat-module.c:1488
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr "%s: Reloading satellites for module %s"
@@ -1561,7 +1562,7 @@
msgid "The sky at a glance (%s)"
msgstr "The sky at a glance (%s)"
-#: ../src/gtk-sat-module-popup.c:891
+#: ../src/gtk-sat-module-popup.c:889
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
@@ -1569,12 +1570,12 @@
"You have no radio configuration!\n"
"Please configure a radio first."
-#: ../src/gtk-sat-module-popup.c:904
+#: ../src/gtk-sat-module-popup.c:902
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr "Gpredict Radio Control: %s"
-#: ../src/gtk-sat-module-popup.c:964
+#: ../src/gtk-sat-module-popup.c:962
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
@@ -1582,12 +1583,12 @@
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
-#: ../src/gtk-sat-module-popup.c:977
+#: ../src/gtk-sat-module-popup.c:975
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr "Gpredict Rotator Control: %s"
-#: ../src/gtk-sat-module-popup.c:1062
+#: ../src/gtk-sat-module-popup.c:1060
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1600,12 +1601,12 @@
"from the disk.\n"
"Do you you want to proceed?"
-#: ../src/gtk-sat-module-popup.c:1072
+#: ../src/gtk-sat-module-popup.c:1070
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr "%s:%d: Failed to delete %s."
-#: ../src/gtk-sat-module-popup.c:1077
+#: ../src/gtk-sat-module-popup.c:1075
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr "%s:%d: %s deleted permanently."
@@ -2086,11 +2087,11 @@
msgid "%s: No selection found!"
msgstr "%s: No selection found!"
-#: ../src/main.c:60
+#: ../src/main.c:64
msgid "just to have a pot"
msgstr "just to have a pot"
-#: ../src/main.c:112
+#: ../src/main.c:120
#, fuzzy, c-format
msgid ""
"%s: User config check failed (code %d). This is fatal.\n"
@@ -2101,22 +2102,22 @@
"A possible solution would be to remove the .gpredict2 data dir\n"
"in your home directory"
-#: ../src/main.c:413
+#: ../src/main.c:468
#, c-format
msgid "%s: Time threshold has been passed."
msgstr "%s: Time threshold has been passed."
-#: ../src/main.c:421
+#: ../src/main.c:476
#, c-f...
[truncated message content] |
|
From: <cs...@us...> - 2009-11-06 23:24:09
|
Revision: 509
http://gpredict.svn.sourceforge.net/gpredict/?rev=509&view=rev
Author: csete
Date: 2009-11-06 23:24:00 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Updated credits.
Modified Paths:
--------------
trunk/AUTHORS
trunk/src/about.c
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2009-11-06 23:05:41 UTC (rev 508)
+++ trunk/AUTHORS 2009-11-06 23:24:00 UTC (rev 509)
@@ -2,6 +2,9 @@
Contributors:
- William J Beksi, KC2EXL, Map view.
+- Charles Suprin, AA1VS, various multithread fixes.
+- Valentin Yakovenkov, Windows build.
+- David VK5DG, transponder data files
- Dr. T.S. Kelso, the author original SGP4/SDP4 algorithms in FORTRAN and Pascal.
- Neoklis Kyriazis, 5B4AZ, conversion of the algorithms to C.
- Damon Chaplin is the author of GooCanvas, which is used extensively in gpredict
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2009-11-06 23:05:41 UTC (rev 508)
+++ trunk/src/about.c 2009-11-06 23:24:00 UTC (rev 509)
@@ -40,6 +40,8 @@
"",
"Contributors:",
"David VK5DG (Transponder data files)",
+ "Charles Suprin, AA1VS (Various multithread fixes)",
+ "Valentin Yakovenkov (Windows build)",
"Bruce Cowan (Gio port of TLE updater)",
"Damon Chaplin (GooCanvas)",
"Dr. T.S. Kelso (SGP4/SDP4 algorithms)",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-06 23:05:51
|
Revision: 508
http://gpredict.svn.sourceforge.net/gpredict/?rev=508&view=rev
Author: csete
Date: 2009-11-06 23:05:41 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
New files introduced by patch 2893617 from Valentin Yakovenkov fixing various windows issues.
Added Paths:
-----------
trunk/win32/build-config.h
trunk/win32/gpredict.exe.manifest
Added: trunk/win32/build-config.h
===================================================================
--- trunk/win32/build-config.h (rev 0)
+++ trunk/win32/build-config.h 2009-11-06 23:05:41 UTC (rev 508)
@@ -0,0 +1,89 @@
+/* build-config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define if code coverage should be enabled. */
+#undef ENABLE_COV
+
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* "definition of GETTEXT_PACKAGE" */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#define VERSION "1.1"
Added: trunk/win32/gpredict.exe.manifest
===================================================================
--- trunk/win32/gpredict.exe.manifest (rev 0)
+++ trunk/win32/gpredict.exe.manifest 2009-11-06 23:05:41 UTC (rev 508)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT'
+ version='8.0.50608.0' processorArchitecture='x86'
+ publicKeyToken='1fc8b3b9a1e18e3b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-11-06 23:04:29
|
Revision: 507
http://gpredict.svn.sourceforge.net/gpredict/?rev=507&view=rev
Author: csete
Date: 2009-11-06 23:04:11 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
Applied patch 2893617 from Valentin Yakovenkov fixing various windows issues.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
trunk/src/main.c
trunk/win32/Makefile
trunk/win32/config.mk
trunk/win32/gpredict.rc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/ChangeLog 2009-11-06 23:04:11 UTC (rev 507)
@@ -1,3 +1,17 @@
+2009-11-06 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-rig-ctrl.c:
+ * src/gtk-rot-ctrl.c:
+ * src/main.c:
+ * win32/Makefile:
+ * win32/build-config.h:
+ * win32/config.mk:
+ * win32/gpredict.exe.manifest:
+ * win32/gpredict.rc:
+ Applied patch 2893617 from Valentin Yakovenkov fixing various windows issues.
+
+
+
2009-10-27 Alexandru Csete <oz9aec at gmail.com>
* src/tle-update.c:
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/src/gtk-rig-ctrl.c 2009-11-06 23:04:11 UTC (rev 507)
@@ -56,10 +56,14 @@
/* NETWORK */
//#include <sys/types.h>
+#ifndef WIN32
#include <sys/socket.h> /* socket(), connect(), send() */
#include <netinet/in.h> /* struct sockaddr_in */
#include <arpa/inet.h> /* htons() */
#include <netdb.h> /* gethostbyname() */
+#else
+#include <winsock2.h>
+#endif
/* END */
#include "gtk-rig-ctrl.h"
@@ -1880,8 +1884,14 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
__FILE__, __FUNCTION__);
- shutdown (sock, SHUT_RDWR);
- close (sock);
+
+#ifndef WIN32
+ shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
+ close (sock);
return FALSE;
}
@@ -1903,8 +1913,13 @@
g_free (buff);
g_strfreev (vbuff);
}
+
+#ifndef WIN32
+ shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
- shutdown (sock, SHUT_RDWR);
close (sock);
@@ -1977,7 +1992,13 @@
__FUNCTION__, written, size);
}
g_free (buff);
+
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
ctrl->wrops++;
@@ -2062,7 +2083,13 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
__FILE__, __FUNCTION__);
+
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
return FALSE;
}
@@ -2086,7 +2113,12 @@
g_strfreev (vbuff);
}
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
@@ -2182,7 +2214,13 @@
__FUNCTION__, written, size);
}
g_free (buff);
+
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
ctrl->wrops++;
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/src/gtk-rot-ctrl.c 2009-11-06 23:04:11 UTC (rev 507)
@@ -50,10 +50,14 @@
/* NETWORK */
//#include <sys/types.h>
+#ifndef WIN32
#include <sys/socket.h> /* socket(), connect(), send() */
#include <netinet/in.h> /* struct sockaddr_in */
#include <arpa/inet.h> /* htons() */
#include <netdb.h> /* gethostbyname() */
+#else
+#include <winsock2.h>
+#endif
/* END */
#define FMTSTR "%7.2f\302\260"
@@ -1005,7 +1009,13 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
__FILE__, __FUNCTION__);
+
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
return FALSE;
}
@@ -1031,7 +1041,12 @@
g_free (buff);
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
ctrl->wrops++;
@@ -1113,7 +1128,12 @@
g_free (buff);
+#ifndef WIN32
shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
close (sock);
ctrl->wrops++;
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/src/main.c 2009-11-06 23:04:11 UTC (rev 507)
@@ -53,6 +53,10 @@
#include "sat-cfg.h"
#include "sat-debugger.h"
+#ifdef WIN32
+#include <winsock2.h>
+#endif
+
/** \brief Main application widget. */
GtkWidget *app;
@@ -81,8 +85,9 @@
static gpointer update_tle_thread (gpointer data);
static void test_ui (void);
+static void InitWinSock2(void);
+static void CloseWinSock2(void);
-
int main (int argc, char *argv[])
{
guint error = 0;
@@ -135,12 +140,59 @@
tle_mon_id = g_timeout_add (600000, tle_mon_task, NULL);
//test_ui ();
+
+#ifdef WIN32
+ // Initializing Windozze Sockets
+ InitWinSock2();
+#endif
gtk_main ();
+#ifdef WIN32
+ // Cleanup Windozze Sockets
+ CloseWinSock2();
+#endif
return 0;
}
+#ifdef WIN32
+/* This code was given from MSDN */
+static void InitWinSock2(void)
+{
+ WORD wVersionRequested;
+ WSADATA wsaData;
+ int err;
+
+ wVersionRequested = MAKEWORD( 2, 2 );
+
+ err = WSAStartup( wVersionRequested, &wsaData );
+ if ( err != 0 ) {
+ /* Tell the user that we could not find a usable */
+ /* WinSock DLL. */
+ return;
+ }
+
+ /* Confirm that the WinSock DLL supports 2.2.*/
+ /* Note that if the DLL supports versions later */
+ /* than 2.2 in addition to 2.2, it will still return */
+ /* 2.2 in wVersion since that is the version we */
+ /* requested. */
+
+ if ( LOBYTE( wsaData.wVersion ) != 2 ||
+ HIBYTE( wsaData.wVersion ) != 2 ) {
+ /* Tell the user that we could not find a usable */
+ /* WinSock DLL. */
+ WSACleanup( );
+ return;
+ }
+}
+
+static void CloseWinSock2(void)
+{
+ WSACleanup();
+}
+#endif
+
static void test_ui (void)
{
gchar *fnam;
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/win32/Makefile 2009-11-06 23:04:11 UTC (rev 507)
@@ -5,7 +5,7 @@
# directories
topsrc = ..
-gcincdir = $(topsrc)/goocanv8
+gcincdir = c:/mingw/include/goocanvas-0.10/goocanvas/
gcsrcdir = $(topsrc)/goocanv8/src
gpreddir = $(topsrc)/src
sgpsdpdir = $(gpreddir)/sgpsdp
@@ -22,7 +22,7 @@
# libraries
GTKLIBS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs gtk+-win32-2.0)
GLIBLIB := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs glib-2.0 gthread-2.0)
-GUI_LIBS = $(GTKLIBS) $(GLIBLIB) libgoocanvas.lib libsgpsdp.lib -lcurl -lwinmm -lws2_32
+GUI_LIBS = $(GTKLIBS) $(GLIBLIB) -lgoocanvas libsgpsdp.lib -lcurldll -lwinmm -lws2_32
LIBS = -lm
@@ -90,10 +90,12 @@
gtk-polar-plot.c \
gtk-polar-view.c \
gtk-polar-view-popup.c \
+ gtk-rig-ctrl.c \
gtk-rot-ctrl.c \
gtk-rot-knob.c \
gtk-sat-data.c \
gtk-sat-list.c \
+ gtk-sat-list-popup.c \
gtk-sat-list-col-sel.c \
gtk-sat-map.c \
gtk-sat-map-ground-track.c \
@@ -101,7 +103,7 @@
gtk-sat-module.c \
gtk-sat-module-popup.c \
gtk-sat-module-tmg.c \
- gtk-sat-tree.c \
+ gtk-sat-selector.c \
gtk-single-sat.c \
gtk-sky-glance.c \
gui.c \
@@ -117,18 +119,17 @@
pass-popup-menu.c \
pass-to-txt.c \
predict-tools.c \
+ qth-data.c \
qth-editor.c \
radio-conf.c \
- rig-io.c \
rotor-conf.c \
- rdv.c \
sat-cfg.c \
sat-debugger.c \
+ sat-info.c \
sat-log.c \
sat-log-browser.c \
sat-monitor.c \
sat-pass-dialogs.c \
- sat-popup-menu.c \
sat-pref.c \
sat-pref-conditions.c \
sat-pref-debug.c \
@@ -157,13 +158,13 @@
sat-vis.c \
save-pass.c \
time-tools.c \
- tle-lookup.c \
tle-tools.c \
tle-update.c \
+ trsp-conf.c \
GPREDICTOBJ = $(GPREDICTSRC:.c=.o)
-OBJS = $(GOOCANVOBJ) $(SGPSDPOBJ) $(GPREDICTOBJ)
+OBJS = $(SGPSDPOBJ) $(GPREDICTOBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) $<
@@ -172,13 +173,13 @@
# targets begin
-all: libgoocanvas.dll libsgpsdp.dll gpredict.exe
+all: libsgpsdp.dll gpredict.exe
# Use -mconsole to always open a console window when gpredicxt is started
# Use -mwindows for no copnsole
gpredict.exe: $(OBJS) gpredict_res.o
- $(CC) -mconsole -o $@ $^ $(CFLAGS) $(GTK_CFLAGS) $(LIBS) $(GUI_LIBS) -lmingwex -s
+ $(CC) -mconsole -mthread -o $@ $^ $(CFLAGS) $(GTK_CFLAGS) $(LIBS) $(GUI_LIBS) -lmingwex -s
gpredict_res.o: gpredict.rc
$(RC) $(RCFLAGS) $< $@
Modified: trunk/win32/config.mk
===================================================================
--- trunk/win32/config.mk 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/win32/config.mk 2009-11-06 23:04:11 UTC (rev 507)
@@ -1,10 +1,10 @@
# Configuration variables governing the build of grig for win32
# directory containing the cross tools
-CROSSDIR = /grga/mingw32/buildenv
+#CROSSDIR = /grga/mingw32/buildenv
# prefix for mingw tools (e.g. i586-mingw32msvc-gcc)
-MGW_PREFIX = i586-mingw32msvc-
+#MGW_PREFIX = i586-mingw32msvc-
# mingw include dir
MGW_INC = $(CROSSDIR)/include
Modified: trunk/win32/gpredict.rc
===================================================================
--- trunk/win32/gpredict.rc 2009-10-30 16:43:19 UTC (rev 506)
+++ trunk/win32/gpredict.rc 2009-11-06 23:04:11 UTC (rev 507)
@@ -1,5 +1,7 @@
#include <windows.h>
+#include <winuser.h>
/* icon for the program itself */
icon_0 ICON "icons/gpredict-icon.ico"
+2 RT_MANIFEST gpredict.exe.manifest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-30 16:43:26
|
Revision: 506
http://gpredict.svn.sourceforge.net/gpredict/?rev=506&view=rev
Author: csete
Date: 2009-10-30 16:43:19 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Add .desktop file.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-10-30 16:42:35 UTC (rev 505)
+++ trunk/configure.ac 2009-10-30 16:43:19 UTC (rev 506)
@@ -59,7 +59,12 @@
AC_DEFINE(ENABLE_COV, 1, [Define if code coverage should be enabled.])
fi
+AC_ARG_ENABLE(caches,[ --enable-caches Run update-* to update desktop and icon caches when installing (disable if you install as not root)],,[enable_caches="yes"])
+AM_CONDITIONAL(UPDATE_CACHES, test x"$enable_caches" = "xyes")
+
+
+
GLIB_V=`pkg-config --modversion glib-2.0`
GIO_V=`pkg-config --modversion gio-2.0`
GTHR_V=`pkg-config --modversion gthread-2.0`
@@ -89,6 +94,7 @@
pixmaps/maps/Makefile
pixmaps/icons/Makefile
data/Makefile
+data/desktop/Makefile
data/satdata/Makefile
data/trsp/Makefile
po/Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-30 16:42:49
|
Revision: 505
http://gpredict.svn.sourceforge.net/gpredict/?rev=505&view=rev
Author: csete
Date: 2009-10-30 16:42:35 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Add .desktop file.
Modified Paths:
--------------
trunk/data/Makefile.am
Added Paths:
-----------
trunk/data/desktop/
trunk/data/desktop/Makefile.am
trunk/data/desktop/gpredict.desktop.in
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-10-28 17:32:37 UTC (rev 504)
+++ trunk/data/Makefile.am 2009-10-30 16:42:35 UTC (rev 505)
@@ -1,4 +1,4 @@
-SUBDIRS = satdata trsp
+SUBDIRS = satdata trsp desktop
gpredict_datdir = $(pkgdatadir)/data
Added: trunk/data/desktop/Makefile.am
===================================================================
--- trunk/data/desktop/Makefile.am (rev 0)
+++ trunk/data/desktop/Makefile.am 2009-10-30 16:42:35 UTC (rev 505)
@@ -0,0 +1,28 @@
+desktop_in_files = gpredict.desktop.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = $(desktop_in_files) $(desktop_DATA)
+
+DISTCLEANFILES = gpredict.desktop
+
+UPDATE_DESKTOP = \
+ if which update-desktop-database>/dev/null 2>&1 ; then \
+ update-desktop-database; \
+ fi
+
+install-data-hook:
+if UPDATE_CACHES
+ $(UPDATE_DESKTOP)
+else
+ @true
+endif
+
+uninstall-hook:
+if UPDATE_CACHES
+ $(UPDATE_DESKTOP)
+else
+ @true
+endif
Added: trunk/data/desktop/gpredict.desktop.in
===================================================================
--- trunk/data/desktop/gpredict.desktop.in (rev 0)
+++ trunk/data/desktop/gpredict.desktop.in 2009-10-30 16:42:35 UTC (rev 505)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Gredict
+Comment=Satellite tracker
+Exec=gpredict
+Icon=$(datadir)/pixmaps/gpredict/icons/gpredict-icon.png
+Terminal=false
+Type=Application
+Categories=HamRadio;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-28 17:32:50
|
Revision: 504
http://gpredict.svn.sourceforge.net/gpredict/?rev=504&view=rev
Author: csete
Date: 2009-10-28 17:32:37 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
Update satellite database
Modified Paths:
--------------
trunk/data/satdata/amateur.cat
trunk/data/satdata/cubesat.cat
trunk/data/satdata/satellites.dat
trunk/data/satdata/science.cat
trunk/data/satdata/tle-new.cat
Modified: trunk/data/satdata/amateur.cat
===================================================================
--- trunk/data/satdata/amateur.cat 2009-10-27 21:26:57 UTC (rev 503)
+++ trunk/data/satdata/amateur.cat 2009-10-28 17:32:37 UTC (rev 504)
@@ -57,6 +57,7 @@
28897
28941
29712
+32785
32789
32953
33493
@@ -64,3 +65,4 @@
33499
35693
35694
+35870
Modified: trunk/data/satdata/cubesat.cat
===================================================================
--- trunk/data/satdata/cubesat.cat 2009-10-27 21:26:57 UTC (rev 503)
+++ trunk/data/satdata/cubesat.cat 2009-10-28 17:32:37 UTC (rev 504)
@@ -26,3 +26,7 @@
35003
35004
35005
+35932
+35933
+35934
+35935
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-10-27 21:26:57 UTC (rev 503)
+++ trunk/data/satdata/satellites.dat 2009-10-28 17:32:37 UTC (rev 504)
@@ -1,8582 +1,8561 @@
-[733]
+[28082]
VERSION=1.1
-NAME=THOR AGENA D R/B
-NICKNAME=THOR AGENA D R/B
-TLE1=1 00733U 64002A 09284.78264811 -.00000000 00000-0 17948-4 0 8954
-TLE2=2 00733 99.1121 312.3438 0034929 56.4448 304.0048 14.31270308380885
+NAME=ZHONGXING-20
+NICKNAME=ZHONGXING-20
+TLE1=1 28082U 03052A 09300.60895701 -.00000288 00000-0 10000-3 0 8642
+TLE2=2 28082 0.0668 59.8383 0001848 162.2508 131.3679 1.00271286 21845
-[24960]
+[35004]
VERSION=1.1
-NAME=MOLNIYA 1-90
-NICKNAME=MOLNIYA 1-90
-TLE1=1 24960U 97054A 09284.99081043 .00000213 00000-0 10000-3 0 5966
-TLE2=2 24960 63.7824 70.5310 7328487 253.7067 47.7321 2.00600845 88328
+NAME=POLYSAT CP6
+NICKNAME=POLYSAT CP6
+TLE1=1 35004U 09028D 09300.04566117 .00009402 00000-0 22386-3 0 1242
+TLE2=2 35004 40.4585 169.8952 0025957 65.9588 294.3939 15.41199139 24681
-[25908]
+[24714]
VERSION=1.1
-NAME=GLOBALSTAR M050
-NICKNAME=GLOBALSTAR M050
-TLE1=1 25908U 99049B 09284.70008496 -.00000079 00000-0 10000-3 0 9937
-TLE2=2 25908 52.0027 356.2942 0009355 135.2541 224.9055 12.07308592461089
+NAME=NAHUEL 1A
+NICKNAME=NAHUEL 1A
+TLE1=1 24714U 97002B 09300.12022575 -.00000256 00000-0 10000-3 0 9608
+TLE2=2 24714 2.0909 77.2516 0004253 131.2452 158.6406 1.00271151 46660
-[28922]
+[25482]
VERSION=1.1
-NAME=GIOVE-A
-NICKNAME=GIOVE-A
-TLE1=1 28922U 05051A 09284.15365481 .00000036 00000-0 10000-3 0 6024
-TLE2=2 28922 56.0689 154.3195 0009697 347.4420 12.6269 1.69483414 23531
+NAME=ORBCOMM FM28 [-]
+NICKNAME=ORBCOMM FM28 [-]
+TLE1=1 25482U 98053H 09300.54967690 -.00000195 00000-0 -21212-4 0 7261
+TLE2=2 25482 45.0108 65.4279 0003231 292.0420 68.0080 14.30100525579231
-[24932]
+[25732]
VERSION=1.1
-NAME=METEOSAT-7
-NICKNAME=METEOSAT-7
-TLE1=1 24932U 97049B 09284.16790679 .00000060 00000-0 10000-3 0 7287
-TLE2=2 24932 5.4760 68.1482 0000139 110.2874 319.3633 1.00267366 44354
+NAME=CZ-4B R/B
+NICKNAME=CZ-4B R/B
+TLE1=1 25732U 99025C 09300.98675799 -.00000025 00000-0 85145-5 0 2333
+TLE2=2 25732 98.6609 272.8806 0037949 138.6506 221.7565 14.17193176541517
-[27858]
+[28353]
VERSION=1.1
-NAME=SCISAT 1
-NICKNAME=SCISAT 1
-TLE1=1 27858U 03036A 09285.04179289 .00000012 00000-0 69550-5 0 8594
-TLE2=2 27858 73.9337 312.0077 0008388 333.8873 26.1897 14.74816316331940
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 28353U 04021B 09300.16515039 .00000315 00000-0 19105-3 0 4803
+TLE2=2 28353 70.9993 168.1963 0003760 127.0504 233.0948 14.13923170277768
-[25495]
+[28493]
VERSION=1.1
-NAME=EUROBIRD 2
-NICKNAME=EUROBIRD 2
-TLE1=1 25495U 98057A 09281.98165627 .00000142 00000-0 10000-3 0 7324
-TLE2=2 25495 0.0640 344.8894 0004369 226.7113 185.0565 1.00273060 40330
+NAME=NANOSAT-1
+NICKNAME=NANOSAT-1
+TLE1=1 28493U 04049B 09300.82052151 .00000228 00000-0 46219-4 0 4734
+TLE2=2 28493 98.2813 263.9518 0004570 183.1306 176.9882 14.70337012260659
-[24869]
+[24653]
VERSION=1.1
-NAME=IRIDIUM 15 [+]
-NICKNAME=IRIDIUM 15 [+]
-TLE1=1 24869U 97034A 09284.62925884 -.00000106 00000-0 -44746-4 0 8277
-TLE2=2 24869 86.3921 114.4228 0002198 75.1464 284.9974 14.34217053641799
+NAME=MEASAT-2
+NICKNAME=MEASAT-2
+TLE1=1 24653U 96063B 09299.89962624 -.00000253 00000-0 10000-3 0 502
+TLE2=2 24653 1.8876 77.4279 0000721 183.4562 200.8837 0.99908127 47494
-[32404]
+[24871]
VERSION=1.1
-NAME=THURAYA-3
-NICKNAME=THURAYA-3
-TLE1=1 32404U 08001A 09284.27805486 -.00000316 00000-0 10000-3 0 3196
-TLE2=2 32404 5.5336 331.7124 0005196 217.4693 29.5664 1.00270397 6435
+NAME=IRIDIUM 920 [-]
+NICKNAME=IRIDIUM 920 [-]
+TLE1=1 24871U 97034C 09300.48870791 .00000216 00000-0 64771-4 0 4095
+TLE2=2 24871 86.3936 100.4768 0012956 137.5993 222.6203 14.38080010645248
-[28892]
+[27414]
VERSION=1.1
-NAME=UWE-1
-NICKNAME=UWE-1
-TLE1=1 28892U 05043C 09284.70046750 .00000064 00000-0 22971-4 0 4522
-TLE2=2 28892 98.0361 171.3534 0017320 346.9646 13.1121 14.59774631210844
+NAME=NSS-7
+NICKNAME=NSS-7
+TLE1=1 27414U 02019A 09299.90711188 -.00000166 00000-0 10000-3 0 4155
+TLE2=2 27414 0.0235 147.6844 0002490 64.0449 128.2679 1.00273064 27643
-[23319]
+[18362]
VERSION=1.1
-NAME=EXPRESS 1
-NICKNAME=EXPRESS 1
-TLE1=1 23319U 94067A 09283.06747877 .00000043 00000-0 10000-3 0 7508
-TLE2=2 23319 8.3739 61.4321 0002718 102.8576 257.2116 0.99829225 54766
+NAME=OSCAR 29
+NICKNAME=OSCAR 29
+TLE1=1 18362U 87080B 09300.84771044 .00000068 00000-0 10000-3 0 7783
+TLE2=2 18362 90.3366 237.9248 0107162 170.7639 189.5513 13.43702723 84213
-[25104]
+[25983]
VERSION=1.1
-NAME=IRIDIUM 45 [+]
-NICKNAME=IRIDIUM 45 [+]
-TLE1=1 25104U 97082A 09284.68539548 .00000203 00000-0 65384-4 0 7071
-TLE2=2 25104 86.3993 348.0624 0002444 86.5314 273.6161 14.34223881618254
+NAME=ORBCOMM FM33 [-]
+NICKNAME=ORBCOMM FM33 [-]
+TLE1=1 25983U 99065D 09299.99646443 .00000324 00000-0 18261-3 0 6605
+TLE2=2 25983 45.0320 260.7981 0001511 37.7014 322.3919 14.28744920516121
-[17912]
+[25407]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 17912U 87038B 09284.16676452 .00000081 00000-0 72005-5 0 8825
-TLE2=2 17912 82.5028 159.8105 0022494 98.0505 262.3269 14.81487089212098
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 25407U 98045B 09300.66222995 .00000245 00000-0 14991-3 0 1706
+TLE2=2 25407 71.0088 142.1831 0007148 149.3465 210.8078 14.15507451581414
-[28376]
+[31573]
VERSION=1.1
-NAME=AURA
-NICKNAME=AURA
-TLE1=1 28376U 04026A 09285.15014389 -.00000029 00000-0 34846-5 0 6206
-TLE2=2 28376 98.1857 227.5289 0001377 88.7112 271.4245 14.57122955278841
+NAME=GLOBALSTAR M069
+NICKNAME=GLOBALSTAR M069
+TLE1=1 31573U 07020C 09300.92685392 -.00000086 00000-0 10000-3 0 3852
+TLE2=2 31573 51.9962 291.3233 0000363 157.0006 203.0884 12.62258336113218
-[27704]
+[26867]
VERSION=1.1
-NAME=GPS BIIR-09 (PRN 21)
-NICKNAME=GPS BIIR-09 (PRN 21)
-TLE1=1 27704U 03010A 09283.01386492 .00000007 00000-0 10000-3 0 7392
-TLE2=2 27704 53.4777 214.4058 0146975 210.1642 149.1059 2.00554165 47870
+NAME=MOLNIYA 3-51
+NICKNAME=MOLNIYA 3-51
+TLE1=1 26867U 01030A 09300.22237147 .00000728 00000-0 00000+0 0 9753
+TLE2=2 26867 64.0811 187.7213 6971419 265.5112 346.9231 2.00566185 60602
-[25478]
+[23546]
VERSION=1.1
-NAME=ORBCOMM FM24 [+]
-NICKNAME=ORBCOMM FM24 [+]
-TLE1=1 25478U 98053D 09285.00508317 .00000164 00000-0 11899-3 0 6909
-TLE2=2 25478 45.0102 166.8382 0000828 321.7515 38.3274 14.28967101576662
+NAME=ORBCOMM FM02 [+]
+NICKNAME=ORBCOMM FM02 [+]
+TLE1=1 23546U 95017B 09300.89858845 .00000275 00000-0 69368-4 0 3915
+TLE2=2 23546 69.9761 192.3772 0008800 19.2581 340.8887 14.61245226773472
-[26407]
+[25789]
VERSION=1.1
-NAME=GPS BIIR-05 (PRN 28)
-NICKNAME=GPS BIIR-05 (PRN 28)
-TLE1=1 26407U 00040A 09283.62668345 .00000056 00000-0 10000-3 0 5873
-TLE2=2 26407 55.4593 95.2761 0153557 244.6100 113.8253 2.00565928 67738
+NAME=QUIKSCAT
+NICKNAME=QUIKSCAT
+TLE1=1 25789U 99034A 09300.56605878 -.00000046 00000-0 -77220-6 0 5579
+TLE2=2 25789 98.6303 127.9635 0000296 88.6647 271.4569 14.26792008539337
-[33315]
+[9478]
VERSION=1.1
-NAME=RAPIDEYE 3
-NICKNAME=RAPIDEYE 3
-TLE1=1 33315U 08040D 09285.14198711 .00000038 00000-0 11955-4 0 2510
-TLE2=2 33315 97.9677 9.0163 0013372 43.8015 316.4263 14.79919205 60455
+NAME=MARISAT 2
+NICKNAME=MARISAT 2
+TLE1=1 09478U 76101A 09299.66963772 -.00000064 00000-0 10000-3 0 1962
+TLE2=2 09478 13.2556 355.0921 0100638 202.3289 157.2176 0.97589672 64171
-[27560]
+[28902]
VERSION=1.1
-NAME=MOZHAYETS
-NICKNAME=MOZHAYETS
-TLE1=1 27560U 02054B 09284.14386087 .00000078 00000-0 28042-4 0 638
-TLE2=2 27560 97.9251 121.0945 0042452 208.9591 150.9240 14.55045916363618
+NAME=TELKOM 2
+NICKNAME=TELKOM 2
+TLE1=1 28902U 05046A 09300.65791068 -.00000359 00000-0 10000-3 0 7192
+TLE2=2 28902 0.0309 149.9070 0001362 40.5275 200.5974 1.00269626 14486
-[20479]
+[33056]
VERSION=1.1
-NAME=ORIZURU (DEBUT)
-NICKNAME=ORIZURU (DEBUT)
-TLE1=1 20479U 90013B 09284.81682002 -.00000043 00000-0 -15257-4 0 3914
-TLE2=2 20479 99.0581 185.5524 0538675 261.2381 92.7370 12.83687717921991
+NAME=TURKSAT 3A
+NICKNAME=TURKSAT 3A
+TLE1=1 33056U 08030B 09300.84279972 .00000150 00000-0 10000-3 0 2531
+TLE2=2 33056 0.0027 213.8949 0003825 322.0208 205.8211 1.00271395 5157
-[25262]
+[29644]
VERSION=1.1
-NAME=IRIDIUM 51 [S]
-NICKNAME=IRIDIUM 51 [S]
-TLE1=1 25262U 98018A 09284.42311889 .00000147 00000-0 38014-4 0 8487
-TLE2=2 25262 86.4456 51.5000 0002234 84.7406 275.4042 14.42947351608135
+NAME=AMC-18
+NICKNAME=AMC-18
+TLE1=1 29644U 06054B 09300.54976659 -.00000086 00000-0 10000-3 0 5291
+TLE2=2 29644 0.0636 63.6648 0002766 144.6308 280.7321 1.00272658 10625
-[29505]
+[25113]
VERSION=1.1
-NAME=SJ-6C
-NICKNAME=SJ-6C
-TLE1=1 29505U 06046A 09285.10967456 .00000036 00000-0 91766-5 0 3413
-TLE2=2 29505 97.6910 288.9163 0004540 54.3843 305.7808 14.90672841161508
+NAME=ORBCOMM FM10 [+]
+NICKNAME=ORBCOMM FM10 [+]
+TLE1=1 25113U 97084B 09300.55966917 -.00000140 00000-0 32371-6 0 898
+TLE2=2 25113 45.0185 94.6609 0005133 16.6359 343.4658 14.34405819619258
-[25431]
+[24277]
VERSION=1.1
-NAME=IRIDIUM 3 [+]
-NICKNAME=IRIDIUM 3 [+]
-TLE1=1 25431U 98048A 09284.65368296 .00000105 00000-0 30466-4 0 6831
-TLE2=2 25431 86.3994 348.2065 0002485 99.4488 260.6985 14.34223639583497
+NAME=MIDORI (ADEOS)
+NICKNAME=MIDORI (ADEOS)
+TLE1=1 24277U 96046A 09300.95567595 -.00000008 00000-0 13442-4 0 1933
+TLE2=2 24277 98.3822 260.2436 0000178 229.0853 131.0314 14.28601983687886
-[26081]
+[28935]
VERSION=1.1
-NAME=GLOBALSTAR M063
-NICKNAME=GLOBALSTAR M063
-TLE1=1 26081U 00008A 09284.46636414 -.00000086 00000-0 10000-3 0 767
-TLE2=2 26081 51.9978 251.1633 0000838 84.4853 275.6109 12.62259527454666
+NAME=ECHOSTAR 10
+NICKNAME=ECHOSTAR 10
+TLE1=1 28935U 06003A 09300.26464259 -.00000053 00000-0 10000-3 0 7795
+TLE2=2 28935 0.0685 61.7115 0001158 119.1626 199.9628 1.00272318 13585
-[27600]
+[12054]
VERSION=1.1
-NAME=MICRO LABSAT
-NICKNAME=MICRO LABSAT
-TLE1=1 27600U 02056D 09285.20434112 -.00000058 00000-0 -65847-5 0 8808
-TLE2=2 27600 98.3780 337.5542 0010028 263.0915 96.9142 14.28867459356153
+NAME=COSMOS 1220
+NICKNAME=COSMOS 1220
+TLE1=1 12054U 80089A 09300.32308487 .00002828 00000-0 12508-3 0 1164
+TLE2=2 12054 64.9755 233.1115 0035858 110.6322 249.8659 15.23397226488351
-[29480]
+[19688]
VERSION=1.1
-NAME=M-V-7 R/B
-NICKNAME=M-V-7 R/B
-TLE1=1 29480U 06041B 09283.86050409 .00510804 29274-5 27564-3 0 465
-TLE2=2 29480 98.2468 132.2170 0028810 37.7983 322.5351 16.18731348173626
+NAME=ASTRA 1A
+NICKNAME=ASTRA 1A
+TLE1=1 19688U 88109B 09298.62030986 -.00000209 00000-0 10000-3 0 6207
+TLE2=2 19688 7.9321 62.7670 0012607 309.6074 50.2684 0.98338830 56333
-[32750]
+[733]
VERSION=1.1
-NAME=SAR-LUPE 4
-NICKNAME=SAR-LUPE 4
-TLE1=1 32750U 08014A 09285.10769833 .00000634 00000-0 27458-4 0 7307
-TLE2=2 32750 98.1338 36.0734 0021996 28.5747 96.2535 15.26538562 85943
+NAME=THOR AGENA D R/B
+NICKNAME=THOR AGENA D R/B
+TLE1=1 00733U 64002A 09300.58164644 -.00000007 00000-0 15582-4 0 9088
+TLE2=2 00733 99.1098 328.9067 0034443 11.1438 349.0500 14.31271824383145
-[20918]
+[25651]
VERSION=1.1
-NAME=INMARSAT 2-F1
-NICKNAME=INMARSAT 2-F1
-TLE1=1 20918U 90093A 09280.34962670 .00000113 00000-0 10000-3 0 6252
-TLE2=2 20918 6.8564 54.2770 0003255 130.5817 175.2258 1.00276827 65796
+NAME=GLOBALSTAR M046
+NICKNAME=GLOBALSTAR M046
+TLE1=1 25651U 99012C 09300.45658635 -.00000086 00000-0 10000-3 0 983
+TLE2=2 25651 52.0050 292.8910 0000612 32.2784 327.8111 12.62266282490035
-[32790]
+[27811]
VERSION=1.1
-NAME=CANX-2
-NICKNAME=CANX-2
-TLE1=1 32790U 08021H 09284.22984736 -.00000745 00000-0 -88042-4 0 4793
-TLE2=2 32790 97.9297 347.1160 0015895 18.8146 341.3637 14.81502869 78606
+NAME=HELLAS-SAT 2
+NICKNAME=HELLAS-SAT 2
+TLE1=1 27811U 03020A 09300.89269127 .00000157 00000-0 10000-3 0 88
+TLE2=2 27811 0.0138 281.7233 0002790 285.4920 189.5548 1.00274983 23567
-[25415]
+[25397]
VERSION=1.1
-NAME=ORBCOMM FM19 [+]
-NICKNAME=ORBCOMM FM19 [+]
-TLE1=1 25415U 98046C 09284.56367970 -.00000357 00000-0 -88036-4 0 1167
-TLE2=2 25415 44.9962 79.5253 0002662 191.7613 168.3173 14.27639077583324
+NAME=TECHSAT 1B (GO-32)
+NICKNAME=GO-32
+TLE1=1 25397U 98043D 09301.02165618 .00000041 00000-0 36080-4 0 258
+TLE2=2 25397 98.3209 316.2141 0000736 179.1290 180.9930 14.23165610587023
-[29155]
+[27651]
VERSION=1.1
-NAME=GOES 13
-NICKNAME=GOES 13
-TLE1=1 29155U 06018A 09284.23718301 -.00000096 00000-0 10000-3 0 7858
-TLE2=2 29155 0.1639 114.5343 0003406 89.0845 156.2486 1.00272318 12415
+NAME=SORCE
+NICKNAME=SORCE
+TLE1=1 27651U 03004A 09300.40220334 .00000128 00000-0 31420-4 0 365
+TLE2=2 27651 39.9975 304.2472 0025818 185.9483 174.0994 14.82219555365919
-[23864]
+[25946]
VERSION=1.1
-NAME=PALAPA C2
-NICKNAME=PALAPA C2
-TLE1=1 23864U 96030A 09282.71477356 -.00000362 00000-0 10000-3 0 9415
-TLE2=2 23864 0.0349 24.2029 0001421 204.2672 160.2677 1.00268866 49077
+NAME=GLOBALSTAR M031
+NICKNAME=GLOBALSTAR M031
+TLE1=1 25946U 99058D 09300.11511416 -.00000086 00000-0 10000-3 0 304
+TLE2=2 25946 51.9974 203.5225 0002800 129.8394 230.2719 12.62266815463273
-[25937]
+[25621]
VERSION=1.1
-NAME=DIRECTV 1R
-NICKNAME=DIRECTV 1R
-TLE1=1 25937U 99056A 09284.12930343 -.00000267 00000-0 10000-3 0 7283
-TLE2=2 25937 0.0153 166.6135 0002514 25.1265 162.1973 1.00271686 36669
+NAME=GLOBALSTAR M023
+NICKNAME=GLOBALSTAR M023
+TLE1=1 25621U 99004A 09301.07587190 -.00000086 00000-0 10000-3 0 1405
+TLE2=2 25621 52.0102 158.9189 0010220 109.2881 250.9085 12.62223635494539
-[25078]
+[34264]
VERSION=1.1
-NAME=IRIDIUM 44 [-]
-NICKNAME=IRIDIUM 44 [-]
-TLE1=1 25078U 97077B 09284.53027375 .00000079 00000-0 20139-4 0 2568
-TLE2=2 25078 86.3912 109.9126 0003902 86.1619 274.0021 14.36568029620633
+NAME=RADUGA-1 8
+NICKNAME=RADUGA-1 8
+TLE1=1 34264U 09010A 09299.69109450 .00000112 00000-0 00000+0 0 1841
+TLE2=2 34264 1.0488 210.0039 0032403 256.5721 194.3960 1.00271037 2417
-[1293]
+[26038]
VERSION=1.1
-NAME=OSCAR 3 (OSCAR III)
-NICKNAME=OSCAR 3 (OSCAR III)
-TLE1=1 01293U 65016F 09284.22372880 .00000050 00000-0 64383-4 0 6336
-TLE2=2 01293 70.0727 280.6379 0017428 6.7312 353.4028 14.04730569276106
+NAME=GALAXY 11 (G-11)
+NICKNAME=GALAXY 11 (G-11)
+TLE1=1 26038U 99071A 09300.78958870 .00000160 00000-0 00000+0 0 7881
+TLE2=2 26038 0.0201 277.8754 0000244 198.4125 237.0242 1.00271931 36175
-[25962]
+[25509]
VERSION=1.1
-NAME=GLOBALSTAR M034
-NICKNAME=GLOBALSTAR M034
-TLE1=1 25962U 99062B 09284.95387357 -.00000086 00000-0 10000-3 0 305
-TLE2=2 25962 51.9966 114.9828 0001579 134.7501 225.3506 12.62264713456190
+NAME=SEDSAT 1 (SO-33)
+NICKNAME=SO-33
+TLE1=1 25509U 98061B 09300.30004795 .00000246 00000-0 39023-4 0 5725
+TLE2=2 25509 31.4331 25.4366 0353816 53.6347 309.6406 14.28269924574739
-[25275]
+[27004]
VERSION=1.1
-NAME=IRIDIUM 59 [+]
-NICKNAME=IRIDIUM 59 [+]
-TLE1=1 25275U 98019D 09284.64460507 .00000147 00000-0 45370-4 0 3767
-TLE2=2 25275 86.3988 19.9072 0002269 61.9849 298.1577 14.34218945603941
+NAME=MAROC-TUBSAT
+NICKNAME=MAROC-TUBSAT
+TLE1=1 27004U 01056D 09299.75434091 .00000023 00000-0 74373-4 0 3916
+TLE2=2 27004 99.2258 155.6256 0020546 58.2900 302.0244 13.70029418393949
-[30773]
+[25964]
VERSION=1.1
-NAME=MIDSTAR-1
-NICKNAME=MIDSTAR-1
-TLE1=1 30773U 07006B 09283.88528161 -.00000304 00000-0 00000+0 0 7360
-TLE2=2 30773 46.0233 101.1933 0008833 98.7411 261.4480 15.23800870144389
+NAME=GLOBALSTAR M061
+NICKNAME=GLOBALSTAR M061
+TLE1=1 25964U 99062D 09300.21463091 -.00000074 00000-0 10000-3 0 9930
+TLE2=2 25964 51.9793 206.0829 0006721 32.4762 327.6476 11.76683927449034
-[27954]
+[24968]
VERSION=1.1
-NAME=GALAXY 13 (HORIZONS-1)
-NICKNAME=GALAXY 13 (HORIZONS-1)
-TLE1=1 27954U 03044A 09282.46809613 .00000045 00000-0 10000-3 0 9517
-TLE2=2 27954 0.0171 200.0201 0000429 250.8884 328.8379 1.00269092 22130
+NAME=IRIDIUM 37 [+]
+NICKNAME=IRIDIUM 37 [+]
+TLE1=1 24968U 97056D 09300.34591708 .00000200 00000-0 64492-4 0 7882
+TLE2=2 24968 86.3964 44.7857 0002215 84.9652 275.1788 14.34217820632669
-[25288]
+[24904]
VERSION=1.1
-NAME=IRIDIUM 65 [+]
-NICKNAME=IRIDIUM 65 [+]
-TLE1=1 25288U 98021D 09284.63127592 -.00000052 00000-0 -25546-4 0 7187
-TLE2=2 25288 86.3961 316.4859 0002601 87.8221 272.3271 14.34224159602897
+NAME=IRIDIUM 25 [+]
+NICKNAME=IRIDIUM 25 [+]
+TLE1=1 24904U 97043B 09300.51649248 .00000097 00000-0 27507-4 0 8061
+TLE2=2 24904 86.3985 341.4298 0002400 79.0766 281.0699 14.34219875637973
-[26063]
+[19822]
VERSION=1.1
-NAME=OPAL (OO-38)
-NICKNAME=OO-38
-TLE1=1 26063U 00004C 09284.52109735 -.00000035 00000-0 85305-5 0 6279
-TLE2=2 26063 100.2251 92.4272 0036595 294.0836 65.6520 14.35873710508642
+NAME=AKEBONO (EXOS-D)
+NICKNAME=AKEBONO (EXOS-D)
+TLE1=1 19822U 89016A 09301.15764960 .00010535 -15163-7 33332-3 0 3637
+TLE2=2 19822 75.0739 167.2781 2692675 158.0838 216.1641 10.01423864608764
-[31601]
+[25112]
VERSION=1.1
-NAME=OFEQ 7
-NICKNAME=OFEQ 7
-TLE1=1 31601U 07025A 09285.12437569 .00001440 00000-0 41895-4 0 6511
-TLE2=2 31601 141.7486 82.8172 0071038 18.0029 124.9208 15.19861228130228
+NAME=ORBCOMM FM08 [+]
+NICKNAME=ORBCOMM FM08 [+]
+TLE1=1 25112U 97084A 09300.52511420 .00000385 00000-0 18531-3 0 3587
+TLE2=2 25112 45.0170 94.0262 0008318 45.0021 315.1506 14.34416735619257
-[11416]
+[24869]
VERSION=1.1
-NAME=NOAA 6 [P]
-NICKNAME=NOAA 6 [P]
-TLE1=1 11416U 79057A 09284.53171173 .00000009 00000-0 19334-4 0 9939
-TLE2=2 11416 98.4069 295.8897 0009608 280.8419 79.1684 14.31936832578368
+NAME=IRIDIUM 15 [+]
+NICKNAME=IRIDIUM 15 [+]
+TLE1=1 24869U 97034A 09300.46673056 .00000005 00000-0 -52374-5 0 8453
+TLE2=2 24869 86.3924 107.7997 0002133 80.1809 279.9625 14.34214374644061
-[23448]
+[25159]
VERSION=1.1
-NAME=RADUGA 32
-NICKNAME=RADUGA 32
-TLE1=1 23448U 94087A 09276.88517704 -.00000132 00000-0 10000-3 0 1963
-TLE2=2 23448 10.4675 51.1523 0005665 130.0196 230.0820 1.00276105 71774
+NAME=ORBCOMM FM04 [+]
+NICKNAME=ORBCOMM FM04 [+]
+TLE1=1 25159U 98007C 09300.23512613 .00000167 00000-0 12415-3 0 82
+TLE2=2 25159 107.9689 21.9455 0044081 62.0558 298.5025 14.25496423608367
-[28946]
+[13969]
VERSION=1.1
-NAME=EUROBIRD 9A
-NICKNAME=EUROBIRD 9A
-TLE1=1 28946U 06007B 09281.87636444 .00000061 00000-0 10000-3 0 3898
-TLE2=2 28946 0.0075 144.1457 0003813 63.1219 134.8752 1.00272866 13181
+NAME=TDRS 1
+NICKNAME=TDRS 1
+TLE1=1 13969U 83026B 09300.12411262 -.00000294 00000-0 10000-3 0 9505
+TLE2=2 13969 13.4486 8.2175 0030417 238.1712 142.4392 1.00031055 70320
-[22912]
+[23816]
VERSION=1.1
-NAME=METEOSAT-6 (MOP-3)
-NICKNAME=METEOSAT-6 (MOP-3)
-TLE1=1 22912U 93073B 09279.95975792 -.00000013 00000-0 10000-3 0 2833
-TLE2=2 22912 8.6285 58.5348 0001022 184.8985 185.3471 1.00269581 56594
+NAME=INTELSAT 707 (IS-707)
+NICKNAME=INTELSAT 707 (IS-707)
+TLE1=1 23816U 96015A 09300.83811958 -.00000281 00000-0 10000-3 0 9127
+TLE2=2 23816 0.0059 293.3003 0003165 280.5754 71.2008 1.00272130 49908
-[24808]
+[24839]
VERSION=1.1
-NAME=THOR II
-NICKNAME=THOR II
-TLE1=1 24808U 97025A 09281.24747586 .00000038 00000-0 10000-3 0 6563
-TLE2=2 24808 1.3967 80.9130 0001203 101.5098 288.8336 1.00275456 45389
+NAME=IRIDIUM 10 [+]
+NICKNAME=IRIDIUM 10 [+]
+TLE1=1 24839U 97030D 09300.45703437 .00000137 00000-0 41841-4 0 8206
+TLE2=2 24839 86.3920 76.1119 0002186 83.9659 276.1780 14.34213699647109
-[6920]
+[25880]
VERSION=1.1
-NAME=NOAA 3 [-]
-NICKNAME=NOAA 3 [-]
-TLE1=1 06920U 73086A 09284.64866727 -.00000030 00000-0 10000-3 0 2766
-TLE2=2 06920 101.7195 302.6851 0006273 313.3535 46.7007 12.40300446626719
+NAME=TELKOM 1
+NICKNAME=TELKOM 1
+TLE1=1 25880U 99042A 09298.66938277 -.00000345 00000-0 10000-3 0 8157
+TLE2=2 25880 0.0092 55.5311 0002279 178.7032 148.9102 1.00269974 37445
-[25622]
+[22698]
VERSION=1.1
-NAME=GLOBALSTAR M040
-NICKNAME=GLOBALSTAR M040
-TLE1=1 25622U 99004B 09283.92853703 -.00000086 00000-0 10000-3 0 998
-TLE2=2 25622 51.9918 206.7499 0000731 356.9677 3.1184 12.61705705492380
+NAME=RADCAL
+NICKNAME=RADCAL
+TLE1=1 22698U 93041A 09298.73042158 .00000012 00000-0 16176-6 0 4571
+TLE2=2 22698 89.5425 20.2883 0087208 250.9763 108.1973 14.22823242847831
-[27392]
+[26643]
VERSION=1.1
-NAME=GRACE 2
-NICKNAME=GRACE 2
-TLE1=1 27392U 02012B 09284.68637858 .00000408 00000-0 11160-4 0 3148
-TLE2=2 27392 89.0185 347.4991 0018581 24.4489 335.7673 15.34308297423170
+NAME=BEIDOU 1B
+NICKNAME=BEIDOU 1B
+TLE1=1 26643U 00082A 09299.87382119 -.00000137 00000-0 10000-3 0 4675
+TLE2=2 26643 2.3390 75.9306 0003205 140.1619 214.2350 1.00273322 32453
-[32050]
+[33314]
VERSION=1.1
-NAME=INSAT-4CR
-NICKNAME=INSAT-4CR
-TLE1=1 32050U 07037A 09282.76154409 -.00000082 00000-0 10000-3 0 5243
-TLE2=2 32050 0.0565 84.3768 0003494 79.5283 202.7849 1.00272514 7751
+NAME=RAPIDEYE 1
+NICKNAME=RAPIDEYE 1
+TLE1=1 33314U 08040C 09301.12671289 -.00000204 00000-0 -19765-4 0 3674
+TLE2=2 33314 97.9681 25.4729 0026047 54.7630 305.5944 14.79901031 62855
-[27830]
+[20693]
VERSION=1.1
-NAME=BSAT-2C
-NICKNAME=BSAT-2C
-TLE1=1 27830U 03028A 09282.41215207 -.00000354 00000-0 10000-3 0 589
-TLE2=2 27830 0.0590 73.2935 0004719 131.9781 71.2316 1.00277395 23218
+NAME=COSMOS 2085
+NICKNAME=COSMOS 2085
+TLE1=1 20693U 90061A 09300.79452999 -.00000061 00000-0 10000-3 0 9893
+TLE2=2 20693 12.3746 34.4800 0002761 260.2886 99.6637 1.00263383 70577
-[24285]
+[23051]
VERSION=1.1
-NAME=FAST
-NICKNAME=FAST
-TLE1=1 24285U 96049A 09283.92551227 .00000665 00000-0 60020-4 0 8307
-TLE2=2 24285 82.9767 0.4727 1996626 307.1211 36.3194 11.26418229531568
+NAME=GOES 8 [-]
+NICKNAME=GOES 8 [-]
+TLE1=1 23051U 94022A 09299.98121118 .00000041 00000-0 10000-3 0 9920
+TLE2=2 23051 6.0741 71.7707 0007989 164.7324 195.3179 0.98904381 64029
-[25417]
+[28051]
VERSION=1.1
-NAME=ORBCOMM FM16 [+]
-NICKNAME=ORBCOMM FM16 [+]
-TLE1=1 25417U 98046E 09284.86375564 -.00000188 00000-0 -19743-4 0 1600
-TLE2=2 25417 44.9991 79.2550 0000989 221.1168 138.9608 14.27644502583367
+NAME=IRS-P6 (RESOURCESAT-1)
+NICKNAME=IRS-P6 (RESOURCESAT-1)
+TLE1=1 28051U 03046A 09301.13325798 .00000012 00000-0 25562-4 0 1012
+TLE2=2 28051 98.7046 15.2460 0002851 107.6229 252.5259 14.21633876313001
-[20436]
+[25354]
VERSION=1.1
-NAME=SPOT 2
-NICKNAME=SPOT 2
-TLE1=1 20436U 90005A 09285.13942813 .00000082 00000-0 24720-4 0 8150
-TLE2=2 20436 98.6532 358.2198 0154575 302.7180 55.9194 14.61901582 22637
+NAME=CHINASTAR 1
+NICKNAME=CHINASTAR 1
+TLE1=1 25354U 98033A 09300.83350410 -.00000203 00000-0 10000-3 0 6557
+TLE2=2 25354 0.0130 159.6467 0002406 67.2236 197.0086 1.00272651 46365
-[28939]
+[32958]
VERSION=1.1
-NAME=AKARI (ASTRO-F)
-NICKNAME=AKARI (ASTRO-F)
-TLE1=1 28939U 06005A 09284.63109366 .00000002 00000-0 10667-4 0 1087
-TLE2=2 28939 98.2509 286.8596 0008211 172.8373 187.2930 14.57566901193055
+NAME=FENGYUN 3A
+NICKNAME=FENGYUN 3A
+TLE1=1 32958U 08026A 09300.28040264 .00000167 00000-0 10000-3 0 4376
+TLE2=2 32958 98.7574 10.4133 0001345 97.3392 262.7892 14.19597358 73522
-[24277]
+[32711]
VERSION=1.1
-NAME=MIDORI (ADEOS)
-NICKNAME=MIDORI (ADEOS)
-TLE1=1 24277U 96046A 09284.84678031 -.00000017 00000-0 98676-5 0 1809
-TLE2=2 24277 98.3798 244.7626 0000875 343.0946 17.0209 14.28601119685582
+NAME=GPS BIIRM-6 (PRN 07)
+NICKNAME=GPS BIIRM-6 (PRN 07)
+TLE1=1 32711U 08012A 09299.95119801 -.00000076 00000-0 10000-3 0 2843
+TLE2=2 32711 55.5386 32.8686 0031800 175.4625 184.5903 2.00566829 11890
-[25897]
+[25260]
VERSION=1.1
-NAME=YAMAL 102
-NICKNAME=YAMAL 102
-TLE1=1 25897U 99047B 09285.18592036 -.00000236 00000-0 10000-3 0 3044
-TLE2=2 25897 5.7028 68.6897 0003626 141.8205 327.0905 1.00269835 37074
+NAME=SPOT 4
+NICKNAME=SPOT 4
+TLE1=1 25260U 98017A 09301.15595376 .00000169 00000-0 10000-3 0 6092
+TLE2=2 25260 98.6857 11.6598 0000864 136.6260 308.2355 14.20042710601208
-[25949]
+[27941]
VERSION=1.1
-NAME=TELSTAR 12 (ORION 2)
-NICKNAME=TELSTAR 12 (ORION 2)
-TLE1=1 25949U 99059A 09282.57290868 -.00000122 00000-0 10000-3 0 7366
-TLE2=2 25949 0.0573 82.7521 0002758 104.1926 22.6414 1.00271541 36522
+NAME=NIGERIASAT 1
+NICKNAME=NIGERIASAT 1
+TLE1=1 27941U 03042C 09301.10069999 .00000065 00000-0 21395-4 0 9241
+TLE2=2 27941 97.9207 170.7710 0012710 79.5350 280.7280 14.63038354324971
-[26631]
+[22117]
VERSION=1.1
-NAME=EROS A1
-NICKNAME=EROS A1
-TLE1=1 26631U 00079A 09285.25249940 .00000704 00000-0 37745-4 0 2672
-TLE2=2 26631 97.4758 349.2671 0007870 303.8419 87.1683 15.18215499492285
+NAME=SATCOM C3
+NICKNAME=SATCOM C3
+TLE1=1 22117U 92060B 09300.40750201 -.00000228 00000-0 10000-3 0 2272
+TLE2=2 22117 4.7061 70.7847 0001404 129.6391 263.1509 1.00270754 62703
-[28622]
+[25977]
VERSION=1.1
-NAME=HIMAWARI 6 (MTSAT-1R)
-NICKNAME=HIMAWARI 6 (MTSAT-1R)
-TLE1=1 28622U 05006A 09281.52240056 -.00000280 00000-0 10000-3 0 2757
-TLE2=2 28622 0.0691 9.7203 0002460 331.0602 4.6360 1.00269111 16889
+NAME=HELIOS 1B
+NICKNAME=HELIOS 1B
+TLE1=1 25977U 99064A 09301.08192401 .00000006 00000-0 85483-5 0 7498
+TLE2=2 25977 98.3467 306.5496 0000489 239.9561 120.1608 14.77730664531550
-[26824]
+[27845]
VERSION=1.1
-NAME=INTELSAT 901 (IS-901)
-NICKNAME=INTELSAT 901 (IS-901)
-TLE1=1 26824U 01024A 09282.98996131 -.00000145 00000-0 10000-3 0 4738
-TLE2=2 26824 0.0085 176.7257 0003192 14.4136 166.0014 1.00271948 30560
+NAME=QUAKESAT
+NICKNAME=QUAKESAT
+TLE1=1 27845U 03031F 09300.24314429 .00000063 00000-0 50006-4 0 6737
+TLE2=2 27845 98.7207 306.9909 0009462 137.1744 223.0168 14.20299408327918
-[26610]
+[33322]
VERSION=1.1
-NAME=STRV 1C
-NICKNAME=STRV 1C
-TLE1=1 26610U 00072C 09278.03237310 -.00000317 00000-0 00000+0 0 9877
-TLE2=2 26610 6.5796 248.3971 7333869 137.8208 310.7913 2.03459707 66050
+NAME=CZ-2C R/B
+NICKNAME=CZ-2C R/B
+TLE1=1 33322U 08041C 09301.18511589 .00164060 11141-4 36139-3 0 3995
+TLE2=2 33322 97.9817 67.1812 0150582 110.5314 251.2185 15.81114183 64701
-[24713]
+[23227]
VERSION=1.1
-NAME=AMC-2 (GE-2)
-NICKNAME=AMC-2 (GE-2)
-TLE1=1 24713U 97002A 09282.44189730 -.00000116 00000-0 10000-3 0 9704
-TLE2=2 24713 0.0675 88.0635 0002480 121.5299 226.6773 1.00264512 46497
+NAME=OPTUS B3
+NICKNAME=OPTUS B3
+TLE1=1 23227U 94055A 09300.64439547 -.00000069 00000-0 10000-3 0 4303
+TLE2=2 23227 1.7732 77.9543 0003659 128.9884 225.1868 1.00272219 55529
-[21701]
+[28372]
VERSION=1.1
-NAME=UARS
-NICKNAME=UARS
-TLE1=1 21701U 91063B 09284.23770652 .00006553 00000-0 86913-4 0 7870
-TLE2=2 21701 56.9702 215.1564 0077445 43.8099 316.9082 15.56237618997284
+NAME=APRIZESAT 1 (LATINSAT C)
+NICKNAME=APRIZESAT 1 (LATINSAT C)
+TLE1=1 28372U 04025G 09299.64850032 .00000050 00000-0 24519-4 0 5053
+TLE2=2 28372 98.0074 323.3938 0047964 25.3782 334.9761 14.48178693281522
-[32953]
+[25847]
VERSION=1.1
-NAME=YUBILEINY (RS-30)
-NICKNAME=YUBILEINY (RS-30)
-TLE1=1 32953U 08025A 09284.81913547 .00000010 00000-0 00000+0 0 4263
-TLE2=2 32953 82.5052 184.0982 0018407 288.2389 71.6690 12.43003059 62888
+NAME=MOLNIYA 3-50
+NICKNAME=MOLNIYA 3-50
+TLE1=1 25847U 99036A 09299.92931639 .00000094 00000-0 10000-3 0 7225
+TLE2=2 25847 63.6950 255.0005 6971987 265.9335 18.7542 2.00647631 75495
-[25418]
+[25771]
VERSION=1.1
-NAME=ORBCOMM FM15 [+]
-NICKNAME=ORBCOMM FM15 [+]
-TLE1=1 25418U 98046F 09284.73392628 .00000032 00000-0 68568-4 0 2131
-TLE2=2 25418 44.9985 80.0805 0002097 222.8056 137.2594 14.27655724583342
+NAME=GLOBALSTAR M049
+NICKNAME=GLOBALSTAR M049
+TLE1=1 25771U 99031B 09301.12207444 -.00000086 00000-0 10000-3 0 2410
+TLE2=2 25771 51.9976 334.9358 0000119 326.3952 33.6911 12.62255800478954
-[27847]
+[21576]
VERSION=1.1
-NAME=CANX-1
-NICKNAME=CANX-1
-TLE1=1 27847U 03031H 09284.43951775 .00000002 00000-0 21205-4 0 6127
-TLE2=2 27847 98.7063 292.9071 0009650 144.4659 215.7147 14.20977837325809
+NAME=ORBCOMM-X [-]
+NICKNAME=ORBCOMM-X [-]
+TLE1=1 21576U 91050C 09300.42292619 .00000056 00000-0 31834-4 0 1506
+TLE2=2 21576 98.4836 251.3228 0004038 13.6910 346.4383 14.39969414959575
-[7338]
+[24905]
VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 07338U 74044B 09284.49749313 .00004694 00000-0 90478-4 0 9909
-TLE2=2 07338 82.8833 329.5577 0216556 23.7402 337.3592 15.25838405817320
+NAME=IRIDIUM 46 [+]
+NICKNAME=IRIDIUM 46 [+]
+TLE1=1 24905U 97043C 09300.18033404 .00000083 00000-0 22670-4 0 8225
+TLE2=2 24905 86.3990 341.8634 0002373 82.9092 277.2368 14.34219905637932
-[24931]
+[27775]
VERSION=1.1
-NAME=EUROBIRD 4
-NICKNAME=EUROBIRD 4
-TLE1=1 24931U 97049A 09279.93622921 -.00000091 00000-0 10000-3 0 524
-TLE2=2 24931 0.6209 81.4950 0012492 75.5367 271.6105 1.00271493 44373
+NAME=COSMOS 2397
+NICKNAME=COSMOS 2397
+TLE1=1 27775U 03015A 09300.34493532 -.00000203 00000-0 10000-3 0 1354
+TLE2=2 27775 3.7159 70.4816 0045827 203.5948 156.2546 1.00486953 23884
-[694]
+[32393]
VERSION=1.1
-NAME=ATLAS CENTAUR 2
-NICKNAME=ATLAS CENTAUR 2
-TLE1=1 00694U 63047A 09284.72525668 .00000226 00000-0 16132-4 0 856
-TLE2=2 00694 30.3649 30.5930 0617087 312.7790 42.2471 13.95059697289737
+NAME=COSMOS 2434 (721)
+NICKNAME=COSMOS 2434 (721)
+TLE1=1 32393U 07065A 09300.24916752 -.00000053 00000-0 00000+0 0 3875
+TLE2=2 32393 65.0834 38.9515 0005824 138.0003 294.0325 2.13103245 14307
-[25158]
+[28376]
VERSION=1.1
-NAME=ORBCOMM FM03 [-]
-NICKNAME=ORBCOMM FM03 [-]
-TLE1=1 25158U 98007B 09284.22710569 .00000019 00000-0 62466-4 0 9987
-TLE2=2 25158 107.9666 349.7358 0048622 89.9018 270.7688 14.25464765606053
+NAME=AURA
+NICKNAME=AURA
+TLE1=1 28376U 04026A 09300.94399790 .00000074 00000-0 26452-4 0 6339
+TLE2=2 28376 98.1886 243.0596 0001440 81.7259 278.4117 14.57126832281143
-[24842]
+[25740]
VERSION=1.1
-NAME=IRIDIUM 911 [-]
-NICKNAME=IRIDIUM 911 [-]
-TLE1=1 24842U 97030G 09284.50387403 .00000069 00000-0 14516-4 0 4465
-TLE2=2 24842 86.4398 85.5847 0016859 39.6671 320.5759 14.43189098648060
+NAME=NIMIQ 1
+NICKNAME=NIMIQ 1
+TLE1=1 25740U 99027A 09299.15802686 -.00000174 00000-0 10000-3 0 7018
+TLE2=2 25740 0.0554 64.9688 0003434 157.0400 138.4179 1.00270672 38263
-[25880]
+[12585]
VERSION=1.1
-NAME=TELKOM 1
-NICKNAME=TELKOM 1
-TLE1=1 25880U 99042A 09282.26979892 -.00000346 00000-0 10000-3 0 8087
-TLE2=2 25880 0.0232 194.8700 0002118 36.2983 352.0024 1.00271969 37274
+NAME=METEOR PRIRODA
+NICKNAME=METEOR PRIRODA
+TLE1=1 12585U 81065A 09300.66264104 .00000402 00000-0 30545-4 0 4983
+TLE2=2 12585 97.3938 341.7944 0020030 348.3848 11.6922 15.07309241540515
-[28981]
+[28163]
VERSION=1.1
-NAME=ST5-B
-NICKNAME=ST5-B
-TLE1=1 28981U 06008B 09285.18636891 .00008622 14115-5 29811-3 0 1708
-TLE2=2 28981 105.6720 307.6415 2326727 53.7302 325.7000 10.75281113138374
+NAME=MOLNIYA 1-93
+NICKNAME=MOLNIYA 1-93
+TLE1=1 28163U 04005A 09300.28652604 -.00000405 00000-0 10000-3 0 449
+TLE2=2 28163 64.9020 271.6214 7139852 274.2938 255.5631 2.00622133 41681
-[24792]
+[28230]
VERSION=1.1
-NAME=IRIDIUM 8 [+]
-NICKNAME=IRIDIUM 8 [+]
-TLE1=1 24792U 97020A 09284.42603474 .00000150 00000-0 46429-4 0 7864
-TLE2=2 24792 86.3941 51.3334 0002203 82.3390 277.8055 14.34212861651040
+NAME=GP-B
+NICKNAME=GP-B
+TLE1=1 28230U 04014A 09299.56052739 .00000031 00000-0 22061-5 0 6313
+TLE2=2 28230 89.9379 157.0998 0003326 70.9723 289.1870 14.75993462297152
-[19573]
+[28485]
VERSION=1.1
-NAME=COSMOS 1975
-NICKNAME=COSMOS 1975
-TLE1=1 19573U 88093A 09285.17370666 .00000271 00000-0 22007-4 0 6715
-TLE2=2 19573 82.5249 157.9352 0019536 59.5786 300.7359 14.95418069139527
+NAME=SWIFT
+NICKNAME=SWIFT
+TLE1=1 28485U 04047A 09300.49986450 .00000763 00000-0 33828-4 0 4202
+TLE2=2 28485 20.5607 11.6866 0014559 256.0192 103.8625 14.92594553269465
-[23185]
+[25492]
VERSION=1.1
-NAME=APSTAR 1
-NICKNAME=APSTAR 1
-TLE1=1 23185U 94043A 09284.02104220 -.00000272 00000-0 10000-3 0 2925
-TLE2=2 23185 4.6906 70.8911 0001274 142.5359 315.8920 1.00272725 55740
+NAME=SIRIUS 3
+NICKNAME=SIRIUS 3
+TLE1=1 25492U 98056B 09299.90540234 .00000037 00000-0 10000-3 0 5727
+TLE2=2 25492 0.7971 81.2876 0001645 121.1051 163.9516 1.00274968 40605
-[24834]
+[28089]
VERSION=1.1
-NAME=FENGYUN 2A
-NICKNAME=FENGYUN 2A
-TLE1=1 24834U 97029A 09283.67335718 -.00000149 00000-0 10000-3 0 4242
-TLE2=2 24834 8.6739 61.3219 0095714 75.4696 285.6296 0.96052269 44871
+NAME=YAMAL 202
+NICKNAME=YAMAL 202
+TLE1=1 28089U 03053A 09300.89904307 .00000123 00000-0 10000-3 0 7707
+TLE2=2 28089 0.0276 266.5785 0002625 305.1637 197.3509 1.00276322 21777
-[26410]
+[25778]
VERSION=1.1
-NAME=CLUSTER II-FM6
-NICKNAME=CLUSTER II-FM6
-TLE1=1 26410U 00041A 09285.16666667 .00000501 00000-0 00000-0 0 3952
-TLE2=2 26410 117.5063 198.8471 8681466 37.7862 1.5740 0.42035583 5099
+NAME=IRIDIUM 21 [+]
+NICKNAME=IRIDIUM 21 [+]
+TLE1=1 25778U 99032B 09300.49405178 -.00000043 00000-0 -22265-4 0 6843
+TLE2=2 25778 86.3940 309.9215 0001748 137.0808 223.0523 14.34220440548263
-[28187]
+[25954]
VERSION=1.1
-NAME=EUTELSAT W3A
-NICKNAME=EUTELSAT W3A
-TLE1=1 28187U 04008A 09284.10382068 .00000038 00000-0 10000-3 0 8511
-TLE2=2 28187 0.0691 352.5949 0004489 201.3698 230.2482 1.00270999 20487
+NAME=AMC-4 (GE-4)
+NICKNAME=AMC-4 (GE-4)
+TLE1=1 25954U 99060A 09299.23162186 -.00000115 00000-0 00000+0 0 7576
+TLE2=2 25954 0.0396 64.6432 0002403 150.6759 161.8188 1.00272973 36544
-[30582]
+[28393]
VERSION=1.1
-NAME=THEMIS C
-NICKNAME=THEMIS C
-TLE1=1 30582U 07004C 09269.50000000 -.00002386 00000-0 00000-0 0 4524
-TLE2=2 30582 7.3721 343.8980 9002730 357.8604 119.9187 0.29257951 5392
+NAME=AMAZONAS
+NICKNAME=AMAZONAS
+TLE1=1 28393U 04031A 09298.22184201 -.00000285 00000-0 10000-3 0 6819
+TLE2=2 28393 0.0523 58.1681 0001852 90.3713 264.0720 1.00272329 19170
-[25977]
+[25853]
VERSION=1.1
-NAME=HELIOS 1B
-NICKNAME=HELIOS 1B
-TLE1=1 25977U 99064A 09285.03415693 .00000232 00000-0 40145-4 0 7053
-TLE2=2 25977 98.3473 289.9306 0001058 345.2699 14.8512 14.77724837529181
+NAME=GLOBALSTAR M051
+NICKNAME=GLOBALSTAR M051
+TLE1=1 25853U 99037C 09300.59997556 -.00000086 00000-0 10000-3 0 268
+TLE2=2 25853 52.0023 22.1838 0001842 151.0457 209.0505 12.62263333475120
-[25432]
+[24944]
VERSION=1.1
-NAME=IRIDIUM 76 [+]
-NICKNAME=IRIDIUM 76 [+]
-TLE1=1 25432U 98048B 09284.67271041 .00000111 00000-0 32678-4 0 6097
-TLE2=2 25432 86.3990 348.0432 0001728 94.0202 266.1181 14.34223513583483
+NAME=IRIDIUM 29 [+]
+NICKNAME=IRIDIUM 29 [+]
+TLE1=1 24944U 97051A 09300.29811829 .00000215 00000-0 69811-4 0 7699
+TLE2=2 24944 86.3996 13.1247 0002306 83.4431 276.7027 14.34223691634524
-[25758]
+[33060]
VERSION=1.1
-NAME=IRS-P4 (OCEANSAT 1)
-NICKNAME=IRS-P4 (OCEANSAT 1)
-TLE1=1 25758U 99029C 09284.96045364 .00000109 00000-0 38637-4 0 2709
-TLE2=2 25758 98.2765 18.0538 0000389 86.4054 273.7183 14.50865914549796
+NAME=ORBCOMM FM38 [S]
+NICKNAME=ORBCOMM FM38 [S]
+TLE1=1 33060U 08031A 09301.12127162 .00000053 00000-0 41962-4 0 4437
+TLE2=2 33060 48.4489 172.7176 0006646 255.2971 104.7203 14.68748604 72874
-[20261]
+[26463]
VERSION=1.1
-NAME=INTERCOSMOS 24
-NICKNAME=INTERCOSMOS 24
-TLE1=1 20261U 89080A 09283.77773013 .00000007 00000-0 -76680-5 0 40
-TLE2=2 20261 82.5928 24.5157 1215875 74.6147 298.5750 12.53444559914067
+NAME=CLUSTER II-FM5
+NICKNAME=CLUSTER II-FM5
+TLE1=1 26463U 00045A 09299.41666667 .00000509 00000-0 00000-0 0 3999
+TLE2=2 26463 120.2310 201.4943 8558450 36.4666 2.7388 0.42026725 5732
-[25163]
+[15945]
VERSION=1.1
-NAME=GLOBALSTAR M004
-NICKNAME=GLOBALSTAR M004
-TLE1=1 25163U 98008B 09284.83302944 -.00000086 00000-0 10000-3 0 4363
-TLE2=2 25163 51.9997 242.9152 0002905 188.6084 171.4733 12.63155909537928
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 15945U 85069B 09300.84060405 .00000121 00000-0 11971-4 0 2025
+TLE2=2 15945 82.5275 221.9406 0021760 113.2535 247.0992 14.82440902307596
-[26766]
+[24834]
VERSION=1.1
-NAME=INTELSAT 10 (IS-10)
-NICKNAME=INTELSAT 10 (IS-10)
-TLE1=1 26766U 01019A 09279.94658008 -.00000020 00000-0 10000-3 0 4593
-TLE2=2 26766 0.0248 258.6219 0000707 339.5147 186.8773 1.00273101 30796
+NAME=FENGYUN 2A
+NICKNAME=FENGYUN 2A
+TLE1=1 24834U 97029A 09300.33020160 -.00000056 00000-0 10000-3 0 4299
+TLE2=2 24834 8.7145 61.1312 0095573 76.0591 284.9926 0.96050780 45036
-[25978]
+[25311]
VERSION=1.1
-NAME=CLEMENTINE
-NICKNAME=CLEMENTINE
-TLE1=1 25978U 99064B 09284.77564404 .00000303 00000-0 41628-4 0 7639
-TLE2=2 25978 98.1330 1.5999 0011560 106.4535 253.7996 14.85529208533227
+NAME=NILESAT 101
+NICKNAME=NILESAT 101
+TLE1=1 25311U 98024A 09297.89193700 -.00000059 00000-0 10000-3 0 7873
+TLE2=2 25311 0.0572 76.0264 0003523 103.8643 167.6536 1.00273920 42364
-[29640]
+[27374]
VERSION=1.1
-NAME=FENGYUN 2D
-NICKNAME=FENGYUN 2D
-TLE1=1 29640U 06053A 09283.06525218 -.00000203 00000-0 10000-3 0 7613
-TLE2=2 29640 0.1260 180.8687 0001592 131.3255 176.6143 1.00271144 10455
+NAME=IRIDIUM 94 [S]
+NICKNAME=IRIDIUM 94 [S]
+TLE1=1 27374U 02005C 09301.20392944 -.00001037 00000-0 -19284-3 0 3394
+TLE2=2 27374 86.5802 12.5592 0002475 78.6465 281.5029 14.66235558412652
-[22931]
+[12389]
VERSION=1.1
-NAME=THAICOM 1
-NICKNAME=THAICOM 1
-TLE1=1 22931U 93078B 09282.61177035 -.00000365 00000-0 10000-3 0 4685
-TLE2=2 22931 0.6077 75.9780 0002156 188.1962 94.3504 1.00267525 57469
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 12389U 81033B 09300.80373797 .00003789 00000-0 12023-3 0 4852
+TLE2=2 12389 82.9180 205.7166 0408980 113.9731 250.4832 14.77808597456582
-[30581]
+[24901]
VERSION=1.1
-NAME=THEMIS B
-NICKNAME=THEMIS B
-TLE1=1 30581U 07004B 09269.50000000 -.00010079 00000-0 00000-0 0 2743
-TLE2=2 30581 8.7845 45.0716 8627065 288.9287 120.0537 0.10492745 6299
+NAME=AGILA 2
+NICKNAME=AGILA 2
+TLE1=1 24901U 97042A 09299.63453252 -.00000233 00000-0 10000-3 0 9215
+TLE2=2 24901 0.0765 84.5059 0003916 125.9815 199.0810 1.00272106 44631
-[28393]
+[26095]
VERSION=1.1
-NAME=AMAZONAS
-NICKNAME=AMAZONAS
-TLE1=1 28393U 04031A 09283.43257502 -.00000289 00000-0 10000-3 0 6758
-TLE2=2 28393 0.0421 43.4812 0002203 106.6540 323.7583 1.00271296 19026
+NAME=SUPERBIRD-B2
+NICKNAME=SUPERBIRD-B2
+TLE1=1 26095U 00012A 09300.45719878 -.00000089 00000-0 10000-3 0 7840
+TLE2=2 26095 0.0622 84.4634 0002147 129.3194 148.7783 1.00272428 35558
-[26082]
+[20558]
VERSION=1.1
-NAME=GLOBALSTAR M062
-NICKNAME=GLOBALSTAR M062
-TLE1=1 26082U 00008B 09284.74853924 -.00000086 00000-0 10000-3 0 9776
-TLE2=2 26082 52.0080 26.9027 0001556 79.6270 280.4762 12.62266948446402
+NAME=ASIASAT 1
+NICKNAME=ASIASAT 1
+TLE1=1 20558U 90030A 09299.88331768 .00000093 00000-0 10000-3 0 7562
+TLE2=2 20558 9.3616 58.6932 0004607 194.7933 165.1844 0.99240073 71385
-[26071]
+[28371]
VERSION=1.1
-NAME=HISPASAT 1C
-NICKNAME=HISPASAT 1C
-TLE1=1 26071U 00007A 09281.18588538 -.00000214 00000-0 10000-3 0 3131
-TLE2=2 26071 0.0772 32.7279 0003549 136.0223 245.1491 1.00270418 35526
+NAME=SAUDISAT 2
+NICKNAME=SAUDISAT 2
+TLE1=1 28371U 04025F 09301.12160323 .00000015 00000-0 14136-4 0 281
+TLE2=2 28371 98.0057 340.5346 0026312 358.1003 2.0100 14.52940123282670
-[25039]
+[25160]
VERSION=1.1
-NAME=IRIDIUM 43 [+]
-NICKNAME=IRIDIUM 43 [+]
-TLE1=1 25039U 97069A 09284.58486866 -.00000141 00000-0 -57345-4 0 7550
-TLE2=2 25039 86.3931 114.6077 0002219 72.7761 287.3674 14.34219448624189
+NAME=CELESTIS-02
+NICKNAME=CELESTIS-02
+TLE1=1 25160U 98007D 09300.68220781 -.00000112 00000-0 75465-5 0 1791
+TLE2=2 25160 107.9812 349.7907 0061022 101.8729 258.9254 14.20849572607260
-[27852]
+[25104]
VERSION=1.1
-NAME=ECHOSTAR 12 (RAINBOW 1)
-NICKNAME=ECHOSTAR 12 (RAINBOW 1)
-TLE1=1 27852U 03033A 09284.22627100 -.00000292 00000-0 10000-3 0 265
-TLE2=2 27852 0.0486 40.6136 0001257 139.9431 219.2499 1.00271408 22899
+NAME=IRIDIUM 45 [+]
+NICKNAME=IRIDIUM 45 [+]
+TLE1=1 25104U 97082A 09300.52283462 .00000078 00000-0 20653-4 0 7265
+TLE2=2 25104 86.3980 341.4468 0002427 81.0048 279.1422 14.34219813620522
-[25491]
+[33331]
VERSION=1.1
-NAME=EUTELSAT W2
-NICKNAME=EUTELSAT W2
-TLE1=1 25491U 98056A 09283.22119178 .00000098 00000-0 10000-3 0 7632
-TLE2=2 25491 0.0619 73.8912 0005040 125.8995 274.8188 1.00273932 40376
+NAME=GEOEYE 1
+NICKNAME=GEOEYE 1
+TLE1=1 33331U 08042A 09301.13258177 -.00000004 00000-0 82107-5 0 2737
+TLE2=2 33331 98.0890 13.7454 0011275 25.4891 334.6876 14.64452571 60932
-[28378]
+[23027]
VERSION=1.1
-NAME=ANIK F2
-NICKNAME=ANIK F2
-TLE1=1 28378U 04027A 09281.35846117 -.00000049 00000-0 10000-3 0 8645
-TLE2=2 28378 0.0178 274.0092 0001010 291.4373 189.6423 1.00272384 19236
+NAME=GPS BIIA-24 (PRN 06)
+NICKNAME=GPS BIIA-24 (PRN 06)
+TLE1=1 23027U 94016A 09299.98614192 .00000053 00000-0 10000-3 0 9412
+TLE2=2 23027 53.5158 150.0497 0060071 288.6930 70.7375 2.00560181114579
-[31598]
+[23915]
VERSION=1.1
-NAME=COSMO-SKYMED 1
-NICKNAME=COSMO-SKYMED 1
-TLE1=1 31598U 07023A 09285.12357571 -.00000007 00000-0 56224-5 0 6318
-TLE2=2 31598 97.8641 111.8966 0001263 74.6315 285.5035 14.82164299126949
+NAME=INTELSAT 709 (IS-709)
+NICKNAME=INTELSAT 709 (IS-709)
+TLE1=1 23915U 96035A 09300.58015644 -.00000182 00000-0 10000-3 0 197
+TLE2=2 23915 0.0041 202.1938 0002849 355.4499 132.4637 1.00271800 48988
-[24798]
+[26388]
VERSION=1.1
-NAME=DFH 3-2
-NICKNAME=DFH 3-2
-TLE1=1 24798U 97021A 09276.80773423 -.00000342 00000-0 10000-3 0 7382
-TLE2=2 24798 5.3335 69.5255 0005746 335.8174 24.3782 1.00271412 45425
+NAME=TDRS 8
+NICKNAME=TDRS 8
+TLE1=1 26388U 00034A 09300.61415964 -.00000215 00000-0 10000-3 0 547
+TLE2=2 26388 1.6984 101.7786 0004225 98.1878 146.3372 1.00277535 34251
-[25307]
+[28946]
VERSION=1.1
-NAME=GLOBALSTAR M006
-NICKNAME=GLOBALSTAR M006
-TLE1=1 25307U 98023B 09284.54786421 -.00000086 00000-0 10000-3 0 1495
-TLE2=2 25307 51.9991 295.9119 0000501 61.7177 298.3735 12.62264958528911
+NAME=EUROBIRD 9A
+NICKNAME=EUROBIRD 9A
+TLE1=1 28946U 06007B 09298.80939061 .00000061 00000-0 10000-3 0 3957
+TLE2=2 28946 0.0096 31.0673 0003862 179.7480 123.9162 1.00273919 13359
-[27939]
+[20453]
VERSION=1.1
-NAME=MOZHAYETS 4 (RS-22)
-NICKNAME=RS-22
-TLE1=1 27939U 03042A 09285.19341909 -.00000022 00000-0 46041-5 0 9118
-TLE2=2 27939 97.9229 155.6852 0014283 120.1337 240.1276 14.63346022322681
+NAME=DELTA 2 R/B(1)
+NICKNAME=DELTA 2 R/B(1)
+TLE1=1 20453U 90008B 09300.49979880 .00001235 00000-0 97950-4 0 6179
+TLE2=2 20453 35.6271 102.6977 0375804 96.6659 267.6963 14.59509748 37371
-[26390]
+[31127]
VERSION=1.1
-NAME=SIRIUS-1
-NICKNAME=SIRIUS-1
-TLE1=1 26390U 00035A 09283.83381445 .00000009 00000-0 10000-3 0 5647
-TLE2=2 26390 61.4369 254.1358 2678335 270.0329 59.3447 1.00270900 34004
+NAME=SAUDICOMSAT 4
+NICKNAME=SAUDICOMSAT 4
+TLE1=1 31127U 07012L 09300.18685473 .00000379 00000-0 89803-4 0 7773
+TLE2=2 31127 97.9760 355.4689 0069902 210.1987 149.5147 14.57980614134619
-[28492]
+[25416]
VERSION=1.1
-NAME=HELIOS-2A
-NICKNAME=HELIOS-2A
-TLE1=1 28492U 04049A 09285.16723354 -.00000166 00000-0 -22952-4 0 3901
-TLE2=2 28492 98.0932 219.8824 0001343 48.2944 311.8378 14.63841719257250
+NAME=ORBCOMM FM20 [+]
+NICKNAME=ORBCOMM FM20 [+]
+TLE1=1 25416U 98046D 09300.17865970 .00000002 00000-0 56748-4 0 5677
+TLE2=2 25416 44.9981 6.8992 0003062 251.0771 108.9757 14.27654063585512
-[35931]
+[22314]
VERSION=1.1
-NAME=OCEANSAT 2
-NICKNAME=OCEANSAT 2
-TLE1=1 35931U 09051A 09285.20489308 .00005985 00000-0 15388-2 0 382
-TLE2=2 35931 98.3333 19.7340 0002146 173.7512 186.3168 14.50522326 2741
+NAME=TDRS 6
+NICKNAME=TDRS 6
+TLE1=1 22314U 93003B 09299.64129204 .00000099 00000-0 10000-3 0 5598
+TLE2=2 22314 9.5094 57.0610 0005310 347.6555 49.8638 1.00273154 61507
-[13969]
+[8459]
VERSION=1.1
-NAME=TDRS 1
-NICKNAME=TDRS 1
-TLE1=1 13969U 83026B 09285.09480616 -.00000305 00000-0 10000-3 0 9381
-TLE2=2 13969 13.4258 8.3422 0031007 232.6557 124.9448 1.00273188 70169
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 08459U 75112B 09300.91009799 .00000034 00000-0 20590-4 0 7881
+TLE2=2 08459 74.0618 186.8296 0016321 333.2837 26.7469 14.35892181773740
-[26561]
+[12139]
VERSION=1.1
-NAME=HETE-2
-NICKNAME=HETE-2
-TLE1=1 26561U 00061A 09284.29460617 .00001172 00000-0 31378-4 0 4773
-TLE2=2 26561 1.9513 80.8124 0023651 276.2657 83.4832 14.96094033492525
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 12139U 81003B 09300.55381789 .00000543 00000-0 31303-4 0 8968
+TLE2=2 12139 82.9583 314.4294 0592343 193.8312 164.6029 14.24430107446034
-[25126]
+[28497]
VERSION=1.1
-NAME=HGS-1 (ASIASAT 3)
-NICKNAME=HGS-1 (ASIASAT 3)
-TLE1=1 25126U 97086A 09284.51924602 -.00000164 00000-0 10000-3 0 2874
-TLE2=2 25126 1.9660 115.0371 0044306 204.8397 155.6243 1.00168800 44051
+NAME=ESSAIM-4
+NICKNAME=ESSAIM-4
+TLE1=1 28497U 04049F 09301.10195204 .00000215 00000-0 44323-4 0 5143
+TLE2=2 28497 98.2868 266.4799 0011969 177.2803 182.8474 14.70166492260798
-[6909]
+[27389]
VERSION=1.1
-NAME=NNSS O-20
-NICKNAME=NNSS O-20
-TLE1=1 06909U 73081A 09284.72861704 .00000063 00000-0 52956-4 0 4873
-TLE2=2 06909 89.8639 356.3760 0160193 119.1265 242.6034 13.69761711995011
+NAME=TDRS 9
+NICKNAME=TDRS 9
+TLE1=1 27389U 02011A 09300.37003058 -.00000276 00000-0 10000-3 0 4558
+TLE2=2 27389 2.0799 225.4779 0005381 141.6688 99.8205 1.00270157 29507
-[13068]
+[28369]
VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 13068U 82013B 09285.11352130 .00000538 00000-0 40912-4 0 203
-TLE2=2 13068 81.2080 166.4873 0024941 163.5290 196.6730 15.00307952502067
+NAME=SAUDICOMSAT 1
+NICKNAME=SAUDICOMSAT 1
+TLE1=1 28369U 04025D 09299.94566069 .00000004 00000-0 11937-4 0 5202
+TLE2=2 28369 98.0076 331.9702 0033946 7.1013 353.0647 14.50654326282053
-[26093]
+[24307]
VERSION=1.1
-NAME=PICOSAT 5
-NICKNAME=PICOSAT 5
-TLE1=1 26093U 00004L 09284.52286671 .00000118 00000-0 51047-4 0 4710
-TLE2=2 26093 100.2107 136.1022 0032607 183.0536 177.0474 14.44992240508857
+NAME=INMARSAT 3-F2
+NICKNAME=INMARSAT 3-F2
+TLE1=1 24307U 96053A 09301.05140209 -.00000118 00000-0 10000-3 0 9684
+TLE2=2 24307 0.0760 319.9210 0005266 252.8454 186.8191 1.00271700 48122
-[26095]
+[29079]
VERSION=1.1
-NAME=SUPERBIRD-B2
-NICKNAME=SUPERBIRD-B2
-TLE1=1 26095U 00012A 09283.38370054 -.00000098 00000-0 10000-3 0 7728
-TLE2=2 26095 0.0060 171.2313 0002291 6.0264 142.0305 1.00272237 35377
+NAME=EROS B
+NICKNAME=EROS B
+TLE1=1 29079U 06014A 09301.14659722 .00001694 00000-0 86484-4 0 9698
+TLE2=2 29079 97.4113 59.3683 0009307 315.1345 44.4224 15.18036519194686
-[11060]
+[28187]
VERSION=1.1
-NAME=TIROS N [P]
-NICKNAME=TIROS N [P]
-TLE1=1 11060U 78096A 09284.87860433 .00000006 00000-0 25462-4 0 3061
-TLE2=2 11060 98.9435 256.0476 0011469 45.1092 315.1011 14.17485429815483
+NAME=EUTELSAT W3A
+NICKNAME=EUTELSAT W3A
+TLE1=1 28187U 04008A 09299.89109046 .00000050 00000-0 10000-3 0 8576
+TLE2=2 28187 0.0777 359.6700 0003507 234.0178 129.5103 1.00274337 20649
-[28899]
+[24903]
VERSION=1.1
-NAME=INMARSAT 4-F2
-NICKNAME=INMARSAT 4-F2
-TLE1=1 28899U 05044A 09279.89663666 .00000141 00000-0 10000-3 0 8861
-TLE2=2 28899 2.2289 317.0128 0002803 230.0163 176.5677 1.00274826 14386
+NAME=IRIDIUM 26 [+]
+NICKNAME=IRIDIUM 26 [+]
+TLE1=1 24903U 97043A 09300.48477940 .00000048 00000-0 99105-5 0 9144
+TLE2=2 24903 86.3976 341.4956 0002331 82.0209 278.1251 14.34219673638004
-[902]
+[30777]
VERSION=1.1
-NAME=CALSPHERE 2
-NICKNAME=CALSPHERE 2
-TLE1=1 00902U 64063E 09285.12663942 .00000075 00000-0 10000-3 0 1782
-TLE2=2 00902 90.1601 332.0006 0016111 271.6539 88.2757 13.52467873 33174
+NAME=CFESAT
+NICKNAME=CFESAT
+TLE1=1 30777U 07006F 09300.58129890 .00000588 00000-0 46055-4 0 6926
+TLE2=2 30777 35.4335 20.5433 0004257 310.7393 49.2952 15.02842737144986
-[16882]
+[26605]
VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 16882U 86055B 09285.13023395 .00000091 00000-0 85805-5 0 9956
-TLE2=2 16882 82.5218 336.0388 0018659 281.7737 78.1391 14.81616928252349
+NAME=GPS BIIR-06 (PRN 14)
+NICKNAME=GPS BIIR-06 (PRN 14)
+TLE1=1 26605U 00071A 09300.17595425 -.00000068 00000-0 10000-3 0 6050
+TLE2=2 26605 56.5898 335.1916 0052112 239.0628 120.4771 2.00565983 65664
-[25492]
+[22269]
VERSION=1.1
-NAME=SIRIUS 3
-NICKNAME=SIRIUS 3
-TLE1=1 25492U 98056B 09284.71410230 .00000023 00000-0 10000-3 0 5615
-TLE2=2 25492 0.7572 81.4652 0001768 131.8517 69.1630 1.00272036 40447
+NAME=COSMOS 2224
+NICKNAME=COSMOS 2224
+TLE1=1 22269U 92088A 09297.06299115 -.00000083 00000-0 10000-3 0 5866
+TLE2=2 22269 10.6789 46.2688 0003958 133.1826 226.8144 1.00272700 61202
-[33380]
+[25078]
VERSION=1.1
-NAME=COSMOS 2444 (726)
-NICKNAME=COSMOS 2444 (726)
-TLE1=1 33380U 08046C 09285.19980402 .00000031 00000-0 10000-3 0 3006
-TLE2=2 33380 64.8038 159.3470 0029091 330.7751 44.8449 2.13102873 8136
+NAME=IRIDIUM 44 [-]
+NICKNAME=IRIDIUM 44 [-]
+TLE1=1 25078U 97077B 09300.48112570 .00000093 00000-0 25030-4 0 2744
+TLE2=2 25078 86.3908 103.2151 0003921 63.3884 296.7716 14.36570777622924
-[22907]
+[29640]
VERSION=1.1
-NAME=GORIZONT 29
-NICKNAME=GORIZONT 29
-TLE1=1 22907U 93072A 09279.84743400 -.00000159 00000-0 10000-3 0 6984
-TLE2=2 22907 11.0021 47.0752 0013740 203.8376 156.0940 1.00110933 58147
+NAME=FENGYUN 2D
+NICKNAME=FENGYUN 2D
+TLE1=1 29640U 06053A 09300.81882883 -.00000190 00000-0 10000-3 0 7750
+TLE2=2 29640 0.1439 157.2148 0002179 144.6637 115.5008 1.00266775 10632
-[24870]
+[32404]
VERSION=1.1
-NAME=IRIDIUM 17 [-]
-NICKNAME=IRIDIUM 17 [-]
-TLE1=1 24870U 97034B 09284.07039755 .00000083 00000-0 22586-4 0 8024
-TLE2=2 24870 86.3918 114.5401 0002431 78.1604 281.9860 14.34448755641730
+NAME=THURAYA-3
+NICKNAME=THURAYA-3
+TLE1=1 32404U 08001A 09300.82983659 -.00000308 00000-0 10000-3 0 3297
+TLE2=2 32404 5.5173 331.8287 0004962 227.3339 234.5486 1.00270803 6603
-[32060]
+[25460]
VERSION=1.1
-NAME=WORLDVIEW-1 (WV-1)
-NICKNAME=WORLDVIEW-1 (WV-1)
-TLE1=1 32060U 07041A 09284.19970072 -.00000090 00000-0 -80989-6 0 3132
-TLE2=2 32060 97.4211 0.6411 0002260 91.0904 346.7308 15.24398934114760
+NAME=ST-1
+NICKNAME=ST-1
+TLE1=1 25460U 98049A 09300.83350481 -.00000208 00000-0 10000-3 0 7242
+TLE2=2 25460 0.0064 74.1496 0004067 132.9686 217.3098 1.00272019 40952
-[35867]
+[25025]
VERSION=1.1
-NAME=IRIS & FREGAT R/B
-NICKNAME=IRIS & FREGAT R/B
-TLE1=1 35867U 09049C 09284.84547142 .00002265 00000-0 10000-3 0 360
-TLE2=2 35867 97.3705 334.4703 0009498 195.7614 164.3227 15.22724818 3670
+NAME=TEAMSAT
+NICKNAME=TEAMSAT
+TLE1=1 25025U 97066C 09296.79373046 -.00000030 00000-0 -19714-4 0 7772
+TLE2=2 25025 7.5488 151.9727 6528023 274.7787 18.9476 3.07909874134840
-[26998]
+[26624]
VERSION=1.1
-NAME=TIMED
-NICKNAME=TIMED
-TLE1=1 26998U 01055B 09284.08344910 .00000082 00000-0 14148-4 0 4084
-TLE2=2 26998 74.0708 120.8097 0001896 212.6511 147.4545 14.84097528424717
+NAME=ANIK F1
+NICKNAME=ANIK F1
+TLE1=1 26624U 00076A 09299.51939403 -.00000074 00000-0 10000-3 0 5404
+TLE2=2 26624 0.0123 177.4851 0001013 10.9718 286.2895 1.00272749 32795
-[25693]
+[16182]
VERSION=1.1
-NAME=UOSAT 12 (UO-36)
-NICKNAME=UO-36
-TLE1=1 25693U 99021A 09284.99872316 -.00000052 00000-0 11992-4 0 360
-TLE2=2 25693 64.5562 116.9757 0010361 335.1061 24.9560 14.78761740565110
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 16182U 85097B 09300.03273649 .00000023 00000-0 36046-4 0 9878
+TLE2=2 16182 70.9990 117.0402 0007444 350.6830 9.4184 14.15957459241231
-[25860]
+[32765]
VERSION=1.1
-NAME=OKEAN-O
-NICKNAME=OKEAN-O
-TLE1=1 25860U 99039A 09285.03257435 .00000002 00000-0 76230-5 0 8077
-TLE2=2 25860 97.8007 261.6577 0001317 98.7249 261.4106 14.73590884550356
+NAME=C/NOFS
+NICKNAME=C/NOFS
+TLE1=1 32765U 08017A 09300.14241439 .00004751 00000-0 19811-3 0 4051
+TLE2=2 32765 13.0086 245.5679 0311702 68.7359 294.5916 14.81762094 82911
-[32729]
+[6212]
VERSION=1.1
-NAME=DIRECTV 11
-NICKNAME=DIRECTV 11
-TLE1=1 32729U 08013A 09285.22995832 -.00000139 00000-0 10000-3 0 3115
-TLE2=2 32729 0.0394 43.7189 0000179 118.7876 202.0119 1.00271586 5851
+NAME=OPS 8180 (RADCAT)
+NICKNAME=OPS 8180 (RADCAT)
+TLE1=1 06212U 72076A 09300.48669804 .00002894 00000-0 10532-3 0 8648
+TLE2=2 06212 98.5893 329.0030 0002161 249.1330 110.9680 15.29282804143097
-[28238]
+[33320]
VERSION=1.1
-NAME=DIRECTV 7S
-NICKNAME=DIRECTV 7S
-TLE1=1 28238U 04016A 09284.25915373 -.00000009 00000-0 10000-3 0 9828
-TLE2=2 28238 0.0024 196.3003 0002869 8.6764 149.2597 1.00272931 19988
+NAME=HJ-1A
+NICKNAME=HJ-1A
+TLE1=1 33320U 08041A 09301.14302619 .00000160 00000-0 31153-4 0 2721
+TLE2=2 33320 97.9710 14.8544 0025230 17.0124 343.1932 14.75183382 61496
-[25050]
+[29659]
VERSION=1.1
-NAME=INDOSTAR 1
-NICKNAME=INDOSTAR 1
-TLE1=1 25050U 97071B 09283.71599613 -.00000349 00000-0 10000-3 0 1161
-TLE2=2 25050 3.8414 72.7005 0003839 138.8952 173.1846 1.00272120 43657
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 29659U 06060B 09300.35474481 .00002155 00000-0 78114-4 0 8369
+TLE2=2 29659 98.0831 50.6571 0038705 138.3566 222.0626 15.28968364159222
-[26930]
+[27378]
VERSION=1.1
-NAME=PICOSAT 9
-NICKNAME=PICOSAT 9
-TLE1=1 26930U 01043B 09284.79278787 -.00000094 00000-0 -39335-5 0 2677
-TLE2=2 26930 66.9993 101.2965 0006960 308.2563 51.7908 14.30052960419415
+NAME=ECHOSTAR 7
+NICKNAME=ECHOSTAR 7
+TLE1=1 27378U 02006A 09299.45596058 .00000000 00000-0 10000-3 0 4401
+TLE2=2 27378 0.0803 57.7806 0000902 116.5843 265.8532 1.00273036 28128
-[22178]
+[29398]
VERSION=1.1
-NAME=MOLNIYA 3-42
-NICKNAME=MOLNIYA 3-42
-TLE1=1 22178U 92067A 09282.75925959 .00000332 00000-0 -76854-2 0 7423
-TLE2=2 22178 61.9254 177.0763 7236326 265.0326 16.8512 2.00603184124478
+NAME=ZHONGXING-22A
+NICKNAME=ZHONGXING-22A
+TLE1=1 29398U 06038A 09299.85260541 -.00000322 00000-0 10000-3 0 9530
+TLE2=2 29398 0.0828 64.3438 0002714 172.9421 208.2882 1.00275685 11500
-[28368]
+[28773]
VERSION=1.1
-NAME=DEMETER
-NICKNAME=DEMETER
-TLE1=1 28368U 04025C 09285.13790630 .00000052 00000-0 16573-4 0 131
-TLE2=2 28368 97.9562 347.9420 0001223 94.1165 266.0196 14.70177238282901
+NAME=SUZAKU (ASTRO-EII)
+NICKNAME=SUZAKU (ASTRO-EII)
+TLE1=1 28773U 05025A 09300.84764241 .00000506 00000-0 33171-4 0 1102
+TLE2=2 28773 31.4047 148.7910 0006245 80.1801 279.9550 15.00858681236159
-[25852]
+[25315]
VERSION=1.1
-NAME=GLOBALSTAR M032
-NICKNAME=GLOBALSTAR M032
-TLE1=1 25852U 99037B 09284.82054482 -.00000086 00000-0 10000-3 0 19
-TLE2=2 25852 52.0007 70.3037 0001102 145.3172 214.7762 12.62259752473133
+NAME=COSMOS 2350
+NICKNAME=COSMOS 2350
+TLE1=1 25315U 98025A 09299.86748407 -.00000069 00000-0 10000-3 0 4055
+TLE2=2 25315 7.6828 60.7505 0004379 355.8690 4.1198 1.00285501 42114
-[25469]
+[21906]
VERSION=1.1
-NAME=IRIDIUM 80 [+]
-NICKNAME=IRIDIUM 80 [+]
-TLE1=1 25469U 98051C 09284.61657412 -.00000565 00000-0 -20885-3 0 6759
-TLE2=2 25469 86.3948 114.5310 0002204 76.1857 283.9582 14.34216638580719
+NAME=GALAXY 5
+NICKNAME=GALAXY 5
+TLE1=1 21906U 92013A 09299.54875991 .00000006 00000-0 10000-3 0 9675
+TLE2=2 21906 4.5581 71.8213 0013399 281.5647 78.3248 0.99289868 56061
-[31574]
+[7004]
VERSION=1.1
-NAME=GLOBALSTAR M072
-NICKNAME=GLOBALSTAR M072
-TLE1=1 31574U 07020D 09284.56536745 -.00000117 00000-0 -71989-4 0 7372
-TLE2=2 31574 52.0081 71.9814 0002206 120.7562 239.3517 12.62266565109653
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 07004U 73107B 09300.65050055 .00004157 00000-0 16729-3 0 1567
+TLE2=2 07004 73.9640 351.8014 0429239 184.3683 175.3692 14.68558146819746
-[20465]
+[19223]
VERSION=1.1
-NAME=COSMOS 2058
-NICKNAME=COSMOS 2058
-TLE1=1 20465U 90010A 09284.42481806 -.00000144 00000-0 -17085-4 0 5973
-TLE2=2 20465 82.4922 49.7755 0017105 338.0624 21.9856 14.90996554 66435
+NAME=NOVA 11
+NICKNAME=NOVA 11
+TLE1=1 19223U 88052A 09300.50993461 .00000051 00000-0 10000-3 0 5579
+TLE2=2 19223 90.0166 90.9266 0032208 42.6091 317.7534 13.22417904 31131
-[31571]
+[15936]
VERSION=1.1
-NAME=GLOBALSTAR M065
-NICKNAME=GLOBALSTAR M065
-TLE1=1 31571U 07020A 09284.62965176 -.00000127 00000-0 -13172-3 0 7347
-TLE2=2 31571 51.9933 25.5776 0000845 53.8049 306.2884 12.62259455110427
+NAME=OSCAR 24
+NICKNAME=OSCAR 24
+TLE1=1 15936U 85066B 09300.72925541 .00000065 00000-0 10000-3 0 8372
+TLE2=2 15936 90.0505 20.4444 0171624 134.5360 226.9948 13.35164308180515
-[25924]
+[26382]
VERSION=1.1
-NAME=ABS 1 (LMI 1)
-NICKNAME=ABS 1 (LMI 1)
-TLE1=1 25924U 99053A 09283.03986715 -.00000092 00000-0 10000-3 0 3663
-TLE2=2 25924 0.0337 127.9221 0002712 79.9998 260.1956 1.00272162 36801
+NAME=FENGYUN 2B
+NICKNAME=FENGYUN 2B
+TLE1=1 26382U 00032A 09297.97179636 .00000139 00000-0 10000-3 0 2126
+TLE2=2 26382 4.6534 70.8289 0003999 188.1332 171.8749 1.00074005 34163
-[21922]
+[23176]
VERSION=1.1
-NAME=GORIZONT 25
-NICKNAME=GORIZONT 25
-TLE1=1 21922U 92017A 09283.16631610 -.00000281 00000-0 10000-3 0 2631
-TLE2=2 21922 11.7253 41.1957 0026372 302.4837 57.2674 0.99855057 64099
+NAME=BS-3N
+NICKNAME=BS-3N
+TLE1=1 23176U 94040B 09299.89889351 -.00000349 00000-0 10000-3 0 662
+TLE2=2 23176 0.0966 71.7601 0001378 339.0575 58.1017 1.00270882 55858
-[28380]
+[28790]
VERSION=1.1
-NAME=COSMOS 2407
-NICKNAME=COSMOS 2407
-TLE1=1 28380U 04028A 09284.43565736 .00000006 00000-0 -96573-5 0 5580
-TLE2=2 28380 82.9548 264.7990 0039835 8.6513 351.5317 13.75845990262171
+NAME=GALAXY 14 (G-14)
+NICKNAME=GALAXY 14 (G-14)
+TLE1=1 28790U 05030A 09300.47929733 .00000040 00000-0 10000-3 0 8122
+TLE2=2 28790 0.0563 53.8402 0002491 138.6931 250.9994 1.00271777 15388
-[26931]
+[32768]
VERSION=1.1
-NAME=PCSAT (NO-44)
-NICKNAME=NO-44
-TLE1=1 26931U 01043C 09284.84152504 .00000206 00000-0 11270-3 0 2862
-TLE2=2 26931 67.0505 123.8082 0006699 272.6646 87.3678 14.29570482419255
+NAME=STAR ONE C2
+NICKNAME=STAR ONE C2
+TLE1=1 32768U 08018B 09299.40905030 -.00000264 00000-0 10000-3 0 2331
+TLE2=2 32768 0.0193 230.9006 0002310 356.9783 244.3049 1.00270061 5703
-[15354]
+[21577]
VERSION=1.1
-NAME=ERBS
-NICKNAME=ERBS
-TLE1=1 15354U 84108B 09284.42881039 -.00000280 00000-0 70988-6 0 2135
-TLE2=2 15354 56.9891 35.3742 0011582 285.2389 74.7360 15.15853843369688
+NAME=TUBSAT A
+NICKNAME=TUBSAT A
+TLE1=1 21577U 91050D 09300.82114055 .00000034 00000-0 25350-4 0 6066
+TLE2=2 21577 98.4798 246.0607 00067...
[truncated message content] |
|
From: <cs...@us...> - 2009-10-27 21:27:07
|
Revision: 503
http://gpredict.svn.sourceforge.net/gpredict/?rev=503&view=rev
Author: csete
Date: 2009-10-27 21:26:57 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
Fixed bug that broke TLE update from network, caused by attempts to double-lock the tle_in_progress mutex.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/tle-update.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-25 21:37:22 UTC (rev 502)
+++ trunk/ChangeLog 2009-10-27 21:26:57 UTC (rev 503)
@@ -1,3 +1,10 @@
+2009-10-27 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/tle-update.c:
+ Fixed bug that broke TLE update from network, caused by attempts to
+ double-lock the tle_in_progress mutex.
+
+
2009-10-25 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-sat-module-popup.c:
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-10-25 21:37:22 UTC (rev 502)
+++ trunk/src/tle-update.c 2009-10-27 21:26:57 UTC (rev 503)
@@ -50,8 +50,8 @@
/* Replace flag with lock */
/* http://library.gnome.org/devel/glib/unstable/glib-Threads.html */
static GStaticMutex tle_in_progress = G_STATIC_MUTEX_INIT ;
+static GStaticMutex tle_file_in_progress = G_STATIC_MUTEX_INIT ;
-
/* private function prototypes */
static size_t my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream);
static gint read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data);
@@ -122,8 +122,13 @@
gdouble fraction = 0.0;
gdouble start = 0.0;
- if (g_static_mutex_trylock(&tle_in_progress)==FALSE)
+ if (g_static_mutex_trylock(&tle_file_in_progress)==FALSE) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: A TLE update process is already running. Aborting."),
+ __FUNCTION__);
+
return;
+ }
/* create hash table */
data = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, free_new_tle);
@@ -353,7 +358,7 @@
/* destroy hash tables */
g_hash_table_destroy (data);
- g_static_mutex_unlock(&tle_in_progress);
+ g_static_mutex_unlock(&tle_file_in_progress);
}
@@ -517,8 +522,13 @@
/* bail out if we are already in an update process */
/*if (tle_in_progress)*/
- if (g_static_mutex_trylock(&tle_in_progress)==FALSE)
+ if (g_static_mutex_trylock(&tle_in_progress)==FALSE) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: A TLE update process is already running. Aborting."),
+ __FUNCTION__);
+
return;
+ }
/*tle_in_progress = TRUE;*/
@@ -627,11 +637,20 @@
/* continue update if we have fetched at least one file */
if (success > 0) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Fetched %d files from network; updating..."),
+ __FUNCTION__, success);
/* call update_from_files */
cache = sat_file_name ("cache");
tle_update_from_files (cache, NULL, silent, progress, label1, label2);
g_free (cache);
+
}
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not fetch any new TLE files from network; aborting..."),
+ __FUNCTION__);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-25 21:37:28
|
Revision: 502
http://gpredict.svn.sourceforge.net/gpredict/?rev=502&view=rev
Author: csete
Date: 2009-10-25 21:37:22 +0000 (Sun, 25 Oct 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-10-25 21:23:39 UTC (rev 501)
+++ trunk/NEWS 2009-10-25 21:37:22 UTC (rev 502)
@@ -11,6 +11,7 @@
Charles Suprin AA1VS).
- Applied patch 2877878: Change Flag to Lock in tle-update (thanks Charles Suprin AA1VS).
- Applied patch 2877918: Fixes segfault in TLE updater (thanks Charles Suprin AA1VS).
+- Applied patch 2881367: Updated Flags to Locks (thanks Charles Suprin AA1VS).
Changes in version 1.1 (5 Oct 2009)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-25 21:23:48
|
Revision: 501
http://gpredict.svn.sourceforge.net/gpredict/?rev=501&view=rev
Author: csete
Date: 2009-10-25 21:23:39 +0000 (Sun, 25 Oct 2009)
Log Message:
-----------
Applied patch 2881367 from Charles Suprin AA1VS.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/ChangeLog 2009-10-25 21:23:39 UTC (rev 501)
@@ -1,3 +1,16 @@
+2009-10-25 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-module-popup.c:
+ * src/gtk-rig-ctrl.c:
+ * src/gtk-rig-ctrl.h:
+ * src/main.c:
+ * src/gtk-sat-module.c:
+ * src/gtk-sat-module.h:
+ * src/gtk-rot-ctrl.c:
+ * src/gtk-rot-ctrl.h:
+ Applied patch 2881367 from Charles Suprin AA1VS.
+
+
2009-10-13 Alexandru Csete <oz9aec at gmail.com>
* src/tle-update.c:
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-rig-ctrl.c 2009-10-25 21:23:39 UTC (rev 501)
@@ -41,6 +41,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <math.h>
+#include <glib.h>
#include "compat.h"
#include "sat-log.h"
#include "predict-tools.h"
@@ -186,7 +187,7 @@
ctrl->trsplist = NULL;
ctrl->trsplock = FALSE;
ctrl->tracking = FALSE;
- ctrl->busy = FALSE;
+ g_static_mutex_init(&(ctrl->busy));
ctrl->engaged = FALSE;
ctrl->delay = 1000;
ctrl->timerid = 0;
@@ -199,7 +200,7 @@
gtk_rig_ctrl_destroy (GtkObject *object)
{
GtkRigCtrl *ctrl = GTK_RIG_CTRL (object);
-
+
/* stop timer */
if (ctrl->timerid > 0)
g_source_remove (ctrl->timerid);
@@ -1260,14 +1261,12 @@
GtkRigCtrl *ctrl = GTK_RIG_CTRL (data);
- if (ctrl->busy) {
+ if (g_static_mutex_trylock(&(ctrl->busy))==FALSE) {
sat_log_log (SAT_LOG_LEVEL_ERROR,_("%s missed the deadline"),__FUNCTION__);
return TRUE;
}
- ctrl->busy = TRUE;
-
- if (ctrl->conf2 != NULL) {
+ if (ctrl->conf2 != NULL) {
exec_dual_rig_cycle (ctrl);
}
else {
@@ -1315,7 +1314,7 @@
//g_print (" WROPS = %d\n", ctrl->wrops);
- ctrl->busy = FALSE;
+ g_static_mutex_unlock(&(ctrl->busy));
return TRUE;
}
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-rig-ctrl.h 2009-10-25 21:23:39 UTC (rev 501)
@@ -98,7 +98,7 @@
guint timerid; /*!< Timer ID */
gboolean tracking; /*!< Flag set when we are tracking a target. */
- gboolean busy; /*!< Flag set when control algorithm is busy. */
+ GStaticMutex busy;/*!< Flag set when control algorithm is busy. */
gboolean engaged; /*!< Flag indicating that rig device is engaged. */
gint errcnt; /*!< Error counter. */
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-rot-ctrl.c 2009-10-25 21:23:39 UTC (rev 501)
@@ -155,7 +155,7 @@
ctrl->plot = NULL;
ctrl->tracking = FALSE;
- ctrl->busy = FALSE;
+ g_static_mutex_init(&(ctrl->busy));
ctrl->engaged = FALSE;
ctrl->delay = 1000;
ctrl->timerid = 0;
@@ -180,7 +180,7 @@
g_free (ctrl->conf);
ctrl->conf = NULL;
}
-
+
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -800,13 +800,11 @@
gboolean error = FALSE;
- if (ctrl->busy) {
+ if (g_static_mutex_trylock(&(ctrl->busy))==FALSE) {
sat_log_log (SAT_LOG_LEVEL_ERROR,_("%s missed the deadline"),__FUNCTION__);
return TRUE;
}
- ctrl->busy = TRUE;
-
/* If we are tracking and the target satellite is within
range, set the rotor position controller knob values to
the target values. If the target satellite is out of range
@@ -924,7 +922,7 @@
gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
}
- ctrl->busy = FALSE;
+ g_static_mutex_unlock(&(ctrl->busy));
return TRUE;
}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-rot-ctrl.h 2009-10-25 21:23:39 UTC (rev 501)
@@ -89,7 +89,7 @@
gdouble tolerance; /*!< Error tolerance */
gboolean tracking; /*!< Flag set when we are tracking a target. */
- gboolean busy; /*!< Flag set when control algorithm is busy. */
+ GStaticMutex busy; /*!< Flag set when control algorithm is busy. */
gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
gint errcnt; /*!< Error counter. */
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-sat-module-popup.c 2009-10-25 21:23:39 UTC (rev 501)
@@ -833,11 +833,9 @@
g_free (buff);
/* if module is busy wait until done then go on */
- while (module->busy)
- g_usleep (1000);
+ g_mutex_lock(module->busy);
/* create sky at a glance widget */
- module->busy = TRUE;
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
skg = gtk_sky_glance_new (module->satellites, module->qth, 0.0);
@@ -846,7 +844,7 @@
skg = gtk_sky_glance_new (module->satellites, module->qth, module->tmgCdnum);
}
- module->busy = FALSE;
+ g_mutex_unlock(module->busy);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
gtk_container_add (GTK_CONTAINER (window), skg);
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-sat-module.c 2009-10-25 21:23:39 UTC (rev 501)
@@ -174,7 +174,7 @@
module->rigctrlwin = NULL;
module->state = GTK_SAT_MOD_STATE_DOCKED;
- module->busy = FALSE;
+ module->busy = g_mutex_new();
module->layout = GTK_SAT_MOD_LAYOUT_1;
module->view_1 = GTK_SAT_MOD_VIEW_MAP;
@@ -766,18 +766,7 @@
gdouble delta;
- if (mod->busy) {
-
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Previous cycle missed it's deadline."),
- __FUNCTION__);
-
- return TRUE;
-
- }
-
-
- /* in docked state, update only if tab is visible */
+ /* in docked state, update only if tab is visible */
switch (mod->state) {
case GTK_SAT_MOD_STATE_DOCKED:
@@ -801,9 +790,16 @@
if (needupdate) {
- mod->busy = TRUE;
+ if (g_mutex_trylock(mod->busy)==FALSE) {
+
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Previous cycle missed it's deadline."),
+ __FUNCTION__);
+
+ return TRUE;
+
+ }
-
mod->rtNow = get_current_daynum ();
/* Update time if throttle != 0 */
@@ -879,11 +875,9 @@
}
+ g_mutex_unlock(mod->busy);
- mod->busy = FALSE;
-
}
-
return TRUE;
}
@@ -1488,8 +1482,8 @@
g_return_if_fail (IS_GTK_SAT_MODULE (module));
/* lock module */
- module->busy = TRUE;
-
+ g_mutex_lock(module->busy);
+
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Reloading satellites for module %s"),
__FUNCTION__, module->name);
@@ -1516,8 +1510,7 @@
/* FIXME: radio and rotator controller */
/* unlock module */
- module->busy = FALSE;
-
+ g_mutex_unlock(module->busy);
}
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/gtk-sat-module.h 2009-10-25 21:23:39 UTC (rev 501)
@@ -132,7 +132,7 @@
gtk_sat_mod_view_t view_3;
guint timerid; /*!< The timeout ID (FIXME: REMOVE) */
- gboolean busy; /*!< Flag indicating whether timeout has
+ GMutex *busy; /*!< Flag indicating whether timeout has
finished or not. Also used for blocking
the module during TLE update.
*/
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-10-24 11:12:33 UTC (rev 500)
+++ trunk/src/main.c 2009-10-25 21:23:39 UTC (rev 501)
@@ -102,6 +102,9 @@
/* start logger first, so that we can catch error messages if any */
sat_log_init ();
+
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
/* check that user settings are ok */
error = first_time_check_run ();
@@ -421,8 +424,6 @@
_("%s: Starting new update thread."),
__FUNCTION__);
- if (!g_thread_supported ())
- g_thread_init (NULL);
g_thread_create (update_tle_thread, NULL, FALSE, &err);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-24 11:12:40
|
Revision: 500
http://gpredict.svn.sourceforge.net/gpredict/?rev=500&view=rev
Author: csete
Date: 2009-10-24 11:12:33 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
Switch cubesat frequencies according to latest NORAD ids.
Modified Paths:
--------------
trunk/data/trsp/35933.trsp
trunk/data/trsp/35934.trsp
Modified: trunk/data/trsp/35933.trsp
===================================================================
--- trunk/data/trsp/35933.trsp 2009-10-24 10:42:18 UTC (rev 499)
+++ trunk/data/trsp/35933.trsp 2009-10-24 11:12:33 UTC (rev 500)
@@ -1,6 +1,6 @@
-[AFSK 1k2]
-DOWN_LOW=437385000
+[CW Beacon]
+DOWN_LOW=436000000
-[FSK 9k6]
-DOWN_LOW=437385000
+[GMSK 4k8 9k6]
+DOWN_LOW=436000000
Modified: trunk/data/trsp/35934.trsp
===================================================================
--- trunk/data/trsp/35934.trsp 2009-10-24 10:42:18 UTC (rev 499)
+++ trunk/data/trsp/35934.trsp 2009-10-24 11:12:33 UTC (rev 500)
@@ -1,6 +1,6 @@
-[CW Beacon]
-DOWN_LOW=436000000
+[AFSK 1k2]
+DOWN_LOW=437385000
-[GMSK 4k8 9k6]
-DOWN_LOW=436000000
+[FSK 9k6]
+DOWN_LOW=437385000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-24 10:42:24
|
Revision: 499
http://gpredict.svn.sourceforge.net/gpredict/?rev=499&view=rev
Author: csete
Date: 2009-10-24 10:42:18 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
Update names of latest cubesats. Finally identified by NORAD.
Modified Paths:
--------------
trunk/data/satdata/satellites.dat
Modified: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat 2009-10-19 20:23:26 UTC (rev 498)
+++ trunk/data/satdata/satellites.dat 2009-10-24 10:42:18 UTC (rev 499)
@@ -1387,8 +1387,8 @@
[35934]
VERSION=1.1
-NAME=BEESAT
-NICKNAME=BEESAT
+NAME=UWE-2
+NICKNAME=UWE-2
TLE1=1 35934U 09051D 09284.28320008 .00003303 00000-0 81574-3 0 252
TLE2=2 35934 98.3265 18.8513 0006209 249.5714 110.4733 14.52725289 2628
@@ -2801,8 +2801,8 @@
[35933]
VERSION=1.1
-NAME=UWE-2
-NICKNAME=UWE-2
+NAME=BEESAT
+NICKNAME=BEESAT
TLE1=1 35933U 09051C 09284.21482161 .00007800 00000-0 19109-2 0 219
TLE2=2 35933 98.3287 18.7890 0005767 262.1729 97.8870 14.52708200 2605
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-19 20:23:33
|
Revision: 498
http://gpredict.svn.sourceforge.net/gpredict/?rev=498&view=rev
Author: csete
Date: 2009-10-19 20:23:26 +0000 (Mon, 19 Oct 2009)
Log Message:
-----------
Added transponder data for Sumbandilasat.
Added Paths:
-----------
trunk/data/trsp/35870.trsp
Added: trunk/data/trsp/35870.trsp
===================================================================
--- trunk/data/trsp/35870.trsp (rev 0)
+++ trunk/data/trsp/35870.trsp 2009-10-19 20:23:26 UTC (rev 498)
@@ -0,0 +1,8 @@
+[Mode V/U FM]
+DOWN_LOW=435350000
+UP_LOW=145880000
+MODE=FM
+
+[Voice Beacon]
+DOWN_LOW=435300000
+MODE=FM
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-13 20:42:33
|
Revision: 497
http://gpredict.svn.sourceforge.net/gpredict/?rev=497&view=rev
Author: csete
Date: 2009-10-13 20:42:25 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-13 20:27:36 UTC (rev 496)
+++ trunk/ChangeLog 2009-10-13 20:42:25 UTC (rev 497)
@@ -1,3 +1,18 @@
+2009-10-13 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/tle-update.c:
+ Applied patch 2877878 and 2877918 from Charles Suprin AA1VS.
+
+ * src/gtk-rig-ctrl.c:
+ Fixed bug 2877974: Incorrect uplink Doppler.
+
+ * src/sat-cfg.c:
+ Changed some defaults for the map view.
+
+ * data/Amateur.mod:
+ Added SO-50 to list of satellites in the default module.
+
+
2009-10-12 Alexandru Csete <oz9aec at gmail.com>
* data/trsp:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-10-13 20:27:36 UTC (rev 496)
+++ trunk/NEWS 2009-10-13 20:42:25 UTC (rev 497)
@@ -1,7 +1,16 @@
Changes in version 1.2 (TBD)
-- Fixed a memory leak in the rotator controller. Thanks to Charles Suprin
- AA1VS for patch.
+* New satellite editor to manually add/edit/delete satellite data.
+* New transponder editor to edit transponder data.
+* Feature request 2866570: Set operating mode via CAT.
+* Feature request 2873824: Flip Passes.
+* Feature request 2778735: Visual indicator for RX/TX/TRX.
+* Feature request 2689352: Mutual Contact Window AOS/LOS.
+- Fixed bug 2877974: Incorrect uplink Doppler.
+- Applied patch 2876485: Fix a memory leak in the rotator controller (Thanks to
+ Charles Suprin AA1VS).
+- Applied patch 2877878: Change Flag to Lock in tle-update (thanks Charles Suprin AA1VS).
+- Applied patch 2877918: Fixes segfault in TLE updater (thanks Charles Suprin AA1VS).
Changes in version 1.1 (5 Oct 2009)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-13 20:27:45
|
Revision: 496
http://gpredict.svn.sourceforge.net/gpredict/?rev=496&view=rev
Author: csete
Date: 2009-10-13 20:27:36 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Added SO-50 to list of sats.
Modified Paths:
--------------
trunk/data/Amateur.mod
Modified: trunk/data/Amateur.mod
===================================================================
--- trunk/data/Amateur.mod 2009-10-13 20:12:03 UTC (rev 495)
+++ trunk/data/Amateur.mod 2009-10-13 20:27:36 UTC (rev 496)
@@ -1,2 +1,2 @@
[GLOBAL]
-SATELLITES=28650;28375;25544;24278;22825
+SATELLITES=28650;28375;27607;25544;24278;22825
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-13 20:12:11
|
Revision: 495
http://gpredict.svn.sourceforge.net/gpredict/?rev=495&view=rev
Author: csete
Date: 2009-10-13 20:12:03 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Changed some defaults for the map view.
Modified Paths:
--------------
trunk/src/sat-cfg.c
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-10-13 19:45:46 UTC (rev 494)
+++ trunk/src/sat-cfg.c 2009-10-13 20:12:03 UTC (rev 495)
@@ -124,7 +124,7 @@
{ "MODULES", "MAP_QTH_INFO", TRUE},
{ "MODULES", "MAP_NEXT_EVENT", TRUE},
{ "MODULES", "MAP_CURSOR_TRACK", FALSE},
- { "MODULES", "MAP_SHOW_GRID", FALSE},
+ { "MODULES", "MAP_SHOW_GRID", TRUE},
{ "MODULES", "MAP_KEEP_RATIO", FALSE},
{ "MODULES", "POLAR_QTH_INFO", TRUE},
{ "MODULES", "POLAR_NEXT_EVENT", TRUE},
@@ -158,8 +158,8 @@
{ "MODULES", "MAP_SAT_COLOUR", 0xF0F000FF},
{ "MODULES", "MAP_SELECTED_SAT_COLOUR", 0xFFFFFFFF},
{ "MODULES", "MAP_COV_AREA_COLOUR", 0xFFFFFF1F},
- { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7F7F},
- { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7F7F},
+ { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7FC8},
+ { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7FC8},
{ "MODULES", "MAP_TRACK_COLOUR", 0x00FFFFFF},
{ "MODULES", "MAP_TRACK_NUM", 1},
{ "MODULES", "POLAR_REFRESH", 3},
@@ -184,26 +184,26 @@
{ "PREDICT", "SAVE_CONTENTS", 0},
{ "PREDICT", "TWILIGHT_THRESHOLD", -6},
{ "SKY_AT_GLANCE", "TIME_SPAN_HOURS", 8},
-{ "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
-{ "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
-{ "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
-{ "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
-{ "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
-{ "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
-{ "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
-{ "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
-{ "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
-{ "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
-{ "GLOBAL", "WINDOW_POS_X", 0},
-{ "GLOBAL", "WINDOW_POS_Y", 0},
-{ "GLOBAL", "WINDOW_WIDTH", 700},
-{ "GLOBAL", "WINDOW_HEIGHT", 700},
-{ "GLOBAL", "HTML_BROWSER_TYPE", 0},
-{ "TLE", "AUTO_UPDATE_FREQ", 2},
-{ "TLE", "AUTO_UPDATE_ACTION", 1},
-{ "TLE", "LAST_UPDATE", 0},
-{ "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
-{ "LOG", "LEVEL", 4}
+ { "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
+ { "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
+ { "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
+ { "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
+ { "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
+ { "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
+ { "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
+ { "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
+ { "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
+ { "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
+ { "GLOBAL", "WINDOW_POS_X", 0},
+ { "GLOBAL", "WINDOW_POS_Y", 0},
+ { "GLOBAL", "WINDOW_WIDTH", 700},
+ { "GLOBAL", "WINDOW_HEIGHT", 700},
+ { "GLOBAL", "HTML_BROWSER_TYPE", 0},
+ { "TLE", "AUTO_UPDATE_FREQ", 2},
+ { "TLE", "AUTO_UPDATE_ACTION", 1},
+ { "TLE", "LAST_UPDATE", 0},
+ { "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
+ { "LOG", "LEVEL", 4}
};
@@ -213,8 +213,8 @@
{ "GLOBAL", "DEFAULT_QTH", "sample.qth"},
{ "GLOBAL", "OPEN_MODULES", "Amateur"},
{ "GLOBAL", "HTML_BROWSER", NULL},
- { "MODULES", "MAP_FILE", "nasa-topo_800.png"},
- { "MODULES", "MAP_FONT", "Sans 10"},
+ { "MODULES", "MAP_FILE", "nasa-bmng-07_1024.jpg"},
+ { "MODULES", "MAP_FONT", "Sans 8"},
{ "MODULES", "POLAR_FONT", "Sans 10"},
{ "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
{ "TLE", "FILES", "amateur.txt;cubesat.txt;dmc.txt;education.txt;"\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-13 19:46:07
|
Revision: 494
http://gpredict.svn.sourceforge.net/gpredict/?rev=494&view=rev
Author: csete
Date: 2009-10-13 19:45:46 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Fixed bug 2877974: Incorrect uplink Doppler.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2009-10-13 18:29:03 UTC (rev 493)
+++ trunk/src/gtk-rig-ctrl.c 2009-10-13 19:45:46 UTC (rev 494)
@@ -345,7 +345,7 @@
/* Doppler shift up */
satfreq = gtk_freq_knob_get_value (GTK_FREQ_KNOB (ctrl->SatFreqUp));
- ctrl->du = -satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
+ ctrl->du = satfreq * (ctrl->target->range_rate / 299792.4580); // Hz
buff = g_strdup_printf ("%.0f Hz", ctrl->du);
gtk_label_set_text (GTK_LABEL (ctrl->SatDopUp), buff);
g_free (buff);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-13 18:29:17
|
Revision: 493
http://gpredict.svn.sourceforge.net/gpredict/?rev=493&view=rev
Author: csete
Date: 2009-10-13 18:29:03 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
Applied patch 2877878 and 2877918 from Charles Suprin AA1VS.
Modified Paths:
--------------
trunk/src/tle-update.c
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-10-12 22:20:05 UTC (rev 492)
+++ trunk/src/tle-update.c 2009-10-13 18:29:03 UTC (rev 493)
@@ -3,6 +3,7 @@
Gpredict: Real-time satellite tracking and orbit prediction program
Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2009 Charles Suprin AA1VS.
Authors: Alexandru Csete <oz...@gm...>
@@ -45,7 +46,10 @@
e.g. user starts update from menubar while automatic
update is in progress
*/
-static gboolean tle_in_progress = FALSE;
+/* static gboolean tle_in_progress = FALSE; */
+/* Replace flag with lock */
+/* http://library.gnome.org/devel/glib/unstable/glib-Threads.html */
+static GStaticMutex tle_in_progress = G_STATIC_MUTEX_INIT ;
/* private function prototypes */
@@ -118,15 +122,16 @@
gdouble fraction = 0.0;
gdouble start = 0.0;
+ if (g_static_mutex_trylock(&tle_in_progress)==FALSE)
+ return;
-
/* create hash table */
data = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, free_new_tle);
/* open directory and read files one by one */
cache_dir = g_dir_open (dir, 0, &err);
-
+
if (err != NULL) {
/* send an error message */
@@ -348,6 +353,7 @@
/* destroy hash tables */
g_hash_table_destroy (data);
+ g_static_mutex_unlock(&tle_in_progress);
}
@@ -509,13 +515,13 @@
GError *err = NULL;
guint success = 0; /* no. of successfull downloads */
-
/* bail out if we are already in an update process */
- if (tle_in_progress)
+ /*if (tle_in_progress)*/
+ if (g_static_mutex_trylock(&tle_in_progress)==FALSE)
return;
- tle_in_progress = TRUE;
+ /*tle_in_progress = TRUE;*/
/* get server, proxy, and list of files */
server = sat_cfg_get_str (SAT_CFG_STR_TLE_SERVER);
@@ -570,7 +576,7 @@
while (g_main_context_iteration (NULL, FALSE));
}
- /* creae local cache file */
+ /* create local cache file */
userconfdir = get_user_conf_dir ();
locfile = g_strconcat (userconfdir, G_DIR_SEPARATOR_S,
"satdata", G_DIR_SEPARATOR_S,
@@ -664,7 +670,8 @@
g_free (cache);
/* clear busy flag */
- tle_in_progress = FALSE;
+ /* tle_in_progress = FALSE; */
+ g_static_mutex_unlock(&tle_in_progress);
}
@@ -728,83 +735,101 @@
/* read category name for catfile */
catfile = g_fopen (catpath, "r");
- b = fgets (category, 80, catfile);
- fclose (catfile);
+ if (catfile!=NULL) {
+ b = fgets (category, 80, catfile);
+ fclose (catfile);
+ }
+ else {
+ /* FIXME not sure what goes here AA1VS */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to open %s"),
+ __FILE__, __FUNCTION__, catpath);
+ return (retcode);
+ }
/* reopen a new catfile and write category name */
catfile = g_fopen (catpath, "w");
- g_free (catpath);
- fputs (category, catfile);
+ if (catfile!=NULL) {
- /* .cat file now contains the category name;
- satellite catnums will be added during update in the while loop */
+ fputs (category, catfile);
+
+ /* .cat file now contains the category name;
+ satellite catnums will be added during update in the while loop */
- /* read 3 lines at a time */
- while (fgets (tle_str[0], 80, fp)) {
- /* read second and third lines */
- b = fgets (tle_str[1], 80, fp);
- b = fgets (tle_str[2], 80, fp);
+ /* read 3 lines at a time */
+ while (fgets (tle_str[0], 80, fp)) {
+ /* read second and third lines */
+ b = fgets (tle_str[1], 80, fp);
+ b = fgets (tle_str[2], 80, fp);
+
+ tle_str[1][69] = '\0';
+ tle_str[2][69] = '\0';
+
+ /* 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 (Get_Next_Tle_Set (tle_str, &tle) != 1) {
+ /* TLE data not good */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Invalid data for %d"),
+ __FILE__, __FUNCTION__, catnr);
+ }
+ else {
+ /* DATA OK, phew... */
+ /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
+ /* _("%s: Good data for %d"), */
+ /* __FUNCTION__, */
+ /* catnr); */
+
+ /* store catalog number in catfile */
+ buff = g_strdup_printf ("%d\n", catnr);
+ fputs (buff, catfile);
+ g_free (buff);
+
+ /* add data to hash table */
+ key = g_try_new0 (guint, 1);
+ *key = catnr;
+
+ /* check if satellite already in hash table */
+ if (g_hash_table_lookup (data, key) == NULL) {
+
+ /* create new_tle structure */
+ ntle = g_try_new (new_tle_t, 1);
+ ntle->catnum = catnr;
+ ntle->epoch = tle.epoch;
+ ntle->satname = g_strdup (tle_str[0]);
+ ntle->line1 = g_strdup (tle_str[1]);
+ ntle->line2 = g_strdup (tle_str[2]);
+ ntle->srcfile = g_strdup (fnam);
+ ntle->isnew = TRUE; /* flag will be reset when using data */
+
+
+ g_hash_table_insert (data, key, ntle);
+ retcode++;
+ }
+ else {
+ g_free (key);
+ }
+ }
+
+ }
+
+ /* close category file */
+ fclose (catfile);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Failed to open %s"),
+ __FILE__, __FUNCTION__, catpath);
+ }
- tle_str[1][69] = '\0';
- tle_str[2][69] = '\0';
+ g_free (catpath);
- /* 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 (Get_Next_Tle_Set (tle_str, &tle) != 1) {
- /* TLE data not good */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Invalid data for %d"),
- __FILE__, __FUNCTION__, catnr);
- }
- else {
- /* DATA OK, phew... */
- /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
- /* _("%s: Good data for %d"), */
- /* __FUNCTION__, */
- /* catnr); */
-
- /* store catalog number in catfile */
- buff = g_strdup_printf ("%d\n", catnr);
- fputs (buff, catfile);
- g_free (buff);
-
- /* add data to hash table */
- key = g_try_new0 (guint, 1);
- *key = catnr;
-
- /* check if satellite already in hash table */
- if (g_hash_table_lookup (data, key) == NULL) {
-
- /* create new_tle structure */
- ntle = g_try_new (new_tle_t, 1);
- ntle->catnum = catnr;
- ntle->epoch = tle.epoch;
- ntle->satname = g_strdup (tle_str[0]);
- ntle->line1 = g_strdup (tle_str[1]);
- ntle->line2 = g_strdup (tle_str[2]);
- ntle->srcfile = g_strdup (fnam);
- ntle->isnew = TRUE; /* flag will be reset when using data */
-
-
- g_hash_table_insert (data, key, ntle);
- retcode++;
- }
- else {
- g_free (key);
- }
- }
-
- }
-
- /* close category file */
- fclose (catfile);
-
/* close input TLE file */
fclose (fp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-10-12 22:20:13
|
Revision: 492
http://gpredict.svn.sourceforge.net/gpredict/?rev=492&view=rev
Author: csete
Date: 2009-10-12 22:20:05 +0000 (Mon, 12 Oct 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-12 22:17:42 UTC (rev 491)
+++ trunk/ChangeLog 2009-10-12 22:20:05 UTC (rev 492)
@@ -1,3 +1,16 @@
+2009-10-12 Alexandru Csete <oz9aec at gmail.com>
+
+ * data/trsp:
+ Added transponder data for new cubesats.
+
+ * data/satdata:
+ Updated satellite data. Replaced 2009+051B/C/D/E names for new cubesats
+ with real names based on latest guess by DK3WN.
+
+ * src/gtk-rot-ctrl.c:
+ Fixed memory leak (thanks to Charles Suprin AA1VS for patch).
+
+
2009-09-05 Alexandru Csete <oz9aec at gmail.com>
* src/sat-pass-dialogs.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-10-12 22:17:42 UTC (rev 491)
+++ trunk/NEWS 2009-10-12 22:20:05 UTC (rev 492)
@@ -1,3 +1,9 @@
+Changes in version 1.2 (TBD)
+
+- Fixed a memory leak in the rotator controller. Thanks to Charles Suprin
+ AA1VS for patch.
+
+
Changes in version 1.1 (5 Oct 2009)
- New satellite selector in the module configuration dialog that makes
@@ -13,8 +19,9 @@
- Fixed bug 2116693: List view does not sort properly for all time formats.
- Fixed bug 2836265: Time controls should wrap around their limits.
- Fixed bug 2691499: Sky at glance crashes with empty module.
+- Fixed bug 2836263: Setup translations in Launchpad.
- Include more maps from NASA Visible Earth: Blue Marble Next Generation.
-- Binary packages for Windows, Mac OS X.
+- Binary packages for Ubuntu via PPA.
Changes in version 1.0 beta 5 (24 May 2005)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
