Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/651238 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #651238 Put link to new LoCo Directory ML on LD https://bugs.launchpad.net/bugs/651238 -- https://code.launchpad.net/~chrisjohnston/loco-directory/651238/+merge/41988 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/651238 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-11-12 01:35:17 +0000 +++ loco_directory/locale/loco-directory.pot 2010-11-27 01:11:27 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-12 01:32+0000\n" +"POT-Creation-Date: 2010-11-27 01:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -17,6 +17,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: common/forms.py:47 templates/base.html:32 +msgid "Search" +msgstr "" + #: common/widgets.py:42 msgid "Add Another" msgstr "" @@ -25,12 +29,6 @@ msgid "Please just set one tag." msgstr "" -#: events/forms.py:141 teams/forms.py:39 templates/events/event_list.html:20 -#: templates/teams/team_list.html:16 templates/venues/venue_list.html:15 -#: venues/forms.py:47 -msgid "Search" -msgstr "" - #: events/models.py:9 msgid "attending" msgstr "" @@ -140,75 +138,75 @@ msgstr "" #: events/models.py:166 -#: templates/events/team_event_detail_attendees.inc.html:26 +#: templates/events/team_event_detail_attendees.inc.html:28 msgid "Additional Guests" msgstr "" -#: events/views.py:146 +#: events/views.py:138 msgid "Team Event removed." msgstr "" -#: events/views.py:153 +#: events/views.py:145 msgid "" "You can not remove this team event. You are not admin/owner of the Launchpad " "team or on the LoCo Council." msgstr "" -#: events/views.py:160 +#: events/views.py:152 msgid "" "You can not add a new team event. You are not member of any of the LoCo " "Teams." msgstr "" -#: events/views.py:212 events/views.py:250 +#: events/views.py:204 events/views.py:242 msgid "New event created." msgstr "" -#: events/views.py:228 events/views.py:263 +#: events/views.py:220 events/views.py:255 msgid "" "You can not add a new event for this team. You are not member of the team or " "on the LoCo Council." msgstr "" -#: events/views.py:286 +#: events/views.py:278 msgid "Team Event updated." msgstr "" -#: events/views.py:297 +#: events/views.py:289 msgid "" "You can not update this team event. You are not member of the team or on the " "LoCo Council." msgstr "" -#: events/views.py:317 +#: events/views.py:309 msgid "Your registration has been saved." msgstr "" -#: events/views.py:350 +#: events/views.py:342 msgid "Comment saved." msgstr "" -#: events/views.py:419 +#: events/views.py:411 msgid "Global Event removed." msgstr "" -#: events/views.py:425 +#: events/views.py:417 msgid "You can not remove this global event. You are not on the LoCo Council." msgstr "" -#: events/views.py:439 +#: events/views.py:431 msgid "New Global Event created." msgstr "" -#: events/views.py:450 +#: events/views.py:442 msgid "You can not add a new global event. You are not on the LoCo Council." msgstr "" -#: events/views.py:466 +#: events/views.py:458 msgid "Global Event updated." msgstr "" -#: events/views.py:477 +#: events/views.py:469 msgid "You can not update this global event. You are not on the LoCo Council." msgstr "" @@ -260,7 +258,7 @@ msgid "Email Address" msgstr "" -#: teams/models.py:74 templates/teams/team_detail.html:186 +#: teams/models.py:74 templates/teams/team_detail.html:185 msgid "IRC Channel" msgstr "" @@ -382,19 +380,19 @@ msgid "Team \"%(old_team)\" merged with \"%(new-team)\"." msgstr "" -#: teams/views.py:114 teams/views.py:133 +#: teams/views.py:107 teams/views.py:126 msgid "You are not allowed to merge this team with another one." msgstr "" -#: teams/views.py:156 +#: teams/views.py:149 msgid "You are not allowed to make changes to the team details." msgstr "" -#: teams/views.py:166 +#: teams/views.py:159 msgid "Team details updated" msgstr "" -#: teams/views.py:169 +#: teams/views.py:162 msgid "Team details could not be saved." msgstr "" @@ -448,7 +446,7 @@ "please " msgstr "" -#: templates/404.html:19 templates/500.html:27 templates/about.html:31 +#: templates/404.html:19 templates/500.html:27 templates/about.html:29 msgid "Report it!" msgstr "" @@ -473,11 +471,11 @@ msgid "About the LoCo Team Directory" msgstr "" -#: templates/about.html:12 +#: templates/about.html:10 msgid "What is the LoCo Team Directory?" msgstr "" -#: templates/about.html:13 +#: templates/about.html:11 msgid "" "The LoCo Team Directory is a place where you can find information regarding " "LoCo Teams. It was originally developed by <a href='https://launchpad.net/"; @@ -486,17 +484,17 @@ "Team Directory Developers</a>." msgstr "" -#: templates/about.html:13 +#: templates/about.html:11 msgid "" "The LoCo Team Directory is made available under the <a href='http://www.gnu."; "org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." msgstr "" -#: templates/about.html:20 +#: templates/about.html:18 msgid "The Directory Data" msgstr "" -#: templates/about.html:21 +#: templates/about.html:19 msgid "" "The LoCo Team Directory comes from two sources, <a href='https://launchpad."; "net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/"; @@ -505,7 +503,7 @@ "with other web apps and for possible mashups." msgstr "" -#: templates/about.html:22 +#: templates/about.html:20 msgid "" "The LoCo Team Directory is made available under the <a href='http://www.gnu."; "org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is " @@ -513,62 +511,74 @@ "Code Hosting</a>." msgstr "" -#: templates/about.html:26 +#: templates/about.html:24 msgid "Contribute to the LoCo Team Directory!" msgstr "" -#: templates/about.html:27 +#: templates/about.html:25 msgid "You can make it better:" msgstr "" -#: templates/about.html:29 +#: templates/about.html:27 msgid "Have an Idea?" msgstr "" -#: templates/about.html:29 +#: templates/about.html:27 msgid "Write a blueprint!" msgstr "" -#: templates/about.html:30 +#: templates/about.html:28 msgid "" "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</" "a>" msgstr "" -#: templates/about.html:31 -msgid "Found a bug," -msgstr "" - -#: templates/about.html:32 -msgid "Help with code," -msgstr "" - -#: templates/about.html:32 +#: templates/about.html:29 +msgid "Found a bug?" +msgstr "" + +#: templates/about.html:30 +msgid "Help with code:" +msgstr "" + +#: templates/about.html:30 msgid "Get the code!" msgstr "" -#: templates/about.html:35 +#: templates/about.html:31 +msgid "Discuss:" +msgstr "" + +#: templates/about.html:31 +msgid "LoCo Directory Mailing List" +msgstr "" + +#: templates/about.html:31 +msgid "or send an email to" +msgstr "" + +#: templates/about.html:34 msgid "Need to know more," msgstr "" -#: templates/about.html:35 +#: templates/about.html:34 msgid "just ask!" msgstr "" -#: templates/about.html:41 +#: templates/about.html:40 msgid "Coming Soon!" msgstr "" -#: templates/about.html:43 +#: templates/about.html:42 msgid "Future additions to this site will include:" msgstr "" -#: templates/about_loco.html:4 templates/about_loco.html.py:11 +#: templates/about_loco.html:4 templates/about_loco.html.py:9 #: templates/index.html:5 msgid "About Local Community (LoCo) Teams" msgstr "" -#: templates/about_loco.html:12 +#: templates/about_loco.html:10 msgid "" "With the incredible success of Ubuntu around the world, the LoCo project is " "here to help groups of Ubuntu fans and enthusiasts work together in regional " @@ -577,50 +587,50 @@ "to our already vast and extensive Ubuntu community. Why not go and see the" msgstr "" -#: templates/about_loco.html:12 templates/about_loco.html.py:18 +#: templates/about_loco.html:10 templates/about_loco.html.py:16 msgid "See All LoCo Teams" msgstr "" -#: templates/about_loco.html:12 +#: templates/about_loco.html:10 msgid "full list of teams!" msgstr "" -#: templates/about_loco.html:16 +#: templates/about_loco.html:14 msgid "Joining a LoCo Team" msgstr "" -#: templates/about_loco.html:18 +#: templates/about_loco.html:16 msgid "Do you want to join a LoCo Team? It's easy! Just " msgstr "" -#: templates/about_loco.html:18 +#: templates/about_loco.html:16 msgid "find a team" msgstr "" -#: templates/about_loco.html:18 +#: templates/about_loco.html:16 msgid "" "in your area and click the 'Join This Team!' link at the top of their page." msgstr "" -#: templates/about_loco.html:19 +#: templates/about_loco.html:17 msgid "" "If you are not able to find a LoCo Team in your area and want to create one, " "take a look at the " msgstr "" -#: templates/about_loco.html:19 +#: templates/about_loco.html:17 msgid "LoCo Team HowTo" msgstr "" -#: templates/about_loco.html:19 +#: templates/about_loco.html:17 msgid " for more information on setting up a LoCo Team." msgstr "" -#: templates/about_loco.html:24 +#: templates/about_loco.html:22 msgid "Why Local Teams?" msgstr "" -#: templates/about_loco.html:25 +#: templates/about_loco.html:23 msgid "" "Ever since the birth of computers, enthusiasts and fans around the world " "have collected together in garages, universities and pubs to talk about " @@ -629,7 +639,7 @@ "LoCo project." msgstr "" -#: templates/base.html:6 templates/base.html.py:60 +#: templates/base.html:6 templates/base.html.py:67 msgid "LoCo Team Directory" msgstr "" @@ -637,8 +647,8 @@ msgid "Show All Teams" msgstr "" -#: templates/base.html:14 templates/using_locodir.html:16 -#: templates/events/team_event_list.inc.html:8 +#: templates/base.html:14 templates/site_search.html:10 +#: templates/using_locodir.html:14 templates/events/team_event_list.inc.html:8 msgid "Teams" msgstr "" @@ -646,7 +656,7 @@ msgid "Show All Events" msgstr "" -#: templates/base.html:15 templates/using_locodir.html:21 +#: templates/base.html:15 templates/using_locodir.html:19 msgid "Events" msgstr "" @@ -674,11 +684,11 @@ msgid "Log In" msgstr "" -#: templates/base.html:45 +#: templates/base.html:52 msgid "Logged in as" msgstr "" -#: templates/base.html:59 +#: templates/base.html:66 msgid "About the LoCo Team Directory Project" msgstr "" @@ -687,55 +697,55 @@ msgstr "" #: templates/index.html:6 templates/using_locodir.html:4 -#: templates/using_locodir.html.py:11 +#: templates/using_locodir.html.py:9 msgid "Using the LoCo Team Directory" msgstr "" -#: templates/index.html:18 +#: templates/index.html:16 msgid "Ubuntu Local Community (LoCo) Team Directory" msgstr "" -#: templates/index.html:47 +#: templates/index.html:45 msgid "Click on your continent to find teams near you." msgstr "" -#: templates/index.html:54 +#: templates/index.html:52 msgid "Show all Events" msgstr "" -#: templates/index.html:54 templates/teams/team_event_history.html:8 +#: templates/index.html:52 templates/teams/team_event_history.html:8 msgid "Upcoming Events" msgstr "" -#: templates/index.html:57 +#: templates/index.html:55 templates/site_search.html:23 msgid "Global Events" msgstr "" -#: templates/index.html:59 templates/events/event_list.html:29 +#: templates/index.html:57 templates/events/event_list.html:20 msgid "Global Events as ical" msgstr "" -#: templates/index.html:61 templates/events/event_list.html:31 +#: templates/index.html:59 templates/events/event_list.html:22 msgid "Select a global event below to see more information about it:" msgstr "" -#: templates/index.html:70 +#: templates/index.html:68 msgid "Upcoming Team Events" msgstr "" -#: templates/index.html:72 templates/events/event_list.html:46 +#: templates/index.html:70 templates/events/event_list.html:37 msgid "Team Events as ical" msgstr "" -#: templates/index.html:77 templates/events/global_event_detail.inc.html:117 +#: templates/index.html:75 templates/events/global_event_detail.inc.html:117 msgid "Microblogging" msgstr "" -#: templates/irc_chat.html:4 templates/irc_chat.html.py:10 +#: templates/irc_chat.html:4 templates/irc_chat.html.py:8 msgid "Ubuntu LoCo Teams IRC Chat" msgstr "" -#: templates/irc_chat.html:13 +#: templates/irc_chat.html:11 msgid "" "Why not join other team members from different LoCos around the world on IRC " "in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to " @@ -745,7 +755,7 @@ "teams." msgstr "" -#: templates/irc_chat.html:14 +#: templates/irc_chat.html:12 msgid "" "It's a great place to chat to with members from different teams, get ideas " "from them and learn how other teams interact. Why not join, idle and learn. " @@ -753,7 +763,7 @@ "on your wiki page or in your IRC channel's topic." msgstr "" -#: templates/loco_council.html:4 templates/loco_council.html.py:14 +#: templates/loco_council.html:4 templates/loco_council.html.py:12 msgid "Ubuntu LoCo Council" msgstr "" @@ -761,7 +771,7 @@ msgid "Approved Teams" msgstr "" -#: templates/loco_council.html:17 +#: templates/loco_council.html:15 msgid "" "The Ubuntu LoCo Council is comprised of elected, dedicated members of the " "Ubuntu Community. They have diverse backgrounds, but have a firm " @@ -770,84 +780,117 @@ "guidance and help when needed to these teams and lead them by example." msgstr "" -#: templates/loco_council.html:20 +#: templates/loco_council.html:18 msgid "" "The LoCo Council governs the LoCo community, make decisions on resource " "allocation, deals with conflict resolution and make decisions about where " "the project should move forward." msgstr "" -#: templates/loco_council.html:23 +#: templates/loco_council.html:21 msgid "" "The LoCo Council governs the LoCo Community; responsibilities include but " "are not limited to the following:" msgstr "" -#: templates/loco_council.html:25 +#: templates/loco_council.html:23 msgid "To provide independent guidance for the LoCo Community." msgstr "" -#: templates/loco_council.html:26 +#: templates/loco_council.html:24 msgid "To maintain quality of governance in the LoCo community." msgstr "" -#: templates/loco_council.html:27 +#: templates/loco_council.html:25 msgid "To assess and re-assess teams for approved state." msgstr "" -#: templates/loco_council.html:28 +#: templates/loco_council.html:26 msgid "" "To provide input and feedback to other Ubuntu governance boards regarding " "the needs and achievements of the LoCo community." msgstr "" -#: templates/loco_council.html:29 +#: templates/loco_council.html:27 msgid "" "To act as an independent, objective, third party to resolve conflict in " "teams by acting as mediator for a group or individuals." msgstr "" -#: templates/loco_council.html:30 +#: templates/loco_council.html:28 msgid "" "To govern key LoCo resources such as mailing lists and key web properties. " "ie. if you log a Request Ticket regarding your LoCo and don't hear anything " "after 2 weeks contact us." msgstr "" -#: templates/loco_council.html:31 +#: templates/loco_council.html:29 msgid "Influencing and recommending how LoCo resources are allocated." msgstr "" -#: templates/loco_council.html:32 +#: templates/loco_council.html:30 msgid "" "Influencing the direction and goals of the Ubuntu Project and greater LoCo " "Team effort." msgstr "" -#: templates/loco_council.html:33 +#: templates/loco_council.html:31 msgid "To motivate and encourage LoCos to be the best they can." msgstr "" -#: templates/loco_council.html:37 +#: templates/loco_council.html:35 msgid "" "You can reach the council via email at loco-council at lists.ubuntu.com." msgstr "" -#: templates/loco_council.html:40 +#: templates/loco_council.html:38 msgid "" "The LoCo Council holds regular meetings in #ubuntu-meeting on freenode. To " "find out when the next meeting is view the" msgstr "" -#: templates/loco_council.html:40 +#: templates/loco_council.html:38 msgid "Meeting Agenda" msgstr "" -#: templates/loco_council.html:40 +#: templates/loco_council.html:38 msgid "wiki page." msgstr "" -#: templates/using_locodir.html:12 +#: templates/site_search.html:14 templates/teams/team_list.html:21 +#: templates/teams/team_list.html.py:36 templates/teams/team_list.html:50 +#, python-format +msgid "%(teamname)s approved" +msgstr "" + +#: templates/site_search.html:14 templates/teams/team_list.html:21 +#: templates/teams/team_list.html.py:36 templates/teams/team_list.html:50 +#, python-format +msgid "%(teamname)s not approved" +msgstr "" + +#: templates/site_search.html:36 templates/events/global_event_list.inc.html:7 +msgid "Team Events" +msgstr "" + +#: templates/site_search.html:40 +#: templates/events/global_event_detail_attending_teamevents.inc.html:10 +#: templates/events/global_event_detail_attending_teamevents.inc.html:25 +#: templates/events/global_event_detail_attending_teamevents.inc.html:38 +#: templates/events/team_event_list.inc.html:16 +msgid "more information about this team" +msgstr "" + +#: templates/site_search.html:49 templates/using_locodir.html:24 +#: templates/events/event_list.html:7 +msgid "Venues" +msgstr "" + +#: templates/site_search.html:63 +msgid "No search terms provided" +msgstr "" + +#: templates/using_locodir.html:10 msgid "" "The LoCo Team Directory is an excellent resource for LoCo Teams to use when " "planning events. The LoCo Team Directory allows users to set up events and " @@ -856,23 +899,19 @@ "users." msgstr "" -#: templates/using_locodir.html:17 +#: templates/using_locodir.html:15 msgid "" "All LoCo Teams registered in Launchpad are a part of the LoCo Team " "Directory. Team members can create events and venues for their LoCo Team." msgstr "" -#: templates/using_locodir.html:22 +#: templates/using_locodir.html:20 msgid "" "A LoCo Team member can create an event, and then other members can register " "their attendance to the event and make comments to the event." msgstr "" -#: templates/using_locodir.html:26 templates/events/event_list.html:7 -msgid "Venues" -msgstr "" - -#: templates/using_locodir.html:27 +#: templates/using_locodir.html:25 msgid "" "Creating a venue in the LoCo Team Directory will provide other users with " "information about where an event is being held, and any other information " @@ -925,34 +964,34 @@ msgid "Add Global Event" msgstr "" -#: templates/events/event_list.html:12 +#: templates/events/event_list.html:11 msgid "Add Team Event" msgstr "" -#: templates/events/event_list.html:14 templates/teams/team_detail.html:204 +#: templates/events/event_list.html:12 templates/teams/team_detail.html:203 #: templates/teams/team_event_list.html:8 msgid "Past Events" msgstr "" -#: templates/events/event_list.html:26 +#: templates/events/event_list.html:17 msgid "Ubuntu LoCo Global Events" msgstr "" -#: templates/events/event_list.html:36 +#: templates/events/event_list.html:27 msgid "There are currently no LoCo Global Events" msgstr "" -#: templates/events/event_list.html:43 +#: templates/events/event_list.html:34 msgid "Ubuntu LoCo Team Events" msgstr "" -#: templates/events/event_list.html:47 -#: templates/teams/team_event_history.html:18 -#: templates/teams/team_event_list.html:25 +#: templates/events/event_list.html:38 +#: templates/teams/team_event_history.html:16 +#: templates/teams/team_event_list.html:24 msgid "Select a team event below to see more information about it:" msgstr "" -#: templates/events/event_list.html:52 +#: templates/events/event_list.html:43 msgid "There are currently no LoCo Team Events" msgstr "" @@ -960,17 +999,17 @@ msgid "Delete Global Event" msgstr "" -#: templates/events/global_event_delete_confirm.html:15 +#: templates/events/global_event_delete_confirm.html:12 msgid "Delete global Event" msgstr "" -#: templates/events/global_event_delete_confirm.html:16 +#: templates/events/global_event_delete_confirm.html:13 #, python-format msgid "Do you really want to delete the Global Event: %(eventname)s?" msgstr "" -#: templates/events/global_event_delete_confirm.html:18 -#: templates/events/team_event_delete_confirm.html:18 +#: templates/events/global_event_delete_confirm.html:15 +#: templates/events/team_event_delete_confirm.html:15 msgid "Cancel" msgstr "" @@ -1009,13 +1048,6 @@ msgid "More Information about Team Event" msgstr "" -#: templates/events/global_event_detail_attending_teamevents.inc.html:10 -#: templates/events/global_event_detail_attending_teamevents.inc.html:25 -#: templates/events/global_event_detail_attending_teamevents.inc.html:38 -#: templates/events/team_event_list.inc.html:16 -msgid "more information about this team" -msgstr "" - #: templates/events/global_event_detail_attending_teamevents.inc.html:19 msgid "Events in countries without continents" msgstr "" @@ -1056,10 +1088,6 @@ msgid "End" msgstr "" -#: templates/events/global_event_list.inc.html:7 -msgid "Team Events" -msgstr "" - #: templates/events/global_event_list.inc.html:11 #: templates/events/team_event_list.inc.html:12 msgid "more information about this event" @@ -1069,41 +1097,41 @@ msgid "New Global Event" msgstr "" -#: templates/events/global_event_new.html:25 +#: templates/events/global_event_new.html:22 msgid "Add new Global Event" msgstr "" -#: templates/events/global_event_new.html:31 -#: templates/events/global_event_update.html:29 -#: templates/events/team_event_comment_new.html:29 -#: templates/events/team_event_new.html:37 -#: templates/events/team_event_register.html:26 -#: templates/events/team_event_update.html:29 +#: templates/events/global_event_new.html:28 +#: templates/events/global_event_update.html:26 +#: templates/events/team_event_comment_new.html:26 +#: templates/events/team_event_new.html:34 +#: templates/events/team_event_register.html:23 +#: templates/events/team_event_update.html:26 msgid "Submit" msgstr "" #: templates/events/global_event_update.html:4 -#: templates/events/global_event_update.html:23 +#: templates/events/global_event_update.html:20 msgid "Update Global Event" msgstr "" #: templates/events/team_event_comment_new.html:4 -#: templates/events/team_event_comment_new.html:23 +#: templates/events/team_event_comment_new.html:20 msgid "Team Event Comment" msgstr "" #: templates/events/team_event_delete_confirm.html:4 -#: templates/events/team_event_delete_confirm.html:15 +#: templates/events/team_event_delete_confirm.html:12 msgid "Delete Team Event" msgstr "" -#: templates/events/team_event_delete_confirm.html:16 +#: templates/events/team_event_delete_confirm.html:13 #, python-format msgid "Do you really want to delete the Team Event: %(eventname)s?" msgstr "" -#: templates/events/team_event_detail.html:9 -#: templates/events/team_event_detail_comments.inc.html:7 +#: templates/events/team_event_detail.html:8 +#: templates/events/team_event_detail_comments.inc.html:6 msgid "Add Comment" msgstr "" @@ -1111,13 +1139,13 @@ msgid "Copy Event" msgstr "" -#: templates/events/team_event_detail.html:17 -#: templates/teams/team_detail.html:206 +#: templates/events/team_event_detail.html:16 +#: templates/teams/team_detail.html:205 msgid "iCal Feed" msgstr "" #: templates/events/team_event_detail.inc.html:19 -#: templates/events/team_event_detail_attendees.inc.html:24 +#: templates/events/team_event_detail_attendees.inc.html:26 msgid "Attendees" msgstr "" @@ -1131,18 +1159,19 @@ msgstr "" #: templates/events/team_event_detail_attendees.inc.html:10 +#: templates/events/team_event_detail_attendees.inc.html:13 msgid "Register for this Event" msgstr "" -#: templates/events/team_event_detail_attendees.inc.html:16 +#: templates/events/team_event_detail_attendees.inc.html:18 msgid "Confirmed attending:" msgstr "" -#: templates/events/team_event_detail_attendees.inc.html:17 +#: templates/events/team_event_detail_attendees.inc.html:19 msgid "Maybe attending:" msgstr "" -#: templates/events/team_event_detail_attendees.inc.html:25 +#: templates/events/team_event_detail_attendees.inc.html:27 msgid "Registration Status" msgstr "" @@ -1151,8 +1180,8 @@ msgstr "" #: templates/events/team_event_detail_basic.inc.html:20 -#: templates/venues/venue_list.html:36 templates/venues/venue_list.html:54 -#: templates/venues/venue_list.html:69 +#: templates/venues/venue_list.html:27 templates/venues/venue_list.html:45 +#: templates/venues/venue_list.html:60 msgid "show venue details" msgstr "" @@ -1209,11 +1238,11 @@ msgid "New Team Event" msgstr "" -#: templates/events/team_event_new.html:31 +#: templates/events/team_event_new.html:28 msgid "Add new Team Event for " msgstr "" -#: templates/events/team_event_new_select.html:11 +#: templates/events/team_event_new_select.html:8 msgid "Select a Team to add an Event for" msgstr "" @@ -1221,15 +1250,15 @@ msgid "Team Event Registration" msgstr "" -#: templates/events/team_event_register.html:15 +#: templates/events/team_event_register.html:12 msgid "Register for event " msgstr "" -#: templates/events/team_event_register.html:18 +#: templates/events/team_event_register.html:15 msgid "This event has finished!" msgstr "" -#: templates/events/team_event_register.html:18 +#: templates/events/team_event_register.html:15 msgid "" "Feel free to change your registration status to reflect whether you actually " "attended; we're just making sure you know you're not signing up for an " @@ -1237,31 +1266,31 @@ msgstr "" #: templates/events/team_event_update.html:4 -#: templates/events/team_event_update.html:23 +#: templates/events/team_event_update.html:20 msgid "Update Team Event" msgstr "" -#: templates/teams/merge_teams.html:4 templates/teams/merge_teams.html:12 +#: templates/teams/merge_teams.html:4 templates/teams/merge_teams.html:11 #: templates/teams/select_other_team.html:4 -#: templates/teams/select_other_team.html:12 +#: templates/teams/select_other_team.html:11 msgid "Merge Teams" msgstr "" -#: templates/teams/merge_teams.html:18 +#: templates/teams/merge_teams.html:17 msgid "You need two valid teams you want to merge with another." msgstr "" -#: templates/teams/merge_teams.html:20 +#: templates/teams/merge_teams.html:19 #, python-format msgid "Go back to the main page of %(teamname)s." msgstr "" -#: templates/teams/select_other_team.html:18 +#: templates/teams/select_other_team.html:17 #, python-format msgid "Select the team you want to merge \"%(teamname)s\" with:" msgstr "" -#: templates/teams/select_other_team.html:33 +#: templates/teams/select_other_team.html:32 msgid "There are currently no teams you could merge your team with." msgstr "" @@ -1285,94 +1314,94 @@ msgid "Add New Event" msgstr "" -#: templates/teams/team_detail.html:112 templates/teams/team_event_list.html:9 +#: templates/teams/team_detail.html:111 templates/teams/team_event_list.html:9 msgid "Team Events (RSS)" msgstr "" -#: templates/teams/team_detail.html:121 +#: templates/teams/team_detail.html:120 msgid "Location:" msgstr "" -#: templates/teams/team_detail.html:126 templates/teams/team_detail.html:136 -#: templates/teams/team_detail.html:218 +#: templates/teams/team_detail.html:125 templates/teams/team_detail.html:135 +#: templates/teams/team_detail.html:217 msgid "None Specified" msgstr "" -#: templates/teams/team_detail.html:131 +#: templates/teams/team_detail.html:130 msgid "Languages:" msgstr "" -#: templates/teams/team_detail.html:142 +#: templates/teams/team_detail.html:141 msgid "Approval Date:" msgstr "" -#: templates/teams/team_detail.html:148 +#: templates/teams/team_detail.html:147 msgid "Expires Date:" msgstr "" -#: templates/teams/team_detail.html:153 +#: templates/teams/team_detail.html:152 msgid "Local Support:" msgstr "" -#: templates/teams/team_detail.html:157 +#: templates/teams/team_detail.html:156 msgid "Team Admin(s):" msgstr "" -#: templates/teams/team_detail.html:168 +#: templates/teams/team_detail.html:167 msgid "Team Contact(s):" msgstr "" -#: templates/teams/team_detail.html:175 +#: templates/teams/team_detail.html:174 msgid "No LoCo Team contacts are set." msgstr "" -#: templates/teams/team_detail.html:180 +#: templates/teams/team_detail.html:179 msgid "Resources:" msgstr "" -#: templates/teams/team_detail.html:183 +#: templates/teams/team_detail.html:182 msgid "Team Wiki" msgstr "" -#: templates/teams/team_detail.html:189 +#: templates/teams/team_detail.html:188 msgid "Team Mailing List" msgstr "" -#: templates/teams/team_detail.html:192 +#: templates/teams/team_detail.html:191 msgid "Team Forums" msgstr "" -#: templates/teams/team_detail.html:195 +#: templates/teams/team_detail.html:194 msgid "Team Website" msgstr "" -#: templates/teams/team_detail.html:200 +#: templates/teams/team_detail.html:199 msgid "Upcoming Events:" msgstr "" -#: templates/teams/team_detail.html:203 +#: templates/teams/team_detail.html:202 msgid "All Events" msgstr "" -#: templates/teams/team_detail.html:205 +#: templates/teams/team_detail.html:204 msgid "RSS Feed" msgstr "" -#: templates/teams/team_detail.html:213 +#: templates/teams/team_detail.html:212 #, python-format msgid "%(start_date)s in %(city)s" msgstr "" -#: templates/teams/team_detail.html:213 +#: templates/teams/team_detail.html:212 msgid "on: " msgstr "" -#: templates/teams/team_detail.html:231 +#: templates/teams/team_detail.html:230 msgid "Photos from" msgstr "" #: templates/teams/team_event_history.html:4 -#: templates/teams/team_event_history.html:15 +#: templates/teams/team_event_history.html:13 #, python-format msgid "%(teamname)s Events History" msgstr "" @@ -1382,18 +1411,18 @@ msgid "Back to Team Details" msgstr "" -#: templates/teams/team_event_history.html:23 +#: templates/teams/team_event_history.html:21 #, python-format msgid "There are no past events for LoCo Team %(teamname)s :(" msgstr "" #: templates/teams/team_event_list.html:4 -#: templates/teams/team_event_list.html:20 +#: templates/teams/team_event_list.html:19 #, python-format msgid "%(teamname)s Events List" msgstr "" -#: templates/teams/team_event_list.html:30 +#: templates/teams/team_event_list.html:29 #, python-format msgid "There are currently no Events for LoCo Team %(teamname)s :(" msgstr "" @@ -1402,76 +1431,64 @@ msgid "Ubuntu LoCo Teams List" msgstr "" -#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43 -#: templates/teams/team_list.html:57 -#, python-format -msgid "%(teamname)s approved" -msgstr "" - -#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43 -#: templates/teams/team_list.html:57 -#, python-format -msgid "%(teamname)s not approved" -msgstr "" - -#: templates/teams/team_list.html:37 +#: templates/teams/team_list.html:30 msgid "Countries without continent" msgstr "" -#: templates/teams/team_list.html:53 +#: templates/teams/team_list.html:46 msgid "Teams without country" msgstr "" #: templates/teams/team_reapprovals.html:4 -#: templates/teams/team_reapprovals.html:12 +#: templates/teams/team_reapprovals.html:11 msgid "Approved Ubuntu LoCo Teams" msgstr "" +#: templates/teams/team_reapprovals.html:16 +msgid "Getting Your Team Approved" +msgstr "" + #: templates/teams/team_reapprovals.html:17 -msgid "Getting Your Team Approved" -msgstr "" - -#: templates/teams/team_reapprovals.html:18 msgid "Ubuntu LoCo teams fall into two approximate categories:" msgstr "" -#: templates/teams/team_reapprovals.html:20 +#: templates/teams/team_reapprovals.html:19 msgid "" "New Teams - these are teams that are in the process of getting started and " "have not yet been officially approved as an Ubuntu LoCo team." msgstr "" -#: templates/teams/team_reapprovals.html:21 +#: templates/teams/team_reapprovals.html:20 msgid "" "Approved Teams - an approved team is a team that is up and running, has each " "of the required resources in operation and the team is working well." msgstr "" -#: templates/teams/team_reapprovals.html:24 +#: templates/teams/team_reapprovals.html:23 msgid "For more information on getting approved, you can look at" msgstr "" -#: templates/teams/team_reapprovals.html:24 +#: templates/teams/team_reapprovals.html:23 msgid "getting your LoCo team approved" msgstr "" -#: templates/teams/team_reapprovals.html:24 +#: templates/teams/team_reapprovals.html:23 msgid "and the" msgstr "" -#: templates/teams/team_reapprovals.html:24 +#: templates/teams/team_reapprovals.html:23 msgid "LoCo Team FAQs" msgstr "" -#: templates/teams/team_reapprovals.html:24 +#: templates/teams/team_reapprovals.html:23 msgid "pages created by the LoCo Council." msgstr "" +#: templates/teams/team_reapprovals.html:24 +msgid "Getting Your Team Reapproved" +msgstr "" + #: templates/teams/team_reapprovals.html:25 -msgid "Getting Your Team Reapproved" -msgstr "" - -#: templates/teams/team_reapprovals.html:26 msgid "" "Every two years each LoCo team must be reapproved. LoCo teams will be " "contacted by a member of the LoCo Council notifying the team that it is time " @@ -1480,32 +1497,32 @@ "have been active in the community in the past two years." msgstr "" -#: templates/teams/team_reapprovals.html:27 +#: templates/teams/team_reapprovals.html:26 msgid "" "For more information on getting reapproved, the LoCo Council has created the" msgstr "" -#: templates/teams/team_reapprovals.html:27 +#: templates/teams/team_reapprovals.html:26 msgid "LoCo Team Reapproval" msgstr "" -#: templates/teams/team_reapprovals.html:27 +#: templates/teams/team_reapprovals.html:26 msgid "page." msgstr "" -#: templates/teams/team_reapprovals.html:32 +#: templates/teams/team_reapprovals.html:31 msgid "Approved Teams:" msgstr "" -#: templates/teams/team_reapprovals.html:35 +#: templates/teams/team_reapprovals.html:34 msgid "Reapprovals in the next 6 months:" msgstr "" -#: templates/teams/team_reapprovals.html:51 +#: templates/teams/team_reapprovals.html:50 msgid "Reapprovals later on:" msgstr "" -#: templates/teams/team_reapprovals.html:66 +#: templates/teams/team_reapprovals.html:65 msgid "" "There are currently no approved teams in the Ubuntu LoCo Team Directory. :(" msgstr "" @@ -1534,7 +1551,7 @@ msgid "Back to Venues List" msgstr "" -#: templates/venues/venue_detail.html:16 +#: templates/venues/venue_detail.html:15 msgid "Edit Venue Details" msgstr "" @@ -1554,39 +1571,39 @@ msgid "Latitude:" msgstr "" -#: templates/venues/venue_list.html:4 templates/venues/venue_list.html:22 +#: templates/venues/venue_list.html:4 templates/venues/venue_list.html:13 msgid "Ubuntu LoCo Event Venues" msgstr "" -#: templates/venues/venue_list.html:8 +#: templates/venues/venue_list.html:7 msgid "Add New Venue" msgstr "" -#: templates/venues/venue_list.html:25 +#: templates/venues/venue_list.html:16 msgid "Select a Venue below to see more information about it:" msgstr "" -#: templates/venues/venue_list.html:48 +#: templates/venues/venue_list.html:39 msgid "Countries without Continent" msgstr "" -#: templates/venues/venue_list.html:65 +#: templates/venues/venue_list.html:56 msgid "Venues without Country" msgstr "" -#: templates/venues/venue_list.html:78 +#: templates/venues/venue_list.html:69 msgid "There are currently no LoCo Venues :(" msgstr "" -#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36 +#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:33 msgid "Update Venue" msgstr "" -#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36 +#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:33 msgid "New Venue" msgstr "" -#: templates/venues/venue_update.html:48 +#: templates/venues/venue_update.html:45 msgid "Select venue position" msgstr "" @@ -1670,10 +1687,10 @@ msgid "Comment about the Venue" msgstr "" -#: venues/views.py:63 +#: venues/views.py:56 msgid "New Venue created" msgstr "" -#: venues/views.py:90 +#: venues/views.py:83 msgid "Venue updated" msgstr "" === modified file 'loco_directory/templates/about.html' --- loco_directory/templates/about.html 2010-11-20 17:25:50 +0000 +++ loco_directory/templates/about.html 2010-11-27 01:11:27 +0000 @@ -26,8 +26,9 @@ <ul> <li>{% trans "Have an Idea?" %} <a href='https://blueprints.launchpad.net/loco-directory'>{% trans "Write a blueprint!" %}</a></li> <li> {% trans "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</a>" %}</li> -<li> {% trans "Found a bug," %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li> -<li> {% trans "Help with code," %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li> +<li> {% trans "Found a bug?" %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></li> +<li> {% trans "Help with code:" %} <a href='https://code.launchpad.net/loco-directory'>{% trans "Get the code!" %}</a></li> +<li> {% trans "Discuss:" %} <a href='https://code.launchpad.net/loco-directory'>{% trans "LoCo Directory Mailing List" %}</a> {% trans "or send an email to" %} loco-directory at lists.ubuntu.com </li> </ul> </p> <p>{% trans "Need to know more," %} <a href='https://answers.launchpad.net/loco-directory'>{% trans "just ask!" %}</a></p>
_______________________________________________ Mailing list: https://launchpad.net/~loco-directory-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~loco-directory-dev More help : https://help.launchpad.net/ListHelp
