Move gettext, ngettext and sgettext calls into the new ggettext module. All of them return unicode all of the time.

svn: r14091

src/Merge/_MergePerson.py

@@ -33,7 +33,7 @@ import pango
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 import gen.lib
 from ReportBase import ReportUtils
 from gen.display.name import displayer as name_displayer

src/Merge/_MergePlace.py

@@ -40,7 +40,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
 import ManagedWindow

src/Merge/_MergeSource.py

@@ -38,7 +38,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from TransUtils import sgettext as _
+from gen.ggettext import sgettext as _
 import const
 import GrampsDisplay
 import ManagedWindow