Merging two strings and making external links open in a new window

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7463 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index 1c82086fd6f85bd22f8b5e9e48602241fc6dd9ce..03972b5ce45c4d62a7954132f3dd71ee0a36668b 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -65,12 +65,11 @@ $body = htmlspecialchars($body_top) . $body;
 
    echo "<ul>";
    echo "<li>";
-   printf(_("Make sure that you are running the most recent copy of %s."),'<a href="http://www.squirrelmail.org/">SquirrelMail</a>');
-   printf(_("You are currently using version %s."),$version);
+   printf(_("Make sure that you are running the most recent copy of %s. You are currently using version %s."), '<a href="http://www.squirrelmail.org/" target="_blank">SquirrelMail</a>', $version);
    echo "</li>\n";
 
    echo "<li>";
-   printf(_("Check to see if your bug is already listed in the %sBug List%s on SourceForge. If it is, we already know about it and are trying to fix it."), '<a href="http://sourceforge.net/bugs/?group_id=311">', '</a>');
+   printf(_("Check to see if your bug is already listed in the %sBug List%s on SourceForge. If it is, we already know about it and are trying to fix it."), '<a href="http://sourceforge.net/bugs/?group_id=311" target="_blank">', '</a>');
    echo "</li>\n";
    
    echo "<li>";

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index b8fabed20bde1518ad0b64a6cb9e7365ac9fb61a..aa9ac00bf73d4820d1dd9fb108e308996f778194 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-05-15 12:12+0200\n"
+"POT-Creation-Date: 2004-05-15 15:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2254,11 +2254,9 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "Make sure that you are running the most recent copy of %s."
-msgstr ""
-
-#, c-format
-msgid "You are currently using version %s."
+msgid ""
+"Make sure that you are running the most recent copy of %s. You are currently "
+"using version %s."
 msgstr ""
 
 #, c-format