Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.138 -r1.139
--- openacs-4/packages/xowiki/xowiki.info	16 May 2011 12:29:11 -0000	1.138
+++ openacs-4/packages/xowiki/xowiki.info	20 May 2011 09:52:45 -0000	1.139
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.137" url="http://openacs.org/repository/download/apm/xowiki-0.137.apm">
+    <version name="0.138" url="http://openacs.org/repository/download/apm/xowiki-0.138.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
@@ -56,7 +56,7 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.137"/>
+        <provides url="xowiki" version="0.138"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	4 Jul 2010 16:47:35 -0000	1.39
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	20 May 2011 09:52:45 -0000	1.40
@@ -2,63 +2,122 @@
 <message_catalog package_key="xowiki" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="abstract">Zusammenfassung</msg>
+  <msg key="add">Hinzuf�gen</msg>
   <msg key="admin">Verwalten</msg>
-  <msg key="admin_title">Verwaltungsoptionen f�r dieses Paket ...</msg>
+  <msg key="admin_all_title">Alle Arten von %pretty_plural% verwalten</msg>
+  <msg key="admin_title">Verwaltungsoptionen f�r dieses Wiki...</msg>
   <msg key="ago">vor %time%</msg>
+  <msg key="All_pages">Alle Eintr�ge</msg>
   <msg key="back">Zur�ck</msg>
+  <msg key="By_user">von User/in</msg>
   <msg key="categories">Kategorien</msg>
+  <msg key="CompoundField-validate_compound">%errorMsg%</msg>
+  <msg key="Configure">Einstellungen</msg>
   <msg key="content">Inhalt</msg>
   <msg key="copy_entry">Kopiere Eintrag</msg>
   <msg key="create_new_entry_of_type">Neuen Eintrag vom Typ %type% erstellen</msg>
   <msg key="create_this_page_in_language">Erzeuge diese Seite in der folgenden Sprache:</msg>
+  <msg key="creator">Ersteller/in</msg>
   <msg key="day">Tag</msg>
   <msg key="days">Tage</msg>
   <msg key="delete">L�schen</msg>
+  <msg key="delete_all">Alle l�schen</msg>
+  <msg key="delete_all_confirm">Wirklich alles l�schen?</msg>
+  <msg key="delete_all_instances">Alle %pretty_plural% dieses Wikis l�schen</msg>
+  <msg key="delete_all_items">Alle Eintr�ge dieser Art l�schen</msg>
+  <msg key="delete_confirm">L�schen best�tigen?</msg>
   <msg key="delete_title">L�sche diese Seite ...</msg>
-  <msg key="details">N�here Information</msg>
+  <msg key="description">Kurzbeschreibung</msg>
+  <msg key="details">Details</msg>
   <msg key="edit">Bearbeiten</msg>
   <msg key="edit_link">bearbeiten</msg>
-  <msg key="edit_title">Editiere diese Seite ...</msg>
+  <msg key="edit_title">Diese Seite bearbeiten ...</msg>
   <msg key="entries_using_form">Eintr�ge f�r das Formular %form%:</msg>
-  <msg key="error-delete_entries_first">Dieses Formular wird noch von %count% Eintr�gen verwendet. Bitte verwenden Sie diese, bevor Sie das Formular l�schen.</msg>
+  <msg key="error-delete_entries_first">Dieses Formular wird noch von %count% Eintr�gen verwendet. Bitte l�schen Sie diese, bevor Sie das Formular l�schen.</msg>
+  <msg key="error-includelet-unknown">Fehler: Includelet '%page_name%' nicht bekannt</msg>
+  <msg key="error_in_includelet">Fehler in Includelet '{{%arg%}}' auf Seite %name%:</msg>
   <msg key="event">Termin</msg>
   <msg key="event-end_of_event">Endzeit</msg>
   <msg key="event-end_of_lecture">Vortragsende</msg>
-  <msg key="event-hourprefix"> um </msg>
+  <msg key="event-hourprefix">um </msg>
   <msg key="event-location">Ort</msg>
   <msg key="event-start_of_event">Beginnzeit</msg>
   <msg key="event-start_of_lecture">Vortragsbeginn</msg>
   <msg key="event-title_of_event">Titel</msg>
   <msg key="event-title_of_lecture">Vortragstitel</msg>
