From d288cb0a40402ce983bd7acb58501114ad17a718 Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@activitycentral.com>
Date: Thu, 19 Jan 2012 20:24:23 +0530
Subject: [PATCH 5/5] sl#3149: Localization fixes.
Organization: Sugar Labs Foundation
Signed-off-by: Ajay Garg <ajay@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
|
b
|
def get_wireless_firmware(): |
207 | 207 | if len(firmware_info) == 1: |
208 | 208 | return firmware_info.values()[0] |
209 | 209 | |
210 | | return ', '.join([_('%(interface)s: %(version)s') % |
| 210 | return ', '.join(['%(interface)s: %(version)s' % |
211 | 211 | {'interface': interface, 'version': version} |
212 | 212 | for interface, version in firmware_info.items()]) |
213 | 213 | |
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 81e32c8..e00c48d 100644
a
|
b
|
class FavoritesView(hippo.Canvas): |
338 | 338 | schoolserver.register_laptop() |
339 | 339 | except RegisterError, e: |
340 | 340 | alert.props.title = _('Registration Failed') |
341 | | alert.props.msg = _('%s') % e |
| 341 | alert.props.msg = '%s' % e |
342 | 342 | else: |
343 | 343 | alert.props.title = _('Registration Successful') |
344 | 344 | 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
|
b
|
class BaseTransferPalette(Palette): |
541 | 541 | transferred = self._format_size( |
542 | 542 | self.file_transfer.props.transferred_bytes) |
543 | 543 | total = self._format_size(self.file_transfer.file_size) |
544 | | self.progress_label.props.label = _('%s of %s') % (transferred, total) |
| 544 | self.progress_label.props.label = '%s of %s' % (transferred, total) |
545 | 545 | |
546 | 546 | |
547 | 547 | class IncomingTransferPalette(BaseTransferPalette): |
… |
… |
class IncomingTransferPalette(BaseTransferPalette): |
555 | 555 | self.file_transfer.connect('notify::state', self.__notify_state_cb) |
556 | 556 | |
557 | 557 | nick = str(self.file_transfer.buddy.props.nick) |
558 | | label = glib.markup_escape_text(_('Transfer from %s') % (nick,)) |
| 558 | label = glib.markup_escape_text(_('Transfer from') + ' ' + nick) |
559 | 559 | self.props.secondary_text = label |
560 | 560 | |
561 | 561 | self._update() |
… |
… |
class IncomingTransferPalette(BaseTransferPalette): |
589 | 589 | type_description = mime.get_mime_description(mime_type) |
590 | 590 | |
591 | 591 | size = self._format_size(self.file_transfer.file_size) |
592 | | label = gtk.Label(_('%s (%s)') % (size, type_description)) |
| 592 | label = gtk.Label('%s (%s)' % (size, type_description)) |
593 | 593 | vbox.add(label) |
594 | 594 | label.show() |
595 | 595 | |
… |
… |
class OutgoingTransferPalette(BaseTransferPalette): |
688 | 688 | self.file_transfer.connect('notify::state', self.__notify_state_cb) |
689 | 689 | |
690 | 690 | nick = str(file_transfer.buddy.props.nick) |
691 | | label = glib.markup_escape_text(_('Transfer to %s') % (nick,)) |
| 691 | label = glib.markup_escape_text(_('Transfer to') + ' ' + nick) |
692 | 692 | self.props.secondary_text = label |
693 | 693 | |
694 | 694 | self._update() |
… |
… |
class OutgoingTransferPalette(BaseTransferPalette): |
719 | 719 | type_description = mime.get_mime_description(mime_type) |
720 | 720 | |
721 | 721 | size = self._format_size(self.file_transfer.file_size) |
722 | | label = gtk.Label(_('%s (%s)') % (size, type_description)) |
| 722 | label = gtk.Label('%s (%s)' % (size, type_description)) |
723 | 723 | vbox.add(label) |
724 | 724 | label.show() |
725 | 725 | |