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/plugin_outlook | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/plugin_outlook')
| -rw-r--r-- | addons/plugin_outlook/i18n/hr.po | 20 | ||||
| -rw-r--r-- | addons/plugin_outlook/plugin_outlook.py | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/addons/plugin_outlook/i18n/hr.po b/addons/plugin_outlook/i18n/hr.po index cbc44876222..5872c4294ac 100644 --- a/addons/plugin_outlook/i18n/hr.po +++ b/addons/plugin_outlook/i18n/hr.po @@ -8,24 +8,24 @@ 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: 2011-12-12 12:57+0000\n" -"Last-Translator: Tomislav Bosnjakovic <Unknown>\n" +"PO-Revision-Date: 2012-12-17 20:57+0000\n" +"Last-Translator: Goran Kliska <gkliska@gmail.com>\n" "Language-Team: Croatian <hr@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-11-25 06:29+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n" +"X-Generator: Launchpad (build 16372)\n" #. module: plugin_outlook #: field:outlook.installer,plugin32:0 msgid "Outlook Plug-in 32bits" -msgstr "" +msgstr "Outlook Plug-in 32bita" #. module: plugin_outlook #: view:sale.config.settings:0 msgid "Download and install the plug-in" -msgstr "" +msgstr "Preuzmi i instaliraj plug-in" #. module: plugin_outlook #: model:ir.model,name:plugin_outlook.model_outlook_installer @@ -35,7 +35,7 @@ msgstr "outlook.installer" #. module: plugin_outlook #: view:outlook.installer:0 msgid "MS .Net Framework 3.5 or above." -msgstr "" +msgstr "MS .Net Framework 3.5 ili noviji." #. module: plugin_outlook #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer @@ -43,7 +43,7 @@ msgstr "" #: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook #: view:outlook.installer:0 msgid "Install Outlook Plug-In" -msgstr "" +msgstr "Instaliraj Outlook Plug-In" #. module: plugin_outlook #: view:outlook.installer:0 @@ -70,12 +70,12 @@ msgstr "" #. module: plugin_outlook #: view:outlook.installer:0 msgid "Close" -msgstr "" +msgstr "Zatvori" #. module: plugin_outlook #: field:outlook.installer,plugin64:0 msgid "Outlook Plug-in 64bits" -msgstr "" +msgstr "Outlook Plug-in 64bita" #. module: plugin_outlook #: view:outlook.installer:0 diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index 4fc1f391fab..3210f2505ca 100644 --- a/addons/plugin_outlook/plugin_outlook.py +++ b/addons/plugin_outlook/plugin_outlook.py @@ -19,9 +19,9 @@ # ############################################################################## -from osv import fields -from osv import osv -import addons +from openerp.osv import fields +from openerp.osv import osv +from openerp import addons import base64 class outlook_installer(osv.osv_memory): |