From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 09:16:34 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/web/admin/templates/software_update_list.htm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index d850096..1b49e9e 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -38,7 +38,7 @@
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="3">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="3">{tmpl_var name='no_updates_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>

--
Gitblit v1.9.1