Fill in discriptions for tooltips

diff --git a/src/midori-browser.c b/src/midori-browser.c
index a7084dcd5cd67d60ae69c5cec283d4b51dd3dc72..ee242312964f6c4c87128efbf7be5e9cd96b1948 100644 (file)
--- a/src/midori-browser.c
+++ b/src/midori-browser.c
@@ -2174,7 +2174,6 @@ _action_bookmark_delete_activate (GtkAction* action,
     }
 }
 
-// FIXME: Fill in a good description for each 'hm?'
 static const GtkActionEntry entries[] = {
  { "File", NULL, N_("_File") },
  { "WindowNew", STOCK_WINDOW_NEW,
@@ -2197,13 +2196,13 @@ static const GtkActionEntry entries[] = {
    N_("Close this window"), G_CALLBACK (_action_window_close_activate) },
  { "PageSetup", GTK_STOCK_PROPERTIES,
    N_("Pa_ge Setup"), "",
-   "hm?", NULL/*G_CALLBACK (_action_page_setup_activate)*/ },
+   "Configure your print settings", NULL/*G_CALLBACK (_action_page_setup_activate)*/ },
  { "PrintPreview", GTK_STOCK_PRINT_PREVIEW,
    NULL, "",
-   "hm?", NULL/*G_CALLBACK (_action_print_preview_activate)*/ },
+   N_("Show a preview of the printed page"), NULL/*G_CALLBACK (_action_print_preview_activate)*/ },
  { "Print", GTK_STOCK_PRINT,
    NULL, "<Ctrl>p",
-   "hm?", G_CALLBACK (_action_print_activate) },
+   N_("Print the current page"), G_CALLBACK (_action_print_activate) },
  { "Quit", GTK_STOCK_QUIT,
    NULL, "<Ctrl>q",
    N_("Quit the application"), G_CALLBACK (_action_quit_activate) },
@@ -2217,7 +2216,7 @@ static const GtkActionEntry entries[] = {
    N_("Redo the last modification"), NULL/*G_CALLBACK (_action_redo_activate)*/ },
  { "Cut", GTK_STOCK_CUT,
    NULL, "<Ctrl>x",
-   "Cut the selected text", G_CALLBACK (_action_cut_activate) },
+   N_("Cut the selected text"), G_CALLBACK (_action_cut_activate) },
  { "Copy", GTK_STOCK_COPY,
    NULL, "<Ctrl>c",
    N_("Copy the selected text"), G_CALLBACK (_action_copy_activate) },
@@ -2235,19 +2234,19 @@ static const GtkActionEntry entries[] = {
    N_("Select all text"), G_CALLBACK (_action_select_all_activate) },
  { "Find", GTK_STOCK_FIND,
    NULL, "<Ctrl>f",
-   "hm?", G_CALLBACK (_action_find_activate) },
+   N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
  { "FindNext", GTK_STOCK_GO_FORWARD,
    N_("Find _Next"), "<Ctrl>g",
-   "hm?", G_CALLBACK (_action_find_next_activate) },
+   N_("Find the next occurrence of a word or phrase"), G_CALLBACK (_action_find_next_activate) },
  { "FindPrevious", GTK_STOCK_GO_BACK,
    N_("Find _Previous"), "<Ctrl><Shift>g",
-   "hm?", G_CALLBACK (_action_find_previous_activate) },
+   N_("Find the previous occurrence of a word or phrase"), G_CALLBACK (_action_find_previous_activate) },
  { "FindQuick", GTK_STOCK_FIND,
    N_("_Quick Find"), "period",
-   "hm?", NULL/*G_CALLBACK (_action_find_quick_activate)*/ },
+   N_("Quickly jump to a word or phrase"), NULL/*G_CALLBACK (_action_find_quick_activate)*/ },
  { "Preferences", GTK_STOCK_PREFERENCES,
    NULL, "<Ctrl><Alt>p",
-   "hm?", G_CALLBACK (_action_preferences_activate) },
+   N_("Configure the application preferences"), G_CALLBACK (_action_preferences_activate) },
 
  { "View", NULL, N_("_View") },
  { "Toolbars", NULL, N_("_Toolbars") },
