data/gui/roster_window.ui

@@ -3,11 +3,11 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="roster_window">
-    <property name="width_request">85</property>
+    <property name="width_request">250</property>
     <property name="height_request">200</property>
     <property name="title" translatable="yes">Gajim</property>
     <property name="role">roster</property>
-    <property name="default_width">200</property>
+    <property name="default_width">250</property>
     <property name="default_height">400</property>
     <accel-groups>
       <group name="accelgroup1"/>

debian/patches/00_debian-copying.diff

-Description: don't install useless COPYING file
-Forwarded: not-neded
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,8 +7,6 @@
- docfilesdir = $(docdir)
- docfiles_DATA = README \
- 				README.html \
--				ChangeLog \
--				COPYING \
- 				THANKS \
- 				THANKS.artists \
- 				AUTHORS 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -298,8 +298,6 @@
- docfilesdir = $(docdir)
- docfiles_DATA = README \
- 				README.html \
--				ChangeLog \
--				COPYING \
- 				THANKS \
- 				THANKS.artists \
- 				AUTHORS 

debian/patches/01_configure-ac.diff

-Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev
-Author: Yann Leboulanger <asterix@lagaule.org>
-Origin: upstream,http://hg.gajim.org/gajim/diff/252bb3cf2c59/configure.ac
-Last-Update: 2011-05-07
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,25 +36,10 @@
- AM_NLS
- 
- 
--dnl ****
--dnl pygtk and gtk+
--dnl ****
--PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
--AC_SUBST(PYGTK_CFLAGS)
--AC_SUBST(PYGTK_LIBS)
--PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
--AC_SUBST(PYGTK_DEFS)
--
--AM_PATH_PYTHON([2.5])
--if test "x$PYTHON" = "x:"; then
--	AC_MSG_ERROR([Python not found])
--fi
--
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
- AC_SUBST(ACLOCAL_AMFLAGS)
- 
--AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
--AC_SUBST([PYTHON_INCLUDES])
-+AM_PATH_PYTHON([2.5])
- 
- dnl ****
- dnl enable installation in python-2.x/site-packages/gajim

debian/patches/series

-00_debian-copying.diff
-01_configure-ac.diff

plugins/acronyms_expander/acronyms_expander.py

@@ -36,6 +36,8 @@ class AcronymsExpanderPlugin(GajimPlugin):
 
     @log_calls('AcronymsExpanderPlugin')
     def init(self):
+        self.description = _('Replaces acronyms (or other strings) '
+            'with given expansions/substitutes.')
         self.config_dialog = None
 
         self.gui_extension_points = {
@@ -44,7 +46,7 @@ class AcronymsExpanderPlugin(GajimPlugin):
         }
 
         self.config_default_values = {
-            'INVOKER': (' ', _('')),
+            'INVOKER': (' ', ''),
             'ACRONYMS': ({'RTFM': 'Read The Friendly Manual',
                           '/slap': '/me slaps',
                           'PS-': 'plug-in system',
@@ -53,7 +55,7 @@ class AcronymsExpanderPlugin(GajimPlugin):
                           'GW-': 'http://trac.gajim.org/',
                           'GTS-': 'http://trac.gajim.org/report',
                          },
-            _('')),
+            ''),
         }
 
     @log_calls('AcronymsExpanderPlugin')

plugins/banner_tweaks/plugin.py

@@ -34,7 +34,6 @@ import sys
 import gtk
 import gobject
 import message_control
-from common import i18n
 from common import gajim
 from common import helpers
 
@@ -46,6 +45,10 @@ class BannerTweaksPlugin(GajimPlugin):
 
     @log_calls('BannerTweaksPlugin')
     def init(self):
