diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-09-14 15:24:41 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-09-14 15:24:41 +0530 |
| commit | 58cfff7027a3537fcb78f7a754d87c19a31299c9 (patch) | |
| tree | 0f42075395af7d868b7f0994526cfe7a5051dab2 /addons/analytic_user_function | |
| parent | f9dd99169d569ebe2b710bf4f4305ff55293eb14 (diff) | |
| parent | 91e1d6b44548673d8649ce768ba9a0768d4b04a2 (diff) | |
[MERGE] Merged after remove conflicts
bzr revid: hmo@tinyerp.com-20100914095441-8y5erodnlhpka4cx
Diffstat (limited to 'addons/analytic_user_function')
| -rw-r--r-- | addons/analytic_user_function/i18n/nl.po | 10 | ||||
| -rw-r--r-- | addons/analytic_user_function/i18n/tr.po | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po index bfaf43f6394..19d3aee77a5 100644 --- a/addons/analytic_user_function/i18n/nl.po +++ b/addons/analytic_user_function/i18n/nl.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 02:55+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-09-02 07:26+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Ongeldige XML voor overzicht" +msgstr "Ongeldige XML, kan overzicht niet weergeven!" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid @@ -52,7 +52,7 @@ msgstr "Gebruiker" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index 679e2dcda69..aa1d0d99ee5 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-30 08:12+0000\n" +"PO-Revision-Date: 2010-09-08 09:03+0000\n" "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-31 03:58+0000\n" +"X-Launchpad-Export-Date: 2010-09-09 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function |