Merge lp:~alexwolf/stellarium-website/new-design-fix-v2 into lp:~matthew-porpoisehead/stellarium-website/new-design
- new-design-fix-v2
- Merge into new-design
Proposed by
Alexander Wolf
Status: | Needs review |
---|---|
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matthew Gates | Pending | ||
Review via email: mp+99170@code.launchpad.net |
Commit message
Description of the change
This is version 2 to solution of issue
To post a comment you must log in.
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
1 | === modified file 'css/all.css' |
2 | --- css/all.css 2012-03-23 04:58:09 +0000 |
3 | +++ css/all.css 2012-03-24 14:20:24 +0000 |
4 | @@ -140,29 +140,14 @@ |
5 | display: block; |
6 | } |
7 | |
8 | -#home { |
9 | - clear: both; |
10 | - height: 250px; |
11 | - background: transparent url(../img/nd/bg-descr.jpg) top left repeat-x; |
12 | -} |
13 | - |
14 | .block { |
15 | display: table-cell; |
16 | vertical-align: top; |
17 | } |
18 | |
19 | -#home-describe { |
20 | - width: 300px; |
21 | -} |
22 | - |
23 | -#home-describe p { |
24 | - margin: 0; |
25 | - padding: 8px; |
26 | - color: #000; |
27 | - font-size: 14px; |
28 | -} |
29 | - |
30 | #home-media { |
31 | + clear: both; |
32 | + height: 300px; |
33 | background: transparent url(../img/slideshow/large-slideshow-bar.png) top left no-repeat; |
34 | border-bottom:1px solid #000; |
35 | } |
36 | @@ -173,8 +158,8 @@ |
37 | } |
38 | |
39 | #home-media, #home-media div.slide-item { |
40 | - width: 580px; |
41 | - height: 250px; |
42 | + width: 880px; |
43 | + height: 300px; |
44 | overflow: hidden; |
45 | position: relative; |
46 | } |
47 | @@ -211,11 +196,11 @@ |
48 | |
49 | #thumbs ul { |
50 | list-style:none; |
51 | - margin: 15px 5px 0 10px; |
52 | - overflow:hidden; |
53 | + margin: 15px 5px 0 10px; |
54 | + overflow:hidden; |
55 | padding:0; |
56 | - position:absolute; |
57 | - width:300px; |
58 | + position:absolute; |
59 | + width:600px; |
60 | } |
61 | |
62 | #thumbs li { |
63 | @@ -243,14 +228,14 @@ |
64 | |
65 | #thumbs li a.current img { |
66 | border: 3px solid #FFF; |
67 | - margin: -1px 0 0 0; |
68 | + margin: -1px 0 0 0; |
69 | } |
70 | |
71 | #thumbs { |
72 | background: transparent url(../img/slideshow/large-slideshow-bar.png) top left repeat-y; |
73 | position: absolute; |
74 | z-index: 3; |
75 | - width: 572px; |
76 | + width: 872px; |
77 | height: auto!important; |
78 | height: 80px; |
79 | min-height: 80px; |
80 | @@ -261,14 +246,14 @@ |
81 | |
82 | #description p { |
83 | clear:both; |
84 | - color:#FFFFFF; |
85 | - font-size: 12px; |
86 | + color:#FFFFFF; |
87 | + font-size: 12px; |
88 | margin:0; |
89 | - padding:5px; |
90 | + padding:5px; |
91 | } |
92 | |
93 | #description { |
94 | - width:275px; |
95 | + width:375px; |
96 | padding: 8px 8px 8px 3px; |
97 | height: auto!important; |
98 | height: 70px; |
99 | @@ -371,11 +356,28 @@ |
100 | margin-right: 1em; |
101 | } |
102 | |
103 | +span.newsdate, span.newstitle { |
104 | + display: block; |
105 | + margin-left: 12px; |
106 | + font-size: 0.7em; |
107 | +} |
108 | + |
109 | +.newsdate { |
110 | + font-weight: bold; |
111 | + color: #131417; |
112 | + margin-right: 1.5em; |
113 | +} |
114 | + |
115 | .newstitle { |
116 | font-weight:bold; |
117 | font-size:1.1em; |
118 | } |
119 | |
120 | +/* hack for idiotic processed long links by webkit */ |
121 | +.newsitem p { |
122 | + width: 278px; |
123 | +} |
124 | + |
125 | #xmllink ,#xmllink a, #xmllink a:hover { |
126 | border:1px solid; |
127 | border-color:#FC9 #630 #330 #F96; |
128 | @@ -392,8 +394,3 @@ |
129 | text-align: right; |
130 | } |
131 | |
132 | -.newsdate { |
133 | - font-weight: bold; |
134 | - color: #131417; |
135 | - margin-right: 1.5em; |
136 | -} |
137 | |
138 | === modified file 'img/slideshow/large-slideshow-bar.png' |
139 | Binary 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:20:24 +0000 differ |
140 | === modified file 'img/slideshow/slide-1.jpg' |
141 | Binary files img/slideshow/slide-1.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-1.jpg 2012-03-24 14:20:24 +0000 differ |
142 | === modified file 'img/slideshow/slide-2.jpg' |
143 | Binary files img/slideshow/slide-2.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-2.jpg 2012-03-24 14:20:24 +0000 differ |
144 | === modified file 'img/slideshow/slide-3.jpg' |
145 | Binary files img/slideshow/slide-3.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-3.jpg 2012-03-24 14:20:24 +0000 differ |
146 | === modified file 'img/slideshow/slide-4.jpg' |
147 | Binary files img/slideshow/slide-4.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-4.jpg 2012-03-24 14:20:24 +0000 differ |
148 | === modified file 'img/slideshow/slide-5.jpg' |
149 | Binary files img/slideshow/slide-5.jpg 2011-10-04 11:07:53 +0000 and img/slideshow/slide-5.jpg 2012-03-24 14:20:24 +0000 differ |
150 | === added file 'img/slideshow/slide-6.jpg' |
151 | Binary files img/slideshow/slide-6.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-6.jpg 2012-03-24 14:20:24 +0000 differ |
152 | === added file 'img/slideshow/slide-7.jpg' |
153 | Binary files img/slideshow/slide-7.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-7.jpg 2012-03-24 14:20:24 +0000 differ |
154 | === added file 'img/slideshow/slide-8.jpg' |
155 | Binary files img/slideshow/slide-8.jpg 1970-01-01 00:00:00 +0000 and img/slideshow/slide-8.jpg 2012-03-24 14:20:24 +0000 differ |
156 | === modified file 'img/slideshow/thumbs/thumb-1.jpg' |
157 | Binary 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:20:24 +0000 differ |
158 | === modified file 'img/slideshow/thumbs/thumb-2.jpg' |
159 | Binary 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:20:24 +0000 differ |
160 | === modified file 'img/slideshow/thumbs/thumb-4.jpg' |
161 | Binary 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:20:24 +0000 differ |
162 | === modified file 'img/slideshow/thumbs/thumb-5.jpg' |
163 | Binary 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:20:24 +0000 differ |
164 | === added file 'img/slideshow/thumbs/thumb-6.jpg' |
165 | Binary 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:20:24 +0000 differ |
166 | === added file 'img/slideshow/thumbs/thumb-7.jpg' |
167 | Binary 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:20:24 +0000 differ |
168 | === added file 'img/slideshow/thumbs/thumb-8.jpg' |
169 | Binary 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:20:24 +0000 differ |
170 | === modified file 'index.php' |
171 | --- index.php 2012-03-23 04:58:09 +0000 |
172 | +++ index.php 2012-03-24 14:20:24 +0000 |
173 | @@ -72,7 +72,7 @@ |
174 | printf('<body> |
175 | <div id="wrapper"> |
176 | <div id="langbar">%s ', |
177 | - q_("Other languages:")); |
178 | +q_("Other languages:")); |
179 | print '<select id="language" onchange="changelang(this.value)">'; |
180 | foreach ($language as $langcode => $langname) { |
181 | if ($langcode==$locale) { |
182 | @@ -109,106 +109,141 @@ |
183 | </div> |
184 | </div> |
185 | </div>', |
186 | - q_('latest version'), |
187 | - $version, |
188 | - $download_link_linux, |
189 | - q_('source'), |
190 | - $download_link_osx_u, |
191 | - $download_link_win32, |
192 | - $download_link_guide, |
193 | - q_('User guide'), |
194 | - q_('User guide'), |
195 | - q_('current')); |
196 | +q_('latest version'), |
197 | +$version, |
198 | +$download_link_linux, |
199 | +q_('source'), |
200 | +$download_link_osx_u, |
201 | +$download_link_win32, |
202 | +$download_link_guide, |
203 | +q_('User guide'), |
204 | +q_('User guide'), |
205 | +q_('current')); |
206 | |
207 | printf(' |
208 | -<div id="home"> |
209 | - <div id="home-describe" class="block"> |
210 | - <p>%s</p> |
211 | - <p>%s</p> |
212 | - </div>', |
213 | - 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."), |
214 | - q_("It is being used in planetarium projectors. Just set your coordinates and go.")); |
215 | -printf(' |
216 | - <div class="block"> |
217 | - <div id="home-media"> |
218 | - <div class="slide-item first"> |
219 | - <img src="./img/slideshow/slide-1.jpg" class="photo" alt="%s" /> |
220 | - <h2></h2> |
221 | - <div class="slide-desc"> |
222 | - <p>%s.</p> |
223 | - <a href="./screenshots.html" class="read-more">%s »</a> |
224 | - </div> |
225 | - </div>', |
226 | - q_("A shooting star flashes past the Jupiter. You can select different intensities in the View window"), |
227 | - q_("A shooting star flashes past the Jupiter. You can select different intensities in the View window"), |
228 | - q_("view screenshots")); |
229 | -printf(' |
230 | - <div class="slide-item"> |
231 | - <img src="./img/slideshow/slide-2.jpg" class="photo" alt="%s"/> |
232 | - <h2></h2> |
233 | - <div class="slide-desc"> |
234 | - <p>%s.</p> |
235 | - <a href="./screenshots.html" class="read-more">%s »</a> |
236 | - </div> |
237 | - </div>', |
238 | - 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"), |
239 | - q_("The great nebula in Orion. Press N to bring up the nebula labels"), |
240 | - q_("view screenshots")); |
241 | -printf(' |
242 | - <div class="slide-item"> |
243 | - <img src="./img/slideshow/slide-3.jpg" class="photo" alt="%s"/> |
244 | - <h2></h2> |
245 | - <div class="slide-desc"> |
246 | - <p>%s.</p> |
247 | - <a href="./screenshots.html" class="read-more">%s »</a> |
248 | - </div> |
249 | - </div>', |
250 | - q_("The dance of the planets above ESO headquarters, near Munich"), |
251 | - q_("The dance of the planets above ESO headquarters, near Munich"), |
252 | - q_("view screenshots")); |
253 | -printf(' |
254 | - <div class="slide-item"> |
255 | - <img src="./img/slideshow/slide-4.jpg" class="photo" alt="%s"/> |
256 | - <h2></h2> |
257 | - <div class="slide-desc"> |
258 | - <p>%s.</p> |
259 | - <a href="./screenshots.html" class="read-more">%s »</a> |
260 | - </div> |
261 | - </div>', |
262 | - q_("Full sky view of the constellations, their boundaries, the Milky Way"), |
263 | - q_("Full sky view of the constellations, their boundaries, the Milky Way"), |
264 | - q_("view screenshots")); |
265 | -printf(' |
266 | - <div class="slide-item"> |
267 | - <img src="./img/slideshow/slide-5.jpg" class="photo" alt="%s"/> |
268 | - <h2></h2> |
269 | - <div class="slide-desc"> |
270 | - <p>%s.</p> |
271 | - <a href="./screenshots.html" class="read-more">%s »</a> |
272 | - </div> |
273 | - </div>', |
274 | - q_("Constellation art turned on"), |
275 | - q_("Constellation art turned on"), |
276 | - q_("view screenshots")); |
277 | +<div id="home-media"> |
278 | + <div class="slide-item first"> |
279 | + <img src="./img/slideshow/slide-1.jpg" class="photo" alt="%s" /> |
280 | + <h2></h2> |
281 | + <div class="slide-desc"> |
282 | + <p>%s.</p> |
283 | + <a href="./screenshots.html" class="read-more">%s »</a> |
284 | + </div> |
285 | + </div>', |
286 | +q_("A shooting star flashes past the Pleades. You can select different intensities in the View window"), |
287 | +q_("A shooting star flashes past the Pleades. You can select different intensities in the View window"), |
288 | +q_("view screenshots")); |
289 | +printf(' |
290 | + <div class="slide-item"> |
291 | + <img src="./img/slideshow/slide-2.jpg" class="photo" alt="%s"/> |
292 | + <h2></h2> |
293 | + <div class="slide-desc"> |
294 | + <p>%s.</p> |
295 | + <a href="./screenshots.html" class="read-more">%s »</a> |
296 | + </div> |
297 | + </div>', |
298 | +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"), |
299 | +q_("The great nebula in Orion. Press N to bring up the nebula labels"), |
300 | +q_("view screenshots")); |
301 | +printf(' |
302 | + <div class="slide-item"> |
303 | + <img src="./img/slideshow/slide-3.jpg" class="photo" alt="%s"/> |
304 | + <h2></h2> |
305 | + <div class="slide-desc"> |
306 | + <p>%s.</p> |
307 | + <a href="./screenshots.html" class="read-more">%s »</a> |
308 | + </div> |
309 | + </div>', |
310 | +q_("The dance of the planets above ESO headquarters, near Munich"), |
311 | +q_("The dance of the planets above ESO headquarters, near Munich"), |
312 | +q_("view screenshots")); |
313 | +printf(' |
314 | + <div class="slide-item"> |
315 | + <img src="./img/slideshow/slide-4.jpg" class="photo" alt="%s"/> |
316 | + <h2></h2> |
317 | + <div class="slide-desc"> |
318 | + <p>%s.</p> |
319 | + <a href="./screenshots.html" class="read-more">%s »</a> |
320 | + </div> |
321 | + </div>', |
322 | +q_("Full sky view of the constellations, their boundaries, the Milky Way"), |
323 | +q_("Full sky view of the constellations, their boundaries, the Milky Way"), |
324 | +q_("view screenshots")); |
325 | +printf(' |
326 | + <div class="slide-item"> |
327 | + <img src="./img/slideshow/slide-5.jpg" class="photo" alt="%s"/> |
328 | + <h2></h2> |
329 | + <div class="slide-desc"> |
330 | + <p>%s.</p> |
331 | + <a href="./screenshots.html" class="read-more">%s »</a> |
332 | + </div> |
333 | + </div>', |
334 | +q_("Constellation art turned on"), |
335 | +q_("Constellation art turned on"), |
336 | +q_("view screenshots")); |
337 | +printf(' |
338 | + <div class="slide-item"> |
339 | + <img src="./img/slideshow/slide-6.jpg" class="photo" alt="%s"/> |
340 | + <h2></h2> |
341 | + <div class="slide-desc"> |
342 | + <p>%s.</p> |
343 | + <a href="./screenshots.html" class="read-more">%s »</a> |
344 | + </div> |
345 | + </div>', |
346 | +q_("Stellarium can show of some historical supernovae"), |
347 | +q_("Stellarium can show of some historical supernovae"), |
348 | +q_("view screenshots")); |
349 | +printf(' |
350 | + <div class="slide-item"> |
351 | + <img src="./img/slideshow/slide-7.jpg" class="photo" alt="%s"/> |
352 | + <h2></h2> |
353 | + <div class="slide-desc"> |
354 | + <p>%s.</p> |
355 | + <a href="./screenshots.html" class="read-more">%s »</a> |
356 | + </div> |
357 | + </div>', |
358 | +q_("View M37 via Oculars plugin"), |
359 | +q_("View M37 via Oculars plugin"), |
360 | +q_("view screenshots")); |
361 | +printf(' |
362 | + <div class="slide-item"> |
363 | + <img src="./img/slideshow/slide-8.jpg" class="photo" alt="%s"/> |
364 | + <h2></h2> |
365 | + <div class="slide-desc"> |
366 | + <p>%s.</p> |
367 | + <a href="./screenshots.html" class="read-more">%s »</a> |
368 | + </div> |
369 | + </div>', |
370 | +q_("Saturn from Tethys"), |
371 | +q_("Saturn from Tethys"), |
372 | +q_("view screenshots")); |
373 | printf(' |
374 | - <div id="thumbs"> |
375 | - <div id="description"><p>%s</p></div> |
376 | - <ul> |
377 | - <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> |
378 | - <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> |
379 | - <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> |
380 | - <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> |
381 | - <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> |
382 | - </ul> |
383 | - </div> |
384 | - </div> |
385 | - </div> |
386 | + <div id="thumbs"> |
387 | + <div id="description"><p>%s</p></div> |
388 | + <ul> |
389 | + <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> |
390 | + <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> |
391 | + <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> |
392 | + <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> |
393 | + <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> |
394 | + <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> |
395 | + <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> |
396 | + <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> |
397 | + </ul> |
398 | + </div> |
399 | </div>', |
400 | - q_("Click on the picture to the left for details.")); |
401 | +q_("Click on the picture to the left for details.")); |
402 | printf(' |
403 | <div id="content"> |
404 | <div id="features" class="block"> |
405 | <h2>%s</h2> |
406 | + <p>%s</p> |
407 | + <p>%s</p>', |
408 | +q_("about"), |
409 | +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."), |
410 | +q_("It is being used in planetarium projectors. Just set your coordinates and go.")); |
411 | +printf(' |
412 | + <h2>%s</h2> |
413 | <h3>%s</h3> |
414 | <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>', |
415 | q_("features"), |
416 | @@ -316,8 +351,11 @@ |
417 | q_("instructions (wiki)"), |
418 | q_("irc"), |
419 | sprintf(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."), |
420 | - "<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>") |
421 | - ); |
422 | + "<a href='irc://irc.freenode.org/stellarium'>", "</a>", |
423 | + "<a href='http://freenode.net'>", "</a>", |
424 | + "<a href='irc://irc.freenode.org/stellarium'>", "</a>", |
425 | + "<a href='http://webchat.freenode.net/?channels=stellarium&uio=MTE9MjQ255'>", "</a>") |
426 | +); |
427 | |
428 | printf('<h2>%s</h2><p> |
429 | %s %s<br /> |
430 | @@ -333,19 +371,19 @@ |
431 | %s %s<br /> |
432 | %s<br /> |
433 | </p>', |
434 | - q_('developers'), |
435 | - q_('Project coordinator:'), '<a href="http://f4bien.blogspot.com/">Fabien Chéreau</a>', |
436 | - q_('Doc author/developer:'), '<a href="http://porpoisehead.net/">Matthew Gates</a>', |
437 | - q_('Developer:'), '<a href="http://badlyhonedbytes.wordpress.com/">Bogdan Marinov</a>', |
438 | - q_('Developer:'), '<a href="http://astro.uni-altai.ru/~aw/">Alexander Wolf</a>', |
439 | - q_('Developer:'), '<a href="mailto:treaves%20(at)%20silverfieldstech.com">Timothy Reaves</a>', |
440 | - q_('Developer:'), '<a href="http://charlie137-2.blogspot.com/">Guillaume Chéreau</a>', |
441 | - q_('Developer:'), '<a href="http://homepage.univie.ac.at/Georg.Zotti/">Georg Zotti</a>', |
442 | - q_('OSX Developer:'), 'Nigel Kerr', |
443 | - q_('OSX Developer:'), '<a href="mailto:diego.marcos%20(at)%20gmail.com">Diego Marcos</a>', |
444 | - q_('Tester:'), 'Barry Gerdes', |
445 | - q_('Tester:'), 'Khalid AlAjaji', |
446 | - q_('and everyone else in the community.') ); |
447 | +q_('developers'), |
448 | +q_('Project coordinator:'), '<a href="http://f4bien.blogspot.com/">Fabien Chéreau</a>', |
449 | +q_('Doc author/developer:'), '<a href="http://porpoisehead.net/">Matthew Gates</a>', |
450 | +q_('Developer:'), '<a href="http://badlyhonedbytes.wordpress.com/">Bogdan Marinov</a>', |
451 | +q_('Developer:'), '<a href="http://astro.uni-altai.ru/~aw/">Alexander Wolf</a>', |
452 | +q_('Developer:'), '<a href="mailto:treaves%20(at)%20silverfieldstech.com">Timothy Reaves</a>', |
453 | +q_('Developer:'), '<a href="http://charlie137-2.blogspot.com/">Guillaume Chéreau</a>', |
454 | +q_('Developer:'), '<a href="http://homepage.univie.ac.at/Georg.Zotti/">Georg Zotti</a>', |
455 | +q_('OSX Developer:'), 'Nigel Kerr', |
456 | +q_('OSX Developer:'), '<a href="mailto:diego.marcos%20(at)%20gmail.com">Diego Marcos</a>', |
457 | +q_('Tester:'), 'Barry Gerdes', |
458 | +q_('Tester:'), 'Khalid AlAjaji', |
459 | +q_('and everyone else in the community.') ); |
460 | |
461 | printf(' |
462 | <h2>%s</h2> |
463 | |
464 | === modified file 'po/stellarium-website.pot' |
465 | --- po/stellarium-website.pot 2012-03-19 14:43:38 +0000 |
466 | +++ po/stellarium-website.pot 2012-03-24 14:20:24 +0000 |
467 | @@ -8,10 +8,11 @@ |
468 | msgstr "" |
469 | "Project-Id-Version: stellarium-website 1.0\n" |
470 | "Report-Msgid-Bugs-To: stellarium-translation@lists.launchpad.net\n" |
471 | -"POT-Creation-Date: 2012-03-19 21:42+0700\n" |
472 | +"POT-Creation-Date: 2012-03-24 17:44+0700\n" |
473 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
474 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
475 | "Language-Team: LANGUAGE <LL@li.org>\n" |
476 | +"Language: \n" |
477 | "MIME-Version: 1.0\n" |
478 | "Content-Type: text/plain; charset=CHARSET\n" |
479 | "Content-Transfer-Encoding: 8bit\n" |
480 | @@ -46,275 +47,292 @@ |
481 | msgid "current" |
482 | msgstr "" |
483 | |
484 | -#: index.php:129 |
485 | -msgid "" |
486 | -"Stellarium is a free open source planetarium for your computer. It shows a " |
487 | -"realistic sky in 3D, just like what you see with the naked eye, binoculars " |
488 | -"or a telescope." |
489 | -msgstr "" |
490 | - |
491 | -#: index.php:130 |
492 | -msgid "" |
493 | -"It is being used in planetarium projectors. Just set your coordinates and go." |
494 | -msgstr "" |
495 | - |
496 | -#: index.php:142 index.php:143 |
497 | -msgid "" |
498 | -"A shooting star flashes past the Jupiter. You can select different " |
499 | +#: index.php:133 index.php:134 |
500 | +msgid "" |
501 | +"A shooting star flashes past the Pleades. You can select different " |
502 | "intensities in the View window" |
503 | msgstr "" |
504 | |
505 | -#: index.php:144 index.php:156 index.php:168 index.php:180 index.php:192 |
506 | +#: index.php:135 index.php:147 index.php:159 index.php:171 index.php:183 |
507 | +#: index.php:195 index.php:207 index.php:219 |
508 | msgid "view screenshots" |
509 | msgstr "" |
510 | |
511 | -#: index.php:154 |
512 | +#: index.php:145 |
513 | msgid "" |
514 | "The great nebula in Orion. Press N to bring up the nebula labels. Also shown " |
515 | "are constellation lines, press C to show or hide them" |
516 | msgstr "" |
517 | |
518 | -#: index.php:155 |
519 | +#: index.php:146 |
520 | msgid "The great nebula in Orion. Press N to bring up the nebula labels" |
521 | msgstr "" |
522 | |
523 | -#: index.php:166 index.php:167 |
524 | +#: index.php:157 index.php:158 |
525 | msgid "The dance of the planets above ESO headquarters, near Munich" |
526 | msgstr "" |
527 | |
528 | -#: index.php:178 index.php:179 |
529 | +#: index.php:169 index.php:170 |
530 | msgid "Full sky view of the constellations, their boundaries, the Milky Way" |
531 | msgstr "" |
532 | |
533 | -#: index.php:190 index.php:191 |
534 | +#: index.php:181 index.php:182 |
535 | msgid "Constellation art turned on" |
536 | msgstr "" |
537 | |
538 | -#: index.php:207 |
539 | +#: index.php:193 index.php:194 |
540 | +msgid "Stellarium can show of some historical supernovae" |
541 | +msgstr "" |
542 | + |
543 | +#: index.php:205 index.php:206 |
544 | +msgid "View M37 via Oculars plugin" |
545 | +msgstr "" |
546 | + |
547 | +#: index.php:217 index.php:218 |
548 | +msgid "Saturn from Tethys" |
549 | +msgstr "" |
550 | + |
551 | +#: index.php:235 |
552 | msgid "Click on the picture to the left for details." |
553 | msgstr "" |
554 | |
555 | -#: index.php:214 |
556 | +#: index.php:242 |
557 | +msgid "about" |
558 | +msgstr "" |
559 | + |
560 | +#: index.php:243 |
561 | +msgid "" |
562 | +"Stellarium is a free open source planetarium for your computer. It shows a " |
563 | +"realistic sky in 3D, just like what you see with the naked eye, binoculars " |
564 | +"or a telescope." |
565 | +msgstr "" |
566 | + |
567 | +#: index.php:244 |
568 | +msgid "" |
569 | +"It is being used in planetarium projectors. Just set your coordinates and go." |
570 | +msgstr "" |
571 | + |
572 | +#: index.php:249 |
573 | msgid "features" |
574 | msgstr "" |
575 | |
576 | -#: index.php:215 |
577 | +#: index.php:250 |
578 | msgid "sky" |
579 | msgstr "" |
580 | |
581 | -#: index.php:216 |
582 | +#: index.php:251 |
583 | msgid "default catalogue of over 600,000 stars" |
584 | msgstr "" |
585 | |
586 | -#: index.php:217 |
587 | +#: index.php:252 |
588 | msgid "extra catalogues with more than 210 million stars" |
589 | msgstr "" |
590 | |
591 | -#: index.php:218 |
592 | +#: index.php:253 |
593 | msgid "asterisms and illustrations of the constellations" |
594 | msgstr "" |
595 | |
596 | -#: index.php:219 |
597 | +#: index.php:254 |
598 | msgid "constellations for twelve different cultures" |
599 | msgstr "" |
600 | |
601 | -#: index.php:220 |
602 | +#: index.php:255 |
603 | msgid "images of nebulae (full Messier catalogue)" |
604 | msgstr "" |
605 | |
606 | -#: index.php:221 |
607 | +#: index.php:256 |
608 | msgid "realistic Milky Way" |
609 | msgstr "" |
610 | |
611 | -#: index.php:222 |
612 | +#: index.php:257 |
613 | msgid "very realistic atmosphere, sunrise and sunset" |
614 | msgstr "" |
615 | |
616 | -#: index.php:223 |
617 | +#: index.php:258 |
618 | msgid "the planets and their satellites" |
619 | msgstr "" |
620 | |
621 | -#: index.php:227 |
622 | +#: index.php:262 |
623 | msgid "interface" |
624 | msgstr "" |
625 | |
626 | -#: index.php:228 |
627 | +#: index.php:263 |
628 | msgid "a powerful zoom" |
629 | msgstr "" |
630 | |
631 | -#: index.php:229 |
632 | +#: index.php:264 |
633 | msgid "time control" |
634 | msgstr "" |
635 | |
636 | -#: index.php:230 |
637 | +#: index.php:265 |
638 | msgid "multilingual interface" |
639 | msgstr "" |
640 | |
641 | -#: index.php:231 |
642 | +#: index.php:266 |
643 | msgid "fisheye projection for planetarium domes" |
644 | msgstr "" |
645 | |
646 | -#: index.php:232 |
647 | +#: index.php:267 |
648 | msgid "spheric mirror projection for your own low-cost dome" |
649 | msgstr "" |
650 | |
651 | -#: index.php:233 |
652 | +#: index.php:268 |
653 | msgid "all new graphical interface and extensive keyboard control" |
654 | msgstr "" |
655 | |
656 | -#: index.php:234 |
657 | +#: index.php:269 |
658 | msgid "telescope control" |
659 | msgstr "" |
660 | |
661 | -#: index.php:238 |
662 | +#: index.php:273 |
663 | msgid "visualisation" |
664 | msgstr "" |
665 | |
666 | -#: index.php:239 |
667 | +#: index.php:274 |
668 | msgid "equatorial and azimuthal grids" |
669 | msgstr "" |
670 | |
671 | -#: index.php:240 |
672 | +#: index.php:275 |
673 | msgid "star twinkling" |
674 | msgstr "" |
675 | |
676 | -#: index.php:241 |
677 | +#: index.php:276 |
678 | msgid "shooting stars" |
679 | msgstr "" |
680 | |
681 | -#: index.php:242 |
682 | +#: index.php:277 |
683 | msgid "eclipse simulation" |
684 | msgstr "" |
685 | |
686 | -#: index.php:243 |
687 | +#: index.php:278 |
688 | msgid "supernovae simulation" |
689 | msgstr "" |
690 | |
691 | -#: index.php:244 |
692 | +#: index.php:279 |
693 | msgid "skinnable landscapes, now with spheric panorama projection" |
694 | msgstr "" |
695 | |
696 | -#: index.php:249 |
697 | +#: index.php:284 |
698 | msgid "customizability" |
699 | msgstr "" |
700 | |
701 | -#: index.php:250 |
702 | +#: index.php:285 |
703 | msgid "" |
704 | "plugin system adding artifical satellites, ocular simulation, telescope " |
705 | "configuration and more" |
706 | msgstr "" |
707 | |
708 | -#: index.php:251 |
709 | +#: index.php:286 |
710 | msgid "ability to add new solar system objects from online resources..." |
711 | msgstr "" |
712 | |
713 | -#: index.php:252 |
714 | +#: index.php:287 |
715 | msgid "" |
716 | "add your own deep sky objects, landscapes, constellation images, scripts..." |
717 | msgstr "" |
718 | |
719 | -#: index.php:256 |
720 | +#: index.php:291 |
721 | msgid "news" |
722 | msgstr "" |
723 | |
724 | -#: index.php:286 |
725 | +#: index.php:321 |
726 | msgid "collaborate" |
727 | msgstr "" |
728 | |
729 | -#: index.php:287 |
730 | +#: index.php:322 |
731 | msgid "" |
732 | "You can learn more about Stellarium, get support and help the project from " |
733 | "these links" |
734 | msgstr "" |
735 | |
736 | -#: index.php:288 |
737 | +#: index.php:323 |
738 | msgid "summary" |
739 | msgstr "" |
740 | |
741 | -#: index.php:289 |
742 | +#: index.php:324 |
743 | msgid "forum" |
744 | msgstr "" |
745 | |
746 | -#: index.php:290 |
747 | +#: index.php:325 |
748 | msgid "wiki" |
749 | msgstr "" |
750 | |
751 | -#: index.php:291 |
752 | +#: index.php:326 |
753 | msgid "FAQ" |
754 | msgstr "" |
755 | |
756 | -#: index.php:292 |
757 | +#: index.php:327 |
758 | msgid "landscapes" |
759 | msgstr "" |
760 | |
761 | -#: index.php:293 |
762 | +#: index.php:328 |
763 | msgid "scripts" |
764 | msgstr "" |
765 | |
766 | -#: index.php:294 |
767 | +#: index.php:329 |
768 | msgid "plugins" |
769 | msgstr "" |
770 | |
771 | -#: index.php:295 |
772 | +#: index.php:330 |
773 | msgid "user's guide" |
774 | msgstr "" |
775 | |
776 | -#: index.php:296 |
777 | +#: index.php:331 |
778 | msgid "developers documentation" |
779 | msgstr "" |
780 | |
781 | -#: index.php:297 |
782 | +#: index.php:332 |
783 | msgid "scripting" |
784 | msgstr "" |
785 | |
786 | -#: index.php:298 |
787 | +#: index.php:333 |
788 | msgid "get support" |
789 | msgstr "" |
790 | |
791 | -#: index.php:299 |
792 | +#: index.php:334 |
793 | msgid "report bugs, request new features" |
794 | msgstr "" |
795 | |
796 | -#: index.php:300 |
797 | +#: index.php:335 |
798 | msgid "older releases" |
799 | msgstr "" |
800 | |
801 | -#: index.php:301 |
802 | +#: index.php:336 |
803 | msgid "for Linux (source)" |
804 | msgstr "" |
805 | |
806 | -#: index.php:302 |
807 | +#: index.php:337 |
808 | msgid "for Mac OS X" |
809 | msgstr "" |
810 | |
811 | -#: index.php:303 |
812 | +#: index.php:338 |
813 | msgid "for Windows" |
814 | msgstr "" |
815 | |
816 | -#: index.php:313 |
817 | +#: index.php:348 |
818 | msgid "bzr" |
819 | msgstr "" |
820 | |
821 | -#: index.php:314 |
822 | +#: index.php:349 |
823 | msgid "" |
824 | "The latest development snapshot of Stellarium is kept in Bazaar, a " |
825 | "distributed revision control system. If you want to compile development " |
826 | "versions of Stellarium, this is the place to get the source code." |
827 | msgstr "" |
828 | |
829 | -#: index.php:315 |
830 | +#: index.php:350 |
831 | msgid "browse Bazaar" |
832 | msgstr "" |
833 | |
834 | -#: index.php:316 |
835 | +#: index.php:351 |
836 | msgid "instructions (wiki)" |
837 | msgstr "" |
838 | |
839 | -#: index.php:317 |
840 | +#: index.php:352 |
841 | msgid "irc" |
842 | msgstr "" |
843 | |
844 | -#: index.php:318 |
845 | +#: index.php:353 |
846 | #, php-format |
847 | msgid "" |
848 | "Real time chat about Stellarium can be had in the %s#stellarium%s IRC " |
849 | @@ -322,39 +340,39 @@ |
850 | "connect to %schat.freenode.net%s or try the %sweb-based interface%s." |
851 | msgstr "" |
852 | |
853 | -#: index.php:336 |
854 | +#: index.php:374 |
855 | msgid "developers" |
856 | msgstr "" |
857 | |
858 | -#: index.php:337 |
859 | +#: index.php:375 |
860 | msgid "Project coordinator:" |
861 | msgstr "" |
862 | |
863 | -#: index.php:338 |
864 | +#: index.php:376 |
865 | msgid "Doc author/developer:" |
866 | msgstr "" |
867 | |
868 | -#: index.php:339 index.php:340 index.php:341 index.php:342 index.php:343 |
869 | +#: index.php:377 index.php:378 index.php:379 index.php:380 index.php:381 |
870 | msgid "Developer:" |
871 | msgstr "" |
872 | |
873 | -#: index.php:344 index.php:345 |
874 | +#: index.php:382 index.php:383 |
875 | msgid "OSX Developer:" |
876 | msgstr "" |
877 | |
878 | -#: index.php:346 index.php:347 |
879 | +#: index.php:384 index.php:385 |
880 | msgid "Tester:" |
881 | msgstr "" |
882 | |
883 | -#: index.php:348 |
884 | +#: index.php:386 |
885 | msgid "and everyone else in the community." |
886 | msgstr "" |
887 | |
888 | -#: index.php:361 |
889 | +#: index.php:399 |
890 | msgid "supporters and friends" |
891 | msgstr "" |
892 | |
893 | -#: index.php:362 |
894 | +#: index.php:400 |
895 | #, php-format |
896 | msgid "" |
897 | "Stellarium is produced by the efforts of the developer team, with the help " |
898 | |
899 | === modified file 'rss2html/template.html' |
900 | --- rss2html/template.html 2011-10-28 03:28:29 +0000 |
901 | +++ rss2html/template.html 2012-03-24 14:20:24 +0000 |
902 | @@ -1,5 +1,7 @@ |
903 | -~~~BeginItemsRecord~~~ |
904 | -<p><span class="newsdate">~~~ItemPubShortDate~~~</span><br> |
905 | - <span class="newstitle">~~~ItemTitle~~~</span><br> |
906 | - ~~~ItemDescription~~~ </p> |
907 | +~~~BeginItemsRecord~~~ |
908 | +<div class="newsitem"> |
909 | +<span class="newsdate">~~~ItemPubShortDate~~~</span> |
910 | +<span class="newstitle">~~~ItemTitle~~~</span> |
911 | +~~~ItemDescription~~~ |
912 | +</div> |
913 | ~~~EndItemsRecord~~~ |
914 | \ No newline at end of file |