Pull from trunk

resources/recipes/dhnet_be.recipe

@@ -0,0 +1,34 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>'
+'''
+dhnet.be
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class DHNetBe(BasicNewsRecipe):
+    title                 = u'La Derniere Heure'
+    __author__            = u'Lionel Bergeret'
+    description           = u'News from Belgium in French'
+    publisher             = u'dhnet.be'
+    category              = 'news, Belgium'
+    oldest_article        = 3
+    language = 'fr'
+
+    max_articles_per_feed = 20
+    no_stylesheets        = True
+    use_embedded_content  = False
+    timefmt               = ' [%d %b %Y]'
+
+    keep_only_tags = [
+	   dict(name = 'div', attrs = {'id': 'articleText'})
+	  ,dict(name = 'div', attrs = {'id': 'articlePicureAndLinks'})
+    ]
+
+    feeds = [
+         (u'La Une'         , u'http://www.dhnet.be/rss' )
+		,(u'La Une Sports'  , u'http://www.dhnet.be/rss/dhsports/' )
+		,(u'La Une Info'    , u'http://www.dhnet.be/rss/dhinfos/' )
+    ]

resources/recipes/lesoir_be.recipe

@@ -0,0 +1,43 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>'
+'''
+lesoir.be
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LeSoirBe(BasicNewsRecipe):
+    title                 = u'Le Soir'
+    __author__            = u'Lionel Bergeret'
+    description           = u'News from Belgium in French'
+    publisher             = u'lesoir.be'
+    category              = 'news, Belgium'
+    oldest_article        = 3
+    language = 'fr'
+
+    max_articles_per_feed = 20
+    no_stylesheets        = True
+    use_embedded_content  = False
+    timefmt               = ' [%d %b %Y]'
+
+    keep_only_tags = [
+	   dict(name = 'div', attrs = {'id': 'story_head'})
+	  ,dict(name = 'div', attrs = {'id': 'story_body'})
+    ]
+
+    remove_tags = [
+       dict(name='form', attrs={'id':'story_actions'})
+      ,dict(name='div', attrs={'id':'sb-share'})
+      ,dict(name='div', attrs={'id':'sb-subscribe'})
+    ]
+
+    feeds = [
+         (u'Belgique'       , u'http://www.lesoir.be/actualite/belgique/rss.xml' )
+		,(u'France'         , u'http://www.lesoir.be/actualite/france/rss.xml' )
+		,(u'Monde'          , u'http://www.lesoir.be/actualite/monde/rss.xml' )
+		,(u'Regions'        , u'http://www.lesoir.be/regions/rss.xml' )
+		,(u'Vie du Net'     , u'http://www.lesoir.be/actualite/vie_du_net/rss.xml' )
+		,(u'Petite Gazette' , u'http://www.lesoir.be/actualite/sciences/rss.xml' )
+    ]

src/calibre/gui2/layout.py

@@ -152,7 +152,7 @@ class SearchBar(QWidget): # {{{
         l.addWidget(x)
         x.setToolTip(_("Advanced search"))
 
-        self.label = x = QLabel('&Search:')
+        self.label = x = QLabel(_('&Search:'))
         l.addWidget(self.label)
         x.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)