Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bug-625147 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) -- https://code.launchpad.net/~chrisjohnston/loco-directory/bug-625147/+merge/35193 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bug-625147 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-09-10 01:07:12 +0000 +++ loco_directory/locale/loco-directory.pot 2010-09-11 15:27:46 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-10 01:06+0000\n" +"POT-Creation-Date: 2010-09-11 15:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -345,13 +345,13 @@ msgid "You can browse the full list of venues." msgstr "" -#: templates/404.html:19 templates/500.html:15 +#: templates/404.html:19 msgid "" "If you believe the reason you are here is a bug in the LoCo Team Directory " "please " msgstr "" -#: templates/404.html:19 templates/500.html:15 templates/about.html:31 +#: templates/404.html:19 templates/500.html:27 templates/about.html:31 msgid "Report it!" msgstr "" @@ -359,20 +359,17 @@ msgid "This Team Does Not Exist" msgstr "" -#: templates/500.html:11 -msgid "The Team was not found!" -msgstr "" - -#: templates/500.html:12 -msgid "You can browse the full list of teams" -msgstr "" - -#: templates/500.html:13 -msgid "Please make sure the team you are looking for is a member of" -msgstr "" - -#: templates/500.html:13 -msgid "The LoCo Teams group in Launchpad" +#: templates/500.html:24 +msgid "LoCo Directory has encountered an Error!" +msgstr "" + +#: templates/500.html:25 +msgid "Please try your request again." +msgstr "" + +#: templates/500.html:27 +msgid "" +"If you continue to experience problems with LoCo Team Directory, please " msgstr "" #: templates/about.html:4 @@ -568,8 +565,7 @@ msgid "About LoCos" msgstr "" -#: templates/base.html:18 templates/irc_chat.html:4 -#: templates/irc_chat.html.py:12 +#: templates/base.html:18 msgid "IRC Chat" msgstr "" @@ -634,6 +630,27 @@ msgid "Microblogging" msgstr "" +#: templates/irc_chat.html:4 templates/irc_chat.html.py:12 +msgid "Ubuntu LoCo Teams IRC Chat" +msgstr "" + +#: templates/irc_chat.html:14 +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." +msgstr "" + +#: templates/irc_chat.html:15 +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." +msgstr "" + #: templates/loco_council.html:4 templates/loco_council.html.py:14 msgid "Ubuntu LoCo Council" msgstr "" === modified file 'loco_directory/templates/irc_chat.html' --- loco_directory/templates/irc_chat.html 2010-08-26 00:00:52 +0000 +++ loco_directory/templates/irc_chat.html 2010-09-11 15:27:46 +0000 @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} -{% block title %} {% trans "IRC Chat" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} +{% block title %} {% trans "Ubuntu LoCo Teams IRC Chat" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} {% block sub_nav_links %} {% endblock %} @@ -9,8 +9,12 @@ {% block content %} - <h1>{% trans "IRC Chat" %}</h1> - <article class="main-content"> - <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28"; width="900" height="400"></iframe> - </article> +<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> +</article> +<article class="main-content"> + <iframe src="http://webchat.freenode.net/?channels=#ubuntu-locoteams&prompt=1&uio=MTE9MzE28"; width="900" height="400"></iframe> +</article> {% endblock %}
_______________________________________________ Mailing list: https://launchpad.net/~loco-directory-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~loco-directory-dev More help : https://help.launchpad.net/ListHelp
