Merge lp:~cjohnston/loco-team-portal/686266 into lp:loco-team-portal

[Chris Johnston]

[Michael Hall (mhall119)]

We may need to re-arrange top-level navs depending on the length of some translations, but we'll do that when the need arises.

review: Approve

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-11-20 17:25:50 +0000
+++ loco_directory/templates/base.html	2010-12-09 15:50:28 +0000
@@ -13,6 +13,7 @@
 {% block main_nav_links %}
     <a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
     <a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
+    <a class="main-nav-item {% ifequal url_base 'meetings' %}current{% endifequal %}" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a>
     <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
     <a class="main-nav-item {% ifequal url_base 'about-loco' %}current{% endifequal %}" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
     <a class="main-nav-item {% ifequal url_base 'irc' %}current{% endifequal %}" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2010-12-06 01:37:43 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2010-12-09 15:50:28 +0000
@@ -16,7 +16,7 @@
 
 {% if team_meeting_object.teams.all %}
     <tr>
-        <th class="form-item-label" scope="row"><label>{% trans "Organizing Team(s):" %}</label></th>
+        <th class="form-item-label" scope="row"><label>{% trans "Organizing Team:" %}</label></th>
         <td class="form-item-value">{% for team in team_meeting_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td>
     </tr>
 {% endif %}