[gedit-plugins] Use the right gettext domain.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit d6c1d1ab377a4eb40715a8ab7cd4d7689c98112d
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Jan 19 12:39:15 2011 +0100

    Use the right gettext domain.

 plugins/charmap/charmap/__init__.py     |    8 ++++++++
 plugins/colorpicker/colorpicker.py      |    2 +-
 plugins/joinlines/joinlines.py          |    3 +--
 plugins/multiedit/multiedit/__init__.py |    9 +++++++--
 plugins/synctex/synctex/synctex.py      |   10 ++++++++--
 plugins/terminal/terminal.py            |    5 +----
 plugins/textsize/textsize/__init__.py   |    9 ++++++++-
 7 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
index b97d524..70e4afd 100644
--- a/plugins/charmap/charmap/__init__.py
+++ b/plugins/charmap/charmap/__init__.py
@@ -20,6 +20,14 @@
 from gi.repository import GObject, Gio, Pango, Gtk, Gedit, Gucharmap
 from panel import CharmapPanel
 import sys
+import gettext
+from gpdefs import *
+
+try:
+    gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
+    _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
+except:
+    _ = lambda s: s
 
 class CharmapPlugin(GObject.Object, Gedit.WindowActivatable):
     __gtype_name__ = "CharmapPlugin"
diff --git a/plugins/colorpicker/colorpicker.py b/plugins/colorpicker/colorpicker.py
index 29e28b2..0e341ca 100644
--- a/plugins/colorpicker/colorpicker.py
+++ b/plugins/colorpicker/colorpicker.py
@@ -20,8 +20,8 @@
 #  Boston, MA 02111-1307, USA.
 
 from gi.repository import GObject, Gtk, Gedit
-import gettext
 import re
+import gettext
 from gpdefs import *
 
 try:
diff --git a/plugins/joinlines/joinlines.py b/plugins/joinlines/joinlines.py
index 2d7a50e..01c4a97 100644
--- a/plugins/joinlines/joinlines.py
+++ b/plugins/joinlines/joinlines.py
@@ -21,15 +21,14 @@
 
 from gi.repository import GObject, Gtk, Gedit
 import gettext
+from gpdefs import *
 
 try:
-    from gpdefs import *
     gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
     _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s)
 except:
     _ = lambda s: s
 
-
 ui_str = """
 <ui>
   <menubar name="MenuBar">
diff --git a/plugins/multiedit/multiedit/__init__.py b/plugins/multiedit/multiedit/__init__.py
index 4c588b1..de0dcb9 100644
--- a/plugins/multiedit/multiedit/__init__.py
+++ b/plugins/multiedit/multiedit/__init__.py
@@ -19,14 +19,19 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330,
 #  Boston, MA 02111-1307, USA.
 
-from gettext import gettext as _
 from gi.repository import GObject, Gtk, Gedit
 import constants
 from signals import Signals
 from documenthelper import DocumentHelper
-
+import gettext
 from gpdefs import *
 
+try:
+    gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
+    _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
+except:
+    _ = lambda s: s
+
 ui_str = """
 <ui>
   <menubar name="MenuBar">
diff --git a/plugins/synctex/synctex/synctex.py b/plugins/synctex/synctex/synctex.py
index a588f4d..1590387 100644
--- a/plugins/synctex/synctex/synctex.py
+++ b/plugins/synctex/synctex/synctex.py
@@ -20,13 +20,19 @@
 #  Boston, MA 02111-1307, USA.
 
 from gi.repository import GObject, Gtk, Gedit, Peas, PeasGtk, Gio, Gdk
-from gettext import gettext as _
 from evince_dbus import EvinceWindowProxy
 import dbus.mainloop.glib
 import logging
+import gettext
+from gpdefs import *
 
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+try:
+    gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
+    _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
+except:
+    _ = lambda s: s
 
+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 ui_str = """<ui>
   <menubar name="MenuBar">
diff --git a/plugins/terminal/terminal.py b/plugins/terminal/terminal.py
index 8f9dbfd..2bc026b 100644
--- a/plugins/terminal/terminal.py
+++ b/plugins/terminal/terminal.py
@@ -21,10 +21,8 @@
 # Boston, MA  02110-1301  USA
 
 from gi.repository import GObject, GLib, Gio, Pango, Gdk, Gtk, Gedit, Vte
-import gettext
 import os
-
-"""
+import gettext
 from gpdefs import *
 
 try:
@@ -32,7 +30,6 @@ try:
     _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
 except:
     _ = lambda s: s
-"""
 
 class GeditTerminal(Gtk.Box):
     """VTE terminal which follows gnome-terminal default profile options"""
diff --git a/plugins/textsize/textsize/__init__.py b/plugins/textsize/textsize/__init__.py
index 5582f06..f2348d9 100644
--- a/plugins/textsize/textsize/__init__.py
+++ b/plugins/textsize/textsize/__init__.py
@@ -22,10 +22,17 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330,
 #  Boston, MA 02111-1307, USA.
 
-from gettext import gettext as _
 from gi.repository import GObject, Gtk, Gdk, Gedit
 import constants
 from documenthelper import DocumentHelper
+import gettext
+from gpdefs import *
+
+try:
+    gettext.bindtextdomain(GETTEXT_PACKAGE, GP_LOCALEDIR)
+    _ = lambda s: gettext.dgettext(GETTEXT_PACKAGE, s);
+except:
+    _ = lambda s: s
 
 # UI manager snippet to add menu items to the View menu
 ui_str = """