Merge lp:~openerp-dev/openobject-addons/6.1-opw-578575-dhs into lp:openobject-addons/6.1

Proposed by Dhruti Shastri(OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6969
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-578575-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 27 lines (+8/-1)
2 files modified
anonymization/anonymization.py (+1/-1)
anonymization/i18n/nl.po (+7/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-578575-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+122034@code.launchpad.net

Description of the change

Translation are missing for string,

"Before executing the anonymization process, you should make a backup of your database."

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-578575-port-mma/+merge/135090 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6969. By Dhruti Shastri(OpenERP)

[Anonymization] : Added missing translation (case:578575)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'anonymization/anonymization.py'
2--- anonymization/anonymization.py 2012-04-25 07:26:17 +0000
3+++ anonymization/anonymization.py 2012-08-30 11:08:20 +0000
4@@ -283,7 +283,7 @@
5 res['name'] = '.pickle'
6 res['summary'] = self._get_summary_value(cr, uid, context)
7 res['state'] = self._get_state_value(cr, uid, context)
8- res['msg'] = """Before executing the anonymization process, you should make a backup of your database."""
9+ res['msg'] = _("""Before executing the anonymization process, you should make a backup of your database.""")
10
11 return res
12
13
14=== modified file 'anonymization/i18n/nl.po'
15--- anonymization/i18n/nl.po 2012-08-29 05:31:33 +0000
16+++ anonymization/i18n/nl.po 2012-08-30 11:08:20 +0000
17@@ -213,3 +213,10 @@
18 msgstr ""
19 "Het is niet toegestaan om twee velden met dezelfde naam van hetzelfde object "
20 "te hebben!"
21+
22+#. module: anonymization
23+#: code:addons/anonymization/anonymization.py:286
24+#, python-format
25+msgid"""Before executing the anonymization process, you should make a backup of your database."""
26+msgstr"""Voor het uitvoeren van het anoniem start, moet u een back-up van uw database."""
27+