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

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 209
Merged at revision: 209
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-611892
Merge into: lp:loco-team-portal
Diff against target: 55 lines (+5/-9)
2 files modified
loco_directory/locale/loco-directory.pot (+3/-7)
loco_directory/templates/venues/venue_list.html (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-611892
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+31439@code.launchpad.net

Description of the change

Changes Ubuntu LoCo Venues to Ubuntu LoCo Event Venues on /venues

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 2010-07-30 18:20:56 +0000
3+++ loco_directory/locale/loco-directory.pot 2010-07-30 23:13:06 +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-07-30 18:20+0000\n"
9+"POT-Creation-Date: 2010-07-30 23:07+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@@ -1157,18 +1157,14 @@
14 msgid "Latitude:"
15 msgstr ""
16
17-#: templates/venues/venue_list.html:4
18-msgid "Ubuntu LoCo Venue List"
19+#: templates/venues/venue_list.html:4 templates/venues/venue_list.html:22
20+msgid "Ubuntu LoCo Event Venues"
21 msgstr ""
22
23 #: templates/venues/venue_list.html:8
24 msgid "Add new venue"
25 msgstr ""
26
27-#: templates/venues/venue_list.html:22
28-msgid "Ubuntu LoCo Venues"
29-msgstr ""
30-
31 #: templates/venues/venue_list.html:25
32 msgid "Select a Venue below to see more information about it:"
33 msgstr ""
34
35=== modified file 'loco_directory/templates/venues/venue_list.html'
36--- loco_directory/templates/venues/venue_list.html 2010-06-24 19:18:57 +0000
37+++ loco_directory/templates/venues/venue_list.html 2010-07-30 23:13:06 +0000
38@@ -1,7 +1,7 @@
39 {% extends "base.html" %}
40 {% load i18n %}
41
42-{% block title %}{% trans "Ubuntu LoCo Venue List" %}{% endblock %}
43+{% block title %}{% trans "Ubuntu LoCo Event Venues" %}{% endblock %}
44
45 {% block sub_nav_links %}
46 {% if user.is_authenticated %}
47@@ -19,7 +19,7 @@
48 {% block content %}
49 <article class="main-content">
50
51-<h2>{% trans "Ubuntu LoCo Venues" %}</h2>
52+<h2>{% trans "Ubuntu LoCo Event Venues" %}</h2>
53
54 {% if venue_list %}
55 <p>{% trans "Select a Venue below to see more information about it:" %}</p>

Subscribers

People subscribed via source and target branches