diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index a47f4f92..bf99b890 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -120,8 +120,8 @@ katze_array_action_class_init (KatzeArrayActionClass* class) PROP_ARRAY, g_param_spec_object ( "array", - _("Array"), - _("The array the action represents"), + "Array", + "The array the action represents", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } diff --git a/katze/katze-item.c b/katze/katze-item.c index f77f4b86..f2a40d24 100644 --- a/katze/katze-item.c +++ b/katze/katze-item.c @@ -71,8 +71,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_NAME, g_param_spec_string ( "name", - _("Name"), - _("The name of the item"), + "Name", + "The name of the item", NULL, flags)); @@ -80,8 +80,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_TEXT, g_param_spec_string ( "text", - _("Text"), - _("The descriptive text of the item"), + "Text", + "The descriptive text of the item", NULL, flags)); @@ -89,8 +89,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_URI, g_param_spec_string ( "uri", - _("URI"), - _("The URI of the item"), + "URI", + "The URI of the item", NULL, flags)); @@ -98,8 +98,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_ICON, g_param_spec_string ( "icon", - _("Icon"), - _("The icon of the item"), + "Icon", + "The icon of the item", NULL, flags)); @@ -107,8 +107,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_TOKEN, g_param_spec_string ( "token", - _("Token"), - _("The token of the item"), + "Token", + "The token of the item", NULL, flags)); @@ -116,8 +116,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_ADDED, g_param_spec_string ( "added", - _("Added"), - _("When the item was added"), + "Added", + "When the item was added", NULL, flags)); @@ -125,8 +125,8 @@ katze_item_class_init (KatzeItemClass* class) PROP_VISITS, g_param_spec_int ( "visits", - _("Visits"), - _("The number of visits of the item"), + "Visits", + "The number of visits of the item", G_MININT, G_MAXINT, 0, diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c index b8ea1847..35396fe5 100644 --- a/katze/katze-throbber.c +++ b/katze/katze-throbber.c @@ -13,7 +13,6 @@ #include "katze-utils.h" -#include #include struct _KatzeThrobber @@ -51,7 +50,7 @@ enum }; static void -katze_throbber_dispose(GObject* object); +katze_throbber_dispose (GObject* object); static void katze_throbber_set_property (GObject* object, @@ -132,8 +131,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_SIZE, g_param_spec_int ( "icon-size", - _("Icon size"), - _("Symbolic size to use for the animation"), + "Icon size", + "Symbolic size to use for the animation", 0, G_MAXINT, GTK_ICON_SIZE_MENU, flags)); @@ -141,8 +140,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ICON_NAME, g_param_spec_string ( "icon-name", - _("Icon Name"), - _("The name of an icon containing animation frames"), + "Icon Name", + "The name of an icon containing animation frames", "process-working", flags)); @@ -150,8 +149,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "pixbuf", - _("Pixbuf"), - _("A GdkPixbuf containing animation frames"), + "Pixbuf", + "A GdkPixbuf containing animation frames", GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -159,8 +158,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_ANIMATED, g_param_spec_boolean ( "animated", - _("Animated"), - _("Whether the throbber should be animated"), + "Animated", + "Whether the throbber should be animated", FALSE, flags)); @@ -168,8 +167,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_ICON_NAME, g_param_spec_string ( "static-icon-name", - _("Static Icon Name"), - _("The name of an icon to be used as the static image"), + "Static Icon Name", + "The name of an icon to be used as the static image", NULL, flags)); @@ -177,8 +176,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_PIXBUF, g_param_spec_object ( "static-pixbuf", - _("Static Pixbuf"), - _("A GdkPixbuf to be used as the static image"), + "Static Pixbuf", + "A GdkPixbuf to be used as the static image", GDK_TYPE_PIXBUF, G_PARAM_READWRITE)); @@ -186,8 +185,8 @@ katze_throbber_class_init (KatzeThrobberClass* class) PROP_STATIC_STOCK_ID, g_param_spec_string ( "static-stock-id", - _("Static Stock ID"), - _("The stock ID of an icon to be used as the static image"), + "Static Stock ID", + "The stock ID of an icon to be used as the static image", NULL, flags)); } diff --git a/katze/katze-throbber.h b/katze/katze-throbber.h index b4ef681c..34d00044 100644 --- a/katze/katze-throbber.h +++ b/katze/katze-throbber.h @@ -12,7 +12,6 @@ #ifndef __KATZE_THROBBER_H__ #define __KATZE_THROBBER_H__ -#include #include G_BEGIN_DECLS diff --git a/midori/compat.h b/midori/compat.h index a3c6d5c1..bd03cf97 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -16,9 +16,8 @@ #include #endif -#include #if HAVE_GIO -#include + #include #endif #include diff --git a/midori/midori-addons.c b/midori/midori-addons.c index 9842a468..8415215d 100644 --- a/midori/midori-addons.c +++ b/midori/midori-addons.c @@ -112,8 +112,8 @@ midori_addons_class_init (MidoriAddonsClass* class) PROP_WEB_WIDGET, g_param_spec_object ( "web-widget", - _("Web Widget"), - _("The assigned web widget"), + "Web Widget", + "The assigned web widget", GTK_TYPE_WIDGET, G_PARAM_READWRITE)); @@ -121,8 +121,8 @@ midori_addons_class_init (MidoriAddonsClass* class) PROP_KIND, g_param_spec_enum ( "kind", - _("Kind"), - _("The kind of addons"), + "Kind", + "The kind of addons", MIDORI_TYPE_ADDON_KIND, MIDORI_ADDON_NONE, flags)); diff --git a/midori/midori-app.c b/midori/midori-app.c index 2c4e1595..14e41a67 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -125,8 +125,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -134,8 +134,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BOOKMARKS, g_param_spec_object ( "bookmarks", - _("Bookmarks"), - _("The bookmarks folder, containing all bookmarks"), + "Bookmarks", + "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -143,8 +143,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_TRASH, g_param_spec_object ( "trash", - _("Trash"), - _("The trash, collecting recently closed tabs and windows"), + "Trash", + "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -152,8 +152,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines"), + "Search Engines", + "The list of search engines", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -161,8 +161,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BROWSER, g_param_spec_object ( "browser", - _("Browser"), - _("The current browser"), + "Browser", + "The current browser", MIDORI_TYPE_BROWSER, G_PARAM_READABLE)); @@ -170,8 +170,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_BROWSER_COUNT, g_param_spec_uint ( "browser-count", - _("Browser Count"), - _("The current number of browsers"), + "Browser Count", + "The current number of browsers", 0, G_MAXUINT, 0, G_PARAM_READABLE)); @@ -179,8 +179,8 @@ midori_app_class_init (MidoriAppClass* class) PROP_HISTORY, g_param_spec_object ( "history", - _("History"), - _("The list of history items"), + "History", + "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 0cc425fd..9c96b890 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -963,8 +963,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_MENUBAR, g_param_spec_object ( "menubar", - _("Menubar"), - _("The menubar"), + "Menubar", + "The menubar", GTK_TYPE_MENU_BAR, G_PARAM_READABLE)); @@ -972,8 +972,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_NAVIGATIONBAR, g_param_spec_object ( "navigationbar", - _("Navigationbar"), - _("The navigationbar"), + "Navigationbar", + "The navigationbar", GTK_TYPE_TOOLBAR, G_PARAM_READABLE)); @@ -981,8 +981,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_URI, g_param_spec_string ( "uri", - _("URI"), - _("The current URI"), + "URI", + "The current URI", "about:blank", G_PARAM_READWRITE)); @@ -990,8 +990,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_TAB, g_param_spec_object ( "tab", - _("Tab"), - _("The current tab"), + "Tab", + "The current tab", GTK_TYPE_WIDGET, G_PARAM_READWRITE)); @@ -999,8 +999,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_STATUSBAR, g_param_spec_object ( "statusbar", - _("Statusbar"), - _("The statusbar"), + "Statusbar", + "The statusbar", GTK_TYPE_STATUSBAR, G_PARAM_READABLE)); @@ -1019,8 +1019,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_STATUSBAR_TEXT, g_param_spec_string ( "statusbar-text", - _("Statusbar Text"), - _("The text that is displayed in the statusbar"), + "Statusbar Text", + "The text that is displayed in the statusbar", "", flags)); @@ -1038,8 +1038,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); @@ -1055,8 +1055,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_BOOKMARKS, g_param_spec_object ( "bookmarks", - _("Bookmarks"), - _("The bookmarks folder, containing all bookmarks"), + "Bookmarks", + "The bookmarks folder, containing all bookmarks", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1074,8 +1074,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_TRASH, g_param_spec_object ( "trash", - _("Trash"), - _("The trash, collecting recently closed tabs and windows"), + "Trash", + "The trash, collecting recently closed tabs and windows", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1091,8 +1091,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines to be used for web search"), + "Search Engines", + "The list of search engines to be used for web search", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -1108,8 +1108,8 @@ midori_browser_class_init (MidoriBrowserClass* class) PROP_HISTORY, g_param_spec_object ( "history", - _("History"), - _("The list of history items"), + "History", + "The list of history items", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); } @@ -3048,7 +3048,7 @@ static const GtkToggleActionEntry toggle_entries[] = { N_("_Navigationbar"), "", N_("Show navigationbar"), G_CALLBACK (_action_navigationbar_activate), FALSE }, - { "Panel", NULL, + { "Panel", GTK_STOCK_INDENT, N_("Side_panel"), "F9", N_("Show sidepanel"), G_CALLBACK (_action_panel_activate), FALSE }, diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index b5294388..b7d56b73 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -179,8 +179,8 @@ midori_location_action_class_init (MidoriLocationActionClass* class) PROP_PROGRESS, g_param_spec_double ( "progress", - _("Progress"), - _("The current progress of the action"), + "Progress", + "The current progress of the action", 0.0, 1.0, 0.0, G_PARAM_WRITABLE)); @@ -188,8 +188,8 @@ midori_location_action_class_init (MidoriLocationActionClass* class) PROP_SECONDARY_ICON, g_param_spec_string ( "secondary-icon", - _("Secondary"), - _("The stock ID of the secondary icon"), + "Secondary", + "The stock ID of the secondary icon", NULL, G_PARAM_WRITABLE)); } diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 10e51b6b..f20f81d5 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -143,8 +143,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_SHADOW_TYPE, g_param_spec_enum ( "shadow-type", - _("Shadow Type"), - _("Appearance of the shadow around each panel"), + "Shadow Type", + "Appearance of the shadow around each panel", GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_NONE, flags)); @@ -153,8 +153,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_MENU, g_param_spec_object ( "menu", - _("Menu"), - _("Menu to hold panel items"), + "Menu", + "Menu to hold panel items", GTK_TYPE_MENU, G_PARAM_READWRITE)); @@ -162,8 +162,8 @@ midori_panel_class_init (MidoriPanelClass* class) PROP_PAGE, g_param_spec_int ( "page", - _("Page"), - _("The index of the current page"), + "Page", + "The index of the current page", -1, G_MAXINT, -1, flags)); } @@ -401,7 +401,7 @@ midori_panel_append_page (MidoriPanel* panel, gtk_widget_show (toolbar); gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar); - n = midori_panel_page_num (panel, child); + n = midori_panel_page_num (panel, scrolled); g_object_set_data (G_OBJECT (child), "label", (gchar*)label); @@ -421,7 +421,7 @@ midori_panel_append_page (MidoriPanel* panel, { menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_widget_show (menuitem); - g_object_set_data (G_OBJECT (menuitem), "page", child); + g_object_set_data (G_OBJECT (menuitem), "page", scrolled); g_object_set_data (G_OBJECT (menuitem), "toolitem", toolitem); g_signal_connect (menuitem, "activate", G_CALLBACK (midori_panel_menu_item_activate_cb), diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c0a84f9c..bdb28827 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -58,8 +58,8 @@ midori_preferences_class_init (MidoriPreferencesClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("Settings instance to provide properties"), + "Settings", + "Settings instance to provide properties", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_WRITABLE)); } diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index 6d08d1a6..8999c21b 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -165,8 +165,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_SEARCH_ENGINES, g_param_spec_object ( "search-engines", - _("Search Engines"), - _("The list of search engines"), + "Search Engines", + "The list of search engines", KATZE_TYPE_ARRAY, G_PARAM_READWRITE)); @@ -174,8 +174,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_CURRENT_ITEM, g_param_spec_object ( "current-item", - _("Current Item"), - _("The currently selected item"), + "Current Item", + "The currently selected item", KATZE_TYPE_ITEM, G_PARAM_READWRITE)); @@ -183,8 +183,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_TEXT, g_param_spec_string ( "text", - _("Text"), - _("The current text typed in the entry"), + "Text", + "The current text typed in the entry", NULL, G_PARAM_READWRITE)); @@ -192,8 +192,8 @@ midori_search_action_class_init (MidoriSearchActionClass* class) PROP_DIALOG, g_param_spec_object ( "dialog", - _("Dialog"), - _("A dialog to manage search engines"), + "Dialog", + "A dialog to manage search engines", GTK_TYPE_DIALOG, G_PARAM_READABLE)); } diff --git a/midori/midori-view.c b/midori/midori-view.c index 14caa14b..3149d064 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -344,8 +344,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_URI, g_param_spec_string ( "uri", - _("Uri"), - _("The URI of the currently loaded page"), + "Uri", + "The URI of the currently loaded page", "about:blank", G_PARAM_READABLE)); @@ -353,8 +353,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_TITLE, g_param_spec_string ( "title", - _("Title"), - _("The title of the currently loaded page"), + "Title", + "The title of the currently loaded page", NULL, G_PARAM_READWRITE)); @@ -362,8 +362,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_ICON, g_param_spec_object ( "icon", - _("Icon"), - _("The icon of the view"), + "Icon", + "The icon of the view", GDK_TYPE_PIXBUF, G_PARAM_READABLE)); @@ -371,8 +371,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_LOAD_STATUS, g_param_spec_enum ( "load-status", - _("Load Status"), - _("The current loading status"), + "Load Status", + "The current loading status", MIDORI_TYPE_LOAD_STATUS, MIDORI_LOAD_FINISHED, G_PARAM_READABLE)); @@ -381,8 +381,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_PROGRESS, g_param_spec_double ( "progress", - _("Progress"), - _("The current loading progress"), + "Progress", + "The current loading progress", 0.0, 1.0, 0.0, G_PARAM_READABLE)); @@ -390,8 +390,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_ZOOM_LEVEL, g_param_spec_float ( "zoom-level", - _("Zoom Level"), - _("The current zoom level"), + "Zoom Level", + "The current zoom level", G_MINFLOAT, G_MAXFLOAT, 1.0f, @@ -401,8 +401,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_STATUSBAR_TEXT, g_param_spec_string ( "statusbar-text", - _("Statusbar Text"), - _("The text displayed in the statusbar"), + "Statusbar Text", + "The text displayed in the statusbar", "", G_PARAM_READWRITE)); @@ -410,8 +410,8 @@ midori_view_class_init (MidoriViewClass* class) PROP_SETTINGS, g_param_spec_object ( "settings", - _("Settings"), - _("The associated settings"), + "Settings", + "The associated settings", MIDORI_TYPE_WEB_SETTINGS, G_PARAM_READWRITE)); }