summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-25 11:16:32 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-25 11:16:32 +0200
commit29ee89dfb20af834efd4471ab8bcc953383ffe1f (patch)
tree32c37db075ee451bf8eeb31f7bf35f08795e9b42
parentAlternate F6 shortcut for open location action (diff)
parentlast minute string fixes (diff)
downloadrekonq-29ee89dfb20af834efd4471ab8bcc953383ffe1f.tar.xz
Merge commit 'refs/merge-requests/2276' of git://gitorious.org/rekonq/mainline into m2276
-rw-r--r--src/analyzer/networkanalyzer.cpp2
-rw-r--r--src/bookmarks/bookmarksmanager.cpp2
-rw-r--r--src/bookmarks/bookmarkstreemodel.cpp2
-rw-r--r--src/history/historypanel.cpp2
-rw-r--r--src/main.cpp46
-rw-r--r--src/mainwindow.cpp4
-rw-r--r--src/settings/settings_adblock.ui10
-rw-r--r--src/settings/settings_general.ui2
-rw-r--r--src/settings/settings_tabs.ui2
-rw-r--r--src/urlbar/rsswidget.cpp2
-rw-r--r--src/urlbar/urlbar.cpp2
11 files changed, 43 insertions, 33 deletions
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 53972a9c..22a7c243 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -48,7 +48,7 @@ NetworkAnalyzer::NetworkAnalyzer(QWidget *parent)
, _requestList(new QTreeWidget(this))
{
QStringList headers;
- headers << i18n("Method") << i18n("Url") << i18n("Response") << i18n("Length") << i18n("Content Type") << i18n("Info");
+ headers << i18n("Method") << i18n("URL") << i18n("Response") << i18n("Length") << i18n("Content Type") << i18n("Info");
_requestList->setHeaderLabels( headers );
_requestList->header()->setResizeMode(0, QHeaderView::ResizeToContents);
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 605b9630..503e1df8 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -100,7 +100,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark)
if (urlList.length() > 8)
{
if ( !(KMessageBox::warningContinueCancel( Application::instance()->mainWindow(),
- i18n("You are about to open %1 tabs.\nAre you sure ?",
+ i18n("You are about to open %1 tabs.\nAre you sure?",
QString::number( urlList.length() ))
) == KMessageBox::Continue)
)
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 06732007..4003cf3f 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -75,7 +75,7 @@ QVariant BtmItem::data(int role) const
}
if (m_kbm.isGroup())
{
- tooltip += " [" + QString::number(childCount()) + ' ' + i18n("Items") + ']';
+ tooltip += i18nc("%1=Number of items in bookmark folder", " (%1 items)", QString::number(childCount()));
}
if (!m_kbm.url().url().isEmpty())
{
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index c8009afd..65c9de81 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -172,7 +172,7 @@ void HistoryPanel::openAll()
if (allChild.length() > 8)
{
if (!(KMessageBox::warningContinueCancel(this,
- i18n("You are about to open %1 tabs.\nAre you sure ?",
+ i18n("You are about to open %1 tabs.\nAre you sure?",
QString::number(allChild.length()))) == KMessageBox::Continue)
)
return;
diff --git a/src/main.cpp b/src/main.cpp
index 2697c741..acd65c39 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -66,54 +66,58 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"");
about.addAuthor(ki18n("Lionel Chauvin"),
- ki18n("Developer, Ideas, Mockups. And the icon."),
+ ki18n("Developer, Ideas, Mockups, rekonq Icon"),
"megabigbug@yahoo.fr",
"");
about.addAuthor(ki18n("Johannes Zellner"),
- ki18n("Patches, suggestions, testing, bugfixing"),
+ ki18n("Patches, Suggestions, Testing, Bugfixing"),
"webmaster@nebulon.de",
"");
about.addAuthor(ki18n("Matthieu Gicquel"),
- ki18n("Developer, Ideas, Tabloid improvements"),
+ ki18n("Developer, Ideas, New Tab Page improvements"),
"matgic78@gmail.com",
"");
about.addAuthor(ki18n("Ronny Scholz"),
- ki18n("(Tons of ) patches, testing, bugfixing"),
+ ki18n("(Tons of) Patches, Testing, Bugfixing"),
"ronny_scholz@web.de",
"");
- about.addAuthor(ki18n("Rohan Garg"),
- ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"),
- "rohan16garg@gmail.com",
- "");
-
about.addAuthor(ki18n("Yoann Laissus"),
- ki18n("Developer, history & bookmarks improvements"),
+ ki18n("Developer, History & Bookmarks Improvements"),
"yoann.laissus@gmail.com",
"");
-
- about.addAuthor(ki18n("Cedric Bellegarde"),
+
+ about.addAuthor(ki18n("Cédric Bellegarde"),
ki18n("Patched code quite everywhere :)"),
"gnumdk@adishatz.1s.fr",
"");
-
+
+ about.addAuthor(ki18n("Nikhil Marathe"),
+ ki18n("Bugfixing, Support for Chrome extensions (not yet available)"),
+ "nsm.nikhil@gmail.com",
+ "");
+
+ about.addAuthor(ki18n("Rohan Garg"),
+ ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages"),
+ "rohan16garg@gmail.com",
+ "");
+
about.addAuthor(ki18n("Jonathan Raphael Joachim Kolberg"),
- ki18n("Handbook, maintains a Kubuntu PPA with rekonq git packages"),
+ ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages"),
"bulldog98@freenet.de",
"");
-
// --------------- about credits -----------------------------
about.addCredit(ki18n("Lindsay Mathieson"),
- ki18n("Provided patches & hints. Discovered bugs"),
+ ki18n("Provided Patches & Hints, Discovered Bugs"),
"lindsay.mathieson@gmail.com",
"");
about.addCredit(ki18n("Abdurrahman AVCI"),
- ki18n("Provided patches & hints"),
+ ki18n("Provided Patches & Hints"),
"abdurrahmanavci@gmail.com",
"");
@@ -128,12 +132,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"");
about.addCredit(ki18n("Ivan Čukić"),
- ki18n("Patches, bugfixing and ideas"),
+ ki18n("Patches, Bugfixing and Ideas"),
"ivan@fomentgroup.org",
"");
about.addCredit(ki18n("Adrià Arrufat"),
- ki18n("New tab loading animation"),
+ ki18n("New Tab Page loading animation"),
"swiftscythe@gmail.com",
"");
@@ -143,12 +147,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
"");
about.addCredit(ki18n("Dario Freddi"),
- ki18n("Patches, hints, first KWallet support implementation"),
+ ki18n("Patches, Hints, First implementation of KWallet support"),
"drf@kde.org",
"");
about.addCredit(ki18n("Jon de Andrés Frías"),
- ki18n("first awesome bar implementation"),
+ ki18n("First awesome bar implementation"),
"jondeandres@gmail.com",
"");
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b80805b1..43418ed3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1372,8 +1372,8 @@ bool MainWindow::queryClose()
{
int answer = KMessageBox::questionYesNoCancel(
this,
- i18np("Are you sure you want to close the window?\n" "You have 1 tab open",
- "Are you sure you want to close the window?\n" "You have %1 tabs open" ,
+ i18np("Are you sure you want to close the window?\n" "You have 1 tab open.",
+ "Are you sure you want to close the window?\n" "You have %1 tabs open.",
m_view->count()),
i18n("Are you sure you want to close the window?"),
KStandardGuiItem::quit(),
diff --git a/src/settings/settings_adblock.ui b/src/settings/settings_adblock.ui
index 699aef4d..8933fe60 100644
--- a/src/settings/settings_adblock.ui
+++ b/src/settings/settings_adblock.ui
@@ -17,14 +17,14 @@
<item>
<widget class="QCheckBox" name="checkEnableAdblock">
<property name="text">
- <string>&amp;Enable AdBlock</string>
+ <string>&amp;Enable Ad Block</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkHideAds">
<property name="text">
- <string>&amp;Hide filtered Elements</string>
+ <string>&amp;Hide filtered elements</string>
</property>
</widget>
</item>
@@ -128,6 +128,9 @@
</item>
<item>
<widget class="QToolButton" name="insertButton">
+ <property name="toolTip">
+ <string>Add filter expression</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -135,6 +138,9 @@
</item>
<item>
<widget class="QToolButton" name="removeButton">
+ <property name="toolTip">
+ <string>Remove filter expression</string>
+ </property>
<property name="text">
<string>...</string>
</property>
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index 63ab933c..92e409a2 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -141,7 +141,7 @@
<item row="0" column="1">
<widget class="QCheckBox" name="kcfg_useNewTabPage">
<property name="text">
- <string>Use New Tab Page</string>
+ <string>Use the New Tab Page as home page</string>
</property>
</widget>
</item>
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 8bc3ae70..138b5b5c 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -73,7 +73,7 @@
</size>
</property>
<property name="text">
- <string>New tab page starts with:</string>
+ <string>New Tab Page starts with:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index ae96dfae..6cd63b95 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -163,7 +163,7 @@ void RSSWidget::addWithAkregator(const QString &url)
if (!reply.isValid())
{
- KMessageBox::error(0, QString(i18n("Could not add stream to akregator, Please add it manually :")
+ KMessageBox::error(0, QString(i18n("Could not add feed to Akregator. Please add it manually:")
+ "<br /><br /> <a href=\"" + url + "\">" + url + "</a>"));
}
}
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 6ec461a2..4d38f170 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -91,7 +91,7 @@ UrlBar::UrlBar(QWidget *parent)
setUrlDropsEnabled(true);
// tooltip
- setToolTip(i18n("Type here to search your bookmarks, history and the web.."));
+ setToolTip(i18n("Type here to search your bookmarks, history and the web..."));
// accept focus, via tabbing, clicking & wheeling
setFocusPolicy(Qt::WheelFocus);