Merge lp:~alexwolf/stellarium-website/new-design-fix-v2 into lp:~matthew-porpoisehead/stellarium-website/new-design

Proposed by Alexander Wolf
Status: Superseded
Proposed branch: lp:~alexwolf/stellarium-website/new-design-fix-v2
Merge into: lp:~matthew-porpoisehead/stellarium-website/new-design
Diff against target: 914 lines (+287/-232)
4 files modified
css/all.css (+31/-34)
index.php (+146/-108)
po/stellarium-website.pot (+104/-86)
rss2html/template.html (+6/-4)
To merge this branch: bzr merge lp:~alexwolf/stellarium-website/new-design-fix-v2
Reviewer Review Type Date Requested Status
Matthew Gates Pending
Review via email: mp+99167@code.launchpad.net
To post a comment you must log in.
59. By Alexander Wolf

add hack to resolve long-link bug in webkit

Unmerged revisions

59. By Alexander Wolf

add hack to resolve long-link bug in webkit

58. By Alexander Wolf

improvements for look&feel

57. By Alexander Wolf

update stellarium-website.pot

56. By Alexander Wolf

update screenshots

55. By Alexander Wolf

update screenshots

54. By Alexander Wolf

new design, version 2 for header

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'css/all.css'
--- css/all.css 2012-03-23 04:58:09 +0000
+++ css/all.css 2012-03-24 14:07:20 +0000
@@ -140,29 +140,14 @@
140 display: block;140 display: block;
141}141}
142142
143#home {
144 clear: both;
145 height: 250px;
146 background: transparent url(../img/nd/bg-descr.jpg) top left repeat-x;
147}
148
149.block {143.block {
150 display: table-cell;144 display: table-cell;
151 vertical-align: top;145 vertical-align: top;
152}146}
153147
154#home-describe {
155 width: 300px;
156}
157
158#home-describe p {
159 margin: 0;
160 padding: 8px;
161 color: #000;
162 font-size: 14px;
163}
164
165#home-media {148#home-media {
149 clear: both;
150 height: 300px;
166 background: transparent url(../img/slideshow/large-slideshow-bar.png) top left no-repeat;151 background: transparent url(../img/slideshow/large-slideshow-bar.png) top left no-repeat;
167 border-bottom:1px solid #000;152 border-bottom:1px solid #000;
168}153}
@@ -173,8 +158,8 @@
173}158}
174159
175#home-media, #home-media div.slide-item {160#home-media, #home-media div.slide-item {
176 width: 580px;161 width: 880px;
177 height: 250px;162 height: 300px;
178 overflow: hidden;163 overflow: hidden;
179 position: relative;164 position: relative;
180}165}
@@ -211,11 +196,11 @@
211196
212#thumbs ul {197#thumbs ul {
213 list-style:none;198 list-style:none;
214 margin: 15px 5px 0 10px;199 margin: 15px 5px 0 10px;
215 overflow:hidden;200 overflow:hidden;
216 padding:0;201 padding:0;
217 position:absolute;202 position:absolute;
218 width:300px;203 width:600px;
219}204}
220205
221#thumbs li {206#thumbs li {
@@ -243,14 +228,14 @@
243228
244#thumbs li a.current img {229#thumbs li a.current img {
245 border: 3px solid #FFF;230 border: 3px solid #FFF;
246 margin: -1px 0 0 0;231 margin: -1px 0 0 0;
247}232}
248233
249#thumbs {234#thumbs {
250 background: transparent url(../img/slideshow/large-slideshow-bar.png) top left repeat-y;235 background: transparent url(../img/slideshow/large-slideshow-bar.png) top left repeat-y;
251 position: absolute;236 position: absolute;
252 z-index: 3;237 z-index: 3;
253 width: 572px;238 width: 872px;
254 height: auto!important;239 height: auto!important;
255 height: 80px;240 height: 80px;
256 min-height: 80px;241 min-height: 80px;
@@ -261,14 +246,14 @@
261246
262#description p {247#description p {
263 clear:both;248 clear:both;
264 color:#FFFFFF;249 color:#FFFFFF;
265 font-size: 12px;250 font-size: 12px;
266 margin:0;251 margin:0;
267 padding:5px;252 padding:5px;
268}253}
269254
270#description {255#description {
271 width:275px;256 width:375px;
272 padding: 8px 8px 8px 3px;257 padding: 8px 8px 8px 3px;
273 height: auto!important;258 height: auto!important;
274 height: 70px;259 height: 70px;
@@ -371,11 +356,28 @@
371 margin-right: 1em;356 margin-right: 1em;
372}357}
373358
359span.newsdate, span.newstitle {
360 display: block;
361 margin-left: 12px;
362 font-size: 0.7em;
363}
364
365.newsdate {
366 font-weight: bold;
367 color: #131417;
368 margin-right: 1.5em;
369}
370
374.newstitle {371.newstitle {
375 font-weight:bold;372 font-weight:bold;
376 font-size:1.1em;373 font-size:1.1em;
377}374}
378375
376/* hack for idiotic processed long links by webkit */
377.newsitem p {
378 width: 278px;
379}
380
379#xmllink ,#xmllink a, #xmllink a:hover {381#xmllink ,#xmllink a, #xmllink a:hover {
380 border:1px solid;382 border:1px solid;
381 border-color:#FC9 #630 #330 #F96;383 border-color:#FC9 #630 #330 #F96;
@@ -392,8 +394,3 @@
392 text-align: right;394 text-align: right;
393}395}
394396
395.newsdate {
396 font-weight: bold;
397 color: #131417;
398 margin-right: 1.5em;
399}
400397
=== modified file 'img/slideshow/large-slideshow-bar.png'
401Binary files img/slideshow/large-slideshow-bar.png 2011-10-04 11:07:53 +0000 and img/slideshow/large-slideshow-bar.png 2012-03-24 14:07:20 +0000 differ398Binary files img/slideshow/large-slideshow-bar.png 2011-10-04 11:07:53 +0000 and img/slideshow/large-slideshow-bar.png 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/slide-1.jpg'
402Binary files img/slideshow/slide-1.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-1.jpg 2012-03-24 14:07:20 +0000 differ399Binary files img/slideshow/slide-1.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-1.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/slide-2.jpg'
403Binary files img/slideshow/slide-2.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-2.jpg 2012-03-24 14:07:20 +0000 differ400Binary files img/slideshow/slide-2.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-2.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/slide-3.jpg'
404Binary files img/slideshow/slide-3.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-3.jpg 2012-03-24 14:07:20 +0000 differ401Binary files img/slideshow/slide-3.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-3.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/slide-4.jpg'
405Binary files img/slideshow/slide-4.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-4.jpg 2012-03-24 14:07:20 +0000 differ402Binary files img/slideshow/slide-4.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-4.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/slide-5.jpg'
406Binary files img/slideshow/slide-5.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-5.jpg 2012-03-24 14:07:20 +0000 differ403Binary files img/slideshow/slide-5.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-5.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/slide-6.jpg'
407Binary files img/slideshow/slide-6.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-6.jpg 2012-03-24 14:07:20 +0000 differ404Binary files img/slideshow/slide-6.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-6.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/slide-7.jpg'
408Binary files img/slideshow/slide-7.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-7.jpg 2012-03-24 14:07:20 +0000 differ405Binary files img/slideshow/slide-7.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-7.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/slide-8.jpg'
409Binary files img/slideshow/slide-8.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-8.jpg 2012-03-24 14:07:20 +0000 differ406Binary files img/slideshow/slide-8.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-8.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/thumbs/thumb-1.jpg'
410Binary files img/slideshow/thumbs/thumb-1.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-1.jpg 2012-03-24 14:07:20 +0000 differ407Binary files img/slideshow/thumbs/thumb-1.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-1.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/thumbs/thumb-2.jpg'
411Binary files img/slideshow/thumbs/thumb-2.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-2.jpg 2012-03-24 14:07:20 +0000 differ408Binary files img/slideshow/thumbs/thumb-2.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-2.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/thumbs/thumb-4.jpg'
412Binary files img/slideshow/thumbs/thumb-4.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-4.jpg 2012-03-24 14:07:20 +0000 differ409Binary files img/slideshow/thumbs/thumb-4.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-4.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'img/slideshow/thumbs/thumb-5.jpg'
413Binary files img/slideshow/thumbs/thumb-5.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-5.jpg 2012-03-24 14:07:20 +0000 differ410Binary files img/slideshow/thumbs/thumb-5.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/thumbs/thumb-5.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/thumbs/thumb-6.jpg'
414Binary files img/slideshow/thumbs/thumb-6.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-6.jpg 2012-03-24 14:07:20 +0000 differ411Binary files img/slideshow/thumbs/thumb-6.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-6.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/thumbs/thumb-7.jpg'
415Binary files img/slideshow/thumbs/thumb-7.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-7.jpg 2012-03-24 14:07:20 +0000 differ412Binary files img/slideshow/thumbs/thumb-7.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-7.jpg 2012-03-24 14:07:20 +0000 differ
=== added file 'img/slideshow/thumbs/thumb-8.jpg'
416Binary files img/slideshow/thumbs/thumb-8.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-8.jpg 2012-03-24 14:07:20 +0000 differ413Binary files img/slideshow/thumbs/thumb-8.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/thumbs/thumb-8.jpg 2012-03-24 14:07:20 +0000 differ
=== modified file 'index.php'
--- index.php 2012-03-23 04:58:09 +0000
+++ index.php 2012-03-24 14:07:20 +0000
@@ -72,7 +72,7 @@
72printf('<body>72printf('<body>
73<div id="wrapper">73<div id="wrapper">
74 <div id="langbar">%s ',74 <div id="langbar">%s ',
75 q_("Other languages:")); 75q_("Other languages:"));
76print '<select id="language" onchange="changelang(this.value)">';76print '<select id="language" onchange="changelang(this.value)">';
77foreach ($language as $langcode => $langname) {77foreach ($language as $langcode => $langname) {
78 if ($langcode==$locale) {78 if ($langcode==$locale) {
@@ -109,106 +109,141 @@
109 </div>109 </div>
110 </div>110 </div>
111</div>',111</div>',
112 q_('latest version'),112q_('latest version'),
113 $version,113$version,
114 $download_link_linux,114$download_link_linux,
115 q_('source'),115q_('source'),
116 $download_link_osx_u,116$download_link_osx_u,
117 $download_link_win32,117$download_link_win32,
118 $download_link_guide,118$download_link_guide,
119 q_('User guide'),119q_('User guide'),
120 q_('User guide'),120q_('User guide'),
121 q_('current'));121q_('current'));
122122
123printf(' 123printf('
124<div id="home">124<div id="home-media">
125 <div id="home-describe" class="block">125 <div class="slide-item first">
126 <p>%s</p>126 <img src="./img/slideshow/slide-1.jpg" class="photo" alt="%s" />
127 <p>%s</p>127 <h2></h2>
128 </div>',128 <div class="slide-desc">
129 q_("Stellarium is a free open source planetarium for your computer. It shows a realistic sky in 3D, just like what you see with the naked eye, binoculars or a telescope."),129 <p>%s.</p>
130 q_("It is being used in planetarium projectors. Just set your coordinates and go."));130 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
131printf(' 131 </div>
132 <div class="block">132 </div>',
133 <div id="home-media">133q_("A shooting star flashes past the Pleades. You can select different intensities in the View window"),
134 <div class="slide-item first"> 134q_("A shooting star flashes past the Pleades. You can select different intensities in the View window"),
135 <img src="./img/slideshow/slide-1.jpg" class="photo" alt="%s" /> 135q_("view screenshots"));
136 <h2></h2>136printf('
137 <div class="slide-desc"> 137 <div class="slide-item">
138 <p>%s.</p> 138 <img src="./img/slideshow/slide-2.jpg" class="photo" alt="%s"/>
139 <a href="./screenshots.html" class="read-more">%s &raquo;</a>139 <h2></h2>
140 </div> 140 <div class="slide-desc">
141 </div>',141 <p>%s.</p>
142 q_("A shooting star flashes past the Jupiter. You can select different intensities in the View window"),142 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
143 q_("A shooting star flashes past the Jupiter. You can select different intensities in the View window"), 143 </div>
144 q_("view screenshots"));144 </div>',
145printf(' 145q_("The great nebula in Orion. Press N to bring up the nebula labels. Also shown are constellation lines, press C to show or hide them"),
146 <div class="slide-item"> 146q_("The great nebula in Orion. Press N to bring up the nebula labels"),
147 <img src="./img/slideshow/slide-2.jpg" class="photo" alt="%s"/> 147q_("view screenshots"));
148 <h2></h2>148printf('
149 <div class="slide-desc"> 149 <div class="slide-item">
150 <p>%s.</p> 150 <img src="./img/slideshow/slide-3.jpg" class="photo" alt="%s"/>
151 <a href="./screenshots.html" class="read-more">%s &raquo;</a>151 <h2></h2>
152 </div> 152 <div class="slide-desc">
153 </div>',153 <p>%s.</p>
154 q_("The great nebula in Orion. Press N to bring up the nebula labels. Also shown are constellation lines, press C to show or hide them"),154 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
155 q_("The great nebula in Orion. Press N to bring up the nebula labels"),155 </div>
156 q_("view screenshots"));156 </div>',
157printf(' 157q_("The dance of the planets above ESO headquarters, near Munich"),
158 <div class="slide-item"> 158q_("The dance of the planets above ESO headquarters, near Munich"),
159 <img src="./img/slideshow/slide-3.jpg" class="photo" alt="%s"/> 159q_("view screenshots"));
160 <h2></h2>160printf('
161 <div class="slide-desc"> 161 <div class="slide-item">
162 <p>%s.</p> 162 <img src="./img/slideshow/slide-4.jpg" class="photo" alt="%s"/>
163 <a href="./screenshots.html" class="read-more">%s &raquo;</a>163 <h2></h2>
164 </div> 164 <div class="slide-desc">
165 </div>',165 <p>%s.</p>
166 q_("The dance of the planets above ESO headquarters, near Munich"),166 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
167 q_("The dance of the planets above ESO headquarters, near Munich"),167 </div>
168 q_("view screenshots"));168 </div>',
169printf(' 169q_("Full sky view of the constellations, their boundaries, the Milky Way"),
170 <div class="slide-item"> 170q_("Full sky view of the constellations, their boundaries, the Milky Way"),
171 <img src="./img/slideshow/slide-4.jpg" class="photo" alt="%s"/> 171q_("view screenshots"));
172 <h2></h2>172printf('
173 <div class="slide-desc"> 173 <div class="slide-item">
174 <p>%s.</p> 174 <img src="./img/slideshow/slide-5.jpg" class="photo" alt="%s"/>
175 <a href="./screenshots.html" class="read-more">%s &raquo;</a>175 <h2></h2>
176 </div> 176 <div class="slide-desc">
177 </div>',177 <p>%s.</p>
178 q_("Full sky view of the constellations, their boundaries, the Milky Way"),178 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
179 q_("Full sky view of the constellations, their boundaries, the Milky Way"),179 </div>
180 q_("view screenshots"));180 </div>',
181printf(' 181q_("Constellation art turned on"),
182 <div class="slide-item"> 182q_("Constellation art turned on"),
183 <img src="./img/slideshow/slide-5.jpg" class="photo" alt="%s"/> 183q_("view screenshots"));
184 <h2></h2>184printf('
185 <div class="slide-desc"> 185 <div class="slide-item">
186 <p>%s.</p> 186 <img src="./img/slideshow/slide-6.jpg" class="photo" alt="%s"/>
187 <a href="./screenshots.html" class="read-more">%s &raquo;</a>187 <h2></h2>
188 </div> 188 <div class="slide-desc">
189 </div>',189 <p>%s.</p>
190 q_("Constellation art turned on"),190 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
191 q_("Constellation art turned on"),191 </div>
192 q_("view screenshots"));192 </div>',
193q_("Stellarium can show of some historical supernovae"),
194q_("Stellarium can show of some historical supernovae"),
195q_("view screenshots"));
196printf('
197 <div class="slide-item">
198 <img src="./img/slideshow/slide-7.jpg" class="photo" alt="%s"/>
199 <h2></h2>
200 <div class="slide-desc">
201 <p>%s.</p>
202 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
203 </div>
204 </div>',
205q_("View M37 via Oculars plugin"),
206q_("View M37 via Oculars plugin"),
207q_("view screenshots"));
208printf('
209 <div class="slide-item">
210 <img src="./img/slideshow/slide-8.jpg" class="photo" alt="%s"/>
211 <h2></h2>
212 <div class="slide-desc">
213 <p>%s.</p>
214 <a href="./screenshots.html" class="read-more">%s &raquo;</a>
215 </div>
216 </div>',
217q_("Saturn from Tethys"),
218q_("Saturn from Tethys"),
219q_("view screenshots"));
193printf('220printf('
194 <div id="thumbs"> 221 <div id="thumbs">
195 <div id="description"><p>%s</p></div> 222 <div id="description"><p>%s</p></div>
196 <ul> 223 <ul>
197 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-1.jpg" width="40" height="40" alt="Slide 1" title="Slide 1"/></a></li> 224 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-1.jpg" width="40" height="40" alt="Slide 1" title="Slide 1"/></a></li>
198 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-2.jpg" width="40" height="40" alt="Slide 2" title="Slide 2"/></a></li> 225 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-2.jpg" width="40" height="40" alt="Slide 2" title="Slide 2"/></a></li>
199 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-3.jpg" width="40" height="40" alt="Slide 3" title="Slide 3"/></a></li> 226 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-3.jpg" width="40" height="40" alt="Slide 3" title="Slide 3"/></a></li>
200 <li><a href="./screenshots.html" ><img src="./img/slideshow/thumbs/thumb-4.jpg" width="40" height="40" alt="Slide 4" title="Slide 4"/></a></li> 227 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-4.jpg" width="40" height="40" alt="Slide 4" title="Slide 4"/></a></li>
201 <li class="last"><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-5.jpg" width="40" height="40" alt="Slide 5" title="Slide 5"/></a></li> 228 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-5.jpg" width="40" height="40" alt="Slide 5" title="Slide 5"/></a></li>
202 </ul> 229 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-6.jpg" width="40" height="40" alt="Slide 6" title="Slide 6"/></a></li>
203 </div> 230 <li><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-7.jpg" width="40" height="40" alt="Slide 7" title="Slide 7"/></a></li>
204 </div>231 <li class="last"><a href="./screenshots.html"><img src="./img/slideshow/thumbs/thumb-8.jpg" width="40" height="40" alt="Slide 8" title="Slide 8"/></a></li>
205 </div>232 </ul>
233 </div>
206</div>',234</div>',
207 q_("Click on the picture to the left for details."));235q_("Click on the picture to the left for details."));
208printf('236printf('
209<div id="content">237<div id="content">
210 <div id="features" class="block">238 <div id="features" class="block">
211 <h2>%s</h2>239 <h2>%s</h2>
240 <p>%s</p>
241 <p>%s</p>',
242q_("about"),
243q_("Stellarium is a free open source planetarium for your computer. It shows a realistic sky in 3D, just like what you see with the naked eye, binoculars or a telescope."),
244q_("It is being used in planetarium projectors. Just set your coordinates and go."));
245printf('
246 <h2>%s</h2>
212 <h3>%s</h3>247 <h3>%s</h3>
213 <ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>',248 <ul><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li><li>%s</li></ul>',
214q_("features"),249q_("features"),
@@ -316,8 +351,11 @@
316q_("instructions (wiki)"),351q_("instructions (wiki)"),
317q_("irc"),352q_("irc"),
318sprintf(q_("Real time chat about Stellarium can be had in the %s#stellarium%s IRC channel on the %sfreenode%s IRC network. Use your favorite IRC client to connect to %schat.freenode.net%s or try the %sweb-based interface%s."),353sprintf(q_("Real time chat about Stellarium can be had in the %s#stellarium%s IRC channel on the %sfreenode%s IRC network. Use your favorite IRC client to connect to %schat.freenode.net%s or try the %sweb-based interface%s."),
319 "<a href='irc://irc.freenode.org/stellarium'>", "</a>", "<a href='http://freenode.net'>", "</a>", "<a href='irc://irc.freenode.org/stellarium'>", "</a>", "<a href='http://webchat.freenode.net/?channels=stellarium&uio=MTE9MjQ255'>", "</a>")354 "<a href='irc://irc.freenode.org/stellarium'>", "</a>",
320 );355 "<a href='http://freenode.net'>", "</a>",
356 "<a href='irc://irc.freenode.org/stellarium'>", "</a>",
357 "<a href='http://webchat.freenode.net/?channels=stellarium&uio=MTE9MjQ255'>", "</a>")
358);
321359
322printf('<h2>%s</h2><p>360printf('<h2>%s</h2><p>
323 %s %s<br />361 %s %s<br />
@@ -333,19 +371,19 @@
333 %s %s<br />371 %s %s<br />
334 %s<br />372 %s<br />
335 </p>',373 </p>',
336 q_('developers'),374q_('developers'),
337 q_('Project coordinator:'), '<a href="http://f4bien.blogspot.com/">Fabien Ch&eacute;reau</a>',375q_('Project coordinator:'), '<a href="http://f4bien.blogspot.com/">Fabien Ch&eacute;reau</a>',
338 q_('Doc author/developer:'), '<a href="http://porpoisehead.net/">Matthew Gates</a>',376q_('Doc author/developer:'), '<a href="http://porpoisehead.net/">Matthew Gates</a>',
339 q_('Developer:'), '<a href="http://badlyhonedbytes.wordpress.com/">Bogdan Marinov</a>',377q_('Developer:'), '<a href="http://badlyhonedbytes.wordpress.com/">Bogdan Marinov</a>',
340 q_('Developer:'), '<a href="http://astro.uni-altai.ru/~aw/">Alexander Wolf</a>',378q_('Developer:'), '<a href="http://astro.uni-altai.ru/~aw/">Alexander Wolf</a>',
341 q_('Developer:'), '<a href="mailto:treaves%20(at)%20silverfieldstech.com">Timothy Reaves</a>',379q_('Developer:'), '<a href="mailto:treaves%20(at)%20silverfieldstech.com">Timothy Reaves</a>',
342 q_('Developer:'), '<a href="http://charlie137-2.blogspot.com/">Guillaume Ch&eacute;reau</a>',380q_('Developer:'), '<a href="http://charlie137-2.blogspot.com/">Guillaume Ch&eacute;reau</a>',
343 q_('Developer:'), '<a href="http://homepage.univie.ac.at/Georg.Zotti/">Georg Zotti</a>',381q_('Developer:'), '<a href="http://homepage.univie.ac.at/Georg.Zotti/">Georg Zotti</a>',
344 q_('OSX Developer:'), 'Nigel Kerr',382q_('OSX Developer:'), 'Nigel Kerr',
345 q_('OSX Developer:'), '<a href="mailto:diego.marcos%20(at)%20gmail.com">Diego Marcos</a>',383q_('OSX Developer:'), '<a href="mailto:diego.marcos%20(at)%20gmail.com">Diego Marcos</a>',
346 q_('Tester:'), 'Barry Gerdes',384q_('Tester:'), 'Barry Gerdes',
347 q_('Tester:'), 'Khalid AlAjaji',385q_('Tester:'), 'Khalid AlAjaji',
348 q_('and everyone else in the community.') );386q_('and everyone else in the community.') );
349387
350printf('388printf('
351 <h2>%s</h2>389 <h2>%s</h2>
352390
=== modified file 'po/stellarium-website.pot'
--- po/stellarium-website.pot 2012-03-19 14:43:38 +0000
+++ po/stellarium-website.pot 2012-03-24 14:07:20 +0000
@@ -8,10 +8,11 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: stellarium-website 1.0\n"9"Project-Id-Version: stellarium-website 1.0\n"
10"Report-Msgid-Bugs-To: stellarium-translation@lists.launchpad.net\n"10"Report-Msgid-Bugs-To: stellarium-translation@lists.launchpad.net\n"
11"POT-Creation-Date: 2012-03-19 21:42+0700\n"11"POT-Creation-Date: 2012-03-24 17:44+0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
15"MIME-Version: 1.0\n"16"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
@@ -46,275 +47,292 @@
46msgid "current"47msgid "current"
47msgstr ""48msgstr ""
4849
49#: index.php:12950#: index.php:133 index.php:134
50msgid ""51msgid ""
51"Stellarium is a free open source planetarium for your computer. It shows a "52"A shooting star flashes past the Pleades. You can select different "
52"realistic sky in 3D, just like what you see with the naked eye, binoculars "
53"or a telescope."
54msgstr ""
55
56#: index.php:130
57msgid ""
58"It is being used in planetarium projectors. Just set your coordinates and go."
59msgstr ""
60
61#: index.php:142 index.php:143
62msgid ""
63"A shooting star flashes past the Jupiter. You can select different "
64"intensities in the View window"53"intensities in the View window"
65msgstr ""54msgstr ""
6655
67#: index.php:144 index.php:156 index.php:168 index.php:180 index.php:19256#: index.php:135 index.php:147 index.php:159 index.php:171 index.php:183
57#: index.php:195 index.php:207 index.php:219
68msgid "view screenshots"58msgid "view screenshots"
69msgstr ""59msgstr ""
7060
71#: index.php:15461#: index.php:145
72msgid ""62msgid ""
73"The great nebula in Orion. Press N to bring up the nebula labels. Also shown "63"The great nebula in Orion. Press N to bring up the nebula labels. Also shown "
74"are constellation lines, press C to show or hide them"64"are constellation lines, press C to show or hide them"
75msgstr ""65msgstr ""
7666
77#: index.php:15567#: index.php:146
78msgid "The great nebula in Orion. Press N to bring up the nebula labels"68msgid "The great nebula in Orion. Press N to bring up the nebula labels"
79msgstr ""69msgstr ""
8070
81#: index.php:166 index.php:16771#: index.php:157 index.php:158
82msgid "The dance of the planets above ESO headquarters, near Munich"72msgid "The dance of the planets above ESO headquarters, near Munich"
83msgstr ""73msgstr ""
8474
85#: index.php:178 index.php:17975#: index.php:169 index.php:170
86msgid "Full sky view of the constellations, their boundaries, the Milky Way"76msgid "Full sky view of the constellations, their boundaries, the Milky Way"
87msgstr ""77msgstr ""
8878
89#: index.php:190 index.php:19179#: index.php:181 index.php:182
90msgid "Constellation art turned on"80msgid "Constellation art turned on"
91msgstr ""81msgstr ""
9282
93#: index.php:20783#: index.php:193 index.php:194
84msgid "Stellarium can show of some historical supernovae"
85msgstr ""
86
87#: index.php:205 index.php:206
88msgid "View M37 via Oculars plugin"
89msgstr ""
90
91#: index.php:217 index.php:218
92msgid "Saturn from Tethys"
93msgstr ""
94
95#: index.php:235
94msgid "Click on the picture to the left for details."96msgid "Click on the picture to the left for details."
95msgstr ""97msgstr ""
9698
97#: index.php:21499#: index.php:242
100msgid "about"
101msgstr ""
102
103#: index.php:243
104msgid ""
105"Stellarium is a free open source planetarium for your computer. It shows a "
106"realistic sky in 3D, just like what you see with the naked eye, binoculars "
107"or a telescope."
108msgstr ""
109
110#: index.php:244
111msgid ""
112"It is being used in planetarium projectors. Just set your coordinates and go."
113msgstr ""
114
115#: index.php:249
98msgid "features"116msgid "features"
99msgstr ""117msgstr ""
100118
101#: index.php:215119#: index.php:250
102msgid "sky"120msgid "sky"
103msgstr ""121msgstr ""
104122
105#: index.php:216123#: index.php:251
106msgid "default catalogue of over 600,000 stars"124msgid "default catalogue of over 600,000 stars"
107msgstr ""125msgstr ""
108126
109#: index.php:217127#: index.php:252
110msgid "extra catalogues with more than 210 million stars"128msgid "extra catalogues with more than 210 million stars"
111msgstr ""129msgstr ""
112130
113#: index.php:218131#: index.php:253
114msgid "asterisms and illustrations of the constellations"132msgid "asterisms and illustrations of the constellations"
115msgstr ""133msgstr ""
116134
117#: index.php:219135#: index.php:254
118msgid "constellations for twelve different cultures"136msgid "constellations for twelve different cultures"
119msgstr ""137msgstr ""
120138
121#: index.php:220139#: index.php:255
122msgid "images of nebulae (full Messier catalogue)"140msgid "images of nebulae (full Messier catalogue)"
123msgstr ""141msgstr ""
124142
125#: index.php:221143#: index.php:256
126msgid "realistic Milky Way"144msgid "realistic Milky Way"
127msgstr ""145msgstr ""
128146
129#: index.php:222147#: index.php:257
130msgid "very realistic atmosphere, sunrise and sunset"148msgid "very realistic atmosphere, sunrise and sunset"
131msgstr ""149msgstr ""
132150
133#: index.php:223151#: index.php:258
134msgid "the planets and their satellites"152msgid "the planets and their satellites"
135msgstr ""153msgstr ""
136154
137#: index.php:227155#: index.php:262
138msgid "interface"156msgid "interface"
139msgstr ""157msgstr ""
140158
141#: index.php:228159#: index.php:263
142msgid "a powerful zoom"160msgid "a powerful zoom"
143msgstr ""161msgstr ""
144162
145#: index.php:229163#: index.php:264
146msgid "time control"164msgid "time control"
147msgstr ""165msgstr ""
148166
149#: index.php:230167#: index.php:265
150msgid "multilingual interface"168msgid "multilingual interface"
151msgstr ""169msgstr ""
152170
153#: index.php:231171#: index.php:266
154msgid "fisheye projection for planetarium domes"172msgid "fisheye projection for planetarium domes"
155msgstr ""173msgstr ""
156174
157#: index.php:232175#: index.php:267
158msgid "spheric mirror projection for your own low-cost dome"176msgid "spheric mirror projection for your own low-cost dome"
159msgstr ""177msgstr ""
160178
161#: index.php:233179#: index.php:268
162msgid "all new graphical interface and extensive keyboard control"180msgid "all new graphical interface and extensive keyboard control"
163msgstr ""181msgstr ""
164182
165#: index.php:234183#: index.php:269
166msgid "telescope control"184msgid "telescope control"
167msgstr ""185msgstr ""
168186
169#: index.php:238187#: index.php:273
170msgid "visualisation"188msgid "visualisation"
171msgstr ""189msgstr ""
172190
173#: index.php:239191#: index.php:274
174msgid "equatorial and azimuthal grids"192msgid "equatorial and azimuthal grids"
175msgstr ""193msgstr ""
176194
177#: index.php:240195#: index.php:275
178msgid "star twinkling"196msgid "star twinkling"
179msgstr ""197msgstr ""
180198
181#: index.php:241199#: index.php:276
182msgid "shooting stars"200msgid "shooting stars"
183msgstr ""201msgstr ""
184202
185#: index.php:242203#: index.php:277
186msgid "eclipse simulation"204msgid "eclipse simulation"
187msgstr ""205msgstr ""
188206
189#: index.php:243207#: index.php:278
190msgid "supernovae simulation"208msgid "supernovae simulation"
191msgstr ""209msgstr ""
192210
193#: index.php:244211#: index.php:279
194msgid "skinnable landscapes, now with spheric panorama projection"212msgid "skinnable landscapes, now with spheric panorama projection"
195msgstr ""213msgstr ""
196214
197#: index.php:249215#: index.php:284
198msgid "customizability"216msgid "customizability"
199msgstr ""217msgstr ""
200218
201#: index.php:250219#: index.php:285
202msgid ""220msgid ""
203"plugin system adding artifical satellites, ocular simulation, telescope "221"plugin system adding artifical satellites, ocular simulation, telescope "
204"configuration and more"222"configuration and more"
205msgstr ""223msgstr ""
206224
207#: index.php:251225#: index.php:286
208msgid "ability to add new solar system objects from online resources..."226msgid "ability to add new solar system objects from online resources..."
209msgstr ""227msgstr ""
210228
211#: index.php:252229#: index.php:287
212msgid ""230msgid ""
213"add your own deep sky objects, landscapes, constellation images, scripts..."231"add your own deep sky objects, landscapes, constellation images, scripts..."
214msgstr ""232msgstr ""
215233
216#: index.php:256234#: index.php:291
217msgid "news"235msgid "news"
218msgstr ""236msgstr ""
219237
220#: index.php:286238#: index.php:321
221msgid "collaborate"239msgid "collaborate"
222msgstr ""240msgstr ""
223241
224#: index.php:287242#: index.php:322
225msgid ""243msgid ""
226"You can learn more about Stellarium, get support and help the project from "244"You can learn more about Stellarium, get support and help the project from "
227"these links"245"these links"
228msgstr ""246msgstr ""
229247
230#: index.php:288248#: index.php:323
231msgid "summary"249msgid "summary"
232msgstr ""250msgstr ""
233251
234#: index.php:289252#: index.php:324
235msgid "forum"253msgid "forum"
236msgstr ""254msgstr ""
237255
238#: index.php:290256#: index.php:325
239msgid "wiki"257msgid "wiki"
240msgstr ""258msgstr ""
241259
242#: index.php:291260#: index.php:326
243msgid "FAQ"261msgid "FAQ"
244msgstr ""262msgstr ""
245263
246#: index.php:292264#: index.php:327
247msgid "landscapes"265msgid "landscapes"
248msgstr ""266msgstr ""
249267
250#: index.php:293268#: index.php:328
251msgid "scripts"269msgid "scripts"
252msgstr ""270msgstr ""
253271
254#: index.php:294272#: index.php:329
255msgid "plugins"273msgid "plugins"
256msgstr ""274msgstr ""
257275
258#: index.php:295276#: index.php:330
259msgid "user's guide"277msgid "user's guide"
260msgstr ""278msgstr ""
261279
262#: index.php:296280#: index.php:331
263msgid "developers documentation"281msgid "developers documentation"
264msgstr ""282msgstr ""
265283
266#: index.php:297284#: index.php:332
267msgid "scripting"285msgid "scripting"
268msgstr ""286msgstr ""
269287
270#: index.php:298288#: index.php:333
271msgid "get support"289msgid "get support"
272msgstr ""290msgstr ""
273291
274#: index.php:299292#: index.php:334
275msgid "report bugs, request new features"293msgid "report bugs, request new features"
276msgstr ""294msgstr ""
277295
278#: index.php:300296#: index.php:335
279msgid "older releases"297msgid "older releases"
280msgstr ""298msgstr ""
281299
282#: index.php:301300#: index.php:336
283msgid "for Linux (source)"301msgid "for Linux (source)"
284msgstr ""302msgstr ""
285303
286#: index.php:302304#: index.php:337
287msgid "for Mac OS X"305msgid "for Mac OS X"
288msgstr ""306msgstr ""
289307
290#: index.php:303308#: index.php:338
291msgid "for Windows"309msgid "for Windows"
292msgstr ""310msgstr ""
293311
294#: index.php:313312#: index.php:348
295msgid "bzr"313msgid "bzr"
296msgstr ""314msgstr ""
297315
298#: index.php:314316#: index.php:349
299msgid ""317msgid ""
300"The latest development snapshot of Stellarium is kept in Bazaar, a "318"The latest development snapshot of Stellarium is kept in Bazaar, a "
301"distributed revision control system. If you want to compile development "319"distributed revision control system. If you want to compile development "
302"versions of Stellarium, this is the place to get the source code."320"versions of Stellarium, this is the place to get the source code."
303msgstr ""321msgstr ""
304322
305#: index.php:315323#: index.php:350
306msgid "browse Bazaar"324msgid "browse Bazaar"
307msgstr ""325msgstr ""
308326
309#: index.php:316327#: index.php:351
310msgid "instructions (wiki)"328msgid "instructions (wiki)"
311msgstr ""329msgstr ""
312330
313#: index.php:317331#: index.php:352
314msgid "irc"332msgid "irc"
315msgstr ""333msgstr ""
316334
317#: index.php:318335#: index.php:353
318#, php-format336#, php-format
319msgid ""337msgid ""
320"Real time chat about Stellarium can be had in the %s#stellarium%s IRC "338"Real time chat about Stellarium can be had in the %s#stellarium%s IRC "
@@ -322,39 +340,39 @@
322"connect to %schat.freenode.net%s or try the %sweb-based interface%s."340"connect to %schat.freenode.net%s or try the %sweb-based interface%s."
323msgstr ""341msgstr ""
324342
325#: index.php:336343#: index.php:374
326msgid "developers"344msgid "developers"
327msgstr ""345msgstr ""
328346
329#: index.php:337347#: index.php:375
330msgid "Project coordinator:"348msgid "Project coordinator:"
331msgstr ""349msgstr ""
332350
333#: index.php:338351#: index.php:376
334msgid "Doc author/developer:"352msgid "Doc author/developer:"
335msgstr ""353msgstr ""
336354
337#: index.php:339 index.php:340 index.php:341 index.php:342 index.php:343355#: index.php:377 index.php:378 index.php:379 index.php:380 index.php:381
338msgid "Developer:"356msgid "Developer:"
339msgstr ""357msgstr ""
340358
341#: index.php:344 index.php:345359#: index.php:382 index.php:383
342msgid "OSX Developer:"360msgid "OSX Developer:"
343msgstr ""361msgstr ""
344362
345#: index.php:346 index.php:347363#: index.php:384 index.php:385
346msgid "Tester:"364msgid "Tester:"
347msgstr ""365msgstr ""
348366
349#: index.php:348367#: index.php:386
350msgid "and everyone else in the community."368msgid "and everyone else in the community."
351msgstr ""369msgstr ""
352370
353#: index.php:361371#: index.php:399
354msgid "supporters and friends"372msgid "supporters and friends"
355msgstr ""373msgstr ""
356374
357#: index.php:362375#: index.php:400
358#, php-format376#, php-format
359msgid ""377msgid ""
360"Stellarium is produced by the efforts of the developer team, with the help "378"Stellarium is produced by the efforts of the developer team, with the help "
361379
=== modified file 'rss2html/template.html'
--- rss2html/template.html 2011-10-28 03:28:29 +0000
+++ rss2html/template.html 2012-03-24 14:07:20 +0000
@@ -1,5 +1,7 @@
1~~~BeginItemsRecord~~~1~~~BeginItemsRecord~~~
2<p><span class="newsdate">~~~ItemPubShortDate~~~</span><br>2<div class="newsitem">
3 <span class="newstitle">~~~ItemTitle~~~</span><br>3<span class="newsdate">~~~ItemPubShortDate~~~</span>
4 ~~~ItemDescription~~~ </p>4<span class="newstitle">~~~ItemTitle~~~</span>
5~~~ItemDescription~~~
6</div>
5~~~EndItemsRecord~~~7~~~EndItemsRecord~~~
6\ No newline at end of file8\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: