diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-02-02 02:15:39 +0100 | 
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-02-02 02:15:39 +0100 | 
| commit | 0f71de25b0b0c7aedbe7dd9ba70e2ee78caadb43 (patch) | |
| tree | 36cfb95bad3f7e01bee84dd9059c2842fc26395d | |
| parent | Fix crashes (and hopefully bug 212219) (diff) | |
| parent | KDE HIG fix (diff) | |
| download | rekonq-0f71de25b0b0c7aedbe7dd9ba70e2ee78caadb43.tar.xz | |
Merge commit 'refs/merge-requests/83' of git://gitorious.org/rekonq/mainline into panosf
| -rw-r--r-- | src/settings/settings_general.ui | 13 | ||||
| -rw-r--r-- | src/webview.cpp | 2 | 
2 files changed, 9 insertions, 6 deletions
| diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui index 17ac0d0f..a4503d4a 100644 --- a/src/settings/settings_general.ui +++ b/src/settings/settings_general.ui @@ -244,22 +244,22 @@          </property>          <item>           <property name="text"> -          <string>favorites</string> +          <string>Favorites</string>           </property>          </item>          <item>           <property name="text"> -          <string>closed tabs</string> +          <string>Closed Tabs</string>           </property>          </item>          <item>           <property name="text"> -          <string>history</string> +          <string>Bookmarks</string>           </property>          </item>          <item>           <property name="text"> -          <string>bookmarks</string> +          <string>History</string>           </property>          </item>         </widget> @@ -276,12 +276,15 @@        <item>         <widget class="QCheckBox" name="kcfg_kgetDownload">          <property name="text"> -         <string>Download with KGet</string> +         <string>Use KGet for downloading files</string>          </property>         </widget>        </item>        <item>         <widget class="QCheckBox" name="kcfg_kgetList"> +        <property name="whatsThis"> +         <string>If enabled, rekonq will display an additional context menu entry, which, when selected, lists all available links of the current website in KGet.</string> +        </property>	          <property name="text">           <string>List links with KGet</string>          </property> diff --git a/src/webview.cpp b/src/webview.cpp index 3936ed3c..232a2633 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -278,7 +278,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)              if (ReKonfig::kgetList())              { -                a = new KAction(KIcon("kget"), i18n("List all links"), this); +                a = new KAction(KIcon("kget"), i18n("List All Links"), this);                  connect(a, SIGNAL(triggered(bool)), page(), SLOT(downloadAllContentsWithKGet()));                  menu.addAction(a);              } | 
