Merge commit 'refs/merge-requests/2249' of git://gitorious.org/rekonq/mainline into Pano18

4 files changed, 6 insertions, 6 deletions

diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index 6236512f..93e65294 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -129,7 +129,7 @@ void LineEdit::paintEvent(QPaintEvent *event)
         painter.setPen(Qt::gray);
         painter.drawText( textRect, 
                           Qt::AlignCenter, 
-                          i18n("Search Bookmarks, History, Web.. just start typing here!")
+                          i18n("Start typing here to search your bookmarks, history and the web...")
                         );
     }
 }
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 987d070f..8f299e4f 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -282,7 +282,7 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
 
 QString SearchListItem::searchItemTitle(QString engine, QString text)
 {
-    return QString("Search "+ engine +" for <b>"+text+"</b>");
+    return QString(i18nc("%1=search engine, e.g. Google, Wikipedia %2=text to search for", "Search %1 for <b>%2</b>", engine, text));
 }
 
 
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 5b4b1625..e4a45105 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -172,7 +172,7 @@ UrlSearchList UrlResolver::qurlFromUserInputResolution()
     if(urlFromUserInput.isValid())
     {
         KUrl gUrl(urlFromUserInput);
-        QString gTitle = i18n("Browse");
+        QString gTitle = i18nc("Browse a website", "Browse");
         UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle);
         list << gItem;
     }
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 6bafd04a..62de6299 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -207,15 +207,15 @@ bool WebTab::hasRSSInfo()
 
 void WebTab::showRSSInfo()
 {
-    QString urlList = QString("Here are the rss link found: <br /><br />");
+    QString urlList = QString(i18n("The following RSS feeds were found:<br /><br />"));
     foreach(const KUrl &url, _rssList)
     {
         urlList += QString("<a href=\"") + url.url() + QString("\">") + url.url() + QString("</a><br />");
     }
-    urlList += QString("<br />Enough for now.. waiting for some cool akonadi based feeds management :)");
+    urlList += QString(i18n("<br />Enough for now... Waiting for some cool Akonadi based feeds management :)"));
     
     KMessageBox::information( view(), 
                               urlList,
-                              "RSS Management"
+                              i18n("RSS Management")
                             );
 }