Fix missed renaming of install to activate (take II)

issue1456

trytond/convert.py

@@ -587,7 +587,7 @@ class TrytondXmlHandler(sax.handler.ContentHandler):
             if module == self.module and fs_id in self.to_delete:
                 self.to_delete.remove(fs_id)
 
-            if self.noupdate and self.module_state != 'to install':
+            if self.noupdate and self.module_state != 'to activate':
                 return
 
             # this record is already in the db:

trytond/modules/__init__.py

@@ -231,8 +231,8 @@ def load_module_graph(graph, pool, update=None, lang=None):
             package_state = module2state.get(module, 'not activated')
             if (is_module_to_install(module, update)
                     or (update
-                        and package_state in ('to install', 'to upgrade'))):
-                if package_state not in ('to install', 'to upgrade'):
+                        and package_state in ('to activate', 'to upgrade'))):
+                if package_state not in ('to activate', 'to upgrade'):
                     if package_state == 'activated':
                         package_state = 'to upgrade'
                     elif package_state != 'to remove':