Merge lp:~daker/loco-team-portal/fix.1157170 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 630
Merged at revision: 630
Proposed branch: lp:~daker/loco-team-portal/fix.1157170
Merge into: lp:loco-team-portal
Diff against target: 117 lines (+18/-20)
2 files modified
loco_directory/locale/loco-directory.pot (+17/-16)
loco_directory/templates/events/team_event_detail_comments.inc.html (+1/-4)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1157170
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+156285@code.launchpad.net

Commit message

Fix pot file

To post a comment you must log in.

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 2013-03-19 00:34:50 +0000
3+++ loco_directory/locale/loco-directory.pot 2013-03-30 22:36:22 +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: 2013-03-19 00:34+0000\n"
9+"POT-Creation-Date: 2013-03-30 22:32+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@@ -603,7 +603,7 @@
14 msgid "Date Approved"
15 msgstr ""
16
17-#: teams/models.py:111 templates/teams/team_detail.html:146
18+#: teams/models.py:111 templates/teams/team_detail.html:145
19 #: templates/teams/team_event_history.html:112
20 #: templates/teams/team_meeting_history.html:111
21 msgid "Reapproval Date"
22@@ -1152,15 +1152,15 @@
23 msgid "Wiki"
24 msgstr ""
25
26-#: templates/loco_council.html:42 templates/teams/team_detail.html:125
27+#: templates/loco_council.html:42 templates/teams/team_detail.html:124
28 #: templates/teams/team_event_history.html:91
29 #: templates/teams/team_meeting_history.html:90
30 msgid "Support"
31 msgstr ""
32
33 #: templates/loco_council.html:45 templates/loco_council.html.py:46
34-#: templates/loco_setup.html:92 templates/teams/team_detail.html:128
35-#: templates/teams/team_detail.html:129
36+#: templates/loco_setup.html:92 templates/teams/team_detail.html:127
37+#: templates/teams/team_detail.html:128
38 #: templates/teams/team_event_history.html:94
39 #: templates/teams/team_event_history.html:95
40 #: templates/teams/team_meeting_history.html:93
41@@ -1169,8 +1169,8 @@
42 msgstr ""
43
44 #: templates/loco_council.html:50 templates/loco_council.html.py:51
45-#: templates/loco_setup.html:111 templates/teams/team_detail.html:133
46-#: templates/teams/team_detail.html:134
47+#: templates/loco_setup.html:111 templates/teams/team_detail.html:132
48+#: templates/teams/team_detail.html:133
49 #: templates/teams/team_event_history.html:99
50 #: templates/teams/team_event_history.html:100
51 #: templates/teams/team_meeting_history.html:98
52@@ -1179,8 +1179,8 @@
53 msgstr ""
54
55 #: templates/loco_council.html:55 templates/loco_council.html.py:56
56-#: templates/profiles/details.html:82 templates/teams/team_detail.html:138
57-#: templates/teams/team_detail.html:139
58+#: templates/profiles/details.html:82 templates/teams/team_detail.html:137
59+#: templates/teams/team_detail.html:138
60 #: templates/teams/team_event_history.html:104
61 #: templates/teams/team_event_history.html:105
62 #: templates/teams/team_meeting_history.html:103
63@@ -1787,7 +1787,7 @@
64 msgstr ""
65
66 #: templates/events/team_event_delete_confirm.html:18
67-#: templates/events/team_event_detail_comments.inc.html:36
68+#: templates/events/team_event_detail_comments.inc.html:33
69 #: templates/meetings/agenda_item_delete_confirm.html:38
70 msgid "Delete"
71 msgstr ""
72@@ -1846,15 +1846,12 @@
73 #, python-format
74 msgid ""
75 "\n"
76-" %(comment_count)s Comment\n"
77-" "
78-msgid_plural ""
79-"\n"
80-" %(comment_count)s Comments\n"
81+"%(comment_count)s Comment"
82+msgid_plural "%(comment_count)s Comments"
83 msgstr[0] ""
84 msgstr[1] ""
85
86-#: templates/events/team_event_detail_comments.inc.html:36
87+#: templates/events/team_event_detail_comments.inc.html:33
88 msgid "Edit"
89 msgstr ""
90
91@@ -2531,6 +2528,10 @@
92 msgid "Select venue position"
93 msgstr ""
94
95+#: ubuntu_website/templates/form.html:6
96+msgid "Required"
97+msgstr ""
98+
99 #: userprofiles/models.py:24
100 msgid "Real Name"
101 msgstr ""
102
103=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
104--- loco_directory/templates/events/team_event_detail_comments.inc.html 2013-02-03 00:16:32 +0000
105+++ loco_directory/templates/events/team_event_detail_comments.inc.html 2013-03-30 22:36:22 +0000
106@@ -3,10 +3,7 @@
107
108 <h3 class="comments-nbr">
109 {% blocktrans count team_event_object.teameventcomment_set.all.count as comment_count %}
110- {{ comment_count }} Comment
111- {% plural %}
112- {{ comment_count }} Comments
113-{% endblocktrans %}
114+{{ comment_count }} Comment{% plural %}{{ comment_count }} Comments{% endblocktrans %}
115 </h3>
116
117 <ol id="comments" class="comments">

Subscribers

People subscribed via source and target branches