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

Various string changes and additions

Browse source
This commit is contained in:
Christian Dywan 2009-01-04 19:21:25 +01:00
parent ef57dfb594
commit 6bb3fb442e
8 changed files with 417 additions and 358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/main.c
View file

@ -1881,7 +1881,7 @@ main (int argc,
{ "version", 'V', 0, G_OPTION_ARG_NONE, &version, { "version", 'V', 0, G_OPTION_ARG_NONE, &version,
N_("Display program version"), NULL }, N_("Display program version"), NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris,
N_("URIs"), NULL }, N_("Addresses"), NULL },
{ NULL } { NULL }
}; };
GString* error_messages; GString* error_messages;
@ -1913,7 +1913,7 @@ main (int argc,
version = FALSE; version = FALSE;
uris = NULL; uris = NULL;
error = NULL; error = NULL;
if (!gtk_init_with_args (&argc, &argv, _("[URIs]"), entries, if (!gtk_init_with_args (&argc, &argv, _("[Addresses]"), entries,
GETTEXT_PACKAGE, &error)) GETTEXT_PACKAGE, &error))
{ {
g_print ("%s - %s\n", _("Midori"), error->message); g_print ("%s - %s\n", _("Midori"), error->message);

7
midori/midori-browser.c
View file

@ -557,7 +557,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
{ {
hbox = gtk_hbox_new (FALSE, 8); hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
label = gtk_label_new_with_mnemonic (_("_URL:")); label = gtk_label_new_with_mnemonic (_("_Address:"));
gtk_size_group_add_widget (sizegroup, label); gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_uri = gtk_entry_new (); entry_uri = gtk_entry_new ();
@ -579,7 +579,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
gtk_size_group_add_widget (sizegroup, label); gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
combo_folder = gtk_combo_box_new_text (); combo_folder = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), _("Root")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder),
_("Toplevel folder"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0); gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0);
if ((n = katze_array_get_length (browser->bookmarks))) if ((n = katze_array_get_length (browser->bookmarks)))
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
@ -615,7 +616,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
gtk_entry_get_text (GTK_ENTRY (entry_uri))); gtk_entry_get_text (GTK_ENTRY (entry_uri)));
selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder));
if (g_strcmp0 (selected, _("Root"))) if (g_strcmp0 (selected, _("Toplevel folder")))
{ {
treeview = GTK_TREE_VIEW (browser->panel_bookmarks); treeview = GTK_TREE_VIEW (browser->panel_bookmarks);
treemodel = gtk_tree_view_get_model (treeview); treemodel = gtk_tree_view_get_model (treeview);

16
midori/midori-preferences.c
View file

@ -423,11 +423,13 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
button = katze_property_proxy (settings, "default-font-family", "font"); button = katze_property_proxy (settings, "default-font-family", "font");
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
entry = katze_property_proxy (settings, "default-font-size", NULL); entry = katze_property_proxy (settings, "default-font-size", NULL);
gtk_widget_set_tooltip_text (entry, _("The default font size used to display text"));
gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4); gtk_box_pack_end (GTK_BOX (hbox), entry, FALSE, FALSE, 4);
FILLED_ADD (hbox, 1, 2, 0, 1); FILLED_ADD (hbox, 1, 2, 0, 1);
label = gtk_label_new (_("Minimum Font Size")); label = gtk_label_new (_("Minimum Font Size"));
INDENTED_ADD (label, 0, 1, 1, 2); INDENTED_ADD (label, 0, 1, 1, 2);
entry = katze_property_proxy (settings, "minimum-font-size", NULL); entry = katze_property_proxy (settings, "minimum-font-size", NULL);
gtk_widget_set_tooltip_text (entry, _("The minimum font size used to display text"));
INDENTED_ADD (entry, 1, 2, 1, 2); INDENTED_ADD (entry, 1, 2, 1, 2);
label = katze_property_label (settings, "preferred-encoding"); label = katze_property_label (settings, "preferred-encoding");
INDENTED_ADD (label, 0, 1, 2, 3); INDENTED_ADD (label, 0, 1, 2, 3);
@ -449,27 +451,35 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
TABLE_NEW (6, 2); TABLE_NEW (6, 2);
button = katze_property_proxy (settings, "auto-load-images", NULL); button = katze_property_proxy (settings, "auto-load-images", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically")); gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically"));
gtk_widget_set_tooltip_text (button, _("Load and display images automatically"));
INDENTED_ADD (button, 0, 1, 0, 1); INDENTED_ADD (button, 0, 1, 0, 1);
button = katze_property_proxy (settings, "auto-shrink-images", NULL); button = katze_property_proxy (settings, "auto-shrink-images", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically")); gtk_button_set_label (GTK_BUTTON (button), _("Shrink images automatically"));
gtk_widget_set_tooltip_text (button, _("Automatically shrink standalone images to fit"));
SPANNED_ADD (button, 1, 2, 0, 1); SPANNED_ADD (button, 1, 2, 0, 1);
button = katze_property_proxy (settings, "print-backgrounds", NULL); button = katze_property_proxy (settings, "print-backgrounds", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Print background images")); gtk_button_set_label (GTK_BUTTON (button), _("Print background images"));
gtk_widget_set_tooltip_text (button, _("Whether background images should be printed"));
INDENTED_ADD (button, 0, 1, 1, 2); INDENTED_ADD (button, 0, 1, 1, 2);
button = katze_property_proxy (settings, "resizable-text-areas", NULL); button = katze_property_proxy (settings, "resizable-text-areas", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Resizable text areas")); gtk_button_set_label (GTK_BUTTON (button), _("Resizable text areas"));
gtk_widget_set_tooltip_text (button, _("Whether text areas are resizable"));
SPANNED_ADD (button, 1, 2, 1, 2); SPANNED_ADD (button, 1, 2, 1, 2);
button = katze_property_proxy (settings, "enable-scripts", NULL); button = katze_property_proxy (settings, "enable-scripts", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts")); gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
gtk_widget_set_tooltip_text (button, _("Enable embedded scripting languages"));
INDENTED_ADD (button, 0, 1, 2, 3); INDENTED_ADD (button, 0, 1, 2, 3);
button = katze_property_proxy (settings, "enable-plugins", NULL); button = katze_property_proxy (settings, "enable-plugins", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins")); gtk_button_set_label (GTK_BUTTON (button), _("Enable plugins"));
gtk_widget_set_tooltip_text (button, _("Enable embedded plugin objects"));
SPANNED_ADD (button, 1, 2, 2, 3); SPANNED_ADD (button, 1, 2, 2, 3);
button = katze_property_proxy (settings, "enforce-96-dpi", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch"));
gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI"));
SPANNED_ADD (button, 0, 1, 3, 4);
button = katze_property_proxy (settings, "enable-developer-extras", NULL); button = katze_property_proxy (settings, "enable-developer-extras", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools"));
SPANNED_ADD (button, 0, 1, 3, 4); gtk_widget_set_tooltip_text (button, _("Enable special extensions for developers"));
button = katze_property_proxy (settings, "enforce-96-dpi", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 DPI"));
SPANNED_ADD (button, 1, 2, 3, 4); SPANNED_ADD (button, 1, 2, 3, 4);
label = katze_property_label (settings, "location-entry-search"); label = katze_property_label (settings, "location-entry-search");
INDENTED_ADD (label, 0, 1, 4, 5); INDENTED_ADD (label, 0, 1, 4, 5);

2
midori/midori-searchaction.c
View file

@ -879,7 +879,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action,
hbox = gtk_hbox_new (FALSE, 8); hbox = gtk_hbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
label = gtk_label_new_with_mnemonic (_("_URL:")); label = gtk_label_new_with_mnemonic (_("_Address:"));
gtk_size_group_add_widget (sizegroup, label); gtk_size_group_add_widget (sizegroup, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_uri = gtk_entry_new (); entry_uri = gtk_entry_new ();

2
midori/midori-view.c
View file

@ -1031,7 +1031,7 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view,
&& !strchr (view->selected_text, ' ')) && !strchr (view->selected_text, ' '))
{ {
menuitem = gtk_image_menu_item_new_with_mnemonic ( menuitem = gtk_image_menu_item_new_with_mnemonic (
_("Open URL in New _Tab")); _("Open Address in New _Tab"));
icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO,
GTK_ICON_SIZE_MENU); GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), icon);

7
midori/midori-websettings.c
View file

@ -514,7 +514,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
g_param_spec_boolean ( g_param_spec_boolean (
"middle-click-opens-selection", "middle-click-opens-selection",
_("Middle click opens Selection"), _("Middle click opens Selection"),
_("Load an URL from the selection via middle click"), _("Load an address from the selection via middle click"),
FALSE, FALSE,
flags)); flags));
@ -656,8 +656,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
PROP_HTTP_PROXY, PROP_HTTP_PROXY,
g_param_spec_string ( g_param_spec_string (
"http-proxy", "http-proxy",
_("HTTP Proxy"), _("Proxy Server"),
_("The proxy used for HTTP connections"), _("The proxy server used for HTTP connections"),
NULL, NULL,
#if HAVE_LIBSOUP #if HAVE_LIBSOUP
G_PARAM_READWRITE)); G_PARAM_READWRITE));
@ -676,6 +676,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
PROP_IDENTIFY_AS, PROP_IDENTIFY_AS,
g_param_spec_enum ( g_param_spec_enum (
"identify-as", "identify-as",
/* i18n: This refers to an application, not the 'user agent' string */
_("Identify as"), _("Identify as"),
_("What to identify as to web pages"), _("What to identify as to web pages"),
MIDORI_TYPE_IDENTITY, MIDORI_TYPE_IDENTITY,

1
midori/sokoke.c
View file

@ -342,6 +342,7 @@ sokoke_superuser_warning_new (void)
hbox = gtk_event_box_new (); hbox = gtk_event_box_new ();
gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL,
&hbox->style->bg[GTK_STATE_SELECTED]); &hbox->style->bg[GTK_STATE_SELECTED]);
/* i18n: A superuser, or system administrator, may not be 'root' */
label = gtk_label_new (_("Warning: You are using a superuser account!")); label = gtk_label_new (_("Warning: You are using a superuser account!"));
gtk_misc_set_padding (GTK_MISC (label), 0, 2); gtk_misc_set_padding (GTK_MISC (label), 0, 2);
gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL, gtk_widget_modify_fg (GTK_WIDGET (label), GTK_STATE_NORMAL,

736
po/midori.pot
View file

File diff suppressed because it is too large Load diff