Merge lp:~cjohnston/loco-team-portal/bug-637545 into lp:loco-team-portal

[Chris Johnston]

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-09-13 19:23:31 +0000
+++ loco_directory/locale/loco-directory.pot	2010-09-13 22:23:58 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-13 19:20+0000\n"
+"POT-Creation-Date: 2010-09-13 22:20+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -641,21 +642,22 @@
 msgid "Ubuntu LoCo Teams IRC Chat"
 msgstr ""
 
-#: templates/irc_chat.html:12
+#: templates/irc_chat.html:13
 msgid ""
 "Why not join other team members from different LoCos around the world on IRC "
-"in the locoteams channel. This is where LoCo enthusiasts like to hang out. "
-"It is open to everyone, you don't have to be a leader,it's a welcoming "
-"channel open to everyone to ask questions about LoCo team issues, planning "
-"events or just to talk to others."
+"in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to "
+"hang out. It is open to everyone, you don't have to be a leader. This is the "
+"perfect channel to ask questions about LoCo team issues or planning events. "
+"It is also a great place to talk and socialize with members of other LoCo "
+"teams."
 msgstr ""
 
-#: templates/irc_chat.html:13
+#: templates/irc_chat.html:14
 msgid ""
-"It's a great place to chat to other members from different teams, get ideas "
-"off them and learn how other teams interact. Why not join and idle and learn "
-"from one another. Encourage your own team to join this channel, by adding it "
-"to your wiki information on IRC, or in your channel topic also."
+"It's a great place to chat to with members from different teams, get ideas "
+"from them and learn how other teams interact. Why not join, idle and learn. "
+"Encourage other members of your LoCo to join this channel by mentioning it "
+"on your wiki page or in your IRC channel's topic."
 msgstr ""
 
 #: templates/loco_council.html:4 templates/loco_council.html.py:14

=== modified file 'loco_directory/templates/irc_chat.html'
--- loco_directory/templates/irc_chat.html	2010-09-11 17:20:08 +0000
+++ loco_directory/templates/irc_chat.html	2010-09-13 22:23:58 +0000
@@ -8,13 +8,16 @@
 {% block content %}
 
 <h1>{% trans "Ubuntu LoCo Teams IRC Chat" %}</h1>
+
 <article class="main-content">
-    <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the locoteams channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader,it's a welcoming channel open to everyone to ask questions about LoCo team issues, planning events or just to talk to others." %}</p>
-    <p>{% trans "It's a great place to chat to other members from different teams, get ideas off them and learn how other teams interact. Why not join and idle and learn from one another. Encourage your own team to join this channel, by adding it to your wiki information on IRC, or in your channel topic also." %}</p>
+    <p>{% trans "Why not join other team members from different LoCos around the world on IRC in the #ubuntu-locoteams IRC channel. This is where LoCo enthusiasts like to hang out. It is open to everyone, you don't have to be a leader. This is the perfect channel to ask questions about LoCo team issues or planning events. It is also a great place to talk and socialize with members of other LoCo teams." %}</p>
+    <p>{% trans "It's a great place to chat to with members from different teams, get ideas from them and learn how other teams interact. Why not join, idle and learn. Encourage other members of your LoCo to join this channel by mentioning it on your wiki page or in your IRC channel's topic." %}</p>
 </article>
+
 <article class="main-content alone">
     <h2>Webchat</h2>
     <br />
     <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28" width="900" height="400"></iframe>
 </article>
+
 {% endblock %}