Index: po/ar.po
===================================================================
--- po/ar.po	(revision 12394)
+++ po/ar.po	(working copy)
@@ -2216,8 +2216,8 @@
 #, perl-format
 msgid ""
 "If you want to edit the MusicBrainz data, you will need to go to the {uri|"
-"<img src=\"{url}\" alt=\"{ext_site}\" width=\"12\" /> main MusicBrainz "
-"server}."
+"main MusicBrainz server}<img src=\"{ext_link}\" alt=\"{ext_site}\""
+"width=\"12\" />."
 msgstr ""
 
 #: components/perma-link.tt:5
@@ -4962,8 +4962,8 @@
 #, perl-format
 msgid ""
 "Unless you want to be testing the latest and greatest MusicBrainz features "
-"you probably want to go to the <img src=\"{ext_link}\" alt=\"{ext_site}\" />"
-"{uri| main MusicBrainz server}."
+"you probably want to go to the main server {uri|http://musicbrainz.org}<img"
+"src="{ext_link}" alt="{ext_site}"/>."
 msgstr ""
 
 #: artist/layout.tt:30 label/layout.tt:24 user/profile.tt:126
@@ -5450,7 +5450,7 @@
 
 #: main/index.tt:46
 #, perl-format
-msgid "You are using a MusicBrainz mirror"
+msgid "You are using a MusicBrainz mirror!"
 msgstr ""
 
 #: main/index.tt:59
Index: po/mb_server.pot
===================================================================
--- po/mb_server.pot	(revision 12394)
+++ po/mb_server.pot	(working copy)
@@ -2254,8 +2254,8 @@
 #, perl-format
 msgid ""
 "If you want to edit the MusicBrainz data, you will need to go to the {uri|"
-"<img src=\"{url}\" alt=\"{ext_site}\" width=\"12\" /> main MusicBrainz "
-"server}."
+"main MusicBrainz server}<img src=\"{ext_link}\" alt=\"{ext_site}\""
+"width=\"12\" />."
 msgstr ""
 
 #: ../root/components/perma-link.tt:5
@@ -5038,8 +5038,8 @@
 #, perl-format
 msgid ""
 "Unless you want to be testing the latest and greatest MusicBrainz features "
-"you probably want to go to the <img src=\"{ext_link}\" alt=\"{ext_site}\" />"
-"{uri| main MusicBrainz server}."
+"you probably want to go to the main server {uri|http://musicbrainz.org}<img"
+"src="{ext_link}" alt="{ext_site}"/>."
 msgstr ""
 
 #: ../root/artist/layout.tt:30 ../root/label/layout.tt:24
@@ -5529,7 +5529,7 @@
 
 #: ../root/main/index.tt:46
 #, perl-format
-msgid "You are using a MusicBrainz mirror"
+msgid "You are using a MusicBrainz mirror!"
 msgstr ""
 
 #: ../root/main/index.tt:59
Index: po/nl.po
===================================================================
--- po/nl.po	(revision 12394)
+++ po/nl.po	(working copy)
@@ -2215,8 +2215,8 @@
 #, perl-format
 msgid ""
 "If you want to edit the MusicBrainz data, you will need to go to the {uri|"
-"<img src=\"{url}\" alt=\"{ext_site}\" width=\"12\" /> main MusicBrainz "
-"server}."
+"main MusicBrainz server}<img src=\"{ext_link}\" alt=\"{ext_site}\""
+"width=\"12\" />."
 msgstr ""
 
 #: components/perma-link.tt:5
@@ -4963,8 +4963,8 @@
 #, perl-format
 msgid ""
 "Unless you want to be testing the latest and greatest MusicBrainz features "
-"you probably want to go to the <img src=\"{ext_link}\" alt=\"{ext_site}\" />"
-"{uri| main MusicBrainz server}."
+"you probably want to go to the main server {uri|http://musicbrainz.org}<img"
+"src="{ext_link}" alt="{ext_site}"/>."
 msgstr ""
 
 #: artist/layout.tt:30 label/layout.tt:24 user/profile.tt:126
@@ -5451,8 +5451,8 @@
 
 #: main/index.tt:46
 #, perl-format
