From f3fb99d68a4229b548f3e688088625c12f9a200d Mon Sep 17 00:00:00 2001 From: erlehmann Date: Fri, 12 Oct 2007 12:19:59 +0000 Subject: [PATCH] conflict solved ? git-svn-id: http://yolanda.mister-muffin.de/svn@56 7eef14d0-6ed0-489d-bf55-20463b2d70db --- trunk/locale/en-US.xml | 7 +++++-- trunk/site/gnutube.xml | 5 +++++ trunk/xsl/xhtml.xsl | 9 +++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/trunk/locale/en-US.xml b/trunk/locale/en-US.xml index 38cc250..f1d6bee 100755 --- a/trunk/locale/en-US.xml +++ b/trunk/locale/en-US.xml @@ -33,10 +33,13 @@ best rated - results for + results for query - search: + search + + + title diff --git a/trunk/site/gnutube.xml b/trunk/site/gnutube.xml index d418572..b2b9795 100755 --- a/trunk/site/gnutube.xml +++ b/trunk/site/gnutube.xml @@ -3,9 +3,14 @@ + GNUtube WebTV free as in Speech + + search.pl?query= + search.pl?query= + diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl index 72359b2..f3d73fe 100755 --- a/trunk/xsl/xhtml.xsl +++ b/trunk/xsl/xhtml.xsl @@ -20,8 +20,6 @@ -search.pl?query= - @@ -119,7 +117,7 @@
- +

@@ -159,7 +157,7 @@
- + :
@@ -200,9 +198,8 @@
- THE SEARCH FOR + : "" - BROUGHT US TEH FOLLOWING OBJECTIONSOBJECTS.