Marguerite Su 2013-10-23 08:43:30 +00:00 committed by Git OBS Bridge
parent 5def89ba9d
commit 4856ad8658

View File

@ -26,7 +26,7 @@ Index: nemo-2.0.1/eel/eel-stock-dialogs.c
/* Put up the timed wait window. */
- button = wait->cancel_callback != NULL ? GTK_STOCK_CANCEL : GTK_STOCK_OK;
+ button = wait->cancel_callback != NULL ? _("_Cancel") : _("_OK")
+ button = wait->cancel_callback != NULL ? _("_Cancel") : _("_OK");
dialog = GTK_DIALOG (gtk_message_dialog_new (wait->parent_window,
0,
GTK_MESSAGE_INFO,
@ -487,3 +487,179 @@ Index: nemo-2.0.1/libnemo-private/nemo-file-operations.c
NULL);
} else {
response = 0;
Index: nemo-2.0.1/libnemo-private/nemo-desktop-link-monitor.c
===================================================================
--- nemo-2.0.1.orig/libnemo-private/nemo-desktop-link-monitor.c
+++ nemo-2.0.1/libnemo-private/nemo-desktop-link-monitor.c
@@ -101,7 +101,7 @@ volume_delete_dialog (GtkWidget *parent_
dialog_str,
_("If you want to eject the volume, please use \"Eject\" in the "
"popup menu of the volume."),
- GTK_STOCK_OK, NULL);
+ _("_OK"), NULL);
} else {
eel_run_simple_dialog
(parent_view,
@@ -110,7 +110,7 @@ volume_delete_dialog (GtkWidget *parent_
dialog_str,
_("If you want to unmount the volume, please use \"Unmount Volume\" in the "
"popup menu of the volume."),
- GTK_STOCK_OK, NULL);
+ _("_OK"), NULL);
}
g_object_unref (mount);
Index: nemo-2.0.1/src/nemo-mime-actions.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-mime-actions.c
+++ nemo-2.0.1/src/nemo-mime-actions.c
@@ -672,11 +672,11 @@ report_broken_symbolic_link (GtkWindow *
if (nemo_file_is_in_trash (file)) {
eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING,
- prompt, detail, GTK_STOCK_CANCEL, NULL);
+ prompt, detail, _("_Cancel"), NULL);
goto out;
}
- dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
+ dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), _("_Cancel"),
parent_window);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
@@ -747,7 +747,7 @@ get_executable_text_file_action (GtkWind
_("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
_("_Display"), RESPONSE_DISPLAY,
parent_window);
- gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
gtk_widget_show (GTK_WIDGET (dialog));
@@ -1080,7 +1080,7 @@ confirm_multiple_windows (GtkWindow *par
"This will open %d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parent_window);
g_free (detail);
@@ -1177,9 +1177,9 @@ run_open_with_dialog (ActivateParameters
dialog = gtk_dialog_new_with_buttons (_("Open with"),
params->parent_window,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK,
NULL);
@@ -1269,7 +1269,7 @@ application_unhandled_uri (ActivateParam
}
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
g_signal_connect (dialog, "response",
@@ -1365,7 +1365,7 @@ activate_desktop_file (ActivateParameter
}
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
g_signal_connect (dialog, "response",
@@ -1590,7 +1590,7 @@ activate_files (ActivateParameters *para
detail = g_strdup_printf (ngettext ("This will open %d separate application.",
"This will open %d separate applications.", num_apps), num_apps);
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parameters->parent_window);
g_free (detail);
Index: nemo-2.0.1/src/nemo-places-sidebar.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-places-sidebar.c
+++ nemo-2.0.1/src/nemo-places-sidebar.c
@@ -295,7 +295,7 @@ get_eject_icon (NemoPlacesSidebar *sideb
GtkIconSet *icon_set;
gtk_style_context_set_state (style, GTK_STATE_FLAG_NORMAL);
- icon_set = gtk_style_context_lookup_icon_set (style, GTK_STOCK_MISSING_IMAGE);
+ icon_set = gtk_style_context_lookup_icon_set (style, "image-missing");
eject = gtk_icon_set_render_icon_pixbuf (icon_set, style, GTK_ICON_SIZE_MENU);
}
@@ -3110,7 +3110,7 @@ bookmarks_build_popup_menu (NemoPlacesSi
item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU));
g_signal_connect (item, "activate",
G_CALLBACK (open_shortcut_cb), sidebar);
gtk_widget_show (item);
@@ -3146,7 +3146,7 @@ bookmarks_build_popup_menu (NemoPlacesSi
item = gtk_image_menu_item_new_with_label (_("Remove"));
sidebar->popup_menu_remove_item = item;
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU));
g_signal_connect (item, "activate",
G_CALLBACK (remove_shortcut_cb), sidebar);
gtk_widget_show (item);
Index: nemo-2.0.1/src/nemo-tree-sidebar.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-tree-sidebar.c
+++ nemo-2.0.1/src/nemo-tree-sidebar.c
@@ -1248,7 +1248,7 @@ create_popup_menu (FMTreeView *view)
/* add the "open" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
+ menu_image = gtk_image_new_from_icon_name ("document-open",
GTK_ICON_SIZE_MENU);
gtk_widget_show (menu_image);
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
@@ -1303,8 +1303,7 @@ create_popup_menu (FMTreeView *view)
eel_gtk_menu_append_separator (GTK_MENU (popup));
/* add the "cut folder" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CUT, NULL);
- g_signal_connect (menu_item, "activate",
+ g_signal_connect (_("Cu_t"), "activate",
G_CALLBACK (fm_tree_view_cut_cb),
view);
gtk_widget_show (menu_item);
@@ -1312,8 +1311,7 @@ create_popup_menu (FMTreeView *view)
view->details->popup_cut = menu_item;
/* add the "copy folder" menu item */
- menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
- g_signal_connect (menu_item, "activate",
+ g_signal_connect (_("_Copy"), "activate",
G_CALLBACK (fm_tree_view_copy_cb),
view);
gtk_widget_show (menu_item);
@@ -1321,13 +1319,7 @@ create_popup_menu (FMTreeView *view)
view->details->popup_copy = menu_item;
/* add the "paste files into folder" menu item */
- menu_image = gtk_image_new_from_stock (GTK_STOCK_PASTE,
- GTK_ICON_SIZE_MENU);
- gtk_widget_show (menu_image);
- menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
- menu_image);
- g_signal_connect (menu_item, "activate",
+ g_signal_connect (_("_Paste Into Folder"), "activate",
G_CALLBACK (fm_tree_view_paste_cb),
view);
gtk_widget_show (menu_item);