debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change a few strings, particularly New Bookmark => Add Bookmark

Browse source
This commit is contained in:
Christian Dywan 2008-06-01 16:40:44 +02:00
parent f79806bb27
commit 84036dc39e
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main.c
View file

@ -44,9 +44,9 @@ static void stock_items_init(void)
{ STOCK_USER_TRASH }, { STOCK_USER_TRASH },
{ STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL }, { STOCK_BOOKMARK, N_("Bookmark"), 0, 0, NULL },
{ STOCK_BOOKMARK_NEW, N_("New Bookmark"), 0, 0, NULL }, { STOCK_BOOKMARK_ADD, N_("_Add Bookmark"), 0, 0, NULL },
{ STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL }, { STOCK_FORM_FILL, N_("_Form Fill"), 0, 0, NULL },
{ STOCK_HOMEPAGE, N_("Homepage"), 0, 0, NULL }, { STOCK_HOMEPAGE, N_("_Homepage"), 0, 0, NULL },
{ STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL }, { STOCK_TAB_NEW, N_("New _Tab"), 0, 0, NULL },
{ STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL }, { STOCK_WINDOW_NEW, N_("New _Window"), 0, 0, NULL },
#if !GTK_CHECK_VERSION(2, 10, 0) #if !GTK_CHECK_VERSION(2, 10, 0)
@ -54,7 +54,7 @@ static void stock_items_init(void)
#endif #endif
#if !GTK_CHECK_VERSION(2, 8, 0) #if !GTK_CHECK_VERSION(2, 8, 0)
{ GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL }, { GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), 0, 0, NULL },
{ GTK_STOCK_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL }, { GTK_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"), 0, 0, NULL },
#endif #endif
}; };
GtkIconFactory* factory = gtk_icon_factory_new(); GtkIconFactory* factory = gtk_icon_factory_new();
@ -157,7 +157,7 @@ settings_new_from_file (const gchar* filename)
g_type_class_unref (enum_class); g_type_class_unref (enum_class);
} }
else else
g_warning (_("Unhandled settings property '%s'"), property); g_warning (_("Unhandled settings value '%s'"), property);
} }
return settings; return settings;
} }

2
src/main.h
View file

@ -37,7 +37,7 @@ KatzeXbelItem* bookmarks;
// We assume that these legacy icon names are usually present // We assume that these legacy icon names are usually present
#define STOCK_BOOKMARK_NEW "stock_add-bookmark" #define STOCK_BOOKMARK_ADD "stock_add-bookmark"
#define STOCK_HOMEPAGE GTK_STOCK_HOME #define STOCK_HOMEPAGE GTK_STOCK_HOME
#define STOCK_IMAGE "gnome-mime-image" #define STOCK_IMAGE "gnome-mime-image"
#define STOCK_LOCK_OPEN "stock_lock-open" #define STOCK_LOCK_OPEN "stock_lock-open"

12
src/midori-browser.c
View file

@ -436,7 +436,7 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view,
menuitem = gtk_separator_menu_item_new (); menuitem = gtk_separator_menu_item_new ();
gtk_widget_show (menuitem); gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
action = _action_by_name (browser, "BookmarkNew"); action = _action_by_name (browser, "BookmarkAdd");
menuitem = gtk_action_create_menu_item (action); menuitem = gtk_action_create_menu_item (action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
action = _action_by_name (browser, "SaveAs"); action = _action_by_name (browser, "SaveAs");
@ -1858,7 +1858,7 @@ _midori_browser_create_bookmark_menu (MidoriBrowser* browser,
} }
static void static void
_action_bookmark_new_activate (GtkAction* action, _action_bookmark_add_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
midori_browser_edit_bookmark_dialog_new (browser, NULL); midori_browser_edit_bookmark_dialog_new (browser, NULL);
@ -2308,9 +2308,9 @@ static const GtkActionEntry entries[] = {
N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) }, N_("Open the last closed tab"), G_CALLBACK (_action_undo_tab_close_activate) },
{ "Bookmarks", NULL, N_("_Bookmarks") }, { "Bookmarks", NULL, N_("_Bookmarks") },
{ "BookmarkNew", STOCK_BOOKMARK_NEW, { "BookmarkAdd", STOCK_BOOKMARK_ADD,
NULL, "<Ctrl>d", NULL, "<Ctrl>d",
N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_new_activate) }, N_("Add a new bookmark"), G_CALLBACK (_action_bookmark_add_activate) },
{ "BookmarksManage", NULL, { "BookmarksManage", NULL,
N_("_Manage Bookmarks"), "<Ctrl>b", N_("_Manage Bookmarks"), "<Ctrl>b",
N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ }, N_("Add, edit and remove bookmarks..."), NULL/*G_CALLBACK (_action_bookmarks_manage_activate)*/ },
@ -2518,7 +2518,7 @@ static const gchar* ui_markup =
"<menuitem action='FindPrevious'/>" "<menuitem action='FindPrevious'/>"
"</menu>" "</menu>"
"<menu action='Bookmarks'>" "<menu action='Bookmarks'>"
"<menuitem action='BookmarkNew'/>" "<menuitem action='BookmarkAdd'/>"
"<menuitem action='BookmarksManage'/>" "<menuitem action='BookmarksManage'/>"
"<separator/>" "<separator/>"
// Bookmarks shall be appended here // Bookmarks shall be appended here
@ -2550,7 +2550,7 @@ static const gchar* ui_markup =
"<placeholder name='TabTrash'/>" "<placeholder name='TabTrash'/>"
"</toolbar>" "</toolbar>"
"<toolbar name='toolbar_bookmarks'>" "<toolbar name='toolbar_bookmarks'>"
"<toolitem action='BookmarkNew'/>" "<toolitem action='BookmarkAdd'/>"
"<toolitem action='BookmarkEdit'/>" "<toolitem action='BookmarkEdit'/>"
"<toolitem action='BookmarkDelete'/>" "<toolitem action='BookmarkDelete'/>"
"</toolbar>" "</toolbar>"