/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 conflicts.py

  • Committer: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
29
29
from bzrlib.plugins.gtk import _i18n
30
30
 
31
31
from dialog import error_dialog, warning_dialog
32
 
from errors import show_bzr_error
 
32
 
33
33
 
34
34
class ConflictsDialog(gtk.Dialog):
35
35
    """ This dialog displays the list of conflicts. """
 
36
 
36
37
    def __init__(self, wt, parent=None):
37
38
        """ Initialize the Conflicts dialog. """
38
39
        gtk.Dialog.__init__(self, title="Conflicts - Olive",