Merge lp:~gergagabriel/stoqlib/translation into lp:~stoq-dev/stoqlib/master

Proposed by Gabriel Gerga
Status: Merged
Approved by: Ronaldo Maia
Approved revision: 3197
Merge reported by: Ronaldo Maia
Merged at revision: not available
Proposed branch: lp:~gergagabriel/stoqlib/translation
Merge into: lp:~stoq-dev/stoqlib/master
Diff against target: 27 lines (+3/-3)
2 files modified
stoqlib/gui/dialogs/clientcategorydialog.py (+1/-1)
stoqlib/gui/dialogs/paymentmethod.py (+2/-2)
To merge this branch: bzr merge lp:~gergagabriel/stoqlib/translation
Reviewer Review Type Date Requested Status
Ronaldo Maia Approve
Review via email: mp+33942@code.launchpad.net

Description of the change

Translations updates in admin app. (Clients categories and messages in Payment method settings - Multiple, Store Credit).

To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

certinho. pode fazer o push.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stoqlib/gui/dialogs/clientcategorydialog.py'
--- stoqlib/gui/dialogs/clientcategorydialog.py 2010-07-21 16:18:48 +0000
+++ stoqlib/gui/dialogs/clientcategorydialog.py 2010-08-27 18:22:40 +0000
@@ -45,7 +45,7 @@
4545
46 #ListDialog46 #ListDialog
47 columns = [47 columns = [
48 Column('name', title= ('Category'),48 Column('name', title= _('Category'),
49 data_type=str, expand=True, sorted=True)49 data_type=str, expand=True, sorted=True)
50 ]50 ]
5151
5252
=== modified file 'stoqlib/gui/dialogs/paymentmethod.py'
--- stoqlib/gui/dialogs/paymentmethod.py 2009-04-07 19:57:44 +0000
+++ stoqlib/gui/dialogs/paymentmethod.py 2010-08-27 18:22:40 +0000
@@ -100,8 +100,8 @@
100 'Invalid payment method adapter: %s' % (100 'Invalid payment method adapter: %s' % (
101 method.method_name,))101 method.method_name,))
102 elif dialog is NotImplementedError:102 elif dialog is NotImplementedError:
103 warning(_('Editor for %s is not implemented' % (103 warning(_('Editor for %s is not implemented') % (
104 method.method_name)))104 method.description))
105 return None105 return None
106106
107 return dialog107 return dialog

Subscribers

People subscribed via source and target branches