Launchpad automatic translations update.

[odoo/odoo.git] / bin / addons / base / i18n / uk.po

diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 860af82..6f25810 100644 (file)
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,37 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:37+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:27+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:14+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:31+0000\n"
->>>>>>> MERGE-SOURCE
+"PO-Revision-Date: 2010-08-15 08:22+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"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
->>>>>>> MERGE-SOURCE
+"X-Launchpad-Export-Date: 2010-08-16 06:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base