-msgid "You are using a MusicBrainz mirror"
-msgstr "Je gebruikt een MusicBrainz mirror"
+msgid "You are using a MusicBrainz mirror!"
+msgstr "Je gebruikt een MusicBrainz mirror!"
 
 #: main/index.tt:59
 #, perl-format
Index: po/ru.po
===================================================================
--- po/ru.po	(revision 12394)
+++ po/ru.po	(working copy)
@@ -2276,8 +2276,8 @@
 #, perl-format
 msgid ""
 "If you want to edit the MusicBrainz data, you will need to go to the {uri|"
-"<img src=\"{url}\" alt=\"{ext_site}\" width=\"12\" /> main MusicBrainz "
-"server}."
+"main MusicBrainz server}<img src=\"{ext_link}\" alt=\"{ext_site}\""
+"width=\"12\" />."
 msgstr ""
 
 #: components/perma-link.tt:5
@@ -5080,8 +5080,8 @@
 #, perl-format
 msgid ""
 "Unless you want to be testing the latest and greatest MusicBrainz features "
-"you probably want to go to the <img src=\"{ext_link}\" alt=\"{ext_site}\" />"
-"{uri| main MusicBrainz server}."
+"you probably want to go to the main server {uri|http://musicbrainz.org}<img"
+"src="{ext_link}" alt="{ext_site}"/>."
 msgstr ""
 
 #: artist/layout.tt:30 label/layout.tt:24 user/profile.tt:126
@@ -5587,8 +5587,8 @@
 
 #: main/index.tt:46
 #, fuzzy, perl-format
-msgid "You are using a MusicBrainz mirror"
-msgstr "Вы собираетесь добавить исполнителя в MusicBrainz."
+msgid "You are using a MusicBrainz mirror!"
+msgstr "Вы собираетесь добавить исполнителя в MusicBrainz!"
 
 #: main/index.tt:59
 #, perl-format
Index: root/layout.tt
===================================================================
--- root/layout.tt	(revision 12394)
+++ root/layout.tt	(working copy)
@@ -44,9 +44,8 @@
 
         [%- IF needs_chrome -%]
         <div id="chrome-prompt">
-          It looks like you're using Internet Explorer but do not have Google Chrome installed.
-          We highly recommend the use of Google Chrome Frame!<br />
-          <a href="/chrome_frame">More information&hellip;</a>
+          It looks like you're using Internet Explorer.<br />
+          To get the most out of this website we highly recommend the use of Google Chrome Frame. <a href="/chrome_frame">More information&hellip;</a>
         </div>
         [%- END -%]
 
Index: root/main/frame.tt
===================================================================
--- root/main/frame.tt	(revision 12394)
+++ root/main/frame.tt	(working copy)
@@ -1,11 +1,11 @@
 [%- WRAPPER 'layout.tt' full_width=1 -%]
 <h1>Google Chrome Frame</h1>
 <p>
