LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/651238 into lp:loco-team-portal

  1. 651238
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 327
Merged at revision: 328
Proposed branch: lp:~cjohnston/loco-team-portal/651238
Merge into: lp:loco-team-portal
Diff against target: 1302 lines (+263/-245)
2 files modified
loco_directory/locale/loco-directory.pot (+260/-243)
loco_directory/templates/about.html (+3/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/651238
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+41988@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Why is the Discuss URL the same as the Get the Code URL?

lp:~cjohnston/loco-team-portal/651238 updated
327. By Chris Johnston

Fixing the link to the ML

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/locale/loco-directory.pot'
2--- loco_directory/locale/loco-directory.pot 2010-11-12 01:35:17 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-11-27 03:11:44 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-11-12 01:32+0000\n"
9+"POT-Creation-Date: 2010-11-27 01:06+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -17,6 +17,10 @@
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17+#: common/forms.py:47 templates/base.html:32
18+msgid "Search"
19+msgstr ""
20+
21 #: common/widgets.py:42
22 msgid "Add Another"
23 msgstr ""
24@@ -25,12 +29,6 @@
25 msgid "Please just set one tag."
26 msgstr ""
27
28-#: events/forms.py:141 teams/forms.py:39 templates/events/event_list.html:20
29-#: templates/teams/team_list.html:16 templates/venues/venue_list.html:15
30-#: venues/forms.py:47
31-msgid "Search"
32-msgstr ""
33-
34 #: events/models.py:9
35 msgid "attending"
36 msgstr ""
37@@ -140,75 +138,75 @@
38 msgstr ""
39
40 #: events/models.py:166
41-#: templates/events/team_event_detail_attendees.inc.html:26
42+#: templates/events/team_event_detail_attendees.inc.html:28
43 msgid "Additional Guests"
44 msgstr ""
45
46-#: events/views.py:146
47+#: events/views.py:138
48 msgid "Team Event removed."
49 msgstr ""
50
51-#: events/views.py:153
52+#: events/views.py:145
53 msgid ""
54 "You can not remove this team event. You are not admin/owner of the Launchpad "
55 "team or on the LoCo Council."
56 msgstr ""
57
58-#: events/views.py:160
59+#: events/views.py:152
60 msgid ""
61 "You can not add a new team event. You are not member of any of the LoCo "
62 "Teams."
63 msgstr ""
64
65-#: events/views.py:212 events/views.py:250
66+#: events/views.py:204 events/views.py:242
67 msgid "New event created."
68 msgstr ""
69
70-#: events/views.py:228 events/views.py:263
71+#: events/views.py:220 events/views.py:255
72 msgid ""
73 "You can not add a new event for this team. You are not member of the team or "
74 "on the LoCo Council."
75 msgstr ""
76
77-#: events/views.py:286
78+#: events/views.py:278
79 msgid "Team Event updated."
80 msgstr ""
81
82-#: events/views.py:297
83+#: events/views.py:289
84 msgid ""
85 "You can not update this team event. You are not member of the team or on the "
86 "LoCo Council."
87 msgstr ""
88
89-#: events/views.py:317
90+#: events/views.py:309
91 msgid "Your registration has been saved."
92 msgstr ""
93
94-#: events/views.py:350
95+#: events/views.py:342
96 msgid "Comment saved."
97 msgstr ""
98
99-#: events/views.py:419
100+#: events/views.py:411
101 msgid "Global Event removed."
102 msgstr ""
103
104-#: events/views.py:425
105+#: events/views.py:417
106 msgid "You can not remove this global event. You are not on the LoCo Council."
107 msgstr ""
108
109-#: events/views.py:439
110+#: events/views.py:431
111 msgid "New Global Event created."
112 msgstr ""
113
114-#: events/views.py:450
115+#: events/views.py:442
116 msgid "You can not add a new global event. You are not on the LoCo Council."
117 msgstr ""
118
119-#: events/views.py:466
120+#: events/views.py:458
121 msgid "Global Event updated."
122 msgstr ""
123
124-#: events/views.py:477
125+#: events/views.py:469
126 msgid "You can not update this global event. You are not on the LoCo Council."
127 msgstr ""
128
129@@ -260,7 +258,7 @@
130 msgid "Email Address"
131 msgstr ""
132
133-#: teams/models.py:74 templates/teams/team_detail.html:186
134+#: teams/models.py:74 templates/teams/team_detail.html:185
135 msgid "IRC Channel"
136 msgstr ""
137
138@@ -382,19 +380,19 @@
139 msgid "Team \"%(old_team)\" merged with \"%(new-team)\"."
140 msgstr ""
141
142-#: teams/views.py:114 teams/views.py:133
143+#: teams/views.py:107 teams/views.py:126
144 msgid "You are not allowed to merge this team with another one."
145 msgstr ""
146
147-#: teams/views.py:156
148+#: teams/views.py:149
149 msgid "You are not allowed to make changes to the team details."
150 msgstr ""
151
152-#: teams/views.py:166
153+#: teams/views.py:159
154 msgid "Team details updated"
155 msgstr ""
156
157-#: teams/views.py:169
158+#: teams/views.py:162
159 msgid "Team details could not be saved."
160 msgstr ""
161
162@@ -448,7 +446,7 @@
163 "please "
164 msgstr ""
165
166-#: templates/404.html:19 templates/500.html:27 templates/about.html:31
167+#: templates/404.html:19 templates/500.html:27 templates/about.html:29
168 msgid "Report it!"
169 msgstr ""
170
171@@ -473,11 +471,11 @@
172 msgid "About the LoCo Team Directory"
173 msgstr ""
174
175-#: templates/about.html:12
176+#: templates/about.html:10
177 msgid "What is the LoCo Team Directory?"
178 msgstr ""
179
180-#: templates/about.html:13
181+#: templates/about.html:11
182 msgid ""
183 "The LoCo Team Directory is a place where you can find information regarding "
184 "LoCo Teams. It was originally developed by <a href='https://launchpad.net/"
185@@ -486,17 +484,17 @@
186 "Team Directory Developers</a>."
187 msgstr ""
188
189-#: templates/about.html:13
190+#: templates/about.html:11
191 msgid ""
192 "The LoCo Team Directory is made available under the <a href='http://www.gnu."
193 "org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>."
194 msgstr ""
195
196-#: templates/about.html:20
197+#: templates/about.html:18
198 msgid "The Directory Data"
199 msgstr ""
200
201-#: templates/about.html:21
202+#: templates/about.html:19
203 msgid ""
204 "The LoCo Team Directory comes from two sources, <a href='https://launchpad."
205 "net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/"
206@@ -505,7 +503,7 @@
207 "with other web apps and for possible mashups."
208 msgstr ""
209
210-#: templates/about.html:22
211+#: templates/about.html:20
212 msgid ""
213 "The LoCo Team Directory is made available under the <a href='http://www.gnu."
214 "org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is "
215@@ -513,62 +511,74 @@
216 "Code Hosting</a>."
217 msgstr ""
218
219-#: templates/about.html:26
220+#: templates/about.html:24
221 msgid "Contribute to the LoCo Team Directory!"
222 msgstr ""
223
224-#: templates/about.html:27
225+#: templates/about.html:25
226 msgid "You can make it better:"
227 msgstr ""
228
229-#: templates/about.html:29
230+#: templates/about.html:27
231 msgid "Have an Idea?"
232 msgstr ""
233
234-#: templates/about.html:29
235+#: templates/about.html:27
236 msgid "Write a blueprint!"
237 msgstr ""
238
239-#: templates/about.html:30
240+#: templates/about.html:28
241 msgid ""
242 "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</"
243 "a>"
244 msgstr ""
245
246-#: templates/about.html:31
247-msgid "Found a bug,"
248-msgstr ""
249-
250-#: templates/about.html:32
251-msgid "Help with code,"
252-msgstr ""
253-
254-#: templates/about.html:32
255+#: templates/about.html:29
256+msgid "Found a bug?"
257+msgstr ""
258+
259+#: templates/about.html:30
260+msgid "Help with code:"
261+msgstr ""
262+
263+#: templates/about.html:30
264 msgid "Get the code!"
265 msgstr ""
266
267-#: templates/about.html:35
268+#: templates/about.html:31
269+msgid "Discuss:"
270+msgstr ""
271+
272+#: templates/about.html:31
273+msgid "LoCo Directory Mailing List"
274+msgstr ""
275+
276+#: templates/about.html:31
277+msgid "or send an email to"
278+msgstr ""
279+
280+#: templates/about.html:34
281 msgid "Need to know more,"
282 msgstr ""
283
284-#: templates/about.html:35
285+#: templates/about.html:34
286 msgid "just ask!"
287 msgstr ""
288
289-#: templates/about.html:41
290+#: templates/about.html:40
291 msgid "Coming Soon!"
292 msgstr ""
293
294-#: templates/about.html:43
295+#: templates/about.html:42
296 msgid "Future additions to this site will include:"
297 msgstr ""
298
299-#: templates/about_loco.html:4 templates/about_loco.html.py:11
300+#: templates/about_loco.html:4 templates/about_loco.html.py:9
301 #: templates/index.html:5
302 msgid "About Local Community (LoCo) Teams"
303 msgstr ""
304
305-#: templates/about_loco.html:12
306+#: templates/about_loco.html:10
307 msgid ""
308 "With the incredible success of Ubuntu around the world, the LoCo project is "
309 "here to help groups of Ubuntu fans and enthusiasts work together in regional "
310@@ -577,50 +587,50 @@
311 "to our already vast and extensive Ubuntu community. Why not go and see the"
312 msgstr ""
313
314-#: templates/about_loco.html:12 templates/about_loco.html.py:18
315+#: templates/about_loco.html:10 templates/about_loco.html.py:16
316 msgid "See All LoCo Teams"
317 msgstr ""
318
319-#: templates/about_loco.html:12
320+#: templates/about_loco.html:10
321 msgid "full list of teams!"
322 msgstr ""
323
324-#: templates/about_loco.html:16
325+#: templates/about_loco.html:14
326 msgid "Joining a LoCo Team"
327 msgstr ""
328
329-#: templates/about_loco.html:18
330+#: templates/about_loco.html:16
331 msgid "Do you want to join a LoCo Team? It's easy! Just "
332 msgstr ""
333
334-#: templates/about_loco.html:18
335+#: templates/about_loco.html:16
336 msgid "find a team"
337 msgstr ""
338
339-#: templates/about_loco.html:18
340+#: templates/about_loco.html:16
341 msgid ""
342 "in your area and click the 'Join This Team!' link at the top of their page."
343 msgstr ""
344
345-#: templates/about_loco.html:19
346+#: templates/about_loco.html:17
347 msgid ""
348 "If you are not able to find a LoCo Team in your area and want to create one, "
349 "take a look at the "
350 msgstr ""
351
352-#: templates/about_loco.html:19
353+#: templates/about_loco.html:17
354 msgid "LoCo Team HowTo"
355 msgstr ""
356
357-#: templates/about_loco.html:19
358+#: templates/about_loco.html:17
359 msgid " for more information on setting up a LoCo Team."
360 msgstr ""
361
362-#: templates/about_loco.html:24
363+#: templates/about_loco.html:22
364 msgid "Why Local Teams?"
365 msgstr ""
366
367-#: templates/about_loco.html:25
368+#: templates/about_loco.html:23
369 msgid ""
370 "Ever since the birth of computers, enthusiasts and fans around the world "
371 "have collected together in garages, universities and pubs to talk about "
372@@ -629,7 +639,7 @@
373 "LoCo project."
374 msgstr ""
375
376-#: templates/base.html:6 templates/base.html.py:60
377+#: templates/base.html:6 templates/base.html.py:67
378 msgid "LoCo Team Directory"
379 msgstr ""
380
381@@ -637,8 +647,8 @@
382 msgid "Show All Teams"
383 msgstr ""
384
385-#: templates/base.html:14 templates/using_locodir.html:16
386-#: templates/events/team_event_list.inc.html:8
387+#: templates/base.html:14 templates/site_search.html:10
388+#: templates/using_locodir.html:14 templates/events/team_event_list.inc.html:8
389 msgid "Teams"
390 msgstr ""
391
392@@ -646,7 +656,7 @@
393 msgid "Show All Events"
394 msgstr ""
395
396-#: templates/base.html:15 templates/using_locodir.html:21
397+#: templates/base.html:15 templates/using_locodir.html:19
398 msgid "Events"
399 msgstr ""
400
401@@ -674,11 +684,11 @@
402 msgid "Log In"
403 msgstr ""
404
405-#: templates/base.html:45
406+#: templates/base.html:52
407 msgid "Logged in as"
408 msgstr ""
409
410-#: templates/base.html:59
411+#: templates/base.html:66
412 msgid "About the LoCo Team Directory Project"
413 msgstr ""
414
415@@ -687,55 +697,55 @@
416 msgstr ""
417
418 #: templates/index.html:6 templates/using_locodir.html:4
419-#: templates/using_locodir.html.py:11
420+#: templates/using_locodir.html.py:9
421 msgid "Using the LoCo Team Directory"
422 msgstr ""
423
424-#: templates/index.html:18
425+#: templates/index.html:16
426 msgid "Ubuntu Local Community (LoCo) Team Directory"
427 msgstr ""
428
429-#: templates/index.html:47
430+#: templates/index.html:45
431 msgid "Click on your continent to find teams near you."
432 msgstr ""
433
434-#: templates/index.html:54
435+#: templates/index.html:52
436 msgid "Show all Events"
437 msgstr ""
438
439-#: templates/index.html:54 templates/teams/team_event_history.html:8
440+#: templates/index.html:52 templates/teams/team_event_history.html:8
441 msgid "Upcoming Events"
442 msgstr ""
443
444-#: templates/index.html:57
445+#: templates/index.html:55 templates/site_search.html:23
446 msgid "Global Events"
447 msgstr ""
448
449-#: templates/index.html:59 templates/events/event_list.html:29
450+#: templates/index.html:57 templates/events/event_list.html:20
451 msgid "Global Events as ical"
452 msgstr ""
453
454-#: templates/index.html:61 templates/events/event_list.html:31
455+#: templates/index.html:59 templates/events/event_list.html:22
456 msgid "Select a global event below to see more information about it:"
457 msgstr ""
458
459-#: templates/index.html:70
460+#: templates/index.html:68
461 msgid "Upcoming Team Events"
462 msgstr ""
463
464-#: templates/index.html:72 templates/events/event_list.html:46
465+#: templates/index.html:70 templates/events/event_list.html:37
466 msgid "Team Events as ical"
467 msgstr ""
468
469-#: templates/index.html:77 templates/events/global_event_detail.inc.html:117
470+#: templates/index.html:75 templates/events/global_event_detail.inc.html:117
471 msgid "Microblogging"
472 msgstr ""
473
474-#: templates/irc_chat.html:4 templates/irc_chat.html.py:10
475+#: templates/irc_chat.html:4 templates/irc_chat.html.py:8
476 msgid "Ubuntu LoCo Teams IRC Chat"
477 msgstr ""
478
479-#: templates/irc_chat.html:13
480+#: templates/irc_chat.html:11
481 msgid ""
482 "Why not join other team members from different LoCos around the world on IRC "
483 "in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to "
484@@ -745,7 +755,7 @@
485 "teams."
486 msgstr ""
487
488-#: templates/irc_chat.html:14
489+#: templates/irc_chat.html:12
490 msgid ""
491 "It's a great place to chat to with members from different teams, get ideas "
492 "from them and learn how other teams interact. Why not join, idle and learn. "
493@@ -753,7 +763,7 @@
494 "on your wiki page or in your IRC channel's topic."
495 msgstr ""
496
497-#: templates/loco_council.html:4 templates/loco_council.html.py:14
498+#: templates/loco_council.html:4 templates/loco_council.html.py:12
499 msgid "Ubuntu LoCo Council"
500 msgstr ""
501
502@@ -761,7 +771,7 @@
503 msgid "Approved Teams"
504 msgstr ""
505
506-#: templates/loco_council.html:17
507+#: templates/loco_council.html:15
508 msgid ""
509 "The Ubuntu LoCo Council is comprised of elected, dedicated members of the "
510 "Ubuntu Community. They have diverse backgrounds, but have a firm "
511@@ -770,84 +780,117 @@
512 "guidance and help when needed to these teams and lead them by example."
513 msgstr ""
514
515-#: templates/loco_council.html:20
516+#: templates/loco_council.html:18
517 msgid ""
518 "The LoCo Council governs the LoCo community, make decisions on resource "
519 "allocation, deals with conflict resolution and make decisions about where "
520 "the project should move forward."
521 msgstr ""
522
523-#: templates/loco_council.html:23
524+#: templates/loco_council.html:21
525 msgid ""
526 "The LoCo Council governs the LoCo Community; responsibilities include but "
527 "are not limited to the following:"
528 msgstr ""
529
530-#: templates/loco_council.html:25
531+#: templates/loco_council.html:23
532 msgid "To provide independent guidance for the LoCo Community."
533 msgstr ""
534
535-#: templates/loco_council.html:26
536+#: templates/loco_council.html:24
537 msgid "To maintain quality of governance in the LoCo community."
538 msgstr ""
539
540-#: templates/loco_council.html:27
541+#: templates/loco_council.html:25
542 msgid "To assess and re-assess teams for approved state."
543 msgstr ""
544
545-#: templates/loco_council.html:28
546+#: templates/loco_council.html:26
547 msgid ""
548 "To provide input and feedback to other Ubuntu governance boards regarding "
549 "the needs and achievements of the LoCo community."
550 msgstr ""
551
552-#: templates/loco_council.html:29
553+#: templates/loco_council.html:27
554 msgid ""
555 "To act as an independent, objective, third party to resolve conflict in "
556 "teams by acting as mediator for a group or individuals."
557 msgstr ""
558
559-#: templates/loco_council.html:30
560+#: templates/loco_council.html:28
561 msgid ""
562 "To govern key LoCo resources such as mailing lists and key web properties. "
563 "ie. if you log a Request Ticket regarding your LoCo and don't hear anything "
564 "after 2 weeks contact us."
565 msgstr ""
566
567-#: templates/loco_council.html:31
568+#: templates/loco_council.html:29
569 msgid "Influencing and recommending how LoCo resources are allocated."
570 msgstr ""
571
572-#: templates/loco_council.html:32
573+#: templates/loco_council.html:30
574 msgid ""
575 "Influencing the direction and goals of the Ubuntu Project and greater LoCo "
576 "Team effort."
577 msgstr ""
578
579-#: templates/loco_council.html:33
580+#: templates/loco_council.html:31
581 msgid "To motivate and encourage LoCos to be the best they can."
582 msgstr ""
583
584-#: templates/loco_council.html:37
585+#: templates/loco_council.html:35
586 msgid ""
587 "You can reach the council via email at loco-council at lists.ubuntu.com."
588 msgstr ""
589
590-#: templates/loco_council.html:40
591+#: templates/loco_council.html:38
592 msgid ""
593 "The LoCo Council holds regular meetings in #ubuntu-meeting on freenode. To "
594 "find out when the next meeting is view the"
595 msgstr ""
596
597-#: templates/loco_council.html:40
598+#: templates/loco_council.html:38
599 msgid "Meeting Agenda"
600 msgstr ""
601
602-#: templates/loco_council.html:40
603+#: templates/loco_council.html:38
604 msgid "wiki page."
605 msgstr ""
606
607-#: templates/using_locodir.html:12
608+#: templates/site_search.html:14 templates/teams/team_list.html:21
609+#: templates/teams/team_list.html.py:36 templates/teams/team_list.html:50
610+#, python-format
611+msgid "%(teamname)s approved"
612+msgstr ""
613+
614+#: templates/site_search.html:14 templates/teams/team_list.html:21
615+#: templates/teams/team_list.html.py:36 templates/teams/team_list.html:50
616+#, python-format
617+msgid "%(teamname)s not approved"
618+msgstr ""
619+
620+#: templates/site_search.html:36 templates/events/global_event_list.inc.html:7
621+msgid "Team Events"
622+msgstr ""
623+
624+#: templates/site_search.html:40
625+#: templates/events/global_event_detail_attending_teamevents.inc.html:10
626+#: templates/events/global_event_detail_attending_teamevents.inc.html:25
627+#: templates/events/global_event_detail_attending_teamevents.inc.html:38
628+#: templates/events/team_event_list.inc.html:16
629+msgid "more information about this team"
630+msgstr ""
631+
632+#: templates/site_search.html:49 templates/using_locodir.html:24
633+#: templates/events/event_list.html:7
634+msgid "Venues"
635+msgstr ""
636+
637+#: templates/site_search.html:63
638+msgid "No search terms provided"
639+msgstr ""
640+
641+#: templates/using_locodir.html:10
642 msgid ""
643 "The LoCo Team Directory is an excellent resource for LoCo Teams to use when "
644 "planning events. The LoCo Team Directory allows users to set up events and "
645@@ -856,23 +899,19 @@
646 "users."
647 msgstr ""
648
649-#: templates/using_locodir.html:17
650+#: templates/using_locodir.html:15
651 msgid ""
652 "All LoCo Teams registered in Launchpad are a part of the LoCo Team "
653 "Directory. Team members can create events and venues for their LoCo Team."
654 msgstr ""
655
656-#: templates/using_locodir.html:22
657+#: templates/using_locodir.html:20
658 msgid ""
659 "A LoCo Team member can create an event, and then other members can register "
660 "their attendance to the event and make comments to the event."
661 msgstr ""
662
663-#: templates/using_locodir.html:26 templates/events/event_list.html:7
664-msgid "Venues"
665-msgstr ""
666-
667-#: templates/using_locodir.html:27
668+#: templates/using_locodir.html:25
669 msgid ""
670 "Creating a venue in the LoCo Team Directory will provide other users with "
671 "information about where an event is being held, and any other information "
672@@ -925,34 +964,34 @@
673 msgid "Add Global Event"
674 msgstr ""
675
676-#: templates/events/event_list.html:12
677+#: templates/events/event_list.html:11
678 msgid "Add Team Event"
679 msgstr ""
680
681-#: templates/events/event_list.html:14 templates/teams/team_detail.html:204
682+#: templates/events/event_list.html:12 templates/teams/team_detail.html:203
683 #: templates/teams/team_event_list.html:8
684 msgid "Past Events"
685 msgstr ""
686
687-#: templates/events/event_list.html:26
688+#: templates/events/event_list.html:17
689 msgid "Ubuntu LoCo Global Events"
690 msgstr ""
691
692-#: templates/events/event_list.html:36
693+#: templates/events/event_list.html:27
694 msgid "There are currently no LoCo Global Events"
695 msgstr ""
696
697-#: templates/events/event_list.html:43
698+#: templates/events/event_list.html:34
699 msgid "Ubuntu LoCo Team Events"
700 msgstr ""
701
702-#: templates/events/event_list.html:47
703-#: templates/teams/team_event_history.html:18
704-#: templates/teams/team_event_list.html:25
705+#: templates/events/event_list.html:38
706+#: templates/teams/team_event_history.html:16
707+#: templates/teams/team_event_list.html:24
708 msgid "Select a team event below to see more information about it:"
709 msgstr ""
710
711-#: templates/events/event_list.html:52
712+#: templates/events/event_list.html:43
713 msgid "There are currently no LoCo Team Events"
714 msgstr ""
715
716@@ -960,17 +999,17 @@
717 msgid "Delete Global Event"
718 msgstr ""
719
720-#: templates/events/global_event_delete_confirm.html:15
721+#: templates/events/global_event_delete_confirm.html:12
722 msgid "Delete global Event"
723 msgstr ""
724
725-#: templates/events/global_event_delete_confirm.html:16
726+#: templates/events/global_event_delete_confirm.html:13
727 #, python-format
728 msgid "Do you really want to delete the Global Event: %(eventname)s?"
729 msgstr ""
730
731-#: templates/events/global_event_delete_confirm.html:18
732-#: templates/events/team_event_delete_confirm.html:18
733+#: templates/events/global_event_delete_confirm.html:15
734+#: templates/events/team_event_delete_confirm.html:15
735 msgid "Cancel"
736 msgstr ""
737
738@@ -1009,13 +1048,6 @@
739 msgid "More Information about Team Event"
740 msgstr ""
741
742-#: templates/events/global_event_detail_attending_teamevents.inc.html:10
743-#: templates/events/global_event_detail_attending_teamevents.inc.html:25
744-#: templates/events/global_event_detail_attending_teamevents.inc.html:38
745-#: templates/events/team_event_list.inc.html:16
746-msgid "more information about this team"
747-msgstr ""
748-
749 #: templates/events/global_event_detail_attending_teamevents.inc.html:19
750 msgid "Events in countries without continents"
751 msgstr ""
752@@ -1056,10 +1088,6 @@
753 msgid "End"
754 msgstr ""
755
756-#: templates/events/global_event_list.inc.html:7
757-msgid "Team Events"
758-msgstr ""
759-
760 #: templates/events/global_event_list.inc.html:11
761 #: templates/events/team_event_list.inc.html:12
762 msgid "more information about this event"
763@@ -1069,41 +1097,41 @@
764 msgid "New Global Event"
765 msgstr ""
766
767-#: templates/events/global_event_new.html:25
768+#: templates/events/global_event_new.html:22
769 msgid "Add new Global Event"
770 msgstr ""
771
772-#: templates/events/global_event_new.html:31
773-#: templates/events/global_event_update.html:29
774-#: templates/events/team_event_comment_new.html:29
775-#: templates/events/team_event_new.html:37
776-#: templates/events/team_event_register.html:26
777-#: templates/events/team_event_update.html:29
778+#: templates/events/global_event_new.html:28
779+#: templates/events/global_event_update.html:26
780+#: templates/events/team_event_comment_new.html:26
781+#: templates/events/team_event_new.html:34
782+#: templates/events/team_event_register.html:23
783+#: templates/events/team_event_update.html:26
784 msgid "Submit"
785 msgstr ""
786
787 #: templates/events/global_event_update.html:4
788-#: templates/events/global_event_update.html:23
789+#: templates/events/global_event_update.html:20
790 msgid "Update Global Event"
791 msgstr ""
792
793 #: templates/events/team_event_comment_new.html:4
794-#: templates/events/team_event_comment_new.html:23
795+#: templates/events/team_event_comment_new.html:20
796 msgid "Team Event Comment"
797 msgstr ""
798
799 #: templates/events/team_event_delete_confirm.html:4
800-#: templates/events/team_event_delete_confirm.html:15
801+#: templates/events/team_event_delete_confirm.html:12
802 msgid "Delete Team Event"
803 msgstr ""
804
805-#: templates/events/team_event_delete_confirm.html:16
806+#: templates/events/team_event_delete_confirm.html:13
807 #, python-format
808 msgid "Do you really want to delete the Team Event: %(eventname)s?"
809 msgstr ""
810
811-#: templates/events/team_event_detail.html:9
812-#: templates/events/team_event_detail_comments.inc.html:7
813+#: templates/events/team_event_detail.html:8
814+#: templates/events/team_event_detail_comments.inc.html:6
815 msgid "Add Comment"
816 msgstr ""
817
818@@ -1111,13 +1139,13 @@
819 msgid "Copy Event"
820 msgstr ""
821
822-#: templates/events/team_event_detail.html:17
823-#: templates/teams/team_detail.html:206
824+#: templates/events/team_event_detail.html:16
825+#: templates/teams/team_detail.html:205
826 msgid "iCal Feed"
827 msgstr ""
828
829 #: templates/events/team_event_detail.inc.html:19
830-#: templates/events/team_event_detail_attendees.inc.html:24
831+#: templates/events/team_event_detail_attendees.inc.html:26
832 msgid "Attendees"
833 msgstr ""
834
835@@ -1131,18 +1159,19 @@
836 msgstr ""
837
838 #: templates/events/team_event_detail_attendees.inc.html:10
839+#: templates/events/team_event_detail_attendees.inc.html:13
840 msgid "Register for this Event"
841 msgstr ""
842
843-#: templates/events/team_event_detail_attendees.inc.html:16
844+#: templates/events/team_event_detail_attendees.inc.html:18
845 msgid "Confirmed attending:"
846 msgstr ""
847
848-#: templates/events/team_event_detail_attendees.inc.html:17
849+#: templates/events/team_event_detail_attendees.inc.html:19
850 msgid "Maybe attending:"
851 msgstr ""
852
853-#: templates/events/team_event_detail_attendees.inc.html:25
854+#: templates/events/team_event_detail_attendees.inc.html:27
855 msgid "Registration Status"
856 msgstr ""
857
858@@ -1151,8 +1180,8 @@
859 msgstr ""
860
861 #: templates/events/team_event_detail_basic.inc.html:20
862-#: templates/venues/venue_list.html:36 templates/venues/venue_list.html:54
863-#: templates/venues/venue_list.html:69
864+#: templates/venues/venue_list.html:27 templates/venues/venue_list.html:45
865+#: templates/venues/venue_list.html:60
866 msgid "show venue details"
867 msgstr ""
868
869@@ -1209,11 +1238,11 @@
870 msgid "New Team Event"
871 msgstr ""
872
873-#: templates/events/team_event_new.html:31
874+#: templates/events/team_event_new.html:28
875 msgid "Add new Team Event for "
876 msgstr ""
877
878-#: templates/events/team_event_new_select.html:11
879+#: templates/events/team_event_new_select.html:8
880 msgid "Select a Team to add an Event for"
881 msgstr ""
882
883@@ -1221,15 +1250,15 @@
884 msgid "Team Event Registration"
885 msgstr ""
886
887-#: templates/events/team_event_register.html:15
888+#: templates/events/team_event_register.html:12
889 msgid "Register for event "
890 msgstr ""
891
892-#: templates/events/team_event_register.html:18
893+#: templates/events/team_event_register.html:15
894 msgid "This event has finished!"
895 msgstr ""
896
897-#: templates/events/team_event_register.html:18
898+#: templates/events/team_event_register.html:15
899 msgid ""
900 "Feel free to change your registration status to reflect whether you actually "
901 "attended; we're just making sure you know you're not signing up for an "
902@@ -1237,31 +1266,31 @@
903 msgstr ""
904
905 #: templates/events/team_event_update.html:4
906-#: templates/events/team_event_update.html:23
907+#: templates/events/team_event_update.html:20
908 msgid "Update Team Event"
909 msgstr ""
910
911-#: templates/teams/merge_teams.html:4 templates/teams/merge_teams.html:12
912+#: templates/teams/merge_teams.html:4 templates/teams/merge_teams.html:11
913 #: templates/teams/select_other_team.html:4
914-#: templates/teams/select_other_team.html:12
915+#: templates/teams/select_other_team.html:11
916 msgid "Merge Teams"
917 msgstr ""
918
919-#: templates/teams/merge_teams.html:18
920+#: templates/teams/merge_teams.html:17
921 msgid "You need two valid teams you want to merge with another."
922 msgstr ""
923
924-#: templates/teams/merge_teams.html:20
925+#: templates/teams/merge_teams.html:19
926 #, python-format
927 msgid "Go back to the main page of %(teamname)s."
928 msgstr ""
929
930-#: templates/teams/select_other_team.html:18
931+#: templates/teams/select_other_team.html:17
932 #, python-format
933 msgid "Select the team you want to merge \"%(teamname)s\" with:"
934 msgstr ""
935
936-#: templates/teams/select_other_team.html:33
937+#: templates/teams/select_other_team.html:32
938 msgid "There are currently no teams you could merge your team with."
939 msgstr ""
940
941@@ -1285,94 +1314,94 @@
942 msgid "Add New Event"
943 msgstr ""
944
945-#: templates/teams/team_detail.html:112 templates/teams/team_event_list.html:9
946+#: templates/teams/team_detail.html:111 templates/teams/team_event_list.html:9
947 msgid "Team Events (RSS)"
948 msgstr ""
949
950-#: templates/teams/team_detail.html:121
951+#: templates/teams/team_detail.html:120
952 msgid "Location:"
953 msgstr ""
954
955-#: templates/teams/team_detail.html:126 templates/teams/team_detail.html:136
956-#: templates/teams/team_detail.html:218
957+#: templates/teams/team_detail.html:125 templates/teams/team_detail.html:135
958+#: templates/teams/team_detail.html:217
959 msgid "None Specified"
960 msgstr ""
961
962-#: templates/teams/team_detail.html:131
963+#: templates/teams/team_detail.html:130
964 msgid "Languages:"
965 msgstr ""
966
967-#: templates/teams/team_detail.html:142
968+#: templates/teams/team_detail.html:141
969 msgid "Approval Date:"
970 msgstr ""
971
972-#: templates/teams/team_detail.html:148
973+#: templates/teams/team_detail.html:147
974 msgid "Expires Date:"
975 msgstr ""
976
977-#: templates/teams/team_detail.html:153
978+#: templates/teams/team_detail.html:152
979 msgid "Local Support:"
980 msgstr ""
981
982-#: templates/teams/team_detail.html:157
983+#: templates/teams/team_detail.html:156
984 msgid "Team Admin(s):"
985 msgstr ""
986
987-#: templates/teams/team_detail.html:168
988+#: templates/teams/team_detail.html:167
989 msgid "Team Contact(s):"
990 msgstr ""
991
992-#: templates/teams/team_detail.html:175
993+#: templates/teams/team_detail.html:174
994 msgid "No LoCo Team contacts are set."
995 msgstr ""
996
997-#: templates/teams/team_detail.html:180
998+#: templates/teams/team_detail.html:179
999 msgid "Resources:"
1000 msgstr ""
1001
1002-#: templates/teams/team_detail.html:183
1003+#: templates/teams/team_detail.html:182
1004 msgid "Team Wiki"
1005 msgstr ""
1006
1007-#: templates/teams/team_detail.html:189
1008+#: templates/teams/team_detail.html:188
1009 msgid "Team Mailing List"
1010 msgstr ""
1011
1012-#: templates/teams/team_detail.html:192
1013+#: templates/teams/team_detail.html:191
1014 msgid "Team Forums"
1015 msgstr ""
1016
1017-#: templates/teams/team_detail.html:195
1018+#: templates/teams/team_detail.html:194
1019 msgid "Team Website"
1020 msgstr ""
1021
1022-#: templates/teams/team_detail.html:200
1023+#: templates/teams/team_detail.html:199
1024 msgid "Upcoming Events:"
1025 msgstr ""
1026
1027-#: templates/teams/team_detail.html:203
1028+#: templates/teams/team_detail.html:202
1029 msgid "All Events"
1030 msgstr ""
1031
1032-#: templates/teams/team_detail.html:205
1033+#: templates/teams/team_detail.html:204
1034 msgid "RSS Feed"
1035 msgstr ""
1036
1037-#: templates/teams/team_detail.html:213
1038+#: templates/teams/team_detail.html:212
1039 #, python-format
1040 msgid "%(start_date)s in %(city)s"
1041 msgstr ""
1042
1043-#: templates/teams/team_detail.html:213
1044+#: templates/teams/team_detail.html:212
1045 msgid "on: "
1046 msgstr ""
1047
1048-#: templates/teams/team_detail.html:231
1049+#: templates/teams/team_detail.html:230
1050 msgid "Photos from"
1051 msgstr ""
1052
1053 #: templates/teams/team_event_history.html:4
1054-#: templates/teams/team_event_history.html:15
1055+#: templates/teams/team_event_history.html:13
1056 #, python-format
1057 msgid "%(teamname)s Events History"
1058 msgstr ""
1059@@ -1382,18 +1411,18 @@
1060 msgid "Back to Team Details"
1061 msgstr ""
1062
1063-#: templates/teams/team_event_history.html:23
1064+#: templates/teams/team_event_history.html:21
1065 #, python-format
1066 msgid "There are no past events for LoCo Team %(teamname)s :("
1067 msgstr ""
1068
1069 #: templates/teams/team_event_list.html:4
1070-#: templates/teams/team_event_list.html:20
1071+#: templates/teams/team_event_list.html:19
1072 #, python-format
1073 msgid "%(teamname)s Events List"
1074 msgstr ""
1075
1076-#: templates/teams/team_event_list.html:30
1077+#: templates/teams/team_event_list.html:29
1078 #, python-format
1079 msgid "There are currently no Events for LoCo Team %(teamname)s :("
1080 msgstr ""
1081@@ -1402,76 +1431,64 @@
1082 msgid "Ubuntu LoCo Teams List"
1083 msgstr ""
1084
1085-#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43
1086-#: templates/teams/team_list.html:57
1087-#, python-format
1088-msgid "%(teamname)s approved"
1089-msgstr ""
1090-
1091-#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43
1092-#: templates/teams/team_list.html:57
1093-#, python-format
1094-msgid "%(teamname)s not approved"
1095-msgstr ""
1096-
1097-#: templates/teams/team_list.html:37
1098+#: templates/teams/team_list.html:30
1099 msgid "Countries without continent"
1100 msgstr ""
1101
1102-#: templates/teams/team_list.html:53
1103+#: templates/teams/team_list.html:46
1104 msgid "Teams without country"
1105 msgstr ""
1106
1107 #: templates/teams/team_reapprovals.html:4
1108-#: templates/teams/team_reapprovals.html:12
1109+#: templates/teams/team_reapprovals.html:11
1110 msgid "Approved Ubuntu LoCo Teams"
1111 msgstr ""
1112
1113+#: templates/teams/team_reapprovals.html:16
1114+msgid "Getting Your Team Approved"
1115+msgstr ""
1116+
1117 #: templates/teams/team_reapprovals.html:17
1118-msgid "Getting Your Team Approved"
1119-msgstr ""
1120-
1121-#: templates/teams/team_reapprovals.html:18
1122 msgid "Ubuntu LoCo teams fall into two approximate categories:"
1123 msgstr ""
1124
1125-#: templates/teams/team_reapprovals.html:20
1126+#: templates/teams/team_reapprovals.html:19
1127 msgid ""
1128 "New Teams - these are teams that are in the process of getting started and "
1129 "have not yet been officially approved as an Ubuntu LoCo team."
1130 msgstr ""
1131
1132-#: templates/teams/team_reapprovals.html:21
1133+#: templates/teams/team_reapprovals.html:20
1134 msgid ""
1135 "Approved Teams - an approved team is a team that is up and running, has each "
1136 "of the required resources in operation and the team is working well."
1137 msgstr ""
1138
1139-#: templates/teams/team_reapprovals.html:24
1140+#: templates/teams/team_reapprovals.html:23
1141 msgid "For more information on getting approved, you can look at"
1142 msgstr ""
1143
1144-#: templates/teams/team_reapprovals.html:24
1145+#: templates/teams/team_reapprovals.html:23
1146 msgid "getting your LoCo team approved"
1147 msgstr ""
1148
1149-#: templates/teams/team_reapprovals.html:24
1150+#: templates/teams/team_reapprovals.html:23
1151 msgid "and the"
1152 msgstr ""
1153
1154-#: templates/teams/team_reapprovals.html:24
1155+#: templates/teams/team_reapprovals.html:23
1156 msgid "LoCo Team FAQs"
1157 msgstr ""
1158
1159-#: templates/teams/team_reapprovals.html:24
1160+#: templates/teams/team_reapprovals.html:23
1161 msgid "pages created by the LoCo Council."
1162 msgstr ""
1163
1164+#: templates/teams/team_reapprovals.html:24
1165+msgid "Getting Your Team Reapproved"
1166+msgstr ""
1167+
1168 #: templates/teams/team_reapprovals.html:25
1169-msgid "Getting Your Team Reapproved"
1170-msgstr ""
1171-
1172-#: templates/teams/team_reapprovals.html:26
1173 msgid ""
1174 "Every two years each LoCo team must be reapproved. LoCo teams will be "
1175 "contacted by a member of the LoCo Council notifying the team that it is time "
1176@@ -1480,32 +1497,32 @@
1177 "have been active in the community in the past two years."
1178 msgstr ""
1179
1180-#: templates/teams/team_reapprovals.html:27
1181+#: templates/teams/team_reapprovals.html:26
1182 msgid ""
1183 "For more information on getting reapproved, the LoCo Council has created the"
1184 msgstr ""
1185
1186-#: templates/teams/team_reapprovals.html:27
1187+#: templates/teams/team_reapprovals.html:26
1188 msgid "LoCo Team Reapproval"
1189 msgstr ""
1190
1191-#: templates/teams/team_reapprovals.html:27
1192+#: templates/teams/team_reapprovals.html:26
1193 msgid "page."
1194 msgstr ""
1195
1196-#: templates/teams/team_reapprovals.html:32
1197+#: templates/teams/team_reapprovals.html:31
1198 msgid "Approved Teams:"
1199 msgstr ""
1200
1201-#: templates/teams/team_reapprovals.html:35
1202+#: templates/teams/team_reapprovals.html:34
1203 msgid "Reapprovals in the next 6 months:"
1204 msgstr ""
1205
1206-#: templates/teams/team_reapprovals.html:51
1207+#: templates/teams/team_reapprovals.html:50
1208 msgid "Reapprovals later on:"
1209 msgstr ""
1210
1211-#: templates/teams/team_reapprovals.html:66
1212+#: templates/teams/team_reapprovals.html:65
1213 msgid ""
1214 "There are currently no approved teams in the Ubuntu LoCo Team Directory. :("
1215 msgstr ""
1216@@ -1534,7 +1551,7 @@
1217 msgid "Back to Venues List"
1218 msgstr ""
1219
1220-#: templates/venues/venue_detail.html:16
1221+#: templates/venues/venue_detail.html:15
1222 msgid "Edit Venue Details"
1223 msgstr ""
1224
1225@@ -1554,39 +1571,39 @@
1226 msgid "Latitude:"
1227 msgstr ""
1228
1229-#: templates/venues/venue_list.html:4 templates/venues/venue_list.html:22
1230+#: templates/venues/venue_list.html:4 templates/venues/venue_list.html:13
1231 msgid "Ubuntu LoCo Event Venues"
1232 msgstr ""
1233
1234-#: templates/venues/venue_list.html:8
1235+#: templates/venues/venue_list.html:7
1236 msgid "Add New Venue"
1237 msgstr ""
1238
1239-#: templates/venues/venue_list.html:25
1240+#: templates/venues/venue_list.html:16
1241 msgid "Select a Venue below to see more information about it:"
1242 msgstr ""
1243
1244-#: templates/venues/venue_list.html:48
1245+#: templates/venues/venue_list.html:39
1246 msgid "Countries without Continent"
1247 msgstr ""
1248
1249-#: templates/venues/venue_list.html:65
1250+#: templates/venues/venue_list.html:56
1251 msgid "Venues without Country"
1252 msgstr ""
1253
1254-#: templates/venues/venue_list.html:78
1255+#: templates/venues/venue_list.html:69
1256 msgid "There are currently no LoCo Venues :("
1257 msgstr ""
1258
1259-#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36
1260+#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:33
1261 msgid "Update Venue"
1262 msgstr ""
1263
1264-#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36
1265+#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:33
1266 msgid "New Venue"
1267 msgstr ""
1268
1269-#: templates/venues/venue_update.html:48
1270+#: templates/venues/venue_update.html:45
1271 msgid "Select venue position"
1272 msgstr ""
1273
1274@@ -1670,10 +1687,10 @@
1275 msgid "Comment about the Venue"
1276 msgstr ""
1277
1278-#: venues/views.py:63
1279+#: venues/views.py:56
1280 msgid "New Venue created"
1281 msgstr ""
1282
1283-#: venues/views.py:90
1284+#: venues/views.py:83
1285 msgid "Venue updated"
1286 msgstr ""
1287
1288=== modified file 'loco_directory/templates/about.html'
1289--- loco_directory/templates/about.html 2010-11-20 17:25:50 +0000
1290+++ loco_directory/templates/about.html 2010-11-27 03:11:44 +0000
1291@@ -26,8 +26,9 @@
1292 <ul>
1293 <li>{% trans "Have an Idea?" %} <a href='https://blueprints.launchpad.net/loco-directory'>{% trans "Write a blueprint!" %}</a></li>
1294 <li> {% trans "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</a>" %}</li>
1295-<li> {% trans "Found a bug," %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li>
1296-<li> {% trans "Help with code," %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li>
1297+<li> {% trans "Found a bug?" %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li>
1298+<li> {% trans "Help with code:" %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li>
1299+<li> {% trans "Discuss:" %} <a href='https://lists.ubuntu.com/mailman/listinfo/loco-directory'>{% trans "LoCo Directory Mailing List" %}</a> {% trans "or send an email to" %} loco-directory at lists.ubuntu.com </li>
1300 </ul>
1301 </p>
1302 <p>{% trans "Need to know more," %} <a href='https://answers.launchpad.net/loco-directory'>{% trans "just ask!" %}</a></p>

Subscribers

People subscribed via source and target branches