@@ -2262,19 +2261,19 @@ static const GtkActionEntry entries[] = {
    N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
  { "ZoomIn", GTK_STOCK_ZOOM_IN,
    NULL, "<Ctrl>plus",
-   "hm?", G_CALLBACK (_action_zoom_in_activate) },
+   N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) },
  { "ZoomOut", GTK_STOCK_ZOOM_OUT,
    NULL, "<Ctrl>minus",
-   "hm?", G_CALLBACK (_action_zoom_out_activate) },
+   N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
  { "ZoomNormal", GTK_STOCK_ZOOM_100,
    NULL, "<Ctrl>0",
-   "hm?", G_CALLBACK (_action_zoom_normal_activate) },
+   N_("Reset the zoom level"), G_CALLBACK (_action_zoom_normal_activate) },
  { "SourceView", NULL,
    N_("View Source"), "",
-    "hm?", /*G_CALLBACK (_action_source_view_activate)*/ },
+   N_("View the source code of the page"), /*G_CALLBACK (_action_source_view_activate)*/ },
  { "SelectionSourceView", NULL,
     N_("View Selection Source"), "",
-    "hm?", NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ },
+    N_("View the source code of the selection"), NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ },
  { "Fullscreen", GTK_STOCK_FULLSCREEN,
    NULL, "F11",
    N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
@@ -2282,54 +2281,54 @@ static const GtkActionEntry entries[] = {
  { "Go", NULL, N_("_Go") },
  { "Back", GTK_STOCK_GO_BACK,
    NULL, "<Alt>Left",
-   "hm?", G_CALLBACK (_action_back_activate) },
+   N_("Go back to the previous page"), G_CALLBACK (_action_back_activate) },
  { "Forward", GTK_STOCK_GO_FORWARD,
    NULL, "<Alt>Right",
-   "hm?", G_CALLBACK (_action_forward_activate) },
+   N_("Go forward to the next page"), G_CALLBACK (_action_forward_activate) },
  { "Homepage", STOCK_HOMEPAGE,
    NULL, "<Alt>Home",
-   "hm?", G_CALLBACK (_action_homepage_activate) },
+   N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) },
  { "Location", GTK_STOCK_JUMP_TO,
    N_("Location..."), "<Ctrl>l",
-   "hm?", G_CALLBACK (_action_location_activate) },
+   N_("Open a particular location"), G_CALLBACK (_action_location_activate) },
  { "Search", GTK_STOCK_FIND,
    N_("Web Search..."), "<Ctrl><Shift>f",
-   "hm?", G_CALLBACK (_action_search_activate) },
+   N_("Run a web search"), G_CALLBACK (_action_search_activate) },
  { "OpenInPageholder", GTK_STOCK_JUMP_TO,
    N_("Open in Page_holder..."), "",
-   "hm?", G_CALLBACK (_action_open_in_panel_activate) },
+   N_("Open the current page in the pageholder"), G_CALLBACK (_action_open_in_panel_activate) },
  { "Trash", STOCK_USER_TRASH,
    N_("Closed Tabs and Windows"), "",
    N_("Reopen a previously closed tab or window"), NULL },
  { "TrashEmpty", GTK_STOCK_CLEAR,
    N_("Empty Trash"), "",
-   "hm?", G_CALLBACK (_action_trash_empty_activate) },
+   N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) },
  { "UndoTabClose", GTK_STOCK_UNDELETE,
    N_("Undo Close Tab"), "",
-   "hm?", G_CALLBACK (_action_undo_tab_close_activate) },
+   N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
 
  { "Bookmarks", NULL, N_("_Bookmarks") },
  { "BookmarkNew", STOCK_BOOKMARK_NEW,
    NULL, "<Ctrl>d",
-   "hm?", G_CALLBACK (_action_bookmark_new_activate) },
+   N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_new_activate) },
  { "BookmarksManage", NULL,
    N_("_Manage Bookmarks"), "<Ctrl>b",
-   "hm?", NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ },
+   N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ },
  { "BookmarkOpen", GTK_STOCK_OPEN,
    NULL, "",
-   "hm?", G_CALLBACK (_action_bookmark_open_activate) },
+   N_("Open the selected bookmark"), G_CALLBACK (_action_bookmark_open_activate) },
  { "BookmarkOpenTab", STOCK_TAB_NEW,
    N_("Open in New _Tab"), "",
-   "hm?", G_CALLBACK (_action_bookmark_open_tab_activate) },
+   N_("Open the selected bookmark in a new tab"), G_CALLBACK (_action_bookmark_open_tab_activate) },
  { "BookmarkOpenWindow", STOCK_WINDOW_NEW,
    N_("Open in New _Window"), "",
-   "hm?", G_CALLBACK (_action_bookmark_open_window_activate) },
+   N_("Open the selected bookmark in a new window"), G_CALLBACK (_action_bookmark_open_window_activate) },
  { "BookmarkEdit", GTK_STOCK_EDIT,
    NULL, "",
-   "hm?", G_CALLBACK (_action_bookmark_edit_activate) },
+   N_("Edit the selected bookmark"), G_CALLBACK (_action_bookmark_edit_activate) },
  { "BookmarkDelete", GTK_STOCK_DELETE,
    NULL, "",
-   "hm?", G_CALLBACK (_action_bookmark_delete_activate) },
+   N_("Delete the selected bookmark"), G_CALLBACK (_action_bookmark_delete_activate) },
 
  { "Tools", NULL, N_("_Tools") },
  { "ManageSearchEngines", GTK_STOCK_PROPERTIES,
@@ -2340,53 +2339,53 @@ static const GtkActionEntry entries[] = {
  { "Window", NULL, N_("_Window") },
  { "TabPrevious", GTK_STOCK_GO_BACK,
    N_("_Previous Tab"), "<Ctrl>Page_Up",
-   "hm?", G_CALLBACK (_action_tab_previous_activate) },
+   N_("Switch to the previous tab"), G_CALLBACK (_action_tab_previous_activate) },
  { "TabNext", GTK_STOCK_GO_FORWARD,
    N_("_Next Tab"), "<Ctrl>Page_Down",
-   "hm?", G_CALLBACK (_action_tab_next_activate) },
+   N_("Switch to the next tab"), G_CALLBACK (_action_tab_next_activate) },
  { "TabOverview", NULL,
    N_("Tab _Overview"), "",
-   "hm?", NULL/*G_CALLBACK (_action_tab_overview_activate)*/ },
+   N_("Show an overview of all open tabs"), NULL/*G_CALLBACK (_action_tab_overview_activate)*/ },
 
  { "Help", NULL, N_("_Help") },
  { "HelpContents", GTK_STOCK_HELP,
    N_("_Contents"), "F1",
-   "hm?", NULL/*G_CALLBACK (_action_help_contents_activate)*/ },
+   N_("Show the documentation"), NULL/*G_CALLBACK (_action_help_contents_activate)*/ },
  { "About", GTK_STOCK_ABOUT,
    NULL, "",
-   "hm?", G_CALLBACK (_action_about_activate) },
+   N_("Show information about the program"), G_CALLBACK (_action_about_activate) },
  };
  static const guint entries_n = G_N_ELEMENTS (entries);
 
 static const GtkToggleActionEntry toggle_entries[] = {
  { "PrivateBrowsing", NULL,
    N_("P_rivate Browsing"), "",
-   "hm?", NULL/*G_CALLBACK (_action_private_browsing_activate)*/,
+   N_("Don't save any private data while browsing"), NULL/*G_CALLBACK (_action_private_browsing_activate)*/,
    FALSE },
  { "WorkOffline", GTK_STOCK_DISCONNECT,
    N_("_Work Offline"), "",
-   "hm?", NULL/*G_CALLBACK (_action_work_offline_activate)*/,
+   N_("Work without a network connection"), NULL/*G_CALLBACK (_action_work_offline_activate)*/,
    FALSE },
 
  { "Navigationbar", NULL,
    N_("_Navigationbar"), "",
-   "hm?", G_CALLBACK (_action_navigationbar_activate),
+   N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate),
    FALSE },
  { "Panel", NULL,
    N_("Side_panel"), "F9",
-   "hm?", G_CALLBACK (_action_panel_activate),
+   N_("Show sidepanel"), G_CALLBACK (_action_panel_activate),
    FALSE },
  { "Bookmarkbar", NULL,
    N_("_Bookmarkbar"), "",
-   "hm?", G_CALLBACK (_action_bookmarkbar_activate),
+   N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate),
    FALSE },
  { "Transferbar", NULL,
    N_("_Transferbar"), "",
-   "hm?", NULL/*G_CALLBACK (_action_transferbar_activate)*/,
+   N_("Show transferbar"), NULL/*G_CALLBACK (_action_transferbar_activate)*/,
    FALSE },
  { "Statusbar", NULL,
    N_("_Statusbar"), "",
-   "hm?", G_CALLBACK (_action_statusbar_activate),
+   N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate),
    FALSE },
  };
  static const guint toggle_entries_n = G_N_ELEMENTS (toggle_entries);