Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bugfix-lp-607615 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #607615 LoCo Council tab needs more information https://bugs.launchpad.net/bugs/607615 Adds info to LoCo Council page -- https://code.launchpad.net/~chrisjohnston/loco-directory/bugfix-lp-607615/+merge/30869 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bugfix-lp-607615 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-07-21 10:27:59 +0000 +++ loco_directory/locale/loco-directory.pot 2010-07-24 23:29:40 +0000 @@ -8,7 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< TREE "POT-Creation-Date: 2010-07-21 10:27+0000\n" +======= +"POT-Creation-Date: 2010-07-24 23:26+0000\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -432,7 +436,7 @@ msgid "just ask!" msgstr "" -#: templates/base.html:4 templates/index.html:8 templates/loco_council.html:11 +#: templates/base.html:4 templates/index.html:8 templates/loco_council.html:12 msgid "Ubuntu LoCo Team Directory" msgstr "" @@ -465,7 +469,7 @@ msgid "Venues" msgstr "" -#: templates/base.html:20 templates/loco_council.html:13 +#: templates/base.html:20 templates/loco_council.html:14 msgid "LoCo Council" msgstr "" @@ -527,7 +531,11 @@ msgid "Upcoming Reapprovals" msgstr "" -#: templates/loco_council.html:15 +#: templates/loco_council.html:6 +msgid "Meeting Agenda" +msgstr "" + +#: templates/loco_council.html:16 msgid "" "The Ubuntu LoCo Council is comprised of elected, dedicated members of the " "Ubuntu Community. They have diverse backgrounds, but have a firm " @@ -537,64 +545,68 @@ "example." msgstr "" -#: templates/loco_council.html:18 +#: templates/loco_council.html:19 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:21 +#: templates/loco_council.html:22 msgid "" "The LoCo Council governs the LoCo Community; responsibilities include but " "are not limited to the following:" msgstr "" -#: templates/loco_council.html:23 +#: templates/loco_council.html:24 msgid "To provide independent guidance for the LoCo Community." msgstr "" -#: templates/loco_council.html:24 +#: templates/loco_council.html:25 msgid "To maintain quality of governance in the LoCo community." msgstr "" -#: templates/loco_council.html:25 +#: templates/loco_council.html:26 msgid "To assess and re-assess teams for approved state." msgstr "" -#: templates/loco_council.html:26 +#: templates/loco_council.html:27 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:27 +#: templates/loco_council.html:28 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:28 +#: templates/loco_council.html:29 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:29 +#: templates/loco_council.html:30 msgid "Influencing and recommending how LoCo resources are allocated." msgstr "" -#: templates/loco_council.html:30 +#: templates/loco_council.html:31 msgid "" "Influencing the direction and goals of the Ubuntu Project and greater LoCo " "Team effort." msgstr "" -#: templates/loco_council.html:31 +#: templates/loco_council.html:32 msgid "To motivate and encourage LoCo s to be the best they can." msgstr "" +#: templates/loco_council.html:36 +msgid "You can reach the council via email at loco-council at lists.ubuntu.com" +msgstr "" + #: templates/events/event_history_list.html:4 msgid "Ubuntu LoCo Events History" msgstr "" === modified file 'loco_directory/templates/loco_council.html' --- loco_directory/templates/loco_council.html 2010-07-15 14:36:51 +0000 +++ loco_directory/templates/loco_council.html 2010-07-24 23:29:40 +0000 @@ -3,6 +3,7 @@ {% block sub_nav_links %} <a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a> +<a class="sub-nav-item" href="https://wiki.ubuntu.com/LoCoCouncil/Agenda";>{% trans "Meeting Agenda" %}</a> {% endblock %} {% block search %}{% endblock %} @@ -31,5 +32,8 @@ <li>{% trans "To motivate and encourage LoCo s to be the best they can." %}</li> </ul> </p> - </article> + <p> + {% trans "You can reach the council via email at loco-council at lists.ubuntu.com" %} + </p> + </article> {% endblock %}
_______________________________________________ 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
