Merge lp:~dholbach/loco-team-portal/539903 into lp:loco-team-portal

Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/loco-team-portal/539903
Merge into: lp:loco-team-portal
Diff against target: 52 lines (+5/-5)
2 files modified
loco_directory/locale/loco-directory.pot (+3/-3)
loco_directory/templates/teams/team_detail.html (+2/-2)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/539903
Reviewer Review Type Date Requested Status
Michael Hall Pending
Review via email: mp+23023@code.launchpad.net

This proposal supersedes a proposal from 2010-04-08.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal
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-04-08 11:38:36 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-04-08 13:58:18 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2010-04-08 11:35+0000\n"
9+"POT-Creation-Date: 2010-04-08 13:55+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@@ -817,7 +817,7 @@
14 msgstr ""
15
16 #: templates/teams/team_detail.html:47
17-msgid "Team Leader:"
18+msgid "Launchpad Team Owner:"
19 msgstr ""
20
21 #: templates/teams/team_detail.html:53
22@@ -829,7 +829,7 @@
23 msgstr ""
24
25 #: templates/teams/team_detail.html:65
26-msgid "Admins:"
27+msgid "Launchpad Team Admin(s):"
28 msgstr ""
29
30 #: templates/teams/team_detail.html:72
31
32=== modified file 'loco_directory/templates/teams/team_detail.html'
33--- loco_directory/templates/teams/team_detail.html 2010-03-16 21:46:16 +0000
34+++ loco_directory/templates/teams/team_detail.html 2010-04-08 13:58:18 +0000
35@@ -44,7 +44,7 @@
36 </tr>
37
38 <tr>
39- <th scope="row"><label>{% trans "Team Leader:" %}</label></th>
40+ <th scope="row"><label>{% trans "Launchpad Team Owner:" %}</label></th>
41 <td><a href="https://launchpad.net/~{{ team.owner }}">{{ team.owner }}</a></td>
42 </tr>
43
44@@ -62,7 +62,7 @@
45 {% endif %}
46
47 <tr>
48- <th scope="row"><label>{% trans "Admins:" %}</label></th>
49+ <th scope="row"><label>{% trans "Launchpad Team Admin(s):" %}</label></th>
50 <td>{% for admin in team.admins.all %}
51 <a href="https://launchpad.net/~{{ admin.lpid }}">{{ admin.lpid }}</a>{% if not forloop.last %},{% endif %}
52 {% endfor %}</td>

Subscribers

People subscribed via source and target branches