-   [% l("Google Chrome Frame is a  plug-in that seamlessly brings Google Chrome's
+   [% l("Google Chrome Frame is a plug-in that seamlessly brings Google Chrome's
          open web technologies and speedy JavaScript engine to Internet Explorer.
          MusicBrainz uses a lot of modern technology that Internet Explorer does not yet
          support, so we highly recommend the use of this plugin to ensure you get the most
-         out of the website") %]
+         out of the website.") %]
 </p>
 <p>
     <a href="http://www.google.com/chromeframe/eula.html">[% l('Get Google Chrome Frame') %]</a>
Index: root/main/index.tt
===================================================================
--- root/main/index.tt	(revision 12394)
+++ root/main/index.tt	(working copy)
@@ -38,14 +38,14 @@
                  header = l("You are using a MusicBrainz $server_details.staging_server server!")
                  color = "purple" %]
                 <p>
-                    [% l('Unless you want to be testing the latest and greatest MusicBrainz features you probably want to go to the <img src="{ext_link}" alt="{ext_site}" />{uri| main MusicBrainz server}.', {ext_link => c.uri_for('/static/images/icon/extlink.gif'), ext_site => l("External Website"), uri="http://musicbrainz.org"}) %]
+                    [% l('Unless you want to be testing the latest and greatest MusicBrainz features you probably want to go to the main server {uri|http://musicbrainz.org}<img src="{ext_link}" alt="{ext_site}"/>.', {ext_link => c.uri_for('/static/images/icon/extlink.gif'), ext_site => l("External Website"), uri="http://musicbrainz.org"}) %]
                 </p>
             [% END %]
         [% END %]
         [% IF server_details.is_slave_db %]
-            [% WRAPPER "components/box.tt" header=l("You are using a MusicBrainz mirror") colour="purple" %]
+            [% WRAPPER "components/box.tt" header=l("You are using a MusicBrainz mirror!") colour="purple" %]
                 <p>
-                    [% l('If you want to edit the MusicBrainz data, you will need to go to the {uri|<img src="{url}" alt="{ext_site}" width="12" /> main MusicBrainz server}.', {url => c.uri_for('/images/icon/extlink.gif'), ext_site => l("External Website"), uri="http://musicbrainz.org/"}) %]
+                    [% l('If you want to edit the MusicBrainz data, you will need to go to the {uri|main MusicBrainz server}<img src=\"{ext_link}\" alt=\"{ext_site}\" width=\"12\" />.', {ext_link => c.uri_for('/images/icon/extlink.gif'), ext_site => l("External Website"), uri="http://musicbrainz.org/"}) %]
                 </p>
             [% END %]
         [% END %]
@@ -58,30 +58,28 @@
             <p>
                 [% l('You can use MusicBrainz right now to automatically identify and label your music files - all you have to do is download and run a MusicBrainz enabled tagger. {taggers|Read more about our taggers}.', { taggers => doc_link('MusicBrainzTagger')}) %]
             </p>
+            <div>
+                <a href="[% c.uri_for('/doc/PicardDownload') %]" title="[% l("Download Picard") %]">
+                    <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
+                    [% l('Download Picard') %]
+                </a>
+                [% l('[Windows/Linux]') %]
+            </div>
+            <div>
+                <a href="http://www.magic-tagger.com/bin/magic_tagger.exe" title="[% l("Download Magic-Tagger") %]">
+                    <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
+                    [% l('Download Magic-Tagger') %]
+                </a>
+                [% l('[Windows -- {info|More info...}]', {info="http://www.magic-tagger.com"}) %]
+            </div>
+            <div>
+                <a href="http://www.jthink.net/jaikoz/jsp/download/start.jsp" title="[% l('Download Jaikoz Tag Editor') %]">
+                    <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
+                    [% l('Download Jaikoz Tag Editor') %]
+                </a>
+                [% l('[Windows, Linux, Mac OS X -- {info|More info...}]', {info="http://www.jthink.net/jaikoz"}) %]
+            </div>
             <p>
-                <div>
-                    <a href="[% c.uri_for('/doc/PicardDownload') %]" title="[% l("Download Picard") %]">
-                        <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
-                        [% l('Download Picard') %]
-                    </a>
-                    [% l('[Windows/Linux]') %]
-                </div>
-                <div>
-                    <a href="http://www.magic-tagger.com/bin/magic_tagger.exe" title="[% l("Download Magic-Tagger") %]">
-                        <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
-                        [% l('Download Magic-Tagger') %]
-                    </a>
-                    [% l('[Windows -- {info|More info...}]', {info="http://www.magic-tagger.com"}) %]
-                </div>
-                <div>
-                    <a href="http://www.jthink.net/jaikoz/jsp/download/start.jsp" title="[% l('Download Jaikoz Tag Editor') %]">
-                        <img src="[% c.uri_for('/static/images/download.gif') %]" alt="[% l("[download]") %]" />
-                        [% l('Download Jaikoz Tag Editor') %]
-                    </a>
-                    [% l('[Windows, Linux, Mac OS X -- {info|More info...}]', {info="http://www.jthink.net/jaikoz"}) %]
-                </div>
-            </p>
-            <p>
                 [% l('Alternatively, you might just want to {search_url|search} or {browse_url|browse} the MusicBrainz database. If you spot a mistake, or something that is missing, you can even {edit|edit or add more data}!', { search_url => c.uri_for('/search'), edit => doc_link('HowEditingWorks'), browse_url => c.uri_for('/browse/artist')}) %]
             </p>
             <p>