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

  • Committer: Jelmer Vernooij
  • Date: 2011-04-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
merge.py
27
27
from bzrlib.branch import Branch
28
28
import bzrlib.errors as errors
29
29
 
30
 
from bzrlib.plugins.gtk import _i18n, icon_path
 
30
from bzrlib.plugins.gtk import icon_path
31
31
from bzrlib.plugins.gtk.dialog import (
32
32
    error_dialog,
33
33
    info_dialog,
34
34
    warning_dialog,
35
35
    )
36
36
from bzrlib.plugins.gtk.errors import show_bzr_error
 
37
from bzrlib.plugins.gtk.i18n import _i18n
37
38
 
38
39
 
39
40
class MergeDialog(gtk.Dialog):