+        self.description = _('Allows user to tweak chat window banner '
+            'appearance (eg. make it compact).\n'
+            'Based on patch by pb in ticket #4133:\n'
+            'http://trac.gajim.org/attachment/ticket/4133.')
         self.config_dialog = BannerTweaksPluginConfigDialog(self)
 
         self.gui_extension_points = {
@@ -54,11 +57,11 @@ class BannerTweaksPlugin(GajimPlugin):
         }
 
         self.config_default_values = {
-            'show_banner_image': (True, _('If True, Gajim will display a status icon in the banner of chat windows.')),
-            'show_banner_online_msg': (True, _('If True, Gajim will display the status message of the contact in the banner of chat windows.')),
-            'show_banner_resource': (False, _('If True, Gajim will display the resource name of the contact in the banner of chat windows.')),
-            'banner_small_fonts': (False, _('If True, Gajim will use small fonts for contact name and resource name in the banner of chat windows.')),
-            'old_chat_avatar_height': (52, _('chat_avatar_height value before plugin was activated')),
+            'show_banner_image': (True, 'If True, Gajim will display a status icon in the banner of chat windows.'),
+            'show_banner_online_msg': (True, 'If True, Gajim will display the status message of the contact in the banner of chat windows.'),
+            'show_banner_resource': (False, 'If True, Gajim will display the resource name of the contact in the banner of chat windows.'),
+            'banner_small_fonts': (False, 'If True, Gajim will use small fonts for contact name and resource name in the banner of chat windows.'),
+            'old_chat_avatar_height': (52, 'chat_avatar_height value before plugin was activated'),
         }
 
     @log_calls('BannerTweaksPlugin')
@@ -169,7 +172,7 @@ class BannerTweaksPluginConfigDialog(GajimPluginConfigDialog):
         self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
                 'config_dialog.ui')
         self.xml = gtk.Builder()
-        self.xml.set_translation_domain(i18n.APP)
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
                 ['banner_tweaks_config_vbox'])
         self.config_vbox = self.xml.get_object('banner_tweaks_config_vbox')

plugins/dbus_plugin/plugin.py

@@ -688,6 +688,9 @@ class DBusPlugin(GajimPlugin):
 
     @log_calls('DBusPlugin')
     def init(self):
+        self.description = _('D-Bus support.'
+            ' Based on remote_control module from'
+            '\nGajim core but uses new events handling system.')
         self.config_dialog = None
         #self.gui_extension_points = {}
         #self.config_default_values = {}

plugins/events_dump/plugin.py

@@ -36,6 +36,7 @@ class EventsDumpPlugin(GajimPlugin):
 
     @log_calls('EventsDumpPlugin')
     def init(self):
+        self.description = _('Dumps info about selected events to console.')
         self.config_dialog = None
         #self.gui_extension_points = {}
         #self.config_default_values = {}

plugins/google_translation/plugin.py

@@ -44,18 +44,20 @@ class GoogleTranslationPlugin(GajimPlugin):
 
     @log_calls('GoogleTranslationPlugin')
     def init(self):
+        self.description = _('Translates (currently only incoming)'
+            'messages using Google Translate.')
         self.config_dialog = None
         #self.gui_extension_points = {}
         self.config_default_values = {
             'from_lang' :
-                (u'en', _(u'Language of text to be translated')),
+                (u'en', u'Language of text to be translated'),
             'to_lang' :
-                (u'fr', _(u'Language to which translation will be made')),
+                (u'fr', u'Language to which translation will be made'),
             'user_agent' :
                 (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) '
                 'Gecko/20080213 Firefox/2.0.0.11',
-                _(u'User Agent data to be used with urllib2 '
-                'when connecting to Google Translate service'))}
+                u'User Agent data to be used with urllib2 '
+                'when connecting to Google Translate service')}
 
         #self.events_handlers = {}
 

plugins/length_notifier/length_notifier.py

@@ -27,7 +27,6 @@ Message length notifier plugin.
 import sys
 
 import gtk
-from common import i18n
 
 from plugins import GajimPlugin
 from plugins.helpers import log, log_calls
@@ -37,6 +36,8 @@ class LengthNotifierPlugin(GajimPlugin):
 
     @log_calls('LengthNotifierPlugin')
     def init(self):
+        self.description = _('Highlights message entry field in chat window '
+            'when given length of message is exceeded.')
         self.config_dialog = LengthNotifierPluginConfigDialog(self)
 
         self.gui_extension_points = {
@@ -44,10 +45,11 @@ class LengthNotifierPlugin(GajimPlugin):
                                                   self.disconnect_from_chat_control)
         }
 
