Stellarium Website

Merge lp:~alexwolf/stellarium-website/new-design-wiki-links into lp:~matthew-porpoisehead/stellarium-website/new-design

  1. new-design-wiki-links
  2. Merge into new-design
Proposed by Alexander Wolf
Status: Superseded
Proposed branch: lp:~alexwolf/stellarium-website/new-design-wiki-links
Merge into: lp:~matthew-porpoisehead/stellarium-website/new-design
Diff against target: 652 lines (+179/-150)
2 files modified
index.php (+59/-50)
po/stellarium-website.pot (+120/-100)
To merge this branch: bzr merge lp:~alexwolf/stellarium-website/new-design-wiki-links
Reviewer Review Type Date Requested Status
Matthew Gates Pending
Review via email: mp+98179@code.launchpad.net

This proposal has been superseded by a proposal from 2012-03-19.

To post a comment you must log in.
lp:~alexwolf/stellarium-website/new-design-wiki-links updated
48. By Alexander Wolf

added link to scripting devel. documentation

49. By Alexander Wolf

update stellarium-website.pot

50. By Alexander Wolf

enable backward compatible mode fore hyperlinks

51. By Alexander Wolf

rolling back latest changes

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'index.php'
2--- index.php 2012-03-18 21:46:20 +0000
3+++ index.php 2012-03-19 14:54:23 +0000
4@@ -53,16 +53,16 @@
5 <meta name="Keywords" content="Stellarium, planetarium, astronomy, software, stars, planets, constellations, meteors, universe, open source, free software, astro, freeware, download, stars, planets, realistic, software, sky, program, scientific, educational, free, real, time, Windows, Linux, Apple, Mac, GPL, milky way, moon, mercury, venus, mars, earth, venus, jupiter, saturn, sun, real time, 3D, openGL, graphic, GL, chart, map, twinkle, photo-realistic, brightness, screenshot" />
6 <title>Stellarium</title>
7 <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
8-<link rel="stylesheet" href="./css/all.css" type="text/css" media="screen" />
9+<link rel="stylesheet" href="/css/all.css" type="text/css" media="screen" />
10 <link rel="alternate" type="application/rss+xml" title="%s" href="https://sourceforge.net/export/rss2_projnews.php?group_id=48857&rss_fulltext=1" />
11 <!--[if lt IE 8]>
12-<link href="./css/oldie.css" rel="stylesheet" type="text/css" />
13-<script defer type="text/javascript" src="./js/pngfix.js"></script>
14+<link href="/css/oldie.css" rel="stylesheet" type="text/css" />
15+<script defer type="text/javascript" src="/js/pngfix.js"></script>
16 <![endif]-->
17-<script type="text/javascript" src="./js/jq-ui-flplayer-sw-aggregated.js"></script>
18+<script type="text/javascript" src="/js/jq-ui-flplayer-sw-aggregated.js"></script>
19 <script>
20 function changelang(val) {
21- window.location = "./index.php?lang=" + val;
22+ window.location = "/" + val + "/";
23 }
24 </script>
25 </head>',
26@@ -104,7 +104,7 @@
27 <a href="%s">%s<span>0.10.2-1</span></a>
28 </div>
29 <div class="download pdf">
30- <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">WIKI<span>%s</span></a>
31+ <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">%s<span>%s</span></a>
32 </div>
33 </div>
34 </div>
35@@ -117,6 +117,7 @@
36 $download_link_win32,
37 $download_link_guide,
38 q_('User guide'),
39+ q_('User guide'),
40 q_('current'));
41
42 printf('
43@@ -131,11 +132,11 @@
44 <div class="block">
45 <div id="home-media">
46 <div class="slide-item first">
47- <img src="./img/slideshow/slide-1.jpg" class="photo" alt="%s" />
48+ <img src="/img/slideshow/slide-1.jpg" class="photo" alt="%s" />
49 <h2></h2>
50 <div class="slide-desc">
51 <p>%s.</p>
52- <a href="./screenshots.html" class="read-more">%s &raquo;</a>
53+ <a href="/screenshots.html" class="read-more">%s &raquo;</a>
54 </div>
55 </div>',
56 q_("A shooting star flashes past the Jupiter. You can select different intensities in the View window"),
57@@ -143,11 +144,11 @@
58 q_("view screenshots"));
59 printf('
60 <div class="slide-item">
61- <img src="./img/slideshow/slide-2.jpg" class="photo" alt="%s"/>
62+ <img src="/img/slideshow/slide-2.jpg" class="photo" alt="%s"/>
63 <h2></h2>
64 <div class="slide-desc">
65 <p>%s.</p>
66- <a href="./screenshots.html" class="read-more">%s &raquo;</a>
67+ <a href="/screenshots.html" class="read-more">%s &raquo;</a>
68 </div>
69 </div>',
70 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"),
71@@ -155,35 +156,35 @@
72 q_("view screenshots"));
73 printf('
74 <div class="slide-item">
75- <img src="./img/slideshow/slide-3.jpg" class="photo" alt="%s"/>
76- <h2></h2>
77- <div class="slide-desc">
78- <p>%s.</p>
79- <a href="./screenshots.html" class="read-more">%s &raquo;</a>
80- </div>
81- </div>',
82- q_("The dance of the planets above ESO headquarters, near Munich"),
83- q_("The dance of the planets above ESO headquarters, near Munich"),
84- q_("view screenshots"));
85-printf('
86- <div class="slide-item">
87- <img src="./img/slideshow/slide-4.jpg" class="photo" alt="%s"/>
88- <h2></h2>
89- <div class="slide-desc">
90- <p>%s.</p>
91- <a href="./screenshots.html" class="read-more">%s &raquo;</a>
92- </div>
93- </div>',
94- q_("Full sky view of the constellations, their boundaries, the Milky Way"),
95- q_("Full sky view of the constellations, their boundaries, the Milky Way"),
96- q_("view screenshots"));
97-printf('
98- <div class="slide-item">
99- <img src="./img/slideshow/slide-5.jpg" class="photo" alt="%s"/>
100- <h2></h2>
101- <div class="slide-desc">
102- <p>%s.</p>
103- <a href="./screenshots.html" class="read-more">%s &raquo;</a>
104+ <img src="/img/slideshow/slide-3.jpg" class="photo" alt="%s"/>
105+ <h2></h2>
106+ <div class="slide-desc">
107+ <p>%s.</p>
108+ <a href="/screenshots.html" class="read-more">%s &raquo;</a>
109+ </div>
110+ </div>',
111+ q_("The dance of the planets above ESO headquarters, near Munich"),
112+ q_("The dance of the planets above ESO headquarters, near Munich"),
113+ q_("view screenshots"));
114+printf('
115+ <div class="slide-item">
116+ <img src="/img/slideshow/slide-4.jpg" class="photo" alt="%s"/>
117+ <h2></h2>
118+ <div class="slide-desc">
119+ <p>%s.</p>
120+ <a href="/screenshots.html" class="read-more">%s &raquo;</a>
121+ </div>
122+ </div>',
123+ q_("Full sky view of the constellations, their boundaries, the Milky Way"),
124+ q_("Full sky view of the constellations, their boundaries, the Milky Way"),
125+ q_("view screenshots"));
126+printf('
127+ <div class="slide-item">
128+ <img src="/img/slideshow/slide-5.jpg" class="photo" alt="%s"/>
129+ <h2></h2>
130+ <div class="slide-desc">
131+ <p>%s.</p>
132+ <a href="/screenshots.html" class="read-more">%s &raquo;</a>
133 </div>
134 </div>',
135 q_("Constellation art turned on"),
136@@ -193,11 +194,11 @@
137 <div id="thumbs">
138 <div id="description"><p>%s</p></div>
139 <ul>
140- <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>
141- <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>
142- <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>
143- <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>
144- <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>
145+ <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>
146+ <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>
147+ <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>
148+ <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>
149+ <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>
150 </ul>
151 </div>
152 </div>
153@@ -264,10 +265,14 @@
154 <ul class="largelist">
155 <li><a href="http://launchpad.net/stellarium">%s</a></li>
156 <li><a href="http://sourceforge.net/forum/forum.php?forum_id=278769">%s</a></li>
157- <li><a href="./wiki/">%s</a></li>
158- <li><a href="./wiki/index.php/FAQ">%s</a></li>
159- <li><a href="./wiki/index.php/Category:User\'s_Guide">%s</a></li>
160- <li><a href="./doc/">%s</a></li>
161+ <li><a href="/wiki/">%s</a></li>
162+ <li><a href="/wiki/index.php/FAQ">%s</a></li>
163+ <li><a href="/wiki/index.php/Landscapes">%s</a></li>
164+ <li><a href="/wiki/index.php/Scripts">%s</a></li>
165+ <li><a href="/wiki/index.php/Plugins">%s</a></li>
166+ <li><a href="/wiki/index.php/Category:User\'s_Guide">%s</a></li>
167+ <li><a href="/doc/">%s</a></li>
168+ <li><a href="/doc/head/scripting.html">%s</a></li>
169 <li><a href="https://answers.launchpad.net/stellarium">%s</a></li>
170 <li><a href="http://bugs.launchpad.net/stellarium">%s</a></li>
171 <li><a href="http://sourceforge.net/project/showfiles.php?group_id=48857">%s</a>
172@@ -284,8 +289,12 @@
173 q_("forum"),
174 q_("wiki"),
175 q_("FAQ"),
176+q_("landscapes"),
177+q_("scripts"),
178+q_("plugins"),
179 q_("user's guide"),
180-q_("API"),
181+q_("developers documentation"),
182+q_("scripting"),
183 q_("get support"),
184 q_("report bugs, request new features"),
185 q_("older releases"),
186@@ -344,7 +353,7 @@
187 </div>
188 </div>
189 <div id="footer">
190- <a href="http://sourceforge.net/donate/index.php?group_id=48857"><img src="./img/nd/project.jpg" alt="Support This Project" width="88" height="32" border="0"></a> <a href="http://sourceforge.net/projects/stellarium"><img src="http://sourceforge.net/sflogo.php?group_id=48857&amp;type=5" alt="SourceForge.net Logo" width="108" height="32" border="0"></a>
191+ <a href="http://sourceforge.net/donate/index.php?group_id=48857"><img src="/img/nd/project.jpg" alt="Support This Project" width="88" height="32" border="0"></a> <a href="http://sourceforge.net/projects/stellarium"><img src="http://sourceforge.net/sflogo.php?group_id=48857&amp;type=5" alt="SourceForge.net Logo" width="108" height="32" border="0"></a>
192 </div>
193 </div>
194 </body>
195
196=== modified file 'po/stellarium-website.pot'
197--- po/stellarium-website.pot 2011-10-28 03:28:29 +0000
198+++ po/stellarium-website.pot 2012-03-19 14:54:23 +0000
199@@ -8,7 +8,7 @@
200 msgstr ""
201 "Project-Id-Version: stellarium-website 1.0\n"
202 "Report-Msgid-Bugs-To: stellarium-translation@lists.launchpad.net\n"
203-"POT-Creation-Date: 2011-10-28 10:27+0700\n"
204+"POT-Creation-Date: 2012-03-19 21:42+0700\n"
205 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
206 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
207 "Language-Team: LANGUAGE <LL@li.org>\n"
208@@ -16,281 +16,305 @@
209 "Content-Type: text/plain; charset=CHARSET\n"
210 "Content-Transfer-Encoding: 8bit\n"
211
212-#: index.php:54
213+#: index.php:69
214 msgid ""
215 "Stellarium is a planetarium software that shows exactly what you see when "
216 "you look up at the stars. It's easy to use, and free."
217 msgstr ""
218
219-#: index.php:55
220+#: index.php:70
221 msgid "Stellarium: Project News"
222 msgstr ""
223
224-#: index.php:60
225+#: index.php:75
226 msgid "Other languages:"
227 msgstr ""
228
229-#: index.php:100
230+#: index.php:112
231 msgid "latest version"
232 msgstr ""
233
234-#: index.php:102
235+#: index.php:115
236 msgid "source"
237 msgstr ""
238
239-#: index.php:109
240+#: index.php:119 index.php:120
241+msgid "User guide"
242+msgstr ""
243+
244+#: index.php:121
245+msgid "current"
246+msgstr ""
247+
248+#: index.php:129
249 msgid ""
250 "Stellarium is a free open source planetarium for your computer. It shows a "
251 "realistic sky in 3D, just like what you see with the naked eye, binoculars "
252 "or a telescope."
253 msgstr ""
254
255-#: index.php:110
256+#: index.php:130
257 msgid ""
258 "It is being used in planetarium projectors. Just set your coordinates and go."
259 msgstr ""
260
261-#: index.php:122 index.php:123
262+#: index.php:142 index.php:143
263 msgid ""
264 "A shooting star flashes past the Jupiter. You can select different "
265 "intensities in the View window"
266 msgstr ""
267
268-#: index.php:124 index.php:136 index.php:148 index.php:160 index.php:172
269+#: index.php:144 index.php:156 index.php:168 index.php:180 index.php:192
270 msgid "view screenshots"
271 msgstr ""
272
273-#: index.php:134
274+#: index.php:154
275 msgid ""
276 "The great nebula in Orion. Press N to bring up the nebula labels. Also shown "
277 "are constellation lines, press C to show or hide them"
278 msgstr ""
279
280-#: index.php:135
281+#: index.php:155
282 msgid "The great nebula in Orion. Press N to bring up the nebula labels"
283 msgstr ""
284
285-#: index.php:146 index.php:147
286+#: index.php:166 index.php:167
287 msgid "The dance of the planets above ESO headquarters, near Munich"
288 msgstr ""
289
290-#: index.php:158 index.php:159
291+#: index.php:178 index.php:179
292 msgid "Full sky view of the constellations, their boundaries, the Milky Way"
293 msgstr ""
294
295-#: index.php:170 index.php:171
296+#: index.php:190 index.php:191
297 msgid "Constellation art turned on"
298 msgstr ""
299
300-#: index.php:187
301+#: index.php:207
302 msgid "Click on the picture to the left for details."
303 msgstr ""
304
305-#: index.php:194
306+#: index.php:214
307 msgid "features"
308 msgstr ""
309
310-#: index.php:195
311+#: index.php:215
312 msgid "sky"
313 msgstr ""
314
315-#: index.php:196
316+#: index.php:216
317 msgid "default catalogue of over 600,000 stars"
318 msgstr ""
319
320-#: index.php:197
321+#: index.php:217
322 msgid "extra catalogues with more than 210 million stars"
323 msgstr ""
324
325-#: index.php:198
326+#: index.php:218
327 msgid "asterisms and illustrations of the constellations"
328 msgstr ""
329
330-#: index.php:199
331+#: index.php:219
332 msgid "constellations for twelve different cultures"
333 msgstr ""
334
335-#: index.php:200
336+#: index.php:220
337 msgid "images of nebulae (full Messier catalogue)"
338 msgstr ""
339
340-#: index.php:201
341+#: index.php:221
342 msgid "realistic Milky Way"
343 msgstr ""
344
345-#: index.php:202
346+#: index.php:222
347 msgid "very realistic atmosphere, sunrise and sunset"
348 msgstr ""
349
350-#: index.php:203
351+#: index.php:223
352 msgid "the planets and their satellites"
353 msgstr ""
354
355-#: index.php:207
356+#: index.php:227
357 msgid "interface"
358 msgstr ""
359
360-#: index.php:208
361+#: index.php:228
362 msgid "a powerful zoom"
363 msgstr ""
364
365-#: index.php:209
366+#: index.php:229
367 msgid "time control"
368 msgstr ""
369
370-#: index.php:210
371+#: index.php:230
372 msgid "multilingual interface"
373 msgstr ""
374
375-#: index.php:211
376+#: index.php:231
377 msgid "fisheye projection for planetarium domes"
378 msgstr ""
379
380-#: index.php:212
381+#: index.php:232
382 msgid "spheric mirror projection for your own low-cost dome"
383 msgstr ""
384
385-#: index.php:213
386+#: index.php:233
387 msgid "all new graphical interface and extensive keyboard control"
388 msgstr ""
389
390-#: index.php:214
391+#: index.php:234
392 msgid "telescope control"
393 msgstr ""
394
395-#: index.php:218
396+#: index.php:238
397 msgid "visualisation"
398 msgstr ""
399
400-#: index.php:219
401+#: index.php:239
402 msgid "equatorial and azimuthal grids"
403 msgstr ""
404
405-#: index.php:220
406+#: index.php:240
407 msgid "star twinkling"
408 msgstr ""
409
410-#: index.php:221
411+#: index.php:241
412 msgid "shooting stars"
413 msgstr ""
414
415-#: index.php:222
416+#: index.php:242
417 msgid "eclipse simulation"
418 msgstr ""
419
420-#: index.php:223
421+#: index.php:243
422 msgid "supernovae simulation"
423 msgstr ""
424
425-#: index.php:224
426+#: index.php:244
427 msgid "skinnable landscapes, now with spheric panorama projection"
428 msgstr ""
429
430-#: index.php:229
431+#: index.php:249
432 msgid "customizability"
433 msgstr ""
434
435-#: index.php:230
436+#: index.php:250
437 msgid ""
438 "plugin system adding artifical satellites, ocular simulation, telescope "
439 "configuration and more"
440 msgstr ""
441
442-#: index.php:231
443+#: index.php:251
444 msgid "ability to add new solar system objects from online resources..."
445 msgstr ""
446
447-#: index.php:232
448+#: index.php:252
449 msgid ""
450 "add your own deep sky objects, landscapes, constellation images, scripts..."
451 msgstr ""
452
453-#: index.php:236
454+#: index.php:256
455 msgid "news"
456 msgstr ""
457
458-#: index.php:260
459+#: index.php:286
460 msgid "collaborate"
461 msgstr ""
462
463-#: index.php:261
464+#: index.php:287
465 msgid ""
466 "You can learn more about Stellarium, get support and help the project from "
467 "these links"
468 msgstr ""
469
470-#: index.php:262
471+#: index.php:288
472 msgid "summary"
473 msgstr ""
474
475-#: index.php:263
476+#: index.php:289
477 msgid "forum"
478 msgstr ""
479
480-#: index.php:264
481+#: index.php:290
482 msgid "wiki"
483 msgstr ""
484
485-#: index.php:265
486+#: index.php:291
487 msgid "FAQ"
488 msgstr ""
489
490-#: index.php:266
491+#: index.php:292
492+msgid "landscapes"
493+msgstr ""
494+
495+#: index.php:293
496+msgid "scripts"
497+msgstr ""
498+
499+#: index.php:294
500+msgid "plugins"
501+msgstr ""
502+
503+#: index.php:295
504 msgid "user's guide"
505 msgstr ""
506
507-#: index.php:267
508-msgid "API"
509-msgstr ""
510-
511-#: index.php:268
512+#: index.php:296
513+msgid "developers documentation"
514+msgstr ""
515+
516+#: index.php:297
517+msgid "scripting"
518+msgstr ""
519+
520+#: index.php:298
521 msgid "get support"
522 msgstr ""
523
524-#: index.php:269
525+#: index.php:299
526 msgid "report bugs, request new features"
527 msgstr ""
528
529-#: index.php:270
530+#: index.php:300
531 msgid "older releases"
532 msgstr ""
533
534-#: index.php:271
535+#: index.php:301
536 msgid "for Linux (source)"
537 msgstr ""
538
539-#: index.php:272
540+#: index.php:302
541 msgid "for Mac OS X"
542 msgstr ""
543
544-#: index.php:273
545+#: index.php:303
546 msgid "for Windows"
547 msgstr ""
548
549-#: index.php:283
550+#: index.php:313
551 msgid "bzr"
552 msgstr ""
553
554-#: index.php:284
555+#: index.php:314
556 msgid ""
557 "The latest development snapshot of Stellarium is kept in Bazaar, a "
558 "distributed revision control system. If you want to compile development "
559 "versions of Stellarium, this is the place to get the source code."
560 msgstr ""
561
562-#: index.php:285
563+#: index.php:315
564 msgid "browse Bazaar"
565 msgstr ""
566
567-#: index.php:286
568+#: index.php:316
569 msgid "instructions (wiki)"
570 msgstr ""
571
572-#: index.php:287
573+#: index.php:317
574 msgid "irc"
575 msgstr ""
576
577-#: index.php:288
578+#: index.php:318
579 #, php-format
580 msgid ""
581 "Real time chat about Stellarium can be had in the %s#stellarium%s IRC "
582@@ -298,43 +322,39 @@
583 "connect to %schat.freenode.net%s or try the %sweb-based interface%s."
584 msgstr ""
585
586-#: index.php:304
587+#: index.php:336
588 msgid "developers"
589 msgstr ""
590
591-#: index.php:305
592-msgid "Project coordinator"
593-msgstr ""
594-
595-#: index.php:306
596-msgid "Doc author/developer"
597-msgstr ""
598-
599-#: index.php:307
600-msgid "Graphic/other designer"
601-msgstr ""
602-
603-#: index.php:308 index.php:309
604-msgid "OSX Developer"
605-msgstr ""
606-
607-#: index.php:310 index.php:311 index.php:312 index.php:313
608-msgid "Developer"
609-msgstr ""
610-
611-#: index.php:314
612-msgid "Tester"
613-msgstr ""
614-
615-#: index.php:315
616-msgid "and everyone else in the community"
617-msgstr ""
618-
619-#: index.php:328
620+#: index.php:337
621+msgid "Project coordinator:"
622+msgstr ""
623+
624+#: index.php:338
625+msgid "Doc author/developer:"
626+msgstr ""
627+
628+#: index.php:339 index.php:340 index.php:341 index.php:342 index.php:343
629+msgid "Developer:"
630+msgstr ""
631+
632+#: index.php:344 index.php:345
633+msgid "OSX Developer:"
634+msgstr ""
635+
636+#: index.php:346 index.php:347
637+msgid "Tester:"
638+msgstr ""
639+
640+#: index.php:348
641+msgid "and everyone else in the community."
642+msgstr ""
643+
644+#: index.php:361
645 msgid "supporters and friends"
646 msgstr ""
647
648-#: index.php:329
649+#: index.php:362
650 #, php-format
651 msgid ""
652 "Stellarium is produced by the efforts of the developer team, with the help "

Subscribers

People subscribed via source and target branches

to all changes: