merged with trunk

bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv

20 files changed, 3 insertions, 3 deletions

diff --git a/addons/base_synchro/__init__.py b/addons/base_synchro/__init__.py
index c23ec3f2246..c23ec3f2246 100644..100755
--- a/addons/base_synchro/__init__.py
+++ b/addons/base_synchro/__init__.py
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index 3bb46827d68..3bb46827d68 100644..100755
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 39cd7a700e6..39cd7a700e6 100644..100755
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
diff --git a/addons/base_synchro/i18n/de.po b/addons/base_synchro/i18n/de.po
index d5ddf158876..75dea07f52f 100644..100755
--- a/addons/base_synchro/i18n/de.po
+++ b/addons/base_synchro/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:47+0000\n"
+"PO-Revision-Date: 2010-12-28 11:14+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
@@ -170,7 +170,7 @@ msgstr "Synchronisierte Instanzen"
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
diff --git a/addons/base_synchro/i18n/el.po b/addons/base_synchro/i18n/el.po
index 1561d021d88..1561d021d88 100644..100755
--- a/addons/base_synchro/i18n/el.po
+++ b/addons/base_synchro/i18n/el.po
diff --git a/addons/base_synchro/i18n/es.po b/addons/base_synchro/i18n/es.po
index 4d9393d0d18..4d9393d0d18 100644..100755
--- a/addons/base_synchro/i18n/es.po
+++ b/addons/base_synchro/i18n/es.po
diff --git a/addons/base_synchro/i18n/fr.po b/addons/base_synchro/i18n/fr.po
index 893adfd7b63..893adfd7b63 100644..100755
--- a/addons/base_synchro/i18n/fr.po
+++ b/addons/base_synchro/i18n/fr.po
diff --git a/addons/base_synchro/i18n/it.po b/addons/base_synchro/i18n/it.po
index 7fa8abf987d..7fa8abf987d 100644..100755
--- a/addons/base_synchro/i18n/it.po
+++ b/addons/base_synchro/i18n/it.po
diff --git a/addons/base_synchro/i18n/nl.po b/addons/base_synchro/i18n/nl.po
index 2bfee879f10..2bfee879f10 100644..100755
--- a/addons/base_synchro/i18n/nl.po
+++ b/addons/base_synchro/i18n/nl.po
diff --git a/addons/base_synchro/i18n/pt.po b/addons/base_synchro/i18n/pt.po
index a0ec0760407..a0ec0760407 100644..100755
--- a/addons/base_synchro/i18n/pt.po
+++ b/addons/base_synchro/i18n/pt.po
diff --git a/addons/base_synchro/i18n/pt_BR.po b/addons/base_synchro/i18n/pt_BR.po
index d8ec835079d..d8ec835079d 100644..100755
--- a/addons/base_synchro/i18n/pt_BR.po
+++ b/addons/base_synchro/i18n/pt_BR.po
diff --git a/addons/base_synchro/i18n/ru.po b/addons/base_synchro/i18n/ru.po
index 50f6ac4a16d..50f6ac4a16d 100644..100755
--- a/addons/base_synchro/i18n/ru.po
+++ b/addons/base_synchro/i18n/ru.po
diff --git a/addons/base_synchro/i18n/sr.po b/addons/base_synchro/i18n/sr.po
index 0e4e091709d..0e4e091709d 100644..100755
--- a/addons/base_synchro/i18n/sr.po
+++ b/addons/base_synchro/i18n/sr.po
diff --git a/addons/base_synchro/i18n/sr@latin.po b/addons/base_synchro/i18n/sr@latin.po
index 43b77c45da9..43b77c45da9 100644..100755
--- a/addons/base_synchro/i18n/sr@latin.po
+++ b/addons/base_synchro/i18n/sr@latin.po
diff --git a/addons/base_synchro/i18n/sv.po b/addons/base_synchro/i18n/sv.po
index 9664e5dd648..9664e5dd648 100644..100755
--- a/addons/base_synchro/i18n/sv.po
+++ b/addons/base_synchro/i18n/sv.po
diff --git a/addons/base_synchro/i18n/zh_CN.po b/addons/base_synchro/i18n/zh_CN.po
index 389241f53fe..389241f53fe 100644..100755
--- a/addons/base_synchro/i18n/zh_CN.po
+++ b/addons/base_synchro/i18n/zh_CN.po
diff --git a/addons/base_synchro/security/ir.model.access.csv b/addons/base_synchro/security/ir.model.access.csv
index fa0f00e8ccd..fa0f00e8ccd 100644..100755
--- a/addons/base_synchro/security/ir.model.access.csv
+++ b/addons/base_synchro/security/ir.model.access.csv
diff --git a/addons/base_synchro/wizard/__init__.py b/addons/base_synchro/wizard/__init__.py
index 3deff83f9e3..3deff83f9e3 100644..100755
--- a/addons/base_synchro/wizard/__init__.py
+++ b/addons/base_synchro/wizard/__init__.py
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
index d3c1de40d6d..d3c1de40d6d 100644..100755
--- a/addons/base_synchro/wizard/base_synchro.py
+++ b/addons/base_synchro/wizard/base_synchro.py
diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
index c0c140f3791..c0c140f3791 100644..100755
--- a/addons/base_synchro/wizard/base_synchro_view.xml
+++ b/addons/base_synchro/wizard/base_synchro_view.xml