/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
21
21
    pass
22
22
 
23
23
import gtk
24
 
import gtk.glade
25
24
import gobject
26
25
import pango
27
26
 
32
31
 
33
32
from dialog import error_dialog, question_dialog
34
33
from errors import show_bzr_error
35
 
from guifiles import GLADEFILENAME
36
34
 
37
35
class CommitDialog(gtk.Dialog):
38
36
    """ New implementation of the Commit dialog. """
82
80
        # Create the widgets
83
81
        self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
84
82
        if self._is_checkout:
85
 
            self._check_local = gtk.CheckButton(_("_Local only commit (works in checkouts)"),
 
83
            self._check_local = gtk.CheckButton(_("_Only commit locally"),
86
84
                                                use_underline=True)
87
 
        self._check_strict = gtk.CheckButton(_("_Strict commit (fails if unknown files are present)"),
 
85
        self._check_strict = gtk.CheckButton(_("_Allow unknown files"),
88
86
                                             use_underline=True)
89
 
        self._expander_files = gtk.Expander(_("Please select the file(s) to commit"))
 
87
        self._expander_files = gtk.Expander(_("File(s) to commit"))
90
88
        self._vpaned_main = gtk.VPaned()
91
89
        self._scrolledwindow_files = gtk.ScrolledWindow()
92
90
        self._scrolledwindow_message = gtk.ScrolledWindow()
93
91
        self._treeview_files = gtk.TreeView()
94
92
        self._vbox_message = gtk.VBox()
95
 
        self._label_message = gtk.Label(_("Please specify a commit message:"))
 
93
        self._label_message = gtk.Label(_("Commit message:"))
96
94
        self._textview_message = gtk.TextView()
97
95
        
98
96
        if self._is_pending:
166
164
        (model, iter) = treeselection.get_selected()
167
165
        
168
166
        if iter is not None:
169
 
            from olive import DiffWindow
 
167
            from diff import DiffWindow
170
168
            
171
169
            _selected = model.get_value(iter, 1)
172
170