-        self.config_default_values = {'MESSAGE_WARNING_LENGTH' : (140, _('Message length at which notification is invoked.')),
-                                                                  'WARNING_COLOR' : ('#F0DB3E', _('Background color of text entry field in chat window when notification is invoked.')),
-                                                                  'JIDS' : ([], _('JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). If empty plugin is used with every JID. [not implemented]'))
-                                                                 }
+        self.config_default_values = {
+            'MESSAGE_WARNING_LENGTH' : (140, 'Message length at which notification is invoked.'),
+            'WARNING_COLOR' : ('#F0DB3E', 'Background color of text entry field in chat window when notification is invoked.'),
+            'JIDS' : ([], 'JabberIDs that plugin should be used with (eg. restrict only to one microblogging bot). If empty plugin is used with every JID. [not implemented]')
+            }
 
     @log_calls('LengthNotifierPlugin')
     def textview_length_warning(self, tb, chat_control):
@@ -112,7 +114,7 @@ class LengthNotifierPluginConfigDialog(GajimPluginConfigDialog):
         self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
                 'config_dialog.ui')
         self.xml = gtk.Builder()
-        self.xml.set_translation_domain(i18n.APP)
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
                 ['length_notifier_config_table'])
         self.config_table = self.xml.get_object('length_notifier_config_table')

plugins/new_events_example/plugin.py

@@ -41,6 +41,8 @@ class NewEventsExamplePlugin(GajimPlugin):
 
     @log_calls('NewEventsExamplePlugin')
     def init(self):
+        self.description = _('Shows how to generate new network events based '
+            'on existing one using Network Events Controller.')
         self.config_dialog = None
         #self.gui_extension_points = {}
         #self.config_default_values = {}

plugins/plugin_installer/config_dialog.ui

@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkTextBuffer" id="textbuffer1">
-    <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property>
+    <property name="text">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property>
   </object>
   <object class="GtkWindow" id="window1">
     <child>
@@ -15,18 +15,36 @@
         <property name="position">340</property>
         <property name="position_set">True</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow2">
+          <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="border_width">6</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkTreeView" id="available_treeview">
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="search_column">1</property>
+                <property name="border_width">6</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" id="available_treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="search_column">1</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressbar">
+                <property name="ellipsize">end</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -44,7 +62,7 @@
               <object class="GtkLabel" id="plugin_name_label1">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;empty&gt;</property>
+                <property name="label">&lt;empty&gt;</property>
                 <property name="selectable">True</property>
                 <property name="ellipsize">end</property>
               </object>
@@ -72,7 +90,7 @@
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="xpad">6</property>
-                    <property name="label" translatable="yes">&lt;empty&gt;</property>
+                    <property name="label">&lt;empty&gt;</property>
                     <property name="selectable">True</property>
                     <property name="ellipsize">end</property>
                   </object>
@@ -101,7 +119,7 @@
                 </child>
                 <child>
                   <object class="GtkLinkButton" id="plugin_homepage_linkbutton1">
-                    <property name="label" translatable="yes">button</property>
+                    <property name="label">button</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -176,12 +194,7 @@
               <object class="GtkHBox" id="hbox15">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkProgressBar" id="progressbar">
-                    <property name="ellipsize">end</property>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
+                  <placeholder/>
                 </child>
                 <child>
                   <object class="GtkHButtonBox" id="hbuttonbox3">

plugins/plugin_installer/plugin_installer.py

@@ -35,13 +35,13 @@ from plugins import GajimPlugin
 from plugins.helpers import log_calls, log
 from dialogs import WarningDialog, HigDialog
 from plugins.gui import GajimPluginConfigDialog
-from common import i18n
 
 
 class PluginInstaller(GajimPlugin):
 
     @log_calls('PluginInstallerPlugin')
     def init(self):
