Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-print-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-print.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/project-manager/www/task-print.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	26 Jan 2004 15:39:40 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	26 Feb 2004 15:28:34 -0000	1.4
@@ -10,7 +10,11 @@
         t.task_revision_id,
         t.title,
         t.description,
-        to_char(t.end_date,'YYYY-MM-DD HH24:MI') as end_date,
+        to_char(t.earliest_start,'J') as earliest_start_j,
+        to_char(current_timestamp,'J') as today_j,
+        to_char(t.latest_start,'J') as latest_start_j,
+        to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
+        to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
         t.percent_complete,
         t.estimated_hours_work,
         t.estimated_hours_work_min,
@@ -21,18 +25,16 @@
         to_char(t.latest_start,'YYYY-MM-DD HH24:MI') as latest_start,
         to_char(t.latest_finish,'YYYY-MM-DD HH24:MI') as latest_finish,
         p.first_names || ' ' || p.last_name as full_name,
-        r.one_line as role
+        (select one_line from pm_roles r where ta.role_id = r.role_id) as role
         FROM
         pm_tasks ts, 
         pm_tasks_revisionsx t 
           LEFT JOIN pm_task_assignment ta
           ON t.item_id = ta.task_id
             LEFT JOIN persons p 
-            ON ta.party_id = p.person_id,
-        pm_roles r
+            ON ta.party_id = p.person_id
         WHERE
-        ts.task_id  = t.item_id and
-        ta.role_id = r.role_id 
+        ts.task_id  = t.item_id 
         [template::list::filter_where_clauses -and -name tasks]
         [template::list::orderby_clause -orderby -name tasks]
     </querytext>
Index: openacs-4/contrib/packages/project-manager/www/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/tasks.adp	26 Jan 2004 15:39:40 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/tasks.adp	26 Feb 2004 15:28:34 -0000	1.4
@@ -5,6 +5,19 @@
 <property name="title">@task_term@s</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
+<div id="subnavbar-div">
+<div id="subnavbar-container">
+  <div id="subnavbar">
+  <div class="tab">
+    <a href="tasks?mine_p=t">My tasks</a>
+  </div>
+  <div class="tab">
+    <a href="tasks?mine_p=f">Other tasks</a>
+  </div>
+  </div>
+</div>
+</div>
+
 <table cellpadding="3" cellspacing="3">
 
   <tr>
Index: openacs-4/contrib/packages/project-manager/www/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/project-manager/www/tasks.tcl	26 Jan 2004 15:39:40 -0000	1.3
+++ openacs-4/contrib/packages/project-manager/www/tasks.tcl	26 Feb 2004 15:28:34 -0000	1.4
@@ -18,6 +18,8 @@
     orderby:optional
     party_id:optional
     {searchterm ""}
+    {mine_p "t"}
+    {status_id ""}
 } -properties {
     task_term:onevalue
     context_bar:onevalue
@@ -39,11 +41,16 @@
 set package_id [ad_conn package_id]
 set user_id    [ad_maybe_redirect_for_registration]
 
-# by default, show this user's tasks
-#if {![exists_and_not_null party_id]} {
-#    set party_id $user_id
-#}
+# if mine_p is true, show only my tasks
+if {[string equal $mine_p t]} {
+    set party_id $user_id
+}
 
+# status defaults to open
+if {![exists_and_not_null status_id]} {
+    set status_id [project_manager::task::default_status_open]
+}
+
 # permissions
 permission::require_permission -party_id $user_id -object_id $package_id -privilege read
 
@@ -62,20 +69,28 @@
             label "\#"
             link_url_col item_url
             link_html { title "View this project version" }
+            display_template {<a href="@tasks.item_url@">@tasks.task_id@</a>}
         }
         title {
             label "Subject"
         }
         full_name {
             label "Who"
-            display_template "@tasks.full_name@ (@tasks.role@)"
+            display_template "<if @tasks.full_name@ nil><font color=\"red\">unassigned</font></if><else>@tasks.full_name@ (@tasks.role@)</else>"
         }
         description {
             label "Description"
         }
-        end_date {
-            label "Deadline"
+        slack_time {
+            label "Slack time"
+            display_template "<if @tasks.slack_time@ gt 1>@tasks.slack_time@</if><else><font color=\"red\">@tasks.slack_time@</font></else>"
         }
+        latest_start_pretty {
+            label "Latest Start"
+        }
+        latest_finish_pretty {
+            label "Latest Finish"
+        }
         actual_hours_worked {
             label "Hours completed"
             display_template "@tasks.actual_hours_worked@/@tasks.estimated_hours_work@"
@@ -93,17 +108,19 @@
     -filters {
         searchterm {
             label "Search"
-            where_clause { 
-                t.title ilike '%:searchterm%'
-            }
         }
         party_id {
             label "People"
-            values {[db_list_of_lists get_people "select first_names || ' ' || last_name, u.party_id from all_users u, pm_task_assignment a where u.party_id = a.party_id order by upper(first_names), upper(last_name)"]}
+            values {[db_list_of_lists get_people "select distinct(first_names || ' ' || last_name) as fullname, u.person_id from persons u, pm_task_assignment a where u.person_id = a.party_id order by fullname"]}
             where_clause {
-                t.party_id = :party_id
+                ta.party_id = :party_id
             }
         }
+        status_id {
+            label "Status"
+            values {[db_list_of_lists get_status_values "select description, status_id from pm_task_status order by status_type desc, description"]}
+            where_clause {ts.status = :status_id}
+        }
     } \
     -orderby {
         default_value task_number,asc
@@ -119,16 +136,67 @@
             orderby_asc "t.title asc"
             default_direction asc
         }
+        full_name {
+            label "Who"
+            orderby_desc "p.first_names desc,p.last_name desc"
+            orderby_asc "p.first_names, p.last_name"
+            default_direction asc
+        }
+        description {
+            label "Description"
+            orderby_desc "t.description desc"
+            orderby_asc "t.description"
+            default_direction asc
+        }
+        slack_time {
+            label "Slack"
+            orderby_desc "(latest_start - earliest_start) desc"
+            orderby_asc "(latest_start - earliest_start)"
+            default_direction asc
+        }
+        latest_start_pretty {
+            label "Latest start"
+            orderby_desc "t.latest_start desc"
+            orderby_asc "t.latest_start"
+            default_direction asc
+        }
+        latest_finish_pretty {
+            label "Latest finish"
+            orderby_desc "t.latest_finish desc"
+            orderby_asc "t.latest_finish"
+            default_direction asc
+        }
+        actual_hours_worked {
+            label "Hours completed"
+            orderby_desc "t.actual_hours_worked desc"
+            orderby_asc "t.actual_hours_worked"
+            default_direction asc
+        }
     } \
     -orderby_name orderby \
     -html {
         width 100%
     }
 
 
-db_multirow -extend { item_url } tasks tasks {
+db_multirow -extend { item_url latest_start_pretty latest_finish_pretty slack_time} tasks tasks {
 } {
     set item_url [export_vars -base "task-one" {task_id}]
+
+    set latest_start_pretty [lc_time_fmt $latest_start "%x"]
+    set latest_finish_pretty [lc_time_fmt $latest_finish "%x"]
+
+    if {[exists_and_not_null earliest_start_j]} {
+        if {$earliest_start_j < $today_j} {
+            set slack_time "[expr $latest_start_j - $today_j] days"
+        } else {
+            set slack_time "[expr $latest_start_j - $earliest_start_j] days"
+        }
+    } else {
+        set slack_time "n/a"
+    }
+
+
 }
 
 
Index: openacs-4/etc/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/config.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/etc/config.tcl	21 Feb 2004 16:45:48 -0000	1.18
+++ openacs-4/etc/config.tcl	26 Feb 2004 15:28:35 -0000	1.19
@@ -19,6 +19,10 @@
 set hostname                  [ns_info hostname]
 set address                   [ns_info address]
 
+# Note: If port is privileged (usually < 1024), OpenACS must be
+# started by root, and, in AOLserver 4, the run script have a 
+# '-b address' flag which matches the address given above
+
 set server                    "service0" 
 set servername                "New OpenACS Installation - Development"
 
Index: openacs-4/etc/daemontools/run
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/daemontools/run,v
diff -u -r1.4 -r1.5
--- openacs-4/etc/daemontools/run	11 Nov 2003 16:52:14 -0000	1.4
+++ openacs-4/etc/daemontools/run	26 Feb 2004 15:28:35 -0000	1.5
@@ -1,3 +1,6 @@
 #!/bin/sh 
 
 exec /usr/local/aolserver/bin/nsd-postgres -it /var/lib/aolserver/service0/etc/config.tcl -u service0 -g web
+
+# For AOLserver 4 using privileged ports (usually < 1024), add the flag
+# -b youraddress:yourport
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.62 -r1.63
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	8 Feb 2004 17:20:14 -0000	1.62
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	26 Feb 2004 15:28:36 -0000	1.63
@@ -52,6 +52,27 @@
     ad_script_abort
 }
 
+ad_proc -public auth::refresh_login {} {
+    If there currently is a user associated with this session,
+    but the user's authentication is expired, redirect the
+    user to refresh his/her login. This allows for users to not be logged in,
+    but if the user is logged in, then we require that the authentication is not expired.
+
+    @return user_id of user, if the user is logged in and auth_status is not expired, or 0 if the user is not logged in.
+            If user's auth_status is expired, this proc will issue a returnredirect and abort the current page.
+
+    @see ad_script_abort
+} {
+    if { ![string equal [ad_conn auth_level] "expired"] } {
+        return [ad_conn user_id]
+    }
+        
+
+    # The -return switch causes the URL to return to the current page
+    ad_returnredirect [ad_get_login_url -return]
+    ad_script_abort
+}
+
 ad_proc -public auth::get_user_id {
     {-level ok}
     {-account_status ok}
Index: openacs-4/packages/acs-core-docs/www/images/production-configuration.dia
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/images/production-configuration.dia,v
diff -u -r1.1 -r1.2
Binary files differ
Index: openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml	24 Feb 2004 17:42:26 -0000	1.11
+++ openacs-4/packages/acs-core-docs/www/xml/releasing-openacs.xml	26 Feb 2004 15:28:37 -0000	1.12
@@ -13,13 +13,24 @@
         <para>Update documentation version numbers:</para>
         <orderedlist>
           <listitem>
-            <para>Update /packages/acs-core-docs/www/xml/variables.ent with the new version number and regenerate all HTML docs
+            <para>Update /packages/acs-core-docs/www/xml/variables.ent with the new version number.
             </para>
           </listitem>
           <listitem>
+            <para>Add new section in /packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
+</para>
+          </listitem>
+          <listitem>
+            <para>Regenerate all HTML docs</para>
+          </listitem>
+          <listitem>
             <para>Update /readme.txt with the new version number</para>
           </listitem>
           <listitem>
+            <para>Rebuild the Changelog.  Using cvs2cl:</para>
+            <screen>perl /var/tmp/cvs2cl/cvs2cl.pl -F oacs-5-0 --delta openacs-5-0-0-final:oacs-5-0</screen>
+          </listitem>
+          <listitem>
             <para>
               Commit changes
             </para>
@@ -33,7 +44,7 @@
           this is being done as a local user on openacs.org (which make the 
           checkout and tagging operations much faster).</para>
         <screen><action>cd /var/tmp
-cvs -d /cvsroot checkout -r <replaceable>oacs-5-0</replaceable> openacs-4</action></screen>
+cvs -d /cvsroot checkout -r <replaceable>oacs-5-0</replaceable> openacs-core</action></screen>
         <para>Repeat with the dotlrn cvs tree.</para>
         <screen><action>cd /var/tmp
 mkdir dotlrn-packages
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml	11 Dec 2003 21:39:48 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/templates.xml	26 Feb 2004 15:28:37 -0000	1.8
@@ -239,6 +239,13 @@
 data sources.
 </para>
 
+</sect2>
+
+<sect2 id="templates-summary">
+<title>Documentation</title>
+
+<ulink url="/doc/acs-templating/">Templating system documentation</ulink>
+
 <para><phrase role="cvstag">($Id$)</phrase></para>
 
 </sect2>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	18 Feb 2004 14:43:05 -0000	1.15
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-advanced.xml	26 Feb 2004 15:28:37 -0000	1.16
@@ -620,7 +620,7 @@
         <para>Click on <computeroutput><guilabel>Generate a distribution file
         for this package from the
         filesystem</guilabel></computeroutput>.
-</para>
+        </para>
         <para>Click on the file size
         (<computeroutput><guilabel>37.1KB</guilabel></computeroutput>)
         after the label <computeroutput><guilabel>Distribution
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml	4 Feb 2004 16:47:34 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-debug.xml	26 Feb 2004 15:28:37 -0000	1.8
@@ -45,7 +45,7 @@
 ? searches backward 
 / searches forward. 
           </literallayout>
-</para>
+    </para>
   </sect2>
   <sect2>
     <title>Manual testing</title>
Index: openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml	12 Feb 2004 13:51:42 -0000	1.11
+++ openacs-4/packages/acs-core-docs/www/xml/developers-guide/tutorial-pages.xml	26 Feb 2004 15:28:37 -0000	1.12
@@ -15,10 +15,22 @@
     <title>Install some API</title>
     <para>As a workaround for missing content-repository functionality, copy a provided file into the directory for tcl files:</para>
     <screen>
-    <action>cp <replaceable>/var/lib/aolserver/service0</replaceable>/packages/acs-core-docs/www/files/note-procs.tcl <replaceable>/var/lib/aolserver/service0</replaceable>/packages/myfirstpackage/tcl/</action></screen>
+    <action>cp /var/lib/aolserver/<replaceable>service0</replaceable>/packages/acs-core-docs/www/files/note-procs.tcl /var/lib/aolserver/<replaceable>service0</replaceable>/packages/myfirstpackage/tcl/</action></screen>
     <para>To make this file take effect, go to the <ulink url="/acs-admin/apm">APM</ulink> and choose "Reload changed" for "MyFirstPackage".</para>
   </sect2>
   <sect2>
+    <title>Page Map</title>
+    <para>Our package will have two visible pages.  The first shows a list of all objects; the second shows a single object in view or edit mode, and can also be used to add an object.  The index page will display the list, but since we might reuse the list later, we'll put it in a seperate file and include it on the index page.</para>
+      <figure>
+        <title>Page Map</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/tutorial-page-map.png" format="png" align="center"/>
+          </imageobject>
+        </mediaobject>
+      </figure>
+  </sect2>
+  <sect2>
     <title>Build the "Index" page</title>
       <para>Each user-visible page in your package has, typically,
       three parts.  The  <computeroutput>tcl</computeroutput> file
@@ -31,139 +43,31 @@
       database-specific SQL.  The default page in any directory is
       <computeroutput>index</computeroutput>, so we'll build that
       first, starting with the tcl file:</para>
-      <screen>[service0 postgresql]$<userinput> cd /var/lib/aolserver/service0/myfirstpackages/www</userinput>
+      <screen>[service0 postgresql]$<userinput> cd /var/lib/aolserver/<replaceable>service0</replaceable>/packages/myfirstpackages/www</userinput>
 [service0 www]$ <userinput>emacs index.tcl</userinput></screen>
       <para>Paste this into the file.</para>      
-      <programlisting>ad_page_contract {
-    This is the main page for the package.  It displays all of the Notes and provides links to edit them and to create new Notes.
-
-    @author Your Name (you@example.com)
-    @cvs-id $Id$
-}
-
-set page_title [ad_conn instance_name]
-set context [list]
-
-template::list::create \
-    -name notes \
-    -multirow notes \
-    -actions { "Add a Note" note-edit} \
-    -elements {
-	edit {
-	    link_url_col edit_url
-	    display_template {
-		&lt;img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0"&gt;
-	    }
-	    sub_class narrow
-	}
-	title {
-	    label "Title"
-	}
-	delete {
-	    link_url_col delete_url 
-	    display_template {
-		&lt;img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0"&gt;
-	    }
-	    sub_class narrow
-	}
-    }
-
-db_multirow \
-    -extend {
-	edit_url
-	delete_url
-    } notes notes_select {
-	select ci.item_id,
-	       n.title
-        from   cr_items ci,
-               mfp_notesx n
-        where  n.revision_id = ci.live_revision
-    } {
-	set edit_url [export_vars -base "note-edit" {item_id}]
-	set delete_url [export_vars -base "note-delete" {item_id}]
-    }
-</programlisting>
-
+      <programlisting><xi:include href="../../files/tutorial/index.tcl" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
     <para>Now <computeroutput>index.adp</computeroutput>:</para>
-    <programlisting>
-&lt;master&gt;
-  &lt;property name="title"&gt;@page_title;noquote@&lt;/property&gt;
-  &lt;property name="context"&gt;@context;noquote@&lt;/property&gt;
-&lt;listtemplate name="notes"&gt;&lt;/listtemplate&gt;
-    </programlisting>
-    <para>Now we create the add/edit page.  If note_id is passed in,
-    it edits that note.  Otherwise, it presents a form for adding
-    notes.  Edit
-    <computeroutput>note-edit.tcl</computeroutput>:</para>
-    <programlisting>ad_page_contract {
-    This is the view-edit page for notes.
-
-    @author Your Name (you@example.com)
-    @cvs-id &#x0024;Id$
-
-    @param item_id If present, assume we are editing that note.  Otherwise, we are creating a new note.
-} { 
-    item_id:integer,optional
-}
-
-ad_form -name note -form {
-    {item_id:key}
-    {title:text {label Title}}
-} -new_request {
-    permission::require_permission -object_id [ad_conn package_id] -privilege create
-    set page_title "Add a Note"
-    set context [list $page_title]
-} -edit_request {
-    permission::require_write_permission -object_id $item_id
-    mfp::note::get \
-    -item_id $item_id \
-    -array note_array
-
-    set title $note_array(title)
-
-    set page_title "Edit a Note"
-    set context [list $page_title]
-} -new_data {
-    mfp::note::add \
-    -title $title \
-    -item_id $item_id
-    set message "Note $title added"
-} -edit_data {
-    mfp::note::edit \
-    -item_id $item_id \
-    -title $title
-     set message "Note $title changed"
-} -after_submit {
-    ad_returnredirect -message $message "."
-    ad_script_abort
-} </programlisting>
-    <para>And <computeroutput>note-edit.adp</computeroutput>:</para>
-    <programlisting>&lt;master&gt;
-  &lt;property name="title"&gt;@page_title;noquote@&lt;/property&gt;
-  &lt;property name="context"&gt;@context;noquote@&lt;/property&gt;
-  &lt;property name="focus"&gt;note.title&lt;/property&gt;
-  
-&lt;formtemplate id="note"&gt;&lt;/formtemplate&gt;</programlisting>
+      <programlisting><xi:include href="../../files/tutorial/index.adp" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
+      <para>You can test your work by <ulink url="/myfirstpackage/">viewing the page</ulink>.</para>
+      <para>The index page includes the list page, which we put in /lib instead of /www to designate that it's available for reuse by other packages.</para>
+      <screen>[service0 www]$<userinput> mkdir /var/lib/aolserver/<replaceable>service0</replaceable>/packages/myfirstpackage/lib</userinput>
+[service0 www]$<userinput> cd /var/lib/aolserver/<replaceable>service0</replaceable>/packages/myfirstpackage/lib</userinput>
+[service0 lib]$ <userinput>emacs note-list.tcl</userinput></screen>
+      <programlisting><xi:include href="../../files/tutorial/note-list.tcl" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
+<screen>[service0 lib]$ <userinput>emacs note-list.adp</userinput></screen>
+<programlisting><xi:include href="../../files/tutorial/note-list.adp" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
+      <para>Create the add/edit page.  If note_id is passed in,
+      it display that note, and can change to edit mode if appropriate.  Otherwise, it presents a form for adding notes.</para>
+    <screen>[service0 lib]$<userinput> cd /var/lib/aolserver/<replaceable>service0</replaceable>/packages/myfirstpackage/www</userinput>
+[service0 www]$ <userinput>emacs note-edit.tcl</userinput></screen>
+      <programlisting><xi:include href="../../files/tutorial/note-edit.tcl" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
+<screen>[service0 www]$ <userinput>emacs note-edit.adp</userinput></screen>
+      <programlisting><xi:include href="../../files/tutorial/note-edit.adp" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
      <para>And the delete page.  Since it has no UI, there is only a
-     tcl page, and no adp page.  Edit
-<computeroutput>note-delete.tcl</computeroutput>:</para>
-    <programlisting>ad_page_contract {
-    This deletes a note
-
-    @author Your Name (you@example.com)
-    @cvs-id &#x0024;Id$
- 
-    @param item_id The item_id of the note to delete
-} {
-    item_id:integer
-}
-
-permission::require_write_permission -object_id $item_id
-set title [item::get_title $item_id]
-mfp::note::delete -item_id $item_id
-ad_returnredirect -message "Item $title deleted." "."
-
-</programlisting>
+     tcl page, and no adp page.</para>
+<screen>[service0 www]$ <userinput>emacs note-delete.tcl</userinput></screen>
+      <programlisting><xi:include href="../../files/tutorial/note-delete.tcl" xi:parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>example missing</xi:fallback></xi:include></programlisting>
     </sect2>
   </sect1>
 
Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	24 Feb 2004 17:42:26 -0000	1.14
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml	26 Feb 2004 15:28:38 -0000	1.15
@@ -1,5 +1,5 @@
 <?xml version='1.0' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
 <!ENTITY % myvars SYSTEM "../variables.ent">
@@ -41,48 +41,48 @@
         <para>Under Development - update this no later than 5.1.0rc1</para>
       </listitem>
      </itemizedlist>
-     </sect2>
+   </sect2>
 
-   <sect2 id="release-notes-5-0-2">
-     <title>Version 5.0.2</title>
- 
-       <itemizedlist>
-         <listitem>
-         <para>Bug fixes: <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1495">#1495. Croatian enabled by default</ulink>, <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1496">#1496. APM automated install fails if files have spaces in their names</ulink>, <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1494">#1494. automated upgrade crashes (halting the upgrade process)</ulink></para>
-         </listitem>
-         <listitem>
-           <para>Complete Change list since 5.0.0 in Changelog</para>
-         </listitem>
-         <listitem>
-         <para>File tagging scheme in CVS changed to follow <ulink url="http://openacs.org/forums/message-view?message_id=161375">TIP #46: (Approved) Rules for Version Numbering and CVS tagging of Packages</ulink></para>
-         </listitem>
-     </itemizedlist>
-     </sect2>
- 
-   <sect2 id="release-notes-5-0-1">
-     <title>Version 5.0.1</title>
-       <itemizedlist>
-         <listitem>
-           <para>All work on the translation server from 7 Nov 2003 to 7 Feb 2004 is now included in catalogs.</para>
-         </listitem>
-         <listitem>
-           <para>One new function in acs-tcl, util::age_pretty</para>
-         </listitem>
-         <listitem>
-           <para>Complete Change list since 5.0.0 in Changelog</para>
-         </listitem>
-         <listitem>
-           <para>Many documentation updates and doc bug fixes </para>
-         </listitem>
-     </itemizedlist>
-     </sect2>
- 
 
+  <sect2 id="release-notes-5-0-2">
+    <title>Version 5.0.2</title>
+
+      <itemizedlist>
+        <listitem>
+        <para>Bug fixes: <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1495">#1495. Croatian enabled by default</ulink>, <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1496">#1496. APM automated install fails if files have spaces in their names</ulink>, <ulink url="http://openacs.org/bugtracker/openacs/bug?bug%5fnumber=1494">#1494. automated upgrade crashes (halting the upgrade process)</ulink></para>
+        </listitem>
+        <listitem>
+          <para>Complete Change list since 5.0.0 in Changelog</para>
+        </listitem>
+        <listitem>
+        <para>File tagging scheme in CVS changed to follow <ulink url="http://openacs.org/forums/message-view?message_id=161375">TIP #46: (Approved) Rules for Version Numbering and CVS tagging of Packages</ulink></para>
+        </listitem>
+    </itemizedlist>
+    </sect2>
+
+  <sect2 id="release-notes-5-0-1">
+    <title>Version 5.0.1</title>
+      <itemizedlist>
+        <listitem>
+          <para>All work on the translation server from 7 Nov 2003 to 7 Feb 2004 is now included in catalogs.</para>
+        </listitem>
+        <listitem>
+          <para>One new function in acs-tcl, util::age_pretty</para>
+        </listitem>
+        <listitem>
+          <para>Complete Change list since 5.0.0 in Changelog</para>
+        </listitem>
+        <listitem>
+          <para>Many documentation updates and doc bug fixes </para>
+        </listitem>
+    </itemizedlist>
+    </sect2>
+
   <sect2 id="release-notes-5-0-0">
     <title>Version 5.0.0</title>
 
     <para>
-	This is OpenACS 5.0.0.  This version contains no known security, data loss, or crashing bugs, nor any bugs judged release blockers.  This version has received manual testing.  It has passed current automated testing, which is not comprehensive.  This release contains work done on the translation server http://translate.openacs.org through 3 Nov 2003.  
+	This is OpenACS 5.0.0.  This version contains no known security, data loss, or crashing bugs, nor any bugs judged release blockers.  This version has received manual testing.  It has passed current automated testing, which is not comprehensive.  This release contains work done on the translation server http://translate.openacs.org through 7 Nov 2003.  
   </para>
     
     <para>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml	26 Jan 2004 15:39:44 -0000	1.17
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver.xml	26 Feb 2004 15:28:39 -0000	1.18
@@ -11,6 +11,16 @@
     <para>by <ulink url="mailto:vinod@kurup.com">Vinod Kurup</ulink></para>
   </authorblurb>
 
+
+  <para>
+    (Debian users: we do not recommend installing Debian packages for
+    Aolserver or Postgres. Several people have
+    reported problems while trying to install using apt-get
+    instead of from source. If you have the time to debug these
+    and submit what you did, that's great, but if not, you
+    should stick to installing from source. 
+  </para>
+
   <orderedlist>
     <listitem id="aolserver-tarball">
       <formalpara>
@@ -76,8 +86,9 @@
           <computeroutput>conf</computeroutput>, which compiles
           AOLserver, the default modules, and the database driver, and
           installs them.</para>
-      <para>(Debian Users working with AOLserver 3.3+ad13 and
-          postgresql from apt-get may need to
+      <para>Debian users, see
+          warning above, but if you do use apt-get for AOLserver
+          3.3+ad13 and postgresql from apt-get may need to 
           make these symlinks: <computeroutput>ln -s
           /usr/include/postgresql/ /usr/include/pgsql</computeroutput>
           and <computeroutput>ln -s /usr/lib/postgresql /usr/local/pgsql</computeroutput>)</para>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml	18 Feb 2004 14:43:06 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/database-maintenance.xml	26 Feb 2004 15:28:39 -0000	1.6
@@ -106,8 +106,9 @@
   <sect1 id="install-next-nightly-vacuum">
     <title>Vacuum Postgres nightly</title>
     <para>
-      The "vacuum" command must be run periodically to reclaim space. The
-      "vacuum analyze" form additionally collects statistics on the
+      The "vacuum" command must be run periodically to reclaim space
+      in versions of PostgreSQL before 7.4. The "vacuum analyze" form
+      additionally collects statistics on the 
       disbursion of columns in the database, which the optimizer uses when
       it calculates just how to execute queries. The availability of this
       data can make a tremendous difference in the execution speed of
@@ -117,7 +118,8 @@
       prefer it to happen immediately after (not before!) you've made a
       backup! The "vacuum" command is very reliable, but conservatism is
       the key to good system management. So, if you're using the export
-      procedure described above, you don't need to do this extra step.
+      procedure described above, you don't need to do this extra
+      step.
     </para>
 
     <para>Edit your crontab:</para>
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml	16 Feb 2004 23:00:17 -0000	1.21
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/postgres.xml	26 Feb 2004 15:28:39 -0000	1.22
@@ -14,7 +14,7 @@
   
   <para>Skip this section if you will run only Oracle.</para>
 
-  <para>See <xref linkend="compatibility-matrix"/> for version compatibility.</para>
+  <para>OpenACS &version; will run with <link linkend="source-postgresql">PostgreSQL</link> 7.3.2, 7.3.3, and 7.3.4.  7.3.4 is the recommended version of PostgreSQL.  PostgreSQL 7.4 has been verified.</para>
 
   <itemizedlist>
     <listitem>
@@ -28,7 +28,11 @@
         <title>Special Notes for Debian</title>
         <para></para>
       </formalpara>
-      <para>Debian users, especially Debian stable users, should install PostGreSQL from source as detailed below.  Debian unstable users: the following process has been known to work:</para>
+      <para>Debian users, especially Debian stable users, should
+      install PostGreSQL from source as detailed below. Debian
+      unstable users: the following process has been known to work
+      (but you should double-check that the version of PostGreSQL is
+      7.3 or above):</para>
       <screen><userinput>apt-get install postgresql postgresql-dev postgresql-doc
 ln -s /usr/include/postgresql/ /usr/include/pgsql
 ln -s /var/lib/postgres /usr/local/pgsql
@@ -121,6 +125,10 @@
 	  since it will not run as root.  Since nobody will log in
 	  directly as that user, we'll leave the password blank.
 	</para>
+        <para>
+	  Debian users should probably use adduser instead of
+	  useradd. Type <computeroutput>man adduser</computeroutput>
+	</para>
       </formalpara>
       <screen>[root src]# <userinput>groupadd web</userinput>
 [root src]# <userinput>useradd -g web -d /usr/local/pgsql postgres</userinput>
@@ -181,6 +189,10 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin/X11:/usr/X11R6/bin:/root/bin:/usr/local/pgsql/bin:/usr/local/pgsql/bin
 [postgres pgsql]$ <userinput>exit</userinput>
 </screen>
+
+      <para>Don't continue unless you see correct output from
+      <computeroutput>env | grep PATH</computeroutput></para>
+
     </listitem>
     <listitem id="install-postgres-compile">
       <formalpara>
@@ -508,11 +520,12 @@
 #
 checkpoint_segments = 3     # in logfile segments (16MB each), min 1
 </programlisting>
-          <para>Restart postgres (Redhat: <computeroutput>service postgresql restart</computeroutput>.  Many other systems: <computeroutput>/etc/init.d/postgresql restart</computeroutput>) so that the changes take effect.</para>
+          <para>Restart postgres (<computeroutput>service postgresql
+          restart</computeroutput>) or
+          (<computeroutput>/etc/init.d/postgres
+          restart</computeroutput>) so that the changes take effect.</para>
         </listitem>
       </orderedlist>
-        </listitem>
-      </orderedlist>
     </listitem>
   </itemizedlist>
   
Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	23 Feb 2004 01:11:42 -0000	1.12
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/upgrade.xml	26 Feb 2004 15:28:39 -0000	1.13
@@ -86,6 +86,7 @@
       </indexterm>
       <para>The required platform for OpenACS 4.6 is the same as
       4.5, with the exception of OpenFTS.  OpenACS 4.6 and later require OpenFTS 0.3.2 for full text search on PostGreSQL.  If you have OpenFTS 0.2, you'll need to upgrade.  </para>
+      <para>If upgrading from 4.2, you need to manually run acs-kernel/sql/postgres/upgrade-4.2-4.5.sql.  See <ulink url="http://openacs.org/bugtracker/openacs/bug?bug_number=632">Bug #632</ulink></para>
       <itemizedlist mark="circle">
         <listitem><para>A computer with OpenACS 4.5.</para>
         </listitem>
@@ -261,7 +262,58 @@
         </listitem>
       </itemizedlist>
     </sect2>
-  </sect1>
+    <sect2 id="upgrade-5-0-dot">
+      <title>Upgrading 5.0.0 to 5.0.x</title>
+        <itemizedlist>
+          <listitem>
+            <formalpara>
+              <title>Upgrading a stock site</title>
+              <para>If you have no custom code, and your site is not in a CVS repository, upgrade with these steps:</para>
+            </formalpara>
+            <orderedlist>
+              <listitem>
+                <para>Go to <ulink url="/acs-admin/install">/acs-admin/install/</ulink> and click "Upgrade Your System" in "Install from OpenACS Repository"</para>
+              </listitem>
+              <listitem>
+                <para>Select all of the packages you want to upgrade and proceed</para>
+              </listitem>
+              <listitem>
+                <para>After upgrade is complete, restart the server as indicated.</para>
+              </listitem>
+              <listitem>
+                <para>If you are using locales other than en_US, go to acs-lang/admin and "Import all Messages" to load the new translated messages.  Your local translations, if any, will take precedence over imported translations.</para>
+              </listitem>
+            </orderedlist>
+          </listitem>
+          <listitem>
+            <formalpara>
+              <title>Upgrading a Custom or CVS site</title>
+              <para>If you have no custom code, and your site is not in a CVS repository, upgrade with these steps:</para>
+            </formalpara>
+            <orderedlist>
+              <listitem>
+                <formalpara>
+                  <title>Upgrade the file system for all packages in use</title>
+                  <para><xref linkend="upgrade-openacs-files"/></para>
+                </formalpara>
+              </listitem>
+              <listitem>
+                <para>Go to <ulink url="/acs-admin/install">/acs-admin/install/</ulink> and click "Upgrade Your System" in "Install from local file system"</para>
+              </listitem>
+              <listitem>
+                <para>Select all of the packages you want to upgrade and proceed</para>
+              </listitem>
+              <listitem>
+                <para>After upgrade is complete, restart the server as indicated.</para>
+              </listitem>
+              <listitem>
+                <para>If you are using locales other than en_US, go to acs-lang/admin and "Import all Messages" to load the new translated messages.  Your local translations, if any, will take precedence over imported translations.</para>
+              </listitem>
+            </orderedlist>
+          </listitem>
+        </itemizedlist>
+      </sect2>
+    </sect1>
   <sect1 id="upgrade-openacs-files">
     <title>Upgrading the OpenACS files</title>
     <para>OpenACS is distributed as a collection of files, available as one big tarball, via CVS, and via automatic download from within the APM.  Upgrades work by first changing the file system (via any of the previous methods), and then using the APM to scan the file system, find upgrade scripts, and execute them.  This section describes how to upgrade the file system.  Starting with OpenACS 5.0, this section can generally be skipped because the OpenACS APM can directly download new files from the openacs.org repository.</para>
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml	11 Dec 2003 21:39:49 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/bootstrap-acs.xml	26 Feb 2004 15:28:39 -0000	1.6
@@ -27,7 +27,7 @@
 Before OpenACS 3.3, the OpenACS startup process was extremely simple: after AOLserver
 performed its internal initialization (reading the configuration file,
 loading shared libraries and module code, etc.) it scanned through the Tcl
-library directory (generally <computeroutput>/web/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis><computeroutput>/tcl</computeroutput>),
+library directory (generally <computeroutput>/var/lib/aolserver/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis><computeroutput>/tcl</computeroutput>),
 sourcing each file in sequence. 
 </para>
 
@@ -69,9 +69,9 @@
 <para>Next AOLserver sources, in lexicographical order, each file in the
 <computeroutput>/tcl</computeroutput> directory. The first such file is
 <computeroutput>0-acs-init.tcl</computeroutput>, which doesn&#39;t do much directly except to
-determine the OpenACS path root (e.g., <computeroutput>/web/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis>)
+determine the OpenACS path root (e.g., <computeroutput>/var/lib/aolserver/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis>)
 by trimming the final component from the path to the Tcl library directory
-(<computeroutput>/web/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis><computeroutput>/tcl</computeroutput>). But
+(<computeroutput>/var/lib/aolserver/</computeroutput><emphasis><computeroutput>yourservername</computeroutput></emphasis><computeroutput>/tcl</computeroutput>). But
 <computeroutput>0-acs-init.tcl</computeroutput>&#39;s has an important function, namely sourcing
 <computeroutput>/packages/acs-core/bootstrap.tcl</computeroutput>, which does the following:</para>
 
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml	26 Jan 2004 15:39:45 -0000	1.7
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/rp-design.xml	26 Feb 2004 15:28:39 -0000	1.8
@@ -76,21 +76,21 @@
 
 <listitem>
 <para><emphasis role="strong">global pageroot</emphasis>
-(<emphasis role="strong">/web/<emphasis>servicename</emphasis>/www</emphasis>) -- Files appearing under
+(<emphasis role="strong">/var/lib/aolserver/<emphasis>servicename</emphasis>/www</emphasis>) -- Files appearing under
 this pageroot will be served directly off the base url
 http://www.<emphasis>servicename</emphasis>.com/</para>
 </listitem>
 
 <listitem>
 <para><emphasis role="strong">package root</emphasis>
-(<emphasis role="strong">/web/<emphasis>servicename</emphasis>/packages</emphasis>) -- Each subdirectory of
+(<emphasis role="strong">/var/lib/aolserver/<emphasis>servicename</emphasis>/packages</emphasis>) -- Each subdirectory of
 the package root is a package. A typical OpenACS installation will have several
 packages.</para>
 </listitem>
 
 <listitem>
 <para><emphasis role="strong">package pageroot</emphasis>
-(<emphasis role="strong">/web/<emphasis>servicename</emphasis>/packages/<emphasis>package_key</emphasis>/www</emphasis>)
+(<emphasis role="strong">/var/lib/aolserver/<emphasis>servicename</emphasis>/packages/<emphasis>package_key</emphasis>/www</emphasis>)
 -- This is the pageroot for the <emphasis>package_key</emphasis> package.</para>
 </listitem>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-datetime/catalog/acs-datetime.FA_IR.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-datetime/catalog/acs-datetime.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.TH_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/Attic/acs-datetime.TH_TH.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.TH_TH.utf-8.xml	3 Nov 2003 09:53:15 -0000	1.5
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.TH_TH.utf-8.xml	26 Feb 2004 15:28:40 -0000	1.6
@@ -6,6 +6,7 @@
   <msg key="is">คือ</msg>
   <msg key="List">รายการ</msg>
   <msg key="Month">เดือน</msg>
+  <msg key="short_days_of_week">อ จ อ พ พฤ ศ ส</msg>
   <msg key="Today">วันนี้</msg>
   <msg key="Week">สัปดาห์</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-datetime/catalog/acs-datetime.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.da_DK.ISO-8859-1.xml,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.13
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.14
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="da_DK" charset="ISO-8859-1">
 
+  <msg key="All_day">Hele dagen</msg>
+  <msg key="back_one_day">en dag tilbage</msg>
   <msg key="Date">Dato</msg>
   <msg key="Date_as">Datoen skrives som</msg>
-  <msg key="Date_as_YYYYMMDD">Missing</msg>
+  <msg key="Date_as_YYYYMMDD">Dato som ����MMDD</msg>
   <msg key="Day">Dag</msg>
   <msg key="Day_of_Week">Ugedag</msg>
+  <msg key="days_of_week">S�ndag Mandag Tirsdag Onsdag Torsdag Fredag L�rdag</msg>
+  <msg key="forward_one_day">en dag frem</msg>
   <msg key="is">er</msg>
   <msg key="Items_from">Emner fra</msg>
+  <msg key="Items_until">Emner indtil @pretty_end_date@</msg>
   <msg key="List">Liste</msg>
+  <msg key="lt_Width_must_be_">Bredde skal v�re mellem 1 og 12</msg>
   <msg key="Month">M�ned</msg>
+  <msg key="short_days_of_week">S M T O T F L</msg>
   <msg key="to">til</msg>
   <msg key="Today">I dag</msg>
   <msg key="Week">Uge</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.de_DE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.de_DE.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.9
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.10
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="de_DE" charset="ISO-8859-1">
 
+  <msg key="All_day">Ganzt�gig</msg>
+  <msg key="back_one_day">Einen Tag zur�ck</msg>
   <msg key="Date">Datum</msg>
   <msg key="Date_as">Datum in der Form:</msg>
   <msg key="Date_as_YYYYMMDD">Datum (JJJJMMTT)</msg>
   <msg key="Day">Tag</msg>
-  <msg key="Day_of_Week">Tag der Woche</msg>
-  <msg key="is">Datum:</msg>
-  <msg key="Items_from">Eintr�ge vom</msg>
+  <msg key="Day_of_Week">Wochentag</msg>
+  <msg key="days_of_week">Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag</msg>
+  <msg key="forward_one_day">Einen Tag vor</msg>
+  <msg key="is">&amp;nbsp;</msg>
+  <msg key="Items_from">Termine vom</msg>
+  <msg key="Items_until">Termine bis @pretty_end_date@</msg>
   <msg key="List">Termine</msg>
+  <msg key="lt_Width_must_be_">Der Wert muss zwischen 1 und 12 liegen.</msg>
   <msg key="Month">Monat</msg>
+  <msg key="short_days_of_week">S M D M D F S</msg>
   <msg key="to">bis</msg>
-  <msg key="Today">Heutiges </msg>
+  <msg key="Today">Heute: </msg>
   <msg key="Week">Woche</msg>
 </message_catalog>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.es_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.es_ES.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.10
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.11
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="es_ES" charset="ISO-8859-1">
 
+  <msg key="All_day">Todo el d�a</msg>
+  <msg key="back_one_day">atras un d�a</msg>
   <msg key="Date">Fecha</msg>
   <msg key="Date_as">Formato de fecha: </msg>
   <msg key="Date_as_YYYYMMDD">Formato de fecha: AAAAMMDD</msg>
   <msg key="Day">D�a</msg>
   <msg key="Day_of_Week">D�a de la Semana</msg>
+  <msg key="days_of_week">domingo lunes martes mi�rcoles jueves viernes s�bado</msg>
+  <msg key="forward_one_day">adelante un d�a</msg>
   <msg key="is">es</msg>
   <msg key="Items_from">Citas desde</msg>
+  <msg key="Items_until">Registros hasta el @pretty_end_date@ </msg>
   <msg key="List">Lista</msg>
+  <msg key="lt_Width_must_be_">El ancho debe tener un valor entre 1 y 12</msg>
   <msg key="Month">Mes</msg>
+  <msg key="short_days_of_week">D L M X J V S</msg>
   <msg key="to">a</msg>
   <msg key="Today">Hoy</msg>
   <msg key="Week">Semana</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.fr_FR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.fr_FR.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.8
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.9
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="fr_FR" charset="ISO-8859-1">
 
+  <msg key="All_day">Journ�e enti�re</msg>
   <msg key="Date">Date</msg>
   <msg key="Date_as">Date comme</msg>
   <msg key="Date_as_YYYYMMDD">Format YYYYMMDD</msg>
   <msg key="Day">Jour</msg>
   <msg key="Day_of_Week">Jour de la semaine</msg>
-  <msg key="is">est</msg>
+  <msg key="days_of_week">dimanche lundi mardi mercredi jeudi vendredi samedi</msg>
+  <msg key="is">nous sommes le</msg>
   <msg key="Items_from">El�ments de</msg>
   <msg key="List">Liste</msg>
   <msg key="Month">Mois</msg>
+  <msg key="short_days_of_week">S L M M J V S</msg>
   <msg key="to">�</msg>
   <msg key="Today">Aujourd'hui</msg>
   <msg key="Week">Semaine</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.it_IT.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.it_IT.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.9
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.10
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="it_IT" charset="ISO-8859-1">
 
+  <msg key="All_day">Tutta la giornata</msg>
+  <msg key="back_one_day">Un giorno indietro</msg>
   <msg key="Date">Data</msg>
   <msg key="Date_as">Formato Data</msg>
   <msg key="Date_as_YYYYMMDD">&lt;b&gt;Formato Data&lt;/b&gt;: AAAA-MM-GG&lt;br&gt;
 (es. 2002-05-05)</msg>
   <msg key="Day">Giorno</msg>
   <msg key="Day_of_Week">Giorno della Settimana</msg>
+  <msg key="days_of_week">Domenica Luned� Marted� Mercoled� Gioved� Venerd� Sabato</msg>
+  <msg key="forward_one_day">Un giorno avanti</msg>
   <msg key="is">&amp;egrave; il</msg>
   <msg key="Items_from">Prospetto agenda da</msg>
+  <msg key="Items_until">Prospetto fino al @pretty_end_date@</msg>
   <msg key="List">Elenco</msg>
+  <msg key="lt_Width_must_be_">La larghezza deve essere compresa tra 1 e 12</msg>
   <msg key="Month">Mese</msg>
+  <msg key="short_days_of_week">D L M M G V S</msg>
   <msg key="to">a</msg>
   <msg key="Today">Oggi</msg>
   <msg key="Week">Settimana</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.ko_KR.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.ko_KR.utf-8.xml	3 Nov 2003 09:53:15 -0000	1.2
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.ko_KR.utf-8.xml	26 Feb 2004 15:28:40 -0000	1.3
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="ko_KR" charset="utf-8">
 
+  <msg key="All_day">하루종일</msg>
+  <msg key="back_one_day">하루 전</msg>
   <msg key="Date">월일</msg>
   <msg key="Date_as">월일</msg>
   <msg key="Date_as_YYYYMMDD">YYYYMMDD형태의 년월일</msg>
   <msg key="Day">요일</msg>
   <msg key="Day_of_Week">요일</msg>
+  <msg key="days_of_week">일요일 월요일 화요일 수요일 목요일 금요일 토요일</msg>
+  <msg key="forward_one_day">하루전</msg>
   <msg key="is">은(는)</msg>
   <msg key="Items_from">로(으로)부터의 항목</msg>
+  <msg key="Items_until">@pretty_end_date@ 까지의 항목</msg>
   <msg key="List">목록</msg>
+  <msg key="lt_Width_must_be_">폭은 1에서 12사이여야 합니다</msg>
   <msg key="Month">월</msg>
+  <msg key="short_days_of_week">일 월 화 수 목 금 토</msg>
   <msg key="to">까지</msg>
   <msg key="Today">오늘</msg>
   <msg key="Week">일주일</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/Attic/acs-datetime.ms_my.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.ms_my.utf-8.xml	3 Nov 2003 09:53:15 -0000	1.2
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.ms_my.utf-8.xml	26 Feb 2004 15:28:40 -0000	1.3
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="ms_my" charset="utf-8">
 
+  <msg key="All_day">Seluruh hari</msg>
+  <msg key="back_one_day">kembali satu hari</msg>
   <msg key="Date">Tarikh</msg>
   <msg key="Date_as">Tarikh seperti</msg>
   <msg key="Date_as_YYYYMMDD">Tarikh seperti YYYYMMDD</msg>
   <msg key="Day">Hari</msg>
   <msg key="Day_of_Week">Hari Dalam Minggu</msg>
+  <msg key="days_of_week">Ahad Isnin Selasa Rabu Khamis Jumaat Sabtu</msg>
+  <msg key="forward_one_day">satu hari ke hadapan</msg>
   <msg key="is">ialah</msg>
   <msg key="Items_from">Senarai dari</msg>
+  <msg key="Items_until">Barang sehingga @pretty_end_date@</msg>
   <msg key="List">Senarai</msg>
+  <msg key="lt_Width_must_be_">Lebar hendaklah antara 1 hingga 12</msg>
   <msg key="Month">Bulan</msg>
+  <msg key="short_days_of_week">A I S R K J S</msg>
   <msg key="to">hingga</msg>
   <msg key="Today">Hari Ini</msg>
   <msg key="Week">Minggu</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.9
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.10
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="nl_NL" charset="ISO-8859-1">
 
+  <msg key="All_day">Alle dagen</msg>
+  <msg key="back_one_day">een dag terug</msg>
   <msg key="Date">Datum</msg>
   <msg key="Date_as">Datum als</msg>
   <msg key="Date_as_YYYYMMDD">Datum als JJJJMMDD</msg>
   <msg key="Day">Dag</msg>
-  <msg key="Day_of_Week">Weekdag</msg>
-  <msg key="is">is</msg>
-  <msg key="Items_from">Items van</msg>
+  <msg key="Day_of_Week">weekdag</msg>
+  <msg key="days_of_week">zmondag maandag dinsdag woensdag donderdag vrijdag zaterdag</msg>
+  <msg key="forward_one_day">een dag verder</msg>
+  <msg key="is">is het</msg>
+  <msg key="Items_from">Planning van </msg>
+  <msg key="Items_until">Items tot @pretty_end_date@ </msg>
   <msg key="List">Lijst</msg>
+  <msg key="lt_Width_must_be_">Breedte moet liggen tussen 1 en 12</msg>
   <msg key="Month">Maand</msg>
+  <msg key="short_days_of_week">Z M D W D V Z </msg>
   <msg key="to">tot</msg>
   <msg key="Today">Vandaag</msg>
   <msg key="Week">Week</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.pt_BR.ISO-8859-1.xml	3 Nov 2003 09:53:15 -0000	1.8
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:40 -0000	1.9
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="pt_BR" charset="ISO-8859-1">
 
+  <msg key="All_day">Todo dia</msg>
+  <msg key="back_one_day">voltar um dia</msg>
   <msg key="Date">Data</msg>
   <msg key="Date_as">Data em</msg>
   <msg key="Date_as_YYYYMMDD">Data em AAAAMMDD</msg>
   <msg key="Day">Dia</msg>
   <msg key="Day_of_Week">Dia da Semana</msg>
+  <msg key="days_of_week">Domingo Segunda Ter�a Quarta Quinta Sexta S�bado</msg>
+  <msg key="forward_one_day">avan�ar um dia</msg>
   <msg key="is">�</msg>
   <msg key="Items_from">Itens de</msg>
+  <msg key="Items_until">Itens at� @pretty_end_date@</msg>
   <msg key="List">Lista</msg>
+  <msg key="lt_Width_must_be_">A largura deve estar entre 1 e 12</msg>
   <msg key="Month">M�s</msg>
+  <msg key="short_days_of_week">D S T Q Q S S</msg>
   <msg key="to">at�</msg>
   <msg key="Today">Hoje</msg>
   <msg key="Week">Semana</msg>
Index: openacs-4/packages/acs-datetime/catalog/acs-datetime.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/catalog/acs-datetime.zh_TW.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-datetime/catalog/acs-datetime.zh_TW.utf-8.xml	3 Nov 2003 09:53:15 -0000	1.2
+++ openacs-4/packages/acs-datetime/catalog/acs-datetime.zh_TW.utf-8.xml	26 Feb 2004 15:28:40 -0000	1.3
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="acs-datetime" package_version="4.0" locale="zh_TW" charset="utf-8">
 
+  <msg key="All_day">全日</msg>
+  <msg key="back_one_day">後退一日</msg>
   <msg key="Date">日期</msg>
-  <msg key="Date_as">日期表示為</msg>
+  <msg key="Date_as">日期設定為</msg>
   <msg key="Date_as_YYYYMMDD">日期以YYYYMMDD表示</msg>
   <msg key="Day">日</msg>
-  <msg key="Day_of_Week">Day_of_Week</msg>
+  <msg key="Day_of_Week">工作日</msg>
+  <msg key="days_of_week">週日 週一 週二 週三 週四 週五 週六</msg>
+  <msg key="forward_one_day">後一日</msg>
   <msg key="is">是</msg>
-  <msg key="Items_from">品項來自</msg>
-  <msg key="List">序列</msg>
+  <msg key="Items_from">從</msg>
+  <msg key="Items_until">至@pretty_end_date@為止的項目</msg>
+  <msg key="List">列表</msg>
+  <msg key="lt_Width_must_be_">寬度必須介於1至12之間</msg>
   <msg key="Month">月</msg>
+  <msg key="short_days_of_week">日 一 二 三 四 五 六</msg>
   <msg key="to">到</msg>
   <msg key="Today">今日</msg>
   <msg key="Week">週</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.AR_EG.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_EG.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="AR_EG" charset="utf-8">
 
   <msg key="member_role_pretty_name">عضوِ</msg>
   <msg key="member_role_pretty_plural">أعضاء</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.AR_LB.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.AR_LB.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="AR_LB" charset="utf-8">
 
   <msg key="authentication_authority">السلطة</msg>
   <msg key="common_apply">طبّق</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/catalog/acs-kernel.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ast_ES.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.8
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ast_ES" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autorid�</msg>
   <msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ch_zh.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,5 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ch_zh" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ch_zh" charset="utf-8">
 
-  <msg key="common_edit">園辞</msg>
+  <msg key="authentication_authority">权限</msg>
+  <msg key="common_add">增加</msg>
+  <msg key="common_apply">申请</msg>
+  <msg key="common_cancel">取消</msg>
+  <msg key="common_close">关闭</msg>
+  <msg key="common_closed">关闭的</msg>
+  <msg key="common_continue">继续</msg>
+  <msg key="common_default">使用缺省值</msg>
+  <msg key="common_delete">删除</msg>
+  <msg key="common_discard">放弃</msg>
+  <msg key="common_edit">编辑</msg>
+  <msg key="common_finish">完成</msg>
+  <msg key="common_go">到</msg>
+  <msg key="common_help">帮助</msg>
+  <msg key="common_login">登陆</msg>
+  <msg key="common_needs_approval">需要批准</msg>
+  <msg key="common_next">下一个</msg>
+  <msg key="common_no">不是</msg>
+  <msg key="common_ok">好</msg>
+  <msg key="common_open">打开</msg>
+  <msg key="common_previous">前一个</msg>
+  <msg key="common_register">注册</msg>
+  <msg key="common_repeat">重复</msg>
+  <msg key="common_reset">重置</msg>
+  <msg key="common_save">保存</msg>
+  <msg key="common_stop">停止</msg>
+  <msg key="common_update">更新</msg>
+  <msg key="common_view">查看</msg>
+  <msg key="common_yes">是</msg>
+  <msg key="member_role_pretty_name">会员</msg>
+  <msg key="member_role_pretty_plural">会员</msg>
+  <msg key="member_state_approved">批准的</msg>
+  <msg key="member_state_banned">禁止的</msg>
+  <msg key="member_state_deleted">删除的</msg>
+  <msg key="member_state_needs_approval">需要批准</msg>
+  <msg key="member_state_rejected">拒绝的</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml	21 Oct 2003 14:07:30 -0000	1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.6
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoritet</msg>
+  <msg key="common_add">Tilf�j</msg>
   <msg key="common_apply">Anvend</msg>
   <msg key="common_cancel">Annull�r</msg>
   <msg key="common_close">Luk</msg>
-  <msg key="common_continue">Fors�t</msg>
+  <msg key="common_closed">Lukket</msg>
+  <msg key="common_continue">Forts�t</msg>
   <msg key="common_default">Brug Standard</msg>
   <msg key="common_delete">Slet</msg>
   <msg key="common_discard">Afvis</msg>
@@ -14,16 +16,25 @@
   <msg key="common_go">Opdater</msg>
   <msg key="common_help">Hj�lp</msg>
   <msg key="common_login">Log ind</msg>
+  <msg key="common_needs_approval">Skal Godkendes</msg>
   <msg key="common_next">N�ste</msg>
   <msg key="common_no">Nej</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">�ben</msg>
   <msg key="common_previous">Forrige</msg>
   <msg key="common_register">Registrer</msg>
+  <msg key="common_repeat">Gentag</msg>
   <msg key="common_reset">Nulstil</msg>
   <msg key="common_save">Gem</msg>
   <msg key="common_stop">Stop</msg>
-  <msg key="common_update">Opdat�r</msg>
+  <msg key="common_update">Opdater</msg>
   <msg key="common_view">Vis</msg>
   <msg key="common_yes">Ja</msg>
   <msg key="member_role_pretty_name">Medlem</msg>
   <msg key="member_role_pretty_plural">Medlemmer</msg>
+  <msg key="member_state_approved">Godkendt</msg>
+  <msg key="member_state_banned">Bandlyst</msg>
+  <msg key="member_state_deleted">Slettet</msg>
+  <msg key="member_state_needs_approval">Skal godkendes</msg>
+  <msg key="member_state_rejected">Afvist</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.9
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.10
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="de_DE" charset="ISO-8859-1">
 
+  <msg key="authentication_authority">Authentifizierungsstelle</msg>
+  <msg key="common_add">Hinzuf�gen</msg>
+  <msg key="common_apply">�bernehmen</msg>
+  <msg key="common_cancel">Abbrechen</msg>
+  <msg key="common_close">Schlie�en</msg>
+  <msg key="common_closed">Geschlossen</msg>
+  <msg key="common_continue">Fortsetzen</msg>
+  <msg key="common_default">Standardeinstellung verwenden</msg>
+  <msg key="common_delete">L�schen</msg>
+  <msg key="common_discard">Verwerfen</msg>
+  <msg key="common_edit">Bearbeiten</msg>
+  <msg key="common_finish">Fertig stellen</msg>
+  <msg key="common_go">Los</msg>
+  <msg key="common_help">Hilfe</msg>
+  <msg key="common_login">Anmelden</msg>
+  <msg key="common_needs_approval">Auf Antrag</msg>
+  <msg key="common_next">Weiter</msg>
+  <msg key="common_no">Nein</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">Selbstregistrierung</msg>
+  <msg key="common_previous">Zur�ck</msg>
+  <msg key="common_register">Registrieren</msg>
+  <msg key="common_repeat">Wiederholen</msg>
+  <msg key="common_reset">Zur�cksetzen</msg>
+  <msg key="common_save">Speichern</msg>
+  <msg key="common_stop">Abbrechen</msg>
+  <msg key="common_update">Aktualisieren</msg>
+  <msg key="common_view">Anzeigen</msg>
+  <msg key="common_yes">Ja</msg>
   <msg key="member_role_pretty_name">Teilnehmer</msg>
   <msg key="member_role_pretty_plural">Teilnehmer</msg>
+  <msg key="member_state_approved">Freigeschaltet</msg>
+  <msg key="member_state_banned">Deaktiviert</msg>
+  <msg key="member_state_deleted">Gel�scht</msg>
+  <msg key="member_state_needs_approval">Zugang beantragt</msg>
+  <msg key="member_state_rejected">Abgelehnt</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	22 Dec 2003 22:03:23 -0000	1.18
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.en_US.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.19
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0b4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="en_US" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Authority</msg>
   <description key="authentication_authority">The identifying label for an authentication server, such as an  LDAP or RADIUS server.</description>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.8
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.9
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoridad</msg>
+  <msg key="common_add">A�adir</msg>
   <msg key="common_apply">Aplicar</msg>
   <msg key="common_cancel">Cancelar</msg>
   <msg key="common_close">Cerrar</msg>
+  <msg key="common_closed">Cerrado</msg>
   <msg key="common_continue">Continuar</msg>
   <msg key="common_default">Use el Elemento por Defecto</msg>
   <msg key="common_delete">Eliminar</msg>
   <msg key="common_discard">Descartar</msg>
   <msg key="common_edit">Editar</msg>
   <msg key="common_finish">Terminar</msg>
+  <msg key="common_go">Ir</msg>
   <msg key="common_help">Ayuda</msg>
   <msg key="common_login">Ingresar</msg>
+  <msg key="common_needs_approval">Necesita aprobaci�n</msg>
   <msg key="common_next">Siguiente(s)</msg>
   <msg key="common_no">No</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">Abrir</msg>
   <msg key="common_previous">Previo(s)</msg>
   <msg key="common_register">Registrarse</msg>
+  <msg key="common_repeat">Repetir</msg>
   <msg key="common_reset">Reiniciar</msg>
   <msg key="common_save">Guardar</msg>
   <msg key="common_stop">Detener</msg>
@@ -25,4 +32,9 @@
   <msg key="common_yes">S�</msg>
   <msg key="member_role_pretty_name">Miembro</msg>
   <msg key="member_role_pretty_plural">Miembros</msg>
+  <msg key="member_state_approved">Aprobado</msg>
+  <msg key="member_state_banned">Vetado</msg>
+  <msg key="member_state_deleted">Borrado</msg>
+  <msg key="member_state_needs_approval">Necesita aprobaci�n</msg>
+  <msg key="member_state_rejected">Rechazado</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.fi_FI.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="fi_FI" charset="utf-8">
 
   <msg key="member_role_pretty_name">Jäsen</msg>
   <msg key="member_role_pretty_plural">Jäsenet</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.8
@@ -1,6 +1,31 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="fr_FR" charset="ISO-8859-1">
 
+  <msg key="authentication_authority">Autorit�</msg>
+  <msg key="common_add">Ajouter</msg>
+  <msg key="common_apply">Appliquer</msg>
+  <msg key="common_cancel">Annuler</msg>
+  <msg key="common_close">Fermer</msg>
+  <msg key="common_closed">Ferm�</msg>
+  <msg key="common_continue">Continuer</msg>
+  <msg key="common_delete">Supprimer</msg>
+  <msg key="common_discard">Jeter</msg>
+  <msg key="common_edit">Modifier</msg>
+  <msg key="common_finish">Finir</msg>
+  <msg key="common_go">Acc�der</msg>
+  <msg key="common_help">Aide</msg>
+  <msg key="common_next">Suivant</msg>
+  <msg key="common_no">Non</msg>
+  <msg key="common_ok">Ok</msg>
+  <msg key="common_open">Ouvrir</msg>
+  <msg key="common_previous">Pr�c�dent</msg>
+  <msg key="common_repeat">R�p�ter</msg>
+  <msg key="common_save">Enregistrer</msg>
+  <msg key="common_update">Mise � jour</msg>
+  <msg key="common_view">Vue</msg>
+  <msg key="common_yes">Oui</msg>
   <msg key="member_role_pretty_name">Membre</msg>
   <msg key="member_role_pretty_plural">Membres</msg>
+  <msg key="member_state_approved">Approuv�</msg>
+  <msg key="member_state_deleted">Supprim�</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.8
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.gl_ES.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="gl_ES" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoridade</msg>
   <msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.hu_HU.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="hu_HU" charset="utf-8">
 
   <msg key="authentication_authority">Jogosultság</msg>
   <msg key="common_apply">Alkalmaz</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.5
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.6
@@ -1,9 +1,40 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="it_IT" charset="ISO-8859-1">
 
-  <msg key="common_finish">termina</msg>
+  <msg key="authentication_authority">Modalit&amp;agrave; di autentificazione</msg>
+  <msg key="common_add">Aggiungi</msg>
+  <msg key="common_apply">Applica</msg>
+  <msg key="common_cancel">Cancella</msg>
+  <msg key="common_close">Chiudi</msg>
+  <msg key="common_closed">Chiuso</msg>
+  <msg key="common_continue">Continua</msg>
+  <msg key="common_default">Usa Default</msg>
+  <msg key="common_delete">Elimina</msg>
+  <msg key="common_discard">Rifiuta</msg>
+  <msg key="common_edit">Modifica</msg>
+  <msg key="common_finish">Termina</msg>
+  <msg key="common_go">Vai</msg>
+  <msg key="common_help">Aiuto</msg>
+  <msg key="common_login">Log in</msg>
+  <msg key="common_needs_approval">Richiede approvazione</msg>
+  <msg key="common_next">Prossimo</msg>
   <msg key="common_no">No</msg>
+  <msg key="common_ok">Ok</msg>
+  <msg key="common_open">Aperto</msg>
+  <msg key="common_previous">Precedente</msg>
+  <msg key="common_register">Registra</msg>
+  <msg key="common_repeat">Ripeti</msg>
+  <msg key="common_reset">Azzera</msg>
+  <msg key="common_save">Salva</msg>
+  <msg key="common_stop">Stop</msg>
+  <msg key="common_update">Aggiorna</msg>
+  <msg key="common_view">Vedi</msg>
   <msg key="common_yes">S&amp;igrave;</msg>
   <msg key="member_role_pretty_name">Membro</msg>
   <msg key="member_role_pretty_plural">Membri</msg>
+  <msg key="member_state_approved">Approvato</msg>
+  <msg key="member_state_banned">Bannato</msg>
+  <msg key="member_state_deleted">Cancellato</msg>
+  <msg key="member_state_needs_approval">In attesa di approvazione</msg>
+  <msg key="member_state_rejected">Respinto</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ja_JP.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ja_JP" charset="utf-8">
 
   <msg key="common_cancel">キャンセル</msg>
   <msg key="common_close">閉じる</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ko_KR.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ko_KR" charset="utf-8">
 
+  <msg key="authentication_authority">권한</msg>
+  <msg key="common_add">추가</msg>
+  <msg key="common_apply">적용하다</msg>
+  <msg key="common_cancel">취소</msg>
+  <msg key="common_close">종료하다</msg>
+  <msg key="common_closed">폐쇄</msg>
+  <msg key="common_continue">계속</msg>
+  <msg key="common_default">초기값 사용</msg>
+  <msg key="common_delete">삭제</msg>
+  <msg key="common_discard">취소</msg>
+  <msg key="common_edit">수정</msg>
+  <msg key="common_finish">종료</msg>
+  <msg key="common_go">진행</msg>
+  <msg key="common_help">도움말</msg>
+  <msg key="common_login">로그인</msg>
+  <msg key="common_needs_approval">승인 필요</msg>
+  <msg key="common_next">다음</msg>
+  <msg key="common_no">아니오</msg>
+  <msg key="common_ok">승인</msg>
+  <msg key="common_open">열기</msg>
+  <msg key="common_previous">이전</msg>
+  <msg key="common_register">??</msg>
+  <msg key="common_repeat">반복</msg>
+  <msg key="common_reset">재설정</msg>
+  <msg key="common_save">저장</msg>
+  <msg key="common_stop">중지</msg>
+  <msg key="common_update">업데이트</msg>
+  <msg key="common_view">보기</msg>
+  <msg key="common_yes">예</msg>
   <msg key="member_role_pretty_name">회원</msg>
   <msg key="member_role_pretty_plural">회원들</msg>
+  <msg key="member_state_approved">승인됨</msg>
+  <msg key="member_state_banned">금지됨</msg>
+  <msg key="member_state_deleted">삭제됨</msg>
+  <msg key="member_state_needs_approval">승인 필요</msg>
+  <msg key="member_state_rejected">거절됨</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/Attic/acs-kernel.ms_my.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ms_my.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.4
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ms_my" charset="utf-8">
 
+  <msg key="authentication_authority">Pengendali</msg>
+  <msg key="common_add">Tambah</msg>
   <msg key="common_apply">Mohon</msg>
   <msg key="common_cancel">Batal</msg>
   <msg key="common_close">Tutup</msg>
+  <msg key="common_closed">Telah di tutup</msg>
   <msg key="common_continue">Terus</msg>
   <msg key="common_default">Kembali yang Asal</msg>
   <msg key="common_delete">Hapus</msg>
   <msg key="common_discard">Buang</msg>
   <msg key="common_edit">Edit</msg>
   <msg key="common_finish">Selesai</msg>
+  <msg key="common_go">Pergi</msg>
   <msg key="common_help">Bantuan</msg>
   <msg key="common_login">Log Masuk</msg>
+  <msg key="common_needs_approval">Perlukan Pengesahan</msg>
   <msg key="common_next">Terus</msg>
   <msg key="common_no">Tidak</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">Buka</msg>
   <msg key="common_previous">Sebelum</msg>
   <msg key="common_register">Daftar</msg>
+  <msg key="common_repeat">Ulang</msg>
   <msg key="common_reset">Kembali pada Asal</msg>
   <msg key="common_save">Simpan</msg>
   <msg key="common_stop">Berhenti</msg>
@@ -24,4 +32,9 @@
   <msg key="common_yes">Ya</msg>
   <msg key="member_role_pretty_name">Ahli</msg>
   <msg key="member_role_pretty_plural">Ahli-ahli</msg>
+  <msg key="member_state_approved">Disahkan</msg>
+  <msg key="member_state_banned">Dihalang</msg>
+  <msg key="member_state_deleted">Dipadam</msg>
+  <msg key="member_state_needs_approval">Perlukan pengesahan</msg>
+  <msg key="member_state_rejected">Ditolak</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.9
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.10
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoriteit</msg>
+  <msg key="common_add">Toevoegen</msg>
   <msg key="common_apply">Toepassen</msg>
-  <msg key="common_cancel">Opheffen</msg>
+  <msg key="common_cancel">Annuleren</msg>
   <msg key="common_close">Sluiten</msg>
+  <msg key="common_closed">Gesloten</msg>
   <msg key="common_continue">Doorgaan</msg>
-  <msg key="common_default">Gebruik Standaard</msg>
+  <msg key="common_default">Standaard gebruiken</msg>
   <msg key="common_delete">Verwijderen</msg>
-  <msg key="common_discard">Verwerpen</msg>
+  <msg key="common_discard">Wegwerpen</msg>
   <msg key="common_edit">Bewerken</msg>
   <msg key="common_finish">Eindigen</msg>
+  <msg key="common_go">Ga</msg>
   <msg key="common_help">Hulp</msg>
   <msg key="common_login">Login</msg>
+  <msg key="common_needs_approval">Behoeft Toestemming</msg>
   <msg key="common_next">Volgende</msg>
   <msg key="common_no">Nee</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">Open</msg>
   <msg key="common_previous">Vorige</msg>
   <msg key="common_register">Aanmelden</msg>
+  <msg key="common_repeat">Herhaal</msg>
   <msg key="common_reset">Reset</msg>
   <msg key="common_save">Opslaan</msg>
   <msg key="common_stop">Stop</msg>
@@ -25,4 +32,9 @@
   <msg key="common_yes">Ja</msg>
   <msg key="member_role_pretty_name">Lid</msg>
   <msg key="member_role_pretty_plural">Leden</msg>
+  <msg key="member_state_approved">Goedgekeurd</msg>
+  <msg key="member_state_banned">Geweerd</msg>
+  <msg key="member_state_deleted">Verwijderd</msg>
+  <msg key="member_state_needs_approval">Behoeft toestemming</msg>
+  <msg key="member_state_rejected">Geweigerd</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.8
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.no_NO.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="no_NO" charset="ISO-8859-1">
 
   <msg key="member_role_pretty_name">Medlem</msg>
   <msg key="member_role_pretty_plural">Medlemmer</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pl_PL.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="pl_PL" charset="utf-8">
 
   <msg key="member_role_pretty_name">Członek</msg>
   <msg key="member_role_pretty_plural">Członkowie</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.8
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.9
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoridade</msg>
+  <msg key="common_add">Adicionar</msg>
   <msg key="common_apply">Aplicar</msg>
   <msg key="common_cancel">Cancelar</msg>
   <msg key="common_close">Fechar</msg>
+  <msg key="common_closed">Fechado</msg>
   <msg key="common_continue">Continuar</msg>
   <msg key="common_default">Utilizar defini��es por defeito</msg>
   <msg key="common_delete">Eliminar</msg>
   <msg key="common_discard">Descartar</msg>
   <msg key="common_edit">Editar</msg>
   <msg key="common_finish">Concluir</msg>
+  <msg key="common_go">Ir</msg>
   <msg key="common_help">Ajuda</msg>
   <msg key="common_login">Log in</msg>
+  <msg key="common_needs_approval">Necessitam Aprova��o</msg>
   <msg key="common_next">Pr�ximo</msg>
   <msg key="common_no">N�o</msg>
+  <msg key="common_ok">OK</msg>
+  <msg key="common_open">Aberto</msg>
   <msg key="common_previous">Anterior</msg>
   <msg key="common_register">Registrar</msg>
+  <msg key="common_repeat">Repetir</msg>
   <msg key="common_reset">Restaurar</msg>
   <msg key="common_save">Guardar</msg>
   <msg key="common_stop">Parar</msg>
@@ -25,4 +32,9 @@
   <msg key="common_yes">Sim</msg>
   <msg key="member_role_pretty_name">Membro</msg>
   <msg key="member_role_pretty_plural">Membros</msg>
+  <msg key="member_state_approved">Aprovado</msg>
+  <msg key="member_state_banned">Banido</msg>
+  <msg key="member_state_deleted">Deletado</msg>
+  <msg key="member_state_needs_approval">Necessitam aprova��o</msg>
+  <msg key="member_state_rejected">Rejeitado</msg>
 </message_catalog>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.6
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.pt_PT.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="pt_PT" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Autoridade</msg>
   <msg key="common_apply">Aplicar</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.3
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.ru_RU.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.4
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="ru_RU" charset="utf-8">
 
   <msg key="authentication_authority">Удостоверение подлинности</msg>
   <msg key="common_apply">Применить</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml	3 Nov 2003 12:52:09 -0000	1.7
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.sv_SE.ISO-8859-1.xml	26 Feb 2004 15:28:41 -0000	1.8
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="sv_SE" charset="ISO-8859-1">
 
   <msg key="authentication_authority">Dom�n</msg>
   <msg key="common_apply">OK</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.tr_TR.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="tr_TR" charset="utf-8">
 
   <msg key="member_role_pretty_name">Üye</msg>
   <msg key="member_role_pretty_plural">Üyeler</msg>
Index: openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml	3 Nov 2003 12:52:09 -0000	1.2
+++ openacs-4/packages/acs-kernel/catalog/acs-kernel.zh_TW.utf-8.xml	26 Feb 2004 15:28:41 -0000	1.3
@@ -1,6 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-kernel" package_version="5.0.0a2" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-kernel" package_version="5.0.0" locale="zh_TW" charset="utf-8">
 
-  <msg key="member_role_pretty_name">member_role_pretty_name</msg>
-  <msg key="member_role_pretty_plural">member_role_pretty_plural</msg>
+  <msg key="authentication_authority">權限</msg>
+  <msg key="common_add">增加</msg>
+  <msg key="common_apply">申請</msg>
+  <msg key="common_cancel">取消</msg>
+  <msg key="common_close">關閉</msg>
+  <msg key="common_closed">關閉的</msg>
+  <msg key="common_continue">繼續</msg>
+  <msg key="common_default">使用預設值</msg>
+  <msg key="common_delete">刪除</msg>
+  <msg key="common_discard">放棄</msg>
+  <msg key="common_edit">編輯</msg>
+  <msg key="common_finish">完成</msg>
+  <msg key="common_go">Go</msg>
+  <msg key="common_help">幫助</msg>
+  <msg key="common_login">登入</msg>
+  <msg key="common_needs_approval">需要核准</msg>
+  <msg key="common_next">下一個</msg>
+  <msg key="common_no">否</msg>
+  <msg key="common_ok">好</msg>
+  <msg key="common_open">開啟</msg>
+  <msg key="common_previous">前一個</msg>
+  <msg key="common_register">註冊</msg>
+  <msg key="common_repeat">重複</msg>
+  <msg key="common_reset">重置</msg>
+  <msg key="common_save">儲存</msg>
+  <msg key="common_stop">停止</msg>
+  <msg key="common_update">更新</msg>
+  <msg key="common_view">檢視</msg>
+  <msg key="common_yes">是</msg>
+  <msg key="member_role_pretty_name">會員</msg>
+  <msg key="member_role_pretty_plural">會員們</msg>
+  <msg key="member_state_approved">核准的</msg>
+  <msg key="member_state_banned">禁止的</msg>
+  <msg key="member_state_deleted">刪除的</msg>
+  <msg key="member_state_needs_approval">需要核准</msg>
+  <msg key="member_state_rejected">拒絕的</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.AR_EG.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.AR_EG.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="AR_EG" charset="utf-8">
 
   <msg key="English">إنجليزيّ</msg>
   <msg key="French">فَرَنْسِيّ</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.AR_LB.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml	3 Nov 2003 09:53:14 -0000	1.2
+++ openacs-4/packages/acs-lang/catalog/acs-lang.AR_LB.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="AR_LB" charset="utf-8">
 
   <msg key="English">إنجليزيّ</msg>
   <msg key="French">فَرَنْسِيّ</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/catalog/acs-lang.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.TH_TH.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.3
+++ openacs-4/packages/acs-lang/catalog/acs-lang.TH_TH.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.4
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="TH_TH" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="TH_TH" charset="utf-8">
 
   <msg key="English">ภาษาอังกฤษ</msg>
   <msg key="French">ภาษาฝรั่งเศส</msg>
   <msg key="German">ภาษาเยอรมัน</msg>
+  <msg key="localization-am_str">AM</msg>
+  <msg key="localization-pm_str">PM</msg>
   <msg key="Spanish">ภาษาสเปน</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.8
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ast_ES.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="ast_ES" charset="ISO-8859-1">
 
   <msg key="English">Ingl�s</msg>
   <msg key="French">Franc�s</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/catalog/acs-lang.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.10
+++ openacs-4/packages/acs-lang/catalog/acs-lang.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.11
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="English">Engelsk</msg>
   <msg key="French">Fransk</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.12
+++ openacs-4/packages/acs-lang/catalog/acs-lang.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.13
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="English">Englisch</msg>
   <msg key="French">Franz�sisch</msg>
   <msg key="German">Deutsch</msg>
   <msg key="localization-abday">{So} {Mo} {Di} {Mi} {Do} {Fr} {Sa}</msg>
-  <msg key="localization-abmon">{Jan} {Feb} {M�r} {Apr} {Mai} {Jun} {Jul} {Aug} {Sep} {Okt} {Nov} {Dez}</msg>
-  <msg key="localization-am_str"></msg>
-  <msg key="localization-currency_symbol">�</msg>
+  <msg key="localization-abmon">{Jan} {Feb} {Mrz} {Apr} {Mai} {Jun} {Jul} {Aug} {Sep} {Okt} {Nov} {Dez}</msg>
+  <msg key="localization-am_str">A.M.</msg>
+  <msg key="localization-currency_symbol">?</msg>
   <msg key="localization-d_fmt">%d.%m.%Y</msg>
-  <msg key="localization-d_t_fmt">%a %d %B %Y %H:%M %Z</msg>
+  <msg key="localization-d_t_fmt">%a, %d. %B %Y %H:%M %Z</msg>
   <msg key="localization-day">{Sonntag} {Montag} {Dienstag} {Mittwoch} {Donnerstag} {Freitag} {Samstag}</msg>
   <msg key="localization-decimal_point">,</msg>
-  <msg key="localization-dlong_fmt">%d %B %Y</msg>
-  <msg key="localization-dlongweekday_fmt">%A %d %B %Y</msg>
+  <msg key="localization-dlong_fmt">%d. %B %Y</msg>
+  <msg key="localization-dlongweekday_fmt">%A, %d. %B %Y</msg>
   <msg key="localization-firstdayofweek">1</msg>
   <msg key="localization-formbuilder_time_format">HH24:MI</msg>
   <msg key="localization-frac_digits">2</msg>
@@ -31,7 +31,7 @@
   <msg key="localization-p_cs_precedes">1</msg>
   <msg key="localization-p_sep_by_space">0</msg>
   <msg key="localization-p_sign_posn">1</msg>
-  <msg key="localization-pm_str"></msg>
+  <msg key="localization-pm_str">P.M.</msg>
   <msg key="localization-positive_sign"></msg>
   <msg key="localization-t_fmt">%H:%M</msg>
   <msg key="localization-thousands_sep">.</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.el_GR.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="el_GR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="el_GR" charset="utf-8">
 
   <msg key="English">Αγγλικά</msg>
   <msg key="French">Γαλλικά</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.5
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_GB.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="en_GB" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="en_GB" charset="ISO-8859-1">
 
   <msg key="localization-abday">{Sun} {Mon} {Tue} {Wed} {Thu} {Fri} {Sat}</msg>
   <msg key="localization-abmon">{Jan} {Feb} {Mar} {Apr} {May} {Jun} {Jul} {Aug} {Sep} {Oct} {Nov} {Dec}</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:52 -0000	1.14
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.15
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="en_US" charset="ISO-8859-1">
 
   <msg key="available-in-this-language">Available in English</msg>
-  <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of "English".</description>
+  <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of &quot;English&quot;.</description>
 
   <msg key="English">English</msg>
   <msg key="French">French</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.12
+++ openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.13
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="English">Ingl�s</msg>
   <msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.fi_FI.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="fi_FI" charset="utf-8">
 
   <msg key="English">Englanti</msg>
   <msg key="French">Ranska</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.12
+++ openacs-4/packages/acs-lang/catalog/acs-lang.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.13
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="fr_FR" charset="ISO-8859-1">
 
   <msg key="English">Anglais</msg>
   <msg key="French">Fran�ais</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.8
+++ openacs-4/packages/acs-lang/catalog/acs-lang.gl_ES.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="gl_ES" charset="ISO-8859-1">
 
   <msg key="English">Ingl�s</msg>
   <msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml	3 Nov 2003 09:53:14 -0000	1.2
+++ openacs-4/packages/acs-lang/catalog/acs-lang.hu_HU.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.3
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="hu_HU" charset="utf-8">
 
   <msg key="localization-decimal_point">,</msg>
+  <msg key="localization-grouping">3 3</msg>
   <msg key="localization-thousands_sep">.</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.10
+++ openacs-4/packages/acs-lang/catalog/acs-lang.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.11
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="it_IT" charset="ISO-8859-1">
 
   <msg key="English">Inglese</msg>
   <msg key="French">Francese</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml	3 Nov 2003 09:53:14 -0000	1.2
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ja_JP.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="ja_JP" charset="utf-8">
 
   <msg key="English">英語</msg>
   <msg key="French">フランス語</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ko_KR.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="ko_KR" charset="utf-8">
 
   <msg key="English">영어</msg>
   <msg key="French">프랑스어</msg>
@@ -20,7 +20,7 @@
   <msg key="localization-grouping">3 3 </msg>
   <msg key="localization-int_curr_symbol">KRW </msg>
   <msg key="localization-int_frac_digits">2</msg>
-  <msg key="localization-mon">{1¿?} {2¿?} {3¿?} {4¿?} {5¿?} {6¿?} {7¿?} {8¿?} {9¿?} {10¿?} {11¿?} {12¿?}</msg>
+  <msg key="localization-mon">{1월} {2월} {3월} {4월} {5월} {6월} {7월} {8월} {9월} {10월} {11월} {12월}</msg>
   <msg key="localization-mon_decimal_point">.</msg>
   <msg key="localization-mon_grouping">3 3 </msg>
   <msg key="localization-mon_thousands_sep">,</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/Attic/acs-lang.ms_my.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml	3 Nov 2003 09:53:14 -0000	1.2
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ms_my.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="ms_my" charset="utf-8">
 
   <msg key="English">Inggeris</msg>
   <msg key="French">Perancis</msg>
@@ -17,7 +17,23 @@
   <msg key="localization-firstdayofweek">0</msg>
   <msg key="localization-formbuilder_time_format">HH12:MI AM</msg>
   <msg key="localization-frac_digits">2</msg>
+  <msg key="localization-grouping">3 3</msg>
   <msg key="localization-int_curr_symbol">RM</msg>
   <msg key="localization-int_frac_digits">.</msg>
   <msg key="localization-mon">{Januari} {Februari} {Mac} {April} {Mei} {Jun} {Julai} {Ogos} {September} {Oktober} {November} {Disember}</msg>
+  <msg key="localization-mon_decimal_point">.</msg>
+  <msg key="localization-mon_grouping">3 3</msg>
+  <msg key="localization-mon_thousands_sep">,</msg>
+  <msg key="localization-n_cs_precedes">1</msg>
+  <msg key="localization-n_sep_by_space">0</msg>
+  <msg key="localization-n_sign_posn">1</msg>
+  <msg key="localization-negative_sign">-</msg>
+  <msg key="localization-p_cs_precedes">1</msg>
+  <msg key="localization-p_sep_by_space">0</msg>
+  <msg key="localization-p_sign_posn">1</msg>
+  <msg key="localization-pm_str">PM</msg>
+  <msg key="localization-positive_sign"></msg>
+  <msg key="localization-t_fmt">%r</msg>
+  <msg key="localization-thousands_sep">,</msg>
+  <msg key="Spanish">Sepanyol</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:14 -0000	1.11
+++ openacs-4/packages/acs-lang/catalog/acs-lang.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.12
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="English">Engels</msg>
   <msg key="French">Frans</msg>
   <msg key="German">Duits</msg>
-  <msg key="localization-abday">{Zon} {Maan} {Dins} {Woens} {Donder} {Vrij} {Zater}</msg>
-  <msg key="localization-abmon">{Jan} {Feb} {Mrt} {Apr} {Mei} {Jun} {Jul} {Aug} {Sep} {Okt} {Nov} {Dec}</msg>
+  <msg key="localization-abday">{zon} {maa} {din} {woe} {don} {vri} {zat}</msg>
+  <msg key="localization-abmon">{jan} {feb} {mrt} {apr} {mei} {jun} {jul} {aug} {sep} {okt} {nov} {dec}</msg>
   <msg key="localization-am_str">Voormiddag</msg>
   <msg key="localization-currency_symbol">?</msg>
   <msg key="localization-d_fmt">%d.%m.%Y</msg>
   <msg key="localization-d_t_fmt">%a %d %B %Y %H:%M %Z</msg>
-  <msg key="localization-day">{Zondag} {Maandag} {Dinsdag} {Woensdag} {Donderdag} {Vrijdag} {Zaterdag}</msg>
+  <msg key="localization-day">{zondag} {maandag} {dinsdag} {woensdag} {donderdag} {vrijdag} {zaterdag}</msg>
   <msg key="localization-decimal_point">,</msg>
   <msg key="localization-dlong_fmt">%d %B %Y</msg>
   <msg key="localization-dlongweekday_fmt">%A %d %B %Y</msg>
@@ -20,7 +20,7 @@
   <msg key="localization-grouping">3 3 </msg>
   <msg key="localization-int_curr_symbol">EUR </msg>
   <msg key="localization-int_frac_digits">2</msg>
-  <msg key="localization-mon">{Januari} {Februari} {Maart} {April} {Mei} {Juni} {Juli} {Augustus} {September} {Oktober} {November} {December}</msg>
+  <msg key="localization-mon">{januari} {februari} {maart} {april} {mei} {juni} {juli} {augustus} {september} {oktober} {november} {december}</msg>
   <msg key="localization-mon_decimal_point">,</msg>
   <msg key="localization-mon_grouping">3 3 </msg>
   <msg key="localization-mon_thousands_sep">.</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.9
+++ openacs-4/packages/acs-lang/catalog/acs-lang.no_NO.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.10
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="no_NO" charset="ISO-8859-1">
 
   <msg key="English">Engelsk</msg>
   <msg key="French">Fransk</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pl_PL.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="pl_PL" charset="utf-8">
 
   <msg key="English">Angielski</msg>
   <msg key="French">Francuski</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.8
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="English">Ingl�s</msg>
   <msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.4
+++ openacs-4/packages/acs-lang/catalog/acs-lang.pt_PT.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="pt_PT" charset="ISO-8859-1">
 
   <msg key="English">Ingl�s</msg>
   <msg key="French">Franc�s</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.ru_RU.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="ru_RU" charset="utf-8">
 
   <msg key="English">Английский</msg>
   <msg key="French">Французский</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.sh_HR.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="sh_HR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="sh_HR" charset="utf-8">
 
   <msg key="English">Engleski</msg>
   <msg key="French">Francuski</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml	15 Oct 2003 15:28:20 -0000	1.9
+++ openacs-4/packages/acs-lang/catalog/acs-lang.sv_SE.ISO-8859-1.xml	26 Feb 2004 15:28:42 -0000	1.10
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="sv_SE" charset="ISO-8859-1">
 
   <msg key="English">Engelska</msg>
   <msg key="French">Franska</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.tr_TR.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="tr_TR" charset="utf-8">
 
   <msg key="English">İnglizce</msg>
   <msg key="French">Fransızca</msg>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml	15 Oct 2003 15:04:41 -0000	1.1
+++ openacs-4/packages/acs-lang/catalog/acs-lang.zh_TW.utf-8.xml	26 Feb 2004 15:28:42 -0000	1.2
@@ -1,8 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-lang" package_version="5.0d3" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-lang" package_version="5.0.1" locale="zh_TW" charset="utf-8">
 
   <msg key="English">英文</msg>
   <msg key="French">法文</msg>
   <msg key="German">德文</msg>
+  <msg key="localization-abday">日 一 二 三 四 五 六</msg>
+  <msg key="localization-abmon">一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月</msg>
+  <msg key="localization-am_str">上午</msg>
+  <msg key="localization-currency_symbol">$</msg>
+  <msg key="localization-d_fmt">%m%d%y</msg>
+  <msg key="localization-d_t_fmt"> %a %B %d, %Y %r %Z</msg>
+  <msg key="localization-day">週日 週一 週二 週三 週四 週五 週六</msg>
+  <msg key="localization-decimal_point">.</msg>
+  <msg key="localization-dlong_fmt">%Y年%B月%d日</msg>
+  <msg key="localization-dlongweekday_fmt">%A %B %d, %Y</msg>
+  <msg key="localization-firstdayofweek">0</msg>
+  <msg key="localization-formbuilder_time_format">上午 HH12:MI</msg>
+  <msg key="localization-frac_digits">2</msg>
+  <msg key="localization-grouping">3 3</msg>
+  <msg key="localization-int_curr_symbol">NTD</msg>
+  <msg key="localization-int_frac_digits">2</msg>
+  <msg key="localization-mon">一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月</msg>
+  <msg key="localization-mon_decimal_point">.</msg>
+  <msg key="localization-mon_grouping">3 3</msg>
+  <msg key="localization-mon_thousands_sep">,</msg>
+  <msg key="localization-n_cs_precedes">1</msg>
+  <msg key="localization-n_sep_by_space">0</msg>
+  <msg key="localization-n_sign_posn">1</msg>
+  <msg key="localization-negative_sign">-</msg>
+  <msg key="localization-p_cs_precedes">1</msg>
+  <msg key="localization-p_sep_by_space">0</msg>
+  <msg key="localization-p_sign_posn">1</msg>
+  <msg key="localization-pm_str">下午</msg>
+  <msg key="localization-positive_sign">+</msg>
+  <msg key="localization-t_fmt">%r</msg>
+  <msg key="localization-thousands_sep">,</msg>
   <msg key="Spanish">西班牙文</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	1 Oct 2003 10:50:51 -0000	1.23
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	26 Feb 2004 15:28:43 -0000	1.24
@@ -154,7 +154,7 @@
 insert into ad_locales 
        (locale, label, language, country, nls_language, nls_territory, 
         nls_charset, mime_charset, default_p, enabled_p)
- values ('tl_PH', 'Tagalog (PH)', 'tl', 'PH', 'AMERICAN', 'ALGERIA', 'WE8ISO8859P1', 'ISO-8859-1', 't', 'f');
+ values ('tl_PH', 'Tagalog (PH)', 'tl', 'PH', 'TAGALOG', 'PHILIPPINES', 'WE8ISO8859P1', 'ISO-8859-1', 't', 'f');
 
 insert into ad_locales 
        (locale, label, language, country, nls_language, nls_territory, 
@@ -235,3 +235,23 @@
        (locale, label, language, country, nls_language, nls_territory, 
         nls_charset, mime_charset, default_p, enabled_p)
  values ('zh_TW', 'Chinese (TW)', 'zh ', 'TW', 'TRADITIONAL CHINESE', 'TAIWAN', 'ZHT16BIG5', 'Big5', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('hu_HU', 'Hungarian (HU)', 'hu ', 'HU', 'HUNGARIAN', 'HUNGARY', 'EE8ISO8859P2', 'ISO-8859-2', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('FA_IR', 'Farsi', 'FA ', 'IR', 'AMERICAN', 'ALGERIAN', 'AL24UTFFSS', 'windows-1256', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('RO_RO', 'Romainian', 'RO ', 'RO', 'ROMAINIAN', 'ROMAINIA', 'EE8ISO8859P2', 'UTF-8', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('HR_HR', 'Croatian', 'HR', 'HR', 'CROATIAN', 'CROATIA','UTF8','UTF-8','t','f');
Index: openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	26 Jan 2004 15:39:45 -0000	1.12
+++ openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql	26 Feb 2004 15:28:43 -0000	1.13
@@ -70,7 +70,10 @@
     into an nsv_array.
 ';
 
-create table lang_messages_audit (    
+create table lang_messages_audit (
+    audit_id           integer
+                       constraint lang_messages_audit_pk
+                       primary key,    
     message_key        varchar2(200)
                        constraint lang_messages_audit_key_nn
                        not null,
@@ -96,14 +99,14 @@
     overwrite_user     integer
                        constraint lang_messages_audit_ou_fk
                        references users (user_id),
-    constraint lang_messages_audit_pk
-    primary key (package_key, message_key, locale, overwrite_date),
     constraint lang_messages_audit_fk
     foreign key (message_key, package_key) 
     references lang_message_keys(message_key, package_key)
     on delete cascade
 );
 
+create sequence lang_messages_audit_id_seq;
+
 -- ****************************************************************************
 -- * The lang_translate_columns table holds the columns that require translation.
 -- * It is needed to generate the user interface for translating the web site.
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0-5.0.1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0b4-5.0.0b5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0b4-5.0.0b5.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0b4-5.0.0b5.sql	26 Jan 2004 15:39:45 -0000	1.2
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0b4-5.0.0b5.sql	26 Feb 2004 15:28:44 -0000	1.3
@@ -29,29 +29,5 @@
 -- Missing this primary key made some queries below very slow
 alter table lang_messages_audit add constraint lang_messages_audit_pk primary key (package_key, message_key, locale, overwrite_date);
 
--- Make sure sync_time is not null for the first message imported. If we don't
--- do this we are missing a set of base messages to merge against on the next 
--- catalog import.
--- Messages with only one revision
-
--- Messages with only one revision
--- This query is slow. Not sure how to speed it up.
-update lang_messages lm
-       set lm.sync_time = sysdate
-       where not exists (select 1
-                               from lang_messages_audit lma
-                               where lma.package_key = lm.package_key
-                                 and lma.message_key = lm.message_key
-                                 and lma.locale = lm.locale
-                              );
-
--- Messages with multiple revisions
--- This query is slow as well.
- update lang_messages_audit lma1
-        set lma1.sync_time = sysdate
-        where lma1.overwrite_date = (select min(lma2.overwrite_date)
-                                    from lang_messages_audit lma2
-                                    where lma2.package_key = lma1.package_key
-                                      and lma2.message_key = lma1.message_key
-                                      and lma2.locale      = lma1.locale
-                                    );
+-- We have to leave sync_time null since we don't know when the messages in the db were last in sync
+-- with the catalog files
Index: openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql	23 Sep 2003 08:55:45 -0000	1.21
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql	26 Feb 2004 15:28:44 -0000	1.22
@@ -163,7 +163,7 @@
 insert into ad_locales 
        (locale, label, language, country, nls_language, nls_territory, 
         nls_charset, mime_charset, default_p, enabled_p)
- values ('tl_PH', 'Tagalog (PH)', 'tl', 'PH', 'AMERICAN', 'ALGERIA', 'WE8ISO8859P1', 'ISO-8859-1', 't', 'f');
+ values ('tl_PH', 'Tagalog (PH)', 'tl', 'PH', 'TAGALOG', 'PHILIPPINES', 'WE8ISO8859P1', 'ISO-8859-1', 't', 'f');
 
 insert into ad_locales 
        (locale, label, language, country, nls_language, nls_territory, 
@@ -245,5 +245,24 @@
         nls_charset, mime_charset, default_p, enabled_p)
  values ('zh_TW', 'Chinese (TW)', 'zh ', 'TW', 'TRADITIONAL CHINESE', 'TAIWAN', 'ZHT16BIG5', 'Big5', 't', 'f');
 
-end;
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('hu_HU', 'Hungarian (HU)', 'hu ', 'HU', 'HUNGARIAN', 'HUNGARY', 'EE8ISO8859P2', 'ISO-8859-2', 't', 'f');
 
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('FA_IR', 'Farsi', 'FA ', 'IR', 'AMERICAN', 'ALGERIAN', 'AL24UTFFSS', 'windows-1256', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('RO_RO', 'Romainian', 'RO ', 'RO', 'ROMAINIAN', 'ROMAINIA', 'EE8ISO8859P2', 'UTF-8', 't', 'f');
+
+insert into ad_locales 
+       (locale, label, language, country, nls_language, nls_territory, 
+        nls_charset, mime_charset, default_p, enabled_p)
+ values ('HR_HR', 'Croatian', 'HR', 'HR', 'CROATIAN', 'CROATIA','UTF8','UTF-8','t','f');
+
+end;
Index: openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql	26 Jan 2004 15:39:45 -0000	1.15
+++ openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql	26 Feb 2004 15:28:44 -0000	1.16
@@ -66,6 +66,9 @@
 );
 
 create table lang_messages_audit (    
+    audit_id           integer
+                       constraint lang_messages_audit_pk
+                       primary key,    
     message_key        varchar(200)
                        constraint lang_messages_audit_key_nn
                        not null,
@@ -93,14 +96,13 @@
     overwrite_user     integer
                        constraint lang_messages_audit_ou_fk
                        references users (user_id),
-    constraint lang_messages_audit_pk
-    primary key (package_key, message_key, locale, overwrite_date),
     constraint lang_messages_audit_fk
     foreign key (message_key, package_key) 
     references lang_message_keys(message_key, package_key)
     on delete cascade
 );
 
+create sequence lang_messages_audit_id_seq;
 
 -- ****************************************************************************
 -- * The lang_translate_columns table holds the columns that require translation.
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0-5.0.1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql	26 Jan 2004 15:39:45 -0000	1.3
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0b4-5.0.0b5.sql	26 Feb 2004 15:28:45 -0000	1.4
@@ -29,29 +29,5 @@
 -- Missing this primary key made some queries below very slow
 alter table lang_messages_audit add constraint lang_messages_audit_pk primary key (package_key, message_key, locale, overwrite_date);
 
--- Make sure sync_time is not null for the first message imported. If we don't
--- do this we are missing a set of base messages to merge against on the next 
--- catalog import.
--- Messages with only one revision
-
--- Messages with only one revision
--- This query is slow. Not sure how to speed it up.
-update lang_messages 
-       set sync_time = current_timestamp
-       where not exists (select 1
-                               from lang_messages_audit lma
-                               where lma.package_key = lang_messages.package_key
-                                 and lma.message_key = lang_messages.message_key
-                                 and lma.locale = lang_messages.locale
-                              );
-
--- Messages with multiple revisions
--- This query is slow as well.
- update lang_messages_audit 
-        set sync_time = current_timestamp
-        where overwrite_date = (select max(lma2.overwrite_date)
-                                    from lang_messages_audit lma2
-                                    where lma2.package_key = lang_messages_audit.package_key
-                                      and lma2.message_key = lang_messages_audit.message_key
-                                      and lma2.locale      = lang_messages_audit.locale
-                                    );
+-- We have to leave sync_time null since we don't know when the messages in the db were last in sync
+-- with the catalog files
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql	11 Dec 2003 21:39:53 -0000	1.3
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql	26 Feb 2004 15:28:46 -0000	1.4
@@ -4,10 +4,10 @@
 
   <fullquery name="lang::audit::changed_message.lang_message_audit">
     <querytext>
-          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+          insert into lang_messages_audit (audit_id, package_key, message_key, locale, old_message, comment_text, overwrite_user,
                                            deleted_p, sync_time, conflict_p, upgrade_status) 
-            values (:package_key, :message_key, :locale, empty_clob(), empty_clob(), :overwrite_user,
-                                           :deleted_p, :sync_time, :conflict_p, :upgrade_status)  
+            values (lang_messages_audit_id_seq.nextval, :package_key, :message_key, :locale, empty_clob(), empty_clob(), 
+                    :overwrite_user, :deleted_p, :sync_time, :conflict_p, :upgrade_status)  
           returning old_message, comment_text into :1, :2
     </querytext>
   </fullquery>
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.4
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql	26 Feb 2004 15:28:46 -0000	1.5
@@ -4,10 +4,10 @@
 
   <fullquery name="lang::audit::changed_message.lang_message_audit">
     <querytext>
-          insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+          insert into lang_messages_audit (audit_id, package_key, message_key, locale, old_message, comment_text, overwrite_user,
                                            deleted_p, sync_time, conflict_p, upgrade_status) 
-            values (:package_key, :message_key, :locale, :old_message, :comment, :overwrite_user,
-                                           :deleted_p, :sync_time, :conflict_p, :upgrade_status) 
+            values (nextval('lang_messages_audit_id_seq'::text), :package_key, :message_key, :locale, :old_message, 
+                    :comment, :overwrite_user, :deleted_p, :sync_time, :conflict_p, :upgrade_status) 
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	11 Dec 2003 21:39:53 -0000	1.2
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql	26 Feb 2004 15:28:46 -0000	1.3
@@ -36,7 +36,7 @@
         where  lma1.package_key = :package_key
         and    lma1.locale = :locale
         and    lma1.sync_time is not null
-        and    lma1.overwrite_date = (select max(lma2.overwrite_date)
+        and    lma1.audit_id = (select max(lma2.audit_id)
                                       from lang_messages_audit lma2
                                       where lma2.package_key = lma1.package_key
                                         and lma2.message_key = lma1.message_key
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.2
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql	26 Feb 2004 15:28:46 -0000	1.3
@@ -37,7 +37,7 @@
         where  lma1.package_key = :package_key
         and    lma1.locale = :locale
         and    lma1.sync_time is not null
-        and    lma1.overwrite_date = (select max(lma2.overwrite_date)
+        and    lma1.audit_id = (select max(lma2.audit_id)
                                       from lang_messages_audit lma2
                                       where lma2.package_key = lma1.package_key
                                         and lma2.message_key = lma1.message_key
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	26 Jan 2004 15:39:45 -0000	1.38
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	26 Feb 2004 15:28:46 -0000	1.39
@@ -712,8 +712,8 @@
     @param locale             The locale of the messages.
 
     @return An array list containing the number of messages processed, number of messages added, 
-            number of messages updated, and the number of messages deleted by the import. The keys of the
-            array list are processed, added, updated, and deleted.
+            number of messages updated, number of messages deleted by the import, and a list of errors produced. The keys of the
+            array list are processed, added, updated, and deleted, and errors.
 
     @author Peter Marklund
     @author Lars Pind
@@ -722,13 +722,14 @@
     set message_count(added) 0
     set message_count(updated) 0
     set message_count(deleted) 0
+    set message_count(errors) [list]
 
     # Form arrays for all three sets of messages
     array set file_messages $file_messages_list
-    array set db_messages [messages_in_db \
+    array set db_messages [lang::catalog::messages_in_db \
                                -package_key $package_key \
                                -locale $locale]
-    array set base_messages [last_sync_messages \
+    array set base_messages [lang::catalog::last_sync_messages \
                                -package_key $package_key \
                                -locale $locale]
 
@@ -910,18 +911,22 @@
         }
 
         # Store a new message in the database if we are adding or updating
+        set error_p 0
         if { [string equal $upgrade_status "added"] || [string equal $upgrade_status "updated"] } {
 
             ns_log Debug "lang::catalog::import_messages - invoking lang::message::register with import_case=\"$import_case\" -update_sync=$update_sync_p $message_key $upgrade_status $conflict_p"
-            lang::message::register \
+            if { [catch {lang::message::register \
                 -update_sync \
                 -upgrade_status $upgrade_status \
                 -conflict=$conflict_p \
                 $locale \
                 $package_key \
                 $message_key \
-                $file_messages($message_key)
-
+                $file_messages($message_key)} errmsg] } {
+                
+                lappend message_count(errors) $errmsg
+                set error_p 1
+            }
         } elseif { $update_sync_p || [string equal $upgrade_status "deleted"] } {
             # Set the upgrade_status, deleted_p, conflict_p, and sync_time properties of the message
 
@@ -935,18 +940,24 @@
             }
             
             ns_log Debug "lang::catalog::import_messages - invoking lang::message::edit with import_case=\"$import_case\" -update_sync=$update_sync_p $message_key [array get edit_array]"
-            lang::message::edit \
+            if { [catch {lang::message::edit \
                 -update_sync=$update_sync_p \
                 $package_key \
                 $message_key \
                 $locale \
-                [array get edit_array]
+                [array get edit_array]} errmsg] } {
+
+                lappend message_count(errors) $errmsg
+                set error_p 1
+            }
         } else {
             ns_log Debug "lang::catalog::import_messages - not doing anything: import_case=\"$import_case\" $message_key $upgrade_status $conflict_p"
         }
 
         if { [lsearch -exact {added updated deleted} $upgrade_status] != -1 } {
-            incr message_count($upgrade_status)
+            if { ! $error_p } {
+                incr message_count($upgrade_status)
+            }
         } 
         incr message_count(processed)
 
@@ -972,8 +983,8 @@
     @param cache       Provide this switch if you want the proc to cache all the imported messages
 
     @return An array list containing the number of messages processed, number of messages added, 
-            number of messages updated, and the number of messages deleted by the import. The keys of the
-            array list are processed, added, updated, and deleted.
+            number of messages updated, number of messages deleted by the import, and a list of errors produced. The keys of the
+            array list are processed, added, updated, and deleted, and errors.
 
     @see lang::catalog::import_messages
 
@@ -983,6 +994,7 @@
     set message_count(added) 0
     set message_count(updated) 0
     set message_count(deleted) 0
+    set message_count(errors) [list]
 
     if { ![empty_string_p $package_key] } {
         set package_key_list $package_key
@@ -1015,19 +1027,22 @@
             continue
         }
 
-        array unset loop_message_count
         foreach file_path $catalog_files {
             # Use a catch so that parse failure of one file doesn't cause the import of all files to fail
+            array unset loop_message_count
             if { [catch { array set loop_message_count [lang::catalog::import_from_file $file_path] } errMsg] } {
                 global errorInfo
                 
                 ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n"
-            } 
+            } else {
+                foreach action [array names loop_message_count] {
+                    if { ![string equal $action "errors"] } {
+                        set message_count($action) [expr $message_count($action) + $loop_message_count($action)]
+                    }
+                }
+                set message_count(errors) [concat $message_count(errors) $loop_message_count(errors)]
+            }
         }
-
-        foreach action [array names loop_message_count] {
-            set message_count($action) [expr $message_count($action) + $loop_message_count($action)]
-        }
     }
 
     if { $cache_p } {
Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	26 Jan 2004 15:39:45 -0000	1.41
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	26 Feb 2004 15:28:46 -0000	1.42
@@ -93,8 +93,9 @@
             # The system will not function correctly if there are keys registered in other locales
             # than en_US that are not present for en_US. This introduces the inconvenience of having to
             # register the en_US messages first, but that is manageable
-            ns_log Error "lang::message::register - refusing to register message for non-en_US locale ${locale}. The message key ${package_key}.${message_key} bust be registered in en_US first"
-            return -1
+            set error_message "lang::message::register - refusing to register message for non-en_US locale ${locale}. The message key ${package_key}.${message_key} bust be registered in en_US first"
+            ns_log Error $error_message
+            error $error_message
         }
     }
 
@@ -227,6 +228,36 @@
         ]
 }
 
+ad_proc -public lang::message::revert {
+    {-package_key:required}
+    {-message_key:required}
+    {-locale:required}
+} {
+    Revert a message to the last overwritten version of it, i.e. revert the last change.
+
+    @author Peter Marklund
+} {
+    set last_overwritten_message [db_string select_last_overwritten_message {
+        select old_message
+        from lang_messages_audit lma1
+        where lma1.package_key = :package_key
+          and lma1.message_key = :message_key
+          and lma1.locale = :locale
+          and lma1.audit_id = (select max(lma2.audit_id)
+                               from lang_messages_audit lma2
+                               where lma2.package_key = lma1.package_key
+                                 and lma2.message_key = lma1.message_key
+                                 and lma2.locale = lma1.locale
+                               )                          
+    }]
+    
+    lang::message::register \
+        $locale \
+        $package_key \
+        $message_key \
+        $last_overwritten_message
+}
+
 ad_proc -public lang::message::get_element {
     -package_key:required
     -message_key:required
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	11 Feb 2004 14:48:34 -0000	1.30
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	26 Feb 2004 15:28:46 -0000	1.31
@@ -330,7 +330,7 @@
         set message_key [string range $replacement_string 1 [expr [string length $replacement_string] - 2]]
         
         # Attempt a message lookup
-        set message_value [_ $message_key]
+        set message_value [lang::message::lookup [ad_conn locale] $message_key "" "" 2]
         
         # Replace the string
         # LARS: We don't use regsub here, because regsub interprets certain characters
Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/import-messages.adp	30 Jan 2004 14:53:06 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/import-messages.adp	26 Feb 2004 15:28:47 -0000	1.4
@@ -21,6 +21,14 @@
   deleted: @message_count.deleted@.
 </p>
 
+<if @message_count.errors@ not nil>
+<p>
+  The following errors were produced:
+
+  @errors_list;noquote@
+</p>
+</if>
+
 <if @conflict_count@ gt 0>
   <font color="red">There are @conflict_count@ message conflicts in the database.</font> 
 
Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	26 Jan 2004 15:39:45 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	26 Feb 2004 15:28:47 -0000	1.4
@@ -23,4 +23,10 @@
                         -package_key $package_key \
                         -locale $locale]
 
+set errors_list "<ul>
+  <li>
+    [join $message_count(errors) "</li><li>"]
+</ul>
+"
+
 set conflict_url [export_vars -base message-conflicts { package_key locale }]
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	26 Jan 2004 15:39:45 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	26 Feb 2004 15:28:47 -0000	1.4
@@ -24,7 +24,15 @@
     -name messages \
     -multirow messages \
     -no_data "There are no conflicts" \
+    -sub_class narrow \
     -elements {
+        edit {
+            label ""
+            display_template {
+                <img src="/shared/images/Edit16.gif" border="0" width="16" height="16">
+            }
+            link_url_col edit_url
+        }
         package_key {
             label "Package"
         }
@@ -34,31 +42,36 @@
         locale {
             label "Locale"
         }
+        accept {
+            label ""
+            display_template "Accept new"
+            link_url_col accept_url
+        }
         message {
-            label "Message"
-            link_url_col edit_url
-            display_eval {[string_truncate -len 50 -- $message]}
+            label "New Message"
+            display_col message_truncated
         }
-        upgrade_status {
-            label "Status"
+        old_message {
+            label "Old Message"
+            display_col old_message_truncated
         }
-        accept {
+        revert {
             label ""
-            display_template {
-                Mark resolved
-            }
-            link_url_col accept_url
-            link_html {title "Click to accept current state of message and consider conflict resolved."}
+            display_template "Revert to old"
+            link_url_col revert_url
         }
+        upgrade_status {
+            label "Status"
+        }
     } -filters {
         locale {
             label "Locale"
-            where_clause "locale = :locale"
+            where_clause "lm.locale = :locale"
             values {[db_list_of_lists locales {select distinct locale, locale from lang_messages where conflict_p = 't'}]}
         }
         package_key {
             label "Package"
-            where_clause "package_key = :package_key"
+            where_clause "lm.package_key = :package_key"
             values {[db_list_of_lists packages {
                 select pt.pretty_name, 
                        pt.package_key 
@@ -71,7 +84,7 @@
         }
         upgrade_status {
             label "Status"
-            where_clause "upgrade_status = :upgrade_status"
+            where_clause "lm.upgrade_status = :upgrade_status"
             values {[db_list_of_lists upgrade_statuses {
                 select distinct upgrade_status, upgrade_status
                 from lang_messages
@@ -80,17 +93,34 @@
         }
     }
 
-db_multirow -unclobber -extend { edit_url accept_url } messages select_messages "
-    select package_key,
-           locale,
-           message_key,
-           message,
-           deleted_p,
-           upgrade_status
-    from lang_messages
-    where conflict_p = 't'
+db_multirow -unclobber -extend { edit_url accept_url revert_url message_truncated old_message_truncated } messages select_messages "
+    select lm.package_key,
+           lm.locale,
+           lm.message_key,
+           lm.message,
+           lma.old_message,
+           lm.deleted_p,
+           lm.upgrade_status
+    from lang_messages lm,
+         lang_messages_audit lma
+    where lm.conflict_p = 't'
+      and lm.package_key = lma.package_key
+      and lm.message_key = lma.message_key
+      and lm.locale = lma.locale
+      and lma.audit_id = (select max(audit_id)
+                          from lang_messages_audit lma2
+                          where lma2.package_key = lm.package_key
+                            and lma2.message_key = lm.message_key
+                            and lma2.locale = lm.locale
+                          )
     [template::list::filter_where_clauses -and -name messages]
+    order by lm.package_key, lm.message_key
 " {
     set edit_url [export_vars -base "edit-localized-message" { package_key locale message_key }]
+
     set accept_url [export_vars -base "message-conflict-resolve" { package_key locale message_key {return_url [ad_return_url]}}]
+    set revert_url [export_vars -base "message-conflict-revert" { package_key locale message_key {return_url [ad_return_url]}}]
+
+    set message_truncated [string_truncate -len 150 -- $message]
+    set old_message_truncated [string_truncate -len 150 -- $old_message]
 }
Index: openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql	11 Dec 2003 21:39:53 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql	26 Feb 2004 15:28:47 -0000	1.4
@@ -10,7 +10,8 @@
     select lmk.message_key,
            lm1.message as default_message,
            lm2.message as translated_message,
-           lmk.description
+           lmk.description,
+           nvl(lm2.deleted_p, 'f') as deleted_p
     from   lang_messages lm1,
            lang_messages lm2,
            lang_message_keys lmk
@@ -21,7 +22,6 @@
     and    lm2.locale (+) = :locale
     and    lm2.message_key (+) = lmk.message_key
     and    lm2.package_key (+) = lmk.package_key
-    and    (lm2.deleted_p = 'f' or lm2.deleted_p is null)
     and    lm1.deleted_p = 'f'
     $where_clause
     order  by upper(lm1.message_key), lm1.message_key
Index: openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	16 Feb 2004 15:28:37 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	26 Feb 2004 15:28:47 -0000	1.4
@@ -9,7 +9,8 @@
     select lm1.message_key,
            lm1.message as default_message,
            lm2.message as translated_message,
-           lmk.description
+           lmk.description,
+           coalesce(lm2.deleted_p, 'f') as deleted_p
     from   lang_messages lm1 left outer join 
            lang_messages lm2 on (lm2.locale = :locale and lm2.message_key = lm1.message_key and lm2.package_key = lm1.package_key),
            lang_message_keys lmk
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	30 Jan 2004 14:53:06 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	26 Feb 2004 15:28:47 -0000	1.8
@@ -56,9 +56,14 @@
               </td>
               <td>@messages.default_message@</td>
               <if @default_locale@ ne @current_locale@>
-                <td>
-                  <if @messages.translated_message@ not nil>@messages.translated_message@</if>
-                  <else><span style="color: gray; font-style: italic;">Not translated</span></else>
+                <td>                  
+                  <if @messages.deleted_p@>
+                    <span style="color: red; font-style: italic;">DELETED</span> (@messages.translated_message@)
+                  </if>
+                  <else>
+                    <if @messages.translated_message@ not nil>@messages.translated_message@</if>
+                    <else><span style="color: gray; font-style: italic;">Not translated</span></else>
+                  </else>
                 </td>
               </if>
               <if @messages.translated_message@ not nil>
Index: openacs-4/packages/acs-reference/acs-reference.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/acs-reference.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-reference/acs-reference.info	12 Feb 2004 15:34:25 -0000	1.13
+++ openacs-4/packages/acs-reference/acs-reference.info	26 Feb 2004 15:28:48 -0000	1.14
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.0.1" url="http://openacs.org/repository/download/apm/acs-reference-5.0.1.apm">
+    <version name="5.0.2" url="http://openacs.org/repository/download/apm/acs-reference-5.0.2.apm">
         <owner url="mailto:jon@jongriffin.com">Jon Griffin</owner>
         <summary>Tools and API for managing refrence data.</summary>
         <release-date>2004-01-26</release-date>
@@ -19,7 +19,7 @@
 &lt;li&gt; Monitoring the usage of reference data.
 &lt;/ul&gt;</description>
 
-        <provides url="acs-reference" version="5.0.1"/>
+        <provides url="acs-reference" version="5.0.2"/>
         <requires url="acs-kernel" version="5.0.0"/>
 
         <callbacks>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/catalog/acs-subsite.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml	3 Nov 2003 12:52:10 -0000	1.2
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ch_zh.utf-8.xml	26 Feb 2004 15:28:49 -0000	1.3
@@ -1,6 +1,269 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="ch_zh" charset="utf-8">
 
-  <msg key="Email">窮徨喨周</msg>
-  <msg key="Password">笥綜</msg>
+  <msg key="_or">，否则</msg>
+  <msg key="A_member_of_the_system">%system_name%团体的会员</msg>
+  <msg key="About_You">关于我……</msg>
+  <msg key="Account_at_system_closed">您在%system_name%的帐户已关闭。</msg>
+  <msg key="Account_close_confirm_no_label">不，返回%pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">是，请关闭帐户。</msg>
+  <msg key="Account_closed">&lt;p&gt;您的帐户已关闭。&lt;/p&gt; &lt;p&gt;我们可以为您&lt;a href=&quot;%restore_url%&quot;&gt;重新打开&lt;/a&gt;。&lt;/p&gt; </msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt; &lt;font color=&quot;red&quot;&gt; &lt;b&gt; 您的帐户已关闭。可以重新&lt;/b&gt; &lt;/font&gt; &lt;a href=&quot;%=&quot;%login_url%%&quot;&gt;登陆&lt;/a&gt; 查看有关情况。 &lt;/p&amp;;gt; </msg>
+  <msg key="Account_reopened_message">您在%system_name%的帐户重新打开，欢迎回来。</msg>
+  <msg key="Account_reopened_title">帐户重新打开</msg>
+  <msg key="Action">动作</msg>
+  <msg key="Add_new_app">加入新申请</msg>
+  <msg key="Admin">管理</msg>
+  <msg key="Administer_subsite">管理%subsite_name%</msg>
+  <msg key="Administrative_options">用户管理选项</msg>
+  <msg key="Alert_Type">提示类型</msg>
+  <msg key="another_picture">另一幅图片。</msg>
+  <msg key="Answer">解答</msg>
+  <msg key="Application_Error">申请错误</msg>
+  <msg key="Applications">申请</msg>
+  <msg key="Approve">批准</msg>
+  <msg key="at">在</msg>
+  <msg key="Authority">权限</msg>
+  <msg key="Bad_Password">密码错误</msg>
+  <msg key="Ban">禁止</msg>
+  <msg key="Basic_Information">基本信息</msg>
+  <msg key="Biography">自传</msg>
+  <msg key="cannot_retrieve_password">不支持通过本地权限重新找回密码。</msg>
+  <msg key="Cannot_see_memb_list">不能浏览会员列表</msg>
+  <msg key="Change_locale_label">改变语言</msg>
+  <msg key="Change_my_Password">改变密码</msg>
+  <msg key="Change_pass_email_por">改变密码、email、肖像</msg>
+  <msg key="Check_Your_Inbox">检查收件箱</msg>
+  <msg key="Children">子</msg>
+  <msg key="Close_account_explanation">&lt;p&gt; 请确认您要关闭在%system_name%的帐户。 &lt;/p&gt; &lt;p&gt; 关闭帐户意味着我们将不再给你发邮件通知，也不会再为您显示%system_name%的会员列表。但是，您的资料作为团体历史记录的一部分将被保留下来。&lt;/p&gt; &lt;p&gt; 注意：您可以随时登陆，重新打开您的帐户。&lt;/p&gt;</msg>
+  <msg key="Close_your_account">关闭帐户</msg>
+  <msg key="Comment">评论</msg>
+  <msg key="Communities">团体</msg>
+  <msg key="communities">团体</msg>
+  <msg key="community">团体</msg>
+  <msg key="Confirm">确认</msg>
+  <msg key="Continue">继续</msg>
+  <msg key="Country_Name">国家名</msg>
+  <msg key="Create_new_community">创建新%pretty_name%</msg>
+  <msg key="Current_Password">当前密码</msg>
+  <msg key="Currently_invisible_msg">当前的在线状态为不可见。</msg>
+  <msg key="Currently_visible_msg">当前的在线状态为可见。</msg>
+  <msg key="Customize_Question">用户化问题</msg>
+  <msg key="Database_Error">数据库错误</msg>
+  <msg key="default_context">缺省上下文</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="DevAdmin">开发管理</msg>
+  <msg key="Developers_Admin">开发人员管理</msg>
+  <msg key="Direct_Permissions">直接允许</msg>
+  <msg key="Disable">使不能</msg>
+  <msg key="Disabled">使不能的</msg>
+  <msg key="Domain">管区</msg>
+  <msg key="E_mail">E-mail</msg>
+  <msg key="edit_comment">编辑评论</msg>
+  <msg key="Elements_not_editable">被%authority_name%管理的特定对象不可编辑。</msg>
+  <msg key="Email">Email</msg>
+  <msg key="email_body_Forgotten_password">这是您新的登陆信息：%account_id_label%: %account_id% %password_label%: %password%请点击下面的链接更改密码。</msg>
+  <msg key="email_body_Registration_password">感谢您注册%system_name%. 这里是如何登陆%system_url%: %account_id_label%: %account_id% %password_label%: %password% 请点击下面的链接更改密码。</msg>
+  <msg key="Email_Confirmation">Email确认</msg>
+  <msg key="Email_not_Requested">不能申请Email</msg>
+  <msg key="email_subject_Forgotten_password">您在%system_name%忘记的密码</msg>
+  <msg key="email_subject_Registration_password">欢迎来到%system_name%</msg>
+  <msg key="Enabled">使能的</msg>
+  <msg key="Enter_your_username_to">输入用户名开始恢复密码。</msg>
+  <msg key="Erase_Portrait">擦除肖像</msg>
+  <msg key="erase_portrait">擦除肖像</msg>
+  <msg key="Error">错误</msg>
+  <msg key="Error_sending_mail">发送邮件错误</msg>
+  <msg key="Expires">过期</msg>
+  <msg key="Filename">文件名</msg>
+  <msg key="First_names">名</msg>
+  <msg key="Forgot_your_password">忘记密了码？</msg>
+  <msg key="Frequency">频率</msg>
+  <msg key="Go_back">向后</msg>
+  <msg key="go_upload_the_users_por">上传用户肖像</msg>
+  <msg key="go_upload_your_portrait">上传你的肖像</msg>
+  <msg key="Grant">准予</msg>
+  <msg key="Grant_Permission">准许</msg>
+  <msg key="Hide">隐藏</msg>
+  <msg key="Home_page">主页</msg>
+  <msg key="If_you_were_to">假如你是</msg>
+  <msg key="Information_Updated">信息更新</msg>
+  <msg key="Invite">邀请</msg>
+  <msg key="ISO_Code">ISO编码</msg>
+  <msg key="ISO_Code_List">ISO编码列表</msg>
+  <msg key="ISO_Codes_Not_Loaded">ISO编码没有装载</msg>
+  <msg key="ISO_Codes_not_loaded">ISO编码没有装载</msg>
+  <msg key="Join_community">加入团体</msg>
+  <msg key="Join_group_name">加入%group_name%</msg>
+  <msg key="Join_this_community">加入这个团体</msg>
+  <msg key="Keyword">关键字</msg>
+  <msg key="Last_name">姓</msg>
+  <msg key="later">稍后。</msg>
+  <msg key="Leave_community">离开团体</msg>
+  <msg key="Leave_this_community">离开团体</msg>
+  <msg key="lGo_back_without_adding">不增加任何用户后退</msg>
+  <msg key="Log_In">登陆</msg>
+  <msg key="log_in">登陆</msg>
+  <msg key="Log_in_to_system">登陆到%system_name%</msg>
+  <msg key="logging_back_in">重新登陆</msg>
+  <msg key="Login_has_expired">登陆网页过期。请重新登陆。</msg>
+  <msg key="Login_or_register">登陆或注册</msg>
+  <msg key="login_page">登陆网页</msg>
+  <msg key="Logout">退出</msg>
+  <msg key="Logout_from_system">从%system_name%退出</msg>
+  <msg key="lt__youd_be_able_to_get">，你可以从你的同团体会员那里得到更多的信息。</msg>
+  <msg key="lt_Cannot_join_this_grou">不能加入该组</msg>
+  <msg key="lt_Complete_List_of_ISO_">所有的ISO编码列表</msg>
+  <msg key="lt_Continue_working_with">继续在%system_name%工作</msg>
+  <msg key="lt_Edit_comment_for_the_">编辑%first_names% %last_name%肖像的评论</msg>
+  <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%)已在%system_url%注册</msg>
+  <msg key="lt_For_Site-Wide_Adminis">为网站管理员</msg>
+  <msg key="lt_Grant_Permission_on_n">准许%name%</msg>
+  <msg key="lt_Heres_what_the_databa">这是数据库中的内容</msg>
+  <msg key="lt_How_would_you_like_the">您认为%first_names% %last_name%如何？</msg>
+  <msg key="lt_If_you_dont_think_the">如果你认为此人还没有一个帐户：</msg>
+  <msg key="lt_If_you_happen_to_know">如果你正好知道或相信你所邀请的人已有了此系统的帐户：</msg>
+  <msg key="lt_If_you_need_this_func">如果需要此功能，请安装acs-reference and ref-countries。</msg>
+  <msg key="lt_Inherited_Permissions">继承的许可</msg>
+  <msg key="lt_It_would_be_a_very_ba">如果您使用的是公共计算机，建议不选用该项。否则，使用该计算机的其他人有可能会以您的名义使用系统。</msg>
+  <msg key="lt_New_registration_at_s">新注册到%system_url%</msg>
+  <msg key="lt_Note_text_in_red_below">注意：参数域下面文本为红色标记时表示此参数的值被OpenACS参数文件拒绝。一般不建议使用参数文件，但是某些网站需要它提供特定值。</msg>
+  <msg key="lt_Note_that_you_can_era">注意：在你的工作空间中选择&quot;退出&quot;，取消你存储的email地址和密码。</msg>
+  <msg key="lt_num_children_Children">%num_children%子隐藏</msg>
+  <msg key="lt_On_portrait_publish_d">%portrait_publish_date%日，您上传了&lt;a href=&quot;%subsite_url%user/portrait/?return_url=%pvt_home_url%&quot;&gt;%portrait_title%&lt;/a&gt; </msg>
+  <msg key="lt_Our_server_can_tell_y">服务器可以记忆email地址和密码。如果您是个人使用该计算机，就不用每次都输入email地址和密码。</msg>
+  <msg key="lt_Password_Confirmation">密码确认</msg>
+  <msg key="lt_Personal_Home_Page_UR">个人主页URL:</msg>
+  <msg key="lt_Please_locate_your_co">请在下面列表中找到您的国家代码，单击Back钮返回前一表格。</msg>
+  <msg key="lt_Please_read_and_follo">请阅读email中的说明。</msg>
+  <msg key="lt_Please_try_to_a_hrefi">请重新&lt;a href=&quot;index&quot;&gt;登陆&lt;/a&gt;。</msg>
+  <msg key="lt_Portrait_of_first_last">%first_names% %last_name%的肖像</msg>
+  <msg key="lt_Privileges_higher_implied">高权限的用户能自动赋予下级它所具有的权利。如，当授予了管理权后，就能读、写等等。</msg>
+  <msg key="lt_Problem_with_authenti">认定帐户问题</msg>
+  <msg key="lt_Registration_informat">注册信息被发送到%email%。</msg>
+  <msg key="lt_Registration_informat_1">注册信息已发送到%email%。</msg>
+  <msg key="lt_registration_request_submitted">您的注册信息已提交到%system_name%管理员。请等待批准。</msg>
+  <msg key="lt_Saving_email_address_">保存email地址和密码</msg>
+  <msg key="lt_Show_everyone_else_at">在%system_name%上展示风采：</msg>
+  <msg key="lt_Sorry_but_it_seems_th">对不起，您似乎已被%system_name%禁止。</msg>
+  <msg key="lt_Sure_erase_user_por">真的要删除此用户肖像吗？</msg>
+  <msg key="lt_Sure_erase_your_por">真的要删除你的肖像吗？</msg>
+  <msg key="lt_The_picture_of_you_in">您在系统中的图片格式非法，请</msg>
+  <msg key="lt_There_was_a_problem_w">认定帐户有问题。</msg>
+  <msg key="lt_This_is_the_image_that">这是给%system_name%系统中其他用户看的图片</msg>
+  <msg key="lt_This_user_doesnt_have">该用户还没有肖像，您可以</msg>
+  <msg key="lt_This_user_is_deleted">此用户已被该团体删除并禁止。</msg>
+  <msg key="lt_To_confirm_your_regis">请到%confirmation_url%确认注册。</msg>
+  <msg key="lt_Upload_your_favorite">从本地机上传适当格式的文件，如JPEG、GIF。注意：图片必须在本地机上。</msg>
+  <msg key="lt_Uploaded_pretty_date">上传：%pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">上传：%publish_date%</msg>
+  <msg key="lt_Use_the_Browse_button">使用“浏览”按钮找到文件，单击“打开”。</msg>
+  <msg key="lt_We_cant_find_you">在用户列表中找不到您(%user_id%)，您的帐户可能已被删除。</msg>
+  <msg key="lt_We_had_a_problem_proc">处理您的登陆时出现问题。</msg>
+  <msg key="lt_We_were_not_awaiting_">我们一直在等待您的email。肯定有其它错误。</msg>
+  <msg key="lt_Welcome_to_system_nam">欢迎来到%system_name%</msg>
+  <msg key="lt_What_other_people_see">当别人点击你名字时能看到的内容</msg>
+  <msg key="lt_You_cant_have_a_lt_in">您的名字中没有&amp;lt;，否则就象一个HTML标记，容易引起其他用户误解。</msg>
+  <msg key="lt_You_cant_have_a_lt_in_1">您的姓中没有&amp;lt;，否则就象一个HTML标记，容易引起其他用户误解。</msg>
+  <msg key="lt_You_wont_get_any_email">%pretty_date%后您就有一个email。</msg>
+  <msg key="lt_Your_email_has_been_c">您的email已确认。现在可以登陆%system_name%。</msg>
+  <msg key="lt_Your_email_has_been_c_1">您的email已确认。请等候%system_name%管理员的批准。</msg>
+  <msg key="lt_Your_email_is_confirm">您的email已确认</msg>
+  <msg key="lt_Your_login_has_expire">您的登陆过期。请重新输入密码可继续工作。</msg>
+  <msg key="lt_Your_URL_doesnt_have_">URL格式错误。一个有效的URL样式如下：&quot;%valid_url_example%&quot;。</msg>
+  <msg key="Make_administrator">使成为管理员</msg>
+  <msg key="Make_member">使成为会员</msg>
+  <msg key="Make_yourself_invisible_label">使自己不可见</msg>
+  <msg key="Make_yourself_visible_label">使自己可见</msg>
+  <msg key="Manage_your_notifications">管理通知</msg>
+  <msg key="Mem_list_not_allowed">对不起，您不能浏览会员列表。</msg>
+  <msg key="Member_State">会员状态</msg>
+  <msg key="Members">会员</msg>
+  <msg key="Name">姓名</msg>
+  <msg key="New_Password">新密码</msg>
+  <msg key="No_applications">没有申请</msg>
+  <msg key="No_ISO_Codes">没有ISO编码</msg>
+  <msg key="No_package_parameters">此包没有任何参数</msg>
+  <msg key="no_portrait_title_message">我的肖像</msg>
+  <msg key="No_pretty_plural">没有%pretty_plural</msg>
+  <msg key="No_services">没有服务</msg>
+  <msg key="none">没有</msg>
+  <msg key="Not_logged_in">没有登陆的</msg>
+  <msg key="Notes">注意：</msg>
+  <msg key="Notice">注意：</msg>
+  <msg key="on_name_to">%name%：</msg>
+  <msg key="optional">（可选的）</msg>
+  <msg key="Options">选项</msg>
+  <msg key="Or_add_a_new_user">或增加新用户</msg>
+  <msg key="or_the">或这</msg>
+  <msg key="Password">密码</msg>
+  <msg key="Password_changed_body">您在的%system_name%登陆信息：%account_id_label%: %account_id%，您帐户的密码已更改。这仅仅是一个通知。您总可以通过以下步骤更改您的密码：1.登陆%system_name% 2.单击&quot;%pvt_home_name%&quot; 3.选择&quot;%password_update_link_text%&quot; </msg>
+  <msg key="Password_changed_subject">密码已更改</msg>
+  <msg key="Permissions">许可</msg>
+  <msg key="permissions">许可</msg>
+  <msg key="Permissions_for_name">许可%name%</msg>
+  <msg key="Please_return_to_home">请返回%home_link%。</msg>
+  <msg key="Portrait">肖像</msg>
+  <msg key="Question">问题</msg>
+  <msg key="Re_enable">重新使能</msg>
+  <msg key="Recover_Password">恢复密码</msg>
+  <msg key="Register">注册</msg>
+  <msg key="Registration_Approval_Notice">&lt;p&gt; 感谢您注册%system_name%. 管理员已经看到您的申请. &lt;/p&gt; &lt;p&gt; 当您收到申请被批准的email，就可以使用%system_name%。 &lt;/p&gt; </msg>
+  <msg key="Reject">拒绝</msg>
+  <msg key="Remember_my_login">在此计算机上记住我的登陆</msg>
+  <msg key="Remove">移除</msg>
+  <msg key="Req_membership_comm">申请为此团体的会员</msg>
+  <msg key="Request_membership">申请为会员</msg>
+  <msg key="return_to_application">返回申请</msg>
+  <msg key="Revoke_Checked">撤消选中的</msg>
+  <msg key="Role">角色</msg>
+  <msg key="Save_comment">保存评论</msg>
+  <msg key="Screen_name">姓名</msg>
+  <msg key="Search_For_Exist_User">搜索已存在用户</msg>
+  <msg key="Security_context_root">安全上下文根</msg>
+  <msg key="Select_an_Object_by_Id">按ID选择对象：</msg>
+  <msg key="Send_email_to_this_user">给该用户发送email</msg>
+  <msg key="Show">显示</msg>
+  <msg key="Site_wide_administration">网站管理</msg>
+  <msg key="sorry_forgotten_pwd">对不起，对于您忘记的密码无能为力。</msg>
+  <msg key="Status">身份</msg>
+  <msg key="Story_Behind_Photo">照片背后的故事</msg>
+  <msg key="Story_behind_photo">照片背后的故事</msg>
+  <msg key="Subcommunities">子团体</msg>
+  <msg key="subcommunities">子团体</msg>
+  <msg key="subcommunity">子团体</msg>
+  <msg key="Thank_you">谢谢！</msg>
+  <msg key="The_ISO_codes_were_not">此服务器没有安装ISO编码。</msg>
+  <msg key="this_subsite">子网站</msg>
+  <msg key="This_user_has_left_the">此用户已离开该团体。</msg>
+  <msg key="To_log_in_visit_the">要登陆，访问</msg>
+  <msg key="Topic">话题</msg>
+  <msg key="type_specific_info">指定类型信息</msg>
+  <msg key="UP">向上</msg>
+  <msg key="up_to_context_name">上传到%context_name%</msg>
+  <msg key="Update">更新</msg>
+  <msg key="Update_Password">改变密码</msg>
+  <msg key="upload">上传</msg>
+  <msg key="upload_a_portrait">上传肖像</msg>
+  <msg key="upload_a_replacement_por">上传替换肖像</msg>
+  <msg key="Upload_Portrait">上传肖像</msg>
+  <msg key="Username">用户名</msg>
+  <msg key="Vacation_Info_Updated">休假信息已更新</msg>
+  <msg key="Vacation_information_updated">你在%site_link%的休假信息已更新。</msg>
+  <msg key="Welcome_user">欢迎您，%user_name%</msg>
+  <msg key="When_leaving_checkbox_empty">如果不选择该项，您的权限将从团体中撤消。</msg>
+  <msg key="Whos_Online_link_label">当前在线用户</msg>
+  <msg key="Whos_Online_title">在线用户</msg>
+  <msg key="Yes_I_am_sure">是，我肯定</msg>
+  <msg key="You_can_also_browse_from">你也可以浏览</msg>
+  <msg key="You_can_always_re_open">你可以重新打开它，使用</msg>
+  <msg key="You_do_not_have_admin_on">您没有对%root%及其子对象的管理权</msg>
+  <msg key="You_dont_have_a_portrait">你还没有肖像。可以</msg>
+  <msg key="You_have_admin_rights_on">你有对以下各项的管理权：</msg>
+  <msg key="You_have_no_email_alerts">你没有注册email提示。</msg>
+  <msg key="Your_Account">我的帐户</msg>
+  <msg key="Your_discussion_alerts">你的论坛提示</msg>
+  <msg key="Your_Portrait">我的肖像</msg>
+  <msg key="Your_system_alerts">你的%gc_system_name%提示</msg>
+  <msg key="Youre_marked_as_back">%site_link%已被标记为休假结束。</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml	30 Dec 2003 22:08:33 -0000	1.21
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.22
@@ -1,82 +1,294 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0.0b4" locale="da_DK" charset="ISO-8859-1">
 
-  <msg key="About_You">Omkring dig</msg>
+  <msg key="_or">, eller </msg>
+  <msg key="A_member_of_the_system">Medlem af %system_name% siden</msg>
+  <msg key="About_You">Biografi</msg>
+  <msg key="Account_at_system_closed">Din konto i %system_name% er blevet lukket.</msg>
+  <msg key="Account_close_confirm_no_label">Nej, jeg vil tilbage til %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">Ja, luk venligst min konto</msg>
   <msg key="Account_closed">&lt;p&gt;Din konto er i �jeblikket lukket.&lt;/p&gt; &lt;p&gt;Hvis du vil, kan vi &lt;a href=&quot;%restore_url%&quot;&gt;gen�bne kontoen&lt;/a&gt;.&lt;/p&gt; </msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt; &lt;font color=&quot;red&quot;&gt; &lt;b&gt;Din konto er pt. lukket.&lt;/b&gt; &lt;/font&gt; &lt;a href=&quot;%login_url%&quot;&gt;Log ind&lt;/a&gt; igen for at se hvad du kan g�re ved det.&lt;/p&gt;</msg>
+  <msg key="Account_reopened_message">Din konto p� %system_name% er blevet gen�bnet. Velkommen tilbage.</msg>
+  <msg key="Account_reopened_title">Konto Gen�bnet</msg>
+  <msg key="Action">Handling</msg>
+  <msg key="Add_new_app">Tilf�j ny applikation</msg>
+  <msg key="Admin">Admin</msg>
+  <msg key="Administer_subsite">Administrer %subsite_name%</msg>
+  <msg key="Administrative_options">Administrative muligheder for denne bruger</msg>
+  <msg key="Alert_Type">Alarmtype</msg>
+  <msg key="another_picture">et andet billede.</msg>
   <msg key="Answer">Svar:</msg>
+  <msg key="Application_Error">Fejl i Applikation</msg>
+  <msg key="Applications">Applikationer</msg>
+  <msg key="Approve">Godkend</msg>
   <msg key="at">p�</msg>
-  <msg key="Bad_Password">D�rlig adgangskode</msg>
-  <msg key="Basic_Information">Staminformation</msg>
-  <msg key="cannot_retrieve_password">Der er ikke underst�ttet afhentning af adgangskoden hos den lokale autoritet.</msg>
-  <msg key="Change_my_Password">�ndr min adgangskode</msg>
+  <msg key="Authority">Autoritet</msg>
+  <msg key="Bad_Password">Forkert Adgangskode</msg>
+  <msg key="Ban">Bandlys</msg>
+  <msg key="Basic_Information">Stamoplysninger</msg>
+  <msg key="Biography">Biografi</msg>
+  <msg key="cannot_retrieve_password">Overf�rsel af adgangskode fra den lokale autoritet er ikke underst�ttet.</msg>
+  <msg key="Cannot_see_memb_list">Kan ikke se medlemslisten</msg>
+  <msg key="Change_locale_label">Skift sprog</msg>
+  <msg key="Change_my_Password">�ndre min adgangskode</msg>
+  <msg key="Change_pass_email_por">�ndre password, e-mail, portr�t</msg>
   <msg key="Check_Your_Inbox">Tjek din indbakke</msg>
   <msg key="Children">B�rn</msg>
+  <msg key="Close_account_explanation">&lt;p&gt; Bekr�ft venligst at du gerne vil lukke din konto p� %system_name%. &lt;/p&gt;
+&lt;p&gt; Lukning af din konto indeb�rer at vi ikke l�ngere vil sende dig beskeder med e-mail. Du vil heller ikke optr�de p� medlemslisten p� %system_name%. Dine bidrag til gruppen vil dog blive bevaret, da de er en del af gruppens historik. &lt;/p&gt; &lt;p&gt;Bem�rk at du n�r som helst kan gen�bne din konto ved simpelthen at logge ind igen.</msg>
+  <msg key="Close_your_account">Luk din konto</msg>
+  <msg key="Comment">Kommentar</msg>
+  <msg key="Communities">Grupper</msg>
+  <msg key="communities">grupper</msg>
+  <msg key="community">gruppe</msg>
   <msg key="Confirm">Bekr�ft:</msg>
+  <msg key="Continue">Forts�t</msg>
+  <msg key="Country_Name">Land</msg>
+  <msg key="Create_new_community">Opret nyt %pretty_name%</msg>
   <msg key="Current_Password">Nuv�rende adgangskode:</msg>
+  <msg key="Currently_invisible_msg">&lt;p&gt; Din status er ikke synlig for andre brugere. &lt;/p&gt;</msg>
+  <msg key="Currently_visible_msg">&lt;p&gt; Din status er synlig for andre brugere. &lt;/p&gt;</msg>
   <msg key="Customize_Question">Tilpas sp�rgsm�l</msg>
-  <msg key="Direct_Permissions">Direkte rettigheder</msg>
+  <msg key="Database_Error">Databasefejl</msg>
+  <msg key="default_context">standardkontekst</msg>
+  <msg key="Delete">Slet</msg>
+  <msg key="DevAdmin">DevAdmin</msg>
+  <msg key="Developers_Admin">Administration for Udviklere</msg>
+  <msg key="Direct_Permissions">Direkte Rettigheder</msg>
+  <msg key="Disable">Deaktiv�r</msg>
+  <msg key="Disabled">Deaktiveret</msg>
+  <msg key="Domain">Dom�ne</msg>
+  <msg key="E_mail">E-mail</msg>
+  <msg key="edit_comment">rediger kommentar</msg>
+  <msg key="Elements_not_editable">Visse elementer kan ikke redigeres fordi de styres af %authority_name%.</msg>
   <msg key="Email">E-mail</msg>
-  <msg key="Email_Confirmation">E-mailbeskr�ftigelse</msg>
-  <msg key="Email_not_Requested">E-mail blev ikke forespurgt</msg>
+  <msg key="email_body_Forgotten_password">Her er din nye logininformation:
+
+%account_id_label%: %account_id%
+%password_label%: %password%
+
+Klik venligst p� f�lgende link for at �ndre din adgangskode nu:
+
+%reset_password_url%</msg>
+  <msg key="email_body_Registration_password">Tak fordi du registrerede dig p� %system_name%.
+
+Her er hvordan du logger ind p� %system_url%:
+
+%account_id_label%: %account_id%
+%password_label%: %password%</msg>
+  <msg key="Email_Confirmation">E-mailbeskr�ftelse</msg>
+  <msg key="Email_not_Requested">E-mail blev ikke anmodet</msg>
+  <msg key="email_subject_Forgotten_password">Din glemte adgangskode til %system_name%</msg>
+  <msg key="email_subject_Registration_password">Velkommen til %system_name%</msg>
+  <msg key="Enabled">Aktiveret</msg>
+  <msg key="Enter_your_username_to">Indtast dit brugernavn for at generhverve din adgangskode.</msg>
+  <msg key="Erase_Portrait">Slet Portr�t</msg>
+  <msg key="erase_portrait">slet portr�t</msg>
+  <msg key="Error">Fejl</msg>
   <msg key="Error_sending_mail">Fejl ved afsendelse af mail</msg>
+  <msg key="Expires">Udl�ber</msg>
+  <msg key="Filename">Filnavn</msg>
   <msg key="First_names">Fornavn(e)</msg>
-  <msg key="Grant">Giv</msg>
-  <msg key="Grant_Permission">Giv adgang</msg>
-  <msg key="Join_group_name">Slut til %group_name%</msg>
+  <msg key="Forgot_your_password">Glemt din adgangskode?</msg>
+  <msg key="Frequency">Frekvens</msg>
+  <msg key="Go_back">G� tilbage</msg>
+  <msg key="go_upload_the_users_por">upload brugerens portr�t</msg>
+  <msg key="go_upload_your_portrait">indsend dit portr�t</msg>
+  <msg key="Grant">Tildel</msg>
+  <msg key="Grant_Permission">Tildel Rettighed</msg>
+  <msg key="Hide">Skjul</msg>
+  <msg key="Home_page">Hjemmeside</msg>
+  <msg key="If_you_were_to">Hvis du skulle</msg>
+  <msg key="Information_Updated">Oplysninger Opdateret</msg>
+  <msg key="Invite">Invit�r</msg>
+  <msg key="ISO_Code">ISO-kode</msg>
+  <msg key="ISO_Code_List">Liste over ISO-koder</msg>
+  <msg key="ISO_Codes_Not_Loaded">ISO-koder ikke indl�st</msg>
+  <msg key="ISO_Codes_not_loaded">ISO-koder ikke indl�st</msg>
+  <msg key="Join_community">Tilmeld gruppe</msg>
+  <msg key="Join_group_name">Meld ind i %group_name%</msg>
+  <msg key="Join_this_community">Tilmeld denne gruppe</msg>
+  <msg key="Keyword">Stikord</msg>
   <msg key="Last_name">Efternavn</msg>
+  <msg key="later">senere.</msg>
+  <msg key="Leave_community">Forlad gruppen</msg>
+  <msg key="Leave_this_community">Forlad denne gruppe</msg>
+  <msg key="lGo_back_without_adding">Tilbage uden at oprette nogen brugere</msg>
   <msg key="Log_In">Log ind</msg>
-  <msg key="lt_Cannot_join_this_grou">Kan ikke tilslutte denne gruppe.</msg>
+  <msg key="log_in">log ind</msg>
+  <msg key="Log_in_to_system">Log ind p� %system_name%</msg>
+  <msg key="logging_back_in">logge ind igen</msg>
+  <msg key="Login_has_expired">Denne loginside er udl�bet. Log venligst ind igen.</msg>
+  <msg key="Login_or_register">Log ind eller tilmeld</msg>
+  <msg key="login_page">loginside</msg>
+  <msg key="Logout">Log ud</msg>
+  <msg key="Logout_from_system">Log ud fra %system_name%</msg>
+  <msg key="lt__youd_be_able_to_get"> ville du kunne se flere oplysninger om de andre medlemmer af din gruppe.</msg>
+  <msg key="lt_Cannot_join_this_grou">Kan ikke tilmeldes denne gruppe.</msg>
+  <msg key="lt_Complete_List_of_ISO_">Fuldst�ndig liste over ISO-koder</msg>
+  <msg key="lt_Continue_working_with">Forts�t med %system_name%</msg>
+  <msg key="lt_Edit_comment_for_the_">Rediger kommentar til portr�ttet af %first_names% %last_name%</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) registeret som bruger af %system_url% </msg>
-  <msg key="lt_Grant_Permission_on_n">Giv tilladelse til %name%</msg>
-  <msg key="lt_Inherited_Permissions">Nedarvede rettigheder</msg>
-  <msg key="lt_It_would_be_a_very_ba">Det er en meget d�rlig id� at v�lge denne mulighed, hvis du bruger en delt computer p� et bibliotek eller p� en skole. Alle senere brugere af denne maskine vil kunne bruge denne service i dit navn.</msg>
-  <msg key="lt_New_registration_at_s">Ny registrering p� %system_url% </msg>
-  <msg key="lt_Note_that_you_can_era">Bem�rk, at du kan slette den gemte e-mailadresse og adgangskode ved at v�lge &quot;log ud&quot; fra din arbejdsplads.</msg>
-  <msg key="lt_num_children_Children">%num_children% B�rn skjult</msg>
-  <msg key="lt_On_portrait_publish_d">Den %portrait_publish_date%, uploadede du &lt;a href=&quot;%subsite_url%user/portrait/?return_url=%pvt_home_url%&quot;&gt;%portrait_title%&lt;/a&gt; </msg>
-  <msg key="lt_Our_server_can_tell_y">Vore server kan fort�lle din browser, at den skal gemme visse ting s�som din e-mailadresse og din adgangskode. Dette er smart, fordi du - hvis du er den eneste, der bruger din computer - ikke bliver n�dt til at fort�lle os din e-mailadresse og din kode hver gang du bes�ger siden.</msg>
-  <msg key="lt_Password_Confirmation">Bekr�ftigelse af adgangskode:</msg>
+  <msg key="lt_For_Site-Wide_Adminis">For administratorer for hele sitet</msg>
+  <msg key="lt_Grant_Permission_on_n">Tildel rettighed til %name%</msg>
+  <msg key="lt_Heres_what_the_databa">Her er hvad databasen meldte tilbage:</msg>
+  <msg key="lt_How_would_you_like_the">Hvordan vil du have at verden skal se %first_names% %last_name%?</msg>
+  <msg key="lt_If_you_dont_think_the">Hvis du ikke mener at personen allerede har en konto:</msg>
+  <msg key="lt_If_you_happen_to_know">Hvis du mener eller tror at personen du vil invitere allerede har en konto i dette system:</msg>
+  <msg key="lt_If_you_need_this_func">Indl�s acs-reference og ref-countries hvis du har brug for denne funktionalitet.</msg>
+  <msg key="lt_Inherited_Permissions">Nedarvede Rettigheder</msg>
+  <msg key="lt_It_would_be_a_very_ba">Det ville v�re en meget d�rlig id� at v�lge denne mulighed hvis du bruger en delt computer p� et bibliotek eller en skole. Alle senere brugere af denne computer vil kunne udgive sig for at v�re dig.</msg>
+  <msg key="lt_New_registration_at_s">Ny tilmelding p� %system_url% </msg>
+  <msg key="lt_Note_text_in_red_below">Den r�de tekst under parameterens indtastningsfelt angiver den parameterv�rdi som bliver tilsidesat af en linje i OpenACS's parameterfil. Brugen af parameterfilen frar�des, men visse sites beh�ver den for at oprette instansspecifikke v�rdier for parametrene uafh�ngigt af apm_parameter tabellerne.</msg>
+  <msg key="lt_Note_that_you_can_era">Bem�rk at du kan slette den gemte e-mail-adresse og adgangskode ved at v�lge &quot;log ud&quot; fra din arbejdsplads.</msg>
+  <msg key="lt_num_children_Children">%num_children% b�rn er skjult</msg>
+  <msg key="lt_On_portrait_publish_d">Den %portrait_publish_date% indsendte du &lt;a href=&quot;%subsite_url%user/portrait/?return_url=%pvt_home_url%&quot;&gt;%portrait_title%&lt;/a&gt; </msg>
+  <msg key="lt_Our_server_can_tell_y">Vores server kan fort�lle din browser at den skal gemme visse oplysninger, s�som din e-mail-adresse og din adgangskode. Dette er smart, fordi du &amp;mdash; hvis du er den eneste der bruger din computer &amp;mdash; ikke bliver n�dt til at fort�lle os din e-mail-adresse og din kode hver gang du bes�ger siden.</msg>
+  <msg key="lt_Password_Confirmation">Bekr�ft Adgangskode</msg>
   <msg key="lt_Personal_Home_Page_UR">URL til personlig hjemmeside:</msg>
+  <msg key="lt_Please_locate_your_co">Find dit lands kode blandt dem p� listen. Brug derefter din browsers &quot;Tilbage&quot;-knap for at returnere til formularen.</msg>
   <msg key="lt_Please_read_and_follo">L�s og f�lg venligst instruktionerne i denne e-mail.</msg>
   <msg key="lt_Please_try_to_a_hrefi">Pr�v venligst at &lt;a href=&quot;index&quot;&gt;logge ind&lt;/a&gt; igen</msg>
+  <msg key="lt_Portrait_of_first_last">Portr�t af %first_names% %last_name%</msg>
+  <msg key="lt_Privileges_higher_implied">Rettigheder h�jere i hierarkiet medf�rer alle lavere rettigheder. N�r du fx. tildeler administrationsrettigheder, medf�rer det automatisk l�sning, skrivning, osv.</msg>
   <msg key="lt_Problem_with_authenti">Problem med godkendelse</msg>
-  <msg key="lt_Registration_informat">Registreringsinformation til denne service er netop blevet sendt til %email%.</msg>
-  <msg key="lt_Registration_informat_1">Registreringsinformation til denne service er blevet sendt til %email%.</msg>
-  <msg key="lt_registration_request_submitted">Din registreringsforesp�rgsel er blevet til administratoren p� %system_name%. Den venter stadig p� godkendelse.</msg>
-  <msg key="lt_Saving_email_address_">Gemmer e-mailadresse og adgangskode</msg>
-  <msg key="lt_Show_everyone_else_at">Vis alle andre p� %system_name% hvor godt, du ser ud:</msg>
-  <msg key="lt_Sorry_but_it_seems_th">Beklager, men det lader til, at du er bandlyst fra %system_name%.</msg>
+  <msg key="lt_Registration_informat">Tilmeldingsoplysninger til denne tjeneste er netop blevet sendt til %email%.</msg>
+  <msg key="lt_Registration_informat_1">Tilmeldelsesoplysninger til denne service er blevet sendt til %email%.</msg>
+  <msg key="lt_registration_request_submitted">Din tilmeldingsforesp�rgsel er sendt til administratoren p� %system_name%. Den venter stadig p� at blive godkendt.</msg>
+  <msg key="lt_Saving_email_address_">Gemmer e-mail-adresse og adgangskode</msg>
+  <msg key="lt_Show_everyone_else_at">Vis alle andre p� %system_name% hvor godt du ser ud:</msg>
+  <msg key="lt_Sorry_but_it_seems_th">Beklager, men det lader til at du er bandlyst fra %system_name%.</msg>
+  <msg key="lt_Sure_erase_user_por">Er du sikker p� at du vil slette denne brugers portr�t?</msg>
+  <msg key="lt_Sure_erase_your_por">Er du sikker p� at du vil slette dit portr�t?</msg>
+  <msg key="lt_The_picture_of_you_in">Billedet af dig i systemet er ugyldigt. Venligst</msg>
   <msg key="lt_There_was_a_problem_w">Der opstod problemer ved godkendelse af din konto</msg>
-  <msg key="lt_To_confirm_your_regis">G� venligt til %confirmation_url% for at bekr�fte din registrering</msg>
-  <msg key="lt_We_were_not_awaiting_">Vi afventer ikke din e-mail. Der m� v�re sket en fejl.</msg>
+  <msg key="lt_This_is_the_image_that">Dette er billedet vi viser til andre brugere i %system_name%</msg>
+  <msg key="lt_This_user_doesnt_have">Denne bruger har endnu ikke et portr�t. Du kan</msg>
+  <msg key="lt_This_user_is_deleted">Denne bruger er slettet og bandlyst fra gruppen.</msg>
+  <msg key="lt_To_confirm_your_regis">Forts�t venligt til %confirmation_url% for at bekr�fte din tilmelding</msg>
+  <msg key="lt_Upload_your_favorite">Indsend din �nskede fil, en scannet JPEG eller GIF, fra din computer (bem�rk at du ikke kan henvise til et billde der ligger et andet sted p� internettet; dette billede skal v�re p� din computers harddisk).</msg>
+  <msg key="lt_Uploaded_pretty_date">Indsendt: %pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">Indsendt: %publish_date%</msg>
+  <msg key="lt_Use_the_Browse_button">Brug &quot;Gennemse...&quot;-knappen til at finde din fil, klik derefter p� &quot;�bn&quot;.</msg>
+  <msg key="lt_We_cant_find_you">Vi kan ikke finde dig (bruger %user_id%) i brugertabellen. Din konto er h�jst sandsynligt blevet slettet.</msg>
+  <msg key="lt_We_had_a_problem_proc">Vi havde et problem under behandlingen af din indtastning.</msg>
+  <msg key="lt_We_were_not_awaiting_">Vi afventede ikke din e-mail. Der m� v�re sket en fejl.</msg>
   <msg key="lt_Welcome_to_system_nam">Velkommen til %system_name%</msg>
-  <msg key="lt_You_cant_have_a_lt_in">Du kan ikke have et &amp;lt; i dit fornavn, da dette vil se ud som HTML og derfor forvirre andre brugere.</msg>
-  <msg key="lt_You_cant_have_a_lt_in_1">Du kan ikke have et &amp;lt; i dit efternavn, da dette vil se ud som HTML og derfor forvirre andre brugere.</msg>
-  <msg key="lt_Your_email_has_been_c">Din e-mailadresse er blevet bekr�ftet. Du kan nu logge ind p� %system_name%.</msg>
-  <msg key="lt_Your_email_has_been_c_1">Din e-mailadresse er blevet bekr�ftet. Der ventes nu p� godkendelse fra administratoren af %system_name%.</msg>
-  <msg key="lt_Your_email_is_confirm">Din e-mailadresse er blevet bekr�ftet.</msg>
-  <msg key="lt_Your_URL_doesnt_have_">Din URL har ikke den korrekte form. En gyldig URL vil se ud i retningen af \&quot;%valid_url_example%\&quot;.&quot;</msg>
-  <msg key="Name">Navn:</msg>
-  <msg key="New_Password">Ny adgangskode:</msg>
+  <msg key="lt_What_other_people_see">Se hvad andre ser n�r de klikker p� dit navn</msg>
+  <msg key="lt_You_cant_have_a_lt_in">Du kan ikke have et &amp;lt; i dit fornavn da dette vil se ud som HTML og derfor forvirre andre brugere.</msg>
+  <msg key="lt_You_cant_have_a_lt_in_1">Du kan ikke have et &amp;lt; i dit efternavn da dette vil se ud som HTML og derfor forvirre andre brugere.</msg>
+  <msg key="lt_You_wont_get_any_email">Du kommer ikke til at modtage nogen e-mail efter %pretty_date%.</msg>
+  <msg key="lt_Your_email_has_been_c">Din e-mail-adresse er blevet bekr�ftet. Du kan nu logge ind p� %system_name%.</msg>
+  <msg key="lt_Your_email_has_been_c_1">Din e-mail-adresse er blevet bekr�ftet. Der ventes nu p� godkendelse fra administratoren af %system_name%.</msg>
+  <msg key="lt_Your_email_is_confirm">Din e-mail-adresse er blevet bekr�ftet.</msg>
+  <msg key="lt_Your_login_has_expire">Din forbindelse er udl�bet. Indtast venligst din adgangskode igen for at forts�tte med at arbejde.</msg>
+  <msg key="lt_Your_URL_doesnt_have_">Din URL har ikke det korrekte format. En gyldig URL vil se ud i retningen af \&quot;%valid_url_example%\&quot;.</msg>
+  <msg key="Make_administrator">G�r til administrator</msg>
+  <msg key="Make_member">G�r til medlem</msg>
+  <msg key="Make_yourself_invisible_label">G�r dig selv usynlig</msg>
+  <msg key="Make_yourself_visible_label">G�r dig selv usynlig</msg>
+  <msg key="Manage_your_notifications">Administrer dine alarmer</msg>
+  <msg key="Mem_list_not_allowed">Beklager, men du m� ikke se medlemslisten.</msg>
+  <msg key="Member_State">Medlemskabsstatus</msg>
+  <msg key="Members">Medlemmer</msg>
+  <msg key="Name">Navn</msg>
+  <msg key="New_Password">Ny Adgangskode</msg>
+  <msg key="No_applications">Ingen applikationer</msg>
+  <msg key="No_ISO_Codes">Ingen ISO-koder</msg>
+  <msg key="No_package_parameters">Denne pakke har ikke nogen parametre.</msg>
   <msg key="no_portrait_title_message">dit portr�t</msg>
+  <msg key="No_pretty_plural">Ingen %pretty_plural%</msg>
+  <msg key="No_services">Ingen tjenester</msg>
   <msg key="none">ingen</msg>
-  <msg key="Password">Adgangskode:</msg>
-  <msg key="Password_changed_body">Dine informationer til log ind p� %system_name%: %account_id_label%: %account_id% Din adgangskode til den konto er �ndret for nyligt. Det er ikke n�dvendigt for dig at g�re noget; du har kun f�et denne besked for at beskytte din kontos sikkerhed. --------------- Du kan altid �ndre din adgangskode ved at g�re f�lgende: 1. Log ind p� %system_name% 2. Klik p� linket til &quot;%pvt_home_name%&quot; 3. V�lg &quot;%password_update_link_text%&quot; </msg>
+  <msg key="Not_logged_in">Ikke logget ind</msg>
+  <msg key="Notes">Noter:</msg>
+  <msg key="Notice">Meddelelse:</msg>
+  <msg key="on_name_to">p� %name% til:</msg>
+  <msg key="optional">(valgfri)</msg>
+  <msg key="Options">Muligheder</msg>
+  <msg key="Or_add_a_new_user">Eller opret en ny bruger</msg>
+  <msg key="or_the">eller</msg>
+  <msg key="Password">Adgangskode</msg>
+  <msg key="Password_changed_body">Dine informationer til log ind p� %system_name%:
+
+%account_id_label%: %account_id%
+
+Din adgangskode til den konto er �ndret for nyligt. Det er ikke n�dvendigt for dig at g�re noget; du har kun f�et denne besked for at beskytte din kontos sikkerhed.
+
+---------------
+
+Du kan altid �ndre din adgangskode ved at g�re f�lgende:
+1. Log ind p� %system_name%
+2. Klik p� linket til &quot;%pvt_home_name%&quot;
+3. V�lg &quot;%password_update_link_text%&quot; </msg>
   <msg key="Password_changed_subject">Adgangskode �ndret</msg>
   <msg key="Permissions">Rettigheder</msg>
+  <msg key="permissions">rettigheder</msg>
   <msg key="Permissions_for_name">Rettigheder for %name%</msg>
-  <msg key="Question">Sp�rgsm�l:</msg>
-  <msg key="Recover_Password">Gendan adgangskode</msg>
-  <msg key="Register">Registr�r</msg>
+  <msg key="Please_return_to_home">Vend venligst tilbage til %home_link%.</msg>
+  <msg key="Portrait">Portr�t</msg>
+  <msg key="Question">Sp�rgsm�l</msg>
+  <msg key="Re_enable">Genaktiv�r</msg>
+  <msg key="Recover_Password">Gendan Adgangskode</msg>
+  <msg key="Register">Tilmeld</msg>
+  <msg key="Registration_Approval_Notice">&lt;p&gt; Tak for tilmeldingen til %system_name%. En administrator har f�et besked om din anmodning. &lt;/p&gt;
+&lt;p&gt;S� snart du er blevet godkendt, vil du modtage en e-mail, og du kan forts�tte med at bruge %system_name%.</msg>
+  <msg key="Reject">Afvis</msg>
+  <msg key="Remember_my_login">Husk min adgangskode p� denne computer</msg>
+  <msg key="Remove">Fjern</msg>
+  <msg key="Req_membership_comm">Anmod om medlemskab af denne gruppe</msg>
+  <msg key="Request_membership">Anmod om medlemskab</msg>
+  <msg key="return_to_application">vend tilbage til applikation</msg>
   <msg key="Revoke_Checked">Fjern markerede</msg>
+  <msg key="Role">Rolle</msg>
+  <msg key="Save_comment">Gem kommentar</msg>
   <msg key="Screen_name">Sk�rmnavn</msg>
+  <msg key="Search_For_Exist_User">S�g efter en eksisterende bruger</msg>
+  <msg key="Security_context_root">Sikkerhedskontekstens rod</msg>
+  <msg key="Select_an_Object_by_Id">V�lg et objekt efter Id:</msg>
+  <msg key="Send_email_to_this_user">Send e-mail til denne bruger</msg>
   <msg key="Show">Vis</msg>
-  <msg key="sorry_forgotten_pwd">Undskyld, vi kan ikke hj�lpe dig med den glemte adgangskode.</msg>
+  <msg key="Site_wide_administration">Administration for hele sitet</msg>
+  <msg key="sorry_forgotten_pwd">Beklager, vi kan ikke hj�lpe dig med den glemte adgangskode.</msg>
+  <msg key="Status">Status</msg>
+  <msg key="Story_Behind_Photo">Historie Bag Billedet</msg>
+  <msg key="Story_behind_photo">Historie Bag Billedet</msg>
+  <msg key="Subcommunities">Undergrupper</msg>
+  <msg key="subcommunities">undergrupper</msg>
+  <msg key="subcommunity">undergruppe</msg>
   <msg key="Thank_you">Mange tak.</msg>
+  <msg key="The_ISO_codes_were_not">ISO-koderne var ikke indl�st p� denne server.</msg>
+  <msg key="this_subsite">dette undersite</msg>
+  <msg key="This_user_has_left_the">Brugeren har forladt gruppen.</msg>
+  <msg key="To_log_in_visit_the">For at logge ind, bes�g</msg>
+  <msg key="Topic">Emne</msg>
+  <msg key="type_specific_info">typespecifikke oplysninger</msg>
+  <msg key="UP">OP</msg>
   <msg key="up_to_context_name">op til %context_name% </msg>
   <msg key="Update">Opdat�r</msg>
-  <msg key="Update_Password">Opdat�r adgangskode</msg>
-  <msg key="upload_a_portrait">upload et portr�t</msg>
+  <msg key="Update_Password">Opdater Adgangskode</msg>
+  <msg key="upload">indl�s</msg>
+  <msg key="upload_a_portrait">indsend et portr�t</msg>
+  <msg key="upload_a_replacement_por">indsend et erstatningsbillede</msg>
+  <msg key="Upload_Portrait">Indsend Portr�t</msg>
   <msg key="Username">Brugernavn</msg>
-  <msg key="Your_Portrait">Dit portr�t</msg>
+  <msg key="Vacation_Info_Updated">Ferieoplysninger Opdateret</msg>
+  <msg key="Vacation_information_updated">Dine ferieoplysninger p� %site_link% er blevet opdateret.</msg>
+  <msg key="Welcome_user">Velkommen, %user_name%</msg>
+  <msg key="When_leaving_checkbox_empty">N�r du lader fluebenet v�re tomt, betyder det at rettigheden vil blive tilbagekaldt fra parten i tilf�lde af at rettigheden f�r er blevet tildelt den p�g�ldende part.</msg>
+  <msg key="Whos_Online_link_label">Brugere der er online</msg>
+  <msg key="Whos_Online_title">Hvem er Online</msg>
+  <msg key="Yes_I_am_sure">Ja, jeg er sikker</msg>
+  <msg key="You_can_also_browse_from">Du kan ogs� gennemse fra</msg>
+  <msg key="You_can_always_re_open">Du kan altid gen�bne den ved at</msg>
+  <msg key="You_do_not_have_admin_on">Du har ikke administrationsrettigheder p� objektet %root% eller nogen af dets barn.</msg>
+  <msg key="You_dont_have_a_portrait">Du har endnu ikke et portr�t. Du kan</msg>
+  <msg key="You_have_admin_rights_on">Du har administrationsrettigheder p� f�lgende objekter:</msg>
+  <msg key="You_have_no_email_alerts">Du har pt. ikke nogen registrerede e-mail-alarmer.</msg>
+  <msg key="Your_Account">Din Konto</msg>
+  <msg key="Your_discussion_alerts">Dine alarmer p� diskussionsfora</msg>
+  <msg key="Your_Portrait">Dit Portr�t</msg>
+  <msg key="Your_system_alerts">Dine alarmer p� %gc_system_name%</msg>
+  <msg key="Youre_marked_as_back">Du er p� %site_link% markeret som tilbage fra ferie.</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.17
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.18
@@ -1,81 +1,272 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="de_DE" charset="ISO-8859-1">
 
+  <msg key="_or"> oder</msg>
+  <msg key="A_member_of_the_system">Registriert bei %system_name% seit</msg>
   <msg key="About_You">Benutzerinformation</msg>
-  <msg key="Account_closed">&lt;p&gt;Ihr Benutzerkonto ist derzeit deaktiviert.&lt;/p&gt; &lt;p&gt;Falls gew�nscht, k�nnen Sie es &lt;a href=&quot;%restore_url%&quot;&gt;wieder aktivieren lassen&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_at_system_closed">Ihr Benutzerkonto bei %system_name% wurde deaktiviert.</msg>
+  <msg key="Account_close_confirm_no_label">Nein, zur�ck zu %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">Ja, Benutzerkonto deaktivieren</msg>
+  <msg key="Account_closed">&lt;p&gt;Ihr Benutzerkonto ist derzeit deaktiviert.&lt;/p&gt; &lt;p&gt;Sie k�nnen es &lt;a href=&quot;%restore_url%&quot;&gt;wieder aktivieren lassen&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt; &lt;font color=&quot;red&quot;&gt; &lt;b&gt; Ihr Benutzerkonto ist derzeit geschlossen. &lt;/b&gt; &lt;/font&gt; &lt;a href=&quot;%login_url%&quot;&gt;Melden Sie sich wieder an&lt;/a&gt;, um weitere Informationen zu erhalten.  &lt;/p&amp;;gt;  </msg>
+  <msg key="Account_reopened_message">Ihr Benutzerkonto wurde wieder aktiviert. Willkommen bei %system_name%.</msg>
+  <msg key="Account_reopened_title">Benutzerkonto wieder aktiviert</msg>
+  <msg key="Action">Aktion</msg>
+  <msg key="Add_new_app">Neue Anwendung hinzuf�gen</msg>
+  <msg key="Admin">Verwalten</msg>
+  <msg key="Administer_subsite">%subsite_name% verwalten</msg>
+  <msg key="Administrative_options">Verwaltungsoptionen f�r diesen Benutzer</msg>
+  <msg key="Alert_Type">Art der Benachrichtigung</msg>
+  <msg key="another_picture">ein neues Bild</msg>
   <msg key="Answer">Antwort:</msg>
+  <msg key="Application_Error">Anwendungsfehler</msg>
+  <msg key="Applications">Anwendungen</msg>
+  <msg key="Approve">Freischalten</msg>
   <msg key="at">unter</msg>
+  <msg key="Authority">Authentifizierungsstelle</msg>
   <msg key="Bad_Password">Falsches Passwort</msg>
-  <msg key="Basic_Information">Grundlegende Informationen:</msg>
+  <msg key="Ban">Deaktivieren</msg>
+  <msg key="Basic_Information">Allgemeine Informationen:</msg>
+  <msg key="Biography">Lebenslauf</msg>
+  <msg key="cannot_retrieve_password">Passwort zur�cksetzen durch lokale Authentifizierungsstelle nicht unterst�tzt</msg>
+  <msg key="Cannot_see_memb_list">Liste der Teilnehmer verborgen</msg>
+  <msg key="Change_locale_label">Sprache einstellen</msg>
   <msg key="Change_my_Password">Passwort �ndern</msg>
+  <msg key="Change_pass_email_por">Passwort, E-Mail-Adresse oder Bild �ndern</msg>
   <msg key="Check_Your_Inbox">�berp�fen Sie Ihr Postfach</msg>
   <msg key="Children">Untergeordnete Objekte</msg>
+  <msg key="Close_account_explanation">&lt;p&gt; Bitte best�tigen Sie, dass Sie Ihr Benutzerkonto bei %system_name% deaktivieren wollen. &lt;/p&gt; &lt;p&gt; Wenn Ihr Benutzerkonto deaktiviert ist, erhalten Sie keine Benachrichtigungen mehr von dotLRN, und Ihr Name erscheint nicht mehr auf Teilnehmerlisten von Kursen oder Communities. Ihre inhaltlichen Beitr�ge werden jedoch nicht gel�scht, da sie Teil der gemeinschaftlichen Aktivit�ten in dotLRN sind. &lt;/p&gt; &lt;p&gt; Hinweis: Sie k�nnen Ihr Benutzerkonto jederzeit wieder aktivieren, indem Sie sich einfach wieder anmelden. &lt;/p&gt;
+</msg>
+  <msg key="Close_your_account">Benutzerkonto deaktivieren</msg>
+  <msg key="Comment">Kommentar</msg>
+  <msg key="Communities">Communities</msg>
+  <msg key="communities">Communities</msg>
+  <msg key="community">Community</msg>
   <msg key="Confirm">Best�tigen:</msg>
+  <msg key="Continue">Fortsetzen</msg>
+  <msg key="Country_Name">Land</msg>
+  <msg key="Create_new_community">Neue %pretty_name% erstellen</msg>
   <msg key="Current_Password">Aktuelles Passwort:</msg>
+  <msg key="Currently_invisible_msg">&lt;p&gt; Ihr Onlinestatus ist derzeit f�r andere Benutzer verborgen. &lt;/p&gt;</msg>
+  <msg key="Currently_visible_msg">&lt;p&gt; Ihr Onlinestatus ist derzeit f�r andere Benutzer sichtbar. &lt;/p&gt; </msg>
   <msg key="Customize_Question">Frage �ndern</msg>
+  <msg key="Database_Error">Datenbankfehler</msg>
+  <msg key="default_context">Standardkontext</msg>
+  <msg key="Delete">L�schen</msg>
+  <msg key="DevAdmin">Verwalten (Entwickler)</msg>
+  <msg key="Developers_Admin">Verwaltung auf Entwicklerebene</msg>
   <msg key="Direct_Permissions">Explizite Berechtigungen</msg>
+  <msg key="Disable">Deaktivieren</msg>
+  <msg key="Disabled">Deaktiviert</msg>
+  <msg key="Domain">Dom�ne</msg>
+  <msg key="E_mail">E-Mail-Adresse</msg>
+  <msg key="edit_comment">Kommentar bearbeiten</msg>
+  <msg key="Elements_not_editable">Einige Elemente k�nnen nicht bearbeitet werden, da sie von %authority_name% verwaltet werden.</msg>
   <msg key="Email">E-Mail-Adresse</msg>
+  <msg key="email_body_Forgotten_password">Hier sind Ihre neuen Anmeldedaten: %account_id_label%: %account_id% %password_label%: %password%. Bitte �ndern Sie Ihr Passwort unter folgendem Link: %reset_password_url%</msg>
+  <msg key="email_body_Registration_password">Vielen Dank f�r Ihre Registrierung bei %system_name%. Mit folgenden Daten k�nnen Sie sich bei %system_url% anmelden: %account_id_label%: %account_id% %password_label%: %password% Bitte �ndern Sie Ihr Passwort unter folgendem Link: %reset_password_url%</msg>
   <msg key="Email_Confirmation">E-Mail-Adresse best�tigen:</msg>
   <msg key="Email_not_Requested">E-Mail nicht angefordert</msg>
-  <msg key="Error_sending_mail">Fehler beim Versenden der Mail</msg>
+  <msg key="email_subject_Forgotten_password">Ihr vergessenes Passwort f�r %system_name%</msg>
+  <msg key="email_subject_Registration_password">Willkommen bei %system_name%.</msg>
+  <msg key="Enabled">Aktiviert</msg>
+  <msg key="Enter_your_username_to">Um Ihr Passwort zur�cksetzen zu lassen, geben Sie bitte zun�chst Ihre Benutzeridentifikation ein. </msg>
+  <msg key="Erase_Portrait">Bild l�schen</msg>
+  <msg key="erase_portrait">Bild l�schen</msg>
+  <msg key="Error">Fehler</msg>
+  <msg key="Error_sending_mail">Fehler beim Senden der E-Mail</msg>
+  <msg key="Expires">Ablaufdatum</msg>
+  <msg key="Filename">Dateiname</msg>
   <msg key="First_names">Vorname(n)</msg>
+  <msg key="Forgot_your_password">Passwort vergessen?</msg>
+  <msg key="Frequency">H�ufigkeit</msg>
+  <msg key="Go_back">Zur�ck</msg>
+  <msg key="go_upload_the_users_por">Bild des Benutzers hochladen</msg>
+  <msg key="go_upload_your_portrait">ein Bild hochladen.</msg>
   <msg key="Grant">Erteilen</msg>
   <msg key="Grant_Permission">Berechtigungen erteilen</msg>
+  <msg key="Hide">Verbergen</msg>
+  <msg key="Home_page">Homepage</msg>
+  <msg key="If_you_were_to">Wenn Sie sich anmelden </msg>
+  <msg key="Information_Updated">Die Information wurde aktualisiert.</msg>
+  <msg key="Invite">Einladen</msg>
+  <msg key="ISO_Code">ISO-Code</msg>
+  <msg key="ISO_Code_List">Liste der ISO-Codes</msg>
+  <msg key="ISO_Codes_Not_Loaded">ISO-Codes nicht geladen</msg>
+  <msg key="ISO_Codes_not_loaded">ISO-Codes nicht geladen</msg>
+  <msg key="Join_community">Community hinzuf�gen</msg>
   <msg key="Join_group_name">%group_name% hinzuf�gen</msg>
+  <msg key="Join_this_community">Diese Community hinzuf�gen</msg>
+  <msg key="Keyword">Schl�sselwort</msg>
   <msg key="Last_name">Nachname</msg>
+  <msg key="later">&amp;nbsp;</msg>
+  <msg key="Leave_community">Community entfernen</msg>
+  <msg key="Leave_this_community">Diese Community entfernen</msg>
+  <msg key="lGo_back_without_adding">Keine Benutzer hinzuf�gen und zur�ck</msg>
   <msg key="Log_In">Anmelden</msg>
+  <msg key="log_in">Anmelden</msg>
+  <msg key="Log_in_to_system">Bei %system_name% anmelden</msg>
+  <msg key="logging_back_in">sich erneut anmelden.</msg>
+  <msg key="Login_has_expired">Die Anmeldeseite ist abgelaufen. Bitte melden Sie sich erneut an.</msg>
+  <msg key="Login_or_register">Anmelden oder registrieren</msg>
+  <msg key="login_page">Anmeldeseite</msg>
+  <msg key="Logout">Abmelden</msg>
+  <msg key="Logout_from_system">Von %system_name% abmelden</msg>
+  <msg key="lt__youd_be_able_to_get">, werden Ihnen mehr Informationen �ber andere Teilnehmer Ihrer Gruppe angezeigt.</msg>
   <msg key="lt_Cannot_join_this_grou">Diese Gruppe kann nicht hinzugef�gt werden.</msg>
+  <msg key="lt_Complete_List_of_ISO_">Vollst�ndige Liste der ISO-Codes</msg>
+  <msg key="lt_Continue_working_with">Weiterarbeiten mit %system_name% </msg>
+  <msg key="lt_Edit_comment_for_the_">Kommentar zum Bild von %first_names% %last_name% bearbeiten</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) ist als Benutzer von %system_url% registriert. 
       </msg>
+  <msg key="lt_For_Site-Wide_Adminis">F�r Systemadministratoren</msg>
   <msg key="lt_Grant_Permission_on_n">Berechtigungen erteilen f�r %name%</msg>
+  <msg key="lt_Heres_what_the_databa">Folgende Daten wurden in der Datenbank gefunden:</msg>
+  <msg key="lt_How_would_you_like_the">Hier k�nnen Sie Ihr aktuelles Bild durch ein anderes ersetzen.</msg>
+  <msg key="lt_If_you_dont_think_the">Wenn die Person noch kein Benutzerkonto hat:</msg>
+  <msg key="lt_If_you_happen_to_know">Wenn die Person, die Sie einladen wollen, wahrscheinlich bereits ein Benutzerkonto auf diesem System hat:</msg>
+  <msg key="lt_If_you_need_this_func">Wenn Sie diese Funktionalit�t nutzen wollen, laden Sie bitte acs-reference und ref-countries.</msg>
   <msg key="lt_Inherited_Permissions">Vererbte Berechtigungen</msg>
-  <msg key="lt_It_would_be_a_very_ba">Diese Option sollte nicht gew�hlt werden, wenn der Computer von mehreren Personen genutzt wird, etwa in einer Bibliothek oder einem universit�ren Rechenzentrum. Nachfolgende Benutzer k�nnen sonst mit Ihrem Passwort auf den Dienst zugreifen.</msg>
+  <msg key="lt_It_would_be_a_very_ba">Diese Option sollte nicht gew�hlt werden, wenn der Computer von mehreren Personen genutzt wird, etwa in einer Bibliothek oder einem universit�ren Rechenzentrum. Nachfolgende Benutzer k�nnen sonst unter Ihrer Identit�t auf den Dienst zugreifen.</msg>
   <msg key="lt_New_registration_at_s">Neue Registrierung bei %system_url%</msg>
-  <msg key="lt_Note_that_you_can_era">Hinweis: Sie k�nnen Ihre abgespeicherte eMail-Adresse und Ihr Passwort aus dem Browser l�schen, indem Sie auf der dotLRN-Startseite die Option &quot;Abmelden&quot; w�hlen. </msg>
+  <msg key="lt_Note_text_in_red_below">Note text in red below the parameter entry fields indicates the value of this parameter is being overridden by an entry in the OpenACS parameter file. The use of the parameter file is discouraged but some sites need it to provide instance-specific values for parameters independent of the apm_parameter tables. </msg>
+  <msg key="lt_Note_that_you_can_era">Hinweis: Sie k�nnen Ihre Benutzeridentifikation und Ihr Passwort aus dem Browser l�schen, indem Sie auf der dotLRN-Startseite die Option 'Abmelden' w�hlen. </msg>
   <msg key="lt_num_children_Children">%num_children% untergeordnete Objekte ausgeblendet</msg>
-  <msg key="lt_On_portrait_publish_d">Am %portrait_publish_date% haben Sie die Datei &lt;a href=&quot;%subsite_url%user/portrait/&quot;&gt;%portrait_title%&lt;/a&gt; hochgeladen.</msg>
-  <msg key="lt_Our_server_can_tell_y">Bestimmte Daten wie E-Mail-Adresse oder Passwort k�nnen vom Browser gespeichert werden. Das hat das den Vorteil, dass diese Daten bei privat genutzten Computern nicht bei jeder Sitzung neu eingegeben werden m�ssen. </msg>
-  <msg key="lt_Password_Confirmation">Passwort best�tigen:</msg>
+  <msg key="lt_On_portrait_publish_d">Am %portrait_publish_date% haben Sie &lt;a href=&quot;%subsite_url%user/portrait/&quot;&gt;%portrait_title%&lt;/a&gt; hochgeladen</msg>
+  <msg key="lt_Our_server_can_tell_y">Bestimmte Daten wie Benutzeridentifikation oder Passwort k�nnen vom Browser gespeichert werden. Dadurch brauchen diese Daten bei Computern, die von nur einer Person genutzt werden, nicht bei jeder Sitzung neu eingegeben werden.</msg>
+  <msg key="lt_Password_Confirmation">Passwort best�tigen</msg>
   <msg key="lt_Personal_Home_Page_UR">Adresse der pers�nlichen Homepage:</msg>
+  <msg key="lt_Please_locate_your_co">Bitte w�hlen Sie aus der folgenden Liste Ihren L�ndercode aus. Gehen Sie dann mit Hilfe Ihres Browsers zum  Formular zur�ck.</msg>
   <msg key="lt_Please_read_and_follo">Bitte lesen Sie diese E-Mail und f�hren Sie die genannten Schritte aus.</msg>
   <msg key="lt_Please_try_to_a_hrefi">Bitte versuchen Sie noch einmal, sich &lt;a href=&quot;index&quot;&gt;anzumelden&lt;/a&gt;.</msg>
+  <msg key="lt_Portrait_of_first_last">Bild von %first_names% %last_name%</msg>
+  <msg key="lt_Privileges_higher_implied">H�here Rechte schlie�en niedrigere Rechte mit ein. Wenn Sie etwa Verwaltungsrechte erteilen, werden automatisch auch Lese- und Schreibrechte gew�hrt.</msg>
   <msg key="lt_Problem_with_authenti">Es ist ein Authentifizierungsproblem aufgetreten.</msg>
-  <msg key="lt_Registration_informat">Die Registrierungsinformationen f�r diesen Dienst wurden soeben an %email% gesendet.</msg>
+  <msg key="lt_Registration_informat">Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet.</msg>
   <msg key="lt_Registration_informat_1">Die Registrierungsinformationen f�r diesen Dienst wurden an %email% gesendet.
 </msg>
-  <msg key="lt_registration_request_submitted">Ihr Registrierungsantrag wurde an den Administrator von %system_name% �bermittelt. Es wird noch immer auf die Freischaltung gewartet.</msg>
+  <msg key="lt_registration_request_submitted">Ihr Registrierungsantrag wurde an den Administrator von %system_name% �bermittelt. Sie warten noch auf Freischaltung.</msg>
   <msg key="lt_Saving_email_address_">E-Mail-Adresse und Passwort werden gespeichert.</msg>
   <msg key="lt_Show_everyone_else_at">Sie k�nnen ein Bild von sich ins Netz stellen:</msg>
-  <msg key="lt_Sorry_but_it_seems_th">Ihnen wurde der Zugang zu %system_name%verweigert.</msg>
+  <msg key="lt_Sorry_but_it_seems_th">Sie haben keinen Zugang zu %system_name%. Wahrscheinlich wurde Ihr Benutzerkonto deaktiviert.</msg>
+  <msg key="lt_Sure_erase_user_por">Wollen Sie das Bild dieses Benutzers wirklich l�schen?</msg>
+  <msg key="lt_Sure_erase_your_por">Wollen Sie Ihr Bild wirklich l�schen?</msg>
+  <msg key="lt_The_picture_of_you_in">Ihr Bild kann nicht in dotLRN angezeigt werden. Bitte </msg>
   <msg key="lt_There_was_a_problem_w">Es ist ein Problem bei der Authentifizierung Ihres Benutzerkontos aufgetreten.</msg>
+  <msg key="lt_This_is_the_image_that">Folgendes Bild wird anderen Benutzern von %system_name% angezeigt</msg>
+  <msg key="lt_This_user_doesnt_have">Dieser Benutzer hat noch kein Bild hochgeladen. Sie k�nnen</msg>
+  <msg key="lt_This_user_is_deleted">Das Benutzerkonto dieses Benutzers wurde gel�scht.</msg>
   <msg key="lt_To_confirm_your_regis">Zur Best�tigung Ihrer Registrierung klicken Sie bitte auf %confirmation_url%.</msg>
+  <msg key="lt_Upload_your_favorite">Die Datei muss im JPEG oder GIF-Format vorliegen und sich auf Ihrem PC befinden. Eine Verlinkung mit einem Bild im Internet ist nicht m�glich.</msg>
+  <msg key="lt_Uploaded_pretty_date">Hochgeladen am: %pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">Hochgeladen am:</msg>
+  <msg key="lt_Use_the_Browse_button">Klicken Sie auf 'Durchsuchen...', w�hlen Sie die gew�nschte Datei aus und klicken Sie auf '�ffnen'. </msg>
+  <msg key="lt_We_cant_find_you">Ihre Benutzeridentifikation (%user_id%) konnte nicht in der Benutzerdatenbank gefunden werden. Wahrscheinlich wurde Ihr Benutzerkonto gel�scht.</msg>
+  <msg key="lt_We_had_a_problem_proc">Bei der Verarbeitung Ihrer Eingabe ist ein Fehler aufgetreten.</msg>
   <msg key="lt_We_were_not_awaiting_">Es wurde keine E-Mail von Ihnen erwartet. Es ist ein Fehler aufgetreten.</msg>
   <msg key="lt_Welcome_to_system_nam">Willkommen bei %system_name%.</msg>
+  <msg key="lt_What_other_people_see">F�r andere Benutzer sichtbare pers�nliche Informationen </msg>
   <msg key="lt_You_cant_have_a_lt_in">Der Vorname darf keine spitzen Klammern enthalten, da diese gew�hnlich f�r HTML-Steuerzeichen verwendet werden und andere Benutzer verwirren k�nnten.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">Der Nachname darf keine spitzen Klammern enthalten, da diese gew�hnlich f�r HTML-Steuerzeichen verwendet werden und andere Benutzer verwirren k�nnten.</msg>
+  <msg key="lt_You_wont_get_any_email">Sie erhalten erst wieder ab %pretty_date% E-Mails.</msg>
   <msg key="lt_Your_email_has_been_c">Ihre E-Mail-Adresse wurde best�tigt. Sie k�nnen sich nun bei %system_name% anmelden.</msg>
   <msg key="lt_Your_email_has_been_c_1">Ihre E-Mail-Adresse wurde best�tigt. Sie warten nun auf Freischaltung durch den Administrator von %system_name%.</msg>
   <msg key="lt_Your_email_is_confirm">Ihre E-Mail-Adresse wurde best�tigt.</msg>
+  <msg key="lt_Your_login_has_expire">Ihre Anmeldung ist abgelaufen. Bitte geben Sie erneut Ihr Passwort ein.</msg>
   <msg key="lt_Your_URL_doesnt_have_">Die von Ihnen eingegebene URL hat nicht die richtige Form. Eine g�ltige URL k�nnte etwa lauten: &quot;%valid_url_example%&quot;</msg>
+  <msg key="Make_administrator">Administrationsrechte erteilen</msg>
+  <msg key="Make_member">Anmelden</msg>
   <msg key="Make_yourself_invisible_label">Onlinestatus verbergen</msg>
   <msg key="Make_yourself_visible_label">Onlinestatus anzeigen</msg>
-  <msg key="Manage_your_notifications">Benachrichtigungsoptionen �ndern</msg>
+  <msg key="Manage_your_notifications">Benachrichtigungsoptionen verwalten</msg>
+  <msg key="Mem_list_not_allowed">Sie sind nicht berechtigt, die Liste der Teilnehmer zu sehen.</msg>
+  <msg key="Member_State">Teilnehmerstatus</msg>
+  <msg key="Members">Teilnehmer</msg>
   <msg key="Name">Name:</msg>
   <msg key="New_Password">Neues Passwort:</msg>
+  <msg key="No_applications">Keine Anwendungen vorhanden</msg>
+  <msg key="No_ISO_Codes">Keine ISO-Codes geladen</msg>
+  <msg key="No_package_parameters">This package does not have any parameters.</msg>
   <msg key="no_portrait_title_message">Ihr Bild</msg>
+  <msg key="No_pretty_plural">Keine %pretty_plural% vorhanden</msg>
+  <msg key="No_services">Keine Dienste verf�gbar</msg>
   <msg key="none">Keine</msg>
-  <msg key="Password">Passwort:</msg>
+  <msg key="Not_logged_in">Nicht angemeldet</msg>
+  <msg key="Notes">Hinweise:</msg>
+  <msg key="Notice">Hinweis:</msg>
+  <msg key="on_name_to">f�r %name% an:</msg>
+  <msg key="optional">(optional)</msg>
+  <msg key="Options">Optionen</msg>
+  <msg key="Or_add_a_new_user">oder einen neuen Benutzer hinzuf�gen</msg>
+  <msg key="or_the">oder das</msg>
+  <msg key="Password">Passwort</msg>
+  <msg key="Password_changed_body">Das Passwort Ihres Benutzerkontos (%account_id_label%: %account_id%) bei %system_name% wurde k�rzlich ge�ndert. Es sind keine weiteren Schritte n�tig, diese Mitteilung dient lediglich Ihrer Sicherheit. --------------- Sie k�nnen Ihr Passwort jederzeit mit folgenden Schritten �ndern: 1. Melden Sie sich bei %system_name% an. 2. Klicken Sie auf den Link '%pvt_home_name%'. 3. W�hlen Sie die Option '%password_update_link_text%'.</msg>
   <msg key="Password_changed_subject">Passwort ge�ndert</msg>
   <msg key="Permissions">Berechtigungen</msg>
+  <msg key="permissions">Berechtigungen</msg>
   <msg key="Permissions_for_name">Zugriffsberechtigungen f�r %name%</msg>
+  <msg key="Please_return_to_home">Bitte gehen Sie zur�ck zu %home_link%.</msg>
+  <msg key="Portrait">Bild</msg>
   <msg key="Question">Frage:</msg>
+  <msg key="Re_enable">Aktivieren</msg>
+  <msg key="Recover_Password">Passwort zur�cksetzen</msg>
   <msg key="Register">Registrieren</msg>
+  <msg key="Registration_Approval_Notice">&lt;p&gt;Vielen Dank f�r Ihre Registrierung bei %system_name%. Der Antrag wurde an einen Administrator �bermittelt.&lt;/p&gt; &lt;p&gt;Sobald Sie freigeschaltet sind, erhalten Sie eine E-Mail mit den erforderlichen Anmeldedaten und k�nnen %system_name% nutzen.&lt;/p&gt; </msg>
+  <msg key="Reject">Ablehnen</msg>
+  <msg key="Remember_my_login">Anmeldedaten auf diesem Computer speichern</msg>
+  <msg key="Remove">Entfernen</msg>
+  <msg key="Req_membership_comm">Zugang zu dieser Gruppe beantragen</msg>
+  <msg key="Request_membership">Zugang beantragen</msg>
+  <msg key="return_to_application">Zur�ck zur Anwendung</msg>
   <msg key="Revoke_Checked">Ausgew�hlte Berechtigungen aufheben</msg>
+  <msg key="Role">Rolle</msg>
+  <msg key="Save_comment">Kommentar speichern</msg>
+  <msg key="Screen_name">Aliasname</msg>
+  <msg key="Search_For_Exist_User">Nach vorhandenem Benutzer suchen</msg>
+  <msg key="Security_context_root">Wurzelverzeichnis des Sicherheitskontexts</msg>
+  <msg key="Select_an_Object_by_Id">W�hlen Sie mit Hilfe der ID ein Objekt aus:</msg>
+  <msg key="Send_email_to_this_user">E-Mail an diesen Benutzer senden</msg>
   <msg key="Show">Anzeigen</msg>
+  <msg key="Site_wide_administration">Systemadministration</msg>
+  <msg key="sorry_forgotten_pwd">Das Passwort kann nicht wiederhergestellt werden.</msg>
+  <msg key="Status">Status</msg>
+  <msg key="Story_Behind_Photo">Kommentar zum Bild</msg>
+  <msg key="Story_behind_photo">Kommentar zum Bild</msg>
+  <msg key="Subcommunities">Subcommunities</msg>
+  <msg key="subcommunities">Subcommunities</msg>
+  <msg key="subcommunity">Subcommunity</msg>
   <msg key="Thank_you">Vielen Dank.</msg>
-  <msg key="up_to_context_name">Eine Ebene h�her zu &quot;%context_name%&quot;</msg>
+  <msg key="The_ISO_codes_were_not">Die ISO-Codes sind auf diesem Server nicht geladen.</msg>
+  <msg key="this_subsite">diese Subsite</msg>
+  <msg key="This_user_has_left_the">Dieser Benutzer ist nicht mehr bei dotLRN registriert.</msg>
+  <msg key="To_log_in_visit_the">Um sich anzumelden, gehen Sie auf die</msg>
+  <msg key="Topic">Thema</msg>
+  <msg key="type_specific_info">Typspezifische Informationen:</msg>
+  <msg key="UP">Eine Ebene nach oben</msg>
+  <msg key="up_to_context_name">Eine Ebene h�her zu '%context_name%'</msg>
   <msg key="Update">Aktualisieren</msg>
   <msg key="Update_Password">Passwort aktualisieren</msg>
-  <msg key="upload_a_portrait">Bild hochladen</msg>
+  <msg key="upload">Hochladen</msg>
+  <msg key="upload_a_portrait">Ein Bild hochladen</msg>
+  <msg key="upload_a_replacement_por">Ein anderes Bild hochladen</msg>
+  <msg key="Upload_Portrait">Bild hochladen</msg>
+  <msg key="Username">Benutzeridentifikation</msg>
+  <msg key="Vacation_Info_Updated">Die Informationen zu Ihrer Abwesenheit wurden aktualisiert.</msg>
+  <msg key="Vacation_information_updated">Die Informationen zu Ihrer Abwesenheit unter %site_link% wurden aktualisiert.</msg>
+  <msg key="Welcome_user">Willkommen, %user_name%!</msg>
+  <msg key="When_leaving_checkbox_empty">Bereits erteilte Berechtigungen, die Sie hier nicht ausw�hlen, werden aufgehoben.</msg>
+  <msg key="Whos_Online_link_label">Benutzer, die online sind</msg>
+  <msg key="Whos_Online_title">Wer ist online?</msg>
+  <msg key="Yes_I_am_sure">Ja, l�schen</msg>
+  <msg key="You_can_also_browse_from">Weitere M�glichkeiten f�r die Navigation sind der</msg>
+  <msg key="You_can_always_re_open">Sie k�nnen es jederzeit wieder aktivieren, indem Sie</msg>
+  <msg key="You_do_not_have_admin_on">Sie haben keine Verwaltungsrechte f�r das Objekt %root% oder ihm untergeordnete Objekte.</msg>
+  <msg key="You_dont_have_a_portrait">Sie haben noch kein Bild hochgeladen. Sie k�nnen</msg>
+  <msg key="You_have_admin_rights_on">Sie haben Verwaltungsrechte f�r folgende Objekte:</msg>
+  <msg key="You_have_no_email_alerts">Sie haben derzeit keine Benachrichtigungsfunktion aktiviert.</msg>
+  <msg key="Your_Account">Benutzerkonto</msg>
+  <msg key="Your_discussion_alerts">Ihre Benachrichtigungen f�r Diskussionsforen</msg>
   <msg key="Your_Portrait">Ihr Bild:</msg>
+  <msg key="Your_system_alerts">Ihre Benachrichtigungen f�r %gc_system_name%</msg>
+  <msg key="Youre_marked_as_back">Sie sind unter %site_link% als wieder anwesend gekennzeichnet.</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	30 Jan 2004 15:19:29 -0000	1.47
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.48
@@ -63,9 +63,13 @@
   <msg key="Close_your_account">Close your account</msg>
   <msg key="Closed_group">Closed Group</msg>
   <msg key="Comment">Comment</msg>
+  <msg key="Communities">Communities</msg>
+  <msg key="communities">communities</msg>
+  <msg key="community">community</msg>
   <msg key="Confirm">Confirm</msg>
   <msg key="Continue">Continue</msg>
   <msg key="Country_Name">Country Name</msg>
+  <msg key="Create_new_community">Create new %pretty_name%</msg>
   <msg key="Create_new_subsite">Create new subsite</msg>
   <msg key="Current_Password">Current Password</msg>
   <msg key="Currently_invisible_msg">&lt;p&gt; Your online status is currently not visible to other users. &lt;/p&gt;</msg>
@@ -75,6 +79,8 @@
   <msg key="default_context">default context</msg>
   <msg key="Delete">Delete</msg>
   <msg key="DevAdmin">DevAdmin</msg>
+  <description key="DevAdmin">Can we please have a description about the purpose of this key?</description>
+
   <msg key="Developers_Admin">Developer's Administration</msg>
   <msg key="Direct_Permissions">Direct Permissions</msg>
   <msg key="Disable">Disable</msg>
@@ -133,13 +139,17 @@
   <msg key="ISO_Code_List">ISO Code List</msg>
   <msg key="ISO_Codes_Not_Loaded">ISO Codes Not Loaded</msg>
   <msg key="ISO_Codes_not_loaded">ISO Codes not loaded</msg>
+  <msg key="Join_community">Join community</msg>
   <msg key="Join_group_name">Join %group_name%</msg>
   <msg key="Join_subsite">Join subsite</msg>
+  <msg key="Join_this_community">Join this community</msg>
   <msg key="Join_this_subsite">Join this subsite</msg>
   <msg key="Keyword">Keyword</msg>
   <msg key="Last_name">Last name</msg>
   <msg key="later">later.</msg>
+  <msg key="Leave_community">Leave community</msg>
   <msg key="Leave_subsite">Leave subsite</msg>
+  <msg key="Leave_this_community">Leave this community</msg>
   <msg key="Leave_this_subsite">Leave this subsite</msg>
   <msg key="lGo_back_without_adding">Go back without adding any users</msg>
   <msg key="Log_In">Log In</msg>
@@ -296,6 +306,7 @@
   <msg key="Reject">Reject</msg>
   <msg key="Remember_my_login">Remember my login on this computer</msg>
   <msg key="Remove">Remove</msg>
+  <msg key="Req_membership_comm">Request membership of this community</msg>
   <msg key="Req_membership_subs">Request membership of this subsite</msg>
   <msg key="Request_membership">Request membership</msg>
   <msg key="return_to_application">return to application</msg>
@@ -313,6 +324,9 @@
   <msg key="Status">Status</msg>
   <msg key="Story_Behind_Photo">Story Behind Photo</msg>
   <msg key="Story_behind_photo">Story Behind Photo</msg>
+  <msg key="Subcommunities">Subcommunities</msg>
+  <msg key="subcommunities">subcommunities</msg>
+  <msg key="subcommunity">subcommunity</msg>
   <msg key="subsite">subsite</msg>
   <msg key="Subsites">Subsites</msg>
   <msg key="subsites">subsites</msg>
@@ -325,6 +339,8 @@
   <msg key="Topic">Topic</msg>
   <msg key="type_specific_info">type-specific info</msg>
   <msg key="UP">UP</msg>
+  <description key="UP">Can we please have a description of this key??</description>
+
   <msg key="up_to_context_name">up to %context_name%</msg>
   <msg key="Update">Update</msg>
   <msg key="Update_Password">Update Password</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.15
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.16
@@ -1,27 +1,93 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="es_ES" charset="ISO-8859-1">
 
+  <msg key="A_member_of_the_system">Miembro de %system_name% desde</msg>
   <msg key="About_You">Mi informaci�n</msg>
+  <msg key="Account_at_system_closed">Su cuenta en %system_name% ha sido cancelada.</msg>
+  <msg key="Account_close_confirm_no_label">No, volver a %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">S�, cancelar mi cuenta</msg>
   <msg key="Account_closed">&lt;p&gt;Su cuenta se encuentra cerrada por el momento.&lt;/p&gt;&lt;p&gt;Si usted lo desea, podemos &lt;a href=&quot;%restore_url%&quot;&gt;re-abrir su cuenta&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt;&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Su cuenta est� actualmente cancelada.&lt;/b&gt;&lt;/font&gt;&lt;a href=&quot;%login_url%&quot;&gt;Conectese&lt;/a&gt; de nuevo para ver que puede hacer al respecto.&lt;/p&gt;</msg>
+  <msg key="Account_reopened_message">Su cuenta en %system_name% ha sido reactividad. Bienvenido de nuevo.</msg>
+  <msg key="Account_reopened_title">Cuenta reactivada</msg>
+  <msg key="Action">Acci�n</msg>
+  <msg key="Add_new_app">A�adir una nueva aplicaci�n</msg>
+  <msg key="Admin">Admin</msg>
+  <msg key="Administer_subsite">Administrar %subsite_name%</msg>
+  <msg key="Administrative_options">Opciones de administraci�n para este usuario</msg>
+  <msg key="Alert_Type">Tipo de aviso</msg>
+  <msg key="another_picture">otra imagen.</msg>
   <msg key="Answer">Respuesta:</msg>
+  <msg key="Application_Error">Error de la aplicaci�n</msg>
+  <msg key="Applications">Aplicaciones</msg>
+  <msg key="Approve">Aprobar</msg>
   <msg key="at">en</msg>
+  <msg key="Authority">Autoridad</msg>
   <msg key="Bad_Password">Contrase�a err�nea</msg>
+  <msg key="Ban">Prohibir</msg>
   <msg key="Basic_Information">Informaci�n b�sica</msg>
+  <msg key="Biography">Biograf�a</msg>
   <msg key="cannot_retrieve_password">No se soporta la obtenci�n de contrase�as de una autoridad local.</msg>
+  <msg key="Cannot_see_memb_list">No puede ver la lista de miembros</msg>
+  <msg key="Change_locale_label">Seleccionar idioma</msg>
   <msg key="Change_my_Password">Cambiar mi contrase�a</msg>
+  <msg key="Change_pass_email_por">Cambiar contrase�a, email, foto</msg>
   <msg key="Check_Your_Inbox">Revisar correo entrante</msg>
   <msg key="Children">Hijos</msg>
+  <msg key="Close_account_explanation">&lt;p&gt;Por favor, confirme que realmente desea cancelar su cuenta en %system_name%.&lt;/p&gt;
+&lt;p&gt;Cancelar una cuenta significa que no seguir� recibiendo notificaciones, ni formar� parte de los miembros de %system_name%. No obstante, sus contribuciones a la comunidad se conservar�n como parte del hist�rico de la comunidad.&lt;/p&gt;
+&lt;p&gt;Tenga en cuenta que puede reabrir su cuenta en cualquier momento, para ello simplemente vuelva a conectarse.&lt;/p&gt;</msg>
+  <msg key="Close_your_account">Cancelar cuenta</msg>
+  <msg key="Comment">Comentario</msg>
+  <msg key="Communities">Comunidades</msg>
+  <msg key="communities">comunidades</msg>
+  <msg key="community">comunidad</msg>
   <msg key="Confirm">Confirmar:</msg>
+  <msg key="Continue">Continuar</msg>
+  <msg key="Country_Name">Pa�s</msg>
+  <msg key="Create_new_community">Crear nuevo %pretty_name%</msg>
   <msg key="Current_Password">Contrase�a Actual:</msg>
+  <msg key="Currently_invisible_msg">&lt;p&gt;Su nombre NO aparece en la lista de usuarios conectados.&lt;/p&gt;</msg>
+  <msg key="Currently_visible_msg">&lt;p&gt;Su nombre aparece en la lista de usuarios conectados.&lt;/p&gt;</msg>
   <msg key="Customize_Question">Personalizar pregunta</msg>
+  <msg key="Database_Error">Error de base de datos</msg>
+  <msg key="default_context">contexto por defecto</msg>
+  <msg key="Delete">Borrar</msg>
+  <msg key="DevAdmin">DevAdmin</msg>
+  <msg key="Developers_Admin">Administraci�n de desarrolladores</msg>
   <msg key="Direct_Permissions">Permisos directos</msg>
+  <msg key="Disable">Desactivar</msg>
+  <msg key="Disabled">Desactivado</msg>
+  <msg key="Domain">Dominio</msg>
+  <msg key="E_mail">Email</msg>
+  <msg key="edit_comment">editar comentario</msg>
+  <msg key="Elements_not_editable">Algunos elementos no pueden ser editados ya que est�n siendo administrados por %authority_name%.</msg>
   <msg key="Email">correo electr�nico</msg>
+  <msg key="email_body_Forgotten_password">Datos de su cuenta: 
+%account_id_label%: %account_id% 
+%password_label%: %password%
+Para cambiar su contrase�a, visite %reset_password_url%</msg>
+  <msg key="email_body_Registration_password">Gracias por registrarse en %system_name%. Para conectarse, visite %system_url%: 
+%account_id_label%: %account_id%
+%password_label%: %password%
+Para cambiar su contrase�a, visite %reset_password_url%</msg>
   <msg key="Email_Confirmation">Confirmaci�n de correo</msg>
   <msg key="Email_not_Requested">Correo electr�nico no solicitado</msg>
+  <msg key="email_subject_Forgotten_password">Recordatorio de su contrase�a en %system_name%</msg>
+  <msg key="email_subject_Registration_password">Bienvenido a %system_name%</msg>
+  <msg key="Enabled">Activado</msg>
+  <msg key="Enter_your_username_to">Introduzca su nombre de usuario para poder recuperar su contrase�a.</msg>
+  <msg key="Erase_Portrait">Borrar foto</msg>
+  <msg key="erase_portrait">borrar foto</msg>
+  <msg key="Error">Error</msg>
   <msg key="Error_sending_mail">Error al enviar el correo</msg>
+  <msg key="Expires">Caduca</msg>
+  <msg key="Filename">Nombre de archivo</msg>
   <msg key="First_names">Nombres</msg>
+  <msg key="Forgot_your_password">�Ha olvidado su contrase�a?</msg>
   <msg key="Grant">Otorgar</msg>
   <msg key="Grant_Permission">Autorizar</msg>
+  <msg key="Home_page">P�gina web</msg>
   <msg key="Join_group_name">Unirse a %group_name%</msg>
   <msg key="Last_name">Apellido</msg>
   <msg key="Log_In">Ingresar</msg>
@@ -50,12 +116,16 @@
   <msg key="lt_To_confirm_your_regis">Para confirmar su registro, por favor, acuda a %confirmation_url%</msg>
   <msg key="lt_We_were_not_awaiting_">No estabamos esperando su email. Debe tratarse de un error.</msg>
   <msg key="lt_Welcome_to_system_nam">Bienvenido a %system_name%</msg>
+  <msg key="lt_What_other_people_see">Lo que ver�n los dem�s al pulsar sobre su nombre</msg>
   <msg key="lt_You_cant_have_a_lt_in">No puede introducir un signo &amp;lt; en su nombre ya que corresponde a una etiqueta HTML y podr�a crear confusi�n.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">No puede introducir un signo &amp;lt; en sus apellidos ya que corresponde a una etiqueta HTML y podr�a crear confusi�n.</msg>
   <msg key="lt_Your_email_has_been_c">Su correo ha sido confirmado. Ahora, puede ingresar a %system_name%.</msg>
   <msg key="lt_Your_email_has_been_c_1">Su correo ha sido confirmado. Ahora, debe esperar la aprobaci�n del administrador de %system_name%.</msg>
   <msg key="lt_Your_email_is_confirm">Su correo ha sido confirmado</msg>
   <msg key="lt_Your_URL_doesnt_have_">La URL introducida no es v�lida. Un ejemplo de URL v�lida es \&quot;%valid_url_example%\&quot;.&quot;</msg>
+  <msg key="Make_yourself_invisible_label">Volverse invisible</msg>
+  <msg key="Make_yourself_visible_label">Volverse visible</msg>
+  <msg key="Manage_your_notifications">Administrar notificaciones</msg>
   <msg key="Name">Nombre y apellidos:</msg>
   <msg key="New_Password">Nueva contrase�a:</msg>
   <msg key="no_portrait_title_message">su foto</msg>
@@ -78,5 +148,7 @@
   <msg key="Update_Password">Actualizar contrase�a</msg>
   <msg key="upload_a_portrait">subir una foto</msg>
   <msg key="Username">Nombre de usuario</msg>
+  <msg key="Whos_Online_link_label">Usuarios conectados en este momento</msg>
+  <msg key="Whos_Online_title">Qui�n est� conectado</msg>
   <msg key="Your_Portrait">Su foto</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.13
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.14
@@ -6,9 +6,11 @@
   <msg key="at">�</msg>
   <msg key="Bad_Password">Mot de passe erron�</msg>
   <msg key="Basic_Information">Information </msg>
+  <msg key="Change_locale_label">Changer de langue</msg>
   <msg key="Change_my_Password">Changer mon mot de passe</msg>
   <msg key="Check_Your_Inbox">Voir boite aux lettres</msg>
   <msg key="Children">Fils</msg>
+  <msg key="Close_your_account">Fermer votre compte</msg>
   <msg key="Confirm">Confirmer:</msg>
   <msg key="Current_Password">Mot de passe actuel:</msg>
   <msg key="Customize_Question">Question personnalis�e</msg>
@@ -47,6 +49,7 @@
   <msg key="lt_To_confirm_your_regis">Pour confirmer votre inscription, allez � %confirmation_url%</msg>
   <msg key="lt_We_were_not_awaiting_">Nous n'attendions pas de courrier de votre part. Il doit s'agir d'une erreur.</msg>
   <msg key="lt_Welcome_to_system_nam">Bienvenu � %system_name%</msg>
+  <msg key="lt_What_other_people_see">Tout ce que les autres peuvent savoir de vous</msg>
   <msg key="lt_You_cant_have_a_lt_in">Votre pr�nom ne peut pas contenir le signe &amp;lt; car il pourrait �tre pris pour une �tiquette HTML.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">Votre nom ne peut pas contenir le signe &amp;lt; car il pourrait �tre pris pour une �tiquette HTML.</msg>
   <msg key="lt_Your_email_has_been_c">Votre adresse email a �t� v�rifi�e. Vous pouvez maintenant vous connecter � %system_name%.</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.14
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.15
@@ -2,6 +2,8 @@
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="it_IT" charset="ISO-8859-1">
 
   <msg key="About_You">Riguardo a te</msg>
+  <msg key="Account_at_system_closed">La tua account su %system_name% &amp;egrave; stata chiusa.</msg>
+  <msg key="Account_closed"> &lt;p&gt;La tua account &amp;egrave; attualmente chiusa.&lt;/p&gt;  &lt;p&gt;Se lo desideri, possiamo &lt;a href=&quot;%restore_url%&quot;&gt;riaprirla&lt;/a&gt;.&lt;/p&gt;</msg>
   <msg key="Answer">Risposta:</msg>
   <msg key="at">su</msg>
   <msg key="Bad_Password">Password Inadatta</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml	3 Nov 2003 12:52:10 -0000	1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ko_KR.utf-8.xml	26 Feb 2004 15:28:49 -0000	1.4
@@ -6,21 +6,39 @@
   <msg key="at">에서</msg>
   <msg key="Bad_Password">잘못된 비밀번호</msg>
   <msg key="Basic_Information">기본 정보</msg>
+  <msg key="Change_locale_label">언어 변경</msg>
   <msg key="Change_my_Password">비밀번호 변경</msg>
   <msg key="Check_Your_Inbox">받은편지함 점검</msg>
   <msg key="Children">아이들</msg>
+  <msg key="Comment">주석</msg>
   <msg key="Confirm">확인:</msg>
+  <msg key="Continue">계속</msg>
+  <msg key="Create_new_community">새 %pretty_name% 생성</msg>
   <msg key="Current_Password">현재 비밀번호:</msg>
   <msg key="Customize_Question">개별화 질문</msg>
+  <msg key="Database_Error">데이터베이스 오류</msg>
+  <msg key="Delete">삭제</msg>
   <msg key="Direct_Permissions">직접 사용권한</msg>
+  <msg key="Email">전자우편</msg>
   <msg key="Email_Confirmation">전자우편 확인</msg>
   <msg key="Email_not_Requested">전자우편이 요청되지 않음</msg>
+  <msg key="email_subject_Registration_password">%system_name%에 오신걸 환영합니다</msg>
+  <msg key="Erase_Portrait">사진 삭제</msg>
+  <msg key="erase_portrait">사진 삭제</msg>
+  <msg key="Error">오류</msg>
   <msg key="Error_sending_mail">메일 전송 오류</msg>
+  <msg key="Filename">파일이름</msg>
+  <msg key="First_names">이름</msg>
   <msg key="Grant">승인</msg>
   <msg key="Grant_Permission">승인허가</msg>
+  <msg key="Home_page">홈페이지</msg>
   <msg key="Join_group_name">%group_name% 등록</msg>
+  <msg key="Last_name">성</msg>
   <msg key="Log_In">로그인</msg>
+  <msg key="log_in">로그인</msg>
+  <msg key="Logout">로그아웃</msg>
   <msg key="lt_Cannot_join_this_grou">이 그룹에 가입할 수 없음</msg>
+  <msg key="lt_Complete_List_of_ISO_">전체 ISO 코드 목록</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%)님은 %system_url%의 사용자로 등록되었습니다.</msg>
   <msg key="lt_Grant_Permission_on_n">%name%에 허가 승인</msg>
   <msg key="lt_Inherited_Permissions">상속받은 사용권한</msg>
@@ -45,6 +63,7 @@
   <msg key="lt_To_confirm_your_regis">등록을 확인하기 위해  %confirmation_url%(으)로 가시오.</msg>
   <msg key="lt_We_were_not_awaiting_">여러분의 전자우편을 기다리고 있지 않습니다. 약간의 실수가 있습니다.</msg>
   <msg key="lt_Welcome_to_system_nam">%system_name% 에 방문하신 것을 환영합니다.</msg>
+  <msg key="lt_What_other_people_see">다른 사용자가 당신의 이름을 클릭할때 볼 수 있는 것</msg>
   <msg key="lt_You_cant_have_a_lt_in">여러분의 이름에 &amp;lt;를 가질 수 없습니다. 이것은 HTML 태그같아 보여서 다른 사용자와 혼동이 됩니다. </msg>
   <msg key="lt_You_cant_have_a_lt_in_1">여러분의 성에 &amp;lt;를 가질 수 없습니다. 이것은 HTML 태그같아 보여서 다른 사용자와 혼동이 됩니다. </msg>
   <msg key="lt_Your_email_has_been_c_1">여러분의 전자우편이 확인되었습니다. %system_name% 관리자로부터 인증대기중에 있습니다. </msg>
@@ -54,17 +73,26 @@
   <msg key="New_Password">새로운 비밀번호:</msg>
   <msg key="no_portrait_title_message">여러분의 사진</msg>
   <msg key="none">조금도 않다.</msg>
+  <msg key="optional">(선택사항)</msg>
   <msg key="Password">비밀번호:</msg>
+  <msg key="Password_changed_subject">비밀번호 변경</msg>
   <msg key="Permissions">사용권한</msg>
+  <msg key="permissions">권한</msg>
   <msg key="Permissions_for_name">%name%에 대한 사용권한</msg>
+  <msg key="Portrait">사진</msg>
   <msg key="Question">질문:</msg>
   <msg key="Register">레지스터</msg>
   <msg key="Revoke_Checked">취소 표시됨</msg>
+  <msg key="Screen_name">스크린 이름</msg>
   <msg key="Show">보여주기</msg>
+  <msg key="Status">상태</msg>
   <msg key="Thank_you">감사합니다.</msg>
   <msg key="up_to_context_name">%context_name%에 업</msg>
   <msg key="Update">수정</msg>
   <msg key="Update_Password">비밀번호 업데이트</msg>
+  <msg key="upload">업로드</msg>
   <msg key="upload_a_portrait">사진 업로드</msg>
+  <msg key="Username">사용자 이름</msg>
+  <msg key="Yes_I_am_sure">예, 확실합니다</msg>
   <msg key="Your_Portrait">사진</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/Attic/acs-subsite.ms_my.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml	3 Nov 2003 12:52:10 -0000	1.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.ms_my.utf-8.xml	26 Feb 2004 15:28:49 -0000	1.4
@@ -1,17 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="ms_my" charset="utf-8">
 
+  <msg key="_or">, atau</msg>
+  <msg key="A_member_of_the_system">Ahli kepada komuniti %system_name% sejak</msg>
   <msg key="About_You">Tentang Anda</msg>
-  <msg key="Answer">Jawapan:</msg>
+  <msg key="Account_at_system_closed">Akaun anda di %system_name% telah ditutup</msg>
+  <msg key="Account_close_confirm_no_label">Tidak, bawa saya kembali ke %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">Ya, sila tutup akaun saya</msg>
+  <msg key="Account_closed">&lt;p&gt;Akaun anda ketika ini ditutup.&lt;/p&gt;&lt;p&gt;Jika anda mahu, kami boleh &lt;a href=&quot;%restore_url%&quot;&gt;buka kembali akaun anda&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt;&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Akaun anda ketika ini ditutup.&lt;/b&gt;&lt;/font&gt;&lt;a href=&quot;%login_url%&quot;&gt;Masuk ke sistem&lt;/a&gt; semula untuk melihat apa tindakan yang perlu.&lt;/p&gt;</msg>
+  <msg key="Account_reopened_message">Akaun anda di %system_name% telah dibuka kembali. Selamat datang semula!</msg>
+  <msg key="Account_reopened_title">Akaun dibuka semula</msg>
+  <msg key="Action">Tindakan</msg>
+  <msg key="Add_new_app">Tambah aplikasi baru</msg>
+  <msg key="Admin">Urus</msg>
+  <msg key="Administer_subsite">Uruskan %subsite_name%</msg>
+  <msg key="Administrative_options">Pilihan pengurusan untuk ahli ini</msg>
+  <msg key="Alert_Type">Jenis amaran</msg>
+  <msg key="another_picture">gambar lain.</msg>
+  <msg key="Answer">Jawapan</msg>
+  <msg key="Application_Error">Masalah aplikasi</msg>
+  <msg key="Applications">Aplikasi-aplikasi</msg>
+  <msg key="Approve">Sahkan</msg>
   <msg key="at">di</msg>
+  <msg key="Authority">Pengendali</msg>
   <msg key="Bad_Password">Salah Kata Laluan</msg>
+  <msg key="Ban">Halang</msg>
   <msg key="Basic_Information">Informasi Asas</msg>
+  <msg key="Biography">Biografi</msg>
+  <msg key="cannot_retrieve_password">Tidak dibenarkan mendapatkan semula kata laluan dari pengendali ini.</msg>
+  <msg key="Cannot_see_memb_list">Gagal mendapatkan senarai ahli</msg>
+  <msg key="Change_locale_label">Tukar bahasa</msg>
   <msg key="Change_my_Password">Ubah Kata Laluan Saya</msg>
+  <msg key="Change_pass_email_por">Tukar kata laluan, e-mel, gambar</msg>
   <msg key="Check_Your_Inbox">Semak Inbox Anda</msg>
   <msg key="Children">Anak</msg>
-  <msg key="Current_Password">Kata Laluan Kini:</msg>
+  <msg key="Close_account_explanation">&lt;p&gt;Sila sahkan jika anda mahu menutup akaun di %system_name%. &lt;/p&gt;&lt;p&gt;Menutup akaun anda bermakna kami tidak boleh memberi e-mel, dan anda tidak akan muncul lagi sebagai ahli di %system_name%. Walau bagaimanapun pemberian anda kepada komuniti dikekalkan sebagai simpanan kepada aset komuniti.&lt;/p&gt;&lt;p&gt;Anda masih boleh buka kembali akaun anda bila-bila masa hanya dengan login kembali,&lt;/p&gt;</msg>
+  <msg key="Close_your_account">Tutup akaun anda</msg>
+  <msg key="Comment">Komen</msg>
+  <msg key="Communities">Komuniti-komuniti</msg>
+  <msg key="communities">komuniti-komuniti</msg>
+  <msg key="community">komuniti</msg>
+  <msg key="Confirm">Pastikan</msg>
+  <msg key="Continue">Teruskan</msg>
+  <msg key="Country_Name">Nama Negara</msg>
+  <msg key="Create_new_community">Cipta %pretty_name%</msg>
+  <msg key="Current_Password">Kata Laluan Kini</msg>
+  <msg key="Currently_invisible_msg">&lt;p&gt;Status online anda ketika ini tidak kelihatan kepada ahli lain.&lt;/p&gt;</msg>
+  <msg key="Currently_visible_msg">&lt;p&gt;Status online anda ketika ini boleh diketahui ahli lain.&lt;/p&gt;</msg>
   <msg key="Customize_Question">Ubahsuai Soalan</msg>
+  <msg key="Database_Error">Masalah di Pangkalan Data</msg>
+  <msg key="default_context">konteks asal</msg>
+  <msg key="Delete">Padam</msg>
+  <msg key="Developers_Admin">Pentadbiran Pembangun</msg>
+  <msg key="Direct_Permissions">Kebenaran Terus</msg>
+  <msg key="E_mail">E-mail</msg>
+  <msg key="edit_comment">edit komen</msg>
+  <msg key="Elements_not_editable">Elemen-elemen tertentu tidak boleh diedit kerana ia diuruskan oleh %authority_name%.</msg>
+  <msg key="Email">Emel</msg>
+  <msg key="Email_Confirmation">Pengesahan Email</msg>
+  <msg key="Email_not_Requested">E-mail tidak dikehendaki</msg>
+  <msg key="Error">Ralat</msg>
   <msg key="Error_sending_mail">Ralat menghantar e-mel</msg>
+  <msg key="Expires">Luput</msg>
+  <msg key="Filename">Nama Fail</msg>
+  <msg key="First_names">Nama Pertama</msg>
+  <msg key="Frequency">Frekuensi</msg>
+  <msg key="Hide">Sorok</msg>
+  <msg key="Information_Updated">Maklumat Telah Dikemaskini</msg>
+  <msg key="Invite">Jemput</msg>
   <msg key="Log_In">Log Masuk</msg>
   <msg key="lt_Cannot_join_this_grou">Tidak boleh memasuki kumpulan ini.</msg>
   <msg key="Name">Nama:</msg>
@@ -21,4 +78,12 @@
   <msg key="Question">Soalan:</msg>
   <msg key="Thank_you">Terima kasih.</msg>
   <msg key="Update_Password">Kemaskini Kata Laluan</msg>
+  <msg key="You_can_also_browse_from">Anda boleh juga melayari dari</msg>
+  <msg key="You_can_always_re_open">Anda boleh sentiasa membukanya semula dengan</msg>
+  <msg key="You_do_not_have_admin_on">Anda tidak mempunyai hak pengurusan ke atas objek %root% atau mana-mana daripada anak-anaknya</msg>
+  <msg key="You_dont_have_a_portrait">Anda tidak mempunyai gambar lagi. Anda boleh</msg>
+  <msg key="You_have_admin_rights_on">Anda mempunyai hak pengurusan untuk objek-objek berikut:</msg>
+  <msg key="You_have_no_email_alerts">Buat masa ini anda tidak mempunyai amaran e-mel yang diregister.</msg>
+  <msg key="Your_Portrait">Gambar Anda</msg>
+  <msg key="Your_system_alerts">%gc_system_name% anda memberi amaran</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.15
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.16
@@ -1,83 +1,272 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="nl_NL" charset="ISO-8859-1">
 
-  <msg key="About_You">Over u</msg>
-  <msg key="Account_closed">&lt;p&gt;Uw registratie contract is gesloten.&lt;/p&gt; &lt;p&gt;Als u wilt kunnen we &lt;a href=&quot;%restore_url%&quot;&gt;deze heropenen&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="_or">, of</msg>
+  <msg key="A_member_of_the_system">Lid van de %system_name% gemeenschap sinds</msg>
+  <msg key="About_You">Over jou</msg>
+  <msg key="Account_at_system_closed">Je account op %system_name% is gesloten.</msg>
+  <msg key="Account_close_confirm_no_label">Nee, ik wil terug gaan naar %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">Ja, sluit alstublieft mijn account</msg>
+  <msg key="Account_closed">&lt;p&gt;Je account is gesloten.&lt;/p&gt; &lt;p&gt;Als je wilt kunnen we &lt;a href=&quot;%restore_url%&quot;&gt;het heropenen&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_closed_workspace_msg">&lt;P&gt;&lt;FONT color='red'&gt;&lt;B&gt;Je account is momenteel gesloten&lt;/B&gt;&lt;/FONT&gt;&lt;A href='%login_url%'&gt;Log in&lt;/a&gt; om te zien wat je er aan kunt doen.&lt;P&gt;</msg>
+  <msg key="Account_reopened_message">Je account op %system_name% is heropend. Welkom terug!</msg>
+  <msg key="Account_reopened_title">Account heropend</msg>
+  <msg key="Action">actie</msg>
+  <msg key="Add_new_app">Nieuwe toepassing toevoegen</msg>
+  <msg key="Admin">Beheer</msg>
+  <msg key="Administer_subsite">Beheer %subsite_name%</msg>
+  <msg key="Administrative_options">Beheersmogelijkheden voor deze gebruiker</msg>
+  <msg key="Alert_Type">Kennisgevingstype</msg>
+  <msg key="another_picture">nog een plaatje</msg>
   <msg key="Answer">Antwoord:</msg>
+  <msg key="Application_Error">Toepassingsfout</msg>
+  <msg key="Applications">Toepassingen</msg>
+  <msg key="Approve">Goedkeuren</msg>
   <msg key="at">op</msg>
-  <msg key="Bad_Password">Foutief Wachtwoord</msg>
+  <msg key="Authority">Authoriteit</msg>
+  <msg key="Bad_Password">Onjuist wachtwoord</msg>
+  <msg key="Ban">Verbannen</msg>
   <msg key="Basic_Information">Basisinformatie</msg>
-  <msg key="cannot_retrieve_password">Het verkrijgen van een wachtwoord via de gezaghebbende server wordt niet ondersteund.</msg>
-  <msg key="Change_my_Password">Wijzig Wachtwoord</msg>
+  <msg key="Biography">Biografie</msg>
+  <msg key="cannot_retrieve_password">Het verkrijgen van een wachtwoord via locale authoriteit (de database) wordt niet ondersteund.</msg>
+  <msg key="Cannot_see_memb_list">Kan de ledenlijst niet zien</msg>
+  <msg key="Change_locale_label">Taal instellen</msg>
+  <msg key="Change_my_Password">Mijn wachtwoord veranderen</msg>
+  <msg key="Change_pass_email_por">Wachtwoord, e-mail, portret wijzigen</msg>
   <msg key="Check_Your_Inbox">Controleer uw e-postbus</msg>
-  <msg key="Children">Kinderen</msg>
-  <msg key="Confirm">Bevestigen:</msg>
-  <msg key="Current_Password">Huidig Wachtwoord:</msg>
-  <msg key="Customize_Question">Vraag Op Maat maken</msg>
-  <msg key="Direct_Permissions">Directe permissies</msg>
-  <msg key="Email">Email</msg>
+  <msg key="Children">Dochters</msg>
+  <msg key="Close_account_explanation">&lt;P&gt;Bevestig alsjeblieft dat je je account op %system_name% wilt sluiten.&lt;P&gt;Het sluiten van je account betekent dat we je niet langer kennisgevingen sturen en je ook niet meer in de ledenlijst op %system_name% tonen. Je bijdragen aan de gemeenschap, daarentegen, zullen bewaard blijven, want deze maken deel uit van de geschiedenis van deze gemeenschap.&lt;P&gt;Merk op dat je je account ieder moment weer kunt openen.</msg>
+  <msg key="Close_your_account">Mijn account sluiten</msg>
+  <msg key="Comment">Opmerking</msg>
+  <msg key="Communities">Gemeenschappen</msg>
+  <msg key="communities">Gemeenschappen</msg>
+  <msg key="community">gemeenschap</msg>
+  <msg key="Confirm">Bevestigen</msg>
+  <msg key="Continue">Doorgaan</msg>
+  <msg key="Country_Name">Landnaam</msg>
+  <msg key="Create_new_community">Maak een nieuwe %pretty_name%</msg>
+  <msg key="Current_Password">Huidig wachtwoord:</msg>
+  <msg key="Currently_invisible_msg">&lt;P&gt;Andere gebruikers zien nu niet of je on-line bent.</msg>
+  <msg key="Currently_visible_msg">&lt;P&gt;Andere gebruikers kunnen zien of je online bent.</msg>
+  <msg key="Customize_Question">Vraag aanpassen</msg>
+  <msg key="Database_Error">Databasefout</msg>
+  <msg key="default_context">standaardverband</msg>
+  <msg key="Delete">Verwijderen</msg>
+  <msg key="DevAdmin">ProgBeheer</msg>
+  <msg key="Developers_Admin">Ontwikkelaars beheren</msg>
+  <msg key="Direct_Permissions">Directe rechten</msg>
+  <msg key="Disable">Afzetten</msg>
+  <msg key="Disabled">Uitgeschakeld</msg>
+  <msg key="Domain">Domein</msg>
+  <msg key="E_mail">E-mail</msg>
+  <msg key="edit_comment">opmerking wijzigen</msg>
+  <msg key="Elements_not_editable">Bepaalde elementen kunnen niet gewijzigd worden, omdat ze beheerd worden door %authority_name%</msg>
+  <msg key="Email">E-mail</msg>
+  <msg key="email_body_Forgotten_password">Hier is je logininformatie: %account_id_label%: %account_id% %password_label%: %password% Bezoek alsjeblieft de volgende link om je wachtwoord direct te wijzigen.</msg>
+  <msg key="email_body_Registration_password">Bedankt voor het registreren op %system_name%. Je kunt zo inloggen op %system_url%: %account_id_label%: %account_id% %password_label%: %password% Bezoek alsjeblieft de volgende link om je wachtwoord te wijzigen: %reset_password_url%</msg>
   <msg key="Email_Confirmation">E-mailbevestiging</msg>
   <msg key="Email_not_Requested">E-mail niet gevraagd</msg>
+  <msg key="email_subject_Forgotten_password">Je vergeten wachtwoord op %system_name%</msg>
+  <msg key="email_subject_Registration_password">Welkom bij %system_name%</msg>
+  <msg key="Enabled">Ingeschakeld</msg>
+  <msg key="Enter_your_username_to">Typ je gebruikersnaam in om te beginnen met wachtwoordherstel</msg>
+  <msg key="Erase_Portrait">Portret wissen</msg>
+  <msg key="erase_portrait">portret wissen</msg>
+  <msg key="Error">fout</msg>
   <msg key="Error_sending_mail">Fout bij verzenden e-mail</msg>
+  <msg key="Expires">Verloopt</msg>
+  <msg key="Filename">Bestandsnaam</msg>
   <msg key="First_names">Voornamen</msg>
+  <msg key="Forgot_your_password">Wachtwoord vergeten?</msg>
+  <msg key="Frequency">Frequentie</msg>
+  <msg key="Go_back">Ga terug</msg>
+  <msg key="go_upload_the_users_por">ga een portret voor deze gebruiker opladen</msg>
+  <msg key="go_upload_your_portrait">ga een portret van jezelf opladen</msg>
   <msg key="Grant">Toekennen</msg>
-  <msg key="Grant_Permission">Permissie toekennen</msg>
+  <msg key="Grant_Permission">Rechten toekennen</msg>
+  <msg key="Hide">Verbergen</msg>
+  <msg key="Home_page">Website</msg>
+  <msg key="If_you_were_to">Als je zou</msg>
+  <msg key="Information_Updated">Informatie bijgewerkt</msg>
+  <msg key="Invite">Uitnodigen</msg>
+  <msg key="ISO_Code">Isocode</msg>
+  <msg key="ISO_Code_List">Lijst van isocodes</msg>
+  <msg key="ISO_Codes_Not_Loaded">Isocodes zijn niet geladen</msg>
+  <msg key="ISO_Codes_not_loaded">Isocodes zijn niet geladen</msg>
+  <msg key="Join_community">Wordt lid van de gemeenschap</msg>
   <msg key="Join_group_name">Wordt lid van %group_name%</msg>
-  <msg key="Last_name">Achternaam.</msg>
+  <msg key="Join_this_community">Wordt lid van deze gemeenschap</msg>
+  <msg key="Keyword">Sleutelwoord</msg>
+  <msg key="Last_name">Achternaam</msg>
+  <msg key="later">later.</msg>
+  <msg key="Leave_community">Verlaat de gemeenschap</msg>
+  <msg key="Leave_this_community">Verlaat deze gemeenschap</msg>
+  <msg key="lGo_back_without_adding">Ge terug zonder gebruikers toe te voegen</msg>
   <msg key="Log_In">Log In</msg>
+  <msg key="log_in">log in</msg>
+  <msg key="Log_in_to_system">Log in in %system_name%</msg>
+  <msg key="logging_back_in">opnieuw inloggen</msg>
+  <msg key="Login_has_expired">De loginpagina is verlopen. Log alsjeblieft opnieuw in.</msg>
+  <msg key="Login_or_register">Log in of registreer</msg>
+  <msg key="login_page">Loginpagina</msg>
+  <msg key="Logout">Uitloggen</msg>
+  <msg key="Logout_from_system">Log uit uit %system_name%</msg>
+  <msg key="lt__youd_be_able_to_get">, dan zou je meer informatie over je mede-gemeenschapslid kunnen krijgen.</msg>
   <msg key="lt_Cannot_join_this_grou">Lid worden van deze groep is niet mogelijk.</msg>
+  <msg key="lt_Complete_List_of_ISO_">Complete lijst van isocodes</msg>
+  <msg key="lt_Continue_working_with">Werk verder met %system_name%</msg>
+  <msg key="lt_Edit_comment_for_the_">Opmerking wijzigen voor het portret van %first_names% %last_name%</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) heeft zich geregistreerd als gebruiker op %system_url% </msg>
+  <msg key="lt_For_Site-Wide_Adminis">Voor site-brede beheerders</msg>
   <msg key="lt_Grant_Permission_on_n">Ken toestemming toe aan %name%</msg>
-  <msg key="lt_Inherited_Permissions">Ge�rfde Permissies</msg>
-  <msg key="lt_It_would_be_a_very_ba">Het is een zeer slecht idee om deze optie te gebruiken indien u een gedeelde computer gebruikt, zoals in een bibliotheek of school. Elke volgende gebruiker van die computer kan zich dan voordoen als u op ons systeem.</msg>
+  <msg key="lt_Heres_what_the_databa">Dit is wat de database meldde:</msg>
+  <msg key="lt_How_would_you_like_the">Hoe wil je dat de wereld %first_names% %last_name% ziet?</msg>
+  <msg key="lt_If_you_dont_think_the">Als je denkt dat deze persoon nog geen account heeft?</msg>
+  <msg key="lt_If_you_happen_to_know">Als je weet of gelooft dat de persoon die je wilt uitbodigen al een account op dit systeem heeft:</msg>
+  <msg key="lt_If_you_need_this_func">Als je deze functionaliteit nodig gebruik, laad dan alsjeblieft acs-reference en ref-countries in.</msg>
+  <msg key="lt_Inherited_Permissions">Ge�rfde rechten</msg>
+  <msg key="lt_It_would_be_a_very_ba">Het is een zeer slecht idee om deze optie te gebruiken in het geval je een gedeelde computer gebruikt, zoals in een bibliotheek of school. Elke volgende gebruiker van die computer kan zich dan voordoen als jou op ons systeem.</msg>
   <msg key="lt_New_registration_at_s">Nieuwe registratie op %system_url%</msg>
-  <msg key="lt_Note_that_you_can_era">Een opgeslagen e-mailadres en wachtwoord kan worden gewist door de &quot;log uit&quot; optie te kiezen vanuit de &quot;Werkplek&quot;.</msg>
+  <msg key="lt_Note_text_in_red_below">Merk op dat rode tekst in de invoervelden voor parameters aangeven dat de waarde van deze parameter overschreven worden door een vermelding in het OpenACS parameterbestand. Het gebruik van het parameterbestand wordt afgeraden maar sommige sites kunnen niet zonder vanweger die mogelijkheid instantie-specifieke waarden voor paramters toe te passen welke onafhankelijk zijn van waarden in de apm_parameters tabellen.</msg>
+  <msg key="lt_Note_that_you_can_era">Een opgeslagen e-mailadres en wachtwoord kan worden gewist door de optie &quot;uitloggen&quot; te kiezen vanuit de werkplek.</msg>
   <msg key="lt_num_children_Children">%num_children% verborgen onderliggende elementen</msg>
-  <msg key="lt_On_portrait_publish_d">&lt;a href=&quot;%subsite_url%user/portrait/?return_url=%pvt_home_url%&quot;&gt;%portrait_title%&lt;/a&gt; is op %portrait_publish_date% ingevoerd</msg>
-  <msg key="lt_Our_server_can_tell_y">Ons systeem kan uw browser helpen om dingen te onthouden, zoals uw e-mailadres en wachtwoord. Dit is handig als u de enige bent die op uw computer werkt. U hoeft uw e-mailadres en wachtwoord dan niet steeds in te typen.</msg>
-  <msg key="lt_Password_Confirmation">Bevestig Wachtwoord:</msg>
-  <msg key="lt_Personal_Home_Page_UR">URL van persoonlijke webpagina:</msg>
-  <msg key="lt_Please_read_and_follo">Lees en volgt de instructies in deze e-mail alstublieft.</msg>
+  <msg key="lt_On_portrait_publish_d">Op %portrait_publish_date% heb je &lt;a href=&quot;%subsite_url%user/portrait/?return_url=%pvt_home_url%&quot;&gt;%portrait_title%&lt;/a&gt; opgeladen.</msg>
+  <msg key="lt_Our_server_can_tell_y">Onze server kan je browser opdragen om dingen te onthouden, zoals je e-mailadres en wachtwoord. Dit is handig als je de enige bent die op deze computer werkt. Je hoeft je e-mailadres en wachtwoord dan niet steeds in te typen.</msg>
+  <msg key="lt_Password_Confirmation">Wachtwoordbevestiging</msg>
+  <msg key="lt_Personal_Home_Page_UR">URL van je persoonlijke webpagina:</msg>
+  <msg key="lt_Please_locate_your_co">Kies uit de lijst hieronder de landcode van jouw land en gebruik dan de &quot;terug&quot;-knop van je browser om terug te gaan naar het  vorige formulier.</msg>
+  <msg key="lt_Please_read_and_follo">Lees en volg alsjeblieft de instructies in deze e-mail</msg>
   <msg key="lt_Please_try_to_a_hrefi">Probeer nogmaals om &lt;a href=&quot;index&quot;&gt;in te loggen&lt;/a&gt;</msg>
-  <msg key="lt_Problem_with_authenti">Probleem tijdens controle van authenticiteit</msg>
-  <msg key="lt_Registration_informat">Inschrijfgegevens voor deze service zijn toegezonden aan %email%.</msg>
-  <msg key="lt_Registration_informat_1">Inschrijfgegevens voor deze service zijn toegezonden aan %email%.</msg>
-  <msg key="lt_registration_request_submitted">Het verzoek om inschrijving is verzonden aan de beheerder van %system_name%. We zijn in afwachting van toestemming.</msg>
+  <msg key="lt_Portrait_of_first_last">Portret van %first_names% %last_name%</msg>
+  <msg key="lt_Privileges_higher_implied">Privileges hoger in de hierarchie impliceren ook de privileges eronder. Als je zegmaar beheersrechten toekent, dan ken je ook lezen/schrijven en dergelijke toe.
+</msg>
+  <msg key="lt_Problem_with_authenti">Authenticatie is mislukt</msg>
+  <msg key="lt_Registration_informat">De registratiegegevens voor deze service zijn verzonder aan %email%.</msg>
+  <msg key="lt_Registration_informat_1">De registratiegegevens voor deze service zijn toegezonden aan %email%.</msg>
+  <msg key="lt_registration_request_submitted">Je inschrijvingsverzoek is verzonden aan de beheerder van %system_name%. Het is nu wachten op zijn goedkeuring.</msg>
   <msg key="lt_Saving_email_address_">Opslaan e-mailadres en wachtwoord</msg>
-  <msg key="lt_Show_everyone_else_at">Laat aan iedereen op %system_name% zien hoe goed u eruit ziet:</msg>
-  <msg key="lt_Sorry_but_it_seems_th">Het spijt ons, maar het lijkt alsof u bent uitgesloten van %system_name%.</msg>
-  <msg key="lt_There_was_a_problem_w">Er was een probleem met de authenciteit van uw account</msg>
+  <msg key="lt_Show_everyone_else_at">Laat aan iedereen op de %system_name% zien hoe goed je eruit ziet:</msg>
+  <msg key="lt_Sorry_but_it_seems_th">Het spijt ons, maar het lijkt alsof je bent uitgesloten van %system_name%.</msg>
+  <msg key="lt_Sure_erase_user_por">Weet je zeker dat je het portret van deze gebruiker wilt wissen?</msg>
+  <msg key="lt_Sure_erase_your_por">Weet je zeker dat je je portret wilt wissen?</msg>
+  <msg key="lt_The_picture_of_you_in">De afbeelding van je die in dit systeem zit is ongeldig.</msg>
+  <msg key="lt_There_was_a_problem_w">Er is een probleem opgetreden tijdens het authenticeren van je account</msg>
+  <msg key="lt_This_is_the_image_that">Dit is de afbeelding die we tonen aan andere gebruikers op %system_name.</msg>
+  <msg key="lt_This_user_doesnt_have">Deze gebruiker heeft nog geen portret. Je kunt</msg>
+  <msg key="lt_This_user_is_deleted">Deze gebruiker is verwijderd en verbannen uit deze gemeenschap.</msg>
   <msg key="lt_To_confirm_your_regis">Ga naar %confirmation_url% om de inschrijving te bevestigen.</msg>
+  <msg key="lt_Upload_your_favorite">Je kunt hier jouw favoriet bestand van je eigen computer opladen. De mag een ingescand JPEG- of GIF-bestand zijn. Merk op dat je geen verwijzing kan maken naar een bestand ergens op internet, het bestand moet op je eigen computer staan.</msg>
+  <msg key="lt_Uploaded_pretty_date">Opgeladen: %pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">Opgeladen: %publish_date%</msg>
+  <msg key="lt_Use_the_Browse_button">Gebruik de knop &quot;Bladeren...&quot; om je bestand op te zoeken, klik dan op &quot;Openen&quot;.</msg>
+  <msg key="lt_We_cant_find_you">We kunnen je (gebruiker %user_id%) niet vinden in de gebruikerstabel. Waarschijnlijk is je account op de ��n of andere manier gewist.</msg>
+  <msg key="lt_We_had_a_problem_proc">We kregen een probleem terwijl we je invoer verwerkten.</msg>
   <msg key="lt_We_were_not_awaiting_">Wij verwachtten geen e-mail van u. Er is ergens iets misgegaan.</msg>
   <msg key="lt_Welcome_to_system_nam">Welkom bij %system_name%</msg>
+  <msg key="lt_What_other_people_see">Wat andere mensen zien als ze op mijn naam klikken</msg>
   <msg key="lt_You_cant_have_a_lt_in">&amp;lt; kan niet in een voornaam worden gebruikt. Het lijkt dan alsof er een HTML tag staat, hetgeen andere gebruikers in verwarring kan brengen.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">&amp;lt; kan niet in een achternaam worden gebruikt. Het lijkt dan alsof er een HTML tag staat, hetgeen andere gebruikers in verwarring kan brengen.</msg>
+  <msg key="lt_You_wont_get_any_email">Je krijgt geen e-mail tot na %pretty_date%</msg>
   <msg key="lt_Your_email_has_been_c">De e-mail is bevestigd. Log nu in op %system_name%.</msg>
   <msg key="lt_Your_email_has_been_c_1">De e-mail is bevestigd. We zijn nu in afwachting van toestemming van de beheerder van %system_name%.</msg>
   <msg key="lt_Your_email_is_confirm">De e-mail is bevestigd.</msg>
+  <msg key="lt_Your_login_has_expire">Je login is verlopen. Voer alsjeblieft je wachtwoord opnieuw in om verder te werken.</msg>
   <msg key="lt_Your_URL_doesnt_have_">De URL heeft niet de juiste opmaak. Een geldige URL ziet er ongeveer alsvolgt uit \&quot;%valid_url_example%\&quot;.&quot;</msg>
+  <msg key="Make_administrator">Beheerder maken</msg>
+  <msg key="Make_member">Lid maken</msg>
+  <msg key="Make_yourself_invisible_label">Mijzelf onzichtbaar maken</msg>
+  <msg key="Make_yourself_visible_label">Jezelf zichtbaar maken</msg>
+  <msg key="Manage_your_notifications">Mijn kennisgevingen instellen</msg>
+  <msg key="Mem_list_not_allowed">Sorry, maar je bent niet bevoegd om de ledenlijst te zien.</msg>
+  <msg key="Member_State">Lidstatus</msg>
+  <msg key="Members">Leden</msg>
   <msg key="Name">Naam:</msg>
-  <msg key="New_Password">Nieuw Wachtwoord:</msg>
+  <msg key="New_Password">Nieuw wachtwoord:</msg>
+  <msg key="No_applications">Geen toepassingen</msg>
+  <msg key="No_ISO_Codes">Geen isocodes</msg>
+  <msg key="No_package_parameters">Dit pakket heeft geen parameters</msg>
   <msg key="no_portrait_title_message">Jouw portret</msg>
+  <msg key="No_pretty_plural">Geen %pretty_plural%</msg>
+  <msg key="No_services">Geen diensten</msg>
   <msg key="none">geen</msg>
+  <msg key="Not_logged_in">Niet ingelogd</msg>
+  <msg key="Notes">Notities:</msg>
+  <msg key="Notice">Melding:</msg>
+  <msg key="on_name_to">op %name% aan:</msg>
+  <msg key="optional">(facultatief)</msg>
+  <msg key="Options">Opties</msg>
+  <msg key="Or_add_a_new_user">Of voeg een nieuwe gebruiker toe.</msg>
+  <msg key="or_the">of de</msg>
   <msg key="Password">Wachtwoord:</msg>
   <msg key="Password_changed_body">Uw login gegevens op %system_name% voor %account_id_label% %account_id%. 
 Uw wachtwoord is recent gewijzigd. U hoeft niets te doen, dit bericht is slechts bedoeld om de veiligheid van uw gegevens te verhogen. --------------- U kunt uw wachtwoord altijd wijzigen door het volgende te doen: 1. Login op %system_name% 2. Klik op de &quot;%pvt_home_name%&quot; link 3. Kies &quot;%password_update_link_text%&quot; </msg>
   <msg key="Password_changed_subject">Wachtwoord is veranderd</msg>
   <msg key="Permissions">Permissies</msg>
+  <msg key="permissions">rechten</msg>
   <msg key="Permissions_for_name">Permissies van %name%</msg>
+  <msg key="Please_return_to_home">Keer alsjeblieft terug naar %home_link%.</msg>
+  <msg key="Portrait">Portret</msg>
   <msg key="Question">Vraag:</msg>
+  <msg key="Re_enable">Opnieuw inschakelen</msg>
   <msg key="Recover_Password">Terugkrijgen wachtwoord</msg>
   <msg key="Register">Inschrijven</msg>
+  <msg key="Registration_Approval_Notice">&lt;p&gt; Bedankt voor je registratie voor %system_name%. Er is een beheerder op de hoogte gebracht van je registratie, en, zodra hij instemt krijg je een e-mailtje zodat je %system_name% kan gebruiken.
+</msg>
+  <msg key="Reject">Weigeren</msg>
+  <msg key="Remember_my_login">Onthoudt mijn login op deze computer</msg>
+  <msg key="Remove">Verwijderen</msg>
+  <msg key="Req_membership_comm">Verzoek lid te mogen worden van deze gemeenschap</msg>
+  <msg key="Request_membership">Verzoek lid te mogen worden</msg>
+  <msg key="return_to_application">keer terug naar de toepassing</msg>
   <msg key="Revoke_Checked">Gemarkeerde Intrekken</msg>
+  <msg key="Role">Rol</msg>
+  <msg key="Save_comment">Opmerking opslaan</msg>
   <msg key="Screen_name">Schermnaam</msg>
+  <msg key="Search_For_Exist_User">Zoek een gebruiker</msg>
+  <msg key="Security_context_root">Basis van de veiligheidscontekst </msg>
+  <msg key="Select_an_Object_by_Id">Kies een object met Id:</msg>
+  <msg key="Send_email_to_this_user">Stuur e-mail naar deze gebruiker</msg>
   <msg key="Show">Toon</msg>
+  <msg key="Site_wide_administration">Site-breed beheer</msg>
   <msg key="sorry_forgotten_pwd">Sorry, wij kunnen u niet verder helpen met het wachtwoord dat u vergeten bent.</msg>
+  <msg key="Status">Status</msg>
+  <msg key="Story_Behind_Photo">Verhaal achter foto</msg>
+  <msg key="Story_behind_photo">Verhaal achter foto</msg>
+  <msg key="Subcommunities">Subgemeenschappen</msg>
+  <msg key="subcommunities">subgemeenschappen</msg>
+  <msg key="subcommunity">subgemeenschap</msg>
   <msg key="Thank_you">Bedankt.</msg>
+  <msg key="The_ISO_codes_were_not">De isocodes zijn niet geladen op deze server.</msg>
+  <msg key="this_subsite">deze subsite</msg>
+  <msg key="This_user_has_left_the">Deze gebruiker heeft de gemeenschap verlaten.</msg>
+  <msg key="To_log_in_visit_the">Om in te loggen bezoek je</msg>
+  <msg key="Topic">Onderwerp</msg>
+  <msg key="type_specific_info">typespecifieke informatie</msg>
+  <msg key="UP">UP</msg>
   <msg key="up_to_context_name">tot aan %context_name% </msg>
   <msg key="Update">Bijwerken</msg>
-  <msg key="Update_Password">Bijwerken Wachtwoord</msg>
-  <msg key="upload_a_portrait">Sla een portret op</msg>
+  <msg key="Update_Password">Wachtwoord wijzigen</msg>
+  <msg key="upload">opladen</msg>
+  <msg key="upload_a_portrait">Portret aanbieden</msg>
+  <msg key="upload_a_replacement_por">een vervangend portret oploaden</msg>
+  <msg key="Upload_Portrait">Portret opladen</msg>
   <msg key="Username">Gebruikersnaam</msg>
-  <msg key="Your_Portrait">Portret:</msg>
+  <msg key="Vacation_Info_Updated">Verlofinformatie bijgewerkt</msg>
+  <msg key="Vacation_information_updated">Je verlofinformatie op %site_link% is bijgewerkt.</msg>
+  <msg key="Welcome_user">Welkom, %user_name%</msg>
+  <msg key="When_leaving_checkbox_empty">Als je een aankruisvakje hier leeg laat dan zal dat privilige ingetrokken worden van de partij die je kiest in het geval het al eerder aan die partij was toegewezen.</msg>
+  <msg key="Whos_Online_link_label">Gebruikers momenteel online</msg>
+  <msg key="Whos_Online_title">Wie is er online?</msg>
+  <msg key="Yes_I_am_sure">Ja, ik ben zeker</msg>
+  <msg key="You_can_also_browse_from">Je kunt nu ook browsen uit de</msg>
+  <msg key="You_can_always_re_open">Je kunt het altijd heropenen door te</msg>
+  <msg key="You_do_not_have_admin_on">Je hebt geen beheersrechten op het object %root% or ��n van zijn dochters.</msg>
+  <msg key="You_dont_have_a_portrait">Je hebt nog geen portret. Je kunt</msg>
+  <msg key="You_have_admin_rights_on">Je hebt beheersrechten op de volgende objecten:</msg>
+  <msg key="You_have_no_email_alerts">Je hebt momenteel geen e-mail kennisgevingen geregistreerd.</msg>
+  <msg key="Your_Account">Jouw account</msg>
+  <msg key="Your_discussion_alerts">Jouw discussieforum-kennisgevingen</msg>
+  <msg key="Your_Portrait">Mijn portret:</msg>
+  <msg key="Your_system_alerts">Jouw %gc_system_name% alerts</msg>
+  <msg key="Youre_marked_as_back">Je bent nu aangemerk als terug van vakantie op %site_link%</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.5
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:49 -0000	1.6
@@ -1,82 +1,269 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="pt_BR" charset="ISO-8859-1">
 
+  <msg key="_or">, ou</msg>
+  <msg key="A_member_of_the_system">Um membro da comunidade %system_name% desde</msg>
   <msg key="About_You">Sobre voc�</msg>
+  <msg key="Account_at_system_closed">Sua conta em %system_name% est� fechada.</msg>
+  <msg key="Account_close_confirm_no_label">N�o, leve-me de volta para %pvt_home_name%</msg>
+  <msg key="Account_close_confirm_yes_label">Sim, porfavor feche minha conta</msg>
   <msg key="Account_closed">&lt;p&gt;A sua conta encontra-se atualmente fechada.&lt;/p&gt; &lt;p&gt;Se desejar, podemos &lt;a href=&quot;%restore_url%&quot;&gt;reabrir a sua conta&lt;/a&gt;.&lt;/p&gt;</msg>
+  <msg key="Account_closed_workspace_msg">&lt;p&gt; &lt;font color=&quot;red&quot;&gt; &lt;b&gt; Sua conta est� atualmente fechada. &lt;/b&gt; &lt;/font&gt; &lt;a href=&quot;%login_url%&quot;&gt;Fa�a o Log in&lt;/a&gt; novamente para ver o que pode fazer sobre isto. &lt;/p&amp;;gt;</msg>
+  <msg key="Account_reopened_message">Sua conta em %system_name foi reaberta. Bem-vindo novamente.</msg>
+  <msg key="Account_reopened_title">Conta Reaberta</msg>
+  <msg key="Action">A��o</msg>
+  <msg key="Add_new_app">Adicionar nova aplica��o</msg>
+  <msg key="Admin">Administrar</msg>
+  <msg key="Administer_subsite">Administrar %subsite_name%</msg>
+  <msg key="Administrative_options">Op��es administrativas para este usu�rio</msg>
+  <msg key="Alert_Type">Tipo de alerta</msg>
+  <msg key="another_picture">outra imagem</msg>
   <msg key="Answer">Resposta:</msg>
+  <msg key="Application_Error">Erro da aplica��o</msg>
+  <msg key="Applications">Aplica��es</msg>
+  <msg key="Approve">Aprovar</msg>
   <msg key="at">em</msg>
+  <msg key="Authority">Autoridade</msg>
   <msg key="Bad_Password">Senha Incorreta</msg>
+  <msg key="Ban">Banir</msg>
   <msg key="Basic_Information">Informa��es B�sicas</msg>
+  <msg key="Biography">Biografia</msg>
   <msg key="cannot_retrieve_password">Recupera��o de senha da autoridade local n�o � suportado.</msg>
+  <msg key="Cannot_see_memb_list">N�o pode ver a lista dos membros</msg>
+  <msg key="Change_locale_label">Mudar idioma</msg>
   <msg key="Change_my_Password">Mudar minha Senha</msg>
+  <msg key="Change_pass_email_por">Mudar senha, endere�o eletr�nico, retrato</msg>
   <msg key="Check_Your_Inbox">Verifique sua Caixa de Entrada</msg>
   <msg key="Children">Filhos</msg>
+  <msg key="Close_account_explanation">Por favor, confirme se voc� deseja mesmo cancelar sua inscri��o no sistema %system_name%.&lt;/p&gt;&lt;p&gt;O encerramento de sua inscri��o significa que voc� n�o receber� mais notifica��es por correio eletr�nico, nem aparecer� na lista dos membros deste sistema. Suas contribui��es, contudo, ser� opreservadas, pois s�o parte da hist�ria da nossa comunidade.&lt;/p&gt;&lt;p&gt;N�o se esque�a: voc� pode se cadastrar novamente quando quiser.&lt;/p&gt;</msg>
+  <msg key="Close_your_account">Feche sua conta</msg>
+  <msg key="Comment">Coment�rio</msg>
+  <msg key="Communities">Comunidades</msg>
+  <msg key="communities">comunidades</msg>
+  <msg key="community">comunidade</msg>
   <msg key="Confirm">Confirmar:</msg>
+  <msg key="Continue">Continuar</msg>
+  <msg key="Country_Name">Nome do Pa�s</msg>
+  <msg key="Create_new_community">Criar novo %pretty_name%</msg>
   <msg key="Current_Password">Senha Atual:</msg>
+  <msg key="Currently_invisible_msg">&lt;p&gt; Seu estado online est� atualmente invis�vel aos outros usu�rios &lt;/p&gt;</msg>
+  <msg key="Currently_visible_msg">&lt;p&gt; Seu estado online est� atualmente vis�vel aos outros usu�rios &lt;/p&gt;</msg>
   <msg key="Customize_Question">Personalizar Pergunta</msg>
+  <msg key="Database_Error">Erro no Banco de Dados</msg>
+  <msg key="default_context">contexto padr�o</msg>
+  <msg key="Delete">Deletar</msg>
+  <msg key="DevAdmin">DevAdmin</msg>
+  <msg key="Developers_Admin">Administra��o para Desenvolvedores</msg>
   <msg key="Direct_Permissions">Permiss�es Diretas</msg>
+  <msg key="Disable">Desabilitar</msg>
+  <msg key="Disabled">Desabilitado</msg>
+  <msg key="Domain">Dom�nio</msg>
+  <msg key="E_mail">Endere�o eletr�nico</msg>
+  <msg key="edit_comment">editar coment�rio</msg>
+  <msg key="Elements_not_editable">Alguns elementos n�o podem ser editados, pois s�o gerenciados por %authority_name%.</msg>
   <msg key="Email">Email</msg>
+  <msg key="email_body_Forgotten_password">Estas s�o suas novas informa��es para login: %account_id_label%: %account_id% %password_label%: %password% Por favor, visite o link a seguir para alterar sua senha: %reset_password_url%</msg>
+  <msg key="email_body_Registration_password">Obrigado pelo cadastro no sistema %system_name%. Voc� pode acessar o %system_url% da seguinte forma: %account_id_label%: %account_id% %password_label%: %password% Por favor, visite o link a seguir para alterar sua senha: %reset_password_url%</msg>
   <msg key="Email_Confirmation">Confirma��o de E-mail</msg>
   <msg key="Email_not_Requested">E-mail n�o Solicitado</msg>
+  <msg key="email_subject_Forgotten_password">Sua senha esquecida em %system_name%</msg>
+  <msg key="email_subject_Registration_password">Bem-vindo ao %system_name%</msg>
+  <msg key="Enabled">Habilitado</msg>
+  <msg key="Enter_your_username_to">Informe seu nome de usu�rio para iniciar a recupera��o da senha.</msg>
+  <msg key="Erase_Portrait">Apagar Retrato</msg>
+  <msg key="erase_portrait">apagar retrato</msg>
+  <msg key="Error">Erro</msg>
   <msg key="Error_sending_mail">Erro ao enviar e-mail</msg>
+  <msg key="Expires">Expira</msg>
+  <msg key="Filename">Nome do arquivo</msg>
   <msg key="First_names">Primeiros nomes</msg>
+  <msg key="Forgot_your_password">Esqueceu sua senha?</msg>
+  <msg key="Frequency">Frequ�ncia</msg>
+  <msg key="Go_back">Voltar</msg>
+  <msg key="go_upload_the_users_por">enviar retrato do usu�rio</msg>
+  <msg key="go_upload_your_portrait">enviar seu retrato</msg>
   <msg key="Grant">Permitir</msg>
   <msg key="Grant_Permission">Dar Permiss�o</msg>
+  <msg key="Hide">Ocultar</msg>
+  <msg key="Home_page">P�gina Pessoal</msg>
+  <msg key="If_you_were_to">Se voc� fosse</msg>
+  <msg key="Information_Updated">Informa��o Atualizada</msg>
+  <msg key="Invite">Convidar</msg>
+  <msg key="ISO_Code">C�digo ISO</msg>
+  <msg key="ISO_Code_List">Lista de C�digos ISO</msg>
+  <msg key="ISO_Codes_Not_Loaded">C�digos ISO N�o Carregados </msg>
+  <msg key="ISO_Codes_not_loaded">C�digos ISO n�o carregados</msg>
+  <msg key="Join_community">Aderir � comunidade</msg>
   <msg key="Join_group_name">Juntar-se a %group_name%</msg>
+  <msg key="Join_this_community">Aderir a esta comunidade</msg>
+  <msg key="Keyword">Palavra Chave</msg>
   <msg key="Last_name">�ltimo nome</msg>
+  <msg key="later">mais tarde.</msg>
+  <msg key="Leave_community">Deixar comunidade</msg>
+  <msg key="Leave_this_community">Deixar esta comunidade</msg>
+  <msg key="lGo_back_without_adding">Voltar sem incluir usu�rios</msg>
   <msg key="Log_In">Log In</msg>
+  <msg key="log_in">log in</msg>
+  <msg key="Log_in_to_system">Efetuar login no sistema %system_name%</msg>
+  <msg key="logging_back_in">logar-se novamente</msg>
+  <msg key="Login_has_expired">A p�gina de login expirou. Por favor, efetue novamente o login.</msg>
+  <msg key="Login_or_register">Efetue o login ou cadastre-se</msg>
+  <msg key="login_page">p�gina de login</msg>
+  <msg key="Logout">Sair</msg>
+  <msg key="Logout_from_system">Efetuar logout do sistema %system_name%</msg>
+  <msg key="lt__youd_be_able_to_get">, voc� poderia ter maiores informa��es sobre os outros membros da comunidade.</msg>
   <msg key="lt_Cannot_join_this_grou">N�o � poss�vel juntar-se a este grupo.</msg>
+  <msg key="lt_Complete_List_of_ISO_">Lista Completa de C�digos ISO</msg>
+  <msg key="lt_Continue_working_with">Continuar trabalhando com o sistema %system_name%</msg>
+  <msg key="lt_Edit_comment_for_the_">Editar coment�rio para o retrato de: %first_names% %last_name%</msg>
   <msg key="lt_first_names_last_name">%first_names% %last_name% (%email%) registrado como um usu�rio de %system_url%</msg>
+  <msg key="lt_For_Site-Wide_Adminis">Para Administradores do Site</msg>
   <msg key="lt_Grant_Permission_on_n">Conceder Permiss�o para %name%</msg>
+  <msg key="lt_Heres_what_the_databa">Veja o que a base de dados relatou:</msg>
+  <msg key="lt_How_would_you_like_the">Como voc� quer que os usu�rios do site vejam voc�</msg>
+  <msg key="lt_If_you_dont_think_the">Se voc� acha que essa pessoa ainda n�o est� cadastrada:</msg>
+  <msg key="lt_If_you_happen_to_know">Se voc� acha (ou sabe) que a pessoa que voc� quer convidar j� est� cadastrada:</msg>
+  <msg key="lt_If_you_need_this_func">Se voc� precisa ativar essa fun��o, carregue o acs-reference e o ref-countries.</msg>
   <msg key="lt_Inherited_Permissions">Permiss�es Herdadas</msg>
   <msg key="lt_It_would_be_a_very_ba">Seria uma m� id�ia escolher este op��o se voc� est� usando um computador compartilhado numa biblioteca ou escola. O pr�ximo usu�rio desta m�quina poderia usar seu login em nosso servi�o.</msg>
   <msg key="lt_New_registration_at_s">Novo registro em %system_url%</msg>
+  <msg key="lt_Note_text_in_red_below">Obs.: um texto em vermelho sob os campos de entrada de par�metros indica que o valor desse par�metro est� sendo substitu�do por uma entrada no arquivo de par�metros do OpenACS. N�o indicamos o uso do arquivo de par�metros, mas alguns sites precisam de valores espec�ficos para cada par�metro, independente das tabelas apm_parameter .</msg>
   <msg key="lt_Note_that_you_can_era">Note que voc� pode apagar seu endere�o de email e sua senha salva ao escolher a op��o de &quot;logout&quot; do seu espa�o de trabalho.</msg>
   <msg key="lt_num_children_Children">%num_children% Filhos Ocultos</msg>
   <msg key="lt_On_portrait_publish_d">Em %portrait_publish_date%, voc� fez o upload de &lt;a href=&quot;/user/portrait/&quot;&gt;%portrait_title%&lt;/a&gt;</msg>
   <msg key="lt_Our_server_can_tell_y">Nosso servidor pode dizer ao seu navegador para lembrar de certas informa��es, tal como seu endere�o de email e senha. Isto � conveniente para voc� porque, se voc� � a �nica pessoa quem usa seu computador, voc� n�o ter� que dizer-nos seu endere�o de email e senha novamente.</msg>
   <msg key="lt_Password_Confirmation">Confirma��o de Senha:</msg>
   <msg key="lt_Personal_Home_Page_UR">URL da P�gina Pessoal:</msg>
+  <msg key="lt_Please_locate_your_co">Por favor, localize o c�digo do seu pa�s na lista abaixo. Em seguida, use o bot�o &quot;voltar&quot; em seu navegador para retornar ao formul�rio anterior.</msg>
   <msg key="lt_Please_read_and_follo">Por favor leia e siga as instru��es neste email.</msg>
   <msg key="lt_Please_try_to_a_hrefi">Por favor tente &lt;a href=&quot;index&quot;&gt;fazer login&lt;/a&gt; novamente</msg>
+  <msg key="lt_Portrait_of_first_last">Retrado de %first_names% %last_name%</msg>
+  <msg key="lt_Privileges_higher_implied">Um alto privil�gio implica automaticamente em todas as permiss�es inferiores. Ex.: autorizando o poder de &quot;Administrar&quot;, � automaticamente permitido &quot;Ler&quot;, &quot;Gravar&quot;, etc.</msg>
   <msg key="lt_Problem_with_authenti">Problema com autentica��o</msg>
   <msg key="lt_Registration_informat">Informa��es de registro deste servi�o acabaram de ser enviados para %email%.</msg>
   <msg key="lt_Registration_informat_1">Informa��es de registro deste servi�o foram enviados para %email%.</msg>
   <msg key="lt_registration_request_submitted">Sua solicita��o de registro foi submetida para o administrador de %system_name%. Ela est� esperando para ser aprovada.</msg>
   <msg key="lt_Saving_email_address_">Salvando endere�o de email e senha</msg>
   <msg key="lt_Show_everyone_else_at">Mostre a todos em %system_name% como voc� tem um grande visual:</msg>
   <msg key="lt_Sorry_but_it_seems_th">Desculpe mas parece que voc� foi banido de %system_name%. </msg>
+  <msg key="lt_Sure_erase_user_por">Voc� tem creteza que deseja apagar o retrato deste usu�rio?</msg>
+  <msg key="lt_Sure_erase_your_por">Voc� tem certeza que deseja apagar seu retrato?</msg>
+  <msg key="lt_The_picture_of_you_in">Seu retrato no sistema n�o � v�lido. Por favor</msg>
   <msg key="lt_There_was_a_problem_w">Ocorreu um problema com a autentica��o de sua conta</msg>
+  <msg key="lt_This_is_the_image_that">Esta � a imagem que ser� mostrada aos usu�rios do %system_name%</msg>
+  <msg key="lt_This_user_doesnt_have">O usu�rio n�o possui um retrato ainda. Voce pode</msg>
+  <msg key="lt_This_user_is_deleted">Este usu�rio foi apagado e banido da comunidade.</msg>
   <msg key="lt_To_confirm_your_regis">Para confirmar seu registro, por favor clique em %confirmation_url%</msg>
+  <msg key="lt_Upload_your_favorite">Envie seu arquivo favorito, uma imagem scaneada JPEG ou GIF de seu computador (note que voc� s� pode referenciar uma imagem que esteja no disco r�gido de seu computador).</msg>
+  <msg key="lt_Uploaded_pretty_date">Enviado: %pretty_date%</msg>
+  <msg key="lt_Uploaded_publish_date">Enviado: %publish_date%</msg>
+  <msg key="lt_Use_the_Browse_button">Use o bot�o &quot;Navegar&quot; para localizar o arquivo, ent�a click em &quot;Abrir&quot;</msg>
+  <msg key="lt_We_cant_find_you">N�o conseguimos encontrar voc� (usu�rio user %user_id%) em nossa tabela de membros. Pode ser que sua conta tenha sido apagada.</msg>
+  <msg key="lt_We_had_a_problem_proc">N�s tivemnos um problema processando os dados.</msg>
   <msg key="lt_We_were_not_awaiting_">N�s n�o est�vamos esperando por seu email. Deve haver algum erro.</msg>
   <msg key="lt_Welcome_to_system_nam">Bem-vindo a %system_name%</msg>
+  <msg key="lt_What_other_people_see">O que outras pessoas enxergam quando clicam em seu nome</msg>
   <msg key="lt_You_cant_have_a_lt_in">Voc� n�o pode ter um &amp;lt; no seu nome porque isto parece com um comando HTML (tag) e confunde outros usu�rios.</msg>
   <msg key="lt_You_cant_have_a_lt_in_1">Voc� n�o pode ter um &amp;lt; no seu sobrenome porque isto parece com um comando HTML (tag) e confunde outros usu�rios.</msg>
+  <msg key="lt_You_wont_get_any_email">Voc� n�o receber� e-mails do sistema at� o dia %pretty_date%.</msg>
   <msg key="lt_Your_email_has_been_c">Seu email foi confirmado. Voc� pode agora fazer login em %system_name%.</msg>
   <msg key="lt_Your_email_has_been_c_1">Seu email foi confirmado. Voc� agora est� esperando por aprova��o pelo administrador de %system_name%.</msg>
   <msg key="lt_Your_email_is_confirm">Seu email est� confirmado</msg>
+  <msg key="lt_Your_login_has_expire">Seu login expirou. Digite novamente sua senha para continuar.</msg>
   <msg key="lt_Your_URL_doesnt_have_">Seu endere�o (URL) n�o est� no formato correto. Um endere�o (URL) v�lido seria algo como \&quot;%valid_url_example%\&quot;.&quot;</msg>
+  <msg key="Make_administrator">Tornar admimistrador</msg>
+  <msg key="Make_member">Tornar membro</msg>
+  <msg key="Make_yourself_invisible_label">Tornar-se invis�vel</msg>
+  <msg key="Make_yourself_visible_label">Tornar-se vis�vel</msg>
+  <msg key="Manage_your_notifications">Gerenciar suas notifica��es</msg>
+  <msg key="Mem_list_not_allowed">Desculpe, mas voc� n�o pode ver a lista de membros</msg>
+  <msg key="Member_State">Estado do Membro</msg>
+  <msg key="Members">Membros</msg>
   <msg key="Name">Nome:</msg>
   <msg key="New_Password">Nova Senha:</msg>
+  <msg key="No_applications">N�o h� propostas</msg>
+  <msg key="No_ISO_Codes">N�o h� c�digos ISO</msg>
+  <msg key="No_package_parameters">Este pacote n�o tem nenhum par�metro.</msg>
   <msg key="no_portrait_title_message">seu retrato</msg>
+  <msg key="No_pretty_plural">N�o h� %pretty_plural%</msg>
+  <msg key="No_services">N�o h� servi�os.</msg>
   <msg key="none">nenhum</msg>
+  <msg key="Not_logged_in">N�o logado</msg>
+  <msg key="Notes">Observa��es:</msg>
+  <msg key="Notice">Aviso:</msg>
+  <msg key="on_name_to">em %name% para:</msg>
+  <msg key="optional">(opcional)</msg>
+  <msg key="Options">Op��es</msg>
+  <msg key="Or_add_a_new_user">Ou adicione um novo usu�rio</msg>
+  <msg key="or_the">ou o</msg>
   <msg key="Password">Senha:</msg>
   <msg key="Password_changed_body">A sua informa��o do login em %system_name%: %account_id_label%: %account_id% A sua senha para esta conta foi alterada recentemente. N�o precisa de fazer nada, esta mensagem � uma simples notifica��o para proteger a seguran�a da sua conta. ---------------Pode sempre alterar a sua senha fazendo o seguinte: 1. Fazer o login para %system_name% 2. Clicar na liga��o &quot;%pvt_home_name%&quot; 3. Escolher &quot;%password_update_link_text%&quot;</msg>
   <msg key="Password_changed_subject">Senha alterada</msg>
   <msg key="Permissions">Permiss�es</msg>
+  <msg key="permissions">Permiss�es</msg>
   <msg key="Permissions_for_name">Permiss�es para %name%</msg>
+  <msg key="Please_return_to_home">Por favor, retrone � p�gina %home_link%.</msg>
+  <msg key="Portrait">Retrato</msg>
   <msg key="Question">Pergunta:</msg>
+  <msg key="Re_enable">Reabilitar</msg>
   <msg key="Recover_Password">Recuperar Senha</msg>
   <msg key="Register">Registrar</msg>
+  <msg key="Registration_Approval_Notice">&lt;p&gt;Obrigado por se cadastrar no sistema %system_name%. O sistema notificou sua solicita��o a um administrador. &lt;p&gt; &lt;p&gt;Uma vez aprovado, voc� receber� um e-mail e poder� ent�o come�ar utilizar o sistema %system_name%. &lt;/p&gt;</msg>
+  <msg key="Reject">Rejeitar</msg>
+  <msg key="Remember_my_login">Lembrar meu login neste computador</msg>
+  <msg key="Remove">Remover</msg>
+  <msg key="Req_membership_comm">Solicitar ades�o a esta comunidade</msg>
+  <msg key="Request_membership">Solicitar ades�o</msg>
+  <msg key="return_to_application">retornar para a aplica��o</msg>
   <msg key="Revoke_Checked">Cancelamento Verificado</msg>
+  <msg key="Role">Regra</msg>
+  <msg key="Save_comment">Salvar coment�rio</msg>
   <msg key="Screen_name">Nome no ecr�</msg>
+  <msg key="Search_For_Exist_User">Procurar por um Usu�rio Existente</msg>
+  <msg key="Security_context_root">Contexto de seguran�a raiz</msg>
+  <msg key="Select_an_Object_by_Id">Selecionar um Objeto pelo Id:</msg>
+  <msg key="Send_email_to_this_user">Enviar email para este usu�rio</msg>
   <msg key="Show">Mostrar</msg>
+  <msg key="Site_wide_administration">Administra��o geral do site</msg>
   <msg key="sorry_forgotten_pwd">Desculpe, n�o podemos ajud�-lo com a sua senha esquecida.</msg>
+  <msg key="Status">Status</msg>
+  <msg key="Story_Behind_Photo">Hist�ria por tr�z da foto</msg>
+  <msg key="Story_behind_photo">Hist�ria por Tr�z da Foto</msg>
+  <msg key="Subcommunities">Subcomunidades</msg>
+  <msg key="subcommunities">subcomunidades</msg>
+  <msg key="subcommunity">subcomunidade</msg>
   <msg key="Thank_you">Obrigado.</msg>
+  <msg key="The_ISO_codes_were_not">Os c�digos ISO n�o foram carregados neste servidor.</msg>
+  <msg key="this_subsite">este subsite</msg>
+  <msg key="This_user_has_left_the">Este usu�rio deixou a comunidade.</msg>
+  <msg key="To_log_in_visit_the">Para acessar o site, visite</msg>
+  <msg key="Topic">T�pico</msg>
+  <msg key="type_specific_info">informa��o espec�fica</msg>
+  <msg key="UP">Acima</msg>
   <msg key="up_to_context_name">ir para %context_name%</msg>
   <msg key="Update">Atualizar</msg>
   <msg key="Update_Password">Atualizar Senha</msg>
+  <msg key="upload">enviar</msg>
   <msg key="upload_a_portrait">atualizar retrato</msg>
+  <msg key="upload_a_replacement_por">envie outro retrato</msg>
+  <msg key="Upload_Portrait">Enviar Retrato</msg>
   <msg key="Username">Nome de usu�rio</msg>
+  <msg key="Vacation_Info_Updated">Informa��o de F�rias Atualizada</msg>
+  <msg key="Vacation_information_updated">Sua informa��o de f�rias foi atualizada em %site_link%</msg>
+  <msg key="Welcome_user">Bem-vindo, %user_name%</msg>
+  <msg key="When_leaving_checkbox_empty">Deixando de marcar uma permiss�o, o usu�rio ou grupo selecionado ter� a mesma revogada caso ela tenha sido concedida anteriormente.</msg>
+  <msg key="Whos_Online_link_label">Usu�rios online</msg>
+  <msg key="Whos_Online_title">Quem est� online</msg>
+  <msg key="Yes_I_am_sure">Sim, tenho certeza</msg>
+  <msg key="You_can_also_browse_from">Voc� tamb�m pode navegar pelo</msg>
+  <msg key="You_can_always_re_open">Voc� sempre poder� reabrir</msg>
+  <msg key="You_do_not_have_admin_on">Voc� n�o tem provil�gios administrativos sobre o objeto %root% ou seus descendentes</msg>
+  <msg key="You_dont_have_a_portrait">Voc� ainda n�o tem um retrato. Voc� pode</msg>
+  <msg key="You_have_admin_rights_on">Voc� tem direitos de administrador nos seguintes objetos:</msg>
+  <msg key="You_have_no_email_alerts">Atualmente voc� n�o tem alertas de email.</msg>
+  <msg key="Your_Account">Sua Conta</msg>
+  <msg key="Your_discussion_alerts">Seus alertas nos f�runs de discuss�o</msg>
   <msg key="Your_Portrait">Seu Retrato</msg>
+  <msg key="Your_system_alerts">Seus alertas em %gc_system_name%</msg>
+  <msg key="Youre_marked_as_back">Sua volta das f�rias est� marcada para  %site_link%</msg>
 </message_catalog>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml	3 Nov 2003 12:52:10 -0000	1.2
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.zh_TW.utf-8.xml	26 Feb 2004 15:28:49 -0000	1.3
@@ -2,6 +2,8 @@
 <message_catalog package_key="acs-subsite" package_version="5.0d6" locale="zh_TW" charset="utf-8">
 
   <msg key="About_You">關於你</msg>
+  <msg key="Account_at_system_closed">你在%system_name%的帳號已被關閉</msg>
+  <msg key="Account_closed">&lt;p&gt;你的帳號已被關閉.&lt;/p&gt; &lt;p&gt;我們可以為你&lt;a href=&quot;%restore_url%&quot;&gt;重新開啟.&lt;/p&gt;</msg>
   <msg key="Answer">解答:</msg>
   <msg key="at">在</msg>
   <msg key="Bad_Password">密碼錯誤</msg>
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/www/index.adp	30 Jan 2004 15:17:05 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/index.adp	26 Feb 2004 15:28:51 -0000	1.21
@@ -1,5 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="title">@subsite_name;noquote@</property>
 
 
 <table width="100%">
Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	22 Sep 2003 08:22:26 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	26 Feb 2004 15:28:51 -0000	1.19
@@ -119,7 +119,48 @@
             break
         }
     }
+    
+    # If old_password was supplied, handle authentication and log the user in
+    if { [exists_and_not_null old_password] } {
+        
+        # We use full-scale auth::authenticate here, in order to be sure we also get account-status checked
+        # Hm. What if there's a problem with timing, so the password update doesn't take effect immediately?
+        array set auth_info [auth::authenticate \
+                -return_url $return_url \
+                -authority_id $user(authority_id) \
+                -username $user(username) \
+                -password $password_1]
+        
+        # Handle authentication problems
+        switch $auth_info(auth_status) {
+            ok {
+                # Continue below
+            }
+            default {
+                # we shouldn't get bad password here ...
+                form set_error update password_1 $auth_info(auth_message)
+                break
+            }
+        }
+        
+        if { [exists_and_not_null auth_info(account_url)] } {
+            ad_returnredirect $auth_info(account_url)
+            ad_script_abort
+        }
 
+        # Handle account status
+        switch $auth_info(account_status) {
+            ok {
+                # Continue below
+            }
+            default {
+                # Display the message on a separate page
+                ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { { message $auth_info(account_message) } }]
+                ad_script_abort
+            }
+        }
+    }
+
     # If the account was closed, it might be open now
     if { [string equal [ad_conn account_status] "closed"] } {
         auth::verify_account_status
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.AR_EG.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_EG.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="AR_EG" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="AR_EG" charset="utf-8">
 
   <msg key="approve">صدّقْ</msg>
   <msg key="approve_email">صدّقْ بريد إلكتروني</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.AR_LB.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.AR_LB.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="AR_LB" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="AR_LB" charset="utf-8">
 
   <msg key="approve">صدّقْ</msg>
   <msg key="approve_email">صدّقْ بريد إلكتروني</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/catalog/acs-tcl.FA_IR.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/catalog/acs-tcl.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.6
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ast_ES.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="ast_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="ast_ES" charset="ISO-8859-1">
 
   <msg key="approve">aprobar</msg>
   <msg key="approve_email">aprobar correo</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/catalog/acs-tcl.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.9
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="approve">godkend</msg>
   <msg key="approve_email">godkend e-mail</msg>
-  <msg key="ban">lys i band</msg>
+  <msg key="ban">bandlys</msg>
   <msg key="delete">slet</msg>
-  <msg key="lt_require_email_verific">kr�v bekr�ftigelse via e-mail</msg>
+  <msg key="lt_require_email_verific">kr�v bekr�ftelse via e-mail</msg>
   <msg key="reject">afvis</msg>
-  <msg key="undelete">af-slet</msg>
+  <msg key="undelete">fortryd sletning</msg>
 </message_catalog>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.9
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="approve">Freischalten</msg>
   <msg key="approve_email">E-Mail-Adresse best�tigen</msg>
-  <msg key="ban">Sperren</msg>
+  <msg key="ban">Deaktivieren</msg>
   <msg key="delete">L�schen</msg>
   <msg key="lt_require_email_verific">E-Mail-Verifizierung anfordern</msg>
   <msg key="reject">Ablehnen</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.10
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.11
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="en_US" charset="ISO-8859-1">
 
   <msg key="approve">approve</msg>
   <msg key="approve_email">approve email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="approve">Aprobar</msg>
   <msg key="approve_email">Aprobar correo</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.4
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.fi_FI.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="fi_FI" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="fi_FI" charset="utf-8">
 
   <msg key="approve">hyväksy</msg>
   <msg key="approve_email">hyväksy sähköpostiviesti</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.6
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="fr_FR" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="fr_FR" charset="ISO-8859-1">
 
   <msg key="approve">admettre</msg>
   <msg key="approve_email">admettre email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.5
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.gl_ES.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.6
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="gl_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="gl_ES" charset="ISO-8859-1">
 
   <msg key="approve">aprobar</msg>
   <msg key="approve_email">aprobar correo-e</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.hu_HU.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="hu_HU" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="hu_HU" charset="utf-8">
 
   <msg key="approve">jóváhagy</msg>
   <msg key="approve_email">emailt jóváhagy</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="it_IT" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="it_IT" charset="ISO-8859-1">
 
   <msg key="approve">approva</msg>
   <msg key="approve_email">approva l'email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ja_JP.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="ja_JP" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="ja_JP" charset="utf-8">
 
   <msg key="delete">削除</msg>
 </message_catalog>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ko_KR.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="ko_KR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="ko_KR" charset="utf-8">
 
   <msg key="approve">승인</msg>
   <msg key="approve_email">승인 전자우편</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/Attic/acs-tcl.ms_my.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml	3 Nov 2003 09:53:17 -0000	1.2
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ms_my.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.3
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="ms_my" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="ms_my" charset="utf-8">
 
   <msg key="approve">lulus</msg>
+  <msg key="approve_email">luluskan e-mel</msg>
+  <msg key="ban">halang</msg>
   <msg key="delete">buang</msg>
+  <msg key="lt_require_email_verific">perlukan pengesahan e-mel</msg>
   <msg key="reject">ditolak</msg>
+  <msg key="undelete">tak jadi buang</msg>
 </message_catalog>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:17 -0000	1.9
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.10
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="nl_NL" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="approve">goedkeuren</msg>
   <msg key="approve_email">e-mail goedkeuren</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.7
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.no_NO.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.8
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="no_NO" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="no_NO" charset="ISO-8859-1">
 
   <msg key="approve">godkjenn</msg>
   <msg key="approve_email">godkjenn e-post</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pl_PL.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="pl_PL" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="pl_PL" charset="utf-8">
 
   <msg key="approve">zatwierdź</msg>
   <msg key="approve_email">zatwierdź email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.6
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.7
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="approve">aprovar</msg>
   <msg key="approve_email">aprovar email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.4
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.pt_PT.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.5
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="pt_PT" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="pt_PT" charset="ISO-8859-1">
 
   <msg key="approve">aprovar</msg>
   <msg key="approve_email">aprovar email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.ru_RU.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="ru_RU" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="ru_RU" charset="utf-8">
 
   <msg key="approve">утвердить</msg>
   <msg key="approve_email">утвердить электронный адрес</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.sh_HR.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="sh_HR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="sh_HR" charset="utf-8">
 
   <msg key="approve">dozvoli</msg>
   <msg key="approve_email">potvrdi email</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.sv_SE.ISO-8859-1.xml	26 Feb 2004 15:28:52 -0000	1.9
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="sv_SE" charset="ISO-8859-1">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="sv_SE" charset="ISO-8859-1">
 
   <msg key="approve">godk�nn</msg>
   <msg key="approve_email">godk�nn e-postadressen</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.tr_TR.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="tr_TR" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="tr_TR" charset="utf-8">
 
   <msg key="approve">onayla</msg>
   <msg key="approve_email">eposta onayla</msg>
Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml	15 Oct 2003 15:01:42 -0000	1.1
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.zh_TW.utf-8.xml	26 Feb 2004 15:28:52 -0000	1.2
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<message_catalog package_key="acs-tcl" package_version="5.0d1" locale="zh_TW" charset="utf-8">
+<message_catalog package_key="acs-tcl" package_version="5.0.0" locale="zh_TW" charset="utf-8">
 
   <msg key="approve">核可</msg>
   <msg key="approve_email">核可電子郵件</msg>
   <msg key="ban">禁止</msg>
   <msg key="delete">刪除</msg>
   <msg key="lt_require_email_verific">需要電子郵件確認</msg>
   <msg key="reject">拒絕</msg>
-  <msg key="undelete">反刪除</msg>
+  <msg key="undelete">撤消刪除</msg>
 </message_catalog>
Index: openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl	24 Oct 2003 13:19:41 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl	26 Feb 2004 15:28:54 -0000	1.5
@@ -10,41 +10,41 @@
 namespace eval acs_privacy {
 
     ad_proc -public privacy_control_enabled_p {} {
-	Returns whether privacy control is turned on or not.
-	This is provided in order to have complete backwards
-	compatibility with past behaviors, where private information
-	was in no way regulated.
+        Returns whether privacy control is turned on or not.
+        This is provided in order to have complete backwards
+        compatibility with past behaviors, where private information
+        was in no way regulated.
     } {
-	# If no parameter set, then we assume privacy control is DISABLED
-	return [ad_parameter -package_id [ad_acs_kernel_id] PrivacyControlEnabledP 0]
+        # If no parameter set, then we assume privacy control is DISABLED
+        return [ad_parameter -package_id [ad_acs_kernel_id] PrivacyControlEnabledP 0]
     }
 
     ad_proc -public privacy_control_set {val} {
-	set the privacy control
+        set the privacy control
     } {
-	ad_parameter -set $val -package_id [ad_acs_kernel_id] PrivacyControlEnabledP
+        ad_parameter -set $val -package_id [ad_acs_kernel_id] PrivacyControlEnabledP
     }
 
     ad_proc -public user_can_read_private_data_p {
-	{-user_id ""}
-	{-object_id:required}
+        {-user_id ""}
+        {-object_id:required}
     } {
-	check if a user can access an object's private data
+        check if a user can access an object's private data
     } {
-	if {[privacy_control_enabled_p]} {
+        if {[privacy_control_enabled_p]} {
             return [ad_permission_p -user_id $user_id $object_id read_private_data]
-	} else {
-	    # backwards compatibility
-	    return 1
-	}
+        } else {
+            # backwards compatibility
+            return 1
+        }
     }
 
     ad_proc -public set_user_read_private_data {
-	{-user_id:required}
-	{-object_id:required}
+        {-user_id:required}
+        {-object_id:required}
         {-value:required}
     } {
-	grant permission to access private data
+        grant permission to access private data
     } {
         if { [template::util::is_true $value] } {
             ad_permission_grant $user_id $object_id read_private_data
Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	11 Dec 2003 21:39:56 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl	26 Feb 2004 15:28:54 -0000	1.31
@@ -553,7 +553,7 @@
 
     if { [catch {
 	set files [split [string trim \
-		[exec [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] tf - 2>/dev/null] "\n"]]
+		[exec [apm_gunzip_cmd] -q -c $file_path | [apm_tar_cmd] tf - 2>/dev/null]] "\n"]
 	apm_callback_and_log $callback  "<li>Done. Archive is [format "%.1f" [expr { [file size $file_path] / 1024.0 }]]KB, with [llength $files] files.<li>"
     } errmsg] } {
 	apm_callback_and_log $callback "The follow error occured during the uncompression process:
@@ -575,6 +575,7 @@
     # Find that .info file.
     foreach file $files {
 	set components [split $file "/"]
+
 	if { [string compare [lindex $components 0] $package_key] } {
 	    apm_callback_and_log $callback  "All files in the archive must be contained in the same directory 
 	    (corresponding to the package's key). This is not the case, so the archive is not 
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.46 -r1.47
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	17 Feb 2004 15:36:27 -0000	1.46
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	26 Feb 2004 15:28:54 -0000	1.47
@@ -913,7 +913,7 @@
                     }
 
                     if { ![uplevel #$level [list db_0or1row $select_query_name [join $select_query " "] -column_array __ad_form_values__]] } {
-                        return -code error "Error when selecting values"
+                        return -code error "Error when selecting values: No rows returned."
                     }
 
                     foreach element_name $af_element_names($form_name) {
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	30 Dec 2003 23:09:25 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	26 Feb 2004 15:28:54 -0000	1.31
@@ -66,15 +66,15 @@
     set expires [expr {[ns_time] - [sec_session_lifetime]}]
 
     db_dml sessions_sweep {} 
+    db_release_unused_handles
 }
 
 ad_proc -private sec_handler {} {
 
     Reads the security cookies, setting fields in ad_conn accordingly.
 
 } {
-
-    #  ns_log notice "OACS= sec_handler: enter"
+    ns_log debug "OACS= sec_handler: enter"
     if { [catch { 
 	set cookie_list [ad_get_signed_cookie_with_expr "ad_session_id"]
     } errmsg ] } {
@@ -84,6 +84,7 @@
 	# -> it expired.
 
         # Now check for login cookie
+        ns_log Debug "OACS: Not a valid session cookie, looking for login cookie"
         sec_login_handler
     } else {
 	# The session cookie already exists and is valid.
@@ -134,7 +135,6 @@
         ad_conn -set auth_level $auth_level
         ad_conn -set account_status $account_status
 
-        
 	# reissue session cookie so session doesn't expire if the
 	# renewal period has passed. this is a little tricky because
 	# the cookie doesn't know about sec_session_renew; it only
@@ -146,6 +146,8 @@
             # LARS: We use sec_login_handler here instead, so that we check the authentication status again
             # This prevents people from being logged in indefinitely just because they keep the session open
 	    #sec_generate_session_id_cookie
+
+	    ns_log Debug "OACS: sec_handler: Invoking sec_login_handler to reissue session cookie."
             sec_login_handler
 	}
     }
@@ -156,6 +158,8 @@
     Reads the login cookie, setting fields in ad_conn accordingly.
 
 } {
+    ns_log debug "OACS= sec_login_handler: enter"
+
     set auth_level none
     set new_user_id 0
     set untrusted_user_id 0
@@ -263,6 +267,7 @@
     set auth_token [db_string select_auth_token { 
         select auth_token from users where user_id = :user_id
     } -default {}]
+    db_release_unused_handles
 
     if { [empty_string_p $auth_token] } {
         ns_log Debug "Security: User $user_id does not have any auth_token, creating a new one."
@@ -283,6 +288,8 @@
     db_dml update_auth_token {
         update users set auth_token = :auth_token where user_id = :user_id
     }
+    db_release_unused_handles
+
     return $auth_token
 }
 
@@ -303,8 +310,10 @@
     Returns 1 if the password is correct for the given user ID. 
 } {
 
-    if { ![db_0or1row password_select {select password, salt from users where user_id = :user_id}] } {
-	return 0
+    set found_p [db_0or1row password_select {select password, salt from users where user_id = :user_id}]
+    db_release_unused_handles
+    if { !$found_p } {
+    	return 0
     }
 
     set salt [string trim $salt]
@@ -332,6 +341,7 @@
     set salt [sec_random_token]
     set new_password [ns_sha1 "$new_password$salt"]
     db_dml password_update {}
+    db_release_unused_handles
 }
 
 ad_proc -private sec_setup_session { 
@@ -344,23 +354,25 @@
     and generates the cookies necessary for the session
 
 } {
+    ns_log debug "OACS= sec_setup_session: enter"
+
     set session_id [ad_conn session_id]
 
     # figure out the session id, if we don't already have it
     if { [empty_string_p $session_id]} {
 
-	# ns_log Notice "OACS= empty session_id"
+	ns_log debug "OACS= empty session_id"
 
 	set session_id [sec_allocate_session]
         # if we have a user on an newly allocated session, update
         # users table
 
-	# ns_log Notice "OACS= newly allocated session $session_id"
+	ns_log debug "OACS= newly allocated session $session_id"
 
         if { $new_user_id != 0 } {
-	    # ns_log Notice "OACS= about to update user session info, user_id NONZERO"
+	    ns_log debug "OACS= about to update user session info, user_id NONZERO"
             sec_update_user_session_info $new_user_id
-	    # ns_log Notice "OACS= done updating user session info, user_id NONZERO"
+	    ns_log debug "OACS= done updating user session info, user_id NONZERO"
         }
     } else {
         # $session_id is an active verified session
@@ -399,11 +411,11 @@
     ad_conn -set account_status $account_status
     ad_conn -set user_id $user_id
 
-    # ns_log Notice "OACS= about to generate session id cookie"
+    ns_log debug "OACS= about to generate session id cookie"
 
     sec_generate_session_id_cookie
 
-    # ns_log Notice "OACS= done generating session id cookie"
+    ns_log debug "OACS= done generating session id cookie"
 
     if { [string equal $auth_level "secure"] && [security::secure_conn_p] && $new_user_id != 0 } {
         # this is a secure session, so the browser needs
@@ -426,6 +438,7 @@
             n_sessions = n_sessions + 1
         where user_id = :user_id
     }
+    db_release_unused_handles
 }
 
 ad_proc -private sec_generate_session_id_cookie {} { 
@@ -477,6 +490,7 @@
     if { ![info exists tcl_max_value] || ![info exists tcl_current_sequence_id] || $tcl_current_sequence_id > $tcl_max_value } {
 	# Thread just spawned or we exceeded preallocated count.
 	set tcl_current_sequence_id [db_nextval sec_id_seq]
+	db_release_unused_handles
 	set tcl_max_value [expr $tcl_current_sequence_id + 100]
     } 
 
@@ -960,7 +974,8 @@
 	set token [ns_cache eval secret_tokens $token_id {
 	    set token [db_string get_token {select token from secret_tokens
                        	                 where token_id = :token_id} -default 0]
-
+	    db_release_unused_handles
+	    
 	    # Very important to throw the error here if $token == 0
 	    # see: http://www.arsdigita.com/sdm/one-ticket?ticket_id=10760
 
@@ -1012,6 +1027,7 @@
 	    ns_cache set secret_tokens $token_id $token
 	}
     }
+    db_release_unused_handles
 }
 
 ad_proc -private populate_secret_tokens_db {} {
@@ -1040,7 +1056,6 @@
     }
 
     db_release_unused_handles
-
 }
 
 
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	20 Feb 2004 16:11:50 -0000	1.51
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	26 Feb 2004 15:28:54 -0000	1.52
@@ -102,7 +102,9 @@
         }
 
         # Default node_name to package_key
-        set node_name [ad_decode $node_name "" $package_key $node_name]
+        if { [empty_string_p $node_name] } {
+            set node_name $package_key
+        }
 
         # Create the node if it doesn't exists
         set parent_url [get_url -notrailing -node_id $parent_node_id]
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.69 -r1.70
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Feb 2004 18:18:22 -0000	1.69
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	26 Feb 2004 15:28:54 -0000	1.70
@@ -4789,3 +4789,53 @@
     }
     return $result
 }
+
+ad_proc -public util::age_pretty {
+    -timestamp_ansi:required
+    -sysdate_ansi:required
+    {-hours_limit 12}
+    {-days_limit 3}
+    {-mode_2_fmt "%X, %A"}
+    {-mode_3_fmt "%X, %d %b %Y"}
+    {-locale ""}
+} {
+    Formats past time intervals in one of three different modes depending on age.  The first mode is "1 hour 3 minutes" and is NOT currently internationalized.  The second mode is e.g. "14:10, Thursday" and is internationalized.  The third mode is "14:10, 01 Mar 2001" and is internationalized.  Both the locale and the exact format string for modes 2 and 3 can be overridden by parameters.  (Once mode 1 is i18nd, the following sentence will be true:'In mode 1, only the locale can be overridden.'  Until then, move along.  These aren't the timestamps you're looking for.)
+
+    @param timestamp_ansi The older timestamp in full ANSI: YYYY-MM-DD HH24:MI:SS
+    @param sysdate_ansi The newer timestamp.
+
+    @param hours_limit The upper limit, in hours, for mode 1.
+    @param days_limit The upper limit, in days, for mode 2.
+    @param mode_2_fmt A formatting string, as per <a href="/api-doc/proc-view?proc=lc_time_fmt">lc_time_fmt</a>, for mode 2
+    @param mode_3_fmt A formatting string, as per <a href="/api-doc/proc-view?proc=lc_time_fmt">lc_time_fmt</a>, for mode 3
+    @param locale If present, overrides the default locale
+    @return Interval between timestamp and sysdate, as localized text string.
+} {
+    set age_seconds [expr [clock scan $sysdate_ansi] - [clock scan $timestamp_ansi]]
+
+    if { $age_seconds < 30 } {
+        # Handle with normal processing below -- otherwise this would require another string to localize
+        set age_seconds 60
+    }
+
+    if { $age_seconds < [expr $hours_limit * 60 * 60] } {
+        set hours [expr abs($age_seconds / 3600)]
+        set minutes [expr round(($age_seconds% 3600)/60.0)]
+        switch $hours {
+            0 { set result "" }
+            1 { set result "One hour " }
+            default { set result "$hours hours "}
+        }
+        switch $minutes {
+            0 {}
+            1 { append result "$minutes minute " }
+            default { append result "$minutes minutes " }
+        }
+        append result "ago"
+    } elseif { $age_seconds < [expr $days_limit * 60 * 60 * 24] } {
+        set result [lc_time_fmt $timestamp_ansi $mode_2_fmt $locale]
+    } else {
+        set result [lc_time_fmt $timestamp_ansi $mode_3_fmt $locale]
+
+    }
+}
Index: openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	15 Feb 2004 11:15:43 -0000	1.22
+++ openacs-4/packages/acs-tcl/tcl/test/acs-tcl-test-procs.tcl	26 Feb 2004 15:28:54 -0000	1.23
@@ -499,7 +499,7 @@
         [string equal [site_node::verify_folder_name \
                            -parent_node_id $main_site_node_id \
                            -folder $first_child_name] $first_child_name]
-        
+
 }
 
 
@@ -692,7 +692,7 @@
 aa_register_case -cats {smoke} acs_tcl__tcl_file_syntax_errors {
     Test all known tcl files for successful parsing "(in the [info complete] sense at least)" and other common errors.
 
-    @author Jeff Davis
+    @author Jeff Davis davis@xarg.net
 } {
     # couple of local helper procs 
     proc ::tcl_p {file} { 
@@ -719,7 +719,7 @@
 aa_register_case -cats {} -error_level notice acs_tcl__tcl_file_common_errors {
     Test all known tcl files for successful parsing "(in the [info complete] sense at least)" and other common errors.
 
-    @author Jeff Davis
+    @author Jeff Davis davis@xarg.net
 } {
     # couple of local helper procs 
     proc ::tcl_p {file} { 
@@ -805,3 +805,45 @@
     ::tclwebtest::assert text "Main Site"
 
 }
+
+aa_register_case -cats {smoke api} util__age_pretty {
+    Test the util::age_pretty proc.
+} {
+    aa_log "Forcing locale to en_US for all strings so that tests work in any locale"
+    aa_equals "0 secs"       [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:00" -locale en_US] "1 minute ago" 
+    aa_equals "1 sec"        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:01" -locale en_US] "1 minute ago" 
+    aa_equals "29 secs"      [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:29" -locale en_US] "1 minute ago" 
+    aa_equals "30 secs"      [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:30" -locale en_US] "1 minute ago" 
+    aa_equals "31 secs"      [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:31" -locale en_US] "1 minute ago" 
+    aa_equals "59 secs"      [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:59" -locale en_US] "1 minute ago" 
+    aa_equals "1 min"        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:01:00" -locale en_US] "1 minute ago" 
+    aa_equals "1 min 1 sec"  [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:01:01" -locale en_US] "1 minute ago" 
+
+    aa_equals "1 min 29 sec" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:01:29" -locale en_US] "1 minute ago" 
+    aa_equals "1 min 30 sec" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:01:30" -locale en_US] "2 minutes ago" 
+    aa_equals "1 min 31 sec" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:01:31" -locale en_US] "2 minutes ago" 
+
+    aa_equals "11 hours 59 minutes" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-01 23:59:00" -locale en_US] "11 hours 59 minutes ago"
+    aa_equals "15 hours 0 minutes with override" \
+        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-02 03:00:00" -hours_limit 16 -locale en_US] "15 hours ago" 
+
+
+    aa_equals "12 hours 0 minutes" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-02 00:00:00" -locale en_US] "12:00 PM, Thursday" 
+
+    aa_equals "15 hours 0 minutes" [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-02 03:00:00" -locale en_US] "12:00 PM, Thursday" 
+
+    aa_equals "4 days 0 hours 0 minutes with override" \
+        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-05 12:00:00" -days_limit 5 -locale en_US] "12:00 PM, Thursday" 
+
+    aa_equals "3 days 0 hours 0 minutes" \
+        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-04 12:00:00" -locale en_US] "12:00 PM, 01 Jan 2004"
+
+    aa_equals "5 days 0 hours 0 minutes" \
+        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2004-01-06 12:00:00" -locale en_US] "12:00 PM, 01 Jan 2004"
+
+    aa_equals "10 years" \
+        [util::age_pretty -timestamp_ansi "2004-01-01 12:00:00" -sysdate_ansi "2014-01-01 12:00:00" -locale en_US] "12:00 PM, 01 Jan 2004"
+
+    aa_log "100 years - we know it's wrong because of Tcl library limitations: [util::age_pretty -timestamp_ansi "1904-01-01 12:00:00" -sysdate_ansi "2004-01-01 12:00:00"]"
+}
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml	22 Oct 2003 13:54:23 -0000	1.2
+++ openacs-4/packages/acs-templating/catalog/acs-templating.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:55 -0000	1.3
@@ -3,18 +3,18 @@
 
   <msg key="Invalid_choice">Ugyldigt valg</msg>
   <msg key="Invalid_currency">Ugyldig valuta</msg>
-  <msg key="Invalid_decimal_number">Ugyldigt tal</msg>
-  <msg key="Invalid_email_format">Ugyldig email</msg>
+  <msg key="Invalid_decimal_number">Ugyldigt decimaltal</msg>
+  <msg key="Invalid_email_format">Ugyldigt e-mail-format</msg>
   <msg key="Invalid_filename">Ugyldigt filnavn</msg>
-  <msg key="Invalid_integer">Ikke et heltal</msg>
-  <msg key="Invalid_keyword">Ugyldig kategori</msg>
-  <msg key="Invalid_natural_number">Ikke et naturligt tal</msg>
-  <msg key="Invalid_url">Ugyldig URL</msg>
+  <msg key="Invalid_integer">Ugyldigt heltal</msg>
+  <msg key="Invalid_keyword">Ugyldigt n�gleord</msg>
+  <msg key="Invalid_natural_number">Ugyldigt naturligt tal</msg>
+  <msg key="Invalid_url">Ugyldig url</msg>
   <msg key="Next_with_arrow">N�ste &gt;&gt;</msg>
   <msg key="No_row_pretty_plural">Ingen %row_pretty_plural%.</msg>
   <msg key="Previous_with_arrow">&lt;&lt; Forrige</msg>
-  <msg key="required">skal udfyldes</msg>
+  <msg key="required">kr�vet</msg>
   <msg key="Spellcheck">Stavekontrol</msg>
-  <msg key="Tag_handler_invalid_number_of_args">Ugyldigt antal argumenter til tag handler.</msg>
-  <msg key="Template_parser_error_in_parameter_list">Fejl i parameter liste</msg>
+  <msg key="Tag_handler_invalid_number_of_args">Ugyldigt antal argumenter til tag-handler.</msg>
+  <msg key="Template_parser_error_in_parameter_list">Fejl i parameterliste</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.fr_FR.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.hu_HU.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.it_IT.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.ko_KR.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.nl_NL.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-templating/catalog/acs-templating.pt_BR.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	11 Dec 2003 21:39:57 -0000	1.26
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	26 Feb 2004 15:28:56 -0000	1.27
@@ -405,9 +405,29 @@
 } {
   get_reference
 
-  #
+  #----------------------------------------------------------------------
+  # Check for errors on form
+  #----------------------------------------------------------------------
+
+  # make a reference to the formerror array with any validation messages
+  upvar #$level $id:error $id:error
+
+  # Clear the formerror array if it has
+  # been set by another form on the same page
+  upvar #$level formerror formerror
+  if { [info exists formerror] } { unset formerror }
+
+  if { [info exists $id:error] } {
+
+    uplevel #$level "upvar 0 $id:error formerror"
+    
+    # There were errors on the form, force edit mode
+    set properties(mode) edit
+  }
+
+  #----------------------------------------------------------------------
   # Buttons
-  #
+  #----------------------------------------------------------------------
 
   if { [exists_and_not_null form_properties(cancel_url)] && ![exists_and_not_null form_properties(cancel_label)] } {
     set form_properties(cancel_label) "Cancel"
@@ -446,22 +466,6 @@
       template::element create $id $name -widget submit -label $label -datatype text
   }
 
-  # make a reference to the formerror array with any validation messages
-  upvar #$level $id:error $id:error
-
-  # Clear the formerror array if it has
-  # been set by another form on the same page
-  upvar #$level formerror formerror
-  if { [info exists formerror] } { unset formerror }
-
-  if { [info exists $id:error] } {
-
-    uplevel #$level "upvar 0 $id:error formerror"
-    
-    # There were errors on the form, force edit mode
-    set properties(mode) edit
-  }
-
   # Propagate form mode to all form elements
   foreach element_ref $elements { 
  
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/attachments/catalog/attachments.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/attachments/catalog/attachments.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/attachments/catalog/attachments.ch_zh.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/attachments/catalog/attachments.ch_zh.utf-8.xml	26 Feb 2004 15:28:57 -0000	1.2
@@ -1,6 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="attachments" package_version="0.5" locale="ch_zh" charset="utf-8">
 
-  <msg key="Description">傍苧 :</msg>
-  <msg key="Title">炎籾</msg>
+  <msg key="Action">操作</msg>
+  <msg key="Add_File">增加文件</msg>
+  <msg key="Add_folder_Link">增加文件夹链接</msg>
+  <msg key="Add_pretty_name">增加%pretty_name%</msg>
+  <msg key="Attach">添加</msg>
+  <msg key="attach_new">添加&lt;b&gt;新&lt;/b&gt;:</msg>
+  <msg key="Attach_URL">添加URL</msg>
+  <msg key="Choose">选择</msg>
+  <msg key="Description">描述</msg>
+  <msg key="File">文件</msg>
+  <msg key="Last_Modified">最后更新的</msg>
+  <msg key="lt_Add_Attachment_Folder">增加附件文件夹链接</msg>
+  <msg key="lt_Attach_a_File_to_pret">给%pretty_object_name%添加文件</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size%条</msg>
+  <msg key="lt_contentscontent_size__1">%contents.content_size%字节</msg>
+  <msg key="lt_Created_by_the_attach">由附件创建</msg>
+  <msg key="lt_dont_know_how_to_deal">不知如何处理附件类型%content_type%</msg>
+  <msg key="lt_Error_Attachment_root">错误：附件根文件夹和文件存储根文件夹不同！</msg>
+  <msg key="lt_Error_empty_folder_id">错误：空folder_id!</msg>
+  <msg key="lt_Folder_folder_name_is">文件夹%folder_name%空</msg>
+  <msg key="lt_Found_file-storage_fo">找到文件存储文件夹XXXfolder_nameXXX...，要链接它吗？</msg>
+  <msg key="lt_No_file-storage_folde">没有找到要链接的文件存储文件夹，创建一个文件夹吗？</msg>
+  <msg key="lt_No_such_attachment_fo">该项没有附件</msg>
+  <msg key="lt_The_specified_parent_">指定父文件夹无效。</msg>
+  <msg key="lt_To_attach_a_file_alre">要附加一个已在文件夹中的文件，单击文件夹名打开该文件夹，然后单击文件旁边的&amp;quot;[选择]&amp;quot;。要向文件夹上传一个新文件，单击文件夹名打开该文件夹，然后单击&amp;quot;添加一个新的：文件URL&amp;quot;。</msg>
+  <msg key="lt_Upload_New_Attachment">上传新附件</msg>
+  <msg key="lt_Use_the_Browse_button">用“浏览……”按钮查找文件，然后单击“打开”。</msg>
+  <msg key="lt_You_are_attaching_a_d">正在将文档附加到%pretty_object_name%。</msg>
+  <msg key="lt_You_probably_clicked_">可能已多次点击“增加”钮，检查文件是否已经装入&lt;a href=&quot;%folder_url%&quot;&gt;文件夹&lt;/a&gt;，或者用“后退”钮返回，重新进入此版本文件。 </msg>
+  <msg key="lt_Your_file_is_larger_t">文件大于系统规定的最大文件大小（%max_number_of_bytes%字节）</msg>
+  <msg key="Name">名称</msg>
+  <msg key="No_such_type">无此类型</msg>
+  <msg key="Object">项</msg>
+  <msg key="Size">大小</msg>
+  <msg key="Title">标题</msg>
+  <msg key="Top">顶</msg>
+  <msg key="Type">类型</msg>
+  <msg key="URL">URL</msg>
+  <msg key="URL_1">URL：</msg>
+  <msg key="Version_filename_">版本文件名：</msg>
+  <msg key="you_are_attaching_document_to_object">正在给%pretty_object_name%附加新文件。</msg>
+  <msg key="you_are_attaching_url_to_object">正在给%pretty_object_name%附加新URL。</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.da_DK.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/attachments/catalog/attachments.da_DK.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/attachments/catalog/attachments.da_DK.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.9
@@ -11,7 +11,7 @@
   <msg key="Choose">V�lg</msg>
   <msg key="Description">Beskrivelse:</msg>
   <msg key="File">Fil</msg>
-  <msg key="Last_Modified">Seneste �ndret</msg>
+  <msg key="Last_Modified">Senest �ndret</msg>
   <msg key="lt_Add_Attachment_Folder">Tilf�j Link til Vedh�ftningsmappe</msg>
   <msg key="lt_Attach_a_File_to_pret">Vedh�ft en fil til %pretty_object_name%</msg>
   <msg key="lt_contentscontent_size_">%contents.content_size% emner</msg>
@@ -22,9 +22,9 @@
   <msg key="lt_Error_empty_folder_id">Fejl: tom folder_id!</msg>
   <msg key="lt_Folder_folder_name_is">Mappen %folder_name% er tom</msg>
   <msg key="lt_Found_file-storage_fo">Fandt file-storage mappe XXX mappe_navn XXX... �nsker du at linke til den?</msg>
-  <msg key="lt_No_file-storage_folde">Kunne ikke finde nogen file-storage mappe af linke til. �nsker du at oprette �n?</msg>
+  <msg key="lt_No_file-storage_folde">Kunne ikke finde nogen file-storage mappe at linke til. �nsker du at oprette en?</msg>
   <msg key="lt_No_such_attachment_fo">Der er ingen s�dan vedh�ftning til dette objekt</msg>
-  <msg key="lt_The_specified_parent_">Den angivne overmapper er ikke gyldig.</msg>
+  <msg key="lt_The_specified_parent_">Den angivne overmappe er ikke gyldig.</msg>
   <msg key="lt_To_attach_a_file_alre">For at vedh�fte en fil, der allerede eksisterer i en mappe, kan du �bne den angivne mappe ved at klikke p� dens navn. Herefter klikker du p� &amp;quot;[ V�lg ]&amp;quot;-linkes ved siden af filen. For at uploade en ny fil ind i en mappe, skal du �bne mappen ved at klikke p� den navn, hvorefter du trykker p� det passende &amp;quot;Vedh�ft en ny: Fil | URL&amp;quot;-link.</msg>
   <msg key="lt_Upload_New_Attachment">Upload Ny Vedh�ftning </msg>
   <msg key="lt_Use_the_Browse_button">Brug &quot;Gennemse...&quot;-knappen til at finde din fil og klik s� &quot;�bn&quot;.</msg>
@@ -40,5 +40,7 @@
   <msg key="Type">Type</msg>
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
-  <msg key="Version_filename_">Filnavnversion:</msg>
+  <msg key="Version_filename_">Versionens filnavn:</msg>
+  <msg key="you_are_attaching_document_to_object">Du vedh�fter et nyt dokument til %pretty_object_name%.</msg>
+  <msg key="you_are_attaching_url_to_object">Du vedh�fter en ny URL til %pretty_object_name%.</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/attachments/catalog/attachments.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/attachments/catalog/attachments.de_DE.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.9
@@ -6,40 +6,43 @@
   <msg key="Add_folder_Link">Ordnerlink hinzuf�gen</msg>
   <msg key="Add_pretty_name">%pretty_name% hinzuf�gen</msg>
   <msg key="Attach">Anh�ngen</msg>
-  <msg key="attach_new">Anf�gen eines &lt;b&gt;neuen&lt;/b&gt;: </msg>
+  <msg key="attach_new">Anf�gen: &lt;b&gt;Neue&lt;/b&gt; </msg>
   <msg key="Attach_URL">URL anh�ngen</msg>
-  <msg key="Choose">W�hlen</msg>
+  <msg key="Choose">Ausw�hlen</msg>
   <msg key="Description">Beschreibung:</msg>
   <msg key="File">Datei</msg>
   <msg key="Last_Modified">Zuletzt ge�ndert</msg>
-  <msg key="lt_Add_Attachment_Folder">Hinzuf�gen einer Anlage-Ordner-Verkn�pfung</msg>
-  <msg key="lt_Attach_a_File_to_pret">Anf�gen einer Datei an %pretty_object_name%</msg>
-  <msg key="lt_contentscontent_size_">%contents.content_size% Element(e)</msg>
-  <msg key="lt_contentscontent_size__1">%contents.content_size% Byte</msg>
-  <msg key="lt_Created_by_the_attach">Erstellt vom Anlage-Programmpaket</msg>
-  <msg key="lt_dont_know_how_to_deal">Bearbeitungsweise dieses Anlage-Typs unbekannt</msg>
-  <msg key="lt_Error_Attachment_root">Fehler: Anlagen-Wurzelordner unf Datenspeicher-Wurzelordner sind verschieden!</msg>
-  <msg key="lt_Error_empty_folder_id">Fehler: leere Ordner-Identifikation</msg>
+  <msg key="lt_Add_Attachment_Folder">Link zu einem angeh�ngten Ordner hinzuf�gen</msg>
+  <msg key="lt_Attach_a_File_to_pret">Datei anh�ngen an %pretty_object_name%</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size%-Element</msg>
+  <msg key="lt_contentscontent_size__1">%contents.content_size% Bytes</msg>
+  <msg key="lt_Created_by_the_attach">Erstellt vom Programmpaket 'Anh�nge'</msg>
+  <msg key="lt_dont_know_how_to_deal">Der Anhang vom Typ %content_type% kann nicht verarbeitet werden.</msg>
+  <msg key="lt_Error_Attachment_root">Error: Attachment root folder and file storage root folder are different!</msg>
+  <msg key="lt_Error_empty_folder_id">Fehler: Ordner-ID nicht vorhanden</msg>
   <msg key="lt_Folder_folder_name_is">Der Ordner %folder_name% ist leer.</msg>
-  <msg key="lt_Found_file-storage_fo">Es wurde ein Dateispeicher-Ordner gefunden: XXX folder_name XXX ... m�chten Sie dorthin verweisem?</msg>
-  <msg key="lt_No_file-storage_folde">Keine Dateispeicher-Ordner gefunden zu welchen verwiesen werden k�nnte. M�chten Sie einen erstellen? </msg>
-  <msg key="lt_No_such_attachment_fo">Eine solche Anlage ist f�r dieses Objekt nicht vorhanden</msg>
+  <msg key="lt_Found_file-storage_fo">Es wurde der Ordner XXX folder_name XXX gefunden. Wollen Sie einen Link dorthin einrichten?</msg>
+  <msg key="lt_No_file-storage_folde">Es wurde kein Dateiordner gefunden, zu dem Sie einen Link einrichten k�nnen. M�chten Sie einen neuen Ordner erstellen?</msg>
+  <msg key="lt_No_such_attachment_fo">Dieses Objekt verf�gt nicht �ber den angegebenen Anhang.</msg>
   <msg key="lt_The_specified_parent_">Der angegebene �bergeordnete Ordner ist ung�ltig.</msg>
-  <msg key="lt_To_attach_a_file_alre">Um eine Datei anzuf�gen, die schon in einem Ordner vorhanden ist, �ffnen Sie den Ordner, indem Sie auf die Bezeichnung des Ordners klicken, dann klicken Sie auf den Link &amp;quot;[ W�hlen ]&amp;quot; neben der Datei. Um eine neue Datei in einen Ordner hochzuladen, �ffnenSie den Ordner indem Sie auf die Bezeichnung des Ordners klicken, dann klicken Sie auf 
-den entsprechenden Link &amp;quot;Anf�gen einer neuen: Datei | URL&amp;quot;</msg>
+  <msg key="lt_To_attach_a_file_alre">Um eine Datei anzuh�ngen, die bereits in einem Ordner vorhanden ist, �ffnen Sie den Ordner und klicken Sie auf den Link &amp;quot;[ Ausw�hlen ]&amp;quot; neben der Datei. Um eine neue Datei in einen Ordner hochzuladen, �ffnen Sie den Ordner und klicken Sie auf den Link &amp;quot;Neue Datei/URL anh�ngen&amp;quot;.
+
+</msg>
   <msg key="lt_Upload_New_Attachment">Neue Anlage hochladen</msg>
-  <msg key="lt_Use_the_Browse_button">Klicken Sie auf &quot;Durchsuchen...&quot;, w�hlen Sie die gew�nschte Datei aus und klicken Sie auf &quot;�ffnen&quot;.</msg>
-  <msg key="lt_You_are_attaching_a_d">Anh�ngen eines Dokuments an %pretty_object_name%</msg>
-  <msg key="lt_You_probably_clicked_">Sie haben m�glicherweise mehrmals auf die Schaltfl�che &quot;Hinzuf�gen&quot; geklickt. �berpr�fen Sie, ob die Datei ordnungsgem�� in den gew�nschten &lt;a href=&quot;%folder_url%&quot;&gt;Ordner&lt;/a&gt; geladen wurde oder gehen Sie mit Hilfe des Browsers eine Seite zur�ck und geben Sie die Dateiversion erneut ein.</msg>
+  <msg key="lt_Use_the_Browse_button">Klicken Sie auf 'Durchsuchen...', w�hlen Sie die gew�nschte Datei aus und klicken Sie auf '�ffnen'.</msg>
+  <msg key="lt_You_are_attaching_a_d">Sie h�ngen ein Dokument an %pretty_object_name% an.</msg>
+  <msg key="lt_You_probably_clicked_">Wahrscheinlich haben Sie mehrmals auf die Schaltfl�che 'Hochladen' geklickt. �berpr�fen Sie, ob die Datei in den gew�nschten &lt;a href=&quot;%folder_url%&quot;&gt;Ordner&lt;/a&gt; geladen wurde, oder gehen Sie mit Hilfe Ihres Browsers zur�ck und geben Sie die Versionsdatei erneut an. </msg>
   <msg key="lt_Your_file_is_larger_t">Ihre Datei �berschreitet die innerhalb des Systems zul�ssige Maximalgr��e (%max_number_of_bytes% Bytes).</msg>
   <msg key="Name">Name</msg>
   <msg key="No_such_type">Typ nicht vorhanden</msg>
   <msg key="Object">Objekt</msg>
   <msg key="Size">Gr��e</msg>
-  <msg key="Title">Titel:</msg>
+  <msg key="Title">Name das Dokuments:</msg>
   <msg key="Top">Anfang</msg>
   <msg key="Type">Typ</msg>
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">Dateiname der Version:</msg>
+  <msg key="you_are_attaching_document_to_object">Sie f�gen ein neues Dokument an %pretty_object_name% an.</msg>
+  <msg key="you_are_attaching_url_to_object">Sie f�gen eine neue URL an %pretty_object_name% an.</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	11 Dec 2003 21:39:57 -0000	1.14
+++ openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.15
@@ -10,6 +10,10 @@
   <msg key="Add_pretty_name">Add %pretty_name%</msg>
   <msg key="Attach">Attach</msg>
   <msg key="attach_new">Attach a &lt;b&gt;new&lt;/b&gt;:</msg>
+  <description key="attach_new">This key is going to give problems with word-order for several languages, because the &quot;attach new&quot; grammar is quite specific to English. For example the best translation in Dutch would be &quot;Nieuwe xxxx toevoegen&quot;, but we do not know xxxx yet. A work around is to write &quot;Voeg toe nieuw&quot;, but depending on what is behind it, grammar requires &quot;Voeg toe nieuwe&quot;. So, we get a very forced translation: &quot;Voeg toe nieuw(e)&quot;.
+
+Please fix.</description>
+
   <msg key="Attach_URL">Attach URL</msg>
   <description key="Attach_URL">Used as title on page for attaching a URL to an object.</description>
 
@@ -41,7 +45,7 @@
   <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
     then click &quot;Open&quot;.</msg>
   <msg key="lt_You_are_attaching_a_d">You are attaching a document to %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file. Here is the error message: &lt;pre&gt;%errmsg%&lt;pre&gt;</msg>
+  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
   <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
   <msg key="Name">Name</msg>
   <msg key="No_such_type">No such type</msg>
Index: openacs-4/packages/attachments/catalog/attachments.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.es_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/attachments/catalog/attachments.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/attachments/catalog/attachments.es_ES.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.9
@@ -41,4 +41,6 @@
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">T�tulo de la versi�n:</msg>
+  <msg key="you_are_attaching_document_to_object">Esta adjuntando un nuevo documento a %pretty_object_name%. </msg>
+  <msg key="you_are_attaching_url_to_object">Esta adjuntando una nueva url a %pretty_object_name%. </msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.it_IT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/attachments/catalog/attachments.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/attachments/catalog/attachments.it_IT.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.9
@@ -26,7 +26,7 @@
   <msg key="lt_No_such_attachment_fo">Nessun tipo di allegato per questo oggetto.</msg>
   <msg key="lt_The_specified_parent_">La cartella superiore specificata non &amp;egrave; valida.</msg>
   <msg key="lt_To_attach_a_file_alre">Per allegare un file gi&amp;agrave; in una cartella, apri la cartella cliccando sul suo nome, poi clicca sul link &amp;quot;[ Scegli ]&amp;quot; vicino al file.
-Per caricare il file in una cartella, apri la cartella cliccando sul suo nome, poi clicca l'appropriato &amp;quot;Allega nuovo: File | </msg>
+Per caricare il file in una cartella, apri la cartella cliccando sul suo nome, poi clicca l'appropriato &amp;quot;Allega nuovo: File | URL&amp;quot; link</msg>
   <msg key="lt_Upload_New_Attachment">Carica un nuovo allegato</msg>
   <msg key="lt_Use_the_Browse_button">Usa il bottone &quot;Sfoglia...&quot; per individuare il tuo file, poi clicca su &quot;Apri&quot;.</msg>
   <msg key="lt_You_are_attaching_a_d">Stai allegando un documento a %pretty_object_name%.</msg>
@@ -42,4 +42,6 @@
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">Versione file :</msg>
+  <msg key="you_are_attaching_document_to_object">Stai allegando un nuovo documento a %pretty_object_name%</msg>
+  <msg key="you_are_attaching_url_to_object">Stai allegando un nuovo collegameno a %pretty_object_name%.</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/attachments/catalog/attachments.ko_KR.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/attachments/catalog/attachments.ko_KR.utf-8.xml	26 Feb 2004 15:28:57 -0000	1.2
@@ -41,4 +41,6 @@
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">버전 파일이름:</msg>
+  <msg key="you_are_attaching_document_to_object">%pretty_object_name%에 새 문서를 첨부합니다.</msg>
+  <msg key="you_are_attaching_url_to_object">%pretty_object_name%에 새 url을  첨부합니다.</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/attachments/catalog/attachments.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:17 -0000	1.9
+++ openacs-4/packages/attachments/catalog/attachments.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.10
@@ -2,37 +2,37 @@
 <message_catalog package_key="attachments" package_version="0.5" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="Action">Handeling</msg>
-  <msg key="Add_File">Toevoegen Bestand</msg>
-  <msg key="Add_folder_Link">Toevoegen link naar map</msg>
+  <msg key="Add_File">Bestand toevoegen</msg>
+  <msg key="Add_folder_Link">Koppeling naar map toevoegen</msg>
   <msg key="Add_pretty_name">Toevoegen %pretty_name% </msg>
   <msg key="Attach">Aanhechten</msg>
-  <msg key="attach_new">Voeg toe &lt;b&gt;nieuw&lt;/b&gt;:</msg>
-  <msg key="Attach_URL">Aanhechten URL</msg>
+  <msg key="attach_new">Voeg toe &lt;b&gt;nieuw(e)&lt;/b&gt;:</msg>
+  <msg key="Attach_URL">URL bijvoegen</msg>
   <msg key="Choose">Kiezen</msg>
   <msg key="Description">Beschrijving:</msg>
   <msg key="File">Bestand</msg>
-  <msg key="Last_Modified">Laatste Wijziging</msg>
-  <msg key="lt_Add_Attachment_Folder">Toevoegen bijlage link naar map</msg>
-  <msg key="lt_Attach_a_File_to_pret">Aanhechten bestand aan %pretty_object_name%</msg>
+  <msg key="Last_Modified">Laatste wijziging</msg>
+  <msg key="lt_Add_Attachment_Folder">Nieuwe basisfolder aanmaken</msg>
+  <msg key="lt_Attach_a_File_to_pret">Bestand bijvoegen bij %pretty_object_name%</msg>
   <msg key="lt_contentscontent_size_">%contents.content_size% item</msg>
   <msg key="lt_contentscontent_size__1">%contents.content_size% byte</msg>
-  <msg key="lt_Created_by_the_attach">Aangemaakt door de Bijlagen package</msg>
+  <msg key="lt_Created_by_the_attach">Aangemaakt door het bijlagenpakket</msg>
   <msg key="lt_dont_know_how_to_deal">weet niet hoe met dit type bijlagen om te gaan</msg>
-  <msg key="lt_Error_Attachment_root">Fout: basismap van Bijlagen en Bestanden is verschillend!</msg>
+  <msg key="lt_Error_Attachment_root">Fout: De basismap voor bijlagen en voor bestandsopslag is verschillend!</msg>
   <msg key="lt_Error_empty_folder_id">Fout: geen folder_id!</msg>
   <msg key="lt_Folder_folder_name_is">Map %folder_name% is leeg</msg>
-  <msg key="lt_Found_file-storage_fo">Bestanden map XXX map_naam XXX gevonden ... wilt u een link leggen?</msg>
-  <msg key="lt_No_file-storage_folde">Geen Bestanden map gevonden om te linken. Moet er een aangemaakt worden?</msg>
-  <msg key="lt_No_such_attachment_fo">Geen van dergelijke bijlagen voor dit object</msg>
+  <msg key="lt_Found_file-storage_fo">Folder voor bestandsopslag XXX map_naam XXX gevonden ... wilt u een link leggen?</msg>
+  <msg key="lt_No_file-storage_folde">Geen mappen voor bestandsopslag gevonden om naar te koppelen. Moet er ��n aangemaakt worden?</msg>
+  <msg key="lt_No_such_attachment_fo">Gegeven bijlage bestaat niet voor dit object</msg>
   <msg key="lt_The_specified_parent_">De gekozen bovenliggende map is niet geldig</msg>
   <msg key="lt_To_attach_a_file_alre">Om een bestand uit een map bij te voegen, dient op de mapnaam te worden geklikt en vervolgens op de link &amp;quot;[ Kiezen ]&amp;quot; naast het bestand. Om een nieuw bestand in een map te plaatsen, dient  op de mapnaam te worden geklikt en vervolgens op de link &amp;quot;Invoeren nieuw bestand | URL&amp;quot;</msg>
   <msg key="lt_Upload_New_Attachment">Nieuwe bijlage bijvoegen</msg>
-  <msg key="lt_Use_the_Browse_button">Gebruik de &quot;Snuffel/Browse...&quot; knop om het bestand te vinden en klik dan op &quot;Open&quot;. </msg>
+  <msg key="lt_Use_the_Browse_button">Gebruik de knop &quot;Bladeren...&quot; om het bestand te vinden en klik dan op &quot;Openen&quot;. </msg>
   <msg key="lt_You_are_attaching_a_d">Er wordt een document aan %pretty_object_name% toegevoegd.</msg>
-  <msg key="lt_You_probably_clicked_">U heeft waarschijnlijk meer dan eens op de 'Toevoegen' knop geklikt. Controleer of het bestand correct in de &lt;a href=&quot;%folder_url%&quot;&gt;gewenste map&lt;/a&gt; is geladen. De Back/Terug knop van de browser kan gebruikt worden om de handeling te herhalen.</msg>
+  <msg key="lt_You_probably_clicked_">Je hebt waarschijnlijk meer dan eens op de knop 'Toevoegen' geklikt. Controleer of het bestand correct in de &lt;a href=&quot;%folder_url%&quot;&gt;gewenste map&lt;/a&gt; is geladen. De Terug-knop van de browser kan gebruikt worden om de handeling te herhalen.</msg>
   <msg key="lt_Your_file_is_larger_t">Het bestand is groter dan de maximaal toegestane omvang (%max_number_of_bytes% bytes)</msg>
   <msg key="Name">Naam</msg>
-  <msg key="No_such_type">Geen van dergelijk type</msg>
+  <msg key="No_such_type">Gegeven type bestaat niet</msg>
   <msg key="Object">Object</msg>
   <msg key="Size">Grootte</msg>
   <msg key="Title">Titel:</msg>
@@ -41,4 +41,6 @@
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">Versie bestandsnaam:</msg>
+  <msg key="you_are_attaching_document_to_object">Je voegt een nieuw document bij bij %pretty_object_name%</msg>
+  <msg key="you_are_attaching_url_to_object">Je voegt een nieuw url bij bij %pretty_object_name%.</msg>
 </message_catalog>
Index: openacs-4/packages/attachments/catalog/attachments.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/attachments/catalog/attachments.pt_BR.ISO-8859-1.xml	3 Nov 2003 09:53:17 -0000	1.8
+++ openacs-4/packages/attachments/catalog/attachments.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:28:57 -0000	1.9
@@ -41,4 +41,6 @@
   <msg key="URL">URL</msg>
   <msg key="URL_1">URL:</msg>
   <msg key="Version_filename_">Nome de arquivo da vers�o:</msg>
+  <msg key="you_are_attaching_document_to_object">Voc� est� a anexar um documento a %pretty_object_name%.</msg>
+  <msg key="you_are_attaching_url_to_object">Voc� est� enexando uma nova URL a %pretty_object_name%.</msg>
 </message_catalog>
Index: openacs-4/packages/bug-tracker/bug-tracker.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/bug-tracker.info,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/bug-tracker/bug-tracker.info	28 Jan 2004 11:12:15 -0000	1.17
+++ openacs-4/packages/bug-tracker/bug-tracker.info	26 Feb 2004 15:28:58 -0000	1.18
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.3d2" url="http://openacs.org/repository/download/apm/bug-tracker-1.3d2.apm">
+    <version name="1.3d3" url="http://openacs.org/repository/download/apm/bug-tracker-1.3d3.apm">
     <database-support>
         <database>postgresql</database>
         <database>oracle</database>
@@ -18,7 +18,7 @@
         <vendor url="http://www.museatech.net">Musea Technologies</vendor>
         <description format="text/html">Bug tracking application with notifications, configurable state management, and patch upload.
         Contains the best of SDM, Bugzilla, FogBUGZ, and bughost.com.</description>
-        <provides url="bug-tracker" version="1.3d2"/>
+        <provides url="bug-tracker" version="1.3d3"/>
         <requires url="acs-content-repository" version="5.0d1"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-tcl" version="4.6.2d"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bug-tracker/sql/postgresql/upgrade-1.3d2-1.3d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/catalog/bulk-mail.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/catalog/bulk-mail.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/bulk-mail/catalog/bulk-mail.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/catalog/bulk-mail.da_DK.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bulk-mail/catalog/bulk-mail.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.10
+++ openacs-4/packages/bulk-mail/catalog/bulk-mail.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:00 -0000	1.11
@@ -3,7 +3,7 @@
 
   <msg key="Extra_Headers">Ekstra Headers</msg>
   <msg key="From">Fra</msg>
-  <msg key="lt_No_bulk_mail_messages">Der er ingen Massemail-beskeder at vise.</msg>
+  <msg key="lt_No_bulk_mail_messages">Der er ingen massemailbeskeder at vise.</msg>
   <msg key="Message">Besked</msg>
   <msg key="No">Nej</msg>
   <msg key="pretty_name">Massemail</msg>
Index: openacs-4/packages/bulk-mail/catalog/bulk-mail.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/catalog/bulk-mail.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bulk-mail/catalog/bulk-mail.de_DE.ISO-8859-1.xml	3 Nov 2003 09:53:18 -0000	1.8
+++ openacs-4/packages/bulk-mail/catalog/bulk-mail.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:00 -0000	1.9
@@ -3,12 +3,12 @@
 
   <msg key="Extra_Headers">Zus�tzliche Kopfzeilen</msg>
   <msg key="From">Von</msg>
-  <msg key="lt_No_bulk_mail_messages">Keine Rundmails vorhanden</msg>
+  <msg key="lt_No_bulk_mail_messages">Keine Gruppen-E-Mails vorhanden</msg>
   <msg key="Message">Nachricht</msg>
   <msg key="No">Nein</msg>
-  <msg key="pretty_name">Rundmails</msg>
+  <msg key="pretty_name">Gruppen-E-Mail</msg>
   <msg key="Query">Abfrage</msg>
-  <msg key="Reply_To">Antwortadresse</msg>
+  <msg key="Reply_To">Antworten</msg>
   <msg key="Send_Date">Versenden am</msg>
   <msg key="Sent">Gesendet?</msg>
   <msg key="Subject">Betreff</msg>
Index: openacs-4/packages/bulk-mail/catalog/bulk-mail.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/catalog/bulk-mail.nl_NL.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bulk-mail/catalog/bulk-mail.nl_NL.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.7
+++ openacs-4/packages/bulk-mail/catalog/bulk-mail.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:00 -0000	1.8
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="bulk-mail" package_version="0.5" locale="nl_NL" charset="ISO-8859-1">
 
-  <msg key="Extra_Headers">Extra Headers</msg>
+  <msg key="Extra_Headers">Extra kopregels</msg>
   <msg key="From">Van</msg>
-  <msg key="lt_No_bulk_mail_messages">Geen berichten van groepsgewijze e-mails</msg>
+  <msg key="lt_No_bulk_mail_messages">Er zijn geen bulke-mail berichten om te tonen.</msg>
   <msg key="Message">Bericht</msg>
   <msg key="No">Nee</msg>
-  <msg key="pretty_name">Groepsgewijze E-mail</msg>
+  <msg key="pretty_name">Bulke-mail</msg>
   <msg key="Query">Vraag</msg>
-  <msg key="Reply_To">Antwoord Aan</msg>
+  <msg key="Reply_To">Antwoord naar</msg>
   <msg key="Send_Date">Verzenddatum</msg>
   <msg key="Sent">Verzonden?</msg>
   <msg key="Subject">Onderwerp</msg>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.1a-0.2.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.1a-0.4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.2-0.3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/sql/postgresql/upgrade/upgrade-0.3-0.4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/Attic/calendar.AR_LB.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml	3 Nov 2003 09:53:18 -0000	1.2
+++ openacs-4/packages/calendar/catalog/calendar.AR_LB.utf-8.xml	26 Feb 2004 15:29:02 -0000	1.3
@@ -74,6 +74,7 @@
   <msg key="New_Type">النوع الجديد:</msg>
   <msg key="No">لا</msg>
   <msg key="No_Calendars">لا مُفكرات</msg>
+  <msg key="No_Items">لا بنود</msg>
   <msg key="no_keep_it">لا، احتفظ به</msg>
   <msg key="Note">الملاحظة</msg>
   <msg key="of_the_month">من الشّهر</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/catalog/calendar.FA_IR.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/catalog/calendar.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar/catalog/calendar.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/catalog/calendar.ch_zh.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/calendar/catalog/calendar.ch_zh.utf-8.xml	26 Feb 2004 15:29:02 -0000	1.2
@@ -1,10 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="calendar" package_version="2.0d1" locale="ch_zh" charset="utf-8">
 
-  <msg key="Description">傍苧</msg>
-  <msg key="Edit">園辞</msg>
-  <msg key="edit">園辞</msg>
-  <msg key="Start_Time">尼強扮寂</msg>
-  <msg key="Title">炎籾</msg>
-  <msg key="Title_1">炎籾</msg>
+  <msg key="_You_may_choose_to">。你可以选择：</msg>
+  <msg key="Add">增加</msg>
+  <msg key="add">增加</msg>
+  <msg key="Add_a_new_Audience">增加新读者</msg>
+  <msg key="add_an_event">增加事件</msg>
+  <msg key="Add_Item">增加条目</msg>
+  <msg key="Add_Recurrence">增加重现</msg>
+  <msg key="All_Day_Event">全日事件</msg>
+  <msg key="all_events">所有事件</msg>
+  <msg key="and_Time">和时间</msg>
+  <msg key="Attachments">附件：</msg>
+  <msg key="Audiences_for_item">条目%cal_item_name%的读者</msg>
+  <msg key="Calendar">日历</msg>
+  <msg key="Calendar_Add_Item">日历：增加条目</msg>
+  <msg key="Calendar_Edit_Item">日历：编辑条目</msg>
+  <msg key="Calendar_Item">日历条目</msg>
+  <msg key="Calendar_Item_Delete">删除日历条目</msg>
+  <msg key="Calendar_Item_Types">日历条目类型</msg>
+  <msg key="Calendar_Name">日历名称</msg>
+  <msg key="Calendar_Permissions">“日历许可”</msg>
+  <msg key="Calendar_Permissions_1">日历许可</msg>
+  <msg key="Calendar_Preferences">“日历参数”</msg>
+  <msg key="Calendars">日历</msg>
+  <msg key="Choose">选择</msg>
+  <msg key="Current_Permissions">当前许可</msg>
+  <msg key="Date">日期：</msg>
+  <msg key="Date_1">日期</msg>
+  <msg key="day">天</msg>
+  <msg key="day_rolling_period">天</msg>
+  <msg key="day_s">天</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="delete">删除</msg>
+  <msg key="Description">描述</msg>
+  <msg key="Details">详细信息：</msg>
+  <msg key="developer_note_calendar_add">开发者注意：此日历创建过程包括以下步骤：&lt;ol&gt; &lt;li&gt; 创建日历对象，并更改必要的缺省许可。&lt;li&gt; 选择将成为该日历读者的组或用户。&lt;li&gt; 给组或用户申请必要的特定许可。&lt;/ol&gt; </msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="edit">编辑</msg>
+  <msg key="End_Time">结束时间</msg>
+  <msg key="Events_over_a">共</msg>
+  <msg key="Friday">星期五</msg>
+  <msg key="from">从</msg>
+  <msg key="Grant">授权</msg>
+  <msg key="Grant_Permissions">许可</msg>
+  <msg key="Item">条目</msg>
+  <msg key="lt_Are_you_sure_you_want">确实要删除此日历吗？所有的日历条目及与此相关的许可也将被删除。</msg>
+  <msg key="lt_Are_you_sure_you_want_1">确实要删除此事件吗？</msg>
+  <msg key="lt_Audiences_for_calenda">日历读者</msg>
+  <msg key="lt_Calendar_Administrati">日历管理</msg>
+  <msg key="lt_Calendar_Administrati_1">用户日历管理</msg>
+  <msg key="lt_Calendar_Choose_Calen">日历：选择日历</msg>
+  <msg key="lt_Calendar_detail_listi">日历详细信息：个人日历所有信息列表</msg>
+  <msg key="lt_Calendar_Item_Adminis">日历条目管理</msg>
+  <msg key="lt_Calendar_Item_Permiss">“日历条目许可”</msg>
+  <msg key="lt_Calendars_Repeating_E">日历：重复事件</msg>
+  <msg key="lt_Create_a_new_calendar">创建新日历</msg>
+  <msg key="lt_delete_all_occurrence">删除所有事件</msg>
+  <msg key="lt_delete_only_this_inst">仅删除此实例</msg>
+  <msg key="lt_Edit_your_Calendar_Pr">编辑日历参数</msg>
+  <msg key="lt_everyone_have_read_pe">每个人都可以阅读许可条款、注册用户或取消注册用户。</msg>
+  <msg key="lt_Hide_Checked_Calendar">隐藏选择的日历</msg>
+  <msg key="lt_Manage_Calendar_Audie">管理日历读者</msg>
+  <msg key="lt_no_parties_exist_cont">没有团体。请与系统管理员联系。</msg>
+  <msg key="lt_no_privilege_exist_co">没有权限。请与系统管理员联系。</msg>
+  <msg key="lt_no_privilege_has_been">没有授予权限。</msg>
+  <msg key="lt_only_those_you_choose">只有被选中的日历读者才能浏览日历条目。</msg>
+  <msg key="lt_Repeat_this_event_unt">重复此事件直到：</msg>
+  <msg key="lt_The_following_is_a__l">下面是你可浏览的日历列表。此列表为可选日历列表。你可以选择列表中要保留的日历。</msg>
+  <msg key="lt_There_are_no_audience">此日历无读者</msg>
+  <msg key="lt_This_is_a_repeating_e">这是一个重复事件</msg>
+  <msg key="lt_You_are_choosing_to_m">此事件将被重复，它将在日历中重复显示。事件详细信息如下：</msg>
+  <msg key="lt_You_can_manage_the_fo">你可管理下列日历</msg>
+  <msg key="lt_You_have_no_party_wid">你没有团体日历</msg>
+  <msg key="Monday">星期一</msg>
+  <msg key="New_Type">新类型：</msg>
+  <msg key="No">不是</msg>
+  <msg key="No_Calendars">没有日历</msg>
+  <msg key="No_Items">没有条目</msg>
+  <msg key="no_keep_it">不，保留。</msg>
+  <msg key="Note">注意</msg>
+  <msg key="of_the_month">本月的</msg>
+  <msg key="of_the_week">本周的</msg>
+  <msg key="Private">私有的：</msg>
+  <msg key="private">私有</msg>
+  <msg key="Public">公共的：</msg>
+  <msg key="public">公共的</msg>
+  <msg key="Repeat">重复</msg>
+  <msg key="Repeat_1">重复吗？</msg>
+  <msg key="Repeat_every">重复：每</msg>
+  <msg key="revoke">撤消</msg>
+  <msg key="same">同样的</msg>
+  <msg key="Saturday">星期六</msg>
+  <msg key="Select_Calendars">选择日历</msg>
+  <msg key="Start_Time">开始时间</msg>
+  <msg key="Submit_query">提交查询</msg>
+  <msg key="Sunday">星期日</msg>
+  <msg key="sync_with_Outlook">与Outlook同步</msg>
+  <msg key="Thursday">星期四</msg>
+  <msg key="Time">时间：</msg>
+  <msg key="Title">标题：</msg>
+  <msg key="Title_1">标题</msg>
+  <msg key="to">到</msg>
+  <msg key="Tuesday">星期二</msg>
+  <msg key="Type">类型：</msg>
+  <msg key="Type_1">类型</msg>
+  <msg key="Use_Hours_Below">使用时间如下：</msg>
+  <msg key="Wednesday">星期三</msg>
+  <msg key="year">年</msg>
+  <msg key="Yes">是</msg>
+  <msg key="yes_delete_it">是，删除。</msg>
+  <msg key="Yes_I_am_sure">是，确定。</msg>
 </message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.15
+++ openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.16
@@ -6,74 +6,78 @@
   <msg key="add">tilf�j</msg>
   <msg key="Add_a_new_Audience">Tilf�j et nyt publikum</msg>
   <msg key="add_an_event">tilf�j en begivenhed</msg>
-  <msg key="Add_Item">Tilf�j Emne</msg>
+  <msg key="Add_Item">Tilf�j Kalenderpost</msg>
   <msg key="Add_Recurrence">Tilf�j Gentagelse</msg>
   <msg key="All_Day_Event">Heldagsbegivenhed</msg>
   <msg key="all_events">alle begivenheder</msg>
   <msg key="and_Time">og Tidspunkt</msg>
-  <msg key="Attachments">Vedh�ftninger:</msg>
+  <msg key="Attachments">Vedh�ftelser:</msg>
   <msg key="Audiences_for_item">Publikum til emnet</msg>
   <msg key="Calendar">Kalender</msg>
-  <msg key="Calendar_Add_Item">Kalender: Tilf�j Emne</msg>
-  <msg key="Calendar_Edit_Item">Kalender: Redig�r Emne</msg>
-  <msg key="Calendar_Item">Kalenderemne</msg>
-  <msg key="Calendar_Item_Delete">Slet Kalenderemne</msg>
-  <msg key="Calendar_Item_Types">Typer af Kalenderemner</msg>
+  <msg key="Calendar_Add_Item">Kalender: Tilf�j Post</msg>
+  <msg key="Calendar_Edit_Item">Kalender: Rediger Post</msg>
+  <msg key="Calendar_Item">Kalenderpost</msg>
+  <msg key="Calendar_Item_Delete">Slet Kalenderpost</msg>
+  <msg key="Calendar_Item_Types">Typer af Kalenderposter</msg>
   <msg key="Calendar_Name">Kalendernavn</msg>
-  <msg key="Calendar_Permissions">&quot;Kalendertilladelser&quot;</msg>
-  <msg key="Calendar_Permissions_1">Kalendertilladelser</msg>
+  <msg key="Calendar_Permissions">&quot;Kalenderrettigheder&quot;</msg>
+  <msg key="Calendar_Permissions_1">Kalenderrettigheder</msg>
   <msg key="Calendar_Preferences">&quot;Kalenderegenskaber&quot;</msg>
   <msg key="Calendars">Kalendere</msg>
   <msg key="Choose">V�lg</msg>
-  <msg key="Current_Permissions">Nuv�rende Tilladelser</msg>
+  <msg key="Current_Permissions">Nuv�rende Rettigheder</msg>
   <msg key="Date">Dato:</msg>
   <msg key="Date_1">Dato</msg>
   <msg key="day">dag</msg>
+  <msg key="day_rolling_period">dags rullende periode</msg>
   <msg key="day_s">dag(e)</msg>
   <msg key="Delete">Slet</msg>
   <msg key="delete">slet</msg>
   <msg key="Description">Beskrivelse</msg>
   <msg key="Details">Detaljer:</msg>
+  <msg key="developer_note_calendar_add">Note til udviklere: Oprettelsen af en kalender indeb�rer f�lgende trin: &lt;ol&gt; &lt;li&gt;Opret kalenderobjektet og �ndring af standardrettighederne hvis det er n�dvendigt &lt;li&gt;Udv�lg de grupper og/eller brugere som udg�r kalenderens publikum &lt;li&gt;Anvend gruppe- og brugerspecifikke rettigheder hvis det er n�dvendigt &lt;/ol&gt;</msg>
   <msg key="Edit">Redig�r</msg>
   <msg key="edit">redig�r</msg>
   <msg key="End_Time">Sluttidspunkt</msg>
+  <msg key="Events_over_a">Begivenheder over en</msg>
   <msg key="Friday">Fredag</msg>
   <msg key="from">fra</msg>
-  <msg key="Grant">Giv</msg>
-  <msg key="Grant_Permissions">Giv Tilladelser</msg>
+  <msg key="Grant">Tildel</msg>
+  <msg key="Grant_Permissions">Tildel Rettigheder</msg>
   <msg key="Item">Emne</msg>
-  <msg key="lt_Are_you_sure_you_want">Er du sikker p�, at du �nsker at slette denne kalender? Alle emner i kalenderen og alle tilladelse, der er forbundet med disse, vil ogs� blive slettet.</msg>
-  <msg key="lt_Are_you_sure_you_want_1">Er du sikker p�, at du �nsker at redigere denne begivenhed?</msg>
+  <msg key="lt_Are_you_sure_you_want">Er du sikker p�, at du �nsker at slette denne kalender? Alle poster i kalenderen og alle tilladelser  der er forbundet med disse, vil ogs� blive slettet.</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Er du sikker p� at du �nsker at redigere denne begivenhed?</msg>
   <msg key="lt_Audiences_for_calenda">Publikum for kalenderen</msg>
   <msg key="lt_Calendar_Administrati">Kalenderadministration</msg>
   <msg key="lt_Calendar_Administrati_1">Kalenderadministration for Brugeren</msg>
   <msg key="lt_Calendar_Choose_Calen">Kalender: V�lg Kalender</msg>
-  <msg key="lt_Calendar_detail_listi">Kalender detaljer: liste over information omkring den individuelle kalender</msg>
-  <msg key="lt_Calendar_Item_Adminis">Administration af Kalenderemne</msg>
-  <msg key="lt_Calendar_Item_Permiss">&quot;Tilladelser til Kalenderemne&quot;</msg>
+  <msg key="lt_Calendar_detail_listi">Kalenderdetaljer: liste over oplysninger omkring den enkelte kalender</msg>
+  <msg key="lt_Calendar_Item_Adminis">Administration af Kalenderpost</msg>
+  <msg key="lt_Calendar_Item_Permiss">&quot;Tilladelser til Kalenderpost&quot;</msg>
   <msg key="lt_Calendars_Repeating_E">Kalender: Gentaget Begivenhed</msg>
   <msg key="lt_Create_a_new_calendar">Opret en ny kalender</msg>
   <msg key="lt_delete_all_occurrence">slet alle forekomster</msg>
   <msg key="lt_delete_only_this_inst">slet kun denne forekomst</msg>
-  <msg key="lt_Edit_your_Calendar_Pr">Redig�r dine Kalenderindstillinger</msg>
-  <msg key="lt_everyone_have_read_pe">alle har l�setilladdelse og kan se emnerne &amp;minus; registrerede brugere s�vel som ikke-registrerede.</msg>
+  <msg key="lt_Edit_your_Calendar_Pr">Rediger dine Kalenderindstillinger</msg>
+  <msg key="lt_everyone_have_read_pe">alle har ret til at l�se og kan se emnerne &amp;mdash; s�vel registrerede brugere som ikke-registrerede brugere.</msg>
   <msg key="lt_Hide_Checked_Calendar">Skjul Valgte Kalendere</msg>
-  <msg key="lt_Manage_Calendar_Audie">Administr�r Kalenderpublikum</msg>
-  <msg key="lt_no_parties_exist_cont">der eksisterer ingen parter (&quot;parties&quot;) &amp;minus; kontakt systemadministratoren.</msg>
-  <msg key="lt_no_privilege_exist_co">der eksisterer ingen privilegier &amp;minus; kontakt systemadministratoren.</msg>
-  <msg key="lt_no_privilege_has_been">der er ikke blevet tildelt nogle privilegier</msg>
-  <msg key="lt_only_those_you_choose">det er kun dem, du v�lger som publikum, der kan se emner i kalenderen.</msg>
+  <msg key="lt_Manage_Calendar_Audie">Administrer Kalenderpublikum</msg>
+  <msg key="lt_no_parties_exist_cont">Der eksisterer ingen parter. Kontakt din systemadministrator.</msg>
+  <msg key="lt_no_privilege_exist_co">Der eksisterer ingen rettigheder. Kontakt din systemadministrator.</msg>
+  <msg key="lt_no_privilege_has_been">Der er ikke blevet tildelt nogen rettigheder.</msg>
+  <msg key="lt_only_those_you_choose">kun dem du v�lger som publikum, kan se emner i kalenderen.</msg>
   <msg key="lt_Repeat_this_event_unt">Gentag denne begivenhed indtil:</msg>
-  <msg key="lt_The_following_is_a__l">Det f�lgende er en liste over kalendere, som du har adgang til. Listen vil vise sig p� din kalender og give dig mulighed for at se begivenheder mellem disse kalendere. Du kan v�lge hvilke kalendere, du �nsker skal forblive p� denne liste.</msg>
+  <msg key="lt_The_following_is_a__l">Det f�lgende er en liste over kalendere som du har adgang til. Listen vil vise sig p� din kalender og give dig mulighed for at se begivenheder mellem disse kalendere. Du kan v�lge hvilke kalendere du �nsker skal forblive p� denne liste.</msg>
   <msg key="lt_There_are_no_audience">Der er intet publikum til denne kalender</msg>
   <msg key="lt_This_is_a_repeating_e">Dette er en gentaget begivenhed</msg>
-  <msg key="lt_You_are_choosing_to_m">Du har valgt, at denne begivenhed skal gentage sig, s� den forekommer flere gange p� din kalender. Detaljer omkring begivenhedens er:</msg>
+  <msg key="lt_You_are_choosing_to_m">Du har valgt at denne begivenhed skal gentages, s� den forekommer flere gange p� din kalender. Detaljer omkring begivenheden:</msg>
   <msg key="lt_You_can_manage_the_fo">Du kan administrere f�lgende kalendere</msg>
-  <msg key="lt_You_have_no_party_wid">Du har ingen kalendere som &quot;party wide&quot;</msg>
+  <msg key="lt_You_have_no_party_wid">Du har ingen kalendere som er &quot;party wide&quot;</msg>
   <msg key="Monday">Mandag</msg>
   <msg key="New_Type">Ny Type:</msg>
   <msg key="No">Nej</msg>
   <msg key="No_Calendars">Ingen Kalendere</msg>
+  <msg key="No_Items">Ingen kalenderposter</msg>
   <msg key="no_keep_it">nej, behold den</msg>
   <msg key="Note">Bem�rkning</msg>
   <msg key="of_the_month">af m�neden</msg>
@@ -92,7 +96,7 @@
   <msg key="Start_Time">Starttidspunkt</msg>
   <msg key="Submit_query">Indsend</msg>
   <msg key="Sunday">S�ndag</msg>
-  <msg key="sync_with_Outlook">synkronis�r med Outlook:</msg>
+  <msg key="sync_with_Outlook">synkroniser med Outlook:</msg>
   <msg key="Thursday">Torsdag</msg>
   <msg key="Time">Tidspunkt:</msg>
   <msg key="Title">Titel:</msg>
@@ -101,7 +105,7 @@
   <msg key="Tuesday">Tirsdag</msg>
   <msg key="Type">Type:</msg>
   <msg key="Type_1">Type</msg>
-  <msg key="Use_Hours_Below">Brug tidspunkterne nedenfor:</msg>
+  <msg key="Use_Hours_Below">Brug disse tidspunkter:</msg>
   <msg key="Wednesday">Onsdag</msg>
   <msg key="year">�r</msg>
   <msg key="Yes">Ja</msg>
Index: openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.9
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="calendar" package_version="2.0d1" locale="de_DE" charset="ISO-8859-1">
 
-  <msg key="_You_may_choose_to">. Sie d�rfen w�hlen: </msg>
+  <msg key="_You_may_choose_to">. Sie k�nnen</msg>
   <msg key="Add">Hinzuf�gen</msg>
   <msg key="add">hinzuf�gen</msg>
   <msg key="Add_a_new_Audience">Hinzuf�gen einer neuen Zielgruppe</msg>
@@ -11,84 +11,88 @@
   <msg key="All_Day_Event">Ganzt�gig</msg>
   <msg key="all_events">Alle Termine</msg>
   <msg key="and_Time">und Uhrzeit</msg>
-  <msg key="Attachments">Anlagen:</msg>
-  <msg key="Audiences_for_item">Zielgruppen f�r den Eintrag</msg>
+  <msg key="Attachments">Anh�nge:</msg>
+  <msg key="Audiences_for_item">Zielgruppen f�r den Eintrag %cal_item_name%</msg>
   <msg key="Calendar">Kalender</msg>
   <msg key="Calendar_Add_Item">Kalender: Eintrag Hinzuf�gen</msg>
   <msg key="Calendar_Edit_Item">Kalender: Eintrag Bearbeiten</msg>
-  <msg key="Calendar_Item">Kalender: Eintrag</msg>
-  <msg key="Calendar_Item_Delete">Kalender: Eintrag l�schen</msg>
-  <msg key="Calendar_Item_Types">Kalender: Eintragskategorien</msg>
-  <msg key="Calendar_Name">Kalender: Name</msg>
-  <msg key="Calendar_Permissions">&quot;Kalender-Berechtigungen&quot;</msg>
-  <msg key="Calendar_Permissions_1">Kalender-Berechtigungen</msg>
-  <msg key="Calendar_Preferences">Kalender Einstellungen</msg>
+  <msg key="Calendar_Item">Kalendereintrag</msg>
+  <msg key="Calendar_Item_Delete">Kalendereintrag l�schen</msg>
+  <msg key="Calendar_Item_Types">Eintragskategorien f�r Kalender</msg>
+  <msg key="Calendar_Name">Bezeichnung des Kalenders</msg>
+  <msg key="Calendar_Permissions">&quot;Berechtigungen f�r Kalender&quot;</msg>
+  <msg key="Calendar_Permissions_1">Berechtigungen f�r Kalender</msg>
+  <msg key="Calendar_Preferences">&quot;Einstellungen f�r Kalender&quot;</msg>
   <msg key="Calendars">Kalender</msg>
   <msg key="Choose">Ausw�hlen</msg>
   <msg key="Current_Permissions">Derzeitige Berechtigungen</msg>
   <msg key="Date">Datum:</msg>
   <msg key="Date_1">Datum</msg>
   <msg key="day">Jeden</msg>
+  <msg key="day_rolling_period">Tagen</msg>
   <msg key="day_s">Tag(e)</msg>
   <msg key="Delete">L�schen</msg>
   <msg key="delete">L�schen</msg>
   <msg key="Description">Anmerkung</msg>
   <msg key="Details">Anmerkung:</msg>
+  <msg key="developer_note_calendar_add">Hinweis: Die Erstellung eines neuen Kalenders erfolgt in drei Schritten: &lt;ol&gt; &lt;li&gt; Geben Sie einen Namen f�r den Kalender ein und �ndern Sie falls n�tig die Standardberechtigungen. &lt;li&gt; W�hlen Sie Gruppen und/oder einzelne Benutzer als Zielgruppe aus. &lt;li&gt; Erteilen Sie nach Bedarf gruppen- oder benutzerspezifische Berechtigungen.&lt;/ol&gt;  </msg>
   <msg key="Edit">Bearbeiten</msg>
   <msg key="edit">Bearbeiten</msg>
   <msg key="End_Time">Endet</msg>
+  <msg key="Events_over_a">Termine innerhalb eines Zeitraums von</msg>
   <msg key="Friday">Freitag</msg>
   <msg key="from">von</msg>
-  <msg key="Grant">Zuweisen</msg>
-  <msg key="Grant_Permissions">Berechtigungen zuweisen</msg>
+  <msg key="Grant">Erteilen</msg>
+  <msg key="Grant_Permissions">Berechtigungen erteilen</msg>
   <msg key="Item">Eintrag</msg>
   <msg key="lt_Are_you_sure_you_want">Wollen Sie diesen Kalender wirklich l�schen? Alle Eintr�ge und die mit dem Kalender verbundenen Berechtigungen werden dann ebenfalls gel�scht.</msg>
   <msg key="lt_Are_you_sure_you_want_1">Wollen Sie diesen Termin wirklich l�schen?</msg>
   <msg key="lt_Audiences_for_calenda">Zielgruppen f�r Kalender</msg>
   <msg key="lt_Calendar_Administrati">Kalender verwalten</msg>
   <msg key="lt_Calendar_Administrati_1">Kalender verwalten f�r Benutzer</msg>
-  <msg key="lt_Calendar_Choose_Calen">Kalender: Kalender w�hlen</msg>
-  <msg key="lt_Calendar_detail_listi">Kalender-Detail: Aufstellung aller Angaben �ber den einzelnen Kalender</msg>
+  <msg key="lt_Calendar_Choose_Calen">Kalender: Kalender ausw�hlen</msg>
+  <msg key="lt_Calendar_detail_listi">Details f�r Kalender: Alle Angaben �ber den einzelnen Kalender anzeigen</msg>
   <msg key="lt_Calendar_Item_Adminis">Kalendereintr�ge verwalten</msg>
   <msg key="lt_Calendar_Item_Permiss">&quot;Berechtigungen f�r Kalendereintr�ge&quot;</msg>
   <msg key="lt_Calendars_Repeating_E">Kalender: Wiederkehrender Termin</msg>
   <msg key="lt_Create_a_new_calendar">Neuen Kalender erstellen</msg>
   <msg key="lt_delete_all_occurrence">Alle Wiederholungen des Termins l�schen</msg>
   <msg key="lt_delete_only_this_inst">Nur diesen Einzeltermin l�schen</msg>
   <msg key="lt_Edit_your_Calendar_Pr">Eigene Kalendereinstellungen bearbeiten</msg>
-  <msg key="lt_everyone_have_read_pe">Jeder hat Leserecht und kann die Eintr�ge sehen, registrierte und unregistrierte Benutzer gleicherma�en.</msg>
+  <msg key="lt_everyone_have_read_pe">Jeder hat Leserecht und kann die Eintr�ge sehen, sowohl registrierte als auch nicht registrierte Benutzer.</msg>
   <msg key="lt_Hide_Checked_Calendar">Ausgew�hlte Kalender verbergen</msg>
   <msg key="lt_Manage_Calendar_Audie">Zielgruppen f�r Kalender verwalten</msg>
-  <msg key="lt_no_parties_exist_cont">Es gibt keine Zusammenk�nfte. Nehmen Sie Kontakt mit Ihrem System-Administrator auf.</msg>
-  <msg key="lt_no_privilege_exist_co">Es gibt keine Privilegien. Nehmen Sie Kontakt mit Ihrem System-Administrator auf.</msg>
-  <msg key="lt_no_privilege_has_been">Es ist kein Privileg gew�hrt worden.</msg>
+  <msg key="lt_no_parties_exist_cont">Es sind keine Zielgruppen vorhanden. Wenden Sie sich an den Systemadministrator.</msg>
+  <msg key="lt_no_privilege_exist_co">Es sind keine Sonderberechtigungen vorhanden. Wenden Sie sich an den Systemadministrator. </msg>
+  <msg key="lt_no_privilege_has_been">Es wurden keine Sonderberechtigungen erteilt.</msg>
   <msg key="lt_only_those_you_choose">Die Eintr�ge sind nur f�r die zusammengestellte Zielgruppe sichtbar.</msg>
   <msg key="lt_Repeat_this_event_unt">Endet am:</msg>
-  <msg key="lt_The_following_is_a__l">Folgende Liste enth�lt die Ihnen zug�nglichen Kalender. Diese Liste wird auf Ihrem Kalender auftauchen als Option, Termine auf diesen Kalendern anzusehen. Sie k�nnen w�hlen welchen Kalender Sie auf der Liste behalten wollen.</msg>
+  <msg key="lt_The_following_is_a__l">The following is a list of calendars that is accessible to you. This list will show up on your calendar as an option for you to see events between these calendars. You can select which calendar you want to keep on that list. </msg>
   <msg key="lt_There_are_no_audience">Es gibt keine Zielgruppen f�r diesen Kalender.</msg>
   <msg key="lt_This_is_a_repeating_e">Dies ist ein wiederkehrender Termin.</msg>
   <msg key="lt_You_are_choosing_to_m">Hier legen Sie die Kriterien der Terminwiederholung fest:</msg>
   <msg key="lt_You_can_manage_the_fo">Sie k�nnen folgende Kalender verwalten:</msg>
-  <msg key="lt_You_have_no_party_wid">Sie haben keine Zusammenkunfts-weiten Kalender.</msg>
+  <msg key="lt_You_have_no_party_wid">You have no party wide calendars</msg>
   <msg key="Monday">Montag</msg>
   <msg key="New_Type">Neue Eintragskategorie:</msg>
   <msg key="No">Nein</msg>
-  <msg key="No_Calendars">Keine Kalender</msg>
+  <msg key="No_Calendars">Keine Kalender vorhanden</msg>
+  <msg key="No_Items">Keine Eintr�ge vorhanden</msg>
   <msg key="no_keep_it">Nein, nicht l�schen</msg>
   <msg key="Note">Hinweis</msg>
   <msg key="of_the_month">des Monats</msg>
   <msg key="of_the_week">&amp;nbsp;</msg>
   <msg key="Private">Privat:</msg>
-  <msg key="private">privat</msg>
+  <msg key="private">Privat</msg>
   <msg key="Public">�ffentlich:</msg>
   <msg key="public">�ffentlich</msg>
   <msg key="Repeat">Wiederholen</msg>
   <msg key="Repeat_1">Wiederholen?</msg>
   <msg key="Repeat_every">Wiederholungsintervall</msg>
-  <msg key="revoke">zur�ckziehen</msg>
+  <msg key="revoke">Aufheben</msg>
   <msg key="same">Am gleichen</msg>
   <msg key="Saturday">Samstag</msg>
-  <msg key="Select_Calendars">Ausw�hlen von Kalendern</msg>
+  <msg key="Select_Calendars">Kalender ausw�hlen</msg>
   <msg key="Start_Time">Beginnt</msg>
   <msg key="Submit_query">Anfrage senden</msg>
   <msg key="Sunday">Sonntag</msg>
@@ -106,5 +110,5 @@
   <msg key="year">Jahr</msg>
   <msg key="Yes">Ja</msg>
   <msg key="yes_delete_it">Ja, l�schen</msg>
-  <msg key="Yes_I_am_sure">Ja, wirklich!</msg>
+  <msg key="Yes_I_am_sure">Ja, wirklich</msg>
 </message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	24 Feb 2004 13:31:37 -0000	1.19
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.20
@@ -33,6 +33,8 @@
   <msg key="Date_1">Date</msg>
   <msg key="day">day</msg>
   <msg key="day_rolling_period">day rolling period</msg>
+  <description key="day_rolling_period">Please, could you give more info of the context for this, thanks</description>
+
   <msg key="day_s">day (s)</msg>
   <msg key="Delete">Delete</msg>
   <msg key="delete">delete</msg>
@@ -53,6 +55,7 @@
   <msg key="from">from</msg>
   <msg key="Grant">Grant</msg>
   <msg key="Grant_Permissions">Grant Permissions</msg>
+  <msg key="is_recurring">Item is recurring.</msg>
   <msg key="Item">Item</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete this calendar. All the calendar items
       and all the permission that's associated with this calendar will be 
Index: openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.9
@@ -29,14 +29,17 @@
   <msg key="Date">Fecha:</msg>
   <msg key="Date_1">Fecha</msg>
   <msg key="day">d�a</msg>
+  <msg key="day_rolling_period">per�odo de rotaci�n de d�a</msg>
   <msg key="day_s">d�a(s)</msg>
   <msg key="Delete">Borrar</msg>
   <msg key="delete">borrar</msg>
   <msg key="Description">Descripci�n</msg>
   <msg key="Details">Detalles:</msg>
+  <msg key="developer_note_calendar_add">Nota del desarrollador: El proceso de creaci�n del Calendario incluye los siguientes pasos: &lt;ol&gt; &lt;li&gt; Crear el Calendario,y cambiar los permisos otorgados por defecto, si fuera necesario &lt;li&gt; Seleccionar grupos y/o usuarios que ser�n la audiencia del calendario &lt;li&gt; Aplicar si fuera necesario permisos al usuario/grupo.</msg>
   <msg key="Edit">Editar</msg>
   <msg key="edit">editar</msg>
   <msg key="End_Time">Fin</msg>
+  <msg key="Events_over_a">Eventos por arriba de</msg>
   <msg key="Friday">Viernes</msg>
   <msg key="from">de</msg>
   <msg key="Grant">Otorgar</msg>
@@ -74,6 +77,7 @@
   <msg key="New_Type">Categor�a nueva:</msg>
   <msg key="No">No</msg>
   <msg key="No_Calendars">Ning�n calendario</msg>
+  <msg key="No_Items">Sin items</msg>
   <msg key="no_keep_it">no, conservarlo</msg>
   <msg key="Note">Nota</msg>
   <msg key="of_the_month">del mes</msg>
Index: openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.9
@@ -29,14 +29,17 @@
   <msg key="Date">Data:</msg>
   <msg key="Date_1">Data</msg>
   <msg key="day">giorno</msg>
+  <msg key="day_rolling_period">giorni da oggi</msg>
   <msg key="day_s">giorno (i)</msg>
   <msg key="Delete">Cancella</msg>
   <msg key="delete">cancella</msg>
   <msg key="Description">Descrizione</msg>
   <msg key="Details">Dettagli:</msg>
+  <msg key="developer_note_calendar_add">Nota per gli Sviluppatori: Il processo di creazione del calendario comporta i seguenti passi: &lt;ol&gt;  &lt;li&gt; Creare l'oggetto &amp;quote;calendario&amp;quot;, e modificare i permessi di default se necessario.&lt;li&gt; Seleziona gruppi e/o utenti che potranno vedere il calendario &lt;li&gt; Ae necessario, applicare i permessi specifici agli utenti o ai gruppi. &lt;/ol&gt;</msg>
   <msg key="Edit">Modifica</msg>
   <msg key="edit">modifica</msg>
   <msg key="End_Time">Ora finale</msg>
+  <msg key="Events_over_a">Elementi in un intervallo di </msg>
   <msg key="Friday">Venerd&amp;igrave;</msg>
   <msg key="from">da</msg>
   <msg key="Grant">Garantisci</msg>
@@ -74,6 +77,7 @@
   <msg key="New_Type">Nuovo Tipo:</msg>
   <msg key="No">No</msg>
   <msg key="No_Calendars">Nessun Calendario</msg>
+  <msg key="No_Items">Nessun elemento</msg>
   <msg key="no_keep_it">no, tienilo</msg>
   <msg key="Note">Nota</msg>
   <msg key="of_the_month">del mese</msg>
Index: openacs-4/packages/calendar/catalog/calendar.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/catalog/calendar.ko_KR.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/calendar/catalog/calendar.ko_KR.utf-8.xml	26 Feb 2004 15:29:02 -0000	1.2
@@ -29,14 +29,17 @@
   <msg key="Date">날짜:</msg>
   <msg key="Date_1">날짜</msg>
   <msg key="day">요일</msg>
+  <msg key="day_rolling_period">일(日) 회전주기</msg>
   <msg key="day_s">요일(들)</msg>
   <msg key="Delete">삭제</msg>
   <msg key="delete">삭제하다</msg>
   <msg key="Description">설명</msg>
   <msg key="Details">세부사항:</msg>
+  <msg key="developer_note_calendar_add">개발자 노트: 달력 생성 프로세스는 다음의 단계를 포함하고 있다: &lt;ol&gt; &lt;li&gt; 달력 객체 생성과 필요할 경우 기본 권한 변경 &lt;li&gt; 그룹 이나 현재 달력의 독자인 사용자의 선택 &lt;li&gt; 그룹과 사용자의 요구되는 구체적인 사용권한 적용 &lt;/ol&gt;</msg>
   <msg key="Edit">수정하다</msg>
   <msg key="edit">수정하다</msg>
   <msg key="End_Time">종료 시간</msg>
+  <msg key="Events_over_a">이벤트들</msg>
   <msg key="Friday">금요일</msg>
   <msg key="from">로부터</msg>
   <msg key="Grant">승인</msg>
@@ -74,6 +77,7 @@
   <msg key="New_Type">새로운 유형:</msg>
   <msg key="No">아니오</msg>
   <msg key="No_Calendars">달력이 없음</msg>
+  <msg key="No_Items">항목 없음</msg>
   <msg key="no_keep_it">아니오, 보존하시오.</msg>
   <msg key="Note">주</msg>
   <msg key="of_the_month">월(月)의</msg>
Index: openacs-4/packages/calendar/catalog/calendar.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/Attic/calendar.ms_my.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/catalog/calendar.ms_my.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/calendar/catalog/calendar.ms_my.utf-8.xml	26 Feb 2004 15:29:02 -0000	1.2
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="calendar" package_version="2.0d1" locale="ms_my" charset="utf-8">
 
+  <msg key="_You_may_choose_to">. Anda boleh pilih untuk:</msg>
   <msg key="Add">Tambah</msg>
   <msg key="add">tambah</msg>
   <msg key="Add_a_new_Audience">Tambah Penonton Baru</msg>
   <msg key="add_an_event">Tambah Situasi</msg>
   <msg key="Add_Item">Tambah Bahan</msg>
+  <msg key="All_Day_Event">Rancangan Seluruh Hari</msg>
+  <msg key="all_events">Semua rancangan-rancangan</msg>
   <msg key="and_Time">dan Masa</msg>
   <msg key="Attachments">Lampiran-lampiran:</msg>
+  <msg key="Audiences_for_item">Penonton-penonton untuk bahan %cal_item_name%</msg>
   <msg key="Calendar">Takwim</msg>
+  <msg key="Calendar_Add_Item">Takwim: Tambah Bahan</msg>
+  <msg key="Calendar_Edit_Item">Takwim: Ubah Bahan</msg>
+  <msg key="Calendar_Item">Bahan Takwim</msg>
+  <msg key="Calendar_Item_Delete">Buang Bahan Takwim</msg>
+  <msg key="Calendar_Item_Types">Jenis Bahan Takwim</msg>
   <msg key="Calendar_Name">Nama Takwim</msg>
+  <msg key="Calendar_Permissions">&quot;Kebenaran Takwim&quot;</msg>
+  <msg key="Calendar_Permissions_1">Kebenaran Takwim</msg>
   <msg key="Calendars">Takwim-takwim</msg>
   <msg key="Choose">Pilih</msg>
+  <msg key="Current_Permissions">Kebenaran Kini</msg>
   <msg key="Date">Tarikh:</msg>
   <msg key="Date_1">Tarikh</msg>
   <msg key="day">hari</msg>
@@ -22,16 +34,39 @@
   <msg key="Edit">Ubah</msg>
   <msg key="edit">ubah</msg>
   <msg key="End_Time">Masa Akhir</msg>
+  <msg key="Events_over_a">Rancangan dalam </msg>
   <msg key="Friday">Jumaat</msg>
   <msg key="from">daripada</msg>
   <msg key="Item">Bahan</msg>
+  <msg key="lt_Are_you_sure_you_want">Adakah anda pasti hendak membuang takwim ini. Semua bahan-bahan takwim dan semua kebenaran yang berhubung dengan takwim ini akan dibuang juga.</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Adakah anda pasti hendak membuang rancangan ini?</msg>
+  <msg key="lt_Audiences_for_calenda">Penonton-penonton untuk takwim</msg>
+  <msg key="lt_Calendar_Administrati">Pengendalian Takwim</msg>
+  <msg key="lt_Calendar_Administrati_1">Pengendalian Takwim untuk Pengguna</msg>
   <msg key="lt_Calendar_Choose_Calen">Takwim: Pilih Takwim</msg>
+  <msg key="lt_Calendar_Item_Adminis">Pengendalian Bahan Takwim</msg>
+  <msg key="lt_Calendar_Item_Permiss">&quot;Kebenaran Bahan Takwim&quot;</msg>
+  <msg key="lt_Calendars_Repeating_E">Takwim: Rancangan yang Berulang</msg>
+  <msg key="lt_Create_a_new_calendar">Bina takwim baru</msg>
+  <msg key="lt_Edit_your_Calendar_Pr">Ubah Kebenaran Takwim anda</msg>
+  <msg key="lt_everyone_have_read_pe">semua orang mempunyai kebenaran membaca, dan boleh melihat bahan-bahan, sama ada untuk pengguna yang berdaftar atau tidak berdaftar.</msg>
+  <msg key="lt_Hide_Checked_Calendar">Sorok Takwim-takwim Terpilih</msg>
+  <msg key="lt_Manage_Calendar_Audie">Urus Penonton-penonton Takwim</msg>
+  <msg key="lt_only_those_you_choose">hanya mereka yang dipilih untuk menjadi penonton takwim boleh melihat bahan-bahan.</msg>
+  <msg key="lt_Repeat_this_event_unt">Ulangi rancangan ini hingga:</msg>
+  <msg key="lt_The_following_is_a__l">Berikut adalah senarai takwim-takwim yang boleh diakses oleh anda. Senarai ini akan timbul dalam takwim anda sebagai opsyen untuk anda melihat rancangan-rancangan diantara takwim-takwim berikut. Anda boleh memilih takwim yang mana satu yang anda mahu simpan dalam senarai berikut.</msg>
+  <msg key="lt_There_are_no_audience">Tiada penonton bagi takwim ini</msg>
+  <msg key="lt_This_is_a_repeating_e">Berikut adalah rancangan berulang</msg>
   <msg key="lt_You_can_manage_the_fo">Anda boleh mengurus takwim-takwim berikut</msg>
   <msg key="Monday">Isnin</msg>
   <msg key="New_Type">Jenis Baru:</msg>
   <msg key="No">Tidak</msg>
   <msg key="No_Calendars">Tiada Takwim</msg>
+  <msg key="No_Items">Tiada bahan</msg>
+  <msg key="no_keep_it">tidak, simpankannya</msg>
   <msg key="Note">Nota</msg>
+  <msg key="of_the_month">untuk bulan ini</msg>
+  <msg key="of_the_week">untuk minggu ini</msg>
   <msg key="Private">Peribadi:</msg>
   <msg key="private">peribadi</msg>
   <msg key="Public">Awam:</msg>
@@ -52,6 +87,7 @@
   <msg key="Tuesday">Selasa</msg>
   <msg key="Type">Jenis:</msg>
   <msg key="Type_1">Jenis</msg>
+  <msg key="Use_Hours_Below">Guna Masa-masa di Bawah:</msg>
   <msg key="Wednesday">Rabu</msg>
   <msg key="year">tahun</msg>
   <msg key="Yes">Ya</msg>
Index: openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:18 -0000	1.9
+++ openacs-4/packages/calendar/catalog/calendar.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.10
@@ -4,23 +4,23 @@
   <msg key="_You_may_choose_to">. De keuze is om:</msg>
   <msg key="Add">Toevoegen</msg>
   <msg key="add">toevoegen</msg>
-  <msg key="Add_a_new_Audience">Toevoegen nieuw publiek</msg>
-  <msg key="add_an_event">Toevoegen Gebeurtenis</msg>
-  <msg key="Add_Item">Toevoegen Item</msg>
-  <msg key="Add_Recurrence">Toevoegen Herhaling</msg>
+  <msg key="Add_a_new_Audience">Een nieuw publiek toevoegen</msg>
+  <msg key="add_an_event">Een gebeurtenis toevoegen</msg>
+  <msg key="Add_Item">Element toevoegen</msg>
+  <msg key="Add_Recurrence">Herhaling toevoegen</msg>
   <msg key="All_Day_Event">Gebeurtenis op iedere dag</msg>
   <msg key="all_events">alle gebeurtenissen</msg>
-  <msg key="and_Time">en Tijd</msg>
+  <msg key="and_Time">en tijd</msg>
   <msg key="Attachments">Bijlagen:</msg>
-  <msg key="Audiences_for_item">Toehoorder Item</msg>
+  <msg key="Audiences_for_item">Publiek voor element %cal_item_name%</msg>
   <msg key="Calendar">Kalender</msg>
-  <msg key="Calendar_Add_Item">Kalender: Toevoegen Item</msg>
-  <msg key="Calendar_Edit_Item">Kalender: Wijzig Item</msg>
+  <msg key="Calendar_Add_Item">Kalender: Element toevoegen</msg>
+  <msg key="Calendar_Edit_Item">Kalender: Element wijzigen</msg>
   <msg key="Calendar_Item">Kalenderitem</msg>
   <msg key="Calendar_Item_Delete">Verwijder Kalenderitem</msg>
   <msg key="Calendar_Item_Types">Kalenderitem-types</msg>
   <msg key="Calendar_Name">Kalendernaam</msg>
-  <msg key="Calendar_Permissions">&quot;Kalender Permissies&quot;</msg>
+  <msg key="Calendar_Permissions">&quot;Kalenderrechten&quot;</msg>
   <msg key="Calendar_Permissions_1">Kalender Permissies</msg>
   <msg key="Calendar_Preferences">&quot;Kalender Voorkeuren&quot;</msg>
   <msg key="Calendars">Kalenders</msg>
@@ -29,18 +29,21 @@
   <msg key="Date">Datum:</msg>
   <msg key="Date_1">Datum</msg>
   <msg key="day">dag</msg>
+  <msg key="day_rolling_period">Dagrotatie-periode</msg>
   <msg key="day_s">dag(en)</msg>
   <msg key="Delete">Verwijderen</msg>
   <msg key="delete">Verwijderen</msg>
   <msg key="Description">Beschrijving</msg>
   <msg key="Details">Details:</msg>
+  <msg key="developer_note_calendar_add">Opmerking voor ontwikkelaars: Het proces van kalenderaanmaak omvat de volgende stappen: &lt;ol&gt;&lt;li&gt;Maak een kalenderobject aan en wijzig, indien nodig, de standaardrechten.&lt;li&gt;Kies groepen en/of gebruikers welke het publiek van de kalender gaan vormen&lt;li&gt;Pas groeps- en gebruikersrechten toe als gewenst.&lt;/ol&gt;</msg>
   <msg key="Edit">Wijzig</msg>
   <msg key="edit">wijzig</msg>
   <msg key="End_Time">Eindtijd</msg>
+  <msg key="Events_over_a">Gebeurtenissen over een</msg>
   <msg key="Friday">Vrijdag</msg>
   <msg key="from">van</msg>
   <msg key="Grant">Schenk</msg>
-  <msg key="Grant_Permissions">Schenk Permissies</msg>
+  <msg key="Grant_Permissions">Rechten toekennen</msg>
   <msg key="Item">Item</msg>
   <msg key="lt_Are_you_sure_you_want">Weet u zeker dat u deze kalender wilt verwijderen? Alle kalenderitems en alle permissies die aan deze kalender zijn gebonden zullen dan ook worden verwijderd. </msg>
   <msg key="lt_Are_you_sure_you_want_1">weet u zeker dat u deze gebeurtenis wilt verwijderen?</msg>
@@ -49,8 +52,8 @@
   <msg key="lt_Calendar_Administrati_1">Beheer kalender van gebruiker</msg>
   <msg key="lt_Calendar_Choose_Calen">Kalender: Kies Kalender</msg>
   <msg key="lt_Calendar_detail_listi">Kalender detail: alle informatie over de persoonlijke kalender</msg>
-  <msg key="lt_Calendar_Item_Adminis">Beheer Kalenderitem</msg>
-  <msg key="lt_Calendar_Item_Permiss">&quot;Kalenderitem Permissies&quot;</msg>
+  <msg key="lt_Calendar_Item_Adminis">Beheer van kalenderelementen</msg>
+  <msg key="lt_Calendar_Item_Permiss">&quot;Rechten van kalenderelement&quot;</msg>
   <msg key="lt_Calendars_Repeating_E">Kalenders: Herhaalde Gebeurtenis</msg>
   <msg key="lt_Create_a_new_calendar">Aanmaken nieuwe kalender</msg>
   <msg key="lt_delete_all_occurrence">verwijder alle voorkomende gevallen</msg>
@@ -71,9 +74,10 @@
   <msg key="lt_You_can_manage_the_fo">De volgende kalenders kunnen worden beheerd</msg>
   <msg key="lt_You_have_no_party_wid">Er zijn geen algemene kalenders</msg>
   <msg key="Monday">Maandag</msg>
-  <msg key="New_Type">Nieuw Type:</msg>
+  <msg key="New_Type">Nieuw type:</msg>
   <msg key="No">Nee</msg>
-  <msg key="No_Calendars">Geen Kalenders</msg>
+  <msg key="No_Calendars">Geen kalenders</msg>
+  <msg key="No_Items">Geen elementen</msg>
   <msg key="no_keep_it">nee, behouden</msg>
   <msg key="Note">Bericht</msg>
   <msg key="of_the_month">van de maand</msg>
@@ -104,7 +108,7 @@
   <msg key="Use_Hours_Below">Gebruik onderstaande uren:</msg>
   <msg key="Wednesday">Woensdag</msg>
   <msg key="year">jaar</msg>
-  <msg key="Yes">JA</msg>
+  <msg key="Yes">Ja</msg>
   <msg key="yes_delete_it">ja, verwijder</msg>
   <msg key="Yes_I_am_sure">Ja, ik ben er zeker van!</msg>
 </message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/catalog/calendar.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.8
+++ openacs-4/packages/calendar/catalog/calendar.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:29:02 -0000	1.9
@@ -29,14 +29,17 @@
   <msg key="Date">Data:</msg>
   <msg key="Date_1">Data</msg>
   <msg key="day">dia</msg>
+  <msg key="day_rolling_period">dia(s)</msg>
   <msg key="day_s">dia(s)</msg>
   <msg key="Delete">Apagar</msg>
   <msg key="delete">apagar</msg>
   <msg key="Description">Descri��o</msg>
   <msg key="Details">Detalhes:</msg>
+  <msg key="developer_note_calendar_add">Nota do Desenvolvedor: A cria��o de um calend�rio envolve os seguintes passos: &lt;ol&gt; &lt;li&gt; Criar o objeto &quot;calend�rio&quot; e alterar as permiss�es padr�es, caso necess�rio &lt;li&gt; Selecionar grupos ou usu�rios que utilizar�o o calend�rio &lt;li&gt; Aplicar permiss�es espec�ficas necess�rias para grupo ou usu�rio.</msg>
   <msg key="Edit">Editar</msg>
   <msg key="edit">editar</msg>
   <msg key="End_Time">Hora de T�rmino</msg>
+  <msg key="Events_over_a">Eventos com dura��o maior que</msg>
   <msg key="Friday">Sexta</msg>
   <msg key="from">de</msg>
   <msg key="Grant">Conceder</msg>
@@ -74,6 +77,7 @@
   <msg key="New_Type">Novo Tipo:</msg>
   <msg key="No">N�o</msg>
   <msg key="No_Calendars">Nenhum Calend�rio</msg>
+  <msg key="No_Items">Nenhum item</msg>
   <msg key="no_keep_it">n�o apague</msg>
   <msg key="Note">Nota</msg>
   <msg key="of_the_month">do m�s</msg>
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/calendar/www/cal-item-new.tcl	15 Feb 2004 12:16:23 -0000	1.23
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	26 Feb 2004 15:29:03 -0000	1.24
@@ -167,7 +167,7 @@
 	set end_time "{} {} {} [expr $start_hour + 1] 0 {} {HH24:MI}"
 	set time_p 1 
     } else {
-	set time_p 0
+	set time_p 1
 	set start_hour $start_time
 	set start_time "{} {} {} 0 0 {} {HH24:MI}"
 	set end_time "{} {} {} 0 0 {} {HH24:MI}"
Index: openacs-4/packages/curriculum/catalog/curriculum.AR_LB.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/catalog/Attic/curriculum.AR_LB.utf-8.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/catalog/curriculum.AR_LB.utf-8.xml	23 Oct 2003 08:37:04 -0000	1.2
+++ openacs-4/packages/curriculum/catalog/curriculum.AR_LB.utf-8.xml	26 Feb 2004 15:29:04 -0000	1.3
@@ -3,7 +3,7 @@
 
   <msg key="Action_Log">سجل الجراء</msg>
   <msg key="Actions">الإجرائات</msg>
-  <msg key="Add_a_curriculum">أضفْ منهجاً </msg>
+  <msg key="Add_a_curriculum">أضفْ منهجاً</msg>
   <msg key="Add_an_element">أضفْ عنصراً</msg>
   <msg key="Add_Element">أضفْ عنصر</msg>
   <msg key="Any">أيّ</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum/catalog/curriculum.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/catalog/curriculum.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/catalog/curriculum.ch_zh.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/curriculum/catalog/curriculum.ch_zh.utf-8.xml	26 Feb 2004 15:29:08 -0000	1.2
@@ -1,7 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="curriculum" package_version="0.5d1" locale="ch_zh" charset="utf-8">
 
-  <msg key="Author">恬宀</msg>
-  <msg key="Description">傍苧</msg>
-  <msg key="Edit">園辞</msg>
+  <msg key="Action_Log">动作日志</msg>
+  <msg key="Actions">动作</msg>
+  <msg key="Add_a_curriculum">添加课程</msg>
+  <msg key="Add_an_element">添加项目</msg>
+  <msg key="Add_Element">添加项目</msg>
+  <msg key="Any">任何</msg>
+  <msg key="Archive">存档</msg>
+  <msg key="Archived">已存档的</msg>
+  <msg key="Assign">布置</msg>
+  <msg key="Assigned">已布置的</msg>
+  <msg key="Author">作者</msg>
+  <msg key="Comment">评论</msg>
+  <msg key="Commented">已评论的</msg>
+  <msg key="Complete_description">完整的描述</msg>
+  <msg key="Completed">已完成的</msg>
+  <msg key="Create">创建</msg>
+  <msg key="Create_a_new_element">创建新项目</msg>
+  <msg key="Create_Curriculum">创建课程</msg>
+  <msg key="Created">新建的</msg>
+  <msg key="Curriculum">课程：</msg>
+  <msg key="Curriculum_1">课程</msg>
+  <msg key="Curriculum_info">课程信息</msg>
+  <msg key="Curriculum_owner">课程owner</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="Description">描述</msg>
+  <msg key="Detailed_information">详细信息</msg>
+  <msg key="Disable">使不能</msg>
+  <msg key="Disabled">使不能的</msg>
+  <msg key="Drop">移除</msg>
+  <msg key="Dropped">已移除的</msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="Edited">已编辑的</msg>
+  <msg key="Editor">编辑器</msg>
+  <msg key="Enable">使能</msg>
+  <msg key="Enabled">使能的</msg>
+  <msg key="External_Element">外部项目</msg>
+  <msg key="Help">帮助</msg>
+  <msg key="Information">信息</msg>
+  <msg key="lt_A_leading_http_indica">以&quot;http://&quot;开头表示URL为外部链接。</msg>
+  <msg key="lt_action_pretty_past_te">%action_pretty_past_tense%用%user_name%: </msg>
+  <msg key="lt_Activate_this_element">激活此项目</msg>
+  <msg key="lt_Add_the_dropped_curri">将dropped课程加到工具条</msg>
+  <msg key="lt_Add_the_removed_curri">将removed课程加到工具条</msg>
+  <msg key="lt_Administer_Curriculum">管理课程</msg>
+  <msg key="lt_Administer_this_curri">管理此课程</msg>
+  <msg key="lt_Administer_this_eleme">管理此项目</msg>
+  <msg key="lt_Administer_user_privi">管理课程的用户权限</msg>
+  <msg key="lt_Are_you_sure_you_want">确认删除此课程吗？</msg>
+  <msg key="lt_Are_you_sure_you_want_1">确认删除此项目吗？</msg>
+  <msg key="lt_Back_to_ad_urlreturn_">回到%ad_url%%return_url%</msg>
+  <msg key="lt_Back_to_where_you_wer">返回你原来的位置</msg>
+  <msg key="lt_Create_a_new_curricul">创建新课程</msg>
+  <msg key="lt_Deactivate_this_eleme">取消此项的活动状态</msg>
+  <msg key="lt_Delete_this_curriculu">删除此课程及其所有数据</msg>
+  <msg key="lt_Delete_this_element_a">删除此项及其所有数据</msg>
+  <msg key="lt_deleting_curriculum_c">删除%package_id%包中的课程%curriculum_id%</msg>
+  <msg key="lt_element_name_part_of_">%element_name%属于%curriculum_name%</msg>
+  <msg key="lt_Flush_element_cache">刷新项目缓冲</msg>
+  <msg key="lt_Installing_curriculum">给%package_id%包中的%url_pattern%安装课程筛选</msg>
+  <msg key="lt_More_than_one_instanc">多次安装此课程</msg>
+  <msg key="lt_Name_may_not_be_more_">文件名长度不能超过%length%字符。</msg>
+  <msg key="lt_No_published_curricul">没有发布的课程</msg>
+  <msg key="lt_Please_delete_the_ext">请删除acs-subsite或dotlrn的课程包中多余的示例。课程只能被安装一次。请访问&lt;a href=&quot;/admin/site-map/&quot;&gt;站点导航&lt;/a&gt;，卸载多余示例，或单击&lt;a href=&quot;%delete_url%&quot;&gt;这里&lt;/a&gt;直接删除示例。 </msg>
+  <msg key="lt_Read_the_user_manual_">阅读与本页有关的用户手册。</msg>
+  <msg key="lt_Remove_all_curriculum">删除所有的课程</msg>
+  <msg key="lt_Remove_the_curriculum">从工具条中删除课程</msg>
+  <msg key="lt_Request_notifications">课程活动状态的请求通知</msg>
+  <msg key="lt_Reset_all_curriculums">重置所有课程</msg>
+  <msg key="lt_Set_site-wide_prefere">设置课程的站点参数</msg>
+  <msg key="lt_Show_curriculums_in_p">显示发布状态下的课程：</msg>
+  <msg key="lt_Stop_displaying_the_c">停止显示课程工具条</msg>
+  <msg key="lt_This_field_is_for_com">此区域用于课程的评论操作。</msg>
+  <msg key="lt_This_text_should_desc">此文本描述课程及用途。</msg>
+  <msg key="lt_This_text_should_desc_1">此文本描述项目及用途。</msg>
+  <msg key="lt_Uncheck_the_visited_e">取消选择所有课程中访问过的项目</msg>
+  <msg key="lt_Uncheck_the_visited_e_1">取消选择访问过的项目</msg>
+  <msg key="lt_Unsubscribe_to_notifi">取消订阅课程活动状态的通知</msg>
+  <msg key="lt_URL_may_not_be_more_t">URL不能多于%length%个字符。</msg>
+  <msg key="lt_user_id_doesnt_have_p">%user_id%没有'%action%'课程%curriculum_id%的权利</msg>
+  <msg key="lt_Visit_this_element_ag">再次访问此项</msg>
+  <msg key="lt_You_dont_have_permiss">你没有'%action%'此课程的权利。</msg>
+  <msg key="more">更多</msg>
+  <msg key="Move">移动</msg>
+  <msg key="Move_down">向下移动</msg>
+  <msg key="Move_up">向上移动</msg>
+  <msg key="Name">名称</msg>
+  <msg key="No_curriculums">没有课程</msg>
+  <msg key="No_elements">没有项目</msg>
+  <msg key="Ongoing">正在进行</msg>
+  <msg key="Options">选项</msg>
+  <msg key="Owner">Owner</msg>
+  <msg key="Package_parameters">包参数</msg>
+  <msg key="Package_permissions">包许可</msg>
+  <msg key="Pending">待定</msg>
+  <msg key="Publish">发布</msg>
+  <msg key="Published">已发布的</msg>
+  <msg key="Publisher">发布人</msg>
+  <msg key="Reject">拒绝</msg>
+  <msg key="Rejected">被拒绝的</msg>
+  <msg key="Remove">移除</msg>
+  <msg key="Remove_this_frame">移除此框架</msg>
+  <msg key="Removed">已移除的</msg>
+  <msg key="Reset">重置</msg>
+  <msg key="Resume">恢复</msg>
+  <msg key="Retake">找回</msg>
+  <msg key="Revisit">再次访问</msg>
+  <msg key="Search">搜索……</msg>
+  <msg key="Security_Violation">许可被拒绝</msg>
+  <msg key="State">状态</msg>
+  <msg key="Status">状态</msg>
+  <msg key="Stop_watching">停止查看</msg>
+  <msg key="this_curriculum">此课程</msg>
+  <msg key="Unvisited">未被访问过</msg>
+  <msg key="URL">URL </msg>
+  <msg key="View">查看</msg>
+  <msg key="Visit">访问</msg>
+  <msg key="Visit_this_element">访问此项目</msg>
+  <msg key="Visited">访问过的</msg>
+  <msg key="Watch">查看</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.da_DK.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.es_ES.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.it_IT.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/curriculum/catalog/curriculum.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/catalog/curriculum.nl_NL.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/curriculum/catalog/curriculum.nl_NL.ISO-8859-1.xml	23 Oct 2003 08:37:04 -0000	1.2
+++ openacs-4/packages/curriculum/catalog/curriculum.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:08 -0000	1.3
@@ -1,121 +1,123 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="curriculum" package_version="0.5d1" locale="nl_NL" charset="ISO-8859-1">
 
-  <msg key="Action_Log">Actielogboek</msg>
+  <msg key="Action_Log">Actie Journaal</msg>
   <msg key="Actions">Acties</msg>
-  <msg key="Add_a_curriculum">Voeg een curriculum toe</msg>
-  <msg key="Add_an_element">Voeg een element toe</msg>
-  <msg key="Add_Element">Element toevoegen</msg>
-  <msg key="Any">Eender</msg>
-  <msg key="Archive">Archief</msg>
+  <msg key="Add_a_curriculum">Een leerplan toevoegen</msg>
+  <msg key="Add_an_element">Een onderdeel toevoegen</msg>
+  <msg key="Add_Element">Onderdeel toevoegen</msg>
+  <msg key="Any">Ieder</msg>
+  <msg key="Archive">Archiveren</msg>
   <msg key="Archived">Gearchiveerd</msg>
   <msg key="Assign">Toewijzen</msg>
   <msg key="Assigned">Toegewezen</msg>
   <msg key="Author">Auteur</msg>
   <msg key="Comment">Opmerking</msg>
-  <msg key="Commented">Met opmerking</msg>
+  <msg key="Commented">Becommentarieerd</msg>
   <msg key="Complete_description">Volledige beschrijving</msg>
-  <msg key="Completed">Afgerond</msg>
+  <msg key="Completed">Volbracht</msg>
   <msg key="Create">Aanmaken</msg>
-  <msg key="Create_a_new_element">Nieuw element aanmaken</msg>
-  <msg key="Create_Curriculum">Nieuw curriculum aanmaken</msg>
+  <msg key="Create_a_new_element">Aanmaken van een nieuw onderdeel</msg>
+  <msg key="Create_Curriculum">Aanmaken leerplan</msg>
   <msg key="Created">Aangemaakt</msg>
-  <msg key="Curriculum">Curriculum</msg>
-  <msg key="Curriculum_1">Curriculum</msg>
-  <msg key="Curriculum_info">Curriculum info</msg>
-  <msg key="Curriculum_owner">Eigenaar curriculum</msg>
+  <msg key="Curriculum">Leerplan:</msg>
+  <msg key="Curriculum_1">Leerplan</msg>
+  <msg key="Curriculum_info">Leerplan informatie</msg>
+  <msg key="Curriculum_owner">Leerplan samensteller</msg>
   <msg key="Delete">Verwijderen</msg>
   <msg key="Description">Beschrijving</msg>
-  <msg key="Detailed_information">Gedetaileerde informatie</msg>
-  <msg key="Disable">Uitschakelen</msg>
-  <msg key="Disabled">Uitgeschakeld</msg>
-  <msg key="Drop">Laten afvallen</msg>
-  <msg key="Dropped">Is afgevallen</msg>
-  <msg key="Edit">Wijzigen</msg>
-  <msg key="Edited">Gewijzigd</msg>
-  <msg key="Editor">Redacteur</msg>
-  <msg key="Enable">Inschakelen</msg>
-  <msg key="Enabled">Ingeschakeld</msg>
-  <msg key="External_Element">Extern element</msg>
-  <msg key="Help">Help</msg>
+  <msg key="Detailed_information">Uitgebreide informatie</msg>
+  <msg key="Disable">Onbruikbaar maken</msg>
+  <msg key="Disabled">Onbruikbaar gemaakt</msg>
+  <msg key="Drop">Laten vervallen</msg>
+  <msg key="Dropped">Vervallen</msg>
+  <msg key="Edit">Bewerken</msg>
+  <msg key="Edited">Bewerkt</msg>
+  <msg key="Editor">Bewerker</msg>
+  <msg key="Enable">Bruikbaar maken</msg>
+  <msg key="Enabled">Bruikbaar</msg>
+  <msg key="External_Element">Extern Onderdeel</msg>
+  <msg key="Help">Hulp</msg>
   <msg key="Information">Informatie</msg>
-  <msg key="lt_A_leading_http_indica">Een &quot;http://&quot; prefix geeft aan dat de URL exterm is</msg>
+  <msg key="lt_A_leading_http_indica">Als een URL begint met &quot;http://&quot; betekent dit dat deze extern is.</msg>
   <msg key="lt_action_pretty_past_te">%action_pretty_past_tense% door %user_name%: </msg>
-  <msg key="lt_Activate_this_element">Activeer dit element</msg>
-  <msg key="lt_Add_the_dropped_curri">Voeg het afgevallen curriculum aan de werkbalk toe</msg>
-  <msg key="lt_Add_the_removed_curri">Voeg het verwijderd curriculum aan de werkbalk toe</msg>
-  <msg key="lt_Administer_Curriculum">Curricilum beheeren</msg>
-  <msg key="lt_Administer_this_curri">Beheer dit curriculum</msg>
-  <msg key="lt_Administer_this_eleme">Beheer dit element</msg>
-  <msg key="lt_Administer_user_privi">Beheer gebruikersprivileges voor deze curriculuminstantie</msg>
-  <msg key="lt_Are_you_sure_you_want">Wil je dit curriculum echt verwijderen?</msg>
-  <msg key="lt_Are_you_sure_you_want_1">Wil je dit element echt verwijderen?</msg>
+  <msg key="lt_Activate_this_element">Activeer dit onderdeel</msg>
+  <msg key="lt_Add_the_dropped_curri">Voeg het vervallen leerplan aan de werkbalk toe</msg>
+  <msg key="lt_Add_the_removed_curri">Voeg het verwijderde leerplan aan de werkbalk toe</msg>
+  <msg key="lt_Administer_Curriculum">Beheer leerplan</msg>
+  <msg key="lt_Administer_this_curri">Beheer dit leerplan</msg>
+  <msg key="lt_Administer_this_eleme">Beheer dit onderdeel</msg>
+  <msg key="lt_Administer_user_privi">Beheer gebruikersprivileges voor deze leerplan installatie</msg>
+  <msg key="lt_Are_you_sure_you_want">Weet u zeker dat u dit leerplan wilt verwijderen?</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Weet u zeker dat u dit onderdeel wilt verwijderen?</msg>
   <msg key="lt_Back_to_ad_urlreturn_">Terug naar %ad_url%%return_url% </msg>
-  <msg key="lt_Back_to_where_you_wer">Terug naar waar je vandaan kwam</msg>
-  <msg key="lt_Create_a_new_curricul">Maak een nieuw curriculum aan</msg>
-  <msg key="lt_Deactivate_this_eleme">Deactiveer dit element</msg>
-  <msg key="lt_Delete_this_curriculu">Verwijder dit curriculum en al zijn data</msg>
-  <msg key="lt_Delete_this_element_a">Verwijder dit element en al zijn data</msg>
-  <msg key="lt_deleting_curriculum_c">%curriculum_id% in package_id %package_id% wordt verwijderd</msg>
-  <msg key="lt_element_name_part_of_">%element_name%, deel van %curriculum_name% </msg>
-  <msg key="lt_Flush_element_cache">Elementcache leegmaken</msg>
-  <msg key="lt_Installing_curriculum">Curriculumfilter toevoegen aan %url_pattern% in package_id %package_id% </msg>
-  <msg key="lt_Name_may_not_be_more_">Naam mag niet langer dan %length% tekens lang zijn</msg>
-  <msg key="lt_No_published_curricul">Geen gepubliceerde curriculums</msg>
-  <msg key="lt_Read_the_user_manual_">Lees de handleiding van deze bladzijde</msg>
-  <msg key="lt_Remove_all_curriculum">Verwijder alle curriculums</msg>
-  <msg key="lt_Remove_the_curriculum">Verwijder dit  curriculum uit de werkbalk</msg>
-  <msg key="lt_Request_notifications">Vraag berichtmeldingen aan voor activiteiten op dit curriculum</msg>
-  <msg key="lt_Reset_all_curriculums">Stel alle curriculums opnieuw in</msg>
-  <msg key="lt_Set_site-wide_prefere">Stel sitebrede instellingen in voor deze curriculuminstantie</msg>
-  <msg key="lt_Show_curriculums_in_p">Toon curriculums in publicatiestaat</msg>
-  <msg key="lt_Stop_displaying_the_c">Stop met het weergeven van de curriculumwerkbalk</msg>
-  <msg key="lt_This_field_is_for_com">De veld is voor opmerkingsacties op het curriculum.</msg>
-  <msg key="lt_This_text_should_desc">Deze tekst zou een beschrijving over het curriculum en het doel daarvan moeten geven.</msg>
-  <msg key="lt_This_text_should_desc_1">Deze tekst moet het element en het doel daarvan beschrijven.</msg>
-  <msg key="lt_Uncheck_the_visited_e">Deselecteer de bezochte elementen in alle curriculums</msg>
-  <msg key="lt_Uncheck_the_visited_e_1">Deselecteer de bezochte elementen</msg>
-  <msg key="lt_Unsubscribe_to_notifi">Meld je af voor berichtmeldingen voor activiteiten op dit forum</msg>
-  <msg key="lt_URL_may_not_be_more_t">URL mag niet langen dan %length% tekens lang zijn</msg>
-  <msg key="lt_user_id_doesnt_have_p">%user-id% heeft geen rechten om %action% uit te voeren op %curriculum_id%.</msg>
-  <msg key="lt_Visit_this_element_ag">Bezoek dit element nogmaals</msg>
-  <msg key="lt_You_dont_have_permiss">Je hebt geen rechten op %action% uit te voeren op dit curriculum.</msg>
+  <msg key="lt_Back_to_where_you_wer">Terug naar vertrekpunt</msg>
+  <msg key="lt_Create_a_new_curricul">Aanmaken nieuw leerplan</msg>
+  <msg key="lt_Deactivate_this_eleme">Deactiveer dit onderdeel</msg>
+  <msg key="lt_Delete_this_curriculu">Verwijder dit leerplan en alle bijbehorende data</msg>
+  <msg key="lt_Delete_this_element_a">Verwijder dit onderdeel en alle bijbehorende data</msg>
+  <msg key="lt_deleting_curriculum_c">Leerplan %curriculum_id% van package_id %package_id% wordt verwijderd</msg>
+  <msg key="lt_element_name_part_of_">%element_name%, onderdeel van %curriculum_name% </msg>
+  <msg key="lt_Flush_element_cache">Reinig interne informatie van dit onderdeel </msg>
+  <msg key="lt_Installing_curriculum">Leerplan filter voor %url_pattern% van package_id %package_id% wordt geinstalleerd</msg>
+  <msg key="lt_More_than_one_instanc">Dit programmaonderdeel is meer dan eens geinstalleerd.</msg>
+  <msg key="lt_Name_may_not_be_more_">Een naam mag niet meer dan %length% karakters lang zijn</msg>
+  <msg key="lt_No_published_curricul">Geen openbare leerplannen</msg>
+  <msg key="lt_Please_delete_the_ext">Verwijder de extra installaties van dit Leerplan (Curriculum)-pakket in deze subsite van de dotLRN installatie. Leerplan is gemaakt om slechts eenmaal hieronder te worden geinstalleerd. Bezoek de &lt;a href=&quot;/admin/site-map/&quot;&gt;Site-Map&lt;/a&gt; om te de�nstalleren of klik &lt;a href=&quot;%delete_url%&quot;&gt;hier&lt;/a&gt; om direct te verwijderen. </msg>
+  <msg key="lt_Read_the_user_manual_">Lees de gebruikershandleiding van deze pagina</msg>
+  <msg key="lt_Remove_all_curriculum">Verwijder alle leerplannen</msg>
+  <msg key="lt_Remove_the_curriculum">Verwijder het leerplan van de werkbalk</msg>
+  <msg key="lt_Request_notifications">Verzoek om kennisgeving bij veranderingen rondom dit leerplan</msg>
+  <msg key="lt_Reset_all_curriculums">Herstel instellingen voor alle leerplannen</msg>
+  <msg key="lt_Set_site-wide_prefere">Stel systeem voorkeuren in voor deze Leerplan installatie </msg>
+  <msg key="lt_Show_curriculums_in_p">Toon leerplannen die openbaar zijn:</msg>
+  <msg key="lt_Stop_displaying_the_c">Toon de leerplanwerkbalk niet</msg>
+  <msg key="lt_This_field_is_for_com">Dit veld is voor opmerkingen bij acties in dit leerplan.</msg>
+  <msg key="lt_This_text_should_desc">Deze tekst moet het leerplan en het doel beschrijven.</msg>
+  <msg key="lt_This_text_should_desc_1">Deze tekst moet het onderdeel en het doel beschrijven.</msg>
+  <msg key="lt_Uncheck_the_visited_e">Deselecteer bezochte onderdelen in alle leerplannen</msg>
+  <msg key="lt_Uncheck_the_visited_e_1">Deselecteer alle bezochte onderdelen</msg>
+  <msg key="lt_Unsubscribe_to_notifi">Opzeggen van verzoek om kennisgiving voor acties in de leerplan</msg>
+  <msg key="lt_URL_may_not_be_more_t">De URL mag niet langer dan %length% karakters zijn.</msg>
+  <msg key="lt_user_id_doesnt_have_p">%user_id% heeft geen toestemming voor '%action%' in leerplan %curriculum_id% </msg>
+  <msg key="lt_Visit_this_element_ag">Bezoek dit onderdeel opnieuw</msg>
+  <msg key="lt_You_dont_have_permiss">Er is geen toestemming voor '%action%' in dit leerplan.</msg>
   <msg key="more">meer</msg>
-  <msg key="Move">Verplaatsen</msg>
-  <msg key="Move_down">Omlaag verplaatsen</msg>
-  <msg key="Move_up">Omhoog verplaatsen</msg>
+  <msg key="Move">Verplaats</msg>
+  <msg key="Move_down">Verplaats naar beneden</msg>
+  <msg key="Move_up">Verplaats naar boven</msg>
   <msg key="Name">Naam</msg>
-  <msg key="No_curriculums">Geen curriculums</msg>
-  <msg key="No_elements">Geen elementen</msg>
+  <msg key="No_curriculums">Geen leerplannen</msg>
+  <msg key="No_elements">Geen onderdelen</msg>
   <msg key="Ongoing">Lopend</msg>
   <msg key="Options">Opties</msg>
-  <msg key="Owner">Eigenaar</msg>
-  <msg key="Package_parameters">Pakketparameters</msg>
-  <msg key="Package_permissions">Pakketrechten</msg>
-  <msg key="Pending">Lopend</msg>
-  <msg key="Publish">Publiceren</msg>
-  <msg key="Published">Gepubliceerd</msg>
-  <msg key="Publisher">Uitgever</msg>
-  <msg key="Reject">Verwerpen</msg>
-  <msg key="Rejected">Verworpen</msg>
+  <msg key="Owner">Samensteller</msg>
+  <msg key="Package_parameters">Pakket Instellingen</msg>
+  <msg key="Package_permissions">Pakket Permissies</msg>
+  <msg key="Pending">In afwachting van</msg>
+  <msg key="Publish">Openbaar maken</msg>
+  <msg key="Published">Openbaar gemaakt</msg>
+  <msg key="Publisher">Eindverantwoordelijke</msg>
+  <msg key="Reject">Afwijzen</msg>
+  <msg key="Rejected">Afgewezen</msg>
   <msg key="Remove">Verwijderen</msg>
   <msg key="Remove_this_frame">Verwijder dit frame</msg>
   <msg key="Removed">Verwijderd</msg>
-  <msg key="Reset">Opnieuw instellen</msg>
-  <msg key="Resume">Vervolgen</msg>
-  <msg key="Retake">Hernemen</msg>
-  <msg key="Revisit">Herbezoeken</msg>
+  <msg key="Reset">Herstellen</msg>
+  <msg key="Resume">Hervatten</msg>
+  <msg key="Retake">Overdoen</msg>
+  <msg key="Revisit">Herhalen</msg>
   <msg key="Search">Zoeken...</msg>
-  <msg key="Security_Violation">Toestemming geweigerd</msg>
-  <msg key="State">Staat</msg>
+  <msg key="Security_Violation">Toegang geweigerd</msg>
+  <msg key="State">Toestand</msg>
   <msg key="Status">Status</msg>
-  <msg key="Stop_watching">Stop met volgen</msg>
-  <msg key="this_curriculum">dit curriculum</msg>
-  <msg key="Unvisited">Nog niet bezocht</msg>
+  <msg key="Stop_watching">Stop het in de gaten houden</msg>
+  <msg key="this_curriculum">dit leerplan</msg>
+  <msg key="Unvisited">Niet bezocht</msg>
   <msg key="URL">URL</msg>
-  <msg key="View">Bekijken</msg>
-  <msg key="Visit">Bezoeken</msg>
-  <msg key="Visit_this_element">Bezoek dit element</msg>
+  <msg key="View">Overzicht</msg>
+  <msg key="Visit">Bezoek</msg>
+  <msg key="Visit_this_element">Bezoek dit onderdeel</msg>
   <msg key="Visited">Bezocht</msg>
-  <msg key="Watch">Bekijken</msg>
+  <msg key="Watch">In de gaten houden</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/curriculum/catalog/curriculum.pt_BR.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/sql/postgresql/upgrade/upgrade-1.3-1.5.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/edit-this-page/sql/postgresql/upgrade/upgrade-1.4-1.5.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/faq/catalog/faq.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/faq/catalog/faq.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/catalog/faq.ch_zh.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/faq/catalog/faq.ch_zh.utf-8.xml	26 Feb 2004 15:29:11 -0000	1.2
@@ -1,8 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="faq" package_version="4.6" locale="ch_zh" charset="utf-8">
 
-  <msg key="Edit">園辞</msg>
-  <msg key="edit">園辞</msg>
-  <msg key="New">仟議</msg>
-  <msg key="Title">炎籾:</msg>
+  <msg key="A">问题：</msg>
+  <msg key="Add_QA_for_faq_name">向%faq_name%添加问题与解答</msg>
+  <msg key="administer">管理</msg>
+  <msg key="Answer">解答</msg>
+  <msg key="Back_to_FAQs">返回FAQs</msg>
+  <msg key="Create_a_new_FAQ">创建新FAQ</msg>
+  <msg key="Create_an_FAQ">创建FAQ</msg>
+  <msg key="Create_FAQ">创建FAQ</msg>
+  <msg key="Create_New_QA">创建新问题与解答</msg>
+  <msg key="Create_new_QA">创建新问题与解答</msg>
+  <msg key="Create_QA">创建问题与解答</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="delete">删除</msg>
+  <msg key="Delete_This_QA">删除此问题与解答</msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="edit">编辑</msg>
+  <msg key="Edit_an_FAQ">编辑FAQ</msg>
+  <msg key="FAQ_Admin">FAQ管理</msg>
+  <msg key="faq_name_Admin">%faq_name%管理</msg>
+  <msg key="FAQs">FAQ</msg>
+  <msg key="HTML">HTML</msg>
+  <msg key="insert_after">插入</msg>
+  <msg key="lt_Are_you_sure_you_want">确认删除此FAQ吗？</msg>
+  <msg key="lt_Are_you_sure_you_want_1">确认删除此问题吗？</msg>
+  <msg key="lt_no_FAQs">没有FAQ。</msg>
+  <msg key="lt_no_questions">没有问题。</msg>
+  <msg key="Name">名称：</msg>
+  <msg key="New">新的</msg>
+  <msg key="No">不是</msg>
+  <msg key="One_Question">一个问题</msg>
+  <msg key="Plain">普通的</msg>
+  <msg key="Preformatted">预格式化的</msg>
+  <msg key="preview">预览</msg>
+  <msg key="Q">解答：</msg>
+  <msg key="QA_On_Separate_Pages">问题与解答分页显示吗？</msg>
+  <msg key="QA_on_Separate_Pages">问题与解答分页显示吗？</msg>
+  <msg key="Question">问题</msg>
+  <msg key="swap_with_next">同下一个交换</msg>
+  <msg key="Text_type">文本类型？</msg>
+  <msg key="Title">标题：</msg>
+  <msg key="Update_FAQ">更新FAQ</msg>
+  <msg key="Update_This_QA">更新此问题与解答</msg>
+  <msg key="View_All_FAQs">浏览所有FAQ</msg>
+  <msg key="Yes">是</msg>
 </message_catalog>
Index: openacs-4/packages/faq/catalog/faq.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.da_DK.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/faq/catalog/faq.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.11
+++ openacs-4/packages/faq/catalog/faq.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.12
@@ -2,28 +2,28 @@
 <message_catalog package_key="faq" package_version="4.6" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="A">Svar:</msg>
-  <msg key="Add_QA_for_faq_name">Lav sp�rgsm�l og svar for %faq_name%�</msg>
+  <msg key="Add_QA_for_faq_name">Opret sp�rgsm�l og svar til %faq_name%</msg>
   <msg key="administer">administrer</msg>
   <msg key="Answer">Svar</msg>
   <msg key="Back_to_FAQs">Tilbage til FAQ'er</msg>
-  <msg key="Create_a_new_FAQ">Lav en ny FAQ</msg>
-  <msg key="Create_an_FAQ">Lav en FAQ</msg>
-  <msg key="Create_FAQ">Lav FAQ</msg>
-  <msg key="Create_New_QA">Lav ny sp�rgsm�l og svar</msg>
-  <msg key="Create_new_QA">Lav ny sp�rgsm�l og svar</msg>
-  <msg key="Create_QA">Lav sp�rgsm�l og svar</msg>
+  <msg key="Create_a_new_FAQ">Opret en ny FAQ</msg>
+  <msg key="Create_an_FAQ">Opret en FAQ</msg>
+  <msg key="Create_FAQ">Opret FAQ</msg>
+  <msg key="Create_New_QA">Opret nyt sp�rgsm�l og svar</msg>
+  <msg key="Create_new_QA">Opret nyt sp�rgsm�l og svar</msg>
+  <msg key="Create_QA">Opret sp�rgsm�l og svar</msg>
   <msg key="Delete">Slet</msg>
   <msg key="delete">slet</msg>
   <msg key="Delete_This_QA">Slet dette sp�rgsm�l og svar</msg>
-  <msg key="Edit">Rediger</msg>
+  <msg key="Edit">Redig�r</msg>
   <msg key="edit">rediger</msg>
   <msg key="Edit_an_FAQ">Rediger en FAQ</msg>
   <msg key="FAQ_Admin">FAQ Administration</msg>
   <msg key="faq_name_Admin">%faq_name% administration</msg>
   <msg key="FAQs">FAQ'er</msg>
   <msg key="HTML">HTML</msg>
   <msg key="insert_after">inds�t efter</msg>
-  <msg key="lt_Are_you_sure_you_want">Er du sikker p�, at du �nsker at slette denne FAQ?</msg>
+  <msg key="lt_Are_you_sure_you_want">Er du sikker p� at du �nsker at slette denne FAQ?</msg>
   <msg key="lt_Are_you_sure_you_want_1">Er du sikker p�, at du �nsker at slette dette sp�rgsm�l?</msg>
   <msg key="lt_no_FAQs">Der er ingen FAQ'er.</msg>
   <msg key="lt_no_questions">Ingen sp�rgsm�l.</msg>
@@ -32,8 +32,8 @@
   <msg key="No">Nej</msg>
   <msg key="One_Question">Et sp�rgsm�l</msg>
   <msg key="Plain">Almindelig</msg>
-  <msg key="Preformatted">Forformatteret</msg>
-  <msg key="preview">forpremiere</msg>
+  <msg key="Preformatted">Pr�formatteret</msg>
+  <msg key="preview">vis</msg>
   <msg key="Q">Sp�rgsm�l:</msg>
   <msg key="QA_On_Separate_Pages">Sp�rgsm�l og svar p� hver sin side?</msg>
   <msg key="QA_on_Separate_Pages">Sp�rgsm�l og svar p� hver sin side?</msg>
Index: openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.7
+++ openacs-4/packages/faq/catalog/faq.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.8
@@ -3,7 +3,7 @@
 
   <msg key="A">A:</msg>
   <msg key="Add_QA_for_faq_name">F&amp;A f�r %faq_name% hinzuf�gen </msg>
-  <msg key="administer">administrieren</msg>
+  <msg key="administer">Verwalten</msg>
   <msg key="Answer">Antwort</msg>
   <msg key="Back_to_FAQs">Zur�ck zu FAQs</msg>
   <msg key="Create_a_new_FAQ">Neues FAQ erstellen</msg>
@@ -17,22 +17,22 @@
   <msg key="Delete_This_QA">Diese F&amp;A l�schen</msg>
   <msg key="Edit">Bearbeiten</msg>
   <msg key="edit">Bearbeiten</msg>
-  <msg key="Edit_an_FAQ">Ein FAQ editieren</msg>
-  <msg key="FAQ_Admin">FAQ Administration</msg>
-  <msg key="faq_name_Admin">%faq_name% Administration</msg>
+  <msg key="Edit_an_FAQ">Ein FAQ bearbeiten</msg>
+  <msg key="FAQ_Admin">FAQs verwalten</msg>
+  <msg key="faq_name_Admin">%faq_name% verwalten</msg>
   <msg key="FAQs">FAQs</msg>
   <msg key="HTML">HTML</msg>
   <msg key="insert_after">Hier neue F&amp;A einf�gen</msg>
   <msg key="lt_Are_you_sure_you_want">Wollen Sie dieses FAQ wirklich l�schen?</msg>
   <msg key="lt_Are_you_sure_you_want_1">Wollen Sie diese Frage wirklich l�schen?</msg>
-  <msg key="lt_no_FAQs">Es sind keine FAQs verf�gbar.</msg>
-  <msg key="lt_no_questions">Es sind keine Fragen verf�gbar.</msg>
+  <msg key="lt_no_FAQs">Keine FAQs vorhanden</msg>
+  <msg key="lt_no_questions">Keine Fragen vorhanden</msg>
   <msg key="Name">Titel:</msg>
   <msg key="New">Neue F&amp;A hinzuf�gen</msg>
   <msg key="No">Nein</msg>
   <msg key="One_Question">Eine Frage</msg>
-  <msg key="Plain">Einfach</msg>
-  <msg key="Preformatted">Vorformatiert</msg>
+  <msg key="Plain">Einfacher Text</msg>
+  <msg key="Preformatted">Vorformatierter Text</msg>
   <msg key="preview">Vorschau</msg>
   <msg key="Q">F:</msg>
   <msg key="QA_On_Separate_Pages">F&amp;A auf getrennten Seiten?</msg>
Index: openacs-4/packages/faq/catalog/faq.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/Attic/faq.ms_my.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/catalog/faq.ms_my.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/faq/catalog/faq.ms_my.utf-8.xml	26 Feb 2004 15:29:11 -0000	1.2
@@ -3,19 +3,19 @@
 
   <msg key="A">J:</msg>
   <msg key="Add_QA_for_faq_name">Tambah Soal-Jawab untuk %faq_name%</msg>
-  <msg key="administer">menyelia</msg>
-  <msg key="Answer">Jawab</msg>
+  <msg key="administer">tadbir</msg>
+  <msg key="Answer">Jawapan</msg>
   <msg key="Back_to_FAQs">Kembali ke senarai FAQ</msg>
   <msg key="Create_a_new_FAQ">Hasilkan FAQ baru</msg>
   <msg key="Create_an_FAQ">Hasilkan satu FAQ</msg>
   <msg key="Create_FAQ">Hasilkan FAQ</msg>
   <msg key="Create_New_QA">Hasilkan Soal-Jawab Baru</msg>
   <msg key="Create_new_QA">Hasilkan Soal-Jawab baru</msg>
   <msg key="Create_QA">Hasilkan Soal-Jawab</msg>
-  <msg key="Delete">Buang</msg>
-  <msg key="delete">buang</msg>
+  <msg key="Delete">Padam</msg>
+  <msg key="delete">padam</msg>
   <msg key="Delete_This_QA">buang Soal-Jawab ini</msg>
-  <msg key="Edit">Ubah</msg>
+  <msg key="Edit">Edit</msg>
   <msg key="edit">ubah</msg>
   <msg key="Edit_an_FAQ">Ubah satu FAQ</msg>
   <msg key="FAQ_Admin">Penyeliaan FAQ</msg>
Index: openacs-4/packages/faq/catalog/faq.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/catalog/faq.nl_NL.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq/catalog/faq.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:19 -0000	1.8
+++ openacs-4/packages/faq/catalog/faq.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.9
@@ -5,44 +5,44 @@
   <msg key="Add_QA_for_faq_name">Toevoegen Vraag&amp;Antwoord voor %faq_name% </msg>
   <msg key="administer">beheer</msg>
   <msg key="Answer">Antwoord</msg>
-  <msg key="Back_to_FAQs">Terug naar Frequente Vragen</msg>
-  <msg key="Create_a_new_FAQ">Aanmaken nieuwe Frequente Vraag</msg>
-  <msg key="Create_an_FAQ">Aanmaken Frequente Vraag</msg>
-  <msg key="Create_FAQ">Aanmaken Frequente Vraag</msg>
-  <msg key="Create_New_QA">Aanmaken nieuwe Vraag&amp;Antwoord</msg>
-  <msg key="Create_new_QA">Aanmaken nieuwe Vraag&amp;Antwoord</msg>
+  <msg key="Back_to_FAQs">Terug naar veelgestelde vragen</msg>
+  <msg key="Create_a_new_FAQ">Een nieuwe veelgestelde vraag (faq) aanmaken</msg>
+  <msg key="Create_an_FAQ">Een veelgestelde vraag (faq) aanmaken</msg>
+  <msg key="Create_FAQ">Veelgestelde vraag (faq) aanmaken</msg>
+  <msg key="Create_New_QA">Nieuwe Vraag&amp;Antwoord aanmaken</msg>
+  <msg key="Create_new_QA">Nieuwe Vraag&amp;Antwoord aanmaken</msg>
   <msg key="Create_QA">Aanmaken Vraag&amp;Antwoord</msg>
   <msg key="Delete">Verwijderen</msg>
   <msg key="delete">Verwijderen</msg>
   <msg key="Delete_This_QA">Verwijder Vraag&amp;Antwoord</msg>
   <msg key="Edit">Wijzig</msg>
   <msg key="edit">wijzig</msg>
-  <msg key="Edit_an_FAQ">Wijzig Frequente Vraag</msg>
-  <msg key="FAQ_Admin">Beheer Frequente Vragen </msg>
+  <msg key="Edit_an_FAQ">Wijzig een veelgestelde vraag</msg>
+  <msg key="FAQ_Admin">Veelgestelde vragen (faq) beheren</msg>
   <msg key="faq_name_Admin">Beheer %faq_name%</msg>
-  <msg key="FAQs">Frequente Vragen</msg>
+  <msg key="FAQs">Veelgestelde vragen (faqs)</msg>
   <msg key="HTML">HTML</msg>
-  <msg key="insert_after">tussenvoegen na</msg>
+  <msg key="insert_after">invoegen na</msg>
   <msg key="lt_Are_you_sure_you_want">Weet u zeker dat u deze Frequente Vraag wilt verwijderen?</msg>
   <msg key="lt_Are_you_sure_you_want_1">Weet u zeker dat u deze vraag wilt verwijderen?</msg>
-  <msg key="lt_no_FAQs">Er zijn geen Frequente Vragen beschikbaar.</msg>
+  <msg key="lt_no_FAQs">Er zijn geen veelgestelde vragen beschikbaar.</msg>
   <msg key="lt_no_questions">Er zijn geen vragen beschikbaar.</msg>
   <msg key="Name">Naam:</msg>
   <msg key="New">Nieuw</msg>
   <msg key="No">Nee</msg>
-  <msg key="One_Question">Een Vraag</msg>
+  <msg key="One_Question">E�n vraag</msg>
   <msg key="Plain">Zonder opmaak</msg>
   <msg key="Preformatted">Standaard opmaak</msg>
   <msg key="preview">voorvertoning</msg>
   <msg key="Q">V:</msg>
   <msg key="QA_On_Separate_Pages">Vraag&amp;Antwoord op verschillende pagina's?</msg>
   <msg key="QA_on_Separate_Pages">Vraag&amp;Antwoord op verschillende pagina's?</msg>
   <msg key="Question">Vraag</msg>
-  <msg key="swap_with_next">wissel met volgende</msg>
-  <msg key="Text_type">Type tekst?</msg>
+  <msg key="swap_with_next">wisselen met volgende</msg>
+  <msg key="Text_type">Soort tekst?</msg>
   <msg key="Title">Titel:</msg>
-  <msg key="Update_FAQ">Bijwerken Frequente Vraag</msg>
-  <msg key="Update_This_QA">Bijwerken Vraag&amp;Antwoord</msg>
-  <msg key="View_All_FAQs">Bekijk alle Frequente Vragen</msg>
+  <msg key="Update_FAQ">Veelgestelde vraag bijwerken</msg>
+  <msg key="Update_This_QA">Deze Vraag&amp;Antwoord bijwerken</msg>
+  <msg key="View_All_FAQs">Bekijk alle veelgestelde vragen (faqs)</msg>
   <msg key="Yes">Ja</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/catalog/file-storage.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/catalog/file-storage.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/catalog/file-storage.ch_zh.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/file-storage/catalog/file-storage.ch_zh.utf-8.xml	26 Feb 2004 15:29:11 -0000	1.2
@@ -1,16 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="file-storage" package_version="4.7d3" locale="ch_zh" charset="utf-8">
 
-  <msg key="Author">恬宀</msg>
-  <msg key="Copy">鹸崙</msg>
-  <msg key="Delete_this_folder">評茅猟周斜</msg>
-  <msg key="Description">傍苧 :</msg>
-  <msg key="Edit">園辞</msg>
-  <msg key="edit">園辞</msg>
-  <msg key="folder">猟周斜</msg>
-  <msg key="folder_type_pretty_name">猟周斜</msg>
-  <msg key="new">仟議</msg>
-  <msg key="Rename_this_folder">厚兆猟周斜</msg>
-  <msg key="Title">炎籾</msg>
-  <msg key="Title_">炎籾 :</msg>
+  <msg key="Action">动作</msg>
+  <msg key="Actions">动作：</msg>
+  <msg key="Actions_1">动作</msg>
+  <msg key="Add_File">添加文件</msg>
+  <msg key="Add_pretty_name">增加%pretty_name%</msg>
+  <msg key="Author">作者</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;返回&lt;/a&gt;浏览文件夹</msg>
+  <msg key="Change_Name">改变名称</msg>
+  <msg key="Copy">拷贝</msg>
+  <msg key="Create">创建</msg>
+  <msg key="Create_a_new_folder">创建新文件夹</msg>
+  <msg key="Create_a_URL">创建URL</msg>
+  <msg key="Create_New_Folder">创建新文件夹</msg>
+  <msg key="day">天</msg>
+  <msg key="days_as_new">天内更改的文件。</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="delete">删除</msg>
+  <msg key="Delete_this_folder">删除此文件夹</msg>
+  <msg key="Delete_Version">删除版本</msg>
+  <msg key="Description">描述</msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="edit">编辑</msg>
+  <msg key="Edit_Folder">编辑文件夹</msg>
+  <msg key="Edit_URL">编辑URL</msg>
+  <msg key="file">文件</msg>
+  <msg key="file_delete_page_title">删除%title%</msg>
+  <msg key="file_edit_page_title">给%title%重新命名</msg>
+  <msg key="file_edit_page_title_1">编辑%pretty_name%</msg>
+  <msg key="file_page_file_title_label">标题：%title%</msg>
+  <msg key="file_page_owner_label">Owner：</msg>
+  <msg key="folder">文件夹</msg>
+  <msg key="folder_delete_page_title">删除%folder_name%</msg>
+  <msg key="Folder_ID">Folder ID </msg>
+  <msg key="Folder_Name">文件夹名：</msg>
+  <msg key="folder_type_pretty_name">文件夹</msg>
+  <msg key="index_page_navigate_up_folder">到%up_name%</msg>
+  <msg key="item">项</msg>
+  <msg key="items">项</msg>
+  <msg key="Last_Modified">最新更改</msg>
+  <msg key="lt_administer_permission">管理许可</msg>
+  <msg key="lt_All_Versions_of_title">&quot;%title%&quot;的所有版本</msg>
+  <msg key="lt_Are_you_sure_that_you">确实要删除&quot;%title%&quot;的版本&quot;%version_name%&quot;吗？此动作是不可逆转的。</msg>
+  <msg key="lt_bad_folder_id_folder_">丢失folder id</msg>
+  <msg key="lt_Comments_on_this_file">评论此文件：</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty%字节 </msg>
+  <msg key="lt_delete_file">确实要删除文件&quot;%title%&quot;及其所有的版本吗？此动作是不可逆转的。</msg>
+  <msg key="lt_delete_folder">确实要删除文件夹&quot;%folder_name%&quot;及文件夹下所有内容吗？此动作是不可逆转的。</msg>
+  <msg key="lt_Delete_this_file_incl">删除此文件，包括所有版本</msg>
+  <msg key="lt_Download_an_archive_o">下载此文件夹下的所有存档文件</msg>
+  <msg key="lt_Either_there_is_alrea">已有一个名为&quot;%folder_name%&quot;的文件夹存在或多次点击按钮。用返回钮返回，选一个新名字，或&lt;a href=&quot;%directory_url%&quot;&gt;返回到目录列表&lt;/a&gt;，看文件夹是否在列表中。 </msg>
+  <msg key="lt_Folder_folder_name_is">文件夹%folder_name%为空。</msg>
+  <msg key="lt_It_appears_that_there">该文件夹中似乎已有一个同名文件存在。</msg>
+  <msg key="lt_Live_version_of_title">&quot;%title%&quot;的活动版本</msg>
+  <msg key="lt_Modify_permissions_on">修改文件许可</msg>
+  <msg key="lt_Modify_permissions_on_1">修改该文件夹许可</msg>
+  <msg key="lt_Please_enter_the_new_">请输入新文件名：</msg>
+  <msg key="lt_Select_the_folder_tha">选择&quot;%file_name%&quot;拷贝的目标文件夹</msg>
+  <msg key="lt_Select_the_folder_tha_1">选择&quot;%file_name%&quot;移动的目标文件夹</msg>
+  <msg key="lt_Show_files_modified_i">显示</msg>
+  <msg key="lt_show_only_live_versio">仅显示活动的版本</msg>
+  <msg key="lt_The_folder_link_you_s">选择的文件夹%folder_link%中已包含了一个同名文件。</msg>
+  <msg key="lt_The_specified_file_is">指定的文件非法。</msg>
+  <msg key="lt_The_specified_folder_">指定的文件夹不存在。</msg>
+  <msg key="lt_The_specified_folder__1">指定的文件夹非法。</msg>
+  <msg key="lt_The_specified_parent_">指定的父文件夹非法。</msg>
+  <msg key="lt_There_are_no_versions">此文件没有版本信息</msg>
+  <msg key="lt_This_file_has_version">此文件有不允许你删除的版本，所以不能删除。</msg>
+  <msg key="lt_This_folder_contains_">此文件夹中含有不允许你删除的项，所以不能删除。</msg>
+  <msg key="lt_Use_the_Browse_button">使用“浏览……”钮找到文件，单击“打开”。</msg>
+  <msg key="lt_version_not_valid">指定的版本非法。</msg>
+  <msg key="lt_We_got_an_error_that_">请通知系统owner，发现了一个不明错误。</msg>
+  <msg key="lt_We_received_an_error_">收到来自数据库的错误信息。可能选择的文件夹已包含一个同名文件。</msg>
+  <msg key="lt_Were_sorry_but_at_the">对不起，不能删除非空文件夹。</msg>
+  <msg key="lt_You_may_not_delete_th">不可删除根文件夹。</msg>
+  <msg key="lt_You_probably_clicked_">可能多次点击“增加”钮。检查文件是否已装入了文件夹%folder_link%，或用“返回”钮返回，重新进入版本文件。</msg>
+  <msg key="lt_Your_file_is_larger_t">文件大于系统允许的最大文件大小（(%number_of_bytes%字节）</msg>
+  <msg key="lt_Your_file_is_larger_t_1">文件大于系统允许的最大文件大小（(%max_number_of_bytes%字节）</msg>
+  <msg key="lt_Your_search_on_query_">&quot;%query%&quot;搜索没有结果。</msg>
+  <msg key="lt_Your_search_on_query__1">&quot;%query%&quot;搜索到下述的文件：</msg>
+  <msg key="Modified">已更改的</msg>
+  <msg key="Move">移动</msg>
+  <msg key="Name">名称</msg>
+  <msg key="new">新！</msg>
+  <msg key="No_such_type">无此类型</msg>
+  <msg key="no_such_URL">无此URL</msg>
+  <msg key="Rename">重新命名</msg>
+  <msg key="Rename_this_folder">文件夹重新命名</msg>
+  <msg key="Save">保存</msg>
+  <msg key="Search">搜索</msg>
+  <msg key="Search_again">再次搜索：</msg>
+  <msg key="Search_Results">搜索结果</msg>
+  <msg key="show_all_versions">显示所有版本</msg>
+  <msg key="simple_add_page_title">创建%pretty_name%</msg>
+  <msg key="Size">数目</msg>
+  <msg key="Size_bytes">大小（字节）</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;注意:&lt;/strong&gt;此操作要用几分钟时间，请耐心等待。</msg>
+  <msg key="Title">标题：</msg>
+  <msg key="Title_">标题：</msg>
+  <msg key="Type">类型</msg>
+  <msg key="Update">更新</msg>
+  <msg key="Upload">上传</msg>
+  <msg key="Upload_a_file">上传文件</msg>
+  <msg key="Upload_a_new_version">上传新版本</msg>
+  <msg key="Upload_New_File">上传新文件</msg>
+  <msg key="Upload_New_Version">上传新版本</msg>
+  <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">上传%title%的新版本</msg>
+  <msg key="version_delete_page_title">删除%version_name%</msg>
+  <msg key="Version_filename">版本文件名</msg>
+  <msg key="Version_filename_">版本文件名：</msg>
+  <msg key="Version_filename_1">版本文件名：</msg>
+  <msg key="Version_Notes">版本信息</msg>
+  <msg key="Version_Notes_1">版本注意：</msg>
+  <msg key="view_details">查看详细信息</msg>
+  <msg key="Yes_Delete_It">是，删除。</msg>
 </message_catalog>
Index: openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml	11 Dec 2003 21:40:04 -0000	1.14
+++ openacs-4/packages/file-storage/catalog/file-storage.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.15
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="file-storage" package_version="5.0.0a2" locale="da_DK" charset="ISO-8859-1">
+<message_catalog package_key="file-storage" package_version="4.7d3" locale="da_DK" charset="ISO-8859-1">
 
   <msg key="Action">Handling</msg>
   <msg key="Actions">Handlinger:</msg>
   <msg key="Actions_1">Handlinger</msg>
   <msg key="Add_File">Tilf�j Fil</msg>
   <msg key="Add_pretty_name">Tilf�j %pretty_name%</msg>
   <msg key="Author">Forfatter</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Tilbage&lt;/a&gt; til mappevisning</msg>
   <msg key="Change_Name">�ndr Navn</msg>
   <msg key="Copy">Kopier</msg>
   <msg key="Create">Lav</msg>
@@ -25,27 +26,39 @@
   <msg key="Edit_Folder">Rediger Mappe</msg>
   <msg key="Edit_URL">Redig�r URL</msg>
   <msg key="file">file</msg>
+  <msg key="file_delete_page_title">Slet %title%</msg>
+  <msg key="file_edit_page_title">Omd�b %title%</msg>
+  <msg key="file_edit_page_title_1">Rediger %pretty_name%</msg>
+  <msg key="file_page_file_title_label">Titel: %title%</msg>
+  <msg key="file_page_owner_label">Ejer: %owner%</msg>
   <msg key="folder">mappe</msg>
+  <msg key="folder_delete_page_title">Slet %folder_name%</msg>
   <msg key="Folder_ID">Mappe ID</msg>
   <msg key="Folder_Name">Mappe Navn:</msg>
   <msg key="folder_type_pretty_name">folder</msg>
+  <msg key="index_page_navigate_up_folder">Op til %up_name%</msg>
   <msg key="item">objekt</msg>
   <msg key="items">objekter</msg>
   <msg key="Last_Modified">Senest �ndret</msg>
   <msg key="lt_administer_permission">administrer rettigheder</msg>
+  <msg key="lt_All_Versions_of_title">All versioner af &quot;%title%&quot;</msg>
   <msg key="lt_Are_you_sure_that_you">Er du sikker p�, at du �nsker at slette denne version &quot;%version_name%&quot; af &quot;%title%&quot;? Denne handling kan ikke fortrydes.</msg>
   <msg key="lt_bad_folder_id_folder_">manglende mappe id</msg>
+  <msg key="lt_Comments_on_this_file">Kommentarer til denne fil:</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% bytes</msg>
   <msg key="lt_delete_file">Er du sikker p� at du vil slette filen &quot;%title%&quot; og alle dens revisioner? Denne handling kan ikke fortrydes.</msg>
   <msg key="lt_delete_folder">Er du sikker p� at du vil slette mappen &quot;%folder_name%&quot; og alle de ting den indeholder? Denne handling kan ikke g�res om.</msg>
   <msg key="lt_Delete_this_file_incl">Slet denne fil (inklusiv alle versioner)</msg>
   <msg key="lt_Download_an_archive_o">Download et arkiv med indholdet af denne mappe.</msg>
   <msg key="lt_Either_there_is_alrea">Der er enten allerede en mappe med navnet &quot;%folder_name%&quot;, eller du har klikket p� knappen mere end �n gang. Du kan bruge Tilbage-knappen og v�lge et nyt navn, eller du kan &lt;a href=&quot;%directory_url%&quot;&gt;vende tilbage til mappeoversigten&lt;/a&gt; og se, om din mappe er oprettet d�r.</msg>
   <msg key="lt_Folder_folder_name_is">Mappen %folder_name% er tom</msg>
   <msg key="lt_It_appears_that_there">Der er allerede en fil med det navn i denne mappe. M�ske har du klikket to gange.</msg>
-  <msg key="lt_Leave_blank_for_linked_documents">Lad titel v�re blank hvis du uploader flere dokumenter med links imellem.</msg>
+  <msg key="lt_Live_version_of_title">Live version af &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">�ndr rettighedder for denne fil</msg>
   <msg key="lt_Modify_permissions_on_1">Rediger rettigheder p� denne mappe</msg>
   <msg key="lt_Please_enter_the_new_">Skriv venligst det nye navn for denne fil:</msg>
+  <msg key="lt_Select_the_folder_tha">V�lg den mappe du vil kopiere &quot;%file_name%&quot; til</msg>
+  <msg key="lt_Select_the_folder_tha_1">V�lg den mappe du vil flytte &quot;%file_name%&quot; ind under</msg>
   <msg key="lt_Show_files_modified_i">Vis filer �ndret indenfor de sidste</msg>
   <msg key="lt_show_only_live_versio">Vis kun seneste version</msg>
   <msg key="lt_The_folder_link_you_s">Den folder &quot;%folder_link%&quot; du har valgt indeholder allerede en fil med samme navn.</msg>
@@ -65,6 +78,8 @@
   <msg key="lt_You_probably_clicked_">Du har formentlig klikke p� tilf�j-knappen mere end en gang. Tjek hvis filen er ordentlig p� %folder_link% eller brug tilbage-knappen og genindtast versionsfilen.</msg>
   <msg key="lt_Your_file_is_larger_t">Din fil er st�rre end den maksimale filst�rrelse (%number_of_bytes% bytes).</msg>
   <msg key="lt_Your_file_is_larger_t_1">Din fil er st�rre en den maksimalt tilladte st�rrelse p� dette system (%max_number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_search_on_query_">Din s�gning p� &quot;%query%&quot; gav ikke nogen resultater.</msg>
+  <msg key="lt_Your_search_on_query__1">Din s�gning p� &quot;%query%&quot; gav f�lgende filer:</msg>
   <msg key="Modified">�ndret</msg>
   <msg key="Move">Flyt</msg>
   <msg key="Name">Navn</msg>
@@ -78,8 +93,10 @@
   <msg key="Search_again">S�g igen:</msg>
   <msg key="Search_Results">S�geresultater</msg>
   <msg key="show_all_versions">vis alle versioner</msg>
+  <msg key="simple_add_page_title">Opret %pretty_name%</msg>
   <msg key="Size">St�rrelse</msg>
   <msg key="Size_bytes">St�rrelse (bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Note:&lt;/strong&gt; Det kan tage et stykke tid, s� v�r t�lmodig.</msg>
   <msg key="Title">Titel:</msg>
   <msg key="Title_">Titel:</msg>
   <msg key="Type">Type</msg>
@@ -90,6 +107,8 @@
   <msg key="Upload_New_File">Upload Ny Fil</msg>
   <msg key="Upload_New_Version">Upload Ny Version</msg>
   <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">Upload en ny version af %title%</msg>
+  <msg key="version_delete_page_title">Slet %version_name%</msg>
   <msg key="Version_filename">Version filnavn</msg>
   <msg key="Version_filename_">Version filnavn:</msg>
   <msg key="Version_filename_1">Version filnavn:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.9
+++ openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.10
@@ -4,69 +4,83 @@
   <msg key="Action">Aktion</msg>
   <msg key="Actions">Aktionen:</msg>
   <msg key="Actions_1">Aktionen</msg>
-  <msg key="Add_File">Datei hinzuf�gen</msg>
+  <msg key="Add_File">Datei hochladen</msg>
   <msg key="Add_pretty_name">%pretty_name% hinzuf�gen</msg>
   <msg key="Author">Autor</msg>
-  <msg key="Change_Name">Namen �ndern
-</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Zur�ck&lt;/a&gt; zur Ordner�bersicht</msg>
+  <msg key="Change_Name">Umbenennen</msg>
   <msg key="Copy">Kopieren</msg>
   <msg key="Create">Erstellen</msg>
   <msg key="Create_a_new_folder">Neuen Ordner erstellen 
 </msg>
-  <msg key="Create_a_URL">URL hinzuf�gen</msg>
+  <msg key="Create_a_URL">Neue URL hinzuf�gen</msg>
   <msg key="Create_New_Folder">Neuen Ordner erstellen</msg>
   <msg key="day">Tag</msg>
-  <msg key="days_as_new">Tagen ge�ndert wurden, als neu anzeigen.</msg>
+  <msg key="days_as_new">Tagen ge�ndert wurden, als neu anzeigen</msg>
   <msg key="Delete">L�schen</msg>
   <msg key="delete">L�schen</msg>
   <msg key="Delete_this_folder">Diesen Ordner l�schen</msg>
   <msg key="Delete_Version">Version l�schen</msg>
   <msg key="Description">Kommentar:</msg>
   <msg key="Edit">Bearbeiten</msg>
-  <msg key="edit">Bearbeiten</msg>
+  <msg key="edit">Umbenennen</msg>
   <msg key="Edit_Folder">Ordner bearbeiten</msg>
   <msg key="Edit_URL">URL bearbeiten</msg>
   <msg key="file">Datei</msg>
+  <msg key="file_delete_page_title">%title% l�schen</msg>
+  <msg key="file_edit_page_title">%title% umbenennen</msg>
+  <msg key="file_edit_page_title_1">%pretty_name% bearbeiten</msg>
+  <msg key="file_page_file_title_label">Name: %title% </msg>
+  <msg key="file_page_owner_label">Besitzer: %owner%</msg>
   <msg key="folder">Ordner</msg>
-  <msg key="Folder_ID">Ordner ID</msg>
+  <msg key="folder_delete_page_title">%folder_name% l�schen</msg>
+  <msg key="Folder_ID">Ordner-ID</msg>
   <msg key="Folder_Name">Ordnername:</msg>
   <msg key="folder_type_pretty_name">Ordner</msg>
+  <msg key="index_page_navigate_up_folder">Eine Ebene nach oben zu %up_name%</msg>
   <msg key="item">Element</msg>
   <msg key="items">Elemente</msg>
   <msg key="Last_Modified">Zuletzt ge�ndert</msg>
   <msg key="lt_administer_permission">Zugriffsberechtigungen verwalten</msg>
+  <msg key="lt_All_Versions_of_title">Alle Versionen von &quot;%title%&quot;</msg>
   <msg key="lt_Are_you_sure_that_you">Wollen Sie die Version &quot;%version_name%&quot; von &quot;%title%&quot; unwiderruflich l�schen?</msg>
-  <msg key="lt_bad_folder_id_folder_">Fehlende Ordner-Identifikation</msg>
+  <msg key="lt_bad_folder_id_folder_">Fehlende Ordner-ID</msg>
+  <msg key="lt_Comments_on_this_file">Kommentare zu dieser Datei:</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% Bytes</msg>
   <msg key="lt_delete_file">Wollen Sie die Datei &quot;%title%&quot; mit allen Versionen unwiderruflich l�schen?</msg>
   <msg key="lt_delete_folder">Wollen Sie den Ordner &quot;%folder_name%&quot; und seinen gesamten Inhalt unwiderruflich l�schen?</msg>
   <msg key="lt_Delete_this_file_incl">Diese Datei mit allen Versionen l�schen </msg>
   <msg key="lt_Download_an_archive_o">Den Inhalt dieses Ordners als komprimierte Datei herunterladen</msg>
-  <msg key="lt_Either_there_is_alrea">Entweder gibt es den Ordner &quot;%folder_name%&quot; schon oder Sie haben mehrfach auf die Schaltfl�che geklickt-
-Sie k�nnen mit Schaltfl�che &quot;Zur�ck&quot; zur�ckkehren und einen anderen Namen w�hlen, oder &lt;a href=&quot;%directory_url%&quot;&gt;zur Verzeichnis-Liste zur�ckkehren&lt;/a&gt; um nachzuschauen ob der Ordner dort ist.</msg>
+  <msg key="lt_Either_there_is_alrea">Es ist bereits ein Ordner mit dem Namen &quot;%folder_name%&quot; vorhanden. M�glicherweise haben Sie mehrmals auf die Schaltfl�che 'Hochladen' geklickt. Gehen Sie entweder mit Hilfe des Browsers zur�ck und geben Sie einen neuen Namen ein oder gehen Sie &lt;a href=&quot;%directory_url%&quot;&gt;zur�ck zur Ordner�bersicht&lt;/a&gt;.</msg>
   <msg key="lt_Folder_folder_name_is">Der Ordner %folder_name% ist leer.</msg>
-  <msg key="lt_It_appears_that_there">Es ist bereits eine Datei mit diesem Namen im Ordner vorhanden.</msg>
+  <msg key="lt_It_appears_that_there">Es ist bereits eine Datei mit diesem Namen im Ordner vorhanden. M�glicherweise haben Sie mehrmals auf die Schaltfl�che 'Hochladen' geklickt.</msg>
+  <msg key="lt_Live_version_of_title">Aktuelle Version von '%title%'</msg>
   <msg key="lt_Modify_permissions_on">Zugriffsberechtigungen f�r diese Datei �ndern</msg>
   <msg key="lt_Modify_permissions_on_1">Zugriffsberechtigungen f�r diesen Ordner �ndern</msg>
-  <msg key="lt_Please_enter_the_new_">Bitte einen neuen Namen f�r diese Datei eingeben:</msg>
+  <msg key="lt_Please_enter_the_new_">Bitte geben Sie einen neuen Namen f�r diese Datei ein:</msg>
+  <msg key="lt_Select_the_folder_tha">W�hlen Sie den Ordner aus, in den Sie '%file_name%' kopieren wollen</msg>
+  <msg key="lt_Select_the_folder_tha_1">W�hlen Sie den Ordner aus, in den Sie '%file_name%' verschieben wollen</msg>
   <msg key="lt_Show_files_modified_i">Dateien, die in den letzten</msg>
   <msg key="lt_show_only_live_versio">Nur die aktuelle Version anzeigen</msg>
-  <msg key="lt_The_folder_link_you_s">Der ausgew�hlte %folder_link% enth�lt schon eine gleichnamige Datei.</msg>
-  <msg key="lt_The_specified_file_is">Die angegebene Datei ist nicht g�ltig.</msg>
-  <msg key="lt_The_specified_folder_">Den angegebenen Ordner gibt es nicht.</msg>
+  <msg key="lt_The_folder_link_you_s">Der ausgew�hlte %folder_link% enth�lt bereits eine Datei mit diesem Namen.</msg>
+  <msg key="lt_The_specified_file_is">Die angegebene Datei ist ung�ltig.</msg>
+  <msg key="lt_The_specified_folder_">Der angegebene Ordner ist nicht vorhanden.</msg>
   <msg key="lt_The_specified_folder__1">Der angegebene Ordner ist ung�ltig.</msg>
   <msg key="lt_The_specified_parent_">Der angegebene �bergeordnete Ordner ist ung�ltig.</msg>
-  <msg key="lt_There_are_no_versions">Es stehen Ihnen keine Versionen dieser Datei zu Verf�gung</msg>
-  <msg key="lt_This_file_has_version">Diese Datei besitzt Versionen, die Sie mit Ihren Berechtigungen nicht l�schen d�rfen, deshalb k�nnen Sie die Datei nicht l�schen.</msg>
-  <msg key="lt_This_folder_contains_">Dieser Ordner enth�lt Elemente, die Sie mit Ihren Berechtigungen nicht l�schen d�rfen, deshalb k�nnen Sie ihn nicht l�schen.</msg>
-  <msg key="lt_Use_the_Browse_button">Klicken Sie auf &amp;quot;Durchsuchen...&amp;quot;, w�hlen Sie die gew�nschte Datei aus und klicken Sie auf &amp;quot;�ffnen&amp;quot;.</msg>
+  <msg key="lt_There_are_no_versions">Es sind keine Versionen dieser Datei f�r Sie verf�gbar.</msg>
+  <msg key="lt_This_file_has_version">Sie k�nnen diese Datei nicht l�schen, da Sie f�r mindestens eine ihrer Versionen nicht die erforderliche Berechtigung haben.</msg>
+  <msg key="lt_This_folder_contains_">Sie k�nnen diesen Ordner nicht l�schen, da Sie f�r mindesten einen seiner Inhalte nicht die erforderliche Berechtigung haben. </msg>
+  <msg key="lt_Use_the_Browse_button">Klicken Sie auf 'Durchsuchen...', w�hlen Sie die gew�nschte Datei aus und klicken Sie auf '�ffnen'.</msg>
   <msg key="lt_version_not_valid">Die angegebene Version ist ung�ltig.</msg>
-  <msg key="lt_We_got_an_error_that_">Es ist ein Fehler passiert, der nicht gleich identifiziert werden konnte. Bitte informieren Sie diejenige Stelle, zu der das System geh�rt.</msg>
-  <msg key="lt_We_received_an_error_">Wir haben eine Fehlermeldung von der Datenbank erhalten. M�glicherweise enth�lt der gew�hlte Ordner schon eine Datei gleichen Namens.</msg>
-  <msg key="lt_Were_sorry_but_at_the">Leider k�nnen Sie Ordner derzeit erst dann l�schen, wenn sie schon leer sind.</msg>
-  <msg key="lt_You_may_not_delete_th">Der Wurzel-Ordner darf nicht gel�scht werden.</msg>
-  <msg key="lt_You_probably_clicked_">M�glicherweise haben Sie mehr als ein Mal auf die Schaltfl�che &quot;Hinzuf�gen&quot; geclickt. �berpr�fen Sie, ob die Datei ordnungsgem�� in den gew�nschten Ordner %folder_link% geladen ist, oder gehen Sie mithilfe der Schaltfl�che &quot;Zur�ck&quot; zur�ck und geben Sie die Versionsdatei noch einmal an.</msg>
-  <msg key="lt_Your_file_is_larger_t">Die Datei ist gr��er als die erlaubte Maximalgr��e auf diesem System(%number_of_bytes% Bytes). </msg>
-  <msg key="lt_Your_file_is_larger_t_1">Die Datei ist gr��er als die erlaubte Maximalgr��e auf diesm System (%max_number_of_bytes% Bytes) </msg>
+  <msg key="lt_We_got_an_error_that_">Es ist ein nicht identifizierbarer Fehler aufgetreten. Bitte wenden Sie sich an den Systemadministrator.</msg>
+  <msg key="lt_We_received_an_error_">Es wurde ein Fehler von der Datenbank gemeldet. Wahrscheinlich enth�lt der ausgew�hlte Ordner bereits eine Datei mit diesem Namen.</msg>
+  <msg key="lt_Were_sorry_but_at_the">Es k�nnen nur leere Ordner gel�scht werden.</msg>
+  <msg key="lt_You_may_not_delete_th">Der Wurzelordner kann nicht gel�scht werden.</msg>
+  <msg key="lt_You_probably_clicked_">Wahrscheinlich haben Sie mehrmals auf die Schaltfl�che 'Hochladen' geklickt. �berpr�fen Sie, ob die Datei in den gew�nschten Ordner %folder_link% geladen wurde, oder gehen Sie mit Hilfe Ihres Browsers zur�ck und geben Sie die Versionsdatei erneut an.</msg>
+  <msg key="lt_Your_file_is_larger_t">Ihre Datei �berschreitet die innerhalb des Systems zul�ssige Maximalgr��e (%number_of_bytes% Bytes). </msg>
+  <msg key="lt_Your_file_is_larger_t_1">Ihre Datei �berschreitet die innerhalb des Systems zul�ssige Maximalgr��e (%max_number_of_bytes% Bytes).</msg>
+  <msg key="lt_Your_search_on_query_">Ihre Suchanfrage f�r &quot;%query%&quot; ergab keine Treffer.</msg>
+  <msg key="lt_Your_search_on_query__1">Ihre Suchanfrage f�r &quot;%query%&quot; ergab folgende Treffer:</msg>
   <msg key="Modified">Ge�ndert</msg>
   <msg key="Move">Verschieben</msg>
   <msg key="Name">Name</msg>
@@ -77,21 +91,25 @@
   <msg key="Rename_this_folder">Diesen Ordner umbenennen </msg>
   <msg key="Save">Speichern</msg>
   <msg key="Search">Suchen</msg>
-  <msg key="Search_again">Nochmal suchen:</msg>
+  <msg key="Search_again">Erneut suchen:</msg>
   <msg key="Search_Results">Suchergebnisse</msg>
   <msg key="show_all_versions">Alle Versionen anzeigen</msg>
+  <msg key="simple_add_page_title">%pretty_name%  erstellen</msg>
   <msg key="Size">Gr��e</msg>
   <msg key="Size_bytes">Gr��e (Bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Hinweis:&lt;/strong&gt; Dieser Vorgang kann einige Minuten dauern. </msg>
   <msg key="Title">Name:</msg>
-  <msg key="Title_">Titel :</msg>
+  <msg key="Title_">Name:</msg>
   <msg key="Type">Typ</msg>
-  <msg key="Update">Aktualisieren</msg>
+  <msg key="Update">Hochladen</msg>
   <msg key="Upload">Hochladen</msg>
-  <msg key="Upload_a_file">Datei hochladen</msg>
-  <msg key="Upload_a_new_version">Eine neue Version hochladen</msg>
-  <msg key="Upload_New_File">Eine neue Datei hochladen</msg>
-  <msg key="Upload_New_Version">Neue Version Hochladen</msg>
+  <msg key="Upload_a_file">Neue Datei hochladen</msg>
+  <msg key="Upload_a_new_version">Neue Version hochladen</msg>
+  <msg key="Upload_New_File">Neue Datei hochladen</msg>
+  <msg key="Upload_New_Version">Neue Version hochladen</msg>
   <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">Neue Version von %title% hochladen</msg>
+  <msg key="version_delete_page_title">%version_name% l�schen</msg>
   <msg key="Version_filename">Dateiname der Version</msg>
   <msg key="Version_filename_">Dateiname der Version:</msg>
   <msg key="Version_filename_1">Dateiname der Version:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.10
+++ openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.11
@@ -7,6 +7,7 @@
   <msg key="Add_File">A�adir archivo</msg>
   <msg key="Add_pretty_name">A�adir %pretty_name%</msg>
   <msg key="Author">Autor</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Volver&lt;/a&gt; a la vista por carpetas </msg>
   <msg key="Change_Name">Renombrar</msg>
   <msg key="Copy">Copiar</msg>
   <msg key="Create">Crear</msg>
@@ -25,26 +26,39 @@
   <msg key="Edit_Folder">Editar carpeta</msg>
   <msg key="Edit_URL">Editar URL</msg>
   <msg key="file">Archivo</msg>
+  <msg key="file_delete_page_title">Eliminar %title%</msg>
+  <msg key="file_edit_page_title">Renombrar %title%</msg>
+  <msg key="file_edit_page_title_1">Modificar %pretty_name%</msg>
+  <msg key="file_page_file_title_label">T�tulo: %title%</msg>
+  <msg key="file_page_owner_label">Due�o: %owner%</msg>
   <msg key="folder">Carpeta</msg>
+  <msg key="folder_delete_page_title">Eliminar %folder_name%</msg>
   <msg key="Folder_ID">Identificador de carpeta</msg>
   <msg key="Folder_Name">Nombre de carpeta:</msg>
   <msg key="folder_type_pretty_name">carpeta</msg>
+  <msg key="index_page_navigate_up_folder">Subir a %up_name%</msg>
   <msg key="item">archivo</msg>
   <msg key="items">archivos</msg>
   <msg key="Last_Modified">�ltima Modificaci�n</msg>
   <msg key="lt_administer_permission">Administrar permisos</msg>
+  <msg key="lt_All_Versions_of_title">Todas las versiones de &quot;%title%&quot;</msg>
   <msg key="lt_Are_you_sure_that_you">�Desea realmente borrar la versi�n &quot;%version_name%&quot; de &quot;%title%&quot;? No se podr� recuperar.</msg>
   <msg key="lt_bad_folder_id_folder_">Falta identificador de carpeta</msg>
+  <msg key="lt_Comments_on_this_file">Comentarios sobre este fichero:</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% bytes</msg>
   <msg key="lt_delete_file">�Desea realmente borrar el archivo &quot;%title%&quot; y todas sus versiones? No se podr� recuperar.</msg>
   <msg key="lt_delete_folder">�Desea realmente borrar la carpeta &quot;%folder_name%&quot; y todo su contenido? No se podr� recuperar.</msg>
   <msg key="lt_Delete_this_file_incl">Borrar este archivo (y todas sus versiones)</msg>
   <msg key="lt_Download_an_archive_o">Descargar un archivo con los contenidos de esta carpeta</msg>
   <msg key="lt_Either_there_is_alrea">O ya existe una carpeta con el nombre &quot;%folder_name%&quot;, o ha pulsado el bot�n m�s de una vez. Utilice el bot�n Atr�s de su navegador y elija otro nombre, o &lt;a href=&quot;%directory_url%&quot;&gt;vuelva al listado&lt;/a&gt; para comprobar la carpeta.</msg>
   <msg key="lt_Folder_folder_name_is">La carpeta %folder_name% est� vac�a.</msg>
   <msg key="lt_It_appears_that_there">Parece que ya existe un archivo con este nombre en esta carpeta (tambi�n es posible que haya pulsado varias veces el bot�n).</msg>
+  <msg key="lt_Live_version_of_title">Versi�n actual de &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">Modificar permisos de este archivo</msg>
   <msg key="lt_Modify_permissions_on_1">Modificar permisos de esta carpeta</msg>
   <msg key="lt_Please_enter_the_new_">Por favor, introduzca el nuevo nombre del archivo:</msg>
+  <msg key="lt_Select_the_folder_tha">Seleccione la carpeta que quiere copiar en &quot;%file_name%</msg>
+  <msg key="lt_Select_the_folder_tha_1">Seleccione la carpeta donde quiere mover poner &quot;%file_name%&quot;</msg>
   <msg key="lt_Show_files_modified_i">Mostrar archivos modificados en</msg>
   <msg key="lt_show_only_live_versio">Mostrar s�lo �ltima versi�n</msg>
   <msg key="lt_The_folder_link_you_s">La %folder_link% seleccionada ya contiene un archivo con este nombre.</msg>
@@ -63,6 +77,9 @@
   <msg key="lt_You_may_not_delete_th">La carpeta ra�z no puede ser borrada.</msg>
   <msg key="lt_You_probably_clicked_">Es probable que haya pulsado el bot�n A�adir m�s de una vez. Compruebe que el archivo haya sido subido en la %folder_link% que deseaba, o bien utilice le bot�n Atr�s de su navegador para volver.</msg>
   <msg key="lt_Your_file_is_larger_t">Su archivo supera el tama�o m�ximo permitido (%number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_file_is_larger_t_1">Su fichero es mayor que el tama�o m�ximo permitido en este sistema (%max_number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_search_on_query_">La b�squeda de &quot;%query%&quot; no devolvi� ning�n resultado.</msg>
+  <msg key="lt_Your_search_on_query__1">La b�squeda de &quot;%query%&quot; devolvi� los siguientes ficheros:</msg>
   <msg key="Modified">Modificado</msg>
   <msg key="Move">Mover</msg>
   <msg key="Name">Nombre</msg>
@@ -76,8 +93,10 @@
   <msg key="Search_again">Buscar de nuevo:</msg>
   <msg key="Search_Results">Resultados de b�squeda</msg>
   <msg key="show_all_versions">mostrar todas las versiones</msg>
+  <msg key="simple_add_page_title">Crear %pretty_name%</msg>
   <msg key="Size">Tama�o</msg>
   <msg key="Size_bytes">Tama�o (bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Nota:&lt;/strong&gt; Esta operaci�n puede tardar, por favor, sea paciente.</msg>
   <msg key="Title">T�tulo</msg>
   <msg key="Title_">T�tulo :</msg>
   <msg key="Type">Tipo</msg>
@@ -88,6 +107,8 @@
   <msg key="Upload_New_File">Subir un archivo nuevo</msg>
   <msg key="Upload_New_Version">Subir una nueva versi�n</msg>
   <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">Subir una nueva versi�n de %title%</msg>
+  <msg key="version_delete_page_title">Eliminar %version_name%</msg>
   <msg key="Version_filename">T�tulo</msg>
   <msg key="Version_filename_">T�tulo :</msg>
   <msg key="Version_filename_1">T�tulo:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.fr_FR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.fr_FR.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/catalog/file-storage.fr_FR.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.4
+++ openacs-4/packages/file-storage/catalog/file-storage.fr_FR.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.5
@@ -2,4 +2,5 @@
 <message_catalog package_key="file-storage" package_version="4.7d3" locale="fr_FR" charset="ISO-8859-1">
 
   <msg key="folder_type_pretty_name">dossier</msg>
+  <msg key="lt_Folder_folder_name_is">Le dossier %folder_name% est vide.</msg>
 </message_catalog>
Index: openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.9
+++ openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.10
@@ -7,6 +7,7 @@
   <msg key="Add_File">Aggiungi un file</msg>
   <msg key="Add_pretty_name">Aggiungi un %pretty_name%</msg>
   <msg key="Author">Autore</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Torna indietro&lt;/a&gt; alla visualizzazione della cartella</msg>
   <msg key="Change_Name">Cambia Nome</msg>
   <msg key="Copy">Copia</msg>
   <msg key="Create">Crea</msg>
@@ -25,26 +26,39 @@
   <msg key="Edit_Folder">Modifica la cartella</msg>
   <msg key="Edit_URL">Modifica la URL</msg>
   <msg key="file">file</msg>
+  <msg key="file_delete_page_title">Cancella %title%</msg>
+  <msg key="file_edit_page_title">Rinomina %title%</msg>
+  <msg key="file_edit_page_title_1">Modifica %pretty_name%</msg>
+  <msg key="file_page_file_title_label">Titolo: %title%</msg>
+  <msg key="file_page_owner_label">Proprietario: %owner%</msg>
   <msg key="folder">cartella</msg>
+  <msg key="folder_delete_page_title">Cancella %folder_name%</msg>
   <msg key="Folder_ID">Codice Cartella</msg>
   <msg key="Folder_Name">Nome Cartella:</msg>
   <msg key="folder_type_pretty_name">cartella</msg>
+  <msg key="index_page_navigate_up_folder">Torna a %up_name% </msg>
   <msg key="item">elemento</msg>
   <msg key="items">elementi</msg>
   <msg key="Last_Modified">Ultima Modifica</msg>
   <msg key="lt_administer_permission">amministra i permessi</msg>
+  <msg key="lt_All_Versions_of_title">Tutte le versioni di &quot;%title%&quot;</msg>
   <msg key="lt_Are_you_sure_that_you">Sei sicuro di voler cancellare questa versione &quot;%version_name%&quot; di &quot;%title%&quot;? Questa azione non &amp;egrave; reversibile.</msg>
   <msg key="lt_bad_folder_id_folder_">Codice cartella mancante</msg>
+  <msg key="lt_Comments_on_this_file">Commenti su questo file:</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% bytes</msg>
   <msg key="lt_delete_file">Sei sicuro di voler cancellare il file &quot;%title%&quot; e tutte le sue versioni? Questa azione non &amp;egrave; reversibile.</msg>
   <msg key="lt_delete_folder">Sei sicuro di voler cancellare la cartella &quot;%folder_name%&quot; e tutti gli elementi che contiene? Questa azione non &amp;egrave; reversibile</msg>
   <msg key="lt_Delete_this_file_incl">Cancella questo file (con tutte le versioni)</msg>
   <msg key="lt_Download_an_archive_o">Comprimi il contenuto di questa cartella in un archivio scaricabile(formato tgz)</msg>
   <msg key="lt_Either_there_is_alrea">O &amp;egrave; gi&amp;agrave; presente una cartella con nome &quot;%folder_name%&quot; oppure hai premuto invio pi&amp;ugrave; volte. Puoi usare il tasto Back per tornare indietro e scegliere un nuovo nome, o &lt;a href=&quot;%directory_url%&quot;&gt;torna all'elenco delle directory&lt;/a&gt; per verificare se la tua cartella &amp;egrave; l&amp;igrave;. </msg>
   <msg key="lt_Folder_folder_name_is">La cartella %folder_name% &amp;egrave; vuota.</msg>
   <msg key="lt_It_appears_that_there">Sembra che ci sia gi&amp;agrave; un file con quel nome in questa cartella (&amp;egrave; tuttavia possibile che tu abbia premuto il tasto invio pi&amp;ugrave; volte).</msg>
+  <msg key="lt_Live_version_of_title">Versione attuale di &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">Modifica i permessi su questo file</msg>
   <msg key="lt_Modify_permissions_on_1">Modifica i permessi su questa cartella</msg>
   <msg key="lt_Please_enter_the_new_">Inserisci il nuovo nome per il file:</msg>
+  <msg key="lt_Select_the_folder_tha">Seleziona la cartella in cui vorresti copiare &quot;%file_name%&quot;</msg>
+  <msg key="lt_Select_the_folder_tha_1">Seleziona la cartella in cui vorresti spostare &quot;%file_name%&quot;</msg>
   <msg key="lt_Show_files_modified_i">Mostra come nuovi i files modificati negli ultimi</msg>
   <msg key="lt_show_only_live_versio">mostra solo l'ultima versione</msg>
   <msg key="lt_The_folder_link_you_s">La %folder_link% che hai selezionato contiene gi&amp;agrave; un file con lo stesso nome. </msg>
@@ -64,6 +78,8 @@
   <msg key="lt_You_probably_clicked_">E' possobile che tu abbia cliccato pi&amp;ugrave; di una volta sul tasto &quot;Aggiungi&quot;. Controlla se il file &amp;egrave; stato caricato correttamente nella cartella %folder_link%, o torna indietro e immetti nuovamente la versione del file.</msg>
   <msg key="lt_Your_file_is_larger_t">Il tuo file eccede la dimesione massima permessa su questo sistema (%number_of_bytes% bytes)</msg>
   <msg key="lt_Your_file_is_larger_t_1">Il tuo file eccede la dimesione massima permessa su questo sistema (%max_number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_search_on_query_">La tua ricerca di &quot;%query%&quot; non ha prodotto alcun risultato.</msg>
+  <msg key="lt_Your_search_on_query__1">La tua ricerca di &quot;%query%&quot; ha individuato i file seguenti: </msg>
   <msg key="Modified">Modificato</msg>
   <msg key="Move">Sposta</msg>
   <msg key="Name">Nome</msg>
@@ -77,8 +93,10 @@
   <msg key="Search_again">Cerca Ancora</msg>
   <msg key="Search_Results">Risultati della Ricerca</msg>
   <msg key="show_all_versions">mostra tutte le versioni</msg>
+  <msg key="simple_add_page_title">Crea %pretty_name%</msg>
   <msg key="Size">Dimensione</msg>
   <msg key="Size_bytes">Dimensione (bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Nota:&lt;/strong&gt; Pu&amp;ograve; richiedere qualche istante, attendi per favore. </msg>
   <msg key="Title">Titolo:</msg>
   <msg key="Title_">Titolo :</msg>
   <msg key="Type">Tipo</msg>
@@ -89,6 +107,8 @@
   <msg key="Upload_New_File">Carica un nuovo file</msg>
   <msg key="Upload_New_Version">Carica una nuova versione</msg>
   <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">Carica una nuova versione di %title% </msg>
+  <msg key="version_delete_page_title">Cancella %version_name%</msg>
   <msg key="Version_filename">Versione file</msg>
   <msg key="Version_filename_">Versione file :</msg>
   <msg key="Version_filename_1">Versione file: </msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.ko_KR.utf-8.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/catalog/file-storage.ko_KR.utf-8.xml	3 Nov 2003 12:52:10 -0000	1.3
+++ openacs-4/packages/file-storage/catalog/file-storage.ko_KR.utf-8.xml	26 Feb 2004 15:29:11 -0000	1.4
@@ -25,6 +25,7 @@
   <msg key="Edit_Folder">폴더 수정</msg>
   <msg key="Edit_URL">URL 수정</msg>
   <msg key="file">파일</msg>
+  <msg key="file_page_file_title_label">제목: %title%</msg>
   <msg key="folder">폴더</msg>
   <msg key="Folder_ID">폴더 아이디</msg>
   <msg key="Folder_Name">폴더 이름:</msg>
@@ -63,6 +64,7 @@
   <msg key="lt_You_may_not_delete_th">루트 폴더를 삭제할 수 없습니다.</msg>
   <msg key="lt_You_probably_clicked_">아마도 추가 버튼을 한번이상 클릭한 것 같습니다. %folder_link%에 파일이 로드되었는지 체크하던지, 돌아가기는 버튼을 사용하여 파일을 새로 입력할 수 있습니다.</msg>
   <msg key="lt_Your_file_is_larger_t_1">파일이 시스템에서 허용하는 최대 파일 크기(%max_number_of_bytes% 바이트)를 초과했습니다.</msg>
+  <msg key="lt_Your_search_on_query_">&quot;%query%&quot;에대한 검색결과가 없습니다.</msg>
   <msg key="Modified">수정된</msg>
   <msg key="Move">이동</msg>
   <msg key="Name">이름</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.nl_NL.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/file-storage/catalog/file-storage.nl_NL.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.10
+++ openacs-4/packages/file-storage/catalog/file-storage.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.11
@@ -2,69 +2,85 @@
 <message_catalog package_key="file-storage" package_version="4.7d3" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="Action">Handeling</msg>
-  <msg key="Actions">Handelingen:</msg>
-  <msg key="Actions_1">Handelingen</msg>
+  <msg key="Actions">Menu:</msg>
+  <msg key="Actions_1">Acties</msg>
   <msg key="Add_File">Toevoegen Bestand</msg>
   <msg key="Add_pretty_name">Toevoegen %pretty_name%</msg>
   <msg key="Author">Auteur</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Terug&lt;/a&gt; naar mappenoverzicht </msg>
   <msg key="Change_Name">Wijzig Naam</msg>
   <msg key="Copy">Kopieren</msg>
   <msg key="Create">Aanmaken</msg>
   <msg key="Create_a_new_folder">Aanmaken nieuwe map</msg>
-  <msg key="Create_a_URL">Aanmaken URL</msg>
-  <msg key="Create_New_Folder">Aanmaken nieuwe map</msg>
+  <msg key="Create_a_URL">URL Aanmaken</msg>
+  <msg key="Create_New_Folder">Aanmaken Nieuwe Map</msg>
   <msg key="day">dag</msg>
-  <msg key="days_as_new">dagen als nieuw.</msg>
+  <msg key="days_as_new">dagen, de extensie &quot;Nieuw&quot;</msg>
   <msg key="Delete">Verwijderen</msg>
-  <msg key="delete">verwijderen</msg>
-  <msg key="Delete_this_folder">Verwijder Map</msg>
-  <msg key="Delete_Version">Verwijder Variant</msg>
+  <msg key="delete">Verwijder</msg>
+  <msg key="Delete_this_folder">Verwijder deze map</msg>
+  <msg key="Delete_Version">Verwijder Versie</msg>
   <msg key="Description">Beschrijving:</msg>
   <msg key="Edit">Wijzigen</msg>
   <msg key="edit">Wijzig</msg>
   <msg key="Edit_Folder">Wijzig Map</msg>
   <msg key="Edit_URL">Wijzig URL</msg>
   <msg key="file">bestand</msg>
+  <msg key="file_delete_page_title">Verwijder %title% </msg>
+  <msg key="file_edit_page_title">Hernoem %title%</msg>
+  <msg key="file_edit_page_title_1">Wijzig %pretty_name% </msg>
+  <msg key="file_page_file_title_label">Titel: %title% </msg>
+  <msg key="file_page_owner_label">Eigenaar: %owner% </msg>
   <msg key="folder">map</msg>
+  <msg key="folder_delete_page_title">Verwijder %folder_name% </msg>
   <msg key="Folder_ID">Folder ID</msg>
   <msg key="Folder_Name">Mapnaam:</msg>
   <msg key="folder_type_pretty_name">map</msg>
+  <msg key="index_page_navigate_up_folder">Naar hoger niveau %up_name%</msg>
   <msg key="item">item</msg>
   <msg key="items">items</msg>
   <msg key="Last_Modified">Laatste Wijziging</msg>
-  <msg key="lt_administer_permission">beheer permissies</msg>
-  <msg key="lt_Are_you_sure_that_you">Weet u zeker dat u deze variant &quot;%version_name%&quot; van &quot;%title%&quot; wilt verwijderen? Deze handeling kan niet worden hersteld.</msg>
+  <msg key="lt_administer_permission">permissies instellen</msg>
+  <msg key="lt_All_Versions_of_title">Alle Versies van &quot;%title%&quot; </msg>
+  <msg key="lt_Are_you_sure_that_you">Weet u zeker dat u deze versie &quot;%version_name%&quot; van &quot;%title%&quot; wilt verwijderen? Deze handeling kan niet worden hersteld.</msg>
   <msg key="lt_bad_folder_id_folder_">folder id ontbreekt</msg>
+  <msg key="lt_Comments_on_this_file">Opmerkingen bij dit bestand:</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% bytes </msg>
   <msg key="lt_delete_file">Weet u zeker dat u het bestand &quot;%title%&quot; met alle versies wilt verwijderen? Deze handeling kan niet worden hersteld.</msg>
   <msg key="lt_delete_folder">Weet u zeker dat u de map &quot;%folder_name%&quot; met alle items wilt verwijderen? Deze handeling kan niet worden hersteld.</msg>
   <msg key="lt_Delete_this_file_incl">Verwijder dit bestand (met alle versies)</msg>
   <msg key="lt_Download_an_archive_o">Importeer een archief van de mapinhoud</msg>
   <msg key="lt_Either_there_is_alrea">Mogelijk is er al een map met die &quot;%folder_name%&quot; heet, anders heeft u meer dan eenmaal op de verzendknop geklikt. Gebruikt de Beck/Terug knop om een nieuwe naam te kiezen of bekijk de &lt;a href=&quot;%directory_url%&quot;&gt;lijst met bestanden&lt;/a&gt; om te zien of de map bestaat.</msg>
   <msg key="lt_Folder_folder_name_is">Map %folder_name% is leeg.</msg>
   <msg key="lt_It_appears_that_there">Het lijkt alsof er in deze map al een bestand is met deze naam (of er is meer dan eenmaal op de knop geklikt).</msg>
+  <msg key="lt_Live_version_of_title">Live versie van &quot;%title%&quot; </msg>
   <msg key="lt_Modify_permissions_on">Wijzig permissies voor dit bestand</msg>
   <msg key="lt_Modify_permissions_on_1">Wijzig permissies voor deze map</msg>
   <msg key="lt_Please_enter_the_new_">Voer de nieuwe naam voor dit bestand in:</msg>
-  <msg key="lt_Show_files_modified_i">Toon gewijzigde bestanden in de laatste</msg>
-  <msg key="lt_show_only_live_versio">Toon allen versies die live zijn</msg>
+  <msg key="lt_Select_the_folder_tha">Selecteer de map waar naar &quot;%file_name%&quot; gekopieerd moet worden </msg>
+  <msg key="lt_Select_the_folder_tha_1">Selecteer de map waar naar &quot;%file_name%&quot; verplaatst moet worden </msg>
+  <msg key="lt_Show_files_modified_i">Geef bestanden, die gewijzigd zijn in de laatste</msg>
+  <msg key="lt_show_only_live_versio">Toon alleen versies die live zijn</msg>
   <msg key="lt_The_folder_link_you_s">De geselecteerde %folder_link% bevat al een bestand met dezelfde naam.</msg>
   <msg key="lt_The_specified_file_is">Het betreffende bestand is niet geldig.</msg>
   <msg key="lt_The_specified_folder_">De betreffende map bestaat niet.</msg>
   <msg key="lt_The_specified_folder__1">De betreffende map is niet geldig.</msg>
   <msg key="lt_The_specified_parent_">De betreffende bovenliggende map is niet geldig.</msg>
-  <msg key="lt_There_are_no_versions">Er is geen variant van dit bestand beschikbaar</msg>
-  <msg key="lt_This_file_has_version">Het bestand heeft varianten die niet mogen worden verwijderd door u. Verwijderen van het bestand is niet mogelijk.</msg>
-  <msg key="lt_This_folder_contains_">Deze map heeft items die niet mogen worden verwijderd door u. Verwijderen van de map is niet mogelijk.</msg>
-  <msg key="lt_Use_the_Browse_button">Gebruikde &quot;Browse/Snuffel...&quot; knop om het bestand te vinden en klik dan op &quot;Open&quot;.</msg>
-  <msg key="lt_version_not_valid">De betreffende variant is niet geldig.</msg>
-  <msg key="lt_We_got_an_error_that_">Er is een fout opgetreden waarvan de oorzaak niet direct duidelijk is. Wilt u de systeembeheerder hiervan alstublieft op de hoogte stellen.</msg>
-  <msg key="lt_We_received_an_error_">We ontvingen een foutmelding van de database. Waarschijnlijk bevat de map die u selecteerde al een bestand met dezelfde naam.</msg>
-  <msg key="lt_Were_sorry_but_at_the">Het spijt ons, maar op dit moment kunnen deze mappen alleen worden verwijderd als ze leeg zijn. </msg>
-  <msg key="lt_You_may_not_delete_th">De basale map mag niet worden verwijderd.</msg>
-  <msg key="lt_You_probably_clicked_">Waarschijnlijk werd meer dan eenmaal op de Toevoegen knop geklikt. Controleer of het bestand correct is geladen in %folder_link%.  Gebruik anders de Back/Terug knop om het de handeling te herhalen.</msg>
-  <msg key="lt_Your_file_is_larger_t">Het bestand is groter dan de maximaal toegestaan (%number_of_bytes% bytes)</msg>
-  <msg key="lt_Your_file_is_larger_t_1">Het bestand is groter dan het maximaal toegestane formaat (%max_number_of_bytes% bytes)
+  <msg key="lt_There_are_no_versions">Er is geen versie van dit bestand beschikbaar</msg>
+  <msg key="lt_This_file_has_version">Het bestand heeft versies die niet mogen worden verwijderd. Verwijderen van het bestand is dus niet mogelijk.</msg>
+  <msg key="lt_This_folder_contains_">Deze map heeft items die niet mogen worden verwijderd. Verwijderen van de map is dus niet mogelijk.</msg>
+  <msg key="lt_Use_the_Browse_button">Gebruik de &quot;Browse/Snuffel...&quot; knop om het bestand te vinden en klik dan op &quot;Open&quot;.</msg>
+  <msg key="lt_version_not_valid">De betreffende versie is niet geldig.</msg>
+  <msg key="lt_We_got_an_error_that_">Er is een fout opgetreden waarvan de oorzaak niet direct duidelijk is. De systeembeheerder zou hiervan graag op de hoogte worden gesteld.</msg>
+  <msg key="lt_We_received_an_error_">We ontvingen een foutmelding van de database. Waarschijnlijk bestaat er al een bestand met dezelfde naam in de map die u selecteerde.</msg>
+  <msg key="lt_Were_sorry_but_at_the">Het spijt ons, maar op dit moment kunnen mappen niet worden verwijderd tenzij ze al leeg zijn. </msg>
+  <msg key="lt_You_may_not_delete_th">De hoofdmap mag niet worden verwijderd.</msg>
+  <msg key="lt_You_probably_clicked_">Waarschijnlijk werd meer dan eenmaal op de knop &quot;Toevoegen&quot; geklikt. Controleer of het bestand correct is opgeslagen in %folder_link%.  Gebruik anders de Back/Terug knop van de browser om de handeling te herhalen.</msg>
+  <msg key="lt_Your_file_is_larger_t">Het bestand is groter dan toegestaan (%number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_file_is_larger_t_1">Het bestand is groter dan toegestaan (%max_number_of_bytes% bytes)
 </msg>
+  <msg key="lt_Your_search_on_query_">Uw zoekactie naar &quot;%query%&quot; leverde geen resultaten op.</msg>
+  <msg key="lt_Your_search_on_query__1">Uw zoekactie naar &quot;%query%&quot; leverde de volgende resultaten op:</msg>
   <msg key="Modified">Gewijzigd</msg>
   <msg key="Move">Verplaatsen</msg>
   <msg key="Name">Naam</msg>
@@ -78,23 +94,27 @@
   <msg key="Search_again">Zoek opnieuw:</msg>
   <msg key="Search_Results">Zoekresultaten</msg>
   <msg key="show_all_versions">toon alle versies</msg>
+  <msg key="simple_add_page_title">Aanmaken %pretty_name%</msg>
   <msg key="Size">Grootte</msg>
-  <msg key="Size_bytes">Groote (bytes)</msg>
+  <msg key="Size_bytes">Grootte (bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Bericht:&lt;/strong&gt; Dit kan enige tijd in beslag nemen. Wij vragen uw geduld.</msg>
   <msg key="Title">Titel:</msg>
   <msg key="Title_">Titel:</msg>
   <msg key="Type">Type</msg>
   <msg key="Update">Bijwerken</msg>
-  <msg key="Upload">Laden</msg>
-  <msg key="Upload_a_file">Bestand laden</msg>
-  <msg key="Upload_a_new_version">Nieuwe versie laden</msg>
+  <msg key="Upload">Aanbieden</msg>
+  <msg key="Upload_a_file">Bestand aanbieden</msg>
+  <msg key="Upload_a_new_version">Nieuwe versie aanbieden</msg>
   <msg key="Upload_New_File">Nieuw bestand laden</msg>
   <msg key="Upload_New_Version">Nieuwe versie laden</msg>
   <msg key="URL">URL:</msg>
-  <msg key="Version_filename">Variant bestandsnaam</msg>
-  <msg key="Version_filename_">Variant bestandsnaam:</msg>
-  <msg key="Version_filename_1">Variant bestandsnaam:</msg>
-  <msg key="Version_Notes">Variant Aantekening</msg>
-  <msg key="Version_Notes_1">Variant Aantekeningen:</msg>
+  <msg key="version_add_page_title">Toevoegen Niewe Versie van %title% </msg>
+  <msg key="version_delete_page_title">Verwijder %version_name%</msg>
+  <msg key="Version_filename">Versie bestandsnaam</msg>
+  <msg key="Version_filename_">Versie bestandsnaam:</msg>
+  <msg key="Version_filename_1">Versie bestandsnaam:</msg>
+  <msg key="Version_Notes">Versie opmerking</msg>
+  <msg key="Version_Notes_1">Versie Aantekeningen:</msg>
   <msg key="view_details">bekijk details</msg>
-  <msg key="Yes_Delete_It">Ja, verwijder</msg>
+  <msg key="Yes_Delete_It">Ja, Verwijder Het</msg>
 </message_catalog>
Index: openacs-4/packages/file-storage/catalog/file-storage.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/catalog/file-storage.pt_BR.ISO-8859-1.xml	3 Nov 2003 12:52:10 -0000	1.8
+++ openacs-4/packages/file-storage/catalog/file-storage.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:29:11 -0000	1.9
@@ -7,6 +7,7 @@
   <msg key="Add_File">Adicionar Arquivo</msg>
   <msg key="Add_pretty_name">Adicionar %pretty_name%</msg>
   <msg key="Author">Autor</msg>
+  <msg key="back_to_folder_view">&lt;a href=&quot;%folder_view_url%&quot;&gt;Voltar&lt;/a&gt; ao modo de exibi��o normal</msg>
   <msg key="Change_Name">Mudar Nome</msg>
   <msg key="Copy">Copiar</msg>
   <msg key="Create">Criar</msg>
@@ -25,26 +26,39 @@
   <msg key="Edit_Folder">Editar Pasta</msg>
   <msg key="Edit_URL">Editar URL</msg>
   <msg key="file">arquivo</msg>
+  <msg key="file_delete_page_title">Deletar %title% </msg>
+  <msg key="file_edit_page_title">Renomear %title%</msg>
+  <msg key="file_edit_page_title_1">Editar %pretty_name%</msg>
+  <msg key="file_page_file_title_label">T�tulo: %title%</msg>
+  <msg key="file_page_owner_label">Propriet�rio: %owner%</msg>
   <msg key="folder">pasta</msg>
+  <msg key="folder_delete_page_title">Deletar %folder_name%</msg>
   <msg key="Folder_ID">ID da Pasta</msg>
   <msg key="Folder_Name">Nome da Pasta:</msg>
   <msg key="folder_type_pretty_name">pasta</msg>
+  <msg key="index_page_navigate_up_folder">Voltar aos arquivos de %up_name%</msg>
   <msg key="item">item</msg>
   <msg key="items">item(s)</msg>
   <msg key="Last_Modified">�ltima Modifica��o</msg>
   <msg key="lt_administer_permission">permiss�es administrativas</msg>
+  <msg key="lt_All_Versions_of_title">Todas as vers�es de &quot;%title%&quot;</msg>
   <msg key="lt_Are_you_sure_that_you">Voc� tem certeza que deseja remover &quot;%version_name%&quot; de &quot;%title%&quot;? Esta a��o � irrevers�vel.</msg>
   <msg key="lt_bad_folder_id_folder_">faltando id da pasta</msg>
+  <msg key="lt_Comments_on_this_file">Coment�rios sobre este arquivo</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size_pretty% bytes</msg>
   <msg key="lt_delete_file">Voc� tem certeza que quer remover o arquivo &quot;%title%&quot; e todas suas vers�es? Esta a��o � irrevers�vel.</msg>
   <msg key="lt_delete_folder">Voc� tem certeza que quer remover a pasta &quot;%folder_name%&quot; e todos os itens que ela cont�m? Esta a��o � irrevers�vel.</msg>
   <msg key="lt_Delete_this_file_incl">Remover este arquivo (incluindo todas as vers�es)</msg>
   <msg key="lt_Download_an_archive_o">Baixar um arquivo com o conte�do desta pasta</msg>
   <msg key="lt_Either_there_is_alrea">J� existe uma pasta com o nome &quot;%folder_name%&quot; ou voc� clicou no bot�o mais do que uma vez. Voc� pode usar o bot�o Voltar para retornar e escolher um novo nome, ou &lt;a href=&quot;%directory_url%&quot;&gt;retorne a lista de diret�rios&lt;/a&gt; para ver se sua pasta est� l�.</msg>
   <msg key="lt_Folder_folder_name_is">Pasta %folder_name% est� vazia.</msg>
   <msg key="lt_It_appears_that_there">Parece que j� existe um arquivo com aquele nome nesta pasta (embora possivelmente voc� clicou mais que uma vez no bot�o submeter.)</msg>
+  <msg key="lt_Live_version_of_title">Vers�o ativa de &quot;%title%&quot;</msg>
   <msg key="lt_Modify_permissions_on">Modificar permiss�es neste arquivo</msg>
   <msg key="lt_Modify_permissions_on_1">Modificar permiss�es nesta pasta</msg>
   <msg key="lt_Please_enter_the_new_">Por favor digite o novo nome para este arquivo:</msg>
+  <msg key="lt_Select_the_folder_tha">Selecione a pasta de destino da c�pia de &quot;%file_name%&quot;</msg>
+  <msg key="lt_Select_the_folder_tha_1">Selecione a pasta de destino de &quot;%file_name%&quot;</msg>
   <msg key="lt_Show_files_modified_i">Mostrar arquivos modificados nos �ltimos</msg>
   <msg key="lt_show_only_live_versio">mostrar somente vers�o ativa</msg>
   <msg key="lt_The_folder_link_you_s">O %folder_link% que voc� selecionou j� cont�m um arquivo com o mesmo nome.</msg>
@@ -64,6 +78,8 @@
   <msg key="lt_You_probably_clicked_">Voc� provavelmente clicou no bot�o Adicionar mais do que um vez. Verifique se o arquivo est� propriamente carregado na %folder_link% que voc� quer, ou voc� pode usar o bot�o Back para retornar e redigitar a vers�o do arquivo.</msg>
   <msg key="lt_Your_file_is_larger_t">Seu arquivo � maior que o tamanho m�ximo do arquivo permitido neste sistema (%number_of_bytes% bytes)</msg>
   <msg key="lt_Your_file_is_larger_t_1">Seu arquivo � maior que o tamanho m�ximo de arquivos permitido neste sistema (%max_number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_search_on_query_">Sua procura por &quot;%query%&quot; n�o retornou nenhum resultado.</msg>
+  <msg key="lt_Your_search_on_query__1">Sua procura por &quot;%query%&quot; retornou os seguintes arquivos:</msg>
   <msg key="Modified">Modificado</msg>
   <msg key="Move">Mover</msg>
   <msg key="Name">Nome</msg>
@@ -77,8 +93,10 @@
   <msg key="Search_again">Procurar novamente:</msg>
   <msg key="Search_Results">Resultados da Procura</msg>
   <msg key="show_all_versions">mostrar todas as vers�es</msg>
+  <msg key="simple_add_page_title">Criar %pretty_name%</msg>
   <msg key="Size">Arquivo</msg>
   <msg key="Size_bytes">Tamanho (bytes)</msg>
+  <msg key="this_may_take_a_while">&lt;strong&gt;Observa��o:&lt;/strong&gt; Seja paciente. Esta opera��o pode ser demorada.</msg>
   <msg key="Title">T�tulo:</msg>
   <msg key="Title_">T�tulo :</msg>
   <msg key="Type">Tipo</msg>
@@ -89,6 +107,8 @@
   <msg key="Upload_New_File">Fazer Upload de um Novo Arquivo</msg>
   <msg key="Upload_New_Version">Fazer Upload de uma Nova Vers�o</msg>
   <msg key="URL">URL:</msg>
+  <msg key="version_add_page_title">Enviar Nova Vers�o de %title%</msg>
+  <msg key="version_delete_page_title">Deletar %version_name%</msg>
   <msg key="Version_filename">Nome do Arquivo com Vers�o</msg>
   <msg key="Version_filename_">Nome do Arquivo com Vers�o :</msg>
   <msg key="Version_filename_1">Nome de Arquivo com Vers�o:</msg>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.2-4.7d3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-4.6.3-5.0.0sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/forums/catalog/forums.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/catalog/forums.ch_zh.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/forums/catalog/forums.ch_zh.utf-8.xml	26 Feb 2004 15:29:14 -0000	1.2
@@ -1,8 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="forums" package_version="1.0d4" locale="ch_zh" charset="utf-8">
 
-  <msg key="Author">恬宀</msg>
-  <msg key="Edit">園辞</msg>
-  <msg key="edit">園辞</msg>
-  <msg key="Email">窮徨喨周</msg>
+  <msg key="Administer">管理</msg>
+  <msg key="Administration">管理</msg>
+  <msg key="approve">批准</msg>
+  <msg key="Are_you_sure_you_want_to_delete_lt">确实要删除此信息及&lt;strong&gt;全部回复&lt;/strong&gt;吗? </msg>
+  <msg key="Attach">要添加吗？</msg>
+  <msg key="Attachments">附件：</msg>
+  <msg key="Author">作者</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;返回&lt;/a&gt;到%forum.name%</msg>
+  <msg key="Body">内容</msg>
+  <msg key="by_Date">按日期</msg>
+  <msg key="by_Forum">按论坛</msg>
+  <msg key="Charter">章程</msg>
+  <msg key="closed">已关闭的</msg>
+  <msg key="Confirm">确认吗？</msg>
+  <msg key="Confirm_Delete">确认删除：</msg>
+  <msg key="Confirm_Post_to_Forum">确认发布帖子到论坛：</msg>
+  <msg key="Create_a_New_Forum">创建新论坛</msg>
+  <msg key="Create_New_Forum">创建新论坛</msg>
+  <msg key="delete">删除</msg>
+  <msg key="disable">使不能</msg>
+  <msg key="disable_it">使不能</msg>
+  <msg key="disabled">使不能的</msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="edit">编辑</msg>
+  <msg key="Edit_again">重新编辑</msg>
+  <msg key="Edit_forum">编辑论坛</msg>
+  <msg key="Edit_Message">编辑信息：</msg>
+  <msg key="Email">Email</msg>
+  <msg key="email_alert_body_header">%posting_date%日，%user_name%写到：</msg>
+  <msg key="Email_Message">Email信息：</msg>
+  <msg key="Email_to_a_friend">Email给朋友</msg>
+  <msg key="enable">使能</msg>
+  <msg key="enable_it">使能</msg>
+  <msg key="enabled">使能的</msg>
+  <msg key="Entire_Thread">全Thread</msg>
+  <msg key="First_Post">第一帖</msg>
+  <msg key="Flat">普通的</msg>
+  <msg key="Format">格式</msg>
+  <msg key="Forum">论坛</msg>
+  <msg key="Forum_1">论坛：</msg>
+  <msg key="Forum_ID">Forum ID </msg>
+  <msg key="forum_ID">forum ID </msg>
+  <msg key="Forum_Name">论坛名称</msg>
+  <msg key="Forum_Posting">论坛发布</msg>
+  <msg key="ForumID">ForumID </msg>
+  <msg key="Forums">论坛</msg>
+  <msg key="Forums_Posting_hist_lt">论坛：发布帖子历史记录记录</msg>
+  <msg key="forward">向前</msg>
+  <msg key="Fwd">向前：</msg>
+  <msg key="html">HTML</msg>
+  <msg key="Last_Post">最后帖</msg>
+  <msg key="Last_post_in_subject">此主题最后帖子</msg>
+  <msg key="lt_Email_a_copy_of_the_f">Email下列信息的拷贝：</msg>
+  <msg key="lt_First_post_in_subject">此主题的第一帖子</msg>
+  <msg key="lt_Forums_Administration">论坛管理</msg>
+  <msg key="lt_Need_to_provide_a_mes">需要提供显示信息。</msg>
+  <msg key="lt_need_to_provide_a_mes">需要提供显示附件信息！</msg>
+  <msg key="lt_Note_that_you_are_alr">（注意：你已整体订阅论坛。你可能收到重复的通知。）</msg>
+  <msg key="lt_Please_confirm_the_fo">请确认下面的帖子：</msg>
+  <msg key="lt_Please_enter_a_messag">请输入信息</msg>
+  <msg key="lt_Please_enter_a_subjec">请输入主题</msg>
+  <msg key="lt_Users_Can_Create_New_">用户可创建新Threads</msg>
+  <msg key="lt_Would_you_like_to_att">要为此信息附加文件吗？</msg>
+  <msg key="lt_Would_you_like_to_sub">要订阅回复吗？</msg>
+  <msg key="lt_You_either_have_to">可以在论坛发布帖子，也可以回复信息。</msg>
+  <msg key="Manage">管理</msg>
+  <msg key="Manage_Forum">管理论坛：</msg>
+  <msg key="ManageModerate">控制/调制</msg>
+  <msg key="Message_ID">Message ID</msg>
+  <msg key="Moderate">调制</msg>
+  <msg key="moderated">已调制的</msg>
+  <msg key="Name">名称</msg>
+  <msg key="New_Forum">新论坛</msg>
+  <msg key="No">没有</msg>
+  <msg key="No_Forums">没有论坛</msg>
+  <msg key="No_Messages">没有信息</msg>
+  <msg key="No_Postings">没有帖子。</msg>
+  <msg key="None">没有</msg>
+  <msg key="One_Message">一条信息</msg>
+  <msg key="One_Thread">一个Thread</msg>
+  <msg key="open">打开</msg>
+  <msg key="Parameters">参数</msg>
+  <msg key="parent_ID">parent ID</msg>
+  <msg key="Pending">待定</msg>
+  <msg key="Pending_Threads">待定Threads</msg>
+  <msg key="Post">发布</msg>
+  <msg key="Post_a_Message">发布信息</msg>
+  <msg key="Post_a_New_Message">发布新信息</msg>
+  <msg key="Post_a_Reply">回复帖子</msg>
+  <msg key="Post_to_Forum">发布帖子到论坛：</msg>
+  <msg key="Posted">已发布的</msg>
+  <msg key="Posted_by">发布</msg>
+  <msg key="Posting_Date">发布日期</msg>
+  <msg key="Posting_History">发布历史记录</msg>
+  <msg key="Posting_history_for">发布历史记录</msg>
+  <msg key="Posting_Policy">发布策略</msg>
+  <msg key="Presentation">陈述</msg>
+  <msg key="Preview">预览</msg>
+  <msg key="Re">回复：</msg>
+  <msg key="reject">拒绝</msg>
+  <msg key="Rejected">被拒绝的</msg>
+  <msg key="Replies">回复</msg>
+  <msg key="reply">回复</msg>
+  <msg key="Reply_to_first_post_in_thread">回复此thread第一帖子</msg>
+  <msg key="Reply_to_first_post_on_page_label">回复此页第一帖子</msg>
+  <msg key="Search">搜索：</msg>
+  <msg key="Search_1">搜索</msg>
+  <msg key="Search_colon">搜索：</msg>
+  <msg key="Search_Forums">搜索论坛</msg>
+  <msg key="Subject">主题</msg>
+  <msg key="Subscribe">要订阅吗？</msg>
+  <msg key="text">普通文本</msg>
+  <msg key="This_forum_is">此论坛是</msg>
+  <msg key="Threaded">Threaded</msg>
+  <msg key="Threads">Threads</msg>
+  <msg key="View">查看</msg>
+  <msg key="Yes">是</msg>
+  <msg key="You_may">你可能</msg>
+  <msg key="Your_Note">注意</msg>
 </message_catalog>
Index: openacs-4/packages/forums/catalog/forums.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.da_DK.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/forums/catalog/forums.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:11 -0000	1.11
+++ openacs-4/packages/forums/catalog/forums.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.12
@@ -4,94 +4,108 @@
   <msg key="Administer">Administr�r</msg>
   <msg key="Administration">Administration</msg>
   <msg key="approve">godkend</msg>
-  <msg key="Are_you_sure_you_want_to_delete_lt">Er du sikker p�, at du �nsker at slette denne besked og &lt;strong&gt;alle svar til den&lt;/strong&gt;</msg>
+  <msg key="Are_you_sure_you_want_to_delete_lt">Er du sikker p�, at du �nsker at slette dette indl�g og &lt;strong&gt;alle svar til den&lt;/strong&gt;</msg>
   <msg key="Attach">Vedh�ft?</msg>
-  <msg key="Attachments">Vedh�ftninger:</msg>
+  <msg key="Attachments">Vedh�ftelser:</msg>
   <msg key="Author">Forfatter</msg>
-  <msg key="Body">Beskedtekst</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Tilbage&lt;/a&gt; til %forum.name%</msg>
+  <msg key="Body">Tekst</msg>
   <msg key="by_Date">efter Dato</msg>
   <msg key="by_Forum">efter Forum</msg>
-  <msg key="Charter">Dokument</msg>
+  <msg key="Charter">Form�lsbeskrivelse</msg>
   <msg key="closed">lukket</msg>
   <msg key="Confirm">Bekr�ft?</msg>
   <msg key="Confirm_Delete">Bekr�ft Sletning:</msg>
-  <msg key="Confirm_Post_to_Forum">Ber�ft Insendelse til Forum:</msg>
+  <msg key="Confirm_Post_to_Forum">Bekr�ft indl�g til forum:</msg>
   <msg key="Create_a_New_Forum">Opret et nyt Forum</msg>
   <msg key="Create_New_Forum">Opret nyt Forum</msg>
-  <msg key="delete">slet</msg>
+  <msg key="delete">Slet</msg>
   <msg key="disable">deaktiv�r</msg>
-  <msg key="disable_it">deaktiv�re det</msg>
+  <msg key="disable_it">deaktivere det</msg>
   <msg key="disabled">deaktiveret</msg>
-  <msg key="Edit">Redig�r</msg>
-  <msg key="edit">redig�r</msg>
+  <msg key="Edit">Rediger</msg>
+  <msg key="edit">rediger</msg>
+  <msg key="Edit_again">Rediger igen</msg>
   <msg key="Edit_forum">Rediger Forum</msg>
-  <msg key="Edit_Message">Rediger Besked:</msg>
+  <msg key="Edit_Message">Rediger Indl�g:</msg>
   <msg key="Email">E-mail</msg>
+  <msg key="email_alert_body_header">%user_name% skrev p� %posting_date%:</msg>
   <msg key="Email_Message">E-mail Besked:</msg>
-  <msg key="Email_to_a_friend">Mail til en ven</msg>
+  <msg key="Email_to_a_friend">Send til en ven</msg>
   <msg key="enable">aktiv�r</msg>
   <msg key="enable_it">aktiv�re det</msg>
   <msg key="enabled">aktiveret</msg>
   <msg key="Entire_Thread">Hele Tr�den</msg>
-  <msg key="Flat">Flad</msg>
+  <msg key="First_Post">F�rste Indl�g</msg>
+  <msg key="Flat">Fladt</msg>
   <msg key="Format">Format</msg>
   <msg key="Forum">Forum</msg>
   <msg key="Forum_1">Forum:</msg>
   <msg key="Forum_ID">Forum ID</msg>
   <msg key="forum_ID">forum ID</msg>
   <msg key="Forum_Name">Forumnavn</msg>
-  <msg key="Forum_Posting">Forumbesked</msg>
+  <msg key="Forum_Posting">Forumindl�g</msg>
   <msg key="ForumID">Forum ID</msg>
   <msg key="Forums">Fora</msg>
-  <msg key="Forums_Posting_hist_lt">Fora: Indsendelseshistorie for</msg>
+  <msg key="Forums_Posting_hist_lt">Fora: Indl�g for</msg>
+  <msg key="forward">Frem</msg>
   <msg key="Fwd">Fwd:</msg>
   <msg key="html">html</msg>
-  <msg key="Last_Post">Seneste Indsendelse</msg>
-  <msg key="Last_post_in_subject">Sidste indseldelse indenfor emne</msg>
-  <msg key="lt_Email_a_copy_of_the_f">Mail en kopi af den f�lgende besked:</msg>
-  <msg key="lt_First_post_in_subject">F�rste indseldelse indenfor emne</msg>
+  <msg key="Last_Post">Seneste Indl�g</msg>
+  <msg key="Last_post_in_subject">Sidste indl�g indenfor emne</msg>
+  <msg key="lt_Email_a_copy_of_the_f">Send en kopi af det f�lgende indl�g:</msg>
+  <msg key="lt_First_post_in_subject">F�rste indl�g indenfor emne</msg>
   <msg key="lt_Forums_Administration">Administration af Fora</msg>
-  <msg key="lt_Need_to_provide_a_mes">Du skal angive en besked, som kan vises.</msg>
-  <msg key="lt_need_to_provide_a_mes">du skal angive en besked for at vise vedh�ftninger.</msg>
-  <msg key="lt_Note_that_you_are_alr">(Bem�rk, at du allerede abonnerer p� hele dette forum. Det er derfor muligt, at du modtager besked om nye insendelser to gange,)</msg>
-  <msg key="lt_Please_confirm_the_fo">Bekr�ft venligst den f�lgende indsendelse:</msg>
-  <msg key="lt_Please_enter_a_messag">Skriv venligt en besked</msg>
+  <msg key="lt_Need_to_provide_a_mes">Du skal angive et indl�g til visning.</msg>
+  <msg key="lt_need_to_provide_a_mes">du skal angive et indl�g for at vise vedh�ftelser.</msg>
+  <msg key="lt_Note_that_you_are_alr">(Bem�rk, at du allerede abonnerer p� hele dette forum. Det er derfor muligt, at du modtager besked om nye indl�g to gange.)</msg>
+  <msg key="lt_Please_confirm_the_fo">Bekr�ft venligst den f�lgende indl�g:</msg>
+  <msg key="lt_Please_enter_a_messag">Skriv venligt et indl�g</msg>
   <msg key="lt_Please_enter_a_subjec">Skriv venligt et emne</msg>
   <msg key="lt_Users_Can_Create_New_">Brugere kan oprette nye tr�de</msg>
-  <msg key="lt_Would_you_like_to_att">�nsker du at vedh�fte en fil til denne besked?</msg>
+  <msg key="lt_Would_you_like_to_att">�nsker du at vedh�fte en fil til dette indl�g?</msg>
   <msg key="lt_Would_you_like_to_sub">�nsker du er at abonnere p� svar?</msg>
-  <msg key="lt_You_either_have_to">Du skal enten indesende til et forum eller svare p� en anden besked</msg>
+  <msg key="lt_You_either_have_to">Du skal enten skrive et indl�g til et forum eller svare p� et andet indl�g</msg>
   <msg key="Manage">Administr�r</msg>
   <msg key="Manage_Forum">Administr�r Forum</msg>
   <msg key="ManageModerate">Administr�r/Moder�r</msg>
   <msg key="Message_ID">Besked ID</msg>
+  <msg key="Moderate">Moderer</msg>
   <msg key="moderated">modereret</msg>
   <msg key="Name">Navn</msg>
   <msg key="New_Forum">Nyt Forum</msg>
   <msg key="No">Nej</msg>
   <msg key="No_Forums">Ingen Fora</msg>
   <msg key="No_Messages">Ingen Beskeder</msg>
-  <msg key="No_Postings">Ingen Insendelser.</msg>
+  <msg key="No_Postings">Ingen Indl�g.</msg>
   <msg key="None">Ingen</msg>
-  <msg key="One_Message">�n Besked</msg>
-  <msg key="One_Thread">�n Tr�d</msg>
+  <msg key="One_Message">Et Indl�g</msg>
+  <msg key="One_Thread">En Tr�d</msg>
   <msg key="open">�bn</msg>
+  <msg key="Parameters">Parametre</msg>
   <msg key="parent_ID">parent ID</msg>
-  <msg key="Pending_Threads">Foreliggende Tr�de</msg>
-  <msg key="Post_a_Message">Indsend en Besked</msg>
-  <msg key="Post_a_New_Message">Indsend en Ny Besked</msg>
+  <msg key="Pending">Afventer</msg>
+  <msg key="Pending_Threads">Afventende Tr�de</msg>
+  <msg key="Post">Indl�g</msg>
+  <msg key="Post_a_Message">Indsend et indl�g</msg>
+  <msg key="Post_a_New_Message">Indsend et nyt indl�g</msg>
   <msg key="Post_a_Reply">Indsend et Svar</msg>
   <msg key="Post_to_Forum">Indsend til Forum:</msg>
   <msg key="Posted">Indsendt</msg>
-  <msg key="Posting_Date">Insendelsesdato</msg>
-  <msg key="Posting_History">Insendelseshistorie</msg>
-  <msg key="Posting_history_for">Insendelseshistorie for</msg>
+  <msg key="Posted_by">Indsendt af</msg>
+  <msg key="Posting_Date">Indsendelsesdato</msg>
+  <msg key="Posting_History">Indsendelseshistorik</msg>
+  <msg key="Posting_history_for">Indsendelseshistorik for</msg>
   <msg key="Posting_Policy">Indsendelsespolitik</msg>
   <msg key="Presentation">Pr�sentation</msg>
+  <msg key="Preview">Vis</msg>
   <msg key="Re">Re:</msg>
   <msg key="reject">afvis</msg>
+  <msg key="Rejected">Afvist</msg>
   <msg key="Replies">Svar</msg>
   <msg key="reply">svar</msg>
+  <msg key="Reply_to_first_post_in_thread">Besvar det f�rste indl�g i tr�den</msg>
+  <msg key="Reply_to_first_post_on_page_label">Besvar det f�rste indl�g p� denne side</msg>
   <msg key="Search">S�g:</msg>
   <msg key="Search_1">S�g</msg>
   <msg key="Search_colon">S�g:</msg>
Index: openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml	3 Nov 2003 09:53:20 -0000	1.9
+++ openacs-4/packages/forums/catalog/forums.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.10
@@ -2,12 +2,13 @@
 <message_catalog package_key="forums" package_version="1.0d4" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Administer">Forum verwalten</msg>
-  <msg key="Administration">Foren verwalten</msg>
+  <msg key="Administration">Diskussionsforen verwalten</msg>
   <msg key="approve">Freigeben</msg>
   <msg key="Are_you_sure_you_want_to_delete_lt">Wollen Sie diesen Beitrag und &lt;strong&gt;alle zugeh�rigen Antworten &lt;/strong&gt; wirklich l�schen?</msg>
   <msg key="Attach">Anh�ngen?</msg>
   <msg key="Attachments">Anh�nge:</msg>
   <msg key="Author">Verfasser</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Zur�ck&lt;/a&gt; zu %forum.name%</msg>
   <msg key="Body">Inhalt</msg>
   <msg key="by_Date">nach Datum</msg>
   <msg key="by_Forum">nach Forum</msg>
@@ -24,15 +25,18 @@
   <msg key="disabled">Deaktiviert</msg>
   <msg key="Edit">Bearbeiten</msg>
   <msg key="edit">Bearbeiten</msg>
+  <msg key="Edit_again">Erneut bearbeiten</msg>
   <msg key="Edit_forum">Forum bearbeiten</msg>
   <msg key="Edit_Message">Forumsbeitrag bearbeiten:</msg>
   <msg key="Email">E-Mail-Adresse</msg>
+  <msg key="email_alert_body_header">%user_name% schrieb am %posting_date%:</msg>
   <msg key="Email_Message">E-Mail-Nachricht:</msg>
   <msg key="Email_to_a_friend">Weiterleiten</msg>
   <msg key="enable">Aktivieren</msg>
   <msg key="enable_it">aktivieren</msg>
   <msg key="enabled">aktiviert</msg>
-  <msg key="Entire_Thread">Gesamter Thread</msg>
+  <msg key="Entire_Thread">Gesamter Diskussionsfaden</msg>
+  <msg key="First_Post">Erster Beitrag</msg>
   <msg key="Flat">Unstrukturiert</msg>
   <msg key="Format">Format</msg>
   <msg key="Forum">Forum</msg>
@@ -44,54 +48,64 @@
   <msg key="ForumID">Foren-ID</msg>
   <msg key="Forums">Foren</msg>
   <msg key="Forums_Posting_hist_lt">Foren: Verlauf der Beitr�ge f�r</msg>
+  <msg key="forward">Weiterleiten</msg>
   <msg key="Fwd">Fwd:</msg>
   <msg key="html">HTML</msg>
   <msg key="Last_Post">Letzter Beitrag</msg>
   <msg key="Last_post_in_subject">Letzter Beitrag zum Thema</msg>
   <msg key="lt_Email_a_copy_of_the_f">Eine Kopie folgender Nachricht per E-Mail versenden:</msg>
   <msg key="lt_First_post_in_subject">Erster Beitrag zum Thema</msg>
   <msg key="lt_Forums_Administration">Diskussionsforen verwalten</msg>
-  <msg key="lt_Need_to_provide_a_mes">Zum Anzeigen von Anlagen wird eine Nachricht ben�tigt.</msg>
-  <msg key="lt_need_to_provide_a_mes">Zum Anzeigen von Anlagen wird eine Nachricht ben�tigt.</msg>
-  <msg key="lt_Note_that_you_are_alr">(Hinweis: Sie haben die Benachrichtigungsfunktion bereits f�r das gesamte Forum aktiviert. M�glicherweise erhalten Sie Benachrichtigungen mehrfach.)</msg>
+  <msg key="lt_Need_to_provide_a_mes">Zum Anzeigen der Elemente wird eine Nachricht ben�tigt.</msg>
+  <msg key="lt_need_to_provide_a_mes">Zum Anzeigen von Anh�ngen wird eine Nachricht ben�tigt.</msg>
+  <msg key="lt_Note_that_you_are_alr">Hinweis: Sie haben die Benachrichtigungsfunktion bereits f�r das gesamte Forum aktiviert. M�glicherweise erhalten Sie mehrfache Benachrichtigungen.</msg>
   <msg key="lt_Please_confirm_the_fo">Bitte best�tigen Sie folgenden Beitrag:</msg>
   <msg key="lt_Please_enter_a_messag">Bitte geben Sie eine Nachricht ein.</msg>
   <msg key="lt_Please_enter_a_subjec">Bitte geben Sie einen Betreff an.</msg>
-  <msg key="lt_Users_Can_Create_New_">Benutzer d�rfen neue Threads initiieren</msg>
+  <msg key="lt_Users_Can_Create_New_">Benutzer d�rfen einen neuen Diskussionsfaden beginnen</msg>
   <msg key="lt_Would_you_like_to_att">M�chten Sie dem Beitrag einen Anhang hinzuf�gen?</msg>
   <msg key="lt_Would_you_like_to_sub">M�chten Sie �ber Antworten benachrichtigt werden?</msg>
   <msg key="lt_You_either_have_to">Sie k�nnen eine Nachricht entweder als eigenst�ndigen Forumsbeitrag posten oder als Antwort auf einen anderen Beitrag.</msg>
   <msg key="Manage">Verwalten</msg>
   <msg key="Manage_Forum">Forum verwalten:</msg>
-  <msg key="ManageModerate">Forum verwalten/moderieren</msg>
+  <msg key="ManageModerate">Verwalten/Moderieren</msg>
   <msg key="Message_ID">Beitrags-ID</msg>
+  <msg key="Moderate">Moderieren</msg>
   <msg key="moderated">Moderiert</msg>
   <msg key="Name">Name</msg>
   <msg key="New_Forum">Neues Forum erstellen</msg>
   <msg key="No">Nein</msg>
   <msg key="No_Forums">Keine Diskussionsforen vorhanden</msg>
   <msg key="No_Messages">Keine Beitr�ge vorhanden</msg>
   <msg key="No_Postings">Keine Beitr�ge vorhanden</msg>
-  <msg key="None">Keines vorhanden</msg>
+  <msg key="None">Kein Forum vorhanden</msg>
   <msg key="One_Message">Einzelner Beitrag</msg>
-  <msg key="One_Thread">Einzelner Thread</msg>
+  <msg key="One_Thread">Einzelner Diskussionsfaden</msg>
   <msg key="open">Offen</msg>
-  <msg key="parent_ID">�bergeordnete ID</msg>
-  <msg key="Pending_Threads">Threads mit Beitr�gen, die noch nicht freigegeben wurden</msg>
+  <msg key="Parameters">Einstellungen</msg>
+  <msg key="parent_ID">ID des �bergeordneten Objekts</msg>
+  <msg key="Pending">Noch nicht freigegeben</msg>
+  <msg key="Pending_Threads">Diskussionsf�den mit Beitr�gen, die noch nicht freigegeben wurden</msg>
+  <msg key="Post">Senden</msg>
   <msg key="Post_a_Message">Neuen Beitrag verfassen</msg>
   <msg key="Post_a_New_Message">Neuen Beitrag verfassen</msg>
   <msg key="Post_a_Reply">Antworten</msg>
-  <msg key="Post_to_Forum">Ver�ffentlichen auf Forum</msg>
+  <msg key="Post_to_Forum">Ver�ffentlichen auf Forum:</msg>
   <msg key="Posted">Beitrag vom</msg>
+  <msg key="Posted_by">Von</msg>
   <msg key="Posting_Date">Ver�ffentlichungsdatum</msg>
   <msg key="Posting_History">Verlauf der Beitr�ge</msg>
   <msg key="Posting_history_for">Verlauf der Beitr�ge f�r</msg>
   <msg key="Posting_Policy">Teilnahmeregelung</msg>
   <msg key="Presentation">Darstellungsform</msg>
+  <msg key="Preview">Vorschau</msg>
   <msg key="Re">Re:</msg>
   <msg key="reject">Ablehnen</msg>
+  <msg key="Rejected">Abgelehnt</msg>
   <msg key="Replies">Antworten</msg>
   <msg key="reply">Antworten</msg>
+  <msg key="Reply_to_first_post_in_thread">Ersten Beitrag innerhalb des Diskussionsfadens beantworten</msg>
+  <msg key="Reply_to_first_post_on_page_label">Ersten Beitrag auf dieser Seite beantworten</msg>
   <msg key="Search">Suche:</msg>
   <msg key="Search_1">Suche</msg>
   <msg key="Search_colon">Suche:</msg>
@@ -100,8 +114,8 @@
   <msg key="Subscribe">Benachrichtigungsfunktion aktivieren?</msg>
   <msg key="text">Inhalt</msg>
   <msg key="This_forum_is">Dieses Forum ist</msg>
-  <msg key="Threaded">Nach Threads strukturiert</msg>
-  <msg key="Threads">Threads</msg>
+  <msg key="Threaded">Nach Diskussionsfaden strukturiert</msg>
+  <msg key="Threads">Diskussionsf�den</msg>
   <msg key="View">Ansicht</msg>
   <msg key="Yes">Ja</msg>
   <msg key="You_may">Sie k�nnen es</msg>
Index: openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml	3 Nov 2003 09:53:20 -0000	1.9
+++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.10
@@ -8,6 +8,7 @@
   <msg key="Attach">�Adjuntar archivo(s)?</msg>
   <msg key="Attachments">Archivos adjuntos:</msg>
   <msg key="Author">Autor</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Volver&lt;/a&gt; a %forum.name%</msg>
   <msg key="Body">Cuerpo del mensaje</msg>
   <msg key="by_Date">Por Fecha</msg>
   <msg key="by_Forum">por Foro de Discusi�n</msg>
@@ -24,15 +25,18 @@
   <msg key="disabled">no habilitado</msg>
   <msg key="Edit">Editar</msg>
   <msg key="edit">editar</msg>
+  <msg key="Edit_again">Modificar de nuevo</msg>
   <msg key="Edit_forum">Editar foro de discusi�n</msg>
   <msg key="Edit_Message">Editar Mensaje:</msg>
   <msg key="Email">Email</msg>
+  <msg key="email_alert_body_header">El %posting_date%, %user_name% escribi�:</msg>
   <msg key="Email_Message">Mensaje:</msg>
   <msg key="Email_to_a_friend">Enviar por email a terceros</msg>
   <msg key="enable">habilitar</msg>
   <msg key="enable_it">habilitar</msg>
   <msg key="enabled">habilitado</msg>
   <msg key="Entire_Thread">Hilo completo</msg>
+  <msg key="First_Post">Primer Mensaje</msg>
   <msg key="Flat">Sin hilos</msg>
   <msg key="Format">Formato</msg>
   <msg key="Forum">Foro de Discusi�n</msg>
@@ -44,6 +48,7 @@
   <msg key="ForumID">ForoID</msg>
   <msg key="Forums">Foros de Discusi�n</msg>
   <msg key="Forums_Posting_hist_lt">Foros de Discusi�n: Historia de mensajes de</msg>
+  <msg key="forward">Reenviar</msg>
   <msg key="Fwd">Re-enviar:</msg>
   <msg key="html">html</msg>
   <msg key="Last_Post">�ltimo Mensaje</msg>
@@ -65,6 +70,7 @@
   <msg key="Manage_Forum">Administrar Foro de Discusi�n:</msg>
   <msg key="ManageModerate">Administrar/Moderar</msg>
   <msg key="Message_ID">Mensaje ID</msg>
+  <msg key="Moderate">Moderar</msg>
   <msg key="moderated">moderado</msg>
   <msg key="Name">Nombre</msg>
   <msg key="New_Forum">Nuevo Foro de Discusi�n</msg>
@@ -76,22 +82,30 @@
   <msg key="One_Message">Un Mensaje</msg>
   <msg key="One_Thread">Un hilo</msg>
   <msg key="open">Abrir</msg>
+  <msg key="Parameters">Par�metros</msg>
   <msg key="parent_ID">ID del padre</msg>
+  <msg key="Pending">Pendientes</msg>
   <msg key="Pending_Threads">Hilos pendientes</msg>
+  <msg key="Post">Enviar</msg>
   <msg key="Post_a_Message">Enviar un mensaje</msg>
   <msg key="Post_a_New_Message">Enviar un nuevo Mensaje</msg>
   <msg key="Post_a_Reply">Enviar una respuesta</msg>
   <msg key="Post_to_Forum">Enviar al Foro de Discusi�n</msg>
   <msg key="Posted">Enviados</msg>
+  <msg key="Posted_by">Enviado por</msg>
   <msg key="Posting_Date">Fecha de Env�o</msg>
   <msg key="Posting_History">Historia de Mensajes Enviados</msg>
   <msg key="Posting_history_for">Mensajes Enviados por </msg>
   <msg key="Posting_Policy">Pol�tica de publicaciones</msg>
   <msg key="Presentation">Presentaci�n</msg>
+  <msg key="Preview">Vista preliminar</msg>
   <msg key="Re">Res: </msg>
   <msg key="reject">rechazar</msg>
+  <msg key="Rejected">Rechazado</msg>
   <msg key="Replies">Contestaciones</msg>
   <msg key="reply">Contestar</msg>
+  <msg key="Reply_to_first_post_in_thread">Responder al primer mensaje de este hilo</msg>
+  <msg key="Reply_to_first_post_on_page_label">Responder al primer mensaje de esta p�gina</msg>
   <msg key="Search">Buscar:</msg>
   <msg key="Search_1">Buscar</msg>
   <msg key="Search_colon">Buscar:</msg>
Index: openacs-4/packages/forums/catalog/forums.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.it_IT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/catalog/forums.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/forums/catalog/forums.it_IT.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.9
@@ -8,6 +8,7 @@
   <msg key="Attach">Allega?</msg>
   <msg key="Attachments">Allegati</msg>
   <msg key="Author">Autore</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Torna indietro&lt;/a&gt; a %forum.name%</msg>
   <msg key="Body">Messaggio</msg>
   <msg key="by_Date">per Data</msg>
   <msg key="by_Forum">per Forum</msg>
@@ -24,15 +25,18 @@
   <msg key="disabled">disabilitati</msg>
   <msg key="Edit">Modifica</msg>
   <msg key="edit">modifica</msg>
+  <msg key="Edit_again">Modifica ancora</msg>
   <msg key="Edit_forum">Modifica il forum</msg>
   <msg key="Edit_Message">Modifica il Messaggio:</msg>
   <msg key="Email">Email</msg>
+  <msg key="email_alert_body_header">Il %posting_date%, %user_name% ha scritto:</msg>
   <msg key="Email_Message">Spedisci il messaggio:</msg>
   <msg key="Email_to_a_friend">Invia a un amico</msg>
   <msg key="enable">abilita</msg>
   <msg key="enable_it">abilitalo</msg>
   <msg key="enabled">abilitato</msg>
   <msg key="Entire_Thread">L'intera discussione</msg>
+  <msg key="First_Post">Primo messaggio</msg>
   <msg key="Flat">Piatto</msg>
   <msg key="Format">Formato</msg>
   <msg key="Forum">Forum</msg>
@@ -44,6 +48,7 @@
   <msg key="ForumID">ForumID</msg>
   <msg key="Forums">Forum</msg>
   <msg key="Forums_Posting_hist_lt">Forum: Lista messaggi dell'utente</msg>
+  <msg key="forward">Inoltra</msg>
   <msg key="Fwd">Fwd:</msg>
   <msg key="html">html</msg>
   <msg key="Last_Post">Ultimo messaggio</msg>
@@ -65,6 +70,7 @@
   <msg key="Manage_Forum">Gestione Forum:</msg>
   <msg key="ManageModerate">Gestisci/Modera</msg>
   <msg key="Message_ID">ID Messaggio</msg>
+  <msg key="Moderate">Modera</msg>
   <msg key="moderated">moderato</msg>
   <msg key="Name">Nome</msg>
   <msg key="New_Forum">Nuovo Forum</msg>
@@ -76,22 +82,30 @@
   <msg key="One_Message">Un messaggio</msg>
   <msg key="One_Thread">Una discussione</msg>
   <msg key="open">aperta</msg>
+  <msg key="Parameters">Parametri</msg>
   <msg key="parent_ID">parent ID</msg>
+  <msg key="Pending">Pendente</msg>
   <msg key="Pending_Threads">Discussioni in attesa</msg>
+  <msg key="Post">Messaggio</msg>
   <msg key="Post_a_Message">Invia un messaggio</msg>
   <msg key="Post_a_New_Message">Invia un nuovo messaggio</msg>
   <msg key="Post_a_Reply">Invia una risposta</msg>
   <msg key="Post_to_Forum">Invia un messaggio al Forum:</msg>
   <msg key="Posted">Data d'invio</msg>
+  <msg key="Posted_by">Inviato da</msg>
   <msg key="Posting_Date">Data di invio</msg>
   <msg key="Posting_History">Elenco dei messaggi</msg>
   <msg key="Posting_history_for">Lista dei messaggi per l'utente</msg>
   <msg key="Posting_Policy">Politica sui messaggi pendente</msg>
   <msg key="Presentation">Presentazione</msg>
+  <msg key="Preview">Anteprima</msg>
   <msg key="Re">Re:</msg>
   <msg key="reject">rifiuta</msg>
+  <msg key="Rejected">Respinto</msg>
   <msg key="Replies">Risposte</msg>
   <msg key="reply">rispondi</msg>
+  <msg key="Reply_to_first_post_in_thread">Rispondi al primo messaggio della discussione</msg>
+  <msg key="Reply_to_first_post_on_page_label">Rispondi al primo messaggio su questa pagina</msg>
   <msg key="Search">Cerca:</msg>
   <msg key="Search_1">Cerca</msg>
   <msg key="Search_colon">Cerca:</msg>
Index: openacs-4/packages/forums/catalog/forums.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/catalog/forums.ko_KR.utf-8.xml	15 Oct 2003 15:01:43 -0000	1.1
+++ openacs-4/packages/forums/catalog/forums.ko_KR.utf-8.xml	26 Feb 2004 15:29:14 -0000	1.2
@@ -8,6 +8,7 @@
   <msg key="Attach">첨부하시겠습니까?</msg>
   <msg key="Attachments">첨부:</msg>
   <msg key="Author">글쓴이</msg>
+  <msg key="Back_to_thread_link">%forum.name%으로 &lt;a href=&quot;%thread_url%&quot;&gt;돌아가기&lt;/a&gt; </msg>
   <msg key="Body">본문</msg>
   <msg key="by_Date">일자에 의해</msg>
   <msg key="by_Forum">포럼에 의해</msg>
@@ -24,15 +25,18 @@
   <msg key="disabled">사용불가능하다</msg>
   <msg key="Edit">수정</msg>
   <msg key="edit">수정</msg>
+  <msg key="Edit_again">다시 수정</msg>
   <msg key="Edit_forum">포럼 수정</msg>
   <msg key="Edit_Message">메시지 수정:</msg>
   <msg key="Email">전자우편주소</msg>
+  <msg key="email_alert_body_header">%posting_date%에 %user_name%(이)가 기록함</msg>
   <msg key="Email_Message">전자우편 메시지:</msg>
   <msg key="Email_to_a_friend">친구에게 전자우편 보내기</msg>
   <msg key="enable">사용가능하게 하다</msg>
   <msg key="enable_it">사용가능하게 하다</msg>
   <msg key="enabled">사용가능하게 하다</msg>
   <msg key="Entire_Thread">전체 스레드</msg>
+  <msg key="First_Post">처음 게시</msg>
   <msg key="Flat">플랫</msg>
   <msg key="Format">형식</msg>
   <msg key="Forum">포럼</msg>
@@ -44,6 +48,7 @@
   <msg key="ForumID">포럼 아이디</msg>
   <msg key="Forums">포럼</msg>
   <msg key="Forums_Posting_hist_lt">포럼: 게시 기록</msg>
+  <msg key="forward">전달</msg>
   <msg key="Fwd">전달:</msg>
   <msg key="html">html </msg>
   <msg key="Last_Post">마지막 게시</msg>
@@ -65,6 +70,7 @@
   <msg key="Manage_Forum">포럼 관리:</msg>
   <msg key="ManageModerate">관리/조절</msg>
   <msg key="Message_ID">메시지 아이디</msg>
+  <msg key="Moderate">조절하다</msg>
   <msg key="moderated">조절하다</msg>
   <msg key="Name">이름</msg>
   <msg key="New_Forum">새로운 포럼</msg>
@@ -76,22 +82,30 @@
   <msg key="One_Message">하나의 메시지</msg>
   <msg key="One_Thread">한개의 스레드</msg>
   <msg key="open">열기</msg>
+  <msg key="Parameters">파라미터</msg>
   <msg key="parent_ID">부모 아이디</msg>
+  <msg key="Pending">계류중</msg>
   <msg key="Pending_Threads">보류중인 스레드</msg>
+  <msg key="Post">게시</msg>
   <msg key="Post_a_Message">메시지 게시</msg>
   <msg key="Post_a_New_Message">새로운 메시지 게시</msg>
   <msg key="Post_a_Reply">회신 게시</msg>
   <msg key="Post_to_Forum">포럼에 게시:</msg>
   <msg key="Posted">게시된</msg>
+  <msg key="Posted_by">게시됨</msg>
   <msg key="Posting_Date">게시 일자</msg>
   <msg key="Posting_History">게시 기록</msg>
   <msg key="Posting_history_for">게시 기록</msg>
   <msg key="Posting_Policy">게시 정책</msg>
   <msg key="Presentation">표현</msg>
+  <msg key="Preview">미리보기</msg>
   <msg key="Re">응답:</msg>
   <msg key="reject">거부</msg>
+  <msg key="Rejected">거부됨</msg>
   <msg key="Replies">회신</msg>
   <msg key="reply">회신</msg>
+  <msg key="Reply_to_first_post_in_thread">스레드안의 첫번째 게시물에 응답</msg>
+  <msg key="Reply_to_first_post_on_page_label">이 페이지의 첫번째 게시물에 응답</msg>
   <msg key="Search">검색:</msg>
   <msg key="Search_1">검색</msg>
   <msg key="Search_colon">검색:</msg>
Index: openacs-4/packages/forums/catalog/forums.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/catalog/forums.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:20 -0000	1.9
+++ openacs-4/packages/forums/catalog/forums.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.10
@@ -3,54 +3,59 @@
 
   <msg key="Administer">Beheer</msg>
   <msg key="Administration">Beheer</msg>
-  <msg key="approve">Keur goed</msg>
-  <msg key="Are_you_sure_you_want_to_delete_lt">Weet u zeker dat u dit bericht wilt verijderen? &lt;strong&gt;Alle reacties op dit bericht worden tevens verwijdert!&lt;/strong&gt;</msg>
-  <msg key="Attach">Aanhechten?</msg>
+  <msg key="approve">Goedkeuren</msg>
+  <msg key="Are_you_sure_you_want_to_delete_lt">Weet je zeker dat u dit bericht wilt verwijderen? &lt;strong&gt;Alle reacties op dit bericht worden tevens verwijderd!&lt;/strong&gt;</msg>
+  <msg key="Attach">Bijvoegen?</msg>
   <msg key="Attachments">Bijlagen:</msg>
   <msg key="Author">Auteur</msg>
+  <msg key="Back_to_thread_link">&lt;a href='%thread_url'&gt;Terug&lt;/a&gt; naar %forum.name%.</msg>
   <msg key="Body">Inhoud</msg>
   <msg key="by_Date">op Datum</msg>
   <msg key="by_Forum">op Forum</msg>
   <msg key="Charter">Beschrijving</msg>
   <msg key="closed">Gesloten</msg>
   <msg key="Confirm">Bevestigen?</msg>
-  <msg key="Confirm_Delete">Bevestig Verwijderen:</msg>
+  <msg key="Confirm_Delete">Bevestig verwijderen:</msg>
   <msg key="Confirm_Post_to_Forum">Bevestig Bericht in Forum:</msg>
-  <msg key="Create_a_New_Forum">Cre�er een Forum</msg>
-  <msg key="Create_New_Forum">Cre�er een Forum</msg>
+  <msg key="Create_a_New_Forum">Een nieuw forum aanmaken</msg>
+  <msg key="Create_New_Forum">Nieuw forum aanmaken</msg>
   <msg key="delete">verwijder</msg>
   <msg key="disable">Blokkeer</msg>
   <msg key="disable_it">Blokeer het</msg>
   <msg key="disabled">geblokeerd</msg>
   <msg key="Edit">Wijzig</msg>
   <msg key="edit">wijzig</msg>
-  <msg key="Edit_forum">Wijzig Forum</msg>
-  <msg key="Edit_Message">Wijzig Bericht:</msg>
-  <msg key="Email">Email</msg>
-  <msg key="Email_Message">Email Bericht:</msg>
+  <msg key="Edit_again">Opnieuw wijzigen</msg>
+  <msg key="Edit_forum">Forum wijzigen</msg>
+  <msg key="Edit_Message">Bericht wijzigen</msg>
+  <msg key="Email">E-mail</msg>
+  <msg key="email_alert_body_header">Op %posting_date%, schreef %user_name%:</msg>
+  <msg key="Email_Message">E-mailbericht:</msg>
   <msg key="Email_to_a_friend">Email een friend</msg>
-  <msg key="enable">Deblokkeer</msg>
+  <msg key="enable">inschakelen</msg>
   <msg key="enable_it">deblokkeer het</msg>
   <msg key="enabled">Actief</msg>
-  <msg key="Entire_Thread">Gehele Discussie</msg>
+  <msg key="Entire_Thread">Gehele discussie</msg>
+  <msg key="First_Post">Eerste bericht</msg>
   <msg key="Flat">Plat</msg>
   <msg key="Format">Formaat</msg>
   <msg key="Forum">Forum</msg>
   <msg key="Forum_1">Forum:</msg>
   <msg key="Forum_ID">Forum ID</msg>
   <msg key="forum_ID">forum ID</msg>
-  <msg key="Forum_Name">Forum Naam</msg>
-  <msg key="Forum_Posting">Forum Bericht</msg>
+  <msg key="Forum_Name">Forumnaam</msg>
+  <msg key="Forum_Posting">Forumbericht</msg>
   <msg key="ForumID">ForumID</msg>
   <msg key="Forums">Forums</msg>
   <msg key="Forums_Posting_hist_lt">Forums: Berichten overzicht voor:</msg>
+  <msg key="forward">Duursturen</msg>
   <msg key="Fwd">Doorgestuurd:</msg>
   <msg key="html">html</msg>
-  <msg key="Last_Post">Laatste Bericht.</msg>
-  <msg key="Last_post_in_subject">Laatste post in onderwerp</msg>
-  <msg key="lt_Email_a_copy_of_the_f">Email een copie van het volgende bericht:</msg>
-  <msg key="lt_First_post_in_subject">Eerste post in onderwerp</msg>
-  <msg key="lt_Forums_Administration">Forum Beheer</msg>
+  <msg key="Last_Post">Laatste bericht.</msg>
+  <msg key="Last_post_in_subject">Laatste bericht in onderwerp</msg>
+  <msg key="lt_Email_a_copy_of_the_f">E-mail een kopie van het volgende bericht:</msg>
+  <msg key="lt_First_post_in_subject">Eerste bericht in onderwerp</msg>
+  <msg key="lt_Forums_Administration">Forumbeheer</msg>
   <msg key="lt_Need_to_provide_a_mes">Om te tonen dient eerst voor een bericht te worden gezorgd</msg>
   <msg key="lt_need_to_provide_a_mes">Om bijlagen te kunnen tonen dient eerst voor een bericht te worden gezorgd!</msg>
   <msg key="lt_Note_that_you_are_alr">(Attentie! U bent al geabonneerd op het gehele forum. U kunt dubbele berichten ontvangen.)</msg>
@@ -63,39 +68,48 @@
   <msg key="lt_You_either_have_to">U dient te reageren op een ander bericht of een nieuwe discussie te starten in een forum.</msg>
   <msg key="Manage">Beheer</msg>
   <msg key="Manage_Forum">Beheer Forum:</msg>
-  <msg key="ManageModerate">Beheer/Voorzitten</msg>
+  <msg key="ManageModerate">Beheren/Recenseren</msg>
   <msg key="Message_ID">Bericht ID</msg>
-  <msg key="moderated">gesuperviseerd</msg>
+  <msg key="Moderate">Gerecenseerd</msg>
+  <msg key="moderated">gerecenseerd</msg>
   <msg key="Name">Naam</msg>
-  <msg key="New_Forum">Nieuw Forum</msg>
+  <msg key="New_Forum">Nieuw forum</msg>
   <msg key="No">Nee</msg>
-  <msg key="No_Forums">Geen Forums</msg>
+  <msg key="No_Forums">Geen forums</msg>
   <msg key="No_Messages">Geen Berichten</msg>
   <msg key="No_Postings">Geen Berichten</msg>
   <msg key="None">Geen</msg>
   <msg key="One_Message">E�n Bericht</msg>
   <msg key="One_Thread">E�n Discussie</msg>
   <msg key="open">open</msg>
+  <msg key="Parameters">Instellingen</msg>
   <msg key="parent_ID">Ouder ID</msg>
+  <msg key="Pending">In afwachting van</msg>
   <msg key="Pending_Threads">Hangende Discussies</msg>
-  <msg key="Post_a_Message">Publiceer Bericht</msg>
-  <msg key="Post_a_New_Message">Publiceer een Nieuw Bericht</msg>
-  <msg key="Post_a_Reply">Publiceer een Reactie</msg>
-  <msg key="Post_to_Forum">Publiceer in Forum:</msg>
+  <msg key="Post">Plaatsen</msg>
+  <msg key="Post_a_Message">Plaats een bericht</msg>
+  <msg key="Post_a_New_Message">Een nieuw bericht plaatsen</msg>
+  <msg key="Post_a_Reply">Plaats een reaktie</msg>
+  <msg key="Post_to_Forum">Plaatsen op forum</msg>
   <msg key="Posted">Gepubliceerd</msg>
-  <msg key="Posting_Date">Datum Publicatie</msg>
-  <msg key="Posting_History">Publicatie Overzicht</msg>
+  <msg key="Posted_by">Ingestuurd door</msg>
+  <msg key="Posting_Date">Plaatsingsdatum</msg>
+  <msg key="Posting_History">Publicatiegeschiedenis</msg>
   <msg key="Posting_history_for">Publicatie overzicht van</msg>
   <msg key="Posting_Policy">Publicatie Regelingen</msg>
   <msg key="Presentation">Presentatie</msg>
+  <msg key="Preview">Voorvertoning</msg>
   <msg key="Re">Betr:</msg>
   <msg key="reject">Weiger</msg>
+  <msg key="Rejected">Afgewezen</msg>
   <msg key="Replies">Reacties</msg>
   <msg key="reply">reageer</msg>
+  <msg key="Reply_to_first_post_in_thread">Beantwoord het eerste bericht in deze discussie</msg>
+  <msg key="Reply_to_first_post_on_page_label">Beantwoord het eerste bericht op deze pagina</msg>
   <msg key="Search">Zoek:</msg>
   <msg key="Search_1">Zoek</msg>
   <msg key="Search_colon">Zoek:</msg>
-  <msg key="Search_Forums">Zoek Forums</msg>
+  <msg key="Search_Forums">Forums doorzoeken</msg>
   <msg key="Subject">Titel</msg>
   <msg key="Subscribe">Abonneer?</msg>
   <msg key="text">tekst</msg>
@@ -105,5 +119,5 @@
   <msg key="View">Lees</msg>
   <msg key="Yes">Ja</msg>
   <msg key="You_may">U kunt</msg>
-  <msg key="Your_Note">Uw Notitie</msg>
+  <msg key="Your_Note">Jouw opmerking</msg>
 </message_catalog>
Index: openacs-4/packages/forums/catalog/forums.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/catalog/forums.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/forums/catalog/forums.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:29:14 -0000	1.9
@@ -8,6 +8,7 @@
   <msg key="Attach">Anexar?</msg>
   <msg key="Attachments">Anexos:</msg>
   <msg key="Author">Autor</msg>
+  <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Retornar&lt;/a&gt; para %forum.name%</msg>
   <msg key="Body">Corpo</msg>
   <msg key="by_Date">por Data</msg>
   <msg key="by_Forum">por F�rum</msg>
@@ -24,15 +25,18 @@
   <msg key="disabled">desativados</msg>
   <msg key="Edit">Editar</msg>
   <msg key="edit">editar</msg>
+  <msg key="Edit_again">Editar novamente</msg>
   <msg key="Edit_forum">Editar F�rum</msg>
   <msg key="Edit_Message">Editar Mensagem:</msg>
   <msg key="Email">E-mail</msg>
+  <msg key="email_alert_body_header">Em %posting_date%, %user_name% escreveu: </msg>
   <msg key="Email_Message">Enviar Mensagem por e-mail:</msg>
   <msg key="Email_to_a_friend">Enviar por e-mail para um amigo</msg>
   <msg key="enable">ativar</msg>
   <msg key="enable_it">ativ�-lo</msg>
   <msg key="enabled">ativado</msg>
   <msg key="Entire_Thread">Discuss�o Completa</msg>
+  <msg key="First_Post">Primeira Postagem</msg>
   <msg key="Flat">Plano</msg>
   <msg key="Format">Formato</msg>
   <msg key="Forum">F�rum</msg>
@@ -44,6 +48,7 @@
   <msg key="ForumID">ForumID</msg>
   <msg key="Forums">F�rums</msg>
   <msg key="Forums_Posting_hist_lt">F�rums: Hist�ria de mensagens de</msg>
+  <msg key="forward">Encaminhar</msg>
   <msg key="Fwd">Enc:</msg>
   <msg key="html">html</msg>
   <msg key="Last_Post">�ltima Mensagem</msg>
@@ -65,6 +70,7 @@
   <msg key="Manage_Forum">Gerenciar F�rum:</msg>
   <msg key="ManageModerate">Gerenciar/Moderar</msg>
   <msg key="Message_ID">ID da Mensagem</msg>
+  <msg key="Moderate">Moderado</msg>
   <msg key="moderated">moderado</msg>
   <msg key="Name">Nome</msg>
   <msg key="New_Forum">Novo F�rum</msg>
@@ -76,22 +82,30 @@
   <msg key="One_Message">Uma Mensagem</msg>
   <msg key="One_Thread">Uma Discuss�o</msg>
   <msg key="open">aberto(s)</msg>
+  <msg key="Parameters">Par�metros</msg>
   <msg key="parent_ID">ID do pai</msg>
+  <msg key="Pending">Pendente</msg>
   <msg key="Pending_Threads">Discuss�es Pendentes</msg>
+  <msg key="Post">Postar</msg>
   <msg key="Post_a_Message">Enviar uma Mensagem</msg>
   <msg key="Post_a_New_Message">Enviar uma Nova Mensagem</msg>
   <msg key="Post_a_Reply">Enviar uma Resposta</msg>
   <msg key="Post_to_Forum">Enviar Mensagem ao F�rum:</msg>
   <msg key="Posted">Enviados</msg>
+  <msg key="Posted_by">Postado por</msg>
   <msg key="Posting_Date">Data de Envio</msg>
   <msg key="Posting_History">Hist�rico de Mensagens Enviadas</msg>
   <msg key="Posting_history_for">Hist�rico de Mensagens Enviadas de</msg>
   <msg key="Posting_Policy">Pol�tica de Envios</msg>
   <msg key="Presentation">Apresenta��o</msg>
+  <msg key="Preview">Prever</msg>
   <msg key="Re">Res:</msg>
   <msg key="reject">rejeitar</msg>
+  <msg key="Rejected">Rejeitado</msg>
   <msg key="Replies">Respostas</msg>
   <msg key="reply">reponder</msg>
+  <msg key="Reply_to_first_post_in_thread">Responder � primeira postagem do assunto</msg>
+  <msg key="Reply_to_first_post_on_page_label">Responder � primeira postagem nesta p�gina</msg>
   <msg key="Search">Busca:</msg>
   <msg key="Search_1">Busca</msg>
   <msg key="Search_colon">Busca:</msg>
Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/forums/www/message-post.tcl	17 Dec 2003 15:45:30 -0000	1.30
+++ openacs-4/packages/forums/www/message-post.tcl	26 Feb 2004 15:29:16 -0000	1.31
@@ -18,8 +18,18 @@
     }
 }
 
-set user_id [ad_conn user_id]
+if { ![empty_string_p [ns_queryget formbutton:post]] } {
+    set action post
+} elseif { ![empty_string_p [ns_queryget formbutton:preview]] } {
+    set action preview
+} elseif { ![empty_string_p [ns_queryget formbutton:edit]] } {
+    set action edit
+} else {
+    set action ""
+}
 
+set user_id [auth::refresh_login]
+
 ##############################
 # Pull out required forum and parent data and
 # perform security checks 
Index: openacs-4/packages/general-comments/catalog/general-comments.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/catalog/general-comments.ch_zh.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/general-comments/catalog/general-comments.ch_zh.utf-8.xml	26 Feb 2004 15:29:17 -0000	1.2
@@ -1,8 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="general-comments" package_version="4.1" locale="ch_zh" charset="utf-8">
 
-  <msg key="Author">恬宀</msg>
-  <msg key="edit">園辞</msg>
-  <msg key="Title">炎籾:</msg>
-  <msg key="Title_1">炎籾</msg>
+  <msg key="Actions">操作</msg>
+  <msg key="Add_a_comment_to">添加评论</msg>
+  <msg key="Add_comment">添加评论</msg>
+  <msg key="Add_file_attachment">添加文件附件</msg>
+  <msg key="Add_url_comment">添加URL评论</msg>
+  <msg key="Administer">管理</msg>
+  <msg key="all">所有的</msg>
+  <msg key="approve">批准</msg>
+  <msg key="Approved">批准的</msg>
+  <msg key="approved">批准的</msg>
+  <msg key="Attach_a_web_link">添加一个Web链接</msg>
+  <msg key="Attachments">附件</msg>
+  <msg key="Author">作者</msg>
+  <msg key="by">按</msg>
+  <msg key="bytes">字节</msg>
+  <msg key="Cancel">取消</msg>
+  <msg key="Comment">评论</msg>
+  <msg key="Comments">评论</msg>
+  <msg key="Confirm">确认</msg>
+  <msg key="Confirm_comment">确认评论</msg>
+  <msg key="Confirm_comment_on">确认评论</msg>
+  <msg key="delete">删除</msg>
+  <msg key="Delete_a_comment">删除评论</msg>
+  <msg key="Delete_attachment">删除附件</msg>
+  <msg key="details">详细信息</msg>
+  <msg key="edit">编辑</msg>
+  <msg key="Edit_comment">编辑评论</msg>
+  <msg key="Edit_comment_on">编辑评论</msg>
+  <msg key="Edit_file_attachment">编辑文件附件</msg>
+  <msg key="Edit_url_attachment">编辑URL附件</msg>
+  <msg key="edit_your_comment">（编辑评论）</msg>
+  <msg key="Filename">文件名：</msg>
+  <msg key="Full_Comments">所有评论</msg>
+  <msg key="gc_is_not_mounted">没有安装gc</msg>
+  <msg key="General_Comments">一般评论</msg>
+  <msg key="Go_back_to_comment">后退到评论</msg>
+  <msg key="Has_live_version">有一个活动版本</msg>
+  <msg key="HTML">HTML</msg>
+  <msg key="ID">ID#</msg>
+  <msg key="if_general_comments_not_mounted">如果&lt;code&gt;general-comments&lt;/code&gt; 没有安装，调用 &lt;code&gt;general_comments_get_comments&lt;/code&gt;或&lt;code&gt;general_comments_create_link&lt;/code&gt;，将会发生一个错误，因为调用链接到一个与次安装相关的超链接&lt;code&gt;general-comments&lt;/code&gt; 。</msg>
+  <msg key="Image_attachment">图片附件</msg>
+  <msg key="Label">标签：</msg>
+  <msg key="last_24_hours">最近24小时</msg>
+  <msg key="Last_Modified">最后更改的</msg>
+  <msg key="last_month">上月</msg>
+  <msg key="last_week">上周</msg>
+  <msg key="live">（活动的）</msg>
+  <msg key="lt_Add_a_file_attachment">为评论添加文件附件</msg>
+  <msg key="lt_Add_url_attachment_to">为评论添加URL附件</msg>
+  <msg key="lt_approve_this_revision">批准此版本</msg>
+  <msg key="lt_Attach_a_file_or_pict">添加文件或图片</msg>
+  <msg key="lt_Attaching_files_to_co">给评论添加文件附件的功能已关闭。</msg>
+  <msg key="lt_Attaching_links_to_co">给评论添加URL附件的功能已关闭。</msg>
+  <msg key="lt_Current_values_for_Ge">普通评论包的当前值</msg>
+  <msg key="lt_Do_you_really_wish_to">确实要删除下面的评论及附件吗？</msg>
+  <msg key="lt_Do_you_really_wish_to_1">确实要删除此附件吗？</msg>
+  <msg key="lt_Edit_file_attachment_">编辑评论的文件附件</msg>
+  <msg key="lt_Edit_url_attachment_o">编辑评论的URL附件</msg>
+  <msg key="lt_Example_httpwwwarsdig">例如：http://www.arsdigita.com/</msg>
+  <msg key="lt_General_Comments_Admi">普通评论管理</msg>
+  <msg key="lt_Go_back_to_where_you_">后退到原来位置</msg>
+  <msg key="lt_has_chosen_to_limit_a">已选定限定附件</msg>
+  <msg key="lt_Here_is_how_your_comm">评论如何显示：</msg>
+  <msg key="lt_I_would_like_to_uploa">给评论上传文件或添加链接</msg>
+  <msg key="lt_No_comments_available">没有评论</msg>
+  <msg key="lt_no_gc_package_instanc">没有gc包</msg>
+  <msg key="lt_Note_if_the_text_abov">注意：如果上述文本丢失了所有的段落间隔，可能是选择了普通文本格式而不是HTML格式。用浏览器的“返回”按钮返回。</msg>
+  <msg key="lt_Note_if_the_text_abov_1">注意：如果上述文本有一串可见的HTML标记，可能选择了HTML格式而不是普通文本格式。用浏览器的“返回”按钮返回。</msg>
+  <msg key="lt_Test_page_for_General">检验普通评论页</msg>
+  <msg key="lt_The_comment_id_does_n">此comment_id没有同一个有效评论关联。</msg>
+  <msg key="lt_This_revision_is_live">该修订处于活动状态。</msg>
+  <msg key="lt_This_revision_is_not_">该修订处于活动状态。</msg>
+  <msg key="lt_Use_the_Browse_button">用“浏览……”按钮找到文件，然后单击“打开”。</msg>
+  <msg key="lt_Your_file_is_too_larg">文件太大。</msg>
+  <msg key="lt_Your_file_is_zero-len">文件长度为0。试图上传0字节文件、或不存在的文件、或文件传输过程中出错。</msg>
+  <msg key="no_attachments">没有附件</msg>
+  <msg key="none">没有</msg>
+  <msg key="not_set">没有设置</msg>
+  <msg key="Num">数字</msg>
+  <msg key="on">在</msg>
+  <msg key="Plain_text">普通文本</msg>
+  <msg key="Proceed">继续</msg>
+  <msg key="reject">拒绝</msg>
+  <msg key="reject_this_revision">拒绝此修订</msg>
+  <msg key="Revisions">修订</msg>
+  <msg key="Status">状态</msg>
+  <msg key="test">检验</msg>
+  <msg key="Text_above_is">上述文本是</msg>
+  <msg key="The_publisher_of">发行人</msg>
+  <msg key="Title">标题：</msg>
+  <msg key="Title_1">标题</msg>
+  <msg key="unapproved">未批准的</msg>
+  <msg key="URL">URL：</msg>
+  <msg key="View_comment">查看评论</msg>
+  <msg key="View_comment_on">查看评论</msg>
+  <msg key="view_details">查看详细信息</msg>
+  <msg key="you">你</msg>
 </message_catalog>
Index: openacs-4/packages/general-comments/catalog/general-comments.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.da_DK.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/general-comments/catalog/general-comments.da_DK.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.10
+++ openacs-4/packages/general-comments/catalog/general-comments.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.11
@@ -40,6 +40,7 @@
   <msg key="Has_live_version">Har en synlig version</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID-nummer</msg>
+  <msg key="if_general_comments_not_mounted">Hvis &lt;code&gt;general-comments&lt;/code&gt; ikke er monteret og der bliver lavet kald til &lt;code&gt;general_comments_get_comments&lt;/code&gt; eller &lt;code&gt;general_comments_create_link&lt;/code&gt; vil en fejl blive logget. Det er fordi disse kald udskriver links der skal referere til en monteret &lt;code&gt;general-comments&lt;/code&gt; pakkeinstans.</msg>
   <msg key="Image_attachment">Billedvedh�ftning</msg>
   <msg key="Label">Navn:</msg>
   <msg key="last_24_hours">seneste 24 timer</msg>
Index: openacs-4/packages/general-comments/catalog/general-comments.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/catalog/general-comments.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/general-comments/catalog/general-comments.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.9
@@ -4,99 +4,98 @@
   <msg key="Actions">Aktionen</msg>
   <msg key="Add_a_comment_to">Kommentar hinzuf�gen zu</msg>
   <msg key="Add_comment">Kommentar hinzuf�gen</msg>
-  <msg key="Add_file_attachment">Hinzuf�gen einer Anlage-Datei</msg>
-  <msg key="Add_url_comment">URL Kommentar hinzuf�gen</msg>
-  <msg key="Administer">Administrieren</msg>
-  <msg key="all">alle</msg>
-  <msg key="approve">freigeben</msg>
+  <msg key="Add_file_attachment">Datei anh�ngen</msg>
+  <msg key="Add_url_comment">Kommentar zur URL hinzuf�gen</msg>
+  <msg key="Administer">Verwalten</msg>
+  <msg key="all">Alle</msg>
+  <msg key="approve">Freigeben</msg>
   <msg key="Approved">Freigegeben</msg>
-  <msg key="approved">freigegeben</msg>
-  <msg key="Attach_a_web_link">Anf�gen einer Web-Verkn�pfung</msg>
+  <msg key="approved">Freigegeben</msg>
+  <msg key="Attach_a_web_link">URL anh�ngen</msg>
   <msg key="Attachments">Anh�nge</msg>
-  <msg key="Author">Autor</msg>
-  <msg key="by">von</msg>
+  <msg key="Author">Verfasser</msg>
+  <msg key="by">Von</msg>
   <msg key="bytes">Bytes</msg>
   <msg key="Cancel">Abbrechen</msg>
   <msg key="Comment">Kommentar:</msg>
   <msg key="Comments">Kommentare</msg>
   <msg key="Confirm">Best�tigen</msg>
   <msg key="Confirm_comment">Kommentar best�tigen</msg>
-  <msg key="Confirm_comment_on">Best�tigung des Kommentars zu</msg>
-  <msg key="delete">l�schen</msg>
+  <msg key="Confirm_comment_on">Kommentar best�tigen zu</msg>
+  <msg key="delete">L�schen</msg>
   <msg key="Delete_a_comment">Einen Kommentar l�schen</msg>
   <msg key="Delete_attachment">Anhang l�schen</msg>
   <msg key="details">Details</msg>
-  <msg key="edit">bearbeiten</msg>
+  <msg key="edit">Bearbeiten</msg>
   <msg key="Edit_comment">Kommentar bearbeiten</msg>
-  <msg key="Edit_comment_on">Bearbeiten des Kommentars zu</msg>
-  <msg key="Edit_file_attachment">Bearbeiten der Datei-Anlage</msg>
-  <msg key="Edit_url_attachment">Bearbeiten der Webadressen-Anf�gung</msg>
-  <msg key="edit_your_comment">(bearbeiten Ihres Kommentars)</msg>
+  <msg key="Edit_comment_on">Kommentar bearbeiten zu</msg>
+  <msg key="Edit_file_attachment">Dateianhang bearbeiten</msg>
+  <msg key="Edit_url_attachment">Angeh�ngte URL bearbeiten</msg>
+  <msg key="edit_your_comment">Kommentar bearbeiten</msg>
   <msg key="Filename">Dateiname:</msg>
   <msg key="Full_Comments">Vollst�ndige Kommentare</msg>
-  <msg key="gc_is_not_mounted">gc ist nicht montiert.</msg>
-  <msg key="General_Comments">General Comments</msg>
+  <msg key="gc_is_not_mounted">AK ist nicht geladen.</msg>
+  <msg key="General_Comments">Allgemeine Kommentare</msg>
   <msg key="Go_back_to_comment">Zur�ck zum Kommentar</msg>
-  <msg key="Has_live_version">Hat eine &quot;lebende&quot; Version</msg>
+  <msg key="Has_live_version">Ver�ffentlichte Version vorhanden</msg>
   <msg key="HTML">HTML</msg>
-  <msg key="ID">ID Nr.</msg>
+  <msg key="ID">ID</msg>
+  <msg key="if_general_comments_not_mounted">If &lt;code&gt;general-comments&lt;/code&gt; is not mounted and calls are made to &lt;code&gt;general_comments_get_comments&lt;/code&gt; or &lt;code&gt;general_comments_create_link&lt;/code&gt; , then an error will be logged. This is because these calls output hyperlinks that need to reference a mounted &lt;code&gt;general-comments&lt;/code&gt; package instance. </msg>
   <msg key="Image_attachment">Bildanhang</msg>
   <msg key="Label">Beschriftung:</msg>
-  <msg key="last_24_hours">letzte 24 Stunden</msg>
-  <msg key="Last_Modified">Letzte �nderung</msg>
-  <msg key="last_month">letzter Monat</msg>
-  <msg key="last_week">letzte Woche</msg>
-  <msg key="live">(live)</msg>
-  <msg key="lt_Add_a_file_attachment">Hinzuf�gen einer Anlage-Datei zum Kommentar</msg>
-  <msg key="lt_Add_url_attachment_to">Hinzuf�gen einer URL-Anheftung zum Kommentar</msg>
-  <msg key="lt_approve_this_revision">�berarbeitete Version annehmen </msg>
-  <msg key="lt_Attach_a_file_or_pict">Anheften einer Datei oder eines Bildes</msg>
-  <msg key="lt_Attaching_files_to_co">Das Anheften von Dateien an Kommentare ist deaktiviert.</msg>
-  <msg key="lt_Attaching_links_to_co">Das Anheften von Verkn�pfungen an Kommentare ist deaktiviert.</msg>
-  <msg key="lt_Current_values_for_Ge">Aktuelle Werte f�r das Paket &quot;Beliebige Kommentare&quot;</msg>
-  <msg key="lt_Do_you_really_wish_to">Wollen Sie den folgenden Kommentar und seine Anheftungen wirklich l�schen?</msg>
-  <msg key="lt_Do_you_really_wish_to_1">M�chten Sie diese Anlage wirklich l�schen?</msg>
-  <msg key="lt_Edit_file_attachment_">Bearbeiten einer Datei-Anlage zum Kommentar</msg>
-  <msg key="lt_Edit_url_attachment_o">Bearbeiten einer URL-Anheftung zum Kommentar.</msg>
+  <msg key="last_24_hours">Letzte 24 Stunden</msg>
+  <msg key="Last_Modified">Zuletzt ge�ndert</msg>
+  <msg key="last_month">Letzter Monat</msg>
+  <msg key="last_week">Letzte Woche</msg>
+  <msg key="live">(aktiv)</msg>
+  <msg key="lt_Add_a_file_attachment">Datei an Kommentar anh�ngen</msg>
+  <msg key="lt_Add_url_attachment_to">URL an Kommentar anh�ngen</msg>
+  <msg key="lt_approve_this_revision">Diese Version �bernehmen</msg>
+  <msg key="lt_Attach_a_file_or_pict">Datei anh�ngen</msg>
+  <msg key="lt_Attaching_files_to_co">Es k�nnen keine Dateien an Kommentare angeh�ngt werden. Die Funktion ist deaktiviert.</msg>
+  <msg key="lt_Attaching_links_to_co">Es k�nnen keine Links an Kommentare angeh�ngt werden. Die Funktion ist deaktiviert.</msg>
+  <msg key="lt_Current_values_for_Ge">Aktuelle Werte f�r das Programmpaket 'Allgemeine Kommentare'</msg>
+  <msg key="lt_Do_you_really_wish_to">Wollen Sie folgenden Kommentar und seine Anh�nge wirklich l�schen?</msg>
+  <msg key="lt_Do_you_really_wish_to_1">Wollen Sie diesen Anhang wirklich l�schen?</msg>
+  <msg key="lt_Edit_file_attachment_">An den Kommentar angeh�ngte Datei bearbeiten</msg>
+  <msg key="lt_Edit_url_attachment_o">An den Kommentar angeh�ngte URL bearbeiten </msg>
   <msg key="lt_Example_httpwwwarsdig">Beispiel: http://www.dotlrn.org</msg>
-  <msg key="lt_General_Comments_Admi">General Comments Administration</msg>
-  <msg key="lt_Go_back_to_where_you_">Kehren Sie dorthin zur�ck wo Sie waren</msg>
-  <msg key="lt_has_chosen_to_limit_a">hat festgelegt dass Anlagen limitiert werden auf</msg>
-  <msg key="lt_Here_is_how_your_comm">So w�rde Ihr Kommentar erscheinen:</msg>
-  <msg key="lt_I_would_like_to_uploa">Ich m�chte eine Datei hochladen oder eine Verkn�pfung zu meinem Kommentar hinzuf�gen:</msg>
-  <msg key="lt_No_comments_available">Keine Kommentare verf�gbar</msg>
-  <msg key="lt_no_gc_package_instanc">keine Instantiierung des gc-Pakets</msg>
-  <msg key="lt_Note_if_the_text_abov">Hinweis: Falls der obige Text alle Absatz-Abst�nde verloren gegangen sind, dann h�tten Sie m�glicherweise &quot;einfaches Textformat&quot; anstelle von &quot;HTML&quot; ausw�hlen sollen.
-Benutzen Sie die &quot;Zur�ck&quot;-Schaltfl�che Ihres Browsers um zum Einsende-Formular zur�ckzukehren.</msg>
-  <msg key="lt_Note_if_the_text_abov_1">Hinweis: Falls der obige Text lauter sichtbare HTML-Tags aufweist, dann h�tten Sie m�glicherweise &quot;HTML&quot; anstelle von &quot;einfaches Textformat&quot; ausw�hlen sollen.
-Benutzen Sie die &quot;Zur�ck&quot;-Schaltfl�che Ihres Browsers um zum Einsende-Formular zur�ckzukehren.</msg>
-  <msg key="lt_Test_page_for_General">Testseite f�r General Comments</msg>
-  <msg key="lt_The_comment_id_does_n">Die Kommentar-Identifikation bezieht sich nicht auf einen g�ltigen Kommentar.</msg>
-  <msg key="lt_This_revision_is_live">Diese Version wird zur Zeit verwendet.</msg>
-  <msg key="lt_This_revision_is_not_">Diese Version wird zur Zeit nicht verwendet.</msg>
-  <msg key="lt_Use_the_Browse_button">Benutzen Sie die Schaltfl�che &quot;Durchsuchen...&quot; um Ihre Datei zu finden und klicken Sie dann auf &quot;�ffnen&quot;.</msg>
-  <msg key="lt_Your_file_is_too_larg">Die Datei ist zu gross.</msg>
-  <msg key="lt_Your_file_is_zero-len">Ihre Datei hat die L�nge 0. Entweder Sie haben wirklich versucht eine Datei der L�nge 0 hochzuladen, oder eine Datei die es nicht gibt, oder irgendetwas ist beim Transfer schiefgelaufen.</msg>
-  <msg key="no_attachments">keine Anlagen</msg>
-  <msg key="none">keines</msg>
-  <msg key="not_set">nicht eingestellt</msg>
+  <msg key="lt_General_Comments_Admi">Allgemeine Kommentare verwalten</msg>
+  <msg key="lt_Go_back_to_where_you_">Zur�ck</msg>
+  <msg key="lt_has_chosen_to_limit_a">hat festgelegt, dass Anh�nge begrenzt werden auf</msg>
+  <msg key="lt_Here_is_how_your_comm">Ihr Kommentar wird wie folgt angezeigt:</msg>
+  <msg key="lt_I_would_like_to_uploa">Datei oder URL an den Kommentar anh�ngen</msg>
+  <msg key="lt_No_comments_available">Keine Kommentare vorhanden</msg>
+  <msg key="lt_no_gc_package_instanc">Programmpaket 'Allgemeine Kommentare'  nicht geladen</msg>
+  <msg key="lt_Note_if_the_text_abov">Hinweis: Falls im obigen Text alle Abs�tze verloren gegangen sind, h�tten Sie wahrscheinlich die Option 'Einfacher Text' anstelle von 'HTML' ausw�hlen sollen. Gehen Sie mit Hilfe Ihres Browsers zur�ck zum Eingabeformular.</msg>
+  <msg key="lt_Note_if_the_text_abov_1">Hinweis: Falls der obige Text sichtbaren HTML-Code enth�lt, h�tten Sie wahrscheinlich die Option 'HTML' anstelle von 'Einfacher Text' ausw�hlen sollen. Gehen Sie mit Hilfe Ihres Browsers zur�ck zum Eingabeformular. </msg>
+  <msg key="lt_Test_page_for_General">Testseite f�r Allgemeine Kommentare</msg>
+  <msg key="lt_The_comment_id_does_n">Die Kommentar-ID verweist nicht auf einen g�ltigen Kommentar.</msg>
+  <msg key="lt_This_revision_is_live">Aktive Version</msg>
+  <msg key="lt_This_revision_is_not_">Keine aktive Version</msg>
+  <msg key="lt_Use_the_Browse_button">Klicken Sie auf 'Durchsuchen...', w�hlen Sie die gew�nschte Datei aus und klicken Sie auf '�ffnen'. </msg>
+  <msg key="lt_Your_file_is_too_larg">Ihre Datei ist zu gross.</msg>
+  <msg key="lt_Your_file_is_zero-len">Ihre Datei enth�lt 0 Bytes. M�glicherweise ist ein Fehler bei der �bertragung aufgetreten.</msg>
+  <msg key="no_attachments">Keine Anh�nge vorhanden</msg>
+  <msg key="none">Keine Kommentare vorhanden</msg>
+  <msg key="not_set">Nicht festgelegt</msg>
   <msg key="Num">Nr.</msg>
-  <msg key="on">auf</msg>
-  <msg key="Plain_text">Nur Text</msg>
+  <msg key="on">am</msg>
+  <msg key="Plain_text">Einfacher Text</msg>
   <msg key="Proceed">Fortfahren</msg>
-  <msg key="reject">ablehnen</msg>
-  <msg key="reject_this_revision">diese �berarbeitete Version ablehnen</msg>
-  <msg key="Revisions">�berarbeitete Versionen</msg>
+  <msg key="reject">Ablehnen</msg>
+  <msg key="reject_this_revision">Diese Version ablehnen</msg>
+  <msg key="Revisions">Versionen</msg>
   <msg key="Status">Status</msg>
   <msg key="test">Test</msg>
   <msg key="Text_above_is">Obiger Text ist</msg>
   <msg key="The_publisher_of">Der Herausgeber von</msg>
-  <msg key="Title">Titel:</msg>
-  <msg key="Title_1">Titel</msg>
-  <msg key="unapproved">nicht genehmigt</msg>
+  <msg key="Title">Betreff:</msg>
+  <msg key="Title_1">Betreff</msg>
+  <msg key="unapproved">Nicht freigegeben</msg>
   <msg key="URL">URL:</msg>
-  <msg key="View_comment">Kommentar ansehen</msg>
-  <msg key="View_comment_on">Ansicht des Kommentars zu</msg>
-  <msg key="view_details">Detailansicht</msg>
+  <msg key="View_comment">Kommentar anzeigen</msg>
+  <msg key="View_comment_on">Kommentar anzeigen zu</msg>
+  <msg key="view_details">Details anzeigen</msg>
   <msg key="you">Sie</msg>
 </message_catalog>
Index: openacs-4/packages/general-comments/catalog/general-comments.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.es_ES.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/general-comments/catalog/general-comments.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.7
+++ openacs-4/packages/general-comments/catalog/general-comments.es_ES.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.8
@@ -40,6 +40,7 @@
   <msg key="Has_live_version">Tiene versi�n actual</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">Identificador</msg>
+  <msg key="if_general_comments_not_mounted">Si &lt;code&gt;general-comments&lt;/code&gt; no est� montado y hay llamadas a &lt;code&gt;general_comments_get_comments&lt;/code&gt; o &lt;code&gt;general_comments_create_link&lt;/code&gt;, se registrar� un error en los logs. Esto es debido a que estas llamadas devuelven hiperlinks que referencian alguna instancia montada del paquete &lt;code&gt;general-comments&lt;/code&gt;.</msg>
   <msg key="Image_attachment">Imagen adjunta</msg>
   <msg key="Label">Etiqueta:</msg>
   <msg key="last_24_hours">�ltimas 24 horas</msg>
Index: openacs-4/packages/general-comments/catalog/general-comments.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.it_IT.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/catalog/general-comments.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/general-comments/catalog/general-comments.it_IT.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.9
@@ -40,6 +40,7 @@
   <msg key="Has_live_version">Ha una versione attiva</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID#</msg>
+  <msg key="if_general_comments_not_mounted">Se &lt;code&gt;general-comments&lt;/code&gt; non &amp;egrave; monatato e vengono eseguite chiamate a &lt;code&gt;general_comments_get_comments&lt;/code&gt; o &lt;code&gt;general_comments_create_link&lt;/code&gt; , un errore verr&amp;agrave; registrato. Questo &amp;egrave; dovuto al fatto che eseguono chiamate attraverso hyperlink che necessitano di un riferimento a un'istanza montata del pacchetto &lt;code&gt;general-comments&lt;/code&gt;</msg>
   <msg key="Image_attachment">Immagine allegata</msg>
   <msg key="Label">Etichetta:</msg>
   <msg key="last_24_hours">le ultime 24 ore</msg>
Index: openacs-4/packages/general-comments/catalog/general-comments.ms_my.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/Attic/general-comments.ms_my.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/catalog/general-comments.ms_my.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/general-comments/catalog/general-comments.ms_my.utf-8.xml	26 Feb 2004 15:29:17 -0000	1.2
@@ -19,6 +19,7 @@
   <msg key="Cancel">Batal</msg>
   <msg key="Comment">Komen:</msg>
   <msg key="Comments">Komen-komen</msg>
+  <msg key="Confirm">Sahkan</msg>
   <msg key="delete">buang</msg>
   <msg key="Delete_a_comment">Buang komen</msg>
   <msg key="Delete_attachment">Buang lampiran</msg>
Index: openacs-4/packages/general-comments/catalog/general-comments.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.nl_NL.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/general-comments/catalog/general-comments.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:21 -0000	1.9
+++ openacs-4/packages/general-comments/catalog/general-comments.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.10
@@ -40,6 +40,8 @@
   <msg key="Has_live_version">Heeft live versie</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID#</msg>
+  <msg key="if_general_comments_not_mounted">Als &lt;code&gt;general-comments&lt;/code&gt; niet aangekoppeld is en aanroepen gemaakt worden naar &lt;code&gt;general_comments_get_comments&lt;/code&gt; of &lt;code&gt;general_comments_create_link&lt;/code&gt;, dan wordt er een fout gelogd. Dit gebeurt omdat deze aanroepen hyperlinks uitvoeren welke een gekoppelde &lt;code&gt;general-comments&lt;/code&gt; pakketinstantie moeten refereren.
+</msg>
   <msg key="Image_attachment">Afbeelding als Bijlage</msg>
   <msg key="Label">Label:</msg>
   <msg key="last_24_hours">laatste 24 uur</msg>
Index: openacs-4/packages/general-comments/catalog/general-comments.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/catalog/general-comments.pt_BR.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/general-comments/catalog/general-comments.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/general-comments/catalog/general-comments.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:29:17 -0000	1.9
@@ -40,6 +40,7 @@
   <msg key="Has_live_version">Tem uma vers�o ativa</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID#</msg>
+  <msg key="if_general_comments_not_mounted">Se o m�dulo &lt;code&gt;general-comments&lt;/code&gt; n�o estiver montado e forem direcionadas chamadas para code&gt;general_comments_get_comments&lt;/code&gt; ou &lt;code&gt;general_comments_create_link&lt;/code&gt;, uma mensagem de erro ser� registrada em log. Isso ocorre porque estas chamadas geram hiperlinks que devem ter refer�ncia em um pacote &lt;code&gt;general-comments&lt;/code&gt; montado.</msg>
   <msg key="Image_attachment">Imagem anexa</msg>
   <msg key="Label">Etiqueta:</msg>
   <msg key="last_24_hours">�ltimas 24 horas</msg>
Index: openacs-4/packages/logger/tcl/project-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-oracle.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/logger/tcl/project-procs-oracle.xql	5 Jan 2004 21:05:27 -0000	1.4
+++ openacs-4/packages/logger/tcl/project-procs-oracle.xql	26 Feb 2004 15:29:18 -0000	1.5
@@ -29,7 +29,7 @@
  
   <fullquery name="logger::project::users_get_options.select_project_leads">
     <querytext>
-        select acs_object.name(p.project_lead), project_lead
+        select distinct acs_object.name(p.project_lead), project_lead
         from   logger_projects p,
                logger_project_pkg_map ppm
         where  ppm.project_id = p.project_id
Index: openacs-4/packages/logger/tcl/project-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/logger/tcl/project-procs-postgresql.xql	5 Jan 2004 21:05:27 -0000	1.5
+++ openacs-4/packages/logger/tcl/project-procs-postgresql.xql	26 Feb 2004 15:29:18 -0000	1.6
@@ -25,7 +25,7 @@
  
   <fullquery name="logger::project::users_get_options.select_project_leads">
     <querytext>
-        select acs_object__name(p.project_lead), project_lead
+        select distinct acs_object__name(p.project_lead), project_lead
         from   logger_projects p,
                logger_project_pkg_map ppm
         where  ppm.project_id = p.project_id
Index: openacs-4/packages/news/catalog/news.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news/catalog/news.ch_zh.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/news/catalog/news.ch_zh.utf-8.xml	26 Feb 2004 15:29:18 -0000	1.2
@@ -1,6 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="news" package_version="5.0d2" locale="ch_zh" charset="utf-8">
 
-  <msg key="Author">恬宀</msg>
-  <msg key="Title">炎籾</msg>
+  <msg key="active">活动的</msg>
+  <msg key="Active_Revision">活动修订本</msg>
+  <msg key="Add_a_new_revision">增加新修订本</msg>
+  <msg key="Administer">管理</msg>
+  <msg key="Administration">管理</msg>
+  <msg key="All">所有的</msg>
+  <msg key="approve">批准</msg>
+  <msg key="Approve_items">批准条目</msg>
+  <msg key="Approved">已批准的</msg>
+  <msg key="Archive_Date">存档日期</msg>
+  <msg key="Archive_Now">现在存档</msg>
+  <msg key="Archived">已存档的</msg>
+  <msg key="Author">作者</msg>
+  <msg key="Back_to_news_list">返回新闻列表</msg>
+  <msg key="Body">内容</msg>
+  <msg key="bytes">字节</msg>
+  <msg key="Comments">评论</msg>
+  <msg key="Confirm">确认</msg>
+  <msg key="Confirm_Action">确认动作：</msg>
+  <msg key="Contributed_by">投稿</msg>
+  <msg key="Create_a_news_item">创建新条目</msg>
+  <msg key="Create_News_Item">创建新闻条目</msg>
+  <msg key="Creation_Date">创建日期</msg>
+  <msg key="Creation_IP">Creation IP </msg>
+  <msg key="Database_Error">数据库错误</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="Error">错误</msg>
+  <msg key="Go">到</msg>
+  <msg key="going_live_no_archive">在%n_days_until_publish%天之内处于活动状态，没有存档计划。</msg>
+  <msg key="going_live_with_archive">在%n_days_until_publish%天之内处于活动状态，计划在%n_days_until_archive%天内存档</msg>
+  <msg key="HTML">HTML</msg>
+  <msg key="It_will_go_live_on">继续处于活动状态</msg>
+  <msg key="It_will_move_into_archive_on">将被存档</msg>
+  <msg key="Log_Entry">登陆日记</msg>
+  <msg key="lt__When_youre_done_clic">。完成后，单击“预览”，查看新闻条目如何显示。</msg>
+  <msg key="lt_And_be_live_until_rev">并且撤回之前总处于活动状态</msg>
+  <msg key="lt_Archive_as_of_Next_Mo">下月存档</msg>
+  <msg key="lt_Archive_as_of_Next_We">下周存档</msg>
+  <msg key="lt_cannot_be_applied_to_">不能用于下面条目：</msg>
+  <msg key="lt_Cant_upload_a_publica">不能在文本区域或非空文件中上传一个发布。</msg>
+  <msg key="lt_Click_on_item_ID_to_a">单击item ID#批准/撤消条目</msg>
+  <msg key="lt_Click_on_revise_to_ed">单击“修订”，编辑条目。</msg>
+  <msg key="lt_Could_not_find_corres">找不到申请新闻条目的相应修订本</msg>
+  <msg key="lt_Could_not_find_the_re">找不到申请的新闻条目</msg>
+  <msg key="lt_Do_the_following_to_t">按下述选择条目：</msg>
+  <msg key="lt_Do_you_really_want_to">确实要完成此操作：</msg>
+  <msg key="lt_has_been_submitted_an">已提交，一旦批准将处于活动状态</msg>
+  <msg key="lt_It_will_go_live_after">被新闻管理员批准后将处于活动状态。</msg>
+  <msg key="lt_Manage_the_items_indi">首先个别管理批准的条目。</msg>
+  <msg key="lt_on_the_following_news">下述新闻条目吗？</msg>
+  <msg key="lt_One_Item_-_add_revisi">一个条目——增加修订本</msg>
+  <msg key="lt_Please_check_the_item">请检查要处理的条目。</msg>
+  <msg key="lt_Please_supply_the_bod">请提供新闻内容。</msg>
+  <msg key="lt_Please_supply_the_tit">请提供新闻标题。</msg>
+  <msg key="lt_Publish_body_is_missi">发布内容丢失。重新上传文件或在文本区域输入内容。</msg>
+  <msg key="lt_red_fields_are_requir">红色区域必填</msg>
+  <msg key="lt_See_details_for_the_e">查看下面错误信息的详细资料</msg>
+  <msg key="lt_Select_the_publicatio">选择发布日期和存档日期：</msg>
+  <msg key="lt_The_archive_date_must">存档日期必须在发布日期之后。</msg>
+  <msg key="lt_The_database_did_not_">数据库没有接受你的输入。</msg>
+  <msg key="lt_There_are_no_items_av">没有条目。</msg>
+  <msg key="lt_There_are_no_news_ite">没有新闻条目。</msg>
+  <msg key="lt_To_the_readers_it_wil">面向读者的外观：</msg>
+  <msg key="lt_Use_the_following_for">用下面的表格定义你的新闻条目。注意：</msg>
+  <msg key="lt_When_youre_done_click">。完成后，单击“预览”，查看新闻条目的外观如何。</msg>
+  <msg key="lt_You_must_supply_a_rev">必须提供修订本的日志信息。</msg>
+  <msg key="lt_Your_document_is_larg">文档大于系统允许的最大长度</msg>
+  <msg key="lt_Your_news_item_will_b">新闻条目的显示将使用news.adp中定义的默认模板。</msg>
+  <msg key="make_active">使处于活动状态</msg>
+  <msg key="Make_Permanent">使永久</msg>
+  <msg key="manage">管理</msg>
+  <msg key="never">从不</msg>
+  <msg key="News">新闻</msg>
+  <msg key="News_Archive">新闻存档</msg>
+  <msg key="News_item">新闻条目</msg>
+  <msg key="News_item_submitted">已提交的新闻条目</msg>
+  <msg key="News_Items">新闻条目</msg>
+  <msg key="next">下一个</msg>
+  <msg key="One_Item">一条</msg>
+  <msg key="One_Revision">一个修订本</msg>
+  <msg key="or_upload_text_file">或上传文本文件：</msg>
+  <msg key="Plain_text">普通文本</msg>
+  <msg key="prev">前一个</msg>
+  <msg key="Preview">预览</msg>
+  <msg key="Preview_news_item">预览新闻条目</msg>
+  <msg key="Publication_Date">发布日期</msg>
+  <msg key="Publish">发布</msg>
+  <msg key="Published">已发布的</msg>
+  <msg key="published_no_archive">已发部的，没有存档计划</msg>
+  <msg key="published_scheduled_for_archive">已发布，在%n_days_until_archive%天之内存档。</msg>
+  <msg key="Release">发布</msg>
+  <msg key="Release_Date">发布日期</msg>
+  <msg key="rev">修订</msg>
+  <msg key="revise">修订</msg>
+  <msg key="Revision">修订本</msg>
+  <msg key="Revision_log">修订本日志</msg>
+  <msg key="Revision_number">修订本号</msg>
+  <msg key="revoke">撤回</msg>
+  <msg key="Scheduling_Error">时间安排错误</msg>
+  <msg key="Search">搜索</msg>
+  <msg key="Select">选择</msg>
+  <msg key="Show_archived_news">显示存档的新闻</msg>
+  <msg key="show_it_permanently">（永远显示）</msg>
+  <msg key="Show_live_news">显示活动的新闻</msg>
+  <msg key="Status">状态</msg>
+  <msg key="Submit_a_news_item">提交新闻条目</msg>
+  <msg key="Thank_You">谢谢！</msg>
+  <msg key="The_action">动作</msg>
+  <msg key="The_text_is_formatted_as">文本格式设定为</msg>
+  <msg key="Title">标题</msg>
+  <msg key="Unapproved">未批准的</msg>
+  <msg key="Yes">是</msg>
+  <msg key="Your_news_item">新闻条目</msg>
 </message_catalog>
Index: openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:11 -0000	1.15
+++ openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.16
@@ -29,6 +29,8 @@
   <msg key="Delete">Slet</msg>
   <msg key="Error">Fejl</msg>
   <msg key="Go">Videre</msg>
+  <msg key="going_live_no_archive">G�r live om %n_days_until_publish% dage, bliver ikke arkiveret</msg>
+  <msg key="going_live_with_archive">G�r live om %n_days_until_publish% dage, bliver arkiveret om %n_days_until_archive% dage</msg>
   <msg key="HTML">HTML</msg>
   <msg key="It_will_go_live_on">Den vil blive synlig den</msg>
   <msg key="It_will_move_into_archive_on">Nyheden vil flytte til arkivet den</msg>
@@ -85,7 +87,10 @@
   <msg key="Preview">Vis</msg>
   <msg key="Preview_news_item">Vis nyhed</msg>
   <msg key="Publication_Date">Udgivelsesdato</msg>
+  <msg key="Publish">Udgiv</msg>
   <msg key="Published">Udgivet</msg>
+  <msg key="published_no_archive">Udgivet, bliver ikke arkiveret</msg>
+  <msg key="published_scheduled_for_archive">Udgivet, bliver arkiveret om %n_days_until_archive% dage</msg>
   <msg key="Release">Udgiv</msg>
   <msg key="Release_Date">Udgivelsesdato</msg>
   <msg key="rev">revision</msg>
Index: openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.12
+++ openacs-4/packages/news/catalog/news.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.13
@@ -2,13 +2,13 @@
 <message_catalog package_key="news" package_version="5.0d2" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="active">aktiv</msg>
-  <msg key="Active_Revision">Aktive Version </msg>
+  <msg key="Active_Revision">Aktive Version</msg>
   <msg key="Add_a_new_revision">Neue Version hinzuf�gen </msg>
-  <msg key="Administer">Verwalten</msg>
+  <msg key="Administer">Ank�ndigungen verwalten</msg>
   <msg key="Administration">Verwalten</msg>
   <msg key="All">Alle</msg>
   <msg key="approve">Freigeben</msg>
-  <msg key="Approve_items">Eintr�ge freigeben</msg>
+  <msg key="Approve_items">Freigeben</msg>
   <msg key="Approved">Freigegeben</msg>
   <msg key="Archive_Date">Archivierungsdatum</msg>
   <msg key="Archive_Now">Jetzt archivieren</msg>
@@ -26,83 +26,88 @@
   <msg key="Create_News_Item">Neue Ank�ndigung erstellen</msg>
   <msg key="Creation_Date">Erstellungsdatum</msg>
   <msg key="Creation_IP">IP-Adresse w�hrend der Erstellung</msg>
-  <msg key="Database_Error">Fehler in der Datenbank</msg>
+  <msg key="Database_Error">Datenbankfehler</msg>
   <msg key="Delete">L�schen</msg>
   <msg key="Error">Fehler</msg>
   <msg key="Go">Los</msg>
+  <msg key="going_live_no_archive">Ver�ffentlichung in %n_days_until_publish% Tagen, kein Archivierungsdatum festgelegt</msg>
+  <msg key="going_live_with_archive">Ver�ffentlichung in %n_days_until_publish% Tagen, Archivierung in %n_days_until_archive% Tagen</msg>
   <msg key="HTML">HTML</msg>
   <msg key="It_will_go_live_on">Das Ver�ffentlichungsdatum ist der</msg>
   <msg key="It_will_move_into_archive_on">Das Archivierungsdatum ist der</msg>
   <msg key="Log_Entry">Protokolleintrag</msg>
   <msg key="lt__When_youre_done_clic">Um die fertiggestellte Ank�ndigung zu �berpr�fen, klicken Sie auf 'Vorschau'. </msg>
-  <msg key="lt_And_be_live_until_rev">And be live until revoked. </msg>
+  <msg key="lt_And_be_live_until_rev">Ver�ffentlicht bis zur Aufhebung der Freigabe</msg>
   <msg key="lt_Archive_as_of_Next_Mo">Ab n�chstem Monat archivieren</msg>
   <msg key="lt_Archive_as_of_Next_We">Ab n�chster Woche archivieren</msg>
-  <msg key="lt_cannot_be_applied_to_">kann an folgenden Eintr�gen nicht ausgef�hrt werden:</msg>
+  <msg key="lt_cannot_be_applied_to_">kann an folgenden Elementen nicht ausgef�hrt werden:</msg>
   <msg key="lt_Cant_upload_a_publica">Can't upload a publication in the text-field and a non-empty file.</msg>
-  <msg key="lt_Click_on_item_ID_to_a">Klicken Sie auf die Eintrags-ID, um einen Eintrag freizugeben/die Freigabe aufzuheben.</msg>
-  <msg key="lt_Click_on_revise_to_ed">Klicken Sie auf '�ndern', um einen Eintrag zu bearbeiten.</msg>
+  <msg key="lt_Click_on_item_ID_to_a">Klicken Sie auf die ID, um eine Ank�ndigung freizugeben/die Freigabe aufzuheben.</msg>
+  <msg key="lt_Click_on_revise_to_ed">Klicken Sie auf 'Neue Version hinzuf�gen', um eine Ank�ndigung zu bearbeiten.</msg>
   <msg key="lt_Could_not_find_corres">Die gew�nschte Version der Ank�ndigung konnte nicht gefunden werden.</msg>
-  <msg key="lt_Could_not_find_the_re">Der gew�nschte Eintrag konnte nicht gefunden werden.</msg>
-  <msg key="lt_Do_the_following_to_t">An den ausgew�hlten Eintr�gen folgende Aktion ausf�hren:</msg>
-  <msg key="lt_Do_you_really_want_to">Wollen Sie wirklich die Aktion </msg>
-  <msg key="lt_has_been_submitted_an">has been submitted and will go live as soon as it is approved.</msg>
+  <msg key="lt_Could_not_find_the_re">Die gew�nschte Ank�ndigung konnte nicht gefunden werden.</msg>
+  <msg key="lt_Do_the_following_to_t">An den ausgew�hlten Elementen folgende Aktion ausf�hren:</msg>
+  <msg key="lt_Do_you_really_want_to">Wollen Sie wirklich folgende Aktion ausf�hren:</msg>
+  <msg key="lt_has_been_submitted_an">Der Eintrag wurde gesendet und wird ver�ffentlicht, sobald er freigegeben wurde.</msg>
   <msg key="lt_It_will_go_live_after">Der Eintrag wird ver�ffentlicht, sobald er vom Ank�ndigungsadministrator freigegeben wurde.</msg>
-  <msg key="lt_Manage_the_items_indi">Manage the items individually for approval first. </msg>
-  <msg key="lt_on_the_following_news">an folgenden Eintr�gen ausf�hren?</msg>
-  <msg key="lt_One_Item_-_add_revisi">Einzelner Eintrag - Version hinzuf�gen </msg>
-  <msg key="lt_Please_check_the_item">Bitte w�hlen Sie die Eintr�ge aus, die Sie bearbeiten wollen.</msg>
+  <msg key="lt_Manage_the_items_indi">Legen Sie zun�chst f�r jede einzelne Ank�ndigung die Freigabedaten fest.</msg>
+  <msg key="lt_on_the_following_news">an folgenden Ank�ndigungen ausf�hren?</msg>
+  <msg key="lt_One_Item_-_add_revisi">Einzelne Ank�ndigung - Version hinzuf�gen </msg>
+  <msg key="lt_Please_check_the_item">Bitte w�hlen Sie die Elemente aus, die Sie bearbeiten wollen.</msg>
   <msg key="lt_Please_supply_the_bod">Bitte geben Sie den Inhalt der Ank�ndigung ein.</msg>
   <msg key="lt_Please_supply_the_tit">Bitte geben Sie einen Betreff f�r die Ank�ndigung an.</msg>
   <msg key="lt_Publish_body_is_missi">Die Ank�ndigung hat keinen Inhalt. Geben Sie einen Text ins Eingabefeld ein oder laden Sie eine Datei hoch. </msg>
   <msg key="lt_red_fields_are_requir">Die roten Felder m�ssen ausgef�llt werden.</msg>
   <msg key="lt_See_details_for_the_e">See details for the error message below</msg>
   <msg key="lt_Select_the_publicatio">W�hlen Sie das Ver�ffentlichungsdatum und das Archivierungsdatum aus:</msg>
-  <msg key="lt_The_archive_date_must">Das Archivierungdatum muss NACH dem Ver�ffentlichungsdatum angesetzt sein.</msg>
+  <msg key="lt_The_archive_date_must">Das Archivierungdatum muss NACH dem Ver�ffentlichungsdatum sein.</msg>
   <msg key="lt_The_database_did_not_">Ihre Eingaben wurden von der Datenbank nicht angenommen.</msg>
-  <msg key="lt_There_are_no_items_av">Es sind keine Eintr�ge vorhanden.</msg>
-  <msg key="lt_There_are_no_news_ite">Es sind keine Eintr�ge vorhanden.</msg>
+  <msg key="lt_There_are_no_items_av">Keine Ank�ndigungen vorhanden</msg>
+  <msg key="lt_There_are_no_news_ite">Keine Ank�ndigungen vorhanden</msg>
   <msg key="lt_To_the_readers_it_wil">F�r den Leser wird die Ank�ndigung wie folgt angezeigt:</msg>
-  <msg key="lt_Use_the_following_for">Mit diesem Formular k�nnen Sie eine neue Ank�ndigung erstellen. Hinweis:</msg>
+  <msg key="lt_Use_the_following_for">Hier k�nnen Sie Ihre Ank�ndigung erstellen oder bearbeiten. Hinweis:</msg>
   <msg key="lt_When_youre_done_click">Um die fertiggestellte Ank�ndigung zu �berpr�fen, klicken Sie auf 'Vorschau'.</msg>
   <msg key="lt_You_must_supply_a_rev">Bitte geben Sie einen Protokolleintrag f�r die neue Version ein.</msg>
   <msg key="lt_Your_document_is_larg">Ihr Dokument �berschreitet die zul�ssige Maximalgr��e.</msg>
   <msg key="lt_Your_news_item_will_b">F�r die Darstellung Ihrer Ank�ndigung wird das in news.adp definierte Standard-Template verwendet.</msg>
-  <msg key="make_active">aktivieren</msg>
-  <msg key="Make_Permanent">Immer anzeigen</msg>
-  <msg key="manage">verwalten</msg>
+  <msg key="make_active">Aktivieren</msg>
+  <msg key="Make_Permanent">Archivierungsdatum aufheben</msg>
+  <msg key="manage">Verwalten</msg>
   <msg key="never">Nicht archivieren</msg>
   <msg key="News">Ank�ndigungen</msg>
   <msg key="News_Archive">Ank�ndigungsarchiv</msg>
   <msg key="News_item">Ank�ndigung</msg>
   <msg key="News_item_submitted">Ank�ndigung gesendet</msg>
   <msg key="News_Items">Ank�ndigungen</msg>
-  <msg key="next">next</msg>
-  <msg key="One_Item">Einzelner Eintrag</msg>
+  <msg key="next">Weiter</msg>
+  <msg key="One_Item">Einzelne Ank�ndigung</msg>
   <msg key="One_Revision">Einzelne Version</msg>
-  <msg key="or_upload_text_file">Sie k�nnen auch eine Textdatei hochladen:</msg>
+  <msg key="or_upload_text_file">oder eine Textdatei hochladen:</msg>
   <msg key="Plain_text">Einfacher Text</msg>
-  <msg key="prev">previous</msg>
+  <msg key="prev">Zur�ck</msg>
   <msg key="Preview">Vorschau</msg>
-  <msg key="Preview_news_item">Eintrag in der Vorschau anzeigen</msg>
+  <msg key="Preview_news_item">Ank�ndigung in der Vorschau anzeigen</msg>
   <msg key="Publication_Date">Ver�ffentlichungsdatum</msg>
+  <msg key="Publish">Ver�ffentlichen</msg>
   <msg key="Published">Ver�ffentlicht</msg>
+  <msg key="published_no_archive">Ver�ffentlicht, kein Archivierungsdatum festgelegt</msg>
+  <msg key="published_scheduled_for_archive">Ver�ffentlicht, Archivierung in %n_days_until_archive% Tagen</msg>
   <msg key="Release">Freigeben</msg>
   <msg key="Release_Date">Ver�ffentlichungsdatum</msg>
   <msg key="rev">Vers.</msg>
-  <msg key="revise">�ndern</msg>
+  <msg key="revise">Neue Version hinzuf�gen</msg>
   <msg key="Revision">Version</msg>
   <msg key="Revision_log">Protokolleintrag</msg>
   <msg key="Revision_number">Version</msg>
   <msg key="revoke">Freigabe aufheben</msg>
-  <msg key="Scheduling_Error">Zeitlicher Fehler</msg>
-  <msg key="Search">Suchen</msg>
+  <msg key="Scheduling_Error">Fehler in der Zeitangabe</msg>
+  <msg key="Search">Suche</msg>
   <msg key="Select">Ausw�hlen</msg>
   <msg key="Show_archived_news">Archivierte Ank�ndigungen anzeigen</msg>
   <msg key="show_it_permanently">(immer anzeigen)</msg>
   <msg key="Show_live_news">Ver�ffentlichte Ank�ndigungen anzeigen </msg>
   <msg key="Status">Status</msg>
-  <msg key="Submit_a_news_item">Submit a news item</msg>
+  <msg key="Submit_a_news_item">Neue Ank�ndigung erstellen</msg>
   <msg key="Thank_You">Vielen Dank.</msg>
   <msg key="The_action">Die Aktion</msg>
   <msg key="The_text_is_formatted_as">Format:</msg>
Index: openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.10
+++ openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.11
@@ -87,6 +87,7 @@
   <msg key="Preview">Vista previa</msg>
   <msg key="Preview_news_item">Vista previa de la noticia</msg>
   <msg key="Publication_Date">Fecha de publicaci�n</msg>
+  <msg key="Publish">Publicar</msg>
   <msg key="Published">Publicado</msg>
   <msg key="published_no_archive">Publicada, no agendada para archivar</msg>
   <msg key="published_scheduled_for_archive">Publicada, se archivar� en %n_days_until_archive% d�as</msg>
Index: openacs-4/packages/news/catalog/news.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.it_IT.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/news/catalog/news.it_IT.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.5
+++ openacs-4/packages/news/catalog/news.it_IT.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.6
@@ -29,6 +29,8 @@
   <msg key="Delete">Cancella</msg>
   <msg key="Error">Errore</msg>
   <msg key="Go">Vai</msg>
+  <msg key="going_live_no_archive">Pubblicazione prevista tra %n_days_until_publish% giorni, archiviazione non prevista.</msg>
+  <msg key="going_live_with_archive">Pubblicazione prevista tra %n_days_until_publish% giorni, archiviazione prevista tra %n_days_until_archive% giorni</msg>
   <msg key="HTML">HTML</msg>
   <msg key="It_will_go_live_on">Sar&amp;agrave; pubblicata il</msg>
   <msg key="It_will_move_into_archive_on">sar&amp;agrave; trasferita nell'archivio il</msg>
@@ -85,7 +87,10 @@
   <msg key="Preview">Anteprima</msg>
   <msg key="Preview_news_item">Anteprima news</msg>
   <msg key="Publication_Date">Data di pubblicazione</msg>
+  <msg key="Publish">Pubblica</msg>
   <msg key="Published">Pubblicato</msg>
+  <msg key="published_no_archive">Pubblicazione avventua, archiviazione non programmata</msg>
+  <msg key="published_scheduled_for_archive">Pubblicazione avvenuta, archiviazione prevista tra %n_days_until_archive% giorni</msg>
   <msg key="Release">Release</msg>
   <msg key="Release_Date">Data Release</msg>
   <msg key="rev">rev.</msg>
Index: openacs-4/packages/news/catalog/news.ko_KR.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.ko_KR.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news/catalog/news.ko_KR.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/news/catalog/news.ko_KR.utf-8.xml	26 Feb 2004 15:29:18 -0000	1.2
@@ -29,6 +29,8 @@
   <msg key="Delete">삭제</msg>
   <msg key="Error">오류</msg>
   <msg key="Go">가기</msg>
+  <msg key="going_live_no_archive">%n_days_until_publish% 일동안 활동중이고, 기록을 위한 예정은 없음</msg>
+  <msg key="going_live_with_archive">%n_days_until_publish% 일 동안 활동중이고, %n_days_until_archive% 일 안에 기록을 위한 예정이 있음</msg>
   <msg key="HTML">HTML </msg>
   <msg key="It_will_go_live_on">존속될 것입니다.</msg>
   <msg key="It_will_move_into_archive_on">기록으로 옮겨질 것입니다.</msg>
@@ -85,7 +87,10 @@
   <msg key="Preview">미리보기</msg>
   <msg key="Preview_news_item">뉴스 항목 미리보기</msg>
   <msg key="Publication_Date">출판일</msg>
+  <msg key="Publish">출판하다</msg>
   <msg key="Published">발표된</msg>
+  <msg key="published_no_archive">출판되었지만, 기록을 위한 예정이 없음</msg>
+  <msg key="published_scheduled_for_archive">출판되었고, %n_days_until_archive% 일 안에 기록됨</msg>
   <msg key="Release">배포</msg>
   <msg key="Release_Date">배포일</msg>
   <msg key="rev">개정</msg>
Index: openacs-4/packages/news/catalog/news.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.nl_NL.ISO-8859-1.xml,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/news/catalog/news.nl_NL.ISO-8859-1.xml	3 Nov 2003 09:53:22 -0000	1.11
+++ openacs-4/packages/news/catalog/news.nl_NL.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.12
@@ -8,7 +8,7 @@
   <msg key="Administration">Beheer</msg>
   <msg key="All">Alle</msg>
   <msg key="approve">toestaan</msg>
-  <msg key="Approve_items">Toegestane_onderwerpen</msg>
+  <msg key="Approve_items">Berichten goedkeuren</msg>
   <msg key="Approved">Toegestaan</msg>
   <msg key="Archive_Date">Archiefdatum</msg>
   <msg key="Archive_Now">Archiveer Nu</msg>
@@ -29,6 +29,8 @@
   <msg key="Delete">Verwijder</msg>
   <msg key="Error">Fout</msg>
   <msg key="Go">Ga</msg>
+  <msg key="going_live_no_archive">Wordt openbaar over %n_days_until_publish% dagen, niet gepland voor archivering</msg>
+  <msg key="going_live_with_archive">Wordt openbaar over %n_days_until_publish% dagen, gepland voor archivering over %n_days_until_archive% dagen</msg>
   <msg key="HTML">HTML</msg>
   <msg key="It_will_go_live_on">Embargo tot</msg>
   <msg key="It_will_move_into_archive_on">Het wordt gearchiveerd op</msg>
@@ -58,34 +60,37 @@
   <msg key="lt_See_details_for_the_e">De details van de foutmelding staan hieronder</msg>
   <msg key="lt_Select_the_publicatio">Selecteer de publicatiedatum en achiefdatum</msg>
   <msg key="lt_The_archive_date_must">De archiefdatum moet na de embargo datum zijn</msg>
-  <msg key="lt_The_database_did_not_">De database heeft de input niet geaccepteerd.</msg>
+  <msg key="lt_The_database_did_not_">De database heeft je invoer niet geaccepteerd.</msg>
   <msg key="lt_There_are_no_items_av">Er zijn geen onderwerpen beschikbaar.</msg>
   <msg key="lt_There_are_no_news_ite">Er zijn geen berichten beschikbaar.</msg>
   <msg key="lt_To_the_readers_it_wil">Voor de lezers ziet het er alsvolgt uit</msg>
   <msg key="lt_Use_the_following_for">Gebruik het volgende formulier om het bericht op te stellen. Merk op dat de </msg>
   <msg key="lt_When_youre_done_click">. Klik aan het eind op 'Voorbeeld' om te zien hoe het nieuwsitem er uit zal zien.</msg>
   <msg key="lt_You_must_supply_a_rev">Er is informatie nodig voor het wijzigingsjournaal.</msg>
   <msg key="lt_Your_document_is_larg">Het document is groter dan de maximaal toegestane omvang</msg>
-  <msg key="lt_Your_news_item_will_b">Het nieuwsitem zal worden vormgegeven met behulp van het standaard sjabloon in news.adp.</msg>
+  <msg key="lt_Your_news_item_will_b">Het nieuwsbericht zal worden vormgegeven met behulp van het standaardsjabloon in news.adp.</msg>
   <msg key="make_active">maak actueel</msg>
-  <msg key="Make_Permanent">Maak Permanent</msg>
+  <msg key="Make_Permanent">Permanent maken</msg>
   <msg key="manage">beheer</msg>
   <msg key="never">nooit</msg>
   <msg key="News">Nieuws</msg>
   <msg key="News_Archive">Nieuwsarchief</msg>
-  <msg key="News_item">Nieuwsitem</msg>
+  <msg key="News_item">Nieuwsbericht</msg>
   <msg key="News_item_submitted">Ingediende Nieuwsitems</msg>
-  <msg key="News_Items">Nieuwsitems</msg>
+  <msg key="News_Items">Nieuwsbericht</msg>
   <msg key="next">volgende</msg>
-  <msg key="One_Item">Een Item</msg>
-  <msg key="One_Revision">Een Wijziging</msg>
+  <msg key="One_Item">E�n element</msg>
+  <msg key="One_Revision">E�n wijziging</msg>
   <msg key="or_upload_text_file">of biedt een tekstbestand aan:</msg>
-  <msg key="Plain_text">Platte Tekst</msg>
+  <msg key="Plain_text">Platte tekst</msg>
   <msg key="prev">Voorvertoning</msg>
   <msg key="Preview">Voorvertoning</msg>
   <msg key="Preview_news_item">Voorvertoning nieuwsitem</msg>
   <msg key="Publication_Date">Publicatiedatum</msg>
+  <msg key="Publish">Openbaar maken</msg>
   <msg key="Published">Gepubliseerd</msg>
+  <msg key="published_no_archive">Openbaar maken, niet gepland voor archivering</msg>
+  <msg key="published_scheduled_for_archive">Openbaar maken, gepland voor archivering over %n_days_until_archive% dagen</msg>
   <msg key="Release">Vrijgeven</msg>
   <msg key="Release_Date">Datum van vrijgave</msg>
   <msg key="rev">wijzig.</msg>
@@ -94,7 +99,7 @@
   <msg key="Revision_log">Wijzigingsjournaal</msg>
   <msg key="Revision_number">Wijzigingsnummer</msg>
   <msg key="revoke">Intrekken</msg>
-  <msg key="Scheduling_Error">Fout in de planning</msg>
+  <msg key="Scheduling_Error">Fout bij inroostering</msg>
   <msg key="Search">Zoeken</msg>
   <msg key="Select">Selecteer</msg>
   <msg key="Show_archived_news">Toon gearchiveerde berichten</msg>
Index: openacs-4/packages/news/catalog/news.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.pt_BR.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/news/catalog/news.pt_BR.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.10
+++ openacs-4/packages/news/catalog/news.pt_BR.ISO-8859-1.xml	26 Feb 2004 15:29:18 -0000	1.11
@@ -29,6 +29,8 @@
   <msg key="Delete">Apague</msg>
   <msg key="Error">Erro</msg>
   <msg key="Go">Continuar</msg>
+  <msg key="going_live_no_archive">Vem a p�blico em %n_days_until_publish%, arquivamento n�o agendado</msg>
+  <msg key="going_live_with_archive">Vem a p�blico em %n_days_until_publish% dias, arquivamento em %n_days_until_archive% dias</msg>
   <msg key="HTML">HTML</msg>
   <msg key="It_will_go_live_on">Ser� publicada em</msg>
   <msg key="It_will_move_into_archive_on">Ser� movida para o arquivo em</msg>
@@ -85,7 +87,10 @@
   <msg key="Preview">Prever</msg>
   <msg key="Preview_news_item">Prever not�cia</msg>
   <msg key="Publication_Date">Data de Publica��o</msg>
+  <msg key="Publish">Publicar</msg>
   <msg key="Published">Publicado</msg>
+  <msg key="published_no_archive">Publicada, arquivamento n�o agendado</msg>
+  <msg key="published_scheduled_for_archive">Publicada, ser� arquivada em %n_days_until_archive% dias</msg>
   <msg key="Release">Release</msg>
   <msg key="Release_Date">Data de Libera��o</msg>
   <msg key="rev">rev.</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/catalog/notifications.ch_zh.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/catalog/notifications.da_DK.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.da_DK.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/notifications/catalog/notifications.da_DK.ISO-8859-1.xml	3 Nov 2003 12:52:11 -0000	1.10
+++ openacs-4/packages/notifications/catalog/notifications.da_DK.ISO-8859-1.xml	26 Feb 2004 15:29:19 -0000	1.11
@@ -12,7 +12,7 @@
   <msg key="lt_system_name_-_Batched">[%system_name% - Gruppe af Beskeder] </msg>
   <msg key="lt_You_have_no_notificat">Du har ingen Beskeder.</msg>
   <msg key="lt_You_have_requested_no">Du har �nsket Beskeder i forbindelse med %pretty_name%. Du kan &lt;a href=&quot;%sub_url%&quot;&gt;afmelde dig her&lt;/a&gt;.</msg>
-  <msg key="lt_You_may_a_hrefsub_url">Du kan &amp;lt;a href=&amp;quot;%sub_url%&amp;quot;&amp;gt;F� Besked&amp;lt;/a&amp;gt; i forbindelse med %pretty_name%.</msg>
+  <msg key="lt_You_may_a_hrefsub_url">Du kan &lt;a href=&quot;%sub_url%&quot;&gt;f� besked&lt;/a&gt; ved opdatering af %pretty_name%.</msg>
   <msg key="Manage_Notifications">Administr�r Beskeder</msg>
   <msg key="Notification_type">Beskedtype</msg>
   <msg key="Request_Notification">Giv Mig Besked</msg>
Index: openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml	15 Oct 2003 15:28:22 -0000	1.8
+++ openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml	26 Feb 2004 15:29:19 -0000	1.9
@@ -6,17 +6,17 @@
   <msg key="Delivery_Method">Zustellungsart</msg>
   <msg key="Frequency">H�ufigkeit</msg>
   <msg key="Item">Gegenstand</msg>
-  <msg key="lt_Getting_too_much_emai">Zuviel E-Mail? Verwalten Sie die Optionen f�r Ihre Beachrichtigungen hier: %manage_notifications_url%  
+  <msg key="lt_Getting_too_much_emai">Bekommen Sie zu viele E-Mails von dotLRN? Unter %manage_notifications_url% k�nnen Sie Ihre Benachrichtigungsoptionen verwalten.  
       </msg>
   <msg key="lt_Notification_Interval">Benachrichtigungsintervall</msg>
-  <msg key="lt_Request_Notification_">Benachrichtigung f�r %pretty_name% anfordern</msg>
-  <msg key="lt_system_name_-_Batched">[%system_name% - gestapelte Benachrichtigung]</msg>
-  <msg key="lt_You_have_no_notificat">Sie haben keine Benachrichtigungen.</msg>
+  <msg key="lt_Request_Notification_">Benachrichtigungsfunktion f�r %pretty_name% aktivieren</msg>
+  <msg key="lt_system_name_-_Batched">[%system_name% - Batched Notification]</msg>
+  <msg key="lt_You_have_no_notificat">Sie haben keine Benachrichtigungsfunktion aktiviert.</msg>
   <msg key="lt_You_have_requested_no">Sie haben f�r &quot;%pretty_name%&quot; die Benachrichtigungsfunktion aktiviert. Sie k�nnen diese &lt;a href=&quot;%sub_url%&quot;&gt;deaktivieren&lt;/a&gt;. </msg>
   <msg key="lt_You_may_a_hrefsub_url">Sie k�nnen f�r &quot;%pretty_name%&quot; die &lt;a href=&quot;%sub_url%&quot;&gt;Benachrichtigungsfunktion aktivieren&lt;/a&gt;.</msg>
-  <msg key="Manage_Notifications">Benachrichtigungs-Optionen verwalten</msg>
+  <msg key="Manage_Notifications">Benachrichtigungsoptionen verwalten</msg>
   <msg key="Notification_type">Art der Benachrichtigung</msg>
-  <msg key="Request_Notification">Benachrichtigung Anfordern</msg>
+  <msg key="Request_Notification">Benachrichtigungsfunktion aktivieren</msg>
   <msg key="SUBJECT">BETREFF:</msg>
-  <msg key="Unsubscribe">Abonnement stoppen</msg>
+  <msg key="Unsubscribe">Benachrichtigungsfunktion deaktivieren</msg>
 </message_catalog>
Index: openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql	11 Dec 2003 21:40:09 -0000	1.2
+++ openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-4.6.4-5.0d1.sql	26 Feb 2004 15:29:20 -0000	1.3
@@ -1,9 +1,9 @@
 create table notification_email_hold (
-    reply_id			integer
-				constraint notification_email_hold_pk primary key
-				constraint notif_email_hold_reply_id_ref
-				references notification_replies(reply_id),
-    to_addr			text,
-    headers 			text,
-    body			text
+    reply_id                    integer
+                                constraint notification_email_hold_pk primary key
+                                constraint notif_email_hold_reply_id_ref
+                                references notification_replies(reply_id),
+    to_addr                     text,
+    headers                     text,
+    body                        text
 );
Index: openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	11 Dec 2003 21:40:09 -0000	1.2
+++ openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	26 Feb 2004 15:29:20 -0000	1.3
@@ -1,15 +1,43 @@
 -- Add on delete cascade to the notifications.response_id column foreign key constraint
 -- see Bug http://openacs.org/bugtracker/openacs/bug?filter%2estatus=resolved&filter%2eactionby=6815&bug%5fnumber=260
 -- @author Peter Marklund
-alter table notifications drop constraint notif_reponse_id_fk;
+
+create or replace function safe_drop_cosntraint(name, name)
+returns integer as '
+declare
+    p_table_name          alias for $1;
+    p_constraint_name     alias for $2;
+    v_constraint_p        integer;
+begin
+    select count(*)
+    into   v_constraint_p
+    from   pg_constraint con, pg_class c
+    where  con.conname = p_constraint_name
+    and    c.oid = con.conrelid
+    and    c.relname = p_table_name;
+
+    if v_constraint_p > 0 then
+        execute ''alter table '' || p_table_name || '' drop constraint '' || p_constraint_name;
+    end if;
+
+    return 0;
+end;' language 'plpgsql';
+
+select safe_drop_cosntraint('notifications', 'notif_reponse_id_fk');
+
 alter table notifications add constraint notif_reponse_id_fk
                               foreign key (response_id)
                               references acs_objects (object_id)
                               on delete cascade;
 
 -- Add on delete cascade to notification_user_map.notification_in foreign key constraint
-alter table notification_user_map drop constraint notif_user_map_notif_id_fk;
+
+select safe_drop_cosntraint('notification_user_map', 'notif_user_map_notif_id_fk');
+
 alter table notification_user_map add constraint notif_user_map_notif_id_fk 
                                       foreign key (notification_id) 
                                       references notifications(notification_id) 
                                       on delete cascade;
+
+drop function safe_drop_cosntraint(name, name);
+
Index: openacs-4/packages/organizations/organizations.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/organizations.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/organizations/organizations.info	11 Dec 2003 21:40:09 -0000	1.3
+++ openacs-4/packages/organizations/organizations.info	26 Feb 2004 15:29:21 -0000	1.4
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Generated by the OpenACS Package Manager -->
 
-<package key="organizations" url="http://openacs.org/repository/apm/packages/organizations" type="apm_service">
+<package key="organizations" url="http://openacs.org/repository/apm/packages/organizations" type="apm_application">
     <package-name>Organization</package-name>
     <pretty-plural>Organizations</pretty-plural>
     <initial-install-p>f</initial-install-p>
Index: openacs-4/packages/organizations/www/add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/organizations/www/add-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/organizations/www/add-edit.tcl	26 Jan 2004 15:39:47 -0000	1.2
+++ openacs-4/packages/organizations/www/add-edit.tcl	26 Feb 2004 15:29:21 -0000	1.3
@@ -27,15 +27,19 @@
     permission::require_permission \
 	-object_id $package_id \
 	-privilege write
+
+    set org_types_used [db_list select_org_types_used { }]
+
 } else {
     set context_bar [ad_context_bar "New"] 
 
     permission::require_permission \
 	-object_id $package_id \
 	-privilege create
+
+    set org_types_used {}
 }
 
-set org_types_used [db_list select_org_types_used { }]
 
 ad_form -name org -form {
     organization_id:key
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/search/www/search-results-bottom.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/search/www/search-results-one.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/search/www/search-results-top.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/search/www/search.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/search/www/search.tcl	18 Sep 2002 12:04:29 -0000	1.9
+++ openacs-4/packages/search/www/search.tcl	26 Feb 2004 15:29:22 -0000	1.10
@@ -13,15 +13,18 @@
     q:notnull {You must specify some keywords.}
 }
 
-ns_startcontent -type "text/html"
 
-set this_dir [file dirname [ad_conn file]]
-set template_top_file "$this_dir/search-results-top"
-set template_one_file "$this_dir/search-results-one"
-set template_bottom_file "$this_dir/search-results-bottom"
+set page_title "Search Results"
 
-set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
+
+set package_url [ad_conn package_url]
+set package_url_with_extras $package_url
+
+set context [list]
+set context_base_url $package_url
+
+set user_id [ad_conn user_id]
 set driver [ad_parameter -package_id $package_id FtsEngineDriver]
 array set info [acs_sc_call FtsEngineDriver info [list] $driver]
 
@@ -45,13 +48,6 @@
 if { $dts != "" } { set dt [db_exec_plsql get_dt "select now() + '$symbol2interval($dts)'::interval"] }
 
 
-
-
-
-
-set title "Search Results"
-set context_bar [ad_context_bar {Search Results}]
-
 set q [string tolower $q]
 set urlencoded_query [ad_urlencode $q]
 if { $offset < 0 } { set offset 0 }
@@ -82,97 +78,70 @@
 if { $num > 0 } { append url_advanced_search "&num=${num}" }
 
 
-set template_top [template::adp_parse $template_top_file [list \
-	t $t \
-	title $title \
-	context_bar $context_bar \
-	query $q \
-	nquery [llength $q] \
-	and_queries_notice_p $and_queries_notice_p \
-	stopwords $result(stopwords) \
-	nstopwords [llength $result(stopwords)] \
-	low $low \
-	high $high \
-	count $result(count) \
-	elapsed $elapsed \
-	url_advanced_search $url_advanced_search]]
+set query $q
+set nquery [llength $q]
+set stopwords $result(stopwords)
+set nstopwords [llength $result(stopwords)] 
+set count $result(count)
 
-ReturnHeaders "text/html"
-ns_write $template_top
+template::multirow create searchresult title_summary txt_summary url_one
 
-    for { set __i 0 } { $__i < [expr $high - $low +1] } { incr __i } {
+for { set __i 0 } { $__i < [expr $high - $low +1] } { incr __i } {
 
-	set object_id [lindex $result(ids) $__i]
-	set object_type [acs_object_type $object_id]
-	array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
-	search_content_get txt $datasource(content) $datasource(mime) $datasource(storage_type)
-	set title_summary [acs_sc_call FtsEngineDriver summary [list $q $datasource(title)] $driver]
-	set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
-	set url [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+    set object_id [lindex $result(ids) $__i]
+    set object_type [acs_object_type $object_id]
+    array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
+    search_content_get txt $datasource(content) $datasource(mime) $datasource(storage_type)
+    set title_summary [acs_sc_call FtsEngineDriver summary [list $q $datasource(title)] $driver]
+    set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
+    set url_one [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+    
+    template::multirow append searchresult $title_summary $txt_summary $url_one
 
+}
 
-	set template_one [template::adp_parse $template_one_file [list \
-		title_summary $title_summary \
-		txt_summary $txt_summary \
-		url $url]]
 
-	ns_write $template_one
+set from_result_page 1
+set current_result_page [expr ($low / $limit) + 1]
+set to_result_page [expr ceil(double($result(count)) / double($limit))]
 
-    }
+set url_previous ""
+set url_next ""
+append url_previous "search?q=${urlencoded_query}"
+append url_next "search?q=${urlencoded_query}"
+if { [expr $current_result_page - 1] > $from_result_page } { 
+    append url_previous "&offset=[expr ($current_result_page - 2) * $limit]"
+}
+if { $current_result_page < $to_result_page } { 
+    append url_next "&offset=[expr $current_result_page * $limit]"
+}
+if { $num > 0 } {
+    append url_previous "&num=$num"
+    append url_next "&num=$num"
+}
 
-    set from_result_page 1
-    set current_result_page [expr ($low / $limit) + 1]
-    set to_result_page [expr ceil(double($result(count)) / double($limit))]
 
-    set url_previous ""
-    set url_next ""
-    append url_previous "search?q=${urlencoded_query}"
-    append url_next "search?q=${urlencoded_query}"
-    if { [expr $current_result_page - 1] > $from_result_page } { 
-	append url_previous "&offset=[expr ($current_result_page - 2) * $limit]"
-    }
-    if { $current_result_page < $to_result_page } { 
-	append url_next "&offset=[expr $current_result_page * $limit]"
-    }
-    if { $num > 0 } {
-	append url_previous "&num=$num"
-	append url_next "&num=$num"
-    }
+set items [list]
+set links [list]
+set values [list]
+for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
+    set link ""
+    append link "search?q=${urlencoded_query}"
+    if { $__i > 1 } { append link "&offset=[expr ($__i - 1) * $limit]" }
+    if { $num > 0 } { append link "&num=$num" }
 
+    lappend items $__i
+    lappend links $link
+    lappend values $__i
+}
 
-    set items [list]
-    set links [list]
-    set values [list]
-    for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
-	set link ""
-	append link "search?q=${urlencoded_query}"
-	if { $__i > 1 } { append link "&offset=[expr ($__i - 1) * $limit]" }
-	if { $num > 0 } { append link "&num=$num" }
-
-	lappend items $__i
-	lappend links $link
-	lappend values $__i
+set search_the_web [ad_parameter -package_id $package_id SearchTheWeb]
+if [llength $search_the_web] {
+    set stw ""
+    foreach {url site} $search_the_web {
+	append stw "<a href=[format $url $urlencoded_query]>$site</a> "
     }
+}
 
-    set search_the_web [ad_parameter -package_id $package_id SearchTheWeb]
-    if [llength $search_the_web] {
-	set stw ""
-	foreach {url site} $search_the_web {
-	    append stw "<a href=[format $url $urlencoded_query]>$site</a> "
-	}
-    }
+set choice_bar [search_choice_bar $items $links $values $current_result_page]
 
-set template_bottom [template::adp_parse $template_bottom_file [list \
-	query $q \
-	count $result(count) \
-	urlencoded_query $urlencoded_query \
-	from_result_page $from_result_page \
-	current_result_page $current_result_page \
-	to_result_page $to_result_page \
-	url_previous $url_previous \
-	choice_bar [search_choice_bar $items $links $values $current_result_page] \
-	url_next $url_next \
-	stw $stw\
-	  ]]
-
-ns_write $template_bottom
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.FA_IR.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.RO_RO.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/survey/catalog/survey.ch_zh.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/catalog/survey.ch_zh.utf-8.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/survey/catalog/survey.ch_zh.utf-8.xml	15 Oct 2003 15:01:44 -0000	1.1
+++ openacs-4/packages/survey/catalog/survey.ch_zh.utf-8.xml	26 Feb 2004 15:29:23 -0000	1.2
@@ -1,10 +1,245 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="survey" package_version="0.2d" locale="ch_zh" charset="utf-8">
 
-  <msg key="Copy">鹸崙</msg>
-  <msg key="Copy_title_name">鹸崙 : %title_name%</msg>
-  <msg key="Description">傍苧 :</msg>
-  <msg key="Description_1">傍苧</msg>
-  <msg key="Edit">園辞</msg>
-  <msg key="Email_Address">窮徨喨周仇峽</msg>
+  <msg key="-__Created_by">——创建人</msg>
+  <msg key="_on_creation_date">，%creation_date%日</msg>
+  <msg key="Actions">动作</msg>
+  <msg key="Active">活动的吗？</msg>
+  <msg key="Add_A_Question">增加问题</msg>
+  <msg key="Add_New">增加新的</msg>
+  <msg key="add_new_question">增加新问题</msg>
+  <msg key="Admin_This_Survey">管理此问卷</msg>
+  <msg key="allow_multiple">允许多项选择</msg>
+  <msg key="Answer_Survey">解答问卷</msg>
+  <msg key="Answer_Text">解答文本</msg>
+  <msg key="are">是</msg>
+  <msg key="Below_the_question">问题下面</msg>
+  <msg key="Beside_the_question">问题旁边</msg>
+  <msg key="Boolean">布尔</msg>
+  <msg key="By_user">按用户</msg>
+  <msg key="Choose_a_Survey_Type">选择问卷类型</msg>
+  <msg key="Choose_Survey_Type">选择问卷类型</msg>
+  <msg key="Choose_Type">选择类型</msg>
+  <msg key="Continue_with_Delete">继续删除</msg>
+  <msg key="Copy">拷贝</msg>
+  <msg key="Copy_of">拷贝</msg>
+  <msg key="Copy_this_survey">拷贝此问卷</msg>
+  <msg key="Copy_title_name">拷贝：%title_name%</msg>
+  <msg key="Could_not_find_user">找不到此用户</msg>
+  <msg key="Create_Survey">创建问卷</msg>
+  <msg key="CSV_Export">CSV导出</msg>
+  <msg key="CSV_file">CVS文件</msg>
+  <msg key="Database_Error">数据库错误</msg>
+  <msg key="Database_error">数据库错误</msg>
+  <msg key="Date">日期</msg>
+  <msg key="Delete">删除</msg>
+  <msg key="Delete_1">删除：</msg>
+  <msg key="DELETE_Question">删除：问题</msg>
+  <msg key="Delete_Question">删除问题</msg>
+  <msg key="Delete_Response">删除应答</msg>
+  <msg key="Delete_Survey">删除问卷</msg>
+  <msg key="Delete_this_survey">删除此问卷</msg>
+  <msg key="Description">描述：</msg>
+  <msg key="Description_1">描述</msg>
+  <msg key="disable">使不能</msg>
+  <msg key="disabled">（不能的）</msg>
+  <msg key="Display_Options">显示选项：</msg>
+  <msg key="Edit">编辑</msg>
+  <msg key="Edit_Description">编辑描述</msg>
+  <msg key="Edit_Name">编辑名称</msg>
+  <msg key="Edit_Response">编辑解答</msg>
+  <msg key="edit_this_response">编辑此回复</msg>
+  <msg key="editable">可编辑的</msg>
+  <msg key="Edited">已编辑的</msg>
+  <msg key="Email_Address">Email地址</msg>
+  <msg key="Email_Options">Email选项：</msg>
+  <msg key="enable">使能</msg>
+  <msg key="Enter_Message">输入信息</msg>
+  <msg key="Extreme_Actions">Extreme操作：</msg>
+  <msg key="File_Attachment">文件附件</msg>
+  <msg key="First_Name">名</msg>
+  <msg key="From">从：</msg>
+  <msg key="From_1">从</msg>
+  <msg key="General_Survey">一般问卷</msg>
+  <msg key="Here_is_what">此处是</msg>
+  <msg key="inactive">[非动态的]</msg>
+  <msg key="Integer">整数</msg>
+  <msg key="is">是</msg>
+  <msg key="Large">大的</msg>
+  <msg key="Last_Name">姓</msg>
+  <msg key="limit_to_one">限一人</msg>
+  <msg key="lt_-_Lets_you_use_this_s">——用此问卷做模板，创建新问卷。</msg>
+  <msg key="lt_-_Removes_all_questio">——删除所有问题及回应</msg>
+  <msg key="lt_A_database_error_occu">交换问题时发生数据库错误。错误如下：</msg>
+  <msg key="lt_Already_Responsed_n_r">已收到：%n_responses users%查看用户。&lt;%community_url%/survey/admin/respondents?response_type=responded&gt; 群发用户。 &lt;%community_url%/survey/admin/send-mail?survey_id=%survey_id%&amp;to=responded&gt; </msg>
+  <msg key="lt_Already_Responsed_n_r_1">已收到：%n_responses users% 查看用户。&lt;%community_url%/survey/admin/respondents?response_type=responded&gt; 群发用户。&lt;%community_url%/survey/admin/send-mail?survey_id=%survey_id%&amp;to=responded&gt; </msg>
+  <msg key="lt_Answers_to_survey_nam">应答%survey_name%</msg>
+  <msg key="lt_Awaiting_a_response_n">等待回应：%n_awaiting users% 查看用户。&lt;%community_url%/survey/admin/respondents?response_type=not_responded&gt; 群发用户。&lt;%community_url%/survey/admin/send-mail?survey_id=%survey_id%&amp;to=not_responded&gt; 整组：%n_members% 查看用户。&lt;%community_url%/survey/admin/respondents?response_type=all&gt; 群发用户。&lt;%community_url%/survey/admin/send-mail?survey_id=%survey_id%&amp;to=all&gt; 回应： </msg>
+  <msg key="lt_Cancel_and_return_to_">取消并返回到问卷回复</msg>
+  <msg key="lt_Cancel_and_return_to__1">取消并返回到调查问卷</msg>
+  <msg key="lt_Completely_delete">确实要从%response_date_var%彻底删除%user_name_var%的应答吗？（注意：此操作是不可逆转的。）</msg>
+  <msg key="lt_Confirm_Survey_Detail">确认问卷详细信息</msg>
+  <msg key="lt_Copying_a_survey_will">拷贝一个问卷可以创建一个包含所有问题拷贝的新问卷。&lt;br /&gt; 应答数据不会被拷贝。</msg>
+  <msg key="lt_Could_not_find_a_surv">找不到问卷问题</msg>
+  <msg key="lt_Could_not_find_the_re">找不到回复</msg>
+  <msg key="lt_Couldnt_find_attachment">找不到附件。找不到问题%question_id%的应答%response_id%相应的附件。</msg>
+  <msg key="lt_DELETE_survey_infonam">删除：%survey_info.name%</msg>
+  <msg key="lt_DELETE_Survey_Respons">删除：问卷回复</msg>
+  <msg key="lt_Deleting_this_surve">删除此问卷将回删除所有的%questions_count%问题和所有相应的%responses_count%应答。</msg>
+  <msg key="lt_denotes_a_required_qu">必答题</msg>
+  <msg key="lt_Description_must_be_l">描述不能超过4000字符</msg>
+  <msg key="lt_Edit_and_submit_to_ch">编辑并提交已更改的问卷名称</msg>
+  <msg key="lt_Essay_Answer_Text_Are">撰写回答（文本区域）</msg>
+  <msg key="lt_Everyone_eligible_to_">任何人都可答此问卷</msg>
+  <msg key="lt_Everyone_who_has_alre">所有答此问卷之人</msg>
+  <msg key="lt_Everyone_who_has_not_">还没有答此问卷之人</msg>
+  <msg key="lt_For_Multiple_Choicebr">对多项选择题&lt;br /&gt;输入有效的应答列表&lt;br /&gt;（每行输入一个选择）</msg>
+  <msg key="lt_had_to_say_in_respons">必须表示应答到%survey_name%：</msg>
+  <msg key="lt_Here_is_how_your_surv">问卷描述显示样式如下：</msg>
+  <msg key="lt_img_srcgraphicsadming">&lt;img src=&quot;graphics/admin.gif&quot; border=&quot;0&quot; alt=&quot;管理问卷&quot;&gt; </msg>
+  <msg key="lt_img_srcgraphicsadming_1">&lt;img src=&quot;graphics/admin.gif&quot; border=&quot;0&quot; alt=&quot;管理&quot;&gt; </msg>
+  <msg key="lt_Main_Survey_Administr">主要问卷管理</msg>
+  <msg key="lt_Modify_a_Questions_Te">修改问题文本</msg>
+  <msg key="lt_Modify_previous_respo">修改前一应答</msg>
+  <msg key="lt_Modify_Question_Respo">修改问题应答</msg>
+  <msg key="lt_Multiple_Choice_Check">多项选择题（多选框，可选择多项）</msg>
+  <msg key="lt_Multiple_Choice_Drop_">多项选择题（下拉列表，只能选一项）</msg>
+  <msg key="lt_Multiple_Choice_Radio">多项选择题（单选钮，只能选一项）</msg>
+  <msg key="lt_No_Responses_for_surv">无应答：%survey_info.name%</msg>
+  <msg key="lt_No_Responses_for_surv_1">没有%survey_info.name%的应答</msg>
+  <msg key="lt_on_responsessubmissio">%responses.submission_date%日|%responses.response%</msg>
+  <msg key="lt_One_Line_Answer_Text_">一行应答（文本区域）</msg>
+  <msg key="lt_One_Respondent_first_">一个应答者：%first_names% %last_name% </msg>
+  <msg key="lt_One_Survey_survey_inf">一个问卷：%survey_info.name% </msg>
+  <msg key="lt_People_who_answered_r">回答%response_text%之人</msg>
+  <msg key="lt_Please_go_back_using_">请返回。</msg>
+  <msg key="lt_Please_make_sure_your">请确认日期有效。</msg>
+  <msg key="lt_Presentation_Alignmen">陈述对齐</msg>
+  <msg key="lt_Preview_One_Survey_na">预览问卷：%name%</msg>
+  <msg key="lt_Previous_response_on_">以前解答：%surveys.creation_date%</msg>
+  <msg key="lt_Previous_response_on__1">前一应答：%survey_details.creation_date%</msg>
+  <msg key="lt_regarding_this_survey">关于此问卷</msg>
+  <msg key="lt_Requested_survey_does">申请的问卷不存在</msg>
+  <msg key="lt_Response_on_response_">%response_date%日的回复</msg>
+  <msg key="lt_Response_on_responses">%responses.creation_date%日的回答</msg>
+  <msg key="lt_Response_Submitted_for">给%survey_name%提交的回复</msg>
+  <msg key="lt_Response_submitted_Th">回复已提交。谢谢！</msg>
+  <msg key="lt_Responses_to_Question">问题的应答</msg>
+  <msg key="lt_Return_to_survey_admi">返回问卷管理</msg>
+  <msg key="lt_Section_section_id_do">%section_id%不存在</msg>
+  <msg key="lt_Send_Mail_Re_survey_n">发送邮件回复：%survey_name%</msg>
+  <msg key="lt_Survey_Administration">问卷管理</msg>
+  <msg key="lt_Survey_Administration_1">问卷管理：增加问题（内容）</msg>
+  <msg key="lt_Survey_Administration_2">问卷管理：创建新问卷</msg>
+  <msg key="lt_survey_infoname_New_Q">%survey_info.name%：新问题</msg>
+  <msg key="lt_survey_name_Edit_Desc">%survey_name%：编辑描述</msg>
+  <msg key="lt_survey_name_Edit_Name">%survey_name%：编辑名称</msg>
+  <msg key="lt_survey_name_Modify_Qu">%survey_name%：修改问题文本</msg>
+  <msg key="lt_Survey_Name_must_be_4">问卷名称不得超过4000字符。</msg>
+  <msg key="lt_Survey_Name_must_be_l">问卷名称不得超过4000字符。</msg>
+  <msg key="lt_survey_name_Responden">%survey_name%：回答者</msg>
+  <msg key="lt_survey_name_responder">当提问%question_text%时，回答%response_text%的%survey_name%应答者：</msg>
+  <msg key="lt_survey_name_Responses">%survey_name%：应答</msg>
+  <msg key="lt_survey_name_Responses_1">%survey_name%：问题应答</msg>
+  <msg key="lt_Survey_Question_Not_F">没找到问卷问题</msg>
+  <msg key="lt_Survey_section_id_does">问卷%section_id%不存在</msg>
+  <msg key="lt_Survey_survey_id_do_no">问卷%survey_id不存在</msg>
+  <msg key="lt_Survey_survey_id_does">问卷%survey_id不存在</msg>
+  <msg key="lt_Survey_survey_nameRes">对不起，%survey_name%回答者：%user_name%这里是%user_name% %comm_url%对%survey_name:%的应答：</msg>
+  <msg key="lt_Survey_survey_nameRes_1">问卷：%survey_name%回答者：%user_name%这里是%user_name% %comm_url%对%survey_name:%的应答：</msg>
+  <msg key="lt_The_Above_Description">上述描述是</msg>
+  <msg key="lt_The_response_to_ques_i">对%question_text%的应答必须是整数。您的回答是response_value%。</msg>
+  <msg key="lt_The_response_to_ques_n">对%question_text%的应答必须是数字。您的回答是response_value%。</msg>
+  <msg key="lt_There_has_been_1_resp">已有一个应答。</msg>
+  <msg key="lt_There_have_been_n">已有%n_responses%个应答。</msg>
+  <msg key="lt_There_isare_n_resp">此问题有%n_responses% %resp%。建议不要编辑有应答的问题。原始问题没有留档。操作要小心。</msg>
+  <msg key="lt_There_was_an_error_wh">删除问题时出现错误：</msg>
+  <msg key="lt_This_is_a_multiple_ch">这是一个多项选择题问卷，没一个问题可以有一个或多个答案。此问卷也允许你在问卷结束时，根据分值使用任意编码（如redirects）。</msg>
+  <msg key="lt_This_question_has_n">此问题有%n_responses% %response_text%。如果继续，将被删除。（注意：此操作是不可逆转的。）</msg>
+  <msg key="lt_This_survey_allows_yo">此问卷允许你指定应答的类型。如果你想让用户输入自己的答案而不是从列表中选择，可以使用此问卷。如果你想使用符合问题类型，如多项选择题、自由文本输入问题，也可以使用此问卷。</msg>
+  <msg key="lt_This_survey_is_not_ed">此问卷是不可编辑的。</msg>
+  <msg key="lt_This_will_remove_respo">将删除%response_count%应答</msg>
+  <msg key="lt_to_the_survey_index_p">到问卷索引页。</msg>
+  <msg key="lt_Users_may_edit_their_">用户能编辑应答</msg>
+  <msg key="lt_Users_may_not_edit_th">用户不能编辑应答</msg>
+  <msg key="lt_Valid_Resposnes_enter">有效应答（每行输入一个选择）</msg>
+  <msg key="lt_You_did_not_enter_a_l">你没有输入一列有效回答或选择。</msg>
+  <msg key="lt_You_did_not_enter_a_q">你没有输入问题。</msg>
+  <msg key="lt_You_didnt_respond_to_">你没有答完所有的题目。你跳过了：</msg>
+  <msg key="lt_You_have_already_comp">你已完成了此问卷</msg>
+  <msg key="lt_Your_file_is_zero-len">你的文件0字节。试图上传一个0字节文件，或者一个不存在的文件，或文件传输过程中出错。</msg>
+  <msg key="lt_Your_response________">%responses.pretty_submission_date%日的应答</msg>
+  <msg key="make">做</msg>
+  <msg key="Mean">意思是：</msg>
+  <msg key="Medium">中等的</msg>
+  <msg key="Message_Subject">信息主题</msg>
+  <msg key="Modify_Question">修改问题</msg>
+  <msg key="Modify_Responses">修改应答</msg>
+  <msg key="Move_Down">向下移动</msg>
+  <msg key="Move_Up">向上移动</msg>
+  <msg key="Multiple_Choice">多项选择题</msg>
+  <msg key="Name_copy">名称</msg>
+  <msg key="New_Survey">新问卷</msg>
+  <msg key="No">不是</msg>
+  <msg key="No_data_found">没有找到数据</msg>
+  <msg key="No_Responses">没有应答</msg>
+  <msg key="No_surveys_active">没有活动的问卷</msg>
+  <msg key="non-">非</msg>
+  <msg key="Not_Found">没有找到</msg>
+  <msg key="Number">数字</msg>
+  <msg key="One_Respondent">一个回答者</msg>
+  <msg key="One_Response">一个应答</msg>
+  <msg key="One_Survey_name">问卷：%name%</msg>
+  <msg key="oops">oops</msg>
+  <msg key="Original">原始的</msg>
+  <msg key="Plain_Text">普通文本</msg>
+  <msg key="Preformatted_Text">预格式化文本</msg>
+  <msg key="Presentation_Type">陈述类型</msg>
+  <msg key="Preview">预览</msg>
+  <msg key="Question">问题</msg>
+  <msg key="Question_Text">问题文本</msg>
+  <msg key="Questions">问题</msg>
+  <msg key="Required">必答吗？</msg>
+  <msg key="Respondents">回答者</msg>
+  <msg key="response">应答</msg>
+  <msg key="Response_Not_Found">没有找到应答</msg>
+  <msg key="Response_Options">应答选项：</msg>
+  <msg key="Response_Submitted">应答已提交</msg>
+  <msg key="Response_to">应答</msg>
+  <msg key="Responses">应答</msg>
+  <msg key="responses">应答</msg>
+  <msg key="Return">返回</msg>
+  <msg key="Score">分数</msg>
+  <msg key="Scored_Survey">计分问卷</msg>
+  <msg key="Send_bulkmail">发送群发邮件</msg>
+  <msg key="Send_Mail">发送邮件</msg>
+  <msg key="Send_mail_to">发送邮件给</msg>
+  <msg key="Short_Text">短文本</msg>
+  <msg key="Size">大小</msg>
+  <msg key="Small">小的</msg>
+  <msg key="Standard_Dev">标准Dev</msg>
+  <msg key="Submit">提交</msg>
+  <msg key="Submit_response">提交</msg>
+  <msg key="Summary">摘要</msg>
+  <msg key="Survey_Description">问卷描述</msg>
+  <msg key="Survey_Name">问卷名称：</msg>
+  <msg key="Survey_Name_1">问卷名称</msg>
+  <msg key="Survey_Name_name">问卷名称：%name%</msg>
+  <msg key="Surveys">问卷</msg>
+  <msg key="Text">文本</msg>
+  <msg key="This_survey_is">此问卷是</msg>
+  <msg key="True_or_False">True或False</msg>
+  <msg key="TrueFalse">True/False</msg>
+  <msg key="Type_of_Response">应答类型</msg>
+  <msg key="Uploaded_file">上传文件：</msg>
+  <msg key="View">查看</msg>
+  <msg key="View_Response">查看解答</msg>
+  <msg key="View_Responses">查看应答：</msg>
+  <msg key="View_responses">查看应答</msg>
+  <msg key="View_responses_1">查看应答。</msg>
+  <msg key="Warning">警告！</msg>
+  <msg key="Warning_1">警告：</msg>
+  <msg key="Yes">是</msg>
+  <msg key="Yes_or_No">是或否</msg>
+  <msg key="YesNo">是/否</msg>
 </message_catalog>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.da_DK.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.de_DE.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	11 Dec 2003 21:40:14 -0000	1.8
+++ openacs-4/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	26 Feb 2004 15:29:23 -0000	1.9
@@ -65,10 +65,10 @@
   <msg key="inactive">[inactive]</msg>
   <msg key="Integer">Integer</msg>
   <msg key="is">is</msg>
-  <msg key="list">list</msg>
   <msg key="Large">Large</msg>
   <msg key="Last_Name">Last Name</msg>
   <msg key="limit_to_one">limit to one</msg>
+  <msg key="list">list</msg>
   <msg key="lt_-_Lets_you_use_this_s">- Lets you use this survey as a template to create a new survey.</msg>
   <msg key="lt_-_Removes_all_questio">- Removes all questions and responses</msg>
   <msg key="lt_A_database_error_occu">A database error occured while trying
@@ -173,12 +173,12 @@
 Respondent: %user_name% 
 
 Here is what %user_name% %comm_url%
-had to say in response to %survey_name%:</msg>
+had to say in response to %survey_name:%</msg>
   <msg key="lt_Survey_survey_nameRes_1">Survey: %survey_name%
 Respondent: %user_name% 
 
 Here is what %user_name% &lt;%comm_url%&gt;
-had to say in response to %survey_name%:</msg>
+had to say in response to %survey_name:%</msg>
   <msg key="lt_The_Above_Description">The Above Description is</msg>
   <msg key="lt_The_response_to_ques_i">The response to %question_text% must be an integer. Your answer was %response_value%.</msg>
   <msg key="lt_The_response_to_ques_n">The response to %question_text% must be a number. Your answer was %response_value%.</msg>
@@ -201,14 +201,14 @@
   <msg key="lt_to_the_survey_index_p">to the survey index page.</msg>
   <msg key="lt_Users_may_edit_their_">Users may edit their responses</msg>
   <msg key="lt_Users_may_not_edit_th">Users may not edit their responses</msg>
-  <msg key="lt_Valid_Resposnes_enter">Valid Resposnes (enter one choice per line)</msg>
+  <msg key="lt_Valid_Resposnes_enter">Valid Responses (enter one choice per line)</msg>
   <msg key="lt_You_did_not_enter_a_l">You did not enter a list of valid responses/choices.</msg>
   <msg key="lt_You_did_not_enter_a_q">You did not enter a question.</msg>
   <msg key="lt_You_didnt_respond_to_">You didn't respond to all required sections. You skipped:</msg>
   <msg key="lt_You_have_already_comp">You have already completed this survey</msg>
   <msg key="lt_Your_file_is_zero-len">Your file is zero-length. Either you attempted to upload a zero length file, a file which does not exist, or something went wrong during the transfer.</msg>
   <msg key="lt_Your_response________">Your response
-            on %responses.pretty_submission_date_ansi%</msg>
+            on %responses.pretty_submission_date%</msg>
   <msg key="make">make</msg>
   <msg key="Mean">Mean:</msg>
   <msg key="Medium">Medium</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.it_IT.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.ms_my.utf-8.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.nl_NL.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/survey/catalog/survey.pt_BR.ISO-8859-1.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/sql/postgresql/upgrade/upgrade-4.0b3-4.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/upgrade/upgrade-4.0b3-4.1.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/sql/postgresql/upgrade/upgrade-4.0b3-4.1.sql	26 Jan 2004 15:39:48 -0000	1.3
+++ openacs-4/packages/wp-slim/sql/postgresql/upgrade/upgrade-4.0b3-4.1.sql	26 Feb 2004 15:29:24 -0000	1.4
@@ -10,7 +10,7 @@
 -- the old functions, so they would linger in the db. drop them explicitly
 
 drop function wp_presentation__new (
-	timestamp,
+	timestamptz,
 	integer,
 	varchar(400),
 	varchar(400),	
@@ -25,7 +25,7 @@
 );
 
 drop function wp_presentation__new_revision (
-    timestamp,
+    timestamptz,
     integer,	 
     varchar,	 
     integer,	 
@@ -41,7 +41,7 @@
 
 drop function wp_slide__new (
     integer,
-    timestamp,
+    timestamptz,
     integer,
     varchar,
     varchar,
@@ -57,7 +57,7 @@
 );
 
 drop function wp_slide__new_revision(
-    timestamp,
+    timestamptz,
     integer,
     varchar,
     integer,
@@ -73,4 +73,1129 @@
 );
 
 -- now load the new functions 
-\i ../wp-packages-create.sql
+--
+-- PL/pgsql for wimpy point
+-- 
+-- @cvs-id $Id$
+--
+
+--jackp: From here on the functions are defined
+
+--jackp: To p_create each presentation
+create or replace function wp_presentation__new (
+    timestamptz,
+    integer,
+    varchar,
+    varchar,   
+    varchar,   
+    varchar,    
+    integer,    
+    boolean,
+    boolean,
+    varchar,
+    varchar,
+    integer
+) 
+returns integer as'
+declare
+    p_creation_date             alias for $1;
+    p_creation_user             alias for $2;
+    p_creation_ip               alias for $3;
+    p_pres_title                alias for $4;
+    p_page_signature            alias for $5;
+    p_copyright_notice          alias for $6;
+    p_style                     alias for $7;
+    p_public_p                  alias for $8;
+    p_show_modified_p           alias for $9;
+    p_aud                       alias for $10;
+    p_back                      alias for $11;
+    p_parent_id                 alias for $12;
+    v_item_id                   cr_items.item_id%TYPE;
+    v_audience_item_id          cr_items.item_id%TYPE;
+    v_background_item_id        cr_items.item_id%TYPE;
+    v_revision_id               cr_revisions.revision_id%TYPE;
+    v_audience_revision_id      cr_revisions.revision_id%TYPE;
+    v_background_revision_id    cr_revisions.revision_id%TYPE;
+    v_max_id                    integer;
+    v_name                      cr_wp_presentations.pres_title%TYPE;
+begin 
+    select coalesce(max(item_id),0) into v_max_id
+    from cr_items
+    where content_type = ''cr_wp_presentation''
+    and   name like p_pres_title || ''%'';
+    
+    v_name := p_pres_title || ''_'' || v_max_id;
+
+    v_item_id := content_item__new( 
+        v_name,
+        p_parent_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_presentation'',
+         null,
+         null,
+         ''text/plain'',
+         null,
+         null,
+         ''text''
+    );
+
+    v_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        null,
+        v_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+    
+    perform content_item__set_live_revision(v_revision_id);
+
+    --jackp: Actually place the information entered 
+    --       by the user into the table
+
+    insert into cr_wp_presentations (
+        presentation_id,
+        pres_title,
+        page_signature,
+        copyright_notice,
+        style,
+        public_p,
+        show_modified_p
+    ) values (
+        v_revision_id,
+        p_pres_title,
+        p_page_signature,
+        p_copyright_notice,
+        p_style,
+        p_public_p,
+        p_show_modified_p
+    );
+   
+    v_audience_item_id := content_item__new(    
+        p_aud,
+        v_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_presentation_aud'',
+         null,
+         null,
+         ''text/plain'',
+         null,
+         null,
+         ''text''
+    );
+
+    v_audience_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_aud,
+        v_audience_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+     );
+    
+    perform content_item__set_live_revision(v_audience_revision_id);
+      
+    insert into cr_wp_presentations_aud 
+    (id, presentation_id) 
+    values 
+    (v_audience_revision_id, v_revision_id);
+    
+    v_background_item_id := content_item__new(
+        p_back,
+        v_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_presentation_back'',
+         null,
+         null,
+         ''text/plain'',
+         null,
+         null,
+         ''text''
+    );
+    
+    v_background_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_back,
+        v_background_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+    
+    perform content_item__set_live_revision(v_background_revision_id);
+     
+    insert into cr_wp_presentations_back
+    (id, presentation_id) 
+    values 
+    (v_background_revision_id, v_revision_id);
+    
+    return v_item_id;
+end;' language 'plpgsql';
+        
+create or replace function wp_presentation__delete_audience (integer)
+returns integer as '
+declare
+    audience_item_id    alias for $1;
+begin
+    delete from cr_wp_presentations_aud
+    where exists (select 1 from cr_revisions 
+                    where revision_id = cr_wp_presentations_aud.id 
+                    and item_id = audience_item_id);
+
+    delete from cr_item_publish_audit where item_id = audience_item_id;
+     
+    perform content_item__delete(audience_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__delete_background (integer)
+returns integer as '
+declare
+    background_item_id  alias for $1;
+begin
+    delete from cr_wp_presentations_back
+    where exists (select 1 from cr_revisions 
+                    where revision_id = cr_wp_presentations_back.id 
+                    and item_id = background_item_id);  
+
+    delete from cr_item_publish_audit where item_id = background_item_id;
+    
+    perform content_item__delete(background_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__delete (integer)
+returns integer as '
+declare
+    p_pres_item_id                  alias for $1;
+    v_audience_item_id              cr_items.item_id%TYPE;
+    v_background_item_id            cr_items.item_id%TYPE;
+    del_rec                         record;
+begin
+    for del_rec in 
+        select item_id as slide_item_id
+          from cr_items
+          where content_type = ''cr_wp_slide''
+          and   parent_id = p_pres_item_id 
+    loop 
+       perform wp_slide__delete(del_rec.slide_item_id);
+    end loop;
+    
+    select item_id into v_audience_item_id
+      from cr_items
+      where content_type = ''cr_wp_presentation_aud''
+      and   parent_id = p_pres_item_id;
+    
+    perform wp_presentation__delete_audience(v_audience_item_id);
+    
+    select item_id into v_background_item_id
+      from cr_items
+      where content_type = ''cr_wp_presentation_back''
+      and   parent_id = p_pres_item_id;
+    
+    perform wp_presentation__delete_background(v_background_item_id);
+    
+    delete from acs_permissions where object_id = p_pres_item_id;
+
+   -- update acs_objects set context_id=null where context_id = p_pres_item_id;
+
+    delete from cr_wp_presentations where exists 
+        (select 1 from cr_revisions 
+         where cr_revisions.revision_id = cr_wp_presentations.presentation_id 
+         and cr_revisions.item_id = p_pres_item_id);
+
+    perform content_item__delete(p_pres_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+-- DRB: All these could've been implemented as a single function with a 
+--      type argument but I'm not going to rewrite all of wp-slim's queries 
+--      just to clean this up...
+
+create or replace function wp_presentation__get_ad_revision (integer) 
+returns text as '
+declare
+    p_pres_revision_id  alias for $1;
+begin
+  return r.content
+  from cr_revisions r, cr_wp_presentations_aud pa
+  where pa.presentation_id = p_pres_revision_id
+    and r.revision_id = pa.id;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__get_audience (integer) 
+returns text as '
+declare
+    p_pres_item_id  alias for $1;
+begin
+    return content
+    from cr_revisions, cr_items
+    where cr_items.content_type = ''cr_wp_presentation_aud''
+    and cr_items.parent_id = p_pres_item_id
+    and cr_revisions.revision_id = cr_items__live_revision;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__get_bg_revision (integer) 
+returns text as '
+declare
+    p_pres_revision_id  alias for $1;
+begin
+  return r.content
+  from cr_revisions r, cr_wp_presentations_aud pa
+  where pa.presentation_id = p_pres_revision_id
+    and r.revision_id = pa.id;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__get_background (integer) 
+returns text as '
+declare 
+    pres_item_id    alias for $1;
+begin
+    return content
+    from cr_revisions, cr_items
+    where cr_items.content_type = ''cr_wp_presentation_bak''
+    and cr_items.parent_id = p_pres_item_id
+    and cr_revisions.revision_id = cr_items__live_revision;
+end;' language 'plpgsql';
+
+create or replace function wp_presentation__new_revision (
+    timestamptz,
+    integer,     
+    varchar,     
+    integer,     
+    varchar,
+    varchar,
+    varchar,
+    integer,        
+    boolean,    
+    boolean,    
+    varchar,    
+    varchar
+) returns integer as ' 
+declare
+    p_creation_date             alias for $1;
+    p_creation_user             alias for $2;
+    p_creation_ip               alias for $3;
+    p_pres_item_id              alias for $4;
+    p_pres_title                alias for $5;
+    p_page_signature            alias for $6;
+    p_copyright_notice          alias for $7;
+    p_style                     alias for $8;
+    p_public_p                  alias for $9;
+    p_show_modified_p           alias for $10;
+    p_audience                  alias for $11;
+    p_background                alias for $12;
+    v_audience_item_id          cr_items.item_id%TYPE;
+    v_background_item_id        cr_items.item_id%TYPE;
+    v_revision_id               cr_revisions.revision_id%TYPE;
+    v_audience_revision_id      cr_revisions.revision_id%TYPE;
+    v_background_revision_id    cr_revisions.revision_id%TYPE;
+begin
+    v_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        null,
+        p_pres_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+
+    perform content_item__set_live_revision(v_revision_id);
+       
+    insert into cr_wp_presentations (
+        presentation_id,
+        pres_title,
+        page_signature,
+        copyright_notice,
+        style,
+        public_p,
+        show_modified_p
+    ) values ( 
+        v_revision_id,
+        p_pres_title,
+        p_page_signature,
+        p_copyright_notice,
+        p_style,
+        p_public_p,
+        p_show_modified_p
+    );
+   
+    select item_id into v_audience_item_id
+    from cr_items
+    where parent_id = p_pres_item_id
+    and   content_type = ''cr_wp_presentation_aud'';
+    
+    v_audience_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_audience,
+        v_audience_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+    
+    perform content_item__set_live_revision(v_audience_revision_id);
+        
+    insert into cr_wp_presentations_aud 
+    (id, presentation_id) 
+    values 
+    (v_audience_revision_id, v_revision_id);
+    
+    select item_id into v_background_item_id
+    from cr_items
+    where parent_id = p_pres_item_id   
+    and   content_type = ''cr_wp_presentation_back'';
+        
+    v_background_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_background,
+        v_background_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+    
+    perform content_item__set_live_revision(v_background_revision_id);
+    
+    insert into cr_wp_presentations_back 
+    (id, presentation_id) 
+    values 
+    (v_background_revision_id, v_revision_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__new (
+    integer,
+    timestamptz,
+    integer,
+    varchar,
+    varchar,
+    integer,
+    integer,
+    integer,
+    varchar,
+    varchar,
+    varchar,
+    boolean,
+    boolean,
+    integer
+) returns integer as '
+declare
+    p_pres_item_id              alias for $1; 
+    p_creation_date             alias for $2; 
+    p_creation_user             alias for $3; 
+    p_creation_ip               alias for $4; 
+    p_slide_title               alias for $5;
+    p_style                     alias for $6;
+    p_original_slide_id         alias for $7;
+    p_sort_key                  alias for $8;
+    p_preamble                  alias for $9;
+    p_bullet_items              alias for $10;
+    p_postamble                 alias for $11;
+    p_include_in_outline_p      alias for $12;
+    p_context_break_after_p     alias for $13;
+    p_context_id                alias for $14;
+    v_item_id                   cr_items.item_id%TYPE;
+    v_preamble_item_id          cr_items.item_id%TYPE;
+    v_postamble_item_id         cr_items.item_id%TYPE;
+    v_bullet_items_item_id      cr_items.item_id%TYPE;
+    v_revision_id               cr_revisions.revision_id%TYPE;
+    v_preamble_revision_id      cr_revisions.revision_id%TYPE;
+    v_postamble_revision_id     cr_revisions.revision_id%TYPE;
+    v_bullet_items_revision_id  cr_revisions.revision_id%TYPE;
+    v_max_id                    integer;
+    v_name                      varchar;
+begin
+    select coalesce(max(item_id),0) into v_max_id
+    from cr_items
+    where content_type = ''cr_wp_slide''
+    and   name like p_slide_title || ''%'';
+    
+    v_name := p_slide_title || ''_'' || v_max_id;
+  
+    v_item_id := content_item__new(
+        v_name,
+        p_pres_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_slide'',      
+        null,
+        null,
+        ''text/plain'',
+        null,
+        null,
+        ''text''
+    );
+
+    v_revision_id := content_revision__new(
+        null,
+        null, 
+        current_timestamp,
+        ''text/plain'', 
+        null, 
+        null,
+        v_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip          
+    );
+      
+    perform content_item__set_live_revision(v_revision_id);
+
+    update cr_wp_slides
+    set sort_key = sort_key + 1
+    where sort_key >= p_sort_key
+    and  exists (select 1 from cr_items, cr_revisions 
+                 where parent_id = p_pres_item_id 
+                 and cr_items.item_id = cr_revisions.item_id 
+                 and cr_revisions.revision_id=cr_wp_slides.slide_id);
+        
+    insert into cr_wp_slides ( 
+        slide_id,
+        original_slide_id,
+        sort_key,
+        slide_title,
+        include_in_outline_p,
+        context_break_after_p,
+        style  
+    ) values ( 
+        v_revision_id,
+        p_original_slide_id,
+        p_sort_key,
+        p_slide_title,
+        p_include_in_outline_p,
+        p_context_break_after_p,
+        p_style
+    );  
+    
+    v_preamble_item_id := content_item__new(
+        ''preamble'',
+        v_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_slide_preamble'',
+        null,
+        null,
+        ''text/plain'',
+        null,
+        null,
+        ''text''
+    );  
+
+    v_preamble_revision_id := content_revision__new(
+        null,
+        null, 
+        current_timestamp,
+        ''text/plain'', 
+        null, 
+        p_preamble,
+        v_preamble_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip          
+    );
+    
+    perform content_item__set_live_revision(v_preamble_revision_id);
+
+    insert into cr_wp_slides_preamble
+    (id, slide_id) 
+    values 
+    (v_preamble_revision_id, v_revision_id);
+
+    v_postamble_item_id := content_item__new(
+        ''postamble'',
+        v_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_slide_postamble'',
+        null,
+        null,
+        ''text/plain'',
+        null,
+        null,
+        ''text''      
+    );
+
+    v_postamble_revision_id := content_revision__new(
+        null,
+        null, 
+        current_timestamp,
+        ''text/plain'', 
+        null, 
+        p_postamble,
+        v_postamble_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip          
+    );
+
+    perform content_item__set_live_revision(v_postamble_revision_id);
+    
+    insert into cr_wp_slides_postamble
+    (id, slide_id) 
+    values 
+    (v_postamble_revision_id, v_revision_id);
+
+    v_bullet_items_item_id := content_item__new(
+        ''bullet_items'',
+        v_item_id,
+        null,
+        null,
+        p_creation_date,
+        p_creation_user,
+        null,
+        p_creation_ip,
+        ''content_item'',
+        ''cr_wp_slide_bullet_items'',
+        null,
+        null,
+        null,
+        ''text/plain'',
+        null,  
+        ''text''      
+    );
+
+    v_bullet_items_revision_id := content_revision__new(
+        null,
+        null, 
+        current_timestamp,
+        ''text/plain'', 
+        null, 
+        p_bullet_items,
+        v_bullet_items_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip          
+    );
+
+    perform content_item__set_live_revision(v_bullet_items_revision_id);
+
+    insert into cr_wp_slides_bullet_items
+    (id, slide_id) 
+    values 
+    (v_bullet_items_revision_id, v_revision_id);
+
+    return v_item_id;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__delete_preamble (integer) 
+returns integer as '
+declare
+    delete_preamble__preamble_item_id         alias for $1;
+begin 
+    delete from cr_wp_slides_preamble
+    where exists (select 1 from cr_revisions 
+                    where revision_id = cr_wp_slides_preamble.id
+                    and item_id = delete_preamble__preamble_item_id);    
+    
+    delete from cr_item_publish_audit
+    where item_id = delete_preamble__preamble_item_id;
+
+    perform content_item__delete(delete_preamble__preamble_item_id);
+
+    return 0;
+end;' language 'plpgsql'; 
+
+create or replace function wp_slide__delete_postamble(integer) 
+returns integer as '
+declare
+    delete_postamble__postamble_item_id          alias for $1;
+begin
+    delete from cr_wp_slides_postamble
+    where exists (select 1 from cr_revisions 
+                    where revision_id = cr_wp_slides_postamble.id
+                    and item_id = delete_postamble__postamble_item_id);
+    
+    delete from cr_item_publish_audit 
+    where item_id = delete_postamble__postamble_item_id;
+  
+    perform content_item__delete(delete_postamble__postamble_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__delete_bullet_items(integer) 
+returns integer as '
+declare
+    delete_bullet_items__bullet_items_item_id            alias for $1;
+begin 
+    delete from cr_wp_slides_bullet_items
+    where exists (select 1 from cr_revisions 
+                    where revision_id = cr_wp_slides_bullet_items.id
+                    and item_id = delete_bullet_items__bullet_items_item_id);
+    
+    delete from cr_item_publish_audit
+    where item_id = delete_bullet_items__bullet_items_item_id;
+
+    perform content_item__delete(delete_bullet_items__bullet_items_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__delete(integer) 
+returns integer as '
+declare
+    p_slide_item_id             alias for $1;
+    del_rec                     record;
+    v_sort_key                  cr_wp_slides.sort_key%TYPE;
+    v_pres_item_id              cr_items.item_id%TYPE;
+    v_preamble_item_id          cr_items.item_id%TYPE;
+    v_postamble_item_id         cr_items.item_id%TYPE;
+    v_bullet_items_item_id      cr_items.item_id%TYPE;
+begin
+    for del_rec in 
+        select item_id as attach_item_id
+        from cr_items
+        where content_type in 
+            (''cr_wp_image_attachment'', ''cr_wp_file_attachment'')
+        and parent_id = p_slide_item_id
+    loop
+        perform wp_attachment__delete(del_rec.attach_item_id);
+    end loop;
+
+    select item_id into v_preamble_item_id
+    from cr_items
+    where content_type = ''cr_wp_slide_preamble''
+    and parent_id = p_slide_item_id;
+    
+    perform wp_slide__delete_preamble(v_preamble_item_id);
+    
+    select item_id into v_postamble_item_id
+    from cr_items
+    where content_type = ''cr_wp_slide_postamble''
+    and parent_id = p_slide_item_id;
+
+    perform wp_slide__delete_postamble(v_postamble_item_id);
+    
+    select item_id into v_bullet_items_item_id
+    from cr_items
+    where content_type = ''cr_wp_slide_bullet_items''
+    and parent_id = p_slide_item_id;
+    
+    perform wp_slide__delete_bullet_items(v_bullet_items_item_id);
+
+    -- sort_key of all revisions should be the same
+    select max(s.sort_key), max(i.parent_id) into v_sort_key, v_pres_item_id
+    from cr_wp_slides s, cr_revisions r, cr_items i
+    where r.item_id = p_slide_item_id
+    and   r.revision_id = s.slide_id
+    and   i.item_id = r.item_id;
+    
+    delete from cr_wp_slides where exists (select 1 from cr_revisions
+    where cr_revisions.revision_id = cr_wp_slides.slide_id
+    and cr_revisions.item_id = p_slide_item_id);
+
+    update cr_wp_slides set sort_key = sort_key - 1 
+    where sort_key > v_sort_key and exists 
+      (select 1 from cr_revisions r, cr_items i 
+      where i.parent_id = v_pres_item_id and i.item_id = r.item_id
+      and r.revision_id = cr_wp_slides.slide_id);    
+
+--    update acs_objects set context_id=null
+--    where context_id = p_slide_item_id;
+
+    delete from cr_item_publish_audit where item_id = p_slide_item_id;
+
+    perform content_item__delete(p_slide_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_preamble_revision (integer) 
+returns text as '
+declare
+  p_slide_revision_id       alias for $1;
+begin
+  return content
+  from cr_revisions r, cr_wp_slides_preamble sp
+  where sp.slide_id = p_slide_revision_id
+  and r.revision_id = sp.id;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_postamble_revision (integer) 
+returns text as '
+declare
+  p_slide_revision_id       alias for $1;
+begin
+  return content
+  from cr_revisions r, cr_wp_slides_postamble sp
+  where sp.slide_id = p_slide_revision_id
+  and r.revision_id = sp.id;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_bullet_items_revision (integer) 
+returns text as '
+declare
+  p_slide_revision_id       alias for $1;
+begin
+  return content
+  from cr_revisions r, cr_wp_slides_bullet_items sp
+  where sp.slide_id = p_slide_revision_id
+  and r.revision_id = sp.id;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_postamble(integer) 
+returns text as '
+declare
+    p_slide_item_id         alias for $1;
+begin
+    return content
+    from cr_revisions, cr_items
+    where cr_items.content_type = ''cr_wp_slide_postamble''
+    and cr_items.parent_id = p_slide_item_id
+    and cr_revisions.revision_id = cr_items.live_revision;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_preamble(integer) 
+returns text as'
+declare
+    p_slide_item_id         alias for $1;
+begin
+    return content
+    from cr_revisions, cr_items
+    where cr_items.content_type = ''cr_wp_slide_preamble''
+    and cr_items.parent_id = p_slide_item_id
+    and cr_revisions.revision_id = cr_items.live_revision;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__get_bullet_items(integer) 
+returns text as '
+declare
+    p_slide_item_id         alias for $1;
+begin
+    return content
+    from cr_revisions, cr_items
+    where cr_items.content_type = ''cr_wp_slide_bullet_items''
+    and cr_items.parent_id = p_slide_item_id
+    and cr_revisions.revision_id = cr_items.live_revision;
+end;' language 'plpgsql';
+
+create or replace function wp_slide__new_revision(
+    timestamptz,
+    integer,
+    varchar,
+    integer,
+    varchar, 
+    text, 
+    varchar, 
+    varchar, 
+    integer, 
+    integer, 
+    integer, 
+    boolean,
+    boolean
+) returns integer as'
+declare
+    p_creation_date             alias for $1;  
+    p_creation_user             alias for $2;
+    p_creation_ip               alias for $3;
+    p_slide_item_id             alias for $4;
+    p_slide_title               alias for $5;
+    p_preamble                  alias for $6;
+    p_bullet_items              alias for $7;
+    p_postamble                 alias for $8;
+    p_style                     alias for $9;
+    p_original_slide_id         alias for $10;
+    p_sort_key                  alias for $11;    
+    p_include_in_outline_p      alias for $12;
+    p_context_break_after_p     alias for $13;
+    v_preamble_item_id          cr_items.item_id%TYPE;
+    v_postamble_item_id         cr_items.item_id%TYPE;
+    v_bullet_items_item_id      cr_items.item_id%TYPE;
+    v_revision_id               cr_revisions.revision_id%TYPE;
+    v_preamble_revision_id      cr_revisions.revision_id%TYPE;
+    v_postamble_revision_id     cr_revisions.revision_id%TYPE;
+    v_bullet_items_revision_id  cr_revisions.revision_id%TYPE;
+begin
+    v_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        null,
+        p_slide_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+
+    perform content_item__set_live_revision(v_revision_id);
+    
+    insert into cr_wp_slides (
+        slide_id,
+        slide_title,
+        style,
+        original_slide_id,
+        sort_key,
+        include_in_outline_p,
+        context_break_after_p
+    ) values (
+        v_revision_id,
+        p_slide_title,
+        p_style,
+        p_original_slide_id,
+        p_sort_key,
+        p_include_in_outline_p,
+        p_context_break_after_p 
+    );
+
+    select item_id into v_preamble_item_id
+    from cr_items
+    where parent_id = p_slide_item_id
+    and   content_type = ''cr_wp_slide_preamble'';
+    
+    v_preamble_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_preamble,
+        v_preamble_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+          
+    perform content_item__set_live_revision(v_preamble_revision_id);
+
+    insert into cr_wp_slides_preamble
+    (id, slide_id) 
+    values 
+    (v_preamble_revision_id, v_revision_id);
+
+    select item_id into v_postamble_item_id
+    from cr_items
+    where parent_id = p_slide_item_id
+    and   content_type = ''cr_wp_slide_postamble'';
+
+    v_postamble_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_postamble,
+        v_postamble_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+
+    perform content_item__set_live_revision(v_postamble_revision_id);
+      
+    insert into cr_wp_slides_postamble
+    (id, slide_id) 
+    values 
+    (v_postamble_revision_id, v_revision_id);
+
+    select item_id into v_bullet_items_item_id
+    from cr_items
+    where parent_id = p_slide_item_id
+    and   content_type = ''cr_wp_slide_bullet_items'';
+ 
+    v_bullet_items_revision_id := content_revision__new(
+        null,
+        null,
+        current_timestamp,
+        ''text/plain'',
+        null,
+        p_bullet_items,
+        v_bullet_items_item_id,
+        null,
+        p_creation_date,
+        p_creation_user,
+        p_creation_ip
+    );
+
+    perform content_item__set_live_revision(v_bullet_items_revision_id); 
+
+    insert into cr_wp_slides_bullet_items
+    (id, slide_id) 
+    values 
+    (v_bullet_items_revision_id, v_revision_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+-- bug fixed, delete first an image then a file, roc@
+create or replace function wp_attachment__delete(integer) 
+returns integer as '
+declare 
+    p_attach_item_id        alias for $1;
+begin   
+    delete from cr_wp_image_attachments
+    where exists (select 1 from cr_revisions where revision_id 
+      = cr_wp_image_attachments.attach_id 
+      and item_id = p_attach_item_id);
+    
+    delete from cr_wp_file_attachments
+    where exists (select 1 from cr_revisions where revision_id 
+      = cr_wp_file_attachments.attach_id 
+      and item_id = p_attach_item_id);
+
+    delete from cr_item_publish_audit
+    where item_id = p_attach_item_id;
+
+    perform content_item__delete(p_attach_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_attachment__new_revision (integer) 
+returns integer as '
+declare
+    p_attach_item_id        alias for $1;
+begin
+    return 0;
+end; 'language 'plpgsql';
+
+create or replace function wp_presentation__set_live_revision(integer) 
+returns integer as '
+declare
+  p_revision_id         alias for $1;
+  v_revision_id         integer;
+begin
+  perform content_item__set_live_revision(p_revision_id);
+
+  select id into v_revision_id
+  from cr_wp_presentations_aud
+  where presentation_id = p_revision_id;
+      
+  perform content_item__set_live_revision(v_revision_id);
+
+  select id into v_revision_id
+  from cr_wp_presentations_back
+  where presentation_id = p_revision_id;
+
+  perform content_item__set_live_revision(v_revision_id);
+  return 0;
+end;' language 'plpgsql';
+
+
+-- style functions roc@
+create or replace function wp_style__delete(integer) 
+returns integer as '
+declare 
+    p_style_id          alias for $1;
+    v_item_id           integer;
+    one_image           record;
+begin
+    for one_image in 
+        select * from wp_style_images where wp_style_images_id = 
+          (select background_image from wp_styles where style_id = p_style_id)
+    loop
+        delete from wp_style_images 
+        where wp_style_images_id = one_image.wp_style_images_id;
+
+        select item_id into v_item_id 
+        from cr_revisions 
+        where revision_id = one_image.wp_style_images_id;
+
+        perform content_item__delete(v_item_id);
+    end loop;
+    
+    update cr_wp_slides set style = -1 where style = p_style_id;
+    update cr_wp_presentations set style = -1 where style = p_style_id;
+    delete from wp_styles where style_id = p_style_id;
+
+    return 0;
+end;' language 'plpgsql';
+
+create or replace function wp_style__image_delete(integer) 
+returns integer as '
+declare 
+    p_revision_id       alias for $1;
+    v_item_id           integer;
+begin
+    update wp_styles set background_image = 0 
+    where background_image = p_revision_id;
+
+    delete from wp_style_images 
+    where wp_style_images_id = p_revision_id;
+    
+    select item_id into v_item_id from cr_revisions 
+    where revision_id = p_revision_id;
+
+    perform content_item__delete(v_item_id);
+
+    return 0;
+end;' language 'plpgsql';
+
+
+
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/www/blank-master.tcl	22 Jan 2004 12:58:12 -0000	1.9
+++ openacs-4/www/blank-master.tcl	26 Feb 2004 15:29:25 -0000	1.10
@@ -72,4 +72,19 @@
 
 set translator_mode_p [lang::util::translator_mode_p]
 
+
 set openacs_version [ad_acs_version]
+
+# Toggle translator mode link
+
+set acs_lang_url [apm_package_url_from_key "acs-lang"]
+if { [empty_string_p $acs_lang_url] } {
+    set lang_admin_p 0
+} else {
+    set lang_admin_p [permission::permission_p \
+                          -object_id [site_node::get_element -url $acs_lang_url -element object_id] \
+                          -privilege admin \
+                          -party_id [ad_conn untrusted_user_id]]
+}
+set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/www/SYSTEM/change-auth-token.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?