diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/note_pad | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/note_pad')
| -rw-r--r-- | addons/note_pad/i18n/pt.po | 10 | ||||
| -rw-r--r-- | addons/note_pad/note_pad.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/note_pad/i18n/pt.po b/addons/note_pad/i18n/pt.po index 159c5de738a..90416030de5 100644 --- a/addons/note_pad/i18n/pt.po +++ b/addons/note_pad/i18n/pt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2012-11-24 02:53+0000\n" -"PO-Revision-Date: 2012-12-05 09:44+0000\n" -"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n" +"PO-Revision-Date: 2012-12-17 12:46+0000\n" +"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n" "Language-Team: Portuguese <pt@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n" -"X-Generator: Launchpad (build 16341)\n" +"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n" +"X-Generator: Launchpad (build 16372)\n" #. module: note_pad #: model:ir.model,name:note_pad.model_note_note @@ -25,4 +25,4 @@ msgstr "Nota" #. module: note_pad #: field:note.note,note_pad_url:0 msgid "Pad Url" -msgstr "" +msgstr "URL" diff --git a/addons/note_pad/note_pad.py b/addons/note_pad/note_pad.py index d0c18a9f986..24157fa0c11 100644 --- a/addons/note_pad/note_pad.py +++ b/addons/note_pad/note_pad.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.osv import osv, fields -from tools.translate import _ +from openerp.tools.translate import _ class note_pad_note(osv.osv): """ memo pad """ |