Merge lp:~cjohnston/loco-team-portal/bugfix-lp-611801 into lp:loco-team-portal

[Chris Johnston]

Removes Ubuntu LoCo Team Directory from h1 and makes Ubuntu LoCo Council h1 on LoCo Council page

[lp:~cjohnston/loco-team-portal/bugfix-lp-611801]

209. By Chris Johnston on 2010-07-30

Fixes translations

[Michael Hall (mhall119)]

Looks much better this way

review: Approve

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-07-30 07:59:42 +0000
+++ loco_directory/locale/loco-directory.pot	2010-07-30 18:22:47 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-30 07:59+0000\n"
+"POT-Creation-Date: 2010-07-30 18:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -432,7 +432,7 @@
 msgid "just ask!"
 msgstr ""
 
-#: templates/base.html:4 templates/index.html:8 templates/loco_council.html:12
+#: templates/base.html:4 templates/index.html:8
 msgid "Ubuntu LoCo Team Directory"
 msgstr ""
 
@@ -465,7 +465,7 @@
 msgid "Venues"
 msgstr ""
 
-#: templates/base.html:20 templates/loco_council.html:14
+#: templates/base.html:20
 msgid "LoCo Council"
 msgstr ""
 
@@ -485,11 +485,11 @@
 msgid "Log in"
 msgstr ""
 
-#: templates/base.html:47
+#: templates/base.html:48
 msgid "Logged in as"
 msgstr ""
 
-#: templates/base.html:49
+#: templates/base.html:61
 msgid "LoCo Directory"
 msgstr ""
 
@@ -531,7 +531,11 @@
 msgid "Meeting Agenda"
 msgstr ""
 
-#: templates/loco_council.html:16
+#: templates/loco_council.html:12
+msgid "Ubuntu LoCo Council"
+msgstr ""
+
+#: 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 "
@@ -541,65 +545,65 @@
 "example."
 msgstr ""
 
-#: templates/loco_council.html:19
+#: 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:22
+#: 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:23
+msgid "To provide independent guidance for the LoCo Community."
+msgstr ""
+
 #: templates/loco_council.html:24
-msgid "To provide independent guidance for the LoCo Community."
+msgid "To maintain quality of governance in the LoCo community."
 msgstr ""
 
 #: templates/loco_council.html:25
-msgid "To maintain quality of governance in the LoCo community."
+msgid "To assess and re-assess teams for approved state."
 msgstr ""
 
 #: templates/loco_council.html:26
-msgid "To assess and re-assess teams for approved state."
-msgstr ""
-
-#: 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:28
+#: 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:29
+#: 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:29
+msgid "Influencing and recommending how LoCo  resources are allocated."
+msgstr ""
+
 #: templates/loco_council.html:30
-msgid "Influencing and recommending how LoCo  resources are allocated."
-msgstr ""
-
-#: 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:32
+#: templates/loco_council.html:31
 msgid "To motivate and encourage LoCo s to be the best they can."
 msgstr ""
 
-#: templates/loco_council.html:36
+#: templates/loco_council.html:35
 msgid ""
 "You can reach the council via email at loco-council at lists.ubuntu.com."
 msgstr ""

=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2010-07-27 10:47:28 +0000
+++ loco_directory/templates/loco_council.html	2010-07-30 18:22:47 +0000
@@ -9,9 +9,8 @@
 
 {% block content %}
 
-  <h1>{% trans "Ubuntu LoCo Team Directory" %}</h1>
+  <h1>{% trans "Ubuntu LoCo Council" %}</h1>
 	<article class="main-content">
-        <h2>{% trans "LoCo Council" %}</h2>
         <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 LoCo's. 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>