r1536: - Adding the template diff for 1.2.0 Beta 3

- Updating the en_US.pot language file

diff --git a/install/templates/1.2.0 Beta 2 - 1.2.0 Beta 3.diff b/install/templates/1.2.0 Beta 2 - 1.2.0 Beta 3.diff
new file mode 100644 (file)
index 0000000..56c48d0
--- /dev/null
+++ b/install/templates/1.2.0 Beta 2 - 1.2.0 Beta 3.diff
@@ -0,0 +1,25 @@
+Index: userctrl_search.tpl
+===================================================================
+--- userctrl_search.tpl        (.../tags/1.2.0-b2/templates)   (revision 1535)
++++ userctrl_search.tpl        (.../trunk/templates)   (revision 1535)
+@@ -1,7 +1,7 @@
+ <div>
+       $search[name]
+       <span style="float: $stylevar[right]">
+-              <a href="search.php?searchid=$search[searchid]">[{@"Run Search"}]</a>
++              <a href="search.php?searchid=$search[searchid]&amp;rerun=1">[{@"Run Search"}]</a>
+               <a href="userctrl.php?do=deletesearch&amp;searchid=$search[searchid]">[{@"Delete"}]</a>
+       </span>
+ </div>
+\ No newline at end of file
+Index: email/passwordreset.xml.tpl
+===================================================================
+--- email/passwordreset.xml.tpl        (.../tags/1.2.0-b2/templates)   (revision 1535)
++++ email/passwordreset.xml.tpl        (.../trunk/templates)   (revision 1535)
+@@ -1,5 +1,5 @@
+ <email>
+-      <subject>$bugsys->options['trackertitle'] Password Reset</subject>
++      <subject>{$bugsys->options['trackertitle']} Password Reset</subject>
+       <bodyText>Hi {$user->objdata['displayname']},
+ 
+ You requested this lost password email at the {$bugsys->options['trackertitle']} bug tracker. To reset your password, simply click the link below (or paste it into your browser window exactly) and enter a new password.

diff --git a/po/en_US.pot b/po/en_US.pot
index 6a4da83bca92121aa4465d360a5a6bb46b75724c..f0d687ebf226e32faf49e87112a92803759497cf 100644 (file)
--- a/po/en_US.pot
+++ b/po/en_US.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-19 11:11-0700\n"
+"POT-Creation-Date: 2007-04-07 17:47-0700\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"
@@ -2267,7 +2267,7 @@ msgstr ""
 msgid "%1$s does not match the specified format"
 msgstr ""
 
-#: includes/init.php:163
+#: includes/init.php:162
 msgid "Bugdar Notification"
 msgstr ""