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

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

Description of the change

Fixes spacing issue on 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-20 16:29:46 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-08-21 00:54:44 +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-20 16:29+0000\n"
9+"POT-Creation-Date: 2010-08-21 00:51+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@@ -628,10 +629,9 @@
18 msgid ""
19 "The Ubuntu LoCo Council is comprised of elected, dedicated members of the "
20 "Ubuntu Community. They have diverse backgrounds, but have a firm "
21-"understanding of what makes up successful LoCo's. The LoCo Council was set "
22-"up to govern Ubuntu LoCo teams, and utilizing their past experiences, "
23-"provide guidance and help when needed to these teams and lead them by "
24-"example."
25+"understanding of what makes up successful LoCos. The LoCo Council was set up "
26+"to govern Ubuntu LoCo teams, and utilizing their past experiences, provide "
27+"guidance and help when needed to these teams and lead them by example."
28 msgstr ""
29
30 #: templates/loco_council.html:20
31@@ -689,7 +689,7 @@
32 msgstr ""
33
34 #: templates/loco_council.html:33
35-msgid "To motivate and encourage LoCo s to be the best they can."
36+msgid "To motivate and encourage LoCos to be the best they can."
37 msgstr ""
38
39 #: templates/loco_council.html:37
40
41=== modified file 'loco_directory/templates/loco_council.html'
42--- loco_directory/templates/loco_council.html 2010-08-17 00:33:22 +0000
43+++ loco_directory/templates/loco_council.html 2010-08-21 00:54:44 +0000
44@@ -14,7 +14,7 @@
45 <h1>{% trans "Ubuntu LoCo Council" %}</h1>
46 <article class="main-content">
47 <p>
48- {% 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." %}
49+ {% 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." %}
50 </p>
51 <p>
52 {% 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." %}
53@@ -30,7 +30,7 @@
54 <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>
55 <li>{% trans "Influencing and recommending how LoCo resources are allocated." %}</li>
56 <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li>
57- <li>{% trans "To motivate and encourage LoCo s to be the best they can." %}</li>
58+ <li>{% trans "To motivate and encourage LoCos to be the best they can." %}</li>
59 </ul>
60 </p>
61 <p>

Subscribers

People subscribed via source and target branches