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

Proposed by Chris Johnston
Status: Merged
Merged at revision: 229
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-617972
Merge into: lp:loco-team-portal
Diff against target: 135 lines (+24/-17)
2 files modified
loco_directory/locale/loco-directory.pot (+22/-17)
loco_directory/templates/loco_council.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-617972
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+32679@code.launchpad.net

Description of the change

Adds title to loco council page

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

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-08-06 14:30:38 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-08-14 20:26:11 +0000
4@@ -8,10 +8,11 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-08-06 14:30+0000\n"
9+"POT-Creation-Date: 2010-08-14 20:22+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+"Language: \n"
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17@@ -527,19 +528,23 @@
18 msgid "Future additions to this site will include:"
19 msgstr ""
20
21-#: templates/loco_council.html:5
22+#: templates/loco_council.html:4
23+msgid " Ubuntu LoCo Council | Ubuntu LoCo Team Directory"
24+msgstr ""
25+
26+#: templates/loco_council.html:7
27 msgid "Upcoming Reapprovals"
28 msgstr ""
29
30-#: templates/loco_council.html:6
31+#: templates/loco_council.html:8
32 msgid "Meeting Agenda"
33 msgstr ""
34
35-#: templates/loco_council.html:12
36+#: templates/loco_council.html:14
37 msgid "Ubuntu LoCo Council"
38 msgstr ""
39
40-#: templates/loco_council.html:15
41+#: templates/loco_council.html:17
42 msgid ""
43 "The Ubuntu LoCo Council is comprised of elected, dedicated members of the "
44 "Ubuntu Community. They have diverse backgrounds, but have a firm "
45@@ -549,65 +554,65 @@
46 "example."
47 msgstr ""
48
49-#: templates/loco_council.html:18
50+#: templates/loco_council.html:20
51 msgid ""
52 "The LoCo Council governs the LoCo community, make decisions on resource "
53 "allocation, deals with conflict resolution and make decisions about where "
54 "the project should move forward."
55 msgstr ""
56
57-#: templates/loco_council.html:21
58+#: templates/loco_council.html:23
59 msgid ""
60 "The LoCo Council governs the LoCo Community; responsibilities include but "
61 "are not limited to the following:"
62 msgstr ""
63
64-#: templates/loco_council.html:23
65+#: templates/loco_council.html:25
66 msgid "To provide independent guidance for the LoCo Community."
67 msgstr ""
68
69-#: templates/loco_council.html:24
70+#: templates/loco_council.html:26
71 msgid "To maintain quality of governance in the LoCo community."
72 msgstr ""
73
74-#: templates/loco_council.html:25
75+#: templates/loco_council.html:27
76 msgid "To assess and re-assess teams for approved state."
77 msgstr ""
78
79-#: templates/loco_council.html:26
80+#: templates/loco_council.html:28
81 msgid ""
82 "To provide input and feedback to other Ubuntu governance boards regarding "
83 "the needs and achievements of the LoCo community."
84 msgstr ""
85
86-#: templates/loco_council.html:27
87+#: templates/loco_council.html:29
88 msgid ""
89 "To act as an independent, objective, third party to resolve conflict in "
90 "teams by acting as mediator for a group or individuals."
91 msgstr ""
92
93-#: templates/loco_council.html:28
94+#: templates/loco_council.html:30
95 msgid ""
96 "To govern key LoCo resources such as mailing lists and key web properties. "
97 "ie. if you log a Request Ticket regarding your LoCo and don't hear anything "
98 "after 2 weeks contact us."
99 msgstr ""
100
101-#: templates/loco_council.html:29
102+#: templates/loco_council.html:31
103 msgid "Influencing and recommending how LoCo resources are allocated."
104 msgstr ""
105
106-#: templates/loco_council.html:30
107+#: templates/loco_council.html:32
108 msgid ""
109 "Influencing the direction and goals of the Ubuntu Project and greater LoCo "
110 "Team effort."
111 msgstr ""
112
113-#: templates/loco_council.html:31
114+#: templates/loco_council.html:33
115 msgid "To motivate and encourage LoCo s to be the best they can."
116 msgstr ""
117
118-#: templates/loco_council.html:35
119+#: templates/loco_council.html:37
120 msgid ""
121 "You can reach the council via email at loco-council at lists.ubuntu.com."
122 msgstr ""
123
124=== modified file 'loco_directory/templates/loco_council.html'
125--- loco_directory/templates/loco_council.html 2010-07-30 18:19:31 +0000
126+++ loco_directory/templates/loco_council.html 2010-08-14 20:26:11 +0000
127@@ -1,6 +1,8 @@
128 {% extends "base.html" %}
129 {% load i18n %}
130
131+{% block title %} {% trans " Ubuntu LoCo Council | Ubuntu LoCo Team Directory" %} {% endblock %}
132+
133 {% block sub_nav_links %}
134 <a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>
135 <a class="sub-nav-item" href="https://wiki.ubuntu.com/LoCoCouncil/Agenda">{% trans "Meeting Agenda" %}</a>

Subscribers

People subscribed via source and target branches