diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-07 11:38:02 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-07 11:38:02 +0200 |
| commit | 063d5693a1cc20cbc56a2691c53ab5d3d6fdb223 (patch) | |
| tree | b314a6c77cf807809619b918a91fb8c05e456404 /addons/analytic_user_function/i18n/sr@latin.po | |
| parent | c3d3d2683c879ce952555ff2648af041dc67325f (diff) | |
| parent | 3cfd65b43d53a37664752b949e6e98e19e57092e (diff) | |
[MERGE] mail.alias implementation + mrp.repair improvement + placeholders review + misc bits
Attempt to fix previous fp-style merge breaking weeks
of history. Unfortunately this one will swallow a few
extra merges on top of the mail.alias merge, as well
as a few odd commits
bzr revid: odo@openerp.com-20120807093802-f20mfq8a42rp84wp
Diffstat (limited to 'addons/analytic_user_function/i18n/sr@latin.po')
| -rw-r--r-- | addons/analytic_user_function/i18n/sr@latin.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po index 3a81c6a192d..5f5ab37eb2f 100644 --- a/addons/analytic_user_function/i18n/sr@latin.po +++ b/addons/analytic_user_function/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:11+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n" +"X-Generator: Launchpad (build 15745)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 |