-  <msg key="File-name-help_text">Kann von hochegeladener Datei �bernommen werden</msg>
+  <msg key="export">Exportieren</msg>
+  <msg key="File-name-help_text">Kann von hochgeladener Datei �bernommen werden</msg>
+  <msg key="File_pretty_name">Wiki File</msg>
+  <msg key="File_pretty_plural">Wiki Files</msg>
+  <msg key="form-created">Erstelltes Formular</msg>
   <msg key="Form-form">Formular</msg>
   <msg key="Form-form_constraints">Einschr�nkungen</msg>
+  <msg key="form-menu-answer_link">Eintr�ge f�r dieses Formular</msg>
   <msg key="form-menu-button-answers">Eintr�ge f�r dieses Formular</msg>
   <msg key="form-menu-button-form">Formular %form_name%</msg>
   <msg key="form-menu-button-new">Formular ausf�llen</msg>
+  <msg key="form-menu-button-wf">Workflow %form_name%</msg>
   <msg key="form-menu-button-wf-instances">Auspr�gungen von %form_name%</msg>
-  <msg key="formfield-author">Verfasser</msg>
+  <msg key="form-menu-new_link">Formular ausf�llen</msg>
+  <msg key="Form-submit_button">OK</msg>
+  <msg key="Form-template">Template</msg>
+  <msg key="form-updated">Aktualisiertes Formular</msg>
+  <msg key="form-validate_form">%errorMsg%</msg>
+  <msg key="Form-validate_form_constraints">Ung�ltiges Formular %errorMsg%</msg>
+  <msg key="Form_plural_name">Wiki Forms</msg>
+  <msg key="Form_pretty_name">Wiki Form</msg>
+  <msg key="formfield-author">Verfasser/in</msg>
+  <msg key="formfield-image_url-help_text">URL des Bildes (Sie k�nnen die URL des Bildes, die im Webbrowser angezeigt wird, hier einf�gen)</msg>
+  <msg key="formfield-import_archive-help_text">Name des -zip- oder .tar.gz-Files ausw�hlen</msg>
+  <msg key="formfield-import_archive-label">Archiv importieren</msg>
+  <msg key="formfield-youtube_url-help_text">Cut&amp;Paste URL eines YouTube-Videos (http://www.youtube.com/....)</msg>
   <msg key="FormPage-state">Zustand</msg>
+  <msg key="FormPage_parameters_title">Wiki Einstellungen</msg>
+  <msg key="FormPage_pretty_name">Wiki FormPage</msg>
+  <msg key="FormPage_pretty_plural_name">Wiki FormPages</msg>
   <msg key="hour">Stunde</msg>
   <msg key="hours">Stunden</msg>
-  <msg key="includelet-visitors">Besucher</msg>
+  <msg key="import">Importieren</msg>
+  <msg key="import_create_user_ids">User-IDs erstellen</msg>
+  <msg key="import_create_user_ids_helptxt">Falls dieses K�stchen aktiviert ist, werden beim Import gegebenenfalls neue User-IDs erstellt.</msg>
+  <msg key="import_replace">Objekte ersetzen</msg>
+  <msg key="import_replace_helptxt">Falls dieses K�stchen aktiviert ist, werden beim Import bereits bestehende Objekte ersetzt. Bei Nicht-Aktivieren wird beim Import eine neue Version des Objekts hinzugef�gt.</msg>
+  <msg key="import_title">Wiki Seiten importieren</msg>
+  <msg key="import_upload_file">Datei f�r Upload ausw�hlen</msg>
+  <msg key="includelet-visitors">Besucher/innen</msg>
   <msg key="includelets-visits">Besuche</msg>
   <msg key="index">Index</msg>
   <msg key="index_title">Zur Startseite</msg>
+  <msg key="instances">Eintr�ge</msg>
+  <msg key="Language">Sprache</msg>
   <msg key="last_visited_pages">Zuletzt besuchte Seiten</msg>
+  <msg key="listing_title">Inhaltsverzeichnis der %pretty_plural%</msg>
+  <msg key="listing_title_all">Liste aller Arten von %pretty_plural% </msg>
+  <msg key="menu-Clipboard-Add">Hinzuf�gen</msg>
+  <msg key="menu-Clipboard-Content">Inhalt</msg>
+  <msg key="menu-Clipboard-Copy">Kopieren</msg>
+  <msg key="menu-Clipboard-Use-Copy">Kopieren</msg>
+  <msg key="menu-Clipboard-Use-Export">Export</msg>
+  <msg key="menu-Package-ImportArchive">Archiv importieren</msg>
   <msg key="minute">Minute</msg>
   <msg key="minutes">Minuten</msg>
   <msg key="month">Monat</msg>
   <msg key="months">Monaten</msg>
-  <msg key="most_frequent_visitors">H�ufigsten Besucher</msg>
-  <msg key="most_popular_pages">H�ufigst besuchten Seiten</msg>
-  <msg key="new_page">Neuer Eintrag</msg>
+  <msg key="most_frequent_visitors">Die h�ufigsten Besucher/innen</msg>
+  <msg key="most_popular_pages">Am h�ufigsten besuchte Seiten</msg>
+  <msg key="name">Name</msg>
+  <msg key="new">Neue Seite</msg>
+  <msg key="new_page">Neue Seite</msg>
+  <msg key="new_title">Neue Seite erstellen ...</msg>
   <msg key="news-source">Quelle</msg>
   <msg key="news-teaser">Kurztext</msg>
-  <msg key="notifications">Verst�ndigungen</msg>
-  <msg key="notifications_title">Verwalten der Verst�ndigungen ...</msg>
+  <msg key="notifications">Benachrichtigungen</msg>
+  <msg key="notifications_title">Verwalten der Benachrichtigungen...</msg>
   <msg key="numeric-validate_numeric">ung�ltiger numerischer Wert</msg>
-  <msg key="Page-creator">Ersteller</msg>
+  <msg key="Object_pretty_name">Wiki Objekt</msg>
+  <msg key="Object_pretty_plural">Wiki Objekte</msg>
+  <msg key="order">Abschnitt</msg>
+  <msg key="Page-creator">Ersteller/in</msg>
   <msg key="Page-description">Kurzbeschreibung</msg>
   <msg key="Page-last_modified">�nderungsdatum</msg>
   <msg key="Page-name">Name</msg>
@@ -68,7 +127,7 @@
   <msg key="Page-publish_date">Ver�ffentlichungsdatum</msg>
   <msg key="Page-text">Inhalt</msg>
   <msg key="Page-title">Titel der Seite</msg>
-  <msg key="Page-validate_name">Another item with the name '%value%' exists already in this folder                                </msg>
+  <msg key="Page-validate_name">Another item with the name '%value%' exists already in this folder</msg>
   <msg key="page_kind">Art</msg>
   <msg key="page_type">Typ der Seite</msg>
   <msg key="PageInstance-instance_attributes">Instanzattribute</msg>
@@ -96,8 +155,7 @@
   <msg key="seconds">Sekunden</msg>
   <msg key="subscribe">Abonnieren</msg>
   <msg key="title">Titel</msg>
-  <msg key="title_of_event">Titel
-</msg>
+  <msg key="title_of_event">Titel</msg>
   <msg key="unread_items">Ungelesene Seiten</msg>
   <msg key="view">Ansehen</msg>
   <msg key="weblog-more">mehr...</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.58 -r1.59
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	4 Jul 2010 16:47:35 -0000	1.58
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	20 May 2011 09:52:45 -0000	1.59
@@ -2,19 +2,29 @@
 <message_catalog package_key="xowiki" locale="en_US" charset="ISO-8859-1">
 
   <msg key="abstract">Abstract</msg>
+  <msg key="add">Add</msg>
   <msg key="admin">Admin</msg>
+  <msg key="admin_all_title">Administer all kind of %pretty_plural%</msg>
   <msg key="admin_title">Administer this package ...</msg>
   <msg key="ago">%time% ago</msg>
+  <msg key="All_pages">All items</msg>
   <msg key="back">Back</msg>
+  <msg key="By_user">By User</msg>
   <msg key="categories">Categories</msg>
   <msg key="CompoundField-validate_compound">%errorMsg%</msg>
+  <msg key="Configure">Configure</msg>
   <msg key="content">Content</msg>
   <msg key="copy_entry">Copy Entry</msg>
   <msg key="create_new_entry_of_type">Create new entry of type %type%</msg>
   <msg key="create_this_page_in_language">Create this page in a different language</msg>
   <msg key="day">day</msg>
   <msg key="days">days</msg>
   <msg key="delete">Delete</msg>
+  <msg key="delete_all">Delete All</msg>
+  <msg key="delete_all_confirm">Delete really all?</msg>
+  <msg key="delete_all_instances">Delete all %pretty_plural% of this instance</msg>
+  <msg key="delete_all_items">Delete all such items of this instances</msg>
+  <msg key="delete_confirm">Confirm delete?</msg>
   <msg key="delete_title">Delete this page ...</msg>
   <msg key="details">Details</msg>
   <msg key="edit">Edit</msg>
@@ -47,34 +57,55 @@
   <msg key="event-start_of_lecture">Start of Lecture</msg>
   <msg key="event-title_of_event">Title</msg>
   <msg key="event-title_of_lecture">Title of Lecture</msg>
+  <msg key="export">Export</msg>
   <msg key="File-name-help_text">Can be obtained from the name of the uploaded file</msg>
+  <msg key="File_pretty_name">Wiki File</msg>
+  <msg key="File_pretty_plural">Wiki Files</msg>
   <msg key="form-created">Created form</msg>
   <msg key="Form-form">Form</msg>
   <msg key="Form-form_constraints">Form Constraints</msg>
+  <msg key="form-menu-answer_link">Entries for this form</msg>
   <msg key="form-menu-button-answers">Entries for this form</msg>
   <msg key="form-menu-button-form">Form %form_name%</msg>
   <msg key="form-menu-button-new">Fill out</msg>
   <msg key="form-menu-button-wf">Workflow %form_name%</msg>
   <msg key="form-menu-button-wf-instances">Instances of %form_name%</msg>
+  <msg key="form-menu-new_link">Fill out</msg>
   <msg key="Form-submit_button">       OK       </msg>
   <msg key="Form-template">Template</msg>
   <msg key="form-updated">Updated form</msg>
   <msg key="form-validate_form">%errorMsg%</msg>
   <msg key="Form-validate_form_constraints">Invalid Form %errorMsg%</msg>
+  <msg key="Form_plural_name">Wiki Forms</msg>
+  <msg key="Form_pretty_name">Wiki Form</msg>
   <msg key="formfield-author">Author</msg>
   <msg key="formfield-image_url-help_text">HTTP Url of the Image (you might drag an image displayed by a web-browser here)</msg>
   <msg key="formfield-import_archive-help_text">Select the Name of a .zip or .tar.gz File</msg>
   <msg key="formfield-import_archive-label">Import Archive</msg>
   <msg key="formfield-youtube_url-help_text">Cut&amp;Paste URL of YouTube video (http://www.youtube.com/....)</msg>
   <msg key="FormPage-assignee">Assignee</msg>
   <msg key="FormPage-state">State</msg>
+  <msg key="FormPage_parameters_title">Wiki parameters</msg>
+  <msg key="FormPage_pretty_name">Wiki FormPage</msg>
+  <msg key="FormPage_pretty_plural_name">Wiki FormPages</msg>
   <msg key="hour">hour</msg>
   <msg key="hours">hours</msg>
+  <msg key="import">Import</msg>
+  <msg key="import_create_user_ids">Create user_ids</msg>
+  <msg key="import_create_user_ids_helptxt">If checked, import will create new user_ids if necessary</msg>
+  <msg key="import_replace">Raplace objects</msg>
+  <msg key="import_replace_helptxt">If checked, import will delete the object if it exists and create it new, otherwise import just adds a revision</msg>
+  <msg key="import_title">Import Wiki Pages</msg>
+  <msg key="import_upload_file">Import file for upload</msg>
   <msg key="includelet-visitors">Visitors</msg>
   <msg key="includelets-visits">Visits</msg>
   <msg key="index">Index</msg>
   <msg key="index_title">Go to the start page of this package ...</msg>
+  <msg key="instances">Instances</msg>
+  <msg key="Language">Language</msg>
   <msg key="last_visited_pages">Last Visited Pages</msg>
+  <msg key="listing_title">Index of %pretty_plural%</msg>
+  <msg key="listing_title_all">List of all kind of %pretty_plural%</msg>
   <msg key="menu-Clipboard-Add">Add</msg>
   <msg key="menu-Clipboard-Clear">Clear</msg>
   <msg key="menu-Clipboard-Content">Content</msg>
@@ -89,13 +120,18 @@
   <msg key="months">months</msg>
   <msg key="most_frequent_visitors">Most Frequent Visitors</msg>
   <msg key="most_popular_pages">Most Popular Pages</msg>
+  <msg key="name">Name</msg>
+  <msg key="new">New Page</msg>
   <msg key="new_page">New Page</msg>
   <msg key="new_title">Create a new page ...</msg>
   <msg key="news-source">Source</msg>
   <msg key="news-teaser">Teaser</msg>
   <msg key="notifications">Notifications</msg>
   <msg key="notifications_title">Manage notifications ...</msg>
   <msg key="numeric-validate_numeric">Invalid numeric value</msg>
+  <msg key="Object_pretty_name">Wiki Object</msg>
+  <msg key="Object_pretty_plural">Wiki Objects</msg>
+  <msg key="order">Section</msg>
   <msg key="Page-creation_user">Creation User</msg>
   <msg key="Page-creator">Creator</msg>
   <msg key="Page-description">Description</msg>
@@ -108,27 +144,41 @@
   <msg key="Page-text">Content</msg>
   <msg key="Page-title">Page Title</msg>
   <msg key="Page-validate_form_constraints">%errorMsg%</msg>
-  <msg key="Page-validate_name">Another item with the name '%value%' exists already in this folder                                </msg>
+  <msg key="Page-validate_name">Another item with the name '%value%' exists already in this folder</msg>
   <msg key="Page-validate_page_order">Page Order invalid; might only contain upper and lower case letters, underscore, digits and dots</msg>
   <msg key="page_kind">Type</msg>
+  <msg key="Page_pretty_name">XoWiki Page</msg>
+  <msg key="Page_pretty_plural">Wiki Pages</msg>
+  <msg key="page_title">Page Title</msg>
   <msg key="page_type">Page Type</msg>
   <msg key="PageInstance-instance_attributes">Instance Attributes</msg>
   <msg key="PageInstance-page_template">Page Instance</msg>
+  <msg key="PageInstance_pretty_name">Wiki Page Instance</msg>
+  <msg key="PageInstance_pretty_plural">Wiki Page Instances</msg>
   <msg key="PageTemplate-anon_instances">Autonamed Entries</msg>
+  <msg key="PageTemplate_pretty_name">Wiki Page Template</msg>
+  <msg key="PageTemplate_pretty_plural">Wiki Page Templates</msg>
   <msg key="party_id-validate_party_id_check">Value is not a valid party_id</msg>
+  <msg key="permissions_manage_package">Manage Permissions for Wiki: %package_name%</msg>
+  <msg key="permissions_manage_page">Manage Permissions for Page: %page_name%</msg>
+  <msg key="PlainPage_pretty_name">Wiki Plain Page</msg>
+  <msg key="PlainPage_pretty_plural">Wiki Plain Pages</msg>
   <msg key="PodcastItem-duration">Duration</msg>
   <msg key="PodcastItem-duration-help_text">E.g. 9:16 means 9 minutes 16 seconds (if ffmpeg is installed and configured, it will get the value automatically)</msg>
   <msg key="PodcastItem-keywords">Keywords</msg>
   <msg key="PodcastItem-keywords-help_text">comma separated itunes keywords, e.g. salt, pepper, shaker, exciting</msg>
   <msg key="PodcastItem-name-help_text">Can be obtained from the name of the uploaded file</msg>
   <msg key="PodcastItem-pub_date">Publication Date</msg>
   <msg key="PodcastItem-subtitle">Subtitle</msg>
+  <msg key="PodcastItem_pretty_name">Podcast Item</msg>
+  <msg key="PodcastItem_pretty_plural">Podcast Items</msg>
   <msg key="popular_tags_label">Popular tags</msg>
   <msg key="popular_tags_link">popular tags</msg>
   <msg key="portlet_name_does_not_exist_error_long">There is no page with name &quot;%page_name%&quot; available.</msg>
   <msg key="portlet_page_does_not_exist_error_short">The given page does not exist</msg>
   <msg key="portlet_title_exists_error_long">Please either change the existing portlets' name or the title of the xowiki page you want to add to the portal.</msg>
   <msg key="portlet_title_exists_error_short">A portlet with the title '%page_title%' already exists in this portal.</msg>
+  <msg key="pretty_name">Wiki</msg>
   <msg key="publish_status">Published</msg>
   <msg key="recently_changed_pages">Recently Changed Pages</msg>
   <msg key="recently_changed_pages_by_categories">Recently Changed Pages (by categories)</msg>
@@ -143,10 +193,10 @@
   <msg key="second">second</msg>
   <msg key="seconds">seconds</msg>
   <msg key="select_link_target">To create a click, click on a page name </msg>
+  <msg key="Size">Size</msg>
   <msg key="subscribe">Subscribe</msg>
   <msg key="title">Title</msg>
-  <msg key="title_of_event">Title
-</msg>
+  <msg key="title_of_event">Title</msg>
   <msg key="unread_items">Unread Items</msg>
   <msg key="view">View</msg>
   <msg key="view_in_context">View page in original context %context%</msg>
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.431 -r1.432
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	16 May 2011 12:27:53 -0000	1.431
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	20 May 2011 09:52:45 -0000	1.432
@@ -11,7 +11,7 @@
   # create classes for different kind of pages
   #
   ::xo::db::CrClass create Page -superclass ::xo::db::CrItem \
-      -pretty_name "XoWiki Page" -pretty_plural "XoWiki Pages" \
+      -pretty_name "#xowiki.Page_pretty_name#" -pretty_plural "#xowiki.Page_pretty_plural#" \
       -table_name "xowiki_page" -id_column "page_id" \
       -mime_type text/html \
       -slots {
@@ -55,19 +55,19 @@
   }
 
   ::xo::db::CrClass create PlainPage -superclass Page \
-      -pretty_name "XoWiki Plain Page" -pretty_plural "XoWiki Plain Pages" \
+      -pretty_name "#xowiki.PlainPage_pretty_name#" -pretty_plural "#xowiki.PlainPage_pretty_plural#" \
       -table_name "xowiki_plain_page" -id_column "ppage_id" \
       -mime_type text/plain \
       -form ::xowiki::PlainWikiForm
 
   ::xo::db::CrClass create File -superclass Page \
-      -pretty_name "XoWiki File" -pretty_plural "XoWiki Files" \
+      -pretty_name "#xowiki.File_pretty_name#" -pretty_plural "#xowiki.File_pretty_plural#" \
       -table_name "xowiki_file" -id_column "file_id" \
       -storage_type file \
       -form ::xowiki::FileForm
 
   ::xo::db::CrClass create PodcastItem -superclass File \
-      -pretty_name "Podcast Item" -pretty_plural "Podcast Items" \
+      -pretty_name "#xowiki.PodcastItem_pretty_name#" -pretty_plural "#xowiki.PodcastItem_pretty_plural#" \
       -table_name "xowiki_podcast_item" -id_column "podcast_item_id" \
       -slots {
 	::xo::db::CrAttribute create pub_date \
@@ -84,7 +84,7 @@
       -form ::xowiki::PodcastForm
   
   ::xo::db::CrClass create PageTemplate -superclass Page \
-      -pretty_name "XoWiki Page Template" -pretty_plural "XoWiki Page Templates" \
+      -pretty_name "#xowiki.PageTemplate_pretty_name#" -pretty_plural "#xowiki.PageTemplate_pretty_plural#" \
       -table_name "xowiki_page_template" -id_column "page_template_id" \
       -slots {
         ::xo::db::CrAttribute create anon_instances \
@@ -94,7 +94,7 @@
       -form ::xowiki::PageTemplateForm
 
   ::xo::db::CrClass create PageInstance -superclass Page \
-      -pretty_name "XoWiki Page Instance" -pretty_plural "XoWiki Page Instances" \
+      -pretty_name "#xowiki.PageInstance_pretty_name#" -pretty_plural "#xowiki.PageInstance_pretty_plural#" \
       -table_name "xowiki_page_instance"  -id_column "page_instance_id" \
       -slots {
         ::xo::db::CrAttribute create page_template \
@@ -108,13 +108,13 @@
       -edit_form ::xowiki::PageInstanceEditForm
 
   ::xo::db::CrClass create Object -superclass PlainPage \
-      -pretty_name "XoWiki Object" -pretty_plural "XoWiki Objects" \
+      -pretty_name "#xowiki.Object_pretty_name#" -pretty_plural "#xowiki.Object_pretty_plural#" \
       -table_name "xowiki_object"  -id_column "xowiki_object_id" \
       -mime_type text/plain \
       -form ::xowiki::ObjectForm
 
   ::xo::db::CrClass create Form -superclass PageTemplate \
-      -pretty_name "XoWiki Form" -pretty_plural "XoWiki Forms" \
+      -pretty_name "#xowiki.Form_pretty_name#" -pretty_plural "#xowiki.Form_pretty_name#" \
       -table_name "xowiki_form"  -id_column "xowiki_form_id" \
       -slots {
         ::xo::db::CrAttribute create form \
@@ -129,7 +129,7 @@
       -form ::xowiki::FormForm
 
   ::xo::db::CrClass create FormPage -superclass PageInstance \
-      -pretty_name "XoWiki FormPage" -pretty_plural "XoWiki FormPages" \
+      -pretty_name "#xowiki.FormPage_pretty_name#" -pretty_plural "#xowiki.FormPage_pretty_name#" \
       -table_name "xowiki_form_page" -id_column "xowiki_form_page_id" \
       -slots {
         ::xo::db::CrAttribute create assignee \
Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	22 Nov 2010 12:19:19 -0000	1.4
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	20 May 2011 09:52:45 -0000	1.5
@@ -558,5 +558,21 @@
 	}
       }
     }
+
+    set v 0.138
+    if {[apm_version_names_compare $from_version_name $v] == -1 &&
+        [apm_version_names_compare $to_version_name $v] > -1} {
+        ns_log notice "-- upgrading to $v"
+        
+        foreach object_type {PlainPage Page File PodcastItem PageTemplate PageInstance Object Form FormPage} {
+            set pretty_name_key "#xowiki.${object_type}_pretty_name#"
+            set pretty_plural_key "#xowiki.${object_type}_pretty_plural#"
+            set xowiki_object_type "::xowiki::${object_type}"
+            db_dml i18_name "
+                update acs_object_types set pretty_name = :pretty_name_key, pretty_plural = :pretty_plural_key
+                where object_type = :xowiki_object_type
+            "
+        }
+    }
   }
 }
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/admin/import.tcl	22 Jun 2010 07:35:49 -0000	1.19
+++ openacs-4/packages/xowiki/www/admin/import.tcl	20 May 2011 09:52:45 -0000	1.20
@@ -16,14 +16,14 @@
     -export {parent_id return_url} \
     -html { enctype multipart/form-data } \
     -form {
-      {upload_file:file(file) {html {size 30}} {label "Import file for upload"} }
-      {create_user_ids:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} 
-        {label "Create user_ids"}
-        {help_text "If checked, import will create new user_ids if necessary"}
+      {upload_file:file(file) {html {size 30}} {label "[_ xowiki.import_upload_file]"}}
+      {create_user_ids:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+        {label "[_ xowiki.import_create_user_ids]"}
+        {help_text "[_ xowiki.import_create_user_ids_helptxt]"}
       }
-      {replace:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} 
-        {label "Replace objects"}
-        {help_text "If checked, import will delete the object if it exists and create it new, otherwise import just adds a revision"}
+      {replace:integer(radio),optional {options {{#acs-admin.Yes# 1} {#acs-admin.No# 0}}} {value 0} 
+        {label "[_ xowiki.import_replace]"}
+        {help_text "[_ xowiki.import_replace_helptxt]"}
       }
       {ok_btn:text(submit) {label "[_ acs-templating.HTMLArea_SelectUploadBtn]"}
       }
@@ -73,6 +73,6 @@
 
 
 set return_url [ns_queryget return_url ../]
-set title "Import XoWiki Pages"
+set title [_ xowiki.import_title]
 set context .
 ad_return_template
Index: openacs-4/packages/xowiki/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/index.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/xowiki/www/admin/index.tcl	8 Feb 2009 12:58:56 -0000	1.25
+++ openacs-4/packages/xowiki/www/admin/index.tcl	20 May 2011 09:52:45 -0000	1.26
@@ -11,7 +11,8 @@
 }
 
 set context [list]
-set title "Administer all kind of [$object_type set pretty_plural]"
+set pretty_plural [$object_type set pretty_plural]
+set title #xowiki.admin_all_title#
 
 set object_types [$object_type object_types]
 set return_url   [ns_conn url]
@@ -20,37 +21,38 @@
 lang::message::lookup "" xowiki.admin " "
 TableWidget t1 -volatile \
     -actions [subst {
-      Action new -label "all pages" -url list
+      Action new -label #xowiki.All_pages# -url list
       Action new -label "[lang::message::lookup {} categories.Categories Categories]" \
           -url $category_url
-      Action new -label parameters -url \
+      Action new -label [_ acs-subsite.Parameters] -url \
           [export_vars -base /shared/parameters {package_id return_url}]
-      Action new -label export -url export
-      Action new -label import -url import
-      Action new -label permissions -url [export_vars -base permissions {package_id}]
+      Action new -label [_ xowiki.export] -url export
+      Action new -label [_ xowiki.import] -url import
+      Action new -label [_ acs-subsite.Permissions] -url [export_vars -base permissions {package_id}]
     }] \
     -columns {
       Field object_type -label [_ xowiki.page_type]
-      AnchorField instances -label Instances -html {align center}
-      AnchorField edit -CSSclass add-item-button -label "Add" -html {align center}
-      AnchorField delete -CSSclass delete-item-button -label "Delete All" \
-          -html {align center onClick "return(confirm('Delete really all?'));"}
+      AnchorField instances -label [_ xowiki.instances] -html {align center}
+      AnchorField edit -CSSclass add-item-button -label [_ xowiki.add] -html {align center}
+      AnchorField delete -CSSclass delete-item-button -label [_ xowiki.delete_all] \
+          -html {align center onClick "return(confirm('#xowiki.delete_all_confirm#'));"}
     }
 
 set base [::$package_id package_url]
 foreach object_type $object_types {
   set return_url [export_vars -base ${base}admin {object_type}]
   set add_title ""
   set add_href ""
+  set pretty_plural [$object_type pretty_plural]
   if {[catch {set n [db_list count [$object_type instance_select_query \
                                        -folder_id [::$package_id set folder_id] \
                                        -count 1 -with_subtypes false]]}]} {
     set n -
-    set delete_title "Delete all such items of this instance"
+    set delete_title [_ xowiki.delete_all_items]
   } else {
     set add_title [_ xotcl-core.add [list type [$object_type pretty_name]]]
     set add_href  [$package_id make_link -with_entities 0 $package_id edit-new object_type return_url autoname]
-    set delete_title "Delete all [$object_type pretty_plural] of this instance"
+    set delete_title [_ xowiki.delete_all_instances]
   }
   t1 add \
       -object_type  $object_type \
Index: openacs-4/packages/xowiki/www/admin/list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/xowiki/www/admin/list.tcl	27 Jan 2011 07:39:35 -0000	1.31
+++ openacs-4/packages/xowiki/www/admin/list.tcl	20 May 2011 09:52:45 -0000	1.32
@@ -20,14 +20,16 @@
   set per_type 0
   set supertype ::xowiki::Page
   set object_types [$supertype object_types]
-  set page_title "List of all kind of [$supertype set pretty_plural]"
+  set pretty_plural [$supertype set pretty_plural]
+  set page_title [_ xowiki.listing_title_all]
   set with_subtypes true
   set object_type $supertype
   set with_children true
 } else {
   set per_type 1
   set object_types [list $object_type]
-  set page_title "Index of [$object_type set pretty_plural]"
+  set pretty_plural [$object_type set pretty_plural]
+  set page_title [_ xowiki.listing_title]
   set with_subtypes false
   set with_children true
 }
@@ -60,8 +62,8 @@
     -actions $actions \
     -columns {
       BulkAction objects -id name -actions {
-        Action new -label export -tooltip export -url export
-        Action new -label delete -tooltip delete -url bulk-delete
+        Action new -label [_ xowiki.export] -tooltip [_ xowiki.export] -url export
+        Action new -label [_ xowiki.delete] -tooltip [_ xowiki.delete] -url bulk-delete
       }
       AnchorField edit -CSSclass edit-item-button -label "" -html {style "padding: 0px;"}
       if {$::individual_permissions} {
@@ -79,10 +81,10 @@
       AnchorField name -label [_ xowiki.Page-name] -orderby name -html {style "padding: 2px;"}
       AnchorField title -label [_ xowiki.Page-title] -orderby title
       Field object_type -label [_ xowiki.page_type] -orderby object_type -html {style "padding: 2px;"}
-      Field size -label "Size" -orderby size -html {align right style "padding: 2px;"}
+      Field size -label [_ xowiki.Size] -orderby size -html {align right style "padding: 2px;"}
       Field last_modified -label [_ xowiki.Page-last_modified] -orderby last_modified
-      Field mod_user -label "By User" -orderby mod_user
-      AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('Confirm delete?'));"}
+      Field mod_user -label [_ xowiki.By_user] -orderby mod_user
+      AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('#xowiki.delete_confirm#'));"}
     }
 
 foreach {att order} [split $orderby ,] break
Index: openacs-4/packages/xowiki/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/permissions.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/admin/permissions.tcl	3 Sep 2007 21:07:53 -0000	1.3
+++ openacs-4/packages/xowiki/www/admin/permissions.tcl	20 May 2011 09:52:45 -0000	1.4
@@ -13,11 +13,14 @@
   set page [::xo::db::CrClass get_instance_from_db -item_id $item_id]
   $page volatile
   set object_id  $item_id
-  set page_title "Manage Permissions for Page: [$page name]"
+  set page_name [$page name]
+  set page_title [_ xowiki.permissions_manage_page]
   set return_url [$package_id query_parameter return_url [$package_id package_url]admin/list]
 } else {
   set object_id  $package_id
-  set page_title "Manage Permissions for Package [apm_instance_name_from_id $package_id]"
+  set package_name [apm_instance_name_from_id $package_id]
+  set package_name [$package_id get_parameter PackageTitle $package_name]
+  set page_title [_ xowiki.permissions_manage_package]
   set return_url [$package_id query_parameter return_url [$package_id package_url]admin]
 }