diff --git a/src/common/exceptions.py b/src/common/exceptions.py index dc5327757..86eb85e23 100644 --- a/src/common/exceptions.py +++ b/src/common/exceptions.py @@ -32,10 +32,7 @@ class PysqliteNotAvailable(Exception): Exception.__init__(self) def __str__(self): - return _('pysqlite2 (aka python-pysqlite2) dependency is missing. '\ - 'After you install pysqlite3, if you want to migrate your logs '\ - 'to the new database, please read: http://trac.gajim.org/wiki/MigrateLogToDot9DB '\ - 'Exiting...') + return _('pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting...') class ServiceNotAvailable(Exception): '''This exception is raised when we cannot use Gajim remotely''' diff --git a/src/gajim.py b/src/gajim.py index 8ad5ecd57..e5ea10a43 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -59,7 +59,7 @@ except ImportError: if os.name == 'nt': sectext = _('Please remove your current GTK+ runtime and install the latest stable version from %s') % 'http://gladewin32.sourceforge.net' else: - sectext = _('Please make sure that gtk and pygtk have libglade support in your system.') + sectext = _('Please make sure that GTK+ and PyGTK have libglade support in your system.') try: from common import check_paths diff --git a/src/groupchat_window.py b/src/groupchat_window.py index 90dc68641..99e61f87e 100644 --- a/src/groupchat_window.py +++ b/src/groupchat_window.py @@ -951,7 +951,7 @@ class GroupchatWindow(chat.Chat): self.get_command_help(command) else: self.print_conversation( - _('No such command: /%s (if you want to sent this prefix it with /say)') % command, + _('No such command: /%s (if you want to send this, prefix it with /say)') % command, room_jid) return # don't print the command diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 983969c26..3fd950ca6 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -9100,7 +9100,7 @@ Custom True True - False + True 0 @@ -9146,7 +9146,7 @@ Custom - + True 0.5 0.5 @@ -9158,13 +9158,13 @@ Custom 0 - + True False 2 - + True gtk-find 4 @@ -9181,9 +9181,9 @@ Custom - + True - Search + Search True False GTK_JUSTIFY_LEFT