+        self.description = _('Install and upgrade plugins from ftp')
         self.config_dialog = PluginInstallerPluginConfigDialog(self)
         self.config_default_values = {'ftp_server': ('ftp.gajim.org', '')}
 
@@ -74,11 +74,11 @@ class PluginInstaller(GajimPlugin):
         self.window.connect('destroy', self.on_win_destroy)
         self.GTK_BUILDER_FILE_PATH = self.local_file_path('config_dialog.ui')
         self.xml = gtk.Builder()
-        self.xml.set_translation_domain(i18n.APP)
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['hpaned2'])
         hpaned = self.xml.get_object('hpaned2')
         self.page_num = self.notebook.append_page(hpaned,
-            gtk.Label('Available'))
+            gtk.Label(_('Available')))
 
         widgets_to_extract = ('plugin_name_label1',
         'available_treeview', 'progressbar', 'inslall_upgrade_button',
@@ -175,7 +175,7 @@ class PluginInstaller(GajimPlugin):
         for i in xrange(len(self.available_plugins_model)):
             self.available_plugins_model[i][4] = False
         self.progressbar.hide()
-        WarningDialog('Ftp error', error_text, self.window)
+        WarningDialog(_('Ftp error'), error_text, self.window)
 
     def on_plugin_downloaded(self, widget, plugin_dirs):
         for _dir in plugin_dirs:
@@ -212,7 +212,7 @@ class PluginInstaller(GajimPlugin):
                 self.installed_plugins_model.append([plugin, plugin.name,
                     is_active])
         dialog = HigDialog(None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
-            '', 'All selected plugins downloaded')
+            '', _('All selected plugins downloaded'))
         dialog.set_modal(False)
         dialog.set_transient_for(self.window)
         dialog.popup()
@@ -228,7 +228,7 @@ class PluginInstaller(GajimPlugin):
             label.set_ellipsize(pango.ELLIPSIZE_END)
             self.plugin_homepage_linkbutton1.set_property('sensitive', True)
             desc_textbuffer = self.plugin_description_textview1.get_buffer()
-            desc_textbuffer.set_text(model.get_value(iter, 5))
+            desc_textbuffer.set_text(_(model.get_value(iter, 5)))
             self.plugin_description_textview1.set_property('sensitive', True)
         else:
             self._clear_available_plugin_info()
@@ -334,7 +334,7 @@ class Ftp(threading.Thread):
     def run(self):
         try:
             gobject.idle_add(self.progressbar.set_text,
-                'Connecting to server')
+                _('Connecting to server'))
             self.ftp = ftplib.FTP(self.server)
             self.ftp.login()
             self.ftp.cwd('plugins')
@@ -342,12 +342,12 @@ class Ftp(threading.Thread):
                 self.plugins_dirs = self.ftp.nlst()
                 progress_step = 1.0 / len(self.plugins_dirs)
                 gobject.idle_add(self.progressbar.set_text,
-                    'Scan files on the server')
+                    _('Scan files on the server'))
                 for dir_ in self.plugins_dirs:
                     fract = self.progressbar.get_fraction() + progress_step
                     gobject.idle_add(self.progressbar.set_fraction, fract)
                     gobject.idle_add(self.progressbar.set_text,
-                        'Read "%s"' % dir_)
+                        _('Read "%s"') % dir_)
                     try:
                         self.ftp.retrbinary('RETR %s/manifest.ini' % dir_,
                             self.handleDownload)
@@ -378,7 +378,7 @@ class Ftp(threading.Thread):
     def download_plugin(self):
         gobject.idle_add(self.progressbar.show)
         self.pulse = gobject.timeout_add(150, self.progressbar_pulse)
-        gobject.idle_add(self.progressbar.set_text, 'Create a list of files')
+        gobject.idle_add(self.progressbar.set_text, _('Create a list of files'))
         for remote_dir in self.remote_dirs:
 
             def nlstr(dir_, subdir=None):
