Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bug-644417 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #644417 Meeting Agenda link on LoCo Council page https://bugs.launchpad.net/bugs/644417 -- https://code.launchpad.net/~chrisjohnston/loco-directory/bug-644417/+merge/36491 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bug-644417 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-09-13 19:23:31 +0000 +++ loco_directory/locale/loco-directory.pot 2010-09-23 19:21:00 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-13 19:20+0000\n" +"POT-Creation-Date: 2010-09-23 19:17+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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -187,27 +188,27 @@ msgid "Comment saved." msgstr "" -#: events/views.py:418 +#: events/views.py:419 msgid "Global Event removed." msgstr "" -#: events/views.py:424 +#: events/views.py:425 msgid "You can not remove this global event. You are not on the LoCo Council." msgstr "" -#: events/views.py:438 +#: events/views.py:439 msgid "New Global Event created." msgstr "" -#: events/views.py:449 +#: events/views.py:450 msgid "You can not add a new global event. You are not on the LoCo Council." msgstr "" -#: events/views.py:465 +#: events/views.py:466 msgid "Global Event updated." msgstr "" -#: events/views.py:476 +#: events/views.py:477 msgid "You can not update this global event. You are not on the LoCo Council." msgstr "" @@ -666,10 +667,6 @@ msgid "Approved Teams" msgstr "" -#: templates/loco_council.html:8 -msgid "Meeting Agenda" -msgstr "" - #: templates/loco_council.html:17 msgid "" "The Ubuntu LoCo Council is comprised of elected, dedicated members of the " @@ -742,6 +739,20 @@ "You can reach the council via email at loco-council at lists.ubuntu.com." msgstr "" +#: templates/loco_council.html:40 +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 +msgid "Meeting Agenda" +msgstr "" + +#: templates/loco_council.html:40 +msgid "wiki page." +msgstr "" + #: templates/using_locodir.html:12 msgid "" "The LoCo Team Directory is an excellent resource for LoCo Teams to use when " === modified file 'loco_directory/templates/loco_council.html' --- loco_directory/templates/loco_council.html 2010-09-10 01:07:12 +0000 +++ loco_directory/templates/loco_council.html 2010-09-23 19:21:00 +0000 @@ -4,37 +4,40 @@ {% block title %} {% trans "Ubuntu LoCo Council" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} -<a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a> -<a class="sub-nav-item" href="https://wiki.ubuntu.com/LoCoCouncil/Agenda";>{% trans "Meeting Agenda" %}</a> + <a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a> {% endblock %} + {% block search %}{% endblock %} {% block content %} - <h1>{% trans "Ubuntu LoCo Council" %}</h1> - <article class="main-content"> - <p> - {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCos. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %} - </p> - <p> - {% trans "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." %} - </p> - <p> - {% trans "The LoCo Council governs the LoCo Community; responsibilities include but are not limited to the following:" %} - <ul> - <li>{% trans "To provide independent guidance for the LoCo Community." %}</li> - <li>{% trans "To maintain quality of governance in the LoCo community." %}</li> - <li>{% trans "To assess and re-assess teams for approved state." %}</li> - <li>{% trans "To provide input and feedback to other Ubuntu governance boards regarding the needs and achievements of the LoCo community." %}</li> - <li>{% trans "To act as an independent, objective, third party to resolve conflict in teams by acting as mediator for a group or individuals." %}</li> - <li>{% trans "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." %}</li> - <li>{% trans "Influencing and recommending how LoCo resources are allocated." %}</li> - <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li> - <li>{% trans "To motivate and encourage LoCos to be the best they can." %}</li> - </ul> - </p> - <p> - {% trans "You can reach the council via email at loco-council at lists.ubuntu.com." %} - </p> - </article> + <h1>{% trans "Ubuntu LoCo Council" %}</h1> + <article class="main-content"> + <p> + {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCos. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %} + </p> + <p> + {% trans "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." %} + </p> + <p> + {% trans "The LoCo Council governs the LoCo Community; responsibilities include but are not limited to the following:" %} + <ul> + <li>{% trans "To provide independent guidance for the LoCo Community." %}</li> + <li>{% trans "To maintain quality of governance in the LoCo community." %}</li> + <li>{% trans "To assess and re-assess teams for approved state." %}</li> + <li>{% trans "To provide input and feedback to other Ubuntu governance boards regarding the needs and achievements of the LoCo community." %}</li> + <li>{% trans "To act as an independent, objective, third party to resolve conflict in teams by acting as mediator for a group or individuals." %}</li> + <li>{% trans "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." %}</li> + <li>{% trans "Influencing and recommending how LoCo resources are allocated." %}</li> + <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li> + <li>{% trans "To motivate and encourage LoCos to be the best they can." %}</li> + </ul> + </p> + <p> + {% trans "You can reach the council via email at loco-council at lists.ubuntu.com." %} + </p> + <p> + {% trans "The LoCo Council holds regular meetings in #ubuntu-meeting on freenode. To find out when the next meeting is view the" %}<a class="sub-nav-item" href="https://wiki.ubuntu.com/LoCoCouncil/Agenda";>{% trans "Meeting Agenda" %}</a> {% trans "wiki page." %} + </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
