--- a/devtools/devctl.py	Tue Jan 26 20:27:48 2010 +0100
+++ b/devtools/devctl.py	Tue Jan 26 20:28:56 2010 +0100
@@ -164,9 +164,7 @@
                             eschema, rschema, role, tschema)):
                     add_msg(w, 'add a %s' % tschema,
                             'inlined:%s.%s.%s' % (etype, rschema, role))
-                    add_msg(w, 'remove this %s' % tschema,
-                            'inlined:%s.%s.%s' % (etype, rschema, role))
-                    add_msg(w, 'This %s' % tschema,
+                    add_msg(w, str(tschema),
                             'inlined:%s.%s.%s' % (etype, rschema, role))
                 if appearsin_addmenu.etype_get(eschema, rschema, role, tschema) and \
                        (libconfig is None or not

--- a/web/views/editforms.py	Tue Jan 26 20:27:48 2010 +0100
+++ b/web/views/editforms.py	Tue Jan 26 20:28:56 2010 +0100
@@ -564,7 +564,7 @@
             counter=self._cw.data[countkey] , **kwargs))
 
     def form_title(self, entity, i18nctx):
-        return self._cw.pgettext(i18nctx, 'This %s' % entity.e_schema)
+        return self._cw.pgettext(i18nctx, entity.__regid__)
 
     def add_hiddens(self, form, entity):
         """to ease overriding (see cubes.vcsfile.views.forms for instance)"""

--- a/web/views/formrenderers.py	Tue Jan 26 20:27:48 2010 +0100
+++ b/web/views/formrenderers.py	Tue Jan 26 20:28:56 2010 +0100
@@ -412,8 +412,7 @@
                 values['divid'], self._cw._('click on the box to cancel the deletion')))
         w(u'<div class="iformBody">')
         eschema = form.edited_entity.e_schema
-        ctx = values.pop('i18nctx')
-        values['removemsg'] = self._cw.pgettext(ctx, 'remove this %s' % eschema)
+        values['removemsg'] = self._cw._('remove-inlined-entity-form')
         w(u'<div class="iformTitle"><span>%(title)s</span> '
           '#<span class="icounter">%(counter)s</span> '
           '[<a href="javascript: %(removejs)s;noop();">%(removemsg)s</a>]</div>'