← Back to branch summary

~ubuntu-branches/ubuntu/utopic/nautilus/utopic-proposed

« back to all changes in this revision

Viewing changes to src/nautilus-mime-actions.c

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
https://launchpad.net/bugs/1272602
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nautilus-mime-actions.c
645
645
        
646
646
        if (!can_trash) {
647
647
                eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING,
648
 
                                       prompt, detail, GTK_STOCK_CANCEL, NULL);
 
648
                                       prompt, detail, _("_Cancel"), NULL);
649
649
                goto out;
650
650
        }
651
651
 
652
 
        dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
 
652
        dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), _("_Cancel"),
653
653
                                         parent_window);
654
654
 
655
655
        gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
720
720
                                             _("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
721
721
                                             _("_Display"), RESPONSE_DISPLAY,
722
722
                                             parent_window);
723
 
        gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 
723
        gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL);
724
724
        gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
725
725
        gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
726
726
        gtk_widget_show (GTK_WIDGET (dialog));
1063
1063
                                                   "This will open %d separate windows.", count), count);
1064
1064
        }
1065
1065
        dialog = eel_show_yes_no_dialog (prompt, detail, 
1066
 
                                         GTK_STOCK_OK, GTK_STOCK_CANCEL,
 
1066
                                         _("_OK"), _("_Cancel"),
1067
1067
                                         parent_window);
1068
1068
        g_free (detail);
1069
1069
 
1240
1240
 
1241
1241
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Select Application"), GTK_RESPONSE_ACCEPT);
1242
1242
 
1243
 
        gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
 
1243
        gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_OK);
1244
1244
 
1245
1245
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
1246
1246
 
1571
1571
                }
1572
1572
                */
1573
1573
                gtk_dialog_add_button (GTK_DIALOG (dialog),
1574
 
                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 
1574
                                       _("_Cancel"), GTK_RESPONSE_CANCEL);
1575
1575
                gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
1576
1576
 
1577
1577
                g_signal_connect (dialog, "response",
1795
1795
                detail = g_strdup_printf (ngettext ("This will open %d separate application.",
1796
1796
                                                    "This will open %d separate applications.", num_apps), num_apps);
1797
1797
                dialog = eel_show_yes_no_dialog (prompt, detail,
1798
 
                                                 GTK_STOCK_OK, GTK_STOCK_CANCEL,
 
1798
                                                 _("_OK"), _("_Cancel"),
1799
1799
                                                 parameters->parent_window);
1800
1800
                g_free (detail);
1801
1801