@@ -422,7 +422,7 @@ class Ftp(threading.Thread):
             # downloading files
             for filename in files:
                 gobject.idle_add(self.progressbar.set_text,
-                    'Downloading "%s"' % filename)
+                    _('Downloading "%s"') % filename)
                 full_filename = os.path.join(local_dir, filename)
                 try:
                     self.ftp.retrbinary('RETR /%s' % filename,
@@ -432,7 +432,8 @@ class Ftp(threading.Thread):
                     print 'ERROR: cannot read file "%s"' % filename
                     os.unlink(filename)
         self.ftp.quit()
-        self.window.emit('plugin_downloaded', self.remote_dirs)
+        gobject.idle_add(self.window.emit, 'plugin_downloaded',
+            self.remote_dirs)
         gobject.source_remove(self.pulse)
 
 
@@ -441,6 +442,7 @@ class PluginInstallerPluginConfigDialog(GajimPluginConfigDialog):
         self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
             'config_dialog.ui')
         self.xml = gtk.Builder()
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['hbox111'])
         hbox = self.xml.get_object('hbox111')
         self.child.pack_start(hbox)

plugins/roster_buttons/plugin.py

@@ -27,7 +27,6 @@ Roster buttons plug-in.
 import sys
 
 import gtk
-from common import i18n
 from common import gajim
 
 from plugins import GajimPlugin
@@ -37,6 +36,7 @@ class RosterButtonsPlugin(GajimPlugin):
 
     @log_calls('RosterButtonsPlugin')
     def init(self):
+        self.description = _('Adds quick action buttons to roster window.')
         self.GTK_BUILDER_FILE_PATH = self.local_file_path('roster_buttons.ui')
         self.roster_vbox = gajim.interface.roster.xml.get_object('roster_vbox2')
         self.show_offline_contacts_menuitem = gajim.interface.roster.xml.get_object('show_offline_contacts_menuitem')
@@ -46,7 +46,7 @@ class RosterButtonsPlugin(GajimPlugin):
     @log_calls('RosterButtonsPlugin')
     def activate(self):
         self.xml = gtk.Builder()
-        self.xml.set_translation_domain(i18n.APP)
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
                 ['roster_buttons_buttonbox'])
         self.buttonbox = self.xml.get_object('roster_buttons_buttonbox')

plugins/roster_buttons/roster_buttons.ui

@@ -10,7 +10,7 @@
         <property name="layout_style">spread</property>
         <child>
           <object class="GtkButton" id="roster_button_1">
-            <property name="label" translatable="yes">1</property>
+            <property name="label">1</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -24,7 +24,7 @@
         </child>
         <child>
           <object class="GtkButton" id="roster_button_2">
-            <property name="label" translatable="yes">2</property>
+            <property name="label">2</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -38,7 +38,7 @@
         </child>
         <child>
           <object class="GtkButton" id="roster_button_3">
-            <property name="label" translatable="yes">3</property>
+            <property name="label">3</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -52,7 +52,7 @@
         </child>
         <child>
           <object class="GtkButton" id="roster_button_4">
-            <property name="label" translatable="yes">4</property>
+            <property name="label">4</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>

plugins/snarl_notifications/plugin.py

@@ -41,6 +41,10 @@ class SnarlNotificationsPlugin(GajimPlugin):
 
     @log_calls('SnarlNotificationsPlugin')
     def init(self):
+        self.description = _('Shows events notification using Snarl '
+            '(http://www.fullphat.net/) under Windows. '
+            'Snarl needs to be installed in system.\n'
+            'PySnarl bindings are used (http://code.google.com/p/pysnarl/).')
         self.config_dialog = None
         #self.gui_extension_points = {}
         #self.config_default_values = {}

plugins/triggers/triggers.py

@@ -24,9 +24,8 @@ import sys
 
 from common import gajim
 from plugins import GajimPlugin
-from plugins.helpers import log_calls, log
+from plugins.helpers import log_calls
 from plugins.gui import GajimPluginConfigDialog
-from common import i18n
 from common import ged
 from common import helpers
 
@@ -35,10 +34,11 @@ class Triggers(GajimPlugin):
 
     @log_calls('TriggersPlugin')
     def init(self):
