Now unicode support for translations :)

15 files changed, 13 insertions, 15 deletions

diff --git a/portato/gui/__init__.py b/portato/gui/__init__.py
index ba7bb3e..20bcba6 100644
--- a/portato/gui/__init__.py
+++ b/portato/gui/__init__.py
@@ -12,7 +12,6 @@
 
 from __future__ import absolute_import
 
-from ..helper import _
 from .. import get_listener
 from .exception_handling import register_ex_handler
 
diff --git a/portato/gui/dialogs.py b/portato/gui/dialogs.py
index 1beb6be..0313cae 100644
--- a/portato/gui/dialogs.py
+++ b/portato/gui/dialogs.py
@@ -11,7 +11,7 @@
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
 import gtk
-from ..helper import _, error
+from ..helper import error
 
 def queue_not_empty_dialog():
 	dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_NONE, _("There are some packages in the emerge queue and/or an emerge process is running.\nDo you really want to quit?"))
diff --git a/portato/gui/exception_handling.py b/portato/gui/exception_handling.py
index 33e58ab..d8ff7ba 100644
--- a/portato/gui/exception_handling.py
+++ b/portato/gui/exception_handling.py
@@ -19,7 +19,7 @@ import sys, traceback
 from threading import Thread
 from StringIO import StringIO
 
-from ..helper import _, debug, error
+from ..helper import debug, error
 from .dialogs import file_chooser_dialog, io_ex_dialog
 
 class GtkThread (Thread):
diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index 40b765d..f203920 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -20,7 +20,7 @@ from subprocess import Popen
 # some backend things
 from .. import backend, plugin
 from ..backend import flags, system
-from ..helper import _, debug, info, send_signal_to_group, unique_array
+from ..helper import debug, info, send_signal_to_group, unique_array
 from ..waiting_queue import WaitingQueue
 from .updater import Updater
 
diff --git a/portato/gui/session.py b/portato/gui/session.py
index e356fbd..a37cd85 100644
--- a/portato/gui/session.py
+++ b/portato/gui/session.py
@@ -10,7 +10,7 @@
 #
 # Written by René 'Necoro' Neumann <necoro@necoro.net>
 
-from ..helper import _, debug
+from ..helper import debug
 
 # the current version for saved sessions
 # change this, whenever the change is incompatible with previous versions
diff --git a/portato/gui/updater.py b/portato/gui/updater.py
index d6087ee..f293fbc 100644
--- a/portato/gui/updater.py
+++ b/portato/gui/updater.py
@@ -15,7 +15,7 @@ from __future__ import absolute_import
 from ..backend import system
 
 import threading, subprocess, time
-from ..helper import _, debug, error
+from ..helper import debug, error
 
 class Updater (object):
 	"""
diff --git a/portato/gui/utils.py b/portato/gui/utils.py
index a6bd800..151ec22 100644
--- a/portato/gui/utils.py
+++ b/portato/gui/utils.py
@@ -21,7 +21,7 @@ from functools import wraps
 
 # some backend things
 from ..backend import flags, system, set_system
-from ..helper import _, debug, info, set_log_level 
+from ..helper import debug, info, set_log_level 
 from ..constants import USE_CATAPULT
 
 # parser
diff --git a/portato/gui/views.py b/portato/gui/views.py
index 41e6ae5..bd98ad8 100644
--- a/portato/gui/views.py
+++ b/portato/gui/views.py
@@ -17,7 +17,7 @@ import pango
 import gtksourceview2
 import logging
 
-from ..helper import _, warning
+from ..helper import warning
 
 class LazyView (object):
 	def __init__ (self):
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 14a0181..32b6660 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -23,7 +23,7 @@ import itertools as itt
 # our backend stuff
 from ...backend import flags, system # must be the first to avoid circular deps
 from ... import get_listener, plugin, dependency
-from ...helper import debug, warning, error, info, unique_array, N_, _
+from ...helper import debug, warning, error, info, unique_array
 from ...session import Session
 from ...constants import CONFIG_LOCATION, VERSION, APP_ICON
 from ...backend.exceptions import PackageNotFoundException, BlockedException
diff --git a/portato/gui/windows/plugin.py b/portato/gui/windows/plugin.py
index 672bff5..fb9446e 100644
--- a/portato/gui/windows/plugin.py
+++ b/portato/gui/windows/plugin.py
@@ -15,7 +15,7 @@ from __future__ import absolute_import
 import gtk
 
 from .basic import AbstractDialog
-from ...helper import _, debug
+from ...helper import debug
 
 class PluginWindow (AbstractDialog):
 	
diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py
index 41db921..991e7b3 100644
--- a/portato/gui/windows/preference.py
+++ b/portato/gui/windows/preference.py
@@ -16,7 +16,7 @@ import gtk
 
 from .basic import AbstractDialog
 from ..dialogs import io_ex_dialog
-from ...helper import _, debug
+from ...helper import debug
 
 class PreferenceWindow (AbstractDialog):
 	"""Window displaying some preferences."""
diff --git a/portato/gui/windows/search.py b/portato/gui/windows/search.py
index 6e34a0e..e776dd1 100644
--- a/portato/gui/windows/search.py
+++ b/portato/gui/windows/search.py
@@ -14,7 +14,7 @@ from __future__ import absolute_import
 
 import gtk
 from .basic import AbstractDialog
-from ...helper import _, debug
+from ...helper import debug
 
 class SearchWindow (AbstractDialog):
 	"""A window showing the results of a search process."""
diff --git a/portato/gui/windows/splash.py b/portato/gui/windows/splash.py
index 52c2543..df19a9b 100644
--- a/portato/gui/windows/splash.py
+++ b/portato/gui/windows/splash.py
@@ -15,7 +15,6 @@ from __future__ import absolute_import
 import gtk
 
 from .basic import Window
-from ...helper import _
 from ...constants import VERSION, APP_ICON
 
 class SplashScreen (Window):
diff --git a/portato/gui/windows/update.py b/portato/gui/windows/update.py
index 8e4fad1..e369c49 100644
--- a/portato/gui/windows/update.py
+++ b/portato/gui/windows/update.py
@@ -17,7 +17,7 @@ from .basic import AbstractDialog
 from ..dialogs import unmask_dialog, blocked_dialog
 from ...backend import system
 from ...backend.exceptions import PackageNotFoundException, BlockedException
-from ...helper import _, debug
+from ...helper import debug
 
 class UpdateWindow (AbstractDialog):
 
diff --git a/portato/gui/wrapper.py b/portato/gui/wrapper.py
index 8be3b6a..2c492d4 100644
--- a/portato/gui/wrapper.py
+++ b/portato/gui/wrapper.py
@@ -13,7 +13,7 @@
 from __future__ import absolute_import
 
 import vte
-from ..helper import _,debug
+from ..helper import debug
 
 class GtkTree (object):
 	"""The implementation of the abstract tree."""