[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/locales/ Merged all translations with i18nmergeall.py

Mon Jul 19 09:40:28 EDT 2004

Log message for revision 26626:
  Merged all translations with i18nmergeall.py
  


Changed:
  U   Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po


-=-
Modified: Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po
===================================================================

--- Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po	2004-07-19 13:39:42 UTC (rev 26625)
+++ Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po	2004-07-19 13:40:28 UTC (rev 26626)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zope\n"
-"POT-Creation-Date: Fri Jun 18 17:40:55 2004\n"
+"POT-Creation-Date: Mon Jul 19 17:08:59 2004\n"
 "PO-Revision-Date: 2004-07-07 10:43-0400\n"
 "Last-Translator: Stephan Richter <stephan.richter at tufts.edu>\n"
 "Language-Team: German <zope3-dev at zope.org>\n"
@@ -16,25 +16,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: src/zope/app/adapter/adapter.py:283
+#: src/zope/app/adapter/adapter.py:285
 #: src/zope/app/presentation/pagefolder.py:54
 #: src/zope/app/presentation/presentation.py:290
 msgid "For interface"
 msgstr "Gegebenes Interface"
 
-#: src/zope/app/adapter/adapter.py:284
+#: src/zope/app/adapter/adapter.py:286
 msgid "The interface of the objects being adapted"
 msgstr "Das Interface des adaptierten Objektes"
 
-#: src/zope/app/adapter/adapter.py:289 src/zope/app/utility/interfaces.py:48
+#: src/zope/app/adapter/adapter.py:291 src/zope/app/utility/interfaces.py:48
 msgid "Provided interface"
 msgstr "Bereitgestelltes Interface"
 
-#: src/zope/app/adapter/adapter.py:290
+#: src/zope/app/adapter/adapter.py:292
 msgid "The interface provided"
 msgstr "Das bereitgestellte Interface"
 
-#: src/zope/app/adapter/adapter.py:296 src/zope/app/site/interfaces.py:162
+#: src/zope/app/adapter/adapter.py:298 src/zope/app/site/interfaces.py:162
 #: src/zope/app/site/browser/tool.pt:40
 #: src/zope/app/schema/browser/schema_edit.pt:36
 #: src/zope/app/workflow/browser/instancecontainer_index.pt:19
@@ -44,15 +44,15 @@
 msgid "Name"
 msgstr "Name"
 
-#: src/zope/app/adapter/adapter.py:302
+#: src/zope/app/adapter/adapter.py:304
 msgid "The dotted name of a factory for creating the adapter"
 msgstr "Der gepunktete Name der Fabrik, die den Adapter erzeugt"
 
-#: src/zope/app/adapter/adapter.py:308
+#: src/zope/app/adapter/adapter.py:310
 msgid "The permission required for use"
 msgstr "Die zur Verwendung benÃ¶tigte Berechtigung"
 
-#: src/zope/app/adapter/adapter.py:315
+#: src/zope/app/adapter/adapter.py:317
 msgid "Factory to be called to construct the component"
 msgstr "Aufzurufende Fabrik um die Komponente zu erzeugen"
 
@@ -132,21 +132,25 @@
 msgstr "Zope 3 API Doku"
 
 # Default: "Bases"
-#: src/zope/app/apidoc/classmodule/__init__.py:511
-#: src/zope/app/apidoc/ifacemodule/index.pt:264
+#: src/zope/app/apidoc/classmodule/__init__.py:545
+#: src/zope/app/apidoc/ifacemodule/index.pt:265
 msgid "Classes"
 msgstr "Klassen"
 
-#: src/zope/app/apidoc/classmodule/__init__.py:549
+#: src/zope/app/apidoc/classmodule/__init__.py:583
 msgid "Zope 3 root."
 msgstr "Zope 3 Wurzel"
 
-#: src/zope/app/apidoc/classmodule/browser.py:410
-#: src/zope/app/rotterdam/template.pt:104
+#: src/zope/app/apidoc/classmodule/browser.py:675
+#: src/zope/app/rotterdam/template.pt:102
 msgid "[top]"
 msgstr "[oben]"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:140
+#: src/zope/app/apidoc/classmodule/class_index.pt:102
+msgid "There are no attributes in this class."
+msgstr "Es gibt keine Attribute in dieser Klasse."
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:144
 msgid "There are no methods in this class."
 msgstr "Diese Klasse hat keine Methoden."
 
@@ -155,37 +159,49 @@
 msgid "Bases"
 msgstr "Basen"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:30
+#: src/zope/app/apidoc/classmodule/class_index.pt:34
 #: src/zope/app/apidoc/ifacemodule/index.pt:40
 msgid "There are no base classes."
 msgstr "Es gibt keine Basisklassen."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:35
+#: src/zope/app/apidoc/classmodule/class_index.pt:39
 msgid "Implemented Interfaces"
 msgstr "Implementierte Interfaces:"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:50
+#: src/zope/app/apidoc/classmodule/class_index.pt:54
 msgid "There are no implemented interfaces."
 msgstr "Es gibt keine implementierten Interfaces."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:56
+#: src/zope/app/apidoc/classmodule/class_index.pt:60
 msgid "Attributes/Properties"
 msgstr "Attribute/Eigenschaften"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:89
-#: src/zope/app/apidoc/classmodule/class_index.pt:131
+#: src/zope/app/apidoc/classmodule/class_index.pt:73
+#: src/zope/app/apidoc/classmodule/function_index.pt:40
+#: src/zope/app/apidoc/classmodule/function_index.pt:44
+msgid "type:"
+msgstr "Typ:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:79
+#: src/zope/app/apidoc/classmodule/function_index.pt:51
+msgid "Value:"
+msgstr "Wert:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:91
+#: src/zope/app/apidoc/classmodule/class_index.pt:133
+msgid "Permissions:"
+msgstr "Berechtigungen:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:93
+#: src/zope/app/apidoc/classmodule/class_index.pt:135
 msgid "(read)"
 msgstr "(lesbar)"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:91
-#: src/zope/app/apidoc/classmodule/class_index.pt:133
+#: src/zope/app/apidoc/classmodule/class_index.pt:95
+#: src/zope/app/apidoc/classmodule/class_index.pt:137
 msgid "(write)"
 msgstr "(schreibbar)"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:98
-msgid "There are no attributes in this class."
-msgstr "Es gibt keine Attribute in dieser Klasse."
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:18
 msgid "Documentation String"
 msgstr "Dokumentations-String"
@@ -194,17 +210,6 @@
 msgid "Attributes"
 msgstr "Attribute"
 
-#: src/zope/app/apidoc/classmodule/function_index.pt:40
-#: src/zope/app/apidoc/classmodule/function_index.pt:44
-#: src/zope/app/apidoc/classmodule/class_index.pt:69
-msgid "type:"
-msgstr "Typ:"
-
-#: src/zope/app/apidoc/classmodule/function_index.pt:51
-#: src/zope/app/apidoc/classmodule/class_index.pt:75
-msgid "Value:"
-msgstr "Wert:"
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:9
 msgid "Signature"
 msgstr "Signatur"
@@ -230,82 +235,82 @@
 msgid "Zope 3 Class Browser"
 msgstr "Zope 3 Klassen-Browser"
 
-#: src/zope/app/apidoc/ifacemodule/__init__.py:73
+#: src/zope/app/apidoc/ifacemodule/__init__.py:75
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:158
+#: src/zope/app/apidoc/ifacemodule/browser.py:199
 msgid "required"
 msgstr "notwendig"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:160
+#: src/zope/app/apidoc/ifacemodule/browser.py:201
 msgid "optional"
 msgstr "optional"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:100
+#: src/zope/app/apidoc/ifacemodule/index.pt:101
 msgid "There are no methods specified."
 msgstr "Es wurden keine Methoden angegeben."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:107
+#: src/zope/app/apidoc/ifacemodule/index.pt:108
 msgid "Adapters"
 msgstr "Adapter"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:113
+#: src/zope/app/apidoc/ifacemodule/index.pt:114
 msgid "Adapters where this interface is required:"
 msgstr "Adapter, fÃ¼r welche dieses Interface notwendig ist:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:126
-#: src/zope/app/apidoc/ifacemodule/index.pt:167
+#: src/zope/app/apidoc/ifacemodule/index.pt:127
+#: src/zope/app/apidoc/ifacemodule/index.pt:168
 msgid "name:"
 msgstr "Name:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:131
+#: src/zope/app/apidoc/ifacemodule/index.pt:132
 msgid "provides:"
 msgstr "liefert:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:137
+#: src/zope/app/apidoc/ifacemodule/index.pt:138
 msgid "also required:"
 msgstr "Auch notwendig:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:154
+#: src/zope/app/apidoc/ifacemodule/index.pt:155
 msgid "Adapters that provide this interface:"
 msgstr "Adapter, die dieses Interface liefern:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:171
+#: src/zope/app/apidoc/ifacemodule/index.pt:172
 msgid "requires:"
 msgstr "Notwendig:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:178
+#: src/zope/app/apidoc/ifacemodule/index.pt:179
 msgid "No interface required."
 msgstr "Kein Interface notwendig."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:189
+#: src/zope/app/apidoc/ifacemodule/index.pt:190
 msgid "There are no adapters registered for this interface."
 msgstr "Es gibt keine registrierten Adapter fÃ¼r dieses Interface."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:199
+#: src/zope/app/apidoc/ifacemodule/index.pt:200
 msgid "Other Information"
 msgstr "Weitere Informationen"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:204
+#: src/zope/app/apidoc/ifacemodule/index.pt:205
 msgid "Factories"
 msgstr "Fabriken"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:206
+#: src/zope/app/apidoc/ifacemodule/index.pt:207
 msgid "A list of factories that create objects implement this interface."
 msgstr ""
 "Eine Liste von Fabriken, die solche Objekte erstellen, die dieses Interface "
 "liefern."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:224
+#: src/zope/app/apidoc/ifacemodule/index.pt:225
 msgid "A list of utilities that are are registered to provide this interface."
 msgstr "Eine Liste registrierter Werkzeuge, welche dieses Interface liefern."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:235
+#: src/zope/app/apidoc/ifacemodule/index.pt:236
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:249
+#: src/zope/app/apidoc/ifacemodule/index.pt:250
 msgid ""
 "A list of services (usually just one) that are are registered to provide "
 "this interface."
@@ -313,7 +318,7 @@
 "Eine Liste von registrierten Diensten (Ã¼blicherweise nur einer), die dieses "
 "Interface liefern."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:266
+#: src/zope/app/apidoc/ifacemodule/index.pt:267
 msgid ""
 "A list of classes that implement this interface. This might duplicate the "
 "entries in Utilities and Services."
@@ -329,15 +334,15 @@
 "Anmerkung: Dies sind nur Interfaces, die mit dem Interfacedienst registriert "
 "sind."
 
-#: src/zope/app/apidoc/servicemodule/__init__.py:73
+#: src/zope/app/apidoc/servicemodule/__init__.py:75
 #: src/zope/app/site/browser/configure.zcml:87
-#: src/zope/app/zopetop/widget_macros.pt:34
+#: src/zope/app/zopetop/widget_macros.pt:54
 msgid "Services"
 msgstr "Dienste"
 
 #: src/zope/app/apidoc/servicemodule/index.pt:17
-#: src/zope/app/apidoc/classmodule/class_index.pt:79
-#: src/zope/app/apidoc/classmodule/class_index.pt:120
+#: src/zope/app/apidoc/classmodule/class_index.pt:83
+#: src/zope/app/apidoc/classmodule/class_index.pt:124
 msgid "Interface:"
 msgstr "Interface:"
 
@@ -349,15 +354,15 @@
 
 #: src/zope/app/apidoc/servicemodule/index.pt:55
 #: src/zope/app/apidoc/utilitymodule/index.pt:61
-#: src/zope/app/apidoc/ifacemodule/index.pt:77
+#: src/zope/app/apidoc/ifacemodule/index.pt:78
 msgid "There are no attributes or fields specified."
 msgstr "Es wurden keine Attribute oder Felder angegeben."
 
 # Default: "Methods"
 #: src/zope/app/apidoc/servicemodule/index.pt:62
 #: src/zope/app/apidoc/utilitymodule/index.pt:68
-#: src/zope/app/apidoc/classmodule/class_index.pt:104
-#: src/zope/app/apidoc/ifacemodule/index.pt:84
+#: src/zope/app/apidoc/classmodule/class_index.pt:108
+#: src/zope/app/apidoc/ifacemodule/index.pt:85
 msgid "Methods"
 msgstr "Methoden"
 
@@ -374,14 +379,14 @@
 msgid "This is a list of all available services by name."
 msgstr "Dies ist eine Liste aller Dienstnamen."
 
-#: src/zope/app/apidoc/utilities.py:254 src/zope/app/apidoc/utilities.py:256
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:55
+#: src/zope/app/apidoc/utilities.py:233 src/zope/app/apidoc/utilities.py:235
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:58
 msgid "n/a"
 msgstr "entfÃ¤llt"
 
-#: src/zope/app/apidoc/utilitymodule/__init__.py:132
+#: src/zope/app/apidoc/utilitymodule/__init__.py:129
 #: src/zope/app/utility/browser/configure.zcml:31
-#: src/zope/app/apidoc/ifacemodule/index.pt:222
+#: src/zope/app/apidoc/ifacemodule/index.pt:223
 msgid "Utilities"
 msgstr "Werkzeuge"
 
@@ -394,12 +399,12 @@
 msgid "(Attribute)"
 msgstr "(Attribut)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:200
-#: src/zope/app/apidoc/viewmodule/__init__.py:262
+#: src/zope/app/apidoc/viewmodule/__init__.py:201
+#: src/zope/app/apidoc/viewmodule/__init__.py:263
 msgid "$file (line $line)"
 msgstr "$file (Zeile $line)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:64
+#: src/zope/app/apidoc/viewmodule/__init__.py:65
 msgid "Presentations"
 msgstr "PrÃ¤sentationen"
 
@@ -432,12 +437,11 @@
 msgstr "Ansichten fÃ¼r"
 
 #: src/zope/app/apidoc/viewmodule/index.pt:77
-#: src/zope/app/apidoc/classmodule/class_index.pt:87
-#: src/zope/app/apidoc/classmodule/class_index.pt:129
-msgid "Permissions:"
+#, fuzzy
+msgid "Permission:"
 msgstr "Berechtigungen:"
 
-#: src/zope/app/apidoc/viewmodule/index.pt:90
+#: src/zope/app/apidoc/viewmodule/index.pt:89
 msgid "There are no views for this interface and presentation type."
 msgstr "Es gibt keine Ansichten fÃ¼r dieses Interface und PrÃ¤sentationstyp."
 
@@ -484,7 +488,7 @@
 "Themen und Ebenen zeigt die Dokumentation die Datei und Zeilennummer in "
 "welcher das Thema oder die Ebene definiert wurde."
 
-#: src/zope/app/apidoc/zcmlmodule/__init__.py:190
+#: src/zope/app/apidoc/zcmlmodule/__init__.py:192
 msgid "ZCML Reference"
 msgstr "ZCML-Referenz"
 
@@ -514,7 +518,7 @@
 msgstr "Schema"
 
 #: src/zope/app/apidoc/zcmlmodule/index.pt:68
-#: src/zope/app/apidoc/ifacemodule/index.pt:69
+#: src/zope/app/apidoc/ifacemodule/index.pt:70
 msgid "default"
 msgstr "voreingestellt"
 
@@ -528,7 +532,8 @@
 msgstr "Unterdirektiven"
 
 #: src/zope/app/apidoc/zcmlmodule/menu.pt:4
-msgid "Namespaces that are not full URLs start with \"http://namespaces.zope.org\"."
+msgid ""
+"Namespaces that are not full URLs start with \"http://namespaces.zope.org\"."
 msgstr ""
 "NamensrÃ¤ume, die nicht als volle URIs angegeben sind, starten mit \"http://"
 "namespaces.zope.org\"."
@@ -589,11 +594,11 @@
 msgid "Python path"
 msgstr "Python Pfad"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:44
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:47
 msgid "${days} day(s) ${hours}:${minutes}:${seconds}"
 msgstr "${days} Tag(e) ${hours}:${minutes}:${seconds}"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:65
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:68
 msgid "Could not retrieve runtime information."
 msgstr "Die Laufzeitinformationen konnten nicht ermittelt werden."
 
@@ -602,7 +607,8 @@
 msgstr "Sekunden"
 
 #: src/zope/app/applicationcontrol/browser/server-control.pt:13
-msgid "If you specify a time of 0 seconds, then the server will do a hard shutdown."
+msgid ""
+"If you specify a time of 0 seconds, then the server will do a hard shutdown."
 msgstr ""
 "Wenn Sie eine Zeit von 0 Sekunden eingeben, dann wird der Server sofort "
 "angehalten (hard shutdown)."
@@ -623,11 +629,11 @@
 msgid "Shutdown time:"
 msgstr "Shutdown-Zeit:"
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:32
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:34
 msgid "You restarted the server."
 msgstr "Sie haben den Server neugestartet."
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:35
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:37
 msgid "You shut down the server."
 msgstr "Sie haben den Server heruntergefahren."
 
@@ -643,7 +649,7 @@
 msgid "reload-button"
 msgstr "Aktualisieren"
 
-#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:49
+#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:51
 msgid "Message Catalog successfully reloaded."
 msgstr "Nachrichtenkatalog erfolgreich neu geladen."
 
@@ -671,20 +677,20 @@
 msgid "Name of database: ${name}"
 msgstr "Name der Datenbank: ${name}"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:31
-#: src/zope/app/size/__init__.py:52
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:33
+#: src/zope/app/size/__init__.py:50
 msgid "${size} MB"
 msgstr "${size} MB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:34
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:36
 msgid "${size} kB"
 msgstr "${size} kB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:37
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:39
 msgid "${size} Bytes"
 msgstr "${size} Bytes"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:50
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:52
 msgid "ZODB successfully packed."
 msgstr "ZODB erfolgreich gepackt."
 
@@ -696,15 +702,15 @@
 msgid "Broken object"
 msgstr "Kaputtes Objekt"
 
-#: src/zope/app/bundle/browser/__init__.py:112
+#: src/zope/app/bundle/browser/__init__.py:114
 msgid "Activated: ${activated}.\n"
 msgstr "Aktiviert: ${activated}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:115
+#: src/zope/app/bundle/browser/__init__.py:117
 msgid "Registered: ${registered}.\n"
 msgstr "Registriert: ${registered}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:85
+#: src/zope/app/bundle/browser/__init__.py:87
 msgid "unregistered ${count} registrations"
 msgstr "unregistrierte ${count} Registrierungen"
 
@@ -722,14 +728,16 @@
 
 #: src/zope/app/bundle/browser/bundle.pt:123
 msgid "Click \"Activate bundle\" to perform the above actions."
-msgstr "Klicken Sie auf \"BÃ¼ndel aktivieren\" um die o.a. Aktionen durchzufÃ¼hren."
+msgstr ""
+"Klicken Sie auf \"BÃ¼ndel aktivieren\" um die o.a. Aktionen durchzufÃ¼hren."
 
 #: src/zope/app/bundle/browser/bundle.pt:127
 msgid "activate-bundle-button"
 msgstr "Aktivieren"
 
 #: src/zope/app/bundle/browser/bundle.pt:137
-msgid "Click \"Deactivate bundle\" to unregister all registrations in this bundle."
+msgid ""
+"Click \"Deactivate bundle\" to unregister all registrations in this bundle."
 msgstr ""
 "Klicken Sie auf \"BÃ¼ndel deaktivieren\", um alle Registrierungen in diesem "
 "BÃ¼ndel nichtig zu machen."
@@ -806,16 +814,16 @@
 msgid "Bundle"
 msgstr "BÃ¼ndel"
 
-#: src/zope/app/cache/browser/cacheable.py:57
+#: src/zope/app/cache/browser/cacheable.py:63
 msgid "cache-invalidated"
 msgstr "Cache ungÃ¼ltig gemacht."
 
 # Default: "No cache associated with object."
-#: src/zope/app/cache/browser/cacheable.py:59
+#: src/zope/app/cache/browser/cacheable.py:65
 msgid "no-cache-associated"
 msgstr "Es ist kein Cache mit diesem Objekt assoziiert."
 
-#: src/zope/app/cache/browser/cacheable.py:71
+#: src/zope/app/cache/browser/cacheable.py:77
 msgid "Saved changes."
 msgstr "Ã„nderungen gespeichert."
 
@@ -833,12 +841,35 @@
 
 #: src/zope/app/cache/browser/cacheableedit.pt:5
 msgid "This edit form allows you to associate a cache with this object."
-msgstr "Dieses Formular erlaubt Ihnen, einen Cache fÃ¼r dieses Objekt zu definieren."
+msgstr ""
+"Dieses Formular erlaubt Ihnen, einen Cache fÃ¼r dieses Objekt zu definieren."
 
 #: src/zope/app/cache/browser/cacheableedit.pt:9
 msgid "Currently there is no cache associated with the object."
 msgstr "Derzeit ist kein Cache fÃ¼r dieses Objekt definiert."
 
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "RAM Cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "A RAM cache is a volatile (in memory) cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:26
+#, fuzzy
+msgid "Statistics"
+msgstr "Status"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+#, fuzzy
+msgid "Caches"
+msgstr "Cachename"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+msgid "Caches can be used to make your site run faster."
+msgstr ""
+
 #: src/zope/app/cache/browser/ramedit.pt:20
 msgid "Maximum cached entries"
 msgstr "Maximale Anzahl der gecachten EintrÃ¤ge"
@@ -855,6 +886,12 @@
 msgid "You can configure the RAM Cache here."
 msgstr "Hier kÃ¶nnen sie den RAM Cache konfigurieren."
 
+#: src/zope/app/cache/browser/ramedit.pt:53
+#: src/zope/app/site/browser/add_svc_config.pt:35
+#: src/zope/app/bundle/browser/bundle.pt:130
+msgid "reset-button"
+msgstr "ZurÃ¼cksetzen"
+
 #: src/zope/app/cache/browser/ramstats.pt:20
 msgid "Path"
 msgstr "Pfad"
@@ -879,7 +916,7 @@
 msgid "RAMCache statistics"
 msgstr "RAMCache Statistiken"
 
-#: src/zope/app/container/browser/adding.py:117
+#: src/zope/app/container/browser/adding.py:119
 msgid "You must select the type of object to add."
 msgstr "Sie mÃ¼ssen den Inhaltstypen auswÃ¤hlen, den sie hinzufÃ¼gen mÃ¶chten."
 
@@ -911,23 +948,23 @@
 msgid "container-cancel-button"
 msgstr "Abbrechen"
 
-#: src/zope/app/container/browser/contents.py:232
+#: src/zope/app/container/browser/contents.py:233
 msgid "You didn't specify any ids to remove."
 msgstr "Sie haben keine Ids zum LÃ¶schen angegeben."
 
-#: src/zope/app/container/browser/contents.py:244
+#: src/zope/app/container/browser/contents.py:245
 msgid "You didn't specify any ids to copy."
 msgstr "Sie haben keine Ids zum Kopieren angegeben."
 
-#: src/zope/app/container/browser/contents.py:264
+#: src/zope/app/container/browser/contents.py:265
 msgid "You didn't specify any ids to cut."
 msgstr "Sie haben keine Ids zum Ausschneiden angegeben."
 
-#: src/zope/app/container/browser/contents.py:61
+#: src/zope/app/container/browser/contents.py:62
 msgid "You didn't specify any ids to rename."
 msgstr "Sie haben keine Ids zum Umbenennen angegeben."
 
-#: src/zope/app/container/browser/metaconfigure.py:63
+#: src/zope/app/container/browser/metaconfigure.py:65
 #: src/zope/app/folder/browser/configure.zcml:20
 #: src/zope/app/site/browser/configure.zcml:19
 #: src/zope/app/bundle/browser/configure.zcml:11
@@ -936,7 +973,7 @@
 msgid "Contents"
 msgstr "Inhalt"
 
-#: src/zope/app/container/browser/metaconfigure.py:71
+#: src/zope/app/container/browser/metaconfigure.py:73
 #: src/zope/app/schema/browser/configure.zcml:15
 #: src/zope/app/container/browser/configure.zcml:5
 #: src/zope/app/registration/browser/configure.zcml:42
@@ -946,19 +983,19 @@
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: src/zope/app/container/constraints.py:185
+#: src/zope/app/container/constraints.py:186
 msgid "Container is not a valid Zope container."
 msgstr "BehÃ¤lter ist kein gÃ¼ltiger Zope-BehÃ¤lter."
 
-#: src/zope/app/container/contained.py:688
+#: src/zope/app/container/contained.py:690
 msgid "An empty name was provided. Names cannot be empty."
 msgstr "Ein leerer Name wurde angegeben. Namen dÃ¼rfen aber nicht leer sein."
 
-#: src/zope/app/container/contained.py:698
+#: src/zope/app/container/contained.py:700
 msgid "Names cannot begin with '+' or '@' or contain '/'"
 msgstr "Namen dÃ¼rfen nicht mit '+' or '@' beginnen, noch '/' enthalten."
 
-#: src/zope/app/container/contained.py:703
+#: src/zope/app/container/contained.py:705
 msgid "The given name is already being used"
 msgstr "Der gegebene Name existiert bereits."
 
@@ -979,7 +1016,6 @@
 msgstr "Fehlertyp: ${error_type}"
 
 #: src/zope/app/debugskin/unauthorized.pt:7
-#: src/zope/app/exception/browser/unauthorized.pt:8
 msgid "Unauthorized"
 msgstr "Unberechtigt"
 
@@ -1024,27 +1060,27 @@
 msgid "A simple, content-based DTML page"
 msgstr "Eine einfache, auf Inhalt basierte DTML-Seite"
 
-#: src/zope/app/dtmlpage/interfaces.py:31
+#: src/zope/app/dtmlpage/interfaces.py:32
 #: src/zope/app/pythonpage/__init__.py:39
-#: src/zope/app/sqlscript/interfaces.py:44
+#: src/zope/app/sqlscript/interfaces.py:45
 #: src/zope/app/zptpage/interfaces.py:36
 msgid "Source"
 msgstr "Quellcode"
 
-#: src/zope/app/dtmlpage/interfaces.py:32
+#: src/zope/app/dtmlpage/interfaces.py:33
 msgid "The source of the dtml page."
 msgstr "Der Quellcode der DTML Page"
 
 #: src/zope/app/dublincore/browser/configure.zcml:10
-#: src/zope/app/zopetop/widget_macros.pt:166
+#: src/zope/app/zopetop/widget_macros.pt:186
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: src/zope/app/dublincore/browser/edit.pt:43
+#: src/zope/app/dublincore/browser/edit.pt:45
 msgid "Content Last Modified"
 msgstr "Inhalt wurde zuletzt geÃ¤ndert am"
 
-#: src/zope/app/dublincore/browser/edit.pt:47
+#: src/zope/app/dublincore/browser/edit.pt:49
 msgid "Creator"
 msgstr "Autor"
 
@@ -1082,7 +1118,8 @@
 msgstr "Fehlermeldedienst fÃ¼r Logging Fehler"
 
 #: src/zope/app/errorservice/browser/error.pt:10
-msgid "This page lists the exceptions that have occurred in this site recently."
+msgid ""
+"This page lists the exceptions that have occurred in this site recently."
 msgstr ""
 "Diese Seite listet die Ausnahmen auf, die kÃ¼rzlich in dieser Webseite "
 "aufgetreten sind."
@@ -1190,6 +1227,10 @@
 msgid "The page that you are trying to access is not available"
 msgstr "Die Seite, die Sie versuchen aufzurufen, ist nicht verfÃ¼gbar"
 
+#: src/zope/app/exception/browser/unauthorized.pt:10
+msgid "You are not authorized"
+msgstr "Sie sind nicht bevollmÃ¤chtigt"
+
 #: src/zope/app/file/browser/configure.zcml:109
 msgid "Add a Image"
 msgstr "Bild hinzufÃ¼gen"
@@ -1246,7 +1287,7 @@
 msgid "Image"
 msgstr "Bild"
 
-#: src/zope/app/file/image.py:73
+#: src/zope/app/file/image.py:72
 msgid " ${width}x${height}"
 msgstr " ${width}x${height}"
 
@@ -1290,12 +1331,11 @@
 msgstr "Minimaler Ordner"
 
 #: src/zope/app/form/browser/add.pt:55
-#: src/zope/app/wiki/browser/wiki_add.pt:34
 msgid "Object Name"
 msgstr "Objektname"
 
-#: src/zope/app/form/browser/add.py:61
-#: src/zope/app/form/browser/editview.py:109
+#: src/zope/app/form/browser/add.py:60
+#: src/zope/app/form/browser/editview.py:108
 #: src/zope/app/schema/browser/__init__.py:53
 #: src/zope/app/schema/browser/__init__.py:64
 #: src/zope/app/schema/browser/__init__.py:70
@@ -1374,12 +1414,11 @@
 #: src/zope/app/publisher/interfaces/browser.py:44
 #: src/zope/app/publisher/interfaces/browser.py:87
 #: src/zope/app/security/interfaces/__init__.py:44
-#: src/zope/app/security/interfaces/__init__.py:197
-#: src/zope/app/wiki/interfaces.py:39 src/zope/schema/interfaces.py:100
-#: src/zope/schema/interfaces.py:484
+#: src/zope/app/security/interfaces/__init__.py:189
+#: src/zope/schema/interfaces.py:100 src/zope/schema/interfaces.py:484
+#: src/zope/app/menu/browser/menu_contents.pt:31
 #: src/zope/app/site/browser/interfacebrowse.pt:11
-#: src/zope/app/menu/browser/menu_contents.pt:31
-#: src/zope/app/dublincore/browser/edit.pt:14
+#: src/zope/app/dublincore/browser/edit.pt:16
 #: src/zope/app/schema/browser/schema_edit.pt:38
 #: src/zope/app/container/browser/contents.pt:33
 #: src/zope/app/container/browser/index.pt:27
@@ -1394,25 +1433,25 @@
 msgid "widget-missing-multiple-value"
 msgstr "Mehrere Werte fehlen"
 
-#: src/zope/app/form/browser/editview.py:118
+#: src/zope/app/form/browser/editview.py:117
 msgid "Updated on ${date_time}"
 msgstr "Daten am ${date_time} geÃ¤ndert"
 
-#: src/zope/app/form/browser/editwizard.pt:47
-#: src/zope/app/form/browser/addwizard.pt:55
+#: src/zope/app/form/browser/editwizard.pt:42
+#: src/zope/app/form/browser/addwizard.pt:63
 msgid "previous-button"
 msgstr "ZurÃ¼ck"
 
-#: src/zope/app/form/browser/editwizard.pt:53
-#: src/zope/app/form/browser/addwizard.pt:61
+#: src/zope/app/form/browser/editwizard.pt:48
+#: src/zope/app/form/browser/addwizard.pt:69
 msgid "next-button"
 msgstr "NÃ¤chste"
 
-#: src/zope/app/form/browser/editwizard.py:149
+#: src/zope/app/form/browser/editwizard.py:148
 msgid "No changes to save"
 msgstr "Keine Ã„nderungen zu speichern"
 
-#: src/zope/app/form/browser/editwizard.py:151
+#: src/zope/app/form/browser/editwizard.py:150
 msgid "Changes saved"
 msgstr "Ã„nderungen gespeichert"
 
@@ -1424,21 +1463,21 @@
 msgid "vocabulary-missing-multiple-value-for-display"
 msgstr "Mehrere Werte fehlen"
 
-#: src/zope/app/form/browser/itemswidgets.py:425
-#: src/zope/app/form/browser/itemswidgets.py:469
+#: src/zope/app/form/browser/itemswidgets.py:426
+#: src/zope/app/form/browser/itemswidgets.py:470
 msgid "vocabulary-missing-single-value-for-edit"
 msgstr "Einfacher Wert fehlt"
 
-#: src/zope/app/form/browser/itemswidgets.py:543
+#: src/zope/app/form/browser/itemswidgets.py:544
 msgid "vocabulary-missing-multiple-value-for-edit"
 msgstr "Mehrere Werte fehlen"
 
 # Default: "Remove selected items"
-#: src/zope/app/form/browser/sequencewidget.py:84
+#: src/zope/app/form/browser/sequencewidget.py:82
 msgid "remove-selected-items"
 msgstr "AusgewÃ¤hlte EintrÃ¤ge entfernen"
 
-#: src/zope/app/form/browser/sequencewidget.py:91
+#: src/zope/app/form/browser/sequencewidget.py:89
 msgid "Add %s"
 msgstr "%s hinzufÃ¼gen"
 
@@ -1495,7 +1534,8 @@
 msgstr "Datenbanken-Schemas"
 
 #: src/zope/app/generations/browser/managers.pt:18
-msgid "The database was updated to generation ${generation} for ${application}."
+msgid ""
+"The database was updated to generation ${generation} for ${application}."
 msgstr ""
 "Die Datenbank wurde auf Generation ${generation} fÃ¼r ${application} "
 "aktualisiert."
@@ -1591,7 +1631,8 @@
 
 #: src/zope/app/i18n/browser/synchronize.pt:122
 msgid "No connection could be made to remote data source."
-msgstr "Es konnte keine Verbindung mit der Fremddatenquelle hergestellt werden."
+msgstr ""
+"Es konnte keine Verbindung mit der Fremddatenquelle hergestellt werden."
 
 #: src/zope/app/i18n/browser/synchronize.pt:26
 msgid "Server URL"
@@ -1609,23 +1650,23 @@
 msgid "synchronize-button"
 msgstr "Synchronisieren"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Up to Date"
 msgstr "Aktuell"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "New Remote"
 msgstr "Neu in Ferndienst"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Out of Date"
 msgstr "Veraltet"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Does not exist"
 msgstr "Existiert nicht"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Newer Local"
 msgstr "Neuere LÃ¤ndereinstellung"
 
@@ -1713,7 +1754,6 @@
 #: src/zope/app/i18nfile/browser/file_edit.pt:68
 #: src/zope/app/i18nfile/browser/image_edit.pt:69
 #: src/zope/app/introspector/marker.pt:118
-#: src/zope/app/wiki/browser/subscriptions.pt:19
 #: src/zope/app/registration/browser/editregistration.pt:53
 msgid "remove-button"
 msgstr "Entfernen"
@@ -1727,7 +1767,7 @@
 #: src/zope/app/i18nfile/browser/image_edit.pt:94
 #: src/zope/app/cache/browser/cacheableedit.pt:45
 #: src/zope/app/cache/browser/ramedit.pt:51
-#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/dublincore/browser/edit.pt:35
 #: src/zope/app/rdb/browser/rdbconnection.pt:28
 #: src/zope/app/errorservice/browser/error_config.pt:46
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:63
@@ -1735,19 +1775,21 @@
 msgid "save-changes-button"
 msgstr "Ã„nderungen speichern"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:45
-#: src/zope/app/i18nfile/browser/i18nimage.py:27
+#: src/zope/app/i18nfile/browser/i18nfile.py:44
+#: src/zope/app/i18nfile/browser/i18nimage.py:29
 msgid "Edit Form"
 msgstr "Bearbeitungsformular"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:46
-msgid "This edit form allows you to make changes to the properties of this file."
+#: src/zope/app/i18nfile/browser/i18nfile.py:45
+msgid ""
+"This edit form allows you to make changes to the properties of this file."
 msgstr ""
 "Dieses Berarbeitungsformular erlaubt es Ihnen, Ã„nderungen an den "
 "Einstellungen ihrer Datei vorzunehmen."
 
-#: src/zope/app/i18nfile/browser/i18nimage.py:28
-msgid "This edit form allows you to make changes to the properties of this image."
+#: src/zope/app/i18nfile/browser/i18nimage.py:30
+msgid ""
+"This edit form allows you to make changes to the properties of this image."
 msgstr ""
 "Dieses Berarbeitungsformular erlaubt es Ihnen, Ã„nderungen an den "
 "Einstellungen ihres Bildes vorzunehmen."
@@ -1917,7 +1959,8 @@
 msgstr "BrowsermenÃ¼ hinzufÃ¼gen (Registrierung)"
 
 #: src/zope/app/menu/browser/configure.zcml:5
-msgid "Browser Menu tools are used to build menus for Web user        interfaces."
+msgid ""
+"Browser Menu tools are used to build menus for Web user        interfaces."
 msgstr ""
 "BrowsermenÃ¼-Werkzeuge werden benutzt, um MenÃ¼s fÃ¼r Web-BenutzeroberflÃ¤chen "
 "zu erstellen."
@@ -1939,10 +1982,10 @@
 msgstr "BrowsermenÃ¼-Eintrag hinzufÃ¼gen"
 
 #: src/zope/app/menu/browser/menu_contents.pt:25
+#: src/zope/app/uniqueid/browser/registrations.pt:7
 #: src/zope/app/schema/browser/schema_edit.pt:30
 #: src/zope/app/container/browser/contents.pt:26
 #: src/zope/app/container/browser/index.pt:18
-#: src/zope/app/uniqueid/browser/registrations.pt:7
 msgid "Content listing"
 msgstr "Inhaltsauflistung"
 
@@ -1951,7 +1994,7 @@
 msgstr "Aktion"
 
 #: src/zope/app/menu/browser/menu_contents.pt:33
-#: src/zope/app/dublincore/browser/edit.pt:39
+#: src/zope/app/dublincore/browser/edit.pt:41
 #: src/zope/app/container/browser/contents.pt:35
 #: src/zope/app/container/browser/index.pt:28
 msgid "Created"
@@ -2030,7 +2073,8 @@
 
 #: src/zope/app/menus.zcml:17
 msgid "Menu of objects to be added to content folders"
-msgstr "MenÃ¼ von Objekten die als Inhalt zu dem Ordner hinzugefÃ¼gt werden kÃ¶nnen"
+msgstr ""
+"MenÃ¼ von Objekten die als Inhalt zu dem Ordner hinzugefÃ¼gt werden kÃ¶nnen"
 
 #: src/zope/app/menus.zcml:21
 msgid "Menu for objects to be added according to containment constraints"
@@ -2040,7 +2084,8 @@
 
 #: src/zope/app/menus.zcml:26
 msgid "Menu of objects to be added to site management folders"
-msgstr "MenÃ¼ von Objekten die Webseitenverwaltungs-Ordnern hinzugefÃ¼gt werden kÃ¶nnen"
+msgstr ""
+"MenÃ¼ von Objekten die Webseitenverwaltungs-Ordnern hinzugefÃ¼gt werden kÃ¶nnen"
 
 #: src/zope/app/menus.zcml:30
 msgid "Menu of database connections to be added"
@@ -2096,7 +2141,7 @@
 msgstr "Ein Modul bearbeiten"
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:30
-#: src/zope/app/zopetop/widget_macros.pt:215
+#: src/zope/app/zopetop/widget_macros.pt:235
 msgid "Help"
 msgstr "Hilfe"
 
@@ -2135,7 +2180,7 @@
 
 #: src/zope/app/onlinehelp/interfaces.py:46
 #: src/zope/app/security/interfaces/__init__.py:38
-#: src/zope/app/security/interfaces/__init__.py:191
+#: src/zope/app/security/interfaces/__init__.py:183
 #: src/zope/app/workflow/stateful/browser/addtransition.pt:12
 #: src/zope/app/workflow/stateful/browser/addstate.pt:12
 msgid "Id"
@@ -2165,8 +2210,7 @@
 msgid "Help Topic"
 msgstr "Hilfthema"
 
-#: src/zope/app/onlinehelp/interfaces.py:64 src/zope/app/wiki/interfaces.py:45
-#: src/zope/app/wiki/interfaces.py:71
+#: src/zope/app/onlinehelp/interfaces.py:64
 msgid "Source Text"
 msgstr "Quelltext"
 
@@ -2182,13 +2226,11 @@
 msgid "The Path to the Definition of a Help Topic"
 msgstr "Der Pfad zur Definition des Hilfthemas"
 
-#: src/zope/app/onlinehelp/interfaces.py:77 src/zope/app/wiki/interfaces.py:51
-#: src/zope/app/wiki/interfaces.py:77
+#: src/zope/app/onlinehelp/interfaces.py:77
 msgid "Source Type"
 msgstr "Quelltext-Typ"
 
-#: src/zope/app/onlinehelp/interfaces.py:78 src/zope/app/wiki/interfaces.py:52
-#: src/zope/app/wiki/interfaces.py:78
+#: src/zope/app/onlinehelp/interfaces.py:78
 msgid "Type of the source text, e.g. structured text"
 msgstr "Typ des Quelltextes, zum Beispiel \"Structured Text\""
 
@@ -2247,6 +2289,7 @@
 #: src/zope/app/schema/fieldforms.zcml:151
 #: src/zope/app/module/browser/configure.zcml:6
 #: src/zope/app/utility/browser/configure.zcml:85
+#: src/zope/app/cache/browser/configure.zcml:24
 #: src/zope/app/file/browser/configure.zcml:29
 #: src/zope/app/i18nfile/browser/configure.zcml:31
 #: src/zope/app/i18nfile/browser/configure.zcml:73
@@ -2254,12 +2297,11 @@
 #: src/zope/app/rdb/browser/configure.zcml:27
 #: src/zope/app/schemacontent/browser/configure.zcml:46
 #: src/zope/app/schemacontent/browser/configure.zcml:88
-#: src/zope/app/wiki/browser/configure.zcml:76
-#: src/zope/app/wiki/browser/configure.zcml:160
 #: src/zope/app/menu/browser/configure.zcml:71
 #: src/zope/app/menu/browser/configure.zcml:106
-#: src/zope/app/session/browser.zcml:25 src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:15 src/zope/app/session/browser.zcml:38
 #: src/zope/app/zptpage/browser/configure.zcml:39
+#: src/zwiki/browser/configure.zcml:76 src/zwiki/browser/configure.zcml:160
 #: src/zope/app/securitypolicy/browser/configure.zcml:25
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -2280,7 +2322,8 @@
 
 #: src/zope/app/pluggableauth/interfaces.py:31
 msgid "The Login/Username of the user. This value can change."
-msgstr "Eine Anmeldung (Benutzername) fuer den Nutzer. Dieser Wert kann sich Ã¤ndern."
+msgstr ""
+"Eine Anmeldung (Benutzername) fuer den Nutzer. Dieser Wert kann sich Ã¤ndern."
 
 #: src/zope/app/pluggableauth/interfaces.py:37
 msgid "The password for the user."
@@ -2299,7 +2342,8 @@
 msgstr "PrÃ¤sentationsdienst"
 
 #: src/zope/app/presentation/browser/configure.zcml:3
-msgid "A Presentation Service allows you to register views, resources and skins"
+msgid ""
+"A Presentation Service allows you to register views, resources and skins"
 msgstr ""
 "Ein PrÃ¤sentationsdienst erlaubt es Ihnen, Ansichten, Ressourcen und Themen "
 "zu registrieren."
@@ -2372,7 +2416,7 @@
 msgid "${view_name} ${ptype} View for ${iface_name} in layer ${layer}"
 msgstr "${view_name} ${ptype} Ansicht fÃ¼r {iface_name} in Ebene ${layer}"
 
-#: src/zope/app/presentation/presentation.py:273
+#: src/zope/app/presentation/presentation.py:274
 msgid "Registered by ZCML"
 msgstr "Registriert durch ZCML"
 
@@ -2452,7 +2496,8 @@
 
 #: src/zope/app/publisher/interfaces/browser.py:39
 msgid "The url is relative to the object the menu is being displayed for."
-msgstr "DIe URL ist relativ zu dem Objekt fÃ¼r das der MenÃ¼eintrag angezeigt wird."
+msgstr ""
+"DIe URL ist relativ zu dem Objekt fÃ¼r das der MenÃ¼eintrag angezeigt wird."
 
 #: src/zope/app/publisher/interfaces/browser.py:45
 msgid "The text to be displayed for the menu item"
@@ -2577,7 +2622,8 @@
 msgstr "Datenbankverbindungs-Registrierung hinzufÃ¼gen"
 
 #: src/zope/app/rdb/browser/configure.zcml:5
-msgid "Database Adapters are used to connect to external       relational databases."
+msgid ""
+"Database Adapters are used to connect to external       relational databases."
 msgstr ""
 "Datenbankadapter werde benutzt, um Verbindungen zu externen relationalen "
 "Datenbanken herzustellen."
@@ -2629,7 +2675,8 @@
 
 #: src/zope/app/rdb/browser/rdbtestsql.pt:13
 msgid "Here you can enter an SQL statement, so you can test the connection."
-msgstr "Sie kÃ¶nnen hier eine SQL-Abfrage eingeben, um die Verbindung zu testen."
+msgstr ""
+"Sie kÃ¶nnen hier eine SQL-Abfrage eingeben, um die Verbindung zu testen."
 
 #: src/zope/app/rdb/browser/rdbtestsql.pt:18
 msgid "Query"
@@ -2752,7 +2799,7 @@
 "Dieses Objekt wird eigentlich nicht benutzt werden, es sei denn es ist "
 "registriert, um eine spezielle Funktion zu erfÃ¼llen, und es ist aktiv."
 
-#: src/zope/app/registration/configure.zcml:23
+#: src/zope/app/registration/configure.zcml:38
 #: src/zope/app/registration/browser/editregistration.pt:10
 msgid "Registration Manager"
 msgstr "Registrierungsverwalter"
@@ -2815,7 +2862,7 @@
 msgstr "Quelle fÃ¼r ReStrukturierten Text (reST)"
 
 #: src/zope/app/rotterdam/dialog_macros.pt:135
-#: src/zope/app/rotterdam/template.pt:208
+#: src/zope/app/rotterdam/template.pt:205
 msgid "Tip"
 msgstr "Tipp"
 
@@ -2827,7 +2874,7 @@
 msgid "Extended Editor"
 msgstr "Erweiterter Editor"
 
-#: src/zope/app/rotterdam/template.pt:102
+#: src/zope/app/rotterdam/template.pt:100
 msgid "Location:&nbsp;"
 msgstr "Standort:&nbsp;"
 
@@ -2835,11 +2882,11 @@
 msgid "[Logout]"
 msgstr "[Abmelden]"
 
-#: src/zope/app/rotterdam/template.pt:56
+#: src/zope/app/rotterdam/template.pt:55
 msgid "[Login]"
 msgstr "[Anmelden]"
 
-#: src/zope/app/rotterdam/template.pt:77
+#: src/zope/app/rotterdam/template.pt:75
 msgid "Add:"
 msgstr "HinzufÃ¼gen:"
 
@@ -3223,7 +3270,9 @@
 msgstr "Login fehlgeschlagen!"
 
 #: src/zope/app/security/browser/login_failed.pt:9
-msgid "You cancelled the login procedure. <a href=\"\"> Click here to return. </a>"
+#, fuzzy
+msgid ""
+"You cancelled the login procedure. <a href=\"\">Click here to return.</a>"
 msgstr ""
 "Sie haben den Loginprozess abgebrochen. <a href=\"\"> Bitte hier klicken um "
 "zurÃ¼ckzukehren. </a>"
@@ -3246,15 +3295,10 @@
 "Wenn sie diesen Bildschirm fÃ¼r mehr als 5 Sekunden sehen, klicken sie bitte "
 "hier."
 
-#: src/zope/app/security/configure.zcml:53
+#: src/zope/app/security/configure.zcml:56
 msgid "change-security-settings-permission"
 msgstr "Sicherheitseinstellungen Ã¤ndern"
 
-# Default: "Manage Content"
-#: src/zope/app/security/configure.zcml:58
-msgid "manage-content-permission"
-msgstr "Inhalt verwalten"
-
 #: src/zope/app/security/configure.zcml:6
 msgid ""
 "Special permission indicating unconditional access.                    "
@@ -3264,52 +3308,57 @@
 "Resourcen sind immer zugÃ¤nglich."
 
 #: src/zope/app/security/configure.zcml:6
-#: src/zope/app/security/configure.zcml:48
+#: src/zope/app/security/configure.zcml:51
 msgid "view-permission"
 msgstr "Ansehen"
 
-#: src/zope/app/security/configure.zcml:63
+# Default: "Manage Content"
+#: src/zope/app/security/configure.zcml:61
+msgid "manage-content-permission"
+msgstr "Inhalt verwalten"
+
+#: src/zope/app/security/configure.zcml:66
 msgid "manage-service-bindings-permission"
 msgstr "Dienstebindungen verwalten"
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "Manage executable code, including Python, SQL, ZPT, etc."
 msgstr "AusfÃ¼hrbaren Code (inkl. Python, SQL, ZPT etc.) verwalten"
 
 # Default: "Manage Code"
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "manage-code-permission"
 msgstr "Quellcode verwalten"
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:74
+#: src/zope/app/security/configure.zcml:77
 msgid "manage-services-permission"
 msgstr "Dienste verwalten"
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:79
+#: src/zope/app/security/configure.zcml:82
 msgid "manage-principal-permission"
 msgstr "Dienste verwalten"
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid ""
 "Manage the Zope Application, such as Restart/Shutdown or                    "
 "packing the ZODB."
 msgstr "Zope-Anwedung verwalten (z.B. neustarten/runterfahren/ZODB packen)"
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid "manage-application-permission"
 msgstr "Anwendung verwalten"
 
-#: src/zope/app/security/interfaces/__init__.py:192
+#: src/zope/app/security/interfaces/__init__.py:184
 msgid "Id as which this permission will be known and used."
 msgstr "ID, unter der diese Erlaubnis bekannt sein und benutzt werden soll."
 
-#: src/zope/app/security/interfaces/__init__.py:198
+#: src/zope/app/security/interfaces/__init__.py:190
 msgid "Provides a title for the permission."
 msgstr "Titel der Erlaubnis an."
 
-#: src/zope/app/security/interfaces/__init__.py:203
+#: src/zope/app/security/interfaces/__init__.py:195
 msgid "Provides a description for the permission."
 msgstr "Eine detailierte Beschreibung der Erlaubnis."
 
@@ -3324,11 +3373,11 @@
 "verwendet."
 
 #: src/zope/app/security/interfaces/__init__.py:50
-#: src/zope/app/security/interfaces/__init__.py:202
+#: src/zope/app/security/interfaces/__init__.py:194
 #: src/zope/schema/interfaces.py:107
 #: src/zope/app/site/browser/interfacedetail.pt:21
 #: src/zope/app/site/browser/interfacedetail.pt:48
-#: src/zope/app/dublincore/browser/edit.pt:22
+#: src/zope/app/dublincore/browser/edit.pt:24
 #: src/zope/app/introspector/marker.pt:63
 #: src/zope/app/introspector/introspector.pt:52
 #: src/zope/app/introspector/introspector.pt:155
@@ -3403,7 +3452,8 @@
 
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:9
 msgid "Helpful message explaining about how to set specific roles"
-msgstr "Hilfreiche Nachricht die erklÃ¤rt wie man spezifische Rollen setzen kann."
+msgstr ""
+"Hilfreiche Nachricht die erklÃ¤rt wie man spezifische Rollen setzen kann."
 
 #: src/zope/app/securitypolicy/browser/principal_permission_edit.pt:12
 msgid "Permission Settings"
@@ -3463,81 +3513,91 @@
 msgid "permission-deny"
 msgstr "Verweigern"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "All users have this role implicitly"
 msgstr "Alle Benutzer haben diese Rolle impliziterweise"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "Everybody"
 msgstr "Alle"
 
-#: src/zope/app/securitypolicy/configure.zcml:67
+#: src/zope/app/securitypolicy/configure.zcml:94
 msgid "Site Manager"
 msgstr "Webseiten-Verwalter"
 
-#: src/zope/app/securitypolicy/configure.zcml:68
+#: src/zope/app/securitypolicy/configure.zcml:95
 msgid "Site Member"
 msgstr "Webseiten-Mitglied"
 
-#: src/zope/app/session/browser.zcml:25
-msgid "Cookie Browser ID Manager Properties"
+#: src/zope/app/session/browser.zcml:15
+#, fuzzy
+msgid "Cookie Client Id Manager Properties"
 msgstr "Cookie-Browser-ID-Verwalter Eigenschaften"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Stores session data persistently in the ZODB"
 msgstr "Speichert Sitzungsdaten persistent in der ZODB"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Persistent Session Data Container"
 msgstr "Persistenter SitzungsdatenbehÃ¤lter"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "Stores session data in RAM"
 msgstr "Speichert Sitzungsdaten im RAM"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "RAM Session Data Container"
 msgstr "RAM-SitzungsdatenbehÃ¤lter"
 
-#: src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:38
 msgid "Session Data Container Properties"
 msgstr "Eigenschaften von SitzungsdatenbehÃ¤lter"
 
 #: src/zope/app/session/browser.zcml:8
+#, fuzzy
 msgid ""
-"Uses a cookie to uniquely identify a browser, allowing        state to be "
+"Uses a cookie to uniquely identify a client, allowing        state to be "
 "maintained between requests"
 msgstr ""
 "Benutzt einen Cookie, um einen Browser eindeutig zu identifzieren, so dass "
 "der Sitzungsstatus zwischen Anfragen behalten werden kann."
 
 #: src/zope/app/session/browser.zcml:8
-msgid "Cookie Browser Id Manager"
+#, fuzzy
+msgid "Cookie Client Id Manager"
 msgstr "Cookie-Browser-ID-Verwalter"
 
-#: src/zope/app/session/interfaces.py:100
-msgid "Timeout"
-msgstr "Auszeit"
+#: src/zope/app/session/http.py:48
+msgid "Cookie Name"
+msgstr "Cookie-Name"
 
-#: src/zope/app/session/interfaces.py:101
-msgid "Number of seconds before data becomes stale and may be removed"
-msgstr "Anzahl von Sekunden bis die Daten verfallen und gelÃ¶scht werden kÃ¶nnen"
+#: src/zope/app/session/http.py:49
+msgid ""
+"Name of cookie used to maintain state. Must be unique to the site domain "
+"name, and only contain ASCII letters, digits and '_'"
+msgstr ""
+"Name des Cookies, der zur Sitzungsidentifkation benutzt wird. Er muss "
+"eindeutig sein und darf nur ASCII Buchstaben, Zahlen und '_' enthalten."
 
-#: src/zope/app/session/interfaces.py:109
-msgid "Purge Interval"
-msgstr "Abfrageintervall"
+#: src/zope/app/session/http.py:61
+msgid "Cookie Lifetime"
+msgstr "Cookie-Lebensdauer"
 
-#: src/zope/app/session/interfaces.py:110
-msgid "How often stale data is purged in seconds. Higer values improve performance."
+#: src/zope/app/session/http.py:62
+msgid ""
+"Number of seconds until the browser expires the cookie. Leave blank expire "
+"the cookie when the browser is quit. Set to 0 to never expire. "
 msgstr ""
-"Wie oft verfallene Daten gelÃ¶scht werden, in Sekunden. HÃ¶here Werte "
-"verbessern die Geschwindigkeit."
+"Anzahl von Sekunden bis der Cookie im Browser verfÃ¤llt. Lassen Sie dieses "
+"Feld leer, verfÃ¤llt der Cookie, wenn der Browser beendet wird, setzten sie "
+"es auf 0, verfÃ¤llt der Cookie niemals."
 
-#: src/zope/app/session/interfaces.py:144
+#: src/zope/app/session/interfaces.py:125
 msgid "Last Access Time"
 msgstr "Letzter Zugriff"
 
-#: src/zope/app/session/interfaces.py:145
+#: src/zope/app/session/interfaces.py:126
 msgid ""
 "Approximate epoch time this ISessionData was last retrieved from its "
 "ISessionDataContainer"
@@ -3545,57 +3605,55 @@
 "UngefÃ¤hre Epoch-Zeit, seitdem der ISessionDataContainer zuletzt auf dieses "
 "ISessionData zugegriffen hat."
 
-#: src/zope/app/session/interfaces.py:53
-msgid "Cookie Name"
-msgstr "Cookie-Name"
+#: src/zope/app/session/interfaces.py:66
+msgid "Timeout"
+msgstr "Auszeit"
 
-#: src/zope/app/session/interfaces.py:54
+#: src/zope/app/session/interfaces.py:67
+#, fuzzy
 msgid ""
-"Name of cookie used to maintain state. Must be unique to the site domain "
-"name, and only contain ASCII letters, digits and '_'"
+"Number of seconds before data becomes stale and may be removed. A value of "
+"'0' means no expiration."
+msgstr "Anzahl von Sekunden bis die Daten verfallen und gelÃ¶scht werden kÃ¶nnen"
+
+#: src/zope/app/session/interfaces.py:75
+msgid "Timeout resolution (in seconds)"
 msgstr ""
-"Name des Cookies, der zur Sitzungsidentifkation benutzt wird. Er muss "
-"eindeutig sein und darf nur ASCII Buchstaben, Zahlen und '_' enthalten."
 
-#: src/zope/app/session/interfaces.py:66
-msgid "Cookie Lifetime"
-msgstr "Cookie-Lebensdauer"
-
-#: src/zope/app/session/interfaces.py:67
+#: src/zope/app/session/interfaces.py:76
 msgid ""
-"Number of seconds until the browser expires the cookie. Leave blank expire "
-"the cookie when the browser is quit. Set to 0 to never expire. "
+"Defines what the 'resolution' of item timeout is. Setting this higher allows "
+"the transience machinery to do fewer 'writes' at the expense of  causing "
+"items to time out later than the 'Data object timeout value' by  a factor of "
+"(at most) this many seconds."
 msgstr ""
-"Anzahl von Sekunden bis der Cookie im Browser verfÃ¤llt. Lassen Sie dieses "
-"Feld leer, verfÃ¤llt der Cookie, wenn der Browser beendet wird, setzten sie "
-"es auf 0, verfÃ¤llt der Cookie niemals."
 
 #: src/zope/app/site/browser/__init__.py:108
 msgid "Add Service"
 msgstr "Dienst hinzufÃ¼gen"
 
-#: src/zope/app/site/browser/__init__.py:145
+#: src/zope/app/site/browser/__init__.py:144
 #: src/zope/app/schema/browser/schema_add.pt:8
 msgid "Add Utility"
 msgstr "Werkzeug hinzufÃ¼gen"
 
-#: src/zope/app/site/browser/__init__.py:236
+#: src/zope/app/site/browser/__init__.py:234
 msgid "Activated: ${activated_services}"
 msgstr "Aktiviert: ${activated_services}"
 
-#: src/zope/app/site/browser/__init__.py:240
+#: src/zope/app/site/browser/__init__.py:238
 msgid "All of the checked services were already active"
 msgstr "Alle ausgewÃ¤hlten Dienste waren schon aktiv"
 
-#: src/zope/app/site/browser/__init__.py:251
+#: src/zope/app/site/browser/__init__.py:249
 msgid "Deactivated: ${deactivated_services}"
 msgstr "Deaktiviert: ${deactivated_services}"
 
-#: src/zope/app/site/browser/__init__.py:255
+#: src/zope/app/site/browser/__init__.py:253
 msgid "None of the checked services were active"
 msgstr "Kein ausgewÃ¤hlter Dienst war aktiv"
 
-#: src/zope/app/site/browser/__init__.py:266
+#: src/zope/app/site/browser/__init__.py:264
 msgid ""
 "Can't delete active service(s): ${service_names}; use the Deactivate button "
 "to deactivate"
@@ -3603,27 +3661,27 @@
 "Kann nicht aktive Dienst(e) lÃ¶schen: ${service_names}; bitte benutzen Sie "
 "Deaktivieren, um die Dienste zu deaktivieren"
 
-#: src/zope/app/site/browser/__init__.py:300
+#: src/zope/app/site/browser/__init__.py:298
 msgid "Deleted: ${service_names}"
 msgstr "GelÃ¶scht: ${service_names}"
 
-#: src/zope/app/site/browser/__init__.py:335
+#: src/zope/app/site/browser/__init__.py:333
 msgid "global"
 msgstr "global"
 
-#: src/zope/app/site/browser/__init__.py:416
+#: src/zope/app/site/browser/__init__.py:414
 msgid "Invalid service type specified"
 msgstr "UngÃ¼ltiger Diensttyp angegeben"
 
-#: src/zope/app/site/browser/__init__.py:423
+#: src/zope/app/site/browser/__init__.py:421
 msgid "No change"
 msgstr "Keine Ã„nderungen"
 
-#: src/zope/app/site/browser/__init__.py:427
+#: src/zope/app/site/browser/__init__.py:425
 msgid "Service deactivated"
 msgstr "Dienst deaktiviert"
 
-#: src/zope/app/site/browser/__init__.py:430
+#: src/zope/app/site/browser/__init__.py:428
 msgid "${active_services} activated"
 msgstr "${active_services} aktiviert"
 
@@ -3636,12 +3694,6 @@
 msgid "Service name"
 msgstr "Dienstname"
 
-#: src/zope/app/site/browser/add_svc_config.pt:35
-#: src/zope/app/cache/browser/ramedit.pt:53
-#: src/zope/app/bundle/browser/bundle.pt:130
-msgid "reset-button"
-msgstr "ZurÃ¼cksetzen"
-
 #: src/zope/app/site/browser/add_svc_config.pt:7
 msgid "Register this object to provide the following service(s):"
 msgstr ""
@@ -3678,7 +3730,7 @@
 
 #: src/zope/app/site/browser/configure.zcml:210
 #: src/zope/app/site/browser/serviceactivation.pt:26
-#: src/zope/app/apidoc/ifacemodule/index.pt:247
+#: src/zope/app/apidoc/ifacemodule/index.pt:248
 msgid "Service"
 msgstr "Dienst"
 
@@ -3778,19 +3830,13 @@
 #: src/zope/app/zptpage/browser/inlinecode.pt:65
 #: src/zope/app/workflow/stateful/browser/instance_manage.pt:76
 #: src/zope/app/pythonpage/edit.pt:71
-#: src/zope/app/form/browser/editwizard.pt:50
-#: src/zope/app/form/browser/addwizard.pt:58
+#: src/zope/app/form/browser/editwizard.pt:45
+#: src/zope/app/form/browser/addwizard.pt:66
 #: src/zope/app/form/browser/edit.pt:52
 #: src/zope/app/registration/browser/editregistration.pt:51
 msgid "submit-button"
 msgstr "Abschicken"
 
-#: src/zope/app/site/browser/services.pt:15
-#: src/zope/app/utility/browser/utilities.pt:11
-#: src/zope/app/bundle/browser/bundle.pt:53
-msgid "(click to clear message)"
-msgstr "(Nachricht lÃ¶schen)"
-
 #: src/zope/app/site/browser/services.pt:18
 msgid "No services are registered."
 msgstr "Es sind keine Dienste registriert."
@@ -3835,32 +3881,24 @@
 "bereitstellen (welche eventuell existierende Tools aufheben)."
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:30
+#: src/zope/app/site/browser/tasks.pt:30 src/zope/app/site/browser/tasks.pt:35
 msgid "label-configure-services"
 msgstr "Dienste konfigurieren"
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:36
+#: src/zope/app/site/browser/tasks.pt:41
 msgid "label-configure-utilities"
 msgstr "Dienste konfigurieren"
 
-#: src/zope/app/site/browser/tasks.pt:43
-msgid "label-add-service"
-msgstr "Dienst hinzufÃ¼gen"
-
 #: src/zope/app/site/browser/tasks.pt:49
-msgid "label-add-utility"
-msgstr "Werkzeug hinzufÃ¼gen"
+msgid "label-software"
+msgstr "Software"
 
 #: src/zope/app/site/browser/tasks.pt:5
 msgid "heading-common-site-management-tasks"
 msgstr "HÃ¤ufige Webseitenverwaltungsaufgaben"
 
-#: src/zope/app/site/browser/tasks.pt:56
-msgid "label-software"
-msgstr "Software"
-
-#: src/zope/app/site/browser/tasks.pt:59
+#: src/zope/app/site/browser/tasks.pt:52
 msgid ""
 "The site may customize the behavior of existing software or define its own. "
 "The first step in creating a new software package is to create a new Site "
@@ -3871,12 +3909,12 @@
 "Softwarepakets is das erstellen eines Webseitenverwaltungsordners, der die "
 "Software enthÃ¤lt."
 
-#: src/zope/app/site/browser/tasks.pt:68
+#: src/zope/app/site/browser/tasks.pt:61
 msgid "label-customize-existing-software"
 msgstr "Das Verhalten von existierender Software anpassen"
 
 # Default: "Create a new Site Management Folder"
-#: src/zope/app/site/browser/tasks.pt:75
+#: src/zope/app/site/browser/tasks.pt:68
 msgid "label-create-new-site-management-folder"
 msgstr "Neuen Webseitenverwaltungsordner erstellen"
 
@@ -3892,24 +3930,6 @@
 msgid "rename-button"
 msgstr "Umbenennen"
 
-#: src/zope/app/site/browser/tool.pt:106
-#: src/zope/app/site/browser/services.pt:74
-#: src/zope/app/utility/browser/utilities.pt:50
-#: src/zope/app/zptpage/browser/inlinecode.pt:63
-#: src/zope/app/dublincore/browser/edit.pt:31
-#: src/zope/app/schemacontent/browser/permission_edit.pt:33
-#: src/zope/app/errorservice/browser/error.pt:52
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
-#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
-#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
-#: src/zope/app/form/browser/edit.pt:50
-#: src/zope/app/wiki/browser/subscriptions.pt:35
-#: src/zope/app/wiki/browser/wiki_add.pt:29
-#: src/zope/app/registration/browser/editregistration.pt:49
-msgid "refresh-button"
-msgstr "Auffrischen"
-
 #: src/zope/app/site/browser/tool.pt:110
 #: src/zope/app/securitypolicy/browser/principal_role_association.pt:98
 msgid "apply-button"
@@ -3941,21 +3961,6 @@
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/zope/app/site/browser/tool.pt:91
-#: src/zope/app/site/browser/services.pt:66
-#: src/zope/app/site/browser/add_svc_config.pt:16
-#: src/zope/app/utility/browser/utilities.pt:42
-#: src/zope/app/registration/browser/registration.pt:30
-msgid "activate-button"
-msgstr "Aktivieren"
-
-#: src/zope/app/site/browser/tool.pt:93
-#: src/zope/app/site/browser/services.pt:68
-#: src/zope/app/utility/browser/utilities.pt:44
-#: src/zope/app/registration/browser/registration.pt:25
-msgid "deactivate-button"
-msgstr "Deaktivieren"
-
 #: src/zope/app/site/browser/tool.pt:96
 #: src/zope/app/schema/browser/schema_add.pt:39
 #: src/zope/app/workflow/stateful/browser/add.pt:65
@@ -3964,40 +3969,30 @@
 #: src/zope/app/i18n/browser/translate.pt:48
 #: src/zope/app/container/browser/add.pt:38
 #: src/zope/app/introspector/marker.pt:133 src/zope/app/form/browser/add.pt:52
-#: src/zope/app/wiki/browser/subscriptions.pt:37
-#: src/zope/app/wiki/browser/wiki_add.pt:31
 msgid "add-button"
 msgstr "HinzufÃ¼gen"
 
-#: src/zope/app/site/browser/tool.pt:99
-#: src/zope/app/site/browser/services.pt:71
-#: src/zope/app/utility/browser/utilities.pt:47
-#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
-#: src/zope/app/i18n/browser/translate.pt:37
-msgid "delete-button"
-msgstr "LÃ¶schen"
-
 #: src/zope/app/site/browser/tools.pt:5
 msgid "Available Tools"
 msgstr "VerfÃ¼gbare Werkzeuge"
 
-#: src/zope/app/site/browser/tools.py:159
-#: src/zope/app/site/browser/tools.py:303
+#: src/zope/app/site/browser/tools.py:160
+#: src/zope/app/site/browser/tools.py:304
 msgid "Deleted selected tools."
 msgstr "AusgewÃ¤hlte Tools wurden gelÃ¶scht."
 
-#: src/zope/app/site/browser/tools.py:162
-#: src/zope/app/site/browser/tools.py:308
+#: src/zope/app/site/browser/tools.py:163
+#: src/zope/app/site/browser/tools.py:309
 msgid "Renamed selected tools."
 msgstr "AusgewÃ¤hlte Tools umbenannt."
 
-#: src/zope/app/site/browser/tools.py:167
-#: src/zope/app/site/browser/tools.py:313
+#: src/zope/app/site/browser/tools.py:168
+#: src/zope/app/site/browser/tools.py:314
 msgid "Activated registrations."
 msgstr "Registrierungen wurden aktiviert."
 
-#: src/zope/app/site/browser/tools.py:170
-#: src/zope/app/site/browser/tools.py:316
+#: src/zope/app/site/browser/tools.py:171
+#: src/zope/app/site/browser/tools.py:317
 msgid "Deactivated registrations."
 msgstr "Registrierungen wurden deaktiviert."
 
@@ -4005,19 +4000,19 @@
 msgid "The name that is registered"
 msgstr "Der Name der registriert ist"
 
-#: src/zope/app/size/__init__.py:44
+#: src/zope/app/size/__init__.py:42
 msgid "not-available"
 msgstr "-"
 
-#: src/zope/app/size/__init__.py:48
+#: src/zope/app/size/__init__.py:46
 msgid "0 KB"
 msgstr "0 KB"
 
-#: src/zope/app/size/__init__.py:50
+#: src/zope/app/size/__init__.py:48
 msgid "1 KB"
 msgstr "1 KB"
 
-#: src/zope/app/size/__init__.py:55
+#: src/zope/app/size/__init__.py:53
 msgid "${size} KB"
 msgstr "${size} KB"
 
@@ -4073,19 +4068,19 @@
 msgid "SQL Script"
 msgstr "SQL-Skript"
 
-#: src/zope/app/sqlscript/interfaces.py:29
+#: src/zope/app/sqlscript/interfaces.py:30
 msgid "Connection Name"
 msgstr "Verbindungsname"
 
-#: src/zope/app/sqlscript/interfaces.py:30
+#: src/zope/app/sqlscript/interfaces.py:31
 msgid "The Connection Name for the connection to be used."
 msgstr "Der Verbindungsname fÃ¼r die zu benutzende Verbindung."
 
-#: src/zope/app/sqlscript/interfaces.py:35
+#: src/zope/app/sqlscript/interfaces.py:36
 msgid "Arguments"
 msgstr "Argumente"
 
-#: src/zope/app/sqlscript/interfaces.py:36
+#: src/zope/app/sqlscript/interfaces.py:37
 msgid ""
 "A set of attributes that can be used during the SQL command rendering "
 "process to provide dynamic data."
@@ -4093,7 +4088,7 @@
 "Eine Sammlung von Attributen, die, wÃ¤hrend der SQL-Befehl zusammengestellt "
 "wird, als dynamische Variablen verfÃ¼gbar sind."
 
-#: src/zope/app/sqlscript/interfaces.py:45
+#: src/zope/app/sqlscript/interfaces.py:46
 msgid "The SQL command to be run."
 msgstr "Der auszufÃ¼hrende SQL-Befehl"
 
@@ -4321,15 +4316,61 @@
 msgstr "Aktualisieren"
 
 #: src/zope/app/utility/browser/configureutility.pt:9
-msgid "Utility registrations for interface ${interface} with name ${utility_name}"
+msgid ""
+"Utility registrations for interface ${interface} with name ${utility_name}"
 msgstr ""
 "Werkzeugregistrierung fÃ¼r Interface ${interface} mit dem Namen "
 "${utility_name}"
 
+#: src/zope/app/utility/browser/utilities.pt:11
+#: src/zope/app/site/browser/services.pt:15
+#: src/zope/app/bundle/browser/bundle.pt:53
+msgid "(click to clear message)"
+msgstr "(Nachricht lÃ¶schen)"
+
 #: src/zope/app/utility/browser/utilities.pt:34
 msgid "change registration"
 msgstr "Registrierung Ã¤ndern"
 
+#: src/zope/app/utility/browser/utilities.pt:42
+#: src/zope/app/site/browser/tool.pt:91
+#: src/zope/app/site/browser/services.pt:66
+#: src/zope/app/site/browser/add_svc_config.pt:16
+#: src/zope/app/registration/browser/registration.pt:30
+msgid "activate-button"
+msgstr "Aktivieren"
+
+#: src/zope/app/utility/browser/utilities.pt:44
+#: src/zope/app/site/browser/tool.pt:93
+#: src/zope/app/site/browser/services.pt:68
+#: src/zope/app/registration/browser/registration.pt:25
+msgid "deactivate-button"
+msgstr "Deaktivieren"
+
+#: src/zope/app/utility/browser/utilities.pt:47
+#: src/zope/app/site/browser/tool.pt:99
+#: src/zope/app/site/browser/services.pt:71
+#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
+#: src/zope/app/i18n/browser/translate.pt:37
+msgid "delete-button"
+msgstr "LÃ¶schen"
+
+#: src/zope/app/utility/browser/utilities.pt:50
+#: src/zope/app/site/browser/tool.pt:106
+#: src/zope/app/site/browser/services.pt:74
+#: src/zope/app/zptpage/browser/inlinecode.pt:63
+#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/schemacontent/browser/permission_edit.pt:33
+#: src/zope/app/errorservice/browser/error.pt:52
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
+#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
+#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
+#: src/zope/app/form/browser/edit.pt:50
+#: src/zope/app/registration/browser/editregistration.pt:49
+msgid "refresh-button"
+msgstr "Auffrischen"
+
 #: src/zope/app/utility/browser/utilities.pt:6
 msgid "Utilities registered in this utility service"
 msgstr "Werkzeuge, die mit diesem Werkzeugdienst registriert sind"
@@ -4346,236 +4387,6 @@
 msgid "The physical path to the component"
 msgstr "Der physische Pfad zu der Komponente"
 
-# XXX
-# there is a problem with this message id
-# in src/zope/app/services/view.py:274, 'View' means a view component
-# and is refering to the substantive.
-#
-# In src/zope/app/security/configure.zcml:10, 'View' is refering to
-# the permission, the verb. While the substantive and the verb
-# happen to be equal in English, they aren't in most other languages.
-# This needs a fix.
-#: src/zope/app/wiki/browser/configure.zcml:101
-#: src/zope/app/wiki/browser/configure.zcml:158
-msgid "View"
-msgstr "Ansicht"
-
-#: src/zope/app/wiki/browser/configure.zcml:109
-#: src/zope/app/wiki/browser/configure.zcml:161
-#: src/zope/app/wiki/browser/parents_page.pt:13
-msgid "Parents"
-msgstr "Eltern"
-
-#: src/zope/app/wiki/browser/configure.zcml:134
-#: src/zope/app/wiki/browser/configure.zcml:143
-#: src/zope/app/wiki/browser/configure.zcml:159
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/zope/app/wiki/browser/configure.zcml:143
-msgid "A Comment"
-msgstr "Ein Kommentar"
-
-#: src/zope/app/wiki/browser/configure.zcml:152
-msgid "Menu for Wiki Page related actions."
-msgstr "MenÃ¼ fÃ¼r Wikiseiten-bezogene Aktionen"
-
-#: src/zope/app/wiki/browser/configure.zcml:168
-msgid "Table of Contents"
-msgstr "Inhaltsverzeichnis"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "Wiki"
-msgstr "Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "A Wiki"
-msgstr "Ein Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:24
-#: src/zope/app/wiki/browser/configure.zcml:162
-msgid "TOC"
-msgstr "Inhaltsverz."
-
-#: src/zope/app/wiki/browser/configure.zcml:32
-#: src/zope/app/wiki/browser/configure.zcml:169
-msgid "Search"
-msgstr "Suchen"
-
-#: src/zope/app/wiki/browser/configure.zcml:44
-#: src/zope/app/wiki/browser/configure.zcml:118
-#: src/zope/app/wiki/browser/configure.zcml:163
-#: src/zope/app/wiki/browser/configure.zcml:170
-msgid "Subscriptions"
-msgstr "Abonnements"
-
-#: src/zope/app/wiki/browser/configure.zcml:76
-msgid "Change Wiki Page"
-msgstr "Wiki-Seite Ã¤ndern"
-
-#: src/zope/app/wiki/browser/configure.zcml:8
-msgid "Add Wiki"
-msgstr "Wiki hinzufÃ¼gen"
-
-#: src/zope/app/wiki/browser/parents_page.pt:30
-msgid "reparent-button"
-msgstr "Erneuere Eltern Verzweigung"
-
-#: src/zope/app/wiki/browser/parents_page.pt:35
-msgid "Branch"
-msgstr "Zweig"
-
-#: src/zope/app/wiki/browser/skin/template.pt:32
-msgid "Last modified by ${user} on ${date}"
-msgstr "Zuletzt von ${user} am ${date} modifiziert"
-
-#: src/zope/app/wiki/browser/skin/template.pt:64
-msgid "Jump to:"
-msgstr "Springe zu:"
-
-#: src/zope/app/wiki/browser/skin/template.pt:73
-msgid ""
-"User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Search Wiki</a> </div>"
-msgstr ""
-"Benutzer: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Wiki Durchsuchen</a> </div>"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:12
-msgid "Current Subscriptions"
-msgstr "Aktuelle Abonnements"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:25
-msgid "Enter new Users (separate by 'Return')"
-msgstr "Geben Sie neue Benutzer sein (pro Zeile einen Benutzer)"
-
-#: src/zope/app/wiki/browser/wiki_search.pt:9
-msgid "Wiki Search"
-msgstr "Wiki-Suche"
-
-#: src/zope/app/wiki/browser/wiki_toc.pt:9
-msgid "Wiki Table of Contents"
-msgstr "Wiki Inhaltsverzeichnis"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "A Wiki Page"
-msgstr "Wiki-Seite hinzufÃ¼gen"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "Wiki Page"
-msgstr "Wiki-Seite"
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "The Wiki Editor can create and edit wikis."
-msgstr "Der Wiki-Editor kann Wikis erstellen und bearbeiten."
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "Wiki Editor"
-msgstr "Wiki-Editor"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "A Wiki Page Comment"
-msgstr "Ein Wiki-Seiten-Kommentar"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "Wiki Page Comment"
-msgstr "Wikiseiten-Kommentar"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "Wiki Administrator"
-msgstr "Wiki-Administrator"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "The Wiki Admin can fully manage wiki pages."
-msgstr "Der Wiki-Administrator kann Wiki-Seiten komplett verwalten."
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View Wiki Page"
-msgstr "Wiki-Seite ansehen"
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View a Wiki Page"
-msgstr "Wiki-Seite ansehen"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Comment on Wiki Page"
-msgstr "Wiki-Seite kommentieren"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Make a comment on Wiki Page"
-msgstr "Ein Kommentar zu einer Wiki-Seite abgeben"
-
-#: src/zope/app/wiki/configure.zcml:42
-#: src/zope/app/wiki/browser/configure.zcml:60
-msgid "Add Wiki Page"
-msgstr "Wiki-Seite hinzufÃ¼gen"
-
-#: src/zope/app/wiki/configure.zcml:51
-msgid "Edit Wiki Page"
-msgstr "Wiki-Seite bearbeiten"
-
-#: src/zope/app/wiki/configure.zcml:60
-msgid "Delete Wiki Page"
-msgstr "Wiki-Seite lÃ¶schen"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent Wiki Page"
-msgstr "Wiki-Seite neu zuordnen"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent a Wiki Page"
-msgstr "Wiki-Seite neu zuordnen"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki User"
-msgstr "Wiki-Benutzer"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki visitors, which can only view and comment on wikis."
-msgstr "Wiki-Besucher, die nur betrachten und kommentieren dÃ¼rfen."
-
-#: src/zope/app/wiki/configure.zcml:93
-msgid "Minimal Wiki Page Container implementation "
-msgstr "Minimale Wikiseiten-BehÃ¤lter-Implementation"
-
-#: src/zope/app/wiki/interfaces.py:150
-msgid "Previous Source Text"
-msgstr "Vorheriger Quelltext"
-
-#: src/zope/app/wiki/interfaces.py:151
-msgid "Previous source text of the Wiki Page."
-msgstr "Vorheriger Quelltext der Wiki Page."
-
-#: src/zope/app/wiki/interfaces.py:40
-msgid "Comment Title"
-msgstr "Kommentartitel"
-
-#: src/zope/app/wiki/interfaces.py:46
-msgid "Renderable source text of the comment."
-msgstr "Darstellbarer Quelltext des Kommentars."
-
-#: src/zope/app/wiki/interfaces.py:72
-msgid "Renderable source text of the Wiki Page."
-msgstr "Darstellbarer Quelltext der Wiki Page."
-
-#: src/zope/app/wiki/interfaces.py:96
-msgid "Wiki Page Parents"
-msgstr "Ãœbergeordnete Wiki Seiten"
-
-#: src/zope/app/wiki/interfaces.py:97
-msgid "Parents of a Wiki"
-msgstr "Wiki-Eltern"
-
-#: src/zope/app/wiki/interfaces.py:98
-msgid "Parent Name"
-msgstr "Elternname"
-
-#: src/zope/app/wiki/interfaces.py:99
-msgid "Name of the parent wiki page."
-msgstr "Name der Ã¼bergeordneten Wiki Seite."
-
 #: src/zope/app/workflow/browser/configure.zcml:6
 msgid ""
 "Workflow Process Definitions define a particular workflow       for an "
@@ -4659,13 +4470,13 @@
 msgstr "Zustandsbasierter Ãœbergang"
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
+msgid "An utility to manage content and workflow interaction."
+msgstr "Ein Werkzeug, um Inhalt und ArbeitslÃ¤ufe zu verwalten."
+
+#: src/zope/app/workflow/stateful/browser/configure.zcml:121
 msgid "Content Workflows Manager"
 msgstr "Verwalter von ArbeitsablÃ¤ufen von Inhalten"
 
-#: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "An utility to manage content and workflow interaction."
-msgstr "Ein Werkzeug, um Inhalt und ArbeitslÃ¤ufe zu verwalten."
-
 #: src/zope/app/workflow/stateful/browser/configure.zcml:129
 msgid "Content/Process Registry"
 msgstr "Inhalt/Prozess-Registrierung"
@@ -4879,59 +4690,59 @@
 msgid "Source State"
 msgstr "Quell-Zustand"
 
-#: src/zope/app/zopetop/widget_macros.pt:13
-msgid "Logged in as ${user_title}"
-msgstr "Sie sind nun als  ${user_title} eingelogged."
-
-#: src/zope/app/zopetop/widget_macros.pt:132
+#: src/zope/app/zopetop/widget_macros.pt:152
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/zope/app/zopetop/widget_macros.pt:149
+#: src/zope/app/zopetop/widget_macros.pt:169
 msgid "Actions"
 msgstr "TÃ¤tigkeiten"
 
-#: src/zope/app/zopetop/widget_macros.pt:176
+#: src/zope/app/zopetop/widget_macros.pt:196
 msgid "Location:"
 msgstr "Standort:"
 
-#: src/zope/app/zopetop/widget_macros.pt:26
+#: src/zope/app/zopetop/widget_macros.pt:32
+msgid "Logged in as ${user_title}"
+msgstr "Sie sind nun als  ${user_title} eingelogged."
+
+#: src/zope/app/zopetop/widget_macros.pt:46
 msgid "Common Tasks"
 msgstr "Oftgenutzte Aufgaben"
 
-#: src/zope/app/zopetop/widget_macros.pt:37
+#: src/zope/app/zopetop/widget_macros.pt:57
 msgid "user accounts"
 msgstr "Benutzerkonten"
 
-#: src/zope/app/zopetop/widget_macros.pt:40
+#: src/zope/app/zopetop/widget_macros.pt:60
 msgid "User Accounts"
 msgstr "Benutzerkonten"
 
-#: src/zope/app/zopetop/widget_macros.pt:43
+#: src/zope/app/zopetop/widget_macros.pt:63
 msgid "control panels"
 msgstr "Kontrollen"
 
-#: src/zope/app/zopetop/widget_macros.pt:46
+#: src/zope/app/zopetop/widget_macros.pt:66
 msgid "Control Panels"
 msgstr "Kontrollen"
 
-#: src/zope/app/zopetop/widget_macros.pt:49
+#: src/zope/app/zopetop/widget_macros.pt:69
 msgid "system security"
 msgstr "Systemsicherheit"
 
-#: src/zope/app/zopetop/widget_macros.pt:52
+#: src/zope/app/zopetop/widget_macros.pt:72
 msgid "System Security"
 msgstr "Systemsicherheit"
 
-#: src/zope/app/zopetop/widget_macros.pt:55
+#: src/zope/app/zopetop/widget_macros.pt:75
 msgid "add more"
 msgstr "Mehr hinzufÃ¼gen"
 
-#: src/zope/app/zopetop/widget_macros.pt:58
+#: src/zope/app/zopetop/widget_macros.pt:78
 msgid "Add More"
 msgstr "Mehr hinzufÃ¼gen"
 
-#: src/zope/app/zopetop/widget_macros.pt:66
+#: src/zope/app/zopetop/widget_macros.pt:86
 msgid "Root Folder"
 msgstr "Wurzelordner"
 
@@ -5012,27 +4823,14 @@
 "Codeschnipsel in TAL ausfÃ¼hren. Wir raten Entwicklern normalerweise von der "
 "Benutzung dieser Funktion ab."
 
-#: src/zope/app/zptpage/zptpage.py:114
+#: src/zope/app/zptpage/zptpage.py:112
 msgid "1 line"
 msgstr "1 Zeile"
 
-#: src/zope/app/zptpage/zptpage.py:115
+#: src/zope/app/zptpage/zptpage.py:113
 msgid "${lines} lines"
 msgstr "${lines} Zeilen"
 
-#: src/zope/exceptions/unauthorized.py:69
-#: src/zope/exceptions/unauthorized.py:72
-msgid "You are not allowed to access ${name} in this context"
-msgstr "Es ist Ihnen nicht gestattet auf ${name} in diesem Kontext zuzugreifen."
-
-#: src/zope/exceptions/unauthorized.py:74
-msgid "You are not authorized"
-msgstr "Sie sind nicht bevollmÃ¤chtigt"
-
-#: src/zope/exceptions/unauthorized.py:84
-msgid "a particular ${object}"
-msgstr "ein bestimmtes ${object}"
-
 #: src/zope/schema/_bootstrapinterfaces.py:43
 msgid "Required input is missing."
 msgstr "Erforderliche Eingabe fehlt."
@@ -5108,7 +4906,8 @@
 msgid ""
 "The field default value may be None or a legal\n"
 "                        field value"
-msgstr "Der \"default\" Wert des Feldes kann None oder ein legaler Feldwert sein"
+msgstr ""
+"Der \"default\" Wert des Feldes kann None oder ein legaler Feldwert sein"
 
 #: src/zope/schema/interfaces.py:132
 msgid "Missing Value"
@@ -5192,7 +4991,8 @@
 msgstr "Werttyp"
 
 #: src/zope/schema/interfaces.py:385
-msgid "Field value items must conform to the given type, expressed via a Field."
+msgid ""
+"Field value items must conform to the given type, expressed via a Field."
 msgstr "Feldwerte mÃ¼ssen sich auf den Typen in diesem Feld anpassen."
 
 #: src/zope/schema/interfaces.py:389
@@ -5249,19 +5049,242 @@
 msgid "The field is not bound."
 msgstr "Das Feld ist nicht gebunden."
 
-#: src/zope/schema/tests/test_objectfield.py:38
+#: src/zope/schema/tests/test_objectfield.py:37
 msgid "Foo"
 msgstr "Foo"
 
-#: src/zope/schema/tests/test_objectfield.py:39
+#: src/zope/schema/tests/test_objectfield.py:38
 msgid "Foo description"
 msgstr "Foo Beschreibung"
 
-#: src/zope/schema/tests/test_objectfield.py:44
+#: src/zope/schema/tests/test_objectfield.py:43
 msgid "Bar"
 msgstr "Bar"
 
-#: src/zope/schema/tests/test_objectfield.py:45
+#: src/zope/schema/tests/test_objectfield.py:44
 msgid "Bar description"
 msgstr "Bar Beschreibung"
 
+# XXX
+# there is a problem with this message id
+# in src/zope/app/services/view.py:274, 'View' means a view component
+# and is refering to the substantive.
+#
+# In src/zope/app/security/configure.zcml:10, 'View' is refering to
+# the permission, the verb. While the substantive and the verb
+# happen to be equal in English, they aren't in most other languages.
+# This needs a fix.
+#: src/zwiki/browser/configure.zcml:101 src/zwiki/browser/configure.zcml:158
+msgid "View"
+msgstr "Ansicht"
+
+#: src/zwiki/browser/configure.zcml:109 src/zwiki/browser/configure.zcml:161
+msgid "Parents"
+msgstr "Eltern"
+
+#: src/zwiki/browser/configure.zcml:134 src/zwiki/browser/configure.zcml:143
+#: src/zwiki/browser/configure.zcml:159
+msgid "Comment"
+msgstr "Kommentar"
+
+#: src/zwiki/browser/configure.zcml:143
+msgid "A Comment"
+msgstr "Ein Kommentar"
+
+#: src/zwiki/browser/configure.zcml:152
+msgid "Menu for Wiki Page related actions."
+msgstr "MenÃ¼ fÃ¼r Wikiseiten-bezogene Aktionen"
+
+#: src/zwiki/browser/configure.zcml:168
+msgid "Table of Contents"
+msgstr "Inhaltsverzeichnis"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "Wiki"
+msgstr "Wiki"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "A Wiki"
+msgstr "Ein Wiki"
+
+#: src/zwiki/browser/configure.zcml:24 src/zwiki/browser/configure.zcml:162
+msgid "TOC"
+msgstr "Inhaltsverz."
+
+#: src/zwiki/browser/configure.zcml:32 src/zwiki/browser/configure.zcml:169
+msgid "Search"
+msgstr "Suchen"
+
+#: src/zwiki/browser/configure.zcml:44 src/zwiki/browser/configure.zcml:118
+#: src/zwiki/browser/configure.zcml:163 src/zwiki/browser/configure.zcml:170
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#: src/zwiki/browser/configure.zcml:76
+msgid "Change Wiki Page"
+msgstr "Wiki-Seite Ã¤ndern"
+
+#: src/zwiki/browser/configure.zcml:8
+msgid "Add Wiki"
+msgstr "Wiki hinzufÃ¼gen"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki User"
+msgstr "Wiki-Benutzer"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki visitors, which can only view and comment on wikis."
+msgstr "Wiki-Besucher, die nur betrachten und kommentieren dÃ¼rfen."
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "A Wiki Page"
+msgstr "Wiki-Seite hinzufÃ¼gen"
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "Wiki Page"
+msgstr "Wiki-Seite"
+
+#: src/zwiki/configure.zcml:17
+msgid "The Wiki Editor can create and edit wikis."
+msgstr "Der Wiki-Editor kann Wikis erstellen und bearbeiten."
+
+#: src/zwiki/configure.zcml:17
+msgid "Wiki Editor"
+msgstr "Wiki-Editor"
+
+#: src/zwiki/configure.zcml:186
+msgid "A Wiki Page Comment"
+msgstr "Ein Wiki-Seiten-Kommentar"
+
+#: src/zwiki/configure.zcml:186
+msgid "Wiki Page Comment"
+msgstr "Wikiseiten-Kommentar"
+
+#: src/zwiki/configure.zcml:22
+msgid "Wiki Administrator"
+msgstr "Wiki-Administrator"
+
+#: src/zwiki/configure.zcml:22
+msgid "The Wiki Admin can fully manage wiki pages."
+msgstr "Der Wiki-Administrator kann Wiki-Seiten komplett verwalten."
+
+#: src/zwiki/configure.zcml:27
+msgid "View Wiki Page"
+msgstr "Wiki-Seite ansehen"
+
+#: src/zwiki/configure.zcml:27
+msgid "View a Wiki Page"
+msgstr "Wiki-Seite ansehen"
+
+#: src/zwiki/configure.zcml:36
+msgid "Comment on Wiki Page"
+msgstr "Wiki-Seite kommentieren"
+
+#: src/zwiki/configure.zcml:36
+msgid "Make a comment on Wiki Page"
+msgstr "Ein Kommentar zu einer Wiki-Seite abgeben"
+
+#: src/zwiki/configure.zcml:45 src/zwiki/browser/configure.zcml:60
+msgid "Add Wiki Page"
+msgstr "Wiki-Seite hinzufÃ¼gen"
+
+#: src/zwiki/configure.zcml:54
+msgid "Edit Wiki Page"
+msgstr "Wiki-Seite bearbeiten"
+
+#: src/zwiki/configure.zcml:63
+msgid "Delete Wiki Page"
+msgstr "Wiki-Seite lÃ¶schen"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent Wiki Page"
+msgstr "Wiki-Seite neu zuordnen"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent a Wiki Page"
+msgstr "Wiki-Seite neu zuordnen"
+
+#: src/zwiki/configure.zcml:96
+msgid "Minimal Wiki Page Container implementation "
+msgstr "Minimale Wikiseiten-BehÃ¤lter-Implementation"
+
+#~ msgid "Purge Interval"
+#~ msgstr "Abfrageintervall"
+
+#~ msgid ""
+#~ "How often stale data is purged in seconds. Higer values improve "
+#~ "performance."
+#~ msgstr ""
+#~ "Wie oft verfallene Daten gelÃ¶scht werden, in Sekunden. HÃ¶here Werte "
+#~ "verbessern die Geschwindigkeit."
+
+#~ msgid "label-add-service"
+#~ msgstr "Dienst hinzufÃ¼gen"
+
+#~ msgid "label-add-utility"
+#~ msgstr "Werkzeug hinzufÃ¼gen"
+
+#~ msgid "reparent-button"
+#~ msgstr "Erneuere Eltern Verzweigung"
+
+#~ msgid "Branch"
+#~ msgstr "Zweig"
+
+#~ msgid "Last modified by ${user} on ${date}"
+#~ msgstr "Zuletzt von ${user} am ${date} modifiziert"
+
+#~ msgid "Jump to:"
+#~ msgstr "Springe zu:"
+
+#~ msgid ""
+#~ "User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
+#~ "\">Search Wiki</a> </div>"
+#~ msgstr ""
+#~ "Benutzer: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search."
+#~ "html\">Wiki Durchsuchen</a> </div>"
+
+#~ msgid "Current Subscriptions"
+#~ msgstr "Aktuelle Abonnements"
+
+#~ msgid "Enter new Users (separate by 'Return')"
+#~ msgstr "Geben Sie neue Benutzer sein (pro Zeile einen Benutzer)"
+
+#~ msgid "Wiki Search"
+#~ msgstr "Wiki-Suche"
+
+#~ msgid "Wiki Table of Contents"
+#~ msgstr "Wiki Inhaltsverzeichnis"
+
+#~ msgid "Previous Source Text"
+#~ msgstr "Vorheriger Quelltext"
+
+#~ msgid "Previous source text of the Wiki Page."
+#~ msgstr "Vorheriger Quelltext der Wiki Page."
+
+#~ msgid "Comment Title"
+#~ msgstr "Kommentartitel"
+
+#~ msgid "Renderable source text of the comment."
+#~ msgstr "Darstellbarer Quelltext des Kommentars."
+
+#~ msgid "Renderable source text of the Wiki Page."
+#~ msgstr "Darstellbarer Quelltext der Wiki Page."
+
+#~ msgid "Wiki Page Parents"
+#~ msgstr "Ãœbergeordnete Wiki Seiten"
+
+#~ msgid "Parents of a Wiki"
+#~ msgstr "Wiki-Eltern"
+
+#~ msgid "Parent Name"
+#~ msgstr "Elternname"
+
+#~ msgid "Name of the parent wiki page."
+#~ msgstr "Name der Ã¼bergeordneten Wiki Seite."
+
+#~ msgid "You are not allowed to access ${name} in this context"
+#~ msgstr ""
+#~ "Es ist Ihnen nicht gestattet auf ${name} in diesem Kontext zuzugreifen."
+
+#~ msgid "a particular ${object}"
+#~ msgstr "ein bestimmtes ${object}"

Modified: Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po	2004-07-19 13:39:42 UTC (rev 26625)
+++ Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po	2004-07-19 13:40:28 UTC (rev 26626)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Zope X3 Pre-M4\n"
-"POT-Creation-Date: Fri Jun 18 17:40:55 2004\n"
+"POT-Creation-Date: Mon Jul 19 17:08:59 2004\n"
 "PO-Revision-Date: 2003-08-06 11:22-0500\n"
 "Last-Translator: Philipp von Weitershausen\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
@@ -15,25 +15,25 @@
 "Generated-By: Zope 3 0.1\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: src/zope/app/adapter/adapter.py:283
+#: src/zope/app/adapter/adapter.py:285
 #: src/zope/app/presentation/pagefolder.py:54
 #: src/zope/app/presentation/presentation.py:290
 msgid "For interface"
 msgstr "Para interfaz:"
 
-#: src/zope/app/adapter/adapter.py:284
+#: src/zope/app/adapter/adapter.py:286
 msgid "The interface of the objects being adapted"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:289 src/zope/app/utility/interfaces.py:48
+#: src/zope/app/adapter/adapter.py:291 src/zope/app/utility/interfaces.py:48
 msgid "Provided interface"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:290
+#: src/zope/app/adapter/adapter.py:292
 msgid "The interface provided"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:296 src/zope/app/site/interfaces.py:162
+#: src/zope/app/adapter/adapter.py:298 src/zope/app/site/interfaces.py:162
 #: src/zope/app/site/browser/tool.pt:40
 #: src/zope/app/schema/browser/schema_edit.pt:36
 #: src/zope/app/workflow/browser/instancecontainer_index.pt:19
@@ -43,15 +43,15 @@
 msgid "Name"
 msgstr "Nombre"
 
-#: src/zope/app/adapter/adapter.py:302
+#: src/zope/app/adapter/adapter.py:304
 msgid "The dotted name of a factory for creating the adapter"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:308
+#: src/zope/app/adapter/adapter.py:310
 msgid "The permission required for use"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:315
+#: src/zope/app/adapter/adapter.py:317
 msgid "Factory to be called to construct the component"
 msgstr ""
 
@@ -117,21 +117,25 @@
 msgid "Zope 3 API Docs"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/__init__.py:511
-#: src/zope/app/apidoc/ifacemodule/index.pt:264
+#: src/zope/app/apidoc/classmodule/__init__.py:545
+#: src/zope/app/apidoc/ifacemodule/index.pt:265
 msgid "Classes"
 msgstr "Clases"
 
-#: src/zope/app/apidoc/classmodule/__init__.py:549
+#: src/zope/app/apidoc/classmodule/__init__.py:583
 msgid "Zope 3 root."
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/browser.py:410
-#: src/zope/app/rotterdam/template.pt:104
+#: src/zope/app/apidoc/classmodule/browser.py:675
+#: src/zope/app/rotterdam/template.pt:102
 msgid "[top]"
 msgstr "[tapa]"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:140
+#: src/zope/app/apidoc/classmodule/class_index.pt:102
+msgid "There are no attributes in this class."
+msgstr ""
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:144
 msgid "There are no methods in this class."
 msgstr "No hay mÃ©todos en este clase."
 
@@ -140,37 +144,49 @@
 msgid "Bases"
 msgstr "Bases"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:30
+#: src/zope/app/apidoc/classmodule/class_index.pt:34
 #: src/zope/app/apidoc/ifacemodule/index.pt:40
 msgid "There are no base classes."
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:35
+#: src/zope/app/apidoc/classmodule/class_index.pt:39
 msgid "Implemented Interfaces"
 msgstr "Interfaces implementados"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:50
+#: src/zope/app/apidoc/classmodule/class_index.pt:54
 msgid "There are no implemented interfaces."
 msgstr "No hay interfaces implementados."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:56
+#: src/zope/app/apidoc/classmodule/class_index.pt:60
 msgid "Attributes/Properties"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:89
-#: src/zope/app/apidoc/classmodule/class_index.pt:131
-msgid "(read)"
-msgstr "(leer)"
+#: src/zope/app/apidoc/classmodule/class_index.pt:73
+#: src/zope/app/apidoc/classmodule/function_index.pt:40
+#: src/zope/app/apidoc/classmodule/function_index.pt:44
+msgid "type:"
+msgstr "tipo:"
 
+#: src/zope/app/apidoc/classmodule/class_index.pt:79
+#: src/zope/app/apidoc/classmodule/function_index.pt:51
+msgid "Value:"
+msgstr "Valor:"
+
 #: src/zope/app/apidoc/classmodule/class_index.pt:91
 #: src/zope/app/apidoc/classmodule/class_index.pt:133
+msgid "Permissions:"
+msgstr "Permisos:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:93
+#: src/zope/app/apidoc/classmodule/class_index.pt:135
+msgid "(read)"
+msgstr "(leer)"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:95
+#: src/zope/app/apidoc/classmodule/class_index.pt:137
 msgid "(write)"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:98
-msgid "There are no attributes in this class."
-msgstr ""
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:18
 msgid "Documentation String"
 msgstr "Texto de documentaciÃ³n"
@@ -179,17 +195,6 @@
 msgid "Attributes"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/function_index.pt:40
-#: src/zope/app/apidoc/classmodule/function_index.pt:44
-#: src/zope/app/apidoc/classmodule/class_index.pt:69
-msgid "type:"
-msgstr "tipo:"
-
-#: src/zope/app/apidoc/classmodule/function_index.pt:51
-#: src/zope/app/apidoc/classmodule/class_index.pt:75
-msgid "Value:"
-msgstr "Valor:"
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:9
 msgid "Signature"
 msgstr ""
@@ -215,87 +220,87 @@
 msgid "Zope 3 Class Browser"
 msgstr "Explorador de clases Zope 3"
 
-#: src/zope/app/apidoc/ifacemodule/__init__.py:73
+#: src/zope/app/apidoc/ifacemodule/__init__.py:75
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:158
+#: src/zope/app/apidoc/ifacemodule/browser.py:199
 #, fuzzy
 msgid "required"
 msgstr "requirido:"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:160
+#: src/zope/app/apidoc/ifacemodule/browser.py:201
 msgid "optional"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:100
+#: src/zope/app/apidoc/ifacemodule/index.pt:101
 msgid "There are no methods specified."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:107
+#: src/zope/app/apidoc/ifacemodule/index.pt:108
 msgid "Adapters"
 msgstr "Adaptadores"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:113
+#: src/zope/app/apidoc/ifacemodule/index.pt:114
 msgid "Adapters where this interface is required:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:126
-#: src/zope/app/apidoc/ifacemodule/index.pt:167
+#: src/zope/app/apidoc/ifacemodule/index.pt:127
+#: src/zope/app/apidoc/ifacemodule/index.pt:168
 msgid "name:"
 msgstr "nombre:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:131
+#: src/zope/app/apidoc/ifacemodule/index.pt:132
 msgid "provides:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:137
+#: src/zope/app/apidoc/ifacemodule/index.pt:138
 msgid "also required:"
 msgstr "tambiÃ©n requiridos:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:154
+#: src/zope/app/apidoc/ifacemodule/index.pt:155
 msgid "Adapters that provide this interface:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:171
+#: src/zope/app/apidoc/ifacemodule/index.pt:172
 msgid "requires:"
 msgstr "requiere:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:178
+#: src/zope/app/apidoc/ifacemodule/index.pt:179
 msgid "No interface required."
 msgstr "No interfaz requirido."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:189
+#: src/zope/app/apidoc/ifacemodule/index.pt:190
 msgid "There are no adapters registered for this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:199
+#: src/zope/app/apidoc/ifacemodule/index.pt:200
 msgid "Other Information"
 msgstr "Otras informaciones"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:204
+#: src/zope/app/apidoc/ifacemodule/index.pt:205
 msgid "Factories"
 msgstr "FÃ¡bricas"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:206
+#: src/zope/app/apidoc/ifacemodule/index.pt:207
 msgid "A list of factories that create objects implement this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:224
+#: src/zope/app/apidoc/ifacemodule/index.pt:225
 msgid "A list of utilities that are are registered to provide this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:235
+#: src/zope/app/apidoc/ifacemodule/index.pt:236
 msgid "Class:"
 msgstr "Clase:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:249
+#: src/zope/app/apidoc/ifacemodule/index.pt:250
 msgid ""
 "A list of services (usually just one) that are are registered to provide "
 "this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:266
+#: src/zope/app/apidoc/ifacemodule/index.pt:267
 msgid ""
 "A list of classes that implement this interface. This might duplicate the "
 "entries in Utilities and Services."
@@ -307,15 +312,15 @@
 "Service."
 msgstr ""
 
-#: src/zope/app/apidoc/servicemodule/__init__.py:73
+#: src/zope/app/apidoc/servicemodule/__init__.py:75
 #: src/zope/app/site/browser/configure.zcml:87
-#: src/zope/app/zopetop/widget_macros.pt:34
+#: src/zope/app/zopetop/widget_macros.pt:54
 msgid "Services"
 msgstr "Servicios"
 
 #: src/zope/app/apidoc/servicemodule/index.pt:17
-#: src/zope/app/apidoc/classmodule/class_index.pt:79
-#: src/zope/app/apidoc/classmodule/class_index.pt:120
+#: src/zope/app/apidoc/classmodule/class_index.pt:83
+#: src/zope/app/apidoc/classmodule/class_index.pt:124
 msgid "Interface:"
 msgstr "Interfaz:"
 
@@ -327,14 +332,14 @@
 
 #: src/zope/app/apidoc/servicemodule/index.pt:55
 #: src/zope/app/apidoc/utilitymodule/index.pt:61
-#: src/zope/app/apidoc/ifacemodule/index.pt:77
+#: src/zope/app/apidoc/ifacemodule/index.pt:78
 msgid "There are no attributes or fields specified."
 msgstr ""
 
 #: src/zope/app/apidoc/servicemodule/index.pt:62
 #: src/zope/app/apidoc/utilitymodule/index.pt:68
-#: src/zope/app/apidoc/classmodule/class_index.pt:104
-#: src/zope/app/apidoc/ifacemodule/index.pt:84
+#: src/zope/app/apidoc/classmodule/class_index.pt:108
+#: src/zope/app/apidoc/ifacemodule/index.pt:85
 msgid "Methods"
 msgstr "MÃ©todos"
 
@@ -351,14 +356,14 @@
 msgid "This is a list of all available services by name."
 msgstr ""
 
-#: src/zope/app/apidoc/utilities.py:254 src/zope/app/apidoc/utilities.py:256
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:55
+#: src/zope/app/apidoc/utilities.py:233 src/zope/app/apidoc/utilities.py:235
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:58
 msgid "n/a"
 msgstr ""
 
-#: src/zope/app/apidoc/utilitymodule/__init__.py:132
+#: src/zope/app/apidoc/utilitymodule/__init__.py:129
 #: src/zope/app/utility/browser/configure.zcml:31
-#: src/zope/app/apidoc/ifacemodule/index.pt:222
+#: src/zope/app/apidoc/ifacemodule/index.pt:223
 msgid "Utilities"
 msgstr "Herramientas"
 
@@ -371,12 +376,12 @@
 msgid "(Attribute)"
 msgstr ""
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:200
-#: src/zope/app/apidoc/viewmodule/__init__.py:262
+#: src/zope/app/apidoc/viewmodule/__init__.py:201
+#: src/zope/app/apidoc/viewmodule/__init__.py:263
 msgid "$file (line $line)"
 msgstr "$file (lÃnea $line)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:64
+#: src/zope/app/apidoc/viewmodule/__init__.py:65
 msgid "Presentations"
 msgstr "Presentaciones"
 
@@ -409,12 +414,11 @@
 msgstr "vistas para"
 
 #: src/zope/app/apidoc/viewmodule/index.pt:77
-#: src/zope/app/apidoc/classmodule/class_index.pt:87
-#: src/zope/app/apidoc/classmodule/class_index.pt:129
-msgid "Permissions:"
+#, fuzzy
+msgid "Permission:"
 msgstr "Permisos:"
 
-#: src/zope/app/apidoc/viewmodule/index.pt:90
+#: src/zope/app/apidoc/viewmodule/index.pt:89
 msgid "There are no views for this interface and presentation type."
 msgstr ""
 
@@ -455,7 +459,7 @@
 "which the skin or layer was declared."
 msgstr ""
 
-#: src/zope/app/apidoc/zcmlmodule/__init__.py:190
+#: src/zope/app/apidoc/zcmlmodule/__init__.py:192
 msgid "ZCML Reference"
 msgstr ""
 
@@ -483,7 +487,7 @@
 msgstr "Esquema"
 
 #: src/zope/app/apidoc/zcmlmodule/index.pt:68
-#: src/zope/app/apidoc/ifacemodule/index.pt:69
+#: src/zope/app/apidoc/ifacemodule/index.pt:70
 msgid "default"
 msgstr "defecto"
 
@@ -557,11 +561,11 @@
 msgid "Python path"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:44
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:47
 msgid "${days} day(s) ${hours}:${minutes}:${seconds}"
 msgstr "${days} dias ${hours}:${minutes}:${seconds}"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:65
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:68
 msgid "Could not retrieve runtime information."
 msgstr ""
 
@@ -590,11 +594,11 @@
 msgid "Shutdown time:"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:32
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:34
 msgid "You restarted the server."
 msgstr "Ha reiniciado el servidor"
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:35
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:37
 msgid "You shut down the server."
 msgstr "Ha apagado el servidor"
 
@@ -610,7 +614,7 @@
 msgid "reload-button"
 msgstr "Actualizar"
 
-#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:49
+#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:51
 msgid "Message Catalog successfully reloaded."
 msgstr ""
 
@@ -638,20 +642,20 @@
 msgid "Name of database: ${name}"
 msgstr "Nombre de la base de datos: ${name}"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:31
-#: src/zope/app/size/__init__.py:52
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:33
+#: src/zope/app/size/__init__.py:50
 msgid "${size} MB"
 msgstr "${size} MB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:34
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:36
 msgid "${size} kB"
 msgstr "${size} kB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:37
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:39
 msgid "${size} Bytes"
 msgstr "${size} Bytes"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:50
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:52
 msgid "ZODB successfully packed."
 msgstr ""
 
@@ -663,15 +667,15 @@
 msgid "Broken object"
 msgstr ""
 
-#: src/zope/app/bundle/browser/__init__.py:112
+#: src/zope/app/bundle/browser/__init__.py:114
 msgid "Activated: ${activated}.\n"
 msgstr "Activado: ${activated}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:115
+#: src/zope/app/bundle/browser/__init__.py:117
 msgid "Registered: ${registered}.\n"
 msgstr "Registrado: ${registered}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:85
+#: src/zope/app/bundle/browser/__init__.py:87
 msgid "unregistered ${count} registrations"
 msgstr ""
 
@@ -769,15 +773,15 @@
 msgid "Bundle"
 msgstr "Paquete"
 
-#: src/zope/app/cache/browser/cacheable.py:57
+#: src/zope/app/cache/browser/cacheable.py:63
 msgid "cache-invalidated"
 msgstr "El cachÃ© ha sido invalidado."
 
-#: src/zope/app/cache/browser/cacheable.py:59
+#: src/zope/app/cache/browser/cacheable.py:65
 msgid "no-cache-associated"
 msgstr "No cachÃ© ha sido asociado con este objeto."
 
-#: src/zope/app/cache/browser/cacheable.py:71
+#: src/zope/app/cache/browser/cacheable.py:77
 msgid "Saved changes."
 msgstr "Los cambios han sido guardados."
 
@@ -801,6 +805,28 @@
 msgid "Currently there is no cache associated with the object."
 msgstr "Actualmente no hay ningÃºn cachÃ© asociado con el objeto."
 
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "RAM Cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "A RAM cache is a volatile (in memory) cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:26
+#, fuzzy
+msgid "Statistics"
+msgstr "Estado"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+#, fuzzy
+msgid "Caches"
+msgstr "Nombre del cache"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+msgid "Caches can be used to make your site run faster."
+msgstr ""
+
 #: src/zope/app/cache/browser/ramedit.pt:20
 msgid "Maximum cached entries"
 msgstr ""
@@ -817,6 +843,12 @@
 msgid "You can configure the RAM Cache here."
 msgstr "Puede configurar el CachÃ© RAM aquÃ."
 
+#: src/zope/app/cache/browser/ramedit.pt:53
+#: src/zope/app/site/browser/add_svc_config.pt:35
+#: src/zope/app/bundle/browser/bundle.pt:130
+msgid "reset-button"
+msgstr "Reiniciar"
+
 #: src/zope/app/cache/browser/ramstats.pt:20
 msgid "Path"
 msgstr "LocalizaciÃ³n"
@@ -841,7 +873,7 @@
 msgid "RAMCache statistics"
 msgstr "Statisticas RAMCache"
 
-#: src/zope/app/container/browser/adding.py:117
+#: src/zope/app/container/browser/adding.py:119
 msgid "You must select the type of object to add."
 msgstr "Tiene que seleccionar el tip del objeto para aÃ±adir"
 
@@ -873,23 +905,23 @@
 msgid "container-cancel-button"
 msgstr "Cancelar"
 
-#: src/zope/app/container/browser/contents.py:232
+#: src/zope/app/container/browser/contents.py:233
 msgid "You didn't specify any ids to remove."
 msgstr "No especificÃ³ un id para borrar."
 
-#: src/zope/app/container/browser/contents.py:244
+#: src/zope/app/container/browser/contents.py:245
 msgid "You didn't specify any ids to copy."
 msgstr "No especificÃ³ un id para copiar."
 
-#: src/zope/app/container/browser/contents.py:264
+#: src/zope/app/container/browser/contents.py:265
 msgid "You didn't specify any ids to cut."
 msgstr "No especificÃ³ un id para cortar."
 
-#: src/zope/app/container/browser/contents.py:61
+#: src/zope/app/container/browser/contents.py:62
 msgid "You didn't specify any ids to rename."
 msgstr "No especificÃ³ un id para renombrar."
 
-#: src/zope/app/container/browser/metaconfigure.py:63
+#: src/zope/app/container/browser/metaconfigure.py:65
 #: src/zope/app/folder/browser/configure.zcml:20
 #: src/zope/app/site/browser/configure.zcml:19
 #: src/zope/app/bundle/browser/configure.zcml:11
@@ -898,7 +930,7 @@
 msgid "Contents"
 msgstr "Contenido"
 
-#: src/zope/app/container/browser/metaconfigure.py:71
+#: src/zope/app/container/browser/metaconfigure.py:73
 #: src/zope/app/schema/browser/configure.zcml:15
 #: src/zope/app/container/browser/configure.zcml:5
 #: src/zope/app/registration/browser/configure.zcml:42
@@ -908,19 +940,19 @@
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: src/zope/app/container/constraints.py:185
+#: src/zope/app/container/constraints.py:186
 msgid "Container is not a valid Zope container."
 msgstr ""
 
-#: src/zope/app/container/contained.py:688
+#: src/zope/app/container/contained.py:690
 msgid "An empty name was provided. Names cannot be empty."
 msgstr ""
 
-#: src/zope/app/container/contained.py:698
+#: src/zope/app/container/contained.py:700
 msgid "Names cannot begin with '+' or '@' or contain '/'"
 msgstr ""
 
-#: src/zope/app/container/contained.py:703
+#: src/zope/app/container/contained.py:705
 msgid "The given name is already being used"
 msgstr ""
 
@@ -941,7 +973,6 @@
 msgstr ""
 
 #: src/zope/app/debugskin/unauthorized.pt:7
-#: src/zope/app/exception/browser/unauthorized.pt:8
 msgid "Unauthorized"
 msgstr ""
 
@@ -986,27 +1017,27 @@
 msgid "A simple, content-based DTML page"
 msgstr "Una pÃ¡gina DTML sencilla y basada en contenido"
 
-#: src/zope/app/dtmlpage/interfaces.py:31
+#: src/zope/app/dtmlpage/interfaces.py:32
 #: src/zope/app/pythonpage/__init__.py:39
-#: src/zope/app/sqlscript/interfaces.py:44
+#: src/zope/app/sqlscript/interfaces.py:45
 #: src/zope/app/zptpage/interfaces.py:36
 msgid "Source"
 msgstr "Fuente"
 
-#: src/zope/app/dtmlpage/interfaces.py:32
+#: src/zope/app/dtmlpage/interfaces.py:33
 msgid "The source of the dtml page."
 msgstr "El codigo fuente de la pÃ¡gina DTML."
 
 #: src/zope/app/dublincore/browser/configure.zcml:10
-#: src/zope/app/zopetop/widget_macros.pt:166
+#: src/zope/app/zopetop/widget_macros.pt:186
 msgid "Metadata"
 msgstr "Datos de meta"
 
-#: src/zope/app/dublincore/browser/edit.pt:43
+#: src/zope/app/dublincore/browser/edit.pt:45
 msgid "Content Last Modified"
 msgstr "Ãšltima modificaciÃ³n del contenido"
 
-#: src/zope/app/dublincore/browser/edit.pt:47
+#: src/zope/app/dublincore/browser/edit.pt:49
 msgid "Creator"
 msgstr "Creador"
 
@@ -1150,6 +1181,10 @@
 msgid "The page that you are trying to access is not available"
 msgstr ""
 
+#: src/zope/app/exception/browser/unauthorized.pt:10
+msgid "You are not authorized"
+msgstr ""
+
 #: src/zope/app/file/browser/configure.zcml:109
 msgid "Add a Image"
 msgstr "AÃ±adir un imagen"
@@ -1207,7 +1242,7 @@
 msgid "Image"
 msgstr "Imagen"
 
-#: src/zope/app/file/image.py:73
+#: src/zope/app/file/image.py:72
 msgid " ${width}x${height}"
 msgstr " ${width}x${height}"
 
@@ -1251,12 +1286,11 @@
 msgstr "Carpeta mÃnima"
 
 #: src/zope/app/form/browser/add.pt:55
-#: src/zope/app/wiki/browser/wiki_add.pt:34
 msgid "Object Name"
 msgstr "Nombre del Objeto"
 
-#: src/zope/app/form/browser/add.py:61
-#: src/zope/app/form/browser/editview.py:109
+#: src/zope/app/form/browser/add.py:60
+#: src/zope/app/form/browser/editview.py:108
 #: src/zope/app/schema/browser/__init__.py:53
 #: src/zope/app/schema/browser/__init__.py:64
 #: src/zope/app/schema/browser/__init__.py:70
@@ -1335,12 +1369,11 @@
 #: src/zope/app/publisher/interfaces/browser.py:44
 #: src/zope/app/publisher/interfaces/browser.py:87
 #: src/zope/app/security/interfaces/__init__.py:44
-#: src/zope/app/security/interfaces/__init__.py:197
-#: src/zope/app/wiki/interfaces.py:39 src/zope/schema/interfaces.py:100
-#: src/zope/schema/interfaces.py:484
-#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/security/interfaces/__init__.py:189
+#: src/zope/schema/interfaces.py:100 src/zope/schema/interfaces.py:484
 #: src/zope/app/menu/browser/menu_contents.pt:31
-#: src/zope/app/dublincore/browser/edit.pt:14
+#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/dublincore/browser/edit.pt:16
 #: src/zope/app/schema/browser/schema_edit.pt:38
 #: src/zope/app/container/browser/contents.pt:33
 #: src/zope/app/container/browser/index.pt:27
@@ -1355,25 +1388,25 @@
 msgid "widget-missing-multiple-value"
 msgstr ""
 
-#: src/zope/app/form/browser/editview.py:118
+#: src/zope/app/form/browser/editview.py:117
 msgid "Updated on ${date_time}"
 msgstr "Los datos han sido cambiado ${date_time}"
 
-#: src/zope/app/form/browser/editwizard.pt:47
-#: src/zope/app/form/browser/addwizard.pt:55
+#: src/zope/app/form/browser/editwizard.pt:42
+#: src/zope/app/form/browser/addwizard.pt:63
 msgid "previous-button"
 msgstr "Anterior"
 
-#: src/zope/app/form/browser/editwizard.pt:53
-#: src/zope/app/form/browser/addwizard.pt:61
+#: src/zope/app/form/browser/editwizard.pt:48
+#: src/zope/app/form/browser/addwizard.pt:69
 msgid "next-button"
 msgstr "Siguiente"
 
-#: src/zope/app/form/browser/editwizard.py:149
+#: src/zope/app/form/browser/editwizard.py:148
 msgid "No changes to save"
 msgstr "No hay cambios para guardar"
 
-#: src/zope/app/form/browser/editwizard.py:151
+#: src/zope/app/form/browser/editwizard.py:150
 msgid "Changes saved"
 msgstr "Los cambios han sido guardado"
 
@@ -1385,21 +1418,21 @@
 msgid "vocabulary-missing-multiple-value-for-display"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:425
-#: src/zope/app/form/browser/itemswidgets.py:469
+#: src/zope/app/form/browser/itemswidgets.py:426
+#: src/zope/app/form/browser/itemswidgets.py:470
 msgid "vocabulary-missing-single-value-for-edit"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:543
+#: src/zope/app/form/browser/itemswidgets.py:544
 msgid "vocabulary-missing-multiple-value-for-edit"
 msgstr ""
 
 # Default: "Remove selected items"
-#: src/zope/app/form/browser/sequencewidget.py:84
+#: src/zope/app/form/browser/sequencewidget.py:82
 msgid "remove-selected-items"
 msgstr ""
 
-#: src/zope/app/form/browser/sequencewidget.py:91
+#: src/zope/app/form/browser/sequencewidget.py:89
 msgid "Add %s"
 msgstr "AÃ±adir %s"
 
@@ -1565,23 +1598,23 @@
 msgid "synchronize-button"
 msgstr "Sincornizar"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Up to Date"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "New Remote"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Out of Date"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Does not exist"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Newer Local"
 msgstr ""
 
@@ -1669,7 +1702,6 @@
 #: src/zope/app/i18nfile/browser/file_edit.pt:68
 #: src/zope/app/i18nfile/browser/image_edit.pt:69
 #: src/zope/app/introspector/marker.pt:118
-#: src/zope/app/wiki/browser/subscriptions.pt:19
 #: src/zope/app/registration/browser/editregistration.pt:53
 msgid "remove-button"
 msgstr "Quitar"
@@ -1683,7 +1715,7 @@
 #: src/zope/app/i18nfile/browser/image_edit.pt:94
 #: src/zope/app/cache/browser/cacheableedit.pt:45
 #: src/zope/app/cache/browser/ramedit.pt:51
-#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/dublincore/browser/edit.pt:35
 #: src/zope/app/rdb/browser/rdbconnection.pt:28
 #: src/zope/app/errorservice/browser/error_config.pt:46
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:63
@@ -1691,18 +1723,18 @@
 msgid "save-changes-button"
 msgstr "Guardar cambios"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:45
-#: src/zope/app/i18nfile/browser/i18nimage.py:27
+#: src/zope/app/i18nfile/browser/i18nfile.py:44
+#: src/zope/app/i18nfile/browser/i18nimage.py:29
 msgid "Edit Form"
 msgstr "Ficha de editar"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:46
+#: src/zope/app/i18nfile/browser/i18nfile.py:45
 #, fuzzy
 msgid ""
 "This edit form allows you to make changes to the properties of this file."
 msgstr "En esta ficha puede cambiar los propiedades de esta imagen."
 
-#: src/zope/app/i18nfile/browser/i18nimage.py:28
+#: src/zope/app/i18nfile/browser/i18nimage.py:30
 msgid ""
 "This edit form allows you to make changes to the properties of this image."
 msgstr "En esta ficha puede cambiar los propiedades de esta imagen."
@@ -1892,10 +1924,10 @@
 msgstr ""
 
 #: src/zope/app/menu/browser/menu_contents.pt:25
+#: src/zope/app/uniqueid/browser/registrations.pt:7
 #: src/zope/app/schema/browser/schema_edit.pt:30
 #: src/zope/app/container/browser/contents.pt:26
 #: src/zope/app/container/browser/index.pt:18
-#: src/zope/app/uniqueid/browser/registrations.pt:7
 msgid "Content listing"
 msgstr "Lista de contenido"
 
@@ -1904,7 +1936,7 @@
 msgstr "AcciÃ³n"
 
 #: src/zope/app/menu/browser/menu_contents.pt:33
-#: src/zope/app/dublincore/browser/edit.pt:39
+#: src/zope/app/dublincore/browser/edit.pt:41
 #: src/zope/app/container/browser/contents.pt:35
 #: src/zope/app/container/browser/index.pt:28
 msgid "Created"
@@ -2047,7 +2079,7 @@
 msgstr "Editar un mÃ³dulo"
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:30
-#: src/zope/app/zopetop/widget_macros.pt:215
+#: src/zope/app/zopetop/widget_macros.pt:235
 msgid "Help"
 msgstr "Auxilio"
 
@@ -2084,7 +2116,7 @@
 
 #: src/zope/app/onlinehelp/interfaces.py:46
 #: src/zope/app/security/interfaces/__init__.py:38
-#: src/zope/app/security/interfaces/__init__.py:191
+#: src/zope/app/security/interfaces/__init__.py:183
 #: src/zope/app/workflow/stateful/browser/addtransition.pt:12
 #: src/zope/app/workflow/stateful/browser/addstate.pt:12
 msgid "Id"
@@ -2114,8 +2146,7 @@
 msgid "Help Topic"
 msgstr ""
 
-#: src/zope/app/onlinehelp/interfaces.py:64 src/zope/app/wiki/interfaces.py:45
-#: src/zope/app/wiki/interfaces.py:71
+#: src/zope/app/onlinehelp/interfaces.py:64
 msgid "Source Text"
 msgstr "Texto Fuente"
 
@@ -2131,13 +2162,11 @@
 msgid "The Path to the Definition of a Help Topic"
 msgstr ""
 
-#: src/zope/app/onlinehelp/interfaces.py:77 src/zope/app/wiki/interfaces.py:51
-#: src/zope/app/wiki/interfaces.py:77
+#: src/zope/app/onlinehelp/interfaces.py:77
 msgid "Source Type"
 msgstr "Tipo de Fuente"
 
-#: src/zope/app/onlinehelp/interfaces.py:78 src/zope/app/wiki/interfaces.py:52
-#: src/zope/app/wiki/interfaces.py:78
+#: src/zope/app/onlinehelp/interfaces.py:78
 msgid "Type of the source text, e.g. structured text"
 msgstr ""
 
@@ -2193,6 +2222,7 @@
 #: src/zope/app/schema/fieldforms.zcml:151
 #: src/zope/app/module/browser/configure.zcml:6
 #: src/zope/app/utility/browser/configure.zcml:85
+#: src/zope/app/cache/browser/configure.zcml:24
 #: src/zope/app/file/browser/configure.zcml:29
 #: src/zope/app/i18nfile/browser/configure.zcml:31
 #: src/zope/app/i18nfile/browser/configure.zcml:73
@@ -2200,12 +2230,11 @@
 #: src/zope/app/rdb/browser/configure.zcml:27
 #: src/zope/app/schemacontent/browser/configure.zcml:46
 #: src/zope/app/schemacontent/browser/configure.zcml:88
-#: src/zope/app/wiki/browser/configure.zcml:76
-#: src/zope/app/wiki/browser/configure.zcml:160
 #: src/zope/app/menu/browser/configure.zcml:71
 #: src/zope/app/menu/browser/configure.zcml:106
-#: src/zope/app/session/browser.zcml:25 src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:15 src/zope/app/session/browser.zcml:38
 #: src/zope/app/zptpage/browser/configure.zcml:39
+#: src/zwiki/browser/configure.zcml:76 src/zwiki/browser/configure.zcml:160
 #: src/zope/app/securitypolicy/browser/configure.zcml:25
 msgid "Edit"
 msgstr "Editar"
@@ -2315,7 +2344,7 @@
 msgid "${view_name} ${ptype} View for ${iface_name} in layer ${layer}"
 msgstr ""
 
-#: src/zope/app/presentation/presentation.py:273
+#: src/zope/app/presentation/presentation.py:274
 msgid "Registered by ZCML"
 msgstr "Registrado por ZCML"
 
@@ -2671,7 +2700,7 @@
 "specific function and is activated."
 msgstr ""
 
-#: src/zope/app/registration/configure.zcml:23
+#: src/zope/app/registration/configure.zcml:38
 #: src/zope/app/registration/browser/editregistration.pt:10
 msgid "Registration Manager"
 msgstr "Administrador de registraciones"
@@ -2732,7 +2761,7 @@
 msgstr ""
 
 #: src/zope/app/rotterdam/dialog_macros.pt:135
-#: src/zope/app/rotterdam/template.pt:208
+#: src/zope/app/rotterdam/template.pt:205
 msgid "Tip"
 msgstr ""
 
@@ -2744,7 +2773,7 @@
 msgid "Extended Editor"
 msgstr ""
 
-#: src/zope/app/rotterdam/template.pt:102
+#: src/zope/app/rotterdam/template.pt:100
 msgid "Location:&nbsp;"
 msgstr "LocaciÃ³n:&nbsp;"
 
@@ -2752,11 +2781,11 @@
 msgid "[Logout]"
 msgstr "[Salir]"
 
-#: src/zope/app/rotterdam/template.pt:56
+#: src/zope/app/rotterdam/template.pt:55
 msgid "[Login]"
 msgstr "[Entrar]"
 
-#: src/zope/app/rotterdam/template.pt:77
+#: src/zope/app/rotterdam/template.pt:75
 msgid "Add:"
 msgstr "AÃ±adir:"
 
@@ -3125,7 +3154,7 @@
 
 #: src/zope/app/security/browser/login_failed.pt:9
 msgid ""
-"You cancelled the login procedure. <a href=\"\"> Click here to return. </a>"
+"You cancelled the login procedure. <a href=\"\">Click here to return.</a>"
 msgstr ""
 
 #: src/zope/app/security/browser/logout.pt:5
@@ -3144,15 +3173,10 @@
 msgid "If you you see this screen for more than 5 seconds, click here."
 msgstr ""
 
-#: src/zope/app/security/configure.zcml:53
+#: src/zope/app/security/configure.zcml:56
 msgid "change-security-settings-permission"
 msgstr "Cambiar configuraciÃ³n de seguridad"
 
-# Default: "Manage Content"
-#: src/zope/app/security/configure.zcml:58
-msgid "manage-content-permission"
-msgstr ""
-
 #: src/zope/app/security/configure.zcml:6
 msgid ""
 "Special permission indicating unconditional access.                    "
@@ -3160,52 +3184,57 @@
 msgstr ""
 
 #: src/zope/app/security/configure.zcml:6
-#: src/zope/app/security/configure.zcml:48
+#: src/zope/app/security/configure.zcml:51
 msgid "view-permission"
 msgstr "Ver"
 
+# Default: "Manage Content"
+#: src/zope/app/security/configure.zcml:61
+msgid "manage-content-permission"
+msgstr ""
+
 # Default: "Manage Service Bindings"
-#: src/zope/app/security/configure.zcml:63
+#: src/zope/app/security/configure.zcml:66
 msgid "manage-service-bindings-permission"
 msgstr ""
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "Manage executable code, including Python, SQL, ZPT, etc."
 msgstr "Administrar codigo executable, incluyendo Python, SQL, ZPT, etc."
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "manage-code-permission"
 msgstr "Manejar Codigo"
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:74
+#: src/zope/app/security/configure.zcml:77
 msgid "manage-services-permission"
 msgstr "Manejar Servicios"
 
 # Default: "Manage Principals"
-#: src/zope/app/security/configure.zcml:79
+#: src/zope/app/security/configure.zcml:82
 msgid "manage-principal-permission"
 msgstr "Manejar Principales"
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid ""
 "Manage the Zope Application, such as Restart/Shutdown or                    "
 "packing the ZODB."
 msgstr ""
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid "manage-application-permission"
 msgstr "Manejar la aplicaciÃ³n"
 
-#: src/zope/app/security/interfaces/__init__.py:192
+#: src/zope/app/security/interfaces/__init__.py:184
 msgid "Id as which this permission will be known and used."
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:198
+#: src/zope/app/security/interfaces/__init__.py:190
 msgid "Provides a title for the permission."
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:203
+#: src/zope/app/security/interfaces/__init__.py:195
 msgid "Provides a description for the permission."
 msgstr ""
 
@@ -3218,11 +3247,11 @@
 msgstr ""
 
 #: src/zope/app/security/interfaces/__init__.py:50
-#: src/zope/app/security/interfaces/__init__.py:202
+#: src/zope/app/security/interfaces/__init__.py:194
 #: src/zope/schema/interfaces.py:107
 #: src/zope/app/site/browser/interfacedetail.pt:21
 #: src/zope/app/site/browser/interfacedetail.pt:48
-#: src/zope/app/dublincore/browser/edit.pt:22
+#: src/zope/app/dublincore/browser/edit.pt:24
 #: src/zope/app/introspector/marker.pt:63
 #: src/zope/app/introspector/introspector.pt:52
 #: src/zope/app/introspector/introspector.pt:155
@@ -3356,155 +3385,160 @@
 msgid "permission-deny"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "All users have this role implicitly"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "Everybody"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:67
+#: src/zope/app/securitypolicy/configure.zcml:94
 msgid "Site Manager"
 msgstr "Administrador del sitio"
 
-#: src/zope/app/securitypolicy/configure.zcml:68
+#: src/zope/app/securitypolicy/configure.zcml:95
 msgid "Site Member"
 msgstr "Miembro del sitio"
 
-#: src/zope/app/session/browser.zcml:25
-msgid "Cookie Browser ID Manager Properties"
+#: src/zope/app/session/browser.zcml:15
+msgid "Cookie Client Id Manager Properties"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Stores session data persistently in the ZODB"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Persistent Session Data Container"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "Stores session data in RAM"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "RAM Session Data Container"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:38
 msgid "Session Data Container Properties"
 msgstr ""
 
 #: src/zope/app/session/browser.zcml:8
 msgid ""
-"Uses a cookie to uniquely identify a browser, allowing        state to be "
+"Uses a cookie to uniquely identify a client, allowing        state to be "
 "maintained between requests"
 msgstr ""
 
 #: src/zope/app/session/browser.zcml:8
-msgid "Cookie Browser Id Manager"
+msgid "Cookie Client Id Manager"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:100
-msgid "Timeout"
+#: src/zope/app/session/http.py:48
+msgid "Cookie Name"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:101
-msgid "Number of seconds before data becomes stale and may be removed"
+#: src/zope/app/session/http.py:49
+msgid ""
+"Name of cookie used to maintain state. Must be unique to the site domain "
+"name, and only contain ASCII letters, digits and '_'"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:109
-msgid "Purge Interval"
+#: src/zope/app/session/http.py:61
+msgid "Cookie Lifetime"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:110
+#: src/zope/app/session/http.py:62
 msgid ""
-"How often stale data is purged in seconds. Higer values improve performance."
+"Number of seconds until the browser expires the cookie. Leave blank expire "
+"the cookie when the browser is quit. Set to 0 to never expire. "
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:144
+#: src/zope/app/session/interfaces.py:125
 msgid "Last Access Time"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:145
+#: src/zope/app/session/interfaces.py:126
 msgid ""
 "Approximate epoch time this ISessionData was last retrieved from its "
 "ISessionDataContainer"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:53
-msgid "Cookie Name"
+#: src/zope/app/session/interfaces.py:66
+msgid "Timeout"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:54
+#: src/zope/app/session/interfaces.py:67
 msgid ""
-"Name of cookie used to maintain state. Must be unique to the site domain "
-"name, and only contain ASCII letters, digits and '_'"
+"Number of seconds before data becomes stale and may be removed. A value of "
+"'0' means no expiration."
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:66
-msgid "Cookie Lifetime"
+#: src/zope/app/session/interfaces.py:75
+msgid "Timeout resolution (in seconds)"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:67
+#: src/zope/app/session/interfaces.py:76
 msgid ""
-"Number of seconds until the browser expires the cookie. Leave blank expire "
-"the cookie when the browser is quit. Set to 0 to never expire. "
+"Defines what the 'resolution' of item timeout is. Setting this higher allows "
+"the transience machinery to do fewer 'writes' at the expense of  causing "
+"items to time out later than the 'Data object timeout value' by  a factor of "
+"(at most) this many seconds."
 msgstr ""
 
 #: src/zope/app/site/browser/__init__.py:108
 msgid "Add Service"
 msgstr "AÃ±adir Servicio"
 
-#: src/zope/app/site/browser/__init__.py:145
+#: src/zope/app/site/browser/__init__.py:144
 #: src/zope/app/schema/browser/schema_add.pt:8
 msgid "Add Utility"
 msgstr "AÃ±adir Herramienta"
 
-#: src/zope/app/site/browser/__init__.py:236
+#: src/zope/app/site/browser/__init__.py:234
 msgid "Activated: ${activated_services}"
 msgstr "Activado: ${activated_services}"
 
-#: src/zope/app/site/browser/__init__.py:240
+#: src/zope/app/site/browser/__init__.py:238
 msgid "All of the checked services were already active"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:251
+#: src/zope/app/site/browser/__init__.py:249
 msgid "Deactivated: ${deactivated_services}"
 msgstr "Desactivado: ${deactivated_services}"
 
-#: src/zope/app/site/browser/__init__.py:255
+#: src/zope/app/site/browser/__init__.py:253
 msgid "None of the checked services were active"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:266
+#: src/zope/app/site/browser/__init__.py:264
 msgid ""
 "Can't delete active service(s): ${service_names}; use the Deactivate button "
 "to deactivate"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:300
+#: src/zope/app/site/browser/__init__.py:298
 msgid "Deleted: ${service_names}"
 msgstr "Borrado: ${service_names}"
 
-#: src/zope/app/site/browser/__init__.py:335
+#: src/zope/app/site/browser/__init__.py:333
 msgid "global"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:416
+#: src/zope/app/site/browser/__init__.py:414
 msgid "Invalid service type specified"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:423
+#: src/zope/app/site/browser/__init__.py:421
 msgid "No change"
 msgstr "No hubieron cambios"
 
-#: src/zope/app/site/browser/__init__.py:427
+#: src/zope/app/site/browser/__init__.py:425
 msgid "Service deactivated"
 msgstr "El servicio ha sido desactivado"
 
-#: src/zope/app/site/browser/__init__.py:430
+#: src/zope/app/site/browser/__init__.py:428
 msgid "${active_services} activated"
 msgstr ""
 
@@ -3517,12 +3551,6 @@
 msgid "Service name"
 msgstr "Nombre del servicio"
 
-#: src/zope/app/site/browser/add_svc_config.pt:35
-#: src/zope/app/cache/browser/ramedit.pt:53
-#: src/zope/app/bundle/browser/bundle.pt:130
-msgid "reset-button"
-msgstr "Reiniciar"
-
 #: src/zope/app/site/browser/add_svc_config.pt:7
 msgid "Register this object to provide the following service(s):"
 msgstr ""
@@ -3557,7 +3585,7 @@
 
 #: src/zope/app/site/browser/configure.zcml:210
 #: src/zope/app/site/browser/serviceactivation.pt:26
-#: src/zope/app/apidoc/ifacemodule/index.pt:247
+#: src/zope/app/apidoc/ifacemodule/index.pt:248
 msgid "Service"
 msgstr "Servicio"
 
@@ -3656,19 +3684,13 @@
 #: src/zope/app/zptpage/browser/inlinecode.pt:65
 #: src/zope/app/workflow/stateful/browser/instance_manage.pt:76
 #: src/zope/app/pythonpage/edit.pt:71
-#: src/zope/app/form/browser/editwizard.pt:50
-#: src/zope/app/form/browser/addwizard.pt:58
+#: src/zope/app/form/browser/editwizard.pt:45
+#: src/zope/app/form/browser/addwizard.pt:66
 #: src/zope/app/form/browser/edit.pt:52
 #: src/zope/app/registration/browser/editregistration.pt:51
 msgid "submit-button"
 msgstr "Someter"
 
-#: src/zope/app/site/browser/services.pt:15
-#: src/zope/app/utility/browser/utilities.pt:11
-#: src/zope/app/bundle/browser/bundle.pt:53
-msgid "(click to clear message)"
-msgstr ""
-
 #: src/zope/app/site/browser/services.pt:18
 msgid "No services are registered."
 msgstr "No hay servicios registrados."
@@ -3704,22 +3726,18 @@
 msgstr ""
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:30
+#: src/zope/app/site/browser/tasks.pt:30 src/zope/app/site/browser/tasks.pt:35
 msgid "label-configure-services"
 msgstr ""
 
 # Default: "Configure utilities"
-#: src/zope/app/site/browser/tasks.pt:36
+#: src/zope/app/site/browser/tasks.pt:41
 msgid "label-configure-utilities"
 msgstr ""
 
-#: src/zope/app/site/browser/tasks.pt:43
-msgid "label-add-service"
-msgstr "AÃ±adir Servicio"
-
-# Default: "Add a utility"
+# Default: "Software"
 #: src/zope/app/site/browser/tasks.pt:49
-msgid "label-add-utility"
+msgid "label-software"
 msgstr ""
 
 # Default: "Common Site Management Tasks"
@@ -3727,12 +3745,7 @@
 msgid "heading-common-site-management-tasks"
 msgstr ""
 
-# Default: "Software"
-#: src/zope/app/site/browser/tasks.pt:56
-msgid "label-software"
-msgstr ""
-
-#: src/zope/app/site/browser/tasks.pt:59
+#: src/zope/app/site/browser/tasks.pt:52
 msgid ""
 "The site may customize the behavior of existing software or define its own. "
 "The first step in creating a new software package is to create a new Site "
@@ -3740,12 +3753,12 @@
 msgstr ""
 
 # Default: "Customize the behavior of existing software"
-#: src/zope/app/site/browser/tasks.pt:68
+#: src/zope/app/site/browser/tasks.pt:61
 msgid "label-customize-existing-software"
 msgstr ""
 
 # Default: "Create a new Site Management Folder"
-#: src/zope/app/site/browser/tasks.pt:75
+#: src/zope/app/site/browser/tasks.pt:68
 msgid "label-create-new-site-management-folder"
 msgstr ""
 
@@ -3759,24 +3772,6 @@
 msgid "rename-button"
 msgstr "Renombrar"
 
-#: src/zope/app/site/browser/tool.pt:106
-#: src/zope/app/site/browser/services.pt:74
-#: src/zope/app/utility/browser/utilities.pt:50
-#: src/zope/app/zptpage/browser/inlinecode.pt:63
-#: src/zope/app/dublincore/browser/edit.pt:31
-#: src/zope/app/schemacontent/browser/permission_edit.pt:33
-#: src/zope/app/errorservice/browser/error.pt:52
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
-#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
-#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
-#: src/zope/app/form/browser/edit.pt:50
-#: src/zope/app/wiki/browser/subscriptions.pt:35
-#: src/zope/app/wiki/browser/wiki_add.pt:29
-#: src/zope/app/registration/browser/editregistration.pt:49
-msgid "refresh-button"
-msgstr "Actualizar"
-
 #: src/zope/app/site/browser/tool.pt:110
 #: src/zope/app/securitypolicy/browser/principal_role_association.pt:98
 msgid "apply-button"
@@ -3806,21 +3801,6 @@
 msgid "disabled"
 msgstr ""
 
-#: src/zope/app/site/browser/tool.pt:91
-#: src/zope/app/site/browser/services.pt:66
-#: src/zope/app/site/browser/add_svc_config.pt:16
-#: src/zope/app/utility/browser/utilities.pt:42
-#: src/zope/app/registration/browser/registration.pt:30
-msgid "activate-button"
-msgstr "Activar"
-
-#: src/zope/app/site/browser/tool.pt:93
-#: src/zope/app/site/browser/services.pt:68
-#: src/zope/app/utility/browser/utilities.pt:44
-#: src/zope/app/registration/browser/registration.pt:25
-msgid "deactivate-button"
-msgstr "Desactivar"
-
 #: src/zope/app/site/browser/tool.pt:96
 #: src/zope/app/schema/browser/schema_add.pt:39
 #: src/zope/app/workflow/stateful/browser/add.pt:65
@@ -3829,40 +3809,30 @@
 #: src/zope/app/i18n/browser/translate.pt:48
 #: src/zope/app/container/browser/add.pt:38
 #: src/zope/app/introspector/marker.pt:133 src/zope/app/form/browser/add.pt:52
-#: src/zope/app/wiki/browser/subscriptions.pt:37
-#: src/zope/app/wiki/browser/wiki_add.pt:31
 msgid "add-button"
 msgstr "AÃ±adir"
 
-#: src/zope/app/site/browser/tool.pt:99
-#: src/zope/app/site/browser/services.pt:71
-#: src/zope/app/utility/browser/utilities.pt:47
-#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
-#: src/zope/app/i18n/browser/translate.pt:37
-msgid "delete-button"
-msgstr "Borrar"
-
 #: src/zope/app/site/browser/tools.pt:5
 msgid "Available Tools"
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:159
-#: src/zope/app/site/browser/tools.py:303
+#: src/zope/app/site/browser/tools.py:160
+#: src/zope/app/site/browser/tools.py:304
 msgid "Deleted selected tools."
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:162
-#: src/zope/app/site/browser/tools.py:308
+#: src/zope/app/site/browser/tools.py:163
+#: src/zope/app/site/browser/tools.py:309
 msgid "Renamed selected tools."
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:167
-#: src/zope/app/site/browser/tools.py:313
+#: src/zope/app/site/browser/tools.py:168
+#: src/zope/app/site/browser/tools.py:314
 msgid "Activated registrations."
 msgstr "Registraciones activadas."
 
-#: src/zope/app/site/browser/tools.py:170
-#: src/zope/app/site/browser/tools.py:316
+#: src/zope/app/site/browser/tools.py:171
+#: src/zope/app/site/browser/tools.py:317
 msgid "Deactivated registrations."
 msgstr "Registraciones desactivadas"
 
@@ -3871,19 +3841,19 @@
 msgstr "El nombre que es registrado"
 
 # Default: "n/a"
-#: src/zope/app/size/__init__.py:44
+#: src/zope/app/size/__init__.py:42
 msgid "not-available"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:48
+#: src/zope/app/size/__init__.py:46
 msgid "0 KB"
 msgstr "0 KB"
 
-#: src/zope/app/size/__init__.py:50
+#: src/zope/app/size/__init__.py:48
 msgid "1 KB"
 msgstr "1 KB"
 
-#: src/zope/app/size/__init__.py:55
+#: src/zope/app/size/__init__.py:53
 msgid "${size} KB"
 msgstr "${size} KB"
 
@@ -3939,25 +3909,25 @@
 msgid "SQL Script"
 msgstr "Script SQL"
 
-#: src/zope/app/sqlscript/interfaces.py:29
+#: src/zope/app/sqlscript/interfaces.py:30
 msgid "Connection Name"
 msgstr "Nombre de la conexiÃ³n"
 
-#: src/zope/app/sqlscript/interfaces.py:30
+#: src/zope/app/sqlscript/interfaces.py:31
 msgid "The Connection Name for the connection to be used."
 msgstr "El nombre de la conexiÃ³n."
 
-#: src/zope/app/sqlscript/interfaces.py:35
+#: src/zope/app/sqlscript/interfaces.py:36
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: src/zope/app/sqlscript/interfaces.py:36
+#: src/zope/app/sqlscript/interfaces.py:37
 msgid ""
 "A set of attributes that can be used during the SQL command rendering "
 "process to provide dynamic data."
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:45
+#: src/zope/app/sqlscript/interfaces.py:46
 msgid "The SQL command to be run."
 msgstr ""
 
@@ -4174,10 +4144,55 @@
 "Utility registrations for interface ${interface} with name ${utility_name}"
 msgstr ""
 
+#: src/zope/app/utility/browser/utilities.pt:11
+#: src/zope/app/site/browser/services.pt:15
+#: src/zope/app/bundle/browser/bundle.pt:53
+msgid "(click to clear message)"
+msgstr ""
+
 #: src/zope/app/utility/browser/utilities.pt:34
 msgid "change registration"
 msgstr "cambiar registraciÃ³n"
 
+#: src/zope/app/utility/browser/utilities.pt:42
+#: src/zope/app/site/browser/tool.pt:91
+#: src/zope/app/site/browser/services.pt:66
+#: src/zope/app/site/browser/add_svc_config.pt:16
+#: src/zope/app/registration/browser/registration.pt:30
+msgid "activate-button"
+msgstr "Activar"
+
+#: src/zope/app/utility/browser/utilities.pt:44
+#: src/zope/app/site/browser/tool.pt:93
+#: src/zope/app/site/browser/services.pt:68
+#: src/zope/app/registration/browser/registration.pt:25
+msgid "deactivate-button"
+msgstr "Desactivar"
+
+#: src/zope/app/utility/browser/utilities.pt:47
+#: src/zope/app/site/browser/tool.pt:99
+#: src/zope/app/site/browser/services.pt:71
+#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
+#: src/zope/app/i18n/browser/translate.pt:37
+msgid "delete-button"
+msgstr "Borrar"
+
+#: src/zope/app/utility/browser/utilities.pt:50
+#: src/zope/app/site/browser/tool.pt:106
+#: src/zope/app/site/browser/services.pt:74
+#: src/zope/app/zptpage/browser/inlinecode.pt:63
+#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/schemacontent/browser/permission_edit.pt:33
+#: src/zope/app/errorservice/browser/error.pt:52
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
+#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
+#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
+#: src/zope/app/form/browser/edit.pt:50
+#: src/zope/app/registration/browser/editregistration.pt:49
+msgid "refresh-button"
+msgstr "Actualizar"
+
 #: src/zope/app/utility/browser/utilities.pt:6
 msgid "Utilities registered in this utility service"
 msgstr "Herramientas registradas en este servicio de Herramientas"
@@ -4194,227 +4209,6 @@
 msgid "The physical path to the component"
 msgstr "La localizaciÃ³n fÃsica del componente"
 
-#: src/zope/app/wiki/browser/configure.zcml:101
-#: src/zope/app/wiki/browser/configure.zcml:158
-msgid "View"
-msgstr "Vista"
-
-#: src/zope/app/wiki/browser/configure.zcml:109
-#: src/zope/app/wiki/browser/configure.zcml:161
-#: src/zope/app/wiki/browser/parents_page.pt:13
-msgid "Parents"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:134
-#: src/zope/app/wiki/browser/configure.zcml:143
-#: src/zope/app/wiki/browser/configure.zcml:159
-msgid "Comment"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:143
-msgid "A Comment"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:152
-msgid "Menu for Wiki Page related actions."
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:168
-msgid "Table of Contents"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "A Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:24
-#: src/zope/app/wiki/browser/configure.zcml:162
-msgid "TOC"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:32
-#: src/zope/app/wiki/browser/configure.zcml:169
-msgid "Search"
-msgstr "Buscar"
-
-#: src/zope/app/wiki/browser/configure.zcml:44
-#: src/zope/app/wiki/browser/configure.zcml:118
-#: src/zope/app/wiki/browser/configure.zcml:163
-#: src/zope/app/wiki/browser/configure.zcml:170
-msgid "Subscriptions"
-msgstr "Suscripciones"
-
-#: src/zope/app/wiki/browser/configure.zcml:76
-msgid "Change Wiki Page"
-msgstr "Cambiar pÃ¡gina Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:8
-msgid "Add Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/parents_page.pt:30
-msgid "reparent-button"
-msgstr ""
-
-#: src/zope/app/wiki/browser/parents_page.pt:35
-msgid "Branch"
-msgstr ""
-
-#: src/zope/app/wiki/browser/skin/template.pt:32
-msgid "Last modified by ${user} on ${date}"
-msgstr ""
-
-#: src/zope/app/wiki/browser/skin/template.pt:64
-msgid "Jump to:"
-msgstr ""
-
-#: src/zope/app/wiki/browser/skin/template.pt:73
-msgid ""
-"User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Search Wiki</a> </div>"
-msgstr ""
-
-#: src/zope/app/wiki/browser/subscriptions.pt:12
-msgid "Current Subscriptions"
-msgstr "Suscripciones actuales"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:25
-msgid "Enter new Users (separate by 'Return')"
-msgstr ""
-
-#: src/zope/app/wiki/browser/wiki_search.pt:9
-msgid "Wiki Search"
-msgstr ""
-
-#: src/zope/app/wiki/browser/wiki_toc.pt:9
-msgid "Wiki Table of Contents"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "A Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "Wiki Page"
-msgstr "PÃ¡gina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "The Wiki Editor can create and edit wikis."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "Wiki Editor"
-msgstr "Editor de Wiki"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "A Wiki Page Comment"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "Wiki Page Comment"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "Wiki Administrator"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "The Wiki Admin can fully manage wiki pages."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View a Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Comment on Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Make a comment on Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:42
-#: src/zope/app/wiki/browser/configure.zcml:60
-msgid "Add Wiki Page"
-msgstr "AÃ±adir una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:51
-msgid "Edit Wiki Page"
-msgstr "Editar una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:60
-msgid "Delete Wiki Page"
-msgstr "Borrar una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent a Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki User"
-msgstr "Usuario de Wiki"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki visitors, which can only view and comment on wikis."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:93
-msgid "Minimal Wiki Page Container implementation "
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:150
-#, fuzzy
-msgid "Previous Source Text"
-msgstr "Texto Fuente"
-
-#: src/zope/app/wiki/interfaces.py:151
-#, fuzzy
-msgid "Previous source text of the Wiki Page."
-msgstr "El codigo fuente de la pÃ¡gina DTML."
-
-#: src/zope/app/wiki/interfaces.py:40
-msgid "Comment Title"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:46
-msgid "Renderable source text of the comment."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:72
-msgid "Renderable source text of the Wiki Page."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:96
-msgid "Wiki Page Parents"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:97
-msgid "Parents of a Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:98
-msgid "Parent Name"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:99
-msgid "Name of the parent wiki page."
-msgstr ""
-
 #: src/zope/app/workflow/browser/configure.zcml:6
 msgid ""
 "Workflow Process Definitions define a particular workflow       for an "
@@ -4499,11 +4293,11 @@
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "Content Workflows Manager"
+msgid "An utility to manage content and workflow interaction."
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "An utility to manage content and workflow interaction."
+msgid "Content Workflows Manager"
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:129
@@ -4713,59 +4507,59 @@
 msgid "Source State"
 msgstr "Estado de Fuente"
 
-#: src/zope/app/zopetop/widget_macros.pt:13
-msgid "Logged in as ${user_title}"
-msgstr ""
-
-#: src/zope/app/zopetop/widget_macros.pt:132
+#: src/zope/app/zopetop/widget_macros.pt:152
 msgid "Views"
 msgstr "Vistas"
 
-#: src/zope/app/zopetop/widget_macros.pt:149
+#: src/zope/app/zopetop/widget_macros.pt:169
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/zope/app/zopetop/widget_macros.pt:176
+#: src/zope/app/zopetop/widget_macros.pt:196
 msgid "Location:"
 msgstr "LocalizaciÃ³n:"
 
-#: src/zope/app/zopetop/widget_macros.pt:26
+#: src/zope/app/zopetop/widget_macros.pt:32
+msgid "Logged in as ${user_title}"
+msgstr ""
+
+#: src/zope/app/zopetop/widget_macros.pt:46
 msgid "Common Tasks"
 msgstr "Tareas comunes"
 
-#: src/zope/app/zopetop/widget_macros.pt:37
+#: src/zope/app/zopetop/widget_macros.pt:57
 msgid "user accounts"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:40
+#: src/zope/app/zopetop/widget_macros.pt:60
 msgid "User Accounts"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:43
+#: src/zope/app/zopetop/widget_macros.pt:63
 msgid "control panels"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:46
+#: src/zope/app/zopetop/widget_macros.pt:66
 msgid "Control Panels"
 msgstr "Paneles de control"
 
-#: src/zope/app/zopetop/widget_macros.pt:49
+#: src/zope/app/zopetop/widget_macros.pt:69
 msgid "system security"
 msgstr "seguridad del sistema"
 
-#: src/zope/app/zopetop/widget_macros.pt:52
+#: src/zope/app/zopetop/widget_macros.pt:72
 msgid "System Security"
 msgstr "Seguridad del Sistema"
 
-#: src/zope/app/zopetop/widget_macros.pt:55
+#: src/zope/app/zopetop/widget_macros.pt:75
 msgid "add more"
 msgstr "AÃ±adir mÃ¡s"
 
-#: src/zope/app/zopetop/widget_macros.pt:58
+#: src/zope/app/zopetop/widget_macros.pt:78
 msgid "Add More"
 msgstr "AÃ±adir mÃ¡s"
 
-#: src/zope/app/zopetop/widget_macros.pt:66
+#: src/zope/app/zopetop/widget_macros.pt:86
 msgid "Root Folder"
 msgstr ""
 
@@ -4835,27 +4629,14 @@
 "feature."
 msgstr ""
 
-#: src/zope/app/zptpage/zptpage.py:114
+#: src/zope/app/zptpage/zptpage.py:112
 msgid "1 line"
 msgstr "1 lÃnea"
 
-#: src/zope/app/zptpage/zptpage.py:115
+#: src/zope/app/zptpage/zptpage.py:113
 msgid "${lines} lines"
 msgstr "${lines} lÃneas"
 
-#: src/zope/exceptions/unauthorized.py:69
-#: src/zope/exceptions/unauthorized.py:72
-msgid "You are not allowed to access ${name} in this context"
-msgstr ""
-
-#: src/zope/exceptions/unauthorized.py:74
-msgid "You are not authorized"
-msgstr ""
-
-#: src/zope/exceptions/unauthorized.py:84
-msgid "a particular ${object}"
-msgstr ""
-
 #: src/zope/schema/_bootstrapinterfaces.py:43
 msgid "Required input is missing."
 msgstr ""
@@ -5058,23 +4839,171 @@
 msgid "The field is not bound."
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:38
+#: src/zope/schema/tests/test_objectfield.py:37
 msgid "Foo"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:39
+#: src/zope/schema/tests/test_objectfield.py:38
 msgid "Foo description"
 msgstr "DescripciÃ³n Foo"
 
-#: src/zope/schema/tests/test_objectfield.py:44
+#: src/zope/schema/tests/test_objectfield.py:43
 msgid "Bar"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:45
+#: src/zope/schema/tests/test_objectfield.py:44
 msgid "Bar description"
 msgstr "DescripciÃ³n Bar"
 
+#: src/zwiki/browser/configure.zcml:101 src/zwiki/browser/configure.zcml:158
+msgid "View"
+msgstr "Vista"
+
+#: src/zwiki/browser/configure.zcml:109 src/zwiki/browser/configure.zcml:161
+msgid "Parents"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:134 src/zwiki/browser/configure.zcml:143
+#: src/zwiki/browser/configure.zcml:159
+msgid "Comment"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:143
+msgid "A Comment"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:152
+msgid "Menu for Wiki Page related actions."
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:168
+msgid "Table of Contents"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "Wiki"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "A Wiki"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:24 src/zwiki/browser/configure.zcml:162
+msgid "TOC"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:32 src/zwiki/browser/configure.zcml:169
+msgid "Search"
+msgstr "Buscar"
+
+#: src/zwiki/browser/configure.zcml:44 src/zwiki/browser/configure.zcml:118
+#: src/zwiki/browser/configure.zcml:163 src/zwiki/browser/configure.zcml:170
+msgid "Subscriptions"
+msgstr "Suscripciones"
+
+#: src/zwiki/browser/configure.zcml:76
+msgid "Change Wiki Page"
+msgstr "Cambiar pÃ¡gina Wiki"
+
+#: src/zwiki/browser/configure.zcml:8
+msgid "Add Wiki"
+msgstr ""
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki User"
+msgstr "Usuario de Wiki"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki visitors, which can only view and comment on wikis."
+msgstr ""
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "A Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "Wiki Page"
+msgstr "PÃ¡gina Wiki"
+
+#: src/zwiki/configure.zcml:17
+msgid "The Wiki Editor can create and edit wikis."
+msgstr ""
+
+#: src/zwiki/configure.zcml:17
+msgid "Wiki Editor"
+msgstr "Editor de Wiki"
+
+#: src/zwiki/configure.zcml:186
+msgid "A Wiki Page Comment"
+msgstr ""
+
+#: src/zwiki/configure.zcml:186
+msgid "Wiki Page Comment"
+msgstr ""
+
+#: src/zwiki/configure.zcml:22
+msgid "Wiki Administrator"
+msgstr ""
+
+#: src/zwiki/configure.zcml:22
+msgid "The Wiki Admin can fully manage wiki pages."
+msgstr ""
+
+#: src/zwiki/configure.zcml:27
+msgid "View Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:27
+msgid "View a Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:36
+msgid "Comment on Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:36
+msgid "Make a comment on Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:45 src/zwiki/browser/configure.zcml:60
+msgid "Add Wiki Page"
+msgstr "AÃ±adir una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:54
+msgid "Edit Wiki Page"
+msgstr "Editar una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:63
+msgid "Delete Wiki Page"
+msgstr "Borrar una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent a Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:96
+msgid "Minimal Wiki Page Container implementation "
+msgstr ""
+
+#~ msgid "label-add-service"
+#~ msgstr "AÃ±adir Servicio"
+
+#~ msgid "Current Subscriptions"
+#~ msgstr "Suscripciones actuales"
+
 #, fuzzy
+#~ msgid "Previous Source Text"
+#~ msgstr "Texto Fuente"
+
+#, fuzzy
+#~ msgid "Previous source text of the Wiki Page."
+#~ msgstr "El codigo fuente de la pÃ¡gina DTML."
+
+#, fuzzy
 #~ msgid "Unset"
 #~ msgstr "Usuario"
 

Modified: Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po	2004-07-19 13:39:42 UTC (rev 26625)
+++ Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po	2004-07-19 13:40:28 UTC (rev 26626)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Zope X3 Pre-M4\n"
-"POT-Creation-Date: Fri Jun 18 17:40:55 2004\n"
+"POT-Creation-Date: Mon Jul 19 17:08:59 2004\n"
 "PO-Revision-Date: 2004-06-25 16:00+0100\n"
 "Last-Translator: Thierry Goyvaerts <Thierry.Goyvaerts at skynet.be>\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope3.org>\n"
@@ -13,25 +13,25 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/zope/app/adapter/adapter.py:283
+#: src/zope/app/adapter/adapter.py:285
 #: src/zope/app/presentation/pagefolder.py:54
 #: src/zope/app/presentation/presentation.py:290
 msgid "For interface"
 msgstr "Pour l'interface"
 
-#: src/zope/app/adapter/adapter.py:284
+#: src/zope/app/adapter/adapter.py:286
 msgid "The interface of the objects being adapted"
 msgstr "L'interface des objets adaptée"
 
-#: src/zope/app/adapter/adapter.py:289 src/zope/app/utility/interfaces.py:48
+#: src/zope/app/adapter/adapter.py:291 src/zope/app/utility/interfaces.py:48
 msgid "Provided interface"
 msgstr "Interface fournie"
 
-#: src/zope/app/adapter/adapter.py:290
+#: src/zope/app/adapter/adapter.py:292
 msgid "The interface provided"
 msgstr "L'Interface fournie"
 
-#: src/zope/app/adapter/adapter.py:296 src/zope/app/site/interfaces.py:162
+#: src/zope/app/adapter/adapter.py:298 src/zope/app/site/interfaces.py:162
 #: src/zope/app/site/browser/tool.pt:40
 #: src/zope/app/schema/browser/schema_edit.pt:36
 #: src/zope/app/workflow/browser/instancecontainer_index.pt:19
@@ -41,15 +41,15 @@
 msgid "Name"
 msgstr "Nom"
 
-#: src/zope/app/adapter/adapter.py:302
+#: src/zope/app/adapter/adapter.py:304
 msgid "The dotted name of a factory for creating the adapter"
 msgstr "Le nom web d'une Usine afin de créer un Adaptateur"
 
-#: src/zope/app/adapter/adapter.py:308
+#: src/zope/app/adapter/adapter.py:310
 msgid "The permission required for use"
 msgstr "La permission requise pour l'utilisation"
 
-#: src/zope/app/adapter/adapter.py:315
+#: src/zope/app/adapter/adapter.py:317
 msgid "Factory to be called to construct the component"
 msgstr "L'Usine à appeler pour construire le composant"
 
@@ -126,21 +126,25 @@
 msgstr "Docs API Zope 3"
 
 # Default: "Bases"
-#: src/zope/app/apidoc/classmodule/__init__.py:511
-#: src/zope/app/apidoc/ifacemodule/index.pt:264
+#: src/zope/app/apidoc/classmodule/__init__.py:545
+#: src/zope/app/apidoc/ifacemodule/index.pt:265
 msgid "Classes"
 msgstr "Classes"
 
-#: src/zope/app/apidoc/classmodule/__init__.py:549
+#: src/zope/app/apidoc/classmodule/__init__.py:583
 msgid "Zope 3 root."
 msgstr "Racine Zope 3."
 
-#: src/zope/app/apidoc/classmodule/browser.py:410
-#: src/zope/app/rotterdam/template.pt:104
+#: src/zope/app/apidoc/classmodule/browser.py:675
+#: src/zope/app/rotterdam/template.pt:102
 msgid "[top]"
 msgstr "[dessus]"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:140
+#: src/zope/app/apidoc/classmodule/class_index.pt:102
+msgid "There are no attributes in this class."
+msgstr "Il n'y a pas d'attribut dans cette Classe."
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:144
 msgid "There are no methods in this class."
 msgstr "Il n'y a pas de Méthodes dans cette Classe."
 
@@ -149,37 +153,49 @@
 msgid "Bases"
 msgstr "Bases"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:30
+#: src/zope/app/apidoc/classmodule/class_index.pt:34
 #: src/zope/app/apidoc/ifacemodule/index.pt:40
 msgid "There are no base classes."
 msgstr "Il n'y a pas de Classe De Base."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:35
+#: src/zope/app/apidoc/classmodule/class_index.pt:39
 msgid "Implemented Interfaces"
 msgstr "Interfaces implémentées"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:50
+#: src/zope/app/apidoc/classmodule/class_index.pt:54
 msgid "There are no implemented interfaces."
 msgstr "Il n'y a pas d'Interface implémentée."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:56
+#: src/zope/app/apidoc/classmodule/class_index.pt:60
 msgid "Attributes/Properties"
 msgstr "Attributs/Propriétés"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:89
-#: src/zope/app/apidoc/classmodule/class_index.pt:131
-msgid "(read)"
-msgstr "(lecture)"
+#: src/zope/app/apidoc/classmodule/class_index.pt:73
+#: src/zope/app/apidoc/classmodule/function_index.pt:40
+#: src/zope/app/apidoc/classmodule/function_index.pt:44
+msgid "type:"
+msgstr "type:"
 
+#: src/zope/app/apidoc/classmodule/class_index.pt:79
+#: src/zope/app/apidoc/classmodule/function_index.pt:51
+msgid "Value:"
+msgstr "Valeur:"
+
 #: src/zope/app/apidoc/classmodule/class_index.pt:91
 #: src/zope/app/apidoc/classmodule/class_index.pt:133
+msgid "Permissions:"
+msgstr "Permissions:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:93
+#: src/zope/app/apidoc/classmodule/class_index.pt:135
+msgid "(read)"
+msgstr "(lecture)"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:95
+#: src/zope/app/apidoc/classmodule/class_index.pt:137
 msgid "(write)"
 msgstr "(écriture)"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:98
-msgid "There are no attributes in this class."
-msgstr "Il n'y a pas d'attribut dans cette Classe."
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:18
 msgid "Documentation String"
 msgstr "Chaîne De Documentation"
@@ -189,17 +205,6 @@
 msgid "Attributes"
 msgstr "Attributs"
 
-#: src/zope/app/apidoc/classmodule/function_index.pt:40
-#: src/zope/app/apidoc/classmodule/function_index.pt:44
-#: src/zope/app/apidoc/classmodule/class_index.pt:69
-msgid "type:"
-msgstr "type:"
-
-#: src/zope/app/apidoc/classmodule/function_index.pt:51
-#: src/zope/app/apidoc/classmodule/class_index.pt:75
-msgid "Value:"
-msgstr "Valeur:"
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:9
 msgid "Signature"
 msgstr "Signature"
@@ -225,81 +230,81 @@
 msgid "Zope 3 Class Browser"
 msgstr "Navigateur De Classe Zope 3"
 
-#: src/zope/app/apidoc/ifacemodule/__init__.py:73
+#: src/zope/app/apidoc/ifacemodule/__init__.py:75
 msgid "Interfaces"
 msgstr "Interfaces:"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:158
+#: src/zope/app/apidoc/ifacemodule/browser.py:199
 msgid "required"
 msgstr "requis"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:160
+#: src/zope/app/apidoc/ifacemodule/browser.py:201
 msgid "optional"
 msgstr "optionnel"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:100
+#: src/zope/app/apidoc/ifacemodule/index.pt:101
 msgid "There are no methods specified."
 msgstr "Aucune Méthode n'est spécifiée."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:107
+#: src/zope/app/apidoc/ifacemodule/index.pt:108
 msgid "Adapters"
 msgstr "Adaptateurs"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:113
+#: src/zope/app/apidoc/ifacemodule/index.pt:114
 msgid "Adapters where this interface is required:"
 msgstr "Les Adaptateurs pour lesquels cette Interface est requise:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:126
-#: src/zope/app/apidoc/ifacemodule/index.pt:167
+#: src/zope/app/apidoc/ifacemodule/index.pt:127
+#: src/zope/app/apidoc/ifacemodule/index.pt:168
 msgid "name:"
 msgstr "nom:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:131
+#: src/zope/app/apidoc/ifacemodule/index.pt:132
 msgid "provides:"
 msgstr "fournit:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:137
+#: src/zope/app/apidoc/ifacemodule/index.pt:138
 msgid "also required:"
 msgstr "aussi requis:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:154
+#: src/zope/app/apidoc/ifacemodule/index.pt:155
 msgid "Adapters that provide this interface:"
 msgstr "Les Adaptateurs qui fournissent cette Interface:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:171
+#: src/zope/app/apidoc/ifacemodule/index.pt:172
 msgid "requires:"
 msgstr "requis:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:178
+#: src/zope/app/apidoc/ifacemodule/index.pt:179
 msgid "No interface required."
 msgstr "Aucune Interface requise."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:189
+#: src/zope/app/apidoc/ifacemodule/index.pt:190
 msgid "There are no adapters registered for this interface."
 msgstr "Il n'y a pas d'Adapteur enregistré pour cette Interface."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:199
+#: src/zope/app/apidoc/ifacemodule/index.pt:200
 msgid "Other Information"
 msgstr "Information diverse"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:204
+#: src/zope/app/apidoc/ifacemodule/index.pt:205
 msgid "Factories"
 msgstr "Usines"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:206
+#: src/zope/app/apidoc/ifacemodule/index.pt:207
 msgid "A list of factories that create objects implement this interface."
 msgstr ""
 "Une liste d'Usines qui créent des objets implémentants cette interface."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:224
+#: src/zope/app/apidoc/ifacemodule/index.pt:225
 msgid "A list of utilities that are are registered to provide this interface."
 msgstr "Une liste d'Utilitaires enregistrés pour fournir cette Interface."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:235
+#: src/zope/app/apidoc/ifacemodule/index.pt:236
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:249
+#: src/zope/app/apidoc/ifacemodule/index.pt:250
 msgid ""
 "A list of services (usually just one) that are are registered to provide "
 "this interface."
@@ -307,7 +312,7 @@
 "Une liste de Services (en général un seul) qui sont enregistrés pour fournir "
 "cette Interface."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:266
+#: src/zope/app/apidoc/ifacemodule/index.pt:267
 msgid ""
 "A list of classes that implement this interface. This might duplicate the "
 "entries in Utilities and Services."
@@ -322,15 +327,15 @@
 msgstr ""
 "Note: Seules les Interfaces sont enregistrées par le Service D'Interface."
 
-#: src/zope/app/apidoc/servicemodule/__init__.py:73
+#: src/zope/app/apidoc/servicemodule/__init__.py:75
 #: src/zope/app/site/browser/configure.zcml:87
-#: src/zope/app/zopetop/widget_macros.pt:34
+#: src/zope/app/zopetop/widget_macros.pt:54
 msgid "Services"
 msgstr "Services"
 
 #: src/zope/app/apidoc/servicemodule/index.pt:17
-#: src/zope/app/apidoc/classmodule/class_index.pt:79
-#: src/zope/app/apidoc/classmodule/class_index.pt:120
+#: src/zope/app/apidoc/classmodule/class_index.pt:83
+#: src/zope/app/apidoc/classmodule/class_index.pt:124
 msgid "Interface:"
 msgstr "Interface:"
 
@@ -342,15 +347,15 @@
 
 #: src/zope/app/apidoc/servicemodule/index.pt:55
 #: src/zope/app/apidoc/utilitymodule/index.pt:61
-#: src/zope/app/apidoc/ifacemodule/index.pt:77
+#: src/zope/app/apidoc/ifacemodule/index.pt:78
 msgid "There are no attributes or fields specified."
 msgstr "Il n'y a pas d'attribut ou de Champ spécifié."
 
 # Default: "Methods"
 #: src/zope/app/apidoc/servicemodule/index.pt:62
 #: src/zope/app/apidoc/utilitymodule/index.pt:68
-#: src/zope/app/apidoc/classmodule/class_index.pt:104
-#: src/zope/app/apidoc/ifacemodule/index.pt:84
+#: src/zope/app/apidoc/classmodule/class_index.pt:108
+#: src/zope/app/apidoc/ifacemodule/index.pt:85
 msgid "Methods"
 msgstr "Méthodes"
 
@@ -367,14 +372,14 @@
 msgid "This is a list of all available services by name."
 msgstr "Ceci est une liste de tous les Services triés par nom."
 
-#: src/zope/app/apidoc/utilities.py:254 src/zope/app/apidoc/utilities.py:256
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:55
+#: src/zope/app/apidoc/utilities.py:233 src/zope/app/apidoc/utilities.py:235
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:58
 msgid "n/a"
 msgstr "non disponible"
 
-#: src/zope/app/apidoc/utilitymodule/__init__.py:132
+#: src/zope/app/apidoc/utilitymodule/__init__.py:129
 #: src/zope/app/utility/browser/configure.zcml:31
-#: src/zope/app/apidoc/ifacemodule/index.pt:222
+#: src/zope/app/apidoc/ifacemodule/index.pt:223
 msgid "Utilities"
 msgstr "Utilitaire"
 
@@ -387,12 +392,12 @@
 msgid "(Attribute)"
 msgstr "(Attribut)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:200
-#: src/zope/app/apidoc/viewmodule/__init__.py:262
+#: src/zope/app/apidoc/viewmodule/__init__.py:201
+#: src/zope/app/apidoc/viewmodule/__init__.py:263
 msgid "$file (line $line)"
 msgstr "$file (ligne $line)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:64
+#: src/zope/app/apidoc/viewmodule/__init__.py:65
 msgid "Presentations"
 msgstr "Présentations"
 
@@ -425,13 +430,12 @@
 msgstr "Vues de"
 
 #: src/zope/app/apidoc/viewmodule/index.pt:77
-#: src/zope/app/apidoc/classmodule/class_index.pt:87
-#: src/zope/app/apidoc/classmodule/class_index.pt:129
-msgid "Permissions:"
+#, fuzzy
+msgid "Permission:"
 msgstr "Permissions:"
 
 # FR TO BE VALIDATED (TG)
-#: src/zope/app/apidoc/viewmodule/index.pt:90
+#: src/zope/app/apidoc/viewmodule/index.pt:89
 msgid "There are no views for this interface and presentation type."
 msgstr "Il n'y a pas de Vue associé à cette Interface et type de présentation."
 
@@ -478,7 +482,7 @@
 "affiche le fichier et le numéro de ligne dans laquelle le Thème et la Couche "
 "sont déclarée."
 
-#: src/zope/app/apidoc/zcmlmodule/__init__.py:190
+#: src/zope/app/apidoc/zcmlmodule/__init__.py:192
 msgid "ZCML Reference"
 msgstr "Référence ZCML"
 
@@ -508,7 +512,7 @@
 msgstr "Schéma"
 
 #: src/zope/app/apidoc/zcmlmodule/index.pt:68
-#: src/zope/app/apidoc/ifacemodule/index.pt:69
+#: src/zope/app/apidoc/ifacemodule/index.pt:70
 msgid "default"
 msgstr "par défaut"
 
@@ -584,11 +588,11 @@
 msgid "Python path"
 msgstr "PYTHONPATH"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:44
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:47
 msgid "${days} day(s) ${hours}:${minutes}:${seconds}"
 msgstr "${days} jour(s) ${hours}:${minutes}:${seconds}"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:65
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:68
 msgid "Could not retrieve runtime information."
 msgstr "Information temps d'exécution indisponible."
 
@@ -617,11 +621,11 @@
 msgid "Shutdown time:"
 msgstr "Arrêter le serveur:"
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:32
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:34
 msgid "You restarted the server."
 msgstr "Vous avez redémarré le serveur."
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:35
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:37
 msgid "You shut down the server."
 msgstr "Vous avez arrêté le serveur."
 
@@ -637,7 +641,7 @@
 msgid "reload-button"
 msgstr "Charger"
 
-#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:49
+#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:51
 msgid "Message Catalog successfully reloaded."
 msgstr "Le Catalogue De Message a été rechargé."
 
@@ -665,20 +669,20 @@
 msgid "Name of database: ${name}"
 msgstr "Nom de la base de données: ${name}"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:31
-#: src/zope/app/size/__init__.py:52
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:33
+#: src/zope/app/size/__init__.py:50
 msgid "${size} MB"
 msgstr "${size} MB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:34
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:36
 msgid "${size} kB"
 msgstr "${size} kB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:37
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:39
 msgid "${size} Bytes"
 msgstr "${size} Octets"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:50
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:52
 msgid "ZODB successfully packed."
 msgstr "Nettoyage de la ZODB réussi."
 
@@ -690,15 +694,15 @@
 msgid "Broken object"
 msgstr "Objet non lié"
 
-#: src/zope/app/bundle/browser/__init__.py:112
+#: src/zope/app/bundle/browser/__init__.py:114
 msgid "Activated: ${activated}.\n"
 msgstr "Activé: ${activated}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:115
+#: src/zope/app/bundle/browser/__init__.py:117
 msgid "Registered: ${registered}.\n"
 msgstr "Enregistré: ${registered}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:85
+#: src/zope/app/bundle/browser/__init__.py:87
 msgid "unregistered ${count} registrations"
 msgstr "enregistrements ${count} non validés"
 
@@ -801,15 +805,15 @@
 msgid "Bundle"
 msgstr "Paquet"
 
-#: src/zope/app/cache/browser/cacheable.py:57
+#: src/zope/app/cache/browser/cacheable.py:63
 msgid "cache-invalidated"
 msgstr "Cache invalidé"
 
-#: src/zope/app/cache/browser/cacheable.py:59
+#: src/zope/app/cache/browser/cacheable.py:65
 msgid "no-cache-associated"
 msgstr "Il n'y a pas de cache associé"
 
-#: src/zope/app/cache/browser/cacheable.py:71
+#: src/zope/app/cache/browser/cacheable.py:77
 msgid "Saved changes."
 msgstr "Changements enregistrés."
 
@@ -833,6 +837,28 @@
 msgid "Currently there is no cache associated with the object."
 msgstr "Actuellement, il n'y a pas de cache associé à cet objet."
 
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "RAM Cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "A RAM cache is a volatile (in memory) cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:26
+#, fuzzy
+msgid "Statistics"
+msgstr "Statut"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+#, fuzzy
+msgid "Caches"
+msgstr "Nom du cache"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+msgid "Caches can be used to make your site run faster."
+msgstr ""
+
 #: src/zope/app/cache/browser/ramedit.pt:20
 msgid "Maximum cached entries"
 msgstr "Nombre maximum d'entrées dans le cache"
@@ -849,6 +875,12 @@
 msgid "You can configure the RAM Cache here."
 msgstr "Vous pouvez configurer le cache de RAM ici."
 
+#: src/zope/app/cache/browser/ramedit.pt:53
+#: src/zope/app/site/browser/add_svc_config.pt:35
+#: src/zope/app/bundle/browser/bundle.pt:130
+msgid "reset-button"
+msgstr "Re-initialisé"
+
 #: src/zope/app/cache/browser/ramstats.pt:20
 msgid "Path"
 msgstr "Chemin"
@@ -873,7 +905,7 @@
 msgid "RAMCache statistics"
 msgstr "Statistiques RAMCache"
 
-#: src/zope/app/container/browser/adding.py:117
+#: src/zope/app/container/browser/adding.py:119
 msgid "You must select the type of object to add."
 msgstr "Vous devez sélectionner le type d'objet à ajouter."
 
@@ -905,23 +937,23 @@
 msgid "container-cancel-button"
 msgstr "Annuler Conteneur"
 
-#: src/zope/app/container/browser/contents.py:232
+#: src/zope/app/container/browser/contents.py:233
 msgid "You didn't specify any ids to remove."
 msgstr "Vous n'avez pas spécifié d'identificateurs à effacer."
 
-#: src/zope/app/container/browser/contents.py:244
+#: src/zope/app/container/browser/contents.py:245
 msgid "You didn't specify any ids to copy."
 msgstr "Vous n'avez pas spécifié d'identificateurs à copier"
 
-#: src/zope/app/container/browser/contents.py:264
+#: src/zope/app/container/browser/contents.py:265
 msgid "You didn't specify any ids to cut."
 msgstr "Vous n'avez pas spécifié d'identificateurs à couper"
 
-#: src/zope/app/container/browser/contents.py:61
+#: src/zope/app/container/browser/contents.py:62
 msgid "You didn't specify any ids to rename."
 msgstr "Vous n'avez pas spécifié d'identificateurs à renommer"
 
-#: src/zope/app/container/browser/metaconfigure.py:63
+#: src/zope/app/container/browser/metaconfigure.py:65
 #: src/zope/app/folder/browser/configure.zcml:20
 #: src/zope/app/site/browser/configure.zcml:19
 #: src/zope/app/bundle/browser/configure.zcml:11
@@ -930,7 +962,7 @@
 msgid "Contents"
 msgstr "Contenu"
 
-#: src/zope/app/container/browser/metaconfigure.py:71
+#: src/zope/app/container/browser/metaconfigure.py:73
 #: src/zope/app/schema/browser/configure.zcml:15
 #: src/zope/app/container/browser/configure.zcml:5
 #: src/zope/app/registration/browser/configure.zcml:42
@@ -940,19 +972,19 @@
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/zope/app/container/constraints.py:185
+#: src/zope/app/container/constraints.py:186
 msgid "Container is not a valid Zope container."
 msgstr "Le Conteneur n'est pas un Conteneur Zope valide."
 
-#: src/zope/app/container/contained.py:688
+#: src/zope/app/container/contained.py:690
 msgid "An empty name was provided. Names cannot be empty."
 msgstr "Un nom doit être spécifié."
 
-#: src/zope/app/container/contained.py:698
+#: src/zope/app/container/contained.py:700
 msgid "Names cannot begin with '+' or '@' or contain '/'"
 msgstr "Les noms ne peuvent pas commencer par '+' ou '@' ou contenir '/'"
 
-#: src/zope/app/container/contained.py:703
+#: src/zope/app/container/contained.py:705
 msgid "The given name is already being used"
 msgstr "Le nom spécifié est déjà utilisé"
 
@@ -973,7 +1005,6 @@
 msgstr "Type de l'erreur: ${error_type}"
 
 #: src/zope/app/debugskin/unauthorized.pt:7
-#: src/zope/app/exception/browser/unauthorized.pt:8
 msgid "Unauthorized"
 msgstr "Non autorisé"
 
@@ -1018,27 +1049,27 @@
 msgid "A simple, content-based DTML page"
 msgstr "Une simple Page DTML de contenu"
 
-#: src/zope/app/dtmlpage/interfaces.py:31
+#: src/zope/app/dtmlpage/interfaces.py:32
 #: src/zope/app/pythonpage/__init__.py:39
-#: src/zope/app/sqlscript/interfaces.py:44
+#: src/zope/app/sqlscript/interfaces.py:45
 #: src/zope/app/zptpage/interfaces.py:36
 msgid "Source"
 msgstr "Source"
 
-#: src/zope/app/dtmlpage/interfaces.py:32
+#: src/zope/app/dtmlpage/interfaces.py:33
 msgid "The source of the dtml page."
 msgstr "La source de la Page DTML."
 
 #: src/zope/app/dublincore/browser/configure.zcml:10
-#: src/zope/app/zopetop/widget_macros.pt:166
+#: src/zope/app/zopetop/widget_macros.pt:186
 msgid "Metadata"
 msgstr "Meta Données"
 
-#: src/zope/app/dublincore/browser/edit.pt:43
+#: src/zope/app/dublincore/browser/edit.pt:45
 msgid "Content Last Modified"
 msgstr "Contenu Modifié Récemment"
 
-#: src/zope/app/dublincore/browser/edit.pt:47
+#: src/zope/app/dublincore/browser/edit.pt:49
 msgid "Creator"
 msgstr "Créateur"
 
@@ -1187,6 +1218,10 @@
 msgid "The page that you are trying to access is not available"
 msgstr "La page à laquelle vous tentiez d'accéder n'est pas disponible"
 
+#: src/zope/app/exception/browser/unauthorized.pt:10
+msgid "You are not authorized"
+msgstr "Vous n'êtes pas autorisé"
+
 #: src/zope/app/file/browser/configure.zcml:109
 msgid "Add a Image"
 msgstr "Ajouter une Image"
@@ -1244,7 +1279,7 @@
 msgid "Image"
 msgstr "Image"
 
-#: src/zope/app/file/image.py:73
+#: src/zope/app/file/image.py:72
 msgid " ${width}x${height}"
 msgstr " ${width}x${height}"
 
@@ -1288,12 +1323,11 @@
 msgstr "Dossier minimum"
 
 #: src/zope/app/form/browser/add.pt:55
-#: src/zope/app/wiki/browser/wiki_add.pt:34
 msgid "Object Name"
 msgstr "Nom de l'objet"
 
-#: src/zope/app/form/browser/add.py:61
-#: src/zope/app/form/browser/editview.py:109
+#: src/zope/app/form/browser/add.py:60
+#: src/zope/app/form/browser/editview.py:108
 #: src/zope/app/schema/browser/__init__.py:53
 #: src/zope/app/schema/browser/__init__.py:64
 #: src/zope/app/schema/browser/__init__.py:70
@@ -1372,12 +1406,11 @@
 #: src/zope/app/publisher/interfaces/browser.py:44
 #: src/zope/app/publisher/interfaces/browser.py:87
 #: src/zope/app/security/interfaces/__init__.py:44
-#: src/zope/app/security/interfaces/__init__.py:197
-#: src/zope/app/wiki/interfaces.py:39 src/zope/schema/interfaces.py:100
-#: src/zope/schema/interfaces.py:484
-#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/security/interfaces/__init__.py:189
+#: src/zope/schema/interfaces.py:100 src/zope/schema/interfaces.py:484
 #: src/zope/app/menu/browser/menu_contents.pt:31
-#: src/zope/app/dublincore/browser/edit.pt:14
+#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/dublincore/browser/edit.pt:16
 #: src/zope/app/schema/browser/schema_edit.pt:38
 #: src/zope/app/container/browser/contents.pt:33
 #: src/zope/app/container/browser/index.pt:27
@@ -1392,25 +1425,25 @@
 msgid "widget-missing-multiple-value"
 msgstr "Valeur multiple manquante"
 
-#: src/zope/app/form/browser/editview.py:118
+#: src/zope/app/form/browser/editview.py:117
 msgid "Updated on ${date_time}"
 msgstr "Mis à jour le ${date_time}"
 
-#: src/zope/app/form/browser/editwizard.pt:47
-#: src/zope/app/form/browser/addwizard.pt:55
+#: src/zope/app/form/browser/editwizard.pt:42
+#: src/zope/app/form/browser/addwizard.pt:63
 msgid "previous-button"
 msgstr "Précédent"
 
-#: src/zope/app/form/browser/editwizard.pt:53
-#: src/zope/app/form/browser/addwizard.pt:61
+#: src/zope/app/form/browser/editwizard.pt:48
+#: src/zope/app/form/browser/addwizard.pt:69
 msgid "next-button"
 msgstr "Suivant"
 
-#: src/zope/app/form/browser/editwizard.py:149
+#: src/zope/app/form/browser/editwizard.py:148
 msgid "No changes to save"
 msgstr "Pas de changement à sauvegarder"
 
-#: src/zope/app/form/browser/editwizard.py:151
+#: src/zope/app/form/browser/editwizard.py:150
 msgid "Changes saved"
 msgstr "Changements sauvegardés"
 
@@ -1422,21 +1455,21 @@
 msgid "vocabulary-missing-multiple-value-for-display"
 msgstr "Valeur multiple manquante pour l'affichage"
 
-#: src/zope/app/form/browser/itemswidgets.py:425
-#: src/zope/app/form/browser/itemswidgets.py:469
+#: src/zope/app/form/browser/itemswidgets.py:426
+#: src/zope/app/form/browser/itemswidgets.py:470
 msgid "vocabulary-missing-single-value-for-edit"
 msgstr "Valeur simple manquante pour l'édition"
 
-#: src/zope/app/form/browser/itemswidgets.py:543
+#: src/zope/app/form/browser/itemswidgets.py:544
 msgid "vocabulary-missing-multiple-value-for-edit"
 msgstr "Valeur multiple manquante pour l'édition"
 
 # Default: "Remove selected items"
-#: src/zope/app/form/browser/sequencewidget.py:84
+#: src/zope/app/form/browser/sequencewidget.py:82
 msgid "remove-selected-items"
 msgstr "Supprimer les éléments sélectionnés"
 
-#: src/zope/app/form/browser/sequencewidget.py:91
+#: src/zope/app/form/browser/sequencewidget.py:89
 msgid "Add %s"
 msgstr "Ajouter %s"
 
@@ -1609,23 +1642,23 @@
 msgid "synchronize-button"
 msgstr "Synchroniser"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Up to Date"
 msgstr "Mis à jour"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "New Remote"
 msgstr "Nouveau Externe"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Out of Date"
 msgstr "Non à jour"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Does not exist"
 msgstr "N'existe pas"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Newer Local"
 msgstr "Nouveau Locale"
 
@@ -1713,7 +1746,6 @@
 #: src/zope/app/i18nfile/browser/file_edit.pt:68
 #: src/zope/app/i18nfile/browser/image_edit.pt:69
 #: src/zope/app/introspector/marker.pt:118
-#: src/zope/app/wiki/browser/subscriptions.pt:19
 #: src/zope/app/registration/browser/editregistration.pt:53
 msgid "remove-button"
 msgstr "Supprimer"
@@ -1727,7 +1759,7 @@
 #: src/zope/app/i18nfile/browser/image_edit.pt:94
 #: src/zope/app/cache/browser/cacheableedit.pt:45
 #: src/zope/app/cache/browser/ramedit.pt:51
-#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/dublincore/browser/edit.pt:35
 #: src/zope/app/rdb/browser/rdbconnection.pt:28
 #: src/zope/app/errorservice/browser/error_config.pt:46
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:63
@@ -1735,18 +1767,18 @@
 msgid "save-changes-button"
 msgstr "Enregistrer les modifications"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:45
-#: src/zope/app/i18nfile/browser/i18nimage.py:27
+#: src/zope/app/i18nfile/browser/i18nfile.py:44
+#: src/zope/app/i18nfile/browser/i18nimage.py:29
 msgid "Edit Form"
 msgstr "Formulaire D'Edition"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:46
+#: src/zope/app/i18nfile/browser/i18nfile.py:45
 msgid ""
 "This edit form allows you to make changes to the properties of this file."
 msgstr ""
 "Ce formulaire d'édition vous permet de changer les propriétés de ce fichier."
 
-#: src/zope/app/i18nfile/browser/i18nimage.py:28
+#: src/zope/app/i18nfile/browser/i18nimage.py:30
 msgid ""
 "This edit form allows you to make changes to the properties of this image."
 msgstr ""
@@ -1944,10 +1976,10 @@
 msgstr "Ajouter Un Elément De Menu De Navigation"
 
 #: src/zope/app/menu/browser/menu_contents.pt:25
+#: src/zope/app/uniqueid/browser/registrations.pt:7
 #: src/zope/app/schema/browser/schema_edit.pt:30
 #: src/zope/app/container/browser/contents.pt:26
 #: src/zope/app/container/browser/index.pt:18
-#: src/zope/app/uniqueid/browser/registrations.pt:7
 msgid "Content listing"
 msgstr "Liste de contenu"
 
@@ -1956,7 +1988,7 @@
 msgstr "Action"
 
 #: src/zope/app/menu/browser/menu_contents.pt:33
-#: src/zope/app/dublincore/browser/edit.pt:39
+#: src/zope/app/dublincore/browser/edit.pt:41
 #: src/zope/app/container/browser/contents.pt:35
 #: src/zope/app/container/browser/index.pt:28
 msgid "Created"
@@ -2101,7 +2133,7 @@
 msgstr "Editer un Module"
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:30
-#: src/zope/app/zopetop/widget_macros.pt:215
+#: src/zope/app/zopetop/widget_macros.pt:235
 msgid "Help"
 msgstr "Aide"
 
@@ -2140,7 +2172,7 @@
 
 #: src/zope/app/onlinehelp/interfaces.py:46
 #: src/zope/app/security/interfaces/__init__.py:38
-#: src/zope/app/security/interfaces/__init__.py:191
+#: src/zope/app/security/interfaces/__init__.py:183
 #: src/zope/app/workflow/stateful/browser/addtransition.pt:12
 #: src/zope/app/workflow/stateful/browser/addstate.pt:12
 msgid "Id"
@@ -2170,8 +2202,7 @@
 msgid "Help Topic"
 msgstr "Sujet D'Aide"
 
-#: src/zope/app/onlinehelp/interfaces.py:64 src/zope/app/wiki/interfaces.py:45
-#: src/zope/app/wiki/interfaces.py:71
+#: src/zope/app/onlinehelp/interfaces.py:64
 msgid "Source Text"
 msgstr "Texte Source"
 
@@ -2187,13 +2218,11 @@
 msgid "The Path to the Definition of a Help Topic"
 msgstr "Le Chemin vers la Définition du Sujet D'Aide"
 
-#: src/zope/app/onlinehelp/interfaces.py:77 src/zope/app/wiki/interfaces.py:51
-#: src/zope/app/wiki/interfaces.py:77
+#: src/zope/app/onlinehelp/interfaces.py:77
 msgid "Source Type"
 msgstr "Type de Source"
 
-#: src/zope/app/onlinehelp/interfaces.py:78 src/zope/app/wiki/interfaces.py:52
-#: src/zope/app/wiki/interfaces.py:78
+#: src/zope/app/onlinehelp/interfaces.py:78
 msgid "Type of the source text, e.g. structured text"
 msgstr "Type de Texte Soruce, ex. : Texte Structuré"
 
@@ -2252,6 +2281,7 @@
 #: src/zope/app/schema/fieldforms.zcml:151
 #: src/zope/app/module/browser/configure.zcml:6
 #: src/zope/app/utility/browser/configure.zcml:85
+#: src/zope/app/cache/browser/configure.zcml:24
 #: src/zope/app/file/browser/configure.zcml:29
 #: src/zope/app/i18nfile/browser/configure.zcml:31
 #: src/zope/app/i18nfile/browser/configure.zcml:73
@@ -2259,12 +2289,11 @@
 #: src/zope/app/rdb/browser/configure.zcml:27
 #: src/zope/app/schemacontent/browser/configure.zcml:46
 #: src/zope/app/schemacontent/browser/configure.zcml:88
-#: src/zope/app/wiki/browser/configure.zcml:76
-#: src/zope/app/wiki/browser/configure.zcml:160
 #: src/zope/app/menu/browser/configure.zcml:71
 #: src/zope/app/menu/browser/configure.zcml:106
-#: src/zope/app/session/browser.zcml:25 src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:15 src/zope/app/session/browser.zcml:38
 #: src/zope/app/zptpage/browser/configure.zcml:39
+#: src/zwiki/browser/configure.zcml:76 src/zwiki/browser/configure.zcml:160
 #: src/zope/app/securitypolicy/browser/configure.zcml:25
 msgid "Edit"
 msgstr "Editer"
@@ -2378,7 +2407,7 @@
 msgid "${view_name} ${ptype} View for ${iface_name} in layer ${layer}"
 msgstr "${view_name} ${ptype} Vue pour ${iface_name} dans la Couche ${layer}"
 
-#: src/zope/app/presentation/presentation.py:273
+#: src/zope/app/presentation/presentation.py:274
 msgid "Registered by ZCML"
 msgstr "Enregistré par ZCML"
 
@@ -2764,7 +2793,7 @@
 "Cet objet n'est pas utilisé actuellement sauf si il est enregistré afin "
 "d'effectuer une fonction déterminée et activé."
 
-#: src/zope/app/registration/configure.zcml:23
+#: src/zope/app/registration/configure.zcml:38
 #: src/zope/app/registration/browser/editregistration.pt:10
 msgid "Registration Manager"
 msgstr "Gestionnaire D'Enregistrement"
@@ -2827,7 +2856,7 @@
 msgstr "Source Texte ReStructuré"
 
 #: src/zope/app/rotterdam/dialog_macros.pt:135
-#: src/zope/app/rotterdam/template.pt:208
+#: src/zope/app/rotterdam/template.pt:205
 msgid "Tip"
 msgstr "Astuce"
 
@@ -2839,7 +2868,7 @@
 msgid "Extended Editor"
 msgstr "Editeur Etendu"
 
-#: src/zope/app/rotterdam/template.pt:102
+#: src/zope/app/rotterdam/template.pt:100
 msgid "Location:&nbsp;"
 msgstr "Emplacement:&nbsp;"
 
@@ -2847,11 +2876,11 @@
 msgid "[Logout]"
 msgstr "[Déconnexion]"
 
-#: src/zope/app/rotterdam/template.pt:56
+#: src/zope/app/rotterdam/template.pt:55
 msgid "[Login]"
 msgstr "[Connexion]"
 
-#: src/zope/app/rotterdam/template.pt:77
+#: src/zope/app/rotterdam/template.pt:75
 msgid "Add:"
 msgstr "Ajouter:"
 
@@ -3233,8 +3262,9 @@
 msgstr "Connexion échouée !"
 
 #: src/zope/app/security/browser/login_failed.pt:9
+#, fuzzy
 msgid ""
-"You cancelled the login procedure. <a href=\"\"> Click here to return. </a>"
+"You cancelled the login procedure. <a href=\"\">Click here to return.</a>"
 msgstr ""
 "Vous avez annulé la procédure de connexion. <a href=\"\"> Cliquez-ici pour "
 "retourner. </a>"
@@ -3256,15 +3286,10 @@
 msgstr "Si vous visualiser cette écran plus de 5 secondes, appuyez ici."
 
 # Default: "Change security settings"
-#: src/zope/app/security/configure.zcml:53
+#: src/zope/app/security/configure.zcml:56
 msgid "change-security-settings-permission"
 msgstr "Modifier les paramétrages de sécurité"
 
-# Default: "Manage Content"
-#: src/zope/app/security/configure.zcml:58
-msgid "manage-content-permission"
-msgstr "Gérer Du Contenu"
-
 #: src/zope/app/security/configure.zcml:6
 msgid ""
 "Special permission indicating unconditional access.                    "
@@ -3275,35 +3300,40 @@
 
 # Default: "View"
 #: src/zope/app/security/configure.zcml:6
-#: src/zope/app/security/configure.zcml:48
+#: src/zope/app/security/configure.zcml:51
 msgid "view-permission"
 msgstr "Vue"
 
+# Default: "Manage Content"
+#: src/zope/app/security/configure.zcml:61
+msgid "manage-content-permission"
+msgstr "Gérer Du Contenu"
+
 # Default: "Manage Service Bindings"
-#: src/zope/app/security/configure.zcml:63
+#: src/zope/app/security/configure.zcml:66
 msgid "manage-service-bindings-permission"
 msgstr "Gérer les Liaisons de Services"
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "Manage executable code, including Python, SQL, ZPT, etc."
 msgstr "Gérer du code exécutable, incluant Python, SQL, ZPT, etc."
 
 # Default: "Manage Code"
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "manage-code-permission"
 msgstr "Gérer De Code"
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:74
+#: src/zope/app/security/configure.zcml:77
 msgid "manage-services-permission"
 msgstr "Gérer Des Services"
 
 # Default: "Manage Principals"
-#: src/zope/app/security/configure.zcml:79
+#: src/zope/app/security/configure.zcml:82
 msgid "manage-principal-permission"
 msgstr "Gérer Des Principales"
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid ""
 "Manage the Zope Application, such as Restart/Shutdown or                    "
 "packing the ZODB."
@@ -3311,19 +3341,19 @@
 "Gérer l'Application Zope, comme Redémmarer/Arrêter ou compacter la ZODB."
 
 # Default: "Manage Application"
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid "manage-application-permission"
 msgstr "Gestion d'Application"
 
-#: src/zope/app/security/interfaces/__init__.py:192
+#: src/zope/app/security/interfaces/__init__.py:184
 msgid "Id as which this permission will be known and used."
 msgstr "Identificateur de la permission."
 
-#: src/zope/app/security/interfaces/__init__.py:198
+#: src/zope/app/security/interfaces/__init__.py:190
 msgid "Provides a title for the permission."
 msgstr "Définir un titre pour la permission."
 
-#: src/zope/app/security/interfaces/__init__.py:203
+#: src/zope/app/security/interfaces/__init__.py:195
 msgid "Provides a description for the permission."
 msgstr "Définir une description pour la permission."
 
@@ -3336,11 +3366,11 @@
 msgstr "Le titre du Principale.  Celui-ci est généralement utilisé dans l'IU."
 
 #: src/zope/app/security/interfaces/__init__.py:50
-#: src/zope/app/security/interfaces/__init__.py:202
+#: src/zope/app/security/interfaces/__init__.py:194
 #: src/zope/schema/interfaces.py:107
 #: src/zope/app/site/browser/interfacedetail.pt:21
 #: src/zope/app/site/browser/interfacedetail.pt:48
-#: src/zope/app/dublincore/browser/edit.pt:22
+#: src/zope/app/dublincore/browser/edit.pt:24
 #: src/zope/app/introspector/marker.pt:63
 #: src/zope/app/introspector/introspector.pt:52
 #: src/zope/app/introspector/introspector.pt:155
@@ -3479,50 +3509,51 @@
 msgid "permission-deny"
 msgstr "Refuser"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "All users have this role implicitly"
 msgstr "Tous les utilisateurs disposent de ce Rôle implicitement"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "Everybody"
 msgstr "Tous"
 
-#: src/zope/app/securitypolicy/configure.zcml:67
+#: src/zope/app/securitypolicy/configure.zcml:94
 msgid "Site Manager"
 msgstr "Gestionnaire de Site"
 
-#: src/zope/app/securitypolicy/configure.zcml:68
+#: src/zope/app/securitypolicy/configure.zcml:95
 msgid "Site Member"
 msgstr "Membre du Site"
 
-#: src/zope/app/session/browser.zcml:25
+#: src/zope/app/session/browser.zcml:15
 #, fuzzy
-msgid "Cookie Browser ID Manager Properties"
+msgid "Cookie Client Id Manager Properties"
 msgstr "Gestionnaire De Propriétés D'Identificateur De Cookie De Navigateur"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Stores session data persistently in the ZODB"
 msgstr "Stocker les données de session de façon persistante dans la ZODB"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Persistent Session Data Container"
 msgstr "Session Persistante De Conteneur De Données"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "Stores session data in RAM"
 msgstr "Stocké le Données De Session en RAM"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "RAM Session Data Container"
 msgstr "Conteneur De Session De Données en RAM"
 
-#: src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:38
 msgid "Session Data Container Properties"
 msgstr "Propriétés De Conteneur De Session De Données"
 
 #: src/zope/app/session/browser.zcml:8
+#, fuzzy
 msgid ""
-"Uses a cookie to uniquely identify a browser, allowing        state to be "
+"Uses a cookie to uniquely identify a client, allowing        state to be "
 "maintained between requests"
 msgstr ""
 "Utilisé un Cookie afin d'identifier de façon unique un Navigateur, "
@@ -3530,35 +3561,39 @@
 
 #: src/zope/app/session/browser.zcml:8
 #, fuzzy
-msgid "Cookie Browser Id Manager"
+msgid "Cookie Client Id Manager"
 msgstr "Gestionnaire D'Identificateur De Cookie De Navigateur"
 
-#: src/zope/app/session/interfaces.py:100
-msgid "Timeout"
-msgstr "Arrêt"
+#: src/zope/app/session/http.py:48
+msgid "Cookie Name"
+msgstr "Nom De Cookie"
 
-#: src/zope/app/session/interfaces.py:101
-msgid "Number of seconds before data becomes stale and may be removed"
+#: src/zope/app/session/http.py:49
+msgid ""
+"Name of cookie used to maintain state. Must be unique to the site domain "
+"name, and only contain ASCII letters, digits and '_'"
 msgstr ""
-"Nombre de secondes avant que ces données ne deviennent obsolètes et puissent "
-"être supprimées"
+"Nom du Cookie utilisé afin de conserver l'état. Il doit être unique pour le "
+"nom de domaine du site, et ne contenir que des lettres, chiffres ASCII et '_'"
 
-#: src/zope/app/session/interfaces.py:109
-msgid "Purge Interval"
-msgstr "Intervale De Purge"
+#: src/zope/app/session/http.py:61
+msgid "Cookie Lifetime"
+msgstr "Durée de vie du Cookie"
 
-#: src/zope/app/session/interfaces.py:110
+#: src/zope/app/session/http.py:62
 msgid ""
-"How often stale data is purged in seconds. Higer values improve performance."
+"Number of seconds until the browser expires the cookie. Leave blank expire "
+"the cookie when the browser is quit. Set to 0 to never expire. "
 msgstr ""
-"Périodicité de purge des données obsolètes par secondes. Une valeur élevée "
-"améliore la performance."
+"Nombre de secondes avant lesquelles les Cookies de Navigateur expirent. Si "
+"rien n'est spécifié les Cookies expirent lorsque le Navigateur est fermé. Si "
+"la valeur est 0, ils n'expirent jamais. "
 
-#: src/zope/app/session/interfaces.py:144
+#: src/zope/app/session/interfaces.py:125
 msgid "Last Access Time"
 msgstr "Dernier Accès"
 
-#: src/zope/app/session/interfaces.py:145
+#: src/zope/app/session/interfaces.py:126
 msgid ""
 "Approximate epoch time this ISessionData was last retrieved from its "
 "ISessionDataContainer"
@@ -3566,57 +3601,57 @@
 "Temps approximatif à laquelle ces IDonnéesDeSession a été extraite de son "
 "Conteneur D'IDonnéesDeSession"
 
-#: src/zope/app/session/interfaces.py:53
-msgid "Cookie Name"
-msgstr "Nom De Cookie"
+#: src/zope/app/session/interfaces.py:66
+msgid "Timeout"
+msgstr "Arrêt"
 
-#: src/zope/app/session/interfaces.py:54
+#: src/zope/app/session/interfaces.py:67
+#, fuzzy
 msgid ""
-"Name of cookie used to maintain state. Must be unique to the site domain "
-"name, and only contain ASCII letters, digits and '_'"
+"Number of seconds before data becomes stale and may be removed. A value of "
+"'0' means no expiration."
 msgstr ""
-"Nom du Cookie utilisé afin de conserver l'état. Il doit être unique pour le "
-"nom de domaine du site, et ne contenir que des lettres, chiffres ASCII et '_'"
+"Nombre de secondes avant que ces données ne deviennent obsolètes et puissent "
+"être supprimées"
 
-#: src/zope/app/session/interfaces.py:66
-msgid "Cookie Lifetime"
-msgstr "Durée de vie du Cookie"
+#: src/zope/app/session/interfaces.py:75
+msgid "Timeout resolution (in seconds)"
+msgstr ""
 
-#: src/zope/app/session/interfaces.py:67
+#: src/zope/app/session/interfaces.py:76
 msgid ""
-"Number of seconds until the browser expires the cookie. Leave blank expire "
-"the cookie when the browser is quit. Set to 0 to never expire. "
+"Defines what the 'resolution' of item timeout is. Setting this higher allows "
+"the transience machinery to do fewer 'writes' at the expense of  causing "
+"items to time out later than the 'Data object timeout value' by  a factor of "
+"(at most) this many seconds."
 msgstr ""
-"Nombre de secondes avant lesquelles les Cookies de Navigateur expirent. Si "
-"rien n'est spécifié les Cookies expirent lorsque le Navigateur est fermé. Si "
-"la valeur est 0, ils n'expirent jamais. "
 
 #: src/zope/app/site/browser/__init__.py:108
 msgid "Add Service"
 msgstr "Ajouter un Service"
 
-#: src/zope/app/site/browser/__init__.py:145
+#: src/zope/app/site/browser/__init__.py:144
 #: src/zope/app/schema/browser/schema_add.pt:8
 msgid "Add Utility"
 msgstr "Ajouter un Utilitaire"
 
-#: src/zope/app/site/browser/__init__.py:236
+#: src/zope/app/site/browser/__init__.py:234
 msgid "Activated: ${activated_services}"
 msgstr "Activé: ${activated_services}"
 
-#: src/zope/app/site/browser/__init__.py:240
+#: src/zope/app/site/browser/__init__.py:238
 msgid "All of the checked services were already active"
 msgstr "Tous les Services sélectionnés étaient déjà actifs"
 
-#: src/zope/app/site/browser/__init__.py:251
+#: src/zope/app/site/browser/__init__.py:249
 msgid "Deactivated: ${deactivated_services}"
 msgstr "Désactivé: ${deactivated_services}"
 
-#: src/zope/app/site/browser/__init__.py:255
+#: src/zope/app/site/browser/__init__.py:253
 msgid "None of the checked services were active"
 msgstr "Aucun des Services sélectionnés n'était activé"
 
-#: src/zope/app/site/browser/__init__.py:266
+#: src/zope/app/site/browser/__init__.py:264
 msgid ""
 "Can't delete active service(s): ${service_names}; use the Deactivate button "
 "to deactivate"
@@ -3624,27 +3659,27 @@
 "Impossible de supprimer un/des Service(s) actif(s): ${service_names}; "
 "utilisez le bouton Désactiver au préalable"
 
-#: src/zope/app/site/browser/__init__.py:300
+#: src/zope/app/site/browser/__init__.py:298
 msgid "Deleted: ${service_names}"
 msgstr "Supprimé: ${service_names}"
 
-#: src/zope/app/site/browser/__init__.py:335
+#: src/zope/app/site/browser/__init__.py:333
 msgid "global"
 msgstr "global"
 
-#: src/zope/app/site/browser/__init__.py:416
+#: src/zope/app/site/browser/__init__.py:414
 msgid "Invalid service type specified"
 msgstr "Le type du Service spécifié n'est pas valide"
 
-#: src/zope/app/site/browser/__init__.py:423
+#: src/zope/app/site/browser/__init__.py:421
 msgid "No change"
 msgstr "Pas de modification"
 
-#: src/zope/app/site/browser/__init__.py:427
+#: src/zope/app/site/browser/__init__.py:425
 msgid "Service deactivated"
 msgstr "Service désactivé"
 
-#: src/zope/app/site/browser/__init__.py:430
+#: src/zope/app/site/browser/__init__.py:428
 msgid "${active_services} activated"
 msgstr "${active_services} activé"
 
@@ -3657,12 +3692,6 @@
 msgid "Service name"
 msgstr "Nom de Service"
 
-#: src/zope/app/site/browser/add_svc_config.pt:35
-#: src/zope/app/cache/browser/ramedit.pt:53
-#: src/zope/app/bundle/browser/bundle.pt:130
-msgid "reset-button"
-msgstr "Re-initialisé"
-
 #: src/zope/app/site/browser/add_svc_config.pt:7
 msgid "Register this object to provide the following service(s):"
 msgstr "Enregister cet objet pour assurer le(s) Service(s) suivant(s):"
@@ -3697,7 +3726,7 @@
 
 #: src/zope/app/site/browser/configure.zcml:210
 #: src/zope/app/site/browser/serviceactivation.pt:26
-#: src/zope/app/apidoc/ifacemodule/index.pt:247
+#: src/zope/app/apidoc/ifacemodule/index.pt:248
 msgid "Service"
 msgstr "Service"
 
@@ -3797,19 +3826,13 @@
 #: src/zope/app/zptpage/browser/inlinecode.pt:65
 #: src/zope/app/workflow/stateful/browser/instance_manage.pt:76
 #: src/zope/app/pythonpage/edit.pt:71
-#: src/zope/app/form/browser/editwizard.pt:50
-#: src/zope/app/form/browser/addwizard.pt:58
+#: src/zope/app/form/browser/editwizard.pt:45
+#: src/zope/app/form/browser/addwizard.pt:66
 #: src/zope/app/form/browser/edit.pt:52
 #: src/zope/app/registration/browser/editregistration.pt:51
 msgid "submit-button"
 msgstr "Soumettre"
 
-#: src/zope/app/site/browser/services.pt:15
-#: src/zope/app/utility/browser/utilities.pt:11
-#: src/zope/app/bundle/browser/bundle.pt:53
-msgid "(click to clear message)"
-msgstr "(cliquer pour effacer le message)"
-
 #: src/zope/app/site/browser/services.pt:18
 msgid "No services are registered."
 msgstr "Aucun Service enregistré."
@@ -3855,36 +3878,26 @@
 "existants)."
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:30
+#: src/zope/app/site/browser/tasks.pt:30 src/zope/app/site/browser/tasks.pt:35
 msgid "label-configure-services"
 msgstr "Configurer des Services"
 
 # Default: "Configure utilities"
-#: src/zope/app/site/browser/tasks.pt:36
+#: src/zope/app/site/browser/tasks.pt:41
 msgid "label-configure-utilities"
 msgstr "Configurer utilitaires"
 
-# Default: "Add a service"
-#: src/zope/app/site/browser/tasks.pt:43
-msgid "label-add-service"
-msgstr "Ajouter un Service"
-
-# Default: "Add a utility"
+# Default: "Software"
 #: src/zope/app/site/browser/tasks.pt:49
-msgid "label-add-utility"
-msgstr "Ajouter un Utilitaire"
+msgid "label-software"
+msgstr "Logiciel"
 
 # Default: "Common Site Management Tasks"
 #: src/zope/app/site/browser/tasks.pt:5
 msgid "heading-common-site-management-tasks"
 msgstr "Tâches Communes De Gestion De Site"
 
-# Default: "Software"
-#: src/zope/app/site/browser/tasks.pt:56
-msgid "label-software"
-msgstr "Logiciel"
-
-#: src/zope/app/site/browser/tasks.pt:59
+#: src/zope/app/site/browser/tasks.pt:52
 msgid ""
 "The site may customize the behavior of existing software or define its own. "
 "The first step in creating a new software package is to create a new Site "
@@ -3895,12 +3908,12 @@
 "consiste à créer un Dossier De Gestion De Site qui contiendra le logiciel."
 
 # Default: "Customize the behavior of existing software"
-#: src/zope/app/site/browser/tasks.pt:68
+#: src/zope/app/site/browser/tasks.pt:61
 msgid "label-customize-existing-software"
 msgstr "Adaptez le comportement de logiciel existant"
 
 # Default: "Create a new Site Management Folder"
-#: src/zope/app/site/browser/tasks.pt:75
+#: src/zope/app/site/browser/tasks.pt:68
 msgid "label-create-new-site-management-folder"
 msgstr "Créer un nouveau Dossier De Gestion De Site"
 
@@ -3916,24 +3929,6 @@
 msgid "rename-button"
 msgstr "Renommer"
 
-#: src/zope/app/site/browser/tool.pt:106
-#: src/zope/app/site/browser/services.pt:74
-#: src/zope/app/utility/browser/utilities.pt:50
-#: src/zope/app/zptpage/browser/inlinecode.pt:63
-#: src/zope/app/dublincore/browser/edit.pt:31
-#: src/zope/app/schemacontent/browser/permission_edit.pt:33
-#: src/zope/app/errorservice/browser/error.pt:52
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
-#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
-#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
-#: src/zope/app/form/browser/edit.pt:50
-#: src/zope/app/wiki/browser/subscriptions.pt:35
-#: src/zope/app/wiki/browser/wiki_add.pt:29
-#: src/zope/app/registration/browser/editregistration.pt:49
-msgid "refresh-button"
-msgstr "Rafraîchir"
-
 #: src/zope/app/site/browser/tool.pt:110
 #: src/zope/app/securitypolicy/browser/principal_role_association.pt:98
 msgid "apply-button"
@@ -3964,21 +3959,6 @@
 msgid "disabled"
 msgstr "Désactivé"
 
-#: src/zope/app/site/browser/tool.pt:91
-#: src/zope/app/site/browser/services.pt:66
-#: src/zope/app/site/browser/add_svc_config.pt:16
-#: src/zope/app/utility/browser/utilities.pt:42
-#: src/zope/app/registration/browser/registration.pt:30
-msgid "activate-button"
-msgstr "Activer"
-
-#: src/zope/app/site/browser/tool.pt:93
-#: src/zope/app/site/browser/services.pt:68
-#: src/zope/app/utility/browser/utilities.pt:44
-#: src/zope/app/registration/browser/registration.pt:25
-msgid "deactivate-button"
-msgstr "Désactiver"
-
 #: src/zope/app/site/browser/tool.pt:96
 #: src/zope/app/schema/browser/schema_add.pt:39
 #: src/zope/app/workflow/stateful/browser/add.pt:65
@@ -3987,40 +3967,30 @@
 #: src/zope/app/i18n/browser/translate.pt:48
 #: src/zope/app/container/browser/add.pt:38
 #: src/zope/app/introspector/marker.pt:133 src/zope/app/form/browser/add.pt:52
-#: src/zope/app/wiki/browser/subscriptions.pt:37
-#: src/zope/app/wiki/browser/wiki_add.pt:31
 msgid "add-button"
 msgstr "Ajouter"
 
-#: src/zope/app/site/browser/tool.pt:99
-#: src/zope/app/site/browser/services.pt:71
-#: src/zope/app/utility/browser/utilities.pt:47
-#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
-#: src/zope/app/i18n/browser/translate.pt:37
-msgid "delete-button"
-msgstr "Effacer"
-
 #: src/zope/app/site/browser/tools.pt:5
 msgid "Available Tools"
 msgstr "Outils disponibles"
 
-#: src/zope/app/site/browser/tools.py:159
-#: src/zope/app/site/browser/tools.py:303
+#: src/zope/app/site/browser/tools.py:160
+#: src/zope/app/site/browser/tools.py:304
 msgid "Deleted selected tools."
 msgstr "Effacer les outils sélectionnés."
 
-#: src/zope/app/site/browser/tools.py:162
-#: src/zope/app/site/browser/tools.py:308
+#: src/zope/app/site/browser/tools.py:163
+#: src/zope/app/site/browser/tools.py:309
 msgid "Renamed selected tools."
 msgstr "Renommer les outils sélectionnés."
 
-#: src/zope/app/site/browser/tools.py:167
-#: src/zope/app/site/browser/tools.py:313
+#: src/zope/app/site/browser/tools.py:168
+#: src/zope/app/site/browser/tools.py:314
 msgid "Activated registrations."
 msgstr "Activé des enregistrements."
 
-#: src/zope/app/site/browser/tools.py:170
-#: src/zope/app/site/browser/tools.py:316
+#: src/zope/app/site/browser/tools.py:171
+#: src/zope/app/site/browser/tools.py:317
 msgid "Deactivated registrations."
 msgstr "Désactivé des enregistrements."
 
@@ -4029,19 +3999,19 @@
 msgstr "Le nom qui est enregistré"
 
 # Default: "n/a"
-#: src/zope/app/size/__init__.py:44
+#: src/zope/app/size/__init__.py:42
 msgid "not-available"
 msgstr "non disponible"
 
-#: src/zope/app/size/__init__.py:48
+#: src/zope/app/size/__init__.py:46
 msgid "0 KB"
 msgstr "0 KB"
 
-#: src/zope/app/size/__init__.py:50
+#: src/zope/app/size/__init__.py:48
 msgid "1 KB"
 msgstr "1 KB"
 
-#: src/zope/app/size/__init__.py:55
+#: src/zope/app/size/__init__.py:53
 msgid "${size} KB"
 msgstr "1 KB"
 
@@ -4099,19 +4069,19 @@
 msgid "SQL Script"
 msgstr "Script SQL"
 
-#: src/zope/app/sqlscript/interfaces.py:29
+#: src/zope/app/sqlscript/interfaces.py:30
 msgid "Connection Name"
 msgstr "Nom De Connexion"
 
-#: src/zope/app/sqlscript/interfaces.py:30
+#: src/zope/app/sqlscript/interfaces.py:31
 msgid "The Connection Name for the connection to be used."
 msgstr "Le Nom De Connexion à utiliser."
 
-#: src/zope/app/sqlscript/interfaces.py:35
+#: src/zope/app/sqlscript/interfaces.py:36
 msgid "Arguments"
 msgstr "Arguments"
 
-#: src/zope/app/sqlscript/interfaces.py:36
+#: src/zope/app/sqlscript/interfaces.py:37
 msgid ""
 "A set of attributes that can be used during the SQL command rendering "
 "process to provide dynamic data."
@@ -4119,7 +4089,7 @@
 "Un ensemble d'attributs qui peuvent être utilisés lors du processus de rendu "
 "de commande SQL afin de délivrer des données dynamiques."
 
-#: src/zope/app/sqlscript/interfaces.py:45
+#: src/zope/app/sqlscript/interfaces.py:46
 msgid "The SQL command to be run."
 msgstr "La commande SQL à exécuter."
 
@@ -4358,10 +4328,55 @@
 msgstr ""
 "Enregistrements d'Utilitaire d'Interface ${interface} nommé ${utility_name}"
 
+#: src/zope/app/utility/browser/utilities.pt:11
+#: src/zope/app/site/browser/services.pt:15
+#: src/zope/app/bundle/browser/bundle.pt:53
+msgid "(click to clear message)"
+msgstr "(cliquer pour effacer le message)"
+
 #: src/zope/app/utility/browser/utilities.pt:34
 msgid "change registration"
 msgstr "Modifier Enregistrement"
 
+#: src/zope/app/utility/browser/utilities.pt:42
+#: src/zope/app/site/browser/tool.pt:91
+#: src/zope/app/site/browser/services.pt:66
+#: src/zope/app/site/browser/add_svc_config.pt:16
+#: src/zope/app/registration/browser/registration.pt:30
+msgid "activate-button"
+msgstr "Activer"
+
+#: src/zope/app/utility/browser/utilities.pt:44
+#: src/zope/app/site/browser/tool.pt:93
+#: src/zope/app/site/browser/services.pt:68
+#: src/zope/app/registration/browser/registration.pt:25
+msgid "deactivate-button"
+msgstr "Désactiver"
+
+#: src/zope/app/utility/browser/utilities.pt:47
+#: src/zope/app/site/browser/tool.pt:99
+#: src/zope/app/site/browser/services.pt:71
+#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
+#: src/zope/app/i18n/browser/translate.pt:37
+msgid "delete-button"
+msgstr "Effacer"
+
+#: src/zope/app/utility/browser/utilities.pt:50
+#: src/zope/app/site/browser/tool.pt:106
+#: src/zope/app/site/browser/services.pt:74
+#: src/zope/app/zptpage/browser/inlinecode.pt:63
+#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/schemacontent/browser/permission_edit.pt:33
+#: src/zope/app/errorservice/browser/error.pt:52
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
+#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
+#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
+#: src/zope/app/form/browser/edit.pt:50
+#: src/zope/app/registration/browser/editregistration.pt:49
+msgid "refresh-button"
+msgstr "Rafraîchir"
+
 #: src/zope/app/utility/browser/utilities.pt:6
 msgid "Utilities registered in this utility service"
 msgstr "Utilitaires enregistrés dans ce Service D'Utilitaire"
@@ -4378,227 +4393,6 @@
 msgid "The physical path to the component"
 msgstr "Le chemin physique vers le composant"
 
-#: src/zope/app/wiki/browser/configure.zcml:101
-#: src/zope/app/wiki/browser/configure.zcml:158
-msgid "View"
-msgstr "Vue"
-
-#: src/zope/app/wiki/browser/configure.zcml:109
-#: src/zope/app/wiki/browser/configure.zcml:161
-#: src/zope/app/wiki/browser/parents_page.pt:13
-msgid "Parents"
-msgstr "Parents"
-
-#: src/zope/app/wiki/browser/configure.zcml:134
-#: src/zope/app/wiki/browser/configure.zcml:143
-#: src/zope/app/wiki/browser/configure.zcml:159
-msgid "Comment"
-msgstr "Commentaire"
-
-#: src/zope/app/wiki/browser/configure.zcml:143
-msgid "A Comment"
-msgstr "Un commentaire"
-
-#: src/zope/app/wiki/browser/configure.zcml:152
-msgid "Menu for Wiki Page related actions."
-msgstr "Menu d'actions liées à une Page Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:168
-msgid "Table of Contents"
-msgstr "Table des matières"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "Wiki"
-msgstr "Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "A Wiki"
-msgstr "Un Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:24
-#: src/zope/app/wiki/browser/configure.zcml:162
-msgid "TOC"
-msgstr "Table des matières"
-
-#: src/zope/app/wiki/browser/configure.zcml:32
-#: src/zope/app/wiki/browser/configure.zcml:169
-msgid "Search"
-msgstr "Chercher"
-
-#: src/zope/app/wiki/browser/configure.zcml:44
-#: src/zope/app/wiki/browser/configure.zcml:118
-#: src/zope/app/wiki/browser/configure.zcml:163
-#: src/zope/app/wiki/browser/configure.zcml:170
-msgid "Subscriptions"
-msgstr "Abonnements"
-
-#: src/zope/app/wiki/browser/configure.zcml:76
-msgid "Change Wiki Page"
-msgstr "Modifier une Page Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:8
-msgid "Add Wiki"
-msgstr "Ajouter un Wiki"
-
-#: src/zope/app/wiki/browser/parents_page.pt:30
-msgid "reparent-button"
-msgstr "Associer un parent"
-
-#: src/zope/app/wiki/browser/parents_page.pt:35
-msgid "Branch"
-msgstr "Branche"
-
-#: src/zope/app/wiki/browser/skin/template.pt:32
-msgid "Last modified by ${user} on ${date}"
-msgstr "Dernière modification par ${user} le ${date}"
-
-#: src/zope/app/wiki/browser/skin/template.pt:64
-msgid "Jump to:"
-msgstr "Aller à:"
-
-#: src/zope/app/wiki/browser/skin/template.pt:73
-msgid ""
-"User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Search Wiki</a> </div>"
-msgstr ""
-"Utilisateur: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search."
-"html\">Recherche Wiki</a> </div>"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:12
-msgid "Current Subscriptions"
-msgstr "Abonnements courants"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:25
-msgid "Enter new Users (separate by 'Return')"
-msgstr "Encoder des nouveaux Utilisateurs (séparés par 'Retour')"
-
-#: src/zope/app/wiki/browser/wiki_search.pt:9
-msgid "Wiki Search"
-msgstr "Rechercher dans Wiki"
-
-#: src/zope/app/wiki/browser/wiki_toc.pt:9
-msgid "Wiki Table of Contents"
-msgstr "Table des matières Wiki"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "A Wiki Page"
-msgstr "Une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "Wiki Page"
-msgstr "Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "The Wiki Editor can create and edit wikis."
-msgstr "L'Editeur Wiki permet de créer et éditer Wikis."
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "Wiki Editor"
-msgstr "Editeur Wiki"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "A Wiki Page Comment"
-msgstr "Un Commentaire de Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "Wiki Page Comment"
-msgstr "Commentaire de Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "Wiki Administrator"
-msgstr "Administrateur Wiki"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "The Wiki Admin can fully manage wiki pages."
-msgstr "L'Administrateur Wiki peut totalement gérer les pages Wikis."
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View Wiki Page"
-msgstr "Visualiser Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View a Wiki Page"
-msgstr "Visualiser une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Comment on Wiki Page"
-msgstr "Commentaire sur une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Make a comment on Wiki Page"
-msgstr "Commenter une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:42
-#: src/zope/app/wiki/browser/configure.zcml:60
-msgid "Add Wiki Page"
-msgstr "Ajouter une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:51
-msgid "Edit Wiki Page"
-msgstr "Editer une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:60
-msgid "Delete Wiki Page"
-msgstr "Effacer une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent Wiki Page"
-msgstr "Associer un parent à la Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent a Wiki Page"
-msgstr "Associer un parent à une Page Wiki"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki User"
-msgstr "Utilisateur Wiki"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki visitors, which can only view and comment on wikis."
-msgstr "Visiteurs Wiki, qui ne peuvent que visualiser et commenter Wikis."
-
-#: src/zope/app/wiki/configure.zcml:93
-msgid "Minimal Wiki Page Container implementation "
-msgstr "Implémentation minimum de Conteneur De Page Wiki"
-
-#: src/zope/app/wiki/interfaces.py:150
-msgid "Previous Source Text"
-msgstr "Texte Source précédent"
-
-#: src/zope/app/wiki/interfaces.py:151
-msgid "Previous source text of the Wiki Page."
-msgstr "Texte source précédent de la Page Wiki."
-
-#: src/zope/app/wiki/interfaces.py:40
-msgid "Comment Title"
-msgstr "Titre de commentaire"
-
-#: src/zope/app/wiki/interfaces.py:46
-msgid "Renderable source text of the comment."
-msgstr "Texte source généré par le commentaire."
-
-#: src/zope/app/wiki/interfaces.py:72
-msgid "Renderable source text of the Wiki Page."
-msgstr "Texte source généré par la Page Wiki."
-
-#: src/zope/app/wiki/interfaces.py:96
-msgid "Wiki Page Parents"
-msgstr "Parents de la Page Wiki"
-
-#: src/zope/app/wiki/interfaces.py:97
-msgid "Parents of a Wiki"
-msgstr "Parents d'une Page Wiki"
-
-#: src/zope/app/wiki/interfaces.py:98
-msgid "Parent Name"
-msgstr "Nom du parent"
-
-#: src/zope/app/wiki/interfaces.py:99
-msgid "Name of the parent wiki page."
-msgstr "Nom du parent de la Page Wiki"
-
 #: src/zope/app/workflow/browser/configure.zcml:6
 msgid ""
 "Workflow Process Definitions define a particular workflow       for an "
@@ -4686,14 +4480,14 @@
 msgstr "Transition"
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "Content Workflows Manager"
-msgstr "Gestionnaire De Contenu De Gestion De Flux"
-
-#: src/zope/app/workflow/stateful/browser/configure.zcml:121
 msgid "An utility to manage content and workflow interaction."
 msgstr ""
 "Un Utilitaire pour gérer le contenu and l'intéraction de Gestion De Glux."
 
+#: src/zope/app/workflow/stateful/browser/configure.zcml:121
+msgid "Content Workflows Manager"
+msgstr "Gestionnaire De Contenu De Gestion De Flux"
+
 #: src/zope/app/workflow/stateful/browser/configure.zcml:129
 msgid "Content/Process Registry"
 msgstr "Registre De Contenu/Processus"
@@ -4910,59 +4704,59 @@
 msgid "Source State"
 msgstr "Etat D'Origine"
 
-#: src/zope/app/zopetop/widget_macros.pt:13
-msgid "Logged in as ${user_title}"
-msgstr "Connecté comme ${user_title}"
-
-#: src/zope/app/zopetop/widget_macros.pt:132
+#: src/zope/app/zopetop/widget_macros.pt:152
 msgid "Views"
 msgstr "Vues"
 
-#: src/zope/app/zopetop/widget_macros.pt:149
+#: src/zope/app/zopetop/widget_macros.pt:169
 msgid "Actions"
 msgstr "Actions"
 
-#: src/zope/app/zopetop/widget_macros.pt:176
+#: src/zope/app/zopetop/widget_macros.pt:196
 msgid "Location:"
 msgstr "Emplacement:"
 
-#: src/zope/app/zopetop/widget_macros.pt:26
+#: src/zope/app/zopetop/widget_macros.pt:32
+msgid "Logged in as ${user_title}"
+msgstr "Connecté comme ${user_title}"
+
+#: src/zope/app/zopetop/widget_macros.pt:46
 msgid "Common Tasks"
 msgstr "Tâches communes"
 
-#: src/zope/app/zopetop/widget_macros.pt:37
+#: src/zope/app/zopetop/widget_macros.pt:57
 msgid "user accounts"
 msgstr "Comptes D'Utilisateur"
 
-#: src/zope/app/zopetop/widget_macros.pt:40
+#: src/zope/app/zopetop/widget_macros.pt:60
 msgid "User Accounts"
 msgstr "Comptes D'Utilisateur"
 
-#: src/zope/app/zopetop/widget_macros.pt:43
+#: src/zope/app/zopetop/widget_macros.pt:63
 msgid "control panels"
 msgstr "Panneaux De Contrôle"
 
-#: src/zope/app/zopetop/widget_macros.pt:46
+#: src/zope/app/zopetop/widget_macros.pt:66
 msgid "Control Panels"
 msgstr "Panneaux De Contrôle"
 
-#: src/zope/app/zopetop/widget_macros.pt:49
+#: src/zope/app/zopetop/widget_macros.pt:69
 msgid "system security"
 msgstr "sécurité du système"
 
-#: src/zope/app/zopetop/widget_macros.pt:52
+#: src/zope/app/zopetop/widget_macros.pt:72
 msgid "System Security"
 msgstr "Sécurité Du Système"
 
-#: src/zope/app/zopetop/widget_macros.pt:55
+#: src/zope/app/zopetop/widget_macros.pt:75
 msgid "add more"
 msgstr "ajouter suite"
 
-#: src/zope/app/zopetop/widget_macros.pt:58
+#: src/zope/app/zopetop/widget_macros.pt:78
 msgid "Add More"
 msgstr "Ajouter suite"
 
-#: src/zope/app/zopetop/widget_macros.pt:66
+#: src/zope/app/zopetop/widget_macros.pt:86
 msgid "Root Folder"
 msgstr "Dossier Racine"
 
@@ -5043,27 +4837,14 @@
 "Evaluer des portions de code en TAL.  Généralement nous décourageons l'usage "
 "de cette fonction."
 
-#: src/zope/app/zptpage/zptpage.py:114
+#: src/zope/app/zptpage/zptpage.py:112
 msgid "1 line"
 msgstr "1 ligne"
 
-#: src/zope/app/zptpage/zptpage.py:115
+#: src/zope/app/zptpage/zptpage.py:113
 msgid "${lines} lines"
 msgstr "${lines} lignes"
 
-#: src/zope/exceptions/unauthorized.py:69
-#: src/zope/exceptions/unauthorized.py:72
-msgid "You are not allowed to access ${name} in this context"
-msgstr "Vous ne pouvez accéder à ${name} dans ce contexte"
-
-#: src/zope/exceptions/unauthorized.py:74
-msgid "You are not authorized"
-msgstr "Vous n'êtes pas autorisé"
-
-#: src/zope/exceptions/unauthorized.py:84
-msgid "a particular ${object}"
-msgstr "un ${object} particulier"
-
 #: src/zope/schema/_bootstrapinterfaces.py:43
 msgid "Required input is missing."
 msgstr "L'argument requis n'est pas disponible."
@@ -5300,18 +5081,234 @@
 msgid "The field is not bound."
 msgstr "Le Champ n'est pas lié."
 
-#: src/zope/schema/tests/test_objectfield.py:38
+#: src/zope/schema/tests/test_objectfield.py:37
 msgid "Foo"
 msgstr "Vide"
 
-#: src/zope/schema/tests/test_objectfield.py:39
+#: src/zope/schema/tests/test_objectfield.py:38
 msgid "Foo description"
 msgstr "Description vide"
 
-#: src/zope/schema/tests/test_objectfield.py:44
+#: src/zope/schema/tests/test_objectfield.py:43
 msgid "Bar"
 msgstr "Barre"
 
-#: src/zope/schema/tests/test_objectfield.py:45
+#: src/zope/schema/tests/test_objectfield.py:44
 msgid "Bar description"
 msgstr "Description de barre"
+
+#: src/zwiki/browser/configure.zcml:101 src/zwiki/browser/configure.zcml:158
+msgid "View"
+msgstr "Vue"
+
+#: src/zwiki/browser/configure.zcml:109 src/zwiki/browser/configure.zcml:161
+msgid "Parents"
+msgstr "Parents"
+
+#: src/zwiki/browser/configure.zcml:134 src/zwiki/browser/configure.zcml:143
+#: src/zwiki/browser/configure.zcml:159
+msgid "Comment"
+msgstr "Commentaire"
+
+#: src/zwiki/browser/configure.zcml:143
+msgid "A Comment"
+msgstr "Un commentaire"
+
+#: src/zwiki/browser/configure.zcml:152
+msgid "Menu for Wiki Page related actions."
+msgstr "Menu d'actions liées à une Page Wiki"
+
+#: src/zwiki/browser/configure.zcml:168
+msgid "Table of Contents"
+msgstr "Table des matières"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "Wiki"
+msgstr "Wiki"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "A Wiki"
+msgstr "Un Wiki"
+
+#: src/zwiki/browser/configure.zcml:24 src/zwiki/browser/configure.zcml:162
+msgid "TOC"
+msgstr "Table des matières"
+
+#: src/zwiki/browser/configure.zcml:32 src/zwiki/browser/configure.zcml:169
+msgid "Search"
+msgstr "Chercher"
+
+#: src/zwiki/browser/configure.zcml:44 src/zwiki/browser/configure.zcml:118
+#: src/zwiki/browser/configure.zcml:163 src/zwiki/browser/configure.zcml:170
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#: src/zwiki/browser/configure.zcml:76
+msgid "Change Wiki Page"
+msgstr "Modifier une Page Wiki"
+
+#: src/zwiki/browser/configure.zcml:8
+msgid "Add Wiki"
+msgstr "Ajouter un Wiki"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki User"
+msgstr "Utilisateur Wiki"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki visitors, which can only view and comment on wikis."
+msgstr "Visiteurs Wiki, qui ne peuvent que visualiser et commenter Wikis."
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "A Wiki Page"
+msgstr "Une Page Wiki"
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "Wiki Page"
+msgstr "Page Wiki"
+
+#: src/zwiki/configure.zcml:17
+msgid "The Wiki Editor can create and edit wikis."
+msgstr "L'Editeur Wiki permet de créer et éditer Wikis."
+
+#: src/zwiki/configure.zcml:17
+msgid "Wiki Editor"
+msgstr "Editeur Wiki"
+
+#: src/zwiki/configure.zcml:186
+msgid "A Wiki Page Comment"
+msgstr "Un Commentaire de Page Wiki"
+
+#: src/zwiki/configure.zcml:186
+msgid "Wiki Page Comment"
+msgstr "Commentaire de Page Wiki"
+
+#: src/zwiki/configure.zcml:22
+msgid "Wiki Administrator"
+msgstr "Administrateur Wiki"
+
+#: src/zwiki/configure.zcml:22
+msgid "The Wiki Admin can fully manage wiki pages."
+msgstr "L'Administrateur Wiki peut totalement gérer les pages Wikis."
+
+#: src/zwiki/configure.zcml:27
+msgid "View Wiki Page"
+msgstr "Visualiser Page Wiki"
+
+#: src/zwiki/configure.zcml:27
+msgid "View a Wiki Page"
+msgstr "Visualiser une Page Wiki"
+
+#: src/zwiki/configure.zcml:36
+msgid "Comment on Wiki Page"
+msgstr "Commentaire sur une Page Wiki"
+
+#: src/zwiki/configure.zcml:36
+msgid "Make a comment on Wiki Page"
+msgstr "Commenter une Page Wiki"
+
+#: src/zwiki/configure.zcml:45 src/zwiki/browser/configure.zcml:60
+msgid "Add Wiki Page"
+msgstr "Ajouter une Page Wiki"
+
+#: src/zwiki/configure.zcml:54
+msgid "Edit Wiki Page"
+msgstr "Editer une Page Wiki"
+
+#: src/zwiki/configure.zcml:63
+msgid "Delete Wiki Page"
+msgstr "Effacer une Page Wiki"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent Wiki Page"
+msgstr "Associer un parent à la Page Wiki"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent a Wiki Page"
+msgstr "Associer un parent à une Page Wiki"
+
+#: src/zwiki/configure.zcml:96
+msgid "Minimal Wiki Page Container implementation "
+msgstr "Implémentation minimum de Conteneur De Page Wiki"
+
+#~ msgid "Purge Interval"
+#~ msgstr "Intervale De Purge"
+
+#~ msgid ""
+#~ "How often stale data is purged in seconds. Higer values improve "
+#~ "performance."
+#~ msgstr ""
+#~ "Périodicité de purge des données obsolètes par secondes. Une valeur "
+#~ "élevée améliore la performance."
+
+# Default: "Add a service"
+#~ msgid "label-add-service"
+#~ msgstr "Ajouter un Service"
+
+# Default: "Add a utility"
+#~ msgid "label-add-utility"
+#~ msgstr "Ajouter un Utilitaire"
+
+#~ msgid "reparent-button"
+#~ msgstr "Associer un parent"
+
+#~ msgid "Branch"
+#~ msgstr "Branche"
+
+#~ msgid "Last modified by ${user} on ${date}"
+#~ msgstr "Dernière modification par ${user} le ${date}"
+
+#~ msgid "Jump to:"
+#~ msgstr "Aller à:"
+
+#~ msgid ""
+#~ "User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
+#~ "\">Search Wiki</a> </div>"
+#~ msgstr ""
+#~ "Utilisateur: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search."
+#~ "html\">Recherche Wiki</a> </div>"
+
+#~ msgid "Current Subscriptions"
+#~ msgstr "Abonnements courants"
+
+#~ msgid "Enter new Users (separate by 'Return')"
+#~ msgstr "Encoder des nouveaux Utilisateurs (séparés par 'Retour')"
+
+#~ msgid "Wiki Search"
+#~ msgstr "Rechercher dans Wiki"
+
+#~ msgid "Wiki Table of Contents"
+#~ msgstr "Table des matières Wiki"
+
+#~ msgid "Previous Source Text"
+#~ msgstr "Texte Source précédent"
+
+#~ msgid "Previous source text of the Wiki Page."
+#~ msgstr "Texte source précédent de la Page Wiki."
+
+#~ msgid "Comment Title"
+#~ msgstr "Titre de commentaire"
+
+#~ msgid "Renderable source text of the comment."
+#~ msgstr "Texte source généré par le commentaire."
+
+#~ msgid "Renderable source text of the Wiki Page."
+#~ msgstr "Texte source généré par la Page Wiki."
+
+#~ msgid "Wiki Page Parents"
+#~ msgstr "Parents de la Page Wiki"
+
+#~ msgid "Parents of a Wiki"
+#~ msgstr "Parents d'une Page Wiki"
+
+#~ msgid "Parent Name"
+#~ msgstr "Nom du parent"
+
+#~ msgid "Name of the parent wiki page."
+#~ msgstr "Nom du parent de la Page Wiki"
+
+#~ msgid "You are not allowed to access ${name} in this context"
+#~ msgstr "Vous ne pouvez accéder à ${name} dans ce contexte"
+
+#~ msgid "a particular ${object}"
+#~ msgstr "un ${object} particulier"

Modified: Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po	2004-07-19 13:39:42 UTC (rev 26625)
+++ Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po	2004-07-19 13:40:28 UTC (rev 26626)
@@ -1,10 +1,9 @@
-
 # Fabrizio Reale, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zope\n"
-"POT-Creation-Date: Fri Jun 18 17:40:55 2004\n"
+"POT-Creation-Date: Mon Jul 19 17:08:59 2004\n"
 "PO-Revision-Date: 2004-07-02 11:20+0200\n"
 "Last-Translator: Fabrizio Reale\n"
 "Language-Team:  <fabrizio.reale at redomino.com>\n"
@@ -14,25 +13,25 @@
 "Generated-By: zope/app/translation_files/extract.py\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: src/zope/app/adapter/adapter.py:283
+#: src/zope/app/adapter/adapter.py:285
 #: src/zope/app/presentation/pagefolder.py:54
 #: src/zope/app/presentation/presentation.py:290
 msgid "For interface"
 msgstr "Per l'Interfaccia"
 
-#: src/zope/app/adapter/adapter.py:284
+#: src/zope/app/adapter/adapter.py:286
 msgid "The interface of the objects being adapted"
 msgstr "L'interfaccia degli oggetti adattatati"
 
-#: src/zope/app/adapter/adapter.py:289 src/zope/app/utility/interfaces.py:48
+#: src/zope/app/adapter/adapter.py:291 src/zope/app/utility/interfaces.py:48
 msgid "Provided interface"
 msgstr "Interfaccia fornita"
 
-#: src/zope/app/adapter/adapter.py:290
+#: src/zope/app/adapter/adapter.py:292
 msgid "The interface provided"
 msgstr "L'interfaccia fornita"
 
-#: src/zope/app/adapter/adapter.py:296 src/zope/app/site/interfaces.py:162
+#: src/zope/app/adapter/adapter.py:298 src/zope/app/site/interfaces.py:162
 #: src/zope/app/site/browser/tool.pt:40
 #: src/zope/app/schema/browser/schema_edit.pt:36
 #: src/zope/app/workflow/browser/instancecontainer_index.pt:19
@@ -42,15 +41,15 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/zope/app/adapter/adapter.py:302
+#: src/zope/app/adapter/adapter.py:304
 msgid "The dotted name of a factory for creating the adapter"
 msgstr "Il nome puntato di una fabbrica per creare l'adattatore"
 
-#: src/zope/app/adapter/adapter.py:308
+#: src/zope/app/adapter/adapter.py:310
 msgid "The permission required for use"
 msgstr "Il permesso necessario per usarlo"
 
-#: src/zope/app/adapter/adapter.py:315
+#: src/zope/app/adapter/adapter.py:317
 msgid "Factory to be called to construct the component"
 msgstr "Il Factory da invocare per creare il componente"
 
@@ -125,21 +124,25 @@
 msgstr "Dcoumentazione delle API di Zope 3"
 
 # Default: "Basi"
-#: src/zope/app/apidoc/classmodule/__init__.py:511
-#: src/zope/app/apidoc/ifacemodule/index.pt:264
+#: src/zope/app/apidoc/classmodule/__init__.py:545
+#: src/zope/app/apidoc/ifacemodule/index.pt:265
 msgid "Classes"
 msgstr "Classi"
 
-#: src/zope/app/apidoc/classmodule/__init__.py:549
+#: src/zope/app/apidoc/classmodule/__init__.py:583
 msgid "Zope 3 root."
 msgstr "Radice di Zope 3"
 
-#: src/zope/app/apidoc/classmodule/browser.py:410
-#: src/zope/app/rotterdam/template.pt:104
+#: src/zope/app/apidoc/classmodule/browser.py:675
+#: src/zope/app/rotterdam/template.pt:102
 msgid "[top]"
 msgstr "[su]"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:140
+#: src/zope/app/apidoc/classmodule/class_index.pt:102
+msgid "There are no attributes in this class."
+msgstr "Non ci sono attributi in questa classe."
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:144
 msgid "There are no methods in this class."
 msgstr "Non ci sono metodi in questa classe."
 
@@ -148,38 +151,50 @@
 msgid "Bases"
 msgstr "Basi"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:30
+#: src/zope/app/apidoc/classmodule/class_index.pt:34
 #: src/zope/app/apidoc/ifacemodule/index.pt:40
 msgid "There are no base classes."
 msgstr "Non ci sono classi base."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:35
+#: src/zope/app/apidoc/classmodule/class_index.pt:39
 msgid "Implemented Interfaces"
 msgstr "Interfacce implementate"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:50
+#: src/zope/app/apidoc/classmodule/class_index.pt:54
 msgid "There are no implemented interfaces."
 msgstr "Non ci sono interfacce implementate."
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:56
+#: src/zope/app/apidoc/classmodule/class_index.pt:60
 msgid "Attributes/Properties"
 msgstr "Attributi/ProprietÃ "
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:89
-#: src/zope/app/apidoc/classmodule/class_index.pt:131
+#: src/zope/app/apidoc/classmodule/class_index.pt:73
+#: src/zope/app/apidoc/classmodule/function_index.pt:40
+#: src/zope/app/apidoc/classmodule/function_index.pt:44
+msgid "type:"
+msgstr "tipo:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:79
+#: src/zope/app/apidoc/classmodule/function_index.pt:51
+msgid "Value:"
+msgstr "Valore:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:91
+#: src/zope/app/apidoc/classmodule/class_index.pt:133
+msgid "Permissions:"
+msgstr "Permessi:"
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:93
+#: src/zope/app/apidoc/classmodule/class_index.pt:135
 msgid "(read)"
 msgstr "(leggi)"
 
 # Default: "Attributi"
-#: src/zope/app/apidoc/classmodule/class_index.pt:91
-#: src/zope/app/apidoc/classmodule/class_index.pt:133
+#: src/zope/app/apidoc/classmodule/class_index.pt:95
+#: src/zope/app/apidoc/classmodule/class_index.pt:137
 msgid "(write)"
 msgstr "(scrivi)"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:98
-msgid "There are no attributes in this class."
-msgstr "Non ci sono attributi in questa classe."
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:18
 msgid "Documentation String"
 msgstr "Stringa di documentazione"
@@ -189,17 +204,6 @@
 msgid "Attributes"
 msgstr "Attributi"
 
-#: src/zope/app/apidoc/classmodule/function_index.pt:40
-#: src/zope/app/apidoc/classmodule/function_index.pt:44
-#: src/zope/app/apidoc/classmodule/class_index.pt:69
-msgid "type:"
-msgstr "tipo:"
-
-#: src/zope/app/apidoc/classmodule/function_index.pt:51
-#: src/zope/app/apidoc/classmodule/class_index.pt:75
-msgid "Value:"
-msgstr "Valore:"
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:9
 msgid "Signature"
 msgstr "Firma"
@@ -226,82 +230,83 @@
 msgid "Zope 3 Class Browser"
 msgstr "Navigatore delle classi di Zope 3"
 
-#: src/zope/app/apidoc/ifacemodule/__init__.py:73
+#: src/zope/app/apidoc/ifacemodule/__init__.py:75
 msgid "Interfaces"
 msgstr "Interfacce:"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:158
+#: src/zope/app/apidoc/ifacemodule/browser.py:199
 msgid "required"
 msgstr "richiesto"
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:160
+#: src/zope/app/apidoc/ifacemodule/browser.py:201
 msgid "optional"
 msgstr "opzionale"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:100
+#: src/zope/app/apidoc/ifacemodule/index.pt:101
 msgid "There are no methods specified."
 msgstr "Non ci sono metodi specificati."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:107
+#: src/zope/app/apidoc/ifacemodule/index.pt:108
 msgid "Adapters"
 msgstr "Adattatori"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:113
+#: src/zope/app/apidoc/ifacemodule/index.pt:114
 msgid "Adapters where this interface is required:"
 msgstr "Adattatori per cui l'interfaccia Ã¨ richiesta:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:126
-#: src/zope/app/apidoc/ifacemodule/index.pt:167
+#: src/zope/app/apidoc/ifacemodule/index.pt:127
+#: src/zope/app/apidoc/ifacemodule/index.pt:168
 msgid "name:"
 msgstr "nome:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:131
+#: src/zope/app/apidoc/ifacemodule/index.pt:132
 msgid "provides:"
 msgstr "fornisce:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:137
+#: src/zope/app/apidoc/ifacemodule/index.pt:138
 msgid "also required:"
 msgstr "inoltre richiede:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:154
+#: src/zope/app/apidoc/ifacemodule/index.pt:155
 msgid "Adapters that provide this interface:"
 msgstr "Adattatori forniti da questa interfaccia:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:171
+#: src/zope/app/apidoc/ifacemodule/index.pt:172
 msgid "requires:"
 msgstr "richiesti:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:178
+#: src/zope/app/apidoc/ifacemodule/index.pt:179
 msgid "No interface required."
 msgstr "Nessuna interfaccia richiesta."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:189
+#: src/zope/app/apidoc/ifacemodule/index.pt:190
 msgid "There are no adapters registered for this interface."
 msgstr "Nessun adattatore registrato per questa interfaccia."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:199
+#: src/zope/app/apidoc/ifacemodule/index.pt:200
 msgid "Other Information"
 msgstr "Altre informazioni"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:204
+#: src/zope/app/apidoc/ifacemodule/index.pt:205
 msgid "Factories"
 msgstr "Fabbricatori"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:206
+#: src/zope/app/apidoc/ifacemodule/index.pt:207
 msgid "A list of factories that create objects implement this interface."
 msgstr ""
 "Lista delle fabbriche che creano gli oggetti che implementano questa "
 "interfaccia."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:224
+#: src/zope/app/apidoc/ifacemodule/index.pt:225
 msgid "A list of utilities that are are registered to provide this interface."
-msgstr "Lista delle utilitÃ  che sono registrate come fornitori di questa interfaccia."
+msgstr ""
+"Lista delle utilitÃ  che sono registrate come fornitori di questa interfaccia."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:235
+#: src/zope/app/apidoc/ifacemodule/index.pt:236
 msgid "Class:"
 msgstr "Classi:"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:249
+#: src/zope/app/apidoc/ifacemodule/index.pt:250
 msgid ""
 "A list of services (usually just one) that are are registered to provide "
 "this interface."
@@ -309,7 +314,7 @@
 "Lista dei servizi (solitamente solo uno) che sono registrati come fornitori "
 "di questa interfaccia."
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:266
+#: src/zope/app/apidoc/ifacemodule/index.pt:267
 msgid ""
 "A list of classes that implement this interface. This might duplicate the "
 "entries in Utilities and Services."
@@ -325,15 +330,15 @@
 "Nota: Queste sono le sole interfacce registrate con il Servizio di "
 "Interfaccia"
 
-#: src/zope/app/apidoc/servicemodule/__init__.py:73
+#: src/zope/app/apidoc/servicemodule/__init__.py:75
 #: src/zope/app/site/browser/configure.zcml:87
-#: src/zope/app/zopetop/widget_macros.pt:34
+#: src/zope/app/zopetop/widget_macros.pt:54
 msgid "Services"
 msgstr "Servizi"
 
 #: src/zope/app/apidoc/servicemodule/index.pt:17
-#: src/zope/app/apidoc/classmodule/class_index.pt:79
-#: src/zope/app/apidoc/classmodule/class_index.pt:120
+#: src/zope/app/apidoc/classmodule/class_index.pt:83
+#: src/zope/app/apidoc/classmodule/class_index.pt:124
 msgid "Interface:"
 msgstr "Interfaccia:"
 
@@ -345,15 +350,15 @@
 
 #: src/zope/app/apidoc/servicemodule/index.pt:55
 #: src/zope/app/apidoc/utilitymodule/index.pt:61
-#: src/zope/app/apidoc/ifacemodule/index.pt:77
+#: src/zope/app/apidoc/ifacemodule/index.pt:78
 msgid "There are no attributes or fields specified."
 msgstr "Non ci sono attributi o campi specificati."
 
 # Default: "Metodi"
 #: src/zope/app/apidoc/servicemodule/index.pt:62
 #: src/zope/app/apidoc/utilitymodule/index.pt:68
-#: src/zope/app/apidoc/classmodule/class_index.pt:104
-#: src/zope/app/apidoc/ifacemodule/index.pt:84
+#: src/zope/app/apidoc/classmodule/class_index.pt:108
+#: src/zope/app/apidoc/ifacemodule/index.pt:85
 msgid "Methods"
 msgstr "Metodi"
 
@@ -370,14 +375,14 @@
 msgid "This is a list of all available services by name."
 msgstr "Lista di tutti i servizi disponibili per nome."
 
-#: src/zope/app/apidoc/utilities.py:254 src/zope/app/apidoc/utilities.py:256
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:55
+#: src/zope/app/apidoc/utilities.py:233 src/zope/app/apidoc/utilities.py:235
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:58
 msgid "n/a"
 msgstr "n/d"
 
-#: src/zope/app/apidoc/utilitymodule/__init__.py:132
+#: src/zope/app/apidoc/utilitymodule/__init__.py:129
 #: src/zope/app/utility/browser/configure.zcml:31
-#: src/zope/app/apidoc/ifacemodule/index.pt:222
+#: src/zope/app/apidoc/ifacemodule/index.pt:223
 msgid "Utilities"
 msgstr "UtilitÃ "
 
@@ -391,12 +396,12 @@
 msgid "(Attribute)"
 msgstr "(Attributo)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:200
-#: src/zope/app/apidoc/viewmodule/__init__.py:262
+#: src/zope/app/apidoc/viewmodule/__init__.py:201
+#: src/zope/app/apidoc/viewmodule/__init__.py:263
 msgid "$file (line $line)"
 msgstr "$file (linea $line)"
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:64
+#: src/zope/app/apidoc/viewmodule/__init__.py:65
 msgid "Presentations"
 msgstr "Presentazioni"
 
@@ -429,12 +434,11 @@
 msgstr "viste per"
 
 #: src/zope/app/apidoc/viewmodule/index.pt:77
-#: src/zope/app/apidoc/classmodule/class_index.pt:87
-#: src/zope/app/apidoc/classmodule/class_index.pt:129
-msgid "Permissions:"
+#, fuzzy
+msgid "Permission:"
 msgstr "Permessi:"
 
-#: src/zope/app/apidoc/viewmodule/index.pt:90
+#: src/zope/app/apidoc/viewmodule/index.pt:89
 msgid "There are no views for this interface and presentation type."
 msgstr "Non ci sono viste per questa interfaccia e tipo di presentazione."
 
@@ -480,7 +484,7 @@
 "Ã¨ stata registrata. Per i temi e livelli globali, la documentazione mostra "
 "il file e il numero di linea in cui sono dichiarati."
 
-#: src/zope/app/apidoc/zcmlmodule/__init__.py:190
+#: src/zope/app/apidoc/zcmlmodule/__init__.py:192
 msgid "ZCML Reference"
 msgstr "Riferimento ZCML"
 
@@ -510,7 +514,7 @@
 msgstr "Schema"
 
 #: src/zope/app/apidoc/zcmlmodule/index.pt:68
-#: src/zope/app/apidoc/ifacemodule/index.pt:69
+#: src/zope/app/apidoc/ifacemodule/index.pt:70
 msgid "default"
 msgstr "predefinito"
 
@@ -524,7 +528,8 @@
 msgstr "Sottodirettive"
 
 #: src/zope/app/apidoc/zcmlmodule/menu.pt:4
-msgid "Namespaces that are not full URLs start with \"http://namespaces.zope.org\"."
+msgid ""
+"Namespaces that are not full URLs start with \"http://namespaces.zope.org\"."
 msgstr ""
 "Gli spazi dei nomi che non sono URL completi cominciano con \"http://"
 "namespaces.zope.org\"."
@@ -585,11 +590,11 @@
 msgid "Python path"
 msgstr "Percorso del Python"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:44
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:47
 msgid "${days} day(s) ${hours}:${minutes}:${seconds}"
 msgstr "${days} giorni ${hours}:${minutes}:${seconds}"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:65
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:68
 msgid "Could not retrieve runtime information."
 msgstr "Non riesco a recuperare informazioni di runtime."
 
@@ -598,8 +603,10 @@
 msgstr "secondi"
 
 #: src/zope/app/applicationcontrol/browser/server-control.pt:13
-msgid "If you specify a time of 0 seconds, then the server will do a hard shutdown."
-msgstr "Se specifichi un tempo di 0 secondi il server farÃ  uno spegnimento forzato."
+msgid ""
+"If you specify a time of 0 seconds, then the server will do a hard shutdown."
+msgstr ""
+"Se specifichi un tempo di 0 secondi il server farÃ  uno spegnimento forzato."
 
 #: src/zope/app/applicationcontrol/browser/server-control.pt:18
 msgid "Restart server"
@@ -617,11 +624,11 @@
 msgid "Shutdown time:"
 msgstr "Tempo di spegnimento:"
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:32
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:34
 msgid "You restarted the server."
 msgstr "Hai riavviato il server."
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:35
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:37
 msgid "You shut down the server."
 msgstr "Hai spento il server."
 
@@ -638,7 +645,7 @@
 msgid "reload-button"
 msgstr "Ricarica"
 
-#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:49
+#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:51
 msgid "Message Catalog successfully reloaded."
 msgstr "Catalogo dei Messaggi ricaricato correttamente."
 
@@ -667,20 +674,20 @@
 msgid "Name of database: ${name}"
 msgstr "Nome del database: ${name}"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:31
-#: src/zope/app/size/__init__.py:52
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:33
+#: src/zope/app/size/__init__.py:50
 msgid "${size} MB"
 msgstr "${size} MB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:34
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:36
 msgid "${size} kB"
 msgstr "${size} kB"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:37
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:39
 msgid "${size} Bytes"
 msgstr "${size} Bytes"
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:50
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:52
 msgid "ZODB successfully packed."
 msgstr "ZODB correttamente compattato."
 
@@ -692,15 +699,15 @@
 msgid "Broken object"
 msgstr "Oggetto rotto"
 
-#: src/zope/app/bundle/browser/__init__.py:112
+#: src/zope/app/bundle/browser/__init__.py:114
 msgid "Activated: ${activated}.\n"
 msgstr "Attivato: ${activated}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:115
+#: src/zope/app/bundle/browser/__init__.py:117
 msgid "Registered: ${registered}.\n"
 msgstr "Registrato: ${registered}.\n"
 
-#: src/zope/app/bundle/browser/__init__.py:85
+#: src/zope/app/bundle/browser/__init__.py:87
 msgid "unregistered ${count} registrations"
 msgstr "${count} registrazioni non registrate"
 
@@ -726,7 +733,8 @@
 msgstr "Attiva pacchetto"
 
 #: src/zope/app/bundle/browser/bundle.pt:137
-msgid "Click \"Deactivate bundle\" to unregister all registrations in this bundle."
+msgid ""
+"Click \"Deactivate bundle\" to unregister all registrations in this bundle."
 msgstr ""
 "Clicka \"Disattiva pacchetto\" per rimuovere tutte le registrazioni in "
 "questo pacchetto."
@@ -804,16 +812,16 @@
 msgstr "Pacchetto"
 
 # Default: "Disabilitato"
-#: src/zope/app/cache/browser/cacheable.py:57
+#: src/zope/app/cache/browser/cacheable.py:63
 msgid "cache-invalidated"
 msgstr "Disabilitata"
 
 # Default: "Nessuna cache associata all'oggetto."
-#: src/zope/app/cache/browser/cacheable.py:59
+#: src/zope/app/cache/browser/cacheable.py:65
 msgid "no-cache-associated"
 msgstr "Nessuna cache associata all'oggetto."
 
-#: src/zope/app/cache/browser/cacheable.py:71
+#: src/zope/app/cache/browser/cacheable.py:77
 msgid "Saved changes."
 msgstr "Modifiche salvate."
 
@@ -838,6 +846,28 @@
 msgid "Currently there is no cache associated with the object."
 msgstr "Attualmente nessuna cache Ã¨ associata con l'oggetto."
 
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "RAM Cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "A RAM cache is a volatile (in memory) cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:26
+#, fuzzy
+msgid "Statistics"
+msgstr "Stato"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+#, fuzzy
+msgid "Caches"
+msgstr "Nome della cache"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+msgid "Caches can be used to make your site run faster."
+msgstr ""
+
 #: src/zope/app/cache/browser/ramedit.pt:20
 msgid "Maximum cached entries"
 msgstr "Numero massimo di elementi in cache"
@@ -854,6 +884,13 @@
 msgid "You can configure the RAM Cache here."
 msgstr "Qui puoi configurare la Cache RAM."
 
+# Default: "Reset"
+#: src/zope/app/cache/browser/ramedit.pt:53
+#: src/zope/app/site/browser/add_svc_config.pt:35
+#: src/zope/app/bundle/browser/bundle.pt:130
+msgid "reset-button"
+msgstr "Reset"
+
 #: src/zope/app/cache/browser/ramstats.pt:20
 msgid "Path"
 msgstr "Percorso"
@@ -878,7 +915,7 @@
 msgid "RAMCache statistics"
 msgstr "Statistiche sulla RAM Cache"
 
-#: src/zope/app/container/browser/adding.py:117
+#: src/zope/app/container/browser/adding.py:119
 msgid "You must select the type of object to add."
 msgstr "Devi selezionare il tipo di oggetto da aggiungere."
 
@@ -916,23 +953,23 @@
 msgid "container-cancel-button"
 msgstr "Annulla"
 
-#: src/zope/app/container/browser/contents.py:232
+#: src/zope/app/container/browser/contents.py:233
 msgid "You didn't specify any ids to remove."
 msgstr "Non hai specificato nessun id da cancellare."
 
-#: src/zope/app/container/browser/contents.py:244
+#: src/zope/app/container/browser/contents.py:245
 msgid "You didn't specify any ids to copy."
 msgstr "Non hai specificato nessun id da copiare."
 
-#: src/zope/app/container/browser/contents.py:264
+#: src/zope/app/container/browser/contents.py:265
 msgid "You didn't specify any ids to cut."
 msgstr "Non hai specificato nessun id da tagliare."
 
-#: src/zope/app/container/browser/contents.py:61
+#: src/zope/app/container/browser/contents.py:62
 msgid "You didn't specify any ids to rename."
 msgstr "Non hai specificato nessun id da rinominare."
 
-#: src/zope/app/container/browser/metaconfigure.py:63
+#: src/zope/app/container/browser/metaconfigure.py:65
 #: src/zope/app/folder/browser/configure.zcml:20
 #: src/zope/app/site/browser/configure.zcml:19
 #: src/zope/app/bundle/browser/configure.zcml:11
@@ -941,7 +978,7 @@
 msgid "Contents"
 msgstr "Contenuto"
 
-#: src/zope/app/container/browser/metaconfigure.py:71
+#: src/zope/app/container/browser/metaconfigure.py:73
 #: src/zope/app/schema/browser/configure.zcml:15
 #: src/zope/app/container/browser/configure.zcml:5
 #: src/zope/app/registration/browser/configure.zcml:42
@@ -951,19 +988,19 @@
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/zope/app/container/constraints.py:185
+#: src/zope/app/container/constraints.py:186
 msgid "Container is not a valid Zope container."
 msgstr "Il Contenitore non Ã¨ contenitore Zope valido."
 
-#: src/zope/app/container/contained.py:688
+#: src/zope/app/container/contained.py:690
 msgid "An empty name was provided. Names cannot be empty."
 msgstr "Il nome fornito Ã¨ vuoto. Il nome non puÃ² esserlo."
 
-#: src/zope/app/container/contained.py:698
+#: src/zope/app/container/contained.py:700
 msgid "Names cannot begin with '+' or '@' or contain '/'"
 msgstr "I nomi non possono cominciare con '+' o '@' e contenere '/'"
 
-#: src/zope/app/container/contained.py:703
+#: src/zope/app/container/contained.py:705
 msgid "The given name is already being used"
 msgstr "Il nome scelto Ã¨ giÃ  in uso"
 
@@ -984,7 +1021,6 @@
 msgstr "Tipo di errore: ${error_type}"
 
 #: src/zope/app/debugskin/unauthorized.pt:7
-#: src/zope/app/exception/browser/unauthorized.pt:8
 msgid "Unauthorized"
 msgstr "Non autorizzato"
 
@@ -1029,27 +1065,27 @@
 msgid "A simple, content-based DTML page"
 msgstr "Una semplice DTML basata sul contenuto"
 
-#: src/zope/app/dtmlpage/interfaces.py:31
+#: src/zope/app/dtmlpage/interfaces.py:32
 #: src/zope/app/pythonpage/__init__.py:39
-#: src/zope/app/sqlscript/interfaces.py:44
+#: src/zope/app/sqlscript/interfaces.py:45
 #: src/zope/app/zptpage/interfaces.py:36
 msgid "Source"
 msgstr "Sorgente"
 
-#: src/zope/app/dtmlpage/interfaces.py:32
+#: src/zope/app/dtmlpage/interfaces.py:33
 msgid "The source of the dtml page."
 msgstr "Sorgente della pagina DTML"
 
 #: src/zope/app/dublincore/browser/configure.zcml:10
-#: src/zope/app/zopetop/widget_macros.pt:166
+#: src/zope/app/zopetop/widget_macros.pt:186
 msgid "Metadata"
 msgstr ""
 
-#: src/zope/app/dublincore/browser/edit.pt:43
+#: src/zope/app/dublincore/browser/edit.pt:45
 msgid "Content Last Modified"
 msgstr "Ultima modifica del contenuto"
 
-#: src/zope/app/dublincore/browser/edit.pt:47
+#: src/zope/app/dublincore/browser/edit.pt:49
 msgid "Creator"
 msgstr "Autore"
 
@@ -1088,8 +1124,10 @@
 msgstr "Servizio di registrazione errori"
 
 #: src/zope/app/errorservice/browser/error.pt:10
-msgid "This page lists the exceptions that have occurred in this site recently."
-msgstr "Questa pagina elenca le eccezioni recentemente catturate in questo sito."
+msgid ""
+"This page lists the exceptions that have occurred in this site recently."
+msgstr ""
+"Questa pagina elenca le eccezioni recentemente catturate in questo sito."
 
 #: src/zope/app/errorservice/browser/error.pt:15
 msgid "No exceptions logged."
@@ -1195,6 +1233,11 @@
 msgid "The page that you are trying to access is not available"
 msgstr "La pagina a cui cerchi di accedere non Ã¨ disponibile"
 
+#: src/zope/app/exception/browser/unauthorized.pt:10
+#, fuzzy
+msgid "You are not authorized"
+msgstr "Non autorizzato"
+
 #: src/zope/app/file/browser/configure.zcml:109
 msgid "Add a Image"
 msgstr "Aggiungi un immagine"
@@ -1252,7 +1295,7 @@
 msgid "Image"
 msgstr "Immagine"
 
-#: src/zope/app/file/image.py:73
+#: src/zope/app/file/image.py:72
 msgid " ${width}x${height}"
 msgstr "${width}x${height}"
 
@@ -1296,12 +1339,11 @@
 msgstr "Cartella minimale"
 
 #: src/zope/app/form/browser/add.pt:55
-#: src/zope/app/wiki/browser/wiki_add.pt:34
 msgid "Object Name"
 msgstr "Nome dell'Oggetto"
 
-#: src/zope/app/form/browser/add.py:61
-#: src/zope/app/form/browser/editview.py:109
+#: src/zope/app/form/browser/add.py:60
+#: src/zope/app/form/browser/editview.py:108
 #: src/zope/app/schema/browser/__init__.py:53
 #: src/zope/app/schema/browser/__init__.py:64
 #: src/zope/app/schema/browser/__init__.py:70
@@ -1380,12 +1422,11 @@
 #: src/zope/app/publisher/interfaces/browser.py:44
 #: src/zope/app/publisher/interfaces/browser.py:87
 #: src/zope/app/security/interfaces/__init__.py:44
-#: src/zope/app/security/interfaces/__init__.py:197
-#: src/zope/app/wiki/interfaces.py:39 src/zope/schema/interfaces.py:100
-#: src/zope/schema/interfaces.py:484
+#: src/zope/app/security/interfaces/__init__.py:189
+#: src/zope/schema/interfaces.py:100 src/zope/schema/interfaces.py:484
+#: src/zope/app/menu/browser/menu_contents.pt:31
 #: src/zope/app/site/browser/interfacebrowse.pt:11
-#: src/zope/app/menu/browser/menu_contents.pt:31
-#: src/zope/app/dublincore/browser/edit.pt:14
+#: src/zope/app/dublincore/browser/edit.pt:16
 #: src/zope/app/schema/browser/schema_edit.pt:38
 #: src/zope/app/container/browser/contents.pt:33
 #: src/zope/app/container/browser/index.pt:27
@@ -1400,27 +1441,27 @@
 msgid "widget-missing-multiple-value"
 msgstr ""
 
-#: src/zope/app/form/browser/editview.py:118
+#: src/zope/app/form/browser/editview.py:117
 msgid "Updated on ${date_time}"
 msgstr "Aggiornato il ${date_time}"
 
 # Default: "Precedente"
-#: src/zope/app/form/browser/editwizard.pt:47
-#: src/zope/app/form/browser/addwizard.pt:55
+#: src/zope/app/form/browser/editwizard.pt:42
+#: src/zope/app/form/browser/addwizard.pt:63
 msgid "previous-button"
 msgstr "Precedente"
 
 # Default: "Successivo"
-#: src/zope/app/form/browser/editwizard.pt:53
-#: src/zope/app/form/browser/addwizard.pt:61
+#: src/zope/app/form/browser/editwizard.pt:48
+#: src/zope/app/form/browser/addwizard.pt:69
 msgid "next-button"
 msgstr "Successivo"
 
-#: src/zope/app/form/browser/editwizard.py:149
+#: src/zope/app/form/browser/editwizard.py:148
 msgid "No changes to save"
 msgstr "Nessuna modifica da salvare"
 
-#: src/zope/app/form/browser/editwizard.py:151
+#: src/zope/app/form/browser/editwizard.py:150
 msgid "Changes saved"
 msgstr "Modifiche salvate"
 
@@ -1432,21 +1473,21 @@
 msgid "vocabulary-missing-multiple-value-for-display"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:425
-#: src/zope/app/form/browser/itemswidgets.py:469
+#: src/zope/app/form/browser/itemswidgets.py:426
+#: src/zope/app/form/browser/itemswidgets.py:470
 msgid "vocabulary-missing-single-value-for-edit"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:543
+#: src/zope/app/form/browser/itemswidgets.py:544
 msgid "vocabulary-missing-multiple-value-for-edit"
 msgstr ""
 
 # Default: "Cancella gli elementi selezionati"
-#: src/zope/app/form/browser/sequencewidget.py:84
+#: src/zope/app/form/browser/sequencewidget.py:82
 msgid "remove-selected-items"
 msgstr "Cancella gli elementi selezionati"
 
-#: src/zope/app/form/browser/sequencewidget.py:91
+#: src/zope/app/form/browser/sequencewidget.py:89
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
@@ -1504,7 +1545,8 @@
 msgstr "Schemi del Database"
 
 #: src/zope/app/generations/browser/managers.pt:18
-msgid "The database was updated to generation ${generation} for ${application}."
+msgid ""
+"The database was updated to generation ${generation} for ${application}."
 msgstr ""
 "Il database Ã¨ stato aggiornato alla generazione ${generation} per "
 "${application}."
@@ -1586,7 +1628,8 @@
 
 #: src/zope/app/i18n/browser/exportimport.pt:12
 msgid "Here you can export and import messages from your Translation Domain."
-msgstr "Qui puoi esportare ed importare messaggi dal tuo Dominio di Traduzione."
+msgstr ""
+"Qui puoi esportare ed importare messaggi dal tuo Dominio di Traduzione."
 
 #: src/zope/app/i18n/browser/exportimport.pt:32
 msgid "Import File Name:"
@@ -1619,23 +1662,23 @@
 msgid "synchronize-button"
 msgstr "Sincronizza"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Up to Date"
 msgstr "Aggiornato"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "New Remote"
 msgstr "Nuova connessione remota"
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Out of Date"
 msgstr "Non aggiornato"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Does not exist"
 msgstr "Non esiste"
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Newer Local"
 msgstr "Locale piÃ¹ recente"
 
@@ -1727,7 +1770,6 @@
 #: src/zope/app/i18nfile/browser/file_edit.pt:68
 #: src/zope/app/i18nfile/browser/image_edit.pt:69
 #: src/zope/app/introspector/marker.pt:118
-#: src/zope/app/wiki/browser/subscriptions.pt:19
 #: src/zope/app/registration/browser/editregistration.pt:53
 msgid "remove-button"
 msgstr "Cancella"
@@ -1742,7 +1784,7 @@
 #: src/zope/app/i18nfile/browser/image_edit.pt:94
 #: src/zope/app/cache/browser/cacheableedit.pt:45
 #: src/zope/app/cache/browser/ramedit.pt:51
-#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/dublincore/browser/edit.pt:35
 #: src/zope/app/rdb/browser/rdbconnection.pt:28
 #: src/zope/app/errorservice/browser/error_config.pt:46
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:63
@@ -1750,17 +1792,20 @@
 msgid "save-changes-button"
 msgstr "Salva modifiche"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:45
-#: src/zope/app/i18nfile/browser/i18nimage.py:27
+#: src/zope/app/i18nfile/browser/i18nfile.py:44
+#: src/zope/app/i18nfile/browser/i18nimage.py:29
 msgid "Edit Form"
 msgstr "Modulo di modifica"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:46
-msgid "This edit form allows you to make changes to the properties of this file."
-msgstr "Questo modulo di modifica permette di modificare le proprietÃ  di questo file."
+#: src/zope/app/i18nfile/browser/i18nfile.py:45
+msgid ""
+"This edit form allows you to make changes to the properties of this file."
+msgstr ""
+"Questo modulo di modifica permette di modificare le proprietÃ  di questo file."
 
-#: src/zope/app/i18nfile/browser/i18nimage.py:28
-msgid "This edit form allows you to make changes to the properties of this image."
+#: src/zope/app/i18nfile/browser/i18nimage.py:30
+msgid ""
+"This edit form allows you to make changes to the properties of this image."
 msgstr ""
 "Questo modulo di modifica permette di modificare le proprietÃ  di "
 "quest'immagine."
@@ -1869,7 +1914,8 @@
 
 #: src/zope/app/mail/interfaces.py:120
 msgid "How often the queue is checked for new messages (in milliseconds)"
-msgstr "Ogni quanto si verifica se ci sono nuovi messaggi in coda (in millisecondi)"
+msgstr ""
+"Ogni quanto si verifica se ci sono nuovi messaggi in coda (in millisecondi)"
 
 #: src/zope/app/mail/interfaces.py:152
 msgid "Hostname"
@@ -1931,7 +1977,8 @@
 msgstr "Aggiungi un menu al browser (Registrazione)"
 
 #: src/zope/app/menu/browser/configure.zcml:5
-msgid "Browser Menu tools are used to build menus for Web user        interfaces."
+msgid ""
+"Browser Menu tools are used to build menus for Web user        interfaces."
 msgstr ""
 "Gli strumenti per i Menu di Navigazione sono utilizzati per costruire menu "
 "per gli utenti Web        interfacce."
@@ -1953,10 +2000,10 @@
 msgstr "Aggiungi una voce al menu del browser"
 
 #: src/zope/app/menu/browser/menu_contents.pt:25
+#: src/zope/app/uniqueid/browser/registrations.pt:7
 #: src/zope/app/schema/browser/schema_edit.pt:30
 #: src/zope/app/container/browser/contents.pt:26
 #: src/zope/app/container/browser/index.pt:18
-#: src/zope/app/uniqueid/browser/registrations.pt:7
 msgid "Content listing"
 msgstr "Lista dei contenuti"
 
@@ -1965,7 +2012,7 @@
 msgstr "Azione"
 
 #: src/zope/app/menu/browser/menu_contents.pt:33
-#: src/zope/app/dublincore/browser/edit.pt:39
+#: src/zope/app/dublincore/browser/edit.pt:41
 #: src/zope/app/container/browser/contents.pt:35
 #: src/zope/app/container/browser/index.pt:28
 msgid "Created"
@@ -2110,13 +2157,14 @@
 msgstr "Modifica un modulo"
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:30
-#: src/zope/app/zopetop/widget_macros.pt:215
+#: src/zope/app/zopetop/widget_macros.pt:235
 msgid "Help"
 msgstr "Aiuto"
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:7
 msgid "Menu for displaying help actions to be performed with popup"
-msgstr "Menu per mostrare le azioni di aiuto che possono essere eseguite con un popup"
+msgstr ""
+"Menu per mostrare le azioni di aiuto che possono essere eseguite con un popup"
 
 #: src/zope/app/onlinehelp/browser/contexthelp.pt:11
 #: src/zope/app/onlinehelp/browser/helptopic.pt:11
@@ -2149,7 +2197,7 @@
 
 #: src/zope/app/onlinehelp/interfaces.py:46
 #: src/zope/app/security/interfaces/__init__.py:38
-#: src/zope/app/security/interfaces/__init__.py:191
+#: src/zope/app/security/interfaces/__init__.py:183
 #: src/zope/app/workflow/stateful/browser/addtransition.pt:12
 #: src/zope/app/workflow/stateful/browser/addstate.pt:12
 msgid "Id"
@@ -2179,8 +2227,7 @@
 msgid "Help Topic"
 msgstr "Argomento dell'Aiuto"
 
-#: src/zope/app/onlinehelp/interfaces.py:64 src/zope/app/wiki/interfaces.py:45
-#: src/zope/app/wiki/interfaces.py:71
+#: src/zope/app/onlinehelp/interfaces.py:64
 msgid "Source Text"
 msgstr "Testo Sorgente"
 
@@ -2196,13 +2243,11 @@
 msgid "The Path to the Definition of a Help Topic"
 msgstr "Percorso della Definizione di un Aiuto"
 
-#: src/zope/app/onlinehelp/interfaces.py:77 src/zope/app/wiki/interfaces.py:51
-#: src/zope/app/wiki/interfaces.py:77
+#: src/zope/app/onlinehelp/interfaces.py:77
 msgid "Source Type"
 msgstr "Tipo Sorgente"
 
-#: src/zope/app/onlinehelp/interfaces.py:78 src/zope/app/wiki/interfaces.py:52
-#: src/zope/app/wiki/interfaces.py:78
+#: src/zope/app/onlinehelp/interfaces.py:78
 msgid "Type of the source text, e.g. structured text"
 msgstr "Tipo del sorgente del testo, es. testo strutturato"
 
@@ -2261,6 +2306,7 @@
 #: src/zope/app/schema/fieldforms.zcml:151
 #: src/zope/app/module/browser/configure.zcml:6
 #: src/zope/app/utility/browser/configure.zcml:85
+#: src/zope/app/cache/browser/configure.zcml:24
 #: src/zope/app/file/browser/configure.zcml:29
 #: src/zope/app/i18nfile/browser/configure.zcml:31
 #: src/zope/app/i18nfile/browser/configure.zcml:73
@@ -2268,12 +2314,11 @@
 #: src/zope/app/rdb/browser/configure.zcml:27
 #: src/zope/app/schemacontent/browser/configure.zcml:46
 #: src/zope/app/schemacontent/browser/configure.zcml:88
-#: src/zope/app/wiki/browser/configure.zcml:76
-#: src/zope/app/wiki/browser/configure.zcml:160
 #: src/zope/app/menu/browser/configure.zcml:71
 #: src/zope/app/menu/browser/configure.zcml:106
-#: src/zope/app/session/browser.zcml:25 src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:15 src/zope/app/session/browser.zcml:38
 #: src/zope/app/zptpage/browser/configure.zcml:39
+#: src/zwiki/browser/configure.zcml:76 src/zwiki/browser/configure.zcml:160
 #: src/zope/app/securitypolicy/browser/configure.zcml:25
 msgid "Edit"
 msgstr "Modifica"
@@ -2311,7 +2356,8 @@
 msgstr "Servizio di Presentazione"
 
 #: src/zope/app/presentation/browser/configure.zcml:3
-msgid "A Presentation Service allows you to register views, resources and skins"
+msgid ""
+"A Presentation Service allows you to register views, resources and skins"
 msgstr ""
 "Un Servizio di Presentazione permette di registrare viste, risorse e temi "
 "grafici"
@@ -2385,7 +2431,7 @@
 msgid "${view_name} ${ptype} View for ${iface_name} in layer ${layer}"
 msgstr "${view_name} ${ptype} Mostra per ${iface_name} nel livello ${layer}"
 
-#: src/zope/app/presentation/presentation.py:273
+#: src/zope/app/presentation/presentation.py:274
 msgid "Registered by ZCML"
 msgstr "Registrato dalla ZCML"
 
@@ -2483,7 +2529,9 @@
 msgid ""
 "A UI may display this with the item or display it when the user requests "
 "more assistance."
-msgstr "Un UI puÃ² mostrare questo con l'elemento o mostrarlo quando l'utente richiede piÃ¹ assistenza."
+msgstr ""
+"Un UI puÃ² mostrare questo con l'elemento o mostrarlo quando l'utente "
+"richiede piÃ¹ assistenza."
 
 #: src/zope/app/publisher/interfaces/browser.py:55
 msgid "The permission needed access the item"
@@ -2591,7 +2639,8 @@
 msgstr "Aggiungi una registrazione di una connessione ad un Database"
 
 #: src/zope/app/rdb/browser/configure.zcml:5
-msgid "Database Adapters are used to connect to external       relational databases."
+msgid ""
+"Database Adapters are used to connect to external       relational databases."
 msgstr ""
 "Gli Adattatori di Database sono usati per connettersi a database relazionali "
 "esterni."
@@ -2772,7 +2821,7 @@
 "Attualmente questo oggetto non sarÃ  utilizzato se non Ã¨ registrato per una "
 "specifica funzione e attivato."
 
-#: src/zope/app/registration/configure.zcml:23
+#: src/zope/app/registration/configure.zcml:38
 #: src/zope/app/registration/browser/editregistration.pt:10
 msgid "Registration Manager"
 msgstr "Gestore di Registrazioni"
@@ -2835,7 +2884,7 @@
 msgstr "Sorgente di Testo RiStrutturato (ReST)"
 
 #: src/zope/app/rotterdam/dialog_macros.pt:135
-#: src/zope/app/rotterdam/template.pt:208
+#: src/zope/app/rotterdam/template.pt:205
 msgid "Tip"
 msgstr "Nota"
 
@@ -2847,7 +2896,7 @@
 msgid "Extended Editor"
 msgstr "Editor esteso"
 
-#: src/zope/app/rotterdam/template.pt:102
+#: src/zope/app/rotterdam/template.pt:100
 msgid "Location:&nbsp;"
 msgstr "Posizione:&nbsp;"
 
@@ -2855,11 +2904,11 @@
 msgid "[Logout]"
 msgstr "[Esci]"
 
-#: src/zope/app/rotterdam/template.pt:56
+#: src/zope/app/rotterdam/template.pt:55
 msgid "[Login]"
 msgstr "[Accedi]"
 
-#: src/zope/app/rotterdam/template.pt:77
+#: src/zope/app/rotterdam/template.pt:75
 msgid "Add:"
 msgstr "Aggiungi:"
 
@@ -3158,7 +3207,8 @@
 
 #: src/zope/app/schemacontent/content.py:161
 msgid "No local Browser Menu called \"${name}\" found."
-msgstr "Non Ã¨ stato trovato nessuno Menu di consultazione chiamato \"${name}\"."
+msgstr ""
+"Non Ã¨ stato trovato nessuno Menu di consultazione chiamato \"${name}\"."
 
 #: src/zope/app/schemacontent/interfaces.py:45
 msgid "Menu Id"
@@ -3245,7 +3295,9 @@
 msgstr "Login fallito!"
 
 #: src/zope/app/security/browser/login_failed.pt:9
-msgid "You cancelled the login procedure. <a href=\"\"> Click here to return. </a>"
+#, fuzzy
+msgid ""
+"You cancelled the login procedure. <a href=\"\">Click here to return.</a>"
 msgstr ""
 "Procedura di login annullata. <a href=\"\"> Clicka qui per tornare indietro. "
 "</a>"
@@ -3267,54 +3319,54 @@
 msgstr "Se vedi questa pagina per piÃ¹ di 5 secondi clicka qui."
 
 # Default: "Change security settings"
-#: src/zope/app/security/configure.zcml:53
+#: src/zope/app/security/configure.zcml:56
 msgid "change-security-settings-permission"
 msgstr "Cambia impostazioni di sicurezza"
 
-# Default: "Manage Content"
-#: src/zope/app/security/configure.zcml:58
-msgid "manage-content-permission"
-msgstr "Gestisci contenuto"
-
 #: src/zope/app/security/configure.zcml:6
 msgid ""
 "Special permission indicating unconditional access.                    "
 "Public resources are always accessable."
 msgstr ""
-"Permesso speciale indicante accesso incondizionato.                    "
-"Le risorse pubbliche sono sempre accessibili."
+"Permesso speciale indicante accesso incondizionato.                    Le "
+"risorse pubbliche sono sempre accessibili."
 
 # Default: "View"
 #: src/zope/app/security/configure.zcml:6
-#: src/zope/app/security/configure.zcml:48
+#: src/zope/app/security/configure.zcml:51
 msgid "view-permission"
 msgstr "Mostra"
 
+# Default: "Manage Content"
+#: src/zope/app/security/configure.zcml:61
+msgid "manage-content-permission"
+msgstr "Gestisci contenuto"
+
 # Default: "Manage Service Bindings"
-#: src/zope/app/security/configure.zcml:63
+#: src/zope/app/security/configure.zcml:66
 msgid "manage-service-bindings-permission"
 msgstr "Gestisci Associazione Servizi"
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "Manage executable code, including Python, SQL, ZPT, etc."
 msgstr "Gestisci il codice eseguibile, incluso Python, SQL, ZPT, ecc."
 
 # Default: "Manage Code"
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "manage-code-permission"
 msgstr "Gestisci Codice"
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:74
+#: src/zope/app/security/configure.zcml:77
 msgid "manage-services-permission"
 msgstr "Gestisci Servizi"
 
 # Default: "Manage Principals"
-#: src/zope/app/security/configure.zcml:79
+#: src/zope/app/security/configure.zcml:82
 msgid "manage-principal-permission"
 msgstr "Gestisci controlli principali"
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 #, fuzzy
 msgid ""
 "Manage the Zope Application, such as Restart/Shutdown or                    "
@@ -3324,19 +3376,19 @@
 "compressione dello ZODB."
 
 # Default: "Manage Application"
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid "manage-application-permission"
 msgstr "Gestisci l'applicazione"
 
-#: src/zope/app/security/interfaces/__init__.py:192
+#: src/zope/app/security/interfaces/__init__.py:184
 msgid "Id as which this permission will be known and used."
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:198
+#: src/zope/app/security/interfaces/__init__.py:190
 msgid "Provides a title for the permission."
 msgstr "Fornisce un titolo per il permesso."
 
-#: src/zope/app/security/interfaces/__init__.py:203
+#: src/zope/app/security/interfaces/__init__.py:195
 #, fuzzy
 msgid "Provides a description for the permission."
 msgstr "Una descrizione dettagliata dell'utente."
@@ -3352,11 +3404,11 @@
 msgstr "Il titolo dell'utente. Questo Ã¨ solitamente usato nella UI."
 
 #: src/zope/app/security/interfaces/__init__.py:50
-#: src/zope/app/security/interfaces/__init__.py:202
+#: src/zope/app/security/interfaces/__init__.py:194
 #: src/zope/schema/interfaces.py:107
 #: src/zope/app/site/browser/interfacedetail.pt:21
 #: src/zope/app/site/browser/interfacedetail.pt:48
-#: src/zope/app/dublincore/browser/edit.pt:22
+#: src/zope/app/dublincore/browser/edit.pt:24
 #: src/zope/app/introspector/marker.pt:63
 #: src/zope/app/introspector/introspector.pt:52
 #: src/zope/app/introspector/introspector.pt:155
@@ -3509,53 +3561,55 @@
 msgid "permission-deny"
 msgstr "Permesso"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "All users have this role implicitly"
 msgstr "Tutti gli utenti hanno questo ruolo implicitamente"
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "Everybody"
 msgstr "Tutti"
 
-#: src/zope/app/securitypolicy/configure.zcml:67
+#: src/zope/app/securitypolicy/configure.zcml:94
 msgid "Site Manager"
 msgstr "Amministratore del sito"
 
-#: src/zope/app/securitypolicy/configure.zcml:68
+#: src/zope/app/securitypolicy/configure.zcml:95
 msgid "Site Member"
 msgstr "Membro del sito"
 
-#: src/zope/app/session/browser.zcml:25
-msgid "Cookie Browser ID Manager Properties"
+#: src/zope/app/session/browser.zcml:15
+#, fuzzy
+msgid "Cookie Client Id Manager Properties"
 msgstr "ProprietÃ  del gestore di ID dei cookie"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Stores session data persistently in the ZODB"
 msgstr "Memorizza i dati di sessione in modo persistente nello ZODB"
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 #, fuzzy
 msgid "Persistent Session Data Container"
 msgstr "ProprietÃ  del contenitore della sessione persistente"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 #, fuzzy
 msgid "Stores session data in RAM"
 msgstr "Memorizza i dati di sessione in modo persistente nello ZODB"
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 #, fuzzy
 msgid "RAM Session Data Container"
 msgstr "ProprietÃ  del contenitore della sessione persistente"
 
-#: src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:38
 #, fuzzy
 msgid "Session Data Container Properties"
 msgstr "ProprietÃ  del contenitore della sessione persistente"
 
 #: src/zope/app/session/browser.zcml:8
+#, fuzzy
 msgid ""
-"Uses a cookie to uniquely identify a browser, allowing        state to be "
+"Uses a cookie to uniquely identify a client, allowing        state to be "
 "maintained between requests"
 msgstr ""
 "Usa un cookie per identificare in modo univoco un browser, cosÃ¬ da "
@@ -3563,44 +3617,14 @@
 
 #: src/zope/app/session/browser.zcml:8
 #, fuzzy
-msgid "Cookie Browser Id Manager"
+msgid "Cookie Client Id Manager"
 msgstr "ProprietÃ  del gestore di ID dei cookie"
 
-#: src/zope/app/session/interfaces.py:100
-msgid "Timeout"
-msgstr "Tempo massimo"
-
-#: src/zope/app/session/interfaces.py:101
-msgid "Number of seconds before data becomes stale and may be removed"
-msgstr ""
-"Numero di secondi prima che i dati divengano obsoleti e possano essere "
-"rimossi"
-
-#: src/zope/app/session/interfaces.py:109
-msgid "Purge Interval"
-msgstr "Intervallo di eliminazione"
-
-#: src/zope/app/session/interfaces.py:110
-msgid "How often stale data is purged in seconds. Higer values improve performance."
-msgstr ""
-"Quanto spesso i dati obsoleti devono essere rimossi in secondi. Valori piÃ¹ "
-"elevati migliorano le prestazioni."
-
-#: src/zope/app/session/interfaces.py:144
-msgid "Last Access Time"
-msgstr "Ultimo accesso"
-
-#: src/zope/app/session/interfaces.py:145
-msgid ""
-"Approximate epoch time this ISessionData was last retrieved from its "
-"ISessionDataContainer"
-msgstr ""
-
-#: src/zope/app/session/interfaces.py:53
+#: src/zope/app/session/http.py:48
 msgid "Cookie Name"
 msgstr "Nome del Cookie"
 
-#: src/zope/app/session/interfaces.py:54
+#: src/zope/app/session/http.py:49
 msgid ""
 "Name of cookie used to maintain state. Must be unique to the site domain "
 "name, and only contain ASCII letters, digits and '_'"
@@ -3609,11 +3633,11 @@
 "rispetto al nome di dominio del sito, e puÃ² contenere solo lettere ASCII, "
 "cifre e '_'"
 
-#: src/zope/app/session/interfaces.py:66
+#: src/zope/app/session/http.py:61
 msgid "Cookie Lifetime"
 msgstr "Tempo di permanenza dei cookie"
 
-#: src/zope/app/session/interfaces.py:67
+#: src/zope/app/session/http.py:62
 msgid ""
 "Number of seconds until the browser expires the cookie. Leave blank expire "
 "the cookie when the browser is quit. Set to 0 to never expire. "
@@ -3622,32 +3646,67 @@
 "il cookie viene rimosso quando il browser Ã¨ chiuso. Impostare a 0 per non "
 "avere scadenza."
 
+#: src/zope/app/session/interfaces.py:125
+msgid "Last Access Time"
+msgstr "Ultimo accesso"
+
+#: src/zope/app/session/interfaces.py:126
+msgid ""
+"Approximate epoch time this ISessionData was last retrieved from its "
+"ISessionDataContainer"
+msgstr ""
+
+#: src/zope/app/session/interfaces.py:66
+msgid "Timeout"
+msgstr "Tempo massimo"
+
+#: src/zope/app/session/interfaces.py:67
+#, fuzzy
+msgid ""
+"Number of seconds before data becomes stale and may be removed. A value of "
+"'0' means no expiration."
+msgstr ""
+"Numero di secondi prima che i dati divengano obsoleti e possano essere "
+"rimossi"
+
+#: src/zope/app/session/interfaces.py:75
+msgid "Timeout resolution (in seconds)"
+msgstr ""
+
+#: src/zope/app/session/interfaces.py:76
+msgid ""
+"Defines what the 'resolution' of item timeout is. Setting this higher allows "
+"the transience machinery to do fewer 'writes' at the expense of  causing "
+"items to time out later than the 'Data object timeout value' by  a factor of "
+"(at most) this many seconds."
+msgstr ""
+
 #: src/zope/app/site/browser/__init__.py:108
 msgid "Add Service"
 msgstr "Aggiungi un servizio"
 
-#: src/zope/app/site/browser/__init__.py:145
+#: src/zope/app/site/browser/__init__.py:144
 #: src/zope/app/schema/browser/schema_add.pt:8
 msgid "Add Utility"
 msgstr "Aggiungi un'utilitÃ "
 
-#: src/zope/app/site/browser/__init__.py:236
+#: src/zope/app/site/browser/__init__.py:234
 msgid "Activated: ${activated_services}"
 msgstr "Attivato: ${activated_services}"
 
-#: src/zope/app/site/browser/__init__.py:240
+#: src/zope/app/site/browser/__init__.py:238
 msgid "All of the checked services were already active"
 msgstr "Tutti i servizi selezionati erano giÃ  attivi"
 
-#: src/zope/app/site/browser/__init__.py:251
+#: src/zope/app/site/browser/__init__.py:249
 msgid "Deactivated: ${deactivated_services}"
 msgstr "Disattivato: ${deactivated_services}"
 
-#: src/zope/app/site/browser/__init__.py:255
+#: src/zope/app/site/browser/__init__.py:253
 msgid "None of the checked services were active"
 msgstr "Nessuno dei servizi selezionati era attivo"
 
-#: src/zope/app/site/browser/__init__.py:266
+#: src/zope/app/site/browser/__init__.py:264
 msgid ""
 "Can't delete active service(s): ${service_names}; use the Deactivate button "
 "to deactivate"
@@ -3655,27 +3714,27 @@
 "Non Ã¨ possibile cancellare i servizi attivi: ${service_names}; si usi il "
 "pulsante Disattiva per disattivarli"
 
-#: src/zope/app/site/browser/__init__.py:300
+#: src/zope/app/site/browser/__init__.py:298
 msgid "Deleted: ${service_names}"
 msgstr "Cancellato: ${service_names}"
 
-#: src/zope/app/site/browser/__init__.py:335
+#: src/zope/app/site/browser/__init__.py:333
 msgid "global"
 msgstr "globale"
 
-#: src/zope/app/site/browser/__init__.py:416
+#: src/zope/app/site/browser/__init__.py:414
 msgid "Invalid service type specified"
 msgstr "Il tipo di servizio specificato non Ã¨ valido"
 
-#: src/zope/app/site/browser/__init__.py:423
+#: src/zope/app/site/browser/__init__.py:421
 msgid "No change"
 msgstr "Nessuna modifica"
 
-#: src/zope/app/site/browser/__init__.py:427
+#: src/zope/app/site/browser/__init__.py:425
 msgid "Service deactivated"
 msgstr "Servizio disattivato"
 
-#: src/zope/app/site/browser/__init__.py:430
+#: src/zope/app/site/browser/__init__.py:428
 msgid "${active_services} activated"
 msgstr "Attivati i servizi: ${active_services}"
 
@@ -3689,13 +3748,6 @@
 msgid "Service name"
 msgstr "Nome del servizio"
 
-# Default: "Reset"
-#: src/zope/app/site/browser/add_svc_config.pt:35
-#: src/zope/app/cache/browser/ramedit.pt:53
-#: src/zope/app/bundle/browser/bundle.pt:130
-msgid "reset-button"
-msgstr "Reset"
-
 #: src/zope/app/site/browser/add_svc_config.pt:7
 msgid "Register this object to provide the following service(s):"
 msgstr "Registra questo oggetto per fornire i seguenti servizi:"
@@ -3732,7 +3784,7 @@
 
 #: src/zope/app/site/browser/configure.zcml:210
 #: src/zope/app/site/browser/serviceactivation.pt:26
-#: src/zope/app/apidoc/ifacemodule/index.pt:247
+#: src/zope/app/apidoc/ifacemodule/index.pt:248
 msgid "Service"
 msgstr "Servizio"
 
@@ -3841,19 +3893,13 @@
 #: src/zope/app/zptpage/browser/inlinecode.pt:65
 #: src/zope/app/workflow/stateful/browser/instance_manage.pt:76
 #: src/zope/app/pythonpage/edit.pt:71
-#: src/zope/app/form/browser/editwizard.pt:50
-#: src/zope/app/form/browser/addwizard.pt:58
+#: src/zope/app/form/browser/editwizard.pt:45
+#: src/zope/app/form/browser/addwizard.pt:66
 #: src/zope/app/form/browser/edit.pt:52
 #: src/zope/app/registration/browser/editregistration.pt:51
 msgid "submit-button"
 msgstr "Invia"
 
-#: src/zope/app/site/browser/services.pt:15
-#: src/zope/app/utility/browser/utilities.pt:11
-#: src/zope/app/bundle/browser/bundle.pt:53
-msgid "(click to clear message)"
-msgstr "(clicka per rimuovere il messaggio)"
-
 #: src/zope/app/site/browser/services.pt:18
 msgid "No services are registered."
 msgstr "Nessun servizio registrato"
@@ -3902,36 +3948,26 @@
 "\"default/Utilities/@@utilities.html\">x</a> giÃ  presenti nel sito."
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:30
+#: src/zope/app/site/browser/tasks.pt:30 src/zope/app/site/browser/tasks.pt:35
 msgid "label-configure-services"
 msgstr ""
 
 # Default: "Configure utilities"
-#: src/zope/app/site/browser/tasks.pt:36
+#: src/zope/app/site/browser/tasks.pt:41
 msgid "label-configure-utilities"
 msgstr ""
 
-#: src/zope/app/site/browser/tasks.pt:43
-#, fuzzy
-msgid "label-add-service"
-msgstr "Aggiungi un servizio"
-
+# Default: "Software"
 #: src/zope/app/site/browser/tasks.pt:49
-#, fuzzy
-msgid "label-add-utility"
-msgstr "Aggiungi un'utilitÃ "
+msgid "label-software"
+msgstr ""
 
 #: src/zope/app/site/browser/tasks.pt:5
 #, fuzzy
 msgid "heading-common-site-management-tasks"
 msgstr "AttivitÃ  generali di amministrazione del sito"
 
-# Default: "Software"
-#: src/zope/app/site/browser/tasks.pt:56
-msgid "label-software"
-msgstr ""
-
-#: src/zope/app/site/browser/tasks.pt:59
+#: src/zope/app/site/browser/tasks.pt:52
 #, fuzzy
 msgid ""
 "The site may customize the behavior of existing software or define its own. "
@@ -3944,13 +3980,13 @@
 "software. Se Ã¨ giÃ  stato aggiunto il proprio software, Ã¨ possibile <a href="
 "\"@@contents.html\">x</a>."
 
-#: src/zope/app/site/browser/tasks.pt:68
+#: src/zope/app/site/browser/tasks.pt:61
 #, fuzzy
 msgid "label-customize-existing-software"
 msgstr "personalizza il comportamento del software esistente"
 
 # Default: "Create a new Site Management Folder"
-#: src/zope/app/site/browser/tasks.pt:75
+#: src/zope/app/site/browser/tasks.pt:68
 msgid "label-create-new-site-management-folder"
 msgstr ""
 
@@ -3969,25 +4005,6 @@
 msgid "rename-button"
 msgstr "Cancella"
 
-# Default: "Rigenera"
-#: src/zope/app/site/browser/tool.pt:106
-#: src/zope/app/site/browser/services.pt:74
-#: src/zope/app/utility/browser/utilities.pt:50
-#: src/zope/app/zptpage/browser/inlinecode.pt:63
-#: src/zope/app/dublincore/browser/edit.pt:31
-#: src/zope/app/schemacontent/browser/permission_edit.pt:33
-#: src/zope/app/errorservice/browser/error.pt:52
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
-#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
-#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
-#: src/zope/app/form/browser/edit.pt:50
-#: src/zope/app/wiki/browser/subscriptions.pt:35
-#: src/zope/app/wiki/browser/wiki_add.pt:29
-#: src/zope/app/registration/browser/editregistration.pt:49
-msgid "refresh-button"
-msgstr "Rigenera"
-
 # Default: "Su"
 #: src/zope/app/site/browser/tool.pt:110
 #: src/zope/app/securitypolicy/browser/principal_role_association.pt:98
@@ -4027,23 +4044,6 @@
 msgid "disabled"
 msgstr "(disabilitato)"
 
-# Default: "Attiva"
-#: src/zope/app/site/browser/tool.pt:91
-#: src/zope/app/site/browser/services.pt:66
-#: src/zope/app/site/browser/add_svc_config.pt:16
-#: src/zope/app/utility/browser/utilities.pt:42
-#: src/zope/app/registration/browser/registration.pt:30
-msgid "activate-button"
-msgstr "Attiva"
-
-# Default: "Disattiva"
-#: src/zope/app/site/browser/tool.pt:93
-#: src/zope/app/site/browser/services.pt:68
-#: src/zope/app/utility/browser/utilities.pt:44
-#: src/zope/app/registration/browser/registration.pt:25
-msgid "deactivate-button"
-msgstr "Disattiva"
-
 # Default: "Aggiungi"
 #: src/zope/app/site/browser/tool.pt:96
 #: src/zope/app/schema/browser/schema_add.pt:39
@@ -4053,43 +4053,32 @@
 #: src/zope/app/i18n/browser/translate.pt:48
 #: src/zope/app/container/browser/add.pt:38
 #: src/zope/app/introspector/marker.pt:133 src/zope/app/form/browser/add.pt:52
-#: src/zope/app/wiki/browser/subscriptions.pt:37
-#: src/zope/app/wiki/browser/wiki_add.pt:31
 msgid "add-button"
 msgstr "Aggiungi"
 
-# Default: "Delete"
-#: src/zope/app/site/browser/tool.pt:99
-#: src/zope/app/site/browser/services.pt:71
-#: src/zope/app/utility/browser/utilities.pt:47
-#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
-#: src/zope/app/i18n/browser/translate.pt:37
-msgid "delete-button"
-msgstr "Cancella"
-
 #: src/zope/app/site/browser/tools.pt:5
 #, fuzzy
 msgid "Available Tools"
 msgstr "Mappature disponibili."
 
-#: src/zope/app/site/browser/tools.py:159
-#: src/zope/app/site/browser/tools.py:303
+#: src/zope/app/site/browser/tools.py:160
+#: src/zope/app/site/browser/tools.py:304
 msgid "Deleted selected tools."
 msgstr "Strumenti selezionati eliminati."
 
-#: src/zope/app/site/browser/tools.py:162
-#: src/zope/app/site/browser/tools.py:308
+#: src/zope/app/site/browser/tools.py:163
+#: src/zope/app/site/browser/tools.py:309
 msgid "Renamed selected tools."
 msgstr "Strumenti selezionati rinominati."
 
-#: src/zope/app/site/browser/tools.py:167
-#: src/zope/app/site/browser/tools.py:313
+#: src/zope/app/site/browser/tools.py:168
+#: src/zope/app/site/browser/tools.py:314
 #, fuzzy
 msgid "Activated registrations."
 msgstr "cambia registrazione"
 
-#: src/zope/app/site/browser/tools.py:170
-#: src/zope/app/site/browser/tools.py:316
+#: src/zope/app/site/browser/tools.py:171
+#: src/zope/app/site/browser/tools.py:317
 #, fuzzy
 msgid "Deactivated registrations."
 msgstr "cambia registrazione"
@@ -4099,19 +4088,19 @@
 msgstr "Il nome registrato"
 
 # Default: "n/a"
-#: src/zope/app/size/__init__.py:44
+#: src/zope/app/size/__init__.py:42
 msgid "not-available"
 msgstr "n/d"
 
-#: src/zope/app/size/__init__.py:48
+#: src/zope/app/size/__init__.py:46
 msgid "0 KB"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:50
+#: src/zope/app/size/__init__.py:48
 msgid "1 KB"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:55
+#: src/zope/app/size/__init__.py:53
 msgid "${size} KB"
 msgstr ""
 
@@ -4172,19 +4161,19 @@
 msgid "SQL Script"
 msgstr "Aggiungi un SQL Script"
 
-#: src/zope/app/sqlscript/interfaces.py:29
+#: src/zope/app/sqlscript/interfaces.py:30
 msgid "Connection Name"
 msgstr "Nome della Connessione"
 
-#: src/zope/app/sqlscript/interfaces.py:30
+#: src/zope/app/sqlscript/interfaces.py:31
 msgid "The Connection Name for the connection to be used."
 msgstr "Il Nome della Connessione da utilizzare."
 
-#: src/zope/app/sqlscript/interfaces.py:35
+#: src/zope/app/sqlscript/interfaces.py:36
 msgid "Arguments"
 msgstr "Parametri"
 
-#: src/zope/app/sqlscript/interfaces.py:36
+#: src/zope/app/sqlscript/interfaces.py:37
 msgid ""
 "A set of attributes that can be used during the SQL command rendering "
 "process to provide dynamic data."
@@ -4192,7 +4181,7 @@
 "Un insieme di attributi che puÃ² essere utilizzato per fornire dati dinamici "
 "durante il processo di interpretazione dei comandi SQL."
 
-#: src/zope/app/sqlscript/interfaces.py:45
+#: src/zope/app/sqlscript/interfaces.py:46
 msgid "The SQL command to be run."
 msgstr "Il comando SQL da eseguire."
 
@@ -4437,15 +4426,65 @@
 msgstr "Aggiorna"
 
 #: src/zope/app/utility/browser/configureutility.pt:9
-msgid "Utility registrations for interface ${interface} with name ${utility_name}"
+msgid ""
+"Utility registrations for interface ${interface} with name ${utility_name}"
 msgstr ""
 "Registrazione delle utilitÃ  per l'interfaccia ${interface} con nome "
 "${utility_name}"
 
+#: src/zope/app/utility/browser/utilities.pt:11
+#: src/zope/app/site/browser/services.pt:15
+#: src/zope/app/bundle/browser/bundle.pt:53
+msgid "(click to clear message)"
+msgstr "(clicka per rimuovere il messaggio)"
+
 #: src/zope/app/utility/browser/utilities.pt:34
 msgid "change registration"
 msgstr "cambia registrazione"
 
+# Default: "Attiva"
+#: src/zope/app/utility/browser/utilities.pt:42
+#: src/zope/app/site/browser/tool.pt:91
+#: src/zope/app/site/browser/services.pt:66
+#: src/zope/app/site/browser/add_svc_config.pt:16
+#: src/zope/app/registration/browser/registration.pt:30
+msgid "activate-button"
+msgstr "Attiva"
+
+# Default: "Disattiva"
+#: src/zope/app/utility/browser/utilities.pt:44
+#: src/zope/app/site/browser/tool.pt:93
+#: src/zope/app/site/browser/services.pt:68
+#: src/zope/app/registration/browser/registration.pt:25
+msgid "deactivate-button"
+msgstr "Disattiva"
+
+# Default: "Delete"
+#: src/zope/app/utility/browser/utilities.pt:47
+#: src/zope/app/site/browser/tool.pt:99
+#: src/zope/app/site/browser/services.pt:71
+#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
+#: src/zope/app/i18n/browser/translate.pt:37
+msgid "delete-button"
+msgstr "Cancella"
+
+# Default: "Rigenera"
+#: src/zope/app/utility/browser/utilities.pt:50
+#: src/zope/app/site/browser/tool.pt:106
+#: src/zope/app/site/browser/services.pt:74
+#: src/zope/app/zptpage/browser/inlinecode.pt:63
+#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/schemacontent/browser/permission_edit.pt:33
+#: src/zope/app/errorservice/browser/error.pt:52
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
+#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
+#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
+#: src/zope/app/form/browser/edit.pt:50
+#: src/zope/app/registration/browser/editregistration.pt:49
+msgid "refresh-button"
+msgstr "Rigenera"
+
 #: src/zope/app/utility/browser/utilities.pt:6
 msgid "Utilities registered in this utility service"
 msgstr "UtilitÃ  registrate in questo servizio di utilitÃ "
@@ -4463,252 +4502,6 @@
 msgid "The physical path to the component"
 msgstr "Percorso fisico del componente"
 
-#: src/zope/app/wiki/browser/configure.zcml:101
-#: src/zope/app/wiki/browser/configure.zcml:158
-#, fuzzy
-msgid "View"
-msgstr "Viste"
-
-#: src/zope/app/wiki/browser/configure.zcml:109
-#: src/zope/app/wiki/browser/configure.zcml:161
-#: src/zope/app/wiki/browser/parents_page.pt:13
-#, fuzzy
-msgid "Parents"
-msgstr "Stampa"
-
-#: src/zope/app/wiki/browser/configure.zcml:134
-#: src/zope/app/wiki/browser/configure.zcml:143
-#: src/zope/app/wiki/browser/configure.zcml:159
-#, fuzzy
-msgid "Comment"
-msgstr "Comando"
-
-#: src/zope/app/wiki/browser/configure.zcml:143
-#, fuzzy
-msgid "A Comment"
-msgstr "Aggiungi Contenuto"
-
-#: src/zope/app/wiki/browser/configure.zcml:152
-msgid "Menu for Wiki Page related actions."
-msgstr "Menu per le azioni colegate a Wiki Page."
-
-#: src/zope/app/wiki/browser/configure.zcml:168
-#, fuzzy
-msgid "Table of Contents"
-msgstr "Contenuto"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "A Wiki"
-msgstr "Un Wiki"
-
-#: src/zope/app/wiki/browser/configure.zcml:24
-#: src/zope/app/wiki/browser/configure.zcml:162
-msgid "TOC"
-msgstr "Indice"
-
-#: src/zope/app/wiki/browser/configure.zcml:32
-#: src/zope/app/wiki/browser/configure.zcml:169
-#, fuzzy
-msgid "Search"
-msgstr "Servizio"
-
-#: src/zope/app/wiki/browser/configure.zcml:44
-#: src/zope/app/wiki/browser/configure.zcml:118
-#: src/zope/app/wiki/browser/configure.zcml:163
-#: src/zope/app/wiki/browser/configure.zcml:170
-#, fuzzy
-msgid "Subscriptions"
-msgstr "Descrizione"
-
-#: src/zope/app/wiki/browser/configure.zcml:76
-#, fuzzy
-msgid "Change Wiki Page"
-msgstr "Cambia pagina"
-
-#: src/zope/app/wiki/browser/configure.zcml:8
-#, fuzzy
-msgid "Add Wiki"
-msgstr "Aggiungi un'utilitÃ "
-
-# Default: "Reset"
-#: src/zope/app/wiki/browser/parents_page.pt:30
-#, fuzzy
-msgid "reparent-button"
-msgstr "Reset"
-
-#: src/zope/app/wiki/browser/parents_page.pt:35
-msgid "Branch"
-msgstr "Ramo"
-
-#: src/zope/app/wiki/browser/skin/template.pt:32
-msgid "Last modified by ${user} on ${date}"
-msgstr "Ultima modifica di ${user} il ${date}"
-
-#: src/zope/app/wiki/browser/skin/template.pt:64
-#, fuzzy
-msgid "Jump to:"
-msgstr "Mantieni fino a:"
-
-#: src/zope/app/wiki/browser/skin/template.pt:73
-msgid ""
-"User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Search Wiki</a> </div>"
-msgstr ""
-"Utente: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Cerca Wiki</a> </div>"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:12
-#, fuzzy
-msgid "Current Subscriptions"
-msgstr "Descrizione"
-
-#: src/zope/app/wiki/browser/subscriptions.pt:25
-msgid "Enter new Users (separate by 'Return')"
-msgstr "Inserisci i nuovi utenti (separati da un 'a capo')"
-
-#: src/zope/app/wiki/browser/wiki_search.pt:9
-msgid "Wiki Search"
-msgstr "Cerca Wiki"
-
-#: src/zope/app/wiki/browser/wiki_toc.pt:9
-msgid "Wiki Table of Contents"
-msgstr "Indice del Wiki"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "A Wiki Page"
-msgstr "Una Wiki Page"
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "The Wiki Editor can create and edit wikis."
-msgstr "Il Wiki Editor puÃ² creare e modificare i wiki"
-
-#: src/zope/app/wiki/configure.zcml:14
-#, fuzzy
-msgid "Wiki Editor"
-msgstr "Modulo di modifica"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "A Wiki Page Comment"
-msgstr "Un Pagina di Commento Wiki"
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "Wiki Page Comment"
-msgstr "Pagina di Commento Wiki"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "Wiki Administrator"
-msgstr "Amministratore Wiki"
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "The Wiki Admin can fully manage wiki pages."
-msgstr "L'amministratore del Wiki puÃ² gestire totalemente le pagine wiki."
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View Wiki Page"
-msgstr "Mostra Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View a Wiki Page"
-msgstr "Mostra una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Comment on Wiki Page"
-msgstr "Commento su una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Make a comment on Wiki Page"
-msgstr "Commenta una Pagina Wiki"
-
-#: src/zope/app/wiki/configure.zcml:42
-#: src/zope/app/wiki/browser/configure.zcml:60
-#, fuzzy
-msgid "Add Wiki Page"
-msgstr "Aggiungi una ZPT"
-
-#: src/zope/app/wiki/configure.zcml:51
-#, fuzzy
-msgid "Edit Wiki Page"
-msgstr "Modifica una ZPT"
-
-#: src/zope/app/wiki/configure.zcml:60
-#, fuzzy
-msgid "Delete Wiki Page"
-msgstr "Cancella i messaggi"
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent a Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:9
-#, fuzzy
-msgid "Wiki User"
-msgstr "Modifica utente"
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki visitors, which can only view and comment on wikis."
-msgstr "Visitatori del Wiki, possono solo vedere e commentare i wiki."
-
-#: src/zope/app/wiki/configure.zcml:93
-msgid "Minimal Wiki Page Container implementation "
-msgstr "Implementazione minimale di un Contenitore per Pagine Wiki"
-
-#: src/zope/app/wiki/interfaces.py:150
-#, fuzzy
-msgid "Previous Source Text"
-msgstr "Campo Sorgente di Testo"
-
-#: src/zope/app/wiki/interfaces.py:151
-#, fuzzy
-msgid "Previous source text of the Wiki Page."
-msgstr "Sorgente della pagina DTML"
-
-#: src/zope/app/wiki/interfaces.py:40
-#, fuzzy
-msgid "Comment Title"
-msgstr "Linea di comando"
-
-#: src/zope/app/wiki/interfaces.py:46
-msgid "Renderable source text of the comment."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:72
-#, fuzzy
-msgid "Renderable source text of the Wiki Page."
-msgstr "Sorgente della pagina DTML"
-
-#: src/zope/app/wiki/interfaces.py:96
-msgid "Wiki Page Parents"
-msgstr "Genitori delle Pagine Wiki"
-
-#: src/zope/app/wiki/interfaces.py:97
-#, fuzzy
-msgid "Parents of a Wiki"
-msgstr "Genitori di un Wiki"
-
-#: src/zope/app/wiki/interfaces.py:98
-#, fuzzy
-msgid "Parent Name"
-msgstr "Nome dell'argomento"
-
-#: src/zope/app/wiki/interfaces.py:99
-#, fuzzy
-msgid "Name of the parent wiki page."
-msgstr "Torna alla pagina principale."
-
 #: src/zope/app/workflow/browser/configure.zcml:6
 #, fuzzy
 msgid ""
@@ -4795,13 +4588,13 @@
 msgstr "Transizione"
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
+msgid "An utility to manage content and workflow interaction."
+msgstr "Un'utilitÃ  per gestire le interazioni tra contenuti e workflow."
+
+#: src/zope/app/workflow/stateful/browser/configure.zcml:121
 msgid "Content Workflows Manager"
 msgstr "Gestore del workflow dei contenuti"
 
-#: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "An utility to manage content and workflow interaction."
-msgstr "Un'utilitÃ  per gestire le interazioni tra contenuti e workflow."
-
 #: src/zope/app/workflow/stateful/browser/configure.zcml:129
 msgid "Content/Process Registry"
 msgstr "Registro dei contenuti e dei processi"
@@ -5029,59 +4822,59 @@
 msgid "Source State"
 msgstr "Sorgente"
 
-#: src/zope/app/zopetop/widget_macros.pt:13
-msgid "Logged in as ${user_title}"
-msgstr "Autenticato come ${user_title}"
-
-#: src/zope/app/zopetop/widget_macros.pt:132
+#: src/zope/app/zopetop/widget_macros.pt:152
 msgid "Views"
 msgstr "Viste"
 
-#: src/zope/app/zopetop/widget_macros.pt:149
+#: src/zope/app/zopetop/widget_macros.pt:169
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/zope/app/zopetop/widget_macros.pt:176
+#: src/zope/app/zopetop/widget_macros.pt:196
 msgid "Location:"
 msgstr "Posizione:"
 
-#: src/zope/app/zopetop/widget_macros.pt:26
+#: src/zope/app/zopetop/widget_macros.pt:32
+msgid "Logged in as ${user_title}"
+msgstr "Autenticato come ${user_title}"
+
+#: src/zope/app/zopetop/widget_macros.pt:46
 msgid "Common Tasks"
 msgstr "AttivitÃ  comuni"
 
-#: src/zope/app/zopetop/widget_macros.pt:37
+#: src/zope/app/zopetop/widget_macros.pt:57
 msgid "user accounts"
 msgstr "account utente"
 
-#: src/zope/app/zopetop/widget_macros.pt:40
+#: src/zope/app/zopetop/widget_macros.pt:60
 msgid "User Accounts"
 msgstr "Account utenti"
 
-#: src/zope/app/zopetop/widget_macros.pt:43
+#: src/zope/app/zopetop/widget_macros.pt:63
 msgid "control panels"
 msgstr "pannelli di gestione"
 
-#: src/zope/app/zopetop/widget_macros.pt:46
+#: src/zope/app/zopetop/widget_macros.pt:66
 msgid "Control Panels"
 msgstr "Pannelli di gestione"
 
-#: src/zope/app/zopetop/widget_macros.pt:49
+#: src/zope/app/zopetop/widget_macros.pt:69
 msgid "system security"
 msgstr "sicurezza del sistema"
 
-#: src/zope/app/zopetop/widget_macros.pt:52
+#: src/zope/app/zopetop/widget_macros.pt:72
 msgid "System Security"
 msgstr "Sicurezza del sistema"
 
-#: src/zope/app/zopetop/widget_macros.pt:55
+#: src/zope/app/zopetop/widget_macros.pt:75
 msgid "add more"
 msgstr "aggiungi"
 
-#: src/zope/app/zopetop/widget_macros.pt:58
+#: src/zope/app/zopetop/widget_macros.pt:78
 msgid "Add More"
 msgstr "Aggiungi"
 
-#: src/zope/app/zopetop/widget_macros.pt:66
+#: src/zope/app/zopetop/widget_macros.pt:86
 msgid "Root Folder"
 msgstr "Cartella radice"
 
@@ -5161,28 +4954,14 @@
 "Esegui il codice snippet nei TAL. Si Ã¨ scoraggiati dall'utilizzare questa "
 "caratteristica."
 
-#: src/zope/app/zptpage/zptpage.py:114
+#: src/zope/app/zptpage/zptpage.py:112
 msgid "1 line"
 msgstr "1 linea"
 
-#: src/zope/app/zptpage/zptpage.py:115
+#: src/zope/app/zptpage/zptpage.py:113
 msgid "${lines} lines"
 msgstr "${lines} linee"
 
-#: src/zope/exceptions/unauthorized.py:69
-#: src/zope/exceptions/unauthorized.py:72
-msgid "You are not allowed to access ${name} in this context"
-msgstr "Non sei autorizzato ad accedere ${name} in questo contesto"
-
-#: src/zope/exceptions/unauthorized.py:74
-#, fuzzy
-msgid "You are not authorized"
-msgstr "Non autorizzato"
-
-#: src/zope/exceptions/unauthorized.py:84
-msgid "a particular ${object}"
-msgstr "un particolare ${object}"
-
 #: src/zope/schema/_bootstrapinterfaces.py:43
 #, fuzzy
 msgid "Required input is missing."
@@ -5295,12 +5074,14 @@
 "        (Fields in separate threads could have the same order.)\n"
 "        "
 msgstr ""
-"        L'attributo di ordinamento puÃ² essere usato per determinare l'ordine in\n"
+"        L'attributo di ordinamento puÃ² essere usato per determinare l'ordine "
+"in\n"
 "        cui i campi in uno schema sono definiti. Se un campo Ã¨ creato\n"
 "        dopo un'altro (nello stesso gruppo), il suo attributo sarÃ \n"
 "        maggiore.\n"
 "\n"
-"        (I campi in gruppi separati possono avere lo stesso valore di ordinamento.)\n"
+"        (I campi in gruppi separati possono avere lo stesso valore di "
+"ordinamento.)\n"
 "        "
 
 #: src/zope/schema/interfaces.py:220 src/zope/schema/interfaces.py:303
@@ -5348,7 +5129,8 @@
 msgstr "Sorgente"
 
 #: src/zope/schema/interfaces.py:385
-msgid "Field value items must conform to the given type, expressed via a Field."
+msgid ""
+"Field value items must conform to the given type, expressed via a Field."
 msgstr ""
 
 #: src/zope/schema/interfaces.py:389
@@ -5406,25 +5188,263 @@
 msgid "The field is not bound."
 msgstr "Il campo non Ã¨ legato."
 
-#: src/zope/schema/tests/test_objectfield.py:38
+#: src/zope/schema/tests/test_objectfield.py:37
 msgid "Foo"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:39
+#: src/zope/schema/tests/test_objectfield.py:38
 #, fuzzy
 msgid "Foo description"
 msgstr "Descrizione"
 
-#: src/zope/schema/tests/test_objectfield.py:44
+#: src/zope/schema/tests/test_objectfield.py:43
 msgid "Bar"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:45
+#: src/zope/schema/tests/test_objectfield.py:44
 #, fuzzy
 msgid "Bar description"
 msgstr "Descrizione"
 
+#: src/zwiki/browser/configure.zcml:101 src/zwiki/browser/configure.zcml:158
+#, fuzzy
+msgid "View"
+msgstr "Viste"
+
+#: src/zwiki/browser/configure.zcml:109 src/zwiki/browser/configure.zcml:161
+#, fuzzy
+msgid "Parents"
+msgstr "Stampa"
+
+#: src/zwiki/browser/configure.zcml:134 src/zwiki/browser/configure.zcml:143
+#: src/zwiki/browser/configure.zcml:159
+#, fuzzy
+msgid "Comment"
+msgstr "Comando"
+
+#: src/zwiki/browser/configure.zcml:143
+#, fuzzy
+msgid "A Comment"
+msgstr "Aggiungi Contenuto"
+
+#: src/zwiki/browser/configure.zcml:152
+msgid "Menu for Wiki Page related actions."
+msgstr "Menu per le azioni colegate a Wiki Page."
+
+#: src/zwiki/browser/configure.zcml:168
+#, fuzzy
+msgid "Table of Contents"
+msgstr "Contenuto"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "Wiki"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "A Wiki"
+msgstr "Un Wiki"
+
+#: src/zwiki/browser/configure.zcml:24 src/zwiki/browser/configure.zcml:162
+msgid "TOC"
+msgstr "Indice"
+
+#: src/zwiki/browser/configure.zcml:32 src/zwiki/browser/configure.zcml:169
+#, fuzzy
+msgid "Search"
+msgstr "Servizio"
+
+#: src/zwiki/browser/configure.zcml:44 src/zwiki/browser/configure.zcml:118
+#: src/zwiki/browser/configure.zcml:163 src/zwiki/browser/configure.zcml:170
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Descrizione"
+
+#: src/zwiki/browser/configure.zcml:76
+#, fuzzy
+msgid "Change Wiki Page"
+msgstr "Cambia pagina"
+
+#: src/zwiki/browser/configure.zcml:8
+#, fuzzy
+msgid "Add Wiki"
+msgstr "Aggiungi un'utilitÃ "
+
+#: src/zwiki/configure.zcml:12
+#, fuzzy
+msgid "Wiki User"
+msgstr "Modifica utente"
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki visitors, which can only view and comment on wikis."
+msgstr "Visitatori del Wiki, possono solo vedere e commentare i wiki."
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "A Wiki Page"
+msgstr "Una Wiki Page"
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:17
+msgid "The Wiki Editor can create and edit wikis."
+msgstr "Il Wiki Editor puÃ² creare e modificare i wiki"
+
+#: src/zwiki/configure.zcml:17
+#, fuzzy
+msgid "Wiki Editor"
+msgstr "Modulo di modifica"
+
+#: src/zwiki/configure.zcml:186
+msgid "A Wiki Page Comment"
+msgstr "Un Pagina di Commento Wiki"
+
+#: src/zwiki/configure.zcml:186
+msgid "Wiki Page Comment"
+msgstr "Pagina di Commento Wiki"
+
+#: src/zwiki/configure.zcml:22
+msgid "Wiki Administrator"
+msgstr "Amministratore Wiki"
+
+#: src/zwiki/configure.zcml:22
+msgid "The Wiki Admin can fully manage wiki pages."
+msgstr "L'amministratore del Wiki puÃ² gestire totalemente le pagine wiki."
+
+#: src/zwiki/configure.zcml:27
+msgid "View Wiki Page"
+msgstr "Mostra Pagina Wiki"
+
+#: src/zwiki/configure.zcml:27
+msgid "View a Wiki Page"
+msgstr "Mostra una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:36
+msgid "Comment on Wiki Page"
+msgstr "Commento su una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:36
+msgid "Make a comment on Wiki Page"
+msgstr "Commenta una Pagina Wiki"
+
+#: src/zwiki/configure.zcml:45 src/zwiki/browser/configure.zcml:60
+#, fuzzy
+msgid "Add Wiki Page"
+msgstr "Aggiungi una ZPT"
+
+#: src/zwiki/configure.zcml:54
+#, fuzzy
+msgid "Edit Wiki Page"
+msgstr "Modifica una ZPT"
+
+#: src/zwiki/configure.zcml:63
+#, fuzzy
+msgid "Delete Wiki Page"
+msgstr "Cancella i messaggi"
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent a Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:96
+msgid "Minimal Wiki Page Container implementation "
+msgstr "Implementazione minimale di un Contenitore per Pagine Wiki"
+
+#~ msgid "Purge Interval"
+#~ msgstr "Intervallo di eliminazione"
+
 #~ msgid ""
+#~ "How often stale data is purged in seconds. Higer values improve "
+#~ "performance."
+#~ msgstr ""
+#~ "Quanto spesso i dati obsoleti devono essere rimossi in secondi. Valori "
+#~ "piÃ¹ elevati migliorano le prestazioni."
+
+#, fuzzy
+#~ msgid "label-add-service"
+#~ msgstr "Aggiungi un servizio"
+
+#, fuzzy
+#~ msgid "label-add-utility"
+#~ msgstr "Aggiungi un'utilitÃ "
+
+# Default: "Reset"
+#, fuzzy
+#~ msgid "reparent-button"
+#~ msgstr "Reset"
+
+#~ msgid "Branch"
+#~ msgstr "Ramo"
+
+#~ msgid "Last modified by ${user} on ${date}"
+#~ msgstr "Ultima modifica di ${user} il ${date}"
+
+#, fuzzy
+#~ msgid "Jump to:"
+#~ msgstr "Mantieni fino a:"
+
+#~ msgid ""
+#~ "User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
+#~ "\">Search Wiki</a> </div>"
+#~ msgstr ""
+#~ "Utente: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
+#~ "\">Cerca Wiki</a> </div>"
+
+#, fuzzy
+#~ msgid "Current Subscriptions"
+#~ msgstr "Descrizione"
+
+#~ msgid "Enter new Users (separate by 'Return')"
+#~ msgstr "Inserisci i nuovi utenti (separati da un 'a capo')"
+
+#~ msgid "Wiki Search"
+#~ msgstr "Cerca Wiki"
+
+#~ msgid "Wiki Table of Contents"
+#~ msgstr "Indice del Wiki"
+
+#, fuzzy
+#~ msgid "Previous Source Text"
+#~ msgstr "Campo Sorgente di Testo"
+
+#, fuzzy
+#~ msgid "Previous source text of the Wiki Page."
+#~ msgstr "Sorgente della pagina DTML"
+
+#, fuzzy
+#~ msgid "Comment Title"
+#~ msgstr "Linea di comando"
+
+#, fuzzy
+#~ msgid "Renderable source text of the Wiki Page."
+#~ msgstr "Sorgente della pagina DTML"
+
+#~ msgid "Wiki Page Parents"
+#~ msgstr "Genitori delle Pagine Wiki"
+
+#, fuzzy
+#~ msgid "Parents of a Wiki"
+#~ msgstr "Genitori di un Wiki"
+
+#, fuzzy
+#~ msgid "Parent Name"
+#~ msgstr "Nome dell'argomento"
+
+#, fuzzy
+#~ msgid "Name of the parent wiki page."
+#~ msgstr "Torna alla pagina principale."
+
+#~ msgid "You are not allowed to access ${name} in this context"
+#~ msgstr "Non sei autorizzato ad accedere ${name} in questo contesto"
+
+#~ msgid "a particular ${object}"
+#~ msgstr "un particolare ${object}"
+
+#~ msgid ""
 #~ "Dynamic content expressed using the Document Template Markup Language "
 #~ "(DTML)"
 #~ msgstr "Contenuto dinamico realizzato con il DTML"
@@ -5617,4 +5637,3 @@
 
 #~ msgid "title=${title}; url=${url}; score=${score}"
 #~ msgstr "titolo=${title}; url=${url}; punteggio=${score}"
-

Modified: Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po	2004-07-19 13:39:42 UTC (rev 26625)
+++ Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po	2004-07-19 13:40:28 UTC (rev 26626)
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Zope X3 Pre-M4\n"
-"POT-Creation-Date: Fri Jun 18 17:40:55 2004\n"
+"POT-Creation-Date: Mon Jul 19 17:08:59 2004\n"
 "PO-Revision-Date: 2003-08-07 18:51-0300\n"
 "Last-Translator: Sidnei da Silva <sidnei at plone.org>\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
@@ -13,25 +13,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Zope 3 0.1\n"
 
-#: src/zope/app/adapter/adapter.py:283
+#: src/zope/app/adapter/adapter.py:285
 #: src/zope/app/presentation/pagefolder.py:54
 #: src/zope/app/presentation/presentation.py:290
 msgid "For interface"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:284
+#: src/zope/app/adapter/adapter.py:286
 msgid "The interface of the objects being adapted"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:289 src/zope/app/utility/interfaces.py:48
+#: src/zope/app/adapter/adapter.py:291 src/zope/app/utility/interfaces.py:48
 msgid "Provided interface"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:290
+#: src/zope/app/adapter/adapter.py:292
 msgid "The interface provided"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:296 src/zope/app/site/interfaces.py:162
+#: src/zope/app/adapter/adapter.py:298 src/zope/app/site/interfaces.py:162
 #: src/zope/app/site/browser/tool.pt:40
 #: src/zope/app/schema/browser/schema_edit.pt:36
 #: src/zope/app/workflow/browser/instancecontainer_index.pt:19
@@ -41,15 +41,15 @@
 msgid "Name"
 msgstr "Nome"
 
-#: src/zope/app/adapter/adapter.py:302
+#: src/zope/app/adapter/adapter.py:304
 msgid "The dotted name of a factory for creating the adapter"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:308
+#: src/zope/app/adapter/adapter.py:310
 msgid "The permission required for use"
 msgstr ""
 
-#: src/zope/app/adapter/adapter.py:315
+#: src/zope/app/adapter/adapter.py:317
 msgid "Factory to be called to construct the component"
 msgstr ""
 
@@ -115,21 +115,25 @@
 msgid "Zope 3 API Docs"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/__init__.py:511
-#: src/zope/app/apidoc/ifacemodule/index.pt:264
+#: src/zope/app/apidoc/classmodule/__init__.py:545
+#: src/zope/app/apidoc/ifacemodule/index.pt:265
 msgid "Classes"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/__init__.py:549
+#: src/zope/app/apidoc/classmodule/__init__.py:583
 msgid "Zope 3 root."
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/browser.py:410
-#: src/zope/app/rotterdam/template.pt:104
+#: src/zope/app/apidoc/classmodule/browser.py:675
+#: src/zope/app/rotterdam/template.pt:102
 msgid "[top]"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:140
+#: src/zope/app/apidoc/classmodule/class_index.pt:102
+msgid "There are no attributes in this class."
+msgstr ""
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:144
 msgid "There are no methods in this class."
 msgstr ""
 
@@ -138,39 +142,51 @@
 msgid "Bases"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:30
+#: src/zope/app/apidoc/classmodule/class_index.pt:34
 #: src/zope/app/apidoc/ifacemodule/index.pt:40
 msgid "There are no base classes."
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:35
+#: src/zope/app/apidoc/classmodule/class_index.pt:39
 msgid "Implemented Interfaces"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:50
+#: src/zope/app/apidoc/classmodule/class_index.pt:54
 #, fuzzy
 msgid "There are no implemented interfaces."
 msgstr "Use 'atualizar' ou entre com mais interfaces"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:56
+#: src/zope/app/apidoc/classmodule/class_index.pt:60
 msgid "Attributes/Properties"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:89
-#: src/zope/app/apidoc/classmodule/class_index.pt:131
+#: src/zope/app/apidoc/classmodule/class_index.pt:73
+#: src/zope/app/apidoc/classmodule/function_index.pt:40
+#: src/zope/app/apidoc/classmodule/function_index.pt:44
+msgid "type:"
+msgstr ""
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:79
+#: src/zope/app/apidoc/classmodule/function_index.pt:51
+msgid "Value:"
+msgstr ""
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:91
+#: src/zope/app/apidoc/classmodule/class_index.pt:133
+msgid "Permissions:"
+msgstr ""
+
+#: src/zope/app/apidoc/classmodule/class_index.pt:93
+#: src/zope/app/apidoc/classmodule/class_index.pt:135
 #, fuzzy
 msgid "(read)"
 msgstr "Criado"
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:91
-#: src/zope/app/apidoc/classmodule/class_index.pt:133
+#: src/zope/app/apidoc/classmodule/class_index.pt:95
+#: src/zope/app/apidoc/classmodule/class_index.pt:137
 msgid "(write)"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/class_index.pt:98
-msgid "There are no attributes in this class."
-msgstr ""
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:18
 msgid "Documentation String"
 msgstr ""
@@ -179,17 +195,6 @@
 msgid "Attributes"
 msgstr ""
 
-#: src/zope/app/apidoc/classmodule/function_index.pt:40
-#: src/zope/app/apidoc/classmodule/function_index.pt:44
-#: src/zope/app/apidoc/classmodule/class_index.pt:69
-msgid "type:"
-msgstr ""
-
-#: src/zope/app/apidoc/classmodule/function_index.pt:51
-#: src/zope/app/apidoc/classmodule/class_index.pt:75
-msgid "Value:"
-msgstr ""
-
 #: src/zope/app/apidoc/classmodule/function_index.pt:9
 msgid "Signature"
 msgstr ""
@@ -215,89 +220,89 @@
 msgid "Zope 3 Class Browser"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/__init__.py:73
+#: src/zope/app/apidoc/ifacemodule/__init__.py:75
 msgid "Interfaces"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:158
+#: src/zope/app/apidoc/ifacemodule/browser.py:199
 msgid "required"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/browser.py:160
+#: src/zope/app/apidoc/ifacemodule/browser.py:201
 msgid "optional"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:100
+#: src/zope/app/apidoc/ifacemodule/index.pt:101
 msgid "There are no methods specified."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:107
+#: src/zope/app/apidoc/ifacemodule/index.pt:108
 msgid "Adapters"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:113
+#: src/zope/app/apidoc/ifacemodule/index.pt:114
 msgid "Adapters where this interface is required:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:126
-#: src/zope/app/apidoc/ifacemodule/index.pt:167
+#: src/zope/app/apidoc/ifacemodule/index.pt:127
+#: src/zope/app/apidoc/ifacemodule/index.pt:168
 #, fuzzy
 msgid "name:"
 msgstr "Nome"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:131
+#: src/zope/app/apidoc/ifacemodule/index.pt:132
 msgid "provides:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:137
+#: src/zope/app/apidoc/ifacemodule/index.pt:138
 msgid "also required:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:154
+#: src/zope/app/apidoc/ifacemodule/index.pt:155
 msgid "Adapters that provide this interface:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:171
+#: src/zope/app/apidoc/ifacemodule/index.pt:172
 msgid "requires:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:178
+#: src/zope/app/apidoc/ifacemodule/index.pt:179
 msgid "No interface required."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:189
+#: src/zope/app/apidoc/ifacemodule/index.pt:190
 msgid "There are no adapters registered for this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:199
+#: src/zope/app/apidoc/ifacemodule/index.pt:200
 #, fuzzy
 msgid "Other Information"
 msgstr "InformaÃ§Ãµes de tempo de execuÃ§Ã£o"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:204
+#: src/zope/app/apidoc/ifacemodule/index.pt:205
 #, fuzzy
 msgid "Factories"
 msgstr "Entradas"
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:206
+#: src/zope/app/apidoc/ifacemodule/index.pt:207
 msgid "A list of factories that create objects implement this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:224
+#: src/zope/app/apidoc/ifacemodule/index.pt:225
 msgid "A list of utilities that are are registered to provide this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:235
+#: src/zope/app/apidoc/ifacemodule/index.pt:236
 msgid "Class:"
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:249
+#: src/zope/app/apidoc/ifacemodule/index.pt:250
 msgid ""
 "A list of services (usually just one) that are are registered to provide "
 "this interface."
 msgstr ""
 
-#: src/zope/app/apidoc/ifacemodule/index.pt:266
+#: src/zope/app/apidoc/ifacemodule/index.pt:267
 msgid ""
 "A list of classes that implement this interface. This might duplicate the "
 "entries in Utilities and Services."
@@ -309,15 +314,15 @@
 "Service."
 msgstr ""
 
-#: src/zope/app/apidoc/servicemodule/__init__.py:73
+#: src/zope/app/apidoc/servicemodule/__init__.py:75
 #: src/zope/app/site/browser/configure.zcml:87
-#: src/zope/app/zopetop/widget_macros.pt:34
+#: src/zope/app/zopetop/widget_macros.pt:54
 msgid "Services"
 msgstr ""
 
 #: src/zope/app/apidoc/servicemodule/index.pt:17
-#: src/zope/app/apidoc/classmodule/class_index.pt:79
-#: src/zope/app/apidoc/classmodule/class_index.pt:120
+#: src/zope/app/apidoc/classmodule/class_index.pt:83
+#: src/zope/app/apidoc/classmodule/class_index.pt:124
 msgid "Interface:"
 msgstr ""
 
@@ -329,14 +334,14 @@
 
 #: src/zope/app/apidoc/servicemodule/index.pt:55
 #: src/zope/app/apidoc/utilitymodule/index.pt:61
-#: src/zope/app/apidoc/ifacemodule/index.pt:77
+#: src/zope/app/apidoc/ifacemodule/index.pt:78
 msgid "There are no attributes or fields specified."
 msgstr ""
 
 #: src/zope/app/apidoc/servicemodule/index.pt:62
 #: src/zope/app/apidoc/utilitymodule/index.pt:68
-#: src/zope/app/apidoc/classmodule/class_index.pt:104
-#: src/zope/app/apidoc/ifacemodule/index.pt:84
+#: src/zope/app/apidoc/classmodule/class_index.pt:108
+#: src/zope/app/apidoc/ifacemodule/index.pt:85
 msgid "Methods"
 msgstr ""
 
@@ -353,14 +358,14 @@
 msgid "This is a list of all available services by name."
 msgstr ""
 
-#: src/zope/app/apidoc/utilities.py:254 src/zope/app/apidoc/utilities.py:256
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:55
+#: src/zope/app/apidoc/utilities.py:233 src/zope/app/apidoc/utilities.py:235
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:58
 msgid "n/a"
 msgstr ""
 
-#: src/zope/app/apidoc/utilitymodule/__init__.py:132
+#: src/zope/app/apidoc/utilitymodule/__init__.py:129
 #: src/zope/app/utility/browser/configure.zcml:31
-#: src/zope/app/apidoc/ifacemodule/index.pt:222
+#: src/zope/app/apidoc/ifacemodule/index.pt:223
 msgid "Utilities"
 msgstr ""
 
@@ -374,12 +379,12 @@
 msgid "(Attribute)"
 msgstr ""
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:200
-#: src/zope/app/apidoc/viewmodule/__init__.py:262
+#: src/zope/app/apidoc/viewmodule/__init__.py:201
+#: src/zope/app/apidoc/viewmodule/__init__.py:263
 msgid "$file (line $line)"
 msgstr ""
 
-#: src/zope/app/apidoc/viewmodule/__init__.py:64
+#: src/zope/app/apidoc/viewmodule/__init__.py:65
 #, fuzzy
 msgid "Presentations"
 msgstr "Limpar"
@@ -413,12 +418,10 @@
 msgstr ""
 
 #: src/zope/app/apidoc/viewmodule/index.pt:77
-#: src/zope/app/apidoc/classmodule/class_index.pt:87
-#: src/zope/app/apidoc/classmodule/class_index.pt:129
-msgid "Permissions:"
+msgid "Permission:"
 msgstr ""
 
-#: src/zope/app/apidoc/viewmodule/index.pt:90
+#: src/zope/app/apidoc/viewmodule/index.pt:89
 msgid "There are no views for this interface and presentation type."
 msgstr ""
 
@@ -459,7 +462,7 @@
 "which the skin or layer was declared."
 msgstr ""
 
-#: src/zope/app/apidoc/zcmlmodule/__init__.py:190
+#: src/zope/app/apidoc/zcmlmodule/__init__.py:192
 msgid "ZCML Reference"
 msgstr ""
 
@@ -487,7 +490,7 @@
 msgstr ""
 
 #: src/zope/app/apidoc/zcmlmodule/index.pt:68
-#: src/zope/app/apidoc/ifacemodule/index.pt:69
+#: src/zope/app/apidoc/ifacemodule/index.pt:70
 msgid "default"
 msgstr ""
 
@@ -568,11 +571,11 @@
 msgid "Python path"
 msgstr "Caminho do Python"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:44
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:47
 msgid "${days} day(s) ${hours}:${minutes}:${seconds}"
 msgstr "${days} dia(s) ${hours}:${minutes}:{seconds}"
 
-#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:65
+#: src/zope/app/applicationcontrol/browser/runtimeinfo.py:68
 #, fuzzy
 msgid "Could not retrieve runtime information."
 msgstr "InformaÃ§Ãµes de tempo de execuÃ§Ã£o do Zope"
@@ -603,11 +606,11 @@
 msgid "Shutdown time:"
 msgstr "Desligar servidor"
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:32
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:34
 msgid "You restarted the server."
 msgstr "VocÃª reiniciou o servidor."
 
-#: src/zope/app/applicationcontrol/browser/servercontrol.py:35
+#: src/zope/app/applicationcontrol/browser/servercontrol.py:37
 msgid "You shut down the server."
 msgstr "VocÃª desligou o servidor."
 
@@ -624,7 +627,7 @@
 msgid "reload-button"
 msgstr "Upload"
 
-#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:49
+#: src/zope/app/applicationcontrol/browser/translationdomaincontrol.py:51
 msgid "Message Catalog successfully reloaded."
 msgstr ""
 
@@ -653,20 +656,20 @@
 msgid "Name of database: ${name}"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:31
-#: src/zope/app/size/__init__.py:52
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:33
+#: src/zope/app/size/__init__.py:50
 msgid "${size} MB"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:34
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:36
 msgid "${size} kB"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:37
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:39
 msgid "${size} Bytes"
 msgstr ""
 
-#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:50
+#: src/zope/app/applicationcontrol/browser/zodbcontrol.py:52
 msgid "ZODB successfully packed."
 msgstr ""
 
@@ -678,15 +681,15 @@
 msgid "Broken object"
 msgstr ""
 
-#: src/zope/app/bundle/browser/__init__.py:112
+#: src/zope/app/bundle/browser/__init__.py:114
 msgid "Activated: ${activated}.\n"
 msgstr ""
 
-#: src/zope/app/bundle/browser/__init__.py:115
+#: src/zope/app/bundle/browser/__init__.py:117
 msgid "Registered: ${registered}.\n"
 msgstr ""
 
-#: src/zope/app/bundle/browser/__init__.py:85
+#: src/zope/app/bundle/browser/__init__.py:87
 msgid "unregistered ${count} registrations"
 msgstr ""
 
@@ -784,17 +787,17 @@
 msgid "Bundle"
 msgstr ""
 
-#: src/zope/app/cache/browser/cacheable.py:57
+#: src/zope/app/cache/browser/cacheable.py:63
 #, fuzzy
 msgid "cache-invalidated"
 msgstr "Invalidado."
 
-#: src/zope/app/cache/browser/cacheable.py:59
+#: src/zope/app/cache/browser/cacheable.py:65
 #, fuzzy
 msgid "no-cache-associated"
 msgstr "Nenhum cache estÃ¡ associado a esse objeto."
 
-#: src/zope/app/cache/browser/cacheable.py:71
+#: src/zope/app/cache/browser/cacheable.py:77
 msgid "Saved changes."
 msgstr "ModificaÃ§Ãµes salvas."
 
@@ -818,6 +821,28 @@
 msgid "Currently there is no cache associated with the object."
 msgstr "Atualmente nÃ£o hÃ¡ nenhum cache associado a esse objeto."
 
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "RAM Cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:12
+msgid "A RAM cache is a volatile (in memory) cache"
+msgstr ""
+
+#: src/zope/app/cache/browser/configure.zcml:26
+#, fuzzy
+msgid "Statistics"
+msgstr "EstatÃsticas"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+#, fuzzy
+msgid "Caches"
+msgstr "Nome do Cache"
+
+#: src/zope/app/cache/browser/configure.zcml:6
+msgid "Caches can be used to make your site run faster."
+msgstr ""
+
 #: src/zope/app/cache/browser/ramedit.pt:20
 msgid "Maximum cached entries"
 msgstr "MÃ¡ximo nÃºmero de entradas no cache"
@@ -834,6 +859,12 @@
 msgid "You can configure the RAM Cache here."
 msgstr "VocÃª pode configurar um RAM Cache aqui."
 
+#: src/zope/app/cache/browser/ramedit.pt:53
+#: src/zope/app/site/browser/add_svc_config.pt:35
+#: src/zope/app/bundle/browser/bundle.pt:130
+msgid "reset-button"
+msgstr "Limpar"
+
 #: src/zope/app/cache/browser/ramstats.pt:20
 msgid "Path"
 msgstr "Caminho"
@@ -859,7 +890,7 @@
 msgid "RAMCache statistics"
 msgstr "EstatÃsticas"
 
-#: src/zope/app/container/browser/adding.py:117
+#: src/zope/app/container/browser/adding.py:119
 msgid "You must select the type of object to add."
 msgstr "VocÃª precisa selecionar um objeto para adicionar."
 
@@ -891,23 +922,23 @@
 msgid "container-cancel-button"
 msgstr "Cancelar"
 
-#: src/zope/app/container/browser/contents.py:232
+#: src/zope/app/container/browser/contents.py:233
 msgid "You didn't specify any ids to remove."
 msgstr "VocÃª nÃ£o especificou nenhum id para ser excluÃdo."
 
-#: src/zope/app/container/browser/contents.py:244
+#: src/zope/app/container/browser/contents.py:245
 msgid "You didn't specify any ids to copy."
 msgstr "VocÃª nÃ£o especificou nenhum id para copiar."
 
-#: src/zope/app/container/browser/contents.py:264
+#: src/zope/app/container/browser/contents.py:265
 msgid "You didn't specify any ids to cut."
 msgstr "VocÃª nÃ£o especificou nenhum id para recortar."
 
-#: src/zope/app/container/browser/contents.py:61
+#: src/zope/app/container/browser/contents.py:62
 msgid "You didn't specify any ids to rename."
 msgstr "VocÃª nÃ£o especificou nenhum id para renomear."
 
-#: src/zope/app/container/browser/metaconfigure.py:63
+#: src/zope/app/container/browser/metaconfigure.py:65
 #: src/zope/app/folder/browser/configure.zcml:20
 #: src/zope/app/site/browser/configure.zcml:19
 #: src/zope/app/bundle/browser/configure.zcml:11
@@ -916,7 +947,7 @@
 msgid "Contents"
 msgstr "ConteÃºdo"
 
-#: src/zope/app/container/browser/metaconfigure.py:71
+#: src/zope/app/container/browser/metaconfigure.py:73
 #: src/zope/app/schema/browser/configure.zcml:15
 #: src/zope/app/container/browser/configure.zcml:5
 #: src/zope/app/registration/browser/configure.zcml:42
@@ -926,19 +957,19 @@
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/zope/app/container/constraints.py:185
+#: src/zope/app/container/constraints.py:186
 msgid "Container is not a valid Zope container."
 msgstr ""
 
-#: src/zope/app/container/contained.py:688
+#: src/zope/app/container/contained.py:690
 msgid "An empty name was provided. Names cannot be empty."
 msgstr ""
 
-#: src/zope/app/container/contained.py:698
+#: src/zope/app/container/contained.py:700
 msgid "Names cannot begin with '+' or '@' or contain '/'"
 msgstr ""
 
-#: src/zope/app/container/contained.py:703
+#: src/zope/app/container/contained.py:705
 msgid "The given name is already being used"
 msgstr ""
 
@@ -959,7 +990,6 @@
 msgstr ""
 
 #: src/zope/app/debugskin/unauthorized.pt:7
-#: src/zope/app/exception/browser/unauthorized.pt:8
 msgid "Unauthorized"
 msgstr ""
 
@@ -1007,27 +1037,27 @@
 msgid "A simple, content-based DTML page"
 msgstr ""
 
-#: src/zope/app/dtmlpage/interfaces.py:31
+#: src/zope/app/dtmlpage/interfaces.py:32
 #: src/zope/app/pythonpage/__init__.py:39
-#: src/zope/app/sqlscript/interfaces.py:44
+#: src/zope/app/sqlscript/interfaces.py:45
 #: src/zope/app/zptpage/interfaces.py:36
 msgid "Source"
 msgstr ""
 
-#: src/zope/app/dtmlpage/interfaces.py:32
+#: src/zope/app/dtmlpage/interfaces.py:33
 msgid "The source of the dtml page."
 msgstr ""
 
 #: src/zope/app/dublincore/browser/configure.zcml:10
-#: src/zope/app/zopetop/widget_macros.pt:166
+#: src/zope/app/zopetop/widget_macros.pt:186
 msgid "Metadata"
 msgstr ""
 
-#: src/zope/app/dublincore/browser/edit.pt:43
+#: src/zope/app/dublincore/browser/edit.pt:45
 msgid "Content Last Modified"
 msgstr ""
 
-#: src/zope/app/dublincore/browser/edit.pt:47
+#: src/zope/app/dublincore/browser/edit.pt:49
 msgid "Creator"
 msgstr ""
 
@@ -1171,6 +1201,10 @@
 msgid "The page that you are trying to access is not available"
 msgstr ""
 
+#: src/zope/app/exception/browser/unauthorized.pt:10
+msgid "You are not authorized"
+msgstr ""
+
 #: src/zope/app/file/browser/configure.zcml:109
 #, fuzzy
 msgid "Add a Image"
@@ -1230,7 +1264,7 @@
 msgid "Image"
 msgstr ""
 
-#: src/zope/app/file/image.py:73
+#: src/zope/app/file/image.py:72
 msgid " ${width}x${height}"
 msgstr ""
 
@@ -1274,13 +1308,12 @@
 msgstr ""
 
 #: src/zope/app/form/browser/add.pt:55
-#: src/zope/app/wiki/browser/wiki_add.pt:34
 #, fuzzy
 msgid "Object Name"
 msgstr "Nome"
 
-#: src/zope/app/form/browser/add.py:61
-#: src/zope/app/form/browser/editview.py:109
+#: src/zope/app/form/browser/add.py:60
+#: src/zope/app/form/browser/editview.py:108
 #: src/zope/app/schema/browser/__init__.py:53
 #: src/zope/app/schema/browser/__init__.py:64
 #: src/zope/app/schema/browser/__init__.py:70
@@ -1359,12 +1392,11 @@
 #: src/zope/app/publisher/interfaces/browser.py:44
 #: src/zope/app/publisher/interfaces/browser.py:87
 #: src/zope/app/security/interfaces/__init__.py:44
-#: src/zope/app/security/interfaces/__init__.py:197
-#: src/zope/app/wiki/interfaces.py:39 src/zope/schema/interfaces.py:100
-#: src/zope/schema/interfaces.py:484
-#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/security/interfaces/__init__.py:189
+#: src/zope/schema/interfaces.py:100 src/zope/schema/interfaces.py:484
 #: src/zope/app/menu/browser/menu_contents.pt:31
-#: src/zope/app/dublincore/browser/edit.pt:14
+#: src/zope/app/site/browser/interfacebrowse.pt:11
+#: src/zope/app/dublincore/browser/edit.pt:16
 #: src/zope/app/schema/browser/schema_edit.pt:38
 #: src/zope/app/container/browser/contents.pt:33
 #: src/zope/app/container/browser/index.pt:27
@@ -1379,25 +1411,25 @@
 msgid "widget-missing-multiple-value"
 msgstr ""
 
-#: src/zope/app/form/browser/editview.py:118
+#: src/zope/app/form/browser/editview.py:117
 msgid "Updated on ${date_time}"
 msgstr ""
 
-#: src/zope/app/form/browser/editwizard.pt:47
-#: src/zope/app/form/browser/addwizard.pt:55
+#: src/zope/app/form/browser/editwizard.pt:42
+#: src/zope/app/form/browser/addwizard.pt:63
 msgid "previous-button"
 msgstr ""
 
-#: src/zope/app/form/browser/editwizard.pt:53
-#: src/zope/app/form/browser/addwizard.pt:61
+#: src/zope/app/form/browser/editwizard.pt:48
+#: src/zope/app/form/browser/addwizard.pt:69
 msgid "next-button"
 msgstr ""
 
-#: src/zope/app/form/browser/editwizard.py:149
+#: src/zope/app/form/browser/editwizard.py:148
 msgid "No changes to save"
 msgstr ""
 
-#: src/zope/app/form/browser/editwizard.py:151
+#: src/zope/app/form/browser/editwizard.py:150
 msgid "Changes saved"
 msgstr ""
 
@@ -1409,21 +1441,21 @@
 msgid "vocabulary-missing-multiple-value-for-display"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:425
-#: src/zope/app/form/browser/itemswidgets.py:469
+#: src/zope/app/form/browser/itemswidgets.py:426
+#: src/zope/app/form/browser/itemswidgets.py:470
 msgid "vocabulary-missing-single-value-for-edit"
 msgstr ""
 
-#: src/zope/app/form/browser/itemswidgets.py:543
+#: src/zope/app/form/browser/itemswidgets.py:544
 msgid "vocabulary-missing-multiple-value-for-edit"
 msgstr ""
 
 # Default: "Remove selected items"
-#: src/zope/app/form/browser/sequencewidget.py:84
+#: src/zope/app/form/browser/sequencewidget.py:82
 msgid "remove-selected-items"
 msgstr ""
 
-#: src/zope/app/form/browser/sequencewidget.py:91
+#: src/zope/app/form/browser/sequencewidget.py:89
 #, fuzzy
 msgid "Add %s"
 msgstr "Adicionar"
@@ -1591,23 +1623,23 @@
 msgid "synchronize-button"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Up to Date"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "New Remote"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:30
+#: src/zope/app/i18n/browser/synchronize.py:32
 msgid "Out of Date"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Does not exist"
 msgstr ""
 
-#: src/zope/app/i18n/browser/synchronize.py:31
+#: src/zope/app/i18n/browser/synchronize.py:33
 msgid "Newer Local"
 msgstr ""
 
@@ -1695,7 +1727,6 @@
 #: src/zope/app/i18nfile/browser/file_edit.pt:68
 #: src/zope/app/i18nfile/browser/image_edit.pt:69
 #: src/zope/app/introspector/marker.pt:118
-#: src/zope/app/wiki/browser/subscriptions.pt:19
 #: src/zope/app/registration/browser/editregistration.pt:53
 msgid "remove-button"
 msgstr ""
@@ -1709,7 +1740,7 @@
 #: src/zope/app/i18nfile/browser/image_edit.pt:94
 #: src/zope/app/cache/browser/cacheableedit.pt:45
 #: src/zope/app/cache/browser/ramedit.pt:51
-#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/dublincore/browser/edit.pt:35
 #: src/zope/app/rdb/browser/rdbconnection.pt:28
 #: src/zope/app/errorservice/browser/error_config.pt:46
 #: src/zope/app/securitypolicy/browser/manage_roleform.pt:63
@@ -1717,18 +1748,18 @@
 msgid "save-changes-button"
 msgstr "Salvar ModificaÃ§Ãµes"
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:45
-#: src/zope/app/i18nfile/browser/i18nimage.py:27
+#: src/zope/app/i18nfile/browser/i18nfile.py:44
+#: src/zope/app/i18nfile/browser/i18nimage.py:29
 msgid "Edit Form"
 msgstr ""
 
-#: src/zope/app/i18nfile/browser/i18nfile.py:46
+#: src/zope/app/i18nfile/browser/i18nfile.py:45
 #, fuzzy
 msgid ""
 "This edit form allows you to make changes to the properties of this file."
 msgstr "Este formulÃ¡rio permite associar um cache a este objeto."
 
-#: src/zope/app/i18nfile/browser/i18nimage.py:28
+#: src/zope/app/i18nfile/browser/i18nimage.py:30
 msgid ""
 "This edit form allows you to make changes to the properties of this image."
 msgstr ""
@@ -1919,10 +1950,10 @@
 msgstr ""
 
 #: src/zope/app/menu/browser/menu_contents.pt:25
+#: src/zope/app/uniqueid/browser/registrations.pt:7
 #: src/zope/app/schema/browser/schema_edit.pt:30
 #: src/zope/app/container/browser/contents.pt:26
 #: src/zope/app/container/browser/index.pt:18
-#: src/zope/app/uniqueid/browser/registrations.pt:7
 msgid "Content listing"
 msgstr "Listagem de conteÃºdo"
 
@@ -1931,7 +1962,7 @@
 msgstr ""
 
 #: src/zope/app/menu/browser/menu_contents.pt:33
-#: src/zope/app/dublincore/browser/edit.pt:39
+#: src/zope/app/dublincore/browser/edit.pt:41
 #: src/zope/app/container/browser/contents.pt:35
 #: src/zope/app/container/browser/index.pt:28
 msgid "Created"
@@ -2075,7 +2106,7 @@
 msgstr ""
 
 #: src/zope/app/onlinehelp/browser/configure.zcml:30
-#: src/zope/app/zopetop/widget_macros.pt:215
+#: src/zope/app/zopetop/widget_macros.pt:235
 msgid "Help"
 msgstr ""
 
@@ -2112,7 +2143,7 @@
 
 #: src/zope/app/onlinehelp/interfaces.py:46
 #: src/zope/app/security/interfaces/__init__.py:38
-#: src/zope/app/security/interfaces/__init__.py:191
+#: src/zope/app/security/interfaces/__init__.py:183
 #: src/zope/app/workflow/stateful/browser/addtransition.pt:12
 #: src/zope/app/workflow/stateful/browser/addstate.pt:12
 msgid "Id"
@@ -2143,8 +2174,7 @@
 msgid "Help Topic"
 msgstr ""
 
-#: src/zope/app/onlinehelp/interfaces.py:64 src/zope/app/wiki/interfaces.py:45
-#: src/zope/app/wiki/interfaces.py:71
+#: src/zope/app/onlinehelp/interfaces.py:64
 msgid "Source Text"
 msgstr ""
 
@@ -2160,13 +2190,11 @@
 msgid "The Path to the Definition of a Help Topic"
 msgstr ""
 
-#: src/zope/app/onlinehelp/interfaces.py:77 src/zope/app/wiki/interfaces.py:51
-#: src/zope/app/wiki/interfaces.py:77
+#: src/zope/app/onlinehelp/interfaces.py:77
 msgid "Source Type"
 msgstr ""
 
-#: src/zope/app/onlinehelp/interfaces.py:78 src/zope/app/wiki/interfaces.py:52
-#: src/zope/app/wiki/interfaces.py:78
+#: src/zope/app/onlinehelp/interfaces.py:78
 msgid "Type of the source text, e.g. structured text"
 msgstr ""
 
@@ -2224,6 +2252,7 @@
 #: src/zope/app/schema/fieldforms.zcml:151
 #: src/zope/app/module/browser/configure.zcml:6
 #: src/zope/app/utility/browser/configure.zcml:85
+#: src/zope/app/cache/browser/configure.zcml:24
 #: src/zope/app/file/browser/configure.zcml:29
 #: src/zope/app/i18nfile/browser/configure.zcml:31
 #: src/zope/app/i18nfile/browser/configure.zcml:73
@@ -2231,12 +2260,11 @@
 #: src/zope/app/rdb/browser/configure.zcml:27
 #: src/zope/app/schemacontent/browser/configure.zcml:46
 #: src/zope/app/schemacontent/browser/configure.zcml:88
-#: src/zope/app/wiki/browser/configure.zcml:76
-#: src/zope/app/wiki/browser/configure.zcml:160
 #: src/zope/app/menu/browser/configure.zcml:71
 #: src/zope/app/menu/browser/configure.zcml:106
-#: src/zope/app/session/browser.zcml:25 src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:15 src/zope/app/session/browser.zcml:38
 #: src/zope/app/zptpage/browser/configure.zcml:39
+#: src/zwiki/browser/configure.zcml:76 src/zwiki/browser/configure.zcml:160
 #: src/zope/app/securitypolicy/browser/configure.zcml:25
 msgid "Edit"
 msgstr "Editar"
@@ -2347,7 +2375,7 @@
 msgid "${view_name} ${ptype} View for ${iface_name} in layer ${layer}"
 msgstr ""
 
-#: src/zope/app/presentation/presentation.py:273
+#: src/zope/app/presentation/presentation.py:274
 msgid "Registered by ZCML"
 msgstr ""
 
@@ -2704,7 +2732,7 @@
 "specific function and is activated."
 msgstr ""
 
-#: src/zope/app/registration/configure.zcml:23
+#: src/zope/app/registration/configure.zcml:38
 #: src/zope/app/registration/browser/editregistration.pt:10
 msgid "Registration Manager"
 msgstr ""
@@ -2765,7 +2793,7 @@
 msgstr ""
 
 #: src/zope/app/rotterdam/dialog_macros.pt:135
-#: src/zope/app/rotterdam/template.pt:208
+#: src/zope/app/rotterdam/template.pt:205
 msgid "Tip"
 msgstr ""
 
@@ -2777,7 +2805,7 @@
 msgid "Extended Editor"
 msgstr ""
 
-#: src/zope/app/rotterdam/template.pt:102
+#: src/zope/app/rotterdam/template.pt:100
 msgid "Location:&nbsp;"
 msgstr ""
 
@@ -2785,11 +2813,11 @@
 msgid "[Logout]"
 msgstr ""
 
-#: src/zope/app/rotterdam/template.pt:56
+#: src/zope/app/rotterdam/template.pt:55
 msgid "[Login]"
 msgstr ""
 
-#: src/zope/app/rotterdam/template.pt:77
+#: src/zope/app/rotterdam/template.pt:75
 #, fuzzy
 msgid "Add:"
 msgstr "Adicionar"
@@ -3164,7 +3192,7 @@
 
 #: src/zope/app/security/browser/login_failed.pt:9
 msgid ""
-"You cancelled the login procedure. <a href=\"\"> Click here to return. </a>"
+"You cancelled the login procedure. <a href=\"\">Click here to return.</a>"
 msgstr ""
 
 #: src/zope/app/security/browser/logout.pt:5
@@ -3184,15 +3212,10 @@
 msgstr ""
 
 # Default: "Change security settings"
-#: src/zope/app/security/configure.zcml:53
+#: src/zope/app/security/configure.zcml:56
 msgid "change-security-settings-permission"
 msgstr ""
 
-# Default: "Manage Content"
-#: src/zope/app/security/configure.zcml:58
-msgid "manage-content-permission"
-msgstr ""
-
 #: src/zope/app/security/configure.zcml:6
 msgid ""
 "Special permission indicating unconditional access.                    "
@@ -3201,54 +3224,59 @@
 
 # Default: "View"
 #: src/zope/app/security/configure.zcml:6
-#: src/zope/app/security/configure.zcml:48
+#: src/zope/app/security/configure.zcml:51
 msgid "view-permission"
 msgstr ""
 
+# Default: "Manage Content"
+#: src/zope/app/security/configure.zcml:61
+msgid "manage-content-permission"
+msgstr ""
+
 # Default: "Manage Service Bindings"
-#: src/zope/app/security/configure.zcml:63
+#: src/zope/app/security/configure.zcml:66
 msgid "manage-service-bindings-permission"
 msgstr ""
 
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "Manage executable code, including Python, SQL, ZPT, etc."
 msgstr ""
 
 # Default: "Manage Code"
-#: src/zope/app/security/configure.zcml:68
+#: src/zope/app/security/configure.zcml:71
 msgid "manage-code-permission"
 msgstr ""
 
 # Default: "Manage Services"
-#: src/zope/app/security/configure.zcml:74
+#: src/zope/app/security/configure.zcml:77
 msgid "manage-services-permission"
 msgstr ""
 
 # Default: "Manage Principals"
-#: src/zope/app/security/configure.zcml:79
+#: src/zope/app/security/configure.zcml:82
 msgid "manage-principal-permission"
 msgstr ""
 
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid ""
 "Manage the Zope Application, such as Restart/Shutdown or                    "
 "packing the ZODB."
 msgstr ""
 
 # Default: "Manage Application"
-#: src/zope/app/security/configure.zcml:84
+#: src/zope/app/security/configure.zcml:87
 msgid "manage-application-permission"
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:192
+#: src/zope/app/security/interfaces/__init__.py:184
 msgid "Id as which this permission will be known and used."
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:198
+#: src/zope/app/security/interfaces/__init__.py:190
 msgid "Provides a title for the permission."
 msgstr ""
 
-#: src/zope/app/security/interfaces/__init__.py:203
+#: src/zope/app/security/interfaces/__init__.py:195
 msgid "Provides a description for the permission."
 msgstr ""
 
@@ -3261,11 +3289,11 @@
 msgstr ""
 
 #: src/zope/app/security/interfaces/__init__.py:50
-#: src/zope/app/security/interfaces/__init__.py:202
+#: src/zope/app/security/interfaces/__init__.py:194
 #: src/zope/schema/interfaces.py:107
 #: src/zope/app/site/browser/interfacedetail.pt:21
 #: src/zope/app/site/browser/interfacedetail.pt:48
-#: src/zope/app/dublincore/browser/edit.pt:22
+#: src/zope/app/dublincore/browser/edit.pt:24
 #: src/zope/app/introspector/marker.pt:63
 #: src/zope/app/introspector/introspector.pt:52
 #: src/zope/app/introspector/introspector.pt:155
@@ -3402,155 +3430,160 @@
 msgid "permission-deny"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "All users have this role implicitly"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:65
+#: src/zope/app/securitypolicy/configure.zcml:92
 msgid "Everybody"
 msgstr ""
 
-#: src/zope/app/securitypolicy/configure.zcml:67
+#: src/zope/app/securitypolicy/configure.zcml:94
 msgid "Site Manager"
 msgstr "Administrador"
 
-#: src/zope/app/securitypolicy/configure.zcml:68
+#: src/zope/app/securitypolicy/configure.zcml:95
 msgid "Site Member"
 msgstr "Membro"
 
-#: src/zope/app/session/browser.zcml:25
-msgid "Cookie Browser ID Manager Properties"
+#: src/zope/app/session/browser.zcml:15
+msgid "Cookie Client Id Manager Properties"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Stores session data persistently in the ZODB"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:33
+#: src/zope/app/session/browser.zcml:23
 msgid "Persistent Session Data Container"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "Stores session data in RAM"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:41
+#: src/zope/app/session/browser.zcml:31
 msgid "RAM Session Data Container"
 msgstr ""
 
-#: src/zope/app/session/browser.zcml:48
+#: src/zope/app/session/browser.zcml:38
 msgid "Session Data Container Properties"
 msgstr ""
 
 #: src/zope/app/session/browser.zcml:8
 msgid ""
-"Uses a cookie to uniquely identify a browser, allowing        state to be "
+"Uses a cookie to uniquely identify a client, allowing        state to be "
 "maintained between requests"
 msgstr ""
 
 #: src/zope/app/session/browser.zcml:8
-msgid "Cookie Browser Id Manager"
+msgid "Cookie Client Id Manager"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:100
-msgid "Timeout"
+#: src/zope/app/session/http.py:48
+msgid "Cookie Name"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:101
-msgid "Number of seconds before data becomes stale and may be removed"
+#: src/zope/app/session/http.py:49
+msgid ""
+"Name of cookie used to maintain state. Must be unique to the site domain "
+"name, and only contain ASCII letters, digits and '_'"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:109
-msgid "Purge Interval"
+#: src/zope/app/session/http.py:61
+msgid "Cookie Lifetime"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:110
+#: src/zope/app/session/http.py:62
 msgid ""
-"How often stale data is purged in seconds. Higer values improve performance."
+"Number of seconds until the browser expires the cookie. Leave blank expire "
+"the cookie when the browser is quit. Set to 0 to never expire. "
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:144
+#: src/zope/app/session/interfaces.py:125
 msgid "Last Access Time"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:145
+#: src/zope/app/session/interfaces.py:126
 msgid ""
 "Approximate epoch time this ISessionData was last retrieved from its "
 "ISessionDataContainer"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:53
-msgid "Cookie Name"
+#: src/zope/app/session/interfaces.py:66
+msgid "Timeout"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:54
+#: src/zope/app/session/interfaces.py:67
 msgid ""
-"Name of cookie used to maintain state. Must be unique to the site domain "
-"name, and only contain ASCII letters, digits and '_'"
+"Number of seconds before data becomes stale and may be removed. A value of "
+"'0' means no expiration."
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:66
-msgid "Cookie Lifetime"
+#: src/zope/app/session/interfaces.py:75
+msgid "Timeout resolution (in seconds)"
 msgstr ""
 
-#: src/zope/app/session/interfaces.py:67
+#: src/zope/app/session/interfaces.py:76
 msgid ""
-"Number of seconds until the browser expires the cookie. Leave blank expire "
-"the cookie when the browser is quit. Set to 0 to never expire. "
+"Defines what the 'resolution' of item timeout is. Setting this higher allows "
+"the transience machinery to do fewer 'writes' at the expense of  causing "
+"items to time out later than the 'Data object timeout value' by  a factor of "
+"(at most) this many seconds."
 msgstr ""
 
 #: src/zope/app/site/browser/__init__.py:108
 msgid "Add Service"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:145
+#: src/zope/app/site/browser/__init__.py:144
 #: src/zope/app/schema/browser/schema_add.pt:8
 msgid "Add Utility"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:236
+#: src/zope/app/site/browser/__init__.py:234
 msgid "Activated: ${activated_services}"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:240
+#: src/zope/app/site/browser/__init__.py:238
 msgid "All of the checked services were already active"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:251
+#: src/zope/app/site/browser/__init__.py:249
 msgid "Deactivated: ${deactivated_services}"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:255
+#: src/zope/app/site/browser/__init__.py:253
 msgid "None of the checked services were active"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:266
+#: src/zope/app/site/browser/__init__.py:264
 msgid ""
 "Can't delete active service(s): ${service_names}; use the Deactivate button "
 "to deactivate"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:300
+#: src/zope/app/site/browser/__init__.py:298
 msgid "Deleted: ${service_names}"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:335
+#: src/zope/app/site/browser/__init__.py:333
 msgid "global"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:416
+#: src/zope/app/site/browser/__init__.py:414
 msgid "Invalid service type specified"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:423
+#: src/zope/app/site/browser/__init__.py:421
 msgid "No change"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:427
+#: src/zope/app/site/browser/__init__.py:425
 msgid "Service deactivated"
 msgstr ""
 
-#: src/zope/app/site/browser/__init__.py:430
+#: src/zope/app/site/browser/__init__.py:428
 msgid "${active_services} activated"
 msgstr ""
 
@@ -3564,12 +3597,6 @@
 msgid "Service name"
 msgstr ""
 
-#: src/zope/app/site/browser/add_svc_config.pt:35
-#: src/zope/app/cache/browser/ramedit.pt:53
-#: src/zope/app/bundle/browser/bundle.pt:130
-msgid "reset-button"
-msgstr "Limpar"
-
 #: src/zope/app/site/browser/add_svc_config.pt:7
 msgid "Register this object to provide the following service(s):"
 msgstr ""
@@ -3605,7 +3632,7 @@
 
 #: src/zope/app/site/browser/configure.zcml:210
 #: src/zope/app/site/browser/serviceactivation.pt:26
-#: src/zope/app/apidoc/ifacemodule/index.pt:247
+#: src/zope/app/apidoc/ifacemodule/index.pt:248
 msgid "Service"
 msgstr ""
 
@@ -3708,19 +3735,13 @@
 #: src/zope/app/zptpage/browser/inlinecode.pt:65
 #: src/zope/app/workflow/stateful/browser/instance_manage.pt:76
 #: src/zope/app/pythonpage/edit.pt:71
-#: src/zope/app/form/browser/editwizard.pt:50
-#: src/zope/app/form/browser/addwizard.pt:58
+#: src/zope/app/form/browser/editwizard.pt:45
+#: src/zope/app/form/browser/addwizard.pt:66
 #: src/zope/app/form/browser/edit.pt:52
 #: src/zope/app/registration/browser/editregistration.pt:51
 msgid "submit-button"
 msgstr ""
 
-#: src/zope/app/site/browser/services.pt:15
-#: src/zope/app/utility/browser/utilities.pt:11
-#: src/zope/app/bundle/browser/bundle.pt:53
-msgid "(click to clear message)"
-msgstr ""
-
 #: src/zope/app/site/browser/services.pt:18
 msgid "No services are registered."
 msgstr ""
@@ -3756,23 +3777,18 @@
 msgstr ""
 
 # Default: "Configure services"
-#: src/zope/app/site/browser/tasks.pt:30
+#: src/zope/app/site/browser/tasks.pt:30 src/zope/app/site/browser/tasks.pt:35
 msgid "label-configure-services"
 msgstr ""
 
 # Default: "Configure utilities"
-#: src/zope/app/site/browser/tasks.pt:36
+#: src/zope/app/site/browser/tasks.pt:41
 msgid "label-configure-utilities"
 msgstr ""
 
-# Default: "Add a service"
-#: src/zope/app/site/browser/tasks.pt:43
-msgid "label-add-service"
-msgstr ""
-
-# Default: "Add a utility"
+# Default: "Software"
 #: src/zope/app/site/browser/tasks.pt:49
-msgid "label-add-utility"
+msgid "label-software"
 msgstr ""
 
 # Default: "Common Site Management Tasks"
@@ -3780,12 +3796,7 @@
 msgid "heading-common-site-management-tasks"
 msgstr ""
 
-# Default: "Software"
-#: src/zope/app/site/browser/tasks.pt:56
-msgid "label-software"
-msgstr ""
-
-#: src/zope/app/site/browser/tasks.pt:59
+#: src/zope/app/site/browser/tasks.pt:52
 msgid ""
 "The site may customize the behavior of existing software or define its own. "
 "The first step in creating a new software package is to create a new Site "
@@ -3793,12 +3804,12 @@
 msgstr ""
 
 # Default: "Customize the behavior of existing software"
-#: src/zope/app/site/browser/tasks.pt:68
+#: src/zope/app/site/browser/tasks.pt:61
 msgid "label-customize-existing-software"
 msgstr ""
 
 # Default: "Create a new Site Management Folder"
-#: src/zope/app/site/browser/tasks.pt:75
+#: src/zope/app/site/browser/tasks.pt:68
 msgid "label-create-new-site-management-folder"
 msgstr ""
 
@@ -3813,24 +3824,6 @@
 msgid "rename-button"
 msgstr "Limpar"
 
-#: src/zope/app/site/browser/tool.pt:106
-#: src/zope/app/site/browser/services.pt:74
-#: src/zope/app/utility/browser/utilities.pt:50
-#: src/zope/app/zptpage/browser/inlinecode.pt:63
-#: src/zope/app/dublincore/browser/edit.pt:31
-#: src/zope/app/schemacontent/browser/permission_edit.pt:33
-#: src/zope/app/errorservice/browser/error.pt:52
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
-#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
-#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
-#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
-#: src/zope/app/form/browser/edit.pt:50
-#: src/zope/app/wiki/browser/subscriptions.pt:35
-#: src/zope/app/wiki/browser/wiki_add.pt:29
-#: src/zope/app/registration/browser/editregistration.pt:49
-msgid "refresh-button"
-msgstr ""
-
 #: src/zope/app/site/browser/tool.pt:110
 #: src/zope/app/securitypolicy/browser/principal_role_association.pt:98
 msgid "apply-button"
@@ -3862,21 +3855,6 @@
 msgid "disabled"
 msgstr ""
 
-#: src/zope/app/site/browser/tool.pt:91
-#: src/zope/app/site/browser/services.pt:66
-#: src/zope/app/site/browser/add_svc_config.pt:16
-#: src/zope/app/utility/browser/utilities.pt:42
-#: src/zope/app/registration/browser/registration.pt:30
-msgid "activate-button"
-msgstr ""
-
-#: src/zope/app/site/browser/tool.pt:93
-#: src/zope/app/site/browser/services.pt:68
-#: src/zope/app/utility/browser/utilities.pt:44
-#: src/zope/app/registration/browser/registration.pt:25
-msgid "deactivate-button"
-msgstr ""
-
 #: src/zope/app/site/browser/tool.pt:96
 #: src/zope/app/schema/browser/schema_add.pt:39
 #: src/zope/app/workflow/stateful/browser/add.pt:65
@@ -3885,40 +3863,30 @@
 #: src/zope/app/i18n/browser/translate.pt:48
 #: src/zope/app/container/browser/add.pt:38
 #: src/zope/app/introspector/marker.pt:133 src/zope/app/form/browser/add.pt:52
-#: src/zope/app/wiki/browser/subscriptions.pt:37
-#: src/zope/app/wiki/browser/wiki_add.pt:31
 msgid "add-button"
 msgstr ""
 
-#: src/zope/app/site/browser/tool.pt:99
-#: src/zope/app/site/browser/services.pt:71
-#: src/zope/app/utility/browser/utilities.pt:47
-#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
-#: src/zope/app/i18n/browser/translate.pt:37
-msgid "delete-button"
-msgstr ""
-
 #: src/zope/app/site/browser/tools.pt:5
 msgid "Available Tools"
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:159
-#: src/zope/app/site/browser/tools.py:303
+#: src/zope/app/site/browser/tools.py:160
+#: src/zope/app/site/browser/tools.py:304
 msgid "Deleted selected tools."
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:162
-#: src/zope/app/site/browser/tools.py:308
+#: src/zope/app/site/browser/tools.py:163
+#: src/zope/app/site/browser/tools.py:309
 msgid "Renamed selected tools."
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:167
-#: src/zope/app/site/browser/tools.py:313
+#: src/zope/app/site/browser/tools.py:168
+#: src/zope/app/site/browser/tools.py:314
 msgid "Activated registrations."
 msgstr ""
 
-#: src/zope/app/site/browser/tools.py:170
-#: src/zope/app/site/browser/tools.py:316
+#: src/zope/app/site/browser/tools.py:171
+#: src/zope/app/site/browser/tools.py:317
 msgid "Deactivated registrations."
 msgstr ""
 
@@ -3927,19 +3895,19 @@
 msgstr ""
 
 # Default: "n/a"
-#: src/zope/app/size/__init__.py:44
+#: src/zope/app/size/__init__.py:42
 msgid "not-available"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:48
+#: src/zope/app/size/__init__.py:46
 msgid "0 KB"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:50
+#: src/zope/app/size/__init__.py:48
 msgid "1 KB"
 msgstr ""
 
-#: src/zope/app/size/__init__.py:55
+#: src/zope/app/size/__init__.py:53
 msgid "${size} KB"
 msgstr ""
 
@@ -3998,25 +3966,25 @@
 msgid "SQL Script"
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:29
+#: src/zope/app/sqlscript/interfaces.py:30
 msgid "Connection Name"
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:30
+#: src/zope/app/sqlscript/interfaces.py:31
 msgid "The Connection Name for the connection to be used."
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:35
+#: src/zope/app/sqlscript/interfaces.py:36
 msgid "Arguments"
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:36
+#: src/zope/app/sqlscript/interfaces.py:37
 msgid ""
 "A set of attributes that can be used during the SQL command rendering "
 "process to provide dynamic data."
 msgstr ""
 
-#: src/zope/app/sqlscript/interfaces.py:45
+#: src/zope/app/sqlscript/interfaces.py:46
 msgid "The SQL command to be run."
 msgstr ""
 
@@ -4237,10 +4205,55 @@
 "Utility registrations for interface ${interface} with name ${utility_name}"
 msgstr ""
 
+#: src/zope/app/utility/browser/utilities.pt:11
+#: src/zope/app/site/browser/services.pt:15
+#: src/zope/app/bundle/browser/bundle.pt:53
+msgid "(click to clear message)"
+msgstr ""
+
 #: src/zope/app/utility/browser/utilities.pt:34
 msgid "change registration"
 msgstr ""
 
+#: src/zope/app/utility/browser/utilities.pt:42
+#: src/zope/app/site/browser/tool.pt:91
+#: src/zope/app/site/browser/services.pt:66
+#: src/zope/app/site/browser/add_svc_config.pt:16
+#: src/zope/app/registration/browser/registration.pt:30
+msgid "activate-button"
+msgstr ""
+
+#: src/zope/app/utility/browser/utilities.pt:44
+#: src/zope/app/site/browser/tool.pt:93
+#: src/zope/app/site/browser/services.pt:68
+#: src/zope/app/registration/browser/registration.pt:25
+msgid "deactivate-button"
+msgstr ""
+
+#: src/zope/app/utility/browser/utilities.pt:47
+#: src/zope/app/site/browser/tool.pt:99
+#: src/zope/app/site/browser/services.pt:71
+#: src/zope/app/workflow/browser/instancecontainer_main.pt:47
+#: src/zope/app/i18n/browser/translate.pt:37
+msgid "delete-button"
+msgstr ""
+
+#: src/zope/app/utility/browser/utilities.pt:50
+#: src/zope/app/site/browser/tool.pt:106
+#: src/zope/app/site/browser/services.pt:74
+#: src/zope/app/zptpage/browser/inlinecode.pt:63
+#: src/zope/app/dublincore/browser/edit.pt:33
+#: src/zope/app/schemacontent/browser/permission_edit.pt:33
+#: src/zope/app/errorservice/browser/error.pt:52
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:24
+#: src/zope/app/workflow/stateful/browser/definition_edit.pt:51
+#: src/zope/app/workflow/stateful/browser/instance_manage.pt:74
+#: src/zope/app/pythonpage/edit.pt:69 src/zope/app/form/browser/add.pt:50
+#: src/zope/app/form/browser/edit.pt:50
+#: src/zope/app/registration/browser/editregistration.pt:49
+msgid "refresh-button"
+msgstr ""
+
 #: src/zope/app/utility/browser/utilities.pt:6
 msgid "Utilities registered in this utility service"
 msgstr ""
@@ -4257,233 +4270,6 @@
 msgid "The physical path to the component"
 msgstr ""
 
-#: src/zope/app/wiki/browser/configure.zcml:101
-#: src/zope/app/wiki/browser/configure.zcml:158
-msgid "View"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:109
-#: src/zope/app/wiki/browser/configure.zcml:161
-#: src/zope/app/wiki/browser/parents_page.pt:13
-msgid "Parents"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:134
-#: src/zope/app/wiki/browser/configure.zcml:143
-#: src/zope/app/wiki/browser/configure.zcml:159
-#, fuzzy
-msgid "Comment"
-msgstr "ConteÃºdo"
-
-#: src/zope/app/wiki/browser/configure.zcml:143
-#, fuzzy
-msgid "A Comment"
-msgstr "Adicionar ConteÃºdo"
-
-#: src/zope/app/wiki/browser/configure.zcml:152
-msgid "Menu for Wiki Page related actions."
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:168
-#, fuzzy
-msgid "Table of Contents"
-msgstr "ConteÃºdo"
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:17
-msgid "A Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:24
-#: src/zope/app/wiki/browser/configure.zcml:162
-msgid "TOC"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:32
-#: src/zope/app/wiki/browser/configure.zcml:169
-msgid "Search"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:44
-#: src/zope/app/wiki/browser/configure.zcml:118
-#: src/zope/app/wiki/browser/configure.zcml:163
-#: src/zope/app/wiki/browser/configure.zcml:170
-msgid "Subscriptions"
-msgstr ""
-
-#: src/zope/app/wiki/browser/configure.zcml:76
-#, fuzzy
-msgid "Change Wiki Page"
-msgstr "Modificar um arquivo"
-
-#: src/zope/app/wiki/browser/configure.zcml:8
-msgid "Add Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/browser/parents_page.pt:30
-#, fuzzy
-msgid "reparent-button"
-msgstr "Limpar"
-
-#: src/zope/app/wiki/browser/parents_page.pt:35
-msgid "Branch"
-msgstr ""
-
-#: src/zope/app/wiki/browser/skin/template.pt:32
-msgid "Last modified by ${user} on ${date}"
-msgstr ""
-
-#: src/zope/app/wiki/browser/skin/template.pt:64
-#, fuzzy
-msgid "Jump to:"
-msgstr "Manter em:"
-
-#: src/zope/app/wiki/browser/skin/template.pt:73
-msgid ""
-"User: ${user} (${login}) <div id=\"search\"> <a href=\"../@@search.html"
-"\">Search Wiki</a> </div>"
-msgstr ""
-
-#: src/zope/app/wiki/browser/subscriptions.pt:12
-msgid "Current Subscriptions"
-msgstr ""
-
-#: src/zope/app/wiki/browser/subscriptions.pt:25
-msgid "Enter new Users (separate by 'Return')"
-msgstr ""
-
-#: src/zope/app/wiki/browser/wiki_search.pt:9
-msgid "Wiki Search"
-msgstr ""
-
-#: src/zope/app/wiki/browser/wiki_toc.pt:9
-msgid "Wiki Table of Contents"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "A Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:126
-#: src/zope/app/wiki/browser/configure.zcml:69
-msgid "Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "The Wiki Editor can create and edit wikis."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:14
-msgid "Wiki Editor"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "A Wiki Page Comment"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:156
-msgid "Wiki Page Comment"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "Wiki Administrator"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:19
-msgid "The Wiki Admin can fully manage wiki pages."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:24
-msgid "View a Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Comment on Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:33
-msgid "Make a comment on Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:42
-#: src/zope/app/wiki/browser/configure.zcml:60
-msgid "Add Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:51
-#, fuzzy
-msgid "Edit Wiki Page"
-msgstr "Editar uma pÃ¡gina ZPT"
-
-#: src/zope/app/wiki/configure.zcml:60
-msgid "Delete Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:69
-msgid "Reparent a Wiki Page"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki User"
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:9
-msgid "Wiki visitors, which can only view and comment on wikis."
-msgstr ""
-
-#: src/zope/app/wiki/configure.zcml:93
-msgid "Minimal Wiki Page Container implementation "
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:150
-msgid "Previous Source Text"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:151
-msgid "Previous source text of the Wiki Page."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:40
-#, fuzzy
-msgid "Comment Title"
-msgstr "Linha de comando:"
-
-#: src/zope/app/wiki/interfaces.py:46
-msgid "Renderable source text of the comment."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:72
-msgid "Renderable source text of the Wiki Page."
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:96
-msgid "Wiki Page Parents"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:97
-msgid "Parents of a Wiki"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:98
-msgid "Parent Name"
-msgstr ""
-
-#: src/zope/app/wiki/interfaces.py:99
-msgid "Name of the parent wiki page."
-msgstr ""
-
 #: src/zope/app/workflow/browser/configure.zcml:6
 msgid ""
 "Workflow Process Definitions define a particular workflow       for an "
@@ -4568,11 +4354,11 @@
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "Content Workflows Manager"
+msgid "An utility to manage content and workflow interaction."
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:121
-msgid "An utility to manage content and workflow interaction."
+msgid "Content Workflows Manager"
 msgstr ""
 
 #: src/zope/app/workflow/stateful/browser/configure.zcml:129
@@ -4781,59 +4567,59 @@
 msgid "Source State"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:13
-msgid "Logged in as ${user_title}"
-msgstr ""
-
-#: src/zope/app/zopetop/widget_macros.pt:132
+#: src/zope/app/zopetop/widget_macros.pt:152
 msgid "Views"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:149
+#: src/zope/app/zopetop/widget_macros.pt:169
 msgid "Actions"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:176
+#: src/zope/app/zopetop/widget_macros.pt:196
 msgid "Location:"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:26
+#: src/zope/app/zopetop/widget_macros.pt:32
+msgid "Logged in as ${user_title}"
+msgstr ""
+
+#: src/zope/app/zopetop/widget_macros.pt:46
 msgid "Common Tasks"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:37
+#: src/zope/app/zopetop/widget_macros.pt:57
 msgid "user accounts"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:40
+#: src/zope/app/zopetop/widget_macros.pt:60
 msgid "User Accounts"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:43
+#: src/zope/app/zopetop/widget_macros.pt:63
 msgid "control panels"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:46
+#: src/zope/app/zopetop/widget_macros.pt:66
 msgid "Control Panels"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:49
+#: src/zope/app/zopetop/widget_macros.pt:69
 msgid "system security"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:52
+#: src/zope/app/zopetop/widget_macros.pt:72
 msgid "System Security"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:55
+#: src/zope/app/zopetop/widget_macros.pt:75
 msgid "add more"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:58
+#: src/zope/app/zopetop/widget_macros.pt:78
 msgid "Add More"
 msgstr ""
 
-#: src/zope/app/zopetop/widget_macros.pt:66
+#: src/zope/app/zopetop/widget_macros.pt:86
 msgid "Root Folder"
 msgstr ""
 
@@ -4904,27 +4690,14 @@
 "feature."
 msgstr ""
 
-#: src/zope/app/zptpage/zptpage.py:114
+#: src/zope/app/zptpage/zptpage.py:112
 msgid "1 line"
 msgstr ""
 
-#: src/zope/app/zptpage/zptpage.py:115
+#: src/zope/app/zptpage/zptpage.py:113
 msgid "${lines} lines"
 msgstr ""
 
-#: src/zope/exceptions/unauthorized.py:69
-#: src/zope/exceptions/unauthorized.py:72
-msgid "You are not allowed to access ${name} in this context"
-msgstr ""
-
-#: src/zope/exceptions/unauthorized.py:74
-msgid "You are not authorized"
-msgstr ""
-
-#: src/zope/exceptions/unauthorized.py:84
-msgid "a particular ${object}"
-msgstr ""
-
 #: src/zope/schema/_bootstrapinterfaces.py:43
 msgid "Required input is missing."
 msgstr ""
@@ -5130,23 +4903,174 @@
 msgid "The field is not bound."
 msgstr "o campo Ã© requerido"
 
-#: src/zope/schema/tests/test_objectfield.py:38
+#: src/zope/schema/tests/test_objectfield.py:37
 msgid "Foo"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:39
+#: src/zope/schema/tests/test_objectfield.py:38
 msgid "Foo description"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:44
+#: src/zope/schema/tests/test_objectfield.py:43
 msgid "Bar"
 msgstr ""
 
-#: src/zope/schema/tests/test_objectfield.py:45
+#: src/zope/schema/tests/test_objectfield.py:44
 msgid "Bar description"
 msgstr ""
 
+#: src/zwiki/browser/configure.zcml:101 src/zwiki/browser/configure.zcml:158
+msgid "View"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:109 src/zwiki/browser/configure.zcml:161
+msgid "Parents"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:134 src/zwiki/browser/configure.zcml:143
+#: src/zwiki/browser/configure.zcml:159
 #, fuzzy
+msgid "Comment"
+msgstr "ConteÃºdo"
+
+#: src/zwiki/browser/configure.zcml:143
+#, fuzzy
+msgid "A Comment"
+msgstr "Adicionar ConteÃºdo"
+
+#: src/zwiki/browser/configure.zcml:152
+msgid "Menu for Wiki Page related actions."
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:168
+#, fuzzy
+msgid "Table of Contents"
+msgstr "ConteÃºdo"
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "Wiki"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:17
+msgid "A Wiki"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:24 src/zwiki/browser/configure.zcml:162
+msgid "TOC"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:32 src/zwiki/browser/configure.zcml:169
+msgid "Search"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:44 src/zwiki/browser/configure.zcml:118
+#: src/zwiki/browser/configure.zcml:163 src/zwiki/browser/configure.zcml:170
+msgid "Subscriptions"
+msgstr ""
+
+#: src/zwiki/browser/configure.zcml:76
+#, fuzzy
+msgid "Change Wiki Page"
+msgstr "Modificar um arquivo"
+
+#: src/zwiki/browser/configure.zcml:8
+msgid "Add Wiki"
+msgstr ""
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki User"
+msgstr ""
+
+#: src/zwiki/configure.zcml:12
+msgid "Wiki visitors, which can only view and comment on wikis."
+msgstr ""
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "A Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:142 src/zwiki/browser/configure.zcml:69
+msgid "Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:17
+msgid "The Wiki Editor can create and edit wikis."
+msgstr ""
+
+#: src/zwiki/configure.zcml:17
+msgid "Wiki Editor"
+msgstr ""
+
+#: src/zwiki/configure.zcml:186
+msgid "A Wiki Page Comment"
+msgstr ""
+
+#: src/zwiki/configure.zcml:186
+msgid "Wiki Page Comment"
+msgstr ""
+
+#: src/zwiki/configure.zcml:22
+msgid "Wiki Administrator"
+msgstr ""
+
+#: src/zwiki/configure.zcml:22
+msgid "The Wiki Admin can fully manage wiki pages."
+msgstr ""
+
+#: src/zwiki/configure.zcml:27
+msgid "View Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:27
+msgid "View a Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:36
+msgid "Comment on Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:36
+msgid "Make a comment on Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:45 src/zwiki/browser/configure.zcml:60
+msgid "Add Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:54
+#, fuzzy
+msgid "Edit Wiki Page"
+msgstr "Editar uma pÃ¡gina ZPT"
+
+#: src/zwiki/configure.zcml:63
+msgid "Delete Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:72
+msgid "Reparent a Wiki Page"
+msgstr ""
+
+#: src/zwiki/configure.zcml:96
+msgid "Minimal Wiki Page Container implementation "
+msgstr ""
+
+#, fuzzy
+#~ msgid "reparent-button"
+#~ msgstr "Limpar"
+
+#, fuzzy
+#~ msgid "Jump to:"
+#~ msgstr "Manter em:"
+
+#, fuzzy
+#~ msgid "Comment Title"
+#~ msgstr "Linha de comando:"
+
+#, fuzzy
 #~ msgid "ZGlobal Transaction Service Controller"
 #~ msgstr "Controlador do Servidor Zope"
 