+        self.description = _('Configure Gajim\'s behaviour for each contact')
         self.config_dialog = TriggersPluginConfigDialog(self)
         self.config_default_values = {}
 
-        self.events_handlers = {'notification' : (ged.PREGUI, self._nec_notif),
+        self.events_handlers = {'notification': (ged.PREGUI, self._nec_notif),
             'decrypted-message-received': (ged.PREGUI2,
             self._nec_decrypted_message_received),
             'presence-received': (ged.PREGUI, self._nec_presence_received)}
@@ -222,6 +222,7 @@ class TriggersPluginConfigDialog(GajimPluginConfigDialog):
         self.GTK_BUILDER_FILE_PATH = self.plugin.local_file_path(
             'config_dialog.ui')
         self.xml = gtk.Builder()
+        self.xml.set_translation_domain('gajim_plugins')
         self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH,
             ['vbox', 'liststore1', 'liststore2'])
         vbox = self.xml.get_object('vbox')
@@ -435,7 +436,7 @@ class TriggersPluginConfigDialog(GajimPluginConfigDialog):
         while iter2:
             num = model[iter2][0]
             model[iter2][0] = num - 1
-            self.config[num-1] = self.config[num].copy()
+            self.config[num - 1] = self.config[num].copy()
             iter2 = model.iter_next(iter2)
         model.remove(iter_)
         del self.config[num]
@@ -453,7 +454,7 @@ class TriggersPluginConfigDialog(GajimPluginConfigDialog):
         self.config[self.active_num] = self.config[self.active_num - 1]
         self.config[self.active_num - 1] = conf
 
-        model[iter_][0] =self.active_num - 1
+        model[iter_][0] = self.active_num - 1
         # get previous iter
         path = model.get_path(iter_)
         iter_ = model.get_iter((path[0] - 1,))

plugins/whiteboard/plugin.py

@@ -52,6 +52,8 @@ NS_SXE = 'urn:xmpp:sxe:0'
 class WhiteboardPlugin(GajimPlugin):
     @log_calls('WhiteboardPlugin')
     def init(self):
+        self.description = _('Shows a whiteboard in chat.'
+            ' python-pygoocanvas is required.')
         self.config_dialog = None
         self.events_handlers = {
             'jingle-request-received': (ged.GUI1, self._nec_jingle_received),
@@ -118,8 +120,12 @@ class WhiteboardPlugin(GajimPlugin):
                 if control.contact.supports(NS_JINGLE_SXE) and \
                 control.contact.supports(NS_SXE):
                     base.button.set_sensitive(True)
+                    tooltip_text = _('Show whiteboard')
                 else:
                     base.button.set_sensitive(False)
+                    tooltip_text = _('Client on the other side '
+                        'does not support the whiteboard')
+                base.button.set_tooltip_text(tooltip_text)
 
     @log_calls('WhiteboardPlugin')
     def show_request_dialog(self, account, fjid, jid, sid, content_types):
@@ -265,7 +271,7 @@ class Base(object):
         self.sid = None
 
     def create_buttons(self):
-        # create juick button
+        # create whiteboard button
         actions_hbox = self.chat_control.xml.get_object('actions_hbox')
         self.button = gtk.ToggleButton(label=None, use_underline=True)
         self.button.set_property('relief', gtk.RELIEF_NONE)

plugins/whiteboard/whiteboard_widget.py

@@ -27,7 +27,6 @@ except:
     HAS_GOOCANVAS = False
 from common.xmpp import Node
 from common import gajim
-from common import i18n
 from dialogs import FileChooserDialog
 
 '''
@@ -40,7 +39,7 @@ class Whiteboard(object):
         self.plugin = plugin
         file_path = plugin.local_file_path('whiteboard_widget.ui')
         xml = gtk.Builder()
-        xml.set_translation_domain(i18n.APP)
+        xml.set_translation_domain('gajim_plugins')
         xml.add_from_file(file_path)
         self.hbox = xml.get_object('whiteboard_hbox')
         self.canevas = goocanvas.Canvas()

po/LINGUAS

@@ -31,3 +31,4 @@ da
 uk
 ja
 kk
+zh_TW