ERP5Workflow: revert some changes again

product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -35,9 +35,6 @@
  <portal_type id="Extension Component">
   <item>SortIndex</item>
  </portal_type>
- <portal_type id="Preference">
-  <item>TelephonePreference</item>
- </portal_type>
  <portal_type id="Property Existence Constraint">
   <item>ConstraintType</item>
  </portal_type>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_checkNamingConventions.py

@@ -10,15 +10,15 @@
 # - Check script names (from skin folders and workflows).
 import re
 ABBREVIATION_WORD_SET = ((
-  "BBAN", "BIC", "BOM", "BT", "BT5", "CAD", "CRM", "CSS", "CSV", "CTX", "DMS", "DNS",
+  "BBAN", "BIC", "BOM", "CAD", "CRM", "CSS", "CSV", "CTX", "DMS", "DNS",
   "EAN", "ERP5", "FAX", "GAP", "GID", "GPG", "HTML", "HTTP", "IBAN", "ID",
   "IMAP", "IP", "KM", "MIME", "MRP", "NVP", "ODT", "PDF", "PDM", "PO",
   "RAM", "RSS", "SMS", "SOAP", "SQL", "SVN", "TALES", "TCP", "TSV", "UBM",
-  "UID", "UNG", "UOM", "URI", "URL", "VADS", "VAT", "VCS", "VPN", "XML", "ZODB",
+  "UID", "UOM", "URI", "URL", "VADS", "VAT", "VCS", "VPN", "XML", "ZODB",
 ))
 
 # List of words that do not need to be titlecased
-LOWERCASE_WORD_SET = set(('g', 'cm', 'kg', '%', '/', '...', 'm', '-', 'g/m2', 'iCalendar', 'm³', 'kB', 's', ))
+LOWERCASE_WORD_SET = set(('g', 'cm', 'kg', '%', '/', '...', 'm', '-', 'g/m2', 'iCalendar', 'm³', 'kB'))
 
 # List of words that should not be modified
 SPECIALCASE_WORD_SET = set(("ChangeLog", "EGov", "iCal", "included",
@@ -42,7 +42,6 @@ CLOSED_CLASS_WORD_LIST = """
   well what whatever when where whereas whether which while whilst who whoever
   whom whose with within without worth would yes you your yours yourself
   """.split()
-
 CLOSED_CLASS_WORD_SET = set(CLOSED_CLASS_WORD_LIST)
 assert len(CLOSED_CLASS_WORD_SET) == len(CLOSED_CLASS_WORD_LIST)
 SENTENCE_PART_LIST = (