Signed-off-by: Ajay Garg <a...@activitycentral.com> --- extensions/cpsection/aboutcomputer/model.py | 2 +- src/jarabe/desktop/favoritesview.py | 2 +- src/jarabe/frame/activitiestray.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py index 753055d..b65bea0 100644 --- a/extensions/cpsection/aboutcomputer/model.py +++ b/extensions/cpsection/aboutcomputer/model.py @@ -207,7 +207,7 @@ def get_wireless_firmware(): if len(firmware_info) == 1: return firmware_info.values()[0] - return ', '.join([_('%(interface)s: %(version)s') % + return ', '.join(['%(interface)s: %(version)s' % {'interface': interface, 'version': version} for interface, version in firmware_info.items()]) diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 81e32c8..e00c48d 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -338,7 +338,7 @@ class FavoritesView(hippo.Canvas): schoolserver.register_laptop() except RegisterError, e: alert.props.title = _('Registration Failed') - alert.props.msg = _('%s') % e + alert.props.msg = '%s' % e else: alert.props.title = _('Registration Successful') alert.props.msg = _('You are now registered ' \ diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 941b174..e268e07 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -541,7 +541,7 @@ class BaseTransferPalette(Palette): transferred = self._format_size( self.file_transfer.props.transferred_bytes) total = self._format_size(self.file_transfer.file_size) - self.progress_label.props.label = _('%s of %s') % (transferred, total) + self.progress_label.props.label = '%s of %s' % (transferred, total) class IncomingTransferPalette(BaseTransferPalette): @@ -555,7 +555,7 @@ class IncomingTransferPalette(BaseTransferPalette): self.file_transfer.connect('notify::state', self.__notify_state_cb) nick = str(self.file_transfer.buddy.props.nick) - label = glib.markup_escape_text(_('Transfer from %s') % (nick,)) + label = glib.markup_escape_text(_('Transfer from') + ' ' + nick) self.props.secondary_text = label self._update() @@ -589,7 +589,7 @@ class IncomingTransferPalette(BaseTransferPalette): type_description = mime.get_mime_description(mime_type) size = self._format_size(self.file_transfer.file_size) - label = gtk.Label(_('%s (%s)') % (size, type_description)) + label = gtk.Label('%s (%s)' % (size, type_description)) vbox.add(label) label.show() @@ -688,7 +688,7 @@ class OutgoingTransferPalette(BaseTransferPalette): self.file_transfer.connect('notify::state', self.__notify_state_cb) nick = str(file_transfer.buddy.props.nick) - label = glib.markup_escape_text(_('Transfer to %s') % (nick,)) + label = glib.markup_escape_text(_('Transfer to') + ' ' + nick) self.props.secondary_text = label self._update() @@ -719,7 +719,7 @@ class OutgoingTransferPalette(BaseTransferPalette): type_description = mime.get_mime_description(mime_type) size = self._format_size(self.file_transfer.file_size) - label = gtk.Label(_('%s (%s)') % (size, type_description)) + label = gtk.Label('%s (%s)' % (size, type_description)) vbox.add(label) label.show() -- 1.7.4.4 _______